@opra/common 1.0.0-alpha.6 → 1.0.0-alpha.8

package/esm/document/data-type/extended-types/filter.type.js

@@ -53,24 +53,22 @@ FilterType = __decorate([
     __metadata("design:paramtypes", [Object])
 ], FilterType);
 export { FilterType };
-const decodeFilter = (dataType, rules) => {
-    return validator('decodeFilter', function (input, context, _this) {
-        if (typeof input === 'string') {
-            try {
-                const filter = OpraFilter.parse(input);
-                if (rules)
-                    return rules.normalizeFilter(filter, dataType);
-                return filter;
-            }
-            catch (e) {
-                context.fail(_this, `Not a valid filter expression. ${e.message}`, input, e.errors);
-                return;
-            }
+const decodeFilter = (dataType, rules) => validator('decodeFilter', (input, context, _this) => {
+    if (typeof input === 'string') {
+        try {
+            const filter = OpraFilter.parse(input);
+            if (rules)
+                return rules.normalizeFilter(filter, dataType);
+            return filter;
         }
-        context.fail(_this, `Nt a valid filter expression string`, input);
-    });
-};
-const encodeFilter = validator('encodeFilter', function (input, context, _this) {
+        catch (e) {
+            context.fail(_this, `Not a valid filter expression. ${e.message}`, input, e.errors);
+            return;
+        }
+    }
+    context.fail(_this, `Nt a valid filter expression string`, input);
+});
+const encodeFilter = validator('encodeFilter', (input, context, _this) => {
     if (input instanceof OpraFilter.Ast) {
         return input.toString();
     }

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

@@ -19,22 +19,25 @@ export const MappedType = function (...args) {
     _this.kind = OpraSchema.MappedType.Kind;
     if (initArgs.base) {
         // noinspection SuspiciousTypeOfGuard
-        if (!(initArgs.base instanceof ComplexTypeBase))
+        if (!(initArgs.base instanceof ComplexTypeBase)) {
             throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${this.kind}"`);
+        }
         _this.base = initArgs.base;
         _this.ctor = initArgs.ctor || _this.base.ctor;
         if (initArgs.pick)
             _this.pick = initArgs.pick.map(f => _this.base.normalizeFieldPath(f));
         else if (initArgs.omit)
             _this.omit = initArgs.omit.map(f => _this.base.normalizeFieldPath(f));
-        else if (initArgs.partial)
+        else if (initArgs.partial) {
             _this.partial = Array.isArray(initArgs.partial)
                 ? initArgs.partial.map(f => _this.base.normalizeFieldPath(f))
                 : initArgs.partial;
-        else if (initArgs.required)
+        }
+        else if (initArgs.required) {
             _this.required = Array.isArray(initArgs.required)
                 ? initArgs.required.map(f => _this.base.normalizeFieldPath(f))
                 : initArgs.required;
+        }
         /** Copy fields from base */
         const isInheritedPredicate = getIsInheritedPredicateFn(_this.pick, _this.omit);
         const partial = Array.isArray(_this.partial) ? _this.partial.map(x => x.toLowerCase()) : _this.partial;
@@ -54,8 +57,9 @@ export const MappedType = function (...args) {
         }
         if (!_this.pick ||
             _this.base.additionalFields === false ||
-            (Array.isArray(_this.base.additionalFields) && _this.base.additionalFields?.[0] === 'error'))
+            (Array.isArray(_this.base.additionalFields) && _this.base.additionalFields?.[0] === 'error')) {
             _this.additionalFields = _this.base.additionalFields;
+        }
         if (initArgs.base.keyField && isInheritedPredicate(initArgs.base.keyField))
             _this.keyField = initArgs.base.keyField;
     }
@@ -88,4 +92,4 @@ class MappedTypeClass extends ComplexTypeBase {
     }
 }
 MappedType.prototype = MappedTypeClass.prototype;
-MappedType._applyMixin = () => void 0;
+MappedType._applyMixin = () => undefined;

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

@@ -97,8 +97,9 @@ function MixinTypeFactory(...args) {
         if (!(itemMeta &&
             (itemMeta.kind === OpraSchema.ComplexType.Kind ||
                 itemMeta.kind === OpraSchema.MixinType.Kind ||
-                itemMeta.kind === OpraSchema.MappedType.Kind)))
+                itemMeta.kind === OpraSchema.MappedType.Kind))) {
             throw new TypeError(`Class "${c.name}" is not a ${OpraSchema.ComplexType.Kind}, ${OpraSchema.MixinType.Kind} or ${OpraSchema.MappedType.Kind}`);
+        }
         metadata.types.push(c);
         mergePrototype(MixinClass.prototype, c.prototype);
     }

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

@@ -20,8 +20,9 @@ export const SimpleType = function (...args) {
     _this.kind = OpraSchema.SimpleType.Kind;
     if (initArgs.base) {
         // noinspection SuspiciousTypeOfGuard
-        if (!(initArgs.base instanceof SimpleType))
+        if (!(initArgs.base instanceof SimpleType)) {
             throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${this.kind}"`);
+        }
         _this.base = initArgs.base;
     }
     _this.properties = initArgs.properties;
@@ -67,15 +68,13 @@ class SimpleTypeClass extends DataType {
             }
             return isAny;
         }
-        else {
-            let t = this;
-            while (t) {
-                if (t._generateEncoder)
-                    return t._generateEncoder(prop, options?.documentElement || this.owner);
-                t = this.base;
-            }
-            return isAny;
+        let t = this;
+        while (t) {
+            if (t._generateEncoder)
+                return t._generateEncoder(prop, options?.documentElement || this.owner);
+            t = this.base;
         }
+        return isAny;
     }
     toJSON() {
         const attributes = omitUndefined(this.ownAttributes);

package/esm/document/data-type/utils/create-mapped-class.js

@@ -23,8 +23,9 @@ export function createMappedClass(source, config, options) {
             throw new TypeError(`Class "${source}" doesn't have datatype metadata information`);
         if (!(m.kind === OpraSchema.ComplexType.Kind ||
             m.kind === OpraSchema.MappedType.Kind ||
-            m.kind === OpraSchema.MixinType.Kind))
+            m.kind === OpraSchema.MixinType.Kind)) {
             throw new TypeError(`Class "${source}" is not a ${OpraSchema.ComplexType.Kind}`);
+        }
     }
     const metadata = {
         ...options,

package/esm/document/decorators/http-operation.decorator.js

@@ -33,8 +33,9 @@ export function HttpOperationDecoratorFactory(decoratorChain, options) {
                     type: arg1,
                 }
                 : { ...arg1, name, location: 'cookie' };
-            if (meta.parameters)
+            if (meta.parameters) {
                 meta.parameters = meta.parameters.filter(p => !(p.location === 'cookie' && String(p.name) === String(name)));
+            }
             else
                 meta.parameters = [];
             meta.parameters.push(paramMeta);
@@ -53,8 +54,9 @@ export function HttpOperationDecoratorFactory(decoratorChain, options) {
                     type: arg1,
                 }
                 : { ...arg1, name, location: 'header' };
-            if (meta.parameters)
+            if (meta.parameters) {
                 meta.parameters = meta.parameters.filter(p => !(p.location === 'header' && String(p.name) === String(name)));
+            }
             else
                 meta.parameters = [];
             meta.parameters.push(paramMeta);
@@ -73,8 +75,9 @@ export function HttpOperationDecoratorFactory(decoratorChain, options) {
                     type: arg1,
                 }
                 : { ...arg1, name, location: 'query' };
-            if (meta.parameters)
+            if (meta.parameters) {
                 meta.parameters = meta.parameters.filter(p => !(p.location === 'query' && String(p.name) === String(name)));
+            }
             else
                 meta.parameters = [];
             meta.parameters.push(paramMeta);
@@ -93,8 +96,9 @@ export function HttpOperationDecoratorFactory(decoratorChain, options) {
                     type: arg1,
                 }
                 : { ...arg1, name, location: 'path' };
-            if (meta.parameters)
+            if (meta.parameters) {
                 meta.parameters = meta.parameters.filter(p => !(p.location === 'path' && String(p.name) === String(name)));
+            }
             else
                 meta.parameters = [];
             meta.parameters.push(paramMeta);

package/esm/document/factory/api-document.factory.js

@@ -42,9 +42,7 @@ export class ApiDocumentFactory {
                 context.error.message = `(${l}) error${l > 1 ? 's' : ''} found in document schema.`;
                 if (context.showErrorDetails) {
                     context.error.message += context.error.details
-                        .map(d => {
-                        return `\n\n  - ${d.message}` + (d.path ? `\n    @${d.path}` : '');
-                    })
+                        .map(d => `\n\n  - ${d.message}` + (d.path ? `\n    @${d.path}` : ''))
                         .join('');
                 }
             }

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

@@ -92,10 +92,10 @@ export class DataTypeFactory {
                     thunk = await resolveThunk(thunk);
                     const metadata = Reflect.getMetadata(DATATYPE_METADATA, thunk) || thunk[DATATYPE_METADATA];
                     if (!(metadata && metadata.name)) {
-                        if (typeof thunk === 'function')
+                        if (typeof thunk === 'function') {
                             return context.addError(`Class "${thunk.name}" doesn't have a valid data type metadata`);
-                        else
-                            return context.addError(`Object doesn't have a valid data type metadata`);
+                        }
+                        return context.addError(`Object doesn't have a valid data type metadata`);
                     }
                     importQueue.set(metadata.name, thunk);
                 });
