@tishlang/tish 1.6.0 → 1.8.0

package/crates/tish_compile/src/infer.rs

@@ -22,7 +22,9 @@ pub struct InferCtx {
 
 impl InferCtx {
     pub fn new() -> Self {
-        Self { scopes: vec![HashMap::new()] }
+        Self {
+            scopes: vec![HashMap::new()],
+        }
     }
 
     fn push_scope(&mut self) {
@@ -75,17 +77,16 @@ pub fn infer_expr_type(expr: &Expr, ctx: &InferCtx) -> Option<TypeAnnotation> {
             Literal::Null => None,
         },
         Expr::Ident { name, .. } => ctx.lookup(name.as_ref()).cloned(),
-        Expr::Binary { left, op, right, .. } => {
+        Expr::Binary {
+            left, op, right, ..
+        } => {
             let lt = infer_expr_type(left, ctx)?;
             let rt = infer_expr_type(right, ctx)?;
             if is_number(&lt) && is_number(&rt) {
                 match op {
-                    BinOp::Add
-                    | BinOp::Sub
-                    | BinOp::Mul
-                    | BinOp::Div
-                    | BinOp::Mod
-                    | BinOp::Pow => Some(number_ann()),
+                    BinOp::Add | BinOp::Sub | BinOp::Mul | BinOp::Div | BinOp::Mod | BinOp::Pow => {
+                        Some(number_ann())
+                    }
                     BinOp::Lt
                     | BinOp::Le
                     | BinOp::Gt
@@ -103,7 +104,11 @@ pub fn infer_expr_type(expr: &Expr, ctx: &InferCtx) -> Option<TypeAnnotation> {
             match op {
                 UnaryOp::Neg | UnaryOp::Pos => {
                     let t = infer_expr_type(operand, ctx)?;
-                    if is_number(&t) { Some(number_ann()) } else { None }
+                    if is_number(&t) {
+                        Some(number_ann())
+                    } else {
+                        None
+                    }
                 }
                 UnaryOp::Not => Some(bool_ann()),
                 _ => None,
@@ -117,7 +122,9 @@ pub fn infer_expr_type(expr: &Expr, ctx: &InferCtx) -> Option<TypeAnnotation> {
 /// type annotations filled in on `VarDecl` nodes.
 pub fn infer_program(program: &Program) -> Program {
     let mut ctx = InferCtx::new();
-    Program { statements: infer_statements(&program.statements, &mut ctx) }
+    Program {
+        statements: infer_statements(&program.statements, &mut ctx),
+    }
 }
 
 fn infer_statements(stmts: &[Statement], ctx: &mut InferCtx) -> Vec<Statement> {
@@ -126,7 +133,14 @@ fn infer_statements(stmts: &[Statement], ctx: &mut InferCtx) -> Vec<Statement> {
 
 fn infer_statement(stmt: &Statement, ctx: &mut InferCtx) -> Statement {
     match stmt {
-        Statement::VarDecl { name, mutable, type_ann, init, span } => {
+        Statement::VarDecl {
+            name,
+            name_span,
+            mutable,
+            type_ann,
+            init,
+            span,
+        } => {
             // Already annotated — propagate into ctx but don't change the node.
             if let Some(ann) = type_ann {
                 ctx.define(name.as_ref(), ann.clone());
@@ -139,6 +153,7 @@ fn infer_statement(stmt: &Statement, ctx: &mut InferCtx) -> Statement {
             }
             Statement::VarDecl {
                 name: name.clone(),
+                name_span: *name_span,
                 mutable: *mutable,
                 type_ann: inferred,
                 init: init.clone(),
@@ -149,9 +164,18 @@ fn infer_statement(stmt: &Statement, ctx: &mut InferCtx) -> Statement {
             ctx.push_scope();
             let stmts = infer_statements(statements, ctx);
             ctx.pop_scope();
-            Statement::Block { statements: stmts, span: *span }
+            Statement::Block {
+                statements: stmts,
+                span: *span,
+            }
         }
-        Statement::For { init, cond, update, body, span } => {
+        Statement::For {
+            init,
+            cond,
+            update,
+            body,
+            span,
+        } => {
             // Scope for loop variable
             ctx.push_scope();
             let new_init = init.as_ref().map(|i| Box::new(infer_statement(i, ctx)));
@@ -165,12 +189,19 @@ fn infer_statement(stmt: &Statement, ctx: &mut InferCtx) -> Statement {
                 span: *span,
             }
         }
-        Statement::ForOf { name, iterable, body, span } => {
+        Statement::ForOf {
+            name,
+            name_span,
+            iterable,
+            body,
+            span,
+        } => {
             ctx.push_scope();
             let new_body = Box::new(infer_statement(body, ctx));
             ctx.pop_scope();
             Statement::ForOf {
                 name: name.clone(),
+                name_span: *name_span,
                 iterable: iterable.clone(),
                 body: new_body,
                 span: *span,
@@ -180,17 +211,32 @@ fn infer_statement(stmt: &Statement, ctx: &mut InferCtx) -> Statement {
             ctx.push_scope();
             let new_body = Box::new(infer_statement(body, ctx));
             ctx.pop_scope();
-            Statement::While { cond: cond.clone(), body: new_body, span: *span }
+            Statement::While {
+                cond: cond.clone(),
+                body: new_body,
+                span: *span,
+            }
         }
         Statement::DoWhile { body, cond, span } => {
             ctx.push_scope();
             let new_body = Box::new(infer_statement(body, ctx));
             ctx.pop_scope();
-            Statement::DoWhile { body: new_body, cond: cond.clone(), span: *span }
+            Statement::DoWhile {
+                body: new_body,
+                cond: cond.clone(),
+                span: *span,
+            }
         }
-        Statement::If { cond, then_branch, else_branch, span } => {
+        Statement::If {
+            cond,
+            then_branch,
+            else_branch,
+            span,
+        } => {
             let new_then = Box::new(infer_statement(then_branch, ctx));
-            let new_else = else_branch.as_ref().map(|e| Box::new(infer_statement(e, ctx)));
+            let new_else = else_branch
+                .as_ref()
+                .map(|e| Box::new(infer_statement(e, ctx)));
             Statement::If {
                 cond: cond.clone(),
                 then_branch: new_then,
@@ -198,7 +244,16 @@ fn infer_statement(stmt: &Statement, ctx: &mut InferCtx) -> Statement {
                 span: *span,
             }
         }
-        Statement::FunDecl { async_, name, params, rest_param, return_type, body, span } => {
+        Statement::FunDecl {
+            async_,
+            name,
+            name_span,
+            params,
+            rest_param,
+            return_type,
+            body,
+            span,
+        } => {
             ctx.push_scope();
             for p in params {
                 if let FunParam::Simple(tp) = p {
@@ -217,6 +272,7 @@ fn infer_statement(stmt: &Statement, ctx: &mut InferCtx) -> Statement {
             Statement::FunDecl {
                 async_: *async_,
                 name: name.clone(),
+                name_span: *name_span,
                 params: params.clone(),
                 rest_param: rest_param.clone(),
                 return_type: return_type.clone(),

package/crates/tish_compile/src/lib.rs

@@ -7,18 +7,19 @@ mod infer;
 mod resolve;
 mod types;
 
+pub use codegen::CompileError;
 pub use codegen::{
     compile, compile_project, compile_project_full, compile_with_features,
     compile_with_native_modules, compile_with_project_root,
 };
-pub use codegen::CompileError;
 pub use resolve::{
     cargo_export_fn_name, compute_native_build_artifacts, detect_cycles, export_name_to_rust_ident,
     extract_native_import_features, format_rust_dependencies_toml, generate_native_wrapper_rs,
     has_external_native_imports, has_native_imports, infer_native_module_exports,
-    is_builtin_native_spec, is_cargo_native_spec, merge_modules, read_project_tish_config,
-    resolve_native_modules, resolve_project, resolve_project_from_stdin, NativeBuildArtifacts,
-    NativeModuleInit, ResolvedNativeModule,
+    is_builtin_native_spec, is_cargo_native_spec, is_native_import, merge_modules,
+    normalize_builtin_spec, read_project_tish_config,
+    resolve_bare_spec, resolve_native_modules, resolve_project, resolve_project_from_stdin,
+    MergedProgram, NativeBuildArtifacts, NativeModuleInit, ResolvedNativeModule,
 };
 pub use types::{RustType, TypeContext};
 
@@ -44,7 +45,10 @@ fn sum(...args: number[]): number {
         // total should be declared as f64
         assert!(rust.contains("let mut total: f64"), "expected total: f64");
         // The return value of run() should convert total back to Value
-        assert!(rust.contains("Value::Number(total)"), "expected Value::Number(total) wrapping");
+        assert!(
+            rust.contains("Value::Number(total)"),
+            "expected Value::Number(total) wrapping"
+        );
     }
 
     #[test]
@@ -60,7 +64,10 @@ for (let i = 0; i < 5; i = i + 1) {
         let program = parse(src).unwrap();
         let rust = compile(&program).unwrap();
         // outerVar and x are f64 (inferred) — Copy assignment, no .clone() needed.
-        assert!(rust.contains("let mut outerVar: f64"), "expected outerVar: f64");
+        assert!(
+            rust.contains("let mut outerVar: f64"),
+            "expected outerVar: f64"
+        );
         assert!(rust.contains("let mut x: f64"), "expected x: f64");
     }
 
@@ -105,13 +112,17 @@ fn factory() {
         // This test verifies the full benchmark_granular project compiles and that outerVar
         // is emitted as the inferred f64 type rather than requiring a Value clone.
         let manifest = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        let bench = manifest.join("../../tests/core/benchmark_granular.tish").canonicalize().unwrap();
+        let bench = manifest
+            .join("../../tests/core/benchmark_granular.tish")
+            .canonicalize()
+            .unwrap();
         // Use same default features as tish CLI (http, fs, process, regex)
         let features = ["http", "fs", "process", "regex"]
             .into_iter()
             .map(String::from)
             .collect::<Vec<_>>();
-        let (rust, _, _, _) = compile_project_full(&bench, bench.parent(), &features, true).unwrap();
+        let (rust, _, _, _) =
+            compile_project_full(&bench, bench.parent(), &features, true).unwrap();
         // outerVar = 42 is inferred as f64; f64 is Copy so no .clone() is emitted.
         assert!(
             rust.contains("let mut outerVar: f64"),