@gjsify/rolldown-plugin-gjsify 0.51.1 → 0.53.0

package/lib/utils/inline-static-reads.js

@@ -66,6 +66,7 @@ import { tsPlugin } from 'acorn-typescript';
 import { dirname, join, resolve, basename, relative, extname, posix, win32 } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import { hasZipSegment } from './zip-path.js';
 /**
  * Run the inliner on a source string. Returns the rewritten source (or the
  * original string when no inlining applied) and the count of edits applied.
@@ -101,7 +102,7 @@ const TS_PARSER = acorn.Parser.extend(tsPlugin());
  * `inlined: 0`, while the identical expression in a `.js` file returned
  * `inlined: 1`.
  */
-function parseSource(src, sourceFilePath) {
+export function parseSource(src, sourceFilePath) {
     const shared = {
         ecmaVersion: 'latest',
         sourceType: 'module',
@@ -142,7 +143,7 @@ function forEachCallExpression(root, visit) {
         }
     }
 }
-export function inlineStaticReads(src, sourceFilePath) {
+export function inlineStaticReads(src, sourceFilePath, declare) {
     if (!src.includes('readFileSync') && !src.includes('readdirSync') && !src.includes('existsSync')) {
         return { contents: src, inlined: 0 };
     }
@@ -160,6 +161,7 @@ export function inlineStaticReads(src, sourceFilePath) {
     const ctx = {
         sourceUrl: pathToFileURL(sourceFilePath).href,
         resourceRoot: resourceRootFor(sourceFilePath),
+        declare,
     };
     const edits = [];
     forEachCallExpression(ast, (node) => {
@@ -246,6 +248,7 @@ function tryInlineCall(node, ctx, _src) {
         if (path && existsSync(path) && isDirectorySafe(path)) {
             try {
                 const names = readdirSync(path);
+                ctx.declare?.(path);
                 return {
                     start: node.start,
                     end: node.end,
@@ -260,11 +263,11 @@ function tryInlineCall(node, ctx, _src) {
     if (calleeName === 'existsSync') {
         const path = evalPathExpr(node.arguments[0], ctx);
         if (path !== undefined) {
-            return {
-                start: node.start,
-                end: node.end,
-                replacement: existsSync(path) ? 'true' : 'false',
-            };
+            // The ANSWER is in the bundle, so the file's existence is an input
+            // of the output — a file that appears changes the emitted literal.
+            const present = existsSync(path);
+            ctx.declare?.(path);
+            return { start: node.start, end: node.end, replacement: present ? 'true' : 'false' };
         }
     }
     // `createRequire(<URL>)` from `node:module` returns a CJS-style require.
@@ -288,8 +291,11 @@ function tryInlineCall(node, ctx, _src) {
         //  - the path contains a `.zip/` segment (Yarn PnP virtual zip,
         //    where Node's PnP hooks make `existsSync` return true at build
         //    time but the path doesn't exist under GJS at runtime).
-        const isZip = path !== undefined && path.includes('.zip/');
+        const isZip = path !== undefined && hasZipSegment(path);
         if (path !== undefined && (isZip || !existsSync(path))) {
+            // The stub-vs-real choice reads the file's existence too, so the
+            // same declaration applies to the branch that replaces the call.
+            ctx.declare?.(path);
             return {
                 start: node.start,
                 end: node.end,
@@ -330,6 +336,7 @@ function tryInlineReadFile(node, ctx, forceTextEncoding) {
     try {
         if (encoding) {
             const text = readFileSync(path, encoding);
+            ctx.declare?.(path);
             return jsStringLiteral(text);
         }
         else {
@@ -337,6 +344,7 @@ function tryInlineReadFile(node, ctx, forceTextEncoding) {
             // Buffer-vs-Uint8Array semantic difference is mostly irrelevant in
             // bundled GJS code (Buffer is polyfilled on top of Uint8Array).
             const bytes = readFileSync(path);
+            ctx.declare?.(path);
             return `new Uint8Array([${Array.from(bytes).join(',')}])`;
         }
     }

package/lib/utils/runtime.js

@@ -11,7 +11,7 @@
 // Kept deliberately pure — no `gi://` / `@girs/*` imports, no side effects —
 // so it stays loadable on every host and so consumers can import it via the
 // `@gjsify/rolldown-plugin-gjsify/runtime` subpath without pulling the rest of
-// the plugin (which transitively loads blueprint-compiler, deepkit, etc.).
+// the plugin (which transitively loads the Blueprint parser, deepkit, etc.).
 /**
  * `true` when running under Bun.
  *

package/lib/utils/scan-globals.d.ts

@@ -34,7 +34,7 @@ export declare function resolveGlobalsList(globalsArg: string): Set<string>;
  * Returns false — never throws — so a missing package causes a graceful
  * skip rather than a build crash.
  */
-export declare function isRegisterPathResolvable(registerPath: string, fromDir: string): boolean;
+export declare function isRegisterPathResolvable(registerPath: string, fromDir: string | readonly string[]): boolean;
 /**
  * Filter `registerPaths` to only those whose base package is resolvable
  * from `fromDir`. Emits a `console.warn` for each skipped path —
@@ -45,7 +45,7 @@ export declare function isRegisterPathResolvable(registerPath: string, fromDir:
  * dep, and that polyfill is not a direct/transitive dep, the warn makes
  * the gap visible so the developer can add the dep explicitly.
  */
-export declare function filterResolvableRegisterPaths(registerPaths: Set<string>, fromDir: string): Set<string>;
+export declare function filterResolvableRegisterPaths(registerPaths: Set<string>, fromDir: string | readonly string[]): Set<string>;
 /** Options for {@link writeRegisterInjectFile}. */
 export interface WriteRegisterInjectOptions {
     /**

package/lib/utils/scan-globals.js

@@ -126,20 +126,26 @@ export function isRegisterPathResolvable(registerPath, fromDir) {
     const canonical = resolveRegisterAlias(registerPath);
     const pkgName = packageNameFromRegisterPath(canonical);
     const parts = pkgName.split('/');
-    // Walk up the directory tree mirroring Node's module-resolution
-    // algorithm: check <dir>/node_modules/<pkg>/package.json at each level.
-    let dir = fromDir;
-    const root = dir.slice(0, dir.indexOf('/') + 1) || '/';
-    while (true) {
-        const candidate = join(dir, 'node_modules', ...parts, 'package.json');
-        if (existsSync(candidate))
-            return true;
-        if (dir === root)
-            break;
-        const parent = join(dir, '..');
-        if (parent === dir)
-            break;
-        dir = parent;
+    // Several roots when the build may take a `@gjsify/*` from beside the running CLI
+    // (`toolchainAnchor`): the resolver would rescue the import, so this gate must not
+    // drop it first — it did, and `gjsify exec` rebuilt a consumer's bin with every
+    // global skipped because the PROJECT installs no `@gjsify/*` at all.
+    for (const start of typeof fromDir === 'string' ? [fromDir] : fromDir) {
+        // Walk up the directory tree mirroring Node's module-resolution
+        // algorithm: check <dir>/node_modules/<pkg>/package.json at each level.
+        let dir = start;
+        const root = dir.slice(0, dir.indexOf('/') + 1) || '/';
+        while (true) {
+            const candidate = join(dir, 'node_modules', ...parts, 'package.json');
+            if (existsSync(candidate))
+                return true;
+            if (dir === root)
+                break;
+            const parent = join(dir, '..');
+            if (parent === dir)
+                break;
+            dir = parent;
+        }
     }
     return false;
 }

package/lib/utils/zip-path.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Does `path` run THROUGH a `.zip` archive (Yarn PnP's `.yarn/cache/<pkg>.zip/...`)?
+ *
+ * The separator is the host's as well as `/`: `relative()` and rolldown's module ids answer
+ * with `\` on win32, where a `.zip/`-only test never matched and a zip-resident module was
+ * sent down the on-disk path. `\` counts only there, because on POSIX it is a filename
+ * character. `separator` defaults to the host's; a parameter so both hosts are testable on one.
+ */
+export declare function hasZipSegment(path: string, separator?: string): boolean;

package/lib/utils/zip-path.js

@@ -0,0 +1,12 @@
+import { sep } from 'node:path';
+/**
+ * Does `path` run THROUGH a `.zip` archive (Yarn PnP's `.yarn/cache/<pkg>.zip/...`)?
+ *
+ * The separator is the host's as well as `/`: `relative()` and rolldown's module ids answer
+ * with `\` on win32, where a `.zip/`-only test never matched and a zip-resident module was
+ * sent down the on-disk path. `\` counts only there, because on POSIX it is a filename
+ * character. `separator` defaults to the host's; a parameter so both hosts are testable on one.
+ */
+export function hasZipSegment(path, separator = sep) {
+    return path.includes('.zip/') || (separator === '\\' && path.includes('.zip\\'));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.51.1",
+    "version": "0.53.0",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -25,6 +25,9 @@
         "./shims/module-resolve": {
             "default": "./lib/shims/module-resolve.js"
         },
+        "./shims/addon-resolve": {
+            "default": "./lib/shims/addon-resolve.js"
+        },
         "./shims/unicorn-magic": {
             "default": "./lib/shims/unicorn-magic.js"
         }
@@ -60,11 +63,12 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "^0.51.1",
-        "@gjsify/resolve-npm": "^0.51.1",
-        "@gjsify/rolldown-plugin-deepkit": "^0.51.1",
-        "@gjsify/rolldown-plugin-pnp": "^0.51.1",
-        "@gjsify/vite-plugin-blueprint": "^0.51.1",
+        "@gjsify/console": "^0.53.0",
+        "@gjsify/resolve-npm": "^0.53.0",
+        "@gjsify/rolldown-plugin-deepkit": "^0.53.0",
+        "@gjsify/rolldown-plugin-pnp": "^0.53.0",
+        "@gjsify/utils": "^0.53.0",
+        "@gjsify/vite-plugin-blueprint": "^0.53.0",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.17.0",
         "acorn-typescript": "^1.4.13",
@@ -74,7 +78,7 @@
         "sass": "^1.101.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "^0.51.1",
+        "@gjsify/lightningcss-native": "^0.53.0",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {
@@ -86,8 +90,8 @@
         }
     },
     "devDependencies": {
-        "@gjsify/cli": "^0.51.1",
-        "@gjsify/unit": "^0.51.1",
+        "@gjsify/cli": "^0.53.0",
+        "@gjsify/unit": "^0.53.0",
         "@types/node": "^25.9.2",
         "rolldown": "^1.1.4",
         "typescript": "^6.0.3"