@skmtc/core 0.0.312 → 0.0.313

package/esm/context/RenderContext.js

@@ -1,23 +1,11 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-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 _RenderContext_stackTrail;
 import * as Sentry from '@sentry/deno';
 import { Import } from '../dsl/Import.js';
 import invariant from 'tiny-invariant';
 import { normalize } from '../deps/jsr.io/@std/path/1.0.0/mod.js';
 import { toResolvedArtifactPath } from '../helpers/toResolvedArtifactPath.js';
-import { StackTrail } from './StackTrail.js';
+import { tracer } from '../helpers/tracer.js';
 export class RenderContext {
-    constructor({ files, prettier, basePath, pinnableGenerators }) {
+    constructor({ files, prettier, basePath, pinnableGenerators, appendToStackTrail, removeFromStackTrail }) {
         Object.defineProperty(this, "files", {
             enumerable: true,
             configurable: true,
@@ -48,22 +36,25 @@ export class RenderContext {
             writable: true,
             value: void 0
         });
-        _RenderContext_stackTrail.set(this, void 0);
-        __classPrivateFieldSet(this, _RenderContext_stackTrail, new StackTrail(), "f");
+        Object.defineProperty(this, "appendToStackTrail", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "removeFromStackTrail", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.currentDestinationPath = 'PRE_RENDER';
         this.files = files;
         this.prettier = prettier;
         this.basePath = basePath;
         this.pinnableGenerators = pinnableGenerators;
-    }
-    appendStackTrailChunk(chunk) {
-        __classPrivateFieldGet(this, _RenderContext_stackTrail, "f").append(chunk);
-    }
-    removeStackTrailChunk(chunk) {
-        __classPrivateFieldGet(this, _RenderContext_stackTrail, "f").remove(chunk);
-    }
-    get stackTrail() {
-        return __classPrivateFieldGet(this, _RenderContext_stackTrail, "f").toString();
+        this.appendToStackTrail = appendToStackTrail;
+        this.removeFromStackTrail = removeFromStackTrail;
     }
     render() {
         return Sentry.startSpan({ name: 'Render artifacts' }, () => {
@@ -87,15 +78,18 @@ export class RenderContext {
     collate() {
         const fileEntries = Array.from(this.files.entries());
         const fileObjects = fileEntries.map(([destinationPath, file]) => {
-            // Set the current destination path to be used by
-            // addGeneratorKey method to apply generator keys
-            // to Correct file
-            this.currentDestinationPath = destinationPath;
-            return renderFile({
-                file,
-                destinationPath,
-                basePath: this.basePath,
-                prettier: this.prettier
+            return tracer(this, destinationPath, () => {
+                // Set the current destination path to be used by
+                // addGeneratorKey method to apply generator keys
+                // to Correct file
+                // @TODO: Could this be combined with the tracer call above?
+                this.currentDestinationPath = destinationPath;
+                return renderFile({
+                    file,
+                    destinationPath,
+                    basePath: this.basePath,
+                    prettier: this.prettier
+                });
             });
         });
         this.currentDestinationPath = 'POST_RENDER';
@@ -144,7 +138,6 @@ export class RenderContext {
         return this.getFile(exportPath).definitions.get(name);
     }
 }
-_RenderContext_stackTrail = new WeakMap();
 const renderFile = ({ file, destinationPath, basePath }) => {
     const imports = Array.from(file.imports.entries()).map(([module, importItems]) => new Import({ module, importNames: Array.from(importItems) }));
     const definitions = Array.from(file.definitions.values());

package/esm/context/StackTrail.js

@@ -50,7 +50,7 @@ export class StackTrail {
     static parse(value) {
         const stack = value.split(':').map(item => {
             if (!item) {
-                throw new Error(`Empty stack trail chunk in: ${value}`);
+                throw new Error(`Empty stack trail token in: ${value}`);
             }
             return item.replaceAll('%3A', ':');
         });

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

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE3D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,QAAQ,4EAQlB,YAAY;;;CAsBd,CAAA"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE3D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,QAAQ,4EAQlB,YAAY;;;CAuBd,CAAA"}

package/esm/generate/generate.js

@@ -1,11 +1,12 @@
 import * as dntShim from "../_dnt.shims.js";
 import { CoreContext } from '../context/CoreContext.js';
 export const generate = ({ traceId, spanId, schema, settings, prettier, generatorsMap, startAt }) => {
-    const context = new CoreContext({ spanId, schema });
+    const context = new CoreContext({ spanId });
     const { artifacts, files, pinnable, results } = context.transform({
         settings,
         generatorsMap,
-        prettier
+        prettier,
+        schema
     });
     const manifest = {
         files,

package/esm/helpers/tracer.d.ts

@@ -1,7 +1,7 @@
 type StackTrailHandler = {
-    appendStackTrailChunk: (chunk: string | string[]) => void;
-    removeStackTrailChunk: (chunk: string | string[]) => void;
+    appendToStackTrail: (token: string | string[]) => void;
+    removeFromStackTrail: (token: string | string[]) => void;
 };
-export declare const tracer: <T>(context: StackTrailHandler, chunk: string | string[], fn: () => T) => T;
+export declare const tracer: <T>(context: StackTrailHandler, token: string | string[], fn: () => T) => T;
 export {};
 //# sourceMappingURL=tracer.d.ts.map

package/esm/helpers/tracer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../src/helpers/tracer.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG;IACvB,qBAAqB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAA;IACzD,qBAAqB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAA;CAC1D,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,CAAC,WACb,iBAAiB,SACnB,MAAM,GAAG,MAAM,EAAE,MACpB,MAAM,CAAC,MASZ,CAAA"}
+{"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../src/helpers/tracer.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,GAAG;IACvB,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAA;IACtD,oBAAoB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAA;CACzD,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,CAAC,WACb,iBAAiB,SACnB,MAAM,GAAG,MAAM,EAAE,MACpB,MAAM,CAAC,MASZ,CAAA"}

package/esm/helpers/tracer.js

@@ -1,6 +1,6 @@
-export const tracer = (context, chunk, fn) => {
-    context.appendStackTrailChunk(chunk);
+export const tracer = (context, token, fn) => {
+    context.appendToStackTrail(token);
     const result = fn();
-    context.removeStackTrailChunk(chunk);
+    context.removeFromStackTrail(token);
     return result;
 };

package/esm/oas/parameter/toParameterV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toParameterV3.d.ts","sourceRoot":"","sources":["../../../src/oas/parameter/toParameterV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAQjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAK9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAI3C,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EACN,CAAC,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC,EAAE,GACzD,SAAS,CAAA;IACb,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,iBAAiB,4BAG3B,qBAAqB,KACpB,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,GACtC,SAWH,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,eAAe,CACtD,CAAA;IACD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,4BAGxB,kBAAkB,KAAG,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,CASxE,CAAA;AAED,KAAK,0BAA0B,GAAG;IAChC,UAAU,EACN,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC,GACrE,SAAS,CAAA;IACb,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,sBAAsB,4BAGhC,0BAA0B,KACzB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,GAClD,SAMH,CAAA"}
+{"version":3,"file":"toParameterV3.d.ts","sourceRoot":"","sources":["../../../src/oas/parameter/toParameterV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAQjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAK9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAI3C,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EACN,CAAC,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC,EAAE,GACzD,SAAS,CAAA;IACb,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,iBAAiB,4BAG3B,qBAAqB,KACpB,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,GACtC,SAUH,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,MAAM,CAChB,MAAM,EACN,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,eAAe,CACtD,CAAA;IACD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,4BAGxB,kBAAkB,KAAG,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,CASxE,CAAA;AAED,KAAK,0BAA0B,GAAG;IAChC,UAAU,EACN,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC,GACrE,SAAS,CAAA;IACb,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,sBAAsB,4BAGhC,0BAA0B,KACzB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,GAClD,SAMH,CAAA"}

package/esm/oas/parameter/toParameterV3.js

@@ -12,7 +12,6 @@ export const toParameterListV3 = ({ parameters, context }) => {
         return undefined;
     }
     return parameters.map((parameter, index) => {
-        console.log('parameter index', index);
         return tracer(context, `${index}`, () => toParameterV3({ parameter, context }));
     });
 };

package/esm/server/createServer.js

@@ -104,6 +104,6 @@ const toOperations = ({ generator, oasDocument, operationsSettings }) => {
     }, {});
 };
 const toOasDocument = ({ schema, spanId }) => {
-    const context = new CoreContext({ spanId, schema });
-    return context.parse();
+    const context = new CoreContext({ spanId });
+    return context.parse(schema);
 };

package/esm/types/GeneratorKeys.js

@@ -22,11 +22,11 @@ export const isOperationGeneratorKey = (arg) => {
     if (typeof arg !== 'string') {
         return false;
     }
-    const keyChunks = arg.split('|');
-    if (keyChunks.length !== 3) {
+    const keyTokens = arg.split('|');
+    if (keyTokens.length !== 3) {
         return false;
     }
-    const [generatorId, path, method] = keyChunks;
+    const [generatorId, path, method] = keyTokens;
     if (typeof generatorId !== 'string' || !generatorId.length) {
         return false;
     }
@@ -42,11 +42,11 @@ export const isModelGeneratorKey = (arg) => {
     if (typeof arg !== 'string') {
         return false;
     }
-    const keyChunks = arg.split('|');
-    if (keyChunks.length !== 2) {
+    const keyTokens = arg.split('|');
+    if (keyTokens.length !== 2) {
         return false;
     }
-    const [generatorId, refName] = keyChunks;
+    const [generatorId, refName] = keyTokens;
     if (typeof generatorId !== 'string' || !generatorId.length) {
         return false;
     }

package/package.json

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

package/script/context/CoreContext.d.ts

@@ -8,9 +8,9 @@ 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;
 };
 type TransformArgs = {
+    schema: string;
     settings: ClientSettings | undefined;
     generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
     prettier?: PrettierConfigType;
@@ -18,16 +18,17 @@ type TransformArgs = {
 export declare class CoreContext {
     #private;
     logger: log.Logger;
-    constructor({ schema, spanId }: CoreContextArgs);
-    parse(): OasDocument;
-    transform({ settings, generatorsMap, prettier }: TransformArgs): {
+    constructor({ spanId }: CoreContextArgs);
+    parse(schema: string): OasDocument;
+    appendToStackTrail(token: string | string[]): void;
+    removeFromStackTrail(token: string | string[]): void;
+    transform({ schema, settings, generatorsMap, prettier }: TransformArgs): {
         results: Record<string, SuccessWarningError>;
         files: Record<string, import("../types/Manifest.js").ManifestEntry>;
         pinnable: Partial<Record<GeneratorKey, string>>;
         artifacts: Record<string, string>;
     };
     captureCurrentResult(result: SuccessWarningError): void;
-    get phaseType(): 'parse' | 'generate' | 'render';
 }
 export type JsonFormatterArgs = {
     logRecord: log.LogRecord;

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

@@ -1 +1 @@
-{"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,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;IA+C/C,KAAK,IAAI,WAAW;IAQpB,SAAS,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IAuE9D,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAgCvD,IAAI,SAAS,IAAI,OAAO,GAAG,UAAU,GAAG,QAAQ,CAE/C;CACF;AAkBD,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"}
+{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"AAIA,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;AA2B7D,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AASD,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,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,EAAE,eAAe;IAmCvC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW;IAMlC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAIlD,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAIpD,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IA4EtE,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;CA8BxD;AAkBD,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"}

package/script/context/CoreContext.js

@@ -33,19 +33,19 @@ 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_instances, _CoreContext_phase, _CoreContext_results, _CoreContext_stackTrail, _CoreContext_setupLogger, _CoreContext_getStackTrailString, _CoreContext_setupParsePhase, _CoreContext_setupGeneratePhase, _CoreContext_setupRenderPhase;
+var _CoreContext_instances, _CoreContext_phase, _CoreContext_results, _CoreContext_stackTrail, _CoreContext_setupLogger, _CoreContext_setupParsePhase, _CoreContext_setupGeneratePhase, _CoreContext_setupRenderPhase;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreContext = void 0;
 exports.skmtcFormatter = skmtcFormatter;
 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");
+const tracer_js_1 = require("../helpers/tracer.js");
 class CoreContext {
-    constructor({ schema, spanId }) {
+    constructor({ spanId }) {
         _CoreContext_instances.add(this);
         Object.defineProperty(this, "logger", {
             enumerable: true,
@@ -59,49 +59,55 @@ class CoreContext {
         __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");
     }
-    parse() {
-        if (__classPrivateFieldGet(this, _CoreContext_phase, "f").type !== 'parse') {
-            throw new Error(`Expected 'parse' phase, got '${__classPrivateFieldGet(this, _CoreContext_phase, "f").type}'`);
-        }
+    parse(schema) {
+        __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupParsePhase).call(this, schema), "f");
         return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.parse();
     }
-    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}'`);
-        }
+    appendToStackTrail(token) {
+        __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append(token);
+    }
+    removeFromStackTrail(token) {
+        __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove(token);
+    }
+    transform({ schema, settings, generatorsMap, prettier }) {
         const callback = (generatorKey) => {
-            if (__classPrivateFieldGet(this, _CoreContext_phase, "f").type === 'render') {
+            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,
-            callback
-        }), "f");
-        const files = __classPrivateFieldGet(this, _CoreContext_phase, "f").context.generate(generatorsMap);
+        const schemaModel = (0, tracer_js_1.tracer)(this, 'parse', () => {
+            __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupParsePhase).call(this, schema), "f");
+            return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.parse();
+        });
+        const files = (0, tracer_js_1.tracer)(this, 'generate', () => {
+            __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupGeneratePhase).call(this, {
+                schemaModel,
+                settings,
+                generatorsMap,
+                callback
+            }), "f");
+            return __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, {
-            files,
-            pinnableGenerators: Object.values(generatorsMap)
-                .map(({ id, pinnable }) => (pinnable ? id : null))
-                .filter(generatorId => generatorId !== null),
-            prettier,
-            basePath: settings?.basePath
-        }), "f");
-        const renderOutput = __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render();
-        __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").remove('render');
+        const renderOutput = (0, tracer_js_1.tracer)(this, 'render', () => {
+            __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupRenderPhase).call(this, {
+                files,
+                pinnableGenerators: Object.values(generatorsMap)
+                    .map(({ id, pinnable }) => (pinnable ? id : null))
+                    .filter(generatorId => generatorId !== null),
+                prettier,
+                basePath: settings?.basePath
+            }), "f");
+            return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render();
+        });
         return {
             ...renderOutput,
             results: __classPrivateFieldGet(this, _CoreContext_results, "f")
         };
     }
     captureCurrentResult(result) {
-        const stackTrail = __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_getStackTrailString).call(this);
+        const stackTrail = __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").toString();
         if (incomingResultIsWorse({
             current: __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail],
             incoming: result
@@ -109,9 +115,6 @@ class CoreContext {
             __classPrivateFieldGet(this, _CoreContext_results, "f")[stackTrail] = result;
         }
     }
-    get phaseType() {
-        return __classPrivateFieldGet(this, _CoreContext_phase, "f").type;
-    }
 }
 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) {
@@ -120,7 +123,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
             [`${spanId}-logs`]: new log.ConsoleHandler('DEBUG', {
                 formatter: logRecord => skmtcFormatter({
                     logRecord,
-                    stackTrail: __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_getStackTrailString).call(this)
+                    stackTrail: __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").toString()
                 }),
                 useColors: false
             }),
@@ -137,37 +140,34 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
         }
     });
     return log.getLogger(spanId);
-}, _CoreContext_getStackTrailString = function _CoreContext_getStackTrailString() {
-    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 StackTrail_js_1.StackTrail.join(__classPrivateFieldGet(this, _CoreContext_stackTrail, "f"), substack);
 }, _CoreContext_setupParsePhase = function _CoreContext_setupParsePhase(schema) {
-    __classPrivateFieldGet(this, _CoreContext_stackTrail, "f").append('parse');
-    const parseContext = new ParseContext_js_1.ParseContext({ schema, logger: this.logger });
+    const parseContext = new ParseContext_js_1.ParseContext({
+        schema,
+        logger: this.logger,
+        appendToStackTrail: this.appendToStackTrail.bind(this),
+        removeFromStackTrail: this.appendToStackTrail.bind(this)
+    });
     return { type: 'parse', context: parseContext };
 }, _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,
         logger: this.logger,
         callback,
-        captureCurrentResult: this.captureCurrentResult.bind(this)
+        captureCurrentResult: this.captureCurrentResult.bind(this),
+        appendToStackTrail: this.appendToStackTrail.bind(this),
+        removeFromStackTrail: this.removeFromStackTrail.bind(this)
     });
     return { type: 'generate', context: generateContext };
 }, _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,
         prettier,
         basePath,
-        pinnableGenerators
+        pinnableGenerators,
+        appendToStackTrail: this.appendToStackTrail.bind(this),
+        removeFromStackTrail: this.removeFromStackTrail.bind(this)
     });
     return { type: 'render', context: renderContext };
 };

package/script/context/GenerateContext.d.ts

@@ -22,6 +22,8 @@ type ConstructorArgs = {
     logger: log.Logger;
     callback: (generatorKey: GeneratorKey) => void;
     captureCurrentResult: (result: SuccessWarningError) => void;
+    appendToStackTrail: (token: string | string[]) => void;
+    removeFromStackTrail: (token: string | string[]) => void;
 };
 export type PickArgs = {
     name: string;
@@ -68,11 +70,10 @@ export declare class GenerateContext {
     logger: log.Logger;
     callback: (generatorKey: GeneratorKey) => void;
     captureCurrentResult: (result: SuccessWarningError) => void;
-    constructor({ schemaModel, settings, logger, callback, captureCurrentResult }: ConstructorArgs);
+    appendToStackTrail: (token: string | string[]) => void;
+    removeFromStackTrail: (token: string | string[]) => void;
+    constructor({ schemaModel, settings, logger, callback, captureCurrentResult, appendToStackTrail, removeFromStackTrail }: 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, definitions, destinationPath }: RegisterArgs): void;
     insert<V extends GeneratedValue, T extends GenerationType>({ generation, destinationPath, ...rest }: InsertArgs<V, T>): InsertReturn<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":"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"}
+{"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,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC9D,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;AACjE,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;AAElD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE/D,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;IAClE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI,CAAA;IAC9C,oBAAoB,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAC3D,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAA;IACtD,oBAAoB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAA;CACzD,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,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;AAYD,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;;IAE1B,WAAW,EAAE,WAAW,CAAA;IACxB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI,CAAA;IAC9C,oBAAoB,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAC3D,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAA;IACtD,oBAAoB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,IAAI,CAAA;gBAE5C,EACV,WAAW,EACX,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,EACrB,EAAE,eAAe;IAWlB,QAAQ,CACN,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,GACjE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;IAuG5B,OAAO,CACL,QAAQ,EAAE,MAAM,EAChB,EAAE,eAAuB,EAAE,GAAE,cAAmB,GAC/C,YAAY;IAgBf,QAAQ,CAAC,EAAE,OAAY,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,YAAY;IAyBrE,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,EACzD,UAAU,EACV,eAAe,EACf,GAAG,IAAI,EACR,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IA4BxC,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,oDAAoD;IACpD,cAAc,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAGvE"}

package/script/context/GenerateContext.js

@@ -33,17 +33,16 @@ 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_files, _GenerateContext_stackTrail, _GenerateContext_runOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_generateModel, _GenerateContext_generateOperation;
+var _GenerateContext_instances, _GenerateContext_files, _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 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, settings, logger, callback, captureCurrentResult }) {
+    constructor({ schemaModel, settings, logger, callback, captureCurrentResult, appendToStackTrail, removeFromStackTrail }) {
         _GenerateContext_instances.add(this);
         _GenerateContext_files.set(this, void 0);
         Object.defineProperty(this, "schemaModel", {
@@ -58,7 +57,6 @@ class GenerateContext {
             writable: true,
             value: void 0
         });
-        _GenerateContext_stackTrail.set(this, void 0);
         Object.defineProperty(this, "logger", {
             enumerable: true,
             configurable: true,
@@ -77,45 +75,49 @@ class GenerateContext {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "appendToStackTrail", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "removeFromStackTrail", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.logger = logger;
-        __classPrivateFieldSet(this, _GenerateContext_stackTrail, new StackTrail_js_1.StackTrail(), "f");
         __classPrivateFieldSet(this, _GenerateContext_files, new Map(), "f");
         this.schemaModel = schemaModel;
         this.settings = settings;
         this.callback = callback;
         this.captureCurrentResult = captureCurrentResult;
+        this.appendToStackTrail = appendToStackTrail;
+        this.removeFromStackTrail = removeFromStackTrail;
     }
     generate(generatorsMap) {
         Sentry.startSpan({ name: 'Generate operations' }, () => Object.values(generatorsMap)
             .filter(generator => generator.type === 'operation')
             .forEach(generator => {
-            this.appendStackTrailChunk(generator.id);
+            this.appendToStackTrail(generator.id);
             __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_runOperationGenerator).call(this, {
                 schemaModel: this.schemaModel,
                 generator
             });
-            this.removeStackTrailChunk(generator.id);
+            this.removeFromStackTrail(generator.id);
         }));
         Sentry.startSpan({ name: 'Generate models' }, () => {
             Object.values(generatorsMap)
                 .filter(generator => generator.type === 'model')
                 .forEach(generator => {
-                this.appendStackTrailChunk(generator.id);
+                this.appendToStackTrail(generator.id);
                 __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_runModelGenerator).call(this, { schemaModel: this.schemaModel, generator });
-                this.removeStackTrailChunk(generator.id);
+                this.removeFromStackTrail(generator.id);
             });
         });
         return __classPrivateFieldGet(this, _GenerateContext_files, "f");
     }
-    appendStackTrailChunk(chunk) {
-        __classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").append(chunk);
-    }
-    removeStackTrailChunk(chunk) {
-        __classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").remove(chunk);
-    }
-    get stackTrail() {
-        return __classPrivateFieldGet(this, _GenerateContext_stackTrail, "f").toString();
-    }
     getFile(filePath, { throwIfNotFound = false } = {}) {
         const normalisedPath = (0, mod_js_1.normalize)(filePath);
         const currentFile = __classPrivateFieldGet(this, _GenerateContext_files, "f").get(normalisedPath);
@@ -228,7 +230,7 @@ class GenerateContext {
     }
 }
 exports.GenerateContext = GenerateContext;
-_GenerateContext_files = new WeakMap(), _GenerateContext_stackTrail = new WeakMap(), _GenerateContext_instances = new WeakSet(), _GenerateContext_runOperationGenerator = function _GenerateContext_runOperationGenerator({ schemaModel, generator }) {
+_GenerateContext_files = 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
@@ -240,21 +242,21 @@ _GenerateContext_files = new WeakMap(), _GenerateContext_stackTrail = new WeakMa
         // https://linear.app/skmtc/issue/SKM-32/generic-models-operations
         const { path, method } = operation;
         if (generator.isSupported(operation)) {
-            this.appendStackTrailChunk([path, method]);
+            this.appendToStackTrail([path, method]);
             __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_generateOperation).call(this, { operation, generatorInstance });
-            this.removeStackTrailChunk([path, method]);
+            this.removeFromStackTrail([path, method]);
         }
     });
 }, _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);
+        this.appendToStackTrail(rn);
         __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_generateModel).call(this, {
             refName: rn,
             generatorInstance
         });
-        this.removeStackTrailChunk(rn);
+        this.removeFromStackTrail(rn);
     });
 }, _GenerateContext_generateModel = function _GenerateContext_generateModel({ refName, generatorInstance }) {
     try {