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

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

@@ -7,6 +7,7 @@ const document_init_context_js_1 = require("../common/document-init-context.js")
 const constants_js_1 = require("../constants.js");
 const complex_type_js_1 = require("../data-type/complex-type.js");
 const complex_type_base_js_1 = require("../data-type/complex-type-base.js");
+const data_type_js_1 = require("../data-type/data-type.js");
 const enum_type_js_1 = require("../data-type/enum-type.js");
 const mapped_type_js_1 = require("../data-type/mapped-type.js");
 const mixin_type_js_1 = require("../data-type/mixin-type.js");
@@ -94,10 +95,10 @@ class DataTypeFactory {
                     thunk = await (0, index_js_1.resolveThunk)(thunk);
                     const metadata = Reflect.getMetadata(constants_js_1.DATATYPE_METADATA, thunk) || thunk[constants_js_1.DATATYPE_METADATA];
                     if (!(metadata && metadata.name)) {
-                        if (typeof thunk === 'function')
+                        if (typeof thunk === 'function') {
                             return context.addError(`Class "${thunk.name}" doesn't have a valid data type metadata`);
-                        else
-                            return context.addError(`Object doesn't have a valid data type metadata`);
+                        }
+                        return context.addError(`Object doesn't have a valid data type metadata`);
                     }
                     importQueue.set(metadata.name, thunk);
                 });
@@ -116,8 +117,9 @@ class DataTypeFactory {
                 continue;
             const dt = await this._importDataTypeArgs(context, owner, name);
             // istanbul ignore next
-            if (dt && typeof dt !== 'string')
+            if (dt && typeof dt !== 'string') {
                 context.addError(`Embedded data type can't be loaded into document node directly`);
+            }
         }
         return Array.from(initArgsMap.values());
     }
