@skmtc/core 0.0.296 → 0.0.297

package/esm/oas/operation/Operation.d.ts

@@ -29,7 +29,7 @@ type ToOperationV3Args = {
     context: CoreContext;
     skipped: Record<string, unknown>;
 };
-/** Operation represents a resource path and a method that can be executed against it */
+/** Operation represents a resource path and a method that can be enacted against it */
 export declare class OasOperation extends OasBase {
     #private;
     oasType: 'operation';

package/esm/oas/operation/Operation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Operation.d.ts","sourceRoot":"","sources":["../../../src/oas/operation/Operation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Operation.d.ts","sourceRoot":"","sources":["../../../src/oas/operation/Operation.ts"],"names":[],"mappings":"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"}

package/esm/oas/operation/Operation.js

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _OasOperation_fields;
 import { OasBase } from '../../dsl/OasBase.js';
 import { OasObject } from '../object/Object.js';
-/** Operation represents a resource path and a method that can be executed against it */
+/** Operation represents a resource path and a method that can be enacted against it */
 export class OasOperation extends OasBase {
     constructor({ fields, trail, skipped, context }) {
         super({ trail, skipped, context });

package/esm/server/createServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../../src/server/createServer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAK3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAmB/D,eAAO,MAAM,YAAY,eACX,CAAC,kBAAkB,GAAG,cAAc,CAAC,EAAE,KAClD,IAiGF,CAAA"}
+{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../../src/server/createServer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAK3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAiB/D,eAAO,MAAM,YAAY,eACX,CAAC,kBAAkB,GAAG,cAAc,CAAC,EAAE,KAClD,IAuGF,CAAA"}

package/esm/server/createServer.js

@@ -3,10 +3,8 @@ import { Hono } from 'hono';
 import { match } from 'ts-pattern';
 import { z } from 'zod';
 import { clientSettings as settingsSchema } from '../types/Settings.js';
-import { generate, parseSchema } from '../generate/generate.js';
-import { ParseContext } from '../context/ParseContext.js';
+import { generate } from '../generate/generate.js';
 import { CoreContext } from '../context/CoreContext.js';
-import { oasToSkmtc } from '../parse/parse.js';
 const postSettingsBody = z.object({
     schema: z.string(),
     clientSettings: settingsSchema.optional()
@@ -26,7 +24,7 @@ export const createServer = (generators) => {
             return Sentry.startSpan({ name: 'Generate' }, () => {
                 const generatorsMap = Object.fromEntries(generators.map(generator => [generator.id, generator]));
                 const { traceId, spanId } = span.spanContext();
-                return generate({
+                const { artifacts, manifest, renderDependencies } = generate({
                     traceId,
                     spanId,
                     startAt,
@@ -35,6 +33,7 @@ export const createServer = (generators) => {
                     settings: clientSettings,
                     generatorsMap
                 });
+                return { artifacts, manifest, renderDependencies };
             });
         });
         return c.json(result);
@@ -43,10 +42,13 @@ export const createServer = (generators) => {
         return Sentry.startSpan({ name: 'GET /generators' }, () => c.json({ generators }));
     });
     app.post('/settings', async (c) => {
-        return await Sentry.startSpan({ name: 'POST /settings' }, async () => {
+        return await Sentry.startSpan({ name: 'POST /settings' }, async (span) => {
             const body = await c.req.json();
             const { clientSettings } = postSettingsBody.parse(body);
-            const oasDocument = await toOasDocument(body.schema);
+            const oasDocument = toOasDocument({
+                schema: body.schema,
+                spanId: span.spanContext().spanId
+            });
             const out = generators.map(generator => {
                 const generatorSettings = clientSettings?.generators?.find(({ id }) => id === generator.id);
                 const generatorType = generator.type;
@@ -101,13 +103,10 @@ const toOperations = ({ generator, oasDocument, operationsSettings }) => {
         return acc;
     }, {});
 };
-const toOasDocument = ({ schema, traceId, spanId }) => {
-    const parsedDocument = parseSchema(schema);
-    const parseContext = new ParseContext({ parsedDocument });
+const toOasDocument = ({ schema, spanId }) => {
     const context = new CoreContext({
-        phase: { type: 'parse', context: parseContext },
-        traceId,
-        spanId
+        spanId,
+        schema
     });
-    return oasToSkmtc(context);
+    return context.parse();
 };

package/esm/types/Manifest.d.ts

@@ -15,17 +15,17 @@ export declare const manifestEntry: z.ZodObject<{
     generatorKeys: z.ZodArray<z.ZodEffects<z.ZodString, GeneratorKey, string>, "many">;
     destinationPath: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    destinationPath: string;
     numberOfLines: number;
     numberOfCharacters: number;
     hash: string;
     generatorKeys: GeneratorKey[];
-}, {
     destinationPath: string;
+}, {
     numberOfLines: number;
     numberOfCharacters: number;
     hash: string;
     generatorKeys: string[];
+    destinationPath: string;
 }>;
 export type SuccessWarningError = 'success' | 'warning' | 'error';
 export type WarningError = 'warning' | 'error';
@@ -37,19 +37,7 @@ export type Results = {
     generate: Record<OperationGeneratorKey | ModelGeneratorKey, SuccessWarningError>;
     render: SuccessWarningError;
 };
-export declare const results: z.ZodObject<{
-    parse: z.ZodEnum<["success", "warning", "error"]>;
-    generate: z.ZodRecord<z.ZodString, z.ZodEnum<["success", "warning", "error"]>>;
-    render: z.ZodEnum<["success", "warning", "error"]>;
-}, "strip", z.ZodTypeAny, {
-    parse: "success" | "warning" | "error";
-    generate: Record<string, "success" | "warning" | "error">;
-    render: "success" | "warning" | "error";
-}, {
-    parse: "success" | "warning" | "error";
-    generate: Record<string, "success" | "warning" | "error">;
-    render: "success" | "warning" | "error";
-}>;
+export declare const results: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodEnum<["success", "warning", "error"]>, z.ZodUndefined]>>;
 export declare const phaseResults: z.ZodObject<{
     parseResult: z.ZodEnum<["success", "warning", "error"]>;
     generateResult: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodEnum<["success", "warning", "error"]>>>;
@@ -70,7 +58,7 @@ export type ManifestContent = {
     region?: string;
     files: Record<string, ManifestEntry>;
     pinnable: Partial<Record<GeneratorKey, string>>;
-    results: Results;
+    results: Record<string, SuccessWarningError | undefined>;
     startAt: number;
     endAt: number;
 };
@@ -86,32 +74,20 @@ export declare const manifestContent: z.ZodObject<{
         generatorKeys: z.ZodArray<z.ZodEffects<z.ZodString, GeneratorKey, string>, "many">;
         destinationPath: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        destinationPath: string;
         numberOfLines: number;
         numberOfCharacters: number;
         hash: string;
         generatorKeys: GeneratorKey[];
-    }, {
         destinationPath: string;
+    }, {
         numberOfLines: number;
         numberOfCharacters: number;
         hash: string;
         generatorKeys: string[];
+        destinationPath: string;
     }>>;
     pinnable: z.ZodRecord<z.ZodEffects<z.ZodString, GeneratorKey, string>, z.ZodString>;
-    results: z.ZodObject<{
-        parse: z.ZodEnum<["success", "warning", "error"]>;
-        generate: z.ZodRecord<z.ZodString, z.ZodEnum<["success", "warning", "error"]>>;
-        render: z.ZodEnum<["success", "warning", "error"]>;
-    }, "strip", z.ZodTypeAny, {
-        parse: "success" | "warning" | "error";
-        generate: Record<string, "success" | "warning" | "error">;
-        render: "success" | "warning" | "error";
-    }, {
-        parse: "success" | "warning" | "error";
-        generate: Record<string, "success" | "warning" | "error">;
-        render: "success" | "warning" | "error";
-    }>;
+    results: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodEnum<["success", "warning", "error"]>, z.ZodUndefined]>>;
     startAt: z.ZodNumber;
     endAt: z.ZodNumber;
 }, "strip", z.ZodTypeAny, {
@@ -119,18 +95,14 @@ export declare const manifestContent: z.ZodObject<{
     traceId: string;
     spanId: string;
     files: Record<string, {
-        destinationPath: string;
         numberOfLines: number;
         numberOfCharacters: number;
         hash: string;
         generatorKeys: GeneratorKey[];
+        destinationPath: string;
     }>;
     pinnable: Partial<Record<GeneratorKey, string>>;
-    results: {
-        parse: "success" | "warning" | "error";
-        generate: Record<string, "success" | "warning" | "error">;
-        render: "success" | "warning" | "error";
-    };
+    results: Record<string, "success" | "warning" | "error" | undefined>;
     startAt: number;
     endAt: number;
     region?: string | undefined;
@@ -139,18 +111,14 @@ export declare const manifestContent: z.ZodObject<{
     traceId: string;
     spanId: string;
     files: Record<string, {
-        destinationPath: string;
         numberOfLines: number;
         numberOfCharacters: number;
         hash: string;
         generatorKeys: string[];
+        destinationPath: string;
     }>;
     pinnable: Record<string, string>;
-    results: {
-        parse: "success" | "warning" | "error";
-        generate: Record<string, "success" | "warning" | "error">;
-        render: "success" | "warning" | "error";
-    };
+    results: Record<string, "success" | "warning" | "error" | undefined>;
     startAt: number;
     endAt: number;
     region?: string | undefined;

package/esm/types/Manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Manifest.d.ts","sourceRoot":"","sources":["../../src/types/Manifest.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;EAMxB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAA;AAEjE,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAA;AAE9C,eAAO,MAAM,mBAAmB,4CAA0C,CAAA;AAE1E,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAA;AAEhF,eAAO,MAAM,cAAc,gGAA0C,CAAA;AAErE,MAAM,MAAM,OAAO,GAAG;IACpB,KAAK,EAAE,mBAAmB,CAAA;IAC1B,QAAQ,EAAE,MAAM,CACd,qBAAqB,GAAG,iBAAiB,EACzC,mBAAmB,CACpB,CAAA;IACD,MAAM,EAAE,mBAAmB,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,OAAO;;;;;;;;;;;;EAIlB,CAAA;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;EAIvB,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IACpC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IAC/C,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU1B,CAAA"}
+{"version":3,"file":"Manifest.d.ts","sourceRoot":"","sources":["../../src/types/Manifest.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;EAMxB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAA;AAEjE,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,OAAO,CAAA;AAE9C,eAAO,MAAM,mBAAmB,4CAA0C,CAAA;AAE1E,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAA;AAEhF,eAAO,MAAM,cAAc,gGAA0C,CAAA;AAErE,MAAM,MAAM,OAAO,GAAG;IACpB,KAAK,EAAE,mBAAmB,CAAA;IAC1B,QAAQ,EAAE,MAAM,CACd,qBAAqB,GAAG,iBAAiB,EACzC,mBAAmB,CACpB,CAAA;IACD,MAAM,EAAE,mBAAmB,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,OAAO,oGAA0D,CAAA;AAE9E,eAAO,MAAM,YAAY;;;;;;;;;;;;EAIvB,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IACpC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAA;IAC/C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,SAAS,CAAC,CAAA;IACxD,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU1B,CAAA"}

package/esm/types/Manifest.js

@@ -10,11 +10,7 @@ export const manifestEntry = z.object({
 });
 export const successWarningError = z.enum(['success', 'warning', 'error']);
 export const generateResult = z.record(z.record(successWarningError));
-export const results = z.object({
-    parse: successWarningError,
-    generate: z.record(successWarningError),
-    render: successWarningError
-});
+export const results = z.record(z.union([successWarningError, z.undefined()]));
 export const phaseResults = z.object({
     parseResult: successWarningError,
     generateResult: generateResult,

package/package.json

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

package/script/context/CoreContext.d.ts

@@ -1,11 +1,7 @@
-import { GenerateContext } from './GenerateContext.js';
 import type { AddRenderDependencyArgs, GetModelSettingsArgs, GetOperationSettingsArgs, PickArgs, RegisterArgs, InsertReturn, InsertArgs } from './GenerateContext.js';
-import { RenderContext, type FilesRenderResult } from './RenderContext.js';
-import type { AddGeneratorKeyArgs, FileContents, RenderDependencies, RenderOptions } from './types.js';
-import type { ParseContext } from './ParseContext.js';
+import type { AddGeneratorKeyArgs, FileContents, RenderDependencies } from './types.js';
 import type { PrettierConfigType } from '../types/prettierConfig.js';
 import type { OasDocument } from '../oas/document/Document.js';
-import type { OpenAPIV3 } from 'openapi-types';
 import type { BaseSettings, ClientSettings } from '../types/Settings.js';
 import type { Definition } from '../dsl/Definition.js';
 import type { OperationGenerator } from '../dsl/OperationInsertable.js';
@@ -15,84 +11,61 @@ import type { OasSchema } from '../oas/schema/Schema.js';
 import type { OasRef } from '../oas/ref/Ref.js';
 import type { GenerationType } from '../types/GeneratedValue.js';
 import type { RefName } from '../types/RefName.js';
-import type { OperationGeneratorKey, ModelGeneratorKey } from '../types/GeneratorKeys.js';
-import type { Results, SuccessWarningError, WarningError } from '../types/Manifest.js';
+import type { SuccessWarningError } from '../types/Manifest.js';
 import * as log from '../deps/jsr.io/@std/log/0.224.6/mod.js';
-type SharedContext = {
-    type: 'parse';
-    context: ParseContext;
-} | {
-    type: 'generate';
-    context: GenerateContext;
-} | {
-    type: 'render';
-    context: RenderContext;
-};
-type GenerateArgs = {
-    schemaModel: OasDocument;
-    generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
-    settings: ClientSettings | undefined;
-};
+import { StackTrail } from './StackTrail.js';
 type CoreContextArgs = {
-    traceId: string;
     spanId: string;
-    phase: SharedContext;
-};
-type RenderArgs = {
-    renderDependencies: RenderDependencies;
-    packageDependencies: Map<string, string>;
-    prettier?: PrettierConfigType;
-    settings: ClientSettings | undefined;
-    pinnableGenerators: string[];
+    schema: string;
 };
 type CaptureResultArgs = {
-    phase: 'parse';
-    result: WarningError;
-} | {
-    phase: 'generate';
-    generatorKey: OperationGeneratorKey | ModelGeneratorKey;
+    stackTrail: string;
     result: SuccessWarningError;
-} | {
-    phase: 'render';
-    result: WarningError;
+};
+type TransformArgs = {
+    settings: ClientSettings | undefined;
+    generatorsMap: Record<string, OperationGenerator | ModelGenerator>;
+    prettier?: PrettierConfigType;
 };
 export declare class CoreContext {
     #private;
-    traceId: string;
-    spanId: string;
-    constructor({ phase, traceId, spanId }: CoreContextArgs);
-    get logger(): log.Logger;
-    setupGeneratePhase({ schemaModel, settings, generatorsMap }: GenerateArgs): void;
-    captureResult(args: CaptureResultArgs): void;
-    setupRenderPhase({ prettier, packageDependencies, settings, renderDependencies, pinnableGenerators }: RenderArgs): void;
+    logger: log.Logger;
+    constructor({ schema, spanId }: CoreContextArgs);
+    parse(): OasDocument;
+    transform({ settings, generatorsMap, prettier }: TransformArgs): {
+        results: Record<string, SuccessWarningError | undefined>;
+        files: Record<string, import("../types/Manifest.js").ManifestEntry>;
+        pinnable: Partial<Record<import("../mod.js").GeneratorKey, string>>;
+        renderDependencies: Record<string, string[]>;
+        artifacts: Record<string, string>;
+    };
+    captureResult({ stackTrail, result }: CaptureResultArgs): void;
+    captureCurrentResult(result: SuccessWarningError): void;
     get phaseType(): 'parse' | 'generate' | 'render';
-    setCurrentLocation(location: OperationGeneratorKey | ModelGeneratorKey): void;
-    getLogFields(): Record<string, string>;
+    appendStackTrailChunk(chunk: string | string[] | StackTrail): void;
+    removeStackTrailChunk(chunk: string | string[] | StackTrail): void;
     register({ destinationPath, ...args }: RegisterArgs): void;
     addGeneratorKey({ generatorKey }: AddGeneratorKeyArgs): void;
     resolveSchemaRefOnce(refName: RefName): OasSchema | OasRef<'schema'>;
     addRenderDependency(args: AddRenderDependencyArgs): void;
     getFile(filePath: string): FileContents;
     findDefinition(args: PickArgs): Definition<GeneratedValue> | undefined;
-    render(options: RenderOptions): FilesRenderResult;
     addFile(normalisedPath: string): FileContents;
     getOperationBaseSettings(args: GetOperationSettingsArgs): BaseSettings;
     insert<V extends GeneratedValue, T extends GenerationType>(args: InsertArgs<V, T>): InsertReturn<V, T>;
     getModelBaseSettings(args: GetModelSettingsArgs): BaseSettings;
-    get results(): Results;
     get files(): Map<string, FileContents>;
     get renderDependencies(): RenderDependencies;
     get packageDependencies(): Map<string, string>;
     get schemaModel(): OasDocument;
     get generatorsMap(): Record<string, OperationGenerator | ModelGenerator>;
-    get parsedDocument(): OpenAPIV3.Document;
     get settings(): ClientSettings | undefined;
 }
 export type JsonFormatterArgs = {
     logRecord: log.LogRecord;
-    context: CoreContext;
+    stackTrail: StackTrail;
 };
-export declare function skmtcFormatter({ logRecord, context }: JsonFormatterArgs): string;
-export declare function resultFormatter({ logRecord, context }: JsonFormatterArgs): string;
+export declare function skmtcFormatter({ logRecord, stackTrail }: JsonFormatterArgs): string;
+export declare function resultFormatter({ logRecord, stackTrail }: JsonFormatterArgs): string;
 export {};
 //# sourceMappingURL=CoreContext.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"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"}