@skmtc/core 0.0.307 → 0.0.308

package/esm/context/CoreContext.d.ts

@@ -1,18 +1,11 @@
-import type { AddRenderDependencyArgs, GetModelSettingsArgs, GetOperationSettingsArgs, PickArgs, RegisterArgs, InsertReturn, InsertArgs } from './GenerateContext.js';
-import type { AddGeneratorKeyArgs, FileContents, RenderDependencies } from './types.js';
 import type { PrettierConfigType } from '../types/prettierConfig.js';
 import type { OasDocument } from '../oas/document/Document.js';
-import type { BaseSettings, ClientSettings } from '../types/Settings.js';
-import type { Definition } from '../dsl/Definition.js';
+import type { ClientSettings } from '../types/Settings.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 { GenerationType } from '../types/GeneratedValue.js';
-import type { RefName } from '../types/RefName.js';
 import type { SuccessWarningError } from '../types/Manifest.js';
 import * as log from '../deps/jsr.io/@std/log/0.224.6/mod.js';
+import type { GeneratorKey } from '../types/GeneratorKeys.js';
 type CoreContextArgs = {
     spanId: string;
     schema: string;
@@ -34,8 +27,7 @@ export declare class CoreContext {
     transform({ settings, generatorsMap, prettier }: TransformArgs): {
         results: Record<string, SuccessWarningError>;
         files: Record<string, import("../types/Manifest.js").ManifestEntry>;
-        pinnable: Partial<Record<import("../mod.js").GeneratorKey, string>>;
-        renderDependencies: Record<string, string[]>;
+        pinnable: Partial<Record<GeneratorKey, string>>;
         artifacts: Record<string, string>;
     };
     captureResult({ stackTrail, result }: CaptureResultArgs): void;
@@ -43,22 +35,6 @@ export declare class CoreContext {
     get phaseType(): 'parse' | 'generate' | 'render';
     appendStackTrailChunk(chunk: string | string[]): void;
     removeStackTrailChunk(chunk: string | string[]): void;
-    register({ destinationPath, ...args }: RegisterArgs): void;
-    addGeneratorKey({ generatorKey }: AddGeneratorKeyArgs): void;
-    resolveSchemaRefOnce(refName: RefName): OasSchema | OasRef<'schema'>;
-    addRenderDependency(args: AddRenderDependencyArgs): void;
-    getFile(filePath: string): FileContents;
-    findDefinition(args: PickArgs): Definition<GeneratedValue> | undefined;
-    addFile(normalisedPath: string): FileContents;
-    getOperationBaseSettings(args: GetOperationSettingsArgs): BaseSettings;
-    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;
-    get packageDependencies(): Map<string, string>;
-    get schemaModel(): OasDocument;
-    get generatorsMap(): Record<string, OperationGenerator | ModelGenerator>;
-    get settings(): ClientSettings | undefined;
 }
 export type JsonFormatterArgs = {
     logRecord: log.LogRecord;

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":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AA0B7D,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AASD,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;CAC5B,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,QAAQ,CAAC,EAAE,kBAAkB,CAAA;CAC9B,CAAA;AAED,qBAAa,WAAW;;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;gBAKN,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,eAAe;IAmD/C,KAAK,IAAI,WAAW;IAQpB,SAAS,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IAsE9D,aAAa,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,iBAAiB,GAAG,IAAI;IAM9D,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IA2BvD,IAAI,SAAS,IAAI,OAAO,GAAG,UAAU,GAAG,QAAQ,CAE/C;IAED,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAI9C,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;CAG/C;AAeD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,GAAG,CAAC,SAAS,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,UAAU,EACX,EAAE,iBAAiB,GAAG,MAAM,CAQ5B;AAUD,wBAAgB,eAAe,CAAC,EAC9B,SAAS,EACT,UAAU,EACX,EAAE,iBAAiB,GAAG,MAAM,CAE5B"}

package/esm/context/CoreContext.js

@@ -44,24 +44,29 @@ export class CoreContext {
         if (__classPrivateFieldGet(this, _CoreContext_phase, "f").type !== 'parse') {
             throw new Error(`Expected 'parse' phase, got '${__classPrivateFieldGet(this, _CoreContext_phase, "f").type}'`);
         }
+        const callback = (generatorKey) => {
+            if (__classPrivateFieldGet(this, _CoreContext_phase, "f").type === 'render') {
+                __classPrivateFieldGet(this, _CoreContext_phase, "f").context.addGeneratorKey({ generatorKey });
+            }
+        };
         const schemaModel = __classPrivateFieldGet(this, _CoreContext_phase, "f").context.parse();
         __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupGeneratePhase).call(this, {
             schemaModel,
             settings,
-            generatorsMap
+            generatorsMap,
+            callback
         }), "f");
-        __classPrivateFieldGet(this, _CoreContext_phase, "f").context.generate(this);
-        this.logger.debug(`${__classPrivateFieldGet(this, _CoreContext_phase, "f").context.files.size} files generated`);
+        const files = __classPrivateFieldGet(this, _CoreContext_phase, "f").context.generate(generatorsMap);
+        this.logger.debug(`${files.size} files generated`);
         __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupRenderPhase).call(this, {
-            renderDependencies: this.renderDependencies,
-            packageDependencies: this.packageDependencies,
-            pinnableGenerators: Object.values(this.generatorsMap)
+            files,
+            pinnableGenerators: Object.values(generatorsMap)
                 .map(({ id, pinnable }) => (pinnable ? id : null))
                 .filter(generatorId => generatorId !== null),
             prettier,
-            settings
+            basePath: settings?.basePath
         }), "f");
