@gjsify/rolldown-plugin-gjsify 0.27.0 → 0.28.0

package/lib/index.d.ts

@@ -18,7 +18,7 @@ export { externalsPlugin } from './plugins/externals.js';
 export type { ExternalsPredicate, ExternalsPluginOptions } from './plugins/externals.js';
 export { unresolvedWorkspaceImportPlugin, classifyImport, isWorkspaceSpecifier, formatUnresolvedWorkspaceImport, buildReverseAliasIndex, UnresolvedWorkspaceImportError, } from './plugins/unresolved-workspace-import.js';
 export type { WorkspaceImportGuardOptions, WorkspaceImportGuardTarget, ImportVerdict, ClassifyImportInput, UnresolvedWorkspaceImportDetails, } from './plugins/unresolved-workspace-import.js';
-export { napiNodeAddonPlugin, resolveAddonPath, nearestPackageRoot, classifySpecifier, directNodeShim, nodeGypBuildShim, bindingsShim, napiRsShim, ADDON_FILTER_RE, isNapiRsPackageJson, isNapiRsSibling, detectNapiRsEntry, hostNapiRsTriple, AddonNotBuiltError, } from './plugins/napi-node-addon.js';
+export { napiNodeAddonPlugin, resolveAddonPath, nearestPackageRoot, classifySpecifier, directNodeShim, nodeGypBuildShim, bindingsShim, napiRsShim, ADDON_FILTER_RE, isNapiRsPackageJson, isNapiRsSibling, isGjsifyNativeBridge, detectNapiRsEntry, hostNapiRsTriple, AddonNotBuiltError, } from './plugins/napi-node-addon.js';
 export type { NapiNodeAddonPluginOptions, AddonPackageJson } from './plugins/napi-node-addon.js';
 export { platformResolvePlugin, detectNativescriptPlatform, nativescriptPlatformDefines, } from './plugins/platform-resolve.js';
 export type { PlatformResolvePluginOptions, NativescriptPlatform } from './plugins/platform-resolve.js';

package/lib/index.js

@@ -12,7 +12,7 @@ export { aliasPlugin } from './plugins/alias.js';
 export { gjsImportsEmptyPlugin } from './plugins/gjs-imports-empty.js';
 export { externalsPlugin } from './plugins/externals.js';
 export { unresolvedWorkspaceImportPlugin, classifyImport, isWorkspaceSpecifier, formatUnresolvedWorkspaceImport, buildReverseAliasIndex, UnresolvedWorkspaceImportError, } from './plugins/unresolved-workspace-import.js';
-export { napiNodeAddonPlugin, resolveAddonPath, nearestPackageRoot, classifySpecifier, directNodeShim, nodeGypBuildShim, bindingsShim, napiRsShim, ADDON_FILTER_RE, isNapiRsPackageJson, isNapiRsSibling, detectNapiRsEntry, hostNapiRsTriple, AddonNotBuiltError, } from './plugins/napi-node-addon.js';
+export { napiNodeAddonPlugin, resolveAddonPath, nearestPackageRoot, classifySpecifier, directNodeShim, nodeGypBuildShim, bindingsShim, napiRsShim, ADDON_FILTER_RE, isNapiRsPackageJson, isNapiRsSibling, isGjsifyNativeBridge, detectNapiRsEntry, hostNapiRsTriple, AddonNotBuiltError, } from './plugins/napi-node-addon.js';
 export { platformResolvePlugin, detectNativescriptPlatform, nativescriptPlatformDefines, } from './plugins/platform-resolve.js';
 export * from './plugin.js';
 import { gjsifyPlugin } from './plugin.js';

package/lib/plugins/napi-node-addon.d.ts

@@ -67,8 +67,39 @@ export interface AddonPackageJson {
     exports?: unknown;
     browser?: string;
     napi?: unknown;
+    gjsify?: unknown;
     optionalDependencies?: Record<string, string>;
 }
