reordenate the lib

Author: skidy89

__test__/languages.d.ts

@@ -3,25 +3,15 @@
 
 /* eslint-disable */
 export interface Lang {
-    /** This is a {placeholder} test. */
-    'test_placeholder': (args: { placeholder: string }) => string;
-    /**
-     * [
-     * "value1",
-     * "value2 with {placeholder}",
-     * "value3",
-     * ]
-     */
-    'tested_array': string[];
-    /** hello world */
-    'hello': string;
     /**
-     * "this is
+     * this is
      * a multi-line
      * string
-     * test"
+     * test
      */
     'test': string;
+    /** hello world */
+    'hello': string;
     /**
      * [
      * "key1",
@@ -30,6 +20,16 @@ export interface Lang {
      * ]
      */
     'array': string[];
+    /** This is a {placeholder} test. */
+    'test_placeholder': (args: { placeholder: string }) => string;
+    /**
+     * [
+     * "value1",
+     * "value2 with {placeholder}",
+     * "value3",
+     * ]
+     */
+    'tested_array': string[];
 }
 
 export interface Langs {

__test__/sec/e.lang

@@ -0,0 +1,23 @@
+# test file
+# This file is used to test the project
+# It contains test cases for various functionalities
+# including language loading and processing.
+# The tests are written using the AVA testing framework.
+
+hello = "hello world"
+test = "this is 
+a multi-line
+string
+test"
+array = [
+"key1",
+"key2",
+"key3"
+]
+# it should not generate placeholder for array types
+test_placeholder = "This is a {placeholder} test."
+tested_array = [
+"value1",
+"value2 with {placeholder}",
+"value3",
+]

index.d.ts

@@ -1,11 +1,7 @@
 /* auto-generated by NAPI-RS */
 /* eslint-disable */
-export declare function clearLangCache(): void
-
 export declare function generateTypescriptDefs(dir: string, output: string, genPlaceholder?: boolean | undefined | null): void
 
-export declare function loadChdlang(dir: string): object
-
-export declare function loadLang(path: string): object
+export declare function loadCachedLangs(dir: string): object
 
 export declare function loadLangs(dir: string): object

index.js

@@ -572,8 +572,6 @@ if (!nativeBinding) {
 }
 
 module.exports = nativeBinding
-module.exports.clearLangCache = nativeBinding.clearLangCache
 module.exports.generateTypescriptDefs = nativeBinding.generateTypescriptDefs
-module.exports.loadChdlang = nativeBinding.loadChdlang
-module.exports.loadLang = nativeBinding.loadLang
+module.exports.loadCachedLangs = nativeBinding.loadCachedLangs
 module.exports.loadLangs = nativeBinding.loadLangs

src/cache.rs

@@ -0,0 +1,12 @@
+use crate::loader::LangCache;
+use once_cell::sync::OnceCell;
+
+static LANG_CACHE: OnceCell<LangCache> = OnceCell::new();
+
+pub fn get() -> Option<&'static LangCache> {
+  LANG_CACHE.get()
+}
+
+pub fn set(langs: LangCache) {
+  let _ = LANG_CACHE.set(langs);
+}

src/lib.rs

@@ -1,164 +1,31 @@
+pub mod cache;
+pub mod loader;
+pub mod parser;
 use napi::{
   bindgen_prelude::{JsObjectValue, Object},
   Env, Error, Result,
 };
 use napi_derive::napi;
-use once_cell::sync::Lazy;
-use rayon::prelude::*;
+use std::fs;
+use std::path::Path;
 
