@gjsify/cli 0.64.4 → 0.64.6

package/lib/utils/ship/layout.js

@@ -75,6 +75,28 @@ function appBundleDir(identity) {
     }
     return `${identity.name}.app`;
 }
+/**
+ * Refuse an `identity.name` that cannot be the carried interpreter's own file
+ * name under `Contents/Helpers` (`dirs.helpers`) — `appRuntimePaths` in
+ * `utils/ship/app-runtime.ts` is the only caller.
+ *
+ * A SUPERSET of {@link BUNDLE_NAME_FORBIDDEN}, not a restatement: the bundle
+ * directory wraps the same string in `.app`, so a name of "." or ".." becomes
+ * "..app" or "....app" — both ordinary directory names — while this leaf is
+ * `identity.name` taken LITERALLY, where "." and ".." name the directory
+ * itself and its parent. An empty name and a NUL byte are refused for the same
+ * reason `windowsProgramDirName` refuses them one OS over: neither is a name a
+ * filesystem can hold.
+ */
+export function assertUsableAsHelperName(name) {
+    if (name === '' || name === '.' || name === '..' || BUNDLE_NAME_FORBIDDEN.test(name) || name.includes('\u0000')) {
+        throw new Error(`gjsify ship: the macOS layout would name the carried interpreter "${name}" under ` +
+            '`Contents/Helpers`, and that is not usable as a file name — empty, ".", ".." and anything ' +
+            'containing "/", ":", "\\" or a NUL byte are refused. Set `gjsify.ship.name` to the display ' +
+            'name you want.');
+    }
+    return name;
+}
 /**
  * The rasters a row writes its icon from, or nothing for a CLI — and a refusal
  * for an application that arrives without them.
@@ -117,6 +139,7 @@ export const LAYOUTS = {
             native: `lib/${identity.binaryName}/gi`,
             data: 'share',
             other: '',
+            helpers: '',
         }),
         // THE RASTERS THE BUILD-TIME READERS OF THE THEME NEED, and the one row
         // whose icon is written as ordinary payload files rather than into a
@@ -280,6 +303,14 @@ export const LAYOUTS = {
                 native: `${app}/Contents/Resources/native`,
                 data: `${app}/Contents/Resources/share`,
                 other: `${app}/Contents/Resources`,
+                // Apple's own nested-code location (alongside `Frameworks`,
+                // `PlugIns`, `XPCServices` — `codesign(1)`'s bundle format), and the
+                // one place `appRuntimePaths` can put the interpreter under a name
+                // that is not `binaryName`: `Contents/MacOS` already holds the
+                // launcher, and APFS is case-insensitive by default, so a second
+                // file there named `<BinaryName>` collides with it bytewise even
+                // when the casing differs.
+                helpers: `${app}/Contents/Helpers`,
             };
         },
         // The two files that make the directory a BUNDLE. Without `Info.plist`
@@ -411,7 +442,7 @@ export const LAYOUTS = {
         // LOADER: `lib/` is what the launcher prepends to `PATH`, because Windows
         // has no rpath — a DLL is found on `PATH`, in the directory of the image
         // that loaded it, or not at all.
-        dirs: () => ({ launcher: '', bundle: 'app', native: 'lib', data: 'share', other: '' }),
+        dirs: () => ({ launcher: '', bundle: 'app', native: 'lib', data: 'share', other: '', helpers: '' }),
         // NO METADATA, and one PROGRAM. A Windows installer's metadata lives in the
         // `.msi`'s own tables, not in a file inside the program directory —
         // `msi.ts` puts every such fact in the `Product`/`Package` attributes of the

package/lib/utils/ship/node-runtime.js

@@ -28,12 +28,14 @@
 // THE CALLER IS `utils/ship/app-runtime.ts` (#1354 M2b), and this paragraph used
 // to say there was none — "⚠️ NOTHING CALLS THIS YET, outside its own spec … a
 // promise to a caller that does not exist yet". It exists: the macOS layout stages
-// `nodePath` into `Contents/MacOS/node` and `licensePath` beside it, and the
-// `null`-not-throw contract is what lets that caller stage the GTK closure it DID
-// find while naming the interpreter package it did not. #1354 M3 adds the second
-// caller — the Windows program directory stages `node.exe` beside its `.cmd` — so
-// both non-Linux rows of the table above are now used, and this paragraph no
-// longer has a "still has none" half to record.
+// `nodePath` into `Contents/Helpers/<display name>` and `licensePath` beside it in
+// `Contents/Resources`, and the `null`-not-throw contract is what lets that caller
+// stage the GTK closure it DID find while naming the interpreter package it did
+// not. #1354 M3 adds the second caller — the Windows program directory stages
+// `node.exe` beside its `.cmd` — so both non-Linux rows of the table above are now
+// used, and this paragraph no longer has a "still has none" half to record.
+// `node.exe` keeps that name verbatim: nothing collides with it on Windows, and
+// only the darwin leaf changed — see `layout.ts`'s `dirs.helpers`.
 //
 // The tests keep the by-name claim honest independently of any caller: they
 // resolve a real installed package out of a throwaway consumer tree holding

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.64.4",
+    "version": "0.64.6",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -142,22 +142,22 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/blueprint": "^0.64.4",
-        "@gjsify/buffer": "^0.64.4",
-        "@gjsify/create-app": "^0.64.4",
-        "@gjsify/node-globals": "^0.64.4",
-        "@gjsify/node-polyfills": "^0.64.4",
-        "@gjsify/npm-registry": "^0.64.4",
-        "@gjsify/resolve-npm": "^0.64.4",
-        "@gjsify/rolldown-plugin-gjsify": "^0.64.4",
-        "@gjsify/vite-plugin-blueprint": "^0.64.4",
-        "@gjsify/rolldown-plugin-pnp": "^0.64.4",
-        "@gjsify/semver": "^0.64.4",
-        "@gjsify/tar": "^0.64.4",
-        "@gjsify/tsc": "^0.64.4",
-        "@gjsify/utils": "^0.64.4",
-        "@gjsify/web-polyfills": "^0.64.4",
-        "@gjsify/workspace": "^0.64.4",
+        "@gjsify/blueprint": "^0.64.6",
+        "@gjsify/buffer": "^0.64.6",
+        "@gjsify/create-app": "^0.64.6",
+        "@gjsify/node-globals": "^0.64.6",
+        "@gjsify/node-polyfills": "^0.64.6",
+        "@gjsify/npm-registry": "^0.64.6",
+        "@gjsify/resolve-npm": "^0.64.6",
+        "@gjsify/rolldown-plugin-gjsify": "^0.64.6",
+        "@gjsify/vite-plugin-blueprint": "^0.64.6",
+        "@gjsify/rolldown-plugin-pnp": "^0.64.6",
+        "@gjsify/semver": "^0.64.6",
+        "@gjsify/tar": "^0.64.6",
+        "@gjsify/tsc": "^0.64.6",
+        "@gjsify/utils": "^0.64.6",
+        "@gjsify/web-polyfills": "^0.64.6",
+        "@gjsify/workspace": "^0.64.6",
         "acorn": "^8.17.0",
         "cosmiconfig": "^9.0.2",
         "get-tsconfig": "^4.14.0",
@@ -166,13 +166,13 @@
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "^0.64.4",
+        "@gjsify/unit": "^0.64.6",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/oxfmt-native": "^0.64.4",
-        "@gjsify/rolldown-native": "^0.64.4"
+        "@gjsify/oxfmt-native": "^0.64.6",
+        "@gjsify/rolldown-native": "^0.64.6"
     },
     "peerDependenciesMeta": {
         "@gjsify/oxfmt-native": {