shorten frequent name in js; tag 0.9.13

Author: tiye

Cargo.lock

@@ -1,8 +1,7 @@
-cargo-features = ["edition2024"]
 
 [package]
 name = "calcit"
-version = "0.9.12"
+version = "0.9.13"
 authors = ["jiyinyiyong <jiyinyiyong@gmail.com>"]
 edition = "2024"
 license = "MIT"

Cargo.toml

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^22.15.24",

package.json

@@ -233,10 +233,10 @@ fn to_js_code(
         match &**info {
           ImportInfo::Core { at_ns } => {
             if &**at_ns == calcit::CORE_NS {
-              // functions under core uses built $calcit module entry
+              // functions under core uses built $clt module entry
               Ok(escape_var(def))
             } else {
-              Ok(format!("$calcit.{}", escape_var(def)))
+              Ok(format!("$clt.{}", escape_var(def)))
             }
           }
           ImportInfo::NsAs { .. } => {
@@ -313,7 +313,7 @@ fn gen_call_code(
   return_label: Option<&str>,
 ) -> Result<String, String> {
   let return_code = return_label.unwrap_or("");
-  let var_prefix = if ns == calcit::CORE_NS { "" } else { "$calcit." };
+  let var_prefix = if ns == calcit::CORE_NS { "" } else { "$clt." };
   let proc_prefix = get_proc_prefix(ns);
   if ys.is_empty() {
     println!("[Warn] Unexpected empty list inside {xs}");
@@ -629,7 +629,7 @@ struct PassedDefs<'a> {
 
 fn gen_symbol_code(s: &str, def_ns: &str, at_def: &str, xs: &Calcit, passed_defs: &PassedDefs) -> Result<String, String> {
   // println!("gen symbol: {} {} {} {:?}", s, def_ns, ns, resolved);
-  let var_prefix = if passed_defs.ns == calcit::CORE_NS { "" } else { "$calcit." };
+  let var_prefix = if passed_defs.ns == calcit::CORE_NS { "" } else { "$clt." };
   if has_ns_part(s) {
     unreachable!("unknown feature: {s} {def_ns} {at_def} {xs}");
   }
@@ -887,7 +887,7 @@ fn gen_args_code(
   tags: &RefCell<HashSet<EdnTag>>,
 ) -> Result<String, String> {
   let mut result = String::from("");
-  let var_prefix = if ns == "calcit.core" { "" } else { "$calcit." };
+  let var_prefix = if ns == "calcit.core" { "" } else { "$clt." };
   let mut spreading = false;
   for x in body {
     match x {
@@ -974,7 +974,7 @@ fn gen_js_func(
   tags: &RefCell<HashSet<EdnTag>>,
   at_ns: &str,
 ) -> Result<String, String> {
-  let var_prefix = if passed_defs.ns == "calcit.core" { "" } else { "$calcit." };
+  let var_prefix = if passed_defs.ns == "calcit.core" { "" } else { "$clt." };
   let mut local_defs = passed_defs.local_defs.to_owned();
   let mut spreading_code = String::from(""); // js list and calcit-js list are different, need to convert
   let mut args_code = String::from("");
@@ -1268,7 +1268,7 @@ pub fn emit_js(entry_ns: &str, emit_path: &str) -> Result<(), String> {
     let mut import_code = if &*ns == "calcit.core" {
       snippets::tmpl_import_procs(wrap_js_str("@calcit/procs"))
     } else {
-      format!("\nimport * as $calcit from {core_lib};")
+      format!("\nimport * as $clt from {core_lib};")
     };
 
     let mut def_names: HashSet<Arc<str>> = HashSet::new(); // multiple parts of scoped defs need to be tracked
@@ -1288,7 +1288,7 @@ pub fn emit_js(entry_ns: &str, emit_path: &str) -> Result<(), String> {
           continue;
         }
         if is_preferred_js_proc(&def) {
-          writeln!(defs_code, "\nvar {} = $calcit_procs.{};", escape_var(&def), escape_var(&def)).expect("write");
+          writeln!(defs_code, "\nvar {} = $procs.{};", escape_var(&def), escape_var(&def)).expect("write");
           continue;
         }
       }
@@ -1298,7 +1298,7 @@ pub fn emit_js(entry_ns: &str, emit_path: &str) -> Result<(), String> {
       match &f {
         // probably not work here
         Calcit::Proc(..) => {
-          writeln!(defs_code, "\nvar {} = $calcit_procs.{};", escape_var(&def), escape_var(&def)).expect("write");
+          writeln!(defs_code, "\nvar {} = $procs.{};", escape_var(&def), escape_var(&def)).expect("write");
         }
         Calcit::Fn { info, .. } => {
           gen_stack::push_call_stack(&info.def_ns, &info.name, StackKind::Codegen, f.to_owned(), &[]);
@@ -1393,7 +1393,7 @@ pub fn emit_js(entry_ns: &str, emit_path: &str) -> Result<(), String> {
       }
     }
 
-    let tag_prefix = if &*ns == "calcit.core" { "" } else { "$calcit." };
+    let tag_prefix = if &*ns == "calcit.core" { "" } else { "$clt." };
     let mut tag_arr = String::from("[");
     let mut ordered_tags: Vec<EdnTag> = vec![];
     for k in collected_tags.borrow().iter() {
@@ -1445,7 +1445,7 @@ fn is_cirru_string(s: &str) -> bool {
 
 #[inline(always)]
 fn get_proc_prefix(ns: &str) -> &str {
-  if ns == calcit::CORE_NS { "$calcit_procs." } else { "$calcit." }
+  if ns == calcit::CORE_NS { "$procs." } else { "$clt." }
 }
 
 fn cirru_to_js(code: &Cirru) -> Result<String, String> {

src/codegen/emit_js.rs

@@ -43,7 +43,7 @@ pub fn tmpl_args_exact(name: &str, args_count: usize, at_ns: &str) -> String {
   let proc_ns = get_proc_prefix(at_ns);
   format!(
     "
-  if (arguments.length !== {}) throw {}_calcit_args_mismatch('{}', {}, arguments.length);",
+  if (arguments.length !== {}) throw {}_args_throw('{}', {}, arguments.length);",
     args_count, proc_ns, name, args_count
   )
 }
@@ -109,7 +109,7 @@ pub fn tmpl_import_procs(name: String) -> String {
   format!(
     "
 import {{newTag, arrayToList, listToArray, CalcitSliceList, CalcitSymbol, CalcitRecur}} from {};
-import * as $calcit_procs from {};
+import * as $procs from {};
 export * from {};
 ",
     name, name, name,
@@ -119,7 +119,7 @@ export * from {};
 pub fn tmpl_classes_registering() -> String {
   format!(
     "
-$calcit_procs.register_calcit_builtin_classes({{
+$procs.register_calcit_builtin_classes({{
   list: _$n_core_list_class,
   map: _$n_core_map_class,
   number: _$n_core_number_class,
@@ -129,7 +129,7 @@ $calcit_procs.register_calcit_builtin_classes({{
   fn: _$n_core_fn_class,
 }});
 
-let runtimeVersion = $calcit_procs.calcit_version;
+let runtimeVersion = $procs.calcit_version;
 let cli_version = '{}';
 
 if (runtimeVersion !== cli_version) {{

src/codegen/emit_js/snippets.rs

@@ -1527,7 +1527,7 @@ export let macroexpand = unavailableProc;
 export let macroexpand_all = unavailableProc;
 export let _$n_get_calcit_running_mode = unavailableProc;
 
-export let _calcit_args_mismatch = (name: string, expected: number, got: number) => {
+export let _args_throw = (name: string, expected: number, got: number) => {
   return new Error(`\`${name}\` expected ${expected} params, got ${got}`);
 };