@opra/common 0.18.3 → 0.19.0

package/cjs/document/resource/singleton.js

@@ -3,12 +3,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Singleton = void 0;
 const tslib_1 = require("tslib");
 const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
+const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
 const index_js_1 = require("../../helpers/index.js");
 const index_js_2 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
 const resource_js_1 = require("./resource.js");
 const NESTJS_INJECTABLE_WATERMARK = '__injectable__';
 const NAME_PATTERN = /^(.*)(Resource|Singleton)$/;
+class SingletonClass extends resource_js_1.Resource {
+    constructor(document, init) {
+        super(document, init);
+        this.kind = index_js_2.OpraSchema.Singleton.Kind;
+        this.controller = init.controller;
+        const operations = this.operations = init.operations || {};
+        this.type = init.type;
+        if (this.controller) {
+            const instance = typeof this.controller == 'function'
+                ? new this.controller()
+                : this.controller;
+            for (const operation of Object.values(operations)) {
+                if (!operation.handler && operation.handlerName) {
+                    const fn = instance[operation.handlerName];
+                    if (!fn)
+                        throw new TypeError(`No such operation handler (${operation.handlerName}) found`);
+                    operation.handler = fn.bind(instance);
+                }
+            }
+        }
+    }
+    exportSchema() {
+        const out = resource_js_1.Resource.prototype.exportSchema.call(this);
+        Object.assign(out, (0, index_js_1.omitUndefined)({
+            type: this.type.name,
+            operations: this.operations
+        }));
+        return out;
+    }
+    normalizeFieldPath(path) {
+        return this.type.normalizeFieldPath(path);
+    }
+}
 exports.Singleton = function (...args) {
     // ClassDecorator
     if (!this) {
@@ -33,46 +67,9 @@ exports.Singleton = function (...args) {
     }
     // Constructor
     const [document, init] = args;
-    // call super()
-    resource_js_1.Resource.apply(this, [document, init]);
-};
-const proto = {
-    _construct(init) {
-        // call super()
-        resource_js_1.Resource.prototype._construct.call(this, init);
-        const _this = this;
-        _this.kind = index_js_2.OpraSchema.Singleton.Kind;
-        _this.controller = init.controller;
-        const operations = _this.operations = init.operations || {};
-        _this.type = init.type;
-        if (_this.controller) {
-            const instance = typeof _this.controller == 'function'
-                ? new _this.controller()
-                : _this.controller;
-            for (const operation of Object.values(operations)) {
-                if (!operation.handler && operation.handlerName) {
-                    const fn = instance[operation.handlerName];
-                    if (!fn)
-                        throw new TypeError(`No such operation handler (${operation.handlerName}) found`);
-                    operation.handler = fn.bind(instance);
-                }
-            }
-        }
-    },
-    exportSchema() {
-        const out = resource_js_1.Resource.prototype.exportSchema.call(this);
-        Object.assign(out, (0, index_js_1.omitUndefined)({
-            type: this.type.name,
-            operations: this.operations
-        }));
-        return out;
-    },
-    normalizeFieldPath(path) {
-        return this.type.normalizeFieldPath(path);
-    },
+    (0, putil_merge_1.default)(this, new SingletonClass(document, init), { descriptor: true });
 };
-Object.assign(exports.Singleton.prototype, proto);
-Object.setPrototypeOf(exports.Singleton.prototype, resource_js_1.Resource.prototype);
+exports.Singleton.prototype = SingletonClass.prototype;
 function createOperationDecorator(operation) {
     return (options) => ((target, propertyKey) => {
         const metadata = {

package/cjs/exception/common-errors/validation.error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValidationError = void 0;
+const opra_exception_js_1 = require("../opra-exception.js");
+class ValidationError extends opra_exception_js_1.OpraException {
+    constructor() {
+        super(...arguments);
+        this.status = 400;
+    }
+}
+exports.ValidationError = ValidationError;

package/cjs/exception/index.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./opra-exception.js"), exports);
 tslib_1.__exportStar(require("./error-issue.js"), exports);
 tslib_1.__exportStar(require("./wrap-exception.js"), exports);
-tslib_1.__exportStar(require("./enums/issue-severity.enum.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/failed-dependency.error.js"), exports);
 tslib_1.__exportStar(require("./http-errors/forbidden.error.js"), exports);
@@ -16,3 +16,4 @@ 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("./resource-errors/resource-conflict.error.js"), exports);
 tslib_1.__exportStar(require("./resource-errors/resource-not-found.error.js"), exports);
+tslib_1.__exportStar(require("./common-errors/validation.error.js"), exports);

package/cjs/exception/{enums/issue-severity.enum.js → issue-severity.enum.js}

@@ -20,4 +20,4 @@ var IssueSeverity;
             'may cause it to be performed suboptimally or in a way that is not as desired',
         info: 'The issue has no relation to the degree of success of the action'
     };
-})(IssueSeverity = exports.IssueSeverity || (exports.IssueSeverity = {}));
+})(IssueSeverity || (exports.IssueSeverity = IssueSeverity = {}));

