veryfront 0.1.819 → 0.1.821
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/deno.js +1 -1
- package/esm/src/internal-agents/run-stream.d.ts.map +1 -1
- package/esm/src/internal-agents/run-stream.js +7 -0
- package/esm/src/platform/adapters/fs/veryfront/multi-project-adapter.d.ts +1 -1
- package/esm/src/platform/adapters/fs/veryfront/multi-project-adapter.d.ts.map +1 -1
- package/esm/src/platform/adapters/fs/veryfront/multi-project-adapter.js +9 -2
- package/esm/src/platform/adapters/fs/veryfront/request-context.d.ts +2 -0
- package/esm/src/platform/adapters/fs/veryfront/request-context.d.ts.map +1 -1
- package/esm/src/platform/adapters/fs/veryfront/request-context.js +7 -0
- package/esm/src/transforms/mdx/esm-module-loader/cache-format.d.ts +1 -1
- package/esm/src/transforms/mdx/esm-module-loader/cache-format.d.ts.map +1 -1
- package/esm/src/transforms/mdx/esm-module-loader/cache-format.js +6 -6
- package/esm/src/transforms/mdx/esm-module-loader/import-transformer.d.ts.map +1 -1
- package/esm/src/transforms/mdx/esm-module-loader/import-transformer.js +17 -14
- package/esm/src/utils/version-constant.d.ts +1 -1
- package/esm/src/utils/version-constant.js +1 -1
- package/package.json +1 -1
package/esm/deno.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-stream.d.ts","sourceRoot":"","sources":["../../../src/src/internal-agents/run-stream.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,KAAK,EACV,KAAK,YAAY,IAAI,OAAO,EAC5B,KAAK,aAAa,EAEnB,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,KAAK,EACV,+BAA+B,EAC/B,8BAA8B,EAC/B,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,EAAmB,KAAK,IAAI,EAAgB,MAAM,kBAAkB,CAAC;AAU5E,OAAO,EAA0B,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAkCxD,MAAM,WAAW,+BAA+B;IAC9C,cAAc,EAAE,sBAAsB,CAAC;IACvC,mBAAmB,CAAC,EAAE;QACpB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;IACF,cAAc,CAAC,EAAE,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;IACnE,8BAA8B,CAAC,EAAE,CAC/B,KAAK,EAAE,+BAA+B,KACnC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC7C,aAAa,CAAC,EAAE,CACd,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAClC;QACH,MAAM,EAAE,CACN,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,SAAS,CAAC,EAAE;YACV,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,IAAI,CAAC;SAC9C,EACD,aAAa,CAAC,EAAE,MAAM,EACtB,uBAAuB,CAAC,EAAE,MAAM,EAChC,WAAW,CAAC,EAAE,WAAW,KACtB,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;KAC1C,CAAC;CACH;AAoCD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,oBAAoB,EAC3B,cAAc,EAAE,sBAAsB,EACtC,2BAA2B,CAAC,EAAE,MAAM,EAAE,EACtC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC;;cAsFrD;AAwKD,wBAAsB,gCAAgC,CACpD,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,+BAA+B,GACpC,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"run-stream.d.ts","sourceRoot":"","sources":["../../../src/src/internal-agents/run-stream.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,KAAK,EACV,KAAK,YAAY,IAAI,OAAO,EAC5B,KAAK,aAAa,EAEnB,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,KAAK,EACV,+BAA+B,EAC/B,8BAA8B,EAC/B,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,EAAmB,KAAK,IAAI,EAAgB,MAAM,kBAAkB,CAAC;AAU5E,OAAO,EAA0B,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAkCxD,MAAM,WAAW,+BAA+B;IAC9C,cAAc,EAAE,sBAAsB,CAAC;IACvC,mBAAmB,CAAC,EAAE;QACpB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;IACF,cAAc,CAAC,EAAE,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;IACnE,8BAA8B,CAAC,EAAE,CAC/B,KAAK,EAAE,+BAA+B,KACnC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC7C,aAAa,CAAC,EAAE,CACd,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAClC;QACH,MAAM,EAAE,CACN,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,SAAS,CAAC,EAAE;YACV,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,IAAI,CAAC;SAC9C,EACD,aAAa,CAAC,EAAE,MAAM,EACtB,uBAAuB,CAAC,EAAE,MAAM,EAChC,WAAW,CAAC,EAAE,WAAW,KACtB,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;KAC1C,CAAC;CACH;AAoCD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,oBAAoB,EAC3B,cAAc,EAAE,sBAAsB,EACtC,2BAA2B,CAAC,EAAE,MAAM,EAAE,EACtC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC;;cAsFrD;AAwKD,wBAAsB,gCAAgC,CACpD,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,+BAA+B,GACpC,OAAO,CAAC,QAAQ,CAAC,CA8TnB"}
|
|
@@ -497,10 +497,17 @@ export async function createRuntimeAgentStreamResponse(input, agent, deps) {
|
|
|
497
497
|
clientAttached = false;
|
|
498
498
|
stopHeartbeat?.();
|
|
499
499
|
stopHeartbeat = undefined;
|
|
500
|
+
const status = deps.sessionManager.getRunStatus(input.runId);
|
|
501
|
+
const shouldCancelActiveRun = status !== null && status !== "waiting";
|
|
502
|
+
if (shouldCancelActiveRun) {
|
|
503
|
+
deps.sessionManager.cancelRun(input.runId);
|
|
504
|
+
}
|
|
500
505
|
logger.info("Internal agent runtime client detached", {
|
|
501
506
|
runId: input.runId,
|
|
502
507
|
threadId: input.threadId,
|
|
503
508
|
agentId: agent.id,
|
|
509
|
+
status,
|
|
510
|
+
cancelledActiveRun: shouldCancelActiveRun,
|
|
504
511
|
});
|
|
505
512
|
return Promise.resolve();
|
|
506
513
|
},
|
|
@@ -2,7 +2,7 @@ import type { DirectoryEntry, FSAdapter, FSAdapterConfig } from "./types.js";
|
|
|
2
2
|
import type { FileInfo, ResolveFileOptions } from "../../base.js";
|
|
3
3
|
import { ProxyFSAdapterManager } from "./proxy-manager.js";
|
|
4
4
|
import type { VeryfrontFSAdapter } from "./adapter.js";
|
|
5
|
-
export { getCurrentRequestContext, getRequestScopedFile, runWithRequestContext, setRequestScopedFile, wrapWithCurrentContext, } from "./request-context.js";
|
|
5
|
+
export { clearRequestScopedFileCache, getCurrentRequestContext, getRequestScopedFile, runWithRequestContext, setRequestScopedFile, wrapWithCurrentContext, } from "./request-context.js";
|
|
6
6
|
export type { RequestContext } from "./request-context.js";
|
|
7
7
|
export declare class MultiProjectFSAdapter implements FSAdapter {
|
|
8
8
|
private manager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-project-adapter.d.ts","sourceRoot":"","sources":["../../../../../../src/src/platform/adapters/fs/veryfront/multi-project-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"multi-project-adapter.d.ts","sourceRoot":"","sources":["../../../../../../src/src/platform/adapters/fs/veryfront/multi-project-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAOvD,OAAO,EACL,2BAA2B,EAC3B,wBAAwB,EACxB,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQ3D,qBAAa,qBAAsB,YAAW,SAAS;IACrD,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,cAAc,CAAC,CAAqB;gBAEhC,MAAM,EAAE,eAAe;IAanC,cAAc,CAAC,CAAC,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;QACR,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACjC,GACA,OAAO,CAAC,CAAC,CAAC;IA8Cb,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAQ3D,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;YAIxD,UAAU;IAgDxB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAIpD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKvC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK3C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKtC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAKrC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAKtD;;;OAGG;IACI,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC;IAOrD,WAAW,CACf,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKnB,qBAAqB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY3D,OAAO,IAAI,IAAI;IAOf,eAAe,IAAI,UAAU,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAI1D,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,GAAG,SAAS,CAAC;IAUvF,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUpE,iBAAiB,IAAI,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAoB9E;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,qBAAqB,CAExF"}
|
|
@@ -2,8 +2,8 @@ import { logger as baseLogger } from "../../../../utils/logger/logger.js";
|
|
|
2
2
|
import { INITIALIZATION_ERROR } from "../../../../errors/error-registry.js";
|
|
3
3
|
import { ProxyFSAdapterManager } from "./proxy-manager.js";
|
|
4
4
|
import { runWithCacheBatching } from "../../../../cache/request-cache-batcher.js";
|
|
5
|
-
import { asyncLocalStorage } from "./request-context.js";
|
|
6
|
-
export { getCurrentRequestContext, getRequestScopedFile, runWithRequestContext, setRequestScopedFile, wrapWithCurrentContext, } from "./request-context.js";
|
|
5
|
+
import { asyncLocalStorage, clearRequestScopedFileCache, } from "./request-context.js";
|
|
6
|
+
export { clearRequestScopedFileCache, getCurrentRequestContext, getRequestScopedFile, runWithRequestContext, setRequestScopedFile, wrapWithCurrentContext, } from "./request-context.js";
|
|
7
7
|
const logger = baseLogger.component("multi-project-fs-adapter");
|
|
8
8
|
const DEFAULT_MAX_ADAPTERS = 100;
|
|
9
9
|
const DEFAULT_CLEANUP_INTERVAL_MS = 5 * 60 * 1_000;
|
|
@@ -146,6 +146,13 @@ export class MultiProjectFSAdapter {
|
|
|
146
146
|
async refreshSourceSnapshot(reason) {
|
|
147
147
|
const adapter = await this.getAdapter();
|
|
148
148
|
await adapter.refreshSourceSnapshot(reason);
|
|
149
|
+
const cleared = clearRequestScopedFileCache();
|
|
150
|
+
if (cleared > 0) {
|
|
151
|
+
logger.debug("Cleared request-scoped file cache after source snapshot refresh", {
|
|
152
|
+
reason,
|
|
153
|
+
cleared,
|
|
154
|
+
});
|
|
155
|
+
}
|
|
149
156
|
}
|
|
150
157
|
dispose() {
|
|
151
158
|
this.manager.dispose();
|
|
@@ -31,6 +31,7 @@ export declare function getCurrentRequestContext(): RequestContext | null;
|
|
|
31
31
|
export declare function wrapWithCurrentContext<T extends (...args: never[]) => unknown>(fn: T): T;
|
|
32
32
|
export declare function getRequestScopedFile(cacheKey: string): string | undefined;
|
|
33
33
|
export declare function setRequestScopedFile(cacheKey: string, content: string): void;
|
|
34
|
+
export declare function clearRequestScopedFileCache(): number;
|
|
34
35
|
/**
|
|
35
36
|
* Run a function within a request context.
|
|
36
37
|
* Standalone version that doesn't require an adapter instance.
|
|
@@ -54,6 +55,7 @@ interface VfMultiProjectAdapterGlobal {
|
|
|
54
55
|
getCurrentRequestContext: () => RequestContext | null;
|
|
55
56
|
getRequestScopedFile: (cacheKey: string) => string | undefined;
|
|
56
57
|
setRequestScopedFile: (cacheKey: string, content: string) => void;
|
|
58
|
+
clearRequestScopedFileCache: () => number;
|
|
57
59
|
}
|
|
58
60
|
declare global {
|
|
59
61
|
var __vf_multi_project_adapter: VfMultiProjectAdapterGlobal | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-context.d.ts","sourceRoot":"","sources":["../../../../../../src/src/platform/adapters/fs/veryfront/request-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,iBAAiB,mCAA0C,CAAC;AAEzE,wBAAgB,wBAAwB,IAAI,cAAc,GAAG,IAAI,CAEhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAOxF;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEzE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAE5E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,EACD,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAaZ;AAED;;;;GAIG;AACH,UAAU,2BAA2B;IACnC,wBAAwB,EAAE,MAAM,cAAc,GAAG,IAAI,CAAC;IACtD,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC/D,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"request-context.d.ts","sourceRoot":"","sources":["../../../../../../src/src/platform/adapters/fs/veryfront/request-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,uEAAuE;IACvE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,iBAAiB,mCAA0C,CAAC;AAEzE,wBAAgB,wBAAwB,IAAI,cAAc,GAAG,IAAI,CAEhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAOxF;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEzE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAE5E;AAED,wBAAgB,2BAA2B,IAAI,MAAM,CAKpD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,EACD,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAaZ;AAED;;;;GAIG;AACH,UAAU,2BAA2B;IACnC,wBAAwB,EAAE,MAAM,cAAc,GAAG,IAAI,CAAC;IACtD,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC/D,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAClE,2BAA2B,EAAE,MAAM,MAAM,CAAC;CAC3C;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,0BAA0B,EAAE,2BAA2B,GAAG,SAAS,CAAC;CACzE"}
|
|
@@ -26,6 +26,12 @@ export function getRequestScopedFile(cacheKey) {
|
|
|
26
26
|
export function setRequestScopedFile(cacheKey, content) {
|
|
27
27
|
asyncLocalStorage.getStore()?.fileCache?.set(cacheKey, content);
|
|
28
28
|
}
|
|
29
|
+
export function clearRequestScopedFileCache() {
|
|
30
|
+
const fileCache = asyncLocalStorage.getStore()?.fileCache;
|
|
31
|
+
const cleared = fileCache?.size ?? 0;
|
|
32
|
+
fileCache?.clear();
|
|
33
|
+
return cleared;
|
|
34
|
+
}
|
|
29
35
|
/**
|
|
30
36
|
* Run a function within a request context.
|
|
31
37
|
* Standalone version that doesn't require an adapter instance.
|
|
@@ -50,4 +56,5 @@ globalThis.__vf_multi_project_adapter = {
|
|
|
50
56
|
getCurrentRequestContext,
|
|
51
57
|
getRequestScopedFile,
|
|
52
58
|
setRequestScopedFile,
|
|
59
|
+
clearRequestScopedFileCache,
|
|
53
60
|
};
|
|
@@ -6,6 +6,6 @@ export declare function buildMdxEsmTransformCacheKey(projectId: string, contentS
|
|
|
6
6
|
export declare function buildMdxEsmPathCacheKey(normalizedPath: string, reactVersion?: string): string;
|
|
7
7
|
export declare function buildMdxEsmModuleFileName(contentHash: string): string;
|
|
8
8
|
export declare function buildMdxEsmModuleRecoveryCacheKey(projectId: string, contentSourceId: string, fileName: string): string;
|
|
9
|
-
export declare function buildMdxJsxCacheFileName(filePath: string): string;
|
|
9
|
+
export declare function buildMdxJsxCacheFileName(filePath: string, sourceCode: string): string;
|
|
10
10
|
export declare function buildFrameworkVfModuleCacheFileName(pathHash: string, envKey: string, contentHash: string): string;
|
|
11
11
|
//# sourceMappingURL=cache-format.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-format.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/cache-format.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cache-format.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/cache-format.ts"],"names":[],"mappings":"AA8IA,eAAO,MAAM,mCAAmC,QAA8B,CAAC;AAC/E,eAAO,MAAM,mCAAmC,QAA8B,CAAC;AAE/E,eAAO,MAAM,uBAAuB,QAGnC,CAAC;AAEF,eAAO,MAAM,mCAAmC,QAG/C,CAAC;AAEF,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,MAAM,CASR;AAED,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,MAAM,EACtB,YAAY,SAAwB,GACnC,MAAM,CAER;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAErE;AAED,wBAAgB,iCAAiC,CAC/C,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,MAAM,CAOR;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAErF;AAED,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,CAOR"}
|
|
@@ -34,8 +34,8 @@ function formatMdxEsmModuleFileName(namespace, contentHash) {
|
|
|
34
34
|
function formatMdxEsmModuleRecoveryCacheKey(namespace, projectId, contentSourceId, fileName) {
|
|
35
35
|
return `${namespace}:${projectId}:${contentSourceId}:${fileName}:vfmod`;
|
|
36
36
|
}
|
|
37
|
-
function formatMdxJsxCacheFileName(namespace, filePath) {
|
|
38
|
-
return `jsx-${namespace}-${hashString(filePath)}.mjs`;
|
|
37
|
+
function formatMdxJsxCacheFileName(namespace, filePath, sourceCode) {
|
|
38
|
+
return `jsx-${namespace}-${hashString(`${filePath}\0${sourceCode}`)}.mjs`;
|
|
39
39
|
}
|
|
40
40
|
function formatFrameworkVfModuleCacheFileName(namespace, pathHash, envKey, contentHash) {
|
|
41
41
|
return `vfmod-${namespace}-${pathHash}-${envKey}-${contentHash}.mjs`;
|
|
@@ -46,13 +46,13 @@ function buildMdxEsmCacheSchemaSample() {
|
|
|
46
46
|
pathKey: formatMdxEsmPathCacheKey(CACHE_NAMESPACE_SENTINEL, REACT_DEFAULT_VERSION, "_vf_modules/pages/index.js"),
|
|
47
47
|
moduleFile: formatMdxEsmModuleFileName(CACHE_NAMESPACE_SENTINEL, "deadbeef"),
|
|
48
48
|
moduleRecoveryKey: formatMdxEsmModuleRecoveryCacheKey(CACHE_NAMESPACE_SENTINEL, "__vf_project__", "preview-main", formatMdxEsmModuleFileName(CACHE_NAMESPACE_SENTINEL, "deadbeef")),
|
|
49
|
-
jsxFile: formatMdxJsxCacheFileName(CACHE_NAMESPACE_SENTINEL, "/tmp/project/Button.tsx"),
|
|
49
|
+
jsxFile: formatMdxJsxCacheFileName(CACHE_NAMESPACE_SENTINEL, "/tmp/project/Button.tsx", "export default function Button() {}"),
|
|
50
50
|
unresolvedVfModulesPattern: UNRESOLVED_VF_MODULES_PATTERN.source,
|
|
51
51
|
allFileUrlPattern: ALL_FILE_URL_PATTERN_SOURCE,
|
|
52
52
|
mjsFileUrlPattern: MJS_FILE_URL_PATTERN_SOURCE,
|
|
53
53
|
sourceHashing: [
|
|
54
54
|
hashString("_vf_modules/pages/index.jsexport default 1;"),
|
|
55
|
-
hashString("/tmp/project/Button.tsx"),
|
|
55
|
+
hashString("/tmp/project/Button.tsx\0export default function Button() {}"),
|
|
56
56
|
],
|
|
57
57
|
publicRuntimeAliases: buildPublicRuntimeAliasSchema({
|
|
58
58
|
"veryfront/head": "./src/react/runtime/core.ts",
|
|
@@ -88,8 +88,8 @@ export function buildMdxEsmModuleFileName(contentHash) {
|
|
|
88
88
|
export function buildMdxEsmModuleRecoveryCacheKey(projectId, contentSourceId, fileName) {
|
|
89
89
|
return formatMdxEsmModuleRecoveryCacheKey(MDX_ESM_CACHE_NAMESPACE, projectId, contentSourceId, fileName);
|
|
90
90
|
}
|
|
91
|
-
export function buildMdxJsxCacheFileName(filePath) {
|
|
92
|
-
return formatMdxJsxCacheFileName(MDX_ESM_CACHE_NAMESPACE, filePath);
|
|
91
|
+
export function buildMdxJsxCacheFileName(filePath, sourceCode) {
|
|
92
|
+
return formatMdxJsxCacheFileName(MDX_ESM_CACHE_NAMESPACE, filePath, sourceCode);
|
|
93
93
|
}
|
|
94
94
|
export function buildFrameworkVfModuleCacheFileName(pathHash, envKey, contentHash) {
|
|
95
95
|
return formatFrameworkVfModuleCacheFileName(FRAMEWORK_VF_MODULE_CACHE_NAMESPACE, pathHash, envKey, contentHash);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/import-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAe5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK9E;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,CAIjF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/import-transformer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAe5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK9E;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,CAIjF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAAC,EACpC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA6HjB"}
|
|
@@ -92,7 +92,22 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
|
|
|
92
92
|
logger.debug(`${LOG_PREFIX_MDX_LOADER} Transforming ${importsToProcess.length} JSX imports in parallel`);
|
|
93
93
|
const transformResults = await Promise.all(importsToProcess.map(async ({ fullMatch, importClause, filePath, ext }) => {
|
|
94
94
|
try {
|
|
95
|
-
const
|
|
95
|
+
const isFrameworkFile = filePath.startsWith(FRAMEWORK_ROOT);
|
|
96
|
+
let jsxCode;
|
|
97
|
+
if (isFrameworkFile) {
|
|
98
|
+
jsxCode = await getLocalFs().readTextFile(filePath);
|
|
99
|
+
}
|
|
100
|
+
else if (adapter) {
|
|
101
|
+
jsxCode = await adapter.fs.readFile(filePath);
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
logger.warn(`${LOG_PREFIX_MDX_LOADER} No adapter available to read JSX file: ${filePath}`);
|
|
105
|
+
return null;
|
|
106
|
+
}
|
|
107
|
+
const sourceCode = typeof jsxCode === "string"
|
|
108
|
+
? jsxCode
|
|
109
|
+
: new TextDecoder().decode(jsxCode);
|
|
110
|
+
const transformedFileName = buildMdxJsxCacheFileName(filePath, sourceCode);
|
|
96
111
|
const transformedPath = join(esmCacheDir, transformedFileName);
|
|
97
112
|
try {
|
|
98
113
|
const stat = await getLocalFs().stat(transformedPath);
|
|
@@ -110,18 +125,6 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
|
|
|
110
125
|
catch (_) {
|
|
111
126
|
/* expected: cached JSX module may not exist yet */
|
|
112
127
|
}
|
|
113
|
-
const isFrameworkFile = filePath.startsWith(FRAMEWORK_ROOT);
|
|
114
|
-
let jsxCode;
|
|
115
|
-
if (isFrameworkFile) {
|
|
116
|
-
jsxCode = await getLocalFs().readTextFile(filePath);
|
|
117
|
-
}
|
|
118
|
-
else if (adapter) {
|
|
119
|
-
jsxCode = await adapter.fs.readFile(filePath);
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
logger.warn(`${LOG_PREFIX_MDX_LOADER} No adapter available to read JSX file: ${filePath}`);
|
|
123
|
-
return null;
|
|
124
|
-
}
|
|
125
128
|
const loaderMap = {
|
|
126
129
|
tsx: "tsx",
|
|
127
130
|
ts: "ts",
|
|
@@ -129,7 +132,7 @@ export async function transformJsxImports(code, adapter, esmCacheDir) {
|
|
|
129
132
|
js: "js",
|
|
130
133
|
};
|
|
131
134
|
const loader = loaderMap[ext] ?? "tsx";
|
|
132
|
-
const result = await transform(
|
|
135
|
+
const result = await transform(sourceCode, {
|
|
133
136
|
loader,
|
|
134
137
|
jsx: "transform",
|
|
135
138
|
jsxFactory: ESBUILD_JSX_FACTORY,
|