@opra/common 1.0.0-alpha.1 → 1.0.0-alpha.11

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

@@ -26,11 +26,13 @@ export const ComplexType = function (...args) {
     if (initArgs.base) {
         context.enter('.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;
-            if (_this.additionalFields == null && _this.base.additionalFields)
+            if (_this.additionalFields == null && _this.base.additionalFields) {
                 _this.additionalFields = _this.base.additionalFields;
+            }
             /** Copy fields from base */
             for (const v of _this.base.fields.values()) {
                 this.fields.set(v.name, new ApiField(this, v));
@@ -57,6 +59,8 @@ export const ComplexType = function (...args) {
  */
 class ComplexTypeClass extends ComplexTypeBase {
     extendsFrom(baseType) {
+        if (!(baseType instanceof DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof ComplexTypeBase))
             return false;
         if (baseType === this)
@@ -72,9 +76,8 @@ class ComplexTypeClass extends ComplexTypeBase {
         });
         if (this.additionalFields) {
             if (this.additionalFields instanceof DataType) {
-                out.additionalFields = this.additionalFields[1].name
-                    ? this.additionalFields[1].name
-                    : this.additionalFields[1].toJSON();
+                const typeName = this.node.getDataTypeNameWithNs(this.additionalFields);
+                out.additionalFields = typeName ? typeName : this.additionalFields.toJSON();
             }
             else
                 out.additionalFields = this.additionalFields;

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

@@ -11,8 +11,9 @@ export const DataType = function (owner, initArgs,
 context) {
     if (!this)
         throw new TypeError('"this" should be passed to call class constructor');
-    if (initArgs?.name && !CLASS_NAME_PATTERN.test(initArgs.name))
+    if (initArgs?.name && !CLASS_NAME_PATTERN.test(initArgs.name)) {
         throw new TypeError(`"${initArgs.name}" is not a valid DataType name`);
+    }
     DocumentElement.call(this, owner);
     const _this = asMutable(this);
     _this.kind = initArgs.kind;

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

@@ -19,8 +19,9 @@ export const EnumType = function (...args) {
     _this.kind = OpraSchema.EnumType.Kind;
     if (initArgs.base) {
         // noinspection SuspiciousTypeOfGuard
-        if (!(initArgs.base instanceof EnumType))
-            throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${this.kind}"`);
+        if (!(initArgs.base instanceof EnumType)) {
+            throw new TypeError(`"${initArgs.base.kind}" can't be set as base for a "${_this.kind}"`);
+        }
         _this.base = initArgs.base;
     }
     _this.instance = initArgs.instance;
@@ -35,6 +36,8 @@ export const EnumType = function (...args) {
  */
 class EnumTypeClass extends DataType {
     extendsFrom(baseType) {
+        if (!(baseType instanceof DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof EnumType))
             return false;
         if (baseType === this)

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -17,6 +17,11 @@ let Base64Type = class Base64Type {
 Base64Type = __decorate([
     SimpleType({
         description: 'A stream of bytes, base64 encoded',
-    })
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }),
+    __metadata("design:paramtypes", [Object])
 ], Base64Type);
 export { Base64Type };

package/esm/document/data-type/extended-types/date-string.type.js

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -23,19 +23,26 @@ let DateStringType = class DateStringType {
 __decorate([
     SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateStringType.prototype, "minValue", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateStringType.prototype, "maxValue", void 0);
 DateStringType = __decorate([
     SimpleType({
         description: 'Date string value',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     })
         .Example('2021-04-18', 'Full date value')
         .Example('2021-04', 'Date value without day')
-        .Example('2021', 'Year only value')
+        .Example('2021', 'Year only value'),
+    __metadata("design:paramtypes", [Object])
 ], DateStringType);
 export { DateStringType };

package/esm/document/data-type/extended-types/date-time-string.type.js

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -23,22 +23,29 @@ let DateTimeStringType = class DateTimeStringType {
 __decorate([
     SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateTimeStringType.prototype, "minValue", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateTimeStringType.prototype, "maxValue", void 0);
 DateTimeStringType = __decorate([
     SimpleType({
         description: 'DateTime string value',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     })
         .Example('2021-04-18T22:30:15+01:00', 'Full date-time value with timezone')
         .Example('2021-04-18T22:30:15', 'Full date-time value without timezone')
         .Example('2021-04-18 22:30', 'Date-time value')
         .Example('2021-04-18', 'Date value')
         .Example('2021-04', 'Date value without day')
-        .Example('2021', 'Year only value')
+        .Example('2021', 'Year only value'),
+    __metadata("design:paramtypes", [Object])
 ], DateTimeStringType);
 export { DateTimeStringType };

package/esm/document/data-type/extended-types/date-time.type.js

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { isDateString, toString, vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -37,19 +37,26 @@ let DateTimeType = class DateTimeType {
 __decorate([
     SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateTimeType.prototype, "minValue", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateTimeType.prototype, "maxValue", void 0);
 DateTimeType = __decorate([
     SimpleType({
         description: 'A full datetime value',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     })
         .Example('2021-04-18T22:30:15')
         .Example('2021-04-18 22:30:15')
-        .Example('2021-04-18 22:30')
+        .Example('2021-04-18 22:30'),
+    __metadata("design:paramtypes", [Object])
 ], DateTimeType);
 export { DateTimeType };

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { isDateString, toString, vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -37,16 +37,23 @@ let DateType = class DateType {
 __decorate([
     SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateType.prototype, "minValue", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateType.prototype, "maxValue", void 0);
 DateType = __decorate([
     SimpleType({
         description: 'A date without time',
-    }).Example('2021-04-18', 'Full date value')
+        nameMappings: {
+            js: 'Date',
+            json: 'string',
+        },
+    }).Example('2021-04-18', 'Full date value'),
+    __metadata("design:paramtypes", [Object])
 ], DateType);
 export { DateType };

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -18,60 +18,74 @@ __decorate([
     SimpleType.Attribute({
         description: 'If set to `true`, the validator will also match `Display Name <email-address>',
         default: false,
-    })
+    }),
+    __metadata("design:type", Boolean)
 ], EmailType.prototype, "allowDisplayName", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'If set to `true`, the validator will reject strings without the format `Display Name <email-address>',
         default: false,
-    })
+    }),
+    __metadata("design:type", Boolean)
 ], EmailType.prototype, "requireDisplayName", void 0);
 __decorate([
     SimpleType.Attribute({
         description: "If set to `false`, the validator will not allow any non-English UTF8 character in email address's local part",
         default: true,
-    })
+    }),
+    __metadata("design:type", Boolean)
 ], EmailType.prototype, "utf8LocalPart", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'If set to `true`, the validator will not check for the standard max length of an email',
         default: false,
-    })
+    }),
+    __metadata("design:type", Boolean)
 ], EmailType.prototype, "ignoreMaxLength", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'If set to `true`, the validator will allow IP addresses in the host part',
         default: false,
-    })
+    }),
+    __metadata("design:type", Boolean)
 ], EmailType.prototype, "allowIpDomain", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'If set to `true`, some additional validation will be enabled, ' +
             'e.g. disallowing certain syntactically valid email addresses that are rejected by GMail.',
         default: false,
-    })
+    }),
+    __metadata("design:type", Boolean)
 ], EmailType.prototype, "domainSpecificValidation", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'If set to an array of strings and the part of the email after the @ symbol ' +
             ' one of the strings defined in it, the validation fails.',
