@opra/common 1.19.7 → 1.20.0

package/cjs/document/api-document.js

@@ -51,18 +51,30 @@ class ApiDocument extends document_element_js_1.DocumentElement {
         }
     }
     get httpApi() {
+        if (this.api && this.api instanceof http_api_js_1.HttpApi)
+            return this.api;
+    }
+    get mqApi() {
+        if (this.api && this.api instanceof mq_api_js_1.MQApi)
+            return this.api;
+    }
+    get wsApi() {
+        if (this.api && this.api instanceof ws_api_js_1.WSApi)
+            return this.api;
+    }
+    getHttpApi() {
         if (!(this.api && this.api instanceof http_api_js_1.HttpApi)) {
             throw new TypeError('The document do not contains HttpApi instance');
         }
         return this.api;
     }
-    get mqApi() {
+    getMqApi() {
         if (!(this.api && this.api instanceof mq_api_js_1.MQApi)) {
             throw new TypeError('The document do not contains MQApi instance');
         }
         return this.api;
     }
-    get wsApi() {
+    getWsApi() {
         if (!(this.api && this.api instanceof ws_api_js_1.WSApi)) {
             throw new TypeError('The document do not contains WSApi instance');
         }

package/cjs/document/common/document-node.js

@@ -64,6 +64,17 @@ class DocumentNode {
         const ns = this.getDocument().getDataTypeNs(dataType);
         return ns ? ns + ':' + dataType.name : dataType.name;
     }
+    /**
+     * Returns EnumType instance by name or Constructor.
+     * Returns undefined if not found
+     * Throws error if data type is not a UnionType
+     */
+    getArrayType(nameOrCtor, scope) {
+        const t = this.getDataType(nameOrCtor, scope);
+        if (t.kind === index_js_1.OpraSchema.ArrayType.Kind)
+            return t;
+        throw new TypeError(`Data type "${t.name || t}" is not a MixinType`);
+    }
     /**
      * Returns ComplexType instance by name or Constructor.
      * Returns undefined if not found
@@ -128,7 +139,7 @@ class DocumentNode {
         const t = this.getDataType(nameOrCtor, scope);
         if (t.kind === index_js_1.OpraSchema.UnionType.Kind)
             return t;
-        throw new TypeError(`Data type "${t.name || t}" is not a MixinType`);
+        throw new TypeError(`Data type "${t.name || t}" is not a UnionType`);
     }
 }
 exports.DocumentNode = DocumentNode;

package/cjs/document/constants.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kTypeNSMap = exports.kCtorMap = exports.kDataTypeMap = exports.CLASS_NAME_PATTERN = exports.NAMESPACE_PATTERN = exports.BUILTIN = exports.DECORATOR = exports.ENCODER = exports.DECODER = exports.RPC_CONTROLLER_METADATA = exports.WS_CONTROLLER_METADATA = exports.MQ_CONTROLLER_METADATA = exports.HTTP_CONTROLLER_METADATA = exports.DATATYPE_METADATA = void 0;
+exports.kTypeNSMap = exports.kCtorMap = exports.kDataTypeMap = exports.CLASS_NAME_PATTERN = exports.NAMESPACE_PATTERN = exports.BUILTIN = exports.DECORATOR = exports.ENCODER = exports.DECODER = exports.RPC_CONTROLLER_METADATA = exports.WS_PARAM_METADATA = exports.WS_CONTROLLER_METADATA = exports.MQ_CONTROLLER_METADATA = exports.HTTP_CONTROLLER_METADATA = exports.DATATYPE_METADATA = void 0;
 exports.DATATYPE_METADATA = Symbol.for('opra.type.metadata');
 exports.HTTP_CONTROLLER_METADATA = Symbol('opra.http-controller.metadata');
 exports.MQ_CONTROLLER_METADATA = Symbol('opra.mq-controller.metadata');
 exports.WS_CONTROLLER_METADATA = Symbol('opra.ws-controller.metadata');
+exports.WS_PARAM_METADATA = Symbol('opra.ws-param.metadata');
 exports.RPC_CONTROLLER_METADATA = Symbol('opra.rpc-controller.metadata');
 exports.DECODER = Symbol.for('opra.type.decoder');
 exports.ENCODER = Symbol('opra.type.encoder');

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

@@ -48,12 +48,7 @@ exports.ApiField = function (...args) {
             ? initArgs.scopePattern
             : [initArgs.scopePattern]
         : undefined;
-    _this.convertToNative =
-        initArgs.convertToNative ??
-            (_this.type.kind === 'SimpleType' &&
-                initArgs.designType !== String &&
-                typeof initArgs.designType === 'function' &&
-                initArgs.designType !== Object);
+    _this.designType = initArgs.designType;
     _this.override = initArgs.override;
 };
 /**
@@ -117,6 +112,12 @@ class ApiFieldClass extends document_element_js_1.DocumentElement {
             examples: this.examples,
         });
     }
+    generateCodec(codec, options, properties) {
+        return this.type.generateCodec(codec, options, {
+            ...properties,
+            designType: this.designType,
+        });
+    }
 }
 exports.ApiField.prototype = ApiFieldClass.prototype;
 Object.assign(exports.ApiField, api_field_decorator_js_1.ApiFieldDecoratorFactory);

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

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArrayType = void 0;
+require("reflect-metadata");
+const objects_1 = require("@jsopen/objects");
+const ts_gems_1 = require("ts-gems");
+const valgen_1 = require("valgen");
+const index_js_1 = require("../../schema/index.js");
+const constants_js_1 = require("../constants.js");
+const data_type_js_1 = require("./data-type.js");
+/**
+ * @class ArrayType
+ */
+exports.ArrayType = function (...args) {
+    // ArrayType factory
+    if (!this) {
+        return exports.ArrayType[constants_js_1.DECORATOR].apply(undefined, args);
+    }
+    // Constructor
+    const [owner, initArgs, context] = args;
+    data_type_js_1.DataType.call(this, owner, initArgs, context);
+    const _this = (0, ts_gems_1.asMutable)(this);
+    _this.kind = index_js_1.OpraSchema.ArrayType.Kind;
+    _this.type = initArgs.type;
+    _this.minOccurs = initArgs.minOccurs;
+    _this.maxOccurs = initArgs.maxOccurs;
+};
+/**
+ *
+ * @class ArrayType
+ */
+class ArrayTypeClass extends data_type_js_1.DataType {
+    toJSON(options) {
+        const superJson = super.toJSON(options);
+        const typeName = this.node.getDataTypeNameWithNs(this.type);
+        return (0, objects_1.omitUndefined)({
+            ...superJson,
+            kind: this.kind,
+            type: typeName ? typeName : this.type.toJSON(options),
+            minOccurs: this.minOccurs,
+            maxOccurs: this.maxOccurs,
+        });
+    }
+    generateCodec(codec, options, properties) {
+        let fn = this.type.generateCodec(codec, options, properties);
+        fn = valgen_1.vg.isArray(fn);
+        const fns = [];
+        if (this.minOccurs)
+            fns.push(valgen_1.vg.lengthMin(this.minOccurs));
+        if (this.maxOccurs)
+            fns.push(valgen_1.vg.lengthMax(this.maxOccurs));
+        if (fns.length > 0)
+            return valgen_1.vg.pipe([fn, ...fns], { returnIndex: 0 });
+        return fn;
+    }
+    extendsFrom() {
+        return false;
+    }
+    _locateBase() {
+        return;
+    }
+}
+exports.ArrayType.prototype = ArrayTypeClass.prototype;
+exports.ArrayType[constants_js_1.DECORATOR] = ArrayTypeFactory;
+/**
+ *
+ */
+function ArrayTypeFactory(clasRefs, options) {
+    class ArrayClass {
+    }
+    const metadata = {
+        ...options,
+        kind: index_js_1.OpraSchema.ArrayType.Kind,
+        type: clasRefs,
+    };
+    Reflect.defineMetadata(constants_js_1.DATATYPE_METADATA, metadata, ArrayClass);
+    return ArrayClass;
+}

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

@@ -6,6 +6,7 @@ const object_hash_1 = tslib_1.__importDefault(require("object-hash"));
 const ts_gems_1 = require("ts-gems");
 const valgen_1 = require("valgen");
 const index_js_1 = require("../../helpers/index.js");
+const array_type_js_1 = require("./array-type.js");
 const data_type_js_1 = require("./data-type.js");
 exports.FIELD_PATH_PATTERN = /^([+-])?([a-z$_][\w.]*)$/i;
 /**
@@ -331,15 +332,13 @@ class ComplexTypeBaseClass extends data_type_js_1.DataType {
         return schema;
     }
     _generateFieldCodec(codec, field, context) {
-        let fn = field.type.generateCodec(codec, {
+        let fn = field.generateCodec(codec, {
             ...context,
             level: context.level + 1,
-        }, {
-            convertToNative: field.convertToNative,
         });
         if (field.fixed)
             fn = valgen_1.vg.isEqual(field.fixed);
-        if (field.isArray)
+        if (field.isArray && !(field.type instanceof array_type_js_1.ArrayType))
             fn = valgen_1.vg.isArray(fn);
         return fn;
     }

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

@@ -12,8 +12,10 @@ let Base64Type = class Base64Type {
     }
     [constants_js_1.DECODER](properties) {
         const fn = valgen_1.vg.isBase64({ coerce: true });
-        if (properties.convertToNative)
+        if (properties.designType === Buffer)
             return valgen_1.vg.pipe([fn, toBuffer], { coerce: true });
+        if (properties.designType === Uint8Array)
+            return valgen_1.vg.pipe([fn, toUint8Array], { coerce: true });
         return fn;
     }
     [constants_js_1.ENCODER]() {
@@ -35,6 +37,9 @@ exports.Base64Type = Base64Type = tslib_1.__decorate([
 const toBuffer = (0, valgen_1.validator)((base64String) => {
     return Buffer.from(base64String, 'base64');
 });
+const toUint8Array = (0, valgen_1.validator)((base64String) => {
+    return new Uint8Array(Buffer.from(base64String, 'base64'));
+});
 const fromBuffer = (0, valgen_1.validator)((input) => {
     if (Buffer.isBuffer(input))
         return input.toString('base64');

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

@@ -20,7 +20,7 @@ let DateTimeType = class DateTimeType {
     }
     [constants_js_1.DECODER](properties) {
         let fn;
-        if (properties.convertToNative) {
+        if (properties.designType === Date) {
             fn = _isDate;
         }
         else {

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

@@ -21,7 +21,7 @@ let DateType = class DateType {
     }
     [constants_js_1.DECODER](properties) {
         let fn;
-        if (properties.convertToNative) {
+        if (properties.designType === Date) {
             fn = _isDate;
         }
         else {

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

@@ -11,7 +11,7 @@ let FieldPathType = class FieldPathType {
         if (attributes)
             Object.assign(this, attributes);
     }
-    [constants_js_1.DECODER](properties, element, scope) {
+    [constants_js_1.DECODER](properties, { element, scope, }) {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');
@@ -19,8 +19,8 @@ let FieldPathType = class FieldPathType {
         const decodeFieldPath = (0, valgen_1.validator)('decodeFieldPath', (input) => dataType.normalizeFieldPath(input, { allowSigns, scope }));
         return valgen_1.vg.pipe([valgen_1.toString, decodeFieldPath]);
     }
-    [constants_js_1.ENCODER](properties, element, scope) {
-        return this[constants_js_1.DECODER](properties, element, scope);
+    [constants_js_1.ENCODER](properties, args) {
+        return this[constants_js_1.DECODER](properties, args);
     }
     toJSON(properties, element, options) {
         const dataType = properties.dataType

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

@@ -13,7 +13,7 @@ let FilterType = class FilterType {
         if (attributes)
             Object.assign(this, attributes);
     }
-    [constants_js_1.DECODER](properties, element) {
+    [constants_js_1.DECODER](properties, { element }) {
         const dataType = properties.dataType
             ? element.node.getComplexType(properties.dataType)
             : element.node.getComplexType('object');

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

@@ -74,7 +74,11 @@ class SimpleTypeClass extends data_type_js_1.DataType {
             let t = this;
             while (t) {
                 if (t._generateDecoder)
-                    return t._generateDecoder(prop, options?.documentElement || this.owner, options?.scope);
+                    return t._generateDecoder(prop, {
+                        dataType: this,
+                        element: options?.documentElement || this.owner,
+                        scope: options?.scope,
+                    });
                 t = this.base;
             }
             return valgen_1.isAny;
@@ -82,7 +86,11 @@ class SimpleTypeClass extends data_type_js_1.DataType {
         let t = this;
         while (t) {
             if (t._generateEncoder)
-                return t._generateEncoder(prop, options?.documentElement || this.owner, options?.scope);
+                return t._generateEncoder(prop, {
+                    dataType: this,
+                    element: options?.documentElement || this.owner,
+                    scope: options?.scope,
+                });
             t = this.base;
         }
         return valgen_1.isAny;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpOperationDecoratorFactory = HttpOperationDecoratorFactory;
+const objects_1 = require("@jsopen/objects");
 const index_js_1 = require("../../enums/index.js");
 const index_js_2 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
@@ -34,6 +35,8 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
                     type: arg1,
                 }
                 : { ...arg1, name, location: 'cookie' };
+            if ((0, objects_1.isConstructor)(paramMeta.type))
+                paramMeta.designType = paramMeta.type;
             if (meta.parameters) {
                 meta.parameters = meta.parameters.filter(p => !(p.location === 'cookie' && String(p.name) === String(name)));
             }
@@ -55,6 +58,8 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
                     type: arg1,
                 }
                 : { ...arg1, name, location: 'header' };
+            if ((0, objects_1.isConstructor)(paramMeta.type))
+                paramMeta.designType = paramMeta.type;
             if (meta.parameters) {
                 meta.parameters = meta.parameters.filter(p => !(p.location === 'header' && String(p.name) === String(name)));
             }
@@ -76,6 +81,8 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
                     type: arg1,
                 }
                 : { ...arg1, name, location: 'query' };
+            if ((0, objects_1.isConstructor)(paramMeta.type))
+                paramMeta.designType = paramMeta.type;
             if (meta.parameters) {
                 meta.parameters = meta.parameters.filter(p => !(p.location === 'query' && String(p.name) === String(name)));
             }
@@ -97,6 +104,8 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
                     type: arg1,
                 }
                 : { ...arg1, name, location: 'path' };
+            if ((0, objects_1.isConstructor)(paramMeta.type))
+                paramMeta.designType = paramMeta.type;
             if (meta.parameters) {
                 meta.parameters = meta.parameters.filter(p => !(p.location === 'path' && String(p.name) === String(name)));
             }
@@ -122,6 +131,8 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
         if (responseMeta.contentType === index_js_1.MimeTypes.opra_response_json) {
             responseMeta.contentEncoding = responseMeta.contentEncoding || 'utf-8';
         }
+        if ((0, objects_1.isConstructor)(responseMeta.type))
+            responseMeta.designType = responseMeta.type;
         decoratorChain.push((meta) => {
             meta.responses = meta.responses || [];
             meta.responses.push(responseMeta);
@@ -133,6 +144,8 @@ function HttpOperationDecoratorFactory(decoratorChain, options) {
         if (contentMeta.type) {
             contentMeta.contentType = contentMeta.contentType || index_js_1.MimeTypes.json;
             contentMeta.contentEncoding = contentMeta.contentEncoding || 'utf-8';
+            if ((0, objects_1.isConstructor)(contentMeta.type))
+                contentMeta.designType = contentMeta.type;
         }
         decoratorChain.push((operationMetadata) => {
             operationMetadata.requestBody = operationMetadata.requestBody || {

package/cjs/document/decorators/mq-operation.decorator.js

@@ -5,7 +5,7 @@ const objects_1 = require("@jsopen/objects");
 const index_js_1 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
 const augmentationRegistry = [];
-function MQOperationDecoratorFactory(decoratorChain, payloadType, options) {
+function MQOperationDecoratorFactory(decoratorChain, type, options) {
     let inResponse = false;
     /**
      *
@@ -16,8 +16,8 @@ function MQOperationDecoratorFactory(decoratorChain, payloadType, options) {
         const operationMetadata = {
             kind: index_js_1.OpraSchema.MQOperation.Kind,
             channel: propertyKey,
-            payloadType,
-            ...(0, objects_1.omit)(options, ['kind', 'payloadType']),
+            type,
+            ...(0, objects_1.omit)(options, ['kind', 'type']),
         };
         const controllerMetadata = (Reflect.getOwnMetadata(constants_js_1.MQ_CONTROLLER_METADATA, target.constructor) || {});
         controllerMetadata.operations = controllerMetadata.operations || {};
@@ -29,10 +29,10 @@ function MQOperationDecoratorFactory(decoratorChain, payloadType, options) {
     /**
      *
      */
-    decorator.UseType = (...type) => {
+    decorator.UseType = (...types) => {
         decoratorChain.push((meta) => {
             meta.types = meta.types || [];
-            meta.types.push(...type);
+            meta.types.push(...types);
         });
         return decorator;
     };
@@ -47,6 +47,8 @@ function MQOperationDecoratorFactory(decoratorChain, payloadType, options) {
                     type: arg1,
                 }
                 : { ...arg1, name };
+            if ((0, objects_1.isConstructor)(headerMetadata.type))
+                headerMetadata.designType = headerMetadata.type;
             const subMeta = inResponse ? meta.response : meta;
             if (subMeta.headers) {
                 subMeta.headers = subMeta.headers.filter(p => String(p.name) !== String(name));
@@ -60,17 +62,19 @@ function MQOperationDecoratorFactory(decoratorChain, payloadType, options) {
     /**
      *
      */
-    decorator.Response = (_payloadType, _options) => {
+    decorator.Response = (_type, _options) => {
         decoratorChain.push((meta) => {
             inResponse = true;
             meta.response = {
                 ..._options,
-                payloadType: _payloadType,
+                type: _type,
             };
+            if ((0, objects_1.isConstructor)(_type))
+                meta.response.designType = _type;
         });
         return decorator;
     };
-    augmentationRegistry.forEach(fn => fn(decorator, decoratorChain, payloadType, options));
+    augmentationRegistry.forEach(fn => fn(decorator, decoratorChain, type, options));
     return decorator;
 }
 MQOperationDecoratorFactory.augment = function (fn) {

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

@@ -16,10 +16,10 @@ function WSControllerDecoratorFactory(options) {
         if (!name)
             name = CLASS_NAME_PATTERN.exec(target.name)?.[1] || target.name;
         const metadata = {};
-        const baseMetadata = Reflect.getOwnMetadata(constants_js_1.MQ_CONTROLLER_METADATA, Object.getPrototypeOf(target));
+        const baseMetadata = Reflect.getOwnMetadata(constants_js_1.WS_CONTROLLER_METADATA, Object.getPrototypeOf(target));
         if (baseMetadata)
             (0, objects_1.merge)(metadata, baseMetadata, { deep: true });
-        const oldMetadata = Reflect.getOwnMetadata(constants_js_1.MQ_CONTROLLER_METADATA, target);
+        const oldMetadata = Reflect.getOwnMetadata(constants_js_1.WS_CONTROLLER_METADATA, target);
         if (oldMetadata)
             (0, objects_1.merge)(metadata, oldMetadata, { deep: true });
         (0, objects_1.merge)(metadata, {
@@ -28,10 +28,10 @@ function WSControllerDecoratorFactory(options) {
             name,
             path: name,
         }, { deep: true });
-        Reflect.defineMetadata(constants_js_1.MQ_CONTROLLER_METADATA, metadata, target);
+        Reflect.defineMetadata(constants_js_1.WS_CONTROLLER_METADATA, metadata, target);
         for (const fn of decoratorChain)
             fn(metadata, target);
-        Reflect.defineMetadata(constants_js_1.MQ_CONTROLLER_METADATA, metadata, target);
+        Reflect.defineMetadata(constants_js_1.WS_CONTROLLER_METADATA, metadata, target);
     };
     /**
      *

package/cjs/document/decorators/ws-operation.decorator.js

@@ -5,7 +5,7 @@ const objects_1 = require("@jsopen/objects");
 const index_js_1 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
 const augmentationRegistry = [];
-function WSOperationDecoratorFactory(decoratorChain, payloadType, options) {
+function WSOperationDecoratorFactory(decoratorChain, options) {
     /**
      *
      */
@@ -14,16 +14,15 @@ function WSOperationDecoratorFactory(decoratorChain, payloadType, options) {
             throw new TypeError(`Symbol properties can not be decorated`);
         const operationMetadata = {
             kind: index_js_1.OpraSchema.WSOperation.Kind,
-            channel: propertyKey,
-            payloadType,
-            ...(0, objects_1.omit)(options, ['kind', 'payloadType']),
+            event: propertyKey,
+            ...(0, objects_1.omit)(options, ['kind']),
         };
-        const controllerMetadata = (Reflect.getOwnMetadata(constants_js_1.MQ_CONTROLLER_METADATA, target.constructor) || {});
+        const controllerMetadata = (Reflect.getOwnMetadata(constants_js_1.WS_CONTROLLER_METADATA, target.constructor) || {});
         controllerMetadata.operations = controllerMetadata.operations || {};
         controllerMetadata.operations[propertyKey] = operationMetadata;
         for (const fn of decoratorChain)
             fn(operationMetadata, target, propertyKey);
-        Reflect.defineMetadata(constants_js_1.MQ_CONTROLLER_METADATA, controllerMetadata, target.constructor);
+        Reflect.defineMetadata(constants_js_1.WS_CONTROLLER_METADATA, controllerMetadata, target.constructor);
     });
     /**
      *
@@ -35,7 +34,7 @@ function WSOperationDecoratorFactory(decoratorChain, payloadType, options) {
         });
         return decorator;
     };
-    augmentationRegistry.forEach(fn => fn(decorator, decoratorChain, payloadType, options));
+    augmentationRegistry.forEach(fn => fn(decorator, decoratorChain, options));
     return decorator;
 }
 WSOperationDecoratorFactory.augment = function (fn) {

package/cjs/document/decorators/ws-param.decorator.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WsParam = WsParam;
+const constants_js_1 = require("../constants.js");
+function WsParam(type) {
+    return (target, propertyKey, parameterIndex) => {
+        if (typeof propertyKey !== 'string')
+            throw new TypeError(`Un-named properties can not be decorated`);
+        if (!type) {
+            const designTypes = Reflect.getMetadata('design:paramtypes', target, propertyKey);
+            type = designTypes[parameterIndex];
+            if (!type)
+                throw new TypeError(`Missing parameter type`);
+        }
+        let paramMetadata = Reflect.getOwnMetadata(constants_js_1.WS_PARAM_METADATA, target, propertyKey);
+        if (!paramMetadata) {
+            paramMetadata = [];
+            Reflect.defineMetadata(constants_js_1.WS_PARAM_METADATA, paramMetadata, target, propertyKey);
+        }
+        paramMetadata[parameterIndex] = type;
+    };
+}

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

@@ -13,6 +13,7 @@ const primitiveTypes = tslib_1.__importStar(require("../data-type/primitive-type
 const data_type_factory_js_1 = require("./data-type.factory.js");
 const http_api_factory_js_1 = require("./http-api.factory.js");
 const mq_api_factory_js_1 = require("./mq-api.factory.js");
+const ws_api_factory_js_1 = require("./ws-api.factory.js");
 const OPRA_SPEC_URL = 'https://oprajs.com/spec/v' + index_js_2.OpraSchema.SpecVersion;
 /**
  * @class ApiDocumentFactory
@@ -131,6 +132,14 @@ class ApiDocumentFactory {
                     if (api)
                         document.api = api;
                 }
+                else if (init.api && init.api.transport === 'ws') {
+                    const api = await ws_api_factory_js_1.WSApiFactory.createApi(context, {
+                        ...init.api,
+                        owner: document,
+                    });
+                    if (api)
+                        document.api = api;
+                }
                 else
                     context.addError(`Unknown service transport (${init.api.transport})`);
             });

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

@@ -5,6 +5,7 @@ const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
 const document_init_context_js_1 = require("../common/document-init-context.js");
 const constants_js_1 = require("../constants.js");
+const array_type_js_1 = require("../data-type/array-type.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");
@@ -251,6 +252,9 @@ class DataTypeFactory {
                     }
                 }
                 switch (out.kind) {
+                    case index_js_2.OpraSchema.ArrayType.Kind:
+                        await this._prepareArrayTypeArgs(context, owner, out, metadata);
+                        break;
                     case index_js_2.OpraSchema.ComplexType.Kind:
                         out.ctor = ctor;
                         await this._prepareComplexTypeArgs(context, owner, out, metadata);
@@ -291,6 +295,15 @@ class DataTypeFactory {
         initArgs.examples = metadata.examples;
         initArgs.scopePattern = metadata.scopePattern;
     }
+    static async _prepareArrayTypeArgs(context, owner, initArgs, metadata) {
+        await this._prepareDataTypeArgs(context, initArgs, metadata);
+        await context.enterAsync('.type', async () => {
+            const baseArgs = await this._importDataTypeArgs(context, owner, metadata.type);
+            if (!baseArgs)
+                return;
+            initArgs.type = preferName(baseArgs);
+        });
+    }
     static async _prepareComplexTypeArgs(context, owner, initArgs, metadata) {
         await this._prepareDataTypeArgs(context, initArgs, metadata);
         initArgs.keyField = metadata.keyField;
@@ -471,6 +484,8 @@ class DataTypeFactory {
                 dataTypeMap.set(dataType.name, dataType);
             }
             switch (initArgs?.kind) {
+                case index_js_2.OpraSchema.ArrayType.Kind:
+                    return this._createArrayType(context, owner, initArgs);
                 case index_js_2.OpraSchema.ComplexType.Kind:
                     return this._createComplexType(context, owner, initArgs);
                 case index_js_2.OpraSchema.EnumType.Kind:
@@ -489,6 +504,18 @@ class DataTypeFactory {
         }
         context.addError(`Unknown data type (${String(args)})`);
     }
+    static _createArrayType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, array_type_js_1.ArrayType.prototype);
+        const initArgs = (0, index_js_1.cloneObject)(args);
+        if (args.type) {
+            context.enter('.type', () => {
+                initArgs.type = this._createDataType(context, owner, args.type);
+            });
+        }
+        array_type_js_1.ArrayType.apply(dataType, [owner, initArgs]);
+        return dataType;
+    }
     static _createComplexType(context, owner, args) {
         const dataType = args._instance || {};
         Object.setPrototypeOf(dataType, complex_type_js_1.ComplexType.prototype);

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

@@ -116,7 +116,7 @@ class MQApiFactory {
                             ...operationMeta,
                             name: operationName,
                             types: undefined,
-                            payloadType: undefined,
+                            type: undefined,
                             keyType: undefined,
                         });
                         await this._initMQOperation(context, operation, operationMeta);
@@ -140,7 +140,7 @@ class MQApiFactory {
                 await data_type_factory_js_1.DataTypeFactory.addDataTypes(context, operation, metadata.types);
             });
         }
-        operation.payloadType = await data_type_factory_js_1.DataTypeFactory.resolveDataType(context, operation, metadata.payloadType);
+        operation.type = await data_type_factory_js_1.DataTypeFactory.resolveDataType(context, operation, metadata.type);
         if (metadata.keyType) {
             operation.keyType = await data_type_factory_js_1.DataTypeFactory.resolveDataType(context, operation, metadata.keyType);
         }
@@ -163,7 +163,7 @@ class MQApiFactory {
             await context.enterAsync('.response', async () => {
                 const response = new mq_operation_response_js_1.MQOperationResponse(operation, {
                     ...metadata.response,
-                    payloadType: undefined,
+                    type: undefined,
                     keyType: undefined,
                 });
                 await this._initMQOperationResponse(context, response, metadata.response);
@@ -179,7 +179,7 @@ class MQApiFactory {
      * @protected
      */
     static async _initMQOperationResponse(context, response, metadata) {
-        response.payloadType = await data_type_factory_js_1.DataTypeFactory.resolveDataType(context, response, metadata.payloadType);
+        response.type = await data_type_factory_js_1.DataTypeFactory.resolveDataType(context, response, metadata.type);
         if (metadata.keyType) {
             response.keyType = await data_type_factory_js_1.DataTypeFactory.resolveDataType(context, response, metadata.keyType);
         }