@opra/common 1.0.0-alpha.2 → 1.0.0-alpha.21

package/esm/document/data-type/primitive-types/string.type.js

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { toString, vg } from 'valgen';
 import { DATATYPE_METADATA, DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -30,26 +30,35 @@ let StringType = class StringType {
 __decorate([
     SimpleType.Attribute({
         description: 'Regex pattern to be used for validation',
-    })
+    }),
+    __metadata("design:type", Object)
 ], StringType.prototype, "pattern", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Name of the pattern',
-    })
+    }),
+    __metadata("design:type", String)
 ], StringType.prototype, "patternName", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Minimum number of characters',
-    })
+    }),
+    __metadata("design:type", Number)
 ], StringType.prototype, "minLength", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Minimum number of characters',
-    })
+    }),
+    __metadata("design:type", Number)
 ], StringType.prototype, "maxLength", void 0);
 StringType = __decorate([
     SimpleType({
         description: 'A sequence of characters',
-    })
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }),
+    __metadata("design:paramtypes", [Object])
 ], StringType);
 export { StringType };

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

@@ -20,11 +20,14 @@ 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;
+    _this.ownNameMappings = { ...initArgs.nameMappings };
+    _this.nameMappings = { ..._this.base?.nameMappings, ...initArgs.nameMappings };
     _this.ownAttributes = cloneObject(initArgs.attributes || {});
     _this.attributes = _this.base ? cloneObject(_this.base.attributes) : {};
     if (_this.ownAttributes) {
@@ -43,6 +46,8 @@ export const SimpleType = function (...args) {
  */
 class SimpleTypeClass extends DataType {
     extendsFrom(baseType) {
+        if (!(baseType instanceof DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof SimpleType))
             return false;
         if (baseType === this)
@@ -63,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);
@@ -87,12 +90,15 @@ class SimpleTypeClass extends DataType {
             return o;
         }, {});
         const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : undefined;
-        return omitUndefined({
+        const out = omitUndefined({
             ...DataType.prototype.toJSON.apply(this),
             base: this.base ? (baseName ? baseName : this.base.toJSON()) : undefined,
             attributes: attributes && Object.keys(attributes).length ? attributes : undefined,
             properties: Object.keys(properties).length ? properties : undefined,
         });
+        if (Object.keys(this.ownNameMappings).length)
+            out.nameMappings = { ...this.ownNameMappings };
+        return out;
     }
 }
 SimpleType.prototype = SimpleTypeClass.prototype;

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-controller.decorator.js

@@ -98,6 +98,31 @@ export function HttpControllerDecoratorFactory(options) {
         });
         return decorator;
     };
+    /**
+     *
+     */
+    decorator.KeyParam = (name, arg1) => {
+        decoratorChain.push((meta) => {
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
+            const paramMeta = typeof arg1 === 'string' || typeof arg1 === 'function'
+                ? {
+                    name,
+                    location: 'path',
+                    type: arg1,
+                    keyParam: true,
+                }
+                : {
+                    ...arg1,
+                    name,
+                    location: 'path',
+                    keyParam: true,
+                };
+            meta.parameters = meta.parameters || [];
+            meta.parameters.push(paramMeta);
+        });
+        return decorator;
+    };
     /**
      *
      */

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

