@rebasepro/server-postgresql 0.0.1-canary.ca2cb6e → 0.0.1-canary.cbdd980

package/dist/index.es.js

@@ -1,6 +1,6 @@
 import { Pool, Client } from "pg";
 import { drizzle } from "drizzle-orm/node-postgres";
-import { sql, inArray, eq as eq$3, and, or, ilike, asc, desc, gt, lt, getTableName as getTableName$1, count, relations, isTable } from "drizzle-orm";
+import { sql, inArray, eq, and, or, ilike, asc, desc, gt, lt, getTableName as getTableName$1, count, relations, isTable } from "drizzle-orm";
 import { pgSchema, timestamp, varchar, boolean, uuid, jsonb, primaryKey, unique } from "drizzle-orm/pg-core";
 import { createHash, randomUUID } from "crypto";
 import * as fs from "fs";
@@ -124,16 +124,14 @@ function getDataSourceCapabilities(driver) {
 }
 const DEFAULT_ONE_OF_TYPE = "type";
 const DEFAULT_ONE_OF_VALUE = "value";
-const snakeCaseRegex = /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g;
+const tokenizeRegex = /[A-Z]{2,}(?=[A-Z][a-z]|\b)|[A-Z]?[a-z]+|[0-9]+(?:[a-z](?![a-z]))?|[A-Z]/g;
+const snakeCaseRegex = tokenizeRegex;
 const toSnakeCase = (str) => {
   const regExpMatchArray = str.match(snakeCaseRegex);
   if (!regExpMatchArray) return "";
   return regExpMatchArray.map((x) => x.toLowerCase()).join("_");
 };
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-function getDefaultExportFromCjs(x) {
-  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
-}
 function commonjsRequire(path2) {
   throw new Error('Could not dynamically require "' + path2 + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
 }
@@ -920,7 +918,23 @@ var object_hash = { exports: {} };
     }, { buffer: 3, lYpoI2: 11 }] }, {}, [1])(1);
   });
 })(object_hash);
-function isObject$6(item) {
+function deepClone(value) {
+  if (value === null || value === void 0) return value;
+  if (typeof value === "function") return value;
+  if (typeof value !== "object") return value;
+  if (Array.isArray(value)) {
+    return value.map((item) => deepClone(item));
+  }
+  if (Object.getPrototypeOf(value) !== Object.prototype) {
+    return value;
+  }
+  const result = {};
+  for (const key of Object.keys(value)) {
+    result[key] = deepClone(value[key]);
+  }
+  return result;
+}
+function isObject(item) {
   return !!item && typeof item === "object" && !Array.isArray(item);
 }
 function isPlainObject(obj) {
@@ -931,13 +945,13 @@ function isPlainObject(obj) {
   return proto === Object.prototype;
 }
 function mergeDeep(target, source, ignoreUndefined = false) {
-  if (!isObject$6(target)) {
+  if (!isObject(target)) {
     return target;
   }
   const output = {
     ...target
   };
-  if (!isObject$6(source)) {
+  if (!isObject(source)) {
     return output;
   }
   for (const key in source) {
@@ -978,7 +992,7 @@ function mergeDeep(target, source, ignoreUndefined = false) {
         } else {
           output[key] = sourceValue;
         }
-      } else if (isObject$6(sourceValue)) {
+      } else if (isObject(sourceValue)) {
         output[key] = sourceValue;
       } else {
         output[key] = sourceValue;
@@ -1021,6 +1035,80 @@ function generateForeignKeyName(name) {
   const singularName = snakeCaseName.endsWith("s") ? snakeCaseName.slice(0, -1) : snakeCaseName;
   return `${singularName}_id`;
 }
+function updateDateAutoValues({
+  inputValues,
+  properties,
+  status,
+  timestampNowValue
+}) {
+  return traverseValuesProperties(inputValues, properties, (inputValue, property) => {
+    if (property.type === "date") {
+      if (status === "existing" && property.autoValue === "on_update") {
+        return timestampNowValue;
+      } else if ((status === "new" || status === "copy") && (property.autoValue === "on_update" || property.autoValue === "on_create")) {
+        return timestampNowValue;
+      } else {
+        return inputValue;
+      }
+    } else {
+      return inputValue;
+    }
+  }) ?? {};
+}
+function traverseValuesProperties(inputValues, properties, operation) {
+  const safeInputValues = inputValues ?? {};
+  const updatedValues = Object.entries(properties).map(([key, property]) => {
+    const inputValue = safeInputValues && safeInputValues[key];
+    const updatedValue = traverseValueProperty(inputValue, property, operation);
+    if (updatedValue === null) return null;
+    if (updatedValue === void 0) return void 0;
+    return {
+      [key]: updatedValue
+    };
+  }).reduce((a, b) => ({
+    ...a,
+    ...b
+  }), {});
+  const result = mergeDeep(safeInputValues, updatedValues);
+  if (!result || Object.keys(result).length === 0) return void 0;
+  return result;
+}
+function traverseValueProperty(inputValue, property, operation) {
+  let value;
+  if (property.type === "map" && property.properties) {
+    value = traverseValuesProperties(inputValue, property.properties, operation);
+  } else if (property.type === "array") {
+    const of = property.of;
+    if (of && Array.isArray(inputValue) && !Array.isArray(of)) {
+      value = inputValue.map((e) => traverseValueProperty(e, of, operation));
+    } else if (of && Array.isArray(inputValue) && Array.isArray(of)) {
+      value = inputValue.map((e, i) => {
+        if (i < of.length) return traverseValueProperty(e, of[i], operation);
+        return null;
+      }).filter(Boolean);
+    } else if (property.oneOf && Array.isArray(inputValue)) {
+      const typeField = property.oneOf?.typeField ?? DEFAULT_ONE_OF_TYPE;
+      const valueField = property.oneOf?.valueField ?? DEFAULT_ONE_OF_VALUE;
+      value = inputValue.map((e) => {
+        if (e === null) return null;
+        if (typeof e !== "object") return e;
+        const rec = e;
+        const type = rec[typeField];
+        const childProperty = property.oneOf?.properties[type];
+        if (!type || !childProperty) return e;
+        return {
+          [typeField]: type,
+          [valueField]: traverseValueProperty(rec[valueField], childProperty, operation)
+        };
+      });
+    } else {
+      value = inputValue;
+    }
+  } else {
+    value = operation(inputValue, property);
+  }
+  return value;
+}
 function createRelationRef(id, path2) {
   return {
     id,
@@ -1350,7 +1438,7 @@ function findRelation(resolvedRelations, key) {
 }
 var logic = { exports: {} };
 (function(module, exports$1) {
-  (function(root2, factory) {
+  (function(root, factory) {
     {
       module.exports = factory();
     }
@@ -1717,8 +1805,8 @@ var logic = { exports: {} };
     return jsonLogic;
   });
 })(logic);
-var getOwnPropertyNames = Object.getOwnPropertyNames, getOwnPropertySymbols = Object.getOwnPropertySymbols;
-var hasOwnProperty$a = Object.prototype.hasOwnProperty;
+const { getOwnPropertyNames, getOwnPropertySymbols } = Object;
+const { hasOwnProperty } = Object.prototype;
 function combineComparators(comparatorA, comparatorB) {
   return function isEqual(a, b, state) {
     return comparatorA(a, b, state) && comparatorB(a, b, state);
@@ -1729,38 +1817,45 @@ function createIsCircular(areItemsEqual) {
     if (!a || !b || typeof a !== "object" || typeof b !== "object") {
       return areItemsEqual(a, b, state);
     }
-    var cache = state.cache;
-    var cachedA = cache.get(a);
-    var cachedB = cache.get(b);
+    const { cache } = state;
+    const cachedA = cache.get(a);
+    const cachedB = cache.get(b);
     if (cachedA && cachedB) {
       return cachedA === b && cachedB === a;
     }
     cache.set(a, b);
     cache.set(b, a);
-    var result = areItemsEqual(a, b, state);
+    const result = areItemsEqual(a, b, state);
     cache.delete(a);
     cache.delete(b);
     return result;
   };
 }
-function getShortTag(value) {
-  return value != null ? value[Symbol.toStringTag] : void 0;
-}
 function getStrictProperties(object) {
   return getOwnPropertyNames(object).concat(getOwnPropertySymbols(object));
 }
-var hasOwn = Object.hasOwn || function(object, property) {
-  return hasOwnProperty$a.call(object, property);
-};
-function sameValueZeroEqual(a, b) {
-  return a === b || !a && !b && a !== a && b !== b;
+const hasOwn = (
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  Object.hasOwn || ((object, property) => hasOwnProperty.call(object, property))
+);
+const PREACT_VNODE = "__v";
+const PREACT_OWNER = "__o";
+const REACT_OWNER = "_owner";
+const { getOwnPropertyDescriptor, keys } = Object;
+const sameValueEqual = (
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  Object.is || function sameValueEqual2(a, b) {
+    return a === b ? a !== 0 || 1 / a === 1 / b : a !== a && b !== b;
+  }
+);
+function strictEqual(a, b) {
+  return a === b;
+}
+function areArrayBuffersEqual(a, b) {
+  return a.byteLength === b.byteLength && areTypedArraysEqual(new Uint8Array(a), new Uint8Array(b));
 }
-var PREACT_VNODE = "__v";
-var PREACT_OWNER = "__o";
-var REACT_OWNER = "_owner";
-var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor, keys$4 = Object.keys;
 function areArraysEqual(a, b, state) {
-  var index = a.length;
+  let index = a.length;
   if (b.length !== index) {
     return false;
   }
@@ -1771,35 +1866,35 @@ function areArraysEqual(a, b, state) {
   }
   return true;
 }
+function areDataViewsEqual(a, b) {
+  return a.byteLength === b.byteLength && areTypedArraysEqual(new Uint8Array(a.buffer, a.byteOffset, a.byteLength), new Uint8Array(b.buffer, b.byteOffset, b.byteLength));
+}
 function areDatesEqual(a, b) {
-  return sameValueZeroEqual(a.getTime(), b.getTime());
+  return sameValueEqual(a.getTime(), b.getTime());
 }
 function areErrorsEqual(a, b) {
   return a.name === b.name && a.message === b.message && a.cause === b.cause && a.stack === b.stack;
 }
-function areFunctionsEqual(a, b) {
-  return a === b;
-}
 function areMapsEqual(a, b, state) {
-  var size = a.size;
+  const size = a.size;
   if (size !== b.size) {
     return false;
   }
   if (!size) {
     return true;
   }
-  var matchedIndices = new Array(size);
-  var aIterable = a.entries();
-  var aResult;
-  var bResult;
-  var index = 0;
+  const matchedIndices = new Array(size);
+  const aIterable = a.entries();
+  let aResult;
+  let bResult;
+  let index = 0;
   while (aResult = aIterable.next()) {
     if (aResult.done) {
       break;
     }
-    var bIterable = b.entries();
-    var hasMatch = false;
-    var matchIndex = 0;
+    const bIterable = b.entries();
+    let hasMatch = false;
+    let matchIndex = 0;
     while (bResult = bIterable.next()) {
       if (bResult.done) {
         break;
@@ -1808,8 +1903,8 @@ function areMapsEqual(a, b, state) {
         matchIndex++;
         continue;
       }
-      var aEntry = aResult.value;
-      var bEntry = bResult.value;
+      const aEntry = aResult.value;
+      const bEntry = bResult.value;
       if (state.equals(aEntry[0], bEntry[0], index, matchIndex, a, b, state) && state.equals(aEntry[1], bEntry[1], aEntry[0], bEntry[0], a, b, state)) {
         hasMatch = matchedIndices[matchIndex] = true;
         break;
@@ -1823,11 +1918,10 @@ function areMapsEqual(a, b, state) {
   }
   return true;
 }
-var areNumbersEqual = sameValueZeroEqual;
 function areObjectsEqual(a, b, state) {
-  var properties = keys$4(a);
-  var index = properties.length;
-  if (keys$4(b).length !== index) {
+  const properties = keys(a);
+  let index = properties.length;
+  if (keys(b).length !== index) {
     return false;
   }
   while (index-- > 0) {
@@ -1838,14 +1932,14 @@ function areObjectsEqual(a, b, state) {
   return true;
 }
 function areObjectsEqualStrict(a, b, state) {
-  var properties = getStrictProperties(a);
-  var index = properties.length;
+  const properties = getStrictProperties(a);
+  let index = properties.length;
   if (getStrictProperties(b).length !== index) {
     return false;
   }
-  var property;
-  var descriptorA;
-  var descriptorB;
+  let property;
+  let descriptorA;
+  let descriptorB;
   while (index-- > 0) {
     property = properties[index];
     if (!isPropertyEqual(a, b, state, property)) {
@@ -1860,30 +1954,30 @@ function areObjectsEqualStrict(a, b, state) {
   return true;
 }
 function arePrimitiveWrappersEqual(a, b) {
-  return sameValueZeroEqual(a.valueOf(), b.valueOf());
+  return sameValueEqual(a.valueOf(), b.valueOf());
 }
 function areRegExpsEqual(a, b) {
   return a.source === b.source && a.flags === b.flags;
 }
 function areSetsEqual(a, b, state) {
-  var size = a.size;
+  const size = a.size;
   if (size !== b.size) {
     return false;
   }
   if (!size) {
     return true;
   }
-  var matchedIndices = new Array(size);
-  var aIterable = a.values();
-  var aResult;
-  var bResult;
+  const matchedIndices = new Array(size);
+  const aIterable = a.values();
+  let aResult;
+  let bResult;
   while (aResult = aIterable.next()) {
     if (aResult.done) {
       break;
     }
-    var bIterable = b.values();
-    var hasMatch = false;
-    var matchIndex = 0;
+    const bIterable = b.values();
+    let hasMatch = false;
+    let matchIndex = 0;
     while (bResult = bIterable.next()) {
       if (bResult.done) {
         break;
@@ -1901,8 +1995,8 @@ function areSetsEqual(a, b, state) {
   return true;
 }
 function areTypedArraysEqual(a, b) {
-  var index = a.length;
-  if (b.length !== index) {
+  let index = a.byteLength;
+  if (b.byteLength !== index || a.byteOffset !== b.byteOffset) {
     return false;
   }
   while (index-- > 0) {
@@ -1921,23 +2015,10 @@ function isPropertyEqual(a, b, state, property) {
   }
   return hasOwn(b, property) && state.equals(a[property], b[property], property, property, a, b, state);
 }
-var ARGUMENTS_TAG = "[object Arguments]";
-var BOOLEAN_TAG = "[object Boolean]";
-var DATE_TAG = "[object Date]";
-var ERROR_TAG = "[object Error]";
-var MAP_TAG = "[object Map]";
-var NUMBER_TAG = "[object Number]";
-var OBJECT_TAG = "[object Object]";
-var REG_EXP_TAG = "[object RegExp]";
-var SET_TAG = "[object Set]";
-var STRING_TAG = "[object String]";
-var URL_TAG = "[object URL]";
-var isArray$4 = Array.isArray;
-var isTypedArray$2 = typeof ArrayBuffer === "function" && ArrayBuffer.isView ? ArrayBuffer.isView : null;
-var assign = Object.assign;
-var getTag$4 = Object.prototype.toString.call.bind(Object.prototype.toString);
-function createEqualityComparator(_a) {
-  var areArraysEqual2 = _a.areArraysEqual, areDatesEqual2 = _a.areDatesEqual, areErrorsEqual2 = _a.areErrorsEqual, areFunctionsEqual2 = _a.areFunctionsEqual, areMapsEqual2 = _a.areMapsEqual, areNumbersEqual2 = _a.areNumbersEqual, areObjectsEqual2 = _a.areObjectsEqual, arePrimitiveWrappersEqual2 = _a.arePrimitiveWrappersEqual, areRegExpsEqual2 = _a.areRegExpsEqual, areSetsEqual2 = _a.areSetsEqual, areTypedArraysEqual2 = _a.areTypedArraysEqual, areUrlsEqual2 = _a.areUrlsEqual, unknownTagComparators = _a.unknownTagComparators;
+const toString = Object.prototype.toString;
+function createEqualityComparator(config) {
+  const supportedComparatorMap = createSupportedComparatorMap(config);
+  const { areArraysEqual: areArraysEqual2, areDatesEqual: areDatesEqual2, areFunctionsEqual, areMapsEqual: areMapsEqual2, areNumbersEqual, areObjectsEqual: areObjectsEqual2, areRegExpsEqual: areRegExpsEqual2, areSetsEqual: areSetsEqual2, getUnsupportedCustomComparator } = config;
   return function comparator(a, b, state) {
     if (a === b) {
       return true;
@@ -1945,32 +2026,29 @@ function createEqualityComparator(_a) {
     if (a == null || b == null) {
       return false;
     }
-    var type = typeof a;
+    const type = typeof a;
     if (type !== typeof b) {
       return false;
     }
     if (type !== "object") {
-      if (type === "number") {
-        return areNumbersEqual2(a, b, state);
+      if (type === "number" || type === "bigint") {
+        return areNumbersEqual(a, b, state);
       }
       if (type === "function") {
-        return areFunctionsEqual2(a, b, state);
+        return areFunctionsEqual(a, b, state);
       }
       return false;
     }
-    var constructor = a.constructor;
+    const constructor = a.constructor;
     if (constructor !== b.constructor) {
       return false;
     }
     if (constructor === Object) {
       return areObjectsEqual2(a, b, state);
     }
-    if (isArray$4(a)) {
+    if (constructor === Array) {
       return areArraysEqual2(a, b, state);
     }
-    if (isTypedArray$2 != null && isTypedArray$2(a)) {
-      return areTypedArraysEqual2(a, b, state);
-    }
     if (constructor === Date) {
       return areDatesEqual2(a, b, state);
     }
@@ -1983,79 +2061,55 @@ function createEqualityComparator(_a) {
     if (constructor === Set) {
       return areSetsEqual2(a, b, state);
     }
-    var tag = getTag$4(a);
-    if (tag === DATE_TAG) {
-      return areDatesEqual2(a, b, state);
-    }
-    if (tag === REG_EXP_TAG) {
-      return areRegExpsEqual2(a, b, state);
-    }
-    if (tag === MAP_TAG) {
-      return areMapsEqual2(a, b, state);
-    }
-    if (tag === SET_TAG) {
-      return areSetsEqual2(a, b, state);
-    }
-    if (tag === OBJECT_TAG) {
-      return typeof a.then !== "function" && typeof b.then !== "function" && areObjectsEqual2(a, b, state);
-    }
-    if (tag === URL_TAG) {
-      return areUrlsEqual2(a, b, state);
-    }
-    if (tag === ERROR_TAG) {
-      return areErrorsEqual2(a, b, state);
+    if (constructor === Promise) {
+      return false;
     }
-    if (tag === ARGUMENTS_TAG) {
-      return areObjectsEqual2(a, b, state);
+    if (Array.isArray(a)) {
+      return areArraysEqual2(a, b, state);
     }
-    if (tag === BOOLEAN_TAG || tag === NUMBER_TAG || tag === STRING_TAG) {
-      return arePrimitiveWrappersEqual2(a, b, state);
+    const tag = toString.call(a);
+    const supportedComparator = supportedComparatorMap[tag];
+    if (supportedComparator) {
+      return supportedComparator(a, b, state);
     }
-    if (unknownTagComparators) {
-      var unknownTagComparator = unknownTagComparators[tag];
-      if (!unknownTagComparator) {
-        var shortTag = getShortTag(a);
-        if (shortTag) {
-          unknownTagComparator = unknownTagComparators[shortTag];
-        }
-      }
-      if (unknownTagComparator) {
-        return unknownTagComparator(a, b, state);
-      }
+    const unsupportedCustomComparator = getUnsupportedCustomComparator && getUnsupportedCustomComparator(a, b, state, tag);
+    if (unsupportedCustomComparator) {
+      return unsupportedCustomComparator(a, b, state);
     }
     return false;
   };
 }
-function createEqualityComparatorConfig(_a) {
-  var circular = _a.circular, createCustomConfig = _a.createCustomConfig, strict = _a.strict;
-  var config = {
+function createEqualityComparatorConfig({ circular, createCustomConfig, strict }) {
+  let config = {
+    areArrayBuffersEqual,
     areArraysEqual: strict ? areObjectsEqualStrict : areArraysEqual,
+    areDataViewsEqual,
     areDatesEqual,
     areErrorsEqual,
-    areFunctionsEqual,
+    areFunctionsEqual: strictEqual,
     areMapsEqual: strict ? combineComparators(areMapsEqual, areObjectsEqualStrict) : areMapsEqual,
-    areNumbersEqual,
+    areNumbersEqual: sameValueEqual,
     areObjectsEqual: strict ? areObjectsEqualStrict : areObjectsEqual,
     arePrimitiveWrappersEqual,
     areRegExpsEqual,
     areSetsEqual: strict ? combineComparators(areSetsEqual, areObjectsEqualStrict) : areSetsEqual,
-    areTypedArraysEqual: strict ? areObjectsEqualStrict : areTypedArraysEqual,
+    areTypedArraysEqual: strict ? combineComparators(areTypedArraysEqual, areObjectsEqualStrict) : areTypedArraysEqual,
     areUrlsEqual,
-    unknownTagComparators: void 0
+    getUnsupportedCustomComparator: void 0
   };
   if (createCustomConfig) {
-    config = assign({}, config, createCustomConfig(config));
+    config = Object.assign({}, config, createCustomConfig(config));
   }
   if (circular) {
-    var areArraysEqual$1 = createIsCircular(config.areArraysEqual);
-    var areMapsEqual$1 = createIsCircular(config.areMapsEqual);
-    var areObjectsEqual$1 = createIsCircular(config.areObjectsEqual);
-    var areSetsEqual$1 = createIsCircular(config.areSetsEqual);
-    config = assign({}, config, {
-      areArraysEqual: areArraysEqual$1,
-      areMapsEqual: areMapsEqual$1,
-      areObjectsEqual: areObjectsEqual$1,
-      areSetsEqual: areSetsEqual$1
+    const areArraysEqual2 = createIsCircular(config.areArraysEqual);
+    const areMapsEqual2 = createIsCircular(config.areMapsEqual);
+    const areObjectsEqual2 = createIsCircular(config.areObjectsEqual);
+    const areSetsEqual2 = createIsCircular(config.areSetsEqual);
+    config = Object.assign({}, config, {
+      areArraysEqual: areArraysEqual2,
+      areMapsEqual: areMapsEqual2,
+      areObjectsEqual: areObjectsEqual2,
+      areSetsEqual: areSetsEqual2
     });
   }
   return config;
@@ -2065,11 +2119,10 @@ function createInternalEqualityComparator(compare) {
     return compare(a, b, state);
   };
 }
-function createIsEqual(_a) {
-  var circular = _a.circular, comparator = _a.comparator, createState = _a.createState, equals = _a.equals, strict = _a.strict;
+function createIsEqual({ circular, comparator, createState, equals, strict }) {
   if (createState) {
     return function isEqual(a, b) {
-      var _a2 = createState(), _b = _a2.cache, cache = _b === void 0 ? circular ? /* @__PURE__ */ new WeakMap() : void 0 : _b, meta = _a2.meta;
+      const { cache = circular ? /* @__PURE__ */ new WeakMap() : void 0, meta } = createState();
       return comparator(a, b, {
         cache,
         equals,
@@ -2088,7 +2141,7 @@ function createIsEqual(_a) {
       });
     };
   }
-  var state = {
+  const state = {
     cache: void 0,
     equals,
     meta: void 0,
@@ -2098,7 +2151,50 @@ function createIsEqual(_a) {
     return comparator(a, b, state);
   };
 }
-var deepEqual = createCustomEqual();
+function createSupportedComparatorMap({ areArrayBuffersEqual: areArrayBuffersEqual2, areArraysEqual: areArraysEqual2, areDataViewsEqual: areDataViewsEqual2, areDatesEqual: areDatesEqual2, areErrorsEqual: areErrorsEqual2, areFunctionsEqual, areMapsEqual: areMapsEqual2, areNumbersEqual, areObjectsEqual: areObjectsEqual2, arePrimitiveWrappersEqual: arePrimitiveWrappersEqual2, areRegExpsEqual: areRegExpsEqual2, areSetsEqual: areSetsEqual2, areTypedArraysEqual: areTypedArraysEqual2, areUrlsEqual: areUrlsEqual2 }) {
+  return {
+    "[object Arguments]": areObjectsEqual2,
+    "[object Array]": areArraysEqual2,
+    "[object ArrayBuffer]": areArrayBuffersEqual2,
+    "[object AsyncGeneratorFunction]": areFunctionsEqual,
+    "[object BigInt]": areNumbersEqual,
+    "[object BigInt64Array]": areTypedArraysEqual2,
+    "[object BigUint64Array]": areTypedArraysEqual2,
+    "[object Boolean]": arePrimitiveWrappersEqual2,
+    "[object DataView]": areDataViewsEqual2,
+    "[object Date]": areDatesEqual2,
+    // If an error tag, it should be tested explicitly. Like RegExp, the properties are not
+    // enumerable, and therefore will give false positives if tested like a standard object.
+    "[object Error]": areErrorsEqual2,
+    "[object Float16Array]": areTypedArraysEqual2,
+    "[object Float32Array]": areTypedArraysEqual2,
+    "[object Float64Array]": areTypedArraysEqual2,
+    "[object Function]": areFunctionsEqual,
+    "[object GeneratorFunction]": areFunctionsEqual,
+    "[object Int8Array]": areTypedArraysEqual2,
+    "[object Int16Array]": areTypedArraysEqual2,
+    "[object Int32Array]": areTypedArraysEqual2,
+    "[object Map]": areMapsEqual2,
+    "[object Number]": arePrimitiveWrappersEqual2,
+    "[object Object]": (a, b, state) => (
+      // The exception for value comparison is custom `Promise`-like class instances. These should
+      // be treated the same as standard `Promise` objects, which means strict equality, and if
+      // it reaches this point then that strict equality comparison has already failed.
+      typeof a.then !== "function" && typeof b.then !== "function" && areObjectsEqual2(a, b, state)
+    ),
+    // For RegExp, the properties are not enumerable, and therefore will give false positives if
+    // tested like a standard object.
+    "[object RegExp]": areRegExpsEqual2,
+    "[object Set]": areSetsEqual2,
+    "[object String]": arePrimitiveWrappersEqual2,
+    "[object URL]": areUrlsEqual2,
+    "[object Uint8Array]": areTypedArraysEqual2,
+    "[object Uint8ClampedArray]": areTypedArraysEqual2,
+    "[object Uint16Array]": areTypedArraysEqual2,
+    "[object Uint32Array]": areTypedArraysEqual2
+  };
+}
+const deepEqual = createCustomEqual();
 createCustomEqual({ strict: true });
 createCustomEqual({ circular: true });
 createCustomEqual({
@@ -2106,1015 +2202,28 @@ createCustomEqual({
   strict: true
 });
 createCustomEqual({
-  createInternalComparator: function() {
-    return sameValueZeroEqual;
-  }
+  createInternalComparator: () => sameValueEqual
 });
 createCustomEqual({
   strict: true,
-  createInternalComparator: function() {
-    return sameValueZeroEqual;
-  }
+  createInternalComparator: () => sameValueEqual
 });
 createCustomEqual({
   circular: true,
-  createInternalComparator: function() {
-    return sameValueZeroEqual;
-  }
+  createInternalComparator: () => sameValueEqual
 });
 createCustomEqual({
   circular: true,
-  createInternalComparator: function() {
-    return sameValueZeroEqual;
-  },
+  createInternalComparator: () => sameValueEqual,
   strict: true
 });
-function createCustomEqual(options) {
-  if (options === void 0) {
-    options = {};
-  }
-  var _a = options.circular, circular = _a === void 0 ? false : _a, createCustomInternalComparator = options.createInternalComparator, createState = options.createState, _b = options.strict, strict = _b === void 0 ? false : _b;
-  var config = createEqualityComparatorConfig(options);
-  var comparator = createEqualityComparator(config);
-  var equals = createCustomInternalComparator ? createCustomInternalComparator(comparator) : createInternalEqualityComparator(comparator);
+function createCustomEqual(options = {}) {
+  const { circular = false, createInternalComparator: createCustomInternalComparator, createState, strict = false } = options;
+  const config = createEqualityComparatorConfig(options);
+  const comparator = createEqualityComparator(config);
+  const equals = createCustomInternalComparator ? createCustomInternalComparator(comparator) : createInternalEqualityComparator(comparator);
   return createIsEqual({ circular, comparator, createState, equals, strict });
 }
-function listCacheClear$1() {
-  this.__data__ = [];
-  this.size = 0;
-}
-var _listCacheClear = listCacheClear$1;
-function eq$2(value, other) {
-  return value === other || value !== value && other !== other;
-}
-var eq_1 = eq$2;
-var eq$1 = eq_1;
-function assocIndexOf$4(array, key) {
-  var length = array.length;
-  while (length--) {
-    if (eq$1(array[length][0], key)) {
-      return length;
-    }
-  }
-  return -1;
-}
-var _assocIndexOf = assocIndexOf$4;
-var assocIndexOf$3 = _assocIndexOf;
-var arrayProto = Array.prototype;
-var splice = arrayProto.splice;
-function listCacheDelete$1(key) {
-  var data = this.__data__, index = assocIndexOf$3(data, key);
-  if (index < 0) {
-    return false;
-  }
-  var lastIndex = data.length - 1;
-  if (index == lastIndex) {
-    data.pop();
-  } else {
-    splice.call(data, index, 1);
-  }
-  --this.size;
-  return true;
-}
-var _listCacheDelete = listCacheDelete$1;
-var assocIndexOf$2 = _assocIndexOf;
-function listCacheGet$1(key) {
-  var data = this.__data__, index = assocIndexOf$2(data, key);
-  return index < 0 ? void 0 : data[index][1];
-}
-var _listCacheGet = listCacheGet$1;
-var assocIndexOf$1 = _assocIndexOf;
-function listCacheHas$1(key) {
-  return assocIndexOf$1(this.__data__, key) > -1;
-}
-var _listCacheHas = listCacheHas$1;
-var assocIndexOf = _assocIndexOf;
-function listCacheSet$1(key, value) {
-  var data = this.__data__, index = assocIndexOf(data, key);
-  if (index < 0) {
-    ++this.size;
-    data.push([key, value]);
-  } else {
-    data[index][1] = value;
-  }
-  return this;
-}
-var _listCacheSet = listCacheSet$1;
-var listCacheClear = _listCacheClear, listCacheDelete = _listCacheDelete, listCacheGet = _listCacheGet, listCacheHas = _listCacheHas, listCacheSet = _listCacheSet;
-function ListCache$4(entries) {
-  var index = -1, length = entries == null ? 0 : entries.length;
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-ListCache$4.prototype.clear = listCacheClear;
-ListCache$4.prototype["delete"] = listCacheDelete;
-ListCache$4.prototype.get = listCacheGet;
-ListCache$4.prototype.has = listCacheHas;
-ListCache$4.prototype.set = listCacheSet;
-var _ListCache = ListCache$4;
-var ListCache$3 = _ListCache;
-function stackClear$1() {
-  this.__data__ = new ListCache$3();
-  this.size = 0;
-}
-var _stackClear = stackClear$1;
-function stackDelete$1(key) {
-  var data = this.__data__, result = data["delete"](key);
-  this.size = data.size;
-  return result;
-}
-var _stackDelete = stackDelete$1;
-function stackGet$1(key) {
-  return this.__data__.get(key);
-}
-var _stackGet = stackGet$1;
-function stackHas$1(key) {
-  return this.__data__.has(key);
-}
-var _stackHas = stackHas$1;
-var freeGlobal$1 = typeof commonjsGlobal == "object" && commonjsGlobal && commonjsGlobal.Object === Object && commonjsGlobal;
-var _freeGlobal = freeGlobal$1;
-var freeGlobal = _freeGlobal;
-var freeSelf = typeof self == "object" && self && self.Object === Object && self;
-var root$8 = freeGlobal || freeSelf || Function("return this")();
-var _root = root$8;
-var root$7 = _root;
-var Symbol$4 = root$7.Symbol;
-var _Symbol = Symbol$4;
-var Symbol$3 = _Symbol;
-var objectProto$c = Object.prototype;
-var hasOwnProperty$9 = objectProto$c.hasOwnProperty;
-var nativeObjectToString$1 = objectProto$c.toString;
-var symToStringTag$1 = Symbol$3 ? Symbol$3.toStringTag : void 0;
-function getRawTag$1(value) {
-  var isOwn = hasOwnProperty$9.call(value, symToStringTag$1), tag = value[symToStringTag$1];
-  try {
-    value[symToStringTag$1] = void 0;
-    var unmasked = true;
-  } catch (e) {
-  }
-  var result = nativeObjectToString$1.call(value);
-  if (unmasked) {
-    if (isOwn) {
-      value[symToStringTag$1] = tag;
-    } else {
-      delete value[symToStringTag$1];
-    }
-  }
-  return result;
-}
-var _getRawTag = getRawTag$1;
-var objectProto$b = Object.prototype;
-var nativeObjectToString = objectProto$b.toString;
-function objectToString$1(value) {
-  return nativeObjectToString.call(value);
-}
-var _objectToString = objectToString$1;
-var Symbol$2 = _Symbol, getRawTag = _getRawTag, objectToString = _objectToString;
-var nullTag = "[object Null]", undefinedTag = "[object Undefined]";
-var symToStringTag = Symbol$2 ? Symbol$2.toStringTag : void 0;
-function baseGetTag$4(value) {
-  if (value == null) {
-    return value === void 0 ? undefinedTag : nullTag;
-  }
-  return symToStringTag && symToStringTag in Object(value) ? getRawTag(value) : objectToString(value);
-}
-var _baseGetTag = baseGetTag$4;
-function isObject$5(value) {
-  var type = typeof value;
-  return value != null && (type == "object" || type == "function");
-}
-var isObject_1 = isObject$5;
-var baseGetTag$3 = _baseGetTag, isObject$4 = isObject_1;
-var asyncTag = "[object AsyncFunction]", funcTag$2 = "[object Function]", genTag$1 = "[object GeneratorFunction]", proxyTag = "[object Proxy]";
-function isFunction$2(value) {
-  if (!isObject$4(value)) {
-    return false;
-  }
-  var tag = baseGetTag$3(value);
-  return tag == funcTag$2 || tag == genTag$1 || tag == asyncTag || tag == proxyTag;
-}
-var isFunction_1 = isFunction$2;
-var root$6 = _root;
-var coreJsData$1 = root$6["__core-js_shared__"];
-var _coreJsData = coreJsData$1;
-var coreJsData = _coreJsData;
-var maskSrcKey = function() {
-  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || "");
-  return uid ? "Symbol(src)_1." + uid : "";
-}();
-function isMasked$1(func) {
-  return !!maskSrcKey && maskSrcKey in func;
-}
-var _isMasked = isMasked$1;
-var funcProto$1 = Function.prototype;
-var funcToString$1 = funcProto$1.toString;
-function toSource$2(func) {
-  if (func != null) {
-    try {
-      return funcToString$1.call(func);
-    } catch (e) {
-    }
-    try {
-      return func + "";
-    } catch (e) {
-    }
-  }
-  return "";
-}
-var _toSource = toSource$2;
-var isFunction$1 = isFunction_1, isMasked = _isMasked, isObject$3 = isObject_1, toSource$1 = _toSource;
-var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
-var reIsHostCtor = /^\[object .+?Constructor\]$/;
-var funcProto = Function.prototype, objectProto$a = Object.prototype;
-var funcToString = funcProto.toString;
-var hasOwnProperty$8 = objectProto$a.hasOwnProperty;
-var reIsNative = RegExp(
-  "^" + funcToString.call(hasOwnProperty$8).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
-);
-function baseIsNative$1(value) {
-  if (!isObject$3(value) || isMasked(value)) {
-    return false;
-  }
-  var pattern = isFunction$1(value) ? reIsNative : reIsHostCtor;
-  return pattern.test(toSource$1(value));
-}
-var _baseIsNative = baseIsNative$1;
-function getValue$1(object, key) {
-  return object == null ? void 0 : object[key];
-}
-var _getValue = getValue$1;
-var baseIsNative = _baseIsNative, getValue = _getValue;
-function getNative$7(object, key) {
-  var value = getValue(object, key);
-  return baseIsNative(value) ? value : void 0;
-}
-var _getNative = getNative$7;
-var getNative$6 = _getNative, root$5 = _root;
-var Map$4 = getNative$6(root$5, "Map");
-var _Map = Map$4;
-var getNative$5 = _getNative;
-var nativeCreate$4 = getNative$5(Object, "create");
-var _nativeCreate = nativeCreate$4;
-var nativeCreate$3 = _nativeCreate;
-function hashClear$1() {
-  this.__data__ = nativeCreate$3 ? nativeCreate$3(null) : {};
-  this.size = 0;
-}
-var _hashClear = hashClear$1;
-function hashDelete$1(key) {
-  var result = this.has(key) && delete this.__data__[key];
-  this.size -= result ? 1 : 0;
-  return result;
-}
-var _hashDelete = hashDelete$1;
-var nativeCreate$2 = _nativeCreate;
-var HASH_UNDEFINED$1 = "__lodash_hash_undefined__";
-var objectProto$9 = Object.prototype;
-var hasOwnProperty$7 = objectProto$9.hasOwnProperty;
-function hashGet$1(key) {
-  var data = this.__data__;
-  if (nativeCreate$2) {
-    var result = data[key];
-    return result === HASH_UNDEFINED$1 ? void 0 : result;
-  }
-  return hasOwnProperty$7.call(data, key) ? data[key] : void 0;
-}
-var _hashGet = hashGet$1;
-var nativeCreate$1 = _nativeCreate;
-var objectProto$8 = Object.prototype;
-var hasOwnProperty$6 = objectProto$8.hasOwnProperty;
-function hashHas$1(key) {
-  var data = this.__data__;
-  return nativeCreate$1 ? data[key] !== void 0 : hasOwnProperty$6.call(data, key);
-}
-var _hashHas = hashHas$1;
-var nativeCreate = _nativeCreate;
-var HASH_UNDEFINED = "__lodash_hash_undefined__";
-function hashSet$1(key, value) {
-  var data = this.__data__;
-  this.size += this.has(key) ? 0 : 1;
-  data[key] = nativeCreate && value === void 0 ? HASH_UNDEFINED : value;
-  return this;
-}
-var _hashSet = hashSet$1;
-var hashClear = _hashClear, hashDelete = _hashDelete, hashGet = _hashGet, hashHas = _hashHas, hashSet = _hashSet;
-function Hash$1(entries) {
-  var index = -1, length = entries == null ? 0 : entries.length;
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-Hash$1.prototype.clear = hashClear;
-Hash$1.prototype["delete"] = hashDelete;
-Hash$1.prototype.get = hashGet;
-Hash$1.prototype.has = hashHas;
-Hash$1.prototype.set = hashSet;
-var _Hash = Hash$1;
-var Hash = _Hash, ListCache$2 = _ListCache, Map$3 = _Map;
-function mapCacheClear$1() {
-  this.size = 0;
-  this.__data__ = {
-    "hash": new Hash(),
-    "map": new (Map$3 || ListCache$2)(),
-    "string": new Hash()
-  };
-}
-var _mapCacheClear = mapCacheClear$1;
-function isKeyable$1(value) {
-  var type = typeof value;
-  return type == "string" || type == "number" || type == "symbol" || type == "boolean" ? value !== "__proto__" : value === null;
-}
-var _isKeyable = isKeyable$1;
-var isKeyable = _isKeyable;
-function getMapData$4(map, key) {
-  var data = map.__data__;
-  return isKeyable(key) ? data[typeof key == "string" ? "string" : "hash"] : data.map;
-}
-var _getMapData = getMapData$4;
-var getMapData$3 = _getMapData;
-function mapCacheDelete$1(key) {
-  var result = getMapData$3(this, key)["delete"](key);
-  this.size -= result ? 1 : 0;
-  return result;
-}
-var _mapCacheDelete = mapCacheDelete$1;
-var getMapData$2 = _getMapData;
-function mapCacheGet$1(key) {
-  return getMapData$2(this, key).get(key);
-}
-var _mapCacheGet = mapCacheGet$1;
-var getMapData$1 = _getMapData;
-function mapCacheHas$1(key) {
-  return getMapData$1(this, key).has(key);
-}
-var _mapCacheHas = mapCacheHas$1;
-var getMapData = _getMapData;
-function mapCacheSet$1(key, value) {
-  var data = getMapData(this, key), size = data.size;
-  data.set(key, value);
-  this.size += data.size == size ? 0 : 1;
-  return this;
-}
-var _mapCacheSet = mapCacheSet$1;
-var mapCacheClear = _mapCacheClear, mapCacheDelete = _mapCacheDelete, mapCacheGet = _mapCacheGet, mapCacheHas = _mapCacheHas, mapCacheSet = _mapCacheSet;
-function MapCache$1(entries) {
-  var index = -1, length = entries == null ? 0 : entries.length;
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-MapCache$1.prototype.clear = mapCacheClear;
-MapCache$1.prototype["delete"] = mapCacheDelete;
-MapCache$1.prototype.get = mapCacheGet;
-MapCache$1.prototype.has = mapCacheHas;
-MapCache$1.prototype.set = mapCacheSet;
-var _MapCache = MapCache$1;
-var ListCache$1 = _ListCache, Map$2 = _Map, MapCache = _MapCache;
-var LARGE_ARRAY_SIZE = 200;
-function stackSet$1(key, value) {
-  var data = this.__data__;
-  if (data instanceof ListCache$1) {
-    var pairs = data.__data__;
-    if (!Map$2 || pairs.length < LARGE_ARRAY_SIZE - 1) {
-      pairs.push([key, value]);
-      this.size = ++data.size;
-      return this;
-    }
-    data = this.__data__ = new MapCache(pairs);
-  }
-  data.set(key, value);
-  this.size = data.size;
-  return this;
-}
-var _stackSet = stackSet$1;
-var ListCache = _ListCache, stackClear = _stackClear, stackDelete = _stackDelete, stackGet = _stackGet, stackHas = _stackHas, stackSet = _stackSet;
-function Stack$1(entries) {
-  var data = this.__data__ = new ListCache(entries);
-  this.size = data.size;
-}
-Stack$1.prototype.clear = stackClear;
-Stack$1.prototype["delete"] = stackDelete;
-Stack$1.prototype.get = stackGet;
-Stack$1.prototype.has = stackHas;
-Stack$1.prototype.set = stackSet;
-var _Stack = Stack$1;
-function arrayEach$1(array, iteratee) {
-  var index = -1, length = array == null ? 0 : array.length;
-  while (++index < length) {
-    if (iteratee(array[index], index, array) === false) {
-      break;
-    }
-  }
-  return array;
-}
-var _arrayEach = arrayEach$1;
-var getNative$4 = _getNative;
-var defineProperty$1 = function() {
-  try {
-    var func = getNative$4(Object, "defineProperty");
-    func({}, "", {});
-    return func;
-  } catch (e) {
-  }
-}();
-var _defineProperty = defineProperty$1;
-var defineProperty = _defineProperty;
-function baseAssignValue$2(object, key, value) {
-  if (key == "__proto__" && defineProperty) {
-    defineProperty(object, key, {
-      "configurable": true,
-      "enumerable": true,
-      "value": value,
-      "writable": true
-    });
-  } else {
-    object[key] = value;
-  }
-}
-var _baseAssignValue = baseAssignValue$2;
-var baseAssignValue$1 = _baseAssignValue, eq = eq_1;
-var objectProto$7 = Object.prototype;
-var hasOwnProperty$5 = objectProto$7.hasOwnProperty;
-function assignValue$2(object, key, value) {
-  var objValue = object[key];
-  if (!(hasOwnProperty$5.call(object, key) && eq(objValue, value)) || value === void 0 && !(key in object)) {
-    baseAssignValue$1(object, key, value);
-  }
-}
-var _assignValue = assignValue$2;
-var assignValue$1 = _assignValue, baseAssignValue = _baseAssignValue;
-function copyObject$4(source, props, object, customizer) {
-  var isNew = !object;
-  object || (object = {});
-  var index = -1, length = props.length;
-  while (++index < length) {
-    var key = props[index];
-    var newValue = customizer ? customizer(object[key], source[key], key, object, source) : void 0;
-    if (newValue === void 0) {
-      newValue = source[key];
-    }
-    if (isNew) {
-      baseAssignValue(object, key, newValue);
-    } else {
-      assignValue$1(object, key, newValue);
-    }
-  }
-  return object;
-}
-var _copyObject = copyObject$4;
-function baseTimes$1(n, iteratee) {
-  var index = -1, result = Array(n);
-  while (++index < n) {
-    result[index] = iteratee(index);
-  }
-  return result;
-}
-var _baseTimes = baseTimes$1;
-function isObjectLike$5(value) {
-  return value != null && typeof value == "object";
-}
-var isObjectLike_1 = isObjectLike$5;
-var baseGetTag$2 = _baseGetTag, isObjectLike$4 = isObjectLike_1;
-var argsTag$2 = "[object Arguments]";
-function baseIsArguments$1(value) {
-  return isObjectLike$4(value) && baseGetTag$2(value) == argsTag$2;
-}
-var _baseIsArguments = baseIsArguments$1;
-var baseIsArguments = _baseIsArguments, isObjectLike$3 = isObjectLike_1;
-var objectProto$6 = Object.prototype;
-var hasOwnProperty$4 = objectProto$6.hasOwnProperty;
-var propertyIsEnumerable$1 = objectProto$6.propertyIsEnumerable;
-var isArguments$1 = baseIsArguments(/* @__PURE__ */ function() {
-  return arguments;
-}()) ? baseIsArguments : function(value) {
-  return isObjectLike$3(value) && hasOwnProperty$4.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
-};
-var isArguments_1 = isArguments$1;
-var isArray$3 = Array.isArray;
-var isArray_1 = isArray$3;
-var isBuffer$2 = { exports: {} };
-function stubFalse() {
-  return false;
-}
-var stubFalse_1 = stubFalse;
-isBuffer$2.exports;
-(function(module, exports$1) {
-  var root2 = _root, stubFalse2 = stubFalse_1;
-  var freeExports = exports$1 && !exports$1.nodeType && exports$1;
-  var freeModule = freeExports && true && module && !module.nodeType && module;
-  var moduleExports = freeModule && freeModule.exports === freeExports;
-  var Buffer = moduleExports ? root2.Buffer : void 0;
-  var nativeIsBuffer = Buffer ? Buffer.isBuffer : void 0;
-  var isBuffer2 = nativeIsBuffer || stubFalse2;
-  module.exports = isBuffer2;
-})(isBuffer$2, isBuffer$2.exports);
-var isBufferExports = isBuffer$2.exports;
-var MAX_SAFE_INTEGER$1 = 9007199254740991;
-var reIsUint = /^(?:0|[1-9]\d*)$/;
-function isIndex$1(value, length) {
-  var type = typeof value;
-  length = length == null ? MAX_SAFE_INTEGER$1 : length;
-  return !!length && (type == "number" || type != "symbol" && reIsUint.test(value)) && (value > -1 && value % 1 == 0 && value < length);
-}
-var _isIndex = isIndex$1;
-var MAX_SAFE_INTEGER = 9007199254740991;
-function isLength$2(value) {
-  return typeof value == "number" && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
-}
-var isLength_1 = isLength$2;
-var baseGetTag$1 = _baseGetTag, isLength$1 = isLength_1, isObjectLike$2 = isObjectLike_1;
-var argsTag$1 = "[object Arguments]", arrayTag$1 = "[object Array]", boolTag$2 = "[object Boolean]", dateTag$2 = "[object Date]", errorTag$1 = "[object Error]", funcTag$1 = "[object Function]", mapTag$4 = "[object Map]", numberTag$2 = "[object Number]", objectTag$2 = "[object Object]", regexpTag$2 = "[object RegExp]", setTag$4 = "[object Set]", stringTag$2 = "[object String]", weakMapTag$2 = "[object WeakMap]";
-var arrayBufferTag$2 = "[object ArrayBuffer]", dataViewTag$3 = "[object DataView]", float32Tag$2 = "[object Float32Array]", float64Tag$2 = "[object Float64Array]", int8Tag$2 = "[object Int8Array]", int16Tag$2 = "[object Int16Array]", int32Tag$2 = "[object Int32Array]", uint8Tag$2 = "[object Uint8Array]", uint8ClampedTag$2 = "[object Uint8ClampedArray]", uint16Tag$2 = "[object Uint16Array]", uint32Tag$2 = "[object Uint32Array]";
-var typedArrayTags = {};
-typedArrayTags[float32Tag$2] = typedArrayTags[float64Tag$2] = typedArrayTags[int8Tag$2] = typedArrayTags[int16Tag$2] = typedArrayTags[int32Tag$2] = typedArrayTags[uint8Tag$2] = typedArrayTags[uint8ClampedTag$2] = typedArrayTags[uint16Tag$2] = typedArrayTags[uint32Tag$2] = true;
-typedArrayTags[argsTag$1] = typedArrayTags[arrayTag$1] = typedArrayTags[arrayBufferTag$2] = typedArrayTags[boolTag$2] = typedArrayTags[dataViewTag$3] = typedArrayTags[dateTag$2] = typedArrayTags[errorTag$1] = typedArrayTags[funcTag$1] = typedArrayTags[mapTag$4] = typedArrayTags[numberTag$2] = typedArrayTags[objectTag$2] = typedArrayTags[regexpTag$2] = typedArrayTags[setTag$4] = typedArrayTags[stringTag$2] = typedArrayTags[weakMapTag$2] = false;
-function baseIsTypedArray$1(value) {
-  return isObjectLike$2(value) && isLength$1(value.length) && !!typedArrayTags[baseGetTag$1(value)];
-}
-var _baseIsTypedArray = baseIsTypedArray$1;
-function baseUnary$3(func) {
-  return function(value) {
-    return func(value);
-  };
-}
-var _baseUnary = baseUnary$3;
-var _nodeUtil = { exports: {} };
-_nodeUtil.exports;
-(function(module, exports$1) {
-  var freeGlobal2 = _freeGlobal;
-  var freeExports = exports$1 && !exports$1.nodeType && exports$1;
-  var freeModule = freeExports && true && module && !module.nodeType && module;
-  var moduleExports = freeModule && freeModule.exports === freeExports;
-  var freeProcess = moduleExports && freeGlobal2.process;
-  var nodeUtil2 = function() {
-    try {
-      var types = freeModule && freeModule.require && freeModule.require("util").types;
-      if (types) {
-        return types;
-      }
-      return freeProcess && freeProcess.binding && freeProcess.binding("util");
-    } catch (e) {
-    }
-  }();
-  module.exports = nodeUtil2;
-})(_nodeUtil, _nodeUtil.exports);
-var _nodeUtilExports = _nodeUtil.exports;
-var baseIsTypedArray = _baseIsTypedArray, baseUnary$2 = _baseUnary, nodeUtil$2 = _nodeUtilExports;
-var nodeIsTypedArray = nodeUtil$2 && nodeUtil$2.isTypedArray;
-var isTypedArray$1 = nodeIsTypedArray ? baseUnary$2(nodeIsTypedArray) : baseIsTypedArray;
-var isTypedArray_1 = isTypedArray$1;
-var baseTimes = _baseTimes, isArguments = isArguments_1, isArray$2 = isArray_1, isBuffer$1 = isBufferExports, isIndex = _isIndex, isTypedArray = isTypedArray_1;
-var objectProto$5 = Object.prototype;
-var hasOwnProperty$3 = objectProto$5.hasOwnProperty;
-function arrayLikeKeys$2(value, inherited) {
-  var isArr = isArray$2(value), isArg = !isArr && isArguments(value), isBuff = !isArr && !isArg && isBuffer$1(value), isType = !isArr && !isArg && !isBuff && isTypedArray(value), skipIndexes = isArr || isArg || isBuff || isType, result = skipIndexes ? baseTimes(value.length, String) : [], length = result.length;
-  for (var key in value) {
-    if ((inherited || hasOwnProperty$3.call(value, key)) && !(skipIndexes && // Safari 9 has enumerable `arguments.length` in strict mode.
-    (key == "length" || // Node.js 0.10 has enumerable non-index properties on buffers.
-    isBuff && (key == "offset" || key == "parent") || // PhantomJS 2 has enumerable non-index properties on typed arrays.
-    isType && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
-    isIndex(key, length)))) {
-      result.push(key);
-    }
-  }
-  return result;
-}
-var _arrayLikeKeys = arrayLikeKeys$2;
-var objectProto$4 = Object.prototype;
-function isPrototype$3(value) {
-  var Ctor = value && value.constructor, proto = typeof Ctor == "function" && Ctor.prototype || objectProto$4;
-  return value === proto;
-}
-var _isPrototype = isPrototype$3;
-function overArg$2(func, transform) {
-  return function(arg) {
-    return func(transform(arg));
-  };
-}
-var _overArg = overArg$2;
-var overArg$1 = _overArg;
-var nativeKeys$1 = overArg$1(Object.keys, Object);
-var _nativeKeys = nativeKeys$1;
-var isPrototype$2 = _isPrototype, nativeKeys = _nativeKeys;
-var objectProto$3 = Object.prototype;
-var hasOwnProperty$2 = objectProto$3.hasOwnProperty;
-function baseKeys$1(object) {
-  if (!isPrototype$2(object)) {
-    return nativeKeys(object);
-  }
-  var result = [];
-  for (var key in Object(object)) {
-    if (hasOwnProperty$2.call(object, key) && key != "constructor") {
-      result.push(key);
-    }
-  }
-  return result;
-}
-var _baseKeys = baseKeys$1;
-var isFunction = isFunction_1, isLength = isLength_1;
-function isArrayLike$2(value) {
-  return value != null && isLength(value.length) && !isFunction(value);
-}
-var isArrayLike_1 = isArrayLike$2;
-var arrayLikeKeys$1 = _arrayLikeKeys, baseKeys = _baseKeys, isArrayLike$1 = isArrayLike_1;
-function keys$3(object) {
-  return isArrayLike$1(object) ? arrayLikeKeys$1(object) : baseKeys(object);
-}
-var keys_1 = keys$3;
-var copyObject$3 = _copyObject, keys$2 = keys_1;
-function baseAssign$1(object, source) {
-  return object && copyObject$3(source, keys$2(source), object);
-}
-var _baseAssign = baseAssign$1;
-function nativeKeysIn$1(object) {
-  var result = [];
-  if (object != null) {
-    for (var key in Object(object)) {
-      result.push(key);
-    }
-  }
-  return result;
-}
-var _nativeKeysIn = nativeKeysIn$1;
-var isObject$2 = isObject_1, isPrototype$1 = _isPrototype, nativeKeysIn = _nativeKeysIn;
-var objectProto$2 = Object.prototype;
-var hasOwnProperty$1 = objectProto$2.hasOwnProperty;
-function baseKeysIn$1(object) {
-  if (!isObject$2(object)) {
-    return nativeKeysIn(object);
-  }
-  var isProto = isPrototype$1(object), result = [];
-  for (var key in object) {
-    if (!(key == "constructor" && (isProto || !hasOwnProperty$1.call(object, key)))) {
-      result.push(key);
-    }
-  }
-  return result;
-}
-var _baseKeysIn = baseKeysIn$1;
-var arrayLikeKeys = _arrayLikeKeys, baseKeysIn = _baseKeysIn, isArrayLike = isArrayLike_1;
-function keysIn$3(object) {
-  return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
-}
-var keysIn_1 = keysIn$3;
-var copyObject$2 = _copyObject, keysIn$2 = keysIn_1;
-function baseAssignIn$1(object, source) {
-  return object && copyObject$2(source, keysIn$2(source), object);
-}
-var _baseAssignIn = baseAssignIn$1;
-var _cloneBuffer = { exports: {} };
-_cloneBuffer.exports;
-(function(module, exports$1) {
-  var root2 = _root;
-  var freeExports = exports$1 && !exports$1.nodeType && exports$1;
-  var freeModule = freeExports && true && module && !module.nodeType && module;
-  var moduleExports = freeModule && freeModule.exports === freeExports;
-  var Buffer = moduleExports ? root2.Buffer : void 0, allocUnsafe = Buffer ? Buffer.allocUnsafe : void 0;
-  function cloneBuffer2(buffer, isDeep) {
-    if (isDeep) {
-      return buffer.slice();
-    }
-    var length = buffer.length, result = allocUnsafe ? allocUnsafe(length) : new buffer.constructor(length);
-    buffer.copy(result);
-    return result;
-  }
-  module.exports = cloneBuffer2;
-})(_cloneBuffer, _cloneBuffer.exports);
-var _cloneBufferExports = _cloneBuffer.exports;
-function copyArray$1(source, array) {
-  var index = -1, length = source.length;
-  array || (array = Array(length));
-  while (++index < length) {
-    array[index] = source[index];
-  }
-  return array;
-}
-var _copyArray = copyArray$1;
-function arrayFilter$1(array, predicate) {
-  var index = -1, length = array == null ? 0 : array.length, resIndex = 0, result = [];
-  while (++index < length) {
-    var value = array[index];
-    if (predicate(value, index, array)) {
-      result[resIndex++] = value;
-    }
-  }
-  return result;
-}
-var _arrayFilter = arrayFilter$1;
-function stubArray$2() {
-  return [];
-}
-var stubArray_1 = stubArray$2;
-var arrayFilter = _arrayFilter, stubArray$1 = stubArray_1;
-var objectProto$1 = Object.prototype;
-var propertyIsEnumerable = objectProto$1.propertyIsEnumerable;
-var nativeGetSymbols$1 = Object.getOwnPropertySymbols;
-var getSymbols$3 = !nativeGetSymbols$1 ? stubArray$1 : function(object) {
-  if (object == null) {
-    return [];
-  }
-  object = Object(object);
-  return arrayFilter(nativeGetSymbols$1(object), function(symbol) {
-    return propertyIsEnumerable.call(object, symbol);
-  });
-};
-var _getSymbols = getSymbols$3;
-var copyObject$1 = _copyObject, getSymbols$2 = _getSymbols;
-function copySymbols$1(source, object) {
-  return copyObject$1(source, getSymbols$2(source), object);
-}
-var _copySymbols = copySymbols$1;
-function arrayPush$2(array, values) {
-  var index = -1, length = values.length, offset = array.length;
-  while (++index < length) {
-    array[offset + index] = values[index];
-  }
-  return array;
-}
-var _arrayPush = arrayPush$2;
-var overArg = _overArg;
-var getPrototype$2 = overArg(Object.getPrototypeOf, Object);
-var _getPrototype = getPrototype$2;
-var arrayPush$1 = _arrayPush, getPrototype$1 = _getPrototype, getSymbols$1 = _getSymbols, stubArray = stubArray_1;
-var nativeGetSymbols = Object.getOwnPropertySymbols;
-var getSymbolsIn$2 = !nativeGetSymbols ? stubArray : function(object) {
-  var result = [];
-  while (object) {
-    arrayPush$1(result, getSymbols$1(object));
-    object = getPrototype$1(object);
-  }
-  return result;
-};
-var _getSymbolsIn = getSymbolsIn$2;
-var copyObject = _copyObject, getSymbolsIn$1 = _getSymbolsIn;
-function copySymbolsIn$1(source, object) {
-  return copyObject(source, getSymbolsIn$1(source), object);
-}
-var _copySymbolsIn = copySymbolsIn$1;
-var arrayPush = _arrayPush, isArray$1 = isArray_1;
-function baseGetAllKeys$2(object, keysFunc, symbolsFunc) {
-  var result = keysFunc(object);
-  return isArray$1(object) ? result : arrayPush(result, symbolsFunc(object));
-}
-var _baseGetAllKeys = baseGetAllKeys$2;
-var baseGetAllKeys$1 = _baseGetAllKeys, getSymbols = _getSymbols, keys$1 = keys_1;
-function getAllKeys$1(object) {
-  return baseGetAllKeys$1(object, keys$1, getSymbols);
-}
-var _getAllKeys = getAllKeys$1;
-var baseGetAllKeys = _baseGetAllKeys, getSymbolsIn = _getSymbolsIn, keysIn$1 = keysIn_1;
-function getAllKeysIn$1(object) {
-  return baseGetAllKeys(object, keysIn$1, getSymbolsIn);
-}
-var _getAllKeysIn = getAllKeysIn$1;
-var getNative$3 = _getNative, root$4 = _root;
-var DataView$1 = getNative$3(root$4, "DataView");
-var _DataView = DataView$1;
-var getNative$2 = _getNative, root$3 = _root;
-var Promise$2 = getNative$2(root$3, "Promise");
-var _Promise = Promise$2;
-var getNative$1 = _getNative, root$2 = _root;
-var Set$2 = getNative$1(root$2, "Set");
-var _Set = Set$2;
-var getNative = _getNative, root$1 = _root;
-var WeakMap$2 = getNative(root$1, "WeakMap");
-var _WeakMap = WeakMap$2;
-var DataView = _DataView, Map$1 = _Map, Promise$1 = _Promise, Set$1 = _Set, WeakMap$1 = _WeakMap, baseGetTag = _baseGetTag, toSource = _toSource;
-var mapTag$3 = "[object Map]", objectTag$1 = "[object Object]", promiseTag = "[object Promise]", setTag$3 = "[object Set]", weakMapTag$1 = "[object WeakMap]";
-var dataViewTag$2 = "[object DataView]";
-var dataViewCtorString = toSource(DataView), mapCtorString = toSource(Map$1), promiseCtorString = toSource(Promise$1), setCtorString = toSource(Set$1), weakMapCtorString = toSource(WeakMap$1);
-var getTag$3 = baseGetTag;
-if (DataView && getTag$3(new DataView(new ArrayBuffer(1))) != dataViewTag$2 || Map$1 && getTag$3(new Map$1()) != mapTag$3 || Promise$1 && getTag$3(Promise$1.resolve()) != promiseTag || Set$1 && getTag$3(new Set$1()) != setTag$3 || WeakMap$1 && getTag$3(new WeakMap$1()) != weakMapTag$1) {
-  getTag$3 = function(value) {
-    var result = baseGetTag(value), Ctor = result == objectTag$1 ? value.constructor : void 0, ctorString = Ctor ? toSource(Ctor) : "";
-    if (ctorString) {
-      switch (ctorString) {
-        case dataViewCtorString:
-          return dataViewTag$2;
-        case mapCtorString:
-          return mapTag$3;
-        case promiseCtorString:
-          return promiseTag;
-        case setCtorString:
-          return setTag$3;
-        case weakMapCtorString:
-          return weakMapTag$1;
-      }
-    }
-    return result;
-  };
-}
-var _getTag = getTag$3;
-var objectProto = Object.prototype;
-var hasOwnProperty = objectProto.hasOwnProperty;
-function initCloneArray$1(array) {
-  var length = array.length, result = new array.constructor(length);
-  if (length && typeof array[0] == "string" && hasOwnProperty.call(array, "index")) {
-    result.index = array.index;
-    result.input = array.input;
-  }
-  return result;
-}
-var _initCloneArray = initCloneArray$1;
-var root = _root;
-var Uint8Array$2 = root.Uint8Array;
-var _Uint8Array = Uint8Array$2;
-var Uint8Array$1 = _Uint8Array;
-function cloneArrayBuffer$3(arrayBuffer) {
-  var result = new arrayBuffer.constructor(arrayBuffer.byteLength);
-  new Uint8Array$1(result).set(new Uint8Array$1(arrayBuffer));
-  return result;
-}
-var _cloneArrayBuffer = cloneArrayBuffer$3;
-var cloneArrayBuffer$2 = _cloneArrayBuffer;
-function cloneDataView$1(dataView, isDeep) {
-  var buffer = isDeep ? cloneArrayBuffer$2(dataView.buffer) : dataView.buffer;
-  return new dataView.constructor(buffer, dataView.byteOffset, dataView.byteLength);
-}
-var _cloneDataView = cloneDataView$1;
-var reFlags = /\w*$/;
-function cloneRegExp$1(regexp) {
-  var result = new regexp.constructor(regexp.source, reFlags.exec(regexp));
-  result.lastIndex = regexp.lastIndex;
-  return result;
-}
-var _cloneRegExp = cloneRegExp$1;
-var Symbol$1 = _Symbol;
-var symbolProto = Symbol$1 ? Symbol$1.prototype : void 0, symbolValueOf = symbolProto ? symbolProto.valueOf : void 0;
-function cloneSymbol$1(symbol) {
-  return symbolValueOf ? Object(symbolValueOf.call(symbol)) : {};
-}
-var _cloneSymbol = cloneSymbol$1;
-var cloneArrayBuffer$1 = _cloneArrayBuffer;
-function cloneTypedArray$1(typedArray, isDeep) {
-  var buffer = isDeep ? cloneArrayBuffer$1(typedArray.buffer) : typedArray.buffer;
-  return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
-}
-var _cloneTypedArray = cloneTypedArray$1;
-var cloneArrayBuffer = _cloneArrayBuffer, cloneDataView = _cloneDataView, cloneRegExp = _cloneRegExp, cloneSymbol = _cloneSymbol, cloneTypedArray = _cloneTypedArray;
-var boolTag$1 = "[object Boolean]", dateTag$1 = "[object Date]", mapTag$2 = "[object Map]", numberTag$1 = "[object Number]", regexpTag$1 = "[object RegExp]", setTag$2 = "[object Set]", stringTag$1 = "[object String]", symbolTag$1 = "[object Symbol]";
-var arrayBufferTag$1 = "[object ArrayBuffer]", dataViewTag$1 = "[object DataView]", float32Tag$1 = "[object Float32Array]", float64Tag$1 = "[object Float64Array]", int8Tag$1 = "[object Int8Array]", int16Tag$1 = "[object Int16Array]", int32Tag$1 = "[object Int32Array]", uint8Tag$1 = "[object Uint8Array]", uint8ClampedTag$1 = "[object Uint8ClampedArray]", uint16Tag$1 = "[object Uint16Array]", uint32Tag$1 = "[object Uint32Array]";
-function initCloneByTag$1(object, tag, isDeep) {
-  var Ctor = object.constructor;
-  switch (tag) {
-    case arrayBufferTag$1:
-      return cloneArrayBuffer(object);
-    case boolTag$1:
-    case dateTag$1:
-      return new Ctor(+object);
-    case dataViewTag$1:
-      return cloneDataView(object, isDeep);
-    case float32Tag$1:
-    case float64Tag$1:
-    case int8Tag$1:
-    case int16Tag$1:
-    case int32Tag$1:
-    case uint8Tag$1:
-    case uint8ClampedTag$1:
-    case uint16Tag$1:
-    case uint32Tag$1:
-      return cloneTypedArray(object, isDeep);
-    case mapTag$2:
-      return new Ctor();
-    case numberTag$1:
-    case stringTag$1:
-      return new Ctor(object);
-    case regexpTag$1:
-      return cloneRegExp(object);
-    case setTag$2:
-      return new Ctor();
-    case symbolTag$1:
-      return cloneSymbol(object);
-  }
-}
-var _initCloneByTag = initCloneByTag$1;
-var isObject$1 = isObject_1;
-var objectCreate = Object.create;
-var baseCreate$1 = /* @__PURE__ */ function() {
-  function object() {
-  }
-  return function(proto) {
-    if (!isObject$1(proto)) {
-      return {};
-    }
-    if (objectCreate) {
-      return objectCreate(proto);
-    }
-    object.prototype = proto;
-    var result = new object();
-    object.prototype = void 0;
-    return result;
-  };
-}();
-var _baseCreate = baseCreate$1;
-var baseCreate = _baseCreate, getPrototype = _getPrototype, isPrototype = _isPrototype;
-function initCloneObject$1(object) {
-  return typeof object.constructor == "function" && !isPrototype(object) ? baseCreate(getPrototype(object)) : {};
-}
-var _initCloneObject = initCloneObject$1;
-var getTag$2 = _getTag, isObjectLike$1 = isObjectLike_1;
-var mapTag$1 = "[object Map]";
-function baseIsMap$1(value) {
-  return isObjectLike$1(value) && getTag$2(value) == mapTag$1;
-}
-var _baseIsMap = baseIsMap$1;
-var baseIsMap = _baseIsMap, baseUnary$1 = _baseUnary, nodeUtil$1 = _nodeUtilExports;
-var nodeIsMap = nodeUtil$1 && nodeUtil$1.isMap;
-var isMap$1 = nodeIsMap ? baseUnary$1(nodeIsMap) : baseIsMap;
-var isMap_1 = isMap$1;
-var getTag$1 = _getTag, isObjectLike = isObjectLike_1;
-var setTag$1 = "[object Set]";
-function baseIsSet$1(value) {
-  return isObjectLike(value) && getTag$1(value) == setTag$1;
-}
-var _baseIsSet = baseIsSet$1;
-var baseIsSet = _baseIsSet, baseUnary = _baseUnary, nodeUtil = _nodeUtilExports;
-var nodeIsSet = nodeUtil && nodeUtil.isSet;
-var isSet$1 = nodeIsSet ? baseUnary(nodeIsSet) : baseIsSet;
-var isSet_1 = isSet$1;
-var Stack = _Stack, arrayEach = _arrayEach, assignValue = _assignValue, baseAssign = _baseAssign, baseAssignIn = _baseAssignIn, cloneBuffer = _cloneBufferExports, copyArray = _copyArray, copySymbols = _copySymbols, copySymbolsIn = _copySymbolsIn, getAllKeys = _getAllKeys, getAllKeysIn = _getAllKeysIn, getTag = _getTag, initCloneArray = _initCloneArray, initCloneByTag = _initCloneByTag, initCloneObject = _initCloneObject, isArray = isArray_1, isBuffer = isBufferExports, isMap = isMap_1, isObject = isObject_1, isSet = isSet_1, keys = keys_1, keysIn = keysIn_1;
-var CLONE_DEEP_FLAG$1 = 1, CLONE_FLAT_FLAG = 2, CLONE_SYMBOLS_FLAG$1 = 4;
-var argsTag = "[object Arguments]", arrayTag = "[object Array]", boolTag = "[object Boolean]", dateTag = "[object Date]", errorTag = "[object Error]", funcTag = "[object Function]", genTag = "[object GeneratorFunction]", mapTag = "[object Map]", numberTag = "[object Number]", objectTag = "[object Object]", regexpTag = "[object RegExp]", setTag = "[object Set]", stringTag = "[object String]", symbolTag = "[object Symbol]", weakMapTag = "[object WeakMap]";
-var arrayBufferTag = "[object ArrayBuffer]", dataViewTag = "[object DataView]", float32Tag = "[object Float32Array]", float64Tag = "[object Float64Array]", int8Tag = "[object Int8Array]", int16Tag = "[object Int16Array]", int32Tag = "[object Int32Array]", uint8Tag = "[object Uint8Array]", uint8ClampedTag = "[object Uint8ClampedArray]", uint16Tag = "[object Uint16Array]", uint32Tag = "[object Uint32Array]";
-var cloneableTags = {};
-cloneableTags[argsTag] = cloneableTags[arrayTag] = cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] = cloneableTags[boolTag] = cloneableTags[dateTag] = cloneableTags[float32Tag] = cloneableTags[float64Tag] = cloneableTags[int8Tag] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[mapTag] = cloneableTags[numberTag] = cloneableTags[objectTag] = cloneableTags[regexpTag] = cloneableTags[setTag] = cloneableTags[stringTag] = cloneableTags[symbolTag] = cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] = cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
-cloneableTags[errorTag] = cloneableTags[funcTag] = cloneableTags[weakMapTag] = false;
-function baseClone$1(value, bitmask, customizer, key, object, stack) {
-  var result, isDeep = bitmask & CLONE_DEEP_FLAG$1, isFlat = bitmask & CLONE_FLAT_FLAG, isFull = bitmask & CLONE_SYMBOLS_FLAG$1;
-  if (customizer) {
-    result = object ? customizer(value, key, object, stack) : customizer(value);
-  }
-  if (result !== void 0) {
-    return result;
-  }
-  if (!isObject(value)) {
-    return value;
-  }
-  var isArr = isArray(value);
-  if (isArr) {
-    result = initCloneArray(value);
-    if (!isDeep) {
-      return copyArray(value, result);
-    }
-  } else {
-    var tag = getTag(value), isFunc = tag == funcTag || tag == genTag;
-    if (isBuffer(value)) {
-      return cloneBuffer(value, isDeep);
-    }
-    if (tag == objectTag || tag == argsTag || isFunc && !object) {
-      result = isFlat || isFunc ? {} : initCloneObject(value);
-      if (!isDeep) {
-        return isFlat ? copySymbolsIn(value, baseAssignIn(result, value)) : copySymbols(value, baseAssign(result, value));
-      }
-    } else {
-      if (!cloneableTags[tag]) {
-        return object ? value : {};
-      }
-      result = initCloneByTag(value, tag, isDeep);
-    }
-  }
-  stack || (stack = new Stack());
-  var stacked = stack.get(value);
-  if (stacked) {
-    return stacked;
-  }
-  stack.set(value, result);
-  if (isSet(value)) {
-    value.forEach(function(subValue) {
-      result.add(baseClone$1(subValue, bitmask, customizer, subValue, value, stack));
-    });
-  } else if (isMap(value)) {
-    value.forEach(function(subValue, key2) {
-      result.set(key2, baseClone$1(subValue, bitmask, customizer, key2, value, stack));
-    });
-  }
-  var keysFunc = isFull ? isFlat ? getAllKeysIn : getAllKeys : isFlat ? keysIn : keys;
-  var props = isArr ? void 0 : keysFunc(value);
-  arrayEach(props || value, function(subValue, key2) {
-    if (props) {
-      key2 = subValue;
-      subValue = value[key2];
-    }
-    assignValue(result, key2, baseClone$1(subValue, bitmask, customizer, key2, value, stack));
-  });
-  return result;
-}
-var _baseClone = baseClone$1;
-var baseClone = _baseClone;
-var CLONE_DEEP_FLAG = 1, CLONE_SYMBOLS_FLAG = 4;
-function cloneDeep(value) {
-  return baseClone(value, CLONE_DEEP_FLAG | CLONE_SYMBOLS_FLAG);
-}
-var cloneDeep_1 = cloneDeep;
-const cloneDeep$1 = /* @__PURE__ */ getDefaultExportFromCjs(cloneDeep_1);
 class CollectionRegistry {
   // Normalized runtime layer (used by Data Grid / UI)
   collectionsByTableName = /* @__PURE__ */ new Map();
@@ -3162,7 +2271,7 @@ class CollectionRegistry {
       ...c
     }));
     normalizedCollections.forEach((c, index) => {
-      const raw = cloneDeep$1(collections[index]);
+      const raw = deepClone(collections[index]);
       this.rootCollections.push(c);
       this.rawRootCollections.push(raw);
       const normalized = this.normalizeCollection(c);
@@ -3182,7 +2291,7 @@ class CollectionRegistry {
           if (!subCollection) return;
           this._registerRecursively(this.normalizeCollection({
             ...subCollection
-          }), cloneDeep$1(subCollection));
+          }), deepClone(subCollection));
         });
       }
     });
@@ -3190,7 +2299,7 @@ class CollectionRegistry {
     return true;
   }
   register(collection, rawCollection) {
-    const raw = rawCollection ? cloneDeep$1(rawCollection) : cloneDeep$1(collection);
+    const raw = rawCollection ? deepClone(rawCollection) : deepClone(collection);
     this.rootCollections.push(collection);
     this.rawRootCollections.push(raw);
     this._registerRecursively(collection, raw);
@@ -3214,7 +2323,7 @@ class CollectionRegistry {
         if (!subCollection) return;
         this._registerRecursively(this.normalizeCollection({
           ...subCollection
-        }), cloneDeep$1(subCollection));
+        }), deepClone(subCollection));
       });
     }
   }
@@ -3386,7 +2495,10 @@ class CollectionRegistry {
       if (!relation) {
         throw new Error(`Relation '${relationKey}' not found in collection '${currentCollection.slug}'`);
       }
-      currentCollection = relation.target();
+      const target = relation.target();
+      const targetRelationKey = relation.relationName || target.slug;
+      const targetSlug = relation.overrides?.slug ?? targetRelationKey;
+      currentCollection = this.get(targetSlug) || this.normalizeCollection(target);
       if (i + 1 < pathSegments.length) ;
     }
     return currentCollection;
@@ -3435,7 +2547,7 @@ class CollectionRegistry {
         if (!subcollection) {
           throw new Error(`Subcollection '${subcollectionSlug}' not found in ${currentCollection.slug}`);
         }
-        currentCollection = subcollection;
+        currentCollection = this.get(subcollection.slug) || this.normalizeCollection(subcollection);
         collections.push(currentCollection);
       }
     }
@@ -3672,7 +2784,7 @@ class DrizzleConditionBuilder {
   static buildSingleFilterCondition(column, op, value) {
     switch (op) {
       case "==":
-        return eq$3(column, value);
+        return eq(column, value);
       case "!=":
         return sql`${column} != ${value}`;
       case ">":
@@ -3802,7 +2914,7 @@ class DrizzleConditionBuilder {
         throw new Error(`Join path did not result in connecting to parent table. Current: ${currentTableName}, Parent: ${parentTableName}`);
       }
     }
-    const finalCondition = Array.isArray(parentEntityId) ? inArray(parentIdColumn, parentEntityId) : eq$3(parentIdColumn, parentEntityId);
+    const finalCondition = Array.isArray(parentEntityId) ? inArray(parentIdColumn, parentEntityId) : eq(parentIdColumn, parentEntityId);
     return {
       joins,
       finalCondition
@@ -3828,7 +2940,7 @@ class DrizzleConditionBuilder {
         throw new Error(`Join columns not found: ${fromTableName}.${fromColName} = ${toTableName}.${toColName}`);
       }
       joinTable = fromTable;
-      condition = eq$3(left, right);
+      condition = eq(left, right);
     } else if (currentTable === fromTable) {
       const left = toTable[toColName];
       const right = currentTable[fromColName];
@@ -3842,7 +2954,7 @@ class DrizzleConditionBuilder {
         throw new Error(`Join columns not found: ${toTableName}.${toColName} = ${fromTableName}.${fromColName}`);
       }
       joinTable = toTable;
-      condition = eq$3(left, right);
+      condition = eq(left, right);
     } else {
       throw new Error(`Join step does not match current table. Current table does not match from: ${fromTableName} or to: ${toTableName}`);
     }
@@ -3873,19 +2985,19 @@ class DrizzleConditionBuilder {
           if (currentTable === targetTable) {
             return {
               joinTable: targetTable,
-              condition: eq$3(targetTableIdCol, junctionTargetCol),
+              condition: eq(targetTableIdCol, junctionTargetCol),
               additionalJoins: [{
                 table: junctionTable,
-                condition: eq$3(currentTableIdCol, junctionSourceCol)
+                condition: eq(currentTableIdCol, junctionSourceCol)
               }]
             };
           } else {
             return {
               joinTable: junctionTable,
-              condition: eq$3(currentTableIdCol, junctionSourceCol),
+              condition: eq(currentTableIdCol, junctionSourceCol),
               additionalJoins: [{
                 table: targetTable,
-                condition: eq$3(targetTableIdCol, junctionTargetCol)
+                condition: eq(targetTableIdCol, junctionTargetCol)
               }]
             };
           }
@@ -3910,11 +3022,11 @@ class DrizzleConditionBuilder {
     if (!junctionTargetCol) {
       throw new Error(`Target column '${through.targetColumn}' not found in junction table '${through.table}'`);
     }
-    const condition = Array.isArray(parentEntityId) ? inArray(junctionSourceCol, parentEntityId) : eq$3(junctionSourceCol, parentEntityId);
+    const condition = Array.isArray(parentEntityId) ? inArray(junctionSourceCol, parentEntityId) : eq(junctionSourceCol, parentEntityId);
     return {
       join: {
         table: junctionTable,
-        condition: eq$3(targetIdColumn, junctionTargetCol)
+        condition: eq(targetIdColumn, junctionTargetCol)
       },
       condition
     };
@@ -3935,11 +3047,11 @@ class DrizzleConditionBuilder {
     if (!junctionTargetCol) {
       throw new Error(`Target column '${through.targetColumn}' not found in junction table '${through.table}'`);
     }
-    const condition = Array.isArray(parentEntityId) ? inArray(junctionSourceCol, parentEntityId) : eq$3(junctionSourceCol, parentEntityId);
+    const condition = Array.isArray(parentEntityId) ? inArray(junctionSourceCol, parentEntityId) : eq(junctionSourceCol, parentEntityId);
     return {
       join: {
         table: junctionTable,
-        condition: eq$3(targetIdColumn, junctionTargetCol)
+        condition: eq(targetIdColumn, junctionTargetCol)
       },
       condition
     };
@@ -3955,15 +3067,15 @@ class DrizzleConditionBuilder {
         if (!idCol) {
           throw new Error('No primary key or "id" column found in target table');
         }
-        return Array.isArray(parentEntityId) ? inArray(idCol, parentEntityId) : eq$3(idCol, parentEntityId);
+        return Array.isArray(parentEntityId) ? inArray(idCol, parentEntityId) : eq(idCol, parentEntityId);
       }
-      return Array.isArray(parentEntityId) ? inArray(targetIdCol, parentEntityId) : eq$3(targetIdCol, parentEntityId);
+      return Array.isArray(parentEntityId) ? inArray(targetIdCol, parentEntityId) : eq(targetIdCol, parentEntityId);
     } else if (relation.direction === "inverse" && relation.foreignKeyOnTarget) {
       const foreignKeyCol = targetTable[relation.foreignKeyOnTarget];
       if (!foreignKeyCol) {
         throw new Error(`Foreign key column '${relation.foreignKeyOnTarget}' not found in target table. This might be a many-to-many relationship that requires a junction table. Consider using 'through' property or ensure the corresponding owning relation exists with junction table configuration.`);
       }
-      return Array.isArray(parentEntityId) ? inArray(foreignKeyCol, parentEntityId) : eq$3(foreignKeyCol, parentEntityId);
+      return Array.isArray(parentEntityId) ? inArray(foreignKeyCol, parentEntityId) : eq(foreignKeyCol, parentEntityId);
     } else if (relation.direction === "inverse" && relation.cardinality === "many" && relation.inverseRelationName) {
       throw new Error(`Inverse many-to-many relation '${relation.relationName}' requires a junction table. Either specify 'through' property or ensure the corresponding owning relation exists with junction table configuration.`);
     } else if (relation.direction === "inverse" && relation.cardinality === "one" && relation.inverseRelationName) {
@@ -3973,7 +3085,7 @@ class DrizzleConditionBuilder {
         throw new Error(`Auto-inferred foreign key column '${inferredForeignKeyName}' not found in target table for inverse relation '${relation.relationName}'. Please specify 'foreignKeyOnTarget' explicitly.`);
       }
       console.debug(`🔍 [DrizzleConditionBuilder] Auto-inferred foreign key '${inferredForeignKeyName}' for inverse relation '${relation.relationName}'`);
-      return Array.isArray(parentEntityId) ? inArray(foreignKeyCol, parentEntityId) : eq$3(foreignKeyCol, parentEntityId);
+      return Array.isArray(parentEntityId) ? inArray(foreignKeyCol, parentEntityId) : eq(foreignKeyCol, parentEntityId);
     } else {
       throw new Error(`Relation '${relation.relationName}' lacks proper configuration. For many-to-many relations, use 'through' property. For simple relations, use 'localKey' or 'foreignKeyOnTarget'.`);
     }
@@ -4014,7 +3126,7 @@ class DrizzleConditionBuilder {
    * Build a unique field check condition
    */
   static buildUniqueFieldCondition(fieldColumn, value, idColumn, excludeId) {
-    const conditions = [eq$3(fieldColumn, value)];
+    const conditions = [eq(fieldColumn, value)];
     if (excludeId && idColumn) {
       conditions.push(sql`${idColumn} != ${excludeId}`);
     }
@@ -4089,7 +3201,7 @@ class DrizzleConditionBuilder {
     if (currentTable !== parentTable) {
       throw new Error("Join path did not result in connecting to parent table");
     }
-    const allConditions = [eq$3(parentIdColumn, parentEntityId)];
+    const allConditions = [eq(parentIdColumn, parentEntityId)];
     if (additionalFilters) {
       allConditions.push(...additionalFilters);
     }
@@ -4111,11 +3223,11 @@ class DrizzleConditionBuilder {
     if (!junctionTargetCol) {
       throw new Error(`Target column '${through.targetColumn}' not found in junction table '${through.table}'`);
     }
-    const baseConditions = [eq$3(junctionSourceCol, parentEntityId)];
+    const baseConditions = [eq(junctionSourceCol, parentEntityId)];
     if (additionalFilters && additionalFilters.length > 0) {
       baseConditions.push(...additionalFilters);
     }
-    return baseCountQuery.innerJoin(junctionTable, eq$3(targetIdColumn, junctionTargetCol)).where(and(...baseConditions));
+    return baseCountQuery.innerJoin(junctionTable, eq(targetIdColumn, junctionTargetCol)).where(and(...baseConditions));
   }
   /**
    * Build inverse junction table conditions for count queries
@@ -4133,11 +3245,11 @@ class DrizzleConditionBuilder {
     if (!junctionTargetCol) {
       throw new Error(`Target column '${through.targetColumn}' not found in junction table '${through.table}'`);
     }
-    const baseConditions = [eq$3(junctionSourceCol, parentEntityId)];
+    const baseConditions = [eq(junctionSourceCol, parentEntityId)];
     if (additionalFilters && additionalFilters.length > 0) {
       baseConditions.push(...additionalFilters);
     }
-    return baseCountQuery.innerJoin(junctionTable, eq$3(targetIdColumn, junctionTargetCol)).where(and(...baseConditions));
+    return baseCountQuery.innerJoin(junctionTable, eq(targetIdColumn, junctionTargetCol)).where(and(...baseConditions));
   }
   /**
    * Helper method to extract table names from columns
@@ -4477,7 +3589,25 @@ function serializePropertyToServer(value, property) {
         return result;
       }
       return value;
+    case "string":
+      if (typeof value === "string") {
+        if (value.startsWith("data:application/octet-stream;base64,")) {
+          const base64Data = value.split(",")[1];
+          if (base64Data) {
+            return Buffer.from(base64Data, "base64");
+          }
+        }
+      }
+      return value;
     default:
+      if (typeof value === "string") {
+        if (value.startsWith("data:application/octet-stream;base64,")) {
+          const base64Data = value.split(",")[1];
+          if (base64Data) {
+            return Buffer.from(base64Data, "base64");
+          }
+        }
+      }
       return value;
   }
 }
@@ -4511,7 +3641,7 @@ async function parseDataFromServer(data, collection, db, registry) {
             if (targetTable && currentEntityId) {
               const foreignKeyColumn = targetTable[relation.foreignKeyOnTarget];
               if (foreignKeyColumn) {
-                const relatedEntities = await db.select().from(targetTable).where(eq$3(foreignKeyColumn, currentEntityId)).limit(relation.cardinality === "one" ? 1 : 100);
+                const relatedEntities = await db.select().from(targetTable).where(eq(foreignKeyColumn, currentEntityId)).limit(relation.cardinality === "one" ? 1 : 100);
                 if (relatedEntities.length > 0) {
                   if (relation.cardinality === "one") {
                     const targetPks = getPrimaryKeys(targetCollection, registry);
@@ -4558,12 +3688,12 @@ async function parseDataFromServer(data, collection, db, registry) {
                   console.warn(`Join columns not found: ${fromColumn} -> ${toColumn}`);
                   break;
                 }
-                query = query.innerJoin(joinTable, eq$3(fromCol, toCol));
+                query = query.innerJoin(joinTable, eq(fromCol, toCol));
                 currentTable = joinTable;
               }
               if (pks.length === 1) {
                 const sourceIdField = sourceTable[pks[0].fieldName];
-                query = query.where(eq$3(sourceIdField, currentEntityId));
+                query = query.where(eq(sourceIdField, currentEntityId));
               } else {
                 console.warn(`Join path resolution for composite primary keys is not yet fully supported: ${collection.slug}`);
               }
@@ -4571,7 +3701,7 @@ async function parseDataFromServer(data, collection, db, registry) {
               let combinedWhere;
               if (pks.length === 1) {
                 const sourceIdField = sourceTable[pks[0].fieldName];
-                combinedWhere = DrizzleConditionBuilder.combineConditionsWithAnd([eq$3(sourceIdField, currentEntityId), ...additionalFilters].filter(Boolean));
+                combinedWhere = DrizzleConditionBuilder.combineConditionsWithAnd([eq(sourceIdField, currentEntityId), ...additionalFilters].filter(Boolean));
               }
               const joinResults = await query.where(combinedWhere).limit(relation.cardinality === "one" ? 1 : 100);
               if (joinResults.length > 0) {
@@ -4603,6 +3733,37 @@ function parsePropertyFromServer(value, property, collection, propertyKey) {
     return value;
   }
   switch (property.type) {
+    case "string": {
+      if (typeof value === "string") return value;
+      let isBuffer = false;
+      let buf = null;
+      if (Buffer.isBuffer(value)) {
+        isBuffer = true;
+        buf = value;
+      } else if (typeof value === "object" && value !== null && value.type === "Buffer" && Array.isArray(value.data)) {
+        isBuffer = true;
+        buf = Buffer.from(value.data);
+      }
+      if (isBuffer && buf) {
+        let isPrintable = true;
+        for (let i = 0; i < buf.length; i++) {
+          const b = buf[i];
+          if ((b < 32 || b > 126) && b !== 9 && b !== 10 && b !== 13) {
+            isPrintable = false;
+            break;
+          }
+        }
+        return isPrintable ? buf.toString("utf8") : `data:application/octet-stream;base64,${buf.toString("base64")}`;
+      }
+      if (typeof value === "object" && value !== null) {
+        try {
+          return JSON.stringify(value);
+        } catch {
+          return String(value);
+        }
+      }
+      return String(value);
+    }
     case "relation":
       if (typeof value === "string" || typeof value === "number") {
         let relationDef = property.relation;
@@ -4686,8 +3847,29 @@ function parsePropertyFromServer(value, property, collection, propertyKey) {
       }
       return null;
     }
-    default:
+    default: {
+      let isBuffer = false;
+      let buf = null;
+      if (Buffer.isBuffer(value)) {
+        isBuffer = true;
+        buf = value;
+      } else if (typeof value === "object" && value !== null && value.type === "Buffer" && Array.isArray(value.data)) {
+        isBuffer = true;
+        buf = Buffer.from(value.data);
+      }
+      if (isBuffer && buf) {
+        let isPrintable = true;
+        for (let i = 0; i < buf.length; i++) {
+          const b = buf[i];
+          if ((b < 32 || b > 126) && b !== 9 && b !== 10 && b !== 13) {
+            isPrintable = false;
+            break;
+          }
+        }
+        return isPrintable ? buf.toString("utf8") : `data:application/octet-stream;base64,${buf.toString("base64")}`;
+      }
       return value;
+    }
   }
 }
 function normalizeScalarValues(data, properties, collection, resolvedRelations, options) {
@@ -4770,11 +3952,11 @@ class RelationService {
         if (!fromCol || !toCol) {
           throw new Error(`Join columns not found: ${fromColumn} -> ${toColumn}`);
         }
-        query2 = query2.innerJoin(joinTable, eq$3(fromCol, toCol));
+        query2 = query2.innerJoin(joinTable, eq(fromCol, toCol));
         currentTable = joinTable;
       }
       const parentIdField = parentTable[getPrimaryKeys(parentCollection, this.registry)[0].fieldName];
-      query2 = query2.where(eq$3(parentIdField, parsedParentId));
+      query2 = query2.where(eq(parentIdField, parsedParentId));
       if (options.limit) {
         query2 = query2.limit(options.limit);
       }
@@ -4893,7 +4075,7 @@ class RelationService {
         if (!fromCol || !toCol) {
           throw new Error(`Join columns not found: ${fromColumn} -> ${toColumn}`);
         }
-        query2 = query2.innerJoin(joinTable, eq$3(fromCol, toCol));
+        query2 = query2.innerJoin(joinTable, eq(fromCol, toCol));
         currentTable = joinTable;
       }
       const parentIdField = parentTable[getPrimaryKeys(parentCollection, this.registry)[0].fieldName];
@@ -5024,7 +4206,7 @@ class RelationService {
         const fromCol = currentTable[fromColName];
         const toCol = joinTable[toColName];
         if (!fromCol || !toCol) throw new Error(`Join columns not found: ${fromColumn} -> ${toColumn}`);
-        query2 = query2.innerJoin(joinTable, eq$3(fromCol, toCol));
+        query2 = query2.innerJoin(joinTable, eq(fromCol, toCol));
         currentTable = joinTable;
       }
       const parentIdField = parentTable[getPrimaryKeys(parentCollection, this.registry)[0].fieldName];
@@ -5059,7 +4241,7 @@ class RelationService {
         console.warn(`[batchFetchRelatedEntitiesMany] Junction columns not found in '${relation.through.table}'`);
         return /* @__PURE__ */ new Map();
       }
-      const query2 = this.db.select().from(junctionTable).innerJoin(targetTable, eq$3(targetJunctionCol, targetIdField)).where(inArray(sourceJunctionCol, parsedParentIds));
+      const query2 = this.db.select().from(junctionTable).innerJoin(targetTable, eq(targetJunctionCol, targetIdField)).where(inArray(sourceJunctionCol, parsedParentIds));
       const results2 = await query2;
       const resultMap2 = /* @__PURE__ */ new Map();
       const targetTableName = getTableName(targetCollection);
@@ -5157,7 +4339,7 @@ class RelationService {
         const parentIdInfo = parentPks[0];
         const parsedParentIdObj = parseIdValues(entityId, parentPks);
         const parsedParentId = parsedParentIdObj[parentIdInfo.fieldName];
-        await tx.delete(junctionTable).where(eq$3(sourceJunctionColumn, parsedParentId));
+        await tx.delete(junctionTable).where(eq(sourceJunctionColumn, parsedParentId));
         if (targetEntityIds.length > 0) {
           const targetPks = getPrimaryKeys(targetCollection, this.registry);
           const targetIdInfo = targetPks[0];
@@ -5186,7 +4368,7 @@ class RelationService {
         const parentIdInfo = parentPks[0];
         const parsedParentIdObj = parseIdValues(entityId, parentPks);
         const parsedParentId = parsedParentIdObj[parentIdInfo.fieldName];
-        await tx.delete(junctionTable).where(eq$3(sourceJunctionColumn, parsedParentId));
+        await tx.delete(junctionTable).where(eq(sourceJunctionColumn, parsedParentId));
         if (targetEntityIds.length > 0) {
           const targetPks = getPrimaryKeys(targetCollection, this.registry);
           const targetIdInfo = targetPks[0];
@@ -5219,14 +4401,14 @@ class RelationService {
           const parsedTargetIds = targetEntityIds.map((id) => parseIdValues(id, targetPks)[targetIdInfo.fieldName]);
           await tx.update(targetTable).set({
             [relation.foreignKeyOnTarget]: null
-          }).where(and(eq$3(fkCol, parsedParentId), sql`${targetIdCol} NOT IN (${sql.join(parsedTargetIds)})`));
+          }).where(and(eq(fkCol, parsedParentId), sql`${targetIdCol} NOT IN (${sql.join(parsedTargetIds)})`));
           await tx.update(targetTable).set({
             [relation.foreignKeyOnTarget]: parsedParentId
           }).where(inArray(targetIdCol, parsedTargetIds));
         } else {
           await tx.update(targetTable).set({
             [relation.foreignKeyOnTarget]: null
-          }).where(eq$3(fkCol, parsedParentId));
+          }).where(eq(fkCol, parsedParentId));
         }
       } else {
         console.warn(`Many relation '${key}' in collection '${collection.slug}' lacks write configuration and will be skipped during save.`);
@@ -5285,17 +4467,17 @@ class RelationService {
         if (newValue === null || newValue === void 0) {
           await tx.update(targetTable).set({
             [relation.foreignKeyOnTarget]: null
-          }).where(eq$3(foreignKeyColumn, parsedSourceId));
+          }).where(eq(foreignKeyColumn, parsedSourceId));
         } else {
           const parsedNewTargetIdObj = parseIdValues(newValue, targetPks);
           const parsedNewTargetId = parsedNewTargetIdObj[targetIdInfo.fieldName];
           const targetIdField = targetTable[targetIdInfo.fieldName];
           await tx.update(targetTable).set({
             [relation.foreignKeyOnTarget]: null
-          }).where(eq$3(foreignKeyColumn, parsedSourceId));
+          }).where(eq(foreignKeyColumn, parsedSourceId));
           await tx.update(targetTable).set({
             [relation.foreignKeyOnTarget]: parsedSourceId
-          }).where(eq$3(targetIdField, parsedNewTargetId));
+          }).where(eq(targetIdField, parsedNewTargetId));
         }
       } catch (e) {
         console.warn(`Failed to update inverse relation '${relation.relationName}':`, e);
@@ -5350,7 +4532,7 @@ class RelationService {
         const sourceIdInfo = sourcePks[0];
         const parsedSourceIdObj = parseIdValues(sourceEntityId, sourcePks);
         const parsedSourceId = parsedSourceIdObj[sourceIdInfo.fieldName];
-        await tx.delete(junctionTable).where(eq$3(sourceJunctionColumn, parsedSourceId));
+        await tx.delete(junctionTable).where(eq(sourceJunctionColumn, parsedSourceId));
         if (newValue && Array.isArray(newValue) && newValue.length > 0) {
           const targetPks = getPrimaryKeys(targetCollection, this.registry);
           const targetIdInfo = targetPks[0];
@@ -5401,7 +4583,7 @@ class RelationService {
       const sourceIdInfo = sourcePks[0];
       const parsedSourceIdObj = parseIdValues(sourceEntityId, sourcePks);
       const parsedSourceId = parsedSourceIdObj[sourceIdInfo.fieldName];
-      await tx.delete(junctionTable).where(eq$3(sourceJunctionColumn, parsedSourceId));
+      await tx.delete(junctionTable).where(eq(sourceJunctionColumn, parsedSourceId));
       if (newValue && Array.isArray(newValue) && newValue.length > 0) {
         const targetPks = getPrimaryKeys(targetCollection, this.registry);
         const targetIdInfo = targetPks[0];
@@ -5456,14 +4638,14 @@ class RelationService {
       }
       const parentRows = await tx.select({
         val: parentSourceCol
-      }).from(parentTable).where(eq$3(parentIdCol, parsedParentId)).limit(1);
+      }).from(parentTable).where(eq(parentIdCol, parsedParentId)).limit(1);
       if (parentRows.length === 0) continue;
       const parentFKValue = parentRows[0].val;
       if (newTargetId === null || newTargetId === void 0) {
         if (parentFKValue !== null && parentFKValue !== void 0) {
           await tx.update(targetTable).set({
             [targetFKColName]: null
-          }).where(eq$3(targetFKCol, parentFKValue));
+          }).where(eq(targetFKCol, parentFKValue));
         }
         continue;
       }
@@ -5472,14 +4654,14 @@ class RelationService {
       if (parentFKValue !== null && parentFKValue !== void 0) {
         await tx.update(targetTable).set({
           [targetFKColName]: null
-        }).where(eq$3(targetFKCol, parentFKValue));
+        }).where(eq(targetFKCol, parentFKValue));
       } else {
         console.warn(`Cannot set joinPath relation '${relation.relationName}' because parent FK value is null/undefined`);
         continue;
       }
       await tx.update(targetTable).set({
         [targetFKColName]: parentFKValue
-      }).where(eq$3(targetIdCol, parsedTargetId));
+      }).where(eq(targetIdCol, parsedTargetId));
     }
   }
   /**
@@ -5864,7 +5046,7 @@ class EntityFetchService {
       const collection = getCollectionByPath(collectionPath, this.registry);
       const searchConditions = DrizzleConditionBuilder.buildSearchConditions(options.searchString, collection.properties, table);
       if (searchConditions.length === 0) {
-        queryOpts.where = and(eq$3(idField, -99999999));
+        queryOpts.where = and(eq(idField, -99999999));
         return queryOpts;
       }
       allConditions.push(DrizzleConditionBuilder.combineConditionsWithOr(searchConditions));
@@ -5911,9 +5093,9 @@ class EntityFetchService {
         const startAfterId = cursor.id ?? cursor[idInfo.fieldName];
         if (startAfterOrderValue !== void 0 && startAfterId !== void 0) {
           if (options.order === "asc") {
-            return [or(gt(orderByField, startAfterOrderValue), and(eq$3(orderByField, startAfterOrderValue), gt(idField, startAfterId)))];
+            return [or(gt(orderByField, startAfterOrderValue), and(eq(orderByField, startAfterOrderValue), gt(idField, startAfterId)))];
           } else {
-            return [or(lt(orderByField, startAfterOrderValue), and(eq$3(orderByField, startAfterOrderValue), lt(idField, startAfterId)))];
+            return [or(lt(orderByField, startAfterOrderValue), and(eq(orderByField, startAfterOrderValue), lt(idField, startAfterId)))];
           }
         }
       }
@@ -5947,7 +5129,7 @@ class EntityFetchService {
       try {
         const withConfig = this.buildWithConfig(collection);
         const row = await qb.findFirst({
-          where: eq$3(idField, parsedId),
+          where: eq(idField, parsedId),
           with: withConfig
         });
         if (!row) return void 0;
@@ -5955,10 +5137,14 @@ class EntityFetchService {
         await this.resolveJoinPathRelations(entity, collection, collectionPath, parsedId, databaseId);
         return entity;
       } catch (e) {
+        if (e instanceof Error && e.message.includes("not enough information to infer relation")) {
+          console.error(`[EntityFetchService] Relation inference error for collection '${collectionPath}': ${e.message}`);
+          console.error(`Hint: This usually means a relation in your drizzle schema is missing a reciprocal 'one()' or 'many()' definition. Run 'rebase schema generate' to fix this.`);
+        }
         console.warn(`[EntityFetchService] db.query.findFirst failed for ${collectionPath}, falling back to db.select:`, e);
       }
     }
-    const result = await this.db.select().from(table).where(eq$3(idField, parsedId)).limit(1);
+    const result = await this.db.select().from(table).where(eq(idField, parsedId)).limit(1);
     if (result.length === 0) return void 0;
     const raw = result[0];
     const values = await parseDataFromServer(raw, collection, this.db, this.registry);
@@ -6015,6 +5201,10 @@ class EntityFetchService {
         const entities = results2.map((row) => this.drizzleResultToEntity(row, collection, collectionPath, idInfo, options.databaseId, idInfoArray));
         return entities;
       } catch (e) {
+        if (e instanceof Error && e.message.includes("not enough information to infer relation")) {
+          console.error(`[EntityFetchService] Relation inference error for collection '${collectionPath}': ${e.message}`);
+          console.error(`Hint: This usually means a relation in your drizzle schema is missing a reciprocal 'one()' or 'many()' definition. Run 'rebase schema generate' to fix this.`);
+        }
         console.warn(`[EntityFetchService] db.query.findMany failed for ${collectionPath}, falling back to db.select:`, e);
       }
     }
@@ -6284,6 +5474,10 @@ class EntityFetchService {
         await this.resolveJoinPathRelationsBatchRest(restRows, collection, collectionPath, idInfoArray, include);
         return restRows;
       } catch (e) {
+        if (e instanceof Error && e.message.includes("not enough information to infer relation")) {
+          console.error(`[EntityFetchService] Relation inference error for collection '${collectionPath}': ${e.message}`);
+          console.error(`Hint: This usually means a relation in your drizzle schema is missing a reciprocal 'one()' or 'many()' definition. Run 'rebase schema generate' to fix this.`);
+        }
         console.warn(`[fetchCollectionForRest] db.query.findMany failed for ${collectionPath}, falling back:`, e);
       }
     }
@@ -6354,7 +5548,7 @@ class EntityFetchService {
       try {
         const withConfig = include && include.length > 0 ? this.buildWithConfig(collection, include) : void 0;
         const row = await qb.findFirst({
-          where: eq$3(idField, parsedId),
+          where: eq(idField, parsedId),
           ...withConfig ? {
             with: withConfig
           } : {}
@@ -6364,10 +5558,14 @@ class EntityFetchService {
         await this.resolveJoinPathRelationsBatchRest([restRow], collection, collectionPath, idInfoArray, include);
         return restRow;
       } catch (e) {
+        if (e instanceof Error && e.message.includes("not enough information to infer relation")) {
+          console.error(`[EntityFetchService] Relation inference error for collection '${collectionPath}': ${e.message}`);
+          console.error(`Hint: This usually means a relation in your drizzle schema is missing a reciprocal 'one()' or 'many()' definition. Run 'rebase schema generate' to fix this.`);
+        }
         console.warn(`[fetchEntityForRest] db.query.findFirst failed for ${collectionPath}, falling back:`, e);
       }
     }
-    const result = await this.db.select().from(table).where(eq$3(idField, parsedId)).limit(1);
+    const result = await this.db.select().from(table).where(eq(idField, parsedId)).limit(1);
     if (result.length === 0) return null;
     const raw = result[0];
     const flatEntity = {
@@ -6576,7 +5774,7 @@ class EntityPersistService {
     }
     const parsedIdObj = parseIdValues(entityId, idInfoArray);
     const parsedId = parsedIdObj[idInfo.fieldName];
-    await this.db.delete(table).where(eq$3(idField, parsedId));
+    await this.db.delete(table).where(eq(idField, parsedId));
   }
   /**
    * Save an entity (create or update)
@@ -6622,7 +5820,7 @@ class EntityPersistService {
               targetColumnName = relation.localKey;
             } else if (relation.foreignKeyOnTarget) {
               targetColumnName = relation.foreignKeyOnTarget;
-            } else if (relation.joinPath && relation.joinPath.length > 0) {
+            } else if (relation.joinPath && relation.joinPath.length === 1) {
               const targetTableName = getTableName(targetCollection);
               const relevantJoinStep = relation.joinPath.find((joinStep) => joinStep.table === targetTableName);
               if (relevantJoinStep) {
@@ -6633,6 +5831,8 @@ class EntityPersistService {
                 const targetColumnNames = DrizzleConditionBuilder.getColumnNamesFromColumns(relation.joinPath[0].on.to);
                 targetColumnName = targetColumnNames[0];
               }
+            } else if (relation.joinPath && relation.joinPath.length > 1) {
+              break;
             } else {
               throw new Error(`Relation '${relationKey}' lacks configuration for path-based saving.`);
             }
@@ -6698,7 +5898,7 @@ class EntityPersistService {
             const conditions = [];
             for (const info of idInfoArray) {
               const field = table[info.fieldName];
-              conditions.push(eq$3(field, idValues[info.fieldName]));
+              conditions.push(eq(field, idValues[info.fieldName]));
             }
             await updateQuery.where(and(...conditions));
           }
@@ -6755,22 +5955,78 @@ class EntityPersistService {
     const pgError = this.extractPgError(error);
     if (pgError) {
       const detail = pgError.detail;
+      const hint = pgError.hint;
       const constraint = pgError.constraint;
       const column = pgError.column;
       const table = pgError.table;
+      const dataType = pgError.dataType;
+      const pgMessage = pgError.message || "Unknown database error";
+      const suffix = hint ? ` Hint: ${hint}` : "";
+      const tableRef = table ?? collectionSlug;
       switch (pgError.code) {
         case "23503":
-          return new Error(detail ? `Foreign key constraint violated: ${detail}` : `Cannot save: a foreign key constraint${constraint ? ` (${constraint})` : ""} was violated in "${collectionSlug}".`);
+          return new Error(detail ? `Foreign key constraint violated: ${detail}${suffix}` : `Cannot save: a foreign key constraint${constraint ? ` (${constraint})` : ""} was violated in "${collectionSlug}".${suffix}`);
         case "23505":
-          return new Error(detail ? `Duplicate value: ${detail}` : `Cannot save: a unique constraint${constraint ? ` (${constraint})` : ""} was violated in "${collectionSlug}".`);
+          return new Error(detail ? `Duplicate value: ${detail}${suffix}` : `Cannot save: a unique constraint${constraint ? ` (${constraint})` : ""} was violated in "${collectionSlug}".${suffix}`);
         case "23502":
-          return new Error(`Missing required field: "${column ?? "unknown"}" in "${table ?? collectionSlug}" cannot be empty.`);
+          return new Error(`Missing required field: "${column ?? "unknown"}" in "${tableRef}" cannot be empty.${suffix}`);
         case "23514":
-          return new Error(`Validation failed: a check constraint${constraint ? ` (${constraint})` : ""} was violated in "${collectionSlug}".`);
+          return new Error(`Validation failed: a check constraint${constraint ? ` (${constraint})` : ""} was violated in "${collectionSlug}".${suffix}`);
+        case "22P02":
+          return new Error(`Invalid data format in "${collectionSlug}": ${pgMessage}${suffix}`);
+        case "22001":
+          return new Error(`Value too long for column "${column ?? "unknown"}" in "${tableRef}": ${pgMessage}${suffix}`);
+        case "22003":
+          return new Error(`Numeric value out of range for column "${column ?? "unknown"}" in "${tableRef}": ${pgMessage}${suffix}`);
+        case "42703":
+          return new Error(`Unknown column in "${tableRef}": ${pgMessage}. Check if your schema is up to date (run migrations).${suffix}`);
+        case "42P01":
+          return new Error(`Table not found for "${collectionSlug}": ${pgMessage}. Check if your schema is up to date (run migrations).${suffix}`);
+        default: {
+          const parts = [`Database error in "${collectionSlug}" [${pgError.code}]: ${pgMessage}`];
+          if (detail) parts.push(`Detail: ${detail}`);
+          if (column) parts.push(`Column: ${column}`);
+          if (dataType) parts.push(`Data type: ${dataType}`);
+          if (constraint) parts.push(`Constraint: ${constraint}`);
+          if (hint) parts.push(`Hint: ${hint}`);
+          return new Error(parts.join(". "));
+        }
+      }
+    }
+    const causeMessage = this.extractCauseMessage(error);
+    if (causeMessage) {
+      return new Error(`Database error in "${collectionSlug}": ${causeMessage}`);
+    }
+    if (error instanceof Error) {
+      const cleaned = this.stripSqlFromMessage(error.message, collectionSlug);
+      return new Error(cleaned);
+    }
+    return new Error(`Database error in "${collectionSlug}": ${String(error)}`);
+  }
+  /**
+   * Walk the error cause chain and return the deepest meaningful message.
+   */
+  extractCauseMessage(error) {
+    if (!error || typeof error !== "object") return null;
+    const err = error;
+    if (err.cause && typeof err.cause === "object") {
+      const deeper = this.extractCauseMessage(err.cause);
+      if (deeper) return deeper;
+      if (err.cause instanceof Error && err.cause.message) {
+        return err.cause.message;
       }
     }
-    if (error instanceof Error) return error;
-    return new Error(String(error));
+    return null;
+  }
+  /**
+   * Strip the raw SQL query from a Drizzle "Failed query: ..." message,
+   * keeping only the error description.
+   */
+  stripSqlFromMessage(message, collectionSlug) {
+    if (message.startsWith("Failed query:")) {
+      return `Failed to save entity in "${collectionSlug}". Check server logs for details.`;
+    }
+    return message;
   }
   /**
    * Extract the underlying PostgreSQL error from a Drizzle wrapper.
@@ -6779,7 +6035,7 @@ class EntityPersistService {
   extractPgError(error) {
     if (!error || typeof error !== "object") return null;
     const err = error;
-    if (err.code && /^[0-9]{5}$/.test(err.code)) {
+    if (err.code && /^[0-9A-Z]{5}$/.test(err.code)) {
       return err;
     }
     if (err.cause && typeof err.cause === "object") {
@@ -7067,6 +6323,7 @@ class PostgresBackendDriver {
   branchService;
   user;
   data;
+  client;
   /**
    * When true, realtime notifications are deferred until after the
    * wrapping transaction commits.  Set by `withAuth` → `withTransaction`.
@@ -7095,6 +6352,14 @@ class PostgresBackendDriver {
       } : {}
     };
   }
+  /**
+   * REST-optimised fetch service (include-aware eager-loading).
+   * Delegates to the underlying EntityFetchService which already
+   * implements the matching method signatures.
+   */
+  get restFetchService() {
+    return this.entityService.getFetchService();
+  }
   resolveCollectionCallbacks(collection, path2) {
     if (!collection && !path2) return {
       collection: void 0,
@@ -7148,7 +6413,8 @@ class PostgresBackendDriver {
       const contextForCallback = {
         user: this.user,
         driver: this,
-        data: this.data
+        data: this.data,
+        client: this.client
       };
       return Promise.all(entities.map(async (entity) => {
         let fetched = entity;
@@ -7242,7 +6508,8 @@ class PostgresBackendDriver {
       const contextForCallback = {
         user: this.user,
         driver: this,
-        data: this.data
+        data: this.data,
+        client: this.client
       };
       if (callbacks?.afterRead) {
         entity = await callbacks.afterRead({
@@ -7311,7 +6578,8 @@ class PostgresBackendDriver {
     const contextForCallback = {
       user: this.user,
       driver: this,
-      data: this.data
+      data: this.data,
+      client: this.client
     };
     let previousValuesForHistory;
     if (status === "existing" && entityId) {
@@ -7346,6 +6614,14 @@ class PostgresBackendDriver {
         if (result) updatedValues = mergeDeep(updatedValues, result);
       }
     }
+    if (resolvedCollection?.properties) {
+      updatedValues = updateDateAutoValues({
+        inputValues: updatedValues,
+        properties: resolvedCollection.properties,
+        status: status ?? "new",
+        timestampNowValue: /* @__PURE__ */ new Date()
+      });
+    }
     try {
       let savedEntity = await this.entityService.saveEntity(path2, updatedValues, entityId, resolvedCollection?.databaseId);
       if (savedEntity && (callbacks?.afterRead || propertyCallbacks?.afterRead)) {
@@ -7451,7 +6727,8 @@ class PostgresBackendDriver {
     const contextForCallback = {
       user: this.user,
       driver: this,
-      data: this.data
+      data: this.data,
+      client: this.client
     };
     if (callbacks?.beforeDelete || propertyCallbacks?.beforeDelete) {
       if (callbacks?.beforeDelete) {
@@ -7778,6 +7055,7 @@ class AuthenticatedPostgresBackendDriver {
       txDelegate.entityService = txEntityService;
       txDelegate._deferNotifications = true;
       txDelegate._pendingNotifications = pendingNotifications;
+      txDelegate.client = this.delegate.client;
       return await operation(txDelegate);
     });
     for (const notification of pendingNotifications) {
@@ -8059,6 +7337,12 @@ const userIdentitiesRelations = relations(userIdentities, ({
     references: [users.id]
   })
 }));
+const resolveColumnName = (propName, prop) => {
+  if (prop && "columnName" in prop && typeof prop.columnName === "string") {
+    return prop.columnName;
+  }
+  return toSnakeCase(propName);
+};
 const getPrimaryKeyProp = (collection) => {
   if (collection.properties) {
     const idPropEntry = Object.entries(collection.properties).find(([_, prop]) => "isId" in prop && Boolean(prop.isId));
@@ -8099,7 +7383,7 @@ const isIdProperty = (propName, prop, collection) => {
   return !hasExplicitId && propName === "id";
 };
 const getDrizzleColumn = (propName, prop, collection, collections) => {
-  const colName = toSnakeCase(propName);
+  const colName = resolveColumnName(propName, prop);
   let columnDefinition;
   switch (prop.type) {
     case "string": {
@@ -8171,6 +7455,9 @@ const getDrizzleColumn = (propName, prop, collection, collections) => {
       } else {
         columnDefinition = `timestamp("${colName}", { withTimezone: true, mode: 'string' })`;
       }
+      if (dateProp.autoValue === "on_create" || dateProp.autoValue === "on_update") {
+        columnDefinition += `.default(sql\`now()\`)`;
+      }
       break;
     }
     case "map":
@@ -8203,7 +7490,7 @@ const getDrizzleColumn = (propName, prop, collection, collections) => {
       } catch {
         return null;
       }
-      const fkColumnName = toSnakeCase(relation.localKey);
+      const fkColumnName = relation.localKey;
       const targetTableVar = getTableVarName(getTableName(targetCollection));
       const pkProp = getPrimaryKeyProp(targetCollection);
       const targetIdField = pkProp.name;
@@ -8391,7 +7678,7 @@ const generateSchema = async (collections, stripPolicies = false) => {
     Object.entries(collection.properties ?? {}).forEach(([propName, prop]) => {
       if ("enum" in prop && (prop.type === "string" || prop.type === "number") && prop.enum) {
         const enumVarName = getEnumVarName(collectionPath, propName);
-        const enumDbName = `${collectionPath}_${toSnakeCase(propName)}`;
+        const enumDbName = `${collectionPath}_${resolveColumnName(propName, prop)}`;
         const values = Array.isArray(prop.enum) ? prop.enum.map((v) => String(v.id ?? v)) : Object.keys(prop.enum);
         if (values.length > 0) {
           schemaContent += `export const ${enumVarName} = pgEnum("${enumDbName}", [${values.map((v) => `'${v}'`).join(", ")}]);
@@ -8448,9 +7735,9 @@ const generateSchema = async (collections, stripPolicies = false) => {
       const targetId = getPrimaryKeyName(targetCollection);
       schemaContent += `export const ${tableVarName} = pgTable("${tableName}", {
 `;
-      schemaContent += `    ${sourceColumn}: ${sourceColType}("${toSnakeCase(sourceColumn)}").notNull().references(() => ${getTableVarName(getTableName(sourceCollection))}.${sourceId}, ${refOptions}),
+      schemaContent += `    ${sourceColumn}: ${sourceColType}("${sourceColumn}").notNull().references(() => ${getTableVarName(getTableName(sourceCollection))}.${sourceId}, ${refOptions}),
 `;
-      schemaContent += `    ${targetColumn}: ${targetColType}("${toSnakeCase(targetColumn)}").notNull().references(() => ${getTableVarName(getTableName(targetCollection))}.${targetId}, ${refOptions}),
+      schemaContent += `    ${targetColumn}: ${targetColType}("${targetColumn}").notNull().references(() => ${getTableVarName(getTableName(targetCollection))}.${targetId}, ${refOptions}),
 `;
       schemaContent += "}, (table) => ({\n";
       schemaContent += `    pk: primaryKey({ columns: [table.${sourceColumn}, table.${targetColumn}] })
@@ -8543,29 +7830,10 @@ const generateSchema = async (collections, stripPolicies = false) => {
         references: [${targetTableVar}.${getPrimaryKeyName(target)}],
         relationName: "${drizzleRelationName}"
     })`);
-            } else if (rel.direction === "inverse" && rel.foreignKeyOnTarget) {
-              const sourceIdField = getPrimaryKeyName(collection);
+            } else if (rel.direction === "inverse") {
               tableRelations.push(`    "${relationKey}": one(${targetTableVar}, {
-        fields: [${tableVarName}.${sourceIdField}],
-        references: [${targetTableVar}.${rel.foreignKeyOnTarget}],
-        relationName: "${drizzleRelationName}"
-    })`);
-            } else if (rel.direction === "inverse" && !rel.foreignKeyOnTarget) {
-              try {
-                const targetCollection = rel.target();
-                const targetResolvedRelations = resolveCollectionRelations(targetCollection);
-                const correspondingRelation = Object.values(targetResolvedRelations).find((targetRel) => targetRel.direction === "owning" && targetRel.cardinality === "one" && targetRel.target().slug === collection.slug);
-                if (correspondingRelation && correspondingRelation.localKey) {
-                  const sourceIdField = getPrimaryKeyName(collection);
-                  tableRelations.push(`    "${relationKey}": one(${targetTableVar}, {
-        fields: [${tableVarName}.${sourceIdField}],
-        references: [${targetTableVar}.${correspondingRelation.localKey}],
         relationName: "${drizzleRelationName}"
     })`);
-                }
-              } catch (e) {
-                console.warn(`Could not resolve inverse one-to-one relation '${relationKey}':`, e);
-              }
             }
           } else if (rel.cardinality === "many") {
             if (rel.direction === "inverse" && rel.foreignKeyOnTarget) {
@@ -8593,6 +7861,32 @@ const generateSchema = async (collections, stripPolicies = false) => {
           console.warn(`Could not generate relation ${relationKey} for ${collection.name}:`, e);
         }
       }
+      for (const otherCollection of collections) {
+        if (otherCollection.slug === collection.slug) continue;
+        const otherRelations = resolveCollectionRelations(otherCollection);
+        for (const [otherKey, otherRel] of Object.entries(otherRelations)) {
+          if (otherRel.direction === "inverse" && otherRel.foreignKeyOnTarget) {
+            try {
+              const otherTarget = otherRel.target();
+              if (otherTarget.slug === collection.slug) {
+                const drizzleRelationName = computeSharedRelationName(otherRel, otherCollection, collections);
+                const deduplicationKey = `${drizzleRelationName}::owning`;
+                if (!emittedRelationNames.has(deduplicationKey)) {
+                  const otherTableVar = getTableVarName(getTableName(otherCollection));
+                  const synthKey = `_synth_${otherTableVar}_${otherRel.foreignKeyOnTarget}`;
+                  tableRelations.push(`    "${synthKey}": one(${otherTableVar}, {
+        fields: [${tableVarName}.${otherRel.foreignKeyOnTarget}],
+        references: [${otherTableVar}.${getPrimaryKeyName(otherCollection)}],
+        relationName: "${drizzleRelationName}"
+    })`);
+                  emittedRelationNames.add(deduplicationKey);
+                }
+              }
+            } catch (e) {
+            }
+          }
+        }
+      }
     }
     if (tableRelations.length > 0) {
       const relVarName = `${tableVarName}Relations`;
@@ -10371,11 +9665,11 @@ class UserService {
     return user;
   }
   async getUserById(id) {
-    const [user] = await this.db.select().from(users).where(eq$3(users.id, id));
+    const [user] = await this.db.select().from(users).where(eq(users.id, id));
     return user || null;
   }
   async getUserByEmail(email) {
-    const [user] = await this.db.select().from(users).where(eq$3(users.email, email.toLowerCase()));
+    const [user] = await this.db.select().from(users).where(eq(users.email, email.toLowerCase()));
     return user || null;
   }
   async getUserByIdentity(provider, providerId) {
@@ -10431,11 +9725,11 @@ class UserService {
     const [user] = await this.db.update(users).set({
       ...data,
       updatedAt: /* @__PURE__ */ new Date()
-    }).where(eq$3(users.id, id)).returning();
+    }).where(eq(users.id, id)).returning();
     return user || null;
   }
   async deleteUser(id) {
-    await this.db.delete(users).where(eq$3(users.id, id));
+    await this.db.delete(users).where(eq(users.id, id));
   }
   async listUsers() {
     return this.db.select().from(users);
@@ -10504,7 +9798,7 @@ class UserService {
     await this.db.update(users).set({
       passwordHash,
       updatedAt: /* @__PURE__ */ new Date()
-    }).where(eq$3(users.id, id));
+    }).where(eq(users.id, id));
   }
   /**
    * Set email verification status
@@ -10514,7 +9808,7 @@ class UserService {
       emailVerified: verified,
       emailVerificationToken: null,
       updatedAt: /* @__PURE__ */ new Date()
-    }).where(eq$3(users.id, id));
+    }).where(eq(users.id, id));
   }
   /**
    * Set email verification token
@@ -10524,13 +9818,13 @@ class UserService {
       emailVerificationToken: token,
       emailVerificationSentAt: token ? /* @__PURE__ */ new Date() : null,
       updatedAt: /* @__PURE__ */ new Date()
-    }).where(eq$3(users.id, id));
+    }).where(eq(users.id, id));
   }
   /**
    * Find user by email verification token
    */
   async getUserByVerificationToken(token) {
-    const [user] = await this.db.select().from(users).where(eq$3(users.emailVerificationToken, token));
+    const [user] = await this.db.select().from(users).where(eq(users.emailVerificationToken, token));
     return user || null;
   }
   /**
@@ -10703,14 +9997,14 @@ class RefreshTokenService {
       createdAt: refreshTokens.createdAt,
       userAgent: refreshTokens.userAgent,
       ipAddress: refreshTokens.ipAddress
-    }).from(refreshTokens).where(eq$3(refreshTokens.tokenHash, tokenHash));
+    }).from(refreshTokens).where(eq(refreshTokens.tokenHash, tokenHash));
     return token || null;
   }
   async deleteByHash(tokenHash) {
-    await this.db.delete(refreshTokens).where(eq$3(refreshTokens.tokenHash, tokenHash));
+    await this.db.delete(refreshTokens).where(eq(refreshTokens.tokenHash, tokenHash));
   }
   async deleteAllForUser(userId) {
-    await this.db.delete(refreshTokens).where(eq$3(refreshTokens.userId, userId));
+    await this.db.delete(refreshTokens).where(eq(refreshTokens.userId, userId));
   }
   async listForUser(userId) {
     const tokens = await this.db.select({
@@ -10721,7 +10015,7 @@ class RefreshTokenService {
       createdAt: refreshTokens.createdAt,
       userAgent: refreshTokens.userAgent,
       ipAddress: refreshTokens.ipAddress
-    }).from(refreshTokens).where(eq$3(refreshTokens.userId, userId)).orderBy(refreshTokens.createdAt);
+    }).from(refreshTokens).where(eq(refreshTokens.userId, userId)).orderBy(refreshTokens.createdAt);
     return tokens;
   }
   async deleteById(id, userId) {
@@ -10753,7 +10047,7 @@ class PasswordResetTokenService {
     const [token] = await this.db.select({
       userId: passwordResetTokens.userId,
       expiresAt: passwordResetTokens.expiresAt
-    }).from(passwordResetTokens).where(eq$3(passwordResetTokens.tokenHash, tokenHash));
+    }).from(passwordResetTokens).where(eq(passwordResetTokens.tokenHash, tokenHash));
     if (!token) return null;
     const result = await this.db.execute(sql`
             SELECT user_id, expires_at 
@@ -10775,13 +10069,13 @@ class PasswordResetTokenService {
   async markAsUsed(tokenHash) {
     await this.db.update(passwordResetTokens).set({
       usedAt: /* @__PURE__ */ new Date()
-    }).where(eq$3(passwordResetTokens.tokenHash, tokenHash));
+    }).where(eq(passwordResetTokens.tokenHash, tokenHash));
   }
   /**
    * Delete all tokens for a user
    */
   async deleteAllForUser(userId) {
-    await this.db.delete(passwordResetTokens).where(eq$3(passwordResetTokens.userId, userId));
+    await this.db.delete(passwordResetTokens).where(eq(passwordResetTokens.userId, userId));
   }
   /**
    * Clean up expired tokens