@@ -133,7 +135,7 @@ class DataTypeFactory {
         const { importQueue, initArgsMap } = context;
         // Check if data type already exist (maybe a builtin type or already imported)
         const dataType = owner.node.findDataType(thunk);
-        if (dataType)
+        if (dataType instanceof data_type_js_1.DataType)
             return dataType.name;
         let metadata;
         let ctor;
@@ -181,8 +183,9 @@ class DataTypeFactory {
                         const baseArgs = await this._importDataTypeArgs(context, owner, metadata.name);
                         if (!baseArgs)
                             return;
-                        if (typeof baseArgs === 'object' && baseArgs.kind !== index_js_2.OpraSchema.SimpleType.Kind)
+                        if (typeof baseArgs === 'object' && baseArgs.kind !== index_js_2.OpraSchema.SimpleType.Kind) {
                             return context.addError('Kind of base data type is not same');
+                        }
                         return {
                             kind: index_js_2.OpraSchema.SimpleType.Kind,
                             name: undefined,
@@ -212,11 +215,16 @@ class DataTypeFactory {
             /** Mark "out" object as initializing. This will help us to detect circular dependencies */
             out[initializingSymbol] = true;
             try {
-                if (out.name && importQueue?.has(out.name)) {
-                    initArgsMap?.set(metadata.name, out);
+                if (out.name) {
+                    if (importQueue?.has(out.name)) {
+                        initArgsMap?.set(metadata.name, out);
+                        out._instance = { name: metadata.name };
+                        out[constants_js_1.kDataTypeMap] = owner.node[constants_js_1.kDataTypeMap];
+                    }
+                    else {
+                        return context.addError(`Data Type (${out.name}) must be explicitly added to type list in the document scope`);
+                    }
                 }
-                else if (out.name)
-                    return context.addError(`Data Type (${out.name}) must be explicitly added to type list in the document scope`);
                 switch (out.kind) {
                     case index_js_2.OpraSchema.ComplexType.Kind:
                         out.ctor = ctor;
@@ -263,8 +271,9 @@ class DataTypeFactory {
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
-                if (Reflect.hasMetadata(constants_js_1.DATATYPE_METADATA, baseClass))
+                if (Reflect.hasMetadata(constants_js_1.DATATYPE_METADATA, baseClass)) {
                     baseArgs = await this._importDataTypeArgs(context, owner, baseClass);
+                }
             }
             if (!baseArgs)
                 return;
@@ -273,14 +282,16 @@ class DataTypeFactory {
         });
         // Initialize additionalFields
         if (metadata.additionalFields != null) {
-            if (typeof metadata.additionalFields === 'boolean' || Array.isArray(metadata.additionalFields))
+            if (typeof metadata.additionalFields === 'boolean' || Array.isArray(metadata.additionalFields)) {
                 initArgs.additionalFields = metadata.additionalFields;
-            else
+            }
+            else {
                 await context.enterAsync('.additionalFields', async () => {
                     const t = await this._importDataTypeArgs(context, owner, metadata.additionalFields);
                     if (t)
                         initArgs.additionalFields = preferName(t);
                 });
+            }
         }
         if (metadata.fields) {
             initArgs.fields = {};
@@ -288,9 +299,10 @@ class DataTypeFactory {
                 for (const [k, v] of Object.entries(metadata.fields)) {
                     await context.enterAsync(`[${k}]`, async () => {
                         const fieldMeta = typeof v === 'string' ? { type: v } : v;
-                        if (fieldMeta.isArray && !fieldMeta.type)
+                        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] = {
@@ -323,8 +335,9 @@ class DataTypeFactory {
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
-                if (Reflect.hasMetadata(constants_js_1.DATATYPE_METADATA, baseClass))
+                if (Reflect.hasMetadata(constants_js_1.DATATYPE_METADATA, baseClass)) {
                     baseArgs = await this._importDataTypeArgs(context, owner, baseClass);
+                }
             }
             if (!baseArgs)
                 return;
@@ -332,14 +345,17 @@ class DataTypeFactory {
             initArgs.ctor = initArgs.ctor || baseArgs.ctor;
         });
         initArgs.properties = metadata.properties;
+        initArgs.nameMappings = metadata.nameMappings;
         if (!initArgs.properties && initArgs.ctor)
             initArgs.properties = new initArgs.ctor();
         if (metadata.attributes)
             initArgs.attributes = (0, index_js_1.cloneObject)(metadata.attributes);
-        if (typeof initArgs.properties?.[constants_js_1.DECODER] === 'function')
+        if (typeof initArgs.properties?.[constants_js_1.DECODER] === 'function') {
             initArgs.generateDecoder = initArgs.properties?.[constants_js_1.DECODER].bind(initArgs.properties);
-        if (typeof initArgs.properties?.[constants_js_1.ENCODER] === 'function')
+        }
+        if (typeof initArgs.properties?.[constants_js_1.ENCODER] === 'function') {
             initArgs.generateEncoder = initArgs.properties?.[constants_js_1.ENCODER].bind(initArgs.properties);
+        }
     }
     static async _prepareMappedTypeArgs(context, owner, initArgs, metadata) {
         await this._prepareDataTypeArgs(context, initArgs, metadata);
@@ -350,8 +366,9 @@ class DataTypeFactory {
             }
             else if (initArgs.ctor) {
                 const baseClass = Object.getPrototypeOf(initArgs.ctor.prototype).constructor;
-                if (Reflect.hasMetadata(constants_js_1.DATATYPE_METADATA, baseClass))
+                if (Reflect.hasMetadata(constants_js_1.DATATYPE_METADATA, baseClass)) {
                     baseArgs = await this._importDataTypeArgs(context, owner, baseClass);
+                }
             }
             if (!baseArgs)
                 return;
@@ -362,10 +379,12 @@ class DataTypeFactory {
             initArgs.pick = [...metadata.pick];
         else if (metadata.omit)
             initArgs.omit = [...metadata.omit];
-        else if (metadata.partial)
+        else if (metadata.partial) {
             initArgs.partial = Array.isArray(metadata.partial) ? [...metadata.partial] : metadata.partial;
-        else if (metadata.required)
+        }
+        else if (metadata.required) {
             initArgs.required = Array.isArray(metadata.required) ? [...metadata.required] : metadata.required;
+        }
     }
     static async _prepareMixinTypeArgs(context, owner, initArgs, metadata) {
         await this._prepareDataTypeArgs(context, initArgs, metadata);
@@ -384,43 +403,52 @@ class DataTypeFactory {
         });
     }
     static _createDataType(context, owner, args) {
+        let dataType = owner.node.findDataType(typeof args === 'string' ? args : args.name || '');
+        if (dataType instanceof data_type_js_1.DataType)
+            return dataType;
         const initArgs = typeof args === 'string' ? context.initArgsMap?.get(args) : args;
-        switch (initArgs?.kind) {
-            case index_js_2.OpraSchema.ComplexType.Kind:
-                return this._createComplexType(context, owner, initArgs);
-            case index_js_2.OpraSchema.EnumType.Kind:
-                return this._createEnumType(context, owner, initArgs);
-            case index_js_2.OpraSchema.MappedType.Kind:
-                return this._createMappedType(context, owner, initArgs);
-            case index_js_2.OpraSchema.MixinType.Kind:
-                return this._createMixinType(context, owner, initArgs);
-            case index_js_2.OpraSchema.SimpleType.Kind:
-                return this._createSimpleType(context, owner, initArgs);
+        if (initArgs) {
+            const dataTypeMap = initArgs[constants_js_1.kDataTypeMap];
+            if (!dataTypeMap)
+                delete initArgs._instance;
+            dataType = initArgs._instance;
+            if (dataType?.name && dataTypeMap) {
+                dataTypeMap.set(dataType.name, dataType);
+            }
+            switch (initArgs?.kind) {
+                case index_js_2.OpraSchema.ComplexType.Kind:
+                    return this._createComplexType(context, owner, initArgs);
+                case index_js_2.OpraSchema.EnumType.Kind:
+                    return this._createEnumType(context, owner, initArgs);
+                case index_js_2.OpraSchema.MappedType.Kind:
+                    return this._createMappedType(context, owner, initArgs);
+                case index_js_2.OpraSchema.MixinType.Kind:
+                    return this._createMixinType(context, owner, initArgs);
+                case index_js_2.OpraSchema.SimpleType.Kind:
+                    return this._createSimpleType(context, owner, initArgs);
+                default:
+                    break;
+            }
         }
         context.addError(`Unknown data type (${String(args)})`);
     }
     static _createComplexType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, complex_type_js_1.ComplexType.prototype);
         const initArgs = (0, index_js_1.cloneObject)(args);
         if (args.base) {
             context.enter('.base', () => {
-                initArgs.base = (owner.node.findDataType(args.base) ||
-                    this._createDataType(context, owner, args.base));
+                initArgs.base = this._createDataType(context, owner, args.base);
             });
         }
         /** Set additionalFields */
         if (args.additionalFields) {
             context.enter('.additionalFields', () => {
-                if (typeof args.additionalFields === 'boolean' || Array.isArray(args.additionalFields))
+                if (typeof args.additionalFields === 'boolean' || Array.isArray(args.additionalFields)) {
                     initArgs.additionalFields = args.additionalFields;
+                }
                 else {
-                    if (typeof args.additionalFields === 'string') {
-                        initArgs.additionalFields =
-                            owner.node.findDataType(args.additionalFields) ||
-                                this._createDataType(context, owner, args.additionalFields);
-                    }
-                    else {
-                        initArgs.additionalFields = this._createDataType(context, owner, args.additionalFields);
-                    }
+                    initArgs.additionalFields = this._createDataType(context, owner, args.additionalFields);
                 }
             });
         }
@@ -430,40 +458,49 @@ class DataTypeFactory {
             context.enter('.fields', () => {
                 for (const [k, v] of Object.entries(args.fields)) {
                     context.enter(`[${k}]`, () => {
-                        const type = owner.node.findDataType(v.type) || this._createDataType(context, owner, v.type);
-                        if (type)
+                        const type = this._createDataType(context, owner, v.type);
+                        if (type) {
                             initArgs.fields[k] = {
                                 ...v,
                                 name: k,
                                 type,
                             };
+                        }
                     });
                 }
             });
         }
-        return new complex_type_js_1.ComplexType(owner, initArgs);
+        complex_type_js_1.ComplexType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
     static _createEnumType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, enum_type_js_1.EnumType.prototype);
         const initArgs = (0, index_js_1.cloneObject)(args);
         if (args.base) {
             context.enter('.base', () => {
-                initArgs.base = (owner.node.findDataType(args.base) ||
-                    this._createDataType(context, owner, args.base));
+                initArgs.base = this._createDataType(context, owner, args.base);
             });
         }
         initArgs.attributes = args.attributes;
-        return new enum_type_js_1.EnumType(owner, initArgs);
+        enum_type_js_1.EnumType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
     static _createMappedType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, mapped_type_js_1.MappedType.prototype);
         const initArgs = (0, index_js_1.cloneObject)(args);
         if (args.base) {
             context.enter('.base', () => {
-                initArgs.base = (owner.node.findDataType(args.base) || this._createDataType(context, owner, args.base));
+                initArgs.base = this._createDataType(context, owner, args.base);
             });
         }
-        return new mapped_type_js_1.MappedType(owner, initArgs);
+        mapped_type_js_1.MappedType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
     static _createMixinType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, mixin_type_js_1.MixinType.prototype);
         const initArgs = (0, index_js_1.cloneObject)(args);
         if (args.types) {
             context.enter('.types', () => {
@@ -471,25 +508,29 @@ class DataTypeFactory {
                 let i = 0;
                 for (const t of args.types) {
                     context.enter(`[${i++}]`, () => {
-                        const base = owner.node.findDataType(t) || this._createDataType(context, owner, t);
-                        if (!(base instanceof complex_type_base_js_1.ComplexTypeBase))
+                        const base = this._createDataType(context, owner, t);
+                        if (!(base instanceof complex_type_base_js_1.ComplexTypeBase)) {
                             throw new TypeError(`"${base?.kind}" can't be set as base for a "${initArgs.kind}"`);
+                        }
                         initArgs.types.push(base);
                     });
                 }
             });
         }
-        return new mixin_type_js_1.MixinType(owner, initArgs);
+        mixin_type_js_1.MixinType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
     static _createSimpleType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, simple_type_js_1.SimpleType.prototype);
         const initArgs = (0, index_js_1.cloneObject)(args);
         if (args.base) {
             context.enter('.base', () => {
-                initArgs.base = (owner.node.findDataType(args.base) ||
-                    this._createDataType(context, owner, args.base));
+                initArgs.base = this._createDataType(context, owner, args.base);
             });
         }
-        return new simple_type_js_1.SimpleType(owner, initArgs);
+        simple_type_js_1.SimpleType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
 }
 exports.DataTypeFactory = DataTypeFactory;

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

@@ -24,6 +24,7 @@ class HttpApiFactory {
      */
     static async createApi(context, document, init) {
         const api = new http_api_js_1.HttpApi(document);
+        api.name = init.name;
         api.description = init.description;
         api.url = init.url;
         if (init.controllers) {
@@ -47,8 +48,9 @@ class HttpApiFactory {
         return api;
     }
     static async _createController(context, parent, thunk, name) {
-        if (typeof thunk === 'function' && !(0, index_js_1.isConstructor)(thunk))
+        if (typeof thunk === 'function' && !(0, index_js_1.isConstructor)(thunk)) {
             thunk = parent instanceof http_controller_js_1.HttpController ? thunk(parent.instance) : thunk();
+        }
         thunk = await (0, index_js_1.resolveThunk)(thunk);
         let ctor;
         let metadata;
@@ -208,7 +210,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/cjs/document/http/http-api.js

@@ -31,8 +31,8 @@ class HttpApi extends api_base_js_1.ApiBase {
             url: this.url,
             controllers: {},
         };
-        for (const [name, v] of this.controllers.entries()) {
-            out.controllers[name] = v.toJSON();
+        for (const v of this.controllers.values()) {
+            out.controllers[v.name] = v.toJSON();
         }
         return out;
     }

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpController = void 0;
+const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const ts_gems_1 = require("ts-gems");
 const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
@@ -61,7 +63,7 @@ class HttpControllerClass extends document_element_js_1.DocumentElement {
                 if (c.controllers.size) {
                     controller = c.findController(arg0);
                     if (controller) {
-                        this._controllerReverseMap.set(arg0, c);
+                        this._controllerReverseMap.set(arg0, controller);
                         return controller;
                     }
                 }
@@ -82,15 +84,25 @@ class HttpControllerClass extends document_element_js_1.DocumentElement {
         return this.controllers.get(arg0);
     }
     findParameter(paramName, location) {
-        paramName = paramName.toLowerCase();
-        for (const prm of this.parameters) {
-            if ((!location || location === prm.location) &&
-                ((prm.name instanceof RegExp && prm.name.test(paramName)) ||
-                    (typeof prm.name === 'string' && prm.name.toLowerCase() === paramName)))
+        const paramNameLower = paramName.toLowerCase();
+        let prm;
+        for (prm of this.parameters) {
+            if (location && location !== prm.location)
+                continue;
+            if (typeof prm.name === 'string') {
+                prm._nameLower = prm._nameLower || prm.name.toLowerCase();
+                if (prm._nameLower === paramNameLower)
+                    return prm;
+            }
+            if (prm.name instanceof RegExp && prm.name.test(paramName))
                 return prm;
         }
-        if (this.node.parent && this.node.parent.element instanceof exports.HttpController)
+        if (this.node.parent && this.node.parent.element instanceof exports.HttpController) {
             return this.node.parent.element.findParameter(paramName, location);
+        }
+    }
+    getFullUrl() {
+        return node_path_1.default.posix.join(this.owner instanceof exports.HttpController ? this.owner.getFullUrl() : '/', this.path);
     }
     /**
      *
@@ -109,20 +121,20 @@ class HttpControllerClass extends document_element_js_1.DocumentElement {
         });
         if (this.operations.size) {
             out.operations = {};
-            for (const [name, v] of this.operations.entries()) {
-                out.operations[name] = v.toJSON();
+            for (const v of this.operations.values()) {
+                out.operations[v.name] = v.toJSON();
             }
         }
         if (this.controllers.size) {
             out.controllers = {};
-            for (const [name, v] of this.controllers.entries()) {
-                out.controllers[name] = v.toJSON();
+            for (const v of this.controllers.values()) {
+                out.controllers[v.name] = v.toJSON();
             }
         }
         if (this.types.size) {
             out.types = {};
-            for (const [name, v] of this.types.entries()) {
-                out.types[name] = v.toJSON();
+            for (const v of this.types.values()) {
+                out.types[v.name] = v.toJSON();
             }
         }
         if (this.parameters.length) {

package/cjs/document/http/http-media-type.js

@@ -25,8 +25,9 @@ exports.HttpMediaType = function (owner, initArgs) {
     _this.maxFileSize = initArgs.maxFileSize;
     _this.maxTotalFileSize = initArgs.maxTotalFileSize;
     _this.minFileSize = initArgs.minFileSize;
-    if (initArgs?.type)
+    if (initArgs?.type) {
         _this.type = initArgs?.type instanceof data_type_js_1.DataType ? initArgs.type : _this.owner.node.getDataType(initArgs.type);
+    }
     _this.isArray = initArgs.isArray;
 };
 /**
@@ -38,8 +39,9 @@ class HttpMediaTypeClass extends document_element_js_1.DocumentElement {
             return;
         for (const f of this.multipartFields) {
             if ((!fieldType || fieldType === f.fieldType) &&
-                ((f.fieldName instanceof RegExp && f.fieldName.test(fieldName)) || f.fieldName === fieldName))
+                ((f.fieldName instanceof RegExp && f.fieldName.test(fieldName)) || f.fieldName === fieldName)) {
                 return f;
+            }
         }
     }
     toJSON() {

package/cjs/document/http/http-operation-response.js

@@ -19,8 +19,9 @@ class HttpOperationResponse extends http_media_type_js_1.HttpMediaType {
         paramName = paramName.toLowerCase();
         for (const prm of this.parameters) {
             if ((!location || location === prm.location) &&
-                ((prm.name instanceof RegExp && prm.name.test(paramName)) || prm.name === paramName))
+                ((prm.name instanceof RegExp && prm.name.test(paramName)) || prm.name === paramName)) {
                 return prm;
+            }
         }
     }
     toJSON() {

package/cjs/document/http/http-operation.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpOperation = void 0;
+const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const ts_gems_1 = require("ts-gems");
 const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
@@ -39,13 +41,24 @@ exports.HttpOperation = function (...args) {
  */
 class HttpOperationClass extends document_element_js_1.DocumentElement {
     findParameter(paramName, location) {
-        paramName = paramName.toLowerCase();
-        for (const prm of this.parameters) {
-            if ((!location || location === prm.location) &&
-                ((prm.name instanceof RegExp && prm.name.test(paramName)) || prm.name === paramName))
+        const paramNameLower = paramName.toLowerCase();
+        let prm;
+        for (prm of this.parameters) {
+            if (location && location !== prm.location)
+                continue;
+            if (typeof prm.name === 'string') {
+                prm._nameLower = prm._nameLower || prm.name.toLowerCase();
+                if (prm._nameLower === paramNameLower)
+                    return prm;
+            }
+            if (prm.name instanceof RegExp && prm.name.test(paramName))
                 return prm;
         }
     }
+    getFullUrl() {
+        const out = this.owner.getFullUrl();
+        return out ? (this.path ? node_path_1.default.posix.join(out, this.path) : out) : this.path || '/';
+    }
     toJSON() {
         const out = (0, index_js_1.omitUndefined)({
             kind: index_js_2.OpraSchema.HttpOperation.Kind,

package/cjs/document/http/http-parameter.js

@@ -25,6 +25,7 @@ exports.HttpParameter = function (owner, initArgs) {
     _this.deprecated = initArgs.deprecated;
     _this.required = initArgs.required;
     _this.arraySeparator = initArgs.arraySeparator;
+    _this.keyParam = initArgs.keyParam;
 };
 /**
  * @class HttpParameter
@@ -36,6 +37,7 @@ class HttpParameterClass extends value_js_1.Value {
             name: this.name,
             location: this.location,
             arraySeparator: this.arraySeparator,
+            keyParam: this.keyParam,
             required: this.required,
             deprecated: this.deprecated,
         });

package/cjs/document/http/http-status-range.js

@@ -31,8 +31,7 @@ class HttpStatusRange {
     toString() {
         if (this.start === this.end)
             return String(this.start);
-        else
-            return String(this.start) + '-' + String(this.end);
+        return String(this.start) + '-' + String(this.end);
     }
     toJSON() {
         return !this.end || this.start === this.end ? this.start : { start: this.start, end: this.end };

package/cjs/document/index.js

@@ -6,36 +6,36 @@ require("reflect-metadata");
 const DataTypeFactory_ = tslib_1.__importStar(require("./factory/data-type.factory.js"));
 const HttpApiFactory_ = tslib_1.__importStar(require("./factory/http-api.factory.js"));
 tslib_1.__exportStar(require("./api-document.js"), exports);
-tslib_1.__exportStar(require("./constants.js"), exports);
 tslib_1.__exportStar(require("./common/api-base.js"), exports);
 tslib_1.__exportStar(require("./common/data-type-map.js"), exports);
 tslib_1.__exportStar(require("./common/document-element.js"), exports);
 tslib_1.__exportStar(require("./common/document-init-context.js"), exports);
 tslib_1.__exportStar(require("./common/document-node.js"), exports);
 tslib_1.__exportStar(require("./common/opra-document-error.js"), exports);
+tslib_1.__exportStar(require("./constants.js"), exports);
+tslib_1.__exportStar(require("./data-type/api-field.js"), exports);
 tslib_1.__exportStar(require("./data-type/complex-type.js"), exports);
 tslib_1.__exportStar(require("./data-type/data-type.js"), exports);
 tslib_1.__exportStar(require("./data-type/enum-type.js"), exports);
-tslib_1.__exportStar(require("./data-type/api-field.js"), exports);
+tslib_1.__exportStar(require("./data-type/extended-types/index.js"), exports);
 tslib_1.__exportStar(require("./data-type/mapped-type.js"), exports);
 tslib_1.__exportStar(require("./data-type/mixin-type.js"), exports);
 tslib_1.__exportStar(require("./data-type/omit-type.js"), exports);
 tslib_1.__exportStar(require("./data-type/partial-type.js"), exports);
 tslib_1.__exportStar(require("./data-type/pick-type.js"), exports);
+tslib_1.__exportStar(require("./data-type/primitive-types/index.js"), exports);
 tslib_1.__exportStar(require("./data-type/required-type.js"), exports);
 tslib_1.__exportStar(require("./data-type/simple-type.js"), exports);
-tslib_1.__exportStar(require("./data-type/primitive-types/index.js"), exports);
-tslib_1.__exportStar(require("./data-type/extended-types/index.js"), exports);
 tslib_1.__exportStar(require("./decorators/http-operation-entity.decorator.js"), exports);
 tslib_1.__exportStar(require("./factory/api-document.factory.js"), exports);
 tslib_1.__exportStar(require("./http/http-api.js"), exports);
+tslib_1.__exportStar(require("./http/http-controller.js"), exports);
 tslib_1.__exportStar(require("./http/http-media-type.js"), exports);
 tslib_1.__exportStar(require("./http/http-multipart-field.js"), exports);
 tslib_1.__exportStar(require("./http/http-operation.js"), exports);
 tslib_1.__exportStar(require("./http/http-operation-response.js"), exports);
 tslib_1.__exportStar(require("./http/http-parameter.js"), exports);
 tslib_1.__exportStar(require("./http/http-request-body.js"), exports);
-tslib_1.__exportStar(require("./http/http-controller.js"), exports);
 tslib_1.__exportStar(require("./http/http-status-range.js"), exports);
 var classes;
 (function (classes) {

package/cjs/exception/index.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./opra-exception.js"), exports);
-tslib_1.__exportStar(require("./opra-http-error.js"), exports);
 tslib_1.__exportStar(require("./error-issue.js"), exports);
-tslib_1.__exportStar(require("./issue-severity.enum.js"), exports);
 tslib_1.__exportStar(require("./http-errors/bad-request.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/conflict.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/failed-dependency.error.js"), exports);
@@ -13,8 +10,11 @@ tslib_1.__exportStar(require("./http-errors/internal-server.error.js"), exports)
 tslib_1.__exportStar(require("./http-errors/method-not-allowed.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/not-acceptable.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/not-found.error.js"), exports);
-tslib_1.__exportStar(require("./http-errors/unauthorized.error.js"), exports);
-tslib_1.__exportStar(require("./http-errors/unprocessable-entity.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/permission.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/resource-conflict.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/resource-not.available.error.js"), exports);
+tslib_1.__exportStar(require("./http-errors/unauthorized.error.js"), exports);
+tslib_1.__exportStar(require("./http-errors/unprocessable-entity.error.js"), exports);
+tslib_1.__exportStar(require("./issue-severity.enum.js"), exports);
+tslib_1.__exportStar(require("./opra-exception.js"), exports);
+tslib_1.__exportStar(require("./opra-http-error.js"), exports);