@skmtc/core 0.0.262 → 0.0.264

package/esm/dsl/withConfig.d.ts

@@ -3,8 +3,8 @@ import type { OasOperation } from '../oas/operation/Operation.js';
 import type { ContentSettings } from './ContentSettings.js';
 import type { RefName } from '../types/RefName.js';
 import { EntityType } from './EntityType.js';
-import type { IsModelSelectedArgs, ToModelExportPathArgs, ToModelNameArgs } from './ModelCreator.js';
-import type { IsOperationSelectedArgs, ToOperationExportPathArgs, ToOperationNameArgs } from './OperationCreator.js';
+import type { IsModelSelectedArgs, ToModelExportPathArgs, ToModelNameArgs } from './ModelInsertable.js';
+import type { IsOperationSelectedArgs, ToOperationExportPathArgs, ToOperationNameArgs } from './OperationInsertable.js';
 export type GeneratorConfigConstructor = {
     context: CoreContext;
 };
@@ -18,20 +18,20 @@ export type OperationConfig = {
     toExportPath({ operation, baseSettings }: ToOperationExportPathArgs): string;
     isSelected({ operation, baseSettings }: IsOperationSelectedArgs): boolean;
 };
-export type OperationCreatorArgs = {
+export type OperationInsertableArgs = {
     context: CoreContext;
     settings: ContentSettings;
     operation: OasOperation;
 };
-export declare const toOperationCreatorBase: (config: OperationConfig) => {
-    new (args: OperationCreatorArgs): {
+export declare const toOperationInsertable: (config: OperationConfig) => {
+    new (args: OperationInsertableArgs): {
         settings: ContentSettings;
         operation: OasOperation;
-        transform<V extends import("../mod.js").GeneratedValue>(args: {
-            creator: import("./OperationCreator.js").OperationCreator<V>;
+        insert<V extends import("../mod.js").GeneratedValue>(args: {
+            insertable: import("./OperationInsertable.js").OperationInsertable<V>;
             operation: OasOperation;
         } | {
-            creator: import("./ModelCreator.js").ModelCreator<V>;
+            insertable: import("./ModelInsertable.js").ModelInsertable<V>;
             refName: RefName;
         }): {
             settings: ContentSettings;
@@ -56,20 +56,20 @@ type ModelConfig = {
     toExportPath({ refName, baseSettings }: ToModelExportPathArgs): string;
     isSelected({ refName, baseSettings }: IsModelSelectedArgs): boolean;
 };
-export type ModelCreatorArgs = {
+export type ModelInsertableArgs = {
     context: CoreContext;
     settings: ContentSettings;
     refName: RefName;
 };
-export declare const toModelCreatorBase: (config: ModelConfig) => {
-    new (args: ModelCreatorArgs): {
+export declare const toModelInsertable: (config: ModelConfig) => {
+    new (args: ModelInsertableArgs): {
         settings: ContentSettings;
         refName: RefName;
         transform<V extends import("../mod.js").GeneratedValue>(args: {
-            creator: import("./OperationCreator.js").OperationCreator<V>;
+            insertable: import("./OperationInsertable.js").OperationInsertable<V>;
             operation: OasOperation;
         } | {
-            creator: import("./ModelCreator.js").ModelCreator<V>;
+            insertable: import("./ModelInsertable.js").ModelInsertable<V>;
             refName: RefName;
         }): void;
         register(args: Partial<import("../context/GenerateContext.js").RegisterArgs>): void;

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

@@ -1 +1 @@
-{"version":3,"file":"withConfig.d.ts","sourceRoot":"","sources":["../../src/dsl/withConfig.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;AAK3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,uBAAuB,CAAA;AAG9B,MAAM,MAAM,0BAA0B,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAA;AACjE,MAAM,MAAM,wBAAwB,GAAG,eAAe,GAAG,eAAe,CAAA;AACxE,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAAG,WAAW,CAAA;AAEhE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,MAAM,CAAA;IAChE,YAAY,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,yBAAyB,GAAG,MAAM,CAAA;IAC5E,UAAU,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,sBAAsB,WAAY,eAAe;eAQxC,oBAAoB;;;;;;;;;;;;;;;;;;;;0CAnBJ,mBAAmB,KAAG,MAAM;gDACtB,yBAAyB,KAAG,MAAM;8CACpC,uBAAuB,KAAG,OAAO;CA2B1E,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,GAAG,MAAM,CAAA;IAC1D,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG,MAAM,CAAA;IACtE,UAAU,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAA;CACpE,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,kBAAkB,WAAY,WAAW;eAUhC,gBAAgB;;;;;;;;;;;;;;;;;;wCArBF,eAAe,KAAG,MAAM;8CAClB,qBAAqB,KAAG,MAAM;4CAChC,mBAAmB,KAAG,OAAO;CA6BpE,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CACnD,CAAA;AAED,eAAO,MAAM,eAAe,WAClB,eAAe,GAAG;IAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAA;CAAE;sBAQ9B,0BAA0B;iBAD1C,WAAW;;;;8BAXI,YAAY,KAAK,OAAO;;CAgBnD,CAAA"}
+{"version":3,"file":"withConfig.d.ts","sourceRoot":"","sources":["../../src/dsl/withConfig.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;AAK3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,0BAA0B,CAAA;AAGjC,MAAM,MAAM,0BAA0B,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAA;AACjE,MAAM,MAAM,wBAAwB,GAAG,eAAe,GAAG,eAAe,CAAA;AACxE,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAAG,WAAW,CAAA;AAEhE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,MAAM,CAAA;IAChE,YAAY,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,yBAAyB,GAAG,MAAM,CAAA;IAC5E,UAAU,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,qBAAqB,WAAY,eAAe;eAQvC,uBAAuB;;;;;;;;;;;;;;;;;;;;0CAnBP,mBAAmB,KAAG,MAAM;gDACtB,yBAAyB,KAAG,MAAM;8CACpC,uBAAuB,KAAG,OAAO;CA2B1E,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,GAAG,MAAM,CAAA;IAC1D,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG,MAAM,CAAA;IACtE,UAAU,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAA;CACpE,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,iBAAiB,WAAY,WAAW;eAU/B,mBAAmB;;;;;;;;;;;;;;;;;;wCArBL,eAAe,KAAG,MAAM;8CAClB,qBAAqB,KAAG,MAAM;4CAChC,mBAAmB,KAAG,OAAO;CA6BpE,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CACnD,CAAA;AAED,eAAO,MAAM,eAAe,WAClB,eAAe,GAAG;IAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAA;CAAE;sBAQ9B,0BAA0B;iBAD1C,WAAW;;;;8BAXI,YAAY,KAAK,OAAO;;CAgBnD,CAAA"}

package/esm/dsl/withConfig.js

@@ -1,7 +1,7 @@
 import { toOperationGeneratorKey, toModelGeneratorKey } from '../types/GeneratorKeys.js';
 import { EntityType } from './EntityType.js';
 import { OperationBase, ModelBase } from './base.js';
-export const toOperationCreatorBase = (config) => {
+export const toOperationInsertable = (config) => {
     var _a;
     return _a = class extends OperationBase {
             constructor(args) {
@@ -46,7 +46,7 @@ export const toOperationCreatorBase = (config) => {
         }),
         _a;
 };
-export const toModelCreatorBase = (config) => {
+export const toModelInsertable = (config) => {
     var _a;
     return _a = class extends ModelBase {
             constructor(args) {

package/esm/generate/generate.d.ts

@@ -1,8 +1,8 @@
 import type { ClientSettings } from '../types/Settings.js';
 import type { PrettierConfigType } from '../types/prettierConfig.js';
 import type { OpenAPIV3 } from 'openapi-types';
-import type { OperationGenerator } from '../dsl/OperationCreator.js';
-import type { ModelGenerator } from '../dsl/ModelCreator.js';
+import type { OperationGenerator } from '../dsl/OperationInsertable.js';
+import type { ModelGenerator } from '../dsl/ModelInsertable.js';
 type GenerateArgs = {
     schema: string;
     settings?: ClientSettings;

package/esm/generate/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAK5D,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,QAAQ,6DAMlB,YAAY,4DAmDd,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,MAAM,2BAMzC,CAAA"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK/D,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,QAAQ,6DAMlB,YAAY,4DAmDd,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,MAAM,2BAMzC,CAAA"}

package/esm/mod.d.ts

@@ -6,13 +6,15 @@ export * from './context/Trail.js';
 export * from './dsl/base.js';
 export * from './dsl/constants.js';
 export * from './dsl/ContentSettings.js';
+export * from './dsl/ContentSettings.js';
 export * from './dsl/Definition.js';
+export * from './dsl/EntityType.js';
 export * from './dsl/GeneratedValueList.js';
 export * from './dsl/Identifier.js';
 export * from './dsl/Import.js';
-export * from './dsl/ModelCreator.js';
+export * from './dsl/ModelInsertable.js';
 export * from './dsl/ModelDriver.js';
-export * from './dsl/OperationCreator.js';
+export * from './dsl/OperationInsertable.js';
 export * from './dsl/OperationDriver.js';
 export * from './dsl/Stringable.js';
 export * from './dsl/ValueBase.js';
@@ -22,7 +24,6 @@ export * from './helpers/logStatus.js';
 export * from './helpers/naming.js';
 export * from './helpers/refFns.js';
 export * from './helpers/strings.js';
-export * from './helpers/verifyType.js';
 export * from './oas/discriminator/Discriminator.js';
 export * from './oas/document/Document.js';
 export * from './oas/integer/Integer.js';
@@ -36,8 +37,6 @@ export * from './oas/string/String.js';
 export * from './oas/tag/Tag.js';
 export * from './oas/void/Void.js';
 export * from './parse/parse.js';
-export * from './dsl/ContentSettings.js';
-export * from './types/Settings.js';
 export * from './server/createServer.js';
 export * from './types/CustomValue.js';
 export * from './types/GeneratedValue.js';
@@ -47,14 +46,14 @@ export * from './types/Modifiers.js';
 export * from './types/prettierConfig.js';
 export * from './types/RefName.js';
 export * from './types/Settings.js';
+export * from './types/Settings.js';
 export * from './types/TypeSystem.js';
-export * from './dsl/EntityType.js';
+export * from './typescript/DestructuredObject.js';
 export * from './typescript/FunctionParameter.js';
 export * from './typescript/identifiers.js';
 export * from './typescript/keyValues.js';
 export * from './typescript/PathParams.js';
 export * from './typescript/ReactRouterPathParams.js';
-export * from './typescript/toOperationResponse.js';
 export * from './typescript/toPathTemplate.js';
 export * from './typescript/withDescription.js';
 //# sourceMappingURL=mod.d.ts.map

package/esm/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,sCAAsC,CAAA;AACpD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,kCAAkC,CAAA;AAChD,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mCAAmC,CAAA;AACjD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uCAAuC,CAAA;AACrD,cAAc,qCAAqC,CAAA;AACnD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,iCAAiC,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,cAAc,0BAA0B,CAAA;AACxC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,eAAe,CAAA;AAC7B,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,sBAAsB,CAAA;AACpC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,0BAA0B,CAAA;AACxC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,sCAAsC,CAAA;AACpD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,kBAAkB,CAAA;AAChC,cAAc,kCAAkC,CAAA;AAChD,cAAc,wBAAwB,CAAA;AACtC,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,0BAA0B,CAAA;AACxC,cAAc,wBAAwB,CAAA;AACtC,cAAc,2BAA2B,CAAA;AACzC,cAAc,0BAA0B,CAAA;AACxC,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oCAAoC,CAAA;AAClD,cAAc,mCAAmC,CAAA;AACjD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uCAAuC,CAAA;AACrD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,iCAAiC,CAAA"}

package/esm/mod.js

@@ -6,13 +6,15 @@ export * from './context/Trail.js';
 export * from './dsl/base.js';
 export * from './dsl/constants.js';
 export * from './dsl/ContentSettings.js';
+export * from './dsl/ContentSettings.js';
 export * from './dsl/Definition.js';
+export * from './dsl/EntityType.js';
 export * from './dsl/GeneratedValueList.js';
 export * from './dsl/Identifier.js';
 export * from './dsl/Import.js';
-export * from './dsl/ModelCreator.js';
+export * from './dsl/ModelInsertable.js';
 export * from './dsl/ModelDriver.js';
-export * from './dsl/OperationCreator.js';
+export * from './dsl/OperationInsertable.js';
 export * from './dsl/OperationDriver.js';
 export * from './dsl/Stringable.js';
 export * from './dsl/ValueBase.js';
@@ -22,7 +24,6 @@ export * from './helpers/logStatus.js';
 export * from './helpers/naming.js';
 export * from './helpers/refFns.js';
 export * from './helpers/strings.js';
-export * from './helpers/verifyType.js';
 export * from './oas/discriminator/Discriminator.js';
 export * from './oas/document/Document.js';
 export * from './oas/integer/Integer.js';
@@ -36,8 +37,6 @@ export * from './oas/string/String.js';
 export * from './oas/tag/Tag.js';
 export * from './oas/void/Void.js';
 export * from './parse/parse.js';
-export * from './dsl/ContentSettings.js';
-export * from './types/Settings.js';
 export * from './server/createServer.js';
 export * from './types/CustomValue.js';
 export * from './types/GeneratedValue.js';
@@ -47,13 +46,13 @@ export * from './types/Modifiers.js';
 export * from './types/prettierConfig.js';
 export * from './types/RefName.js';
 export * from './types/Settings.js';
+export * from './types/Settings.js';
 export * from './types/TypeSystem.js';
-export * from './dsl/EntityType.js';
+export * from './typescript/DestructuredObject.js';
 export * from './typescript/FunctionParameter.js';
 export * from './typescript/identifiers.js';
 export * from './typescript/keyValues.js';
 export * from './typescript/PathParams.js';
 export * from './typescript/ReactRouterPathParams.js';
-export * from './typescript/toOperationResponse.js';
 export * from './typescript/toPathTemplate.js';
 export * from './typescript/withDescription.js';

package/esm/server/createServer.d.ts

@@ -1,5 +1,5 @@
 import { Hono } from 'hono';
-import type { OperationGenerator } from '../dsl/OperationCreator.js';
-import type { ModelGenerator } from '../dsl/ModelCreator.js';
+import type { OperationGenerator } from '../dsl/OperationInsertable.js';
+import type { ModelGenerator } from '../dsl/ModelInsertable.js';
 export declare const createServer: (generators: (OperationGenerator | ModelGenerator)[]) => Hono;
 //# sourceMappingURL=createServer.d.ts.map

package/esm/server/createServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../../src/server/createServer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAK3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAmB5D,eAAO,MAAM,YAAY,eACX,CAAC,kBAAkB,GAAG,cAAc,CAAC,EAAE,KAClD,IA8FF,CAAA"}
+{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../../src/server/createServer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAK3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAmB/D,eAAO,MAAM,YAAY,eACX,CAAC,kBAAkB,GAAG,cAAc,CAAC,EAAE,KAClD,IA8FF,CAAA"}

package/esm/types/GeneratorKeys.d.ts

@@ -1,8 +1,8 @@
 import "../_dnt.polyfills.js";
 import type { OasOperation } from '../oas/operation/Operation.js';
 import type { Brand } from './Brand.js';
-import { type Method } from './Method.js';
 import type { RefName } from './RefName.js';
+import { type Method } from './Method.js';
 export type NakedOperationGeneratorKey = `${string}|${string}|${Method}`;
 export type NakedModelGeneratorKey = `${string}|${string}`;
 export type OperationGeneratorKey = Brand<NakedOperationGeneratorKey, 'OperationGeneratorKey'>;

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

@@ -1 +1 @@
-{"version":3,"file":"GeneratorKeys.d.ts","sourceRoot":"","sources":["../../src/types/GeneratorKeys.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,EAAE,KAAK,MAAM,EAAY,MAAM,aAAa,CAAA;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE3C,MAAM,MAAM,0BAA0B,GAAG,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAA;AAExE,MAAM,MAAM,sBAAsB,GAAG,GAAG,MAAM,IAAI,MAAM,EAAE,CAAA;AAE1D,MAAM,MAAM,qBAAqB,GAAG,KAAK,CACvC,0BAA0B,EAC1B,uBAAuB,CACxB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,KAAK,CACnC,sBAAsB,EACtB,mBAAmB,CACpB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;AAEhE,MAAM,MAAM,YAAY,GACpB,qBAAqB,GACrB,iBAAiB,GACjB,gBAAgB,CAAA;AAEpB,KAAK,2BAA2B,GAC5B;IACE,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,GACD;IACE,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAEL,eAAO,MAAM,uBAAuB,6BAGjC,2BAA2B,KAAG,qBAMhC,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,mBAAmB,6BAG7B,uBAAuB,KAAG,iBAI5B,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,kBAAkB,oBAE5B,sBAAsB,KAAG,gBAI3B,CAAA;AAED,eAAO,MAAM,cAAc,QAAS,OAAO,KAAG,GAAG,IAAI,YAMpD,CAAA;AAED,eAAO,MAAM,uBAAuB,QAC7B,OAAO,KACX,GAAG,IAAI,qBA0BT,CAAA;AAED,eAAO,MAAM,mBAAmB,QAAS,OAAO,KAAG,GAAG,IAAI,iBAsBzD,CAAA;AAED,eAAO,MAAM,kBAAkB,QAAS,OAAO,KAAG,GAAG,IAAI,gBAMxD,CAAA;AAED,eAAO,MAAM,aAAa,iBAAkB,YAAY,KAAG,MAU1D,CAAA;AAED,MAAM,MAAM,kBAAkB,GAC1B;IACE,IAAI,EAAE,WAAW,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,GACD;IACE,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAEL,eAAO,MAAM,gBAAgB,iBACb,YAAY,KACzB,kBAYF,CAAA"}
+{"version":3,"file":"GeneratorKeys.d.ts","sourceRoot":"","sources":["../../src/types/GeneratorKeys.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,KAAK,MAAM,EAAY,MAAM,aAAa,CAAA;AAEnD,MAAM,MAAM,0BAA0B,GAAG,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAA;AAExE,MAAM,MAAM,sBAAsB,GAAG,GAAG,MAAM,IAAI,MAAM,EAAE,CAAA;AAE1D,MAAM,MAAM,qBAAqB,GAAG,KAAK,CACvC,0BAA0B,EAC1B,uBAAuB,CACxB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,KAAK,CACnC,sBAAsB,EACtB,mBAAmB,CACpB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;AAEhE,MAAM,MAAM,YAAY,GACpB,qBAAqB,GACrB,iBAAiB,GACjB,gBAAgB,CAAA;AAEpB,KAAK,2BAA2B,GAC5B;IACE,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,GACD;IACE,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAEL,eAAO,MAAM,uBAAuB,6BAGjC,2BAA2B,KAAG,qBAMhC,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,mBAAmB,6BAG7B,uBAAuB,KAAG,iBAI5B,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,kBAAkB,oBAE5B,sBAAsB,KAAG,gBAI3B,CAAA;AAED,eAAO,MAAM,cAAc,QAAS,OAAO,KAAG,GAAG,IAAI,YAMpD,CAAA;AAED,eAAO,MAAM,uBAAuB,QAC7B,OAAO,KACX,GAAG,IAAI,qBA0BT,CAAA;AAED,eAAO,MAAM,mBAAmB,QAAS,OAAO,KAAG,GAAG,IAAI,iBAsBzD,CAAA;AAED,eAAO,MAAM,kBAAkB,QAAS,OAAO,KAAG,GAAG,IAAI,gBAMxD,CAAA;AAED,eAAO,MAAM,aAAa,iBAAkB,YAAY,KAAG,MAU1D,CAAA;AAED,MAAM,MAAM,kBAAkB,GAC1B;IACE,IAAI,EAAE,WAAW,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,GACD;IACE,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAA;IACtB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAEL,eAAO,MAAM,gBAAgB,iBACb,YAAY,KACzB,kBAYF,CAAA"}

package/package.json

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

package/script/context/CoreContext.d.ts

@@ -8,8 +8,8 @@ import type { AddGeneratorKeyArgs, FileContents, RenderDependencies, RenderOptio
 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 { OperationInsertable, OperationGenerator } from '../dsl/OperationInsertable.js';
+import type { ModelInsertable, 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';
@@ -17,12 +17,12 @@ import type { OasOperation } from '../oas/operation/Operation.js';
 import type { GenerationType } from '../types/GenerationType.js';
 import type { RefName } from '../types/RefName.js';
 type TransformArgs<V extends GeneratedValue> = {
-    creator: OperationCreator<V>;
+    insertable: OperationInsertable<V>;
     operation: OasOperation;
     generation?: GenerationType;
     destinationPath?: string;
 } | {
-    creator: ModelCreator<V>;
+    insertable: ModelInsertable<V>;
     refName: RefName;
     generation?: GenerationType;
     destinationPath?: string;
@@ -63,11 +63,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>(args: TransformArgs<V>): TransformReturn<V>;
     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":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACpB,wBAAwB,EACxB,QAAQ,EACR,YAAY,EACZ,eAAe,EAChB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC1E,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAChF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,KAAK,aAAa,CAAC,CAAC,SAAS,cAAc,IACvC;IACE,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,GACD;IACE,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;AAEL,KAAK,aAAa,GACd;IACE,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,YAAY,CAAA;CACtB,GACD;IACE,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,eAAe,CAAA;CACzB,GACD;IACE,IAAI,EAAE,QAAQ,CAAA;IACd,OAAO,EAAE,aAAa,CAAA;CACvB,CAAA;AAEL,KAAK,YAAY,GAAG;IAClB,WAAW,EAAE,WAAW,CAAA;IACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;CACrC,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,aAAa,CAAA;CACrB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAChC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,kBAAkB,EAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,KAAK,CAAe;gBAEhB,EAAE,KAAK,EAAE,EAAE,eAAe;IAItC,kBAAkB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,YAAY;IAUzE,gBAAgB,CAAC,EACf,KAAK,EACL,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,kBAAkB,EAClB,kBAAkB,EACnB,EAAE,UAAU;IAeb,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE,EAAE,YAAY,GAAG,IAAI;IAc1D,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,IAAI;IAc5D,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;IAcpE,mBAAmB,CAAC,IAAI,EAAE,uBAAuB,GAAG,IAAI;IAcxD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY;IAcvC,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,GAAG,SAAS;IAUtE,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,iBAAiB;IAYjD,OAAO,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY;IAc7C,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,GAAG,YAAY;IActE,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAc5E,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,GAAG,YAAY;IAc9D,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAQrC;IAED,IAAI,kBAAkB,IAAI,kBAAkB,CAQ3C;IAED,IAAI,mBAAmB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQ7C;IAED,IAAI,WAAW,IAAI,WAAW,CAU7B;IAED,IAAI,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAUvE;IAED,IAAI,cAAc,IAAI,SAAS,CAAC,QAAQ,CAUvC;IAED,IAAI,QAAQ,IAAI,cAAc,GAAG,SAAS,CAUzC;CACF"}

package/script/context/CoreContext.js

@@ -99,9 +99,9 @@ class CoreContext {
         })
             .exhaustive();
     }
-    pick(args) {
+    findDefinition(args) {
         return (0, ts_pattern_1.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`);
         })
@@ -145,10 +145,10 @@ class CoreContext {
         })
             .exhaustive();
     }
-    transform(args) {
+    insert(args) {
         return (0, ts_pattern_1.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/script/context/GenerateContext.d.ts

@@ -6,10 +6,10 @@ 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 { ModelInsertable, ModelGenerator } from '../dsl/ModelInsertable.js';
 import type { GenerationType } from '../types/GenerationType.js';
 import type { GeneratedValue } from '../types/GeneratedValue.js';
 import type { ContentSettings } from '../dsl/ContentSettings.js';
@@ -45,13 +45,13 @@ export type GetModelSettingsArgs = {
 };
 export type TransformArgs<V extends GeneratedValue> = {
     coreContext: CoreContext;
-    creator: OperationCreator<V>;
+    insertable: OperationInsertable<V>;
     operation: OasOperation;
     generation?: GenerationType;
     destinationPath?: string;
 } | {
     coreContext: CoreContext;
-    creator: ModelCreator<V>;
+    insertable: ModelInsertable<V>;
     refName: RefName;
     generation?: GenerationType;
     destinationPath?: string;
@@ -70,7 +70,7 @@ 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>): {
+    insert<V extends GeneratedValue>({ coreContext, generation, destinationPath, ...rest }: TransformArgs<V>): {
         settings: ContentSettings;
         definition: Definition<V> | undefined;
     };
@@ -80,7 +80,7 @@ export declare class GenerateContext {
     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/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/context/GenerateContext.js

@@ -85,12 +85,12 @@ 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_js_1.OperationDriver({
                 context: coreContext,
-                creator,
+                insertable,
                 operation,
                 generation,
                 destinationPath
@@ -98,10 +98,10 @@ class GenerateContext {
             return { settings, definition };
         }
         else {
-            const { creator, refName } = rest;
+            const { insertable, refName } = rest;
             const { settings, definition } = new ModelDriver_js_1.ModelDriver({
                 context: coreContext,
-                creator,
+                insertable,
                 refName,
                 generation,
                 destinationPath
@@ -170,7 +170,7 @@ class GenerateContext {
         });
     }
     /** Produce external instance and return its name */
-    pick({ name, exportPath }) {
+    findDefinition({ name, exportPath }) {
         return this.getFile(exportPath).definitions.get(name);
     }
 }

package/script/dsl/ModelDriver.d.ts

@@ -1,4 +1,4 @@
-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';
@@ -7,25 +7,26 @@ import type { GeneratedValue } from '../types/GeneratedValue.js';
 import type { RefName } from '../types/RefName.js';
 type CreateModelArgs<V extends GeneratedValue> = {
     context: CoreContext;
-    creator: ModelCreator<V>;
+    insertable: ModelInsertable<V>;
     refName: RefName;
     generation?: GenerationType;
     destinationPath?: string;
 };
 export declare class ModelDriver<V extends GeneratedValue> {
     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>);
+    constructor({ context, insertable, refName, generation, destinationPath }: CreateModelArgs<V>);
     get value(): V;
     get name(): string;
     get exportPath(): string;
     private apply;
     private getDefinition;
     private buildModelSettings;
+    private affirmDefinition;
 }
 export {};
 //# sourceMappingURL=ModelDriver.d.ts.map

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,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;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"}

package/script/dsl/ModelDriver.js

@@ -6,16 +6,16 @@ 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 verifyType_js_1 = require("../helpers/verifyType.js");
+const GeneratorKeys_js_1 = require("../types/GeneratorKeys.js");
 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,
@@ -46,10 +46,10 @@ 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',
             destinationPath
@@ -57,7 +57,7 @@ class ModelDriver {
     }
     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;
     }
@@ -83,12 +83,11 @@ class ModelDriver {
         return definition;
     }
     getDefinition({ name, exportPath }) {
-        const existing = this.context.pick({ name, exportPath });
-        if (existing) {
-            (0, verifyType_js_1.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,
@@ -101,7 +100,7 @@ class ModelDriver {
             typeof value.tsType === 'string'
             ? value.tsType
             : undefined;
-        const identifier = (0, ts_pattern_1.match)(this.creator.entityType.type)
+        const identifier = (0, ts_pattern_1.match)(this.insertable.entityType.type)
             .with('value', () => Identifier_js_1.Identifier.createValue({ name, tsType }))
             .with('type', () => Identifier_js_1.Identifier.createType(name))
             .exhaustive();
@@ -116,18 +115,31 @@ 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_js_1.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 = (0, GeneratorKeys_js_1.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;
+    }
 }
 exports.ModelDriver = ModelDriver;