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

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

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

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

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

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

@@ -16,7 +16,8 @@ exports.ObjectType = ObjectType = tslib_1.__decorate([
         name: 'object',
         description: 'A non modelled object',
         additionalFields: true,
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [Object])
 ], ObjectType);
 const metadata = Reflect.getMetadata(constants_js_1.DATATYPE_METADATA, ObjectType);
 metadata.ctor = Object;

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

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

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

@@ -28,6 +28,8 @@ exports.SimpleType = function (...args) {
         _this.base = initArgs.base;
     }
     _this.properties = initArgs.properties;
+    _this.ownNameMappings = { ...initArgs.nameMappings };
+    _this.nameMappings = { ..._this.base?.nameMappings, ...initArgs.nameMappings };
     _this.ownAttributes = (0, index_js_1.cloneObject)(initArgs.attributes || {});
     _this.attributes = _this.base ? (0, index_js_1.cloneObject)(_this.base.attributes) : {};
     if (_this.ownAttributes) {
@@ -46,6 +48,8 @@ exports.SimpleType = function (...args) {
  */
 class SimpleTypeClass extends data_type_js_1.DataType {
     extendsFrom(baseType) {
+        if (!(baseType instanceof data_type_js_1.DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof exports.SimpleType))
             return false;
         if (baseType === this)
@@ -90,12 +94,15 @@ class SimpleTypeClass extends data_type_js_1.DataType {
             return o;
         }, {});
         const baseName = this.base ? this.node.getDataTypeNameWithNs(this.base) : undefined;
-        return (0, index_js_1.omitUndefined)({
+        const out = (0, index_js_1.omitUndefined)({
             ...data_type_js_1.DataType.prototype.toJSON.apply(this),
             base: this.base ? (baseName ? baseName : this.base.toJSON()) : undefined,
             attributes: attributes && Object.keys(attributes).length ? attributes : undefined,
             properties: Object.keys(properties).length ? properties : undefined,
         });
+        if (Object.keys(this.ownNameMappings).length)
+            out.nameMappings = { ...this.ownNameMappings };
+        return out;
     }
 }
 exports.SimpleType.prototype = SimpleTypeClass.prototype;

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

@@ -23,8 +23,8 @@ http_operation_js_1.HttpOperation.Entity.Create = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'POST',
+        ...args,
         composition: 'Entity.Create',
         requestBody: {
             immediateFetch: true,
@@ -74,8 +74,8 @@ http_operation_js_1.HttpOperation.Entity.Delete = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'DELETE',
+        ...args,
         composition: 'Entity.Delete',
     }));
     decorator
@@ -123,8 +123,8 @@ http_operation_js_1.HttpOperation.Entity.DeleteMany = function (arg0, arg1) {
     const filterType = new index_js_3.FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'DELETE',
+        ...args,
         composition: 'Entity.DeleteMany',
     }));
     decorator
@@ -171,8 +171,8 @@ http_operation_js_1.HttpOperation.Entity.FindMany = function (arg0, arg1) {
     const filterType = new index_js_3.FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'GET',
+        ...args,
         composition: 'Entity.FindMany',
     }));
     decorator
@@ -263,8 +263,8 @@ http_operation_js_1.HttpOperation.Entity.Get = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'GET',
+        ...args,
         composition: 'Entity.Get',
     }));
     decorator
@@ -326,8 +326,8 @@ http_operation_js_1.HttpOperation.Entity.UpdateMany = function (arg0, arg1) {
     filterType.rules = {};
     const filterRules = new filter_rules_js_1.FilterRules();
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'PATCH',
+        ...args,
         composition: 'Entity.UpdateMany',
         requestBody: {
             immediateFetch: true,
@@ -381,8 +381,8 @@ http_operation_js_1.HttpOperation.Entity.Update = function (arg0, arg1) {
     const filterType = new index_js_3.FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = (0, http_operation_decorator_js_1.HttpOperationDecoratorFactory)(decoratorChain, (0, index_js_1.omitUndefined)({
-        description: args.description,
         method: 'PATCH',
+        ...args,
         composition: 'Entity.Update',
         requestBody: {
             partial: 'deep',

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

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

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

@@ -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");
@@ -133,7 +134,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;
@@ -212,11 +213,15 @@ 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;
@@ -290,7 +295,7 @@ class DataTypeFactory {
                         const fieldMeta = typeof v === 'string' ? { type: v } : v;
                         if (fieldMeta.isArray && !fieldMeta.type)
                             return context.addError(`"type" must be defined explicitly for array fields`);
-                        const t = await this._importDataTypeArgs(context, owner, fieldMeta.type);
+                        const t = await this._importDataTypeArgs(context, owner, fieldMeta.type || 'any');
                         if (!t)
                             return;
                         initArgs.fields[k] = {
@@ -332,6 +337,7 @@ 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)
@@ -384,27 +390,40 @@ 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);
+            }
         }
         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 */
@@ -413,14 +432,7 @@ class DataTypeFactory {
                 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,7 +442,7 @@ 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);
+                        const type = this._createDataType(context, owner, v.type);
                         if (type)
                             initArgs.fields[k] = {
                                 ...v,
@@ -441,29 +453,37 @@ class DataTypeFactory {
                 }
             });
         }
-        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,7 +491,7 @@ 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);
+                        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);
@@ -479,17 +499,20 @@ class DataTypeFactory {
                 }
             });
         }
