@opra/common 0.21.0 → 0.23.0

package/cjs/{url → http}/opra-url.js

@@ -3,48 +3,37 @@ 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 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;
 const hostRegEx = /^([^/:]+)(?::(\d+))?$/;
 const hostnameRegEx = /^([^/:]+)$/;
-const kContext = Symbol('kContext');
-const kPath = Symbol('kPath');
-const kParams = Symbol('kParams');
+const kContext = Symbol.for('kContext');
+const kPath = Symbol.for('kPath');
+const kSearchParams = Symbol.for('kSearchParams');
 class OpraURL {
     constructor(input, base) {
         this[_a] = {
             protocol: '',
             username: '',
-            prefix: '',
             hostname: '',
             port: '',
             hash: '',
             password: ''
         };
-        this[kPath] = new opra_url_path_js_1.OpraURLPath('', {
-            onChange: () => {
-                this[kContext].pathname = undefined;
-                this[kContext].address = undefined;
-            }
-        });
-        this[kParams] = new index_js_1.HttpParams('', {
-            onChange: () => {
-                this[kContext].search = undefined;
-            }
-        });
+        this[kSearchParams] = new URLSearchParams();
+        this[kPath] = new opra_url_path_js_1.OpraURLPath();
         if (input)
-            this.parse(typeof input === 'object' ? input.toString() : input);
-        if (base) {
+            this._parse(String(input));
+        if (base && !this.host) {
             const baseUrl = base instanceof OpraURL ? base : new OpraURL(base);
             this[kContext].protocol = baseUrl.protocol;
             this[kContext].hostname = baseUrl.hostname;
+            this[kContext].username = baseUrl.username;
+            this[kContext].password = baseUrl.password;
             this[kContext].port = baseUrl.port;
-            this[kContext].prefix = baseUrl.pathname;
+            this.path = opra_url_path_js_1.OpraURLPath.join(baseUrl.path, this.path);
         }
     }
     get address() {
@@ -58,7 +47,6 @@ class OpraURL {
                         : '') + this.host;
             }
             this[kContext].address = address +
-                (this.prefix !== '/' ? this.prefix : '') +
                 (this.pathname !== '/' ? this.pathname : '');
         }
         return this[kContext].address;
@@ -96,7 +84,7 @@ class OpraURL {
         }
         else
             this[kContext].hostname = '';
-        this[kContext].address = undefined;
+        this.invalidate();
     }
     get href() {
         return this.address + this.search + this.hash;
@@ -106,7 +94,7 @@ class OpraURL {
     }
     set password(v) {
         this[kContext].password = v ?? '';
-        this[kContext].address = undefined;
+        this.invalidate();
     }
     get port() {
         return this[kContext].port;
@@ -115,8 +103,8 @@ class OpraURL {
         if (value) {
             // noinspection SuspiciousTypeOfGuard
             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'), {
+            if (isNaN(v) || v < 1 || v > 65535 || v % 1 > 0)
+                throw Object.assign(new TypeError(`Invalid port number (${value})`), {
                     hostname: v,
                     code: 'ERR_INVALID_URL'
                 });
@@ -124,18 +112,7 @@ class OpraURL {
         }
         else
             this[kContext].port = '';
-    }
-    get prefix() {
-        return this[kContext].prefix;
-    }
-    set prefix(value) {
-        if (value) {
-            const url = new OpraURL(value);
-            this[kContext].prefix = url.pathname;
-        }
-        else
-            this[kContext].prefix = '';
-        this[kContext].address = undefined;
+        this.invalidate();
     }
     get protocol() {
         return this[kContext].protocol;
@@ -151,14 +128,14 @@ class OpraURL {
         }
         else
             this[kContext].protocol = '';
-        this[kContext].address = undefined;
+        this.invalidate();
     }
     get username() {
         return this[kContext].username;
     }
     set username(v) {
         this[kContext].username = v ?? '';
-        this[kContext].address = undefined;
+        this.invalidate();
     }
     get origin() {
         return this.hostname ? (this.protocol + '//' + this.hostname) : '';
@@ -166,13 +143,20 @@ class OpraURL {
     get path() {
         return this[kPath];
     }
+    set path(path) {
+        // noinspection SuspiciousTypeOfGuard
+        this[kPath] = path instanceof opra_url_path_js_1.OpraURLPath ? path : new opra_url_path_js_1.OpraURLPath(path);
+        this[kContext].pathname = String(this[kPath]);
+        this.invalidate();
+    }
     get pathname() {
         if (this[kContext].pathname == null)
-            this[kContext].pathname = '/' + this[kPath].toString();
+            this[kContext].pathname = this.path.toString() || '/';
         return this[kContext].pathname;
     }
     set pathname(v) {
-        this._setPathname(v, false);
+        this[kPath] = new opra_url_path_js_1.OpraURLPath(v);
+        this.invalidate();
     }
     get hash() {
         return this[kContext].hash;
@@ -181,23 +165,36 @@ class OpraURL {
         this[kContext].hash = v ? (v.startsWith('#') ? v : '#' + v) : '';
     }
     get search() {
-        if (this[kContext].search == null) {
-            const s = this[kParams].toString();
-            this[kContext].search = s ? ('?' + s) : '';
-        }
-        return this[kContext].search;
+        const s = this[kSearchParams].toString();
+        return s ? '?' + s : '';
     }
     set search(v) {
-        if (v) {
-            this[kParams].clear();
-            this[kParams].appendAll(v);
-        }
-        this[kContext].search = undefined;
+        this[kSearchParams] = new URLSearchParams(v);
     }
     get searchParams() {
-        return this[kParams];
+        return this[kSearchParams];
+    }
+    set setSearchParams(v) {
+        this[kSearchParams] = v;
+    }
+    invalidate() {
+        this[kContext].address = undefined;
+        this[kContext].pathname = undefined;
+    }
+    join(...items) {
+        this.path = this.path.join(...items);
+        this.invalidate();
+        return this;
+    }
+    resolve(...items) {
+        this.path = this.path.resolve(...items);
+        this.invalidate();
+        return this;
     }
-    parse(input) {
+    toString() {
+        return this.href;
+    }
+    _parse(input) {
         const m = urlRegEx.exec(input);
         if (!m)
             throw Object.assign(new TypeError('Invalid URL'), {
@@ -227,16 +224,9 @@ class OpraURL {
         input = tokenizer.next() || '';
         this.hash = tokenizer.join('#');
         tokenizer = (0, fast_tokenizer_1.tokenize)(input, { delimiters: '?', quotes: true, brackets: true });
-        this._setPathname(tokenizer.next() || '', isAbsolute);
+        this.path = new opra_url_path_js_1.OpraURLPath(tokenizer.next());
         this.search = tokenizer.join('&');
     }
-    join(...source) {
-        this.path.join(...source);
-        return this;
-    }
-    toString() {
-        return this.href;
-    }
     /* istanbul ignore next */
     [(_a = kContext, nodeInspectCustom)]() {
         // this._update();
@@ -247,60 +237,14 @@ class OpraURL {
             host: this.host,
             hostname: this.hostname,
             origin: this.origin,
-            pathPrefix: this.prefix,
             path: this.path,
             pathname: this.pathname,
             search: this.search,
             hash: this.hash,
         };
     }
-    //
-    // 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)
-            return;
-        const pathTokenizer = (0, fast_tokenizer_1.tokenize)((0, path_utils_js_1.normalizePath)(v, true), {
-            delimiters: '/', quotes: true, brackets: true,
-        });
-        if (trimPrefix && this.prefix) {
-            const prefixTokenizer = (0, fast_tokenizer_1.tokenize)((0, path_utils_js_1.normalizePath)(this.prefix, true), {
-                delimiters: '/', quotes: true, brackets: true,
-            });
-            for (const a of prefixTokenizer) {
-                const b = pathTokenizer.next();
-                if (a !== b)
-                    throw Object.assign(new Error('Invalid URL path. pathPrefix does not match'), { path: v, code: 'ERR_INVALID_URL_PATH' });
-            }
-        }
-        for (const x of pathTokenizer) {
-            const p = (0, decode_path_component_js_1.decodePathComponent)(x);
-            this.path.join(p);
-        }
-    }
 }
 exports.OpraURL = OpraURL;
 OpraURL.kContext = kContext;
 OpraURL.kPath = kPath;
-OpraURL.kParams = kParams;
+OpraURL.kParams = kSearchParams;

package/cjs/i18n/i18n.js

@@ -58,7 +58,7 @@ class I18n extends exports.BaseI18n {
     }
     async loadResourceBundle(lang, ns, filePath, deep, overwrite) {
         let obj;
-        if ((0, index_js_1.isUrl)(filePath)) {
+        if ((0, index_js_1.isUrlString)(filePath)) {
             obj = (await fetch(filePath, { headers: { accept: 'application/json' } })).json();
         }
         else {
@@ -126,9 +126,9 @@ class I18n extends exports.BaseI18n {
                         keys.push(token2);
                     }
                     const k = keys.length > 1 ? '$t(' + keys.join(',') + ')' : keys[0];
-                    s += fallback
+                    s += (fallback
                         ? this.t(k, fallback, { ...options, ...opts })
-                        : this.t(k, { ...options, ...opts });
+                        : this.t(k, { ...options, ...opts }));
                     continue;
                 }
                 s += token;

package/cjs/index.js

@@ -10,7 +10,5 @@ tslib_1.__exportStar(require("./helpers/index.js"), exports);
 tslib_1.__exportStar(require("./http/index.js"), exports);
 tslib_1.__exportStar(require("./i18n/index.js"), exports);
 tslib_1.__exportStar(require("./schema/index.js"), exports);
-tslib_1.__exportStar(require("./url/index.js"), exports);
-tslib_1.__exportStar(require("./utils/path-utils.js"), exports);
 var uid_1 = require("uid");
 Object.defineProperty(exports, "uid", { enumerable: true, get: function () { return uid_1.uid; } });

package/cjs/schema/opra-schema.ns.js

@@ -10,7 +10,7 @@ tslib_1.__exportStar(require("./data-type/mapped-type.interface.js"), exports);
 tslib_1.__exportStar(require("./data-type/union-type.interface.js"), exports);
 tslib_1.__exportStar(require("./resource/collection.interface.js"), exports);
 tslib_1.__exportStar(require("./resource/container.interface.js"), exports);
-tslib_1.__exportStar(require("./resource/endpoint.interface.js"), exports);
+tslib_1.__exportStar(require("./resource/operation.interface.js"), exports);
 tslib_1.__exportStar(require("./resource/resource.interface.js"), exports);
 tslib_1.__exportStar(require("./resource/singleton.interface.js"), exports);
 tslib_1.__exportStar(require("./resource/storage.interface.js"), exports);

package/cjs/schema/resource/operation.interface.js

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

package/esm/document/api-document.js

@@ -1,5 +1,5 @@
-import { NotAcceptableError, NotFoundError } from '../exception/index.js';
-import { cloneObject, omitUndefined, ResponsiveMap } from '../helpers/index.js';
+import { NotAcceptableError, NotFoundError, ResourceNotFoundError } from '../exception/index.js';
+import { cloneObject, ResponsiveMap } from '../helpers/index.js';
 import { OpraSchema } from '../schema/index.js';
 import { NAMESPACE_PATTERN } from './constants.js';
 import { ComplexType } from './data-type/complex-type.js';
@@ -32,7 +32,7 @@ export class ApiDocument {
      */
     getDataType(arg0, silent) {
         let dataType;
-        const name = typeof arg0 === 'function' ? arg0.name : arg0;
+        const name = typeof arg0 === 'function' ? arg0.name : String(arg0);
         // Try to get instance from cache
         const t = typeof arg0 === 'string'
             ? this._typeCache.get(arg0)
@@ -164,7 +164,7 @@ export class ApiDocument {
         }
         if (silent)
             return;
-        throw new NotFoundError(`Resource not found (${path})`);
+        throw new ResourceNotFoundError(path);
     }
     getCollection(path, silent) {
         const t = this.getResource(path);
@@ -193,7 +193,9 @@ export class ApiDocument {
     /**
      * Export as Opra schema definition object
      */
-    exportSchema() {
+    exportSchema(options) {
+        if (this._metadataCache)
+            return cloneObject(this._metadataCache, options?.webSafe);
         const schema = {
             version: OpraSchema.SpecVersion,
             url: this.url,
@@ -223,9 +225,11 @@ export class ApiDocument {
                 types[name] = r.exportSchema();
             }
         }
-        return omitUndefined(schema);
+        this._metadataCache = schema;
+        return this._metadataCache;
     }
     invalidate() {
+        this._metadataCache = undefined;
         this._typeCache.clear();
         this._typesCacheByCtor.clear();
     }

package/esm/document/data-type/api-field.js

@@ -67,14 +67,14 @@ export const ApiField = function (...args) {
 };
 const proto = {
     exportSchema() {
-        return {
+        return omitUndefined({
             type: this.type.name ? this.type.name : this.type.exportSchema(),
             description: this.description,
             isArray: this.isArray,
             default: this.default,
             fixed: this.fixed,
             required: this.required
-        };
+        });
     }
 };
 Object.assign(ApiField.prototype, proto);

package/esm/document/data-type/complex-type.js

@@ -1,8 +1,8 @@
 import 'reflect-metadata';
 import omit from 'lodash.omit';
 import merge from 'putil-merge';
-import * as vg from 'valgen';
 import { omitUndefined, ResponsiveMap } from '../../helpers/index.js';
+import { translate } from '../../i18n/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { METADATA_KEY, TYPENAME_PATTERN } from '../constants.js';
 import { ApiField } from './api-field.js';
@@ -15,7 +15,7 @@ class ComplexTypeClass extends DataType {
         super(document, init);
         this.kind = OpraSchema.ComplexType.Kind;
         const own = this.own = {};
-        own.ctor = init?.ctor;
+        own.ctor = init?.ctor || init?.base?.ctor;
         own.abstract = init?.abstract;
         own.additionalFields = init?.additionalFields;
         own.fields = new ResponsiveMap();
@@ -28,8 +28,6 @@ class ComplexTypeClass extends DataType {
         if (this.base) {
             if (this.additionalFields == null)
                 this.additionalFields = this.base.additionalFields;
-            if (own.ctor == null && this.base instanceof ComplexType)
-                this.ctor = this.base.ctor;
             if (this.base.fields)
                 for (const [k, el] of this.base.fields.entries()) {
                     const newEl = new ApiField(this, el);
@@ -65,7 +63,7 @@ class ComplexTypeClass extends DataType {
         else
             field = this.fields.get(nameOrPath);
         if (!field)
-            throw new Error(`Unknown field "${nameOrPath}"`);
+            throw new Error(translate('error:UNKNOWN_FIELD', { field: nameOrPath }));
         return field;
     }
     iteratePath(path, silent) {
@@ -99,7 +97,7 @@ class ComplexTypeClass extends DataType {
                         if (dataType && !dataType.additionalFields) {
                             if (silent)
                                 return { done: true, value: [] };
-                            throw new Error(`Unknown or Invalid field (${curPath})`);
+                            throw new Error(translate('error:UNKNOWN_FIELD', { field: curPath }));
                         }
                     }
                 }
@@ -111,13 +109,15 @@ class ComplexTypeClass extends DataType {
         };
     }
     normalizeFieldPath(fieldPaths) {
-        if (Array.isArray(fieldPaths))
-            return fieldPaths.map((s) => this.normalizeFieldPath(s));
-        let curPath = '';
-        for (const [, , p] of this.iteratePath(fieldPaths)) {
-            curPath = p;
-        }
-        return curPath;
+        const array = (Array.isArray(fieldPaths) ? fieldPaths : [fieldPaths])
+            .map(s => {
+            let curPath = '';
+            for (const [, , p] of this.iteratePath(s)) {
+                curPath = p;
+            }
+            return curPath;
+        }).flat();
+        return array.length ? array : undefined;
     }
     exportSchema() {
         const out = super.exportSchema();
@@ -147,52 +147,6 @@ class ComplexTypeClass extends DataType {
         }
         return false;
     }
-    decode(v) {
-        return this._getDecoder()(v, { coerce: true });
-    }
-    encode(v) {
-        return this._getEncoder()(v, { coerce: true });
-    }
-    validate(v) {
-        return this._getEncoder()(v);
-    }
-    _getDecoder() {
-        if (this._decoder)
-            return this._decoder;
-        const schema = {};
-        for (const f of this.fields.values()) {
-            let t = f.type._getDecoder();
-            if (f.isArray)
-                t = vg.isArray(t);
-            schema[f.name] = f.required ? vg.required(t) : vg.optional(t);
-        }
-        this._decoder = vg.isObject(schema, {
-            ctor: this.ctor,
-            additionalFields: this.additionalFields ?? 'ignore',
-            name: this.name,
-            caseInSensitive: true,
-        });
-        return this._decoder;
-    }
-    _getEncoder() {
-        if (this._encoder)
-            return this._encoder;
-        const schema = {};
-        for (const f of this.fields.values()) {
-            let t = f.type._getEncoder();
-            if (f.isArray)
-                t = vg.isArray(t);
-            schema[f.name] = t;
-        }
-        this._encoder = vg.isObject(schema, {
-            ctor: this.ctor,
-            additionalFields: this.additionalFields,
-            name: this.name,
-            caseInSensitive: true,
-            detectCircular: true
-        });
-        return this._encoder;
-    }
 }
 /**
  * @class ComplexType

package/esm/document/data-type/data-type.js

@@ -8,15 +8,6 @@ export class DataType {
         this.description = init?.description;
         this.isAnonymous = !this.name;
     }
-    decode(v) {
-        return this._getDecoder()(v, { coerce: true });
-    }
-    encode(v) {
-        return this._getEncoder()(v, { coerce: true });
-    }
-    validate(v) {
-        return this._getEncoder()(v);
-    }
     exportSchema() {
         return omitUndefined({
             kind: this.kind,

package/esm/document/data-type/enum-type.js

@@ -15,6 +15,8 @@ class EnumTypeClass extends DataType {
         this.ownMeanings = init.meanings || {};
         this.values = { ...this.base?.values, ...this.ownValues };
         this.meanings = { ...this.base?.meanings, ...this.ownMeanings };
+        this.decode = vg.isEnum(Object.values(this.values));
+        this.encode = vg.isEnum(Object.values(this.values));
     }
     exportSchema() {
         const out = DataType.prototype.exportSchema.call(this);
@@ -26,14 +28,6 @@ class EnumTypeClass extends DataType {
         }));
         return out;
     }
-    _getDecoder() {
-        if (!this._decoder)
-            this._decoder = vg.isEnum(Object.values(this.values), { enumName: this.name });
-        return this._decoder;
-    }
-    _getEncoder() {
-        return this._getDecoder();
-    }
 }
 /**
  * @class EnumType

package/esm/document/data-type/mapped-type.js

@@ -1,6 +1,5 @@
 import 'reflect-metadata';
 import merge from 'putil-merge';
-import * as vg from 'valgen';
 import { inheritPropertyInitializers, mergePrototype, omitUndefined, ResponsiveMap } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { METADATA_KEY } from '../constants.js';
@@ -33,41 +32,6 @@ class MappedTypeClass extends DataType {
         }));
         return out;
     }
-    _getDecoder() {
-        if (this._decoder)
-            return this._decoder;
-        const schema = {};
-        for (const f of this.fields.values()) {
-            let t = f.type.getDecoder();
-            if (f.isArray)
-                t = vg.isArray(t);
-            schema[f.name] = t;
-        }
-        this._decoder = vg.isObject(schema, {
-            additionalFields: this.additionalFields,
-            name: this.name,
-            caseInSensitive: true
-        });
-        return this._decoder;
-    }
-    _getEncoder() {
-        if (this._encoder)
-            return this._encoder;
-        const schema = {};
-        for (const f of this.fields.values()) {
-            let t = f.type.getEncoder();
-            if (f.isArray)
-                t = vg.isArray(t);
-            schema[f.name] = t;
-        }
-        this._encoder = vg.isObject(schema, {
-            additionalFields: this.additionalFields,
-            name: this.name,
-            caseInSensitive: true,
-            detectCircular: true
-        });
-        return this._encoder;
-    }
 }
 /**
  * @class MappedType

package/esm/document/data-type/simple-type.js

@@ -13,14 +13,8 @@ class SimpleTypeClass extends DataType {
         super(document, init);
         this.kind = OpraSchema.SimpleType.Kind;
         this.base = init.base;
-        this._decoder = init.decoder || init.base?._decoder || vg.isAny();
-        this._encoder = init.encoder || init.base?._encoder || vg.isAny();
-    }
-    _getDecoder() {
-        return this._decoder;
-    }
-    _getEncoder() {
-        return this._encoder;
+        this.decode = init.decoder || init.base?.decode || vg.isAny();
+        this.encode = init.encoder || init.base?.encode || vg.isAny();
     }
     exportSchema() {
         // noinspection UnnecessaryLocalVariableJS

package/esm/document/data-type/union-type.js

@@ -1,6 +1,5 @@
 import 'reflect-metadata';
 import merge from 'putil-merge';
-import * as vg from 'valgen';
 import { inheritPropertyInitializers, mergePrototype, omitUndefined, ResponsiveMap } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { METADATA_KEY } from '../constants.js';
@@ -32,41 +31,6 @@ class UnionTypeClass extends DataType {
         }));
         return out;
     }
-    _getDecoder() {
-        if (this._decoder)
-            return this._decoder;
-        const schema = {};
-        for (const f of this.fields.values()) {
-            let t = f.type.getDecoder();
-            if (f.isArray)
-                t = vg.isArray(t);
-            schema[f.name] = t;
-        }
-        this._decoder = vg.isObject(schema, {
-            additionalFields: this.additionalFields,
-            name: this.name,
-            caseInSensitive: true
-        });
-        return this._decoder;
-    }
-    _getEncoder() {
-        if (this._encoder)
-            return this._encoder;
-        const schema = {};
-        for (const f of this.fields.values()) {
-            let t = f.type.getEncoder();
-            if (f.isArray)
-                t = vg.isArray(t);
-            schema[f.name] = t;
-        }
-        this._encoder = vg.isObject(schema, {
-            additionalFields: this.additionalFields,
-            name: this.name,
-            caseInSensitive: true,
-            detectCircular: true
-        });
-        return this._encoder;
-    }
 }
 /**
  * @class UnionType

package/esm/document/index.js

@@ -13,3 +13,5 @@ export * from './resource/resource.js';
 export * from './resource/collection.js';
 export * from './resource/singleton.js';
 export * from './resource/storage.js';
+export * from './interfaces/collection-resource.interface.js';
+export * from './interfaces/singleton-resource.interface.js';