@@ -21,8 +21,8 @@ HttpOperation.Entity.Create = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'POST',
+        ...args,
         composition: 'Entity.Create',
         requestBody: {
             immediateFetch: true,
@@ -51,8 +51,6 @@ HttpOperation.Entity.Create = function (arg0, arg1) {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
         contentType: MimeTypes.opra_response_json,
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     decoratorChain.push((operationMeta) => {
         const compositionOptions = (operationMeta.compositionOptions = operationMeta.compositionOptions || {});
         compositionOptions.type = getDataTypeName(args.type);
@@ -72,8 +70,8 @@ HttpOperation.Entity.Delete = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'DELETE',
+        ...args,
         composition: 'Entity.Delete',
     }));
     decorator
@@ -85,17 +83,28 @@ HttpOperation.Entity.Delete = function (arg0, arg1) {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
         contentType: MimeTypes.opra_response_json,
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     /**
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };
@@ -121,8 +130,8 @@ HttpOperation.Entity.DeleteMany = function (arg0, arg1) {
     const filterType = new FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'DELETE',
+        ...args,
         composition: 'Entity.DeleteMany',
     }));
     decorator
@@ -138,8 +147,6 @@ HttpOperation.Entity.DeleteMany = function (arg0, arg1) {
         type: filterType,
         description: 'Determines filter fields',
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     decoratorChain.push((operationMeta) => {
         const compositionOptions = (operationMeta.compositionOptions = operationMeta.compositionOptions || {});
         compositionOptions.type = getDataTypeName(args.type);
@@ -169,8 +176,8 @@ HttpOperation.Entity.FindMany = function (arg0, arg1) {
     const filterType = new FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'GET',
+        ...args,
         composition: 'Entity.FindMany',
     }));
     decorator
@@ -219,8 +226,6 @@ HttpOperation.Entity.FindMany = function (arg0, arg1) {
         isArray: true,
         arraySeparator: ',',
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     decoratorChain.push((operationMeta) => {
         const compositionOptions = (operationMeta.compositionOptions = operationMeta.compositionOptions || {});
         compositionOptions.type = getDataTypeName(args.type);
@@ -261,8 +266,8 @@ HttpOperation.Entity.Get = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'GET',
+        ...args,
         composition: 'Entity.Get',
     }));
     decorator
@@ -288,17 +293,28 @@ HttpOperation.Entity.Get = function (arg0, arg1) {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
         contentType: MimeTypes.opra_response_json,
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     /**
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };
@@ -324,8 +340,8 @@ HttpOperation.Entity.UpdateMany = function (arg0, arg1) {
     filterType.rules = {};
     const filterRules = new FilterRules();
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'PATCH',
+        ...args,
         composition: 'Entity.UpdateMany',
         requestBody: {
             immediateFetch: true,
@@ -334,10 +350,8 @@ HttpOperation.Entity.UpdateMany = function (arg0, arg1) {
             required: true,
         },
     }));
-    decorator.RequestContent(args.requestBody?.type || args.type);
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     decorator
+        .RequestContent(args.requestBody?.type || args.type)
         .Response(HttpStatusCode.OK, {
         description: 'Operation is successful. Returns OperationResult with "affected" field.',
         contentType: MimeTypes.opra_response_json,
@@ -379,8 +393,8 @@ HttpOperation.Entity.Update = function (arg0, arg1) {
     const filterType = new FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'PATCH',
+        ...args,
         composition: 'Entity.Update',
         requestBody: {
             partial: 'deep',
@@ -417,17 +431,28 @@ HttpOperation.Entity.Update = function (arg0, arg1) {
         description: 'The request was well-formed but was unable to process operation due to one or many errors.',
         contentType: MimeTypes.opra_response_json,
     });
-    if (typeof args.type === 'function')
-        decorator.UseType(args.type);
     /**
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
+            meta.mergePath = true;
         });
         return decorator;
     };

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);
@@ -110,6 +114,9 @@ export function HttpOperationDecoratorFactory(decoratorChain, options) {
             responseMeta.contentType = responseMeta.contentType || MimeTypes.opra_response_json;
             responseMeta.contentEncoding = responseMeta.contentEncoding || 'utf-8';
         }
+        if (responseMeta.contentType === MimeTypes.opra_response_json) {
+            responseMeta.contentEncoding = responseMeta.contentEncoding || 'utf-8';
+        }
         decoratorChain.push((meta) => {
             meta.responses = meta.responses || [];
             meta.responses.push(responseMeta);

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

@@ -40,9 +40,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('');
                 }
             }
@@ -64,9 +62,14 @@ export class ApiDocumentFactory {
         else
             init = schemaOrUrl;
         // Add builtin data types if this document is the root
+        let builtinDocument;
         if (!document[BUILTIN]) {
-            const builtinDocument = await this.createBuiltinDocument(context);
-            document.references.set('opra', builtinDocument);
+            const t = document.node.findDataType('string');
+            builtinDocument = t?.node.getDocument();
+            if (!builtinDocument) {
+                builtinDocument = await this.createBuiltinDocument(context);
+                document.references.set('opra', builtinDocument);
+            }
         }
         init.spec = init.spec || OpraSchema.SpecVersion;
         document.url = init.url;
@@ -87,8 +90,12 @@ export class ApiDocumentFactory {
                             return;
                         }
                         const refDoc = new ApiDocument();
+                        if (builtinDocument)
+                            refDoc.references.set('opra', builtinDocument);
                         await this.initDocument(refDoc, context, r);
-                        document.references.set(ns, refDoc);
+                        /** If same document already exists in document tree, we use it except the new one */
+                        const preDoc = document.findDocument(refDoc.id);
+                        document.references.set(ns, preDoc || refDoc);
                     });
                 }
             });
@@ -109,6 +116,7 @@ export class ApiDocumentFactory {
                     context.addError(`Unknown service protocol (${init.api.protocol})`);
             });
         }
+        document.invalidate();
     }
     /**
      *