package/cjs/exception/opra-exception.js

@@ -10,14 +10,14 @@ class OpraException extends Error {
         super('');
         this.status = 500;
         this._initName();
+        if (issue instanceof Error)
+            cause = issue;
         if (cause) {
             this.cause = cause;
             if (cause.stack)
                 this.stack = cause.stack;
         }
         this._init(issue || cause || 'Unknown error');
-        if (issue instanceof Error)
-            this.stack = issue.stack;
         this.message = index_js_1.i18n.deep(this.issue.message);
     }
     get issue() {

package/cjs/filter/antlr/OpraFilterLexer.js

@@ -36,7 +36,6 @@ class OpraFilterLexer extends antlr4_1.Lexer {
         return OpraFilterLexer.__ATN;
     }
 }
-exports.default = OpraFilterLexer;
 OpraFilterLexer.T__0 = 1;
 OpraFilterLexer.T__1 = 2;
 OpraFilterLexer.T__2 = 3;
@@ -277,3 +276,4 @@ OpraFilterLexer._serializedATN = [4, 0, 43, 426, 6, -1, 2, 0,
     268, 273, 279, 282, 286, 291, 293, 301, 303, 306, 311, 319, 321, 326, 328, 335, 337, 341,
     346, 361, 370, 376, 390, 392, 394, 399, 404, 409, 411, 416, 1, 0, 1, 0];
 OpraFilterLexer.DecisionsToDFA = OpraFilterLexer._ATN.decisionToState.map((ds, index) => new antlr4_1.DFA(ds, index));
+exports.default = OpraFilterLexer;

package/cjs/filter/antlr/OpraFilterParser.js

@@ -768,7 +768,6 @@ class OpraFilterParser extends antlr4_1.Parser {
         return OpraFilterParser.__ATN;
     }
 }
-exports.default = OpraFilterParser;
 OpraFilterParser.T__0 = 1;
 OpraFilterParser.T__1 = 2;
 OpraFilterParser.T__2 = 3;
@@ -913,6 +912,7 @@ OpraFilterParser._serializedATN = [4, 1, 43, 120, 2, 0, 7, 0, 2,
     7, 3, 0, 0, 112, 27, 1, 0, 0, 0, 113, 114, 7, 4, 0, 0, 114, 29, 1, 0, 0, 0, 115, 116, 7, 5, 0, 0, 116,
     31, 1, 0, 0, 0, 117, 118, 5, 36, 0, 0, 118, 33, 1, 0, 0, 0, 6, 48, 56, 65, 77, 84, 100];
 OpraFilterParser.DecisionsToDFA = OpraFilterParser._ATN.decisionToState.map((ds, index) => new antlr4_1.DFA(ds, index));
+exports.default = OpraFilterParser;
 class RootContext extends antlr4_1.ParserRuleContext {
     constructor(parser, parent, invokingState) {
         super(parent, invokingState);

package/cjs/filter/errors.js

@@ -5,6 +5,11 @@ class SyntaxError extends TypeError {
 }
 exports.SyntaxError = SyntaxError;
 class ValidationError extends TypeError {
+    constructor(message) {
+        super(typeof message === 'string' ? message : message?.message);
+        if (typeof message === 'object')
+            Object.assign(this, message);
+    }
 }
 exports.ValidationError = ValidationError;
 class FilterParseError extends Error {

package/cjs/http/enums/http-headers-codes.enum.js

@@ -410,4 +410,4 @@ var HttpHeaderCodes;
      *
      */
     HttpHeaderCodes["Max_Forwards"] = "Max-Forwards";
-})(HttpHeaderCodes = exports.HttpHeaderCodes || (exports.HttpHeaderCodes = {}));
+})(HttpHeaderCodes || (exports.HttpHeaderCodes = HttpHeaderCodes = {}));

package/cjs/http/enums/http-status-codes.enum.js

