cmpstr 3.2.2 → 3.3.0

package/dist/cjs/metric/Hamming.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Metric = require('./Metric.cjs');

package/dist/cjs/metric/Jaccard.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Pool = require('../utils/Pool.cjs');

package/dist/cjs/metric/JaroWinkler.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Pool = require('../utils/Pool.cjs');

package/dist/cjs/metric/LCS.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Pool = require('../utils/Pool.cjs');

package/dist/cjs/metric/Levenshtein.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Pool = require('../utils/Pool.cjs');

package/dist/cjs/metric/Metric.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Errors = require('../utils/Errors.cjs');
@@ -18,9 +18,15 @@ class Metric {
   optKey;
   symmetric;
   results;
-  static clear = () => this.cache.clear();
-  static swap = (a, b, m, n) => (m > n ? [b, a, n, m] : [a, b, m, n]);
-  static clamp = (res) => Math.max(0, Math.min(1, res));
+  static clear() {
+    this.cache.clear();
+  }
+  static swap(a, b, m, n) {
+    return m > n ? [b, a, n, m] : [a, b, m, n];
+  }
+  static clamp(res) {
+    return Math.max(0, Math.min(1, res));
+  }
   constructor(metric, a, b, opt = {}, symmetric = false) {
     this.metric = metric;
     this.a = Array.isArray(a) ? a : [a];
@@ -59,13 +65,13 @@ class Metric {
         if (!result) {
           result = profiler.run(() => {
             if (this.symmetric) [A, B, m, n] = Metric.swap(A, B, m, n);
-            const key =
-              Metric.cache.key(this.metric, [A, B], this.symmetric) +
-              this.optKey;
+            let key = Metric.cache.key(this.metric, [A, B], this.symmetric);
+            if (key) key += this.optKey;
             return (
               Metric.cache.get(key || '') ??
               (() => {
-                const res = this.compute(A, B, m, n, Math.max(m, n));
+                const maxLen = m > n ? m : n;
+                const res = this.compute(A, B, m, n, maxLen);
                 if (key) Metric.cache.set(key, res);
                 return res;
               })()
@@ -74,8 +80,8 @@ class Metric {
         }
         return {
           metric: this.metric,
-          a: this.origA[i] ?? a,
-          b: this.origB[j] ?? b,
+          a: this.origA.length > i ? this.origA[i] : a,
+          b: this.origB.length > j ? this.origB[j] : b,
           ...result
         };
       },
@@ -94,11 +100,11 @@ class Metric {
     this.results = results;
   }
   async runBatchAsync() {
-    const results = [];
+    const tasks = [];
     for (let i = 0; i < this.a.length; i++)
       for (let j = 0; j < this.b.length; j++)
-        results.push(await this.runSingleAsync(i, j));
-    this.results = results;
+        tasks.push(this.runSingleAsync(i, j));
+    this.results = await Promise.all(tasks);
   }
   runPairwise() {
     const results = [];
@@ -106,18 +112,22 @@ class Metric {
     this.results = results;
   }
   async runPairwiseAsync() {
-    const results = [];
+    const tasks = [];
     for (let i = 0; i < this.a.length; i++)
-      results.push(await this.runSingleAsync(i, i));
-    this.results = results;
+      tasks.push(this.runSingleAsync(i, i));
+    this.results = await Promise.all(tasks);
   }
   setOriginal(a, b) {
     if (a) this.origA = Array.isArray(a) ? a : [a];
     if (b) this.origB = Array.isArray(b) ? b : [b];
     return this;
   }
-  isBatch = () => this.a.length > 1 || this.b.length > 1;
-  isSingle = () => !this.isBatch();
+  isBatch() {
+    return this.a.length > 1 || this.b.length > 1;
+  }
+  isSingle() {
+    return !this.isBatch();
+  }
   isPairwise(safe = false) {
     return this.isBatch() && this.a.length === this.b.length
       ? true
@@ -129,9 +139,15 @@ class Metric {
             );
           })();
   }
-  isSymmetrical = () => this.symmetric;
-  whichMode = (mode) => mode ?? this.options?.mode ?? 'default';
-  clear = () => (this.results = undefined);
+  isSymmetrical() {
+    return this.symmetric;
+  }
+  whichMode(mode) {
+    return mode ?? this.options.mode ?? 'default';
+  }
+  clear() {
+    this.results = undefined;
+  }
   run(mode, clear = true) {
     if (clear) this.clear();
     switch (this.whichMode(mode)) {
@@ -176,7 +192,9 @@ class Metric {
         );
     }
   }
-  getMetricName = () => this.metric;
+  getMetricName() {
+    return this.metric;
+  }
   getResults() {
     Errors.ErrorUtil.assert(
       this.results !== undefined,

package/dist/cjs/metric/NeedlemanWunsch.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Pool = require('../utils/Pool.cjs');

package/dist/cjs/metric/QGram.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Pool = require('../utils/Pool.cjs');

package/dist/cjs/metric/SmithWaterman.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Pool = require('../utils/Pool.cjs');

package/dist/cjs/phonetic/Caverphone.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Phonetic = require('./Phonetic.cjs');

package/dist/cjs/phonetic/Cologne.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Phonetic = require('./Phonetic.cjs');

package/dist/cjs/phonetic/Metaphone.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Phonetic = require('./Phonetic.cjs');

package/dist/cjs/phonetic/Phonetic.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var DeepMerge = require('../utils/DeepMerge.cjs');
@@ -15,7 +15,10 @@ class Phonetic {
   options;
   optKey;
   map;
-  static clear = () => this.cache.clear();
+  ignoreSet;
+  static clear() {
+    this.cache.clear();
+  }
   constructor(algo, opt = {}) {
     const defaults = this.constructor.default ?? {};
     const mapId = opt.map ?? defaults.map;
@@ -30,8 +33,8 @@ class Phonetic {
         `Requested mapping <${mapId}> is not declared`,
         { algo, mapId }
       );
-    this.options = DeepMerge.merge(
-      DeepMerge.merge(defaults, map.options ?? {}),
+    this.options = DeepMerge.DeepMerge.merge(
+      DeepMerge.DeepMerge.merge(defaults, map.options ?? {}),
       opt
     );
     this.optKey = HashTable.Hasher.fastFNV1a(
@@ -39,28 +42,32 @@ class Phonetic {
     ).toString();
     this.algo = algo;
     this.map = map;
+    this.ignoreSet = new Set(map.ignore ?? []);
   }
   applyPattern(word) {
     const { patterns = [] } = this.map;
-    if (!patterns || !patterns.length) return word;
+    if (!patterns.length) return word;
     for (const { pattern, replace, all = false } of patterns) {
-      word = word[all ? 'replaceAll' : 'replace'](pattern, replace);
+      word = all
+        ? word.replaceAll(pattern, replace)
+        : word.replace(pattern, replace);
     }
     return word;
   }
   applyRules(char, i, chars, charLen) {
     const { ruleset = [] } = this.map;
-    if (!ruleset || !ruleset.length) return undefined;
+    if (!ruleset.length) return undefined;
     const prev = chars[i - 1] || '',
       prev2 = chars[i - 2] || '';
     const next = chars[i + 1] || '',
       next2 = chars[i + 2] || '';
+    const str = chars.join('');
     for (const rule of ruleset) {
       if (rule.char && rule.char !== char) continue;
       if (rule.position === 'start' && i !== 0) continue;
       if (rule.position === 'middle' && (i === 0 || i === charLen - 1))
         continue;
-      if (rule.position === 'end' && i !== charLen) continue;
+      if (rule.position === 'end' && i !== charLen - 1) continue;
       if (rule.prev && !rule.prev.includes(prev)) continue;
       if (rule.prevNot && rule.prevNot.includes(prev)) continue;
       if (rule.prev2 && !rule.prev2.includes(prev2)) continue;
@@ -71,12 +78,12 @@ class Phonetic {
       if (rule.next2Not && rule.next2Not.includes(next2)) continue;
       if (
         rule.leading &&
-        !rule.leading.includes(chars.slice(0, rule.leading.length).join(''))
+        !rule.leading.includes(str.slice(0, rule.leading.length))
       )
         continue;
       if (
         rule.trailing &&
-        !rule.trailing.includes(chars.slice(-rule.trailing.length).join(''))
+        !rule.trailing.includes(str.slice(-rule.trailing.length))
       )
         continue;
       if (rule.match && !rule.match.every((c, j) => chars[i + j] === c))
@@ -86,7 +93,7 @@ class Phonetic {
     return undefined;
   }
   encode(word) {
-    const { map = {}, ignore = [] } = this.map;
+    const { map = {} } = this.map;
     word = this.applyPattern(word);
     const chars = this.word2Chars(word);
     const charLen = chars.length;
@@ -94,7 +101,7 @@ class Phonetic {
       lastCode = null;
     for (let i = 0; i < charLen; i++) {
       const char = chars[i];
-      if (ignore.includes(char)) continue;
+      if (this.ignoreSet.has(char)) continue;
       const mapped = this.mapChar(char, i, chars, charLen, lastCode, map);
       if (mapped === undefined) continue;
       ((code += mapped), (lastCode = mapped));
@@ -113,7 +120,9 @@ class Phonetic {
       ? input
       : (input + pad.repeat(length)).slice(0, length);
   }
-  word2Chars = (word) => word.toLowerCase().split('');
+  word2Chars(word) {
+    return Array.from(word.toLowerCase());
+  }
   exitEarly(code, i) {
     const { length = -1 } = this.options;
     return length > 0 && code.length >= length;
@@ -126,7 +135,8 @@ class Phonetic {
       () => {
         const index = [];
         for (const word of words) {
-          const key = Phonetic.cache.key(this.algo, [word]) + this.optKey;
+          let key = Phonetic.cache.key(this.algo, [word]);
+          if (key) key += this.optKey;
           const code =
             Phonetic.cache.get(key || '') ??
             (() => {
@@ -164,7 +174,9 @@ class Phonetic {
       { algo: this.algo, words }
     );
   }
-  getAlgoName = () => this.algo;
+  getAlgoName() {
+    return this.algo;
+  }
   getIndex(input) {
     const { delimiter = ' ' } = this.options;
     return profiler.run(() =>

package/dist/cjs/phonetic/Soundex.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Phonetic = require('./Phonetic.cjs');

package/dist/cjs/root.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var CmpStr = require('./CmpStr.cjs');
@@ -27,6 +27,7 @@ var DeepMerge = require('./utils/DeepMerge.cjs');
 var Errors = require('./utils/Errors.cjs');
 var Filter = require('./utils/Filter.cjs');
 var HashTable = require('./utils/HashTable.cjs');
+var OptionsValidator = require('./utils/OptionsValidator.cjs');
 var Pool = require('./utils/Pool.cjs');
 var Profiler = require('./utils/Profiler.cjs');
 var StructuredData = require('./utils/StructuredData.cjs');
@@ -41,11 +42,12 @@ exports.MetricRegistry = Metric.MetricRegistry;
 exports.Phonetic = Phonetic.Phonetic;
 exports.PhoneticMappingRegistry = Phonetic.PhoneticMappingRegistry;
 exports.PhoneticRegistry = Phonetic.PhoneticRegistry;
-exports.DeepMerge = DeepMerge;
+exports.DeepMerge = DeepMerge.DeepMerge;
 exports.CmpStrError = Errors;
 exports.Filter = Filter.Filter;
 exports.HashTable = HashTable.HashTable;
 exports.Hasher = HashTable.Hasher;
+exports.OptionsValidator = OptionsValidator.OptionsValidator;
 exports.Pool = Pool.Pool;
 exports.Profiler = Profiler.Profiler;
 exports.StructuredData = StructuredData.StructuredData;

package/dist/cjs/utils/DeepMerge.cjs

@@ -1,113 +1,118 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 var Errors = require('./Errors.cjs');
 
-const BRACKET_PATTERN = /\[(\d+)]/g;
-const PATH_CACHE = new Map();
-function parse(p) {
-  let cached = PATH_CACHE.get(p);
-  if (cached) return cached;
-  const parsed = p
-    .replace(BRACKET_PATTERN, '.$1')
-    .split('.')
-    .map((s) => {
-      const n = Number(s);
-      return Number.isInteger(n) && String(n) === s ? n : s;
-    });
-  PATH_CACHE.set(p, parsed);
-  return parsed;
-}
-function get(t, path, fb) {
-  let o = t;
-  for (const k of parse(path)) {
-    if (o == null || !(k in o)) return fb;
-    o = o[k];
+class DeepMerge {
+  static BRACKET_PATTERN = /\[(\d+)]/g;
+  static PATH_CACHE = new Map();
+  static walk(obj, keys) {
+    let o = obj;
+    for (let i = 0; i < keys.length; i++) {
+      const k = keys[i];
+      if (o == null || !(k in o)) return { exists: false };
+      o = o[k];
+    }
+    return { exists: true, value: o };
   }
-  return o;
-}
-function has(t, path) {
-  let o = t;
-  for (const k of parse(path)) {
-    if (o == null || !(k in o)) return false;
-    o = o[k];
+  static parse(p) {
+    const cached = DeepMerge.PATH_CACHE.get(p);
+    if (cached) return cached;
+    const parsed = p
+      .replace(DeepMerge.BRACKET_PATTERN, '.$1')
+      .split('.')
+      .map((s) => {
+        const n = Number(s);
+        return Number.isInteger(n) && String(n) === s ? n : s;
+      });
+    if (DeepMerge.PATH_CACHE.size > 2000) DeepMerge.PATH_CACHE.clear();
+    DeepMerge.PATH_CACHE.set(p, parsed);
+    return parsed;
   }
-  return true;
-}
-function set(t, path, value) {
-  if (path === '') return value;
-  const keys = parse(path);
-  if (t !== undefined && (typeof t !== 'object' || t === null))
-    throw new Errors.CmpStrUsageError(
+  static has(t, path) {
+    return DeepMerge.walk(t, DeepMerge.parse(path)).exists;
+  }
+  static get(t, path, fb) {
+    const r = DeepMerge.walk(t, DeepMerge.parse(path));
+    return r.exists ? r.value : fb;
+  }
+  static set(t, path, value) {
+    if (path === '') return value;
+    const keys = DeepMerge.parse(path);
+    Errors.ErrorUtil.assert(
+      t === undefined || (typeof t === 'object' && t !== null),
       `Cannot set property <${keys[0]}> of <${JSON.stringify(t)}>`,
       { path: keys[0], target: t }
     );
-  const root = t ?? (typeof keys[0] === 'number' ? [] : Object.create(null));
-  let cur = root;
-  for (let i = 0; i < keys.length - 1; i++) {
-    const k = keys[i];
-    let n = cur[k];
-    if (n != null && typeof n !== 'object')
-      throw new Errors.CmpStrUsageError(
+    const root = t ?? (typeof keys[0] === 'number' ? [] : Object.create(null));
+    let cur = root;
+    for (let i = 0; i < keys.length - 1; i++) {
+      const k = keys[i];
+      let n = cur[k];
+      Errors.ErrorUtil.assert(
+        n == null || typeof n === 'object',
         `Cannot set property <${keys[i + 1]}> of <${JSON.stringify(n)}>`,
         { path: keys.slice(0, i + 2), value: n }
       );
-    if (n == null)
-      n = cur[k] = typeof keys[i + 1] === 'number' ? [] : Object.create(null);
-    cur = n;
+      if (n == null)
+        n = cur[k] = typeof keys[i + 1] === 'number' ? [] : Object.create(null);
+      cur = n;
+    }
+    cur[keys[keys.length - 1]] = value;
+    return root;
   }
-  cur[keys[keys.length - 1]] = value;
-  return root;
-}
-function merge(
-  t = Object.create(null),
-  o = Object.create(null),
-  mergeUndefined = false
-) {
-  const target = t ?? Object.create(null);
-  Object.keys(o).forEach((k) => {
-    const val = o[k];
-    if (!mergeUndefined && val === undefined) return;
-    if (k === '__proto__' || k === 'constructor') return;
-    if (val !== null && typeof val === 'object' && !Array.isArray(val)) {
-      const existing = target[k];
-      target[k] = merge(
-        existing !== null &&
-          typeof existing === 'object' &&
-          !Array.isArray(existing)
-          ? existing
-          : Object.create(null),
-        val,
-        mergeUndefined
-      );
-    } else target[k] = val;
-  });
-  return target;
-}
-function rmv(t, path, preserveEmpty = false) {
-  const keys = parse(path);
-  const remove = (obj, i = 0) => {
-    const key = keys[i];
-    if (!obj || typeof obj !== 'object') return false;
-    if (i === keys.length - 1) return delete obj[key];
-    if (!remove(obj[key], i + 1)) return false;
-    if (!preserveEmpty) {
-      const val = obj[key];
-      if (
-        typeof val === 'object' &&
-        ((Array.isArray(val) && val.every((v) => v == null)) ||
-          (!Array.isArray(val) && Object.keys(val).length === 0))
-      )
-        delete obj[key];
+  static rmv(t, path, preserveEmpty = false) {
+    const keys = DeepMerge.parse(path);
+    const remove = (obj, i = 0) => {
+      const key = keys[i];
+      if (!obj || typeof obj !== 'object') return false;
+      if (i === keys.length - 1) return delete obj[key];
+      if (!remove(obj[key], i + 1)) return false;
+      if (!preserveEmpty) {
+        const val = obj[key];
+        let empty = true;
+        if (typeof val === 'object') {
+          if (Array.isArray(val))
+            for (let i = 0; i < val.length; i++) {
+              if (val[i] != null) {
+                empty = false;
+                break;
+              }
+            }
+          else empty = false;
+        }
+        if (empty) delete obj[key];
+      }
+      return true;
+    };
+    remove(t);
+    return t;
+  }
+  static merge(
+    t = Object.create(null),
+    o = Object.create(null),
+    mergeUndefined = false
+  ) {
+    const target = t ?? Object.create(null);
+    for (const k in o) {
+      const val = o[k];
+      if (!mergeUndefined && val === undefined) continue;
+      if (k === '__proto__' || k === 'constructor') continue;
+      if (val !== null && typeof val === 'object' && !Array.isArray(val)) {
+        const existing = target[k];
+        target[k] = DeepMerge.merge(
+          existing !== null &&
+            typeof existing === 'object' &&
+            !Array.isArray(existing)
+            ? existing
+            : Object.create(null),
+          val,
+          mergeUndefined
+        );
+      } else target[k] = val;
     }
-    return true;
-  };
-  remove(t);
-  return t;
+    return target;
+  }
 }
 
-exports.get = get;
-exports.has = has;
-exports.merge = merge;
-exports.rmv = rmv;
-exports.set = set;
+exports.DeepMerge = DeepMerge;

package/dist/cjs/utils/DiffChecker.cjs

@@ -1,4 +1,4 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
 'use strict';
 
 class DiffChecker {