+/**
+ * Is this manifest a gjsify NATIVE BRIDGE whose prebuilds live in per-target
+ * sibling packages (ADR 0017) — `@gjsify/webgl` + `@gjsify/webgl-darwin-x64`, …?
+ *
+ * Such a bridge ships a GObject-Introspection typelib plus a `.so`/`.dylib`/`.dll`
+ * loaded through `gi://`, NEVER a Node-API `.node` addon, so it must never be
+ * routed through `loadAddon()`.
+ *
+ * It has to be excluded EXPLICITLY because the two conventions are
+ * indistinguishable by name: ADR 0017 spells a target `<os>-<arch>` and names the
+ * package `<self>-<os>-<arch>` in `optionalDependencies` — which is exactly
+ * napi-rs' `<self>-<triple>` sibling scheme whenever the target happens to be a
+ * name napi-rs also uses. On Linux the two vocabularies differ by the libc token
+ * (`linux-x64` vs napi-rs' `linux-x64-gnu`), so `hostNapiRsTriple()` never matched
+ * and nothing fired; on macOS napi-rs' triple IS `darwin-x64` / `darwin-arm64`,
+ * so every split bridge looked like a napi-rs package to
+ * {@link isNapiRsPackageJson} and {@link resolveNapiRsEntryAddon} then probed
+ * `ctx.resolve('@gjsify/webgl-darwin-x64')` — an artifact-only package with no JS
+ * entry at all. That probe does not return null: the `unresolved-workspace-import`
+ * guard (correctly) treats an unresolvable bare `@gjsify/*` as FATAL, so
+ * `gjsify build --app gjs` of any consumer of any split bridge died on darwin with
+ * "cannot resolve the workspace package" — invisible to every Linux CI job.
+ *
+ * `gjsify.platforms` is the right discriminator: it is the OS-axis declaration
+ * every native bridge carries (§ Runtime & platform model) and no napi-rs package
+ * has any reason to declare it.
+ *
+ * Exported for the unit tests.
+ */
+export declare function isGjsifyNativeBridge(pkg: AddonPackageJson): boolean;
 /**
  * A package.json describes a napi-rs generated-loader package when EITHER
  * signal holds — both are package.json-level (not source sniffing):

package/lib/plugins/napi-node-addon.js

@@ -384,6 +384,42 @@ export function classifySpecifier(source) {
         return { kind: 'napi-rs-candidate' };
     return null;
 }
+/**
+ * Is this manifest a gjsify NATIVE BRIDGE whose prebuilds live in per-target
+ * sibling packages (ADR 0017) — `@gjsify/webgl` + `@gjsify/webgl-darwin-x64`, …?
+ *
+ * Such a bridge ships a GObject-Introspection typelib plus a `.so`/`.dylib`/`.dll`
+ * loaded through `gi://`, NEVER a Node-API `.node` addon, so it must never be
+ * routed through `loadAddon()`.
+ *
+ * It has to be excluded EXPLICITLY because the two conventions are
+ * indistinguishable by name: ADR 0017 spells a target `<os>-<arch>` and names the
+ * package `<self>-<os>-<arch>` in `optionalDependencies` — which is exactly
+ * napi-rs' `<self>-<triple>` sibling scheme whenever the target happens to be a
+ * name napi-rs also uses. On Linux the two vocabularies differ by the libc token
+ * (`linux-x64` vs napi-rs' `linux-x64-gnu`), so `hostNapiRsTriple()` never matched
+ * and nothing fired; on macOS napi-rs' triple IS `darwin-x64` / `darwin-arm64`,
+ * so every split bridge looked like a napi-rs package to
+ * {@link isNapiRsPackageJson} and {@link resolveNapiRsEntryAddon} then probed
+ * `ctx.resolve('@gjsify/webgl-darwin-x64')` — an artifact-only package with no JS
+ * entry at all. That probe does not return null: the `unresolved-workspace-import`
+ * guard (correctly) treats an unresolvable bare `@gjsify/*` as FATAL, so
+ * `gjsify build --app gjs` of any consumer of any split bridge died on darwin with
+ * "cannot resolve the workspace package" — invisible to every Linux CI job.
+ *
+ * `gjsify.platforms` is the right discriminator: it is the OS-axis declaration
+ * every native bridge carries (§ Runtime & platform model) and no napi-rs package
+ * has any reason to declare it.
+ *
+ * Exported for the unit tests.
+ */
+export function isGjsifyNativeBridge(pkg) {
+    const gjsify = pkg?.gjsify;
+    if (gjsify === null || typeof gjsify !== 'object')
+        return false;
+    const { platforms, prebuilds } = gjsify;
+    return Array.isArray(platforms) || typeof prebuilds === 'string';
+}
 /**
  * A package.json describes a napi-rs generated-loader package when EITHER
  * signal holds — both are package.json-level (not source sniffing):
@@ -576,6 +612,10 @@ function napiSiblingPrefixes(pkg) {
 export function isNapiRsSibling(pkg, dep) {
     if (!NAPI_RS_TRIPLE_RE.test(dep))
         return false;
+    // A gjsify ADR-0017 platform package wears the same name — see
+    // {@link isGjsifyNativeBridge} for the darwin-only build break that caused.
+    if (isGjsifyNativeBridge(pkg))
+        return false;
     return napiSiblingPrefixes(pkg).some((prefix) => dep.startsWith(`${prefix}-`));
 }
 /**
@@ -650,7 +690,22 @@ async function resolveNapiRsEntryAddon(ctx, pkgRoot, pkg, importer) {
     // loaders do, so this matches the binary Node would have loaded.
     const ordered = triple === null ? siblings : siblings.filter((dep) => dep.endsWith(`-${triple}`));
     for (const dep of ordered) {
-        const resolved = await ctx.resolve(dep, importer, { skipSelf: true });
+        // This resolve is a QUESTION ("is a host-triple binary installed?"), but it
+        // can THROW rather than answer: `skipSelf` skips only THIS plugin, so the
+        // `unresolved-workspace-import` guard still runs at `order:'post'` and
+        // (correctly, for a real import) makes an unresolvable bare `@gjsify/*`
+        // FATAL. A misread sibling name then kills the whole build instead of
+        // declining — measured on darwin, where every ADR-0017 platform package
+        // matched this path. The name check above is the fix; this keeps the class
+        // from ever being fatal again, and says which specifier was asked about.
+        let resolved = null;
+        try {
+            resolved = await ctx.resolve(dep, importer, { skipSelf: true });
+        }
+        catch (err) {
+            warnSafe(ctx, `[gjsify-napi] probing the platform sibling "${dep}" of "${pkg.name ?? pkgRoot}" failed; not rewriting its entry (${err instanceof Error ? err.message.split('\n')[0] : String(err)})`);
+            continue;
+        }
         if (!resolved)
             continue;
         const abs = rawAddonPath(resolved.id);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/rolldown-plugin-gjsify",
-    "version": "0.27.0",
+    "version": "0.28.0",
     "description": "Rolldown / Rollup / Vite plugin orchestrator for GJS, Node, and Browser targets",
     "type": "module",
     "main": "lib/index.js",
@@ -35,7 +35,7 @@
     "scripts": {
         "clear": "gjsify clear lib tsconfig.tsbuildinfo",
         "check": "gjsify tsc --noEmit",
-        "build": "tsc"
+        "build": "gjsify tsc"
     },
     "repository": {
         "type": "git",
@@ -55,11 +55,11 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@gjsify/console": "^0.27.0",
-        "@gjsify/resolve-npm": "^0.27.0",
-        "@gjsify/rolldown-plugin-deepkit": "^0.27.0",
-        "@gjsify/rolldown-plugin-pnp": "^0.27.0",
-        "@gjsify/vite-plugin-blueprint": "^0.27.0",
+        "@gjsify/console": "^0.28.0",
+        "@gjsify/resolve-npm": "^0.28.0",
+        "@gjsify/rolldown-plugin-deepkit": "^0.28.0",
+        "@gjsify/rolldown-plugin-pnp": "^0.28.0",
+        "@gjsify/vite-plugin-blueprint": "^0.28.0",
         "@rollup/pluginutils": "^5.4.0",
         "acorn": "^8.17.0",
         "acorn-walk": "^8.3.5",
@@ -68,7 +68,7 @@
         "sass": "^1.101.0"
     },
     "peerDependencies": {
-        "@gjsify/lightningcss-native": "^0.27.0",
+        "@gjsify/lightningcss-native": "^0.28.0",
         "rolldown": "^1.1.4"
     },
     "peerDependenciesMeta": {