@skmtc/core 0.0.296 → 0.0.297

package/script/context/CoreContext.js

@@ -33,7 +33,7 @@ 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 _CoreContext_phase, _CoreContext_results;
+var _CoreContext_instances, _CoreContext_phase, _CoreContext_results, _CoreContext_stackTrail, _CoreContext_setupLogger, _CoreContext_getStackTrail, _CoreContext_setupParsePhase, _CoreContext_setupGeneratePhase, _CoreContext_setupRenderPhase;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreContext = void 0;
 exports.skmtcFormatter = skmtcFormatter;
@@ -41,17 +41,14 @@ exports.resultFormatter = resultFormatter;
 const GenerateContext_js_1 = require("./GenerateContext.js");
 const ts_pattern_1 = require("ts-pattern");
 const RenderContext_js_1 = require("./RenderContext.js");
+const ParseContext_js_1 = require("./ParseContext.js");
 const log = __importStar(require("../deps/jsr.io/@std/log/0.224.6/mod.js"));
 const ResultsHandler_js_1 = require("./ResultsHandler.js");
+const StackTrail_js_1 = require("./StackTrail.js");
 class CoreContext {
-    constructor({ phase, traceId, spanId }) {
-        Object.defineProperty(this, "traceId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "spanId", {
+    constructor({ schema, spanId }) {
+        _CoreContext_instances.add(this);
+        Object.defineProperty(this, "logger", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -59,111 +56,63 @@ class CoreContext {
         });
         _CoreContext_phase.set(this, void 0);
         _CoreContext_results.set(this, void 0);
-        __classPrivateFieldSet(this, _CoreContext_results, {
-            parse: 'success',
-            generate: {},
-            render: 'success'
-        }, "f");
-        __classPrivateFieldSet(this, _CoreContext_phase, phase, "f");
-        this.traceId = traceId;
-        this.spanId = spanId;
-        log.setup({
-            handlers: {
-                [`${spanId}-logs`]: new log.ConsoleHandler('DEBUG', {
-                    formatter: logRecord => skmtcFormatter({ logRecord, context: this }),
-                    useColors: false
-                }),
-                [`${spanId}-results`]: new ResultsHandler_js_1.ResultsHandler('WARN', {
-                    formatter: logRecord => resultFormatter({ logRecord, context: this }),
-                    context: this
-                })
-            },
-            loggers: {
-                [spanId]: {
-                    level: 'DEBUG',
-                    handlers: [`${spanId}-logs`, `${spanId}-results`]
-                }
-            }
-        });
+        _CoreContext_stackTrail.set(this, void 0);
+        __classPrivateFieldSet(this, _CoreContext_stackTrail, new StackTrail_js_1.StackTrail([spanId]), "f");
+        __classPrivateFieldSet(this, _CoreContext_results, {}, "f");
+        this.logger = __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupLogger).call(this, spanId);
+        __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupParsePhase).call(this, schema), "f");
     }
-    get logger() {
-        return log.getLogger(this.spanId);
+    parse() {
+        if (__classPrivateFieldGet(this, _CoreContext_phase, "f").type !== 'parse') {
+            throw new Error(`Expected 'parse' phase, got '${__classPrivateFieldGet(this, _CoreContext_phase, "f").type}'`);
+        }
+        return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.parse(this);
     }
-    setupGeneratePhase({ schemaModel, settings, generatorsMap }) {
-        const generateContext = new GenerateContext_js_1.GenerateContext({
+    transform({ settings, generatorsMap, prettier }) {
+        if (__classPrivateFieldGet(this, _CoreContext_phase, "f").type !== 'parse') {
+            throw new Error(`Expected 'parse' phase, got '${__classPrivateFieldGet(this, _CoreContext_phase, "f").type}'`);
+        }
+        const schemaModel = __classPrivateFieldGet(this, _CoreContext_phase, "f").context.parse(this);
+        __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupGeneratePhase).call(this, {
             schemaModel,
             settings,
             generatorsMap
-        });
-        __classPrivateFieldSet(this, _CoreContext_phase, { type: 'generate', context: generateContext }, "f");
+        }), "f");
+        __classPrivateFieldGet(this, _CoreContext_phase, "f").context.generate(this);
+        __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupRenderPhase).call(this, {
+            renderDependencies: this.renderDependencies,
+            packageDependencies: this.packageDependencies,
+            pinnableGenerators: Object.values(this.generatorsMap)
+                .map(({ id, pinnable }) => (pinnable ? id : null))
+                .filter(generatorId => generatorId !== null),
+            prettier,
+            settings
+        }), "f");
+        const renderOutput = __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render({});
+        return {
+            ...renderOutput,
+            results: __classPrivateFieldGet(this, _CoreContext_results, "f")
+        };
     }