-        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

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

package/esm/document/api-document.js

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

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

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

package/esm/document/constants.js

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

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

@@ -33,6 +33,8 @@ export const ApiField = function (...args) {
     _this.exclusive = initArgs.exclusive;
     _this.translatable = initArgs.translatable;
     _this.deprecated = initArgs.deprecated;
+    _this.readonly = initArgs.readonly;
+    _this.writeonly = initArgs.writeonly;
     _this.examples = initArgs.examples;
 };
 /**
@@ -43,7 +45,7 @@ class ApiFieldClass extends DocumentElement {
     toJSON() {
         const typeName = this.type ? this.node.getDataTypeNameWithNs(this.type) : undefined;
         return omitUndefined({
-            type: this.type ? (typeName ? typeName : this.type?.toJSON()) : undefined,
+            type: typeName ? typeName : this.type?.toJSON(),
             description: this.description,
             isArray: this.isArray,
             default: this.default,
@@ -52,6 +54,8 @@ class ApiFieldClass extends DocumentElement {
             exclusive: this.exclusive,
             translatable: this.translatable,
             deprecated: this.deprecated,
+            readonly: this.readonly,
+            writeonly: this.writeonly,
             examples: this.examples,
         });
     }

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

@@ -143,6 +143,10 @@ class ComplexTypeBaseClass extends DataType {
         // Process fields
         let fieldName;
         for (const field of this.fields.values()) {
+            if ((context.ignoreReadonlyFields && field.readonly) || (context.ignoreWriteonlyFields && field.writeonly)) {
+                schema[field.name] = vg.isUndefined({ coerce: true });
+                continue;
+            }
             fieldName = field.name;
             let p;
             if (projection !== '*') {

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

@@ -57,6 +57,8 @@ export const ComplexType = function (...args) {
  */
 class ComplexTypeClass extends ComplexTypeBase {
     extendsFrom(baseType) {
+        if (!(baseType instanceof DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof ComplexTypeBase))
             return false;
         if (baseType === this)
@@ -72,9 +74,8 @@ class ComplexTypeClass extends ComplexTypeBase {
         });
         if (this.additionalFields) {
             if (this.additionalFields instanceof DataType) {
-                out.additionalFields = this.additionalFields[1].name
-                    ? this.additionalFields[1].name
-                    : this.additionalFields[1].toJSON();
+                const typeName = this.node.getDataTypeNameWithNs(this.additionalFields);
+                out.additionalFields = typeName ? typeName : this.additionalFields.toJSON();
             }
             else
                 out.additionalFields = this.additionalFields;

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

@@ -35,6 +35,8 @@ export const EnumType = function (...args) {
  */
 class EnumTypeClass extends DataType {
     extendsFrom(baseType) {
+        if (!(baseType instanceof DataType))
+            baseType = this.node.getDataType(baseType);
         if (!(baseType instanceof EnumType))
             return false;
         if (baseType === this)

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -17,6 +17,11 @@ let Base64Type = class Base64Type {
 Base64Type = __decorate([
     SimpleType({
         description: 'A stream of bytes, base64 encoded',
-    })
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
+    }),
+    __metadata("design:paramtypes", [Object])
 ], Base64Type);
 export { Base64Type };

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

@@ -1,4 +1,4 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { vg } from 'valgen';
 import { DECODER, ENCODER } from '../../constants.js';
 import { SimpleType } from '../simple-type.js';
@@ -23,19 +23,26 @@ let DateStringType = class DateStringType {
 __decorate([
     SimpleType.Attribute({
         description: 'Minimum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateStringType.prototype, "minValue", void 0);
 __decorate([
     SimpleType.Attribute({
         description: 'Maximum value',
-    })
+    }),
+    __metadata("design:type", String)
 ], DateStringType.prototype, "maxValue", void 0);
 DateStringType = __decorate([
     SimpleType({
         description: 'Date string value',
+        nameMappings: {
+            js: 'string',
+            json: 'string',
+        },
     })
         .Example('2021-04-18', 'Full date value')
         .Example('2021-04', 'Date value without day')
-        .Example('2021', 'Year only value')
+        .Example('2021', 'Year only value'),
+    __metadata("design:paramtypes", [Object])
 ], DateStringType);
 export { DateStringType };