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

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

@@ -23,8 +23,8 @@ http_operation_js_1.HttpOperation.Entity.Create = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'POST',
+        ...args,
         composition: 'Entity.Create',
         requestBody: {
             immediateFetch: true,
@@ -53,8 +53,6 @@ http_operation_js_1.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: index_js_2.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);
@@ -74,8 +72,8 @@ http_operation_js_1.HttpOperation.Entity.Delete = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'DELETE',
+        ...args,
         composition: 'Entity.Delete',
     }));
     decorator
@@ -87,17 +85,28 @@ http_operation_js_1.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: index_js_2.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;
     };
@@ -123,8 +132,8 @@ http_operation_js_1.HttpOperation.Entity.DeleteMany = function (arg0, arg1) {
     const filterType = new index_js_3.FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'DELETE',
+        ...args,
         composition: 'Entity.DeleteMany',
     }));
     decorator
@@ -140,8 +149,6 @@ http_operation_js_1.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);
@@ -171,8 +178,8 @@ http_operation_js_1.HttpOperation.Entity.FindMany = function (arg0, arg1) {
     const filterType = new index_js_3.FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'GET',
+        ...args,
         composition: 'Entity.FindMany',
     }));
     decorator
@@ -221,8 +228,6 @@ http_operation_js_1.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);
@@ -263,8 +268,8 @@ http_operation_js_1.HttpOperation.Entity.Get = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'GET',
+        ...args,
         composition: 'Entity.Get',
     }));
     decorator
@@ -290,17 +295,28 @@ http_operation_js_1.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: index_js_2.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;
     };
@@ -326,8 +342,8 @@ http_operation_js_1.HttpOperation.Entity.UpdateMany = function (arg0, arg1) {
     filterType.rules = {};
     const filterRules = new filter_rules_js_1.FilterRules();
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'PATCH',
+        ...args,
         composition: 'Entity.UpdateMany',
         requestBody: {
             immediateFetch: true,
@@ -336,10 +352,8 @@ http_operation_js_1.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(index_js_2.HttpStatusCode.OK, {
         description: 'Operation is successful. Returns OperationResult with "affected" field.',
         contentType: index_js_2.MimeTypes.opra_response_json,
@@ -381,8 +395,8 @@ http_operation_js_1.HttpOperation.Entity.Update = function (arg0, arg1) {
     const filterType = new index_js_3.FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'PATCH',
+        ...args,
         composition: 'Entity.Update',
         requestBody: {
             partial: 'deep',
@@ -419,17 +433,28 @@ http_operation_js_1.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: index_js_2.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/cjs/document/decorators/http-operation.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpOperationDecoratorFactory = void 0;
+exports.HttpOperationDecoratorFactory = HttpOperationDecoratorFactory;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const index_js_1 = require("../../http/index.js");
@@ -37,8 +37,9 @@ 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);
@@ -57,8 +58,9 @@ 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);
@@ -77,8 +79,9 @@ 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);
@@ -97,8 +100,9 @@ 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);
@@ -114,6 +118,9 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
             responseMeta.contentType = responseMeta.contentType || index_js_1.MimeTypes.opra_response_json;
             responseMeta.contentEncoding = responseMeta.contentEncoding || 'utf-8';
         }
+        if (responseMeta.contentType === index_js_1.MimeTypes.opra_response_json) {
+            responseMeta.contentEncoding = responseMeta.contentEncoding || 'utf-8';
+        }
         decoratorChain.push((meta) => {
             meta.responses = meta.responses || [];
             meta.responses.push(responseMeta);
@@ -180,4 +187,3 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
     };
     return decorator;
 }
-exports.HttpOperationDecoratorFactory = HttpOperationDecoratorFactory;

package/cjs/document/decorators/simple-type.decorator.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AttributeDecoratorFactory = exports.SimpleTypeDecoratorFactory = void 0;
+exports.SimpleTypeDecoratorFactory = SimpleTypeDecoratorFactory;
+exports.AttributeDecoratorFactory = AttributeDecoratorFactory;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const index_js_1 = require("../../schema/index.js");
@@ -42,7 +43,6 @@ function SimpleTypeDecoratorFactory(options) {
     };
     return decorator;
 }
-exports.SimpleTypeDecoratorFactory = SimpleTypeDecoratorFactory;
 function AttributeDecoratorFactory(options) {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
@@ -64,4 +64,3 @@ function AttributeDecoratorFactory(options) {
         Reflect.defineMetadata(constants_js_1.DATATYPE_METADATA, metadata, target.constructor);
     };
 }
-exports.AttributeDecoratorFactory = AttributeDecoratorFactory;

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

@@ -43,9 +43,7 @@ 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('');
                 }
             }
@@ -67,9 +65,14 @@ class ApiDocumentFactory {
         else
             init = schemaOrUrl;
         // Add builtin data types if this document is the root
+        let builtinDocument;
         if (!document[constants_js_1.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 || index_js_2.OpraSchema.SpecVersion;
         document.url = init.url;
@@ -90,8 +93,12 @@ class ApiDocumentFactory {
                             return;
                         }
                         const refDoc = new api_document_js_1.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);
                     });
                 }
             });
@@ -112,6 +119,7 @@ class ApiDocumentFactory {
                     context.addError(`Unknown service protocol (${init.api.protocol})`);
             });
         }
+        document.invalidate();
     }
     /**
      *