@tishlang/tish 1.3.0 → 1.3.1

package/README.md

@@ -2,7 +2,7 @@
 
 [Tish](https://github.com/tishlang/tish) is a minimal TypeScript/JavaScript–compatible language: run with an interpreter, use a REPL, or build native binaries and other targets.
 
-This npm package ships the **Tish CLI** for Node.js **22+**. It includes platform-specific native binaries; the `tish` command picks the right one for your OS and CPU.
+This npm package ships the **Tish CLI**. It includes platform-specific native binaries under `platform/`; **`npm install`** runs `postinstall`, which copies the correct binary to `bin/tish`. That file is what runs when you invoke `tish` — the CLI itself is native, not Node. Node **22+** is required for install scripts and tooling (e.g. semantic-release in this repo); the `tish` binary has no Node runtime dependency.
 
 ## Install
 

package/crates/tish/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tishlang"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 description = "Tish CLI - run, REPL, compile to native"
 license-file = { workspace = true }

package/crates/tish/src/main.rs

@@ -77,6 +77,20 @@ pub(crate) enum Commands {
     },
 }
 
+/// `tish script.tish` → insert `run` so it matches `tish run script.tish` (npx / npm UX).
+fn argv_with_implicit_run(mut argv: Vec<String>) -> Vec<String> {
+    if argv.len() >= 2 {
+        let first = argv[1].as_str();
+        const SUBCOMMANDS: &[&str] = &["run", "repl", "build", "dump-ast"];
+        let looks_like_file =
+            !first.starts_with('-') && !SUBCOMMANDS.iter().any(|&s| s == first);
+        if looks_like_file {
+            argv.insert(1, "run".to_string());
+        }
+    }
+    argv
+}
+
 fn main() {
     let no_opt_env = std::env::var_os("TISH_NO_OPTIMIZE")
         .map(|v| v == "1" || v == "true" || v == "yes")
@@ -93,7 +107,8 @@ fn main() {
         return;
     }
 
-    let cli = Cli::parse();
+    let argv = argv_with_implicit_run(argv);
+    let cli = Cli::parse_from(argv);
     let result = match cli.command {
         Some(Commands::Run(a)) => run_file(&a.file, &a.backend, &a.features, a.no_optimize || no_opt_env),
         Some(Commands::Repl(a)) => run_repl(&a.backend, a.no_optimize || no_opt_env),
@@ -577,7 +592,30 @@ fn build_file(
 mod cli_tests {
     use clap::Parser;
 
-    use super::{Cli, Commands};
+    use super::{argv_with_implicit_run, Cli, Commands};
+
+    #[test]
+    fn implicit_run_inserts_run_before_file() {
+        let argv = argv_with_implicit_run(vec![
+            "tish".to_string(),
+            "hello.tish".to_string(),
+        ]);
+        let cli = Cli::try_parse_from(argv).unwrap();
+        match cli.command {
+            Some(Commands::Run(a)) => assert_eq!(a.file, "hello.tish"),
+            _ => panic!("expected Run"),
+        }
+    }
+
+    #[test]
+    fn explicit_subcommand_not_treated_as_file() {
+        let argv = argv_with_implicit_run(vec![
+            "tish".to_string(),
+            "repl".to_string(),
+        ]);
+        let cli = Cli::try_parse_from(argv).unwrap();
+        assert!(matches!(cli.command, Some(Commands::Repl(_))));
+    }
 
     #[test]
     fn build_js_target_parses() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tishlang/tish",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Tish - minimal TS/JS-compatible language. Run, REPL, build to native or other targets.",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {
@@ -11,10 +11,14 @@
     "access": "public"
   },
   "bin": {
-    "tish": "./bin/tish.js"
+    "tish": "./bin/tish"
+  },
+  "scripts": {
+    "postinstall": "node scripts/install-bin.js"
   },
   "files": [
     "bin",
+    "scripts/install-bin.js",
     "platform",
     "README.md",
     "LICENSE",

package/scripts/install-bin.js

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+'use strict';
+
+/**
+ * Copy platform/<os>-<arch>/tish to bin/tish so the npm bin is the native binary.
+ * Runs on postinstall and before npm pack in CI.
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const platformKey = `${process.platform}-${process.arch}`;
+const binaryName = process.platform === 'win32' ? 'tish.exe' : 'tish';
+
+const root = path.join(__dirname, '..');
+const src = path.join(root, 'platform', platformKey, binaryName);
+const dest = path.join(root, 'bin', 'tish');
+
+if (!fs.existsSync(src)) {
+  if (process.env.TISH_NPM_PACK_REQUIRE === '1') {
+    console.error(`[tish] No prebuilt binary for this platform: ${platformKey}`);
+    console.error(`[tish] Expected: ${src}`);
+    process.exit(1);
+  }
+  console.warn(`[tish] Skipping native bin (not found for ${platformKey}): ${src}`);
+  console.warn('[tish] From repo root run: ./npm/scripts/build-binaries.sh — then: node npm/tish/scripts/install-bin.js');
+  process.exit(0);
+}
+
+fs.mkdirSync(path.dirname(dest), { recursive: true });
+fs.copyFileSync(src, dest);
+try {
+  fs.chmodSync(dest, 0o755);
+} catch (_) {
+  /* Windows may ignore chmod */
+}

package/bin/tish.js

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const { spawnSync } = require('child_process');
-
-const platformKey = `${process.platform}-${process.arch}`;
-const supported = ['darwin-arm64', 'darwin-x64', 'linux-x64', 'linux-arm64', 'win32-x64'];
-const binaryName = process.platform === 'win32' ? 'tish.exe' : 'tish';
-
-const binPath = path.join(__dirname, '..', 'platform', platformKey, binaryName);
-if (!fs.existsSync(binPath)) {
-  console.error(`[tish] Unsupported or missing binary for platform: ${platformKey}`);
-  console.error('Supported:', supported.join(', '));
-  console.error('Build from source: https://github.com/tishlang/tish');
-  process.exit(1);
-}
-
-// Convenience: "npx @tishlang/tish FILE [args]" → "tish run FILE [args]"
-const args = process.argv.slice(2);
-const subcommands = ['run', 'repl', 'build', 'dump-ast'];
-const first = args[0];
-const looksLikeFile = first && !first.startsWith('-') && !subcommands.includes(first);
-
-const finalArgs = looksLikeFile ? ['run', ...args] : args;
-
-const result = spawnSync(binPath, finalArgs, {
-  stdio: 'inherit',
-  windowsHide: true,
-});
-process.exit(result.status !== null ? result.status : 1);