@opra/common 1.19.7 → 1.20.0

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

@@ -87,17 +87,26 @@ class WSApiFactory {
         }
         if (metadata.operations) {
             await context.enterAsync('.operations', async () => {
-                for (const [operationName, operationMeta] of Object.entries(metadata.operations)) {
+                for (const [operationName, _operationMeta] of Object.entries(metadata.operations)) {
                     await context.enterAsync(`[${operationName}]`, async () => {
+                        const argumentsMetadata = Reflect.getMetadata(constants_js_1.WS_PARAM_METADATA, ctor.prototype, operationName);
+                        let operationMeta = _operationMeta;
+                        if (argumentsMetadata) {
+                            operationMeta = {
+                                ...operationMeta,
+                                arguments: argumentsMetadata,
+                            };
+                        }
                         const operation = new ws_operation_js_1.WSOperation(controller, {
                             ...operationMeta,
                             name: operationName,
                             types: undefined,
-                            payloadType: undefined,
+                            type: undefined,
                             keyType: undefined,
+                            arguments: undefined,
                         });
                         await this._initWSOperation(context, operation, operationMeta);
-                        controller.operations.set(operation.name, operation);
+                        controller.operations.set(operationName, operation);
                     });
                 }
             });
@@ -117,7 +126,20 @@ class WSApiFactory {
                 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);
+        if (metadata.arguments?.length) {
+            await context.enterAsync('.arguments', async () => {
+                operation.arguments = [];
+                for (const x of metadata.arguments) {
+                    const t = await data_type_factory_js_1.DataTypeFactory.resolveDataType(context, operation, x);
+                    operation.arguments?.push(t);
+                }
+            });
+        }
+        if (metadata.response) {
+            await context.enterAsync('.response', async () => {
+                operation.response = await data_type_factory_js_1.DataTypeFactory.resolveDataType(context, operation, metadata.response);
+            });
+        }
     }
 }
 exports.WSApiFactory = WSApiFactory;

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

@@ -7,6 +7,7 @@ const objects_1 = require("@jsopen/objects");
 const ts_gems_1 = require("ts-gems");
 const valgen_1 = require("valgen");
 const document_element_js_1 = require("../common/document-element.js");
+const array_type_js_1 = require("../data-type/array-type.js");
 const data_type_js_1 = require("../data-type/data-type.js");
 exports.HttpMediaType = function (owner, initArgs) {
     if (!this)
@@ -36,6 +37,7 @@ exports.HttpMediaType = function (owner, initArgs) {
                 : _this.owner.node.getDataType(initArgs.type);
     }
     _this.isArray = initArgs.isArray;
+    _this.designType = initArgs.designType;
 };
 /**
  * @class HttpMediaType
@@ -75,21 +77,28 @@ class HttpMediaTypeClass extends document_element_js_1.DocumentElement {
         }
         return out;
     }
-    generateCodec(codec, options) {
+    generateCodec(codec, options, properties) {
         let fn;
         if (this.type) {
-            fn = this.type.generateCodec(codec, options);
+            fn = this.type.generateCodec(codec, options, {
+                designType: this.designType,
+            });
         }
         else if (this.contentType) {
             const arr = Array.isArray(this.contentType)
                 ? this.contentType
                 : [this.contentType];
             if (arr.find(ct => type_is_1.default.is(ct, ['json']))) {
-                fn = this.node.findDataType('object').generateCodec(codec);
+                fn = this.node.findDataType('object').generateCodec(codec, options, {
+                    ...properties,
+                    designType: this.designType,
+                });
             }
         }
         fn = fn || valgen_1.isAny;
-        return this.isArray ? valgen_1.vg.isArray(fn) : fn;
+        return this.isArray && !(this.type instanceof array_type_js_1.ArrayType)
+            ? valgen_1.vg.isArray(fn)
+            : fn;
     }
 }
 exports.HttpMediaType.prototype = HttpMediaTypeClass.prototype;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpParameter = void 0;
 const objects_1 = require("@jsopen/objects");
 const ts_gems_1 = require("ts-gems");
+const valgen_1 = require("valgen");
 const value_js_1 = require("../common/value.js");
 const parse_regexp_util_js_1 = require("../utils/parse-regexp.util.js");
 exports.HttpParameter = function (owner, initArgs) {
@@ -29,6 +30,7 @@ exports.HttpParameter = function (owner, initArgs) {
     _this.arraySeparator = initArgs.arraySeparator;
     _this.keyParam = initArgs.keyParam;
     _this.parser = initArgs.parser;
+    _this.designType = initArgs.designType;
 };
 /**
  * @class HttpParameter
@@ -45,5 +47,11 @@ class HttpParameterClass extends value_js_1.Value {
             deprecated: this.deprecated,
         });
     }
+    generateCodec(codec, options, properties) {
+        return (this.type?.generateCodec(codec, options, {
+            ...properties,
+            designType: this.designType,
+        }) || valgen_1.vg.isAny());
+    }
 }
 exports.HttpParameter.prototype = HttpParameterClass.prototype;

package/cjs/document/index.js

@@ -27,6 +27,7 @@ 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/array-type.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);
@@ -40,6 +41,7 @@ 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/union-type.js"), exports);
+tslib_1.__exportStar(require("./decorators/ws-param.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);

package/cjs/document/mq/mq-header.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MQHeader = void 0;
 const objects_1 = require("@jsopen/objects");
 const ts_gems_1 = require("ts-gems");
+const valgen_1 = require("valgen");
 const value_js_1 = require("../common/value.js");
 const parse_regexp_util_js_1 = require("../utils/parse-regexp.util.js");
 exports.MQHeader = function (owner, initArgs) {
@@ -23,6 +24,7 @@ exports.MQHeader = function (owner, initArgs) {
     }
     _this.deprecated = initArgs.deprecated;
     _this.required = initArgs.required;
+    _this.designType = initArgs.designType;
 };
 /**
  * @class MQHeader
@@ -36,5 +38,11 @@ class MQHeaderClass extends value_js_1.Value {
             deprecated: this.deprecated,
         });
     }
+    generateCodec(codec, options, properties) {
+        return (this.type?.generateCodec(codec, options, {
+            ...properties,
+            designType: this.designType,
+        }) || valgen_1.vg.isAny());
+    }
 }
 exports.MQHeader.prototype = MQHeaderClass.prototype;

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

@@ -13,20 +13,22 @@ class MQOperationResponse extends document_element_js_1.DocumentElement {
         this.headers = [];
         this.channel = initArgs?.channel;
         this.description = initArgs?.description;
-        if (initArgs?.payloadType) {
-            this.payloadType =
-                initArgs?.payloadType instanceof data_type_js_1.DataType
-                    ? initArgs.payloadType
-                    : this.owner.node.getDataType(initArgs.payloadType);
+        if (initArgs?.type) {
+            this.type =
+                initArgs?.type instanceof data_type_js_1.DataType
+                    ? initArgs.type
+                    : this.owner.node.getDataType(initArgs.type);
         }
         else
-            this.payloadType = this.owner.node.getDataType('any');
+            this.type = this.owner.node.getDataType('any');
         if (initArgs?.keyType) {
             this.keyType =
                 initArgs?.keyType instanceof data_type_js_1.DataType
                     ? initArgs.keyType
                     : this.owner.node.getDataType(initArgs.keyType);
         }
+        this.designType = initArgs?.designType;
+        this.keyDesignType = initArgs?.keyDesignType;
     }
     findHeader(paramName) {
         const paramNameLower = paramName.toLowerCase();
@@ -45,9 +47,7 @@ class MQOperationResponse extends document_element_js_1.DocumentElement {
         const out = (0, objects_1.omitUndefined)({
             description: this.description,
             channel: this.channel,
-            payloadType: this.payloadType.name
-                ? this.payloadType.name
-                : this.payloadType.toJSON(),
+            type: this.type.name ? this.type.name : this.type.toJSON(),
             keyType: this.keyType
                 ? this.keyType.name
                     ? this.keyType.name

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MQOperation = void 0;
 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 data_type_map_js_1 = require("../common/data-type-map.js");
 const document_element_js_1 = require("../common/document-element.js");
@@ -15,9 +16,9 @@ const mq_operation_decorator_js_1 = require("../decorators/mq-operation.decorato
 exports.MQOperation = function (...args) {
     // Decorator
     if (!this) {
-        const [payloadType, options] = args;
+        const [type, options] = args;
         const decoratorChain = [];
-        return exports.MQOperation[constants_js_1.DECORATOR].call(undefined, decoratorChain, payloadType, options);
+        return exports.MQOperation[constants_js_1.DECORATOR].call(undefined, decoratorChain, type, options);
     }
     // Constructor
     const [resource, initArgs] = args;
@@ -30,11 +31,11 @@ exports.MQOperation = function (...args) {
     _this.name = initArgs.name;
     _this.description = initArgs.description;
     _this.channel = initArgs.channel;
-    if (initArgs?.payloadType) {
-        _this.payloadType =
-            initArgs?.payloadType instanceof data_type_js_1.DataType
-                ? initArgs.payloadType
-                : _this.owner.node.getDataType(initArgs.payloadType);
+    if (initArgs?.type) {
+        _this.type =
+            initArgs?.type instanceof data_type_js_1.DataType
+                ? initArgs.type
+                : _this.owner.node.getDataType(initArgs.type);
     }
     if (initArgs?.keyType) {
         _this.keyType =
@@ -42,6 +43,8 @@ exports.MQOperation = function (...args) {
                 ? initArgs.keyType
                 : _this.owner.node.getDataType(initArgs.keyType);
     }
+    _this.designType = initArgs.designType;
+    _this.keyDesignType = initArgs.keyDesignType;
 };
 /**
  * @class MQOperation
@@ -65,9 +68,7 @@ class MQOperationClass extends document_element_js_1.DocumentElement {
             kind: index_js_1.OpraSchema.MQOperation.Kind,
             description: this.description,
             channel: this.channel,
-            payloadType: this.payloadType.name
-                ? this.payloadType.name
-                : this.payloadType.toJSON(),
+            type: this.type.name ? this.type.name : this.type.toJSON(),
             keyType: this.keyType
                 ? this.keyType.name
                     ? this.keyType.name
@@ -83,6 +84,18 @@ class MQOperationClass extends document_element_js_1.DocumentElement {
         }
         return out;
     }
+    generateCodec(codec, options, properties) {
+        return (this.type?.generateCodec(codec, options, {
+            ...properties,
+            designType: this.designType,
+        }) || valgen_1.vg.isAny());
+    }
+    generateKeyCodec(codec, options, properties) {
+        return (this.keyType?.generateCodec(codec, options, {
+            ...properties,
+            designType: this.keyDesignType,
+        }) || valgen_1.vg.isAny());
+    }
 }
 exports.MQOperation.prototype = MQOperationClass.prototype;
 exports.MQOperation[constants_js_1.DECORATOR] = mq_operation_decorator_js_1.MQOperationDecoratorFactory;

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

@@ -9,15 +9,16 @@ const document_element_js_1 = require("../common/document-element.js");
 const constants_js_1 = require("../constants.js");
 const data_type_js_1 = require("../data-type/data-type.js");
 const ws_operation_decorator_js_1 = require("../decorators/ws-operation.decorator.js");
+const parse_regexp_util_js_1 = require("../utils/parse-regexp.util.js");
 /**
  *  WSOperation
  */
 exports.WSOperation = function (...args) {
     // Decorator
     if (!this) {
-        const [payloadType, options] = args;
+        const [type, options] = args;
         const decoratorChain = [];
-        return exports.WSOperation[constants_js_1.DECORATOR].call(undefined, decoratorChain, payloadType, options);
+        return exports.WSOperation[constants_js_1.DECORATOR].call(undefined, decoratorChain, type, options);
     }
     // Constructor
     const [resource, initArgs] = args;
@@ -28,34 +29,35 @@ exports.WSOperation = function (...args) {
     _this.types = _this.node[constants_js_1.kDataTypeMap] = new data_type_map_js_1.DataTypeMap();
     _this.name = initArgs.name;
     _this.description = initArgs.description;
-    _this.channel = initArgs.channel;
-    if (initArgs?.payloadType) {
-        _this.payloadType =
-            initArgs?.payloadType instanceof data_type_js_1.DataType
-                ? initArgs.payloadType
-                : _this.owner.node.getDataType(initArgs.payloadType);
-    }
-    if (initArgs?.keyType) {
-        _this.keyType =
-            initArgs?.keyType instanceof data_type_js_1.DataType
-                ? initArgs.keyType
-                : _this.owner.node.getDataType(initArgs.keyType);
+    if (initArgs.event)
+        this.event =
+            initArgs.event instanceof RegExp
+                ? initArgs.event
+                : initArgs.event.startsWith('/')
+                    ? (0, parse_regexp_util_js_1.parseRegExp)(initArgs.event)
+                    : initArgs.event;
+    else
+        _this.event = this.name;
+    if (initArgs?.arguments) {
+        _this.arguments = initArgs.arguments.map(arg => arg instanceof data_type_js_1.DataType ? arg : _this.owner.node.getDataType(arg));
     }
+    if (initArgs?.response)
+        _this.response =
+            initArgs.response instanceof data_type_js_1.DataType
+                ? initArgs.response
+                : _this.owner.node.getDataType(initArgs.response);
 };
 /**
  * @class WSOperation
  */
 class WSOperationClass extends document_element_js_1.DocumentElement {
     toJSON() {
-        const out = (0, objects_1.omitUndefined)({
+        return (0, objects_1.omitUndefined)({
             kind: index_js_1.OpraSchema.WSOperation.Kind,
             description: this.description,
-            channel: this.channel,
-            payloadType: this.payloadType.name
-                ? this.payloadType.name
-                : this.payloadType.toJSON(),
+            event: this.event,
+            arguments: this.arguments?.map(arg => arg.name ? arg.name : arg.toJSON()),
         });
-        return out;
     }
 }
 exports.WSOperation.prototype = WSOperationClass.prototype;

package/cjs/filter/filter-rules.js

@@ -125,10 +125,10 @@ class FilterRules {
                         else
                             decoder = this._decoderCache.get(comp.left.field);
                         if (!decoder) {
-                            decoder = comp.left.field.type.generateCodec('decode', {
+                            decoder = comp.left.field.generateCodec('decode', {
                                 scope,
                                 projection: '*',
-                                ignoreWriteonlyFields: true,
+                                ignoreReadonlyFields: true,
                                 coerce: true,
                             });
                             this._decoderCache.set(comp.left.field, decoder);

package/cjs/schema/data-type/array-type.interface.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArrayType = void 0;
+var ArrayType;
+(function (ArrayType) {
+    ArrayType.Kind = 'ArrayType';
+})(ArrayType || (exports.ArrayType = ArrayType = {}));

package/cjs/schema/opra-schema.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./api.interface.js"), exports);
 tslib_1.__exportStar(require("./api-document.interface.js"), exports);
 tslib_1.__exportStar(require("./constants.js"), exports);
+tslib_1.__exportStar(require("./data-type/array-type.interface.js"), exports);
 tslib_1.__exportStar(require("./data-type/complex-type.interface.js"), exports);
 tslib_1.__exportStar(require("./data-type/data-type.interface.js"), exports);
 tslib_1.__exportStar(require("./data-type/enum-type.interface.js"), exports);

package/cjs/schema/type-guards.js

@@ -7,7 +7,9 @@ exports.isMixinType = isMixinType;
 exports.isMappedType = isMappedType;
 exports.isEnumType = isEnumType;
 exports.isUnionType = isUnionType;
+exports.isArrayType = isArrayType;
 exports.isHttpController = isHttpController;
+const array_type_interface_js_1 = require("./data-type/array-type.interface.js");
 const complex_type_interface_js_1 = require("./data-type/complex-type.interface.js");
 const enum_type_interface_js_1 = require("./data-type/enum-type.interface.js");
 const mapped_type_interface_js_1 = require("./data-type/mapped-type.interface.js");
@@ -18,7 +20,8 @@ const http_controller_interface_js_1 = require("./http/http-controller.interface
 function isDataType(obj) {
     return (obj &&
         typeof obj === 'object' &&
-        (obj.kind === complex_type_interface_js_1.ComplexType.Kind ||
+        (obj.kind === array_type_interface_js_1.ArrayType.Kind ||
+            obj.kind === complex_type_interface_js_1.ComplexType.Kind ||
             obj.kind === enum_type_interface_js_1.EnumType.Kind ||
             obj.kind === mapped_type_interface_js_1.MappedType.Kind ||
             obj.kind === simple_type_interface_js_1.SimpleType.Kind ||
@@ -43,6 +46,9 @@ function isEnumType(obj) {
 function isUnionType(obj) {
     return obj && typeof obj === 'object' && obj.kind === union_type_interface_js_1.UnionType.Kind;
 }
+function isArrayType(obj) {
+    return obj && typeof obj === 'object' && obj.kind === array_type_interface_js_1.ArrayType.Kind;
+}
 function isHttpController(obj) {
     return obj && typeof obj === 'object' && obj.kind === http_controller_interface_js_1.HttpController.Kind;
 }

package/esm/document/api-document.js

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

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

@@ -61,6 +61,17 @@ export 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 === 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
@@ -125,6 +136,6 @@ export class DocumentNode {
         const t = this.getDataType(nameOrCtor, scope);
         if (t.kind === 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`);
     }
 }

package/esm/document/constants.js

@@ -2,6 +2,7 @@ export const DATATYPE_METADATA = Symbol.for('opra.type.metadata');
 export const HTTP_CONTROLLER_METADATA = Symbol('opra.http-controller.metadata');
 export const MQ_CONTROLLER_METADATA = Symbol('opra.mq-controller.metadata');
 export const WS_CONTROLLER_METADATA = Symbol('opra.ws-controller.metadata');
+export const WS_PARAM_METADATA = Symbol('opra.ws-param.metadata');
 export const RPC_CONTROLLER_METADATA = Symbol('opra.rpc-controller.metadata');
 export const DECODER = Symbol.for('opra.type.decoder');
 export const ENCODER = Symbol('opra.type.encoder');

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

@@ -45,12 +45,7 @@ export const 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;
 };
 /**
@@ -114,6 +109,12 @@ class ApiFieldClass extends DocumentElement {
             examples: this.examples,
         });
     }
+    generateCodec(codec, options, properties) {
+        return this.type.generateCodec(codec, options, {
+            ...properties,
+            designType: this.designType,
+        });
+    }
 }
 ApiField.prototype = ApiFieldClass.prototype;
 Object.assign(ApiField, ApiFieldDecoratorFactory);

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

@@ -0,0 +1,75 @@
+import 'reflect-metadata';
+import { omitUndefined } from '@jsopen/objects';
+import { asMutable } from 'ts-gems';
+import { vg } from 'valgen';
+import { OpraSchema } from '../../schema/index.js';
+import { DATATYPE_METADATA, DECORATOR } from '../constants.js';
+import { DataType } from './data-type.js';
+/**
+ * @class ArrayType
+ */
+export const ArrayType = function (...args) {
+    // ArrayType factory
+    if (!this) {
+        return ArrayType[DECORATOR].apply(undefined, args);
+    }
+    // Constructor
+    const [owner, initArgs, context] = args;
+    DataType.call(this, owner, initArgs, context);
+    const _this = asMutable(this);
+    _this.kind = OpraSchema.ArrayType.Kind;
+    _this.type = initArgs.type;
+    _this.minOccurs = initArgs.minOccurs;
+    _this.maxOccurs = initArgs.maxOccurs;
+};
+/**
+ *
+ * @class ArrayType
+ */
+class ArrayTypeClass extends DataType {
+    toJSON(options) {
+        const superJson = super.toJSON(options);
+        const typeName = this.node.getDataTypeNameWithNs(this.type);
+        return 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 = vg.isArray(fn);
+        const fns = [];
+        if (this.minOccurs)
+            fns.push(vg.lengthMin(this.minOccurs));
+        if (this.maxOccurs)
+            fns.push(vg.lengthMax(this.maxOccurs));
+        if (fns.length > 0)
+            return vg.pipe([fn, ...fns], { returnIndex: 0 });
+        return fn;
+    }
+    extendsFrom() {
+        return false;
+    }
+    _locateBase() {
+        return;
+    }
+}
+ArrayType.prototype = ArrayTypeClass.prototype;
+ArrayType[DECORATOR] = ArrayTypeFactory;
+/**
+ *
+ */
+function ArrayTypeFactory(clasRefs, options) {
+    class ArrayClass {
+    }
+    const metadata = {
+        ...options,
+        kind: OpraSchema.ArrayType.Kind,
+        type: clasRefs,
+    };
+    Reflect.defineMetadata(DATATYPE_METADATA, metadata, ArrayClass);
+    return ArrayClass;
+}

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

@@ -2,6 +2,7 @@ import hashObject from 'object-hash';
 import { asMutable } from 'ts-gems';
 import { validator, vg } from 'valgen';
 import { parseFieldsProjection, ResponsiveMap, } from '../../helpers/index.js';
+import { ArrayType } from './array-type.js';
 import { DataType } from './data-type.js';
 export const FIELD_PATH_PATTERN = /^([+-])?([a-z$_][\w.]*)$/i;
 /**
@@ -327,15 +328,13 @@ class ComplexTypeBaseClass extends 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 = vg.isEqual(field.fixed);
-        if (field.isArray)
+        if (field.isArray && !(field.type instanceof ArrayType))
             fn = vg.isArray(fn);
         return fn;
     }

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

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

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

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