@opra/common 1.0.0-alpha.3 → 1.0.0-alpha.30

package/cjs/document/data-type/primitive-types/number.type.js

@@ -38,6 +38,10 @@ tslib_1.__decorate([
 exports.NumberType = NumberType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'Both Integer as well as Floating-Point numbers',
+        nameMappings: {
+            js: 'number',
+            json: 'number',
+        },
     }),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], NumberType);

package/cjs/document/data-type/primitive-types/object.type.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectType = void 0;
 const tslib_1 = require("tslib");
-const constants_js_1 = require("../../constants.js");
 const complex_type_js_1 = require("../complex-type.js");
 let ObjectType = class ObjectType {
     constructor(properties) {
@@ -19,5 +18,3 @@ exports.ObjectType = ObjectType = tslib_1.__decorate([
     }),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], ObjectType);
-const metadata = Reflect.getMetadata(constants_js_1.DATATYPE_METADATA, ObjectType);
-metadata.ctor = Object;

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

@@ -58,6 +58,10 @@ tslib_1.__decorate([
 exports.StringType = StringType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A sequence of characters',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     }),
     tslib_1.__metadata("design:paramtypes", [Object])
 ], StringType);

package/cjs/document/data-type/required-type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequiredType = void 0;
+exports.RequiredType = RequiredType;
 const create_mapped_class_js_1 = require("./utils/create-mapped-class.js");
 /**
  *
@@ -10,4 +10,3 @@ function RequiredType(base, ...args) {
     const options = Array.isArray(args[0]) ? args[1] : args[0];
     return (0, create_mapped_class_js_1.createMappedClass)(base, { required: keys }, options);
 }
-exports.RequiredType = RequiredType;

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

@@ -23,11 +23,14 @@ exports.SimpleType = function (...args) {
     _this.kind = index_js_2.OpraSchema.SimpleType.Kind;
     if (initArgs.base) {
         // noinspection SuspiciousTypeOfGuard
-        if (!(initArgs.base instanceof exports.SimpleType))
+        if (!(initArgs.base instanceof exports.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 = (0, index_js_1.cloneObject)(initArgs.attributes || {});
     _this.attributes = _this.base ? (0, index_js_1.cloneObject)(_this.base.attributes) : {};
     if (_this.ownAttributes) {
@@ -46,6 +49,8 @@ exports.SimpleType = function (...args) {
  */
 class SimpleTypeClass extends data_type_js_1.DataType {
     extendsFrom(baseType) {
+        if (!(baseType instanceof data_type_js_1.DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof exports.SimpleType))
             return false;
         if (baseType === this)
@@ -66,15 +71,13 @@ class SimpleTypeClass extends data_type_js_1.DataType {
             }
             return valgen_1.isAny;
         }
-        else {
-            let t = this;
-            while (t) {
-                if (t._generateEncoder)
-                    return t._generateEncoder(prop, options?.documentElement || this.owner);
-                t = this.base;
-            }
-            return valgen_1.isAny;
+        let t = this;
+        while (t) {
+            if (t._generateEncoder)
+                return t._generateEncoder(prop, options?.documentElement || this.owner);
+            t = this.base;
         }
+        return valgen_1.isAny;
     }
     toJSON() {
         const attributes = (0, index_js_1.omitUndefined)(this.ownAttributes);
@@ -83,19 +86,17 @@ class SimpleTypeClass extends data_type_js_1.DataType {
             properties = this.properties.toJSON(this.properties, this.owner);
         }
         else
-            properties = this.properties || {};
-        properties = Object.keys(this.attributes).reduce((o, k) => {
-            if (properties[k] !== undefined)
-                o[k] = properties[k];
-            return o;
-        }, {});
+            properties = this.properties ? (0, index_js_1.cloneObject)(this.properties) : {};
         const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : undefined;
-        return (0, index_js_1.omitUndefined)({
+        const out = (0, index_js_1.omitUndefined)({
             ...data_type_js_1.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;
     }
 }
 exports.SimpleType.prototype = SimpleTypeClass.prototype;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMappedClass = void 0;
+exports.createMappedClass = createMappedClass;
 const index_js_1 = require("../../../helpers/index.js");
 const index_js_2 = require("../../../schema/index.js");
 const constants_js_1 = require("../../constants.js");
@@ -26,8 +26,9 @@ function createMappedClass(source, config, options) {
             throw new TypeError(`Class "${source}" doesn't have datatype metadata information`);
         if (!(m.kind === index_js_2.OpraSchema.ComplexType.Kind ||
             m.kind === index_js_2.OpraSchema.MappedType.Kind ||
-            m.kind === index_js_2.OpraSchema.MixinType.Kind))
+            m.kind === index_js_2.OpraSchema.MixinType.Kind)) {
             throw new TypeError(`Class "${source}" is not a ${index_js_2.OpraSchema.ComplexType.Kind}`);
+        }
     }
     const metadata = {
         ...options,
@@ -51,4 +52,3 @@ function createMappedClass(source, config, options) {
     }
     return MappedClass;
 }
-exports.createMappedClass = createMappedClass;

package/cjs/document/data-type/utils/get-is-inherited-predicate-fn.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIsInheritedPredicateFn = void 0;
+exports.getIsInheritedPredicateFn = getIsInheritedPredicateFn;
 function getIsInheritedPredicateFn(pick, omit) {
     const pickKeys = pick?.map(x => String(x).toLowerCase());
     const omitKeys = omit?.map(x => String(x).toLowerCase());
@@ -12,4 +12,3 @@ function getIsInheritedPredicateFn(pick, omit) {
         return true;
     };
 }
-exports.getIsInheritedPredicateFn = getIsInheritedPredicateFn;

package/cjs/document/decorators/api-field-decorator.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiFieldDecorator = void 0;
-const index_js_1 = require("../../helpers/index.js");
-const index_js_2 = require("../../schema/index.js");
+exports.ApiFieldDecorator = ApiFieldDecorator;
+const index_js_1 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
 function ApiFieldDecorator(options) {
     return function (target, propertyKey) {
         if (typeof propertyKey !== 'string')
             throw new TypeError(`Symbol properties can't be used as a field`);
         const metadata = Reflect.getOwnMetadata(constants_js_1.DATATYPE_METADATA, target.constructor) || {};
-        metadata.kind = index_js_2.OpraSchema.ComplexType.Kind;
+        metadata.kind = index_js_1.OpraSchema.ComplexType.Kind;
         metadata.fields = metadata.fields || {};
         const designType = Reflect.getMetadata('design:type', target, propertyKey);
         const elemMeta = (metadata.fields[propertyKey] = {
@@ -20,7 +19,6 @@ function ApiFieldDecorator(options) {
         }
         else
             elemMeta.type = elemMeta.type || designType;
-        Reflect.defineMetadata(constants_js_1.DATATYPE_METADATA, (0, index_js_1.omitUndefined)(metadata), target.constructor);
+        Reflect.defineMetadata(constants_js_1.DATATYPE_METADATA, metadata, target.constructor);
     };
 }
-exports.ApiFieldDecorator = ApiFieldDecorator;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ComplexTypeDecorator = void 0;
+exports.ComplexTypeDecorator = ComplexTypeDecorator;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const index_js_1 = require("../../schema/index.js");
@@ -30,4 +30,3 @@ function ComplexTypeDecorator(options) {
             Object.assign(metadata, (0, lodash_omit_1.default)(options, ['kind', 'name', 'base', 'fields']));
     };
 }
-exports.ComplexTypeDecorator = ComplexTypeDecorator;

package/cjs/document/decorators/http-controller.decorator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpControllerDecoratorFactory = void 0;
+exports.HttpControllerDecoratorFactory = HttpControllerDecoratorFactory;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
@@ -102,6 +102,31 @@ 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;
+    };
     /**
      *
      */
@@ -114,4 +139,3 @@ function HttpControllerDecoratorFactory(options) {
     };
     return decorator;
 }
-exports.HttpControllerDecoratorFactory = HttpControllerDecoratorFactory;