@@ -114,8 +114,9 @@ export class DataTypeFactory {
                 continue;
             const dt = await this._importDataTypeArgs(context, owner, name);
             // istanbul ignore next
-            if (dt && typeof dt !== 'string')
+            if (dt && typeof dt !== 'string') {
                 context.addError(`Embedded data type can't be loaded into document node directly`);
+            }
         }
         return Array.from(initArgsMap.values());
     }
@@ -179,8 +180,9 @@ export class DataTypeFactory {
                         const baseArgs = await this._importDataTypeArgs(context, owner, metadata.name);
                         if (!baseArgs)
                             return;
-                        if (typeof baseArgs === 'object' && baseArgs.kind !== OpraSchema.SimpleType.Kind)
+                        if (typeof baseArgs === 'object' && baseArgs.kind !== OpraSchema.SimpleType.Kind) {
                             return context.addError('Kind of base data type is not same');
+                        }
                         return {
                             kind: OpraSchema.SimpleType.Kind,
                             name: undefined,
@@ -216,8 +218,9 @@ export class DataTypeFactory {
                         out._instance = { name: metadata.name };
                         out[kDataTypeMap] = owner.node[kDataTypeMap];
                     }
-                    else
+                    else {
                         return context.addError(`Data Type (${out.name}) must be explicitly added to type list in the document scope`);
+                    }
                 }
                 switch (out.kind) {
                     case OpraSchema.ComplexType.Kind:
@@ -265,8 +268,9 @@ export class DataTypeFactory {
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
-                if (Reflect.hasMetadata(DATATYPE_METADATA, baseClass))
+                if (Reflect.hasMetadata(DATATYPE_METADATA, baseClass)) {
                     baseArgs = await this._importDataTypeArgs(context, owner, baseClass);
+                }
             }
             if (!baseArgs)
                 return;
@@ -275,14 +279,16 @@ export class DataTypeFactory {
         });
         // Initialize additionalFields
         if (metadata.additionalFields != null) {
-            if (typeof metadata.additionalFields === 'boolean' || Array.isArray(metadata.additionalFields))
+            if (typeof metadata.additionalFields === 'boolean' || Array.isArray(metadata.additionalFields)) {
                 initArgs.additionalFields = metadata.additionalFields;
-            else
+            }
+            else {
                 await context.enterAsync('.additionalFields', async () => {
                     const t = await this._importDataTypeArgs(context, owner, metadata.additionalFields);
                     if (t)
                         initArgs.additionalFields = preferName(t);
                 });
+            }
         }
         if (metadata.fields) {
             initArgs.fields = {};
@@ -290,8 +296,9 @@ export class DataTypeFactory {
                 for (const [k, v] of Object.entries(metadata.fields)) {
                     await context.enterAsync(`[${k}]`, async () => {
                         const fieldMeta = typeof v === 'string' ? { type: v } : v;
-                        if (fieldMeta.isArray && !fieldMeta.type)
+                        if (fieldMeta.isArray && !fieldMeta.type) {
                             return context.addError(`"type" must be defined explicitly for array fields`);
+                        }
                         const t = await this._importDataTypeArgs(context, owner, fieldMeta.type || 'any');
                         if (!t)
                             return;
@@ -325,8 +332,9 @@ export class DataTypeFactory {
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
-                if (Reflect.hasMetadata(DATATYPE_METADATA, baseClass))
+                if (Reflect.hasMetadata(DATATYPE_METADATA, baseClass)) {
                     baseArgs = await this._importDataTypeArgs(context, owner, baseClass);
+                }
             }
             if (!baseArgs)
                 return;
@@ -339,10 +347,12 @@ export class DataTypeFactory {
             initArgs.properties = new initArgs.ctor();
         if (metadata.attributes)
             initArgs.attributes = cloneObject(metadata.attributes);
-        if (typeof initArgs.properties?.[DECODER] === 'function')
+        if (typeof initArgs.properties?.[DECODER] === 'function') {
             initArgs.generateDecoder = initArgs.properties?.[DECODER].bind(initArgs.properties);
-        if (typeof initArgs.properties?.[ENCODER] === 'function')
+        }
+        if (typeof initArgs.properties?.[ENCODER] === 'function') {
             initArgs.generateEncoder = initArgs.properties?.[ENCODER].bind(initArgs.properties);
+        }
     }
     static async _prepareMappedTypeArgs(context, owner, initArgs, metadata) {
         await this._prepareDataTypeArgs(context, initArgs, metadata);
@@ -353,8 +363,9 @@ export class DataTypeFactory {
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
-                if (Reflect.hasMetadata(DATATYPE_METADATA, baseClass))
+                if (Reflect.hasMetadata(DATATYPE_METADATA, baseClass)) {
                     baseArgs = await this._importDataTypeArgs(context, owner, baseClass);
+                }
             }
             if (!baseArgs)
                 return;
@@ -365,10 +376,12 @@ export class DataTypeFactory {
             initArgs.pick = [...metadata.pick];
         else if (metadata.omit)
             initArgs.omit = [...metadata.omit];
-        else if (metadata.partial)
+        else if (metadata.partial) {
             initArgs.partial = Array.isArray(metadata.partial) ? [...metadata.partial] : metadata.partial;
-        else if (metadata.required)
+        }
+        else if (metadata.required) {
             initArgs.required = Array.isArray(metadata.required) ? [...metadata.required] : metadata.required;
+        }
     }
     static async _prepareMixinTypeArgs(context, owner, initArgs, metadata) {
         await this._prepareDataTypeArgs(context, initArgs, metadata);
@@ -410,6 +423,8 @@ export class DataTypeFactory {
                     return this._createMixinType(context, owner, initArgs);
                 case OpraSchema.SimpleType.Kind:
                     return this._createSimpleType(context, owner, initArgs);
+                default:
+                    break;
             }
         }
         context.addError(`Unknown data type (${String(args)})`);
@@ -426,8 +441,9 @@ export class DataTypeFactory {
         /** Set additionalFields */
         if (args.additionalFields) {
             context.enter('.additionalFields', () => {
-                if (typeof args.additionalFields === 'boolean' || Array.isArray(args.additionalFields))
+                if (typeof args.additionalFields === 'boolean' || Array.isArray(args.additionalFields)) {
                     initArgs.additionalFields = args.additionalFields;
+                }
                 else {
                     initArgs.additionalFields = this._createDataType(context, owner, args.additionalFields);
                 }
@@ -440,12 +456,13 @@ export class DataTypeFactory {
                 for (const [k, v] of Object.entries(args.fields)) {
                     context.enter(`[${k}]`, () => {
                         const type = this._createDataType(context, owner, v.type);
-                        if (type)
+                        if (type) {
                             initArgs.fields[k] = {
                                 ...v,
                                 name: k,
                                 type,
                             };
+                        }
                     });
                 }
             });
@@ -489,8 +506,9 @@ export class DataTypeFactory {
                 for (const t of args.types) {
                     context.enter(`[${i++}]`, () => {
                         const base = this._createDataType(context, owner, t);
-                        if (!(base instanceof ComplexTypeBase))
+                        if (!(base instanceof ComplexTypeBase)) {
                             throw new TypeError(`"${base?.kind}" can't be set as base for a "${initArgs.kind}"`);
+                        }
                         initArgs.types.push(base);
                     });
                 }

package/esm/document/factory/http-api.factory.js

@@ -21,6 +21,7 @@ export class HttpApiFactory {
      */
     static async createApi(context, document, init) {
         const api = new HttpApi(document);
+        api.name = init.name;
         api.description = init.description;
         api.url = init.url;
         if (init.controllers) {
@@ -44,8 +45,9 @@ export class HttpApiFactory {
         return api;
     }
     static async _createController(context, parent, thunk, name) {
-        if (typeof thunk === 'function' && !isConstructor(thunk))
+        if (typeof thunk === 'function' && !isConstructor(thunk)) {
             thunk = parent instanceof HttpController ? thunk(parent.instance) : thunk();
+        }
         thunk = await resolveThunk(thunk);
         let ctor;
         let metadata;

package/esm/document/http/http-controller.js

@@ -58,7 +58,7 @@ class HttpControllerClass extends DocumentElement {
                 if (c.controllers.size) {
                     controller = c.findController(arg0);
                     if (controller) {
-                        this._controllerReverseMap.set(arg0, c);
+                        this._controllerReverseMap.set(arg0, controller);
                         return controller;
                     }
                 }
@@ -92,8 +92,12 @@ class HttpControllerClass extends DocumentElement {
             if (prm.name instanceof RegExp && prm.name.test(paramName))
                 return prm;
         }
-        if (this.node.parent && this.node.parent.element instanceof HttpController)
+        if (this.node.parent && this.node.parent.element instanceof HttpController) {
             return this.node.parent.element.findParameter(paramName, location);
+        }
+    }
+    getFullUrl() {
+        return (this.owner instanceof HttpController ? this.owner.getFullUrl() : '/') + this.path;
     }
     /**
      *

package/esm/document/http/http-media-type.js

@@ -22,8 +22,9 @@ export const HttpMediaType = function (owner, initArgs) {
     _this.maxFileSize = initArgs.maxFileSize;
     _this.maxTotalFileSize = initArgs.maxTotalFileSize;
     _this.minFileSize = initArgs.minFileSize;
-    if (initArgs?.type)
+    if (initArgs?.type) {
         _this.type = initArgs?.type instanceof DataType ? initArgs.type : _this.owner.node.getDataType(initArgs.type);
+    }
     _this.isArray = initArgs.isArray;
 };
 /**
@@ -35,8 +36,9 @@ class HttpMediaTypeClass extends DocumentElement {
             return;
         for (const f of this.multipartFields) {
             if ((!fieldType || fieldType === f.fieldType) &&
-                ((f.fieldName instanceof RegExp && f.fieldName.test(fieldName)) || f.fieldName === fieldName))
+                ((f.fieldName instanceof RegExp && f.fieldName.test(fieldName)) || f.fieldName === fieldName)) {
                 return f;
+            }
         }
     }
     toJSON() {

package/esm/document/http/http-operation-response.js

@@ -16,8 +16,9 @@ export class HttpOperationResponse extends HttpMediaType {
         paramName = paramName.toLowerCase();
         for (const prm of this.parameters) {
             if ((!location || location === prm.location) &&
-                ((prm.name instanceof RegExp && prm.name.test(paramName)) || prm.name === paramName))
+                ((prm.name instanceof RegExp && prm.name.test(paramName)) || prm.name === paramName)) {
                 return prm;
+            }
         }
     }
     toJSON() {

package/esm/document/http/http-operation.js

@@ -1,3 +1,4 @@
+import nodePath from 'node:path';
 import { asMutable } from 'ts-gems';
 import { cloneObject, omitUndefined } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
@@ -50,6 +51,10 @@ class HttpOperationClass extends DocumentElement {
                 return prm;
         }
     }
+    getFullUrl() {
+        const out = this.owner.getFullUrl();
+        return out ? (this.path ? nodePath.posix.join(out, this.path) : out) : this.path || '/';
+    }
     toJSON() {
         const out = omitUndefined({
             kind: OpraSchema.HttpOperation.Kind,

package/esm/document/http/http-status-range.js

@@ -28,8 +28,7 @@ export class HttpStatusRange {
     toString() {
         if (this.start === this.end)
             return String(this.start);
-        else
-            return String(this.start) + '-' + String(this.end);
+        return String(this.start) + '-' + String(this.end);
     }
     toJSON() {
         return !this.end || this.start === this.end ? this.start : { start: this.start, end: this.end };

package/esm/document/index.js

@@ -2,36 +2,36 @@ import 'reflect-metadata';
 import * as DataTypeFactory_ from './factory/data-type.factory.js';
 import * as HttpApiFactory_ from './factory/http-api.factory.js';
 export * from './api-document.js';
-export * from './constants.js';
 export * from './common/api-base.js';
 export * from './common/data-type-map.js';
 export * from './common/document-element.js';
 export * from './common/document-init-context.js';
 export * from './common/document-node.js';
 export * from './common/opra-document-error.js';
+export * from './constants.js';
+export * from './data-type/api-field.js';
 export * from './data-type/complex-type.js';
 export * from './data-type/data-type.js';
 export * from './data-type/enum-type.js';
-export * from './data-type/api-field.js';
+export * from './data-type/extended-types/index.js';
 export * from './data-type/mapped-type.js';
 export * from './data-type/mixin-type.js';
 export * from './data-type/omit-type.js';
 export * from './data-type/partial-type.js';
 export * from './data-type/pick-type.js';
+export * from './data-type/primitive-types/index.js';
 export * from './data-type/required-type.js';
 export * from './data-type/simple-type.js';
-export * from './data-type/primitive-types/index.js';
-export * from './data-type/extended-types/index.js';
 export * from './decorators/http-operation-entity.decorator.js';
 export * from './factory/api-document.factory.js';
 export * from './http/http-api.js';
+export * from './http/http-controller.js';
 export * from './http/http-media-type.js';
 export * from './http/http-multipart-field.js';
 export * from './http/http-operation.js';
 export * from './http/http-operation-response.js';
 export * from './http/http-parameter.js';
 export * from './http/http-request-body.js';
-export * from './http/http-controller.js';
 export * from './http/http-status-range.js';
 export var classes;
 (function (classes) {

package/esm/exception/index.js

@@ -1,7 +1,4 @@
-export * from './opra-exception.js';
-export * from './opra-http-error.js';
 export * from './error-issue.js';
-export * from './issue-severity.enum.js';
 export * from './http-errors/bad-request.error.js';
 export * from './http-errors/conflict.error.js';
 export * from './http-errors/failed-dependency.error.js';
@@ -10,8 +7,11 @@ export * from './http-errors/internal-server.error.js';
 export * from './http-errors/method-not-allowed.error.js';
 export * from './http-errors/not-acceptable.error.js';
 export * from './http-errors/not-found.error.js';
-export * from './http-errors/unauthorized.error.js';
-export * from './http-errors/unprocessable-entity.error.js';
 export * from './http-errors/permission.error.js';
 export * from './http-errors/resource-conflict.error.js';
 export * from './http-errors/resource-not.available.error.js';
+export * from './http-errors/unauthorized.error.js';
+export * from './http-errors/unprocessable-entity.error.js';
+export * from './issue-severity.enum.js';
+export * from './opra-exception.js';
+export * from './opra-http-error.js';