@tishlang/tish 1.6.0 → 1.8.0

package/crates/tish/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tishlang"
-version = "1.6.0"
+version = "1.8.0"
 edition = "2021"
 description = "Tish CLI - run, REPL, compile to native"
 license-file = { workspace = true }
@@ -11,12 +11,21 @@ name = "tish"
 path = "src/main.rs"
 
 [features]
-# Default: secure mode with no dangerous capabilities
-default = []
-# Full: all capabilities enabled (for development/trusted environments)
-full = ["http", "fs", "process", "regex", "ws"]
+# The published `tish` CLI always includes every optional runtime (http, timers, fs, process, regex, ws).
+# Use `cargo build -p tishlang --no-default-features` when you need a locked-down toolchain
+# (see workspace `justfile`). `tish run --feature …` / `tish build --feature …` gate what runs
+# or what gets linked into a *native output* binary — they are not the primary way to ship a
+# “full” vs “empty” CLI.
+default = ["full"]
+# Alias: same dependency edges as `default` (kept for `--features full` in CI and docs).
+# Includes `pg` so `tish run` can resolve `import … from 'tish-pg'` (`cargo:tish_pg`) on the bytecode VM.
+# Requires `tish-pg` next to this workspace root (`…/tish/tish-pg`); CI runs `scripts/ci/ensure-tish-pg.sh`.
+full = ["http", "fs", "process", "regex", "ws", "timers", "pg"]
+# Opt-out: build without Postgres (`cargo build -p tishlang --no-default-features --features http,...`).
+pg = ["dep:tish_pg"]
 # Individual capability flags
 http    = ["tishlang_eval/http",    "tishlang_runtime/http",    "tishlang_compile/http",    "tishlang_vm/http"]
+timers  = ["tishlang_eval/timers",  "tishlang_compile/timers",  "tishlang_vm/timers"]
 fs      = ["tishlang_eval/fs",      "tishlang_runtime/fs",      "tishlang_compile/fs",      "tishlang_vm/fs"]
 process = ["tishlang_eval/process", "tishlang_runtime/process", "tishlang_compile/process", "tishlang_vm/process"]
 regex   = ["tishlang_eval/regex",   "tishlang_runtime/regex",   "tishlang_compile/regex",   "tishlang_vm/regex"]
@@ -40,6 +49,7 @@ tishlang_runtime = { path = "../tish_runtime", version = ">=0.1" }
 tishlang_core = { path = "../tish_core", version = ">=0.1" }
 tishlang_js_to_tish = { path = "../js_to_tish", version = ">=0.1" }
 clap = { version = "4.6.0", features = ["derive", "color"] }
+tish_pg = { path = "../../../tish-pg", package = "tish-pg", optional = true }
 
 [dev-dependencies]
 rayon = "1.11"

package/crates/tish/src/cargo_native_registry.rs

@@ -0,0 +1,29 @@
+//! Registers `cargo:*` Rust shims on the bytecode VM (`tish run`, REPL).
+//!
+//! Native `tish build` outputs register their own crates at link time; the
+//! interpreter path must populate [`tishlang_vm::Vm::register_native_module`].
+
+#[cfg(feature = "pg")]
+pub(crate) fn register_bytecode_native_modules(vm: &mut tishlang_vm::Vm) {
+    use std::sync::Arc;
+    use tishlang_core::{ObjectMap, Value};
+
+    let mut om = ObjectMap::with_capacity(8);
+    om.insert(
+        Arc::from("per_worker_client"),
+        Value::native(tish_pg::per_worker_client),
+    );
+    om.insert(Arc::from("connect"), Value::native(tish_pg::connect));
+    om.insert(Arc::from("prepare"), Value::native(tish_pg::prepare));
+    om.insert(
+        Arc::from("query_prepared"),
+        Value::native(tish_pg::query_prepared),
+    );
+    om.insert(Arc::from("query_all"), Value::native(tish_pg::query_all));
+    om.insert(Arc::from("migrate"), Value::native(tish_pg::migrate));
+    om.insert(Arc::from("close"), Value::native(tish_pg::close));
+    vm.register_native_module("cargo:tish_pg", om);
+}
+
+#[cfg(not(feature = "pg"))]
+pub(crate) fn register_bytecode_native_modules(_vm: &mut tishlang_vm::Vm) {}

package/crates/tish/src/cli_help.rs