-    captureResult(args) {
-        (0, ts_pattern_1.match)(args)
-            .with({ phase: 'parse' }, ({ result }) => {
-            if (applyResult({ current: __classPrivateFieldGet(this, _CoreContext_results, "f").parse, incoming: result })) {
-                __classPrivateFieldGet(this, _CoreContext_results, "f").parse = result;
-            }
-        })
-            .with({ phase: 'generate' }, ({ generatorKey, result }) => {
-            if (applyResult({
-                current: __classPrivateFieldGet(this, _CoreContext_results, "f").generate[generatorKey],
-                incoming: result
-            })) {
-                __classPrivateFieldGet(this, _CoreContext_results, "f").generate[generatorKey] = result;
-            }
-        })
-            .with({ phase: 'render' }, ({ result }) => {
-            if (applyResult({ current: __classPrivateFieldGet(this, _CoreContext_results, "f").render, incoming: result })) {
-                __classPrivateFieldGet(this, _CoreContext_results, "f").render = result;
-            }
-        })
-            .exhaustive();
+    captureResult({ stackTrail, result }) {
+        if (applyResult({ current: __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail], incoming: result })) {
+            __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail] = result;
+        }
     }
-    setupRenderPhase({ prettier, packageDependencies, settings, renderDependencies, pinnableGenerators }) {
-        const renderContext = new RenderContext_js_1.RenderContext({
-            traceId: this.traceId,
-            spanId: this.spanId,
-            results: __classPrivateFieldGet(this, _CoreContext_results, "f"),
-            files: this.files,
-            renderDependencies,
-            packageDependencies,
-            prettier,
-            settings,
-            pinnableGenerators
-        });
-        __classPrivateFieldSet(this, _CoreContext_phase, { type: 'render', context: renderContext }, "f");
+    captureCurrentResult(result) {
+        const stackTrail = __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").toString();
+        if (applyResult({ current: __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail], incoming: result })) {
+            __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail] = result;
+        }
     }
     get phaseType() {
         return __classPrivateFieldGet(this, _CoreContext_phase, "f").type;
     }
