@gjsify/rolldown-plugin-gjsify 0.4.37 → 0.4.38

package/lib/plugins/rewrite-node-modules-paths.js

@@ -28,15 +28,36 @@
 //        bundle's own URL and `__dirname`/`__filename` derive from it.
 //
 //   4. CJS (`__dirname`/`__filename` only, no `import.meta.url`)
-//      → declare them from the file's absolute build path. NOTE: still
-//        build-location-coupled and shares the "breaks when published" class of
-//        bug case (1) fixes; injecting an ESM import into a CJS module is unsafe,
-//        so a CJS-safe runtime-resolve is tracked as a follow-up. ESM deps (the
-//        common data-reader shape, e.g. typedoc) take path (1).
+//      → case 4a (runtime-resolve) when `runtimeResolve` is on (ESM output +
+//        bundle-URL banner present) AND the file is a genuinely resolvable
+//        installed package (`isRuntimeResolvable`). Declares `__dirname`/
+//        `__filename` from the RUNTIME module-resolve shim — the same
+//        location-independent strategy as case (1), so the bundle works after
+//        being published/relocated. This is what lets `@gjsify/tsc` find its
+//        `lib.*.d.ts` files relative to the INSTALLED bundle (via
+//        `getExecutingFilePath()` → `__filename`) instead of the build
+//        machine's `node_modules` path. The shim functions are pulled in with a
+//        CJS `require(...)`, NOT an ESM `import` header: Rolldown classifies a
+//        node_modules file by its own heuristics, and a genuine CommonJS file
+//        (a `.cjs`, or a `.js` with `module.exports` like `typescript/lib/
+//        _tsc.js`) is parsed as a CJS script — a prepended ESM `import` there
+//        throws `Cannot use import statement outside a module`. `require(...)`
+//        is the native CJS idiom Rolldown resolves + links to the bundled shim.
+//      → case 4b (legacy baked absolute path) otherwise: when `runtimeResolve`
+//        is OFF (the rare `--format iife|cjs` build that can't host the
+//        bundle-URL banner) OR the file is NOT a resolvable installed package
+//        (a relative-imported module under a `node_modules`-named dir that the
+//        package manager — Yarn PnP especially — does not resolve). Runtime
+//        resolution of such a file would collapse `__filename` to the bundle's
+//        own location, so the build-time absolute path is the correct value for
+//        an in-place run. Build-location-coupled — shares the "breaks when
+//        published" class of bug, but a non-installed file can't be published
+//        as a package anyway.
 //
 // Hosting: a Rolldown `transform(code, id)` hook with `order: 'post'` — runs
 // after deepkit/blueprint/css pre-transforms but still during module loading,
 // before chunking.
+import { createRequire } from 'node:module';
 import { dirname, join, relative, resolve } from 'node:path';
 import { inlineStaticReads } from '../utils/inline-static-reads.js';
 export const REWRITE_FILTER = /\.(m?js|cjs|[cm]?tsx?)$/;
@@ -89,6 +110,58 @@ export function extractPackageSpec(path) {
     const idx = path.lastIndexOf(marker);
     return idx < 0 ? path : path.slice(idx + marker.length);
 }
