Test case coverage and test cases for default image

Author: manu4543

.github/workflows/nodejs.yml

@@ -19,9 +19,11 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - name: build and test
       run: |
-        npm i -g yarn
-        yarn install
-        yarn build
-        yarn test
+        npm install
+        npm run build
+        npm run test
       env:
         CI: true
+    - name: Publish Code Coverage
+      run: |
+        npm run report-coverage

.github/workflows/npmpublish.yml

@@ -22,10 +22,9 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - name:  build and test
       run: |
-        npm i -g yarn
-        yarn install
-        yarn build
-        yarn test
+        npm install
+        npm run build
+        npm run test
       env:
         CI: true
 
@@ -38,11 +37,10 @@ jobs:
       with:
         node-version: 12
         registry-url: https://registry.npmjs.org/
-    - name: yarn publish
+    - name: npm publish
       run: |
-        npm i -g yarn
-        yarn build
-        yarn config set //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN
+        npm run build
+        npm config set //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN
         npm publish        
       env:
         NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.gitignore

@@ -3,4 +3,7 @@ samples/sample-app/node_modules/*
 .env
 .vscode
 .DS_Store
-dist
+dist
+.nyc_output
+coverage.lcov
+coverage

CHANGELOG.md

@@ -6,6 +6,7 @@
 ![brotli size](https://img.badgesize.io/https://unpkg.com/imagekit-javascript/dist/imagekit.min.js?compression=brotli&label=brotli)
 ![Node CI](https://github.com/imagekit-developer/imagekit-javascript/workflows/Node%20CI/badge.svg)
 [![npm version](https://img.shields.io/npm/v/imagekit-javascript)](https://www.npmjs.com/package/imagekit-javascript) 
+[![codecov](https://codecov.io/gh/imagekit-developer/imagekit-javascript/branch/master/graph/badge.svg)](https://codecov.io/gh/imagekit-developer/imagekit-javascript)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Twitter Follow](https://img.shields.io/twitter/follow/imagekitio?label=Follow&style=social)](https://twitter.com/ImagekitIo)
 

README.md

@@ -1,6 +1,6 @@
 {
     "name": "imagekit-javascript",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "description": "Javascript SDK for using ImageKit.io in the browser",
     "main": "dist/imagekit.cjs.js",
     "module": "dist/imagekit.esm.js",
@@ -19,17 +19,20 @@
         "@rollup/plugin-json": "^4.1.0",
         "@rollup/plugin-node-resolve": "^8.4.0",
         "chai": "^4.2.0",
+        "codecov": "^3.8.0",
         "formdata-node": "2.1.0",
         "mocha": "^7.0.1",
+        "nyc": "^15.1.0",
         "rollup": "^2.22.0",
         "rollup-plugin-terser": "^6.1.0",
         "sinon": "^8.1.1"
     },
     "scripts": {
         "dev": "rollup -c -w",
         "build": "rm -rf dist*;rollup -c",
-        "test": "export NODE_ENV=test && ./node_modules/mocha/bin/mocha --exit -t 40000 test/*.js;ex=$? ; unset NODE_ENV ; exit $ex;",
-        "startSampleApp": "yarn build && cd samples/sample-app/ && yarn install && node index.js"
+        "test": "export NODE_ENV=test && nyc ./node_modules/mocha/bin/mocha --exit -t 40000 test/*.js;ex=$? ; unset NODE_ENV ; exit $ex;",
+        "startSampleApp": "yarn build && cd samples/sample-app/ && yarn install && node index.js",
+        "report-coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov"
     },
     "repository": {
         "type": "git",

package-lock.json

@@ -116,8 +116,8 @@ function constructTransformationString(transformation) {
                 parsedTransformStep.push(transformKey);
             } else {
                 var value = transformation[i][key];
-                if(transformKey === "oi") {
-                    value = removeLeadingSlash(value);
+                if(transformKey === "oi" || transformKey === "di") {
+                    value = removeTrailingSlash(removeLeadingSlash(value));
                     value = value.replace(/\//g,"@@");
                 }
                 parsedTransformStep.push([transformKey, value].join(transformationUtils.getTransformKeyValueDelimiter()));

package.json

@@ -207,6 +207,68 @@ describe("URL generation", function () {
 
         expect(url).equal(`https://ik.imagekit.io/test_url_endpoint/tr:h-300,w-400,b-20_FF0000/test_path.jpg?ik-sdk-version=javascript-${pkg.version}`);
     });
+
+    it('All combined', function () {
+        const url = imagekit.url({
+            path: "/test_path.jpg",
+            transformation: [{
+                height: 300,
+                width: 400,
+                aspectRatio: '4-3',
+                quality: 40,
+                crop: 'force',
+                cropMode: 'extract',
+                focus: 'left',
+                format: 'jpeg',
+                radius: 50,
+                bg: "A94D34",
+                border: "5-A94D34",
+                rotation: 90,
+                blur: 10,
+                named: "some_name",
+                overlayX: 35,
+                overlayY: 35,
+                overlayFocus: "bottom",
+                overlayHeight: 20,
+                overlayWidth: 20,
+                overlayImage: "/folder/file.jpg", // leading slash case
+                overlayImageTrim: false,
+                overlayImageAspectRatio: "4:3",
+                overlayImageBackground: "0F0F0F",
+                overlayImageBorder: "10_0F0F0F",
+                overlayImageDPR: 2,
+                overlayImageQuality: 50,
+                overlayImageCropping: "force",
+                overlayText: "two words",
+                overlayTextFontSize: 20,
+                overlayTextFontFamily: "Open Sans",
+                overlayTextColor: "00FFFF",
+                overlayTextTransparency: 5,
+                overlayTextTypography: "b",
+                overlayBackground: "00AAFF55",
+                overlayTextEncoded: "b3ZlcmxheSBtYWRlIGVhc3k%3D",
+                overlayTextWidth: 50,
+                overlayTextBackground: "00AAFF55",
+                overlayTextPadding: 40,
+                overlayTextInnerAlignment: "left",
+                overlayRadius: 10,
+                progressive: true,
+                lossless: true,
+                trim: 5,
+                metadata: true,
+                colorProfile: true,
+                defaultImage: "folder/file.jpg/", //trailing slash case
+                dpr: 3,
+                effectSharpen: 10,
+                effectUSM: "2-2-0.8-0.024",
+                effectContrast: true,
+                effectGray: true,
+                original: true,
+            }]
+        })
+
+        expect(url).equal(`https://ik.imagekit.io/test_url_endpoint/tr:h-300,w-400,ar-4-3,q-40,c-force,cm-extract,fo-left,f-jpeg,r-50,bg-A94D34,b-5-A94D34,rt-90,bl-10,n-some_name,ox-35,oy-35,ofo-bottom,oh-20,ow-20,oi-folder@@file.jpg,oit-false,oiar-4:3,oibg-0F0F0F,oib-10_0F0F0F,oidpr-2,oiq-50,oic-force,ot-two%20words,ots-20,otf-Open%20Sans,otc-00FFFF,oa-5,ott-b,obg-00AAFF55,ote-b3ZlcmxheSBtYWRlIGVhc3k%3D,otw-50,otbg-00AAFF55,otp-40,otia-left,or-10,pr-true,lo-true,t-5,md-true,cp-true,di-folder@@file.jpg,dpr-3,e-sharpen-10,e-usm-2-2-0.8-0.024,e-contrast-true,e-grayscale-true,orig-true/test_path.jpg?ik-sdk-version=javascript-${pkg.version}`);
+    });
 });