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

package/cjs/document/constants.js

@@ -7,7 +7,7 @@ exports.DECODER = Symbol.for('opra.type.decoder');
 exports.ENCODER = Symbol('opra.type.encoder');
 exports.DECORATOR = Symbol.for('DECORATOR');
 exports.BUILTIN = Symbol.for('BUILTIN');
-exports.NAMESPACE_PATTERN = /([a-z$_]\w+)(:.+)/i;
+exports.NAMESPACE_PATTERN = /([a-z$_]\w+):(.+)/i;
 exports.CLASS_NAME_PATTERN = /^[a-z][\w_]*$/i;
 exports.EXTRACT_TYPENAME_PATTERN = /^(.*)Type(\d*)$/;
 exports.kDataTypeMap = Symbol.for('kDataTypeMap');

package/cjs/document/data-type/api-field.js

@@ -46,7 +46,7 @@ class ApiFieldClass extends document_element_js_1.DocumentElement {
     toJSON() {
         const typeName = this.type ? this.node.getDataTypeNameWithNs(this.type) : undefined;
         return (0, index_js_1.omitUndefined)({
-            type: this.type ? (typeName ? typeName : this.type?.toJSON()) : undefined,
+            type: typeName ? typeName : this.type?.toJSON(),
             description: this.description,
             isArray: this.isArray,
             default: this.default,

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

@@ -75,9 +75,8 @@ class ComplexTypeClass extends complex_type_base_js_1.ComplexTypeBase {
         });
         if (this.additionalFields) {
             if (this.additionalFields instanceof data_type_js_1.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/cjs/document/data-type/extended-types/base64.type.js

@@ -21,5 +21,6 @@ exports.Base64Type = Base64Type;
 exports.Base64Type = Base64Type = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A stream of bytes, base64 encoded',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], Base64Type);

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

@@ -27,12 +27,14 @@ exports.DateStringType = DateStringType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateStringType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateStringType.prototype, "maxValue", void 0);
 exports.DateStringType = DateStringType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
@@ -40,5 +42,6 @@ exports.DateStringType = DateStringType = tslib_1.__decorate([
     })
         .Example('2021-04-18', 'Full date value')
         .Example('2021-04', 'Date value without day')
-        .Example('2021', 'Year only value')
+        .Example('2021', 'Year only value'),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], DateStringType);

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

@@ -27,12 +27,14 @@ exports.DateTimeStringType = DateTimeStringType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateTimeStringType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateTimeStringType.prototype, "maxValue", void 0);
 exports.DateTimeStringType = DateTimeStringType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
@@ -43,5 +45,6 @@ exports.DateTimeStringType = DateTimeStringType = tslib_1.__decorate([
         .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'),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], DateTimeStringType);

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

@@ -41,12 +41,14 @@ exports.DateTimeType = DateTimeType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateTimeType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateTimeType.prototype, "maxValue", void 0);
 exports.DateTimeType = DateTimeType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
@@ -54,5 +56,6 @@ exports.DateTimeType = DateTimeType = tslib_1.__decorate([
     })
         .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'),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], DateTimeType);

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

@@ -41,15 +41,18 @@ exports.DateType = DateType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], DateType.prototype, "maxValue", void 0);
 exports.DateType = DateType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A date without time',
-    }).Example('2021-04-18', 'Full date value')
+    }).Example('2021-04-18', 'Full date value'),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], DateType);

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

@@ -22,59 +22,69 @@ tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, the validator will also match `Display Name <email-address>',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "allowDisplayName", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, the validator will reject strings without the format `Display Name <email-address>',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "requireDisplayName", void 0);
 tslib_1.__decorate([
     simple_type_js_1.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,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "utf8LocalPart", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, the validator will not check for the standard max length of an email',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "ignoreMaxLength", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'If set to `true`, the validator will allow IP addresses in the host part',
         default: false,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "allowIpDomain", void 0);
 tslib_1.__decorate([
     simple_type_js_1.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,
-    })
+    }),
+    tslib_1.__metadata("design:type", Boolean)
 ], EmailType.prototype, "domainSpecificValidation", void 0);
 tslib_1.__decorate([
     simple_type_js_1.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.',
-    })
+    }),
+    tslib_1.__metadata("design:type", Array)
 ], EmailType.prototype, "hostBlacklist", void 0);
 tslib_1.__decorate([
     simple_type_js_1.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.',
-    })
+    }),
+    tslib_1.__metadata("design:type", Array)
 ], EmailType.prototype, "hostWhitelist", void 0);
 tslib_1.__decorate([
     simple_type_js_1.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.',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], EmailType.prototype, "blacklistedChars", void 0);
 exports.EmailType = EmailType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'An email value',
-    }).Example('some.body@example.com')
+    }).Example('some.body@example.com'),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], EmailType);

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