@@ -9,7 +9,7 @@ use clap::{CommandFactory, Parser, Subcommand};
 
 /// FIGlet-style block letters (UTF-8). On a TTY, a short expand + palette-color animation runs.
 const TISH_BANNER_LINES: &[&str] = &[
-        "",
+    "",
     "████████╗██╗███████╗██╗  ██╗",
     "╚══██╔══╝██║██╔════╝██║  ██║",
     "   ██║   ██║███████╗███████║",
@@ -26,13 +26,13 @@ const BANNER_FRAME_MS: u64 = 20;
 
 /// Orange → Yellow → Green → Teal → Blue → Purple → Pink (matching the brand palette).
 const PALETTE: &[(u8, u8, u8)] = &[
-    (255, 159,  64),  // Orange
-    (255, 213,  64),  // Yellow
-    ( 52, 199,  89),  // Green
-    ( 48, 209, 188),  // Teal
-    ( 10, 132, 255),  // Blue
-    (175,  82, 222),  // Purple
-    (255,  55, 148),  // Pink
+    (255, 159, 64), // Orange
+    (255, 213, 64), // Yellow
+    (52, 199, 89),  // Green
+    (48, 209, 188), // Teal
+    (10, 132, 255), // Blue
+    (175, 82, 222), // Purple
+    (255, 55, 148), // Pink
 ];
 
 fn ease_out_cubic(t: f32) -> f32 {
@@ -128,8 +128,8 @@ pub fn print_tish_banner() {
 pub fn build_command() -> clap::Command {
     Cli::command()
         .after_help(cli_after_help())
-        .mut_subcommand("run",   |sub| sub.after_help(run_after_help()))
-        .mut_subcommand("repl",  |sub| sub.after_help(repl_after_help()))
+        .mut_subcommand("run", |sub| sub.after_help(run_after_help()))
+        .mut_subcommand("repl", |sub| sub.after_help(repl_after_help()))
         .mut_subcommand("build", |sub| sub.after_long_help(build_after_help()))
 }
 
@@ -138,7 +138,10 @@ fn count_help_lines(cmd: &mut clap::Command, sub_name: Option<&str>) -> usize {
     let mut buf = Vec::<u8>::new();
     if let Some(name) = sub_name {
         if cmd.find_subcommand(name).is_some() {
-            let _ = cmd.find_subcommand_mut(name).unwrap().write_long_help(&mut buf);
+            let _ = cmd
+                .find_subcommand_mut(name)
+                .unwrap()
+                .write_long_help(&mut buf);
         } else {
             let _ = cmd.write_long_help(&mut buf);
         }
@@ -236,8 +239,11 @@ pub fn print_banner_with_help(argv: &[String]) {
         let mut out = io::stdout().lock();
         write_tish_banner_frame(&mut out, 1.0, 0);
         let _ = writeln!(out); // blank separator  (row n+1)
-        // ── Manual prefix (MAIN_PREFIX_LINES = 4 lines) ──────────────────
-        let _ = writeln!(out, "{H_PURPLE}Tish{H_RESET} {H_GREY}(version {VERSION}){H_RESET}");
+                               // ── Manual prefix (MAIN_PREFIX_LINES = 4 lines) ──────────────────
+        let _ = writeln!(
+            out,
+            "{H_PURPLE}Tish{H_RESET} {H_GREY}(version {VERSION}){H_RESET}"
+        );
         let _ = writeln!(out, "Minimal TS/JS-ish language");
         let _ = writeln!(out, "{H_PINK}https://tishlang.com{H_RESET}");
         let _ = writeln!(out); // blank before Usage
@@ -289,20 +295,24 @@ fn rgb_bold(r: u8, g: u8, b: u8) -> Style {
 /// Orange → section headers / usage.  Teal → literals (commands, flags).  Yellow → placeholders.
 pub fn cargo_help_styles() -> Styles {
     Styles::styled()
-        .header(rgb_bold(255, 159,  64))      // Orange  – "Commands:", "Options:", "Usage:"
-        .usage(rgb_bold(255, 159,  64))       // Orange
-        .literal(rgb_bold( 48, 209, 188))     // Teal    – run, repl, --help, -V …
-        .placeholder(rgb_bold(255, 213,  64)) // Yellow  – <FILE>, <NAME>, …
-        .error(rgb_bold(255,  55, 148))       // Pink    – error messages
-        .valid(rgb_bold( 52, 199,  89))       // Green   – valid values
-        .invalid(rgb_bold(255,  55, 148))     // Pink    – invalid values
+        .header(rgb_bold(255, 159, 64)) // Orange  – "Commands:", "Options:", "Usage:"
+        .usage(rgb_bold(255, 159, 64)) // Orange
+        .literal(rgb_bold(48, 209, 188)) // Teal    – run, repl, --help, -V …
+        .placeholder(rgb_bold(255, 213, 64)) // Yellow  – <FILE>, <NAME>, …
+        .error(rgb_bold(255, 55, 148)) // Pink    – error messages
+        .valid(rgb_bold(52, 199, 89)) // Green   – valid values
+        .invalid(rgb_bold(255, 55, 148)) // Pink    – invalid values
 }
 
 /// Returns the colored `after_help` text for the top-level `tish --help`.
 /// Colors are emitted only when stdout is a TTY.
 pub fn cli_after_help() -> String {
     let (oh, t, r) = if io::stdout().is_terminal() {
-        ("\x1b[1;38;2;255;159;64m", "\x1b[1;38;2;48;209;188m", "\x1b[0m")
+        (
+            "\x1b[1;38;2;255;159;64m",
+            "\x1b[1;38;2;48;209;188m",
+            "\x1b[0m",
+        )
     } else {
         ("", "", "")
     };
@@ -327,7 +337,9 @@ fn capabilities_section(oh: &str, t: &str, r: &str) -> String {
 
 {oh}Capabilities{r} (--feature, repeatable; comma-separated values are split):
   {t}http{r}
-          Network: fetch, serve, Promise / timers (native async)
+          Network: fetch, fetchAll, serve, Promise (and `await`); enabling http also enables timers
+  {t}timers{r}
+          setTimeout, setInterval, clearTimeout, clearInterval (global + `import from \"timers\"` / tish:timers)
   {t}fs{r}
           Filesystem: readFile, writeFile, fileExists, isDir, readDir, mkdir
   {t}process{r}
@@ -337,16 +349,20 @@ fn capabilities_section(oh: &str, t: &str, r: &str) -> String {
   {t}ws{r}
           WebSocket client / server
   {t}full{r}
-          All of the above (http, fs, process, regex, ws)
+          All of the above (http, timers, fs, process, regex, ws)
 
-Omit --feature to use every capability linked into this binary."
+Omit --feature to allow every capability compiled into this `tish` binary; pass flags to restrict what scripts may use. The CLI is normally built with all of them (Cargo default on `tishlang`)."
     )
 }
 
 /// Returns the colored `after_help` for `tish run --help`.
 pub fn run_after_help() -> String {
     let (oh, t, r) = if io::stdout().is_terminal() {
-        ("\x1b[1;38;2;255;159;64m", "\x1b[1;38;2;48;209;188m", "\x1b[0m")
+        (
+            "\x1b[1;38;2;255;159;64m",
+            "\x1b[1;38;2;48;209;188m",
+            "\x1b[0m",
+        )
     } else {
         ("", "", "")
     };
@@ -356,7 +372,11 @@ pub fn run_after_help() -> String {
 /// Returns the colored `after_help` for `tish repl --help`.
 pub fn repl_after_help() -> String {
     let (oh, t, r) = if io::stdout().is_terminal() {
-        ("\x1b[1;38;2;255;159;64m", "\x1b[1;38;2;48;209;188m", "\x1b[0m")
+        (
+            "\x1b[1;38;2;255;159;64m",
+            "\x1b[1;38;2;48;209;188m",
+            "\x1b[0m",
+        )
     } else {
         ("", "", "")
     };
@@ -366,7 +386,11 @@ pub fn repl_after_help() -> String {
 /// Returns the colored `after_long_help` for `tish build --help`.
 pub fn build_after_help() -> String {
     let (oh, t, r) = if io::stdout().is_terminal() {
-        ("\x1b[1;38;2;255;159;64m", "\x1b[1;38;2;48;209;188m", "\x1b[0m")
+        (
+            "\x1b[1;38;2;255;159;64m",
+            "\x1b[1;38;2;48;209;188m",
+            "\x1b[0m",
+        )
     } else {
         ("", "", "")
     };
@@ -392,7 +416,9 @@ pub fn build_after_help() -> String {
 
 {oh}Capabilities{r} (--feature, repeatable; comma-separated values are split):
   {t}http{r}
-          Network: fetch, serve, Promise / timers (native async)
+          Network: fetch, fetchAll, serve, Promise (and `await`); enabling http also enables timers
+  {t}timers{r}
+          setTimeout, setInterval, clearTimeout, clearInterval (global + `import from \"timers\"` / tish:timers)
   {t}fs{r}
           Filesystem: readFile, writeFile, fileExists, isDir, readDir, mkdir
   {t}process{r}
@@ -402,10 +428,9 @@ pub fn build_after_help() -> String {
   {t}ws{r}
           WebSocket client / server
   {t}full{r}
-          All of the above (http, fs, process, regex, ws)
+          All of the above (http, timers, fs, process, regex, ws)
 
-Omit --feature to use every capability linked into this binary.
-Build `tish` with matching Cargo features (e.g. cargo build -p tishlang --features full)."
+For `--target native`, these choose what is linked into the **output** executable (omit = same set as this `tish` binary was built with). Minimal native outputs still use a full `tish` CLI unless you built it with `cargo build -p tishlang --no-default-features`."
     )
 }
 
@@ -421,12 +446,22 @@ pub(crate) struct Cli {
 #[derive(Parser)]
 pub(crate) struct RunArgs {
     /// Path to a `.tish` file, or `-` to read the program from stdin (like `node -`).
-    #[arg(required = true, allow_hyphen_values = true, value_name = "FILE", help_heading = "Arguments")]
+    #[arg(
+        required = true,
+        allow_hyphen_values = true,
+        value_name = "FILE",
+        help_heading = "Arguments"
+    )]
     pub file: String,
     /// `vm` or `interp` (see `tish --help` for capabilities / `--feature`).
-    #[arg(long, default_value = "vm", value_name = "NAME", help_heading = "Options")]
+    #[arg(
+        long,
+        default_value = "vm",
+        value_name = "NAME",
+        help_heading = "Options"
+    )]
     pub backend: String,
-    /// Subset of capabilities (see `tish --help` for the full list).
+    /// Restrict which platform APIs the script may use (omit = all capabilities compiled into this `tish`).
     #[arg(
         long = "feature",
         value_name = "NAME",
@@ -442,9 +477,14 @@ pub(crate) struct RunArgs {
 #[derive(Parser)]
 pub(crate) struct ReplArgs {
     /// `vm` or `interp` (see `tish --help`).
-    #[arg(long, default_value = "vm", value_name = "NAME", help_heading = "Options")]
+    #[arg(
+        long,
+        default_value = "vm",
+        value_name = "NAME",
+        help_heading = "Options"
+    )]
     pub backend: String,
-    /// Subset of capabilities (see `tish --help` for the full list).
+    /// Restrict which platform APIs the REPL may use (omit = all capabilities compiled into this `tish`).
     #[arg(
         long = "feature",
         value_name = "NAME",
@@ -467,12 +507,22 @@ pub(crate) struct BuildArgs {
     )]
     pub output: String,
     /// `native`, `js`, `wasm`, or `wasi` (see long help below).
-    #[arg(long, default_value = "native", value_name = "TARGET", help_heading = "Options")]
+    #[arg(
+        long,
+        default_value = "native",
+        value_name = "TARGET",
+        help_heading = "Options"
+    )]
     pub target: String,
     /// `rust`, `cranelift`, or `llvm` (only for `--target native`).
-    #[arg(long, default_value = "rust", value_name = "BACKEND", help_heading = "Options")]
+    #[arg(
+        long,
+        default_value = "rust",
+        value_name = "BACKEND",
+        help_heading = "Options"
+    )]
     pub native_backend: String,
-    /// Capability subset for native output (see long help below).
+    /// For `--target native`: which capabilities to link into the produced binary (omit = same as this `tish`; see long help).
     #[arg(
         long = "feature",
         value_name = "NAME",
@@ -482,6 +532,9 @@ pub(crate) struct BuildArgs {
     pub features: Vec<String>,
     #[arg(long, help_heading = "Options")]
     pub no_optimize: bool,
+    /// For `--target js` project builds: emit `OUTPUT.js.map` and `//# sourceMappingURL=…` so JS/TS tools can jump to original `.tish` (implies `--no-optimize` for that build).
+    #[arg(long, help_heading = "Options")]
+    pub source_map: bool,
     /// Entry `.tish` file (or `.js` where supported).
     #[arg(required = true, value_name = "FILE", help_heading = "Arguments")]
     pub file: String,