@opra/common 1.0.0-alpha.3 → 1.0.0-alpha.5

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

@@ -21,8 +21,8 @@ HttpOperation.Entity.Create = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'POST',
+        ...args,
         composition: 'Entity.Create',
         requestBody: {
             immediateFetch: true,
@@ -72,8 +72,8 @@ HttpOperation.Entity.Delete = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'DELETE',
+        ...args,
         composition: 'Entity.Delete',
     }));
     decorator
@@ -91,11 +91,23 @@ HttpOperation.Entity.Delete = function (arg0, arg1) {
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
         });
         return decorator;
     };
@@ -121,8 +133,8 @@ HttpOperation.Entity.DeleteMany = function (arg0, arg1) {
     const filterType = new FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'DELETE',
+        ...args,
         composition: 'Entity.DeleteMany',
     }));
     decorator
@@ -169,8 +181,8 @@ HttpOperation.Entity.FindMany = function (arg0, arg1) {
     const filterType = new FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'GET',
+        ...args,
         composition: 'Entity.FindMany',
     }));
     decorator
@@ -261,8 +273,8 @@ HttpOperation.Entity.Get = function (arg0, arg1) {
     /** Initialize the decorator and the chain */
     const decoratorChain = [];
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'GET',
+        ...args,
         composition: 'Entity.Get',
     }));
     decorator
@@ -294,11 +306,23 @@ HttpOperation.Entity.Get = function (arg0, arg1) {
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
         });
         return decorator;
     };
@@ -324,8 +348,8 @@ HttpOperation.Entity.UpdateMany = function (arg0, arg1) {
     filterType.rules = {};
     const filterRules = new FilterRules();
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'PATCH',
+        ...args,
         composition: 'Entity.UpdateMany',
         requestBody: {
             immediateFetch: true,
@@ -379,8 +403,8 @@ HttpOperation.Entity.Update = function (arg0, arg1) {
     const filterType = new FilterType({ dataType: args.type });
     filterType.rules = {};
     const decorator = HttpOperationDecoratorFactory(decoratorChain, omitUndefined({
-        description: args.description,
         method: 'PATCH',
+        ...args,
         composition: 'Entity.Update',
         requestBody: {
             partial: 'deep',
@@ -423,11 +447,23 @@ HttpOperation.Entity.Update = function (arg0, arg1) {
      *
      */
     decorator.KeyParam = (name, prmOptions) => {
-        decorator.PathParam(name, prmOptions);
+        const paramMeta = typeof prmOptions === 'string' || typeof prmOptions === 'function'
+            ? {
+                name,
+                location: 'path',
+                type: prmOptions,
+                keyParam: true,
+            }
+            : {
+                ...prmOptions,
+                name,
+                location: 'path',
+                keyParam: true,
+            };
+        decorator.PathParam(name, paramMeta);
         decoratorChain.push((meta) => {
-            meta.path = (meta.path || '') + '@:' + name;
-            meta.compositionOptions = meta.compositionOptions || {};
-            meta.compositionOptions.keyParameter = name;
+            if (!meta.path?.includes(':' + name))
+                meta.path = (meta.path || '') + '@:' + name;
         });
         return decorator;
     };

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

@@ -4,6 +4,7 @@ import { DocumentInitContext } from '../common/document-init-context.js';
 import { DATATYPE_METADATA, DECODER, ENCODER, kCtorMap, kDataTypeMap } from '../constants.js';
 import { ComplexType } from '../data-type/complex-type.js';
 import { ComplexTypeBase } from '../data-type/complex-type-base.js';
+import { DataType } from '../data-type/data-type.js';
 import { EnumType } from '../data-type/enum-type.js';
 import { MappedType } from '../data-type/mapped-type.js';
 import { MixinType } from '../data-type/mixin-type.js';
@@ -130,7 +131,7 @@ export 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 DataType)
             return dataType.name;
         let metadata;
         let ctor;
@@ -209,11 +210,15 @@ export 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[kDataTypeMap] = owner.node[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 OpraSchema.ComplexType.Kind:
                         out.ctor = ctor;
@@ -329,6 +334,7 @@ export 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)
@@ -381,27 +387,40 @@ export class DataTypeFactory {
         });
     }
     static _createDataType(context, owner, args) {
+        let dataType = owner.node.findDataType(typeof args === 'string' ? args : args.name || '');
+        if (dataType instanceof DataType)
+            return dataType;
         const initArgs = typeof args === 'string' ? context.initArgsMap?.get(args) : args;
-        switch (initArgs?.kind) {
-            case OpraSchema.ComplexType.Kind:
-                return this._createComplexType(context, owner, initArgs);
-            case OpraSchema.EnumType.Kind:
-                return this._createEnumType(context, owner, initArgs);
-            case OpraSchema.MappedType.Kind:
-                return this._createMappedType(context, owner, initArgs);
-            case OpraSchema.MixinType.Kind:
-                return this._createMixinType(context, owner, initArgs);
-            case OpraSchema.SimpleType.Kind:
-                return this._createSimpleType(context, owner, initArgs);
+        if (initArgs) {
+            const dataTypeMap = initArgs[kDataTypeMap];
+            if (!dataTypeMap)
+                delete initArgs._instance;
+            dataType = initArgs._instance;
+            if (dataType?.name && dataTypeMap) {
+                dataTypeMap.set(dataType.name, dataType);
+            }
+            switch (initArgs?.kind) {
+                case OpraSchema.ComplexType.Kind:
+                    return this._createComplexType(context, owner, initArgs);
+                case OpraSchema.EnumType.Kind:
+                    return this._createEnumType(context, owner, initArgs);
+                case OpraSchema.MappedType.Kind:
+                    return this._createMappedType(context, owner, initArgs);
+                case OpraSchema.MixinType.Kind:
+                    return this._createMixinType(context, owner, initArgs);
+                case 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, ComplexType.prototype);
         const initArgs = 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 */
@@ -410,14 +429,7 @@ export 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);
                 }
             });
         }
@@ -427,7 +439,7 @@ export 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,
@@ -438,29 +450,37 @@ export class DataTypeFactory {
                 }
             });
         }