+/**
+ * The bare package name of a node_modules file spec (scoped names kept whole):
+ *   "typedoc/dist/lib/app.js"  → "typedoc"
+ *   "@scope/name/sub/file.js"  → "@scope/name"
+ */
+function packageNameOf(spec) {
+    const parts = spec.split('/');
+    const segments = spec.startsWith('@') ? 2 : 1;
+    return parts.slice(0, segments).join('/');
+}
+/**
+ * Whether the runtime module-resolve shim can actually resolve this file's
+ * package at runtime — i.e. it is a genuinely *installed*, resolvable package
+ * rather than a file that merely lives under a `node_modules`-named directory.
+ *
+ * The CJS runtime-resolve (case 4a) resolves `__dirname`/`__filename` by
+ * resolving the dep's package root from the bundle's location. That only works
+ * for a real installed package (`typescript`, `@gjsify/tsc`, a normal npm dep).
+ * A file reached via a RELATIVE import into a `node_modules`-named folder that
+ * is NOT a resolvable package (e.g. a test fixture at
+ * `fixtures/node_modules/fake-cjs/index.cjs`, or any dir not in the
+ * package manager's resolution graph — Yarn PnP especially rejects these)
+ * would resolve to the bundle's own location at runtime → wrong `__filename`.
+ * For those we fall back to the legacy baked-absolute-path rewrite (case 4b),
+ * which is build-location-coupled but correct for an in-place run.
+ *
+ * Probed at BUILD time with `createRequire(<file>).resolve("<pkg>/package.json")`
+ * anchored at the file itself — succeeds iff the package is installed and
+ * reachable (honours node_modules walking AND Yarn PnP, since the build runs
+ * under the consumer's loader). Best-effort: any throw → treat as not
+ * resolvable (fall back to the absolute rewrite, never crash the build).
+ */
+function isRuntimeResolvable(path) {
+    const pkg = packageNameOf(extractPackageSpec(path));
+    if (!pkg)
+        return false;
+    try {
+        createRequire(path).resolve(`${pkg}/package.json`);
+        return true;
+    }
+    catch {
+        try {
+            // Some strict `exports` maps block `<pkg>/package.json` — fall back
+            // to resolving the package's main entry, which is always exported.
+            createRequire(path).resolve(pkg);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+}
 /** Whether the file needs a `var __dirname`/`__filename` declaration injected. */
 function needsDirnameDecl(src, flags) {
     return flags.hasDirname && !DIRNAME_DECL_RE.test(src);
@@ -157,8 +230,46 @@ function rewriteZipResident(src, path, flags) {
     return { code: withPreamble(src, preamble), moduleType: moduleTypeForPath(path) };
 }
 /**
- * Case 4 — CJS (no `import.meta.url`). Declare `__dirname`/`__filename` from the
- * absolute build path. Build-location-coupled — see file header note.
+ * Case 4a — CJS, runtime-resolve. Declare `__dirname`/`__filename` from the
+ * module-resolve shim so they point at the file's location relative to the
+ * INSTALLED bundle, not the build machine. Location-independent — the fix for
+ * the "works in the workspace, crashes once published" class of bug for CJS
+ * deps (e.g. `@gjsify/tsc`'s `typescript/lib/_tsc.js` resolving its sibling
+ * `lib.*.d.ts` files). Mirrors `rewriteOnDiskEsm` minus the `import.meta.url`
+ * rewrite (a CJS file has none).
+ *
+ * Unlike the ESM case we pull the shim functions in via a CJS `require(...)`,
+ * NOT an ESM `import { … } from …` header. Rolldown classifies a `node_modules`
+ * file by its own heuristics (extension + `module.exports`/`require` content),
+ * and a genuine CommonJS file — a `.cjs`, or a `.js` with `module.exports` like
+ * `typescript/lib/_tsc.js` — is parsed as a CJS script. Prepending an ESM
+ * `import` statement there makes Rolldown's parser throw
+ * `[PARSE_ERROR] Cannot use import statement outside a module`. `require(...)`
+ * is the native CJS idiom Rolldown resolves + links to the bundled shim, so the
+ * preamble parses in either classification.
+ */
+function rewriteCjsRuntime(src, path, flags) {
+    const spec = JSON.stringify(extractPackageSpec(path));
+    const used = [];
+    const preamble = [];
+    if (needsDirnameDecl(src, flags)) {
+        preamble.push(`var __dirname = __gjsifyModuleDir(${spec});`);
+        used.push('__gjsifyModuleDir');
+    }
+    if (needsFilenameDecl(src, flags)) {
+        preamble.push(`var __filename = __gjsifyModuleFile(${spec});`);
+        used.push('__gjsifyModuleFile');
+    }
+    // Nothing to declare (both tokens already locally bound) — leave untouched.
+    if (used.length === 0)
+        return { code: src, moduleType: moduleTypeForPath(path) };
+    const header = `var { ${used.join(', ')} } = require(${JSON.stringify(MODULE_RESOLVE_SHIM)});`;
+    return { code: withPreamble(src, preamble, header), moduleType: moduleTypeForPath(path) };
+}
+/**
+ * Case 4b — CJS, legacy. Declare `__dirname`/`__filename` from the absolute
+ * build path. Build-location-coupled — see file header note. Used only for the
+ * non-ESM output formats that can't host the bundle-URL anchor banner.
  */
 function rewriteCjsAbsolute(src, path, flags) {
     const preamble = [];
@@ -202,7 +313,15 @@ export function rewriteContents(args, srcInput, bundleDir, runtimeResolve) {
             ? rewriteOnDiskEsm(src, args.path, flags)
             : rewriteOnDiskEsmLegacy(src, args.path, bundleDir, flags);
     }
-    return rewriteCjsAbsolute(src, args.path, flags);
+    // CJS (no `import.meta.url`). Runtime-resolve only when the output can host
+    // the bundle-URL banner (ESM output) AND the file is a genuinely resolvable
+    // installed package — otherwise the shim would resolve `__filename` to the
+    // bundle's own location at runtime. A file under a `node_modules`-named dir
+    // that is not actually installed (a relative-imported fixture, a non-PnP
+    // path) keeps the legacy baked-absolute-path rewrite.
+    return runtimeResolve && isRuntimeResolvable(args.path)
+        ? rewriteCjsRuntime(src, args.path, flags)
+        : rewriteCjsAbsolute(src, args.path, flags);
 }
 /**
  * Build a Rolldown plugin that runs the path rewriter as a `transform(code, id)`

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.4.37",
+    "version": "0.4.38",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -48,11 +48,11 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "^0.4.37",
-        "@gjsify/resolve-npm": "^0.4.37",
-        "@gjsify/rolldown-plugin-deepkit": "^0.4.37",
-        "@gjsify/rolldown-plugin-pnp": "^0.4.37",
-        "@gjsify/vite-plugin-blueprint": "^0.4.37",
+        "@gjsify/console": "^0.4.38",
+        "@gjsify/resolve-npm": "^0.4.38",
+        "@gjsify/rolldown-plugin-deepkit": "^0.4.38",
+        "@gjsify/rolldown-plugin-pnp": "^0.4.38",
+        "@gjsify/vite-plugin-blueprint": "^0.4.38",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.16.0",
         "acorn-walk": "^8.3.5",
@@ -60,7 +60,7 @@
         "lightningcss": "^1.32.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "^0.4.37",
+        "@gjsify/lightningcss-native": "^0.4.38",
         "rolldown": "^1.0.3"
     },
     "peerDependenciesMeta": {
@@ -74,6 +74,6 @@
     "devDependencies": {
         "@types/node": "^25.9.1",
         "rolldown": "^1.0.3",
-        "typescript": "^5.9.3"
+        "typescript": "^6.0.3"
     }
 }