dev: optimize misc (#1)

Author: keroxp

.gitignore

@@ -1 +1,2 @@
-/.idea/
+/.idea/
+node_modules/

.prettierignore

@@ -0,0 +1,2 @@
+src/ngrams/**.js
+src/dictionary.js

package-lock.json

@@ -2,7 +2,7 @@
   "name": "eld",
   "version": "1.0.1",
   "description": "Fast and accurate natural language detection. Detector written in Javascript. Efficient language detector, Nito-ELD, ELD.",
-  "main": "src/languageDetector.js",
+  "main": "src/entries/dynamic.js",
   "type": "module",
   "repository": {
     "type": "git",
@@ -17,6 +17,9 @@
     "language-detector",
     "language-identification"
   ],
+  "scripts": {
+    "fmt": "prettier 'src/**/*.js' --write"
+  },
   "author": {
     "name": "Nito T.M.",
     "url": "https://github.com/nitotm"
@@ -26,5 +29,8 @@
   "bugs": {
     "url": "https://github.com/nitotm/efficient-language-detector-js/issues"
   },
-  "homepage": "https://github.com/nitotm/efficient-language-detector-js#readme"
+  "homepage": "https://github.com/nitotm/efficient-language-detector-js#readme",
+  "devDependencies": {
+    "prettier": "^3.3.3"
+  }
 }

package.json

@@ -5,7 +5,7 @@ Author Nito T.M. (https://github.com/nitotm)
 Package npmjs.com/package/eld
 */
 
-import { avgScore } from './avgScore.js'
+import { avgScore } from "./avgScore.js";
 
 export class LanguageResult {
   /**
@@ -17,10 +17,10 @@ export class LanguageResult {
    * @param {Object} langCodes
    * @memberof LanguageResult
    */
-  constructor (language, results, numNgrams, langCodes) {
-    this.language = language
-    this.getScores = () => getScores(results, langCodes) // returns object
-    this.isReliable = () => isReliable(results, numNgrams, language) // returns boolean
+  constructor(language, results, numNgrams, langCodes) {
+    this.language = language;
+    this.getScores = () => getScores(results, langCodes); // returns object
+    this.isReliable = () => isReliable(results, numNgrams, language); // returns boolean
   }
 }
 
@@ -30,15 +30,16 @@ export class LanguageResult {
  * @param {string} language
  * @returns {boolean}
  */
-function isReliable (results, numNgrams, language) {
+function isReliable(results, numNgrams, language) {
   if (!results.length || numNgrams < 3) {
-    return false
+    return false;
   }
-  const nextScore = results.length > 1 ? results[1][0] : 0
+  const nextScore = results.length > 1 ? results[1][0] : 0;
   // A minimum of a 24% per ngram score from average
-  return !(avgScore[language] * 0.24 > results[0][1] / numNgrams || 0.01 >
-    Math.abs(results[0][1] - nextScore))
-
+  return !(
+    avgScore[language] * 0.24 > results[0][1] / numNgrams ||
+    0.01 > Math.abs(results[0][1] - nextScore)
+  );
 }
 
 /**
@@ -47,16 +48,15 @@ function isReliable (results, numNgrams, language) {
  * @param {Object} langCodes
  * @returns {Object}
  */
-function getScores (results, langCodes) {
-  let scores = {}
-  let key
+function getScores(results, langCodes) {
+  let scores = {};
+  let key;
   for (key in results) {
-    let score = results[key][1]
+    let score = results[key][1];
     if (score === 0) {
-      break
+      break;
     }
-    scores[langCodes[results[key][0]]] = score
+    scores[langCodes[results[key][0]]] = score;
   }
-  return scores
+  return scores;
 }
-

src/LanguageResult.js

@@ -60,7 +60,7 @@ export const avgScore = {
   vi: 0.0467,
   yo: 0.0329,
   zh: 0.0152,
-}
+};
 
 /* Deprecated for now: Some languages score higher with the same amount of text, this multiplier evens it out for
  *  multi-language strings

src/avgScore.js

@@ -0,0 +1,21 @@
+import { setNgrams, languageData } from "../languageData.js";
+import { eld } from "../languageDetector.js";
+
+/**
+ * @param {string} file File inside /ngrams/, with ELD ngrams data format
+ * @returns {boolean|undefined} true if file was loaded
+ */
+export async function loadNgrams(file) {
+  return await import("../ngrams/" + file).then((module) => {
+    setNgrams(module.ngramsData);
+    if (languageData.type) {
+      return true;
+    }
+  });
+}
+
+await loadNgrams("ngramsM60.js");
+
+const withLoader = { ...eld, loadNgrams };
+
+export { withLoader as eld };

src/entries/dynamic.js

@@ -0,0 +1,4 @@
+import { setNgrams } from "../languageData.js";
+import { ngramsData } from "../ngrams/ngramsL60.js";
+setNgrams(ngramsData);
+export * from "../languageDetector.js";

src/entries/static.L60.js

@@ -0,0 +1,4 @@
+import { setNgrams } from "../languageData.js";
+import { ngramsData } from "../ngrams/ngramsM60.js";
+setNgrams(ngramsData);
+export * from "../languageDetector.js";

src/entries/static.M60.js

@@ -0,0 +1,4 @@
+import { setNgrams } from "../languageData.js";
+import { ngramsData } from "../ngrams/ngramsS60.js";
+setNgrams(ngramsData);
+export * from "../languageDetector.js";