@skmtc/core 0.0.355 → 0.0.357

package/esm/context/GenerateContext.js

@@ -177,7 +177,7 @@ export class GenerateContext {
         });
         const e = insertable.toExportPath({ operation, baseSettings });
         return new ContentSettings({
-            name: insertable.toName({ operation, baseSettings }),
+            identifier: insertable.toIdentifier({ operation, baseSettings }),
             selected: insertable.isSelected({ operation, baseSettings }),
             exportPath: e,
             importFrom: baseSettings.importFrom ?? e
@@ -190,7 +190,7 @@ export class GenerateContext {
         });
         const e = insertable.toExportPath({ refName, baseSettings });
         return new ContentSettings({
-            name: insertable.toName({ refName, baseSettings }),
+            identifier: insertable.toIdentifier({ refName, baseSettings }),
             selected: insertable.isSelected({ refName, baseSettings }),
             exportPath: e,
             importFrom: baseSettings.importFrom ?? e

package/esm/dsl/ContentSettings.d.ts

@@ -1,20 +1,21 @@
+import type { Identifier } from './Identifier.js';
 type EmptyArgs = {
     exportPath: string;
-    name: string;
+    identifier: Identifier;
 };
 type CreateArgs = {
-    name: string;
+    identifier: Identifier;
     selected: boolean;
     exportPath: string;
     importFrom: string;
 };
 export declare class ContentSettings {
-    name: string;
+    identifier: Identifier;
     selected: boolean;
     exportPath: string;
     importFrom: string;
-    constructor({ name, selected, exportPath, importFrom }: CreateArgs);
-    static empty({ name, exportPath }: EmptyArgs): ContentSettings;
+    constructor({ identifier, selected, exportPath, importFrom }: CreateArgs);
+    static empty({ identifier, exportPath }: EmptyArgs): ContentSettings;
 }
 export {};
 //# sourceMappingURL=ContentSettings.d.ts.map

package/esm/dsl/ContentSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContentSettings.d.ts","sourceRoot":"","sources":["../../src/dsl/ContentSettings.ts"],"names":[],"mappings":"AAAA,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,qBAAa,eAAe;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;gBAEN,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,UAAU;IAOlE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,SAAS,GAAG,eAAe;CAQ/D"}
+{"version":3,"file":"ContentSettings.d.ts","sourceRoot":"","sources":["../../src/dsl/ContentSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,qBAAa,eAAe;IAC1B,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;gBAEN,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,UAAU;IAOxE,MAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,SAAS,GAAG,eAAe;CAQrE"}

package/esm/dsl/ContentSettings.js

@@ -1,6 +1,6 @@
 export class ContentSettings {
-    constructor({ name, selected, exportPath, importFrom }) {
-        Object.defineProperty(this, "name", {
+    constructor({ identifier, selected, exportPath, importFrom }) {
+        Object.defineProperty(this, "identifier", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -24,15 +24,15 @@ export class ContentSettings {
             writable: true,
             value: void 0
         });
-        this.name = name;
+        this.identifier = identifier;
         this.selected = selected;
         this.exportPath = exportPath;
         this.importFrom = importFrom;
     }
-    static empty({ name, exportPath }) {
+    static empty({ identifier, exportPath }) {
         return new ContentSettings({
             selected: true,
-            name,
+            identifier,
             exportPath,
             importFrom: exportPath
         });

package/esm/dsl/Identifier.d.ts

@@ -1,5 +1,5 @@
 import { EntityType } from './EntityType.js';
-type CreateValueArgs = string | {
+type CreateVariableArgs = string | {
     name: string;
     tsType?: string;
 };
@@ -13,7 +13,7 @@ export declare class Identifier {
     entityType: EntityType;
     tsType?: string;
     constructor({ name, tsType, entityType }: ConstructorArgs);
-    static createValue(args: CreateValueArgs): Identifier;
+    static createVariable(args: CreateVariableArgs): Identifier;
     static createType(name: string): Identifier;
     toString(): string;
 }

package/esm/dsl/Identifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Identifier.d.ts","sourceRoot":"","sources":["../../src/dsl/Identifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,KAAK,eAAe,GAChB,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAEL,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,qBAAa,UAAU;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEH,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,eAAe;IAMzD,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,UAAU;IAiBrD,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IAO3C,QAAQ,IAAI,MAAM;CAGnB"}
+{"version":3,"file":"Identifier.d.ts","sourceRoot":"","sources":["../../src/dsl/Identifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,KAAK,kBAAkB,GACnB,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAEL,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,qBAAa,UAAU;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEH,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,eAAe;IAMzD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,UAAU;IAiB3D,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IAO3C,QAAQ,IAAI,MAAM;CAGnB"}

package/esm/dsl/Identifier.js

@@ -24,7 +24,7 @@ export class Identifier {
         this.tsType = tsType;
         this.entityType = entityType;
     }
-    static createValue(args) {
+    static createVariable(args) {
         return match(args)
             .with(P.string, name => {
             return new Identifier({

package/esm/dsl/model/ModelDriver.d.ts

@@ -1,6 +1,7 @@
 import type { ModelInsertable } from './ModelInsertable.js';
 import type { GenerateContext } from '../../context/GenerateContext.js';
 import type { ContentSettings } from '../ContentSettings.js';
+import type { Identifier } from '../Identifier.js';
 import type { GeneratedDefintion, GenerationType } from '../../types/GeneratedValue.js';
 import type { GeneratedValue } from '../../types/GeneratedValue.js';
 import type { RefName } from '../../types/RefName.js';
@@ -20,7 +21,7 @@ export declare class ModelDriver<V extends GeneratedValue, T extends GenerationT
     definition: GeneratedDefintion<V, T>;
     constructor({ context, insertable, refName, generation, destinationPath }: CreateModelArgs<V, T>);
     get value(): V;
-    get name(): string;
+    get identifier(): Identifier;
     get exportPath(): string;
     private apply;
     private getDefinition;

package/esm/dsl/model/ModelDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAK5D,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGrD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IACzE,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAWD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc;IACzE,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACxB,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EAChB,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;IAUxB,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,aAAa;IA6CrB,OAAO,CAAC,gBAAgB;CAqBzB"}
+{"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAG5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGrD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IACzE,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAWD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc;IACzE,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACxB,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EAChB,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;IAUxB,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,aAAa;IAkCrB,OAAO,CAAC,gBAAgB;CAqBzB"}

package/esm/dsl/model/ModelDriver.js

@@ -1,7 +1,5 @@
 import { normalize } from '../../deps/jsr.io/@std/path/1.0.0/mod.js';
 import { Definition } from '../Definition.js';
-import { Identifier } from '../Identifier.js';
-import { match } from 'ts-pattern';
 import { toModelGeneratorKey } from '../../types/GeneratorKeys.js';
 export class ModelDriver {
     constructor({ context, insertable, refName, generation, destinationPath }) {
@@ -54,29 +52,32 @@ export class ModelDriver {
         }
         return this.definition.value;
     }
-    get name() {
-        return this.settings.name;
+    get identifier() {
+        return this.settings.identifier;
     }
     get exportPath() {
         return this.settings.exportPath;
     }
     apply({ generation, destinationPath } = {}) {
-        const { name, exportPath, selected, importFrom } = this.settings;
+        const { identifier, exportPath, selected, importFrom } = this.settings;
         if (!selected && generation !== 'force') {
             return undefined;
         }
-        const definition = this.getDefinition({ name, exportPath });
+        const definition = this.getDefinition({ identifier, exportPath });
         if (destinationPath &&
             normalize(exportPath) !== normalize(destinationPath)) {
             this.context.register({
-                imports: { [importFrom]: [name] },
+                imports: { [importFrom]: [identifier.name] },
                 destinationPath
             });
         }
         return definition;
     }
-    getDefinition({ name, exportPath }) {
-        const cachedDefinition = this.context.findDefinition({ name, exportPath });
+    getDefinition({ identifier, exportPath }) {
+        const cachedDefinition = this.context.findDefinition({
+            name: identifier.name,
+            exportPath
+        });
         if (this.affirmDefinition(cachedDefinition, exportPath)) {
             return cachedDefinition;
         }
@@ -86,17 +87,6 @@ export class ModelDriver {
             settings: this.settings,
             destinationPath: this.settings.exportPath
         });
-        // @TODO This feels hacky and there is probably a better way to do this
-        const tsType = value &&
-            typeof value === 'object' &&
-            'tsType' in value &&
-            typeof value.tsType === 'string'
-            ? value.tsType
-            : undefined;
-        const identifier = match(this.insertable.entityType.type)
-            .with('variable', () => Identifier.createValue({ name, tsType }))
-            .with('type', () => Identifier.createType(name))
-            .exhaustive();
         const definition = new Definition({
             context: this.context,
             value,

package/esm/dsl/model/ModelInsertable.d.ts

@@ -1,8 +1,8 @@
 import type { GenerateContext } from '../../context/GenerateContext.js';
-import type { EntityType } from '../EntityType.js';
 import type { ContentSettings } from '../ContentSettings.js';
 import type { BaseSettings } from '../../types/Settings.js';
 import type { RefName } from '../../types/RefName.js';
+import type { Identifier } from '../Identifier.js';
 type ModelInsertableConstructorArgs = {
     context: GenerateContext;
     refName: RefName;
@@ -39,8 +39,7 @@ export type ModelInsertable<V> = {
     id: string;
     type: 'model';
     _class: 'ModelInsertable';
-    entityType: EntityType;
-    toName: ({ refName, baseSettings }: ToModelNameArgs) => string;
+    toIdentifier: ({ refName, baseSettings }: ToModelNameArgs) => Identifier;
     toExportPath: ({ refName, baseSettings }: ToModelExportPathArgs) => string;
     isSelected: ({ refName, baseSettings }: IsModelSelectedArgs) => boolean;
     pinnable: boolean;

package/esm/dsl/model/ModelInsertable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelInsertable.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAErD,KAAK,8BAA8B,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,cAAc,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC3C,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,OAAO,EAAE,eAAe,GAAG,kBAAkB,CAAA;IAClD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,cAAc,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IAClD,KAAK,EACH,OAAO,EACP,OAAO,EACP,QAAQ,EACR,eAAe,EAChB,EAAE,8BAA8B,GAAG,CAAC,CAAA;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,iBAAiB,CAAA;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,KAAK,MAAM,CAAA;IAC9D,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,KAAK,MAAM,CAAA;IAC1E,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAA;IACvE,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,OAAO,CAAA;CAE3B,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"ModelInsertable.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,KAAK,8BAA8B,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,cAAc,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC3C,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,OAAO,EAAE,eAAe,GAAG,kBAAkB,CAAA;IAClD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,cAAc,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IAClD,KAAK,EACH,OAAO,EACP,OAAO,EACP,QAAQ,EACR,eAAe,EAChB,EAAE,8BAA8B,GAAG,CAAC,CAAA;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,iBAAiB,CAAA;IACzB,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,KAAK,UAAU,CAAA;IACxE,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,KAAK,MAAM,CAAA;IAC1E,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAA;IACvE,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,OAAO,CAAA;CAE3B,GAAG,QAAQ,CAAA"}

package/esm/dsl/model/toModelBase.d.ts

@@ -1,8 +1,8 @@
 import type { GenerateContext } from '../../context/GenerateContext.js';
 import type { RefName } from '../../types/RefName.js';
 import type { ContentSettings } from '../ContentSettings.js';
-import { EntityType } from '../EntityType.js';
 import type { IsModelSelectedArgs, ToModelExportPathArgs, ToModelNameArgs } from './ModelInsertable.js';
+import type { Identifier } from '../Identifier.js';
 export type ModelInsertableArgs = {
     context: GenerateContext;
     settings: ContentSettings;
@@ -10,8 +10,7 @@ export type ModelInsertableArgs = {
 };
 export type ModelConfig = {
     id: string;
-    entityType?: EntityType;
-    toName: ({ refName, baseSettings }: ToModelNameArgs) => string;
+    toIdentifier: ({ refName, baseSettings }: ToModelNameArgs) => Identifier;
     toExportPath: ({ refName, baseSettings }: ToModelExportPathArgs) => string;
     isSelected?: ({ refName, baseSettings }: IsModelSelectedArgs) => boolean;
 };
@@ -29,8 +28,7 @@ export declare const toModelBase: (config: ModelConfig) => {
         id: string;
         type: "model";
         _class: "ModelInsertable";
-        entityType: EntityType;
-        toName: ({ refName, baseSettings }: ToModelNameArgs) => string;
+        toIdentifier: ({ refName, baseSettings }: ToModelNameArgs) => Identifier;
         toExportPath: ({ refName, baseSettings }: ToModelExportPathArgs) => string;
         isSelected: ({ refName, baseSettings }: IsModelSelectedArgs) => boolean;
         isSupported: () => boolean;

package/esm/dsl/model/toModelBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toModelBase.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/toModelBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,sBAAsB,CAAA;AAG7B,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,KAAK,MAAM,CAAA;IAC9D,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,KAAK,MAAM,CAAA;IAC1E,UAAU,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAA;CACzE,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,WAAW;;mBAYzB,mBAAmB;;;;;;;;;;;;;4CAjBH,eAAe,KAAK,MAAM;kDACpB,qBAAqB,KAAK,MAAM;gDACjC,mBAAmB,KAAK,OAAO;;;;;sBAiCjD,eAAe;;;;;;;;;CAMvC,CAAA"}
+{"version":3,"file":"toModelBase.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/toModelBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,KAAK,UAAU,CAAA;IACxE,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,KAAK,MAAM,CAAA;IAC1E,UAAU,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAA;CACzE,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,WAAW;;mBAWzB,mBAAmB;;;;;;;;;;;;kDAhBG,eAAe,KAAK,UAAU;kDAC9B,qBAAqB,KAAK,MAAM;gDACjC,mBAAmB,KAAK,OAAO;;;;;sBAgCjD,eAAe;;;;;;;;;CAMvC,CAAA"}

package/esm/dsl/model/toModelBase.js

@@ -3,7 +3,6 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
 import { toModelGeneratorKey } from '../../types/GeneratorKeys.js';
-import { EntityType } from '../EntityType.js';
 import { GatewayBase } from '../GeneratorBase.js';
 import { ModelBase } from './ModelBase.js';
 export const toModelBase = (config) => {
@@ -38,17 +37,11 @@ export const toModelBase = (config) => {
             writable: true,
             value: 'ModelInsertable'
         }),
-        Object.defineProperty(_a, "entityType", {
+        Object.defineProperty(_a, "toIdentifier", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: config.entityType ?? new EntityType('variable')
-        }),
-        Object.defineProperty(_a, "toName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: config.toName.bind(config)
+            value: config.toIdentifier.bind(config)
         }),
         Object.defineProperty(_a, "toExportPath", {
             enumerable: true,

package/esm/dsl/operation/OperationDriver.d.ts

@@ -1,6 +1,7 @@
 import type { OperationInsertable } from './OperationInsertable.js';
 import type { OasOperation } from '../../oas/operation/Operation.js';
 import type { ContentSettings } from '../ContentSettings.js';
+import type { Identifier } from '../Identifier.js';
 import type { GeneratedDefintion, GenerationType } from '../../types/GeneratedValue.js';
 import type { GeneratedValue } from '../../types/GeneratedValue.js';
 import type { GenerateContext } from '../../context/GenerateContext.js';
@@ -20,7 +21,7 @@ export declare class OperationDriver<V extends GeneratedValue, T extends Generat
     definition: GeneratedDefintion<V, T>;
     constructor({ context, insertable, operation, generation, destinationPath }: CreateOperationArgs<V, T>);
     get value(): V;
-    get name(): string;
+    get identifier(): Identifier;
     get exportPath(): string;
     private apply;
     private getDefinition;

package/esm/dsl/operation/OperationDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OperationDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/OperationDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5D,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAGnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,KAAK,mBAAmB,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IAC7E,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAYD,qBAAa,eAAe,CAC1B,CAAC,SAAS,cAAc,EACxB,CAAC,SAAS,cAAc;IAExB,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBAExB,EACV,OAAO,EACP,UAAU,EACV,SAAS,EACT,UAAU,EACV,eAAe,EAChB,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC;IAc5B,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,aAAa;IAyCrB,OAAO,CAAC,gBAAgB;CAqBzB"}
+{"version":3,"file":"OperationDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/OperationDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAG5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAEnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,KAAK,mBAAmB,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IAC7E,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAYD,qBAAa,eAAe,CAC1B,CAAC,SAAS,cAAc,EACxB,CAAC,SAAS,cAAc;IAExB,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBAExB,EACV,OAAO,EACP,UAAU,EACV,SAAS,EACT,UAAU,EACV,eAAe,EAChB,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC;IAc5B,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,aAAa;IAiCrB,OAAO,CAAC,gBAAgB;CAqBzB"}

package/esm/dsl/operation/OperationDriver.js

@@ -1,7 +1,5 @@
 import { normalize } from '../../deps/jsr.io/@std/path/1.0.0/mod.js';
 import { Definition } from '../Definition.js';
-import { Identifier } from '../Identifier.js';
-import { match } from 'ts-pattern';
 import { toOperationGeneratorKey } from '../../types/GeneratorKeys.js';
 export class OperationDriver {
     constructor({ context, insertable, operation, generation, destinationPath }) {
@@ -57,29 +55,32 @@ export class OperationDriver {
         }
         return this.definition.value;
     }
-    get name() {
-        return this.settings.name;
+    get identifier() {
+        return this.settings.identifier;
     }
     get exportPath() {
         return this.settings.exportPath;
     }
     apply({ generation, destinationPath } = {}) {
-        const { name, exportPath, selected, importFrom } = this.settings;
+        const { identifier, exportPath, selected, importFrom } = this.settings;
         if (!selected && generation !== 'force') {
             return undefined;
         }
-        const definition = this.getDefinition({ name, exportPath });
+        const definition = this.getDefinition({ identifier, exportPath });
         if (destinationPath &&
             normalize(exportPath) !== normalize(destinationPath)) {
             this.context.register({
-                imports: { [importFrom]: [name] },
+                imports: { [importFrom]: [identifier.name] },
                 destinationPath
             });
         }
         return definition;
     }
-    getDefinition({ name, exportPath }) {
-        const cachedDefinition = this.context.findDefinition({ name, exportPath });
+    getDefinition({ identifier, exportPath }) {
+        const cachedDefinition = this.context.findDefinition({
+            name: identifier.name,
+            exportPath
+        });
         if (this.affirmDefinition(cachedDefinition, exportPath)) {
             return cachedDefinition;
         }
@@ -88,14 +89,6 @@ export class OperationDriver {
             operation: this.operation,
             settings: this.settings
         });
-        // @TODO This feels hacky and there is probably a better way to do this
-        const tsType = 'tsType' in value && typeof value.tsType === 'string'
-            ? value.tsType
-            : undefined;
-        const identifier = match(this.insertable.entityType.type)
-            .with('variable', () => Identifier.createValue({ name, tsType }))
-            .with('type', () => Identifier.createType(name))
-            .exhaustive();
         const definition = new Definition({
             context: this.context,
             value,

package/esm/dsl/operation/OperationInsertable.d.ts

@@ -1,8 +1,8 @@
 import type { OasOperation } from '../../oas/operation/Operation.js';
 import type { ContentSettings } from '../ContentSettings.js';
 import type { BaseSettings } from '../../types/Settings.js';
-import type { EntityType } from '../EntityType.js';
 import type { GenerateContext } from '../../context/GenerateContext.js';
+import type { Identifier } from '../Identifier.js';
 type OperationInsertableConstructorArgs = {
     context: GenerateContext;
     settings: ContentSettings;
@@ -38,8 +38,7 @@ export type OperationInsertable<V> = {
     id: string;
     type: 'operation';
     _class: 'OperationInsertable';
-    entityType: EntityType;
-    toName: ({ operation, baseSettings }: ToOperationNameArgs) => string;
+    toIdentifier: ({ operation, baseSettings }: ToOperationNameArgs) => Identifier;
     toExportPath: ({ operation, baseSettings }: ToOperationExportPathArgs) => string;
     isSelected: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
     pinnable: boolean;

package/esm/dsl/operation/OperationInsertable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OperationInsertable.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/OperationInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,KAAK,kCAAkC,GAAG;IACxC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,kBAAkB,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,OAAO,EAAE,eAAe,GAAG,sBAAsB,CAAA;IACtD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,kBAAkB,CAAA;IAC1B,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CAClD,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IACtD,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,kCAAkC,GAAG,CAAC,CAAA;IAC7E,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,qBAAqB,CAAA;IAC7B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,MAAM,CAAA;IACpE,YAAY,EAAE,CAAC,EACb,SAAS,EACT,YAAY,EACb,EAAE,yBAAyB,KAAK,MAAM,CAAA;IACvC,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAA;IAC7E,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CAElD,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"OperationInsertable.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/OperationInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,KAAK,kCAAkC,GAAG;IACxC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,kBAAkB,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,OAAO,EAAE,eAAe,GAAG,sBAAsB,CAAA;IACtD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,kBAAkB,CAAA;IAC1B,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CAClD,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IACtD,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,kCAAkC,GAAG,CAAC,CAAA;IAC7E,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,qBAAqB,CAAA;IAC7B,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,UAAU,CAAA;IAC9E,YAAY,EAAE,CAAC,EACb,SAAS,EACT,YAAY,EACb,EAAE,yBAAyB,KAAK,MAAM,CAAA;IACvC,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAA;IAC7E,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CAElD,GAAG,QAAQ,CAAA"}

package/esm/dsl/operation/toOperationBase.d.ts

@@ -1,8 +1,8 @@
-import { EntityType } from '../EntityType.js';
 import type { GenerateContext } from '../../context/GenerateContext.js';
 import type { OasOperation } from '../../oas/operation/Operation.js';
 import type { ContentSettings } from '../ContentSettings.js';
 import type { ToOperationNameArgs, ToOperationExportPathArgs, IsOperationSelectedArgs } from './OperationInsertable.js';
+import type { Identifier } from '../Identifier.js';
 export type OperationInsertableArgs = {
     context: GenerateContext;
     settings: ContentSettings;
@@ -10,8 +10,7 @@ export type OperationInsertableArgs = {
 };
 export type OperationConfig = {
     id: string;
-    entityType?: EntityType;
-    toName: ({ operation, baseSettings }: ToOperationNameArgs) => string;
+    toIdentifier: ({ operation, baseSettings }: ToOperationNameArgs) => Identifier;
     toExportPath: ({ operation, baseSettings }: ToOperationExportPathArgs) => string;
     isSelected?: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
     isSupported?: (operation: OasOperation) => boolean;
@@ -29,7 +28,7 @@ export declare const toOperationBase: (config: OperationConfig) => {
             };
             createAndRegisterDefinition<Schema extends import("../../mod.js").SchemaType>({ schema, identifier, schemaToValueFn }: {
                 schema: Schema;
-                identifier: import("../Identifier.js").Identifier;
+                identifier: Identifier;
                 schemaToValueFn: import("../../mod.js").SchemaToValueFn;
             }): import("../Definition.js").Definition<import("../../mod.js").TypeSystemOutput<Schema["type"]>>;
             register(args: Partial<import("../../context/GenerateContext.js").RegisterArgs>): void;
@@ -39,8 +38,7 @@ export declare const toOperationBase: (config: OperationConfig) => {
         id: string;
         type: "operation";
         _class: "OperationInsertable";
-        entityType: EntityType;
-        toName: ({ operation, baseSettings }: ToOperationNameArgs) => string;
+        toIdentifier: ({ operation, baseSettings }: ToOperationNameArgs) => Identifier;
         toExportPath: ({ operation, baseSettings }: ToOperationExportPathArgs) => string;
         isSelected: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
         isSupported: (operation: OasOperation) => boolean;

package/esm/dsl/operation/toOperationBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toOperationBase.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/toOperationBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,uBAAuB,EACxB,MAAM,0BAA0B,CAAA;AAIjC,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,MAAM,CAAA;IACpE,YAAY,EAAE,CAAC,EACb,SAAS,EACT,YAAY,EACb,EAAE,yBAAyB,KAAK,MAAM,CAAA;IACvC,UAAU,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAA;IAC9E,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;IAClD,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,eAAe,WAAY,eAAe;;mBAYjC,uBAAuB;;;;;;;;;;;;;;;;;;;;;8CAtBL,mBAAmB,KAAK,MAAM;oDAIjE,yBAAyB,KAAK,MAAM;kDACI,uBAAuB,KAAK,OAAO;iCACpD,YAAY,KAAK,OAAO;;;;sBAkC3B,eAAe;;;;;;iCAlCZ,YAAY,KAAK,OAAO;;;CAwCnD,CAAA"}
+{"version":3,"file":"toOperationBase.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/toOperationBase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,uBAAuB,EACxB,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,UAAU,CAAA;IAC9E,YAAY,EAAE,CAAC,EACb,SAAS,EACT,YAAY,EACb,EAAE,yBAAyB,KAAK,MAAM,CAAA;IACvC,UAAU,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAA;IAC9E,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;IAClD,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,eAAe,WAAY,eAAe;;mBAWjC,uBAAuB;;;;;;;;;;;;;;;;;;;;oDArBC,mBAAmB,KAAK,UAAU;oDAI3E,yBAAyB,KAAK,MAAM;kDACI,uBAAuB,KAAK,OAAO;iCACpD,YAAY,KAAK,OAAO;;;;sBAiC3B,eAAe;;;;;;iCAjCZ,YAAY,KAAK,OAAO;;;CAuCnD,CAAA"}

package/esm/dsl/operation/toOperationBase.js

@@ -2,7 +2,6 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
     if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
-import { EntityType } from '../EntityType.js';
 import { toOperationGeneratorKey } from '../../types/GeneratorKeys.js';
 import { OperationBase } from './OperationBase.js';
 import { GatewayBase } from '../GeneratorBase.js';
@@ -38,17 +37,11 @@ export const toOperationBase = (config) => {
             writable: true,
             value: 'OperationInsertable'
         }),
-        Object.defineProperty(_a, "entityType", {
+        Object.defineProperty(_a, "toIdentifier", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: config.entityType ?? new EntityType('variable')
-        }),
-        Object.defineProperty(_a, "toName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: config.toName.bind(config)
+            value: config.toIdentifier.bind(config)
         }),
         Object.defineProperty(_a, "toExportPath", {
             enumerable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skmtc/core",
-  "version": "0.0.355",
+  "version": "0.0.357",
   "main": "./script/mod.js",
   "module": "./esm/mod.js",
   "exports": {

package/script/context/GenerateContext.js

@@ -203,7 +203,7 @@ class GenerateContext {
         });
         const e = insertable.toExportPath({ operation, baseSettings });
         return new ContentSettings_js_1.ContentSettings({
-            name: insertable.toName({ operation, baseSettings }),
+            identifier: insertable.toIdentifier({ operation, baseSettings }),
             selected: insertable.isSelected({ operation, baseSettings }),
             exportPath: e,
             importFrom: baseSettings.importFrom ?? e
@@ -216,7 +216,7 @@ class GenerateContext {
         });
         const e = insertable.toExportPath({ refName, baseSettings });
         return new ContentSettings_js_1.ContentSettings({
-            name: insertable.toName({ refName, baseSettings }),
+            identifier: insertable.toIdentifier({ refName, baseSettings }),
             selected: insertable.isSelected({ refName, baseSettings }),
             exportPath: e,
             importFrom: baseSettings.importFrom ?? e

package/script/dsl/ContentSettings.d.ts

@@ -1,20 +1,21 @@
+import type { Identifier } from './Identifier.js';
 type EmptyArgs = {
     exportPath: string;
-    name: string;
+    identifier: Identifier;
 };
 type CreateArgs = {
-    name: string;
+    identifier: Identifier;
     selected: boolean;
     exportPath: string;
     importFrom: string;
 };
 export declare class ContentSettings {
-    name: string;
+    identifier: Identifier;
     selected: boolean;
     exportPath: string;
     importFrom: string;
-    constructor({ name, selected, exportPath, importFrom }: CreateArgs);
-    static empty({ name, exportPath }: EmptyArgs): ContentSettings;
+    constructor({ identifier, selected, exportPath, importFrom }: CreateArgs);
+    static empty({ identifier, exportPath }: EmptyArgs): ContentSettings;
 }
 export {};
 //# sourceMappingURL=ContentSettings.d.ts.map

package/script/dsl/ContentSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContentSettings.d.ts","sourceRoot":"","sources":["../../src/dsl/ContentSettings.ts"],"names":[],"mappings":"AAAA,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,qBAAa,eAAe;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;gBAEN,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,UAAU;IAOlE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,SAAS,GAAG,eAAe;CAQ/D"}
+{"version":3,"file":"ContentSettings.d.ts","sourceRoot":"","sources":["../../src/dsl/ContentSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,KAAK,SAAS,GAAG;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,qBAAa,eAAe;IAC1B,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;gBAEN,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,UAAU;IAOxE,MAAM,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,SAAS,GAAG,eAAe;CAQrE"}

package/script/dsl/ContentSettings.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContentSettings = void 0;
 class ContentSettings {
-    constructor({ name, selected, exportPath, importFrom }) {
-        Object.defineProperty(this, "name", {
+    constructor({ identifier, selected, exportPath, importFrom }) {
+        Object.defineProperty(this, "identifier", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -27,15 +27,15 @@ class ContentSettings {
             writable: true,
             value: void 0
         });
-        this.name = name;
+        this.identifier = identifier;
         this.selected = selected;
         this.exportPath = exportPath;
         this.importFrom = importFrom;
     }
-    static empty({ name, exportPath }) {
+    static empty({ identifier, exportPath }) {
         return new ContentSettings({
             selected: true,
-            name,
+            identifier,
             exportPath,
             importFrom: exportPath
         });

package/script/dsl/Identifier.d.ts

@@ -1,5 +1,5 @@
 import { EntityType } from './EntityType.js';
-type CreateValueArgs = string | {
+type CreateVariableArgs = string | {
     name: string;
     tsType?: string;
 };
@@ -13,7 +13,7 @@ export declare class Identifier {
     entityType: EntityType;
     tsType?: string;
     constructor({ name, tsType, entityType }: ConstructorArgs);
-    static createValue(args: CreateValueArgs): Identifier;
+    static createVariable(args: CreateVariableArgs): Identifier;
     static createType(name: string): Identifier;
     toString(): string;
 }

package/script/dsl/Identifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Identifier.d.ts","sourceRoot":"","sources":["../../src/dsl/Identifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,KAAK,eAAe,GAChB,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAEL,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,qBAAa,UAAU;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEH,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,eAAe;IAMzD,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,UAAU;IAiBrD,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IAO3C,QAAQ,IAAI,MAAM;CAGnB"}
+{"version":3,"file":"Identifier.d.ts","sourceRoot":"","sources":["../../src/dsl/Identifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,KAAK,kBAAkB,GACnB,MAAM,GACN;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAEL,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,qBAAa,UAAU;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEH,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,eAAe;IAMzD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,UAAU;IAiB3D,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IAO3C,QAAQ,IAAI,MAAM;CAGnB"}

package/script/dsl/Identifier.js

@@ -27,7 +27,7 @@ class Identifier {
         this.tsType = tsType;
         this.entityType = entityType;
     }
-    static createValue(args) {
+    static createVariable(args) {
         return (0, ts_pattern_1.match)(args)
             .with(ts_pattern_1.P.string, name => {
             return new Identifier({

package/script/dsl/model/ModelDriver.d.ts

@@ -1,6 +1,7 @@
 import type { ModelInsertable } from './ModelInsertable.js';
 import type { GenerateContext } from '../../context/GenerateContext.js';
 import type { ContentSettings } from '../ContentSettings.js';
+import type { Identifier } from '../Identifier.js';
 import type { GeneratedDefintion, GenerationType } from '../../types/GeneratedValue.js';
 import type { GeneratedValue } from '../../types/GeneratedValue.js';
 import type { RefName } from '../../types/RefName.js';
@@ -20,7 +21,7 @@ export declare class ModelDriver<V extends GeneratedValue, T extends GenerationT
     definition: GeneratedDefintion<V, T>;
     constructor({ context, insertable, refName, generation, destinationPath }: CreateModelArgs<V, T>);
     get value(): V;
-    get name(): string;
+    get identifier(): Identifier;
     get exportPath(): string;
     private apply;
     private getDefinition;

package/script/dsl/model/ModelDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAK5D,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGrD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IACzE,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAWD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc;IACzE,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACxB,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EAChB,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;IAUxB,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,aAAa;IA6CrB,OAAO,CAAC,gBAAgB;CAqBzB"}
+{"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAG5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGrD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IACzE,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAWD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc;IACzE,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACxB,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EAChB,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC;IAUxB,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,aAAa;IAkCrB,OAAO,CAAC,gBAAgB;CAqBzB"}

package/script/dsl/model/ModelDriver.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelDriver = void 0;
 const mod_js_1 = require("../../deps/jsr.io/@std/path/1.0.0/mod.js");
 const Definition_js_1 = require("../Definition.js");
-const Identifier_js_1 = require("../Identifier.js");
-const ts_pattern_1 = require("ts-pattern");
 const GeneratorKeys_js_1 = require("../../types/GeneratorKeys.js");
 class ModelDriver {
     constructor({ context, insertable, refName, generation, destinationPath }) {
@@ -57,29 +55,32 @@ class ModelDriver {
         }
         return this.definition.value;
     }
-    get name() {
-        return this.settings.name;
+    get identifier() {
+        return this.settings.identifier;
     }
     get exportPath() {
         return this.settings.exportPath;
     }
     apply({ generation, destinationPath } = {}) {
-        const { name, exportPath, selected, importFrom } = this.settings;
+        const { identifier, exportPath, selected, importFrom } = this.settings;
         if (!selected && generation !== 'force') {
             return undefined;
         }
-        const definition = this.getDefinition({ name, exportPath });
+        const definition = this.getDefinition({ identifier, exportPath });
         if (destinationPath &&
             (0, mod_js_1.normalize)(exportPath) !== (0, mod_js_1.normalize)(destinationPath)) {
             this.context.register({
-                imports: { [importFrom]: [name] },
+                imports: { [importFrom]: [identifier.name] },
                 destinationPath
             });
         }
         return definition;
     }
-    getDefinition({ name, exportPath }) {
-        const cachedDefinition = this.context.findDefinition({ name, exportPath });
+    getDefinition({ identifier, exportPath }) {
+        const cachedDefinition = this.context.findDefinition({
+            name: identifier.name,
+            exportPath
+        });
         if (this.affirmDefinition(cachedDefinition, exportPath)) {
             return cachedDefinition;
         }
@@ -89,17 +90,6 @@ class ModelDriver {
             settings: this.settings,
             destinationPath: this.settings.exportPath
         });
-        // @TODO This feels hacky and there is probably a better way to do this
-        const tsType = value &&
-            typeof value === 'object' &&
-            'tsType' in value &&
-            typeof value.tsType === 'string'
-            ? value.tsType
-            : undefined;
-        const identifier = (0, ts_pattern_1.match)(this.insertable.entityType.type)
-            .with('variable', () => Identifier_js_1.Identifier.createValue({ name, tsType }))
-            .with('type', () => Identifier_js_1.Identifier.createType(name))
-            .exhaustive();
         const definition = new Definition_js_1.Definition({
             context: this.context,
             value,

package/script/dsl/model/ModelInsertable.d.ts

@@ -1,8 +1,8 @@
 import type { GenerateContext } from '../../context/GenerateContext.js';
-import type { EntityType } from '../EntityType.js';
 import type { ContentSettings } from '../ContentSettings.js';
 import type { BaseSettings } from '../../types/Settings.js';
 import type { RefName } from '../../types/RefName.js';
+import type { Identifier } from '../Identifier.js';
 type ModelInsertableConstructorArgs = {
     context: GenerateContext;
     refName: RefName;
@@ -39,8 +39,7 @@ export type ModelInsertable<V> = {
     id: string;
     type: 'model';
     _class: 'ModelInsertable';
-    entityType: EntityType;
-    toName: ({ refName, baseSettings }: ToModelNameArgs) => string;
+    toIdentifier: ({ refName, baseSettings }: ToModelNameArgs) => Identifier;
     toExportPath: ({ refName, baseSettings }: ToModelExportPathArgs) => string;
     isSelected: ({ refName, baseSettings }: IsModelSelectedArgs) => boolean;
     pinnable: boolean;

package/script/dsl/model/ModelInsertable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelInsertable.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAErD,KAAK,8BAA8B,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,cAAc,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC3C,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,OAAO,EAAE,eAAe,GAAG,kBAAkB,CAAA;IAClD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,cAAc,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IAClD,KAAK,EACH,OAAO,EACP,OAAO,EACP,QAAQ,EACR,eAAe,EAChB,EAAE,8BAA8B,GAAG,CAAC,CAAA;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,iBAAiB,CAAA;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,KAAK,MAAM,CAAA;IAC9D,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,KAAK,MAAM,CAAA;IAC1E,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAA;IACvE,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,OAAO,CAAA;CAE3B,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"ModelInsertable.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,KAAK,8BAA8B,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,cAAc,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CAC3C,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,OAAO,EAAE,eAAe,GAAG,kBAAkB,CAAA;IAClD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,cAAc,CAAA;IACtB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,OAAO,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IAClD,KAAK,EACH,OAAO,EACP,OAAO,EACP,QAAQ,EACR,eAAe,EAChB,EAAE,8BAA8B,GAAG,CAAC,CAAA;IACrC,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,MAAM,EAAE,iBAAiB,CAAA;IACzB,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,KAAK,UAAU,CAAA;IACxE,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,KAAK,MAAM,CAAA;IAC1E,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAA;IACvE,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,MAAM,OAAO,CAAA;CAE3B,GAAG,QAAQ,CAAA"}

package/script/dsl/model/toModelBase.d.ts

@@ -1,8 +1,8 @@
 import type { GenerateContext } from '../../context/GenerateContext.js';
 import type { RefName } from '../../types/RefName.js';
 import type { ContentSettings } from '../ContentSettings.js';
-import { EntityType } from '../EntityType.js';
 import type { IsModelSelectedArgs, ToModelExportPathArgs, ToModelNameArgs } from './ModelInsertable.js';
+import type { Identifier } from '../Identifier.js';
 export type ModelInsertableArgs = {
     context: GenerateContext;
     settings: ContentSettings;
@@ -10,8 +10,7 @@ export type ModelInsertableArgs = {
 };
 export type ModelConfig = {
     id: string;
-    entityType?: EntityType;
-    toName: ({ refName, baseSettings }: ToModelNameArgs) => string;
+    toIdentifier: ({ refName, baseSettings }: ToModelNameArgs) => Identifier;
     toExportPath: ({ refName, baseSettings }: ToModelExportPathArgs) => string;
     isSelected?: ({ refName, baseSettings }: IsModelSelectedArgs) => boolean;
 };
@@ -29,8 +28,7 @@ export declare const toModelBase: (config: ModelConfig) => {
         id: string;
         type: "model";
         _class: "ModelInsertable";
-        entityType: EntityType;
-        toName: ({ refName, baseSettings }: ToModelNameArgs) => string;
+        toIdentifier: ({ refName, baseSettings }: ToModelNameArgs) => Identifier;
         toExportPath: ({ refName, baseSettings }: ToModelExportPathArgs) => string;
         isSelected: ({ refName, baseSettings }: IsModelSelectedArgs) => boolean;
         isSupported: () => boolean;

package/script/dsl/model/toModelBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toModelBase.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/toModelBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,sBAAsB,CAAA;AAG7B,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,KAAK,MAAM,CAAA;IAC9D,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,KAAK,MAAM,CAAA;IAC1E,UAAU,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAA;CACzE,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,WAAW;;mBAYzB,mBAAmB;;;;;;;;;;;;;4CAjBH,eAAe,KAAK,MAAM;kDACpB,qBAAqB,KAAK,MAAM;gDACjC,mBAAmB,KAAK,OAAO;;;;;sBAiCjD,eAAe;;;;;;;;;CAMvC,CAAA"}
+{"version":3,"file":"toModelBase.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/toModelBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,KAAK,UAAU,CAAA;IACxE,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,KAAK,MAAM,CAAA;IAC1E,UAAU,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,OAAO,CAAA;CACzE,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,WAAW;;mBAWzB,mBAAmB;;;;;;;;;;;;kDAhBG,eAAe,KAAK,UAAU;kDAC9B,qBAAqB,KAAK,MAAM;gDACjC,mBAAmB,KAAK,OAAO;;;;;sBAgCjD,eAAe;;;;;;;;;CAMvC,CAAA"}

package/script/dsl/model/toModelBase.js

@@ -6,7 +6,6 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toModelBase = void 0;
 const GeneratorKeys_js_1 = require("../../types/GeneratorKeys.js");
-const EntityType_js_1 = require("../EntityType.js");
 const GeneratorBase_js_1 = require("../GeneratorBase.js");
 const ModelBase_js_1 = require("./ModelBase.js");
 const toModelBase = (config) => {
@@ -41,17 +40,11 @@ const toModelBase = (config) => {
             writable: true,
             value: 'ModelInsertable'
         }),
-        Object.defineProperty(_a, "entityType", {
+        Object.defineProperty(_a, "toIdentifier", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: config.entityType ?? new EntityType_js_1.EntityType('variable')
-        }),
-        Object.defineProperty(_a, "toName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: config.toName.bind(config)
+            value: config.toIdentifier.bind(config)
         }),
         Object.defineProperty(_a, "toExportPath", {
             enumerable: true,

package/script/dsl/operation/OperationDriver.d.ts

@@ -1,6 +1,7 @@
 import type { OperationInsertable } from './OperationInsertable.js';
 import type { OasOperation } from '../../oas/operation/Operation.js';
 import type { ContentSettings } from '../ContentSettings.js';
+import type { Identifier } from '../Identifier.js';
 import type { GeneratedDefintion, GenerationType } from '../../types/GeneratedValue.js';
 import type { GeneratedValue } from '../../types/GeneratedValue.js';
 import type { GenerateContext } from '../../context/GenerateContext.js';
@@ -20,7 +21,7 @@ export declare class OperationDriver<V extends GeneratedValue, T extends Generat
     definition: GeneratedDefintion<V, T>;
     constructor({ context, insertable, operation, generation, destinationPath }: CreateOperationArgs<V, T>);
     get value(): V;
-    get name(): string;
+    get identifier(): Identifier;
     get exportPath(): string;
     private apply;
     private getDefinition;

package/script/dsl/operation/OperationDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OperationDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/OperationDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5D,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAGnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,KAAK,mBAAmB,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IAC7E,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAYD,qBAAa,eAAe,CAC1B,CAAC,SAAS,cAAc,EACxB,CAAC,SAAS,cAAc;IAExB,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBAExB,EACV,OAAO,EACP,UAAU,EACV,SAAS,EACT,UAAU,EACV,eAAe,EAChB,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC;IAc5B,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,aAAa;IAyCrB,OAAO,CAAC,gBAAgB;CAqBzB"}
+{"version":3,"file":"OperationDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/OperationDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAG5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAEnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,KAAK,mBAAmB,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IAC7E,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAYD,qBAAa,eAAe,CAC1B,CAAC,SAAS,cAAc,EACxB,CAAC,SAAS,cAAc;IAExB,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBAExB,EACV,OAAO,EACP,UAAU,EACV,SAAS,EACT,UAAU,EACV,eAAe,EAChB,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC;IAc5B,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAyBb,OAAO,CAAC,aAAa;IAiCrB,OAAO,CAAC,gBAAgB;CAqBzB"}

package/script/dsl/operation/OperationDriver.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationDriver = void 0;
 const mod_js_1 = require("../../deps/jsr.io/@std/path/1.0.0/mod.js");
 const Definition_js_1 = require("../Definition.js");
-const Identifier_js_1 = require("../Identifier.js");
-const ts_pattern_1 = require("ts-pattern");
 const GeneratorKeys_js_1 = require("../../types/GeneratorKeys.js");
 class OperationDriver {
     constructor({ context, insertable, operation, generation, destinationPath }) {
@@ -60,29 +58,32 @@ class OperationDriver {
         }
         return this.definition.value;
     }
-    get name() {
-        return this.settings.name;
+    get identifier() {
+        return this.settings.identifier;
     }
     get exportPath() {
         return this.settings.exportPath;
     }
     apply({ generation, destinationPath } = {}) {
-        const { name, exportPath, selected, importFrom } = this.settings;
+        const { identifier, exportPath, selected, importFrom } = this.settings;
         if (!selected && generation !== 'force') {
             return undefined;
         }
-        const definition = this.getDefinition({ name, exportPath });
+        const definition = this.getDefinition({ identifier, exportPath });
         if (destinationPath &&
             (0, mod_js_1.normalize)(exportPath) !== (0, mod_js_1.normalize)(destinationPath)) {
             this.context.register({
-                imports: { [importFrom]: [name] },
+                imports: { [importFrom]: [identifier.name] },
                 destinationPath
             });
         }
         return definition;
     }
-    getDefinition({ name, exportPath }) {
-        const cachedDefinition = this.context.findDefinition({ name, exportPath });
+    getDefinition({ identifier, exportPath }) {
+        const cachedDefinition = this.context.findDefinition({
+            name: identifier.name,
+            exportPath
+        });
         if (this.affirmDefinition(cachedDefinition, exportPath)) {
             return cachedDefinition;
         }
@@ -91,14 +92,6 @@ class OperationDriver {
             operation: this.operation,
             settings: this.settings
         });
-        // @TODO This feels hacky and there is probably a better way to do this
-        const tsType = 'tsType' in value && typeof value.tsType === 'string'
-            ? value.tsType
-            : undefined;
-        const identifier = (0, ts_pattern_1.match)(this.insertable.entityType.type)
-            .with('variable', () => Identifier_js_1.Identifier.createValue({ name, tsType }))
-            .with('type', () => Identifier_js_1.Identifier.createType(name))
-            .exhaustive();
         const definition = new Definition_js_1.Definition({
             context: this.context,
             value,

package/script/dsl/operation/OperationInsertable.d.ts

@@ -1,8 +1,8 @@
 import type { OasOperation } from '../../oas/operation/Operation.js';
 import type { ContentSettings } from '../ContentSettings.js';
 import type { BaseSettings } from '../../types/Settings.js';
-import type { EntityType } from '../EntityType.js';
 import type { GenerateContext } from '../../context/GenerateContext.js';
+import type { Identifier } from '../Identifier.js';
 type OperationInsertableConstructorArgs = {
     context: GenerateContext;
     settings: ContentSettings;
@@ -38,8 +38,7 @@ export type OperationInsertable<V> = {
     id: string;
     type: 'operation';
     _class: 'OperationInsertable';
-    entityType: EntityType;
-    toName: ({ operation, baseSettings }: ToOperationNameArgs) => string;
+    toIdentifier: ({ operation, baseSettings }: ToOperationNameArgs) => Identifier;
     toExportPath: ({ operation, baseSettings }: ToOperationExportPathArgs) => string;
     isSelected: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
     pinnable: boolean;

package/script/dsl/operation/OperationInsertable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OperationInsertable.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/OperationInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAEvE,KAAK,kCAAkC,GAAG;IACxC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,kBAAkB,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,OAAO,EAAE,eAAe,GAAG,sBAAsB,CAAA;IACtD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,kBAAkB,CAAA;IAC1B,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CAClD,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IACtD,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,kCAAkC,GAAG,CAAC,CAAA;IAC7E,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,qBAAqB,CAAA;IAC7B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,MAAM,CAAA;IACpE,YAAY,EAAE,CAAC,EACb,SAAS,EACT,YAAY,EACb,EAAE,yBAAyB,KAAK,MAAM,CAAA;IACvC,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAA;IAC7E,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CAElD,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"OperationInsertable.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/OperationInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,KAAK,kCAAkC,GAAG;IACxC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,kBAAkB,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,OAAO,EAAE,eAAe,GAAG,sBAAsB,CAAA;IACtD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,kBAAkB,CAAA;IAC1B,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CAClD,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IACtD,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,kCAAkC,GAAG,CAAC,CAAA;IAC7E,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,MAAM,EAAE,qBAAqB,CAAA;IAC7B,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,UAAU,CAAA;IAC9E,YAAY,EAAE,CAAC,EACb,SAAS,EACT,YAAY,EACb,EAAE,yBAAyB,KAAK,MAAM,CAAA;IACvC,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAA;IAC7E,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CAElD,GAAG,QAAQ,CAAA"}

package/script/dsl/operation/toOperationBase.d.ts

@@ -1,8 +1,8 @@
-import { EntityType } from '../EntityType.js';
 import type { GenerateContext } from '../../context/GenerateContext.js';
 import type { OasOperation } from '../../oas/operation/Operation.js';
 import type { ContentSettings } from '../ContentSettings.js';
 import type { ToOperationNameArgs, ToOperationExportPathArgs, IsOperationSelectedArgs } from './OperationInsertable.js';
+import type { Identifier } from '../Identifier.js';
 export type OperationInsertableArgs = {
     context: GenerateContext;
     settings: ContentSettings;
@@ -10,8 +10,7 @@ export type OperationInsertableArgs = {
 };
 export type OperationConfig = {
     id: string;
-    entityType?: EntityType;
-    toName: ({ operation, baseSettings }: ToOperationNameArgs) => string;
+    toIdentifier: ({ operation, baseSettings }: ToOperationNameArgs) => Identifier;
     toExportPath: ({ operation, baseSettings }: ToOperationExportPathArgs) => string;
     isSelected?: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
     isSupported?: (operation: OasOperation) => boolean;
@@ -29,7 +28,7 @@ export declare const toOperationBase: (config: OperationConfig) => {
             };
             createAndRegisterDefinition<Schema extends import("../../mod.js").SchemaType>({ schema, identifier, schemaToValueFn }: {
                 schema: Schema;
-                identifier: import("../Identifier.js").Identifier;
+                identifier: Identifier;
                 schemaToValueFn: import("../../mod.js").SchemaToValueFn;
             }): import("../Definition.js").Definition<import("../../mod.js").TypeSystemOutput<Schema["type"]>>;
             register(args: Partial<import("../../context/GenerateContext.js").RegisterArgs>): void;
@@ -39,8 +38,7 @@ export declare const toOperationBase: (config: OperationConfig) => {
         id: string;
         type: "operation";
         _class: "OperationInsertable";
-        entityType: EntityType;
-        toName: ({ operation, baseSettings }: ToOperationNameArgs) => string;
+        toIdentifier: ({ operation, baseSettings }: ToOperationNameArgs) => Identifier;
         toExportPath: ({ operation, baseSettings }: ToOperationExportPathArgs) => string;
         isSelected: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
         isSupported: (operation: OasOperation) => boolean;

package/script/dsl/operation/toOperationBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toOperationBase.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/toOperationBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,uBAAuB,EACxB,MAAM,0BAA0B,CAAA;AAIjC,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,MAAM,CAAA;IACpE,YAAY,EAAE,CAAC,EACb,SAAS,EACT,YAAY,EACb,EAAE,yBAAyB,KAAK,MAAM,CAAA;IACvC,UAAU,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAA;IAC9E,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;IAClD,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,eAAe,WAAY,eAAe;;mBAYjC,uBAAuB;;;;;;;;;;;;;;;;;;;;;8CAtBL,mBAAmB,KAAK,MAAM;oDAIjE,yBAAyB,KAAK,MAAM;kDACI,uBAAuB,KAAK,OAAO;iCACpD,YAAY,KAAK,OAAO;;;;sBAkC3B,eAAe;;;;;;iCAlCZ,YAAY,KAAK,OAAO;;;CAwCnD,CAAA"}
+{"version":3,"file":"toOperationBase.d.ts","sourceRoot":"","sources":["../../../src/dsl/operation/toOperationBase.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,uBAAuB,EACxB,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAElD,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,KAAK,UAAU,CAAA;IAC9E,YAAY,EAAE,CAAC,EACb,SAAS,EACT,YAAY,EACb,EAAE,yBAAyB,KAAK,MAAM,CAAA;IACvC,UAAU,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAA;IAC9E,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;IAClD,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,eAAe,WAAY,eAAe;;mBAWjC,uBAAuB;;;;;;;;;;;;;;;;;;;;oDArBC,mBAAmB,KAAK,UAAU;oDAI3E,yBAAyB,KAAK,MAAM;kDACI,uBAAuB,KAAK,OAAO;iCACpD,YAAY,KAAK,OAAO;;;;sBAiC3B,eAAe;;;;;;iCAjCZ,YAAY,KAAK,OAAO;;;CAuCnD,CAAA"}

package/script/dsl/operation/toOperationBase.js

@@ -5,7 +5,6 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toOperationBase = void 0;
-const EntityType_js_1 = require("../EntityType.js");
 const GeneratorKeys_js_1 = require("../../types/GeneratorKeys.js");
 const OperationBase_js_1 = require("./OperationBase.js");
 const GeneratorBase_js_1 = require("../GeneratorBase.js");
@@ -41,17 +40,11 @@ const toOperationBase = (config) => {
             writable: true,
             value: 'OperationInsertable'
         }),
-        Object.defineProperty(_a, "entityType", {
+        Object.defineProperty(_a, "toIdentifier", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: config.entityType ?? new EntityType_js_1.EntityType('variable')
-        }),
-        Object.defineProperty(_a, "toName", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: config.toName.bind(config)
+            value: config.toIdentifier.bind(config)
         }),
         Object.defineProperty(_a, "toExportPath", {
             enumerable: true,