@skmtc/core 0.0.273 → 0.0.274

package/script/context/CoreContext.js

@@ -1,18 +1,58 @@
 "use strict";
+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 _CoreContext_phase, _CoreContext_results;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreContext = void 0;
+exports.jsonFormatter = jsonFormatter;
 const GenerateContext_js_1 = require("./GenerateContext.js");
 const ts_pattern_1 = require("ts-pattern");
 const RenderContext_js_1 = require("./RenderContext.js");
+const mod_js_1 = require("../deps/jsr.io/@std/log/0.224.6/mod.js");
 class CoreContext {
-    constructor({ phase }) {
-        Object.defineProperty(this, "phase", {
+    constructor({ phase, traceId, spanId }) {
+        Object.defineProperty(this, "traceId", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        this.phase = phase;
+        Object.defineProperty(this, "spanId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        _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;
+        (0, mod_js_1.setup)({
+            handlers: {
+                [spanId]: new mod_js_1.ConsoleHandler('DEBUG', {
+                    formatter: logRecord => jsonFormatter({ logRecord, context: this }),
+                    useColors: false
+                })
+            }
+        });
+    }
+    get logger() {
+        return (0, mod_js_1.getLogger)(this.spanId);
     }
     setupGeneratePhase({ schemaModel, settings, generatorsMap }) {
         const generateContext = new GenerateContext_js_1.GenerateContext({
@@ -20,11 +60,33 @@ class CoreContext {
             settings,
             generatorsMap
         });
-        this.phase = { type: 'generate', context: generateContext };
+        __classPrivateFieldSet(this, _CoreContext_phase, { type: 'generate', context: generateContext }, "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();
     }
-    setupRenderPhase({ files, prettier, packageDependencies, settings, renderDependencies, pinnableGenerators }) {
-        console.log('Render dependencies: ', renderDependencies);
+    setupRenderPhase({ results, files, prettier, packageDependencies, settings, renderDependencies, pinnableGenerators }) {
         const renderContext = new RenderContext_js_1.RenderContext({
+            results,
             files,
             renderDependencies,
             packageDependencies,
@@ -32,10 +94,28 @@ class CoreContext {
             settings,
             pinnableGenerators
         });
-        this.phase = { type: 'render', context: renderContext };
+        __classPrivateFieldSet(this, _CoreContext_phase, { type: 'render', context: renderContext }, "f");
+    }
+    get phaseType() {
+        return __classPrivateFieldGet(this, _CoreContext_phase, "f").type;
+    }
+    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();
     }
     register({ destinationPath, ...args }) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
             return context.register({ destinationPath, ...args });
         })
@@ -48,9 +128,9 @@ class CoreContext {
             .exhaustive();
     }
     addGeneratorKey({ generatorKey }) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, () => {
-            console.log('trying to add generator key during generate phase');
+            this.logger.info('trying to add generator key during generate phase');
         })
             .with({ type: 'parse' }, () => {
             throw new Error(`Cannot add generator key during parse phase`);
@@ -61,7 +141,7 @@ class CoreContext {
             .exhaustive();
     }
     resolveSchemaRefOnce(refName) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
             return context.resolveSchemaRefOnce(refName);
         })
@@ -74,7 +154,7 @@ class CoreContext {
             .exhaustive();
     }
     addRenderDependency(args) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
             return context.addRenderDependency(args);
         })
@@ -87,7 +167,7 @@ class CoreContext {
             .exhaustive();
     }
     getFile(filePath) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
             return context.getFile(filePath);
         })
@@ -100,7 +180,7 @@ class CoreContext {
             .exhaustive();
     }
     findDefinition(args) {
-        return (0, ts_pattern_1.match)(this.phase)
+        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`);
@@ -109,7 +189,7 @@ class CoreContext {
             .exhaustive();
     }
     render(options) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, () => {
             throw new Error(`Cannot render during generate phase`);
         })
@@ -120,7 +200,7 @@ class CoreContext {
             .exhaustive();
     }
     addFile(normalisedPath) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
             return context.addFile(normalisedPath);
         })
@@ -133,7 +213,7 @@ class CoreContext {
             .exhaustive();
     }
     getOperationBaseSettings(args) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
             return context.getOperationBaseSettings(args);
         })
@@ -146,7 +226,7 @@ class CoreContext {
             .exhaustive();
     }
     insert(args) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
             return context.insert({ ...args, coreContext: this });
         })
@@ -159,7 +239,7 @@ class CoreContext {
             .exhaustive();
     }
     getModelBaseSettings(args) {
-        return (0, ts_pattern_1.match)(this.phase)
+        return (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
             .with({ type: 'generate' }, ({ context }) => {
             return context.getModelBaseSettings(args);
         })
@@ -171,8 +251,11 @@ class CoreContext {
         })
             .exhaustive();
     }
+    get results() {
+        return __classPrivateFieldGet(this, _CoreContext_results, "f");
+    }
     get files() {
-        return (0, ts_pattern_1.match)(this.phase)
+        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`);
@@ -181,7 +264,7 @@ class CoreContext {
             .exhaustive();
     }
     get renderDependencies() {
-        return (0, ts_pattern_1.match)(this.phase)
+        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`);
@@ -190,7 +273,7 @@ class CoreContext {
             .exhaustive();
     }
     get packageDependencies() {
-        return (0, ts_pattern_1.match)(this.phase)
+        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`);
@@ -199,7 +282,7 @@ class CoreContext {
             .exhaustive();
     }
     get schemaModel() {
-        return (0, ts_pattern_1.match)(this.phase)
+        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`);
@@ -210,7 +293,7 @@ class CoreContext {
             .exhaustive();
     }
     get generatorsMap() {
-        return (0, ts_pattern_1.match)(this.phase)
+        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`);
@@ -221,7 +304,7 @@ class CoreContext {
             .exhaustive();
     }
     get parsedDocument() {
-        return (0, ts_pattern_1.match)(this.phase)
+        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`);
@@ -232,7 +315,7 @@ class CoreContext {
             .exhaustive();
     }
     get settings() {
-        return (0, ts_pattern_1.match)(this.phase)
+        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`);
@@ -244,3 +327,26 @@ class CoreContext {
     }
 }
 exports.CoreContext = CoreContext;
+_CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap();
+const applyResult = ({ current, incoming }) => {
+    return (current === undefined ||
+        (current === 'success' && incoming !== 'success') ||
+        (current === 'warn' && incoming === 'error'));
+};
+function jsonFormatter({ logRecord, context }) {
+    return JSON.stringify({
+        ...context.getLogFields(),
+        level: logRecord.levelName,
+        datetime: logRecord.datetime.getTime(),
+        message: logRecord.msg,
+        args: flattenArgs(logRecord.args)
+    });
+}
+function flattenArgs(args) {
+    if (args.length === 1) {
+        return args[0];
+    }
+    else if (args.length > 1) {
+        return args;
+    }
+}

package/script/context/GenerateContext.d.ts

@@ -8,6 +8,7 @@ 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';
@@ -64,7 +65,10 @@ export declare class GenerateContext {
     schemaModel: OasDocument;
     settings: ClientSettings | undefined;
     generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
+    currentLocation: OperationGeneratorKey | ModelGeneratorKey | undefined;
     constructor({ schemaModel, generatorsMap, settings }: ConstructorArgs);
+    setCurrentLocation(location: OperationGeneratorKey | ModelGeneratorKey): void;
+    getLogFields(): Record<string, 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> & {

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

@@ -44,6 +44,12 @@ class GenerateContext {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "currentLocation", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.generatorsMap = generatorsMap;
         this.files = new Map();
         this.renderDependencies = new Map();
@@ -51,6 +57,12 @@ class GenerateContext {
         this.schemaModel = schemaModel;
         this.settings = settings;
     }
+    setCurrentLocation(location) {
+        this.currentLocation = location;
+    }
+    getLogFields() {
+        return this.currentLocation ? (0, GeneratorKeys_js_1.fromGeneratorKey)(this.currentLocation) : {};
+    }
     getFile(filePath, { throwIfNotFound = false } = {}) {
         const normalisedPath = (0, mod_js_1.normalize)(filePath);
         const currentFile = this.files.get(normalisedPath);

package/script/context/RenderContext.d.ts

@@ -3,8 +3,9 @@ import type { AddGeneratorKeyArgs, FileContents, RenderDependencies, RenderOptio
 import type { ClientSettings } from '../types/Settings.js';
 import type { Definition } from '../dsl/Definition.js';
 import type { PickArgs } from './GenerateContext.js';
-import type { ManifestContent } from '../types/Manifest.js';
+import type { ManifestContent, Results } from '../types/Manifest.js';
 type ConstructorArgs = {
+    results: Results;
     files: Map<string, FileContents>;
     packageDependencies: Map<string, string>;
     prettier?: PrettierConfigType;
@@ -20,6 +21,7 @@ export type RenderResult = FilesRenderResult & {
     renderDependencies: Record<string, string[]>;
 };
 export declare class RenderContext {
+    #private;
     files: Map<string, FileContents>;
     renderDependencies: RenderDependencies;
     packageDependencies: Map<string, string>;
@@ -27,7 +29,7 @@ export declare class RenderContext {
     settings: ClientSettings | undefined;
     currentDestinationPath: string | 'PRE_RENDER' | 'POST_RENDER';
     pinnableGenerators: string[];
-    constructor({ files, packageDependencies, prettier, settings, renderDependencies, pinnableGenerators }: ConstructorArgs);
+    constructor({ results, files, packageDependencies, prettier, settings, renderDependencies, pinnableGenerators }: ConstructorArgs);
     toPackageJson(): string;
     render({ packageJson, startTime }: RenderOptions): RenderResult;
     private collate;

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

@@ -1 +1 @@
-{"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGpE,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAG3D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAChC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,kBAAkB,EAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,QAAQ,EAAE,eAAe,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,iBAAiB,GAAG;IAC7C,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;CAC7C,CAAA;AAED,qBAAa,aAAa;IACxB,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,OAAO,CAAC,QAAQ,CAAC,CAAoB;IACrC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,sBAAsB,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAAA;IAC7D,kBAAkB,EAAE,MAAM,EAAE,CAAA;gBAChB,EACV,KAAK,EACL,mBAAmB,EACnB,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,kBAAkB,EACnB,EAAE,eAAe;IAUlB,aAAa,IAAI,MAAM;IAQvB,MAAM,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,aAAa,GAAG,YAAY;IAoC/D,OAAO,CAAC,OAAO;IA2Df,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY;IAavC,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,mBAAmB;IAarD,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
+{"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGpE,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAGpE,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAChC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,kBAAkB,EAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,QAAQ,EAAE,eAAe,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,iBAAiB,GAAG;IAC7C,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;CAC7C,CAAA;AAED,qBAAa,aAAa;;IAExB,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,OAAO,CAAC,QAAQ,CAAC,CAAoB;IACrC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,sBAAsB,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAAA;IAC7D,kBAAkB,EAAE,MAAM,EAAE,CAAA;gBAChB,EACV,OAAO,EACP,KAAK,EACL,mBAAmB,EACnB,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,kBAAkB,EACnB,EAAE,eAAe;IAWlB,aAAa,IAAI,MAAM;IAQvB,MAAM,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,aAAa,GAAG,YAAY;IAoC/D,OAAO,CAAC,OAAO;IA4Df,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY;IAavC,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,mBAAmB;IAarD,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}

package/script/context/RenderContext.js

@@ -22,9 +22,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _RenderContext_results;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderContext = void 0;
 const Sentry = __importStar(require("@sentry/deno"));
@@ -33,7 +45,8 @@ const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
 const mod_js_1 = require("../deps/jsr.io/@std/path/1.0.0/mod.js");
 const toResolvedArtifactPath_js_1 = require("../helpers/toResolvedArtifactPath.js");
 class RenderContext {
-    constructor({ files, packageDependencies, prettier, settings, renderDependencies, pinnableGenerators }) {
+    constructor({ results, files, packageDependencies, prettier, settings, renderDependencies, pinnableGenerators }) {
+        _RenderContext_results.set(this, void 0);
         Object.defineProperty(this, "files", {
             enumerable: true,
             configurable: true,
@@ -76,6 +89,7 @@ class RenderContext {
             writable: true,
             value: void 0
         });
+        __classPrivateFieldSet(this, _RenderContext_results, results, "f");
         this.currentDestinationPath = 'PRE_RENDER';
         this.renderDependencies = renderDependencies;
         this.files = files;
@@ -165,6 +179,7 @@ class RenderContext {
             manifest: {
                 createdAt: new Date().toISOString(),
                 files: {},
+                results: __classPrivateFieldGet(this, _RenderContext_results, "f"),
                 pinnable: {}
             }
         });
@@ -186,6 +201,7 @@ class RenderContext {
     }
 }
 exports.RenderContext = RenderContext;
+_RenderContext_results = new WeakMap();
 const renderFile = ({ file, destinationPath, basePath }) => {
     const imports = Array.from(file.imports.entries()).map(([module, importItems]) => new Import_js_1.Import({ module, importNames: Array.from(importItems) }));
     const definitions = Array.from(file.definitions.values());