@@ -27,8 +27,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,
         };
     }
@@ -37,17 +38,20 @@ exports.FieldPathType = FieldPathType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Data type which field belong to',
-    })
+    }),
+    tslib_1.__metadata("design:type", Object)
 ], FieldPathType.prototype, "dataType", void 0);
 tslib_1.__decorate([
     simple_type_js_1.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',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], FieldPathType.prototype, "allowSigns", void 0);
 exports.FieldPathType = FieldPathType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'Field path',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], FieldPathType);

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

@@ -36,18 +36,21 @@ exports.FilterType = FilterType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Data type which filtering fields belong to',
-    })
+    }),
+    tslib_1.__metadata("design:type", Object)
 ], FilterType.prototype, "dataType", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Stringified JSON object defines filtering rules',
         format: 'string',
-    })
+    }),
+    tslib_1.__metadata("design:type", Object)
 ], FilterType.prototype, "rules", void 0);
 exports.FilterType = FilterType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A query filter',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], FilterType);
 const decodeFilter = (dataType, rules) => {
     return (0, valgen_1.validator)('decodeFilter', function (input, context, _this) {

package/cjs/document/data-type/extended-types/object-id.type.js

@@ -21,5 +21,6 @@ exports.ObjectIdType = ObjectIdType;
 exports.ObjectIdType = ObjectIdType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A MongoDB ObjectID value',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], ObjectIdType);

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

@@ -12,30 +12,38 @@ let OperationResult = class OperationResult {
 };
 exports.OperationResult = OperationResult;
 tslib_1.__decorate([
-    (0, api_field_js_1.ApiField)()
+    (0, api_field_js_1.ApiField)(),
+    tslib_1.__metadata("design:type", Number)
 ], OperationResult.prototype, "affected", void 0);
 tslib_1.__decorate([
-    (0, api_field_js_1.ApiField)()
+    (0, api_field_js_1.ApiField)(),
+    tslib_1.__metadata("design:type", Number)
 ], OperationResult.prototype, "totalMatches", void 0);
 tslib_1.__decorate([
-    (0, api_field_js_1.ApiField)()
+    (0, api_field_js_1.ApiField)(),
+    tslib_1.__metadata("design:type", String)
 ], OperationResult.prototype, "context", void 0);
 tslib_1.__decorate([
-    (0, api_field_js_1.ApiField)()
+    (0, api_field_js_1.ApiField)(),
+    tslib_1.__metadata("design:type", String)
 ], OperationResult.prototype, "type", void 0);
 tslib_1.__decorate([
-    (0, api_field_js_1.ApiField)()
+    (0, api_field_js_1.ApiField)(),
+    tslib_1.__metadata("design:type", String)
 ], OperationResult.prototype, "message", void 0);
 tslib_1.__decorate([
-    (0, api_field_js_1.ApiField)({ type: 'any' })
+    (0, api_field_js_1.ApiField)({ type: 'any' }),
+    tslib_1.__metadata("design:type", Object)
 ], OperationResult.prototype, "payload", void 0);
 tslib_1.__decorate([
-    (0, api_field_js_1.ApiField)({ type: 'object' })
+    (0, api_field_js_1.ApiField)({ type: 'object' }),
+    tslib_1.__metadata("design:type", Array)
 ], OperationResult.prototype, "errors", void 0);
 exports.OperationResult = OperationResult = tslib_1.__decorate([
     (0, complex_type_js_1.ComplexType)({
         description: 'Operation result',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], OperationResult);
 (function (OperationResult) {
     function forPayload(type) {
@@ -45,10 +53,12 @@ exports.OperationResult = OperationResult = tslib_1.__decorate([
             }
         };
         tslib_1.__decorate([
-            (0, api_field_js_1.ApiField)({ type, required: true })
+            (0, api_field_js_1.ApiField)({ type, required: true }),
+            tslib_1.__metadata("design:type", Object)
         ], OperationResult_.prototype, "payload", void 0);
         OperationResult_ = tslib_1.__decorate([
-            (0, complex_type_js_1.ComplexType)({ embedded: true })
+            (0, complex_type_js_1.ComplexType)({ embedded: true }),
+            tslib_1.__metadata("design:paramtypes", [Object])
         ], OperationResult_);
         return OperationResult_;
     }

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

@@ -31,17 +31,20 @@ exports.TimeType = TimeType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], TimeType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], TimeType.prototype, "maxValue", void 0);
 exports.TimeType = TimeType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'Time string in 24h format',
     })
         .Example('18:23:00', 'Full time value')
-        .Example('18:23:00', 'Time value without seconds')
+        .Example('18:23:00', 'Time value without seconds'),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], TimeType);

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