-        const renderOutput = __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render({});
+        const renderOutput = __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render();
         __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove('render');
         return {
             ...renderOutput,
@@ -88,192 +93,6 @@ export class CoreContext {
     removeStackTrailChunk(chunk) {
         __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove(chunk);
     }
-    register({ destinationPath, ...args }) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            return context.register({ destinationPath, ...args });
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot register during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot register during render phase`);
-        })
-            .exhaustive();
-    }
-    addGeneratorKey({ generatorKey }) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, () => {
-            this.logger.info('trying to add generator key during generate phase');
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot add generator key during parse phase`);
-        })
-            .with({ type: 'render' }, ({ context }) => {
-            return context.addGeneratorKey({ generatorKey });
-        })
-            .exhaustive();
-    }
-    resolveSchemaRefOnce(refName) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            return context.resolveSchemaRefOnce(refName);
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot resolve schema during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot resolve schema during render phase`);
-        })
-            .exhaustive();
-    }
-    addRenderDependency(args) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            return context.addRenderDependency(args);
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot add render dependency during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot add render dependency during render phase`);
-        })
-            .exhaustive();
-    }
-    getFile(filePath) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            return context.getFile(filePath);
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot get file during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot get file during render phase`);
-        })
-            .exhaustive();
-    }
-    findDefinition(args) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => context.findDefinition(args))
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot pick during parse phase`);
-        })
-            .with({ type: 'render' }, ({ context }) => context.pick(args))
-            .exhaustive();
-    }
-    addFile(normalisedPath) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            return context.addFile(normalisedPath);
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot add file during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot add file during render phase`);
-        })
-            .exhaustive();
-    }
-    getOperationBaseSettings(args) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            return context.getOperationBaseSettings(args);
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot access operation settings during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot access operation settings during render phase`);
-        })
-            .exhaustive();
-    }
-    insert(args) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            return context.insert({ ...args, coreContext: this });
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot run 'transform' during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot run 'transform' during render phase`);
-        })
-            .exhaustive();
-    }
-    getModelBaseSettings(args) {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            return context.getModelBaseSettings(args);
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot access model settings during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot access model settings during render phase`);
-        })
-            .exhaustive();
-    }
-    get files() {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => context.files)
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot access files during parse phase`);
-        })
-            .with({ type: 'render' }, ({ context }) => context.files)
-            .exhaustive();
-    }
-    get renderDependencies() {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => context.renderDependencies)
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot access files during parse phase`);
-        })
-            .with({ type: 'render' }, ({ context }) => context.renderDependencies)
-            .exhaustive();
-    }
-    get packageDependencies() {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => context.packageDependencies)
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot access package dependencies during parse phase`);
-        })
-            .with({ type: 'render' }, ({ context }) => context.packageDependencies)
-            .exhaustive();
-    }
-    get schemaModel() {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => context.schemaModel)
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot access schema model during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot access schema model during render phase`);
-        })
-            .exhaustive();
-    }
-    get generatorsMap() {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => context.generatorsMap)
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot access schema model during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot access schema model during render phase`);
-        })
-            .exhaustive();
-    }
-    get settings() {
-        return match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => context.settings)
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot access settings during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot access settings during render phase`);
-        })
-            .exhaustive();
-    }
 }
 _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreContext_stackTrail = new WeakMap(), _CoreContext_instances = new WeakSet(), _CoreContext_setupLogger = function _CoreContext_setupLogger(spanId) {
     log.setup({
@@ -312,24 +131,24 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
     __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append('parse');
     const parseContext = new ParseContext({ schema, logger: this.logger });
     return { type: 'parse', context: parseContext };
-}, _CoreContext_setupGeneratePhase = function _CoreContext_setupGeneratePhase({ schemaModel, settings, generatorsMap }) {
+}, _CoreContext_setupGeneratePhase = function _CoreContext_setupGeneratePhase({ schemaModel, settings, generatorsMap, callback }) {
     __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove('parse');
     __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append('generate');
     const generateContext = new GenerateContext({
         schemaModel,
         settings,
-        generatorsMap
+        generatorsMap,
+        logger: this.logger,
+        callback
     });
     return { type: 'generate', context: generateContext };
-}, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ prettier, packageDependencies, settings, renderDependencies, pinnableGenerators }) {
+}, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ files, prettier, basePath, pinnableGenerators }) {
     __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove('generate');
     __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append('render');
     const renderContext = new RenderContext({
-        files: this.files,
-        renderDependencies,
-        packageDependencies,
+        files,
         prettier,
-        settings,
+        basePath,
         pinnableGenerators
     });
     return { type: 'render', context: renderContext };

package/esm/context/GenerateContext.d.ts

@@ -3,20 +3,23 @@ import type { Definition } from '../dsl/Definition.js';
 import type { OasDocument } from '../oas/document/Document.js';
 import type { OasSchema } from '../oas/schema/Schema.js';
 import type { OasRef } from '../oas/ref/Ref.js';
-import type { FileContents, GetFileOptions, RenderDependencies } from './types.js';
+import type { FileContents, GetFileOptions } from './types.js';
 import type { BaseSettings, ClientSettings } from '../types/Settings.js';
 import type { Method } from '../types/Method.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 { 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';
+import type * as log from '../deps/jsr.io/@std/log/0.224.6/mod.js';
+import type { GeneratorKey } from '../types/GeneratorKeys.js';
 type ConstructorArgs = {
     schemaModel: OasDocument;
     settings: ClientSettings | undefined;
     generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
+    logger: log.Logger;
+    callback: (generatorKey: GeneratorKey) => void;
 };
 export type PickArgs = {
     name: string;
@@ -24,7 +27,6 @@ export type PickArgs = {
 };
 export type RegisterArgs = {
     imports?: Record<string, ImportNameArg[]>;
-    packageDependencies?: Record<string, string>;
     definitions?: (Definition | undefined)[];
     destinationPath: string;
 };
@@ -59,27 +61,22 @@ export type InsertReturn<V extends GeneratedValue, T extends GenerationType> = {
 };
 export declare class GenerateContext {
     #private;
-    files: Map<string, FileContents>;
-    renderDependencies: RenderDependencies;
-    packageDependencies: Map<string, string>;
     schemaModel: OasDocument;
     settings: ClientSettings | undefined;
-    generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
-    constructor({ schemaModel, generatorsMap, settings }: ConstructorArgs);
-    generate(coreContext: CoreContext): void;
+    logger: log.Logger;
+    callback: (generatorKey: GeneratorKey) => void;
+    constructor({ schemaModel, settings, logger, callback }: ConstructorArgs);
+    generate(generatorsMap: Record<string, OperationGenerator | ModelGenerator>): Map<string, FileContents>;
     appendStackTrailChunk(chunk: string | string[]): void;
     removeStackTrailChunk(chunk: string | string[]): void;
     get stackTrail(): string;
     getFile(filePath: string, { throwIfNotFound }?: GetFileOptions): FileContents;
-    register({ imports, packageDependencies, definitions, destinationPath }: RegisterArgs): void;
-    insert<V extends GeneratedValue, T extends GenerationType>({ coreContext, generation, destinationPath, ...rest }: InsertArgs<V, T> & {
-        coreContext: CoreContext;
-    }): InsertReturn<V, T>;
+    register({ imports, definitions, destinationPath }: RegisterArgs): void;
+    insert<V extends GeneratedValue, T extends GenerationType>({ generation, destinationPath, ...rest }: InsertArgs<V, T>): 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 */
     findDefinition({ name, exportPath }: PickArgs): Definition | undefined;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAErD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EACd,kBAAkB,EACnB,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAEnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAGjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EAEf,MAAM,2BAA2B,CAAA;AAGlC,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAIlD,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,WAAW,CAAA;IACxB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;CACnE,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;IACzC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5C,WAAW,CAAC,EAAE,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAA;IACxC,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,MAAM,EAAE,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAcD,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IACrE;IACE,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,GACD;IACE,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;AAEL,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IAC7E,QAAQ,EAAE,eAAe,CAAA;IACzB,UAAU,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CACrC,CAAA;AAYD,qBAAa,eAAe;;IAC1B,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,WAAW,EAAE,WAAW,CAAA;IACxB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;gBAGtD,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,eAAe;IAWrE,QAAQ,CAAC,WAAW,EAAE,WAAW;IAoGjC,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAI9C,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAI9C,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CACL,QAAQ,EAAE,MAAM,EAChB,EAAE,eAAuB,EAAE,GAAE,cAAmB,GAC/C,YAAY;IAgBf,QAAQ,CAAC,EACP,OAAY,EACZ,mBAAwB,EACxB,WAAW,EACX,eAAe,EAChB,EAAE,YAAY;IA6Bf,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,EACzD,WAAW,EACX,UAAU,EACV,eAAe,EACf,GAAG,IAAI,EACR,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,WAAW,EAAE,WAAW,CAAA;KAAE,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IA4BvE,wBAAwB,CAAC,EACvB,WAAW,EACX,IAAI,EACJ,MAAM,EACP,EAAE,wBAAwB;IAwB3B,oBAAoB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,oBAAoB;IAwBnE,OAAO,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY;IAgB7C,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;IAWpE,mBAAmB,CAAC,EAClB,WAAW,EACX,YAAY,EACZ,SAAS,EACV,EAAE,uBAAuB;IAc1B,oDAAoD;IACpD,cAAc,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAGvE"}
+{"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"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"}