feat: cli commands collect and expand-pl (#3739)

prqlc/prql-compiler/src/codegen/ast.rs

@@ -312,7 +312,13 @@ impl WriteSource for Stmt {
             }
             StmtKind::VarDef(var_def) => match var_def.kind {
                 VarDefKind::Let => {
-                    r += opt.consume(&format!("let {} = ", var_def.name))?;
+                    let typ = if let Some(ty) = &var_def.ty_expr {
+                        format!("<{}> ", ty.write(opt.clone())?)
+                    } else {
+                        "".to_string()
+                    };
+
+                    r += opt.consume(&format!("let {} {}= ", var_def.name, typ))?;
 
                     r += &var_def.value.write(opt)?;
                     r += "\n";

prqlc/prql-compiler/src/ir/pl/expr.rs

@@ -141,3 +141,21 @@ pub struct FuncParam {
 pub type Range = generic::Range<Box<Expr>>;
 pub type InterpolateItem = generic::InterpolateItem<Expr>;
 pub type SwitchCase = generic::SwitchCase<Box<Expr>>;
+
+impl From<Literal> for ExprKind {
+    fn from(value: Literal) -> Self {
+        ExprKind::Literal(value)
+    }
+}
+
+impl From<Ident> for ExprKind {
+    fn from(value: Ident) -> Self {
+        ExprKind::Ident(value)
+    }
+}
+
+impl From<Func> for ExprKind {
+    fn from(value: Func) -> Self {
+        ExprKind::Func(Box::new(value))
+    }
+}

prqlc/prql-compiler/src/ir/pl/extra/expr.rs

@@ -1,5 +1,4 @@
 use enum_as_inner::EnumAsInner;
-use prqlc_ast::expr::{Ident, Literal};
 use serde::{Deserialize, Serialize};
 
 use crate::ir::generic::WindowKind;
@@ -133,21 +132,3 @@ impl Expr {
         }
     }
 }
-
-impl From<Literal> for ExprKind {
-    fn from(value: Literal) -> Self {
-        ExprKind::Literal(value)
-    }
-}
-
-impl From<Ident> for ExprKind {
-    fn from(value: Ident) -> Self {
-        ExprKind::Ident(value)
-    }
-}
-
-impl From<Func> for ExprKind {
-    fn from(value: Func) -> Self {
-        ExprKind::Func(Box::new(value))
-    }
-}