@loadmill/universal 0.3.32 → 0.3.36

package/dist/manipulation-utils.d.ts

@@ -3,7 +3,7 @@ export declare function firstKey(obj: any): string;
 export declare function objToSingletonArray(obj: {}, sort?: boolean): {
     [x: string]: any;
 }[];
-export declare function firstKeyComparator(o1: any, o2: any): 1 | 0 | -1;
+export declare function firstKeyComparator(o1: any, o2: any): 0 | 1 | -1;
 /**
  * {"a":1, "b":2} => [{"a":1}, {"b":2}]
  */

package/dist/uri-utils.js

@@ -39,7 +39,7 @@ function stripProtocol(urlish) {
     if (isUrlStartsWithSupportedProtocol(urlish, '://')) {
         var url = new urijs_1.default(urlish);
         var protocolLength = url.protocol().length;
-        return urlish.substring(protocolLength, urlish.length);
+        return urlish.substring(protocolLength + 3, urlish.length);
     }
     return urlish;
 }

package/dist/uri-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"uri-utils.js","sourceRoot":"","sources":["../src/uri-utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,IAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAE3D,IAAM,gCAAgC,GAAG,UAAC,GAAW,EAAE,SAAe;IAAf,0BAAA,EAAA,eAAe;IACpE,OAAA,mBAAmB,CAAC,IAAI,CAAC,UAAA,QAAQ;QAC/B,OAAA,GAAG,CAAC,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC;IAApC,CAAoC,CACrC;AAFD,CAEC,CAAC;AAEJ,SAAgB,YAAY,CAAC,GAAW;IACtC,IAAI,GAAG,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,EAAE;QACjD,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC;KACvB;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AALD,oCAKC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,eAAG,CAAC,UAAU,CAAC,KAAK,CAAQ,CAAC;AACtC,CAAC;AAFD,gCAEC;AAED,SAAgB,SAAS,CAAC,GAAG;IAC3B,IAAM,SAAS,GAAG,IAAI,eAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,eAAe,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;AAC3C,CAAC;AAHD,8BAGC;AAED,SAAgB,eAAe,CAAC,MAAe;IAC7C,OAAO,CACL,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC;SACxB,WAAW,EAAE;QACd,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACtB,CAAC;AACJ,CAAC;AAPD,0CAOC;AAED,SAAgB,aAAa,CAAC,MAAc;IAC1C,IAAI,gCAAgC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACnD,IAAM,GAAG,GAAG,IAAI,eAAG,CAAC,MAAM,CAAC,CAAC;QAC5B,IAAM,cAAc,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QAC7C,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;KACxD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AARD,sCAQC;AAED,SAAgB,UAAU,CAAC,OAAe;IACxC,OAAO,eAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU,CAAC,OAAe;IACxC,OAAO,eAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU,CAAC,MAAc,EAAE,eAAyB;IAClE,OAAO,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,UAAC,cAAc;QAC3C,OAAA,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC;IAAnC,CAAmC,CACpC,CAAC;AACJ,CAAC;AAJD,gCAIC;AAED,SAAgB,UAAU,CAAE,GAAW;IACrC,OAAO,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACzC,CAAC;AAFD,gCAEC;AAED;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,OAAe,EAAE,OAAe;IACnD,OAAO,OAAO,KAAK,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"uri-utils.js","sourceRoot":"","sources":["../src/uri-utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,IAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAE3D,IAAM,gCAAgC,GAAG,UAAC,GAAW,EAAE,SAAe;IAAf,0BAAA,EAAA,eAAe;IACpE,OAAA,mBAAmB,CAAC,IAAI,CAAC,UAAA,QAAQ;QAC/B,OAAA,GAAG,CAAC,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC;IAApC,CAAoC,CACrC;AAFD,CAEC,CAAC;AAEJ,SAAgB,YAAY,CAAC,GAAW;IACtC,IAAI,GAAG,IAAI,CAAC,gCAAgC,CAAC,GAAG,CAAC,EAAE;QACjD,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC;KACvB;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AALD,oCAKC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,eAAG,CAAC,UAAU,CAAC,KAAK,CAAQ,CAAC;AACtC,CAAC;AAFD,gCAEC;AAED,SAAgB,SAAS,CAAC,GAAG;IAC3B,IAAM,SAAS,GAAG,IAAI,eAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,eAAe,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;AAC3C,CAAC;AAHD,8BAGC;AAED,SAAgB,eAAe,CAAC,MAAe;IAC7C,OAAO,CACL,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC;SACxB,WAAW,EAAE;QACd,mBAAmB;SAClB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CACtB,CAAC;AACJ,CAAC;AAPD,0CAOC;AAED,SAAgB,aAAa,CAAC,MAAc;IAC1C,IAAI,gCAAgC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACnD,IAAM,GAAG,GAAG,IAAI,eAAG,CAAC,MAAM,CAAC,CAAC;QAC5B,IAAM,cAAc,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QAC7C,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;KAC5D;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AARD,sCAQC;AAED,SAAgB,UAAU,CAAC,OAAe;IACxC,OAAO,eAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU,CAAC,OAAe;IACxC,OAAO,eAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAFD,gCAEC;AAED,SAAgB,UAAU,CAAC,MAAc,EAAE,eAAyB;IAClE,OAAO,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,UAAC,cAAc;QAC3C,OAAA,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC;IAAnC,CAAmC,CACpC,CAAC;AACJ,CAAC;AAJD,gCAIC;AAED,SAAgB,UAAU,CAAE,GAAW;IACrC,OAAO,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACzC,CAAC;AAFD,gCAEC;AAED;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,OAAe,EAAE,OAAe;IACnD,OAAO,OAAO,KAAK,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC;AAChE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loadmill/universal",
-  "version": "0.3.32",
+  "version": "0.3.36",
   "description": "Loadmill universal utilities",
   "main": "dist/",
   "types": "dist/index.d.ts",
@@ -9,7 +9,10 @@
     "ts-watch": "rimraf dist && tsc -w -p tsconfig.json",
     "build": "rimraf dist && tsc -p tsconfig.json",
     "check-types": "tsc -p tsconfig.json --noEmit",
-    "prepublish": "yarn build"
+    "prepublish": "yarn build",
+    "unit-test": "run-p unit-test-*",
+    "unit-test-ts": "mocha --require ts-node/register/transpile-only --ui tdd \"test/uri-utils.spec.ts\"",
+    "unit-test-js": "mocha --ui tdd \"test/*.spec.js\""
   },
   "engines": {
     "node": ">=12.0.0"

package/src/uri-utils.ts

@@ -36,7 +36,7 @@ export function stripProtocol(urlish: string) {
   if (isUrlStartsWithSupportedProtocol(urlish, '://')) {
     const url = new URI(urlish);
     const protocolLength = url.protocol().length;
-    return urlish.substring(protocolLength, urlish.length);
+    return urlish.substring(protocolLength + 3, urlish.length);
   }
 
   return urlish;

package/test/cron-utils.spec.js

@@ -1,4 +1,6 @@
 const { expect } = require('chai');
+const { describe, it } = require('mocha');
+
 const { getCronLabel, isAllowedExpression } = require('../dist/cron-utils');
 
 describe('cron-utils', () => {

package/test/manipulation-utils.spec.js

@@ -1,4 +1,6 @@
 const { expect } = require('chai');
+const { describe, it } = require('mocha');
+
 const { deleteProp } = require('../dist/manipulation-utils');
 
 describe('delete Prop', () => {

package/test/object-map.spec.js

@@ -1,5 +1,6 @@
 const { expect } = require('chai');
 const { ObjectMap } = require('../dist/object-map');
+const { describe, it } = require('mocha');
 
 describe('Object Map', () => {
   it('Overrides values', () => {

package/test/uri-utils.spec.ts

@@ -0,0 +1,72 @@
+import { describe, it } from 'mocha';
+import { expect } from 'chai';
+
+import { isVerified, stripProtocol } from '../src/uri-utils';
+
+
+describe('domain-utils', () => {
+  describe('isVerified', () => {
+    it('true when domains are the same', () => {
+      const resolved = 'www.rivi.com';
+      expect(isVerified(resolved, [resolved])).to.eql(true);
+    });
+    it('false when domains aren\'t the same', () => {
+      const resolvedA = 'www.rivi.com';
+      const resolvedB = 'www.shimi.com';
+      expect(isVerified(resolvedA, [resolvedB])).to.eql(false);
+    });
+    it('true when parent include the child', () => {
+      const child = 'shimi.rivi.com';
+      const paernt = 'rivi.com';
+      expect(isVerified(child, [paernt])).to.eql(true);
+    });
+    it('false when parent include the child with *', () => {
+      const child = 'shimi.rivi.com';
+      const paernt = '*.rivi.com';
+      expect(isVerified(child, [paernt])).to.eql(false);
+    });
+    it('false when parent include the child with two *', () => {
+      const child = 'shimi.rivi.com';
+      const paernt = '**.rivi.com';
+      expect(isVerified(child, [paernt])).to.eql(false);
+    });
+    it('false when parent include the child with two *.', () => {
+      const child = 'shimi.rivi.com';
+      const paernt = '*.*.rivi.com';
+      expect(isVerified(child, [paernt])).to.eql(false);
+    });
+  });
+  describe('stripProtocol', () => {
+
+    const nakedUrl = 'rivi.com';
+    const wwwUrl = 'www.rivi.com';
+    const httpUrl = 'http://' + wwwUrl;
+    const httpsUrl = 'https://' + wwwUrl;
+    const wsUrl = 'ws://' + wwwUrl;
+    const wssUrl = 'wss://' + wwwUrl;
+    const wrongProtocolUrl = 'wss:/' + wwwUrl;
+
+    it('should return the same for naked domain', () => {
+      expect(stripProtocol(nakedUrl)).to.eql(nakedUrl);
+    });
+    it('should return the same for wwwUrl', () => {
+      expect(stripProtocol(wwwUrl)).to.eql(wwwUrl);
+    });
+
+    it('should return wwwUrl for httpUrl domain', () => {
+      expect(stripProtocol(httpUrl)).to.eql(wwwUrl);
+    });
+    it('should return wwwUrl for httpsUrl domain', () => {
+      expect(stripProtocol(httpsUrl)).to.eql(wwwUrl);
+    });
+    it('should return wwwUrl for wsUrl domain', () => {
+      expect(stripProtocol(wsUrl)).to.eql(wwwUrl);
+    });
+    it('should return wwwUrl for wssUrl domain', () => {
+      expect(stripProtocol(wssUrl)).to.eql(wwwUrl);
+    });
+    it('should return with wrong protocol for wrong protocol domain', () => {
+      expect(stripProtocol(wrongProtocolUrl)).to.eql(wrongProtocolUrl);
+    });
+  });
+});

package/yarn-error.log

@@ -0,0 +1,69 @@
+Arguments: 
+  /Users/yigal/.nvm/versions/node/v14.18.0/bin/node /Users/yigal/.nvm/versions/node/v14.18.0/bin/yarn unit-test
+
+PATH: 
+  /usr/local/opt/postgresql@9.6/bin:/Users/yigal/.nvm/versions/node/v14.18.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin
+
+Yarn version: 
+  1.22.15
+
+Node version: 
+  14.18.0
+
+Platform: 
+  darwin x64
+
+Trace: 
+  SyntaxError: /Users/yigal/ws/lm/loadmill/packages/universal/package.json: Unexpected string in JSON at position 533
+      at JSON.parse (<anonymous>)
+      at /Users/yigal/.nvm/versions/node/v14.18.0/lib/node_modules/yarn/lib/cli.js:1625:59
+      at Generator.next (<anonymous>)
+      at step (/Users/yigal/.nvm/versions/node/v14.18.0/lib/node_modules/yarn/lib/cli.js:310:30)
+      at /Users/yigal/.nvm/versions/node/v14.18.0/lib/node_modules/yarn/lib/cli.js:321:13
+
+npm manifest: 
+  {
+    "name": "@loadmill/universal",
+    "version": "0.3.34",
+    "description": "Loadmill universal utilities",
+    "main": "dist/",
+    "types": "dist/index.d.ts",
+    "module": "src/",
+    "scripts": {
+      "ts-watch": "rimraf dist && tsc -w -p tsconfig.json",
+      "build": "rimraf dist && tsc -p tsconfig.json",
+      "check-types": "tsc -p tsconfig.json --noEmit",
+      "prepublish": "yarn build",
+      "unit-test": "run-p unit-test-*",
+      "unit-test-ts": "mocha --require ts-node/register/transpile-only --ui tdd \"test/uri-utils.spec.ts\""
+      "unit-test-js": "mocha --require --ui tdd \"test/*.spec.js\""
+    },
+    "engines": {
+      "node": ">=12.0.0"
+    },
+    "license": "Apache-2.0",
+    "devDependencies": {
+      "@types/source-map-support": "^0.4.0",
+      "@types/stack-trace": "^0.0.29"
+    },
+    "dependencies": {
+      "chalk": "^4.1.0",
+      "circular-json": "^0.5.1",
+      "country-list": "^2.1.0",
+      "cron-parser": "^2.13.0",
+      "cronstrue": "^1.83.0",
+      "dayjs": "^1.10.5",
+      "log4js": "3.0.4",
+      "quickselect": "^2.0.0",
+      "source-map-support": "^0.5.0",
+      "stack-trace": "^0.0.10",
+      "urijs": "^1.18.1",
+      "uuid": "^3.0.1"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile

package/test/uri-utils.spec.js

@@ -1,38 +0,0 @@
-const { expect } = require('chai');
-
-const { isVerified } = require('../dist/uri-utils');
-
-
-describe('domain-utils', () => {
-  describe('isVerified', () => {
-    it('true when domains are the same', () => {
-      const resolved = 'www.rivi.com';
-      expect(isVerified(resolved, [resolved])).to.eql(true);
-    });
-    it('false when domains aren\'t the same', () => {
-      const resolvedA = 'www.rivi.com';
-      const resolvedB = 'www.shimi.com';
-      expect(isVerified(resolvedA, [resolvedB])).to.eql(false);
-    });
-    it('true when parent include the child', () => {
-      const child = 'shimi.rivi.com';
-      const paernt = 'rivi.com';
-      expect(isVerified(child, [paernt])).to.eql(true);
-    });
-    it('false when parent include the child with *', () => {
-      const child = 'shimi.rivi.com';
-      const paernt = '*.rivi.com';
-      expect(isVerified(child, [paernt])).to.eql(false);
-    });
-    it('false when parent include the child with two *', () => {
-      const child = 'shimi.rivi.com';
-      const paernt = '**.rivi.com';
-      expect(isVerified(child, [paernt])).to.eql(false);
-    });
-    it('false when parent include the child with two *.', () => {
-      const child = 'shimi.rivi.com';
-      const paernt = '*.*.rivi.com';
-      expect(isVerified(child, [paernt])).to.eql(false);
-    });
-  });
-});