-    })
+    }),
+    __metadata("design:type", Array)
 ], EmailType.prototype, "hostBlacklist", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'If set to an array of strings and the part of the email after the @ symbol ' +
             ' matches none of the strings defined in it, the validation fails.',
-    })
+    }),
+    __metadata("design:type", Array)
 ], EmailType.prototype, "hostWhitelist", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'If set to a string, then the validator will reject emails that include ' +
             ' any of the characters in the string, in the name part.',
-    })
+    }),
+    __metadata("design:type", String)
 ], EmailType.prototype, "blacklistedChars", void 0);
 EmailType = __decorate([
     SimpleType({
         description: 'An email value',
-    }).Example('some.body@example.com')
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }).Example('some.body@example.com'),
+    __metadata("design:paramtypes", [Object])
 ], EmailType);
 export { EmailType };

package/esm/document/data-type/extended-types/field-path.type.js

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { toString, validator, vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -12,9 +12,7 @@ let FieldPathType = class FieldPathType {
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
         const allowSigns = properties.allowSigns;
-        const decodeFieldPath = validator('decodeFieldPath', function (input) {
-            return dataType.normalizeFieldPath(input, { allowSigns });
-        });
+        const decodeFieldPath = validator('decodeFieldPath', (input) => dataType.normalizeFieldPath(input, { allowSigns }));
         return vg.pipe([toString, decodeFieldPath]);
     }
     [ENCODER](properties, element) {
@@ -24,8 +22,9 @@ let FieldPathType = class FieldPathType {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
+        const typeName = dataType ? element.node.getDataTypeNameWithNs(dataType) : undefined;
         return {
-            dataType: dataType.name ? dataType.name : dataType.toJSON(),
+            dataType: typeName ? typeName : dataType.toJSON(),
             allowSigns: properties.allowSigns,
         };
     }
@@ -33,18 +32,25 @@ let FieldPathType = class FieldPathType {
 __decorate([
     SimpleType.Attribute({
         description: 'Data type which field belong to',
-    })
+    }),
+    __metadata("design:type", Object)
 ], FieldPathType.prototype, "dataType", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Determines if signs (+,-) are allowed. ' +
             'If set "first" signs are allowed only beginning of the field path' +
             'If set "each" signs are allowed at each field in the path',
-    })
+    }),
+    __metadata("design:type", String)
 ], FieldPathType.prototype, "allowSigns", void 0);
 FieldPathType = __decorate([
     SimpleType({
         description: 'Field path',
-    })
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }),
+    __metadata("design:paramtypes", [Object])
 ], FieldPathType);
 export { FieldPathType };

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { validator } from 'valgen';
 import { FilterRules } from '../../../filter/filter-rules.js';
 import { OpraFilter } from '../../../filter/index.js';
