graphify-sf 0.3.8 → 0.3.9

package/install.js

@@ -2,27 +2,42 @@
 
 // postinstall hook.
 //
-// The graphify-sf npm package is a thin wrapper that fetches a prebuilt binary
-// from the project's GitHub Releases. In locked-down corporate networks the
-// download can be blocked by a proxy or firewall. A failed download here MUST
-// NOT abort `npm install` for the whole dependency tree — graphify-sf is an
-// optional second engine for its consumers, so a missing binary should degrade
-// gracefully (the binary is fetched lazily on first run, and there are offline
-// remediation paths).
+// As of 0.3.9 the prebuilt binary normally arrives WITH `npm install`, shipped
+// inside a platform-specific scoped subpackage (@graphify-sf/cli-<plat>-<arch>)
+// declared in optionalDependencies. npm installs only the subpackage matching
+// the host os/cpu, so on a supported platform the binary is already present and
+// this hook makes ZERO network requests.
 //
-// Therefore: never exit non-zero from postinstall. Print a clear, actionable
-// warning and exit 0. The actual binary resolution happens later via
-// download.ensureBinary() at first invocation.
+// Resolution order (see lib/download.js ensureBinary):
+//   1. GRAPHIFY_BIN env override
+//   2. the installed platform subpackage  <-- 0.3.9 happy path, no network
+//   3. a previously-downloaded binary in bin/
+//   4. download from GitHub Releases       <-- fallback only
+//
+// A failed download in step 4 MUST NOT abort the consumer's `npm install`
+// (graphify-sf is an optional second engine for its consumers). So this hook
+// always exits 0: if no binary resolves and the fallback download fails, we
+// print actionable remediation and still exit 0; the binary is fetched lazily
+// on first run instead.
+
+const { envBinary, subpackageBinary, download } = require("./lib/download");
 
-const { download } = require("./lib/download");
+async function main() {
+  // If a binary already resolves (env override or the platform subpackage),
+  // there is nothing to do — and crucially, no network request.
+  if (envBinary() || subpackageBinary()) {
+    process.exit(0);
+  }
 
-download()
-  .then(() => {
+  // No prebuilt binary available for this platform (unsupported platform,
+  // --no-optional, or a registry that doesn't carry the scoped subpackages).
+  // Try the GitHub Releases fallback, but never fail the install.
+  try {
+    await download();
     process.exit(0);
-  })
-  .catch((err) => {
+  } catch (err) {
     process.stderr.write(
-      `\ngraphify-sf: could not pre-fetch the CLI binary during install.\n` +
+      `\ngraphify-sf: no prebuilt binary for this platform and the fallback download failed.\n` +
         `  Reason: ${err.message}\n` +
         `\n` +
         `  This is non-fatal — installation will continue. The binary will be\n` +
@@ -34,6 +49,8 @@ download()
         `    • Point at an existing binary:           export GRAPHIFY_BIN=/path/to/graphify-sf\n` +
         `\n`
     );
-    // Non-fatal: do not break the consumer's `npm install`.
     process.exit(0);
-  });
+  }
+}
+
+main();

package/lib/download.js

@@ -132,6 +132,63 @@ function envBinary() {
   return null;
 }
 
+// Name of the platform-specific scoped subpackage that ships the prebuilt
+// binary for the current platform/arch, e.g. "@graphify-sf/cli-linux-x64".
+// Returns null on unsupported platforms.
+function subpackageName() {
+  const plat = process.platform;
+  const arch = process.arch;
+  const supported = SUPPORTED[plat];
+  if (!supported || !supported.includes(arch)) {
+    return null;
+  }
+  return `@graphify-sf/cli-${plat}-${arch}`;
+}
+
+// Resolve the binary from an installed platform subpackage (the 0.3.9 happy
+// path — the binary arrives with `npm install` via optionalDependencies, no
+// network). Returns the absolute path, or null if the subpackage is not
+// installed (unsupported platform, --no-optional, or a registry mirror that
+// does not carry the scoped subpackages).
+function subpackageBinary() {
+  const name = subpackageName();
+  if (!name) return null;
+  const binName = process.platform === "win32" ? "graphify-sf.exe" : "graphify-sf";
+
+  // Build a robust set of resolution roots. In a normal install the subpackage
+  // is a peer in the consumer's node_modules and resolves from this module's
+  // own location; but with non-hoisted / nested layouts (or when invoked from a
+  // different cwd, e.g. tests) it may live elsewhere. Searching from this
+  // module, the package root, and the current working directory covers npm,
+  // pnpm and yarn layouts.
+  const searchPaths = [__dirname, path.join(__dirname, ".."), process.cwd()];
+
+  let resolved = null;
+  try {
+    resolved = require.resolve(`${name}/${binName}`, { paths: searchPaths });
+  } catch {
+    // Subpackage not installed — fall through to other resolution strategies.
+    return null;
+  }
+
+  if (resolved && fs.existsSync(resolved)) {
+    // Defensive: npm tarballs preserve mode, but ensure executable on Unix.
+    if (process.platform !== "win32") {
+      try {
+        fs.accessSync(resolved, fs.constants.X_OK);
+      } catch {
+        try {
+          fs.chmodSync(resolved, 0o755);
+        } catch {
+          /* best-effort; resolution still returned below */
+        }
+      }
+    }
+    return resolved;
+  }
+  return null;
+}
+
 async function ensureBinary() {
   // 1. Explicit override always wins.
   const fromEnv = envBinary();
@@ -139,15 +196,31 @@ async function ensureBinary() {
     return fromEnv;
   }
 
-  // 2. Already-downloaded binary in the package's bin/ dir.
+  // 2. Prebuilt binary shipped in the platform subpackage (0.3.9 happy path,
+  //    no network).
+  const fromSubpkg = subpackageBinary();
+  if (fromSubpkg) {
+    return fromSubpkg;
+  }
+
+  // 3. Already-downloaded binary in the package's bin/ dir (legacy cache).
   const dest = binaryPath();
   if (fs.existsSync(dest)) {
     return dest;
   }
 
-  // 3. Lazily download on first use.
+  // 4. Last resort: lazily download from GitHub Releases on first use.
   await download();
   return dest;
 }
 
-module.exports = { assetName, binaryPath, binDir, download, ensureBinary, envBinary };
+module.exports = {
+  assetName,
+  binaryPath,
+  binDir,
+  download,
+  ensureBinary,
+  envBinary,
+  subpackageName,
+  subpackageBinary,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphify-sf",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "description": "Turn any Salesforce SFDX project into a queryable knowledge graph — no Python required.",
   "bin": {
     "graphify-sf": "bin/graphify-sf.js"
@@ -10,6 +10,13 @@
     "postinstall": "node install.js",
     "test": "node --test"
   },
+  "optionalDependencies": {
+    "@graphify-sf/cli-linux-x64": "0.3.9",
+    "@graphify-sf/cli-linux-arm64": "0.3.9",
+    "@graphify-sf/cli-darwin-x64": "0.3.9",
+    "@graphify-sf/cli-darwin-arm64": "0.3.9",
+    "@graphify-sf/cli-win32-x64": "0.3.9"
+  },
   "files": [
     "bin/",
     "lib/",