-use std::{collections::HashMap, fs, path::Path, sync::RwLock};
-
-type LangCache = HashMap<String, HashMap<String, String>>;
-static LANG_CACHE: Lazy<RwLock<Option<LangCache>>> = Lazy::new(|| RwLock::new(None));
-
-#[napi]
-pub fn load_lang(env: &Env, path: String) -> Result<Object<'_>> {
-  let path = Path::new(&path);
-  if !path.is_file() {
-    return Err(Error::from_reason(format!(
-      "Path '{}' is not a file",
-      path.display()
-    )));
-  }
-
-  let data = fs::read_to_string(path)
-    .map_err(|e| Error::from_reason(format!("Cannot read file '{}': {}", path.display(), e)))?;
-  let map = parse_lang_data(&data);
-  let mut js = Object::new(&env)?;
-  for (k, v) in map {
-    js.set_named_property(&k, env.create_string(&v)?)?;
-  }
-  Ok(js)
-}
-
-fn parse_lang_data(data: &str) -> HashMap<String, String> {
-  let mut map = HashMap::new();
-  let mut ckey: Option<String> = None;
-  let mut cval = String::new();
-  let mut mtl = false;
-  let mut is_array = false;
-
-  for line in data.lines() {
-    let line = line.trim_end();
-    if line.is_empty() || line.starts_with('#') {
-      continue;
-    }
-
-    if mtl {
-      cval.push_str(line);
-      cval.push('\n');
-      if (is_array && line.trim().ends_with(']'))
-        || (!is_array && line.trim().ends_with('"') && !line.trim().ends_with("\\\""))
-      {
-        mtl = false;
-        if let Some(key) = ckey.take() {
-          map.insert(key, cval.trim().to_string());
-        }
-        cval.clear();
-        is_array = false;
-      }
-      continue;
-    }
-
-    if let Some(pos) = line.find('=') {
-      let key = line[..pos].trim().to_string();
-      let value = line[pos + 1..].trim();
-
-      if key.is_empty() {
-        continue;
-      }
-
-      if value.starts_with('[') {
-        if !value.ends_with(']') {
-          mtl = true;
-          is_array = true;
-          ckey = Some(key);
-          cval = value.to_string();
-          cval.push('\n');
-        } else {
-          map.insert(key, value.to_string());
-        }
-      } else if value.starts_with('"') {
-        if !value.ends_with('"') || value.ends_with("\\\"") {
-          mtl = true;
-          ckey = Some(key);
-          cval = value.to_string();
-          cval.push('\n');
-        } else {
-          map.insert(key, value.trim_matches('"').to_string());
-        }
-      } else {
-        map.insert(key, value.to_string());
-      }
-    }
-  }
-
-  map
-}
-
-pub fn validate_path_is_dir(dir: &str) -> Result<&Path> {
-  let dirpath = Path::new(dir);
-  if !dirpath.is_dir() {
-    return Err(Error::from_reason(format!(
-      "Path '{}' is not a directory",
-      dir
-    )));
-  }
-  Ok(dirpath)
-}
-
-pub fn validate_files(files: &Path) -> Result<Vec<std::path::PathBuf>> {
-  let fl: Vec<_> = fs::read_dir(files)
-    .map_err(|e| Error::from_reason(e.to_string()))?
-    .filter_map(|entry| {
-      let entry = entry.ok()?;
-      let path = entry.path();
-      if path.extension()? == "lang" {
-        Some(path)
-      } else {
-        None
-      }
-    })
-    .collect();
-  Ok(fl)
-}
-
-fn load_lang_dsk(dir: &str) -> Result<LangCache> {
-  let dirpath = validate_path_is_dir(dir)?;
-  let files = validate_files(dirpath)?;
-  let results: LangCache = files
-    .par_iter()
-    .filter_map(|path| {
-      let name = path.file_stem()?.to_string_lossy().to_string();
-      let data = fs::read_to_string(path).ok()?;
-      Some((name, parse_lang_data(&data)))
-    })
-    .collect();
-  Ok(results)
-}
+use crate::loader::{load_lang_dir, LangCache};
 
 #[napi]
-pub fn load_langs(env: &Env, dir: String) -> Result<Object<'_>> {
-  let results = load_lang_dsk(&dir)?;
-  to_js(env, &results)
+pub fn load_langs<'a>(env: &'a Env, dir: String) -> Result<Object<'a>> {
+  let langs = load_lang_dir(Path::new(&dir))?;
+  to_js(env, &langs)
 }
 
 #[napi]
-pub fn load_chdlang(env: &Env, dir: String) -> Result<Object<'_>> {
-  {
-    let cache = LANG_CACHE.read().unwrap();
-    if let Some(cached) = &*cache {
-      return to_js(env, cached);
-    }
+pub fn load_cached_langs<'a>(env: &'a Env, dir: String) -> Result<Object<'a>> {
+  if let Some(cached) = cache::get() {
+    return to_js(env, cached);
   }
 
-  let langs = load_lang_dsk(&dir)?;
-  {
-    let mut cache = LANG_CACHE.write().unwrap();
-    *cache = Some(langs.clone());
-  }
-
-  to_js(env, &langs)
+  let langs = load_lang_dir(Path::new(&dir))?;
+  cache::set(langs);
+  to_js(env, cache::get().unwrap())
 }
 
 fn to_js<'a>(env: &'a Env, langs: &LangCache) -> Result<Object<'a>> {
@@ -208,7 +75,7 @@ pub fn generate_typescript_defs(
   output: String,
   gen_placeholder: Option<bool>,
 ) -> Result<()> {
-  let langs = load_lang_dsk(&dir)?;
+  let langs = load_lang_dir(Path::new(&dir))?;
   let mut defs = String::new();
   defs.push_str("// THIS FILE WAS GENERATED BY SSL\n");
   defs.push_str("// DO NOT EDIT MANUALLY OR ELSE IT WILL BE OVERWRITTEN\n\n");
@@ -271,9 +138,3 @@ pub fn generate_typescript_defs(
   }
   Ok(())
 }
-
-#[napi]
-pub fn clear_lang_cache() {
-  let mut cache = LANG_CACHE.write().unwrap();
-  *cache = None;
-}

src/loader.rs

@@ -0,0 +1,29 @@
+use crate::parser::{parse_lang_data, LangMap};
+use rayon::prelude::*;
+use std::{collections::HashMap, fs, path::Path};
+
+pub type LangCache = HashMap<String, LangMap>;
+
+pub fn load_lang_dir(dir: &Path) -> napi::Result<LangCache> {
+  if !dir.is_dir() {
+    return Err(napi::Error::from_reason("Not a directory"));
+  }
+
+  let files: Vec<_> = fs::read_dir(dir)?
+    .filter_map(|e| {
+      let p = e.ok()?.path();
+      (p.extension()? == "lang").then_some(p)
+    })
+    .collect();
+
+  Ok(
+    files
+      .par_iter()
+      .filter_map(|p| {
+        let name = p.file_stem()?.to_string_lossy().to_string();
+        let data = fs::read_to_string(p).ok()?;
+        Some((name, parse_lang_data(&data)))
+      })
+      .collect(),
+  )
+}