@@ -21,5 +21,6 @@ exports.UrlType = UrlType;
 exports.UrlType = UrlType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A Uniform Resource Identifier Reference (RFC 3986 icon) value',
-    }).Example('http://tempuri.org')
+    }).Example('http://tempuri.org'),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], UrlType);

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

@@ -21,10 +21,12 @@ exports.UuidType = UuidType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Version of the UUID',
-    })
+    }),
+    tslib_1.__metadata("design:type", Number)
 ], UuidType.prototype, "version", void 0);
 exports.UuidType = UuidType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A Universal Unique Identifier (UUID) value',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], UuidType);

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

@@ -21,5 +21,6 @@ exports.AnyType = AnyType;
 exports.AnyType = AnyType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'Represents any value',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], AnyType);

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

@@ -26,5 +26,6 @@ exports.BigintType = BigintType;
 exports.BigintType = BigintType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'BigInt number',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], BigintType);

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

@@ -21,5 +21,6 @@ exports.BooleanType = BooleanType;
 exports.BooleanType = BooleanType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'Simple true/false value',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], BooleanType);

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

@@ -26,5 +26,6 @@ exports.IntegerType = IntegerType;
 exports.IntegerType = IntegerType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'An integer number',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], IntegerType);

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

@@ -21,5 +21,6 @@ exports.NullType = NullType;
 exports.NullType = NullType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A Null value',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], NullType);

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

@@ -26,15 +26,18 @@ exports.NumberType = NumberType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Determines the minimum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", Number)
 ], NumberType.prototype, "minValue", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Determines the maximum value',
-    })
+    }),
+    tslib_1.__metadata("design:type", Number)
 ], NumberType.prototype, "maxValue", void 0);
 exports.NumberType = NumberType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'Both Integer as well as Floating-Point numbers',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], NumberType);

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

@@ -16,7 +16,8 @@ exports.ObjectType = ObjectType = tslib_1.__decorate([
         name: 'object',
         description: 'A non modelled object',
         additionalFields: true,
-    })
+    }),
+    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

@@ -34,25 +34,30 @@ exports.StringType = StringType;
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Regex pattern to be used for validation',
-    })
+    }),
+    tslib_1.__metadata("design:type", Object)
 ], StringType.prototype, "pattern", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Name of the pattern',
-    })
+    }),
+    tslib_1.__metadata("design:type", String)
 ], StringType.prototype, "patternName", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum number of characters',
-    })
+    }),
+    tslib_1.__metadata("design:type", Number)
 ], StringType.prototype, "minLength", void 0);
 tslib_1.__decorate([
     simple_type_js_1.SimpleType.Attribute({
         description: 'Minimum number of characters',
-    })
+    }),
+    tslib_1.__metadata("design:type", Number)
 ], StringType.prototype, "maxLength", void 0);
 exports.StringType = StringType = tslib_1.__decorate([
     (0, simple_type_js_1.SimpleType)({
         description: 'A sequence of characters',
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], StringType);

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

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiDocumentFactory = void 0;
+const tslib_1 = require("tslib");
+const node_crypto_1 = tslib_1.__importDefault(require("node:crypto"));
+const ts_gems_1 = require("ts-gems");
 const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
 const api_document_js_1 = require("../api-document.js");
@@ -112,6 +115,8 @@ class ApiDocumentFactory {
                     context.addError(`Unknown service protocol (${init.api.protocol})`);
             });
         }