@@ -32,38 +32,43 @@ let FilterType = class FilterType {
 __decorate([
     SimpleType.Attribute({
         description: 'Data type which filtering fields belong to',
-    })
+    }),
+    __metadata("design:type", Object)
 ], FilterType.prototype, "dataType", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Stringified JSON object defines filtering rules',
         format: 'string',
-    })
+    }),
+    __metadata("design:type", Object)
 ], FilterType.prototype, "rules", void 0);
 FilterType = __decorate([
     SimpleType({
         description: 'A query filter',
-    })
+        nameMappings: {
+            js: 'object',
+            json: 'string',
+        },
+    }),
+    __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/extended-types/object-id.type.js

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -17,6 +17,11 @@ let ObjectIdType = class ObjectIdType {
 ObjectIdType = __decorate([
     SimpleType({
         description: 'A MongoDB ObjectID value',
-    })
+        nameMappings: {
+            js: 'object',
+            json: 'string',
+        },
+    }),
+    __metadata("design:paramtypes", [Object])
 ], ObjectIdType);
 export { ObjectIdType };

package/esm/document/data-type/extended-types/operation-result.type.js

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { ApiField } from '../api-field.js';
 import { ComplexType } from '../complex-type.js';
 let OperationResult = class OperationResult {
@@ -8,30 +8,38 @@ let OperationResult = class OperationResult {
     }
 };
 __decorate([
-    ApiField()
+    ApiField(),
+    __metadata("design:type", Number)
 ], OperationResult.prototype, "affected", void 0);
 __decorate([
-    ApiField()
+    ApiField(),
+    __metadata("design:type", Number)
 ], OperationResult.prototype, "totalMatches", void 0);
 __decorate([
-    ApiField()
+    ApiField(),
+    __metadata("design:type", String)
 ], OperationResult.prototype, "context", void 0);
 __decorate([
-    ApiField()
+    ApiField(),
+    __metadata("design:type", String)
 ], OperationResult.prototype, "type", void 0);
 __decorate([
-    ApiField()
+    ApiField(),
+    __metadata("design:type", String)
 ], OperationResult.prototype, "message", void 0);
 __decorate([
-    ApiField({ type: 'any' })
+    ApiField({ type: 'any' }),
+    __metadata("design:type", Object)
 ], OperationResult.prototype, "payload", void 0);
 __decorate([
-    ApiField({ type: 'object' })
+    ApiField({ type: 'object' }),
+    __metadata("design:type", Array)
 ], OperationResult.prototype, "errors", void 0);
 OperationResult = __decorate([
     ComplexType({
         description: 'Operation result',
-    })
+    }),
+    __metadata("design:paramtypes", [Object])
 ], OperationResult);
 export { OperationResult };
 (function (OperationResult) {
@@ -42,10 +50,12 @@ export { OperationResult };
             }
         };
         __decorate([
-            ApiField({ type, required: true })
+            ApiField({ type, required: true }),
+            __metadata("design:type", Object)
         ], OperationResult_.prototype, "payload", void 0);
         OperationResult_ = __decorate([
-            ComplexType({ embedded: true })
+            ComplexType({ embedded: true }),
+            __metadata("design:paramtypes", [Object])
         ], OperationResult_);
         return OperationResult_;
     }

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -27,18 +27,25 @@ let TimeType = class TimeType {
 __decorate([
     SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], TimeType.prototype, "minValue", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], TimeType.prototype, "maxValue", void 0);
 TimeType = __decorate([
     SimpleType({
         description: 'Time string in 24h format',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     })
         .Example('18:23:00', 'Full time value')
-        .Example('18:23:00', 'Time value without seconds')
+        .Example('18:23:00', 'Time value without seconds'),
+    __metadata("design:paramtypes", [Object])
 ], TimeType);
 export { TimeType };

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -17,6 +17,11 @@ let UrlType = class UrlType {
 UrlType = __decorate([
     SimpleType({
         description: 'A Uniform Resource Identifier Reference (RFC 3986 icon) value',
-    }).Example('http://tempuri.org')
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }).Example('http://tempuri.org'),
+    __metadata("design:paramtypes", [Object])
 ], UrlType);
 export { UrlType };

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -17,11 +17,17 @@ let UuidType = class UuidType {
 __decorate([
     SimpleType.Attribute({
         description: 'Version of the UUID',
-    })
+    }),
+    __metadata("design:type", Number)
 ], UuidType.prototype, "version", void 0);
 UuidType = __decorate([
     SimpleType({
         description: 'A Universal Unique Identifier (UUID) value',
-    })
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }),
+    __metadata("design:paramtypes", [Object])
 ], UuidType);
 export { UuidType };