@skmtc/core 0.0.264 → 0.0.266

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 { OperationInsertable, OperationGenerator } from '../dsl/OperationInsertable.js';
-import type { ModelInsertable, ModelGenerator } from '../dsl/ModelInsertable.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> = {
-    insertable: OperationInsertable<V>;
-    operation: OasOperation;
-    generation?: GenerationType;
-    destinationPath?: string;
-} | {
-    insertable: ModelInsertable<V>;
-    refName: RefName;
-    generation?: GenerationType;
-    destinationPath?: string;
-};
 type SharedContext = {
     type: 'parse';
     context: ParseContext;
@@ -67,7 +55,7 @@ export declare class CoreContext {
     render(options: RenderOptions): FilesRenderResult;
     addFile(normalisedPath: string): FileContents;
     getOperationBaseSettings(args: GetOperationSettingsArgs): BaseSettings;
-    insert<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/GenerateContext.d.ts

@@ -10,8 +10,7 @@ import type { OperationInsertable, OperationGenerator } from '../dsl/OperationIn
 import type { OasOperation } from '../oas/operation/Operation.js';
 import type { CoreContext } from './CoreContext.js';
 import type { ModelInsertable, ModelGenerator } from '../dsl/ModelInsertable.js';
-import type { GenerationType } from '../types/GenerationType.js';
-import type { GeneratedValue } from '../types/GeneratedValue.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;
+export type InsertArgs<V extends GeneratedValue, T extends GenerationType> = {
     insertable: OperationInsertable<V>;
     operation: OasOperation;
-    generation?: GenerationType;
+    generation?: T;
     destinationPath?: string;
 } | {
-    coreContext: CoreContext;
     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,10 +67,9 @@ export declare class GenerateContext {
     constructor({ schemaModel, generatorsMap, settings }: ConstructorArgs);
     getFile(filePath: string, { throwIfNotFound }?: GetFileOptions): FileContents;
     register({ imports, packageDependencies, definitions, destinationPath }: RegisterArgs): void;
-    insert<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;

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/dsl/ModelDriver.d.ts

@@ -1,25 +1,24 @@
 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;
     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;
     insertable: ModelInsertable<V>;
     refName: RefName;
     settings: ContentSettings;
     destinationPath?: string;
-    definition: Definition<V> | undefined;
-    constructor({ context, insertable, 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;

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,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,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;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,IAAI;IAC/C,OAAO,EAAE,WAAW,CAAA;IACpB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,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,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,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;gBACzB,EACV,OAAO,EACP,UAAU,EACV,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;IA6CrB,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,gBAAgB;CAoBzB"}
+{"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

@@ -48,7 +48,7 @@ export class ModelDriver {
         this.destinationPath = destinationPath;
         this.settings = this.buildModelSettings({ refName, insertable });
         this.definition = this.apply({
-            force: generation === 'force',
+            generation,
             destinationPath
         });
     }
@@ -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 &&
@@ -133,7 +133,7 @@ export class ModelDriver {
             generatorId: this.insertable.id,
             refName: this.refName
         });
-        if (currentKey === definition.generatorKey) {
+        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/OperationDriver.d.ts

@@ -2,24 +2,23 @@ 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;
     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;
     insertable: OperationInsertable<V>;
     operation: OasOperation;
     settings: ContentSettings;
     destinationPath?: string;
-    definition: Definition<V> | undefined;
-    constructor({ context, insertable, 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;

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,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;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAIhE,KAAK,mBAAmB,CAAC,CAAC,SAAS,cAAc,IAAI;IACnD,OAAO,EAAE,WAAW,CAAA;IACpB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,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,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,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;gBAEzB,EACV,OAAO,EACP,UAAU,EACV,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;IAyCrB,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,gBAAgB;CAoBzB"}
+{"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

@@ -51,7 +51,7 @@ export class OperationDriver {
             insertable
         });
         this.definition = this.apply({
-            force: generation === 'force',
+            generation,
             destinationPath
         });
     }
@@ -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 &&
@@ -133,7 +133,7 @@ export class OperationDriver {
             generatorId: this.insertable.id,
             operation: this.operation
         });
-        if (currentKey === definition.generatorKey) {
+        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/types/GeneratedValue.d.ts

@@ -1,6 +1,19 @@
+import type { Definition } from '../dsl/Definition.js';
 import type { Stringable } from '../dsl/Stringable.js';
 import type { GeneratorKey } from './GeneratorKeys.js';
+/**
+ * 'force' - will generate content even it is not selected.
+ * Use this option when generating code via a dependency.
+ * For example, when you are generating a form and it needs
+ * an accompanying API client as well. You should use 'force'
+ * when generating the API client to ensure it is generated
+ * event the API client itself is not selected.
+ *
+ * 'regular' - will generate content only if it is selected.
+ */
+export type GenerationType = 'force' | 'regular';
 export type GeneratedValue = Stringable & {
     generatorKey: GeneratorKey;
 };
+export type GeneratedDefintion<V extends GeneratedValue, T extends GenerationType> = T extends 'force' ? Definition<V> : Definition<V> | undefined;
 //# sourceMappingURL=GeneratedValue.d.ts.map

package/esm/types/GeneratedValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratedValue.d.ts","sourceRoot":"","sources":["../../src/types/GeneratedValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IACxC,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA"}
+{"version":3,"file":"GeneratedValue.d.ts","sourceRoot":"","sources":["../../src/types/GeneratedValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD;;;;;;;;;GASG;AAEH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IACxC,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,cAAc,EACxB,CAAC,SAAS,cAAc,IACtB,CAAC,SAAS,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA"}

package/package.json

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

package/script/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 { OperationInsertable, OperationGenerator } from '../dsl/OperationInsertable.js';
-import type { ModelInsertable, ModelGenerator } from '../dsl/ModelInsertable.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> = {
-    insertable: OperationInsertable<V>;
-    operation: OasOperation;
-    generation?: GenerationType;
-    destinationPath?: string;
-} | {
-    insertable: ModelInsertable<V>;
-    refName: RefName;
-    generation?: GenerationType;
-    destinationPath?: string;
-};
 type SharedContext = {
     type: 'parse';
     context: ParseContext;
@@ -67,7 +55,7 @@ export declare class CoreContext {
     render(options: RenderOptions): FilesRenderResult;
     addFile(normalisedPath: string): FileContents;
     getOperationBaseSettings(args: GetOperationSettingsArgs): BaseSettings;
-    insert<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/script/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/script/context/GenerateContext.d.ts

@@ -10,8 +10,7 @@ import type { OperationInsertable, OperationGenerator } from '../dsl/OperationIn
 import type { OasOperation } from '../oas/operation/Operation.js';
 import type { CoreContext } from './CoreContext.js';
 import type { ModelInsertable, ModelGenerator } from '../dsl/ModelInsertable.js';
-import type { GenerationType } from '../types/GenerationType.js';
-import type { GeneratedValue } from '../types/GeneratedValue.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;
+export type InsertArgs<V extends GeneratedValue, T extends GenerationType> = {
     insertable: OperationInsertable<V>;
     operation: OasOperation;
-    generation?: GenerationType;
+    generation?: T;
     destinationPath?: string;
 } | {
-    coreContext: CoreContext;
     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,10 +67,9 @@ export declare class GenerateContext {
     constructor({ schemaModel, generatorsMap, settings }: ConstructorArgs);
     getFile(filePath: string, { throwIfNotFound }?: GetFileOptions): FileContents;
     register({ imports, packageDependencies, definitions, destinationPath }: RegisterArgs): void;
-    insert<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;

package/script/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/script/dsl/ModelDriver.d.ts

@@ -1,25 +1,24 @@
 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;
     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;
     insertable: ModelInsertable<V>;
     refName: RefName;
     settings: ContentSettings;
     destinationPath?: string;
-    definition: Definition<V> | undefined;
-    constructor({ context, insertable, 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;

package/script/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,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,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;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,IAAI;IAC/C,OAAO,EAAE,WAAW,CAAA;IACpB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,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,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,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;gBACzB,EACV,OAAO,EACP,UAAU,EACV,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;IA6CrB,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,gBAAgB;CAoBzB"}
+{"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/script/dsl/ModelDriver.js

@@ -51,7 +51,7 @@ class ModelDriver {
         this.destinationPath = destinationPath;
         this.settings = this.buildModelSettings({ refName, insertable });
         this.definition = this.apply({
-            force: generation === 'force',
+            generation,
             destinationPath
         });
     }
@@ -67,10 +67,10 @@ 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 &&
@@ -136,7 +136,7 @@ class ModelDriver {
             generatorId: this.insertable.id,
             refName: this.refName
         });
-        if (currentKey === definition.generatorKey) {
+        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/OperationDriver.d.ts

@@ -2,24 +2,23 @@ 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;
     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;
     insertable: OperationInsertable<V>;
     operation: OasOperation;
     settings: ContentSettings;
     destinationPath?: string;
-    definition: Definition<V> | undefined;
-    constructor({ context, insertable, 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;

package/script/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,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;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAIhE,KAAK,mBAAmB,CAAC,CAAC,SAAS,cAAc,IAAI;IACnD,OAAO,EAAE,WAAW,CAAA;IACpB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,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,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,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;gBAEzB,EACV,OAAO,EACP,UAAU,EACV,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;IAyCrB,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,gBAAgB;CAoBzB"}
+{"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/script/dsl/OperationDriver.js

@@ -54,7 +54,7 @@ class OperationDriver {
             insertable
         });
         this.definition = this.apply({
-            force: generation === 'force',
+            generation,
             destinationPath
         });
     }
@@ -70,10 +70,10 @@ 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 &&
@@ -136,7 +136,7 @@ class OperationDriver {
             generatorId: this.insertable.id,
             operation: this.operation
         });
-        if (currentKey === definition.generatorKey) {
+        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/types/GeneratedValue.d.ts

@@ -1,6 +1,19 @@
+import type { Definition } from '../dsl/Definition.js';
 import type { Stringable } from '../dsl/Stringable.js';
 import type { GeneratorKey } from './GeneratorKeys.js';
+/**
+ * 'force' - will generate content even it is not selected.
+ * Use this option when generating code via a dependency.
+ * For example, when you are generating a form and it needs
+ * an accompanying API client as well. You should use 'force'
+ * when generating the API client to ensure it is generated
+ * event the API client itself is not selected.
+ *
+ * 'regular' - will generate content only if it is selected.
+ */
+export type GenerationType = 'force' | 'regular';
 export type GeneratedValue = Stringable & {
     generatorKey: GeneratorKey;
 };
+export type GeneratedDefintion<V extends GeneratedValue, T extends GenerationType> = T extends 'force' ? Definition<V> : Definition<V> | undefined;
 //# sourceMappingURL=GeneratedValue.d.ts.map

package/script/types/GeneratedValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratedValue.d.ts","sourceRoot":"","sources":["../../src/types/GeneratedValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IACxC,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA"}
+{"version":3,"file":"GeneratedValue.d.ts","sourceRoot":"","sources":["../../src/types/GeneratedValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD;;;;;;;;;GASG;AAEH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IACxC,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,cAAc,EACxB,CAAC,SAAS,cAAc,IACtB,CAAC,SAAS,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA"}

package/esm/types/GenerationType.d.ts

@@ -1,16 +0,0 @@
-/**
- * 'force' - will generate content even it is not selected.
- * Use this option when generating code via a dependency.
- * For example, when you are generating a form and it needs
- * an accompanying API client as well. You should use 'force'
- * when generating the API client to ensure it is generated
- * event the API client itself is not selected.
- *
- * 'regular' - will generate content only if it is selected.
- *
- * 'lazy' - will create a Driver instance but not apply it, until
- * the value is accessed. This is useful when you want a quick way
- * to access settings for a creator without generating the content.
- */
-export type GenerationType = 'force' | 'regular' | 'lazy';
-//# sourceMappingURL=GenerationType.d.ts.map

package/esm/types/GenerationType.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"GenerationType.d.ts","sourceRoot":"","sources":["../../src/types/GenerationType.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA"}

package/esm/types/GenerationType.js

@@ -1,15 +0,0 @@
-/**
- * 'force' - will generate content even it is not selected.
- * Use this option when generating code via a dependency.
- * For example, when you are generating a form and it needs
- * an accompanying API client as well. You should use 'force'
- * when generating the API client to ensure it is generated
- * event the API client itself is not selected.
- *
- * 'regular' - will generate content only if it is selected.
- *
- * 'lazy' - will create a Driver instance but not apply it, until
- * the value is accessed. This is useful when you want a quick way
- * to access settings for a creator without generating the content.
- */
-export {};

package/script/types/GenerationType.d.ts

@@ -1,16 +0,0 @@
-/**
- * 'force' - will generate content even it is not selected.
- * Use this option when generating code via a dependency.
- * For example, when you are generating a form and it needs
- * an accompanying API client as well. You should use 'force'
- * when generating the API client to ensure it is generated
- * event the API client itself is not selected.
- *
- * 'regular' - will generate content only if it is selected.
- *
- * 'lazy' - will create a Driver instance but not apply it, until
- * the value is accessed. This is useful when you want a quick way
- * to access settings for a creator without generating the content.
- */
-export type GenerationType = 'force' | 'regular' | 'lazy';
-//# sourceMappingURL=GenerationType.d.ts.map

package/script/types/GenerationType.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"GenerationType.d.ts","sourceRoot":"","sources":["../../src/types/GenerationType.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA"}

package/script/types/GenerationType.js

@@ -1,16 +0,0 @@
-"use strict";
-/**
- * 'force' - will generate content even it is not selected.
- * Use this option when generating code via a dependency.
- * For example, when you are generating a form and it needs
- * an accompanying API client as well. You should use 'force'
- * when generating the API client to ensure it is generated
- * event the API client itself is not selected.
- *
- * 'regular' - will generate content only if it is selected.
- *
- * 'lazy' - will create a Driver instance but not apply it, until
- * the value is accessed. This is useful when you want a quick way
- * to access settings for a creator without generating the content.
- */
-Object.defineProperty(exports, "__esModule", { value: true });