@opra/common 0.14.0 → 0.16.0

package/cjs/schema/type-guards.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isContainer = exports.isSingleton = exports.isCollection = exports.isResource = exports.isEnumType = exports.isMappedType = exports.isUnionType = exports.isSimpleType = exports.isComplexType = exports.isDataType = void 0;
+const complex_type_interface_js_1 = require("./data-type/complex-type.interface.js");
+const enum_type_interface_js_1 = require("./data-type/enum-type.interface.js");
+const mapped_type_interface_js_1 = require("./data-type/mapped-type.interface.js");
+const simple_type_interface_js_1 = require("./data-type/simple-type.interface.js");
+const union_type_interface_js_1 = require("./data-type/union-type.interface.js");
+const collection_interface_js_1 = require("./resource/collection.interface.js");
+const container_interface_js_1 = require("./resource/container.interface.js");
+const singleton_interface_js_1 = require("./resource/singleton.interface.js");
+function isDataType(obj) {
+    return obj && typeof obj === 'object' &&
+        (obj.kind === complex_type_interface_js_1.ComplexType.Kind ||
+            obj.kind === enum_type_interface_js_1.EnumType.Kind ||
+            obj.kind === mapped_type_interface_js_1.MappedType.Kind ||
+            obj.kind === simple_type_interface_js_1.SimpleType.Kind ||
+            obj.kind === union_type_interface_js_1.UnionType.Kind);
+}
+exports.isDataType = isDataType;
+function isComplexType(obj) {
+    return obj && typeof obj === 'object' && obj.kind === complex_type_interface_js_1.ComplexType.Kind;
+}
+exports.isComplexType = isComplexType;
+function isSimpleType(obj) {
+    return obj && typeof obj === 'object' && obj.kind === simple_type_interface_js_1.SimpleType.Kind;
+}
+exports.isSimpleType = isSimpleType;
+function isUnionType(obj) {
+    return obj && typeof obj === 'object' && obj.kind === union_type_interface_js_1.UnionType.Kind;
+}
+exports.isUnionType = isUnionType;
+function isMappedType(obj) {
+    return obj && typeof obj === 'object' && obj.kind === mapped_type_interface_js_1.MappedType.Kind;
+}
+exports.isMappedType = isMappedType;
+function isEnumType(obj) {
+    return obj && typeof obj === 'object' && obj.kind === enum_type_interface_js_1.EnumType.Kind;
+}
+exports.isEnumType = isEnumType;
+function isResource(obj) {
+    return obj && typeof obj === 'object' &&
+        (obj.kind === container_interface_js_1.Container.Kind ||
+            obj.kind === collection_interface_js_1.Collection.Kind ||
+            obj.kind === singleton_interface_js_1.Singleton.Kind);
+}
+exports.isResource = isResource;
+function isCollection(obj) {
+    return obj && typeof obj === 'object' && obj.kind === collection_interface_js_1.Collection.Kind;
+}
+exports.isCollection = isCollection;
+function isSingleton(obj) {
+    return obj && typeof obj === 'object' && obj.kind === singleton_interface_js_1.Singleton.Kind;
+}
+exports.isSingleton = isSingleton;
+function isContainer(obj) {
+    return obj && typeof obj === 'object' && obj.kind === container_interface_js_1.Container.Kind;
+}
+exports.isContainer = isContainer;

package/cjs/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/url/index.js

@@ -4,5 +4,5 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./opra-url.js"), exports);
 tslib_1.__exportStar(require("./opra-url-path.js"), exports);
 tslib_1.__exportStar(require("./opra-url-path-component.js"), exports);
-tslib_1.__exportStar(require("./opra-url-search-params.js"), exports);
-tslib_1.__exportStar(require("./utils/path-utils.js"), exports);
+tslib_1.__exportStar(require("./utils/encode-path-component.js"), exports);
+tslib_1.__exportStar(require("./utils/decode-path-component.js"), exports);

