pgplan 1.0.0 → 1.1.0

package/bin/pgplan

@@ -1,58 +1,45 @@
 #!/usr/bin/env node
-
 "use strict";
 
 const { execFileSync } = require("child_process");
-const path = require("path");
-const os = require("os");
 
-const PLATFORMS = {
-  "linux-x64": { pkg: "@pgplan/linux-x64", bin: "pgplan" },
-  "linux-arm64": { pkg: "@pgplan/linux-arm64", bin: "pgplan" },
-  "darwin-x64": { pkg: "@pgplan/darwin-x64", bin: "pgplan" },
-  "darwin-arm64": { pkg: "@pgplan/darwin-arm64", bin: "pgplan" },
-  "win32-x64": { pkg: "@pgplan/win32-x64", bin: "pgplan.exe" },
-};
+const BIN_NAME = "pgplan";
+const ORG_NAME = "pgplan";
 
-function getPlatformKey() {
-  const platform = os.platform();
-  const arch = os.arch();
-  return `${platform}-${arch}`;
-}
+const platforms = {
+  "linux-x64":    `@${ORG_NAME}/${BIN_NAME}-linux-x64`,
+  "linux-arm64":  `@${ORG_NAME}/${BIN_NAME}-linux-arm64`,
+  "darwin-x64":   `@${ORG_NAME}/${BIN_NAME}-darwin-x64`,
+  "darwin-arm64": `@${ORG_NAME}/${BIN_NAME}-darwin-arm64`,
+  "win32-x64":    `@${ORG_NAME}/${BIN_NAME}-win32-x64`,
+  "win32-arm64":  `@${ORG_NAME}/${BIN_NAME}-win32-arm64`,
+};
 
-function getBinaryPath() {
-  const key = getPlatformKey();
-  const entry = PLATFORMS[key];
-  if (!entry) {
-    const supported = Object.keys(PLATFORMS).join(", ");
-    console.error(
-      `pgplan: unsupported platform ${key}\nSupported: ${supported}`
-    );
-    process.exit(1);
-  }
+const key = `${process.platform}-${process.arch === "x64" ? "x64" : process.arch}`;
+const pkg = platforms[key];
 
-  try {
-    const pkgPath = require.resolve(`${entry.pkg}/package.json`);
-    return path.join(path.dirname(pkgPath), entry.bin);
-  } catch {
-    console.error(
-      `pgplan: platform package ${entry.pkg} not installed.\n` +
-        `Try reinstalling: npm install pgplan`
-    );
-    process.exit(1);
-  }
+if (!pkg) {
+  console.error(
+    `${BIN_NAME}: unsupported platform ${process.platform}/${process.arch}\n` +
+    `supported platforms: ${Object.keys(platforms).join(", ")}`
+  );
+  process.exit(1);
 }
 
-const binary = getBinaryPath();
+let binPath;
+try {
+  const binFile = process.platform === "win32" ? `${BIN_NAME}.exe` : BIN_NAME;
+  binPath = require.resolve(`${pkg}/bin/${binFile}`);
+} catch (e) {
+  console.error(
+    `${BIN_NAME}: could not find platform package ${pkg}\n` +
+    `try reinstalling: npm install -g ${BIN_NAME}`
+  );
+  process.exit(1);
+}
 
 try {
-  const result = execFileSync(binary, process.argv.slice(2), {
-    stdio: "inherit",
-    env: process.env,
-  });
+  execFileSync(binPath, process.argv.slice(2), { stdio: "inherit" });
 } catch (e) {
-  if (e.status !== null) {
-    process.exit(e.status);
-  }
-  throw e;
+  process.exit(e.status ?? 1);
 }

package/package.json

@@ -1,29 +1,21 @@
 {
   "name": "pgplan",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Analyze and compare PostgreSQL query plans",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/JacobArthurs/pgplan.git"
-  },
-  "author": "Jacob Arthurs",
   "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/JacobArthurs/pgplan/issues"
-  },
-  "homepage": "https://github.com/JacobArthurs/pgplan",
+  "repository": "https://github.com/JacobArthurs/pgplan",
+  "files": [
+    "bin"
+  ],
   "bin": {
     "pgplan": "bin/pgplan"
   },
-  "files": [
-    "bin/**",
-    "README.md"
-  ],
   "optionalDependencies": {
-    "@pgplan/linux-x64": "1.0.0",
-    "@pgplan/linux-arm64": "1.0.0",
-    "@pgplan/darwin-x64": "1.0.0",
-    "@pgplan/darwin-arm64": "1.0.0",
-    "@pgplan/win32-x64": "1.0.0"
+    "@pgplan/pgplan-darwin-arm64": "1.1.0",
+    "@pgplan/pgplan-darwin-x64": "1.1.0",
+    "@pgplan/pgplan-linux-arm64": "1.1.0",
+    "@pgplan/pgplan-linux-x64": "1.1.0",
+    "@pgplan/pgplan-win32-arm64": "1.1.0",
+    "@pgplan/pgplan-win32-x64": "1.1.0"
   }
 }