cmpstr 3.2.2 → 3.3.0

package/dist/esm/utils/DeepMerge.mjs

@@ -1,107 +1,116 @@
-// CmpStr v3.2.2 build-bb61120-260311 by Paul Köhler @komed3 / MIT License
-import { CmpStrUsageError } from './Errors.mjs';
+// CmpStr v3.3.0 build-3699f85-260318 by Paul Köhler @komed3 / MIT License
+import { ErrorUtil } from './Errors.mjs';
 
-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 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);
+    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 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];
+      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;
+  }
 }
 
-export { get, has, merge, rmv, set };
+export { DeepMerge };

package/dist/esm/utils/DiffChecker.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
 class DiffChecker {
   a;
   b;

package/dist/esm/utils/Errors.mjs

@@ -1,20 +1,33 @@
-// 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
 class CmpStrError extends Error {
   code;
   meta;
-  cause;
   when = new Date().toISOString();
   constructor(code, message, meta, cause) {
-    super(message);
+    super(message, cause !== undefined ? { cause } : undefined);
     this.name = this.constructor.name;
     this.code = code;
     this.meta = meta;
-    this.cause = cause;
     if (typeof Error.captureStackTrace === 'function') {
       Error.captureStackTrace(this, this.constructor);
     }
   }
-  toJSON() {
+  format(stack = false) {
+    const parts = [`${this.name} [${this.code}]`, this.message];
+    if (this.meta)
+      for (const _ in this.meta) {
+        parts.push(JSON.stringify(this.meta));
+        break;
+      }
+    return (
+      parts.join(' - ') +
+      (stack && this.stack ? `\nStack Trace:\n${this.stack}` : '')
+    );
+  }
+  toString() {
+    return this.format(false);
+  }
+  toJSON(stack = false) {
     return {
       name: this.name,
       code: this.code,
@@ -26,23 +39,11 @@ class CmpStrError extends Error {
           ? {
               name: this.cause.name,
               message: this.cause.message,
-              stack: this.cause.stack
+              stack: stack && this.cause.stack
             }
           : this.cause
     };
   }
-  toString(stack = false) {
-    const parts = [`${this.name} [${this.code}]`, this.message];
-    if (this.meta && Object.keys(this.meta).length) {
-      try {
-        parts.push(JSON.stringify(this.meta));
-      } catch {}
-    }
-    return (
-      parts.join(' - ') +
-      (stack && this.stack ? `\nStack Trace:\n${this.stack}` : '')
-    );
-  }
 }
 class CmpStrValidationError extends CmpStrError {
   constructor(message, meta, cause) {
@@ -68,7 +69,7 @@ class ErrorUtil {
   static assert(condition, message, meta) {
     if (!condition) throw new CmpStrUsageError(message, meta);
   }
-  static create(err, message, meta) {
+  static rethrow(err, message, meta) {
     if (err instanceof CmpStrError) throw err;
     throw new CmpStrInternalError(message, meta, err);
   }
@@ -81,6 +82,7 @@ class ErrorUtil {
     try {
       return fn();
     } catch (err) {
+      if (err instanceof CmpStrError) throw err;
       throw new CmpStrInternalError(message, meta, err);
     }
   }
@@ -88,6 +90,7 @@ class ErrorUtil {
     try {
       return await fn();
     } catch (err) {
+      if (err instanceof CmpStrError) throw err;
       throw new CmpStrInternalError(message, meta, err);
     }
   }

package/dist/esm/utils/Filter.mjs

@@ -1,21 +1,33 @@
-// 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 './Errors.mjs';
 
 class Filter {
+  static IDENTITY = (s) => s;
   static filters = new Map();
   static pipeline = new Map();
-  static getPipeline(hook) {
+  static getPipeline(hook, force = false) {
     return ErrorUtil.wrap(
       () => {
-        const cached = Filter.pipeline.get(hook);
-        if (cached) return cached;
+        if (!force) {
+          const cached = Filter.pipeline.get(hook);
+          if (cached) return cached;
+        }
         const filter = Filter.filters.get(hook);
-        if (!filter) return (s) => s;
-        const pipeline = Array.from(filter.values())
-          .filter((f) => f.active)
-          .sort((a, b) => a.priority - b.priority)
-          .map((f) => f.fn);
-        const fn = (input) => pipeline.reduce((v, f) => f(v), input);
+        if (!filter) {
+          Filter.pipeline.set(hook, Filter.IDENTITY);
+          return Filter.IDENTITY;
+        }
+        const pipeline = [];
+        for (const f of filter.values()) if (f.active) pipeline.push(f);
+        pipeline.sort((a, b) => a.priority - b.priority);
+        const fn =
+          pipeline.length === 0
+            ? Filter.IDENTITY
+            : (input) => {
+                let v = input;
+                for (let i = 0; i < pipeline.length; i++) v = pipeline[i].fn(v);
+                return v;
+              };
         Filter.pipeline.set(hook, fn);
         return fn;
       },
@@ -33,9 +45,16 @@ class Filter {
         const filter = Filter.filters.get(hook) ?? new Map();
         const index = filter.get(id);
         if (index && !index.overrideable) return false;
+        if (
+          index &&
+          index.fn === fn &&
+          index.priority === priority &&
+          index.active === active
+        )
+          return true;
         filter.set(id, { id, fn, priority, active, overrideable });
         Filter.filters.set(hook, filter);
-        Filter.pipeline.delete(hook);
+        Filter.getPipeline(hook, true);
         return true;
       },
       `Error adding filter <${id}> to hook <${hook}>`,
@@ -43,19 +62,28 @@ class Filter {
     );
   }
   static remove(hook, id) {
-    Filter.pipeline.delete(hook);
     const filter = Filter.filters.get(hook);
-    return filter ? filter.delete(id) : false;
+    if (!filter || !filter.delete(id)) return false;
+    Filter.getPipeline(hook, true);
+    return true;
   }
   static pause(hook, id) {
-    Filter.pipeline.delete(hook);
-    const f = Filter.filters.get(hook)?.get(id);
-    return !!(f && ((f.active = false), true));
+    const filter = Filter.filters.get(hook);
+    if (!filter) return false;
+    const f = filter.get(id);
+    if (!f || !f.active) return false;
+    f.active = false;
+    Filter.getPipeline(hook, true);
+    return true;
   }
   static resume(hook, id) {
-    Filter.pipeline.delete(hook);
-    const f = Filter.filters.get(hook)?.get(id);
-    return !!(f && ((f.active = true), true));
+    const filter = Filter.filters.get(hook);
+    if (!filter) return false;
+    const f = filter.get(id);
+    if (!f || f.active) return false;
+    f.active = true;
+    Filter.getPipeline(hook, true);
+    return true;
   }
   static list(hook, active = false) {
     const filter = Filter.filters.get(hook);
@@ -68,7 +96,11 @@ class Filter {
     return ErrorUtil.wrap(
       () => {
         const fn = Filter.getPipeline(hook);
-        return Array.isArray(input) ? input.map(fn) : fn(input);
+        if (typeof input === 'string') return fn(input);
+        const arr = input;
+        const out = new Array(arr.length);
+        for (let i = 0; i < arr.length; i++) out[i] = fn(arr[i]);
+        return out;
       },
       `Error applying filters for hook <${hook}>`,
       { hook, input }
@@ -78,16 +110,19 @@ class Filter {
     return ErrorUtil.wrapAsync(
       async () => {
         const fn = Filter.getPipeline(hook);
-        return Array.isArray(input)
-          ? Promise.all(input.map(fn))
-          : Promise.resolve(fn(input));
+        if (typeof input === 'string') return Promise.resolve(fn(input));
+        const arr = input;
+        const out = new Array(arr.length);
+        for (let i = 0; i < arr.length; i++)
+          out[i] = Promise.resolve(fn(arr[i]));
+        return Promise.all(out);
       },
       `Error applying filters for hook <${hook}>`,
       { hook, input }
     );
   }
   static clear(hook) {
-    Filter.pipeline.clear();
+    Filter.clearPipeline();
     if (hook) Filter.filters.delete(hook);
     else Filter.filters.clear();
   }

package/dist/esm/utils/HashTable.mjs

@@ -1,28 +1,24 @@
-// 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
 class Hasher {
   static FNV_PRIME = 0x01000193;
   static HASH_OFFSET = 0x811c9dc5;
   static fastFNV1a(str) {
     const len = str.length;
+    const limit = len & -4;
     let hash = this.HASH_OFFSET;
-    const chunks = Math.floor(len / 4);
-    for (let i = 0; i < chunks; i++) {
-      const pos = i * 4;
+    let i = 0;
+    for (; i < limit; i += 4) {
       const chunk =
-        str.charCodeAt(pos) |
-        (str.charCodeAt(pos + 1) << 8) |
-        (str.charCodeAt(pos + 2) << 16) |
-        (str.charCodeAt(pos + 3) << 24);
+        str.charCodeAt(i) |
+        (str.charCodeAt(i + 1) << 8) |
+        (str.charCodeAt(i + 2) << 16) |
+        (str.charCodeAt(i + 3) << 24);
       hash ^= chunk;
       hash = Math.imul(hash, this.FNV_PRIME);
     }
-    const remaining = len % 4;
-    if (remaining > 0) {
-      const pos = chunks * 4;
-      for (let i = 0; i < remaining; i++) {
-        hash ^= str.charCodeAt(pos + i);
-        hash = Math.imul(hash, this.FNV_PRIME);
-      }
+    for (; i < len; i++) {
+      hash ^= str.charCodeAt(i);
+      hash = Math.imul(hash, this.FNV_PRIME);
     }
     hash ^= hash >>> 16;
     hash *= 0x85ebca6b;
@@ -33,32 +29,51 @@ class Hasher {
   }
 }
 class HashTable {
-  LRU;
+  FIFO;
+  maxSize;
   static MAX_LEN = 2048;
-  static TABLE_SIZE = 10_000;
   table = new Map();
-  constructor(LRU = true) {
-    this.LRU = LRU;
+  constructor(FIFO = true, maxSize = 10000) {
+    this.FIFO = FIFO;
+    this.maxSize = maxSize;
   }
   key(label, strs, sorted = false) {
-    for (const str of strs) if (str.length > HashTable.MAX_LEN) return false;
-    const hashes = strs.map((s) => Hasher.fastFNV1a(s));
-    return [label, ...(sorted ? hashes.sort() : hashes)].join('-');
+    const n = strs.length;
+    const hashes = new Array(n);
+    for (let i = 0; i < n; i++) {
+      const s = strs[i];
+      if (s.length > HashTable.MAX_LEN) return false;
+      hashes[i] = Hasher.fastFNV1a(s);
+    }
+    if (sorted) hashes.sort((a, b) => a - b);
+    let key = label;
+    for (let i = 0; i < hashes.length; i++) key += '-' + hashes[i];
+    return key;
+  }
+  has(key) {
+    return this.table.has(key);
+  }
+  get(key) {
+    return this.table.get(key);
   }
-  has = (key) => this.table.has(key);
-  get = (key) => this.table.get(key);
   set(key, entry, update = true) {
     if (!update && this.table.has(key)) return false;
-    while (!this.table.has(key) && this.table.size >= HashTable.TABLE_SIZE) {
-      if (!this.LRU) return false;
+    if (!this.table.has(key) && this.table.size >= this.maxSize) {
+      if (!this.FIFO) return false;
       this.table.delete(this.table.keys().next().value);
     }
     this.table.set(key, entry);
     return true;
   }
-  delete = (key) => this.table.delete(key);
-  clear = () => this.table.clear();
-  size = () => this.table.size;
+  delete(key) {
+    return this.table.delete(key);
+  }
+  clear() {
+    this.table.clear();
+  }
+  size() {
+    return this.table.size;
+  }
 }
 
 export { HashTable, Hasher };

package/dist/esm/utils/Normalizer.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 './Errors.mjs';
 import { HashTable } from './HashTable.mjs';
 
@@ -18,25 +18,49 @@ class Normalizer {
   static getPipeline(flags) {
     return ErrorUtil.wrap(
       () => {
-        if (Normalizer.pipeline.has(flags))
-          return Normalizer.pipeline.get(flags);
+        const cached = Normalizer.pipeline.get(flags);
+        if (cached) return cached;
         const { REGEX } = Normalizer;
-        const steps = [
-          ['d', (s) => s.normalize('NFD')],
-          ['i', (s) => s.toLowerCase()],
-          ['k', (s) => s.replace(REGEX.nonLetters, '')],
-          ['n', (s) => s.replace(REGEX.nonNumbers, '')],
-          ['r', (s) => s.replace(REGEX.doubleChars, '$1')],
-          ['s', (s) => s.replace(REGEX.specialChars, '')],
-          ['t', (s) => s.trim()],
-          ['u', (s) => s.normalize('NFC')],
-          ['w', (s) => s.replace(REGEX.whitespace, ' ')],
-          ['x', (s) => s.normalize('NFKC')]
-        ];
-        const pipeline = steps
-          .filter(([f]) => flags.includes(f))
-          .map(([, fn]) => fn);
-        const fn = (s) => pipeline.reduce((v, f) => f(v), s);
+        const steps = [];
+        for (let i = 0; i < flags.length; i++) {
+          switch (flags[i]) {
+            case 'd':
+              steps.push((s) => s.normalize('NFD'));
+              break;
+            case 'i':
+              steps.push((s) => s.toLowerCase());
+              break;
+            case 'k':
+              steps.push((s) => s.replace(REGEX.nonLetters, ''));
+              break;
+            case 'n':
+              steps.push((s) => s.replace(REGEX.nonNumbers, ''));
+              break;
+            case 'r':
+              steps.push((s) => s.replace(REGEX.doubleChars, '$1'));
+              break;
+            case 's':
+              steps.push((s) => s.replace(REGEX.specialChars, ''));
+              break;
+            case 't':
+              steps.push((s) => s.trim());
+              break;
+            case 'u':
+              steps.push((s) => s.normalize('NFC'));
+              break;
+            case 'w':
+              steps.push((s) => s.replace(REGEX.whitespace, ' '));
+              break;
+            case 'x':
+              steps.push((s) => s.normalize('NFKC'));
+              break;
+          }
+        }
+        const fn = (input) => {
+          let v = input;
+          for (let i = 0; i < steps.length; i++) v = steps[i](v);
+          return v;
+        };
         Normalizer.pipeline.set(flags, fn);
         return fn;
       },
@@ -44,18 +68,23 @@ class Normalizer {
       { flags }
     );
   }
-  static normalize(input, flags) {
+  static normalize(input, flags, normalizedFlags) {
     return ErrorUtil.wrap(
       () => {
         if (!flags || typeof flags !== 'string' || !input) return input;
-        flags = this.canonicalFlags(flags);
-        if (Array.isArray(input))
-          return input.map((s) => Normalizer.normalize(s, flags));
-        const key = Normalizer.cache.key(flags, [input]);
-        if (key && Normalizer.cache.has(key)) return Normalizer.cache.get(key);
-        const res = Normalizer.getPipeline(flags)(input);
-        if (key) Normalizer.cache.set(key, res);
-        return res;
+        flags = normalizedFlags ?? this.canonicalFlags(flags);
+        const pipeline = Normalizer.getPipeline(flags);
+        const normalizeOne = (s) => {
+          const key = Normalizer.cache.key(flags, [s]);
+          if (key && Normalizer.cache.has(key))
+            return Normalizer.cache.get(key);
+          const res = pipeline(s);
+          if (key) Normalizer.cache.set(key, res);
+          return res;
+        };
+        return Array.isArray(input)
+          ? input.map(normalizeOne)
+          : normalizeOne(input);
       },
       `Failed to normalize input with flags: ${flags}`,
       { input, flags }