Skip to content

fix: prevent stale extension bundle cache when source has bare specifiers #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stack72 merged 1 commit into from
Mar 26, 2026
Merged

fix: prevent stale extension bundle cache when source has bare specifiers #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/domain/datastore/user_datastore_loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
installZodGlobal,
rewriteZodImports,
sanitizeDataUrlError,
sourceHasBareSpecifiers,
uint8ArrayToBase64,
} from "../models/bundle.ts";
import { resolveLocalImports } from "../models/local_import_resolver.ts";
Expand Down Expand Up @@ -233,33 +232,31 @@ export class UserDatastoreLoader {
}
}
} catch {
if (bundleExists) {
logger
.debug`Using cached datastore bundle for ${relativePath} (freshness check failed — missing dependency)`;
return await Deno.readTextFile(bundlePath);
}
// Freshness check failed (e.g. missing dependency file).
// Fall through to attempt a rebundle rather than using a
// potentially stale cache.
}

// If the source uses bare specifiers (e.g., from "zod" instead of
// from "npm:zod@4") and a cached bundle exists, use it — re-bundling
// would fail without a deno.json import map to resolve the specifiers.
if (bundleExists) {
const source = await Deno.readTextFile(absolutePath);
if (sourceHasBareSpecifiers(source)) {
// Try to rebundle from source. If bundling fails (e.g. bare specifiers
// without a deno.json import map) and a cached bundle exists, fall back
// to the cache. The old bundle file is untouched on failure since
// bundleExtension returns the JS string in memory before we write.
try {
const js = await bundleExtension(absolutePath, denoPath);
const bundleBoundary = join(this.repoDir, SWAMP_DATA_DIR);
await assertSafePath(bundlePath, bundleBoundary);
await Deno.mkdir(dirname(bundlePath), { recursive: true });
await Deno.writeTextFile(bundlePath, js);
logger.debug`Wrote datastore bundle cache: ${bundlePath}`;
return js;
} catch (bundleError) {
if (bundleExists) {
logger
.debug`Using cached datastore bundle for ${relativePath} (source has bare specifiers)`;
.warn`Rebundle failed for ${relativePath}, using cached bundle: ${bundleError}`;
return await Deno.readTextFile(bundlePath);
}
throw bundleError;
}

// Bundle and write to cache
const js = await bundleExtension(absolutePath, denoPath);
const bundleBoundary = join(this.repoDir, SWAMP_DATA_DIR);
await assertSafePath(bundlePath, bundleBoundary);
await Deno.mkdir(dirname(bundlePath), { recursive: true });
await Deno.writeTextFile(bundlePath, js);
logger.debug`Wrote datastore bundle cache: ${bundlePath}`;
return js;
}

// No repo dir — just bundle without caching
Expand Down
41 changes: 19 additions & 22 deletions src/domain/drivers/user_driver_loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
installZodGlobal,
rewriteZodImports,
sanitizeDataUrlError,
sourceHasBareSpecifiers,
uint8ArrayToBase64,
} from "../models/bundle.ts";
import { resolveLocalImports } from "../models/local_import_resolver.ts";
Expand Down Expand Up @@ -232,33 +231,31 @@ export class UserDriverLoader {
}
}
} catch {
if (bundleExists) {
logger
.debug`Using cached driver bundle for ${relativePath} (freshness check failed — missing dependency)`;
return await Deno.readTextFile(bundlePath);
}
// Freshness check failed (e.g. missing dependency file).
// Fall through to attempt a rebundle rather than using a
// potentially stale cache.
}

// If the source uses bare specifiers (e.g., from "zod" instead of
// from "npm:zod@4") and a cached bundle exists, use it — re-bundling
// would fail without a deno.json import map to resolve the specifiers.
if (bundleExists) {
const source = await Deno.readTextFile(absolutePath);
if (sourceHasBareSpecifiers(source)) {
// Try to rebundle from source. If bundling fails (e.g. bare specifiers
// without a deno.json import map) and a cached bundle exists, fall back
// to the cache. The old bundle file is untouched on failure since
// bundleExtension returns the JS string in memory before we write.
try {
const js = await bundleExtension(absolutePath, denoPath);
const bundleBoundary = join(this.repoDir, SWAMP_DATA_DIR);
await assertSafePath(bundlePath, bundleBoundary);
await Deno.mkdir(dirname(bundlePath), { recursive: true });
await Deno.writeTextFile(bundlePath, js);
logger.debug`Wrote driver bundle cache: ${bundlePath}`;
return js;
} catch (bundleError) {
if (bundleExists) {
logger
.debug`Using cached driver bundle for ${relativePath} (source has bare specifiers)`;
.warn`Rebundle failed for ${relativePath}, using cached bundle: ${bundleError}`;
return await Deno.readTextFile(bundlePath);
}
throw bundleError;
}

// Bundle and write to cache
const js = await bundleExtension(absolutePath, denoPath);
const bundleBoundary = join(this.repoDir, SWAMP_DATA_DIR);
await assertSafePath(bundlePath, bundleBoundary);
await Deno.mkdir(dirname(bundlePath), { recursive: true });
await Deno.writeTextFile(bundlePath, js);
logger.debug`Wrote driver bundle cache: ${bundlePath}`;
return js;
}

// No repo dir — just bundle without caching
Expand Down
47 changes: 20 additions & 27 deletions src/domain/models/user_model_loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
installZodGlobal,
rewriteZodImports,
sanitizeDataUrlError,
sourceHasBareSpecifiers,
uint8ArrayToBase64,
} from "./bundle.ts";
import { resolveLocalImports } from "./local_import_resolver.ts";
Expand Down Expand Up @@ -428,10 +427,7 @@ export class UserModelLoader {
);

