isolate-package 1.33.0-0 → 1.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isolate-package",
-  "version": "1.33.0-0",
+  "version": "1.34.0",
   "description": "Isolate monorepo packages to form a self-contained deployable unit",
   "keywords": [
     "ci",
@@ -23,7 +23,8 @@
     "url": "git+https://github.com/0x80/isolate-package.git"
   },
   "bin": {
-    "isolate": "dist/isolate-bin.mjs"
+    "isolate": "./dist/isolate-bin.mjs",
+    "isolate-package": "./dist/isolate-bin.mjs"
   },
   "files": [
     "src",
@@ -31,6 +32,9 @@
   ],
   "type": "module",
   "types": "./dist/index.d.mts",
+  "imports": {
+    "#/*": "./src/*"
+  },
   "exports": {
     ".": "./dist/index.mjs",
     "./isolate-bin": "./dist/isolate-bin.mjs",
@@ -41,7 +45,7 @@
     "dev": "tsdown --watch",
     "test": "vitest run",
     "format": "oxfmt",
-    "lint": "oxlint -c .oxlintrc.json --type-aware",
+    "lint": "oxlint -c .oxlintrc.json --import-plugin --type-aware",
     "check-format": "oxfmt --check",
     "check-types": "tsc --noEmit",
     "prepare": "(husky || true) && pnpm check-types && pnpm build",
@@ -52,7 +56,7 @@
   "dependencies": {
     "@npmcli/arborist": "^9.4.2",
     "@npmcli/config": "^10.8.1",
-    "@pnpm/logger": "^1001.0.1",
+    "@pnpm/logger": "^1100.0.0",
     "@pnpm/types": "^1001.3.0",
     "consola": "^3.4.2",
     "detect-monorepo": "^1.0.0",
@@ -63,41 +67,41 @@
     "meow": "^14.1.0",
     "outdent": "^0.8.0",
     "pnpm_lockfile_file_v8": "npm:@pnpm/lockfile-file@8",
-    "pnpm_lockfile_file_v9": "npm:@pnpm/lockfile-file@9",
+    "pnpm_lockfile_file_v9": "npm:@pnpm/lockfile-file@9.0.0",
     "pnpm_prune_lockfile_v8": "npm:@pnpm/prune-lockfile@5",
-    "pnpm_prune_lockfile_v9": "npm:@pnpm/prune-lockfile@6",
+    "pnpm_prune_lockfile_v9": "npm:@pnpm/prune-lockfile@6.0.0",
     "remeda": "^2.33.7",
     "source-map-support": "^0.5.21",
     "strip-json-comments": "^5.0.3",
     "tar-fs": "^3.1.2",
-    "yaml": "^2.8.3"
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
     "@codecompose/typescript-config": "^3.2.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^25.5.2",
+    "@types/node": "^25.7.0",
     "@types/npmcli__config": "^6.0.3",
     "@types/source-map-support": "^0.5.10",
     "@types/tar-fs": "^2.0.4",
     "husky": "^9.1.7",
-    "lint-staged": "^16.4.0",
-    "oxfmt": "^0.44.0",
-    "oxlint": "^1.59.0",
-    "oxlint-tsgolint": "^0.20.0",
-    "tsdown": "0.21.7",
-    "typescript": "6.0.2",
-    "vite": "^7.0.0",
+    "lint-staged": "^17.0.4",
+    "oxfmt": "^0.49.0",
+    "oxlint": "^1.64.0",
+    "oxlint-tsgolint": "^0.22.1",
+    "tsdown": "0.22.0",
+    "typescript": "6.0.3",
+    "vite": "^8.0.12",
     "vitepress": "^1.6.3",
-    "vitest": "^4.1.3"
+    "vitest": "^4.1.6"
   },
   "lint-staged": {
     "*.{ts,tsx,js,mjs,cjs}": [
       "oxfmt",
-      "oxlint -c .oxlintrc.json --type-aware"
+      "oxlint -c .oxlintrc.json --import-plugin --type-aware"
     ]
   },
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=22.22.1"
   },
-  "packageManager": "pnpm@9.0.0+sha256.bdfc9a7b372b5c462176993e586492603e20da5864d2f8881edc2462482c76fa"
+  "packageManager": "pnpm@11.1.3+sha512.c85357fe17ca12dd23dd7071822666dfd7e3cb76fe214e3370b5ea2fb34f2a231185509b63e717f3cd0acb38dd3f8d82bcd5e8172400ae678b70ea4fbed0896d"
 }

package/src/get-internal-package-names.test.ts

@@ -14,7 +14,7 @@ const mockDetectPackageManager = vi.fn(
   (_workspaceRootDir: string) => packageManagerResult,
 );
 
