@skmtc/core 0.0.263 → 0.0.265

package/esm/context/CoreContext.d.ts

@@ -1,32 +1,20 @@
-import type { ParseContext } from './ParseContext.js';
 import { GenerateContext } from './GenerateContext.js';
-import type { AddRenderDependencyArgs, GetModelSettingsArgs, GetOperationSettingsArgs, PickArgs, RegisterArgs, TransformReturn } from './GenerateContext.js';
-import type { PrettierConfigType } from '../types/prettierConfig.js';
-import type { OasDocument } from '../oas/document/Document.js';
+import type { AddRenderDependencyArgs, GetModelSettingsArgs, GetOperationSettingsArgs, PickArgs, RegisterArgs, InsertReturn, InsertArgs } from './GenerateContext.js';
 import { RenderContext, type FilesRenderResult } from './RenderContext.js';
 import type { AddGeneratorKeyArgs, FileContents, RenderDependencies, RenderOptions } from './types.js';
+import type { ParseContext } from './ParseContext.js';
+import type { PrettierConfigType } from '../types/prettierConfig.js';
+import type { OasDocument } from '../oas/document/Document.js';
 import type { OpenAPIV3 } from 'openapi-types';
 import type { BaseSettings, ClientSettings } from '../types/Settings.js';
 import type { Definition } from '../dsl/Definition.js';
-import type { OperationCreator, OperationGenerator } from '../dsl/OperationCreator.js';
-import type { ModelCreator, ModelGenerator } from '../dsl/ModelCreator.js';
+import type { OperationGenerator } from '../dsl/OperationInsertable.js';
+import type { ModelGenerator } from '../dsl/ModelInsertable.js';
 import type { GeneratedValue } from '../types/GeneratedValue.js';
 import type { OasSchema } from '../oas/schema/Schema.js';
 import type { OasRef } from '../oas/ref/Ref.js';
-import type { OasOperation } from '../oas/operation/Operation.js';
-import type { GenerationType } from '../types/GenerationType.js';
+import type { GenerationType } from '../types/GeneratedValue.js';
 import type { RefName } from '../types/RefName.js';
-type TransformArgs<V extends GeneratedValue> = {
-    creator: OperationCreator<V>;
-    operation: OasOperation;
-    generation?: GenerationType;
-    destinationPath?: string;
-} | {
-    creator: ModelCreator<V>;
-    refName: RefName;
-    generation?: GenerationType;
-    destinationPath?: string;
-};
 type SharedContext = {
     type: 'parse';
     context: ParseContext;
@@ -63,11 +51,11 @@ export declare class CoreContext {
     resolveSchemaRefOnce(refName: RefName): OasSchema | OasRef<'schema'>;
     addRenderDependency(args: AddRenderDependencyArgs): void;
     getFile(filePath: string): FileContents;
-    pick(args: PickArgs): Definition<GeneratedValue> | undefined;
+    findDefinition(args: PickArgs): Definition<GeneratedValue> | undefined;
     render(options: RenderOptions): FilesRenderResult;
     addFile(normalisedPath: string): FileContents;
     getOperationBaseSettings(args: GetOperationSettingsArgs): BaseSettings;
-    transform<V extends GeneratedValue>(args: TransformArgs<V>): TransformReturn<V>;
+    insert<V extends GeneratedValue, T extends GenerationType>(args: InsertArgs<V, T>): InsertReturn<V, T>;
     getModelBaseSettings(args: GetModelSettingsArgs): BaseSettings;
     get files(): Map<string, FileContents>;
     get renderDependencies(): RenderDependencies;

package/esm/context/CoreContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"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"}

package/esm/context/CoreContext.js

@@ -96,9 +96,9 @@ export class CoreContext {
         })
             .exhaustive();
     }
-    pick(args) {
+    findDefinition(args) {
         return match(this.phase)
-            .with({ type: 'generate' }, ({ context }) => context.pick(args))
+            .with({ type: 'generate' }, ({ context }) => context.findDefinition(args))
             .with({ type: 'parse' }, () => {
             throw new Error(`Cannot pick during parse phase`);
         })
@@ -142,10 +142,10 @@ export class CoreContext {
         })
             .exhaustive();
     }
-    transform(args) {
+    insert(args) {
         return match(this.phase)
             .with({ type: 'generate' }, ({ context }) => {
-            return context.transform({ ...args, coreContext: this });
+            return context.insert({ ...args, coreContext: this });
         })
             .with({ type: 'parse' }, () => {
             throw new Error(`Cannot run 'transform' during parse phase`);

package/esm/context/GenerateContext.d.ts

@@ -6,12 +6,11 @@ import type { OasRef } from '../oas/ref/Ref.js';
 import type { FileContents, GetFileOptions, RenderDependencies } from './types.js';
 import type { BaseSettings, ClientSettings } from '../types/Settings.js';
 import type { Method } from '../types/Method.js';
-import type { OperationCreator, OperationGenerator } from '../dsl/OperationCreator.js';
+import type { OperationInsertable, OperationGenerator } from '../dsl/OperationInsertable.js';
 import type { OasOperation } from '../oas/operation/Operation.js';
 import type { CoreContext } from './CoreContext.js';
-import type { ModelCreator, ModelGenerator } from '../dsl/ModelCreator.js';
-import type { GenerationType } from '../types/GenerationType.js';
-import type { GeneratedValue } from '../types/GeneratedValue.js';
+import type { ModelInsertable, ModelGenerator } from '../dsl/ModelInsertable.js';
+import type { GenerationType, GeneratedDefintion, GeneratedValue } from '../types/GeneratedValue.js';
 import type { ContentSettings } from '../dsl/ContentSettings.js';
 import type { RefName } from '../types/RefName.js';
 type ConstructorArgs = {
@@ -43,22 +42,20 @@ export type GetModelSettingsArgs = {
     generatorId: string;
     refName: RefName;
 };
-export type TransformArgs<V extends GeneratedValue> = {
-    coreContext: CoreContext;
-    creator: OperationCreator<V>;
+export type InsertArgs<V extends GeneratedValue, T extends GenerationType> = {
+    insertable: OperationInsertable<V>;
     operation: OasOperation;
-    generation?: GenerationType;
+    generation?: T;
     destinationPath?: string;
 } | {
-    coreContext: CoreContext;
-    creator: ModelCreator<V>;
+    insertable: ModelInsertable<V>;
     refName: RefName;
-    generation?: GenerationType;
+    generation?: T;
     destinationPath?: string;
 };
-export type TransformReturn<V extends GeneratedValue> = {
+export type InsertReturn<V extends GeneratedValue, T extends GenerationType> = {
     settings: ContentSettings;
-    definition: Definition<V> | undefined;
+    definition: GeneratedDefintion<V, T>;
 };
 export declare class GenerateContext {
     files: Map<string, FileContents>;
@@ -70,17 +67,16 @@ export declare class GenerateContext {
     constructor({ schemaModel, generatorsMap, settings }: ConstructorArgs);
     getFile(filePath: string, { throwIfNotFound }?: GetFileOptions): FileContents;
     register({ imports, packageDependencies, definitions, destinationPath }: RegisterArgs): void;
-    transform<V extends GeneratedValue>({ coreContext, generation, destinationPath, ...rest }: TransformArgs<V>): {
-        settings: ContentSettings;
-        definition: Definition<V> | undefined;
-    };
+    insert<V extends GeneratedValue, T extends GenerationType>({ coreContext, generation, destinationPath, ...rest }: InsertArgs<V, T> & {
+        coreContext: CoreContext;
+    }): InsertReturn<V, T>;
     getOperationBaseSettings({ generatorId, path, method }: GetOperationSettingsArgs): BaseSettings;
     getModelBaseSettings({ generatorId, refName }: GetModelSettingsArgs): BaseSettings;
     addFile(normalisedPath: string): FileContents;
     resolveSchemaRefOnce(refName: RefName): OasSchema | OasRef<'schema'>;
     addRenderDependency({ generatorId, dependencies, operation }: AddRenderDependencyArgs): void;
     /** Produce external instance and return its name */
-    pick({ name, exportPath }: PickArgs): Definition | undefined;
+    findDefinition({ name, exportPath }: PickArgs): Definition | undefined;
 }
 export {};
 //# sourceMappingURL=GenerateContext.d.ts.map

package/esm/context/GenerateContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"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"}

package/esm/context/GenerateContext.js

@@ -82,12 +82,12 @@ export class GenerateContext {
             currentFile.definitions.set(`${definition.identifier}`, definition);
         });
     }
-    transform({ coreContext, generation, destinationPath, ...rest }) {
+    insert({ coreContext, generation, destinationPath, ...rest }) {
         if ('operation' in rest) {
-            const { creator, operation } = rest;
+            const { insertable, operation } = rest;
             const { settings, definition } = new OperationDriver({
                 context: coreContext,
-                creator,
+                insertable,
                 operation,
                 generation,
                 destinationPath
@@ -95,10 +95,10 @@ export class GenerateContext {
             return { settings, definition };
         }
         else {
-            const { creator, refName } = rest;
+            const { insertable, refName } = rest;
             const { settings, definition } = new ModelDriver({
                 context: coreContext,
-                creator,
+                insertable,
                 refName,
                 generation,
                 destinationPath
@@ -167,7 +167,7 @@ export class GenerateContext {
         });
     }
     /** Produce external instance and return its name */
-    pick({ name, exportPath }) {
+    findDefinition({ name, exportPath }) {
         return this.getFile(exportPath).definitions.get(name);
     }
 }

package/esm/dsl/ModelDriver.d.ts

@@ -1,31 +1,31 @@
-import type { ModelCreator } from './ModelCreator.js';
+import type { ModelInsertable } from './ModelInsertable.js';
 import type { CoreContext } from '../context/CoreContext.js';
 import { ContentSettings } from './ContentSettings.js';
-import { Definition } from './Definition.js';
-import type { GenerationType } from '../types/GenerationType.js';
+import type { GeneratedDefintion, GenerationType } from '../types/GeneratedValue.js';
 import type { GeneratedValue } from '../types/GeneratedValue.js';
 import type { RefName } from '../types/RefName.js';
-type CreateModelArgs<V extends GeneratedValue> = {
+type CreateModelArgs<V extends GeneratedValue, T extends GenerationType> = {
     context: CoreContext;
-    creator: ModelCreator<V>;
+    insertable: ModelInsertable<V>;
     refName: RefName;
-    generation?: GenerationType;
+    generation?: T;
     destinationPath?: string;
 };
-export declare class ModelDriver<V extends GeneratedValue> {
+export declare class ModelDriver<V extends GeneratedValue, T extends GenerationType> {
     context: CoreContext;
-    creator: ModelCreator<V>;
+    insertable: ModelInsertable<V>;
     refName: RefName;
     settings: ContentSettings;
     destinationPath?: string;
-    definition: Definition<V> | undefined;
-    constructor({ context, creator, refName, generation, destinationPath }: CreateModelArgs<V>);
+    definition: GeneratedDefintion<V, T>;
+    constructor({ context, insertable, refName, generation, destinationPath }: CreateModelArgs<V, T>);
     get value(): V;
     get name(): string;
     get exportPath(): string;
     private apply;
     private getDefinition;
     private buildModelSettings;
+    private affirmDefinition;
 }
 export {};
 //# sourceMappingURL=ModelDriver.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../src/dsl/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAI5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,IAAI;IAC/C,OAAO,EAAE,WAAW,CAAA;IACpB,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAgBD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc;IAC/C,OAAO,EAAE,WAAW,CAAA;IACpB,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;gBACzB,EACV,OAAO,EACP,OAAO,EACP,OAAO,EACP,UAAU,EACV,eAAe,EAChB,EAAE,eAAe,CAAC,CAAC,CAAC;IAarB,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAwBb,OAAO,CAAC,aAAa;IA+CrB,OAAO,CAAC,kBAAkB;CAkB3B"}
+{"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../src/dsl/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAKtD,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IACzE,OAAO,EAAE,WAAW,CAAA;IACpB,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;AAgBD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc;IACzE,OAAO,EAAE,WAAW,CAAA;IACpB,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;IAaxB,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,kBAAkB;IAkB1B,OAAO,CAAC,gBAAgB;CAoBzB"}

package/esm/dsl/ModelDriver.js

@@ -3,16 +3,16 @@ 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 { verifyType } from '../helpers/verifyType.js';
+import { toModelGeneratorKey } from '../types/GeneratorKeys.js';
 export class ModelDriver {
-    constructor({ context, creator, refName, generation, destinationPath }) {
+    constructor({ context, insertable, refName, generation, destinationPath }) {
         Object.defineProperty(this, "context", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "creator", {
+        Object.defineProperty(this, "insertable", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -43,18 +43,18 @@ export class ModelDriver {
             value: void 0
         });
         this.context = context;
-        this.creator = creator;
+        this.insertable = insertable;
         this.refName = refName;
         this.destinationPath = destinationPath;
-        this.settings = this.buildModelSettings({ refName, creator });
+        this.settings = this.buildModelSettings({ refName, insertable });
         this.definition = this.apply({
-            force: generation === 'force',
+            generation,
             destinationPath
         });
     }
     get value() {
         if (!this.definition) {
-            throw new Error(`${this.creator.id} ${this.refName}: definition is undefined`);
+            throw new Error(`${this.insertable.id} ${this.refName}: definition is undefined`);
         }
         return this.definition.value;
     }
@@ -64,10 +64,10 @@ export class ModelDriver {
     get exportPath() {
         return this.settings.exportPath;
     }
-    apply({ force, destinationPath } = {}) {
+    apply({ generation, destinationPath } = {}) {
         const { name, exportPath, selected, importFrom } = this.settings;
-        if (!selected && !force) {
-            return;
+        if (!selected && generation !== 'force') {
+            return undefined;
         }
         const definition = this.getDefinition({ name, exportPath });
         if (destinationPath &&
@@ -80,12 +80,11 @@ export class ModelDriver {
         return definition;
     }
     getDefinition({ name, exportPath }) {
-        const existing = this.context.pick({ name, exportPath });
-        if (existing) {
-            verifyType(existing.value, this.creator);
-            return existing;
+        const cachedDefinition = this.context.findDefinition({ name, exportPath });
+        if (this.affirmDefinition(cachedDefinition)) {
+            return cachedDefinition;
         }
-        const value = new this.creator({
+        const value = new this.insertable({
             refName: this.refName,
             context: this.context,
             settings: this.settings,
@@ -98,7 +97,7 @@ export class ModelDriver {
             typeof value.tsType === 'string'
             ? value.tsType
             : undefined;
-        const identifier = match(this.creator.entityType.type)
+        const identifier = match(this.insertable.entityType.type)
             .with('value', () => Identifier.createValue({ name, tsType }))
             .with('type', () => Identifier.createType(name))
             .exhaustive();
@@ -113,17 +112,30 @@ export class ModelDriver {
         });
         return definition;
     }
-    buildModelSettings({ refName, creator }) {
+    buildModelSettings({ refName, insertable }) {
         const baseSettings = this.context.getModelBaseSettings({
-            generatorId: creator.id,
+            generatorId: insertable.id,
             refName
         });
-        const e = creator.toExportPath({ refName, baseSettings });
+        const e = insertable.toExportPath({ refName, baseSettings });
         return new ContentSettings({
-            name: creator.toName({ refName, baseSettings }),
-            selected: creator.isSelected({ refName, baseSettings }),
+            name: insertable.toName({ refName, baseSettings }),
+            selected: insertable.isSelected({ refName, baseSettings }),
             exportPath: e,
             importFrom: baseSettings.importFrom ?? e
         });
     }
+    affirmDefinition(definition) {
+        if (!definition) {
+            return false;
+        }
+        const currentKey = toModelGeneratorKey({
+            generatorId: this.insertable.id,
+            refName: this.refName
+        });
+        if (currentKey === definition.generatorKey) {
+            throw new Error(`Registered definition mismatch: cached key '${definition.generatorKey}' does not match new key ${currentKey}`);
+        }
+        return definition.value instanceof this.insertable;
+    }
 }

package/esm/dsl/{ModelCreator.d.ts → ModelInsertable.d.ts}

@@ -1,9 +1,5 @@
 import type { CoreContext } from '../context/CoreContext.js';
-import type { OasSchema } from '../oas/schema/Schema.js';
 import type { EntityType } from './EntityType.js';
-import type { OasRef } from '../oas/ref/Ref.js';
-import type { CustomValue } from '../types/CustomValue.js';
-import type { OasVoid } from '../oas/void/Void.js';
 import type { ContentSettings } from './ContentSettings.js';
 import type { BaseSettings } from '../types/Settings.js';
 import type { RefName } from '../types/RefName.js';
@@ -28,7 +24,7 @@ export type ModelGenerator = {
     type: 'model';
     pinnable?: boolean;
 };
-export type ModelCreator<V> = {
+export type ModelInsertable<V> = {
     prototype: V;
 } & {
     new (args: {
@@ -43,12 +39,4 @@ export type ModelCreator<V> = {
     toExportPath: ({ refName, baseSettings }: ToModelExportPathArgs) => string;
     isSelected: ({ refName, baseSettings }: IsModelSelectedArgs) => boolean;
 } & Function;
-export type TypeSystemCreatorFnArgs = {
-    context: CoreContext;
-    destinationPath: string;
-    schema: OasSchema | OasRef<'schema'> | OasVoid | CustomValue;
-};
-export type TypeSystemCreator<V> = {
-    create: (args: TypeSystemCreatorFnArgs) => V;
-};
-//# sourceMappingURL=ModelCreator.d.ts.map
+//# sourceMappingURL=ModelInsertable.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ModelInsertable.d.ts","sourceRoot":"","sources":["../../src/dsl/ModelInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,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,cAAc,GAAG;IAC3B,KAAK,OAAO,EAAE,WAAW,GAAG,kBAAkB,CAAA;IAC9C,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IAClD,KAAK,IAAI,EAAE;QACT,OAAO,EAAE,WAAW,CAAA;QACpB,OAAO,EAAE,OAAO,CAAA;QAChB,QAAQ,EAAE,eAAe,CAAA;QACzB,eAAe,EAAE,MAAM,CAAA;KACxB,GAAG,CAAC,CAAA;IACL,EAAE,EAAE,MAAM,CAAA;IACV,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;CAExE,GAAG,QAAQ,CAAA"}

package/esm/dsl/OperationDriver.d.ts

@@ -1,31 +1,31 @@
-import type { OperationCreator } from './OperationCreator.js';
+import type { OperationInsertable } from './OperationInsertable.js';
 import type { CoreContext } from '../context/CoreContext.js';
 import type { OasOperation } from '../oas/operation/Operation.js';
 import { ContentSettings } from './ContentSettings.js';
-import { Definition } from './Definition.js';
-import type { GenerationType } from '../types/GenerationType.js';
+import type { GeneratedDefintion, GenerationType } from '../types/GeneratedValue.js';
 import type { GeneratedValue } from '../types/GeneratedValue.js';
-type CreateOperationArgs<V extends GeneratedValue> = {
+type CreateOperationArgs<V extends GeneratedValue, T extends GenerationType> = {
     context: CoreContext;
-    creator: OperationCreator<V>;
+    insertable: OperationInsertable<V>;
     operation: OasOperation;
-    generation?: GenerationType;
+    generation?: T;
     destinationPath?: string;
 };
-export declare class OperationDriver<V extends GeneratedValue> {
+export declare class OperationDriver<V extends GeneratedValue, T extends GenerationType> {
     context: CoreContext;
-    creator: OperationCreator<V>;
+    insertable: OperationInsertable<V>;
     operation: OasOperation;
     settings: ContentSettings;
     destinationPath?: string;
-    definition: Definition<V> | undefined;
-    constructor({ context, creator, operation, generation, destinationPath }: CreateOperationArgs<V>);
+    definition: GeneratedDefintion<V, T>;
+    constructor({ context, insertable, operation, generation, destinationPath }: CreateOperationArgs<V, T>);
     get value(): V;
     get name(): string;
     get exportPath(): string;
     private apply;
     private getDefinition;
     private buildOperationSettings;
+    private affirmDefinition;
 }
 export {};
 //# sourceMappingURL=OperationDriver.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"OperationDriver.d.ts","sourceRoot":"","sources":["../../src/dsl/OperationDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAGhE,KAAK,mBAAmB,CAAC,CAAC,SAAS,cAAc,IAAI;IACnD,OAAO,EAAE,WAAW,CAAA;IACpB,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAC5B,SAAS,EAAE,YAAY,CAAA;IACvB,UAAU,CAAC,EAAE,cAAc,CAAA;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAiBD,qBAAa,eAAe,CAAC,CAAC,SAAS,cAAc;IACnD,OAAO,EAAE,WAAW,CAAA;IACpB,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAC5B,SAAS,EAAE,YAAY,CAAA;IACvB,QAAQ,EAAE,eAAe,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;gBAEzB,EACV,OAAO,EACP,OAAO,EACP,SAAS,EACT,UAAU,EACV,eAAe,EAChB,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAiBzB,IAAI,KAAK,IAAI,CAAC,CAQb;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,KAAK;IAwBb,OAAO,CAAC,aAAa;IA4CrB,OAAO,CAAC,sBAAsB;CAmB/B"}
+{"version":3,"file":"OperationDriver.d.ts","sourceRoot":"","sources":["../../src/dsl/OperationDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAItD,OAAO,KAAK,EACV,kBAAkB,EAClB,cAAc,EACf,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAIhE,KAAK,mBAAmB,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IAC7E,OAAO,EAAE,WAAW,CAAA;IACpB,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;AAiBD,qBAAa,eAAe,CAC1B,CAAC,SAAS,cAAc,EACxB,CAAC,SAAS,cAAc;IAExB,OAAO,EAAE,WAAW,CAAA;IACpB,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;IAiB5B,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,sBAAsB;IAoB9B,OAAO,CAAC,gBAAgB;CAoBzB"}

package/esm/dsl/OperationDriver.js

@@ -2,17 +2,17 @@ import { ContentSettings } from './ContentSettings.js';
 import { normalize } from '../deps/jsr.io/@std/path/1.0.0/mod.js';
 import { Definition } from './Definition.js';
 import { Identifier } from './Identifier.js';
-import { verifyType } from '../helpers/verifyType.js';
 import { match } from 'ts-pattern';
+import { toOperationGeneratorKey } from '../types/GeneratorKeys.js';
 export class OperationDriver {
-    constructor({ context, creator, operation, generation, destinationPath }) {
+    constructor({ context, insertable, operation, generation, destinationPath }) {
         Object.defineProperty(this, "context", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "creator", {
+        Object.defineProperty(this, "insertable", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -43,21 +43,21 @@ export class OperationDriver {
             value: void 0
         });
         this.context = context;
-        this.creator = creator;
+        this.insertable = insertable;
         this.operation = operation;
         this.destinationPath = destinationPath;
         this.settings = this.buildOperationSettings({
             operation,
-            creator
+            insertable
         });
         this.definition = this.apply({
-            force: generation === 'force',
+            generation,
             destinationPath
         });
     }
     get value() {
         if (!this.definition) {
-            throw new Error(`${this.creator.id} ${this.operation.path} ${this.operation.method}: definition is undefined`);
+            throw new Error(`${this.insertable.id} ${this.operation.path} ${this.operation.method}: definition is undefined`);
         }
         return this.definition.value;
     }
@@ -67,10 +67,10 @@ export class OperationDriver {
     get exportPath() {
         return this.settings.exportPath;
     }
-    apply({ force, destinationPath } = {}) {
+    apply({ generation, destinationPath } = {}) {
         const { name, exportPath, selected, importFrom } = this.settings;
-        if (!selected && !force) {
-            return;
+        if (!selected && generation !== 'force') {
+            return undefined;
         }
         const definition = this.getDefinition({ name, exportPath });
         if (destinationPath &&
@@ -83,13 +83,11 @@ export class OperationDriver {
         return definition;
     }
     getDefinition({ name, exportPath }) {
-        // @TODO Throw error if output was generated using a different creator or operation
-        const existing = this.context.pick({ name, exportPath });
-        if (existing) {
-            verifyType(existing.value, this.creator);
-            return existing;
+        const cachedDefinition = this.context.findDefinition({ name, exportPath });
+        if (this.affirmDefinition(cachedDefinition)) {
+            return cachedDefinition;
         }
-        const value = new this.creator({
+        const value = new this.insertable({
             context: this.context,
             operation: this.operation,
             settings: this.settings
@@ -98,7 +96,7 @@ export class OperationDriver {
         const tsType = 'tsType' in value && typeof value.tsType === 'string'
             ? value.tsType
             : undefined;
-        const identifier = match(this.creator.entityType.type)
+        const identifier = match(this.insertable.entityType.type)
             .with('value', () => Identifier.createValue({ name, tsType }))
             .with('type', () => Identifier.createType(name))
             .exhaustive();
@@ -113,18 +111,31 @@ export class OperationDriver {
         });
         return definition;
     }
-    buildOperationSettings({ operation, creator }) {
+    buildOperationSettings({ operation, insertable }) {
         const baseSettings = this.context.getOperationBaseSettings({
-            generatorId: creator.id,
+            generatorId: insertable.id,
             path: operation.path,
             method: operation.method
         });
-        const e = creator.toExportPath({ operation, baseSettings });
+        const e = insertable.toExportPath({ operation, baseSettings });
         return new ContentSettings({
-            name: creator.toName({ operation, baseSettings }),
-            selected: creator.isSelected({ operation, baseSettings }),
+            name: insertable.toName({ operation, baseSettings }),
+            selected: insertable.isSelected({ operation, baseSettings }),
             exportPath: e,
             importFrom: baseSettings.importFrom ?? e
         });
     }
+    affirmDefinition(definition) {
+        if (!definition) {
+            return false;
+        }
+        const currentKey = toOperationGeneratorKey({
+            generatorId: this.insertable.id,
+            operation: this.operation
+        });
+        if (currentKey === definition.generatorKey) {
+            throw new Error(`Registered definition mismatch: cached key '${definition.generatorKey}' does not match new key ${currentKey}`);
+        }
+        return definition.value instanceof this.insertable;
+    }
 }

package/{script/dsl/OperationCreator.d.ts → esm/dsl/OperationInsertable.d.ts}

@@ -30,7 +30,7 @@ export type OperationGenerator = {
     pinnable?: boolean;
     isSupported?: (operation: OasOperation) => boolean;
 };
-export type OperationCreator<V> = {
+export type OperationInsertable<V> = {
     prototype: V;
 } & {
     id: string;
@@ -41,4 +41,4 @@ export type OperationCreator<V> = {
     isSelected: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
 } & Function;
 export {};
-//# sourceMappingURL=OperationCreator.d.ts.map
+//# sourceMappingURL=OperationInsertable.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"OperationInsertable.d.ts","sourceRoot":"","sources":["../../src/dsl/OperationInsertable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,WAAW,CAAA;IACpB,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,kBAAkB,GAAG;IAC/B,KAAK,OAAO,EAAE,WAAW,GAAG,sBAAsB,CAAA;IAClD,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CACnD,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;IAAE,SAAS,EAAE,CAAC,CAAA;CAAE,GAAG;IACtD,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,IAAI,EAAE,qBAAqB,GAAG,CAAC,CAAA;IACpC,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;CAE9E,GAAG,QAAQ,CAAA"}