@pippit-dev/cli 1.0.21 → 1.0.22

package/scripts/run.js

@@ -1,19 +1,16 @@
 #!/usr/bin/env node
 
-const { execFileSync } = require("child_process");
-const fs = require("fs");
-const path = require("path");
-const {
-  isCanvasCommand,
-  runCanvasCommand,
-} = require("./canvas-command");
-const { maybeWarnNewVersion } = require("./version-check");
+const { execFileSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const { isCanvasCommand, runCanvasCommand } = require('./canvas-command');
+const { maybeWarnNewVersion } = require('./version-check');
 
-const ext = process.platform === "win32" ? ".exe" : "";
-const bin = path.join(__dirname, "..", "bin", "pippit-tool-cli" + ext);
+const ext = process.platform === 'win32' ? '.exe' : '';
+const bin = path.join(__dirname, '..', 'bin', 'pippit-tool-cli' + ext);
 const args = process.argv.slice(2);
 
-const oldBin = bin + ".old";
+const oldBin = bin + '.old';
 function restoreOldBinary() {
   try {
     if (fs.existsSync(bin)) {
@@ -26,57 +23,76 @@ function restoreOldBinary() {
   }
 }
 
-if (process.platform === "win32" && fs.existsSync(oldBin)) {
-  if (!fs.existsSync(bin)) {
-    restoreOldBinary();
-  } else {
-    try {
-      execFileSync(bin, ["--help"], { stdio: "ignore", timeout: 10000 });
-      fs.rmSync(oldBin, { force: true });
-    } catch (_) {
+function runCanvas() {
+  runCanvasCommand(args, {
+    nativeInvocation: { command: bin },
+  })
+    .then((exitCode) => {
+      if (exitCode) process.exitCode = exitCode;
+    })
+    .catch((error) => {
+      console.error(error && error.message ? error.message : String(error));
+      process.exitCode = 1;
+    });
+}
+
+function main() {
+  // Installation help must work before any native binary preparation.
+  if (args[0] === 'install') {
+    return require('./install-wizard.js').main(args.slice(1));
+  }
+
+  const helpRequested = args.includes('--help') || args.includes('-h') || args[0] === 'help';
+  if (isCanvasCommand(args) && (args[2] !== 'run' || helpRequested)) {
+    return runCanvas();
+  }
+
+  if (!helpRequested && args.length > 0 && process.platform === 'win32' && fs.existsSync(oldBin)) {
+    if (!fs.existsSync(bin)) {
       restoreOldBinary();
+    } else {
+      try {
+        execFileSync(bin, ['--help'], { stdio: 'ignore', timeout: 10000 });
+        fs.rmSync(oldBin, { force: true });
+      } catch (_) {
+        restoreOldBinary();
+      }
     }
   }
-}
 
-// Match the lark-cli install entry: `npx @pippit-dev/cli@latest install`
-// should run the JS setup flow before the native binary exists.
-if (args[0] === "install") {
-  require("./install-wizard.js").main();
-} else {
-  maybeWarnNewVersion(args);
+  if (!helpRequested && args.length > 0) maybeWarnNewVersion(args);
 
   if (!fs.existsSync(bin)) {
+    if (helpRequested || args.length === 0) {
+      console.error(
+        'Native CLI binary is missing. Reinstall @pippit-dev/cli to restore native command help; canvas command --help and install --help remain available.',
+      );
+      process.exitCode = 1;
+      return;
+    }
     try {
-      execFileSync(process.execPath, [path.join(__dirname, "install.js")], {
-        stdio: "inherit",
-        env: { ...process.env, PIPPIT_CLI_RUN: "true" },
+      execFileSync(process.execPath, [path.join(__dirname, 'install.js')], {
+        stdio: 'inherit',
+        env: { ...process.env, PIPPIT_CLI_RUN: 'true' },
       });
     } catch (_) {
       console.error(
-        "\nFailed to prepare pippit-tool-cli binary.\n" +
-        "Make sure Go is installed and available in PATH, then retry.\n"
+        '\nFailed to prepare pippit-tool-cli binary.\n' +
+          'Check your network connection and reinstall the npm package to download the prebuilt binary.\n',
       );
       process.exit(1);
     }
   }
 
   if (isCanvasCommand(args)) {
-    runCanvasCommand(args, {
-      nativeInvocation: { command: bin },
-    })
-      .then((exitCode) => {
-        if (exitCode) process.exitCode = exitCode;
-      })
-      .catch((error) => {
-        console.error(error && error.message ? error.message : String(error));
-        process.exitCode = 1;
-      });
+    runCanvas();
   } else {
     try {
-      execFileSync(bin, args, { stdio: "inherit" });
+      execFileSync(bin, args, { stdio: 'inherit' });
     } catch (e) {
       process.exit(e.status || 1);
     }
   }
 }
+
+main();