@@ -297,4 +297,4 @@ var HttpStatusCodes;
      * Indicates that the client needs to authenticate to gain network access.
      */
     HttpStatusCodes[HttpStatusCodes["NETWORK_AUTHENTICATION_REQUIRED"] = 511] = "NETWORK_AUTHENTICATION_REQUIRED";
-})(HttpStatusCodes = exports.HttpStatusCodes || (exports.HttpStatusCodes = {}));
+})(HttpStatusCodes || (exports.HttpStatusCodes = HttpStatusCodes = {}));

package/cjs/http/http-request-message.js

@@ -22,7 +22,7 @@ var HttpRequestMessage;
         return HttpRequestMessageHost.fromStream(readable);
     }
     HttpRequestMessage.fromStream = fromStream;
-})(HttpRequestMessage = exports.HttpRequestMessage || (exports.HttpRequestMessage = {}));
+})(HttpRequestMessage || (exports.HttpRequestMessage = HttpRequestMessage = {}));
 const kQuery = Symbol('kQuery');
 const kQueryProxy = Symbol('kQueryProxy');
 const kProtocol = Symbol('kProtocol');

package/cjs/http/http-response-message.js

@@ -28,7 +28,7 @@ var HttpResponseMessage;
         return HttpResponseMessageHost.fromStream(readable);
     }
     HttpResponseMessage.fromStream = fromStream;
-})(HttpResponseMessage = exports.HttpResponseMessage || (exports.HttpResponseMessage = {}));
+})(HttpResponseMessage || (exports.HttpResponseMessage = HttpResponseMessage = {}));
 /**
  * @class HttpResponseMessageHost
  */

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

@@ -4,4 +4,4 @@ exports.ComplexType = void 0;
 var ComplexType;
 (function (ComplexType) {
     ComplexType.Kind = 'ComplexType';
-})(ComplexType = exports.ComplexType || (exports.ComplexType = {}));
+})(ComplexType || (exports.ComplexType = ComplexType = {}));

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

@@ -4,4 +4,4 @@ exports.EnumType = void 0;
 var EnumType;
 (function (EnumType) {
     EnumType.Kind = 'EnumType';
-})(EnumType = exports.EnumType || (exports.EnumType = {}));
+})(EnumType || (exports.EnumType = EnumType = {}));

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

@@ -4,4 +4,4 @@ exports.MappedType = void 0;
 var MappedType;
 (function (MappedType) {
     MappedType.Kind = 'MappedType';
-})(MappedType = exports.MappedType || (exports.MappedType = {}));
+})(MappedType || (exports.MappedType = MappedType = {}));

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

@@ -4,4 +4,4 @@ exports.SimpleType = void 0;
 var SimpleType;
 (function (SimpleType) {
     SimpleType.Kind = 'SimpleType';
-})(SimpleType = exports.SimpleType || (exports.SimpleType = {}));
+})(SimpleType || (exports.SimpleType = SimpleType = {}));

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

@@ -4,4 +4,4 @@ exports.UnionType = void 0;
 var UnionType;
 (function (UnionType) {
     UnionType.Kind = 'UnionType';
-})(UnionType = exports.UnionType || (exports.UnionType = {}));
+})(UnionType || (exports.UnionType = UnionType = {}));

package/cjs/schema/index.js

@@ -1,44 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraSchema = void 0;
-const constants_js_1 = require("./constants.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");
-const simple_type_interface_js_1 = require("./data-type/simple-type.interface.js");
-const union_type_interface_js_1 = require("./data-type/union-type.interface.js");
-const collection_interface_js_1 = require("./resource/collection.interface.js");
-const container_interface_js_1 = require("./resource/container.interface.js");
-const singleton_interface_js_1 = require("./resource/singleton.interface.js");
-const type_guards_js_1 = require("./type-guards.js");
-var OpraSchema;
-(function (OpraSchema) {
-    // Re-export constants and types
-    OpraSchema.SpecVersion = constants_js_1.SpecVersion;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    OpraSchema.ComplexType = complex_type_interface_js_1.ComplexType;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    OpraSchema.EnumType = enum_type_interface_js_1.EnumType;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    OpraSchema.MappedType = mapped_type_interface_js_1.MappedType;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    OpraSchema.SimpleType = simple_type_interface_js_1.SimpleType;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    OpraSchema.UnionType = union_type_interface_js_1.UnionType;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    OpraSchema.Collection = collection_interface_js_1.Collection;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    OpraSchema.Container = container_interface_js_1.Container;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    OpraSchema.Singleton = singleton_interface_js_1.Singleton;
-    OpraSchema.isDataType = type_guards_js_1.isDataType;
-    OpraSchema.isComplexType = type_guards_js_1.isComplexType;
-    OpraSchema.isEnumType = type_guards_js_1.isEnumType;
-    OpraSchema.isMappedType = type_guards_js_1.isMappedType;
-    OpraSchema.isSimpleType = type_guards_js_1.isSimpleType;
-    OpraSchema.isUnionType = type_guards_js_1.isUnionType;
-    OpraSchema.isResource = type_guards_js_1.isResource;
-    OpraSchema.isCollection = type_guards_js_1.isCollection;
-    OpraSchema.isContainer = type_guards_js_1.isContainer;
-    OpraSchema.isSingleton = type_guards_js_1.isSingleton;
-})(OpraSchema = exports.OpraSchema || (exports.OpraSchema = {}));
+const tslib_1 = require("tslib");
+const OpraSchema = tslib_1.__importStar(require("./opra-schema.ns.js"));
+exports.OpraSchema = OpraSchema;

package/cjs/schema/opra-schema.ns.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+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);
+tslib_1.__exportStar(require("./data-type/field.interface.js"), exports);
+tslib_1.__exportStar(require("./data-type/simple-type.interface.js"), exports);
+tslib_1.__exportStar(require("./data-type/mapped-type.interface.js"), exports);
+tslib_1.__exportStar(require("./data-type/union-type.interface.js"), exports);
+tslib_1.__exportStar(require("./resource/collection.interface.js"), exports);
+tslib_1.__exportStar(require("./resource/container.interface.js"), exports);
+tslib_1.__exportStar(require("./resource/endpoint.interface.js"), exports);
+tslib_1.__exportStar(require("./resource/resource.interface.js"), exports);
+tslib_1.__exportStar(require("./resource/singleton.interface.js"), exports);
+tslib_1.__exportStar(require("./constants.js"), exports);
+tslib_1.__exportStar(require("./document.interface.js"), exports);
+tslib_1.__exportStar(require("./type-guards.js"), exports);

package/cjs/schema/resource/collection.interface.js

@@ -4,4 +4,4 @@ exports.Collection = void 0;
 var Collection;
 (function (Collection) {
     Collection.Kind = 'Collection';
-})(Collection = exports.Collection || (exports.Collection = {}));
+})(Collection || (exports.Collection = Collection = {}));

package/cjs/schema/resource/container.interface.js

@@ -4,4 +4,4 @@ exports.Container = void 0;
 var Container;
 (function (Container) {
     Container.Kind = 'Container';
-})(Container = exports.Container || (exports.Container = {}));
+})(Container || (exports.Container = Container = {}));

package/cjs/schema/resource/singleton.interface.js

@@ -4,4 +4,4 @@ exports.Singleton = void 0;
 var Singleton;
 (function (Singleton) {
     Singleton.Kind = 'Singleton';
-})(Singleton = exports.Singleton || (exports.Singleton = {}));
+})(Singleton || (exports.Singleton = Singleton = {}));

package/esm/document/api-document.js

@@ -3,9 +3,9 @@ import { cloneObject, omitUndefined, ResponsiveMap } from '../helpers/index.js';
 import { OpraSchema } from '../schema/index.js';
 import { NAMESPACE_PATTERN } from './constants.js';
 import { ComplexType } from './data-type/complex-type.js';