package/cjs/url/opra-url-path-component.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraURLPathComponent = void 0;
-const path_utils_js_1 = require("./utils/path-utils.js");
+const encode_path_component_js_1 = require("./utils/encode-path-component.js");
 const nodeInspectCustom = Symbol.for('nodejs.util.inspect.custom');
 class OpraURLPathComponent {
     constructor(init) {
@@ -10,7 +10,7 @@ class OpraURLPathComponent {
         this.typeCast = init.typeCast;
     }
     toString() {
-        const obj = (0, path_utils_js_1.encodePathComponent)(this.resource, this.key, this.typeCast);
+        const obj = (0, encode_path_component_js_1.encodePathComponent)(this.resource, this.key, this.typeCast);
         if (obj)
             Object.setPrototypeOf(obj, OpraURLPathComponent.prototype);
         return obj;

package/cjs/url/opra-url-path.js

@@ -3,9 +3,11 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraURLPath = void 0;
 const fast_tokenizer_1 = require("fast-tokenizer");
-const index_js_1 = require("../utils/index.js");
+const index_js_1 = require("../helpers/index.js");
+const path_utils_js_1 = require("../utils/path-utils.js");
 const opra_url_path_component_js_1 = require("./opra-url-path-component.js");
-const path_utils_js_1 = require("./utils/path-utils.js");
+const decode_path_component_js_1 = require("./utils/decode-path-component.js");
+const encode_path_component_js_1 = require("./utils/encode-path-component.js");
 const nodeInspectCustom = Symbol.for('nodejs.util.inspect.custom');
 const kEntries = Symbol('kEntries');
 const kOptions = Symbol('kOptions');
@@ -89,7 +91,8 @@ class OpraURLPath {
         return this.splice(0, 0, join);
     }
     toString() {
-        return this[kEntries].map(x => (0, path_utils_js_1.encodePathComponent)(x.resource, x.key, x.typeCast)).join('/');
+        return this[kEntries]
+            .map(x => (0, encode_path_component_js_1.encodePathComponent)(x.resource, x.key, x.typeCast)).join('/');
     }
     values() {
         let i = -1;
@@ -113,7 +116,7 @@ class OpraURLPath {
                 delimiters: '/', quotes: true, brackets: true,
             });
             for (const x of pathTokenizer) {
-                const p = (0, path_utils_js_1.decodePathComponent)(x);
+                const p = (0, decode_path_component_js_1.decodePathComponent)(x);
                 target.push(new opra_url_path_component_js_1.OpraURLPathComponent(p));
             }
             return;

package/cjs/url/opra-url.js

@@ -3,9 +3,10 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraURL = void 0;
 const fast_tokenizer_1 = require("fast-tokenizer");
+const index_js_1 = require("../http/index.js");
+const path_utils_js_1 = require("../utils/path-utils.js");
 const opra_url_path_js_1 = require("./opra-url-path.js");
-const opra_url_search_params_js_1 = require("./opra-url-search-params.js");
-const path_utils_js_1 = require("./utils/path-utils.js");
+const decode_path_component_js_1 = require("./utils/decode-path-component.js");
 const nodeInspectCustom = Symbol.for('nodejs.util.inspect.custom');
 const urlRegEx = /^(?:((?:[A-Z][A-Z+-.]+:)+)\/\/([^/?]+))?(.*)?$/i;
 const schemeRegEx = /^([A-Z][A-Z+-.]+:?)+$/i;
@@ -13,34 +14,29 @@ const hostRegEx = /^([^/:]+)(?::(\d+))?$/;
 const hostnameRegEx = /^([^/:]+)$/;
 const kContext = Symbol('kContext');
 const kPath = Symbol('kPath');
-const kSearchParams = Symbol('kSearchParams');
+const kParams = Symbol('kParams');
 class OpraURL {
-    constructor(input, arg1) {
+    constructor(input, base) {
         this[_a] = {
             protocol: '',
             username: '',
-            pathname: '',
             prefix: '',
             hostname: '',
             port: '',
             hash: '',
-            password: '',
-            search: '',
-            address: '',
-            needUpdate: true
+            password: ''
         };
         this[kPath] = new opra_url_path_js_1.OpraURLPath('', {
-            onChange: () => this._changed()
+            onChange: () => {
+                this[kContext].pathname = undefined;
+                this[kContext].address = undefined;
+            }
         });
-        this[kSearchParams] = new opra_url_search_params_js_1.OpraURLSearchParams('', {
-            onChange: () => this._changed()
+        this[kParams] = new index_js_1.HttpParams('', {
+            onChange: () => {
+                this[kContext].search = undefined;
+            }
         });
-        const base = typeof arg1 === 'object' ? arg1.base : arg1;
-        if (typeof arg1 === 'object') {
-            const defineParams = arg1?.params;
-            if (defineParams)
-                Object.keys(defineParams).forEach(key => this.searchParams.define(key, defineParams[key]));
-        }
         if (input)
             this.parse(typeof input === 'object' ? input.toString() : input);
         if (base) {
@@ -52,7 +48,19 @@ class OpraURL {
         }
     }
     get address() {
-        this._update();
+        if (this[kContext].address == null) {
+            let address = '';
+            if (this[kContext].hostname) {
+                address += (this[kContext].protocol || 'http:') + '//' +
+                    (this[kContext].username || this[kContext].password
+                        ? ((this[kContext].username ? encodeURIComponent(this[kContext].username) : '') +
+                            (this[kContext].password ? ':' + encodeURIComponent(this[kContext].password) : '') + '@')
+                        : '') + this.host;
+            }
+            this[kContext].address = address +
+                (this.prefix !== '/' ? this.prefix : '') +
+                (this.pathname !== '/' ? this.pathname : '');
+        }
         return this[kContext].address;
     }
     get host() {
@@ -66,17 +74,16 @@ class OpraURL {
                     host: v,
                     code: 'ERR_INVALID_URL'
                 });
-            this[kContext].hostname = m[1];
-            this[kContext].port = m[2] || '';
+            this.hostname = m[1];
+            this.port = m[2] || '';
         }
         else {
-            this[kContext].hostname = '';
-            this[kContext].port = '';
+            this.hostname = '';
+            this.port = '';
         }
-        this._changed();
     }
     get hostname() {
-        return this[kContext].hostname || '';
+        return this[kContext].hostname;
     }
     set hostname(v) {
         if (v) {
@@ -89,7 +96,7 @@ class OpraURL {
         }
         else
             this[kContext].hostname = '';
-        this._changed();
+        this[kContext].address = undefined;
     }
     get href() {
         return this.address + this.search + this.hash;
@@ -98,8 +105,8 @@ class OpraURL {
         return this[kContext].password;
     }
     set password(v) {
-        this[kContext].password = v || '';
-        this._changed();
+        this[kContext].password = v ?? '';
+        this[kContext].address = undefined;
     }
     get port() {
         return this[kContext].port;
@@ -107,17 +114,16 @@ class OpraURL {
     set port(value) {
         if (value) {
             // noinspection SuspiciousTypeOfGuard
-            const v = parseInt(value, 10);
+            const v = typeof value === 'number' ? value : parseInt(value, 10);
             if (isNaN(v) || v < 1 || v > 35535 || v % 1 > 0)
                 throw Object.assign(new TypeError('Invalid port'), {
                     hostname: v,
                     code: 'ERR_INVALID_URL'
                 });
-            this[kContext].port = value;
+            this[kContext].port = String(v);
         }
         else
             this[kContext].port = '';
-        this._changed();
     }
     get prefix() {
         return this[kContext].prefix;
@@ -129,10 +135,10 @@ class OpraURL {
         }
         else
             this[kContext].prefix = '';
-        this._changed();
+        this[kContext].address = undefined;
     }
     get protocol() {
-        return this[kContext].protocol || 'http:';
+        return this[kContext].protocol;
     }
     set protocol(v) {
         if (v) {
@@ -145,14 +151,14 @@ class OpraURL {
         }
         else
             this[kContext].protocol = '';
-        this._changed();
+        this[kContext].address = undefined;
     }
     get username() {
         return this[kContext].username;
     }
     set username(v) {
-        this[kContext].username = v || '';
-        this._changed();
+        this[kContext].username = v ?? '';
+        this[kContext].address = undefined;
     }
     get origin() {
         return this.hostname ? (this.protocol + '//' + this.hostname) : '';
@@ -161,29 +167,35 @@ class OpraURL {
         return this[kPath];
     }
     get pathname() {
-        this._update();
-        return this[kContext].pathname || '';
+        if (this[kContext].pathname == null)
+            this[kContext].pathname = '/' + this[kPath].toString();
+        return this[kContext].pathname;
     }
     set pathname(v) {
         this._setPathname(v, false);
     }
-    get searchParams() {
-        return this[kSearchParams];
-    }
     get hash() {
-        return this[kContext].hash || '';
+        return this[kContext].hash;
     }
     set hash(v) {
         this[kContext].hash = v ? (v.startsWith('#') ? v : '#' + v) : '';
-        this._changed();
     }
     get search() {
-        this._update();
-        return this[kContext].search || '';
+        if (this[kContext].search == null) {
+            const s = this[kParams].toString();
+            this[kContext].search = s ? ('?' + s) : '';
+        }
+        return this[kContext].search;
     }
     set search(v) {
-        this.searchParams.clear();
-        this.searchParams.appendAll(v);
+        if (v) {
+            this[kParams].clear();
+            this[kParams].appendAll(v);
+        }
+        this[kContext].search = undefined;
+    }
+    get searchParams() {
+        return this[kParams];
     }
     parse(input) {
         const m = urlRegEx.exec(input);
@@ -216,60 +228,18 @@ class OpraURL {
         this.hash = tokenizer.join('#');
         tokenizer = (0, fast_tokenizer_1.tokenize)(input, { delimiters: '?', quotes: true, brackets: true });
         this._setPathname(tokenizer.next() || '', isAbsolute);
-        this.searchParams.clear();
-        this.searchParams.appendAll(tokenizer.join('&'));
-        this._changed();
+        this.search = tokenizer.join('&');
     }
     join(...source) {
         this.path.join(...source);
         return this;
     }
-    addParam(name, value) {
-        this.searchParams.append(name, value);
-        return this;
-    }
-    setParam(name, value) {
-        this.searchParams.set(name, value);
-        return this;
-    }
-    setHost(v) {
-        this.host = v;
-        return this;
-    }
-    setHostname(v) {
-        this.hostname = v;
-        return this;
-    }
-    setProtocol(v) {
-        this.protocol = v;
-        return this;
-    }
-    setPort(v) {
-        this.port = v ? String(v) : '';
-        return this;
-    }
-    setPrefix(v) {
-        this.prefix = v;
-        return this;
-    }
-    setPathname(v) {
-        this.pathname = v;
-        return this;
-    }
-    setHash(v) {
-        this.hash = v;
-        return this;
-    }
-    setSearch(v) {
-        this.search = v;
-        return this;
-    }
     toString() {
         return this.href;
     }
     /* istanbul ignore next */
     [(_a = kContext, nodeInspectCustom)]() {
-        this._update();
+        // this._update();
         return {
             protocol: this.protocol,
             username: this.username,
@@ -281,29 +251,32 @@ class OpraURL {
             path: this.path,
             pathname: this.pathname,
             search: this.search,
-            searchParams: this.searchParams,
             hash: this.hash,
         };
     }
-    _update() {
-        if (!this[kContext].needUpdate)
-            return;
-        const ctx = this[kContext];
-        ctx.needUpdate = false;
-        let s = this.path.toString();
-        ctx.pathname = s ? '/' + s : '';
-        s = this.searchParams.toString();
-        ctx.search = s ? '?' + s : '';
-        let address = '';
-        if (ctx.hostname) {
-            address += (ctx.protocol || 'http:') + '//' +
-                (ctx.username || ctx.password
-                    ? ((ctx.username ? encodeURIComponent(ctx.username) : '') +
-                        (ctx.password ? ':' + encodeURIComponent(ctx.password) : '') + '@')
-                    : '') + this.host;
-        }
-        ctx.address = address + ctx.prefix + ctx.pathname;
-    }
+    //
+    // protected _update() {
+    //   if (!this[kContext].needUpdate)
+    //     return;
+    //   const ctx = this[kContext];
+    //   ctx.needUpdate = false;
+    //   let s = this.path.toString();
+    //   ctx.pathname = s ? '/' + s : '';
+    //   s = this.searchParams.toString();
+    //   ctx.search = s ? '?' + s : '';
+    //
+    //   let address = '';
+    //   if (ctx.hostname) {
+    //     address += (ctx.protocol || 'http:') + '//' +
+    //         (ctx.username || ctx.password
+    //             ? (
+    //                 (ctx.username ? encodeURIComponent(ctx.username) : '') +
+    //                 (ctx.password ? ':' + encodeURIComponent(ctx.password) : '') + '@'
+    //             )
+    //             : '') + this.host;
+    //   }
+    //   ctx.address = address + ctx.prefix + ctx.pathname;
+    // }
     _setPathname(v, trimPrefix) {
         this.path.clear();
         if (!v)
@@ -322,16 +295,12 @@ class OpraURL {
             }
         }
         for (const x of pathTokenizer) {
-            const p = (0, path_utils_js_1.decodePathComponent)(x);
+            const p = (0, decode_path_component_js_1.decodePathComponent)(x);
             this.path.join(p);
         }
-        this._changed();
-    }
-    _changed() {
-        this[kContext].needUpdate = true;
     }
 }
 exports.OpraURL = OpraURL;
 OpraURL.kContext = kContext;
 OpraURL.kPath = kPath;
-OpraURL.kSearchParams = kSearchParams;
+OpraURL.kParams = kParams;

package/cjs/url/utils/{path-utils.js → decode-path-component.js}

@@ -1,30 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodePathComponent = exports.decodePathComponent = exports.joinPath = exports.normalizePath = void 0;
-const tslib_1 = require("tslib");
+exports.decodePathComponent = void 0;
 const fast_tokenizer_1 = require("fast-tokenizer");
-const putil_isplainobject_1 = tslib_1.__importDefault(require("putil-isplainobject"));
-function normalizePath(p, noLeadingSlash) {
-    if (!p)
-        return '';
-    while (noLeadingSlash && p.startsWith('/'))
-        p = p.substring(1);
-    while (p.endsWith('/'))
-        p = p.substring(0, p.length - 1);
-    return p;
-}
-exports.normalizePath = normalizePath;
-function joinPath(...p) {
-    const out = [];
-    let s;
-    for (let i = 0, l = p.length; i < l; i++) {
-        s = normalizePath(p[i], i > 0);
-        if (s)
-            out.push(s);
-    }
-    return out.join('/');
-}
-exports.joinPath = joinPath;
 const pathComponentRegEx = /^([^/?#:@]+)(?:@([^/?#:]*))?(?:::(.*))?$/;
 function decodePathComponent(input) {
     const m = pathComponentRegEx.exec(input);
@@ -62,25 +39,3 @@ function decodePathComponent(input) {
     return { resource, key };
 }
 exports.decodePathComponent = decodePathComponent;
-function encodePathComponent(resource, key, typeCast) {
-    if (resource == null)
-        return '';
-    let keyString = '';
-    if (key !== '' && key != null) {
-        if ((0, putil_isplainobject_1.default)(key)) {
-            const arr = [];
-            for (const k of Object.keys(key)) {
-                arr.push(encodeURIComponent(k) + '=' + encodeURIComponent(key[k]));
-            }
-            keyString = arr.join(';');
-        }
-        else
-            keyString = encodeURIComponent('' + key);
-    }
-    if (typeCast)
-        typeCast = encodeURIComponent(typeCast);
-    return encodeURIComponent(resource).replace(/%24/, '$') +
-        (keyString ? '@' + keyString : '') +
-        (typeCast ? '::' + typeCast : '');
-}
-exports.encodePathComponent = encodePathComponent;

package/cjs/url/utils/encode-path-component.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodePathComponent = void 0;
+const tslib_1 = require("tslib");
+const putil_isplainobject_1 = tslib_1.__importDefault(require("putil-isplainobject"));
+function encodePathComponent(resource, key, typeCast) {
+    if (resource == null)
+        return '';
+    let keyString = '';
+    if (key !== '' && key != null) {
+        if ((0, putil_isplainobject_1.default)(key)) {
+            const arr = [];
+            for (const k of Object.keys(key)) {
+                arr.push(encodeURIComponent(k) + '=' + encodeURIComponent(key[k]));
+            }
+            keyString = arr.join(';');
+        }
+        else
+            keyString = encodeURIComponent('' + key);
+    }
+    if (typeCast)
+        typeCast = encodeURIComponent(typeCast);
+    return encodeURIComponent(resource).replace(/%24/, '$') +
+        (keyString ? '@' + keyString : '') +
+        (typeCast ? '::' + typeCast : '');
+}
+exports.encodePathComponent = encodePathComponent;

package/cjs/utils/path-utils.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.joinPath = exports.normalizePath = void 0;
+function normalizePath(p, noLeadingSlash) {
+    if (!p)
+        return '';
+    while (noLeadingSlash && p.startsWith('/'))
+        p = p.substring(1);
+    while (p.endsWith('/'))
+        p = p.substring(0, p.length - 1);
+    return p;
+}
+exports.normalizePath = normalizePath;
+function joinPath(...p) {
+    const out = [];
+    let s;
+    for (let i = 0, l = p.length; i < l; i++) {
+        s = normalizePath(p[i], i > 0);
+        if (s)
+            out.push(s);
+    }
+    return out.join('/');
+}
+exports.joinPath = joinPath;