-vi.mock("~/lib/package-manager", () => ({
+vi.mock("#/lib/package-manager", () => ({
   usePackageManager: () => packageManagerResult,
   detectPackageManager: (workspaceRootDir: string) =>
     mockDetectPackageManager(workspaceRootDir),

package/src/get-internal-package-names.ts

@@ -23,9 +23,9 @@ export async function getInternalPackageNames(
 
   detectPackageManager(workspaceRootDir);
 
-  const targetPackageManifest = await readTypedJson<PackageManifest>(
+  const targetPackageManifest = (await readTypedJson(
     path.join(targetPackageDir, "package.json"),
-  );
+  )) as PackageManifest;
 
   const packagesRegistry = await createPackagesRegistry(
     workspaceRootDir,

package/src/isolate-bin.ts

@@ -97,11 +97,11 @@ async function run() {
   await isolate(mergedConfig);
 }
 
-run().catch((err) => {
-  if (err instanceof Error) {
-    console.error(err.stack);
-    process.exit(1);
+run().catch((error) => {
+  if (error instanceof Error) {
+    console.error(error.stack);
   } else {
-    console.error(err);
+    console.error(error);
   }
+  process.exit(1);
 });

package/src/isolate.ts

@@ -31,29 +31,30 @@ import {
   getRootRelativeLogPath,
   isRushWorkspace,
   readTypedJson,
+  resetIsolateDir,
   writeTypedYamlSync,
 } from "./lib/utils";
 
 const __dirname = getDirname(import.meta.url);
 
-export function createIsolator(config?: IsolateConfig) {
-  const resolvedConfig = resolveConfig(config);
+export function createIsolator(initialConfig?: IsolateConfig) {
+  const resolvedConfig = resolveConfig(initialConfig);
 
-  return async function isolate(): Promise<string> {
+  return async function runIsolate(): Promise<string> {
     const config = resolvedConfig;
     setLogLevel(config.logLevel);
     const log = useLogger();
 
-    const { version: libraryVersion } = await readTypedJson<PackageManifest>(
+    const { version: libraryVersion } = (await readTypedJson(
       path.join(path.join(__dirname, "..", "package.json")),
-    );
+    )) as PackageManifest;
 
     log.debug("Using isolate-package version", libraryVersion);
 
     const { targetPackageDir, workspaceRootDir } =
       resolveWorkspacePaths(config);
 
-    const buildOutputDir = await getBuildOutputDir({
+    const buildOutputDir = getBuildOutputDir({
       targetPackageDir,
       buildDirName: config.buildDirName,
       tsconfigPath: config.tsconfigPath,
@@ -77,19 +78,23 @@ export function createIsolator(config?: IsolateConfig) {
       getRootRelativeLogPath(isolateDir, workspaceRootDir),
     );
 
-    if (fs.existsSync(isolateDir)) {
-      await fs.remove(isolateDir);
-      log.debug("Cleaned the existing isolate output directory");
-    }
-
-    await fs.ensureDir(isolateDir);
+    /**
+     * Place the trash sibling outside `targetPackageDir`, since that directory
+     * is later packed by `processBuildOutputFiles`. Keeping the trash next to
+     * the target package (still on the same filesystem) preserves the atomic
+     * rename without risking that the trash gets picked up by `npm pack` or
+     * races with that step.
+     */
+    await resetIsolateDir(isolateDir, {
+      trashParentDir: path.dirname(targetPackageDir),
+    });
 
     const tmpDir = path.join(isolateDir, "__tmp");
     await fs.ensureDir(tmpDir);
 
-    const targetPackageManifest = await readTypedJson<PackageManifest>(
+    const targetPackageManifest = (await readTypedJson(
       path.join(targetPackageDir, "package.json"),
-    );
+    )) as PackageManifest;
 
     /** Validate mandatory fields for the target package */
     validateManifestMandatoryFields(
@@ -278,9 +283,7 @@ export function createIsolator(config?: IsolateConfig) {
         if (packageManager.name === "bun") {
           manifest.patchedDependencies = patchEntries;
         } else {
-          if (!manifest.pnpm) {
-            manifest.pnpm = {};
-          }
+          manifest.pnpm ??= {};
           manifest.pnpm.patchedDependencies = patchEntries;
         }
 

package/src/lib/config.test.ts

@@ -12,7 +12,7 @@ const mockLogger = {
   error: vi.fn(),
 };
 
-vi.mock("~/lib/logger", () => ({
+vi.mock("#/lib/logger", () => ({
   useLogger: () => mockLogger,
 }));
 

package/src/lib/config.ts

@@ -93,7 +93,7 @@ function loadModuleConfig(filePath: string): IsolateConfig {
       throw new Error("Failed to extract config JSON from subprocess output");
     }
 
-    const parsed = JSON.parse(jsonMatch);
+    const parsed = JSON.parse(jsonMatch) as unknown;
 
     if (
       typeof parsed !== "object" ||
@@ -105,7 +105,7 @@ function loadModuleConfig(filePath: string): IsolateConfig {
       );
     }
 
-    return parsed;
+    return parsed as IsolateConfig;
   } catch (error) {
     const stderr =
       error instanceof Error && "stderr" in error
@@ -151,7 +151,7 @@ export function loadConfigFromFile(): IsolateConfig {
   }
 
   if (jsonExists) {
-    return readTypedJsonSync<IsolateConfig>(jsonConfigPath);
+    return readTypedJsonSync(jsonConfigPath) as IsolateConfig;
   }
 
   return {};

package/src/lib/lockfile/helpers/bun-lockfile.ts

@@ -109,9 +109,8 @@ export function collectRequiredPackages(
   const required = new Set<string>();
   const queue = [...directDependencyNames];
 
-  while (queue.length > 0) {
-    const name = queue.pop()!;
-
+  let name: string | undefined;
+  while ((name = queue.pop()) !== undefined) {
     if (required.has(name)) continue;
 
     const entry = packages[name];
@@ -128,16 +127,27 @@ export function collectRequiredPackages(
       "optionalDependencies",
       "peerDependencies",
     ]) {
-      const deps = info[depField];
-      if (deps && typeof deps === "object") {
-        for (const depName of Object.keys(deps as Record<string, unknown>)) {
-          if (!required.has(depName)) {
-            queue.push(depName);
-          }
-        }
-      }
+      enqueueDeps(info[depField], required, queue);
     }
   }
 
   return required;
 }
+
+/**
+ * Push any names from a dependency map onto the BFS queue, skipping anything
+ * already marked required so we don't revisit it. `deps` is typed as `unknown`
+ * because it comes from a freshly-parsed lockfile entry with no schema.
+ */
+function enqueueDeps(
+  deps: unknown,
+  required: Set<string>,
+  queue: string[],
+): void {
+  if (!deps || typeof deps !== "object") return;
+  for (const depName of Object.keys(deps as Record<string, unknown>)) {
+    if (!required.has(depName)) {
+      queue.push(depName);
+    }
+  }
+}

package/src/lib/lockfile/helpers/generate-bun-lockfile.test.ts

@@ -13,8 +13,8 @@ vi.mock("fs-extra", () => ({
 }));
 
 /** Mock the utils */
-vi.mock("~/lib/utils", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("~/lib/utils")>();
+vi.mock("#/lib/utils", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("#/lib/utils")>();
   return {
     getErrorMessage: vi.fn((err: Error) => err.message),
     getPackageName: actual.getPackageName,
@@ -23,7 +23,7 @@ vi.mock("~/lib/utils", async (importOriginal) => {
 });
 
 const fs = vi.mocked((await import("fs-extra")).default);
-const { readTypedJsonSync } = vi.mocked(await import("~/lib/utils"));
+const { readTypedJsonSync } = vi.mocked(await import("#/lib/utils"));
 
 /** Reusable packages registry fixture */
 function createPackagesRegistry() {

package/src/lib/lockfile/helpers/generate-bun-lockfile.ts

@@ -1,13 +1,13 @@
 import fs from "fs-extra";
 import { got } from "get-or-throw";
 import path from "node:path";
-import { useLogger } from "~/lib/logger";
-import type { PackagesRegistry } from "~/lib/types";
+import { useLogger } from "#/lib/logger";
+import type { PackagesRegistry } from "#/lib/types";
 import {
   getErrorMessage,
   getPackageName,
   readTypedJsonSync,
-} from "~/lib/utils";
+} from "#/lib/utils";
 import {
   type BunLockfile,
   type BunWorkspaceEntry,
@@ -68,7 +68,7 @@ export async function generateBunLockfile({
       throw new Error(`Failed to find bun.lock at ${lockfilePath}`);
     }
 
-    const lockfile = readTypedJsonSync<BunLockfile>(lockfilePath);
+    const lockfile = readTypedJsonSync(lockfilePath) as BunLockfile;
 
     /** Compute workspace keys for the target and internal deps */
     const targetWorkspaceKey = path
@@ -215,8 +215,8 @@ export async function generateBunLockfile({
     );
 
     log.debug("Created lockfile at", outputPath);
-  } catch (err) {
-    log.error(`Failed to generate lockfile: ${getErrorMessage(err)}`);
-    throw err;
+  } catch (error) {
+    log.error(`Failed to generate lockfile: ${getErrorMessage(error)}`);
+    throw error;
   }
 }

package/src/lib/lockfile/helpers/generate-npm-lockfile.integration.test.ts

@@ -1,14 +1,10 @@
 import fs from "fs-extra";
 import os from "node:os";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { generateNpmLockfile } from "./generate-npm-lockfile";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const FIXTURES_DIR = path.join(__dirname, "__fixtures__");
+const FIXTURES_DIR = path.join(import.meta.dirname, "__fixtures__");
 
 /**
  * Copy a fixture's `workspace/` tree into a fresh tmp directory so that the