-import { SimpleType } from './data-type/simple-type.js';
 export class ApiDocument {
     constructor() {
+        this._designCtorMap = new Map();
         this._typeCache = new ResponsiveMap();
         this._typesCacheByCtor = new Map();
         this.references = new ResponsiveMap();
@@ -15,59 +15,81 @@ export class ApiDocument {
             version: '',
             title: ''
         };
+        const BigIntConstructor = Object.getPrototypeOf(BigInt(0)).constructor;
+        const BufferConstructor = Object.getPrototypeOf(Buffer.from([]));
+        this._designCtorMap.set(String, 'string');
+        this._designCtorMap.set(Number, 'number');
+        this._designCtorMap.set(Boolean, 'boolean');
+        this._designCtorMap.set(Object, 'any');
+        this._designCtorMap.set(Date, 'timestamp');
+        this._designCtorMap.set(BigIntConstructor, 'bigint');
+        this._designCtorMap.set(ArrayBuffer, 'base64');
+        this._designCtorMap.set(SharedArrayBuffer, 'base64');
+        this._designCtorMap.set(BufferConstructor, 'base64');
     }
-    getDataType(nameOrCtor, silent) {
+    /**
+     *
+     */
+    getDataType(arg0, silent) {
         let dataType;
-        if (nameOrCtor === Object)
-            nameOrCtor = 'any';
-        const nameOrCtorName = typeof nameOrCtor === 'function' ? nameOrCtor.name : nameOrCtor;
+        const name = typeof arg0 === 'function' ? arg0.name : arg0;
         // Try to get instance from cache
-        const t = typeof nameOrCtor === 'string'
-            ? this._typeCache.get(nameOrCtor)
-            : this._typesCacheByCtor.get(nameOrCtor);
+        const t = typeof arg0 === 'string'
+            ? this._typeCache.get(arg0)
+            : this._typesCacheByCtor.get(arg0);
         if (t)
             return t;
+        // If cached as null, it means "not found"
         if (t === null) {
             if (silent)
                 return;
-            throw new NotFoundError(`Data type "${nameOrCtorName}" does not exists`);
+            throw new Error(`Data type "${name}" does not exists`);
         }
-        if (typeof nameOrCtor === 'string') {
-            const m = NAMESPACE_PATTERN.exec(nameOrCtor);
+        // Convert design ctor to type name (String -> 'string')
+        if (typeof arg0 === 'function') {
+            const x = this._designCtorMap.get(arg0);
+            if (x)
+                arg0 = x;
+        }
+        if (typeof arg0 === 'string') {
+            const m = NAMESPACE_PATTERN.exec(arg0);
             if (!m)
-                throw new NotFoundError(`Invalid data type name "${nameOrCtorName}"`);
+                throw new TypeError(`Invalid data type name "${name}"`);
             // If given string has namespace pattern (ns:type_name)
             if (m[2]) {
                 const ref = this.references.get(m[1]);
                 if (!ref) {
                     if (silent)
                         return;
-                    throw new NotFoundError(`Reference "${m[1]}" not found`);
+                    throw new Error(`No referenced document found for given namespace "${m[1]}"`);
                 }
-                dataType = ref.getDataType(m[2]);
-                this._typeCache.set(nameOrCtor, dataType);
+                dataType = ref.getDataType(m[2], silent);
             }
             else {
-                const name = m[1];
                 // Get instance from own types
-                dataType = this.types.get(name);
+                dataType = this.types.get(arg0);
                 // if not found, search in references (from last to first)
                 if (!dataType) {
                     const references = Array.from(this.references.values()).reverse();
                     for (const ref of references) {
-                        dataType = ref.getDataType(name);
+                        dataType = ref.getDataType(name, true);
                         if (dataType)
                             break;
                     }
                 }
-                if (dataType)
-                    this._typeCache.set(dataType.name || name, dataType);
             }
+            if (dataType) {
+                this._typeCache.set(arg0, dataType);
+                return dataType;
+            }
+            if (!silent)
+                throw new NotFoundError(`Data type "${arg0}" does not exists`);
+            return;
         }
-        else if (typeof nameOrCtor === 'function') {
+        if (typeof arg0 === 'function') {
             const types = Array.from(this.types.values()).reverse();
             for (const dt of types) {
-                if ((dt instanceof ComplexType || dt instanceof SimpleType) && dt.own.ctor === nameOrCtor) {
+                if (dt instanceof ComplexType && dt.isTypeOf(arg0)) {
                     dataType = dt;
                     break;
                 }
@@ -76,27 +98,22 @@ export class ApiDocument {
             if (!dataType) {
                 const references = Array.from(this.references.values()).reverse();
                 for (const ref of references) {
-                    dataType = ref.getDataType(nameOrCtor, true);
+                    dataType = ref.getDataType(arg0, true);
                     if (dataType)
                         break;
                 }
             }
-        }
-        if (dataType) {
-            if ((dataType instanceof ComplexType || dataType instanceof SimpleType) &&
-                dataType.own?.ctor && dataType.own.ctor !== Object)
-                this._typesCacheByCtor.set(dataType.own.ctor, dataType);
-            return dataType;
-        }
-        else {
-            if (typeof nameOrCtor === 'string')
-                this._typeCache.set(nameOrCtor, null);
-            else
-                this._typesCacheByCtor.set(nameOrCtor, null);
-        }
-        if (silent)
+            if (dataType)
+                this._typesCacheByCtor.set(arg0, dataType);
+            if (dataType)
+                return dataType;
+            if (!silent)
+                throw new NotFoundError(`No data type mapping found for class "${name}"`);
             return;
-        throw new NotFoundError(`Data type "${nameOrCtorName}" does not exists`);
+        }
+        /* istanbul ignore next */
+        if (!silent)
+            throw new TypeError('Invalid argument');
     }
     getComplexType(nameOrCtor, silent) {
         if (nameOrCtor === Object)

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

@@ -16,14 +16,15 @@ export const ApiField = function (...args) {
             metadata.kind = OpraSchema.ComplexType.Kind;
             metadata.fields = metadata.fields || {};
             const designType = Reflect.getMetadata('design:type', target, propertyKey);
-            const isArray = designType === Array;
             const elemMeta = metadata.fields[propertyKey] = {
                 ...options,
                 enum: undefined,
-                designType: isArray ? undefined : designType
+                designType
             };
-            if (designType === Array)
+            if (designType === Array) {
                 elemMeta.isArray = true;
+                delete elemMeta.designType;
+            }
             if (options?.enum) {
                 elemMeta.type = undefined;
                 if (Array.isArray(options.enum)) {
@@ -66,7 +67,7 @@ export const ApiField = function (...args) {
 };
 const proto = {
     exportSchema() {
-        const out = {
+        return {
             type: this.type.name ? this.type.name : this.type.exportSchema(),
             description: this.description,
             isArray: this.isArray,
@@ -74,7 +75,6 @@ const proto = {
             fixed: this.fixed,
             required: this.required
         };
-        return out;
     }
 };
 Object.assign(ApiField.prototype, proto);

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

@@ -1,11 +1,9 @@
 import { __decorate } from "tslib";
 import { SimpleType } from '../simple-type.js';
-let AnyType = class AnyType {
+export let AnyType = class AnyType {
 };
 AnyType = __decorate([
     SimpleType({
-        description: 'Any value',
-        ctor: Object
+        description: 'Represents any value'
     })
 ], AnyType);
-export { AnyType };

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

@@ -1,35 +1,12 @@
 import { __decorate } from "tslib";
+import { isBase64 } from 'valgen';
 import { SimpleType } from '../simple-type.js';
-const BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:(?:[A-Za-z0-9+/][AQgw](:?==)?)|(?:[A-Za-z0-9+/]{2}[AEIMQUYcgkosw048]=?))?$/;
-let Base64Type = class Base64Type {
-    decode(v) {
-        if (v == null)
-            return v;
-        if (typeof v === 'string')
-            this.validate(v);
-        return Buffer.from(v, 'base64').buffer.slice(0);
-    }
-    encode(v) {
-        if (v == null)
-            return v;
-        if (Buffer.isBuffer(v))
-            return v.toString('base64');
-        return Buffer.from(v).toString('base64');
-    }
-    coerce(v) {
-        if (v instanceof ArrayBuffer)
-            return v;
-        return this.decode(v);
-    }
-    validate(v) {
-        if (!(typeof v === 'string' && BASE64_PATTERN.test(v)))
-            throw new TypeError(`Invalid base64 value "${String(v).substring(0, 10)}..."`);
-    }
+export let Base64Type = class Base64Type {
 };
 Base64Type = __decorate([
     SimpleType({
         description: 'A stream of bytes, base64 encoded',
-        ctor: ArrayBuffer
+        decoder: isBase64(),
+        encoder: isBase64(),
     })
 ], Base64Type);
-export { Base64Type };

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

@@ -1,30 +1,12 @@
 import { __decorate } from "tslib";
+import { isBigint, isString, pipe } from 'valgen';
 import { SimpleType } from '../simple-type.js';
-const BigIntConstructor = Object.getPrototypeOf(BigInt(0)).constructor;
-let BigIntType = class BigIntType {
-    decode(v) {
-        if (v == null)
-            return v;
-        return typeof v === 'bigint' ? v : BigInt(v);
-    }
-    encode(v) {
-        if (v == null)
-            return v;
-        return typeof v === 'bigint' ? String(v) : undefined;
-    }
-    coerce(v) {
-        return this.decode(v);
-    }
-    validate(v) {
-        if (!((typeof v === 'number' && !isNaN(v)) || typeof v === 'bigint'))
-            throw new TypeError(`Invalid number value "${v}"`);
-    }
+export let BigintType = class BigintType {
 };
-BigIntType = __decorate([
+BigintType = __decorate([
     SimpleType({
-        name: 'bigint',
         description: 'BigInt number',
-        ctor: BigIntConstructor
+        decoder: isBigint(),
+        encoder: pipe(isBigint(), isString())
     })
-], BigIntType);
-export { BigIntType };
+], BigintType);