babelfhir-ts 1.5.5 → 1.5.6

package/out/src/cli/installCommand.js

@@ -125,47 +125,53 @@ function npmInstall(packagePath) {
     });
 }
 /**
- * Bun caches extracted tgz content in `node_modules/.bun/<pkg>@<path-hash>/`.
- * The cache key is derived from the file *path*, not its content, so replacing a
- * tgz at the same path silently serves stale content — even with `--force`.
- * This function removes those cache entries so the next `bun add` re-extracts.
- * In monorepos the .bun cache lives at the workspace root, not in the app subdir,
- * so we walk up the directory tree to find it (same as detectPackageManager).
- * No-op when bun is not the package manager or no .bun cache dir is found.
+ * Bust stale bun cache entries for a local-tarball dependency.
+ *
+ * Bun caches extracted tgz content keyed by file *path*, not content hash.
+ * Replacing a tgz at the same path silently serves stale content — even with
+ * `--force`.  Two cache locations are relevant:
+ *
+ * 1. **node_modules/.bun/** (bun ≥ 1.1) — per-project extraction cache.
+ * 2. **node_modules/<packageName>/** — the already-installed copy.  When we run
+ *    `bun install` (bare, dep already in package.json) bun skips re-extraction
+ *    if the directory already exists, regardless of whether the underlying tgz
+ *    changed.
+ *
+ * We walk up the directory tree (monorepo-safe) to find both locations and
+ * remove matching entries so the next install re-extracts the fresh tarball.
+ *
+ * No-op when bun is not the package manager.
  */
 function clearBunCache(packageName) {
     const pm = detectPackageManager();
     if (!pm.cmd.includes('bun'))
         return;
-    // Walk up to find node_modules/.bun — in monorepos it's at the workspace root.
-    let bunCacheDir = null;
     let dir = process.cwd();
     while (true) {
-        const candidate = path.join(dir, 'node_modules', '.bun');
-        if (fs.existsSync(candidate)) {
-            bunCacheDir = candidate;
-            break;
+        const nodeModules = path.join(dir, 'node_modules');
+        // (1) Remove .bun/<pkg>@… extraction cache (bun ≥ 1.1)
+        const bunCacheDir = path.join(nodeModules, '.bun');
+        if (fs.existsSync(bunCacheDir)) {
+            const prefix = `${packageName}@`;
+            for (const entry of fs.readdirSync(bunCacheDir, { withFileTypes: true })) {
+                if (entry.isDirectory() && entry.name.startsWith(prefix)) {
+                    fs.rmSync(path.join(bunCacheDir, entry.name), { recursive: true, force: true });
+                }
+            }
+        }
+        // (2) Remove the already-installed node_modules/<pkg> directory.
+        // Without this, `bun install` (bare) sees the existing directory and
+        // skips re-extraction even though the tarball content has changed.
+        const installedDir = path.join(nodeModules, packageName);
+        if (fs.existsSync(installedDir)) {
+            fs.rmSync(installedDir, { recursive: true, force: true });
+            console.log(`Cleared stale node_modules/${packageName} for re-extraction`);
         }
         const parent = path.dirname(dir);
         if (parent === dir)
             break;
         dir = parent;
     }
-    if (!bunCacheDir)
-        return;
-    // Entries look like: <pkg>@<encoded-path>+<hash>
-    // The package name may contain dots/scopes — match by startsWith.
-    const prefix = `${packageName}@`;
-    let removed = 0;
-    for (const entry of fs.readdirSync(bunCacheDir, { withFileTypes: true })) {
-        if (entry.isDirectory() && entry.name.startsWith(prefix)) {
-            fs.rmSync(path.join(bunCacheDir, entry.name), { recursive: true, force: true });
-            removed++;
-        }
-    }
-    if (removed > 0) {
-        console.log(`Cleared ${removed} stale bun cache entr${removed === 1 ? 'y' : 'ies'} for ${packageName}`);
-    }
 }
 export async function handleInstallCommand(opts) {
     const { packageToInstall, registry, generationFlags, downloadPackage } = opts;

package/out/src/cli/updateCommand.js

@@ -405,7 +405,9 @@ function clearBunCacheForPackage(packageName) {
         return;
     let dir = process.cwd();
     while (true) {
-        const candidate = path.join(dir, 'node_modules', '.bun');
+        const nm = path.join(dir, 'node_modules');
+        // Remove .bun/<pkg>@… extraction cache (bun ≥ 1.1)
+        const candidate = path.join(nm, '.bun');
         if (fs.existsSync(candidate)) {
             const prefix = `${packageName}@`;
             for (const entry of fs.readdirSync(candidate, { withFileTypes: true })) {
@@ -413,7 +415,11 @@ function clearBunCacheForPackage(packageName) {
                     fs.rmSync(path.join(candidate, entry.name), { recursive: true, force: true });
                 }
             }
-            break;
+        }
+        // Remove the installed node_modules/<pkg> directory so bun re-extracts
+        const installedDir = path.join(nm, packageName);
+        if (fs.existsSync(installedDir)) {
+            fs.rmSync(installedDir, { recursive: true, force: true });
         }
         const parent = path.dirname(dir);
         if (parent === dir)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "BabelFHIR-TS: generate TypeScript interfaces, validators, and helper classes from FHIR R4/R4B/R5 StructureDefinitions (profiles) directly inside package archives.",
   "type": "module",
   "main": "out/src/main.js",