-    // @TODO This feels like it belongs in GenerateContext
-    setCurrentLocation(location) {
-        (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => {
-            context.setCurrentLocation(location);
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot set current location during parse phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot set current location during render phase`);
-        })
-            .exhaustive();
+    appendStackTrailChunk(chunk) {
+        __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append(chunk);
     }
-    getLogFields() {
-        const logFields = {
-            phase: __classPrivateFieldGet(this, _CoreContext_phase, "f").type,
-            traceId: this.traceId,
-            spanId: this.spanId
-        };
-        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, ({ context }) => ({
-            ...logFields,
-            ...context.getLogFields()
-        }))
-            .with({ type: 'parse' }, () => logFields)
-            .with({ type: 'render' }, () => logFields)
-            .exhaustive();
+    removeStackTrailChunk(chunk) {
+        __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove(chunk);
     }
     register({ destinationPath, ...args }) {
         return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
@@ -239,17 +188,6 @@ class CoreContext {
             .with({ type: 'render' }, ({ context }) => context.pick(args))
             .exhaustive();
     }
-    render(options) {
-        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'generate' }, () => {
-            throw new Error(`Cannot render during generate phase`);
-        })
-            .with({ type: 'parse' }, () => {
-            throw new Error(`Cannot render during parse phase`);
-        })
-            .with({ type: 'render' }, ({ context }) => context.render(options))
-            .exhaustive();
-    }
     addFile(normalisedPath) {
         return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
@@ -302,9 +240,6 @@ class CoreContext {
         })
             .exhaustive();
     }
-    get results() {
-        return __classPrivateFieldGet(this, _CoreContext_results, "f");
-    }
     get files() {
         return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => context.files)
@@ -354,17 +289,6 @@ class CoreContext {
         })
             .exhaustive();
     }
-    get parsedDocument() {
-        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
-            .with({ type: 'parse' }, ({ context }) => context.parsedDocument)
-            .with({ type: 'generate' }, () => {
-            throw new Error(`Cannot access parsed document during generate phase`);
-        })
-            .with({ type: 'render' }, () => {
-            throw new Error(`Cannot access parsed document during render phase`);
-        })
-            .exhaustive();
-    }
     get settings() {
         return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => context.settings)
@@ -378,15 +302,62 @@ class CoreContext {
     }
 }
 exports.CoreContext = CoreContext;
-_CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap();
+_CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreContext_stackTrail = new WeakMap(), _CoreContext_instances = new WeakSet(), _CoreContext_setupLogger = function _CoreContext_setupLogger(spanId) {
+    log.setup({
+        handlers: {
+            [`${spanId}-logs`]: new log.ConsoleHandler('DEBUG', {
+                formatter: logRecord => skmtcFormatter({ logRecord, stackTrail: __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_getStackTrail).call(this) }),
+                useColors: false
+            }),
+            [`${spanId}-results`]: new ResultsHandler_js_1.ResultsHandler('WARN', {
+                formatter: logRecord => resultFormatter({ logRecord, stackTrail: __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_getStackTrail).call(this) }),
+                context: this
+            })
+        },
+        loggers: {
+            [spanId]: {
+                level: 'DEBUG',
+                handlers: [`${spanId}-logs`, `${spanId}-results`]
+            }
+        }
+    });
+    return log.getLogger(spanId);
+}, _CoreContext_getStackTrail = function _CoreContext_getStackTrail() {
+    const substack = (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
+        .with({ type: 'parse' }, ({ context }) => context.stackTrail)
+        .with({ type: 'generate' }, ({ context }) => context.stackTrail)
+        .with({ type: 'render' }, ({ context }) => context.stackTrail)
+        .exhaustive();
+    return __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append(substack);
+}, _CoreContext_setupParsePhase = function _CoreContext_setupParsePhase(schema) {
+    const parseContext = new ParseContext_js_1.ParseContext(schema);
+    return { type: 'parse', context: parseContext };
+}, _CoreContext_setupGeneratePhase = function _CoreContext_setupGeneratePhase({ schemaModel, settings, generatorsMap }) {
+    const generateContext = new GenerateContext_js_1.GenerateContext({
+        schemaModel,
+        settings,
+        generatorsMap
+    });
+    return { type: 'generate', context: generateContext };
+}, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ prettier, packageDependencies, settings, renderDependencies, pinnableGenerators }) {
+    const renderContext = new RenderContext_js_1.RenderContext({
+        files: this.files,
+        renderDependencies,
+        packageDependencies,
+        prettier,
+        settings,
+        pinnableGenerators
+    });
+    return { type: 'render', context: renderContext };
+};
 const applyResult = ({ current, incoming }) => {
     return (current === undefined ||
         (current === 'success' && incoming !== 'success') ||
         (current === 'warning' && incoming === 'error'));
 };
-function skmtcFormatter({ logRecord, context }) {
+function skmtcFormatter({ logRecord, stackTrail }) {
     return JSON.stringify({
-        ...context.getLogFields(),
+        stackTrail,
         level: logRecord.levelName,
         datetime: logRecord.datetime.getTime(),
         message: logRecord.msg,
@@ -401,11 +372,6 @@ function flattenArgs(args) {
         return args;
     }
 }
-function resultFormatter({ logRecord, context }) {
-    const { phase, generatorKey } = context.getLogFields();
-    return JSON.stringify({
-        level: logRecord.levelName,
-        phase,
-        generatorKey
-    });
+function resultFormatter({ logRecord, stackTrail }) {
+    return JSON.stringify({ level: logRecord.levelName, stackTrail });
 }

package/script/context/GenerateContext.d.ts

@@ -8,12 +8,12 @@ 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 { ModelGeneratorKey, OperationGeneratorKey } from '../types/GeneratorKeys.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 { StackTrail } from './StackTrail.js';
 type ConstructorArgs = {
     schemaModel: OasDocument;
     settings: ClientSettings | undefined;
@@ -59,16 +59,18 @@ export type InsertReturn<V extends GeneratedValue, T extends GenerationType> = {
     definition: GeneratedDefintion<V, T>;
 };
 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>;
-    currentLocation: OperationGeneratorKey | ModelGeneratorKey | undefined;
+    stackTrail: StackTrail;
     constructor({ schemaModel, generatorsMap, settings }: ConstructorArgs);
-    setCurrentLocation(location: OperationGeneratorKey | ModelGeneratorKey): void;
-    getLogFields(): Record<string, string>;
+    generate(coreContext: CoreContext): void;
+    appendStackTrailChunk(chunk: string | string[] | StackTrail): void;
+    removeStackTrailChunk(chunk: string | string[] | StackTrail): void;
     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> & {

package/script/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,EACnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAEV,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,2BAA2B,CAAA;AAKlC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAGhF,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;AAElD,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;AAED,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;AAED,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;IAClE,eAAe,EAAE,qBAAqB,GAAG,iBAAiB,GAAG,SAAS,CAAA;gBAE1D,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,eAAe;IASrE,kBAAkB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,iBAAiB;IAItE,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAItC,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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"}

package/script/context/GenerateContext.js

@@ -1,4 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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_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");
@@ -6,8 +35,11 @@ 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 }) {
+        _GenerateContext_instances.add(this);
         Object.defineProperty(this, "files", {
             enumerable: true,
             configurable: true,
@@ -44,12 +76,13 @@ class GenerateContext {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "currentLocation", {
+        Object.defineProperty(this, "stackTrail", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        this.stackTrail = new StackTrail_js_1.StackTrail();
         this.generatorsMap = generatorsMap;
         this.files = new Map();
         this.renderDependencies = new Map();
@@ -57,11 +90,29 @@ class GenerateContext {
         this.schemaModel = schemaModel;
         this.settings = settings;
     }
-    setCurrentLocation(location) {
-        this.currentLocation = location;
+    generate(coreContext) {
+        Sentry.startSpan({ name: 'Generate operations' }, () => Object.values(coreContext.generatorsMap)
+            .filter(generator => generator.type === 'operation')
+            .forEach(generator => {
+            this.appendStackTrailChunk(generator.id);
+            __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_runOperationGenerator).call(this, { context: coreContext, generator });
+            this.removeStackTrailChunk(generator.id);
+        }));
+        Sentry.startSpan({ name: 'Generate models' }, () => {
+            Object.values(coreContext.generatorsMap)
+                .filter(generator => generator.type === 'model')
+                .forEach(generator => {
+                this.appendStackTrailChunk(generator.id);
+                __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_runModelGenerator).call(this, { context: coreContext, generator });
+                this.removeStackTrailChunk(generator.id);
+            });
+        });
     }
-    getLogFields() {
-        return this.currentLocation ? (0, GeneratorKeys_js_1.fromGeneratorKey)(this.currentLocation) : {};
+    appendStackTrailChunk(chunk) {
+        this.stackTrail.append(chunk);
+    }
+    removeStackTrailChunk(chunk) {
+        this.stackTrail.remove(chunk);
     }
     getFile(filePath, { throwIfNotFound = false } = {}) {
         const normalisedPath = (0, mod_js_1.normalize)(filePath);
@@ -187,3 +238,53 @@ class GenerateContext {
     }
 }
 exports.GenerateContext = GenerateContext;
+_GenerateContext_instances = new WeakSet(), _GenerateContext_runOperationGenerator = function _GenerateContext_runOperationGenerator({ context, generator }) {
+    const generatorInstance = new generator(context);
+    context.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
+        // exact operation type that a generator receives.
+        // This would allow us to remove some type checks
+        // in the generator implementations
+        // https://linear.app/skmtc/issue/SKM-32/generic-models-operations
+        const { path, method } = operation;
+        if (generator.isSupported(operation)) {
+            this.appendStackTrailChunk([path, method]);
+            __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_generateOperation).call(this, { context, 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 ?? {});
+    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 }) {
+    try {
+        generatorInstance.transformModel(refName);
+        context.captureCurrentResult('success');
+    }
+    catch (error) {
+        context.logger.error(error);
+        context.captureCurrentResult('error');
+        Sentry.captureException(error);
+    }
+}, _GenerateContext_generateOperation = function _GenerateContext_generateOperation({ context, operation, generatorInstance }) {
+    try {
+        generatorInstance.transformOperation(operation);
+        context.captureCurrentResult('success');
+    }
+    catch (error) {
+        context.logger.error(error);
+        context.captureCurrentResult('error');
+        Sentry.captureException(error);
+    }
+};

package/script/context/ParseContext.d.ts

@@ -1,15 +1,15 @@
 import type { OpenAPIV3 } from 'openapi-types';
-import type { Trail } from './Trail.js';
-type ParseContextArgs = {
-    parsedDocument: OpenAPIV3.Document;
-};
+import { StackTrail } from './StackTrail.js';
+import type { CoreContext } from './CoreContext.js';
+import type { OasDocument } from '../oas/document/Document.js';
 export declare class ParseContext {
-    parsedDocument: OpenAPIV3.Document;
-    refDiffs: Promise<{
-        trail: Trail;
-        key: string;
-    }>[];
-    constructor({ parsedDocument }: ParseContextArgs);
+    #private;
+    schema: string;
+    stackTrail: StackTrail;
+    constructor(schema: string);
+    parse(context: CoreContext): OasDocument;
+    appendStackTrailChunk(frame: string | string[] | StackTrail): void;
+    removeStackTrailChunk(frame: string | string[] | StackTrail): void;
 }
-export {};
+export declare const parseSchema: (schema: string) => OpenAPIV3.Document<{}>;
 //# sourceMappingURL=ParseContext.d.ts.map

package/script/context/ParseContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ParseContext.d.ts","sourceRoot":"","sources":["../../src/context/ParseContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,KAAK,gBAAgB,GAAG;IACtB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;CACnC,CAAA;AAED,qBAAa,YAAY;IACvB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,OAAO,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAA;gBAEtC,EAAE,cAAc,EAAE,EAAE,gBAAgB;CAIjD"}
+{"version":3,"file":"ParseContext.d.ts","sourceRoot":"","sources":["../../src/context/ParseContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAK5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAE9D,qBAAa,YAAY;;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;gBAEV,MAAM,EAAE,MAAM;IAK1B,KAAK,CAAC,OAAO,EAAE,WAAW;IAkC1B,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU;IAI3D,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,UAAU;CAG5D;AAED,eAAO,MAAM,WAAW,WAAY,MAAM,2BAMzC,CAAA"}

package/script/context/ParseContext.js

@@ -1,22 +1,92 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _ParseContext_instances, _ParseContext_parseSchema, _ParseContext_parseDocument;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParseContext = void 0;
+exports.parseSchema = exports.ParseContext = void 0;
+const StackTrail_js_1 = require("./StackTrail.js");
+const Sentry = __importStar(require("@sentry/deno"));
+const mod_js_1 = require("../deps/jsr.io/@std/yaml/0.215.0/mod.js");
+const toDocumentV3_js_1 = require("../oas/document/toDocumentV3.js");
+const Trail_js_1 = require("./Trail.js");
 class ParseContext {
-    constructor({ parsedDocument }) {
-        Object.defineProperty(this, "parsedDocument", {
+    constructor(schema) {
+        _ParseContext_instances.add(this);
+        Object.defineProperty(this, "schema", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "refDiffs", {
+        Object.defineProperty(this, "stackTrail", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        this.parsedDocument = parsedDocument;
-        this.refDiffs = [];
+        this.schema = schema;
+        this.stackTrail = new StackTrail_js_1.StackTrail();
+    }
+    parse(context) {
+        const parsedDocument = __classPrivateFieldGet(this, _ParseContext_instances, "m", _ParseContext_parseSchema).call(this);
+        return __classPrivateFieldGet(this, _ParseContext_instances, "m", _ParseContext_parseDocument).call(this, context, parsedDocument);
+    }
+    appendStackTrailChunk(frame) {
+        this.stackTrail.append(frame);
+    }
+    removeStackTrailChunk(frame) {
+        this.stackTrail.remove(frame);
     }
 }
 exports.ParseContext = ParseContext;
+_ParseContext_instances = new WeakSet(), _ParseContext_parseSchema = function _ParseContext_parseSchema() {
+    const parsedDocument = Sentry.startSpan({ name: 'Parse schema to document' }, () => (0, exports.parseSchema)(this.schema));
+    return parsedDocument;
+}, _ParseContext_parseDocument = function _ParseContext_parseDocument(context, parsedDocument) {
+    const trail = new Trail_js_1.Trail({
+        document: parsedDocument
+    });
+    if (!parsedDocument.openapi.startsWith('3.0.')) {
+        throw new Error('Only OpenAPI v3 is supported');
+    }
+    return (0, toDocumentV3_js_1.toDocumentV3)({
+        document: parsedDocument,
+        trail,
+        context
+    });
+};
+const parseSchema = (schema) => {
+    if (schema.trimStart().startsWith('{')) {
+        return JSON.parse(schema);
+    }
+    else {
+        return (0, mod_js_1.parse)(schema);
+    }
+};
+exports.parseSchema = parseSchema;