@oliasoft-open-source/node-json-migrator 4.4.0 → 4.4.1-beta-2

package/dist/index.cjs

@@ -671,7 +671,7 @@ const capitalize = (word) => {
 const loadModuleFromString = async (script) => {
   let patchedScript = script;
   try {
-    await Promise.resolve().then(function () { return require('./immer-BsT8CIGL.cjs'); }).then(({ produce }) => {
+    await Promise.resolve().then(function () { return require('./immer-ZZLkDBss.cjs'); }).then(({ produce }) => {
       if (produce) {
         patchedScript = script.replace(
           /import\s+produce\s+from\s+['"]immer['"]/,
@@ -680,7 +680,7 @@ const loadModuleFromString = async (script) => {
         );
       }
     });
-  } catch (_error) {
+  } catch {
   }
   return (await moduleFromString.importFromString(patchedScript))?.default ?? null;
 };
@@ -755,6 +755,7 @@ const openPattern = /\\{/g;
 const closePattern = /\\}/g;
 const commaPattern = /\\,/g;
 const periodPattern = /\\./g;
+const EXPANSION_MAX = 1e5;
 function numeric(str) {
   return !isNaN(str) ? parseInt(str, 10) : str.charCodeAt(0);
 }
@@ -784,14 +785,15 @@ function parseCommaParts(str) {
   parts.push.apply(parts, p);
   return parts;
 }
-function expand(str) {
+function expand(str, options = {}) {
   if (!str) {
     return [];
   }
+  const { max = EXPANSION_MAX } = options;
   if (str.slice(0, 2) === "{}") {
     str = "\\{\\}" + str.slice(2);
   }
-  return expand_(escapeBraces(str), true).map(unescapeBraces);
+  return expand_(escapeBraces(str), max, true).map(unescapeBraces);
 }
 function embrace(str) {
   return "{" + str + "}";
@@ -805,15 +807,15 @@ function lte(i, y) {
 function gte(i, y) {
   return i >= y;
 }
-function expand_(str, isTop) {
+function expand_(str, max, isTop) {
   const expansions = [];
   const m = balanced("{", "}", str);
   if (!m)
     return [str];
   const pre = m.pre;
-  const post = m.post.length ? expand_(m.post, false) : [""];
+  const post = m.post.length ? expand_(m.post, max, false) : [""];
   if (/\$$/.test(m.pre)) {
-    for (let k = 0; k < post.length; k++) {
+    for (let k = 0; k < post.length && k < max; k++) {
       const expansion = pre + "{" + m.body + "}" + post[k];
       expansions.push(expansion);
     }
@@ -825,7 +827,7 @@ function expand_(str, isTop) {
     if (!isSequence && !isOptions) {
       if (m.post.match(/,(?!,).*\}/)) {
         str = m.pre + "{" + m.body + escClose + m.post;
-        return expand_(str);
+        return expand_(str, max, true);
       }
       return [str];
     }
@@ -835,7 +837,7 @@ function expand_(str, isTop) {
     } else {
       n = parseCommaParts(m.body);
       if (n.length === 1 && n[0] !== void 0) {
-        n = expand_(n[0], false).map(embrace);
+        n = expand_(n[0], max, false).map(embrace);
         if (n.length === 1) {
           return post.map((p) => m.pre + n[0] + p);
         }
@@ -881,11 +883,11 @@ function expand_(str, isTop) {
     } else {
       N = [];
       for (let j = 0; j < n.length; j++) {
-        N.push.apply(N, expand_(n[j], false));
+        N.push.apply(N, expand_(n[j], max, false));
       }
     }
     for (let j = 0; j < N.length; j++) {
-      for (let k = 0; k < post.length; k++) {
+      for (let k = 0; k < post.length && expansions.length < max; k++) {
         const expansion = pre + N[j] + post[k];
         if (!isTop || isSequence || expansion) {
           expansions.push(expansion);
@@ -1014,8 +1016,11 @@ const parseClass = (glob, position) => {
   return [comb, uflag, endPos - pos, true];
 };
 
-const unescape = (s, { windowsPathsNoEscape = false } = {}) => {
-  return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
+const unescape = (s, { windowsPathsNoEscape = false, magicalBraces = true } = {}) => {
+  if (magicalBraces) {
+    return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
+  }
+  return windowsPathsNoEscape ? s.replace(/\[([^\/\\{}])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\{}])\]/g, "$1$2").replace(/\\([^\/{}])/g, "$1");
 };
 
 const types = /* @__PURE__ */ new Set(["!", "?", "+", "*", "@"]);
@@ -1368,7 +1373,7 @@ class AST {
     if (this.#root === this)
       this.#fillNegs();
     if (!this.type) {
-      const noEmpty = this.isStart() && this.isEnd();
+      const noEmpty = this.isStart() && this.isEnd() && !this.#parts.some((s) => typeof s !== "string");
       const src = this.#parts.map((p) => {
         const [re, _, hasMagic, uflag] = typeof p === "string" ? AST.#parseGlob(p, this.#hasMagic, noEmpty) : p.toRegExpSource(allowDot);
         this.#hasMagic = this.#hasMagic || hasMagic;
@@ -1478,10 +1483,7 @@ class AST {
         }
       }
       if (c === "*") {
-        if (noEmpty && glob === "*")
-          re += starNoEmpty;
-        else
-          re += star$1;
+        re += noEmpty && glob === "*" ? starNoEmpty : star$1;
         hasMagic = true;
         continue;
       }
@@ -1496,7 +1498,10 @@ class AST {
   }
 }
 
-const escape = (s, { windowsPathsNoEscape = false } = {}) => {
+const escape = (s, { windowsPathsNoEscape = false, magicalBraces = false } = {}) => {
+  if (magicalBraces) {
+    return windowsPathsNoEscape ? s.replace(/[?*()[\]{}]/g, "[$&]") : s.replace(/[?*()[\]\\{}]/g, "\\$&");
+  }
   return windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, "[$&]") : s.replace(/[?*()[\]\\]/g, "\\$&");
 };
 
@@ -2136,16 +2141,27 @@ class Minimatch {
             pp[i] = twoStar;
           }
         } else if (next === void 0) {
-          pp[i - 1] = prev + "(?:\\/|" + twoStar + ")?";
+          pp[i - 1] = prev + "(?:\\/|\\/" + twoStar + ")?";
         } else if (next !== GLOBSTAR) {
           pp[i - 1] = prev + "(?:\\/|\\/" + twoStar + "\\/)" + next;
           pp[i + 1] = GLOBSTAR;
         }
       });
-      return pp.filter((p) => p !== GLOBSTAR).join("/");
+      const filtered = pp.filter((p) => p !== GLOBSTAR);
+      if (this.partial && filtered.length >= 1) {
+        const prefixes = [];
+        for (let i = 1; i <= filtered.length; i++) {
+          prefixes.push(filtered.slice(0, i).join("/"));
+        }
+        return "(?:" + prefixes.join("|") + ")";
+      }
+      return filtered.join("/");
     }).join("|");
     const [open, close] = set.length > 1 ? ["(?:", ")"] : ["", ""];
     re = "^" + open + re + close + "$";
+    if (this.partial) {
+      re = "^(?:\\/|" + open + re.slice(1, -1) + close + ")$";
+    }
     if (this.negate)
       re = "^(?!" + re + ").+$";
     try {
@@ -2217,7 +2233,7 @@ minimatch.Minimatch = Minimatch;
 minimatch.escape = escape;
 minimatch.unescape = unescape;
 
-const perf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
+const defaultPerf = typeof performance === "object" && performance && typeof performance.now === "function" ? performance : Date;
 const warned = /* @__PURE__ */ new Set();
 const PROCESS = typeof process === "object" && !!process ? process : {};
 const emitWarning = (msg, type, code, fn) => {
@@ -2301,9 +2317,17 @@ class LRUCache {
   #max;
   #maxSize;
   #dispose;
+  #onInsert;
   #disposeAfter;
   #fetchMethod;
   #memoMethod;
+  #perf;
+  /**
+   * {@link LRUCache.OptionsBase.perf}
+   */
+  get perf() {
+    return this.#perf;
+  }
   /**
    * {@link LRUCache.OptionsBase.ttl}
    */
@@ -2379,9 +2403,11 @@ class LRUCache {
   #sizes;
   #starts;
   #ttls;
+  #autopurgeTimers;
   #hasDispose;
   #hasFetchMethod;
   #hasDisposeAfter;
+  #hasOnInsert;
   /**
    * Do not call this method unless you need to inspect the
    * inner workings of the cache.  If anything returned by this
@@ -2396,6 +2422,7 @@ class LRUCache {
       // properties
       starts: c.#starts,
       ttls: c.#ttls,
+      autopurgeTimers: c.#autopurgeTimers,
       sizes: c.#sizes,
       keyMap: c.#keyMap,
       keyList: c.#keyList,
@@ -2458,6 +2485,12 @@ class LRUCache {
   get dispose() {
     return this.#dispose;
   }
+  /**
+   * {@link LRUCache.OptionsBase.onInsert} (read-only)
+   */
+  get onInsert() {
+    return this.#onInsert;
+  }
   /**
    * {@link LRUCache.OptionsBase.disposeAfter} (read-only)
    */
@@ -2465,7 +2498,13 @@ class LRUCache {
     return this.#disposeAfter;
   }
   constructor(options) {
-    const { max = 0, ttl, ttlResolution = 1, ttlAutopurge, updateAgeOnGet, updateAgeOnHas, allowStale, dispose, disposeAfter, noDisposeOnSet, noUpdateTTL, maxSize = 0, maxEntrySize = 0, sizeCalculation, fetchMethod, memoMethod, noDeleteOnFetchRejection, noDeleteOnStaleGet, allowStaleOnFetchRejection, allowStaleOnFetchAbort, ignoreFetchAbort } = options;
+    const { max = 0, ttl, ttlResolution = 1, ttlAutopurge, updateAgeOnGet, updateAgeOnHas, allowStale, dispose, onInsert, disposeAfter, noDisposeOnSet, noUpdateTTL, maxSize = 0, maxEntrySize = 0, sizeCalculation, fetchMethod, memoMethod, noDeleteOnFetchRejection, noDeleteOnStaleGet, allowStaleOnFetchRejection, allowStaleOnFetchAbort, ignoreFetchAbort, perf } = options;
+    if (perf !== void 0) {
+      if (typeof perf?.now !== "function") {
+        throw new TypeError("perf option must have a now() method if specified");
+      }
+    }
+    this.#perf = perf ?? defaultPerf;
     if (max !== 0 && !isPosInt(max)) {
       throw new TypeError("max option must be a nonnegative integer");
     }
@@ -2507,6 +2546,9 @@ class LRUCache {
     if (typeof dispose === "function") {
       this.#dispose = dispose;
     }
+    if (typeof onInsert === "function") {
+      this.#onInsert = onInsert;
+    }
     if (typeof disposeAfter === "function") {
       this.#disposeAfter = disposeAfter;
       this.#disposed = [];
@@ -2515,6 +2557,7 @@ class LRUCache {
       this.#disposed = void 0;
     }
     this.#hasDispose = !!this.#dispose;
+    this.#hasOnInsert = !!this.#onInsert;
     this.#hasDisposeAfter = !!this.#disposeAfter;
     this.noDisposeOnSet = !!noDisposeOnSet;
     this.noUpdateTTL = !!noUpdateTTL;
@@ -2570,10 +2613,16 @@ class LRUCache {
     const starts = new ZeroArray(this.#max);
     this.#ttls = ttls;
     this.#starts = starts;
-    this.#setItemTTL = (index, ttl, start = perf.now()) => {
+    const purgeTimers = this.ttlAutopurge ? new Array(this.#max) : void 0;
+    this.#autopurgeTimers = purgeTimers;
+    this.#setItemTTL = (index, ttl, start = this.#perf.now()) => {
       starts[index] = ttl !== 0 ? start : 0;
       ttls[index] = ttl;
-      if (ttl !== 0 && this.ttlAutopurge) {
+      if (purgeTimers?.[index]) {
+        clearTimeout(purgeTimers[index]);
+        purgeTimers[index] = void 0;
+      }
+      if (ttl !== 0 && purgeTimers) {
         const t = setTimeout(() => {
           if (this.#isStale(index)) {
             this.#delete(this.#keyList[index], "expire");
@@ -2582,10 +2631,11 @@ class LRUCache {
         if (t.unref) {
           t.unref();
         }
+        purgeTimers[index] = t;
       }
     };
     this.#updateItemAge = (index) => {
-      starts[index] = ttls[index] !== 0 ? perf.now() : 0;
+      starts[index] = ttls[index] !== 0 ? this.#perf.now() : 0;
     };
     this.#statusTTL = (status, index) => {
       if (ttls[index]) {
@@ -2602,7 +2652,7 @@ class LRUCache {
     };
     let cachedNow = 0;
     const getNow = () => {
-      const n = perf.now();
+      const n = this.#perf.now();
       if (this.ttlResolution > 0) {
         cachedNow = n;
         const t = setTimeout(() => cachedNow = 0, this.ttlResolution);
@@ -2905,7 +2955,7 @@ class LRUCache {
       const ttl = this.#ttls[i];
       const start = this.#starts[i];
       if (ttl && start) {
-        const remain = ttl - (perf.now() - start);
+        const remain = ttl - (this.#perf.now() - start);
         entry.ttl = remain;
         entry.start = Date.now();
       }
@@ -2939,7 +2989,7 @@ class LRUCache {
       const entry = { value };
       if (this.#ttls && this.#starts) {
         entry.ttl = this.#ttls[i];
-        const age = perf.now() - this.#starts[i];
+        const age = this.#perf.now() - this.#starts[i];
         entry.start = Math.floor(Date.now() - age);
       }
       if (this.#sizes) {
@@ -2963,7 +3013,7 @@ class LRUCache {
     for (const [key, entry] of arr) {
       if (entry.start) {
         const age = Date.now() - entry.start;
-        entry.start = perf.now() - age;
+        entry.start = this.#perf.now() - age;
       }
       this.set(key, entry.value, entry);
     }
@@ -3028,6 +3078,9 @@ class LRUCache {
       if (status)
         status.set = "add";
       noUpdateTTL = false;
+      if (this.#hasOnInsert) {
+        this.#onInsert?.(v, k, "add");
+      }
     } else {
       this.#moveToTail(index);
       const oldVal = this.#valList[index];
@@ -3063,6 +3116,9 @@ class LRUCache {
       } else if (status) {
         status.set = "update";
       }
+      if (this.#hasOnInsert) {
+        this.onInsert?.(v, k, v === oldVal ? "update" : "replace");
+      }
     }
     if (ttl !== 0 && !this.#ttls) {
       this.#initializeTTLTracking();
@@ -3125,6 +3181,10 @@ class LRUCache {
       }
     }
     this.#removeItemSize(head);
+    if (this.#autopurgeTimers?.[head]) {
+      clearTimeout(this.#autopurgeTimers[head]);
+      this.#autopurgeTimers[head] = void 0;
+    }
     if (free) {
       this.#keyList[head] = void 0;
       this.#valList[head] = void 0;
@@ -3216,6 +3276,7 @@ class LRUCache {
     const cb = (v2, updateCache = false) => {
       const { aborted } = ac.signal;
       const ignoreAbort = options.ignoreFetchAbort && v2 !== void 0;
+      const proceed = options.ignoreFetchAbort || !!(options.allowStaleOnFetchAbort && v2 !== void 0);
       if (options.status) {
         if (aborted && !updateCache) {
           options.status.fetchAborted = true;
@@ -3227,12 +3288,13 @@ class LRUCache {
         }
       }
       if (aborted && !ignoreAbort && !updateCache) {
-        return fetchFail(ac.signal.reason);
+        return fetchFail(ac.signal.reason, proceed);
       }
       const bf2 = p;
-      if (this.#valList[index] === p) {
+      const vl = this.#valList[index];
+      if (vl === p || ignoreAbort && updateCache && vl === void 0) {
         if (v2 === void 0) {
-          if (bf2.__staleWhileFetching) {
+          if (bf2.__staleWhileFetching !== void 0) {
             this.#valList[index] = bf2.__staleWhileFetching;
           } else {
             this.#delete(k, "fetch");
@@ -3250,16 +3312,16 @@ class LRUCache {
         options.status.fetchRejected = true;
         options.status.fetchError = er;
       }
-      return fetchFail(er);
+      return fetchFail(er, false);
     };
-    const fetchFail = (er) => {
+    const fetchFail = (er, proceed) => {
       const { aborted } = ac.signal;
       const allowStaleAborted = aborted && options.allowStaleOnFetchAbort;
       const allowStale = allowStaleAborted || options.allowStaleOnFetchRejection;
       const noDelete = allowStale || options.noDeleteOnFetchRejection;
       const bf2 = p;
       if (this.#valList[index] === p) {
-        const del = !noDelete || bf2.__staleWhileFetching === void 0;
+        const del = !noDelete || !proceed && bf2.__staleWhileFetching === void 0;
         if (del) {
           this.#delete(k, "fetch");
         } else if (!allowStaleAborted) {
@@ -3495,6 +3557,10 @@ class LRUCache {
     if (this.#size !== 0) {
       const index = this.#keyMap.get(k);
       if (index !== void 0) {
+        if (this.#autopurgeTimers?.[index]) {
+          clearTimeout(this.#autopurgeTimers?.[index]);
+          this.#autopurgeTimers[index] = void 0;
+        }
         deleted = true;
         if (this.#size === 1) {
           this.#clear(reason);
@@ -3565,6 +3631,11 @@ class LRUCache {
     if (this.#ttls && this.#starts) {
       this.#ttls.fill(0);
       this.#starts.fill(0);
+      for (const t of this.#autopurgeTimers ?? []) {
+        if (t !== void 0)
+          clearTimeout(t);
+      }
+      this.#autopurgeTimers?.fill(void 0);
     }
     if (this.#sizes) {
       this.#sizes.fill(0);
@@ -4502,7 +4573,7 @@ const ENOREALPATH = 512;
 const ENOCHILD = ENOTDIR | ENOENT | ENOREALPATH;
 const TYPEMASK = 1023;
 const entToType = (s) => s.isFile() ? IFREG : s.isDirectory() ? IFDIR : s.isSymbolicLink() ? IFLNK : s.isCharacterDevice() ? IFCHR : s.isBlockDevice() ? IFBLK : s.isSocket() ? IFSOCK : s.isFIFO() ? IFIFO : UNKNOWN;
-const normalizeCache = /* @__PURE__ */ new Map();
+const normalizeCache = new LRUCache({ max: 2 ** 12 });
 const normalize = (s) => {
   const c = normalizeCache.get(s);
   if (c)
@@ -4511,7 +4582,7 @@ const normalize = (s) => {
   normalizeCache.set(s, n);
   return n;
 };
-const normalizeNocaseCache = /* @__PURE__ */ new Map();
+const normalizeNocaseCache = new LRUCache({ max: 2 ** 12 });
 const normalizeNocase = (s) => {
   const c = normalizeNocaseCache.get(s);
   if (c)
@@ -4668,6 +4739,7 @@ class PathBase {
   get parentPath() {
     return (this.parent || this).fullpath();
   }
+  /* c8 ignore start */
   /**
    * Deprecated alias for Dirent['parentPath'] Somewhat counterintuitively,
    * this property refers to the *parent* path, not the path object itself.
@@ -4677,6 +4749,7 @@ class PathBase {
   get path() {
     return this.parentPath;
   }
+  /* c8 ignore stop */
   /**
    * Do not create new Path objects directly.  They should always be accessed
    * via the PathScurry class or other methods on the Path class.
@@ -7714,12 +7787,12 @@ export default (${entity}) => produce(${entity}, (draft) => {
 const getTemplateMigrationFile = async (entity, enableMetaData) => {
   let template = enableMetaData ? templateMigrationFileWithMetaDataLegacy(entity) : templateMigrationFileLegacy(entity);
   try {
-    await Promise.resolve().then(function () { return require('./immer-BsT8CIGL.cjs'); }).then(({ produce }) => {
+    await Promise.resolve().then(function () { return require('./immer-ZZLkDBss.cjs'); }).then(({ produce }) => {
       if (produce) {
         template = enableMetaData ? templateMigrationFileWithMetaData(entity) : templateMigrationFile(entity);
       }
     });
-  } catch (_error) {
+  } catch {
   }
   return template;
 };
@@ -7830,7 +7903,7 @@ const commandAvailable = (command) => {
     const exists = isWindows ? "where" : "which";
     child_process.execSync(`${exists} ${command}`);
     return true;
-  } catch (_error) {
+  } catch {
     return false;
   }
 };
@@ -7841,7 +7914,7 @@ const bashAvailable = () => {
     try {
       const response = child_process.execSync("bash --version").toString();
       return response.includes("version");
-    } catch (_error) {
+    } catch {
       return false;
     }
   }
@@ -8212,7 +8285,7 @@ const parsePlan = (plan) => {
   return (() => {
     try {
       return JSON.parse(plan);
-    } catch (_error) {
+    } catch {
       console.error("Unable to parse plan.json");
       return null;
     }

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { IDatabase, IHelpers, ITask } from 'pg-promise';
+import { ITask, IDatabase, IHelpers } from 'pg-promise';
 
 /**
  * Generate a new entity migration
@@ -158,4 +158,5 @@ declare const printVersionHistory: ({ config }: {
     config: TConfig;
 }) => Promise<void>;
 
-export { type TAfterMigrateRecord, type TAfterMigrateRecordPayload, type TBeforeMigrateRecord, type TBeforeMigrateRecordPayload, type TConfig, type TEntityColumnNames, type TMetaData, type TMigration, type TMigrationErrorPayload, type TOnMigrationErrors, type TOnMigrationErrorsPayload, type TPayload, type TPlan, type TPlanEntry, type TRecord, type TRecordDetails, type TRecordDetailsList, createMigration, getPlannedMigrations, getPlannedVersion, getVersions, migrate, migrateAll, pipe, printVersionHistory };
+export { createMigration, getPlannedMigrations, getPlannedVersion, getVersions, migrate, migrateAll, pipe, printVersionHistory };
+export type { TAfterMigrateRecord, TAfterMigrateRecordPayload, TBeforeMigrateRecord, TBeforeMigrateRecordPayload, TConfig, TEntityColumnNames, TMetaData, TMigration, TMigrationErrorPayload, TOnMigrationErrors, TOnMigrationErrorsPayload, TPayload, TPlan, TPlanEntry, TRecord, TRecordDetails, TRecordDetailsList };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { IDatabase, IHelpers, ITask } from 'pg-promise';
+import { ITask, IDatabase, IHelpers } from 'pg-promise';
 
 /**
  * Generate a new entity migration
@@ -158,4 +158,5 @@ declare const printVersionHistory: ({ config }: {
     config: TConfig;
 }) => Promise<void>;
 
-export { type TAfterMigrateRecord, type TAfterMigrateRecordPayload, type TBeforeMigrateRecord, type TBeforeMigrateRecordPayload, type TConfig, type TEntityColumnNames, type TMetaData, type TMigration, type TMigrationErrorPayload, type TOnMigrationErrors, type TOnMigrationErrorsPayload, type TPayload, type TPlan, type TPlanEntry, type TRecord, type TRecordDetails, type TRecordDetailsList, createMigration, getPlannedMigrations, getPlannedVersion, getVersions, migrate, migrateAll, pipe, printVersionHistory };
+export { createMigration, getPlannedMigrations, getPlannedVersion, getVersions, migrate, migrateAll, pipe, printVersionHistory };
+export type { TAfterMigrateRecord, TAfterMigrateRecordPayload, TBeforeMigrateRecord, TBeforeMigrateRecordPayload, TConfig, TEntityColumnNames, TMetaData, TMigration, TMigrationErrorPayload, TOnMigrationErrors, TOnMigrationErrorsPayload, TPayload, TPlan, TPlanEntry, TRecord, TRecordDetails, TRecordDetailsList };