// Check mtime-based cache against all local dependencies.
// If the bundle exists but freshness cannot be determined (e.g. a
// dependency file is missing because the extension was pushed with an
// older swamp that had a single-line import regex), fall back to the
// cached bundle rather than attempting a re-bundle that will also fail.
// If the bundle is newer than all source files, use it directly.
let bundleExists = false;
try {
const bundleStat = await Deno.stat(bundlePath);
Expand All @@ -458,34 +454,31 @@ export class UserModelLoader {
}
}
} catch {
if (bundleExists) {
logger
.debug`Using cached bundle for ${relativePath} (freshness check failed — missing dependency)`;
return await Deno.readTextFile(bundlePath);
}
// Freshness check failed (e.g. missing dependency file).
// Fall through to attempt a rebundle rather than using a
// potentially stale cache.
}

// If the source uses bare specifiers (e.g., from "zod" instead of
// from "npm:zod@4") and a cached bundle exists, use it — re-bundling
// would fail without a deno.json import map to resolve the specifiers.
// This handles pulled extensions that were built with a deno.json project.
if (bundleExists) {
const source = await Deno.readTextFile(absolutePath);
if (sourceHasBareSpecifiers(source)) {
// Try to rebundle from source. If bundling fails (e.g. bare specifiers
// without a deno.json import map) and a cached bundle exists, fall back
// to the cache. The old bundle file is untouched on failure since
// bundleExtension returns the JS string in memory before we write.
try {
const js = await bundleExtension(absolutePath, denoPath);
const bundleBoundary = join(this.repoDir, SWAMP_DATA_DIR);
await assertSafePath(bundlePath, bundleBoundary);
await Deno.mkdir(dirname(bundlePath), { recursive: true });
await Deno.writeTextFile(bundlePath, js);
logger.debug`Wrote bundle cache: ${bundlePath}`;
return js;
} catch (bundleError) {
if (bundleExists) {
logger
.debug`Using cached bundle for ${relativePath} (source has bare specifiers)`;
.warn`Rebundle failed for ${relativePath}, using cached bundle: ${bundleError}`;
return await Deno.readTextFile(bundlePath);
}
throw bundleError;
}

// Bundle and write to cache
const js = await bundleExtension(absolutePath, denoPath);
const bundleBoundary = join(this.repoDir, SWAMP_DATA_DIR);
await assertSafePath(bundlePath, bundleBoundary);
await Deno.mkdir(dirname(bundlePath), { recursive: true });
await Deno.writeTextFile(bundlePath, js);
logger.debug`Wrote bundle cache: ${bundlePath}`;
return js;
}

// No repo dir — just bundle without caching
Expand Down
41 changes: 19 additions & 22 deletions src/domain/vaults/user_vault_loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
installZodGlobal,
rewriteZodImports,
sanitizeDataUrlError,
sourceHasBareSpecifiers,
uint8ArrayToBase64,
} from "../models/bundle.ts";
import { resolveLocalImports } from "../models/local_import_resolver.ts";
Expand Down Expand Up @@ -239,33 +238,31 @@ export class UserVaultLoader {
}
}
} catch {
if (bundleExists) {
logger
.debug`Using cached vault bundle for ${relativePath} (freshness check failed — missing dependency)`;
return await Deno.readTextFile(bundlePath);
}
// Freshness check failed (e.g. missing dependency file).
// Fall through to attempt a rebundle rather than using a
// potentially stale cache.
}

// If the source uses bare specifiers (e.g., from "zod" instead of
// from "npm:zod@4") and a cached bundle exists, use it — re-bundling
// would fail without a deno.json import map to resolve the specifiers.
if (bundleExists) {
const source = await Deno.readTextFile(absolutePath);
if (sourceHasBareSpecifiers(source)) {
// Try to rebundle from source. If bundling fails (e.g. bare specifiers
// without a deno.json import map) and a cached bundle exists, fall back
// to the cache. The old bundle file is untouched on failure since
// bundleExtension returns the JS string in memory before we write.
try {
const js = await bundleExtension(absolutePath, denoPath);
const bundleBoundary = join(this.repoDir, SWAMP_DATA_DIR);
await assertSafePath(bundlePath, bundleBoundary);
await Deno.mkdir(dirname(bundlePath), { recursive: true });
await Deno.writeTextFile(bundlePath, js);
logger.debug`Wrote vault bundle cache: ${bundlePath}`;
return js;
} catch (bundleError) {
if (bundleExists) {
logger
.debug`Using cached vault bundle for ${relativePath} (source has bare specifiers)`;
.warn`Rebundle failed for ${relativePath}, using cached bundle: ${bundleError}`;
return await Deno.readTextFile(bundlePath);
}
throw bundleError;
}

// Bundle and write to cache
const js = await bundleExtension(absolutePath, denoPath);
const bundleBoundary = join(this.repoDir, SWAMP_DATA_DIR);
await assertSafePath(bundlePath, bundleBoundary);
await Deno.mkdir(dirname(bundlePath), { recursive: true });
await Deno.writeTextFile(bundlePath, js);
logger.debug`Wrote vault bundle cache: ${bundlePath}`;
return js;
}

// No repo dir — just bundle without caching
Expand Down
Loading