-        return new ComplexType(owner, initArgs);
+        ComplexType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
     static _createEnumType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, EnumType.prototype);
         const initArgs = 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 EnumType(owner, initArgs);
+        EnumType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
     static _createMappedType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, MappedType.prototype);
         const initArgs = 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 MappedType(owner, initArgs);
+        MappedType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
     static _createMixinType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, MixinType.prototype);
         const initArgs = cloneObject(args);
         if (args.types) {
             context.enter('.types', () => {
@@ -468,7 +488,7 @@ export 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 ComplexTypeBase))
                             throw new TypeError(`"${base?.kind}" can't be set as base for a "${initArgs.kind}"`);
                         initArgs.types.push(base);
@@ -476,17 +496,20 @@ export class DataTypeFactory {
                 }
             });
         }
-        return new MixinType(owner, initArgs);
+        MixinType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
     static _createSimpleType(context, owner, args) {
+        const dataType = args._instance || {};
+        Object.setPrototypeOf(dataType, SimpleType.prototype);
         const initArgs = 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 SimpleType(owner, initArgs);
+        SimpleType.apply(dataType, [owner, initArgs]);
+        return dataType;
     }
 }
 function preferName(initArgs) {

package/esm/document/http/http-api.js

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

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

@@ -106,20 +106,20 @@ class HttpControllerClass extends DocumentElement {
         });
         if (this.operations.size) {
             out.operations = {};
-            for (const [name, v] of this.operations.entries()) {
-                out.operations[name] = v.toJSON();
+            for (const v of this.operations.values()) {
+                out.operations[v.name] = v.toJSON();
             }
         }
         if (this.controllers.size) {
             out.controllers = {};
-            for (const [name, v] of this.controllers.entries()) {
-                out.controllers[name] = v.toJSON();
+            for (const v of this.controllers.values()) {
+                out.controllers[v.name] = v.toJSON();
             }
         }
         if (this.types.size) {
             out.types = {};
-            for (const [name, v] of this.types.entries()) {
-                out.types[name] = v.toJSON();
+            for (const v of this.types.values()) {
+                out.types[v.name] = v.toJSON();
             }
         }
         if (this.parameters.length) {

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

@@ -22,6 +22,7 @@ export const HttpParameter = function (owner, initArgs) {
     _this.deprecated = initArgs.deprecated;
     _this.required = initArgs.required;
     _this.arraySeparator = initArgs.arraySeparator;
+    _this.keyParam = initArgs.keyParam;
 };
 /**
  * @class HttpParameter
@@ -33,6 +34,7 @@ class HttpParameterClass extends Value {
             name: this.name,
             location: this.location,
             arraySeparator: this.arraySeparator,
+            keyParam: this.keyParam,
             required: this.required,
             deprecated: this.deprecated,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -25,8 +25,8 @@
     "lint": "eslint . --max-warnings=0",
     "check": "madge --circular src/**",
     "format": "prettier . --write --log-level=warn",
-    "test": "jest",
-    "cover": "jest --collect-coverage",
+    "test": "jest --passWithNoTests",
+    "cover": "jest --passWithNoTests --collect-coverage",
     "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all",
     "clean:test": "ts-cleanup -s test --all",

package/types/document/data-type/api-field.d.ts

@@ -59,6 +59,8 @@ declare class ApiFieldClass extends DocumentElement {
     readonly exclusive?: boolean;
     readonly translatable?: boolean;
     readonly deprecated?: boolean | string;
+    readonly readonly?: boolean;
+    readonly writeonly?: boolean;
     readonly examples?: any[] | Record<string, any>;
     toJSON(): OpraSchema.Field;
 }

package/types/document/data-type/complex-type.d.ts

@@ -71,7 +71,7 @@ declare abstract class ComplexTypeClass extends ComplexTypeBase {
     readonly kind: OpraSchema.ComplexType.Kind;
     readonly base?: ComplexType | MappedType | MixinType;
     readonly ctor?: Type;
-    extendsFrom(baseType: DataType): boolean;
+    extendsFrom(baseType: DataType | string | Type | object): boolean;
     toJSON(): OpraSchema.ComplexType;
 }
 export {};

package/types/document/data-type/data-type.d.ts

@@ -1,4 +1,4 @@
-import { StrictOmit } from 'ts-gems';
+import { StrictOmit, Type } from 'ts-gems';
 import { ValidationOptions, Validator } from 'valgen';
 import { FieldsProjection } from '../../helpers/index.js';
 import type { DataTypeBase } from '../../schema/data-type/data-type.interface.js';
@@ -23,6 +23,8 @@ export declare namespace DataType {
         caseInSensitive?: boolean;
         partial?: boolean | 'deep';
         projection?: string[] | FieldsProjection | '*';
+        ignoreReadonlyFields?: boolean;
+        ignoreWriteonlyFields?: boolean;
     }
 }
 interface DataTypeStatic {
@@ -52,7 +54,7 @@ declare abstract class DataTypeClass extends DocumentElement {
     readonly examples?: OpraSchema.DataTypeExample[];
     abstract generateCodec(codec: 'encode' | 'decode', options?: DataType.GenerateCodecOptions): Validator;
     get embedded(): any;
-    abstract extendsFrom(baseType: DataType): boolean;
+    abstract extendsFrom(baseType: DataType | string | Type | object): boolean;
     toJSON(): OpraSchema.DataType;
     toString(): string;
     [nodeInspectCustom](): string;

package/types/document/data-type/enum-type.d.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { Combine } from 'ts-gems';
+import { Combine, Type } from 'ts-gems';
 import { Validator } from 'valgen';
 import { OpraSchema } from '../../schema/index.js';
 import type { DocumentElement } from '../common/document-element.js';
@@ -63,7 +63,7 @@ declare class EnumTypeClass extends DataType {
     readonly instance?: object;
     readonly attributes: Record<string | number, OpraSchema.EnumType.ValueInfo>;
     readonly ownAttributes: Record<string | number, OpraSchema.EnumType.ValueInfo>;
-    extendsFrom(baseType: DataType): boolean;
+    extendsFrom(baseType: DataType | string | Type | object): boolean;
     generateCodec(): Validator;
     toJSON(): OpraSchema.EnumType;
 }

package/types/document/data-type/mapped-type.d.ts

@@ -5,7 +5,7 @@ import { OpraSchema } from '../../schema/index.js';
 import { DocumentElement } from '../common/document-element.js';
 import type { ComplexType } from './complex-type.js';
 import { ComplexTypeBase } from './complex-type-base.js';
-import type { DataType } from './data-type.js';
+import { DataType } from './data-type.js';
 import type { MixinType } from './mixin-type';
 /**
  * @namespace MappedType
@@ -67,7 +67,7 @@ declare class MappedTypeClass extends ComplexTypeBase {
     readonly pick?: Field.Name[];
     readonly partial?: Field.Name[] | boolean;
     readonly required?: Field.Name[] | boolean;
-    extendsFrom(baseType: DataType): boolean;
+    extendsFrom(baseType: DataType | string | Type | object): boolean;
     toJSON(): OpraSchema.MappedType;
 }
 export {};

package/types/document/data-type/mixin-type.d.ts

@@ -4,7 +4,7 @@ import { OpraSchema } from '../../schema/index.js';
 import type { DocumentElement } from '../common/document-element.js';
 import type { ComplexType } from './complex-type.js';
 import { ComplexTypeBase } from './complex-type-base.js';
-import type { DataType } from './data-type.js';
+import { DataType } from './data-type.js';
 import type { MappedType } from './mapped-type.js';
 /**
  * @namespace MixinType
@@ -76,7 +76,7 @@ export declare const MixinType: MixinTypeStatic;
 declare class MixinTypeClass extends ComplexTypeBase {
     readonly kind: OpraSchema.MixinType.Kind;
     readonly types: (ComplexType | MixinType | MappedType)[];
-    extendsFrom(baseType: DataType): boolean;
+    extendsFrom(baseType: DataType | string | Type | object): boolean;
     toJSON(): OpraSchema.MixinType;
 }
 export {};

package/types/document/data-type/simple-type.d.ts

@@ -14,7 +14,7 @@ export declare namespace SimpleType {
         kind: OpraSchema.SimpleType.Kind;
     }, DataType.Metadata, OpraSchema.SimpleType> {
     }
-    interface Options extends DataType.Options {
+    interface Options extends Combine<Pick<OpraSchema.SimpleType, 'nameMappings'>, DataType.Options> {
     }
     interface InitArguments extends Combine<{
         kind: OpraSchema.SimpleType.Kind;
@@ -64,11 +64,13 @@ declare abstract class SimpleTypeClass extends DataType {
     readonly kind: OpraSchema.SimpleType.Kind;
     readonly base?: SimpleType;
     readonly attributes: Record<string, SimpleType.Attribute>;
+    readonly nameMappings: Record<string, string>;
     readonly ownAttributes: Record<string, SimpleType.Attribute>;
+    readonly ownNameMappings: Record<string, string>;
     protected _generateDecoder?: SimpleType.ValidatorGenerator;
     protected _generateEncoder?: SimpleType.ValidatorGenerator;
     properties?: any;
-    extendsFrom(baseType: DataType): boolean;
+    extendsFrom(baseType: DataType | string | Type | object): boolean;
     generateCodec<T extends Record<string, any> | object = object>(codec: 'encode' | 'decode', options?: DataType.GenerateCodecOptions | null, properties?: Partial<T>): Validator;
     toJSON(): OpraSchema.SimpleType;
 }

package/types/document/decorators/http-controller.decorator.d.ts

@@ -6,6 +6,7 @@ export interface HttpControllerDecorator<T extends HttpControllerDecorator<any>
     Header(name: string | RegExp, optionsOrType?: StrictOmit<HttpParameter.Options, 'location'> | string | TypeThunkAsync | false): T;
     QueryParam(name: string | RegExp, optionsOrType?: StrictOmit<HttpParameter.Options, 'location'> | string | TypeThunkAsync | false): T;
     PathParam(name: string | RegExp, optionsOrType?: StrictOmit<HttpParameter.Options, 'location'> | string | TypeThunkAsync | false): T;
+    KeyParam(name: string | RegExp, optionsOrType?: StrictOmit<HttpParameter.Options, 'location'> | string | TypeThunkAsync | false): T;
     UseType(...type: TypeThunkAsync[]): T;
 }
 export interface HttpControllerDecoratorFactory {

package/types/document/factory/data-type.factory.d.ts

@@ -18,24 +18,29 @@ export declare namespace DataTypeFactory {
     type DataTypeSources = ThunkAsync<Type | EnumType.EnumObject | EnumType.EnumArray | object>[] | Record<string, OpraSchema.DataType>;
     type DataTypeThunk = Type | EnumType.EnumObject | EnumType.EnumArray | object;
     interface ComplexTypeInit extends Combine<{
+        _instance?: ComplexType;
         base?: string | ComplexTypeInit | MappedTypeInit | MixinTypeInit;
         fields?: Record<string, ApiFieldInit>;
         additionalFields?: boolean | string | DataTypeFactory.DataTypeInitArguments | ['error'] | ['error', string];
     }, ComplexType.InitArguments> {
     }
     interface EnumTypeInit extends Combine<{
+        _instance?: MappedType;
         base?: string | EnumTypeInit;
     }, EnumType.InitArguments> {
     }
     interface MappedTypeInit extends Combine<{
+        _instance?: MappedType;
         base: string | ComplexTypeInit | MappedTypeInit | MixinTypeInit;
     }, MappedType.InitArguments> {
     }
     interface MixinTypeInit extends Combine<{
+        _instance?: MixinType;
         types: (string | ComplexTypeInit | MappedTypeInit | MixinTypeInit)[];
     }, MixinType.InitArguments> {
     }
     interface SimpleTypeInit extends Combine<{
+        _instance?: SimpleType;
         base?: string | SimpleTypeInit;
     }, SimpleType.InitArguments> {
     }

package/types/document/http/http-parameter.d.ts

@@ -12,6 +12,7 @@ export declare namespace HttpParameter {
     interface Metadata extends StrictOmit<OpraSchema.HttpParameter, 'type'> {
         name: string | RegExp;
         type?: string | TypeThunkAsync | EnumType.EnumObject | EnumType.EnumArray | object;
+        keyParam?: boolean;
     }
     interface Options extends Partial<StrictOmit<Metadata, 'type'>> {
         type?: string | TypeThunkAsync | object;
@@ -41,6 +42,7 @@ export declare const HttpParameter: HttpParameterStatic;
  */
 declare class HttpParameterClass extends Value {
     readonly owner: DocumentElement;
+    keyParam?: boolean;
     deprecated?: boolean | string;
     required?: boolean;
     arraySeparator?: string;

package/types/schema/data-type/simple-type.interface.d.ts

@@ -9,6 +9,10 @@ export interface SimpleType extends StrictOmit<DataTypeBase, 'kind'> {
     base?: DataType.Name;
     attributes?: Record<string, Attribute>;
     properties?: Record<string, any>;
+    /**
+     * Naming alternatives across software languages
+     */
+    nameMappings?: Record<string, string>;
 }
 export declare namespace SimpleType {
     const Kind = "SimpleType";

package/types/schema/http/http-parameter.interface.d.ts

@@ -13,6 +13,10 @@ export interface HttpParameter extends Value {
      * Name of the parameter. RegExp pattern can be used matching parameter name
      */
     name: string | RegExp;
+    /**
+     * Determines if parameter is key
+     */
+    keyParam?: boolean;
     /**
      * Defines array separator
      */