+        const x = document.export();
+        (0, ts_gems_1.asMutable)(document).id = node_crypto_1.default.createHash('md5').update(JSON.stringify(x)).digest('base64url');
     }
     /**
      *

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

@@ -290,7 +290,7 @@ class DataTypeFactory {
                         const fieldMeta = typeof v === 'string' ? { type: v } : v;
                         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);
+                        const t = await this._importDataTypeArgs(context, owner, fieldMeta.type || 'any');
                         if (!t)
                             return;
                         initArgs.fields[k] = {

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

@@ -208,7 +208,7 @@ class HttpApiFactory {
             });
         }
         if (metadata.requestBody) {
-            await context.enter('.requestBody', async () => {
+            await context.enterAsync('.requestBody', async () => {
                 const requestBody = new http_request_body_js_1.HttpRequestBody(operation);
                 await this._initHttpRequestBody(context, requestBody, metadata.requestBody);
                 operation.requestBody = requestBody;

package/esm/document/api-document.js

@@ -27,18 +27,29 @@ export class ApiDocument extends DocumentElement {
         if (dt)
             return this[kTypeNSMap].get(dt);
     }
+    findDocument(id) {
+        if (this.id === id)
+            return this;
+        for (const doc of this.references.values()) {
+            if (doc.id === id)
+                return doc;
+            const d = doc.findDocument(id);
+            if (d)
+                return d;
+        }
+    }
     toJSON() {
         return this.export();
     }
     /**
      * Export as Opra schema definition object
      */
-    export(options) {
+    export() {
         const out = omitUndefined({
             spec: OpraSchema.SpecVersion,
+            id: this.id,
             url: this.url,
             info: cloneObject(this.info, true),
-            // api: this.api ? this.api.toJSON() : undefined,
         });
         if (this.references.size) {
             let i = 0;
@@ -46,16 +57,11 @@ export class ApiDocument extends DocumentElement {
             for (const [ns, doc] of this.references.entries()) {
                 if (doc[BUILTIN])
                     continue;
-                if (options?.references === 'external-url') {
-                    if (doc.url)
-                        references[ns] = doc.url;
-                    else
-                        references[ns] = `/$schema?ns=${ns}`;
-                }
-                else if (options?.references === 'relative-url')
-                    references[ns] = `/$schema?ns=${ns}`;
-                else
-                    references[ns] = doc.export(options);
+                references[ns] = {
+                    id: doc.id,
+                    url: doc.url,
+                    info: cloneObject(doc.info, true),
+                };
                 i++;
             }
             if (i)

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

@@ -20,7 +20,7 @@ export class DataTypeMap {
     }
     get(nameOrCtor) {
         let name = typeof nameOrCtor === 'string' ? nameOrCtor : this[kCtorMap].get(nameOrCtor);
-        if (!name) {
+        if (!name && typeof nameOrCtor === 'function') {
             const metadata = Reflect.getMetadata(DATATYPE_METADATA, nameOrCtor);
             name = metadata?.name;
         }

package/esm/document/constants.js

@@ -4,7 +4,7 @@ export const DECODER = Symbol.for('opra.type.decoder');
 export const ENCODER = Symbol('opra.type.encoder');
 export const DECORATOR = Symbol.for('DECORATOR');
 export const BUILTIN = Symbol.for('BUILTIN');
-export const NAMESPACE_PATTERN = /([a-z$_]\w+)(:.+)/i;
+export const NAMESPACE_PATTERN = /([a-z$_]\w+):(.+)/i;
 export const CLASS_NAME_PATTERN = /^[a-z][\w_]*$/i;
 export const EXTRACT_TYPENAME_PATTERN = /^(.*)Type(\d*)$/;
 export const kDataTypeMap = Symbol.for('kDataTypeMap');

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

@@ -43,7 +43,7 @@ class ApiFieldClass extends DocumentElement {
     toJSON() {
         const typeName = this.type ? this.node.getDataTypeNameWithNs(this.type) : undefined;
         return omitUndefined({
-            type: this.type ? (typeName ? typeName : this.type?.toJSON()) : undefined,
+            type: typeName ? typeName : this.type?.toJSON(),
             description: this.description,
             isArray: this.isArray,
             default: this.default,