@tishlang/tish 1.0.13 → 1.0.15

package/crates/tish_vm/src/vm.rs

@@ -5,13 +5,13 @@ use std::collections::HashMap;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use tish_ast::{BinOp, UnaryOp};
-use tish_builtins::array as arr_builtins;
-use tish_builtins::string as str_builtins;
-use tish_builtins::globals as globals_builtins;
-use tish_builtins::math as math_builtins;
-use tish_bytecode::{u8_to_binop, u8_to_unaryop, Chunk, Constant, Opcode, NO_REST_PARAM};
-use tish_core::Value;
+use tishlang_ast::{BinOp, UnaryOp};
+use tishlang_builtins::array as arr_builtins;
+use tishlang_builtins::string as str_builtins;
+use tishlang_builtins::globals as globals_builtins;
+use tishlang_builtins::math as math_builtins;
+use tishlang_bytecode::{u8_to_binop, u8_to_unaryop, Chunk, Constant, Opcode, NO_REST_PARAM};
+use tishlang_core::Value;
 
 type ArrayMethodFn = Rc<dyn Fn(&[Value]) -> Value>;
 
@@ -25,12 +25,12 @@ fn get_builtin_export(spec: &str, export_name: &str) -> Option<Value> {
     #[cfg(feature = "fs")]
     if spec == "tish:fs" {
         return match export_name {
-            "readFile" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::read_file(args)))),
-            "writeFile" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::write_file(args)))),
-            "fileExists" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::file_exists(args)))),
-            "isDir" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::is_dir(args)))),
-            "readDir" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::read_dir(args)))),
-            "mkdir" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::mkdir(args)))),
+            "readFile" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::read_file(args)))),
+            "writeFile" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::write_file(args)))),
+            "fileExists" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::file_exists(args)))),
+            "isDir" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::is_dir(args)))),
+            "readDir" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::read_dir(args)))),
+            "mkdir" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::mkdir(args)))),
             _ => None,
         };
     }
@@ -38,15 +38,15 @@ fn get_builtin_export(spec: &str, export_name: &str) -> Option<Value> {
     if spec == "tish:http" {
         return match export_name {
             "fetch" => Some(Value::Function(Rc::new(|args: &[Value]| {
-                tish_runtime::fetch_promise(args.to_vec())
+                tishlang_runtime::fetch_promise(args.to_vec())
             }))),
             "fetchAll" => Some(Value::Function(Rc::new(|args: &[Value]| {
-                tish_runtime::fetch_all_promise(args.to_vec())
+                tishlang_runtime::fetch_all_promise(args.to_vec())
             }))),
             "serve" => Some(Value::Function(Rc::new(|args: &[Value]| {
                 let handler = args.get(1).cloned().unwrap_or(Value::Null);
                 if let Value::Function(f) = handler {
-                    tish_runtime::http_serve(args, move |req_args| f(req_args))
+                    tishlang_runtime::http_serve(args, move |req_args| f(req_args))
                 } else {
                     Value::Null
                 }
@@ -57,9 +57,9 @@ fn get_builtin_export(spec: &str, export_name: &str) -> Option<Value> {
     #[cfg(feature = "process")]
     if spec == "tish:process" {
         return match export_name {
-            "exit" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_exit(args)))),
-            "cwd" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_cwd(args)))),
-            "exec" => Some(Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_exec(args)))),
+            "exit" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_exit(args)))),
+            "cwd" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_cwd(args)))),
+            "exec" => Some(Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_exec(args)))),
             "argv" => Some(Value::Array(Rc::new(RefCell::new(
                 std::env::args().map(|s| Value::String(s.into())).collect(),
             )))),
@@ -70,9 +70,9 @@ fn get_builtin_export(spec: &str, export_name: &str) -> Option<Value> {
             )))),
             "process" => {
                 let mut m = HashMap::new();
-                m.insert("exit".into(), Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_exit(args))));
-                m.insert("cwd".into(), Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_cwd(args))));
-                m.insert("exec".into(), Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_exec(args))));
+                m.insert("exit".into(), Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_exit(args))));
+                m.insert("cwd".into(), Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_cwd(args))));
+                m.insert("exec".into(), Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_exec(args))));
                 m.insert(
                     "argv".into(),
                     Value::Array(Rc::new(RefCell::new(
@@ -96,19 +96,19 @@ fn get_builtin_export(spec: &str, export_name: &str) -> Option<Value> {
     if spec == "tish:ws" {
         return match export_name {
             "WebSocket" => Some(Value::Function(Rc::new(|args: &[Value]| {
-                tish_runtime::web_socket_client(args)
+                tishlang_runtime::web_socket_client(args)
             }))),
             "Server" => Some(Value::Function(Rc::new(|args: &[Value]| {
-                tish_runtime::web_socket_server_construct(args)
+                tishlang_runtime::web_socket_server_construct(args)
             }))),
             "wsSend" => Some(Value::Function(Rc::new(|args: &[Value]| {
-                Value::Bool(tish_runtime::ws_send_native(
+                Value::Bool(tishlang_runtime::ws_send_native(
                     args.first().unwrap_or(&Value::Null),
                     &args.get(1).map(|v| v.to_display_string()).unwrap_or_default(),
                 ))
             }))),
             "wsBroadcast" => Some(Value::Function(Rc::new(|args: &[Value]| {
-                tish_runtime::ws_broadcast_native(args)
+                tishlang_runtime::ws_broadcast_native(args)
             }))),
             _ => None,
         };
@@ -152,7 +152,7 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
     console.insert(
         "debug".into(),
         Value::Function(Rc::new(|args: &[Value]| {
-            let s = tish_core::format_values_for_console(args, tish_core::use_console_colors());
+            let s = tishlang_core::format_values_for_console(args, tishlang_core::use_console_colors());
             vm_log(&s);
             Value::Null
         })),
@@ -160,7 +160,7 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
     console.insert(
         "log".into(),
         Value::Function(Rc::new(|args: &[Value]| {
-            let s = tish_core::format_values_for_console(args, tish_core::use_console_colors());
+            let s = tishlang_core::format_values_for_console(args, tishlang_core::use_console_colors());
             vm_log(&s);
             Value::Null
         })),
@@ -168,7 +168,7 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
     console.insert(
         "info".into(),
         Value::Function(Rc::new(|args: &[Value]| {
-            let s = tish_core::format_values_for_console(args, tish_core::use_console_colors());
+            let s = tishlang_core::format_values_for_console(args, tishlang_core::use_console_colors());
             vm_log(&s);
             Value::Null
         })),
@@ -176,7 +176,7 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
     console.insert(
         "warn".into(),
         Value::Function(Rc::new(|args: &[Value]| {
-            let s = tish_core::format_values_for_console(args, tish_core::use_console_colors());
+            let s = tishlang_core::format_values_for_console(args, tishlang_core::use_console_colors());
             vm_log_err(&s);
             Value::Null
         })),
@@ -184,7 +184,7 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
     console.insert(
         "error".into(),
         Value::Function(Rc::new(|args: &[Value]| {
-            let s = tish_core::format_values_for_console(args, tish_core::use_console_colors());
+            let s = tishlang_core::format_values_for_console(args, tishlang_core::use_console_colors());
             vm_log_err(&s);
             Value::Null
         })),
@@ -262,14 +262,14 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
         "parse".into(),
         Value::Function(Rc::new(|args: &[Value]| {
             let s = args.first().map(|v| v.to_display_string()).unwrap_or_default();
-            tish_core::json_parse(&s).unwrap_or(Value::Null)
+            tishlang_core::json_parse(&s).unwrap_or(Value::Null)
         })),
     );
     json.insert(
         "stringify".into(),
         Value::Function(Rc::new(|args: &[Value]| {
             let v = args.first().unwrap_or(&Value::Null);
-            Value::String(tish_core::json_stringify(v).into())
+            Value::String(tishlang_core::json_stringify(v).into())
         })),
     );
     g.insert("JSON".into(), Value::Object(Rc::new(RefCell::new(json))));
@@ -305,7 +305,7 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
     );
     g.insert("Date".into(), Value::Object(Rc::new(RefCell::new(date))));
 
-    // Object methods - delegate to tish_builtins::globals
+    // Object methods - delegate to tishlang_builtins::globals
     let mut object_methods = HashMap::new();
     object_methods.insert(
         "assign".into(),
@@ -372,15 +372,15 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
         let mut process_obj = HashMap::new();
         process_obj.insert(
             "exit".into(),
-            Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_exit(args))),
+            Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_exit(args))),
         );
         process_obj.insert(
             "cwd".into(),
-            Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_cwd(args))),
+            Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_cwd(args))),
         );
         process_obj.insert(
             "exec".into(),
-            Value::Function(Rc::new(|args: &[Value]| tish_runtime::process_exec(args))),
+            Value::Function(Rc::new(|args: &[Value]| tishlang_runtime::process_exec(args))),
         );
         process_obj.insert(
             "argv".into(),
@@ -406,7 +406,7 @@ fn init_globals() -> HashMap<Arc<str>, Value> {
             Value::Function(Rc::new(|args: &[Value]| {
                 let handler = args.get(1).cloned().unwrap_or(Value::Null);
                 if let Value::Function(f) = handler {
-                    tish_runtime::http_serve(args, move |req_args| f(req_args))
+                    tishlang_runtime::http_serve(args, move |req_args| f(req_args))
                 } else {
                     Value::Null
                 }
@@ -1113,8 +1113,8 @@ impl Default for Vm {
 }
 
 fn eval_binop(op: BinOp, l: &Value, r: &Value) -> Result<Value, String> {
-    use tish_ast::BinOp::*;
-    use tish_core::Value::*;
+    use tishlang_ast::BinOp::*;
+    use tishlang_core::Value::*;
     let ln = l.as_number().unwrap_or(f64::NAN);
     let rn = r.as_number().unwrap_or(f64::NAN);
     match op {
@@ -1165,8 +1165,8 @@ fn eval_binop(op: BinOp, l: &Value, r: &Value) -> Result<Value, String> {
 }
 
 fn eval_unary(op: UnaryOp, o: &Value) -> Result<Value, String> {
-    use tish_ast::UnaryOp::*;
-    use tish_core::Value::*;
+    use tishlang_ast::UnaryOp::*;
+    use tishlang_core::Value::*;
     match op {
         Not => Ok(Bool(!o.is_truthy())),
         Neg => Ok(Number(-o.as_number().unwrap_or(f64::NAN))),

package/crates/tish_wasm/Cargo.toml

@@ -1,13 +1,15 @@
 [package]
-name = "tish_wasm"
+name = "tishlang_wasm"
 version = "0.1.0"
 edition = "2021"
 description = "WebAssembly backend for Tish - compiles to real .wasm"
 
+license-file = { workspace = true }
+repository = { workspace = true }
 [dependencies]
-tish_build_utils = { path = "../tish_build_utils" }
-tish_ast = { path = "../tish_ast" }
-tish_compile = { path = "../tish_compile" }
-tish_bytecode = { path = "../tish_bytecode" }
-tish_opt = { path = "../tish_opt" }
+tishlang_build_utils = { path = "../tish_build_utils" }
+tishlang_ast = { path = "../tish_ast" }
+tishlang_compile = { path = "../tish_compile" }
+tishlang_bytecode = { path = "../tish_bytecode" }
+tishlang_opt = { path = "../tish_opt" }
 base64 = "0.22"

package/crates/tish_wasm/src/lib.rs

@@ -8,9 +8,9 @@ use std::process::Command;
 
 use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
 
-use tish_ast::Program;
-use tish_bytecode::{serialize, Chunk};
-use tish_compile::{
+use tishlang_ast::Program;
+use tishlang_bytecode::{serialize, Chunk};
+use tishlang_compile::{
     detect_cycles, extract_native_import_features, has_external_native_imports, merge_modules,
     resolve_project,
 };
@@ -47,40 +47,40 @@ fn resolve_and_compile_to_chunk(
             message: e.to_string(),
         })?;
         if optimize {
-            tish_opt::optimize(&prog)
+            tishlang_opt::optimize(&prog)
         } else {
             prog
         }
     };
     let chunk = if optimize {
-        tish_bytecode::compile(&program).map_err(|e| WasmError {
+        tishlang_bytecode::compile(&program).map_err(|e| WasmError {
             message: e.to_string(),
         })?
     } else {
-        tish_bytecode::compile_unoptimized(&program).map_err(|e| WasmError {
+        tishlang_bytecode::compile_unoptimized(&program).map_err(|e| WasmError {
             message: e.to_string(),
         })?
     };
     Ok((chunk, program))
 }
 
-/// Compile a single Program (e.g. from js_to_tish) for WebAssembly.
+/// Compile a single Program (e.g. from tishlang_js_to_tish) for WebAssembly.
 pub fn compile_program_to_wasm(
     program: &Program,
     output_path: &Path,
     optimize: bool,
 ) -> Result<(), WasmError> {
     let program = if optimize {
-        tish_opt::optimize(program)
+        tishlang_opt::optimize(program)
     } else {
         program.clone()
     };
     let chunk = if optimize {
-        tish_bytecode::compile(&program).map_err(|e| WasmError {
+        tishlang_bytecode::compile(&program).map_err(|e| WasmError {
             message: e.to_string(),
         })?
     } else {
-        tish_bytecode::compile_unoptimized(&program).map_err(|e| WasmError {
+        tishlang_bytecode::compile_unoptimized(&program).map_err(|e| WasmError {
             message: e.to_string(),
         })?
     };
@@ -107,14 +107,14 @@ fn emit_wasm_from_chunk(chunk: &Chunk, output_path: &Path) -> Result<(), WasmErr
     std::fs::create_dir_all(&out_dir_abs).map_err(|e| WasmError {
         message: format!("Cannot create output directory: {}", e),
     })?;
-    let workspace_root = tish_build_utils::find_workspace_root().map_err(|e| WasmError {
+    let workspace_root = tishlang_build_utils::find_workspace_root().map_err(|e| WasmError {
         message: e,
     })?;
     let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".to_string());
     let build_status = Command::new(&cargo)
         .current_dir(&workspace_root)
         .args([
-            "build", "-p", "tish_wasm_runtime",
+            "build", "-p", "tishlang_wasm_runtime",
             "--target", "wasm32-unknown-unknown",
             "--release", "--features", "browser",
         ])
@@ -127,7 +127,7 @@ fn emit_wasm_from_chunk(chunk: &Chunk, output_path: &Path) -> Result<(), WasmErr
         });
     }
     let wasm_artifact = workspace_root
-        .join("target/wasm32-unknown-unknown/release/tish_wasm_runtime.wasm");
+        .join("target/wasm32-unknown-unknown/release/tishlang_wasm_runtime.wasm");
     if !wasm_artifact.exists() {
         return Err(WasmError {
             message: format!("Wasm artifact not found: {}", wasm_artifact.display()),
@@ -233,7 +233,7 @@ pub fn compile_to_wasi(
         message: format!("Cannot create output directory: {}", e),
     })?;
 
-    let workspace_root = tish_build_utils::find_workspace_root().map_err(|e| WasmError {
+    let workspace_root = tishlang_build_utils::find_workspace_root().map_err(|e| WasmError {
         message: e,
     })?;
 
@@ -248,7 +248,7 @@ pub fn compile_to_wasi(
         message: format!("Cannot write chunk: {}", e),
     })?;
 
-    // Cargo.toml - path to tish_wasm_runtime from build_dir
+    // Cargo.toml - path to tishlang_wasm_runtime (crate in crates/tish_wasm_runtime)
     let runtime_path = workspace_root
         .join("crates")
         .join("tish_wasm_runtime");
@@ -283,7 +283,7 @@ name = "tish_wasi_{stem}"
 path = "src/main.rs"
 
 [dependencies]
-tish_wasm_runtime = {{ path = "{runtime_path_str}"{features_str} }}
+tishlang_wasm_runtime = {{ path = "{runtime_path_str}"{features_str} }}
 "#,
         stem = stem,
         runtime_path_str = runtime_path_str,
@@ -297,7 +297,7 @@ tish_wasm_runtime = {{ path = "{runtime_path_str}"{features_str} }}
     let main_rs = r#"
 fn main() {
     let chunk = include_bytes!("../chunk.bin");
-    if let Err(e) = tish_wasm_runtime::run_wasi(chunk) {
+    if let Err(e) = tishlang_wasm_runtime::run_wasi(chunk) {
         eprintln!("Runtime error: {}", e);
         std::process::exit(1);
     }

package/crates/tish_wasm_runtime/Cargo.toml

@@ -1,23 +1,25 @@
 [package]
-name = "tish_wasm_runtime"
+name = "tishlang_wasm_runtime"
 version = "0.1.0"
 edition = "2021"
 description = "Tish VM compiled to WebAssembly (browser + Wasmtime/WASI)"
+license-file = { workspace = true }
+repository = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [features]
 # For wasm32-unknown-unknown (browser): wasm-bindgen, console output
-browser = ["dep:wasm-bindgen", "tish_vm/wasm"]
+browser = ["dep:wasm-bindgen", "tishlang_vm/wasm"]
 # Built-in modules for WASI (wasm32-wasip1): file I/O, process, http
-fs = ["tish_vm/fs"]
-process = ["tish_vm/process"]
-http = ["tish_vm/http"]
+fs = ["tishlang_vm/fs"]
+process = ["tishlang_vm/process"]
+http = ["tishlang_vm/http"]
 
 [dependencies]
-tish_bytecode = { path = "../tish_bytecode" }
-tish_vm = { path = "../tish_vm" }
+tishlang_bytecode = { path = "../tish_bytecode" }
+tishlang_vm = { path = "../tish_vm" }
 wasm-bindgen = { version = "0.2", optional = true }
 
 # rand_core → getrandom 0.4 needs wasm_js on wasm32-unknown-unknown (browser VM build).

package/crates/tish_wasm_runtime/src/lib.rs

@@ -4,12 +4,12 @@
 //! - **Browser** (wasm32-unknown-unknown): use `--features browser`, wasm-bindgen, console output
 //! - **WASI/Wasmtime** (wasm32-wasi): no features, println! via WASI, run with `wasmtime app.wasm`
 
-use tish_bytecode::deserialize;
-use tish_vm::Vm;
+use tishlang_bytecode::deserialize;
+use tishlang_vm::Vm;
 
 /// Run serialized Tish bytecode (WASI/Wasmtime or native).
 ///
-/// `chunk` is the output of `tish_bytecode::serialize(chunk)`.
+/// `chunk` is the output of `tishlang_bytecode::serialize(chunk)`.
 /// Uses println! for output (WASI fd_write when built for wasm32-wasi).
 #[cfg(not(feature = "browser"))]
 pub fn run_wasi(chunk: &[u8]) -> Result<(), String> {
@@ -21,7 +21,7 @@ pub fn run_wasi(chunk: &[u8]) -> Result<(), String> {
 
 /// Run serialized Tish bytecode in the browser.
 ///
-/// `chunk` is the output of `tish_bytecode::serialize(chunk)`.
+/// `chunk` is the output of `tishlang_bytecode::serialize(chunk)`.
 /// Errors are returned as a JsValue (string).
 #[cfg(feature = "browser")]
 use wasm_bindgen::prelude::*;

package/justfile

@@ -144,12 +144,12 @@ test-secure:
     cargo test --no-default-features
 
 # Install tish CLI (secure mode - no dangerous features)
-install:
-    cargo install --path crates/tish --no-default-features
+install *ARGS:
+    cargo install --path crates/tish --no-default-features {{ARGS}}
 
 # Install tish CLI with all features
-install-full:
-    cargo install --path crates/tish --features full
+install-full *ARGS:
+    cargo install --path crates/tish --features full {{ARGS}}
 
 # Check compilation for all feature combinations
 check-all:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tishlang/tish",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Tish - minimal TS/JS-compatible language. Run, REPL, compile to native.",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {