pgsql-test 2.16.3 → 2.17.0

package/esm/utils.js

@@ -1,5 +1,12 @@
 const uuidRegexp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-const idReplacement = (v) => (!v ? v : '[ID]');
+const idReplacement = (v, idHash) => {
+    if (!v)
+        return v;
+    if (!idHash)
+        return '[ID]';
+    const key = String(v);
+    return idHash[key] !== undefined ? `[ID-${idHash[key]}]` : '[ID]';
+};
 function mapValues(obj, fn) {
     return Object.entries(obj).reduce((acc, [key, value]) => {
         acc[key] = fn(value, key);
@@ -20,9 +27,9 @@ export const pruneDates = (row) => mapValues(row, (v, k) => {
     }
     return v;
 });
-export const pruneIds = (row) => mapValues(row, (v, k) => (k === 'id' || (typeof k === 'string' && k.endsWith('_id'))) &&
+export const pruneIds = (row, idHash) => mapValues(row, (v, k) => (k === 'id' || (typeof k === 'string' && k.endsWith('_id'))) &&
     (typeof v === 'string' || typeof v === 'number')
-    ? idReplacement(v)
+    ? idReplacement(v, idHash)
     : v);
 export const pruneIdArrays = (row) => mapValues(row, (v, k) => typeof k === 'string' && k.endsWith('_ids') && Array.isArray(v)
     ? `[UUIDs-${v.length}]`
@@ -51,26 +58,31 @@ export const pruneTokens = (row) => mapValues(row, (v, k) => (k === 'token' || k
     ? '[token]'
     : v);
 export const composePruners = (...pruners) => (row) => pruners.reduce((acc, pruner) => pruner(acc), row);
-// Default pruners used by prune/snapshot
+// Default pruners used by prune/snapshot (without IdHash)
 export const defaultPruners = [
     pruneTokens,
     prunePeoplestamps,
     pruneDates,
     pruneIdArrays,
-    pruneIds,
     pruneUUIDs,
     pruneHashes
 ];
-export const prune = composePruners(...defaultPruners);
+// Compose pruners and apply pruneIds with IdHash support
+export const prune = (row, idHash) => {
+    const pruned = composePruners(...defaultPruners)(row);
+    return pruneIds(pruned, idHash);
+};
 // Factory to create a snapshot function with custom pruners
 export const createSnapshot = (pruners) => {
     const pruneFn = composePruners(...pruners);
-    const snap = (obj) => {
+    const snap = (obj, idHash) => {
         if (Array.isArray(obj)) {
-            return obj.map(snap);
+            return obj.map((el) => snap(el, idHash));
         }
         else if (obj && typeof obj === 'object') {
-            return mapValues(pruneFn(obj), snap);
+            const pruned = pruneFn(obj);
+            const prunedWithIds = pruneIds(pruned, idHash);
+            return mapValues(prunedWithIds, (v) => snap(v, idHash));
         }
         return obj;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-test",
-  "version": "2.16.3",
+  "version": "2.17.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "pgsql-test offers isolated, role-aware, and rollback-friendly PostgreSQL environments for integration tests — giving developers realistic test coverage without external state pollution",
   "main": "index.js",
@@ -60,16 +60,16 @@
     "makage": "^0.1.8"
   },
   "dependencies": {
-    "@pgpmjs/core": "^3.0.3",
-    "@pgpmjs/env": "^2.8.1",
-    "@pgpmjs/logger": "^1.3.2",
-    "@pgpmjs/server-utils": "^2.8.3",
-    "@pgpmjs/types": "^2.12.1",
+    "@pgpmjs/core": "^3.0.4",
+    "@pgpmjs/env": "^2.8.2",
+    "@pgpmjs/logger": "^1.3.3",
+    "@pgpmjs/server-utils": "^2.8.4",
+    "@pgpmjs/types": "^2.12.2",
     "csv-parse": "^6.1.0",
     "pg": "^8.16.3",
-    "pg-cache": "^1.6.3",
+    "pg-cache": "^1.6.4",
     "pg-copy-streams": "^7.0.0",
-    "pg-env": "^1.2.1"
+    "pg-env": "^1.2.2"
   },
-  "gitHead": "52828c38b144fdc02b6a9a0c8b0ff795d1752d53"
+  "gitHead": "4326e2092d0c57901e898560974d502d626c42cb"
 }

package/utils.d.ts

@@ -1,6 +1,7 @@
+export type IdHash = Record<string, number | string>;
 type AnyObject = Record<string, any>;
 export declare const pruneDates: (row: AnyObject) => AnyObject;
-export declare const pruneIds: (row: AnyObject) => AnyObject;
+export declare const pruneIds: (row: AnyObject, idHash?: IdHash) => AnyObject;
 export declare const pruneIdArrays: (row: AnyObject) => AnyObject;
 export declare const pruneUUIDs: (row: AnyObject) => AnyObject;
 export declare const pruneHashes: (row: AnyObject) => AnyObject;
@@ -10,7 +11,7 @@ export declare const pruneTokens: (row: AnyObject) => AnyObject;
 type Pruner = (row: AnyObject) => AnyObject;
 export declare const composePruners: (...pruners: Pruner[]) => Pruner;
 export declare const defaultPruners: Pruner[];
-export declare const prune: Pruner;
-export declare const createSnapshot: (pruners: Pruner[]) => (obj: unknown) => unknown;
-export declare const snapshot: (obj: unknown) => unknown;
+export declare const prune: (row: AnyObject, idHash?: IdHash) => AnyObject;
+export declare const createSnapshot: (pruners: Pruner[]) => (obj: unknown, idHash?: IdHash) => unknown;
+export declare const snapshot: (obj: unknown, idHash?: IdHash) => unknown;
 export {};

package/utils.js

@@ -2,7 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.snapshot = exports.createSnapshot = exports.prune = exports.defaultPruners = exports.composePruners = exports.pruneTokens = exports.prunePeoplestamps = exports.pruneSchemas = exports.pruneHashes = exports.pruneUUIDs = exports.pruneIdArrays = exports.pruneIds = exports.pruneDates = void 0;
 const uuidRegexp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-const idReplacement = (v) => (!v ? v : '[ID]');
+const idReplacement = (v, idHash) => {
+    if (!v)
+        return v;
+    if (!idHash)
+        return '[ID]';
+    const key = String(v);
+    return idHash[key] !== undefined ? `[ID-${idHash[key]}]` : '[ID]';
+};
 function mapValues(obj, fn) {
     return Object.entries(obj).reduce((acc, [key, value]) => {
         acc[key] = fn(value, key);
@@ -24,9 +31,9 @@ const pruneDates = (row) => mapValues(row, (v, k) => {
     return v;
 });
 exports.pruneDates = pruneDates;
-const pruneIds = (row) => mapValues(row, (v, k) => (k === 'id' || (typeof k === 'string' && k.endsWith('_id'))) &&
+const pruneIds = (row, idHash) => mapValues(row, (v, k) => (k === 'id' || (typeof k === 'string' && k.endsWith('_id'))) &&
     (typeof v === 'string' || typeof v === 'number')
-    ? idReplacement(v)
+    ? idReplacement(v, idHash)
     : v);
 exports.pruneIds = pruneIds;
 const pruneIdArrays = (row) => mapValues(row, (v, k) => typeof k === 'string' && k.endsWith('_ids') && Array.isArray(v)
@@ -63,26 +70,32 @@ const pruneTokens = (row) => mapValues(row, (v, k) => (k === 'token' || k.endsWi
 exports.pruneTokens = pruneTokens;
 const composePruners = (...pruners) => (row) => pruners.reduce((acc, pruner) => pruner(acc), row);
 exports.composePruners = composePruners;
-// Default pruners used by prune/snapshot
+// Default pruners used by prune/snapshot (without IdHash)
 exports.defaultPruners = [
     exports.pruneTokens,
     exports.prunePeoplestamps,
     exports.pruneDates,
     exports.pruneIdArrays,
-    exports.pruneIds,
     exports.pruneUUIDs,
     exports.pruneHashes
 ];
-exports.prune = (0, exports.composePruners)(...exports.defaultPruners);
+// Compose pruners and apply pruneIds with IdHash support
+const prune = (row, idHash) => {
+    const pruned = (0, exports.composePruners)(...exports.defaultPruners)(row);
+    return (0, exports.pruneIds)(pruned, idHash);
+};
+exports.prune = prune;
 // Factory to create a snapshot function with custom pruners
 const createSnapshot = (pruners) => {
     const pruneFn = (0, exports.composePruners)(...pruners);
-    const snap = (obj) => {
+    const snap = (obj, idHash) => {
         if (Array.isArray(obj)) {
-            return obj.map(snap);
+            return obj.map((el) => snap(el, idHash));
         }
         else if (obj && typeof obj === 'object') {
-            return mapValues(pruneFn(obj), snap);
+            const pruned = pruneFn(obj);
+            const prunedWithIds = (0, exports.pruneIds)(pruned, idHash);
+            return mapValues(prunedWithIds, (v) => snap(v, idHash));
         }
         return obj;
     };