cmpstr 3.2.2 → 3.3.0

package/dist/esm/CmpStrAsync.mjs

@@ -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
 import { ErrorUtil } from './utils/Errors.mjs';
 import { Filter } from './utils/Filter.mjs';
 import { Normalizer } from './utils/Normalizer.mjs';
@@ -39,10 +39,10 @@ class CmpStrAsync extends CmpStr {
       : phonetic.getIndexAsync(input).then((r) => r.join(delimiter));
   }
   async computeAsync(a, b, opt, mode, raw, skip) {
+    const resolved = this.resolveOptions(opt);
+    this.assert('metric', resolved.metric);
     return ErrorUtil.wrapAsync(
       async () => {
-        const resolved = this.resolveOptions(opt);
-        this.assert('metric', resolved.metric);
         const A = skip ? a : await this.prepareAsync(a, resolved);
         const B = skip ? b : await this.prepareAsync(b, resolved);
         if (
@@ -100,23 +100,40 @@ class CmpStrAsync extends CmpStr {
     const resolved = this.resolveOptions({ flags, processors });
     const test = await this.prepareAsync(needle, resolved);
     const hstk = await this.prepareAsync(haystack, resolved);
-    return haystack.filter((_, i) => hstk[i].includes(test));
+    const out = [];
+    for (let i = 0; i < hstk.length; i++) {
+      if (hstk[i].includes(test)) out.push(haystack[i]);
+    }
+    return out;
   }
   async matrixAsync(input, opt) {
-    input = await this.prepareAsync(input, this.resolveOptions(opt));
-    return Promise.all(
-      input.map(
-        async (a) =>
-          await this.computeAsync(
-            a,
-            input,
-            undefined,
-            'batch',
-            true,
-            true
-          ).then((r) => r.map((b) => b.res ?? 0))
-      )
-    );
+    const resolved = this.resolveOptions(opt);
+    const arr = await this.prepareAsync(input, resolved);
+    const n = arr.length;
+    const out = Array.from({ length: n }, () => new Array(n).fill(0));
+    for (let i = 0; i < n; i++) {
+      await Promise.all(
+        Array.from({ length: n - i }, (_, k) => i + k).map(async (j) => {
+          if (i === j) {
+            out[i][j] = 1;
+          } else {
+            const score = (
+              await this.computeAsync(
+                arr[i],
+                arr[j],
+                resolved,
+                'single',
+                true,
+                true
+              )
+            ).res;
+            out[i][j] = score;
+            out[j][i] = score;
+          }
+        })
+      );
+    }
+    return out;
   }
   async phoneticIndexAsync(input, algo, opt) {
     const { algo: a, opt: o } = this.options.processors?.phonetic ?? {};

package/dist/esm/index.mjs

@@ -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
 export { CmpStr } from './CmpStr.mjs';
 export { CmpStrAsync } from './CmpStrAsync.mjs';
 export { DiffChecker } from './utils/DiffChecker.mjs';

package/dist/esm/metric/Cosine.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/DamerauLevenshtein.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/DiceSorensen.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/Hamming.mjs

@@ -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
 import { MetricRegistry, Metric } from './Metric.mjs';
 import { CmpStrUsageError } from '../utils/Errors.mjs';
 

package/dist/esm/metric/Jaccard.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/JaroWinkler.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/LCS.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/Levenshtein.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/Metric.mjs

@@ -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
 import {
   ErrorUtil,
   CmpStrInternalError,
@@ -20,9 +20,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];
@@ -61,13 +67,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;
               })()
@@ -76,8 +82,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
         };
       },
@@ -96,11 +102,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 = [];
@@ -108,18 +114,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
@@ -131,9 +141,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 {
         throw new CmpStrInternalError(`Unsupported async mode <${mode}>`);
     }
   }
-  getMetricName = () => this.metric;
+  getMetricName() {
+    return this.metric;
+  }
   getResults() {
     ErrorUtil.assert(
       this.results !== undefined,

package/dist/esm/metric/NeedlemanWunsch.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/QGram.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/metric/SmithWaterman.mjs

@@ -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
 import { Pool } from '../utils/Pool.mjs';
 import { MetricRegistry, Metric } from './Metric.mjs';
 

package/dist/esm/phonetic/Caverphone.mjs

@@ -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
 import {
   PhoneticRegistry,
   PhoneticMappingRegistry,

package/dist/esm/phonetic/Cologne.mjs

@@ -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
 import {
   PhoneticRegistry,
   PhoneticMappingRegistry,

package/dist/esm/phonetic/Metaphone.mjs

@@ -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
 import {
   PhoneticRegistry,
   PhoneticMappingRegistry,

package/dist/esm/phonetic/Phonetic.mjs

@@ -1,5 +1,5 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
-import { merge } from '../utils/DeepMerge.mjs';
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
+import { DeepMerge } from '../utils/DeepMerge.mjs';
 import { CmpStrNotFoundError, ErrorUtil } from '../utils/Errors.mjs';
 import { HashTable, Hasher } from '../utils/HashTable.mjs';
 import { Profiler } from '../utils/Profiler.mjs';
@@ -13,7 +13,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;
@@ -28,34 +31,41 @@ class Phonetic {
         `Requested mapping <${mapId}> is not declared`,
         { algo, mapId }
       );
-    this.options = merge(merge(defaults, map.options ?? {}), opt);
+    this.options = DeepMerge.merge(
+      DeepMerge.merge(defaults, map.options ?? {}),
+      opt
+    );
     this.optKey = Hasher.fastFNV1a(
       JSON.stringify(this.options, Object.keys(this.options).sort())
     ).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;
@@ -66,12 +76,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))
@@ -81,7 +91,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;
@@ -89,7 +99,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));
@@ -108,7 +118,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;
@@ -121,7 +133,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 || '') ??
             (() => {
@@ -159,7 +172,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/esm/phonetic/Soundex.mjs

@@ -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
 import {
   PhoneticRegistry,
   PhoneticMappingRegistry,

package/dist/esm/root.mjs

@@ -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
 export { CmpStr } from './CmpStr.mjs';
 export { CmpStrAsync } from './CmpStrAsync.mjs';
 export { DiffChecker } from './utils/DiffChecker.mjs';
@@ -25,12 +25,12 @@ export {
   PhoneticMappingRegistry,
   PhoneticRegistry
 } from './phonetic/Phonetic.mjs';
-import * as DeepMerge from './utils/DeepMerge.mjs';
-export { DeepMerge };
+export { DeepMerge } from './utils/DeepMerge.mjs';
 import * as Errors from './utils/Errors.mjs';
 export { Errors as CmpStrError };
 export { Filter } from './utils/Filter.mjs';
 export { HashTable, Hasher } from './utils/HashTable.mjs';
+export { OptionsValidator } from './utils/OptionsValidator.mjs';
 export { Pool } from './utils/Pool.mjs';
 export { Profiler } from './utils/Profiler.mjs';
 export { StructuredData } from './utils/StructuredData.mjs';