@skmtc/core 0.0.307 → 0.0.309

package/script/context/CoreContext.js

@@ -72,24 +72,29 @@ 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,
@@ -116,192 +121,6 @@ class CoreContext {
     removeStackTrailChunk(chunk) {
         __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove(chunk);
     }
-    register({ destinationPath, ...args }) {
-        return (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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 (0, ts_pattern_1.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();
-    }
 }
 exports.CoreContext = CoreContext;
 _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreContext_stackTrail = new WeakMap(), _CoreContext_instances = new WeakSet(), _CoreContext_setupLogger = function _CoreContext_setupLogger(spanId) {
@@ -341,24 +160,24 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
     __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append('parse');
     const parseContext = new ParseContext_js_1.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_js_1.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_js_1.RenderContext({
-        files: this.files,
-        renderDependencies,
-        packageDependencies,
+        files,
         prettier,
-        settings,
+        basePath,
         pinnableGenerators
     });
     return { type: 'render', context: renderContext };

package/script/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/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

@@ -33,81 +33,72 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _GenerateContext_instances, _GenerateContext_stackTrail, _GenerateContext_runOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_generateModel, _GenerateContext_generateOperation;
+var _GenerateContext_instances, _GenerateContext_files, _GenerateContext_stackTrail, _GenerateContext_runOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_generateModel, _GenerateContext_generateOperation;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateContext = void 0;
 const mod_js_1 = require("../deps/jsr.io/@std/path/1.0.0/mod.js");
 const Import_js_1 = require("../dsl/Import.js");
-const GeneratorKeys_js_1 = require("../types/GeneratorKeys.js");
 const OperationDriver_js_1 = require("../dsl/OperationDriver.js");
 const ModelDriver_js_1 = require("../dsl/ModelDriver.js");
 const StackTrail_js_1 = require("./StackTrail.js");
 const Sentry = __importStar(require("@sentry/deno"));
 class GenerateContext {
-    constructor({ schemaModel, generatorsMap, settings }) {
+    constructor({ schemaModel, settings, logger, callback }) {
         _GenerateContext_instances.add(this);
-        Object.defineProperty(this, "files", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "renderDependencies", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "packageDependencies", {
+        _GenerateContext_files.set(this, void 0);
+        Object.defineProperty(this, "schemaModel", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "schemaModel", {
+        Object.defineProperty(this, "settings", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "settings", {
+        _GenerateContext_stackTrail.set(this, void 0);
+        Object.defineProperty(this, "logger", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "generatorsMap", {
+        Object.defineProperty(this, "callback", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        _GenerateContext_stackTrail.set(this, void 0);
+        this.logger = logger;
         __classPrivateFieldSet(this, _GenerateContext_stackTrail, new StackTrail_js_1.StackTrail(), "f");
-        this.generatorsMap = generatorsMap;
-        this.files = new Map();
-        this.renderDependencies = new Map();
-        this.packageDependencies = new Map();
+        __classPrivateFieldSet(this, _GenerateContext_files, new Map(), "f");
         this.schemaModel = schemaModel;
         this.settings = settings;
+        this.callback = callback;
     }
-    generate(coreContext) {
-        Sentry.startSpan({ name: 'Generate operations' }, () => Object.values(coreContext.generatorsMap)
+    generate(generatorsMap) {
+        Sentry.startSpan({ name: 'Generate operations' }, () => Object.values(generatorsMap)
             .filter(generator => generator.type === 'operation')
             .forEach(generator => {
             this.appendStackTrailChunk(generator.id);
-            __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_runOperationGenerator).call(this, { context: coreContext, generator });
+            __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_runOperationGenerator).call(this, {
+                schemaModel: this.schemaModel,
+                generator
+            });
             this.removeStackTrailChunk(generator.id);
         }));
         Sentry.startSpan({ name: 'Generate models' }, () => {
-            Object.values(coreContext.generatorsMap)
+            Object.values(generatorsMap)
                 .filter(generator => generator.type === 'model')
                 .forEach(generator => {
                 this.appendStackTrailChunk(generator.id);
-                __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_runModelGenerator).call(this, { context: coreContext, generator });
+                __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_runModelGenerator).call(this, { schemaModel: this.schemaModel, generator });
                 this.removeStackTrailChunk(generator.id);
             });
         });
+        return __classPrivateFieldGet(this, _GenerateContext_files, "f");
     }
     appendStackTrailChunk(chunk) {
         __classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").append(chunk);
@@ -115,12 +106,18 @@ class GenerateContext {
     removeStackTrailChunk(chunk) {
         __classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").remove(chunk);
     }
+    // captureCurrentResult(result: SuccessWarningError): void {
+    //   const stackTrail = this.#stackTrail.toString()
+    //   if (applyResult({ current: this.#results[stackTrail], incoming: result })) {
+    //     this.#results[stackTrail] = result
+    //   }
+    // }
     get stackTrail() {
         return __classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").toString();
     }
     getFile(filePath, { throwIfNotFound = false } = {}) {
         const normalisedPath = (0, mod_js_1.normalize)(filePath);
-        const currentFile = this.files.get(normalisedPath);
+        const currentFile = __classPrivateFieldGet(this, _GenerateContext_files, "f").get(normalisedPath);
         if (!currentFile) {
             if (throwIfNotFound) {
                 throw new Error(`File not found: '${normalisedPath}'`);
@@ -131,7 +128,7 @@ class GenerateContext {
         }
         return currentFile;
     }
-    register({ imports = {}, packageDependencies = {}, definitions, destinationPath }) {
+    register({ imports = {}, definitions, destinationPath }) {
         const currentFile = this.getFile(destinationPath);
         Object.entries(imports).forEach(([importModule, importNames]) => {
             const module = currentFile.imports.get(importModule);
@@ -143,20 +140,17 @@ class GenerateContext {
                 currentFile.imports.set(importModule, new Set(importItem.importNames.map(n => `${n}`)));
             }
         });
-        Object.entries(packageDependencies).forEach(([module, version]) => {
-            this.packageDependencies.set(module, version);
-        });
         definitions
             ?.filter((definition) => Boolean(definition))
             .forEach(definition => {
             currentFile.definitions.set(`${definition.identifier}`, definition);
         });
     }
-    insert({ coreContext, generation, destinationPath, ...rest }) {
+    insert({ generation, destinationPath, ...rest }) {
         if ('operation' in rest) {
             const { insertable, operation } = rest;
             const { settings, definition } = new OperationDriver_js_1.OperationDriver({
-                context: coreContext,
+                context: this,
                 insertable,
                 operation,
                 generation,
@@ -167,7 +161,7 @@ class GenerateContext {
         else {
             const { insertable, refName } = rest;
             const { settings, definition } = new ModelDriver_js_1.ModelDriver({
-                context: coreContext,
+                context: this,
                 insertable,
                 refName,
                 generation,
@@ -209,7 +203,7 @@ class GenerateContext {
         return baseSettings;
     }
     addFile(normalisedPath) {
-        if (this.files.has(normalisedPath)) {
+        if (__classPrivateFieldGet(this, _GenerateContext_files, "f").has(normalisedPath)) {
             throw new Error(`File already exists: ${normalisedPath}`);
         }
         const newFile = {
@@ -217,7 +211,7 @@ class GenerateContext {
             definitions: new Map(),
             generatorKeys: new Set()
         };
-        this.files.set(normalisedPath, newFile);
+        __classPrivateFieldGet(this, _GenerateContext_files, "f").set(normalisedPath, newFile);
         return newFile;
     }
     resolveSchemaRefOnce(refName) {
@@ -227,24 +221,15 @@ class GenerateContext {
         }
         return schema;
     }
-    addRenderDependency({ generatorId, dependencies, operation }) {
-        if (!this.renderDependencies.has(generatorId)) {
-            this.renderDependencies.set(generatorId, new Set());
-        }
-        const generatorDependencies = this.renderDependencies.get(generatorId);
-        dependencies.forEach(dependencyId => {
-            generatorDependencies?.add((0, GeneratorKeys_js_1.toOperationGeneratorKey)({ generatorId: dependencyId, operation }));
-        });
-    }
     /** Produce external instance and return its name */
     findDefinition({ name, exportPath }) {
         return this.getFile(exportPath).definitions.get(name);
     }
 }
 exports.GenerateContext = GenerateContext;
-_GenerateContext_stackTrail = new WeakMap(), _GenerateContext_instances = new WeakSet(), _GenerateContext_runOperationGenerator = function _GenerateContext_runOperationGenerator({ context, generator }) {
-    const generatorInstance = new generator(context);
-    context.schemaModel.operations.forEach(operation => {
+_GenerateContext_files = new WeakMap(), _GenerateContext_stackTrail = new WeakMap(), _GenerateContext_instances = new WeakSet(), _GenerateContext_runOperationGenerator = function _GenerateContext_runOperationGenerator({ schemaModel, generator }) {
+    const generatorInstance = new generator(this);
+    schemaModel.operations.forEach(operation => {
         // TODO If we make OasOperation generic, for example by
         // adding a `method` type, we could make isSupported
         // a type guard which could help us narrow down the
@@ -255,40 +240,39 @@ _GenerateContext_stackTrail = new WeakMap(), _GenerateContext_instances = new We
         const { path, method } = operation;
         if (generator.isSupported(operation)) {
             this.appendStackTrailChunk([path, method]);
-            __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_generateOperation).call(this, { context, operation, generatorInstance });
+            __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_generateOperation).call(this, { operation, generatorInstance });
             this.removeStackTrailChunk([path, method]);
         }
     });
-}, _GenerateContext_runModelGenerator = function _GenerateContext_runModelGenerator({ context, generator }) {
-    const generatorInstance = new generator(context);
-    const refNames = Object.keys(context.schemaModel.components?.schemas ?? {});
+}, _GenerateContext_runModelGenerator = function _GenerateContext_runModelGenerator({ schemaModel, generator }) {
+    const generatorInstance = new generator(this);
+    const refNames = Object.keys(schemaModel.components?.schemas ?? {});
     refNames.forEach(rn => {
         this.appendStackTrailChunk(rn);
         __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_generateModel).call(this, {
-            context,
             refName: rn,
             generatorInstance
         });
         this.removeStackTrailChunk(rn);
     });
-}, _GenerateContext_generateModel = function _GenerateContext_generateModel({ context, refName, generatorInstance }) {
+}, _GenerateContext_generateModel = function _GenerateContext_generateModel({ refName, generatorInstance }) {
     try {
         generatorInstance.transformModel(refName);
-        context.captureCurrentResult('success');
+        // this.captureCurrentResult('success')
     }
     catch (error) {
-        context.logger.error(error);
-        context.captureCurrentResult('error');
+        this.logger.error(error);
+        // this.captureCurrentResult('error')
         Sentry.captureException(error);
     }
-}, _GenerateContext_generateOperation = function _GenerateContext_generateOperation({ context, operation, generatorInstance }) {
+}, _GenerateContext_generateOperation = function _GenerateContext_generateOperation({ operation, generatorInstance }) {
     try {
         generatorInstance.transformOperation(operation);
-        context.captureCurrentResult('success');
+        // this.captureCurrentResult('success')
     }
     catch (error) {
-        context.logger.error(error);
-        context.captureCurrentResult('error');
+        this.logger.error(error);
+        // this.captureCurrentResult('error')
         Sentry.captureException(error);
     }
 };

package/script/context/RenderContext.d.ts

@@ -1,31 +1,25 @@
 import type { PrettierConfigType } from '../types/prettierConfig.js';
-import type { AddGeneratorKeyArgs, FileContents, RenderDependencies, RenderOptions, RenderResult } from './types.js';
-import type { ClientSettings } from '../types/Settings.js';
+import type { AddGeneratorKeyArgs, FileContents, RenderResult } from './types.js';
 import type { Definition } from '../dsl/Definition.js';
 import type { PickArgs } from './GenerateContext.js';
 type ConstructorArgs = {
     files: Map<string, FileContents>;
-    packageDependencies: Map<string, string>;
     prettier?: PrettierConfigType;
-    settings: ClientSettings | undefined;
-    renderDependencies: RenderDependencies;
+    basePath: string | undefined;
     pinnableGenerators: string[];
 };
 export declare class RenderContext {
     #private;
     files: Map<string, FileContents>;
-    renderDependencies: RenderDependencies;
-    packageDependencies: Map<string, string>;
     private prettier?;
-    settings: ClientSettings | undefined;
+    basePath: string | undefined;
     currentDestinationPath: string | 'PRE_RENDER' | 'POST_RENDER';
     pinnableGenerators: string[];
-    constructor({ files, packageDependencies, prettier, settings, renderDependencies, pinnableGenerators }: ConstructorArgs);
+    constructor({ files, prettier, basePath, pinnableGenerators }: ConstructorArgs);
     appendStackTrailChunk(chunk: string): void;
     removeStackTrailChunk(chunk: string): void;
     get stackTrail(): string;
-    toPackageJson(): string;
-    render({ packageJson }: RenderOptions): Omit<RenderResult, 'results'>;
+    render(): Omit<RenderResult, 'results'>;
     private collate;
     getFile(filePath: string): FileContents;
     addGeneratorKey({ generatorKey }: AddGeneratorKeyArgs): void;