@loadmill/universal 0.3.28 → 0.3.32

package/dist/uri-utils.d.ts

@@ -6,3 +6,4 @@ export declare function stripProtocol(urlish: string): string;
 export declare function encodePart(urlPart: string): string;
 export declare function decodePart(urlPart: string): string;
 export declare function isVerified(domain: string, verifiedDomains: string[]): boolean;
+export declare function getFullUrl(url: string): string;

package/dist/uri-utils.js

@@ -3,10 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isVerified = exports.decodePart = exports.encodePart = exports.stripProtocol = exports.normalizeDomain = exports.getDomain = exports.parseQuery = exports.withProtocol = void 0;
+exports.getFullUrl = exports.isVerified = exports.decodePart = exports.encodePart = exports.stripProtocol = exports.normalizeDomain = exports.getDomain = exports.parseQuery = exports.withProtocol = void 0;
 var urijs_1 = __importDefault(require("urijs"));
+var SUPPORTED_PROTOCOLS = ['http', 'https', 'ws', 'wss'];
+var isUrlStartsWithSupportedProtocol = function (url, delimiter) {
+    if (delimiter === void 0) { delimiter = ':'; }
+    return SUPPORTED_PROTOCOLS.some(function (protocol) {
+        return url.startsWith(protocol + delimiter);
+    });
+};
 function withProtocol(url) {
-    if (url && !url.startsWith('http:') && !url.startsWith('https:')) {
+    if (url && !isUrlStartsWithSupportedProtocol(url)) {
         url = 'http://' + url;
     }
     return url;
@@ -29,15 +36,12 @@ function normalizeDomain(domain) {
 }
 exports.normalizeDomain = normalizeDomain;
 function stripProtocol(urlish) {
-    if (urlish.startsWith('http://')) {
-        return urlish.substring(7, urlish.length);
-    }
-    else if (urlish.startsWith('https://')) {
-        return urlish.substring(8, urlish.length);
-    }
-    else {
-        return urlish;
+    if (isUrlStartsWithSupportedProtocol(urlish, '://')) {
+        var url = new urijs_1.default(urlish);
+        var protocolLength = url.protocol().length;
+        return urlish.substring(protocolLength, urlish.length);
     }
+    return urlish;
 }
 exports.stripProtocol = stripProtocol;
 function encodePart(urlPart) {
@@ -54,6 +58,10 @@ function isVerified(domain, verifiedDomains) {
     });
 }
 exports.isVerified = isVerified;
+function getFullUrl(url) {
+    return new URL(withProtocol(url)).href;
+}
+exports.getFullUrl = getFullUrl;
 /**
  * Assumes both domains are properly normalized.
  *

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,SAAgB,YAAY,CAAC,GAAW;IACtC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAChE,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,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;QAChC,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;KAC3C;SAAM,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QACxC,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;KAC3C;SAAM;QACL,OAAO,MAAM,CAAC;KACf;AACH,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;;;;;;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,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loadmill/universal",
-  "version": "0.3.28",
+  "version": "0.3.32",
   "description": "Loadmill universal utilities",
   "main": "dist/",
   "types": "dist/index.d.ts",

package/src/cron-utils.ts

@@ -48,6 +48,6 @@ export const VALID_DAYS = {
 };
 
 export const VALID_HOURS = [
-  '00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', 
+  '00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00',
   '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'
 ];

package/src/errors/json-schema-error.ts

@@ -3,7 +3,7 @@ import PresentableError from './presentable-error';
 export default class JSONSchemaAssertionError extends PresentableError {
   constructor(public readonly prettyMessage) {
     super(prettyMessage);
-  
+
     // Workaround suggested in: https://github.com/Microsoft/TypeScript-wiki/blob/master/Breaking-Changes.md#extending-built-ins-like-error-array-and-map-may-no-longer-work
     Object.setPrototypeOf(this, JSONSchemaAssertionError.prototype);
   }

package/src/uri-utils.ts

@@ -1,7 +1,14 @@
 import URI from 'urijs';
 
+const SUPPORTED_PROTOCOLS = ['http', 'https', 'ws', 'wss'];
+
+const isUrlStartsWithSupportedProtocol = (url: string, delimiter = ':') =>
+  SUPPORTED_PROTOCOLS.some(protocol =>
+    url.startsWith(protocol + delimiter)
+  );
+
 export function withProtocol(url: string) {
-  if (url && !url.startsWith('http:') && !url.startsWith('https:')) {
+  if (url && !isUrlStartsWithSupportedProtocol(url)) {
     url = 'http://' + url;
   }
   return url;
@@ -26,13 +33,13 @@ export function normalizeDomain(domain?: string) {
 }
 
 export function stripProtocol(urlish: string) {
-  if (urlish.startsWith('http://')) {
-    return urlish.substring(7, urlish.length);
-  } else if (urlish.startsWith('https://')) {
-    return urlish.substring(8, urlish.length);
-  } else {
-    return urlish;
+  if (isUrlStartsWithSupportedProtocol(urlish, '://')) {
+    const url = new URI(urlish);
+    const protocolLength = url.protocol().length;
+    return urlish.substring(protocolLength, urlish.length);
   }
+
+  return urlish;
 }
 
 export function encodePart(urlPart: string) {
@@ -49,6 +56,10 @@ export function isVerified(domain: string, verifiedDomains: string[]) {
   );
 }
 
+export function getFullUrl (url: string) {
+  return new URL(withProtocol(url)).href;
+}
+
 /**
  * Assumes both domains are properly normalized.
  *

package/test/array-utils.spec.js

@@ -1,4 +1,6 @@
 const { expect } = require('chai');
+const { describe, it } = require('mocha');
+const { parameterUtils } = require('../../core/dist/parameters');
 const arrayUtils = require('../dist/array-utils');
 
 describe('array-utils', () => {
@@ -20,5 +22,14 @@ describe('array-utils', () => {
       arrayUtils.swap(arr3, 3, 0);
       expect(arr3).deep.equal([{ order: 3 }, { order: 0 }, { order: 1 }, { order: 2 }]);
     });
+
+    it('uniqByKeepLast function', () => {
+      let params = [{ a: 1 }, { a: 2 }, { a: 3 }];
+      expect(arrayUtils.uniqByKeepLast(params, parameterUtils.getParameterName)).to.eql([{ a: 3 }]);
+      params = [{ a: 1 }, { b: 2 }];
+      expect(arrayUtils.uniqByKeepLast(params, parameterUtils.getParameterName)).to.eql([{ a: 1 }, { b:2 }]);
+      params = [{ a: 1 }, { b: 2 }, { a: 4 }];
+      expect(arrayUtils.uniqByKeepLast(params, parameterUtils.getParameterName)).to.eql([{ b:2 }, { a:4 }]);
+    });
   });
 });