@routier/core 0.0.6 → 0.1.0-rc.0

package/dist/index.js

@@ -62,214 +62,103 @@ __webpack_require__.d(__webpack_exports__, {
   Capability: () => (Capability)
 });
 class Capability {
+    excludedNames = new Set([
+        "Array",
+        "Set",
+        "Map",
+        "AbortController",
+        "AbortSignal",
+        "SchemaString",
+        "SchemaNumber",
+        "SchemaArray",
+        "SchemaBoolean",
+        "SchemaDate",
+        "SchemaObject",
+        "SchemaDefault",
+        "SchemaDeserialize",
+        "SchemaDistinct",
+        "SchemaFrom",
+        "SchemaIdentity",
+        "SchemaIndex",
+        "SchemaKey",
+        "SchemaNullable",
+        "SchemaOptional",
+        "SchemaReadonly",
+        "SchemaSerialize",
+        "SchemaTracked",
+        "SchemaComputed",
+        "SchemaFunction",
+        "SchemaBase",
+        "SchemaDefinition"
+    ]);
     isValidObject(obj) {
         return typeof obj === "object" && obj !== null;
     }
-    getObjectName(obj) {
-        return obj?.constructor?.name || 'root';
-    }
-    exploreObjectMethods(obj, callback, options = {}) {
-        if (!this.isValidObject(obj)) {
-            return;
-        }
-        const { maxDepth = 10, includeNonEnumerable = false, filter = () => true } = options;
-        const rootName = this.getObjectName(obj);
-        const visited = new Set();
-        // Explore root methods
-        this.exploreRootMethods(obj, callback, filter);
-        // Explore nested methods
-        this.exploreNestedMethods(obj, callback, filter, [rootName], visited, maxDepth, includeNonEnumerable);
-    }
-    exploreRootMethods(obj, callback, filter) {
-        const methodNames = this.extractMethodNames(obj);
-        for (const methodName of methodNames) {
-            const methodInfo = {
-                methodName,
-                instance: obj,
-                methodPath: [String(methodName)],
-                parent: null
-            };
-            if (filter(methodInfo)) {
-                callback(methodInfo);
-            }
-        }
-    }
-    extractMethodNames(obj) {
-        const methodNames = new Set();
-        let prototype = obj;
-        while (prototype && prototype !== Object.prototype) {
-            const allKeys = [
-                ...Object.getOwnPropertyNames(prototype),
-                ...Object.getOwnPropertySymbols(prototype),
-            ];
-            for (const key of allKeys) {
-                const descriptor = Object.getOwnPropertyDescriptor(prototype, key);
-                if (this.isCallableMethod(descriptor, key)) {
-                    methodNames.add(key);
-                }
-            }
-            prototype = Object.getPrototypeOf(prototype);
-        }
-        return Array.from(methodNames);
-    }
     isCallableMethod(descriptor, key) {
         return (descriptor?.value &&
             typeof descriptor.value === 'function' &&
             key !== 'constructor' &&
             key !== 'undefined');
     }
-    isCustomClassInstance(value) {
-        if (value === null || (typeof value !== "object" && typeof value !== "function")) {
+    canExplore(descriptor) {
+        if (typeof descriptor.value !== "object") {
+            return false;
+        }
+        if (descriptor.value == null) {
             return false;
         }
-        const objectTag = Object.prototype.toString.call(value);
-        // Most built-ins have distinct tags; user classes default to "[object Object]"
-        // Caveat: Symbol.toStringTag can spoof this.
-        return objectTag === "[object Object]";
+        const name = this.getName(descriptor.value);
+        if (name == null) {
+            return true;
+        }
+        return this.excludedNames.has(name) === false;
     }
-    shouldProcessProperty(property) {
-        return (this.isCustomClassInstance(property) &&
-            property?.constructor.name !== "Object");
+    getName(value) {
+        if (value.constructor != null) {
+            return value.constructor.name;
+        }
+        return null;
     }
-    exploreNestedMethods(obj, callback, filter, initialPath, visited, maxDepth, includeNonEnumerable) {
-        if (visited.has(obj) || initialPath.length > maxDepth) {
-            return;
+    getPath(info, propertyName) {
+        let parent = info.parent;
+        const path = [info.propertyName, propertyName];
+        while (parent != null) {
+            path.unshift(parent.propertyName);
+            parent = parent.parent;
         }
-        visited.add(obj);
-        if (!this.isValidObject(obj)) {
+        return path.join(".");
+    }
+    explore(instance, onDiscover) {
+        if (!this.isValidObject(instance)) {
             return;
         }
-        const properties = includeNonEnumerable
-            ? Object.getOwnPropertyNames(obj)
-            : Object.keys(obj);
-        for (const propertyName of properties) {
-            const property = obj[propertyName];
-            if (!this.shouldProcessProperty(property)) {
+        const explore = [{ instance, propertyName: this.getName(instance) }];
+        const visited = new Set();
+        for (let i = 0; i < explore.length; i++) {
+            const info = explore[i];
+            const item = info.instance;
+            if (visited.has(item)) {
                 continue;
             }
-            const newPath = [...initialPath, propertyName];
-            // Explore methods on this property
-            this.explorePropertyMethods(property, callback, filter, newPath, obj);
-            // Recursively explore nested objects
-            this.exploreNestedMethods(property, callback, filter, newPath, visited, maxDepth, includeNonEnumerable);
-        }
-    }
-    explorePropertyMethods(property, callback, filter, methodPath, parent) {
-        const methodNames = this.extractMethodNames(property);
-        for (const methodName of methodNames) {
-            const fullMethodPath = [...methodPath, String(methodName)];
-            const methodInfo = {
-                methodName,
-                instance: property,
-                methodPath: fullMethodPath,
-                parent
-            };
-            if (filter(methodInfo)) {
-                callback(methodInfo);
-            }
-        }
-    }
-    stringifyValue(value, maxDepth = 3, currentDepth = 0) {
-        if (value === null)
-            return 'null';
-        if (value === undefined)
-            return 'undefined';
-        const type = typeof value;
-        switch (type) {
-            case 'string':
-                return `"${value}"`;
-            case 'number':
-            case 'boolean':
-                return String(value);
-            case 'function':
-                return `[Function: ${this.getFunctionName(value)}]`;
-            case 'object':
-                if (currentDepth >= maxDepth) {
-                    return '[Max Depth Reached]';
+            const allKeys = [
+                ...Object.getOwnPropertyNames(item),
+                ...Object.getOwnPropertySymbols(item),
+            ];
+            for (const key of allKeys) {
+                const descriptor = Object.getOwnPropertyDescriptor(item, key);
+                const isCallable = this.isCallableMethod(descriptor, key);
+                onDiscover(info, {
+                    name: key,
+                    isCallable
+                });
+                if (this.canExplore(descriptor) === false) {
+                    continue;
                 }
-                return this.stringifyObject(value, maxDepth, currentDepth);
-            default:
-                return `[${type}]`;
-        }
-    }
-    getFunctionName(fn) {
-        const name = fn.name;
-        return name || 'anonymous';
-    }
-    stringifyObject(obj, maxDepth, currentDepth) {
-        if (obj === null)
-            return 'null';
-        // Handle special object types
-        if (obj instanceof Date) {
-            return `Date(${obj.toISOString()})`;
-        }
-        if (obj instanceof Error) {
-            return `Error(${obj.message})`;
-        }
-        if (obj instanceof RegExp) {
-            return obj.toString();
-        }
-        if (Array.isArray(obj)) {
-            return this.stringifyArray(obj, maxDepth, currentDepth);
-        }
-        if (obj.constructor && obj.constructor.name !== 'Object') {
-            return this.stringifyClassInstance(obj, maxDepth, currentDepth);
-        }
-        return this.stringifyPlainObject(obj, maxDepth, currentDepth);
-    }
-    stringifyArray(arr, maxDepth, currentDepth) {
-        if (arr.length === 0)
-            return '[]';
-        const items = arr.slice(0, 5).map(item => this.stringifyValue(item, maxDepth, currentDepth + 1));
-        const suffix = arr.length > 5 ? `... (+${arr.length - 5} more)` : '';
-        return `[${items.join(', ')}${suffix}]`;
-    }
-    stringifyClassInstance(obj, maxDepth, currentDepth) {
-        const className = obj.constructor.name;
-        const properties = this.getObjectProperties(obj);
-        if (Object.keys(properties).length === 0) {
-            return `${className} {}`;
-        }
-        const props = Object.entries(properties)
-            .slice(0, 5)
-            .map(([key, value]) => {
-            // For primitive values, don't increase depth
-            const isPrimitive = value === null || value === undefined ||
-                (typeof value !== 'object' && typeof value !== 'function');
-            const depth = isPrimitive ? currentDepth : currentDepth + 1;
-            return `${key}: ${this.stringifyValue(value, maxDepth, depth)}`;
-        });
-        const suffix = Object.keys(properties).length > 5 ?
-            `... (+${Object.keys(properties).length - 5} more)` : '';
-        return `${className} { ${props.join(', ')}${suffix} }`;
-    }
-    stringifyPlainObject(obj, maxDepth, currentDepth) {
-        const properties = this.getObjectProperties(obj);
-        if (Object.keys(properties).length === 0) {
-            return '{}';
-        }
-        const props = Object.entries(properties)
-            .slice(0, 5)
-            .map(([key, value]) => {
-            // For primitive values, don't increase depth
-            const isPrimitive = value === null || value === undefined ||
-                (typeof value !== 'object' && typeof value !== 'function');
-            const depth = isPrimitive ? currentDepth : currentDepth + 1;
-            return `${key}: ${this.stringifyValue(value, maxDepth, depth)}`;
-        });
-        const suffix = Object.keys(properties).length > 5 ?
-            `... (+${Object.keys(properties).length - 5} more)` : '';
-        return `{ ${props.join(', ')}${suffix} }`;
-    }
-    getObjectProperties(obj) {
-        const properties = {};
-        // Get enumerable properties
-        for (const key in obj) {
-            if (obj.hasOwnProperty(key)) {
-                properties[key] = obj[key];
+                const path = this.getPath(info, key);
+                explore.push({ instance: descriptor.value, parent: info, propertyName: key, path });
             }
+            visited.add(item);
         }
-        return properties;
     }
 }
 
@@ -284,99 +173,134 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   PerformanceCapability: () => (PerformanceCapability)
 });
+/* ESM import */var _utilities__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utilities */ "./src/utilities/strings.ts");
 /* ESM import */var _Capability__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Capability */ "./src/capabilities/Capability.ts");
 /* ESM import */var _performance_PerformanceTracker__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./performance/PerformanceTracker */ "./src/capabilities/performance/PerformanceTracker.ts");
 /* ESM import */var _tracing_CallTraceManager__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./tracing/CallTraceManager */ "./src/capabilities/tracing/CallTraceManager.ts");
 
 
 
+
 class PerformanceCapability extends _Capability__WEBPACK_IMPORTED_MODULE_0__.Capability {
     callTraceManager;
     performanceTracker;
-    log;
-    shouldLog;
+    filter;
+    childDurations = new Map();
     constructor(options) {
         super();
-        this.log = options?.log ?? ((type, operationId, methodName, methodPath, performanceMetrics, isCompleted) => {
-            if (isCompleted) {
-                if (!performanceMetrics.duration)
-                    return;
-                const deltaFromStart = this.performanceTracker.getDeltaFromOperationStart(operationId, performanceMetrics.endTime || performanceMetrics.startTime);
-                console.log(`[${type} ${operationId}] ${methodName} COMPLETED`, {
-                    methodPath,
-                    performance: {
-                        deltaFromStart: this.performanceTracker.formatDuration(deltaFromStart),
-                        executionTime: this.performanceTracker.formatDuration(performanceMetrics.duration),
-                        timeToNextCall: performanceMetrics.timeToNextCall ?
-                            this.performanceTracker.formatDuration(performanceMetrics.timeToNextCall) : 'N/A'
-                    }
-                });
-                return;
-            }
-            const deltaFromStart = this.performanceTracker.getDeltaFromOperationStart(operationId, performanceMetrics.startTime);
-            console.log(`[${type} ${operationId}] ${methodName}`, {
-                methodPath,
-                performance: {
-                    deltaFromStart: this.performanceTracker.formatDuration(deltaFromStart)
-                }
-            });
-        });
-        this.shouldLog = options?.shouldLog ?? (() => true);
+        this.filter = options?.filter ?? (() => true);
         this.callTraceManager = new _tracing_CallTraceManager__WEBPACK_IMPORTED_MODULE_1__.CallTraceManager();
         this.performanceTracker = new _performance_PerformanceTracker__WEBPACK_IMPORTED_MODULE_2__.PerformanceTracker();
     }
-    createPerformanceInterceptor(originalMethod, methodName, methodPath, instance) {
-        return (...args) => {
-            const isNewOperation = this.callTraceManager.isNewOperation();
-            let operationId;
-            if (isNewOperation) {
-                operationId = this.callTraceManager.startNewOperation();
-                const startTime = this.performanceTracker.startMethodTiming(operationId, methodPath);
-                this.log('ORIGIN', operationId, methodName, methodPath, { startTime }, false);
-            }
-            else {
-                operationId = this.callTraceManager.getActiveOperationId();
-                // Record that the previous method is about to call this one
-                const callTrace = this.callTraceManager.getCurrentTrace();
-                const previousMethodPath = callTrace[callTrace.length - 2];
-                if (previousMethodPath) {
-                    this.performanceTracker.recordNextMethodStart(operationId, previousMethodPath);
-                }
-                const startTime = this.performanceTracker.startMethodTiming(operationId, methodPath);
-                this.log('CHILD', operationId, methodName, methodPath, { startTime }, false);
-            }
-            try {
-                const result = originalMethod.apply(instance, args);
-                return result;
-            }
-            finally {
-                // End performance tracking
-                const performanceMetrics = this.performanceTracker.endMethodTiming(operationId, methodPath);
-                // Log completion with performance metrics
-                this.log(isNewOperation ? 'ORIGIN' : 'CHILD', operationId, methodName, methodPath, performanceMetrics, true);
-                if (isNewOperation) {
-                    this.callTraceManager.endOperation();
-                    this.performanceTracker.cleanupOperation(operationId);
-                }
-            }
-        };
-    }
     apply(instance) {
-        if (!this.isValidObject(instance)) {
-            return;
-        }
-        // Create a performance wrapper
-        const wrapper = {
-            wrapMethod: (originalMethod, methodInfo) => {
-                return this.createPerformanceInterceptor(originalMethod, String(methodInfo.methodName), methodInfo.methodPath.join(' → '), methodInfo.instance);
+        this.explore(instance, (meta, info) => {
+            if (info.isCallable) {
+                const originalMethod = meta.instance[info.name].bind(meta.instance);
+                meta.instance[info.name] = (...args) => {
+                    const path = `${meta.path}.${String(info.name)}()`;
+                    if (this.filter(path, info, meta) === false) {
+                        return originalMethod(...args);
+                    }
+                    const isNewOperation = this.callTraceManager.isNewOperation();
+                    let operationId;
+                    let callTrace;
+                    let depth;
+                    if (isNewOperation) {
+                        operationId = this.callTraceManager.startNewOperation();
+                        this.childDurations.set(operationId, []);
+                        callTrace = this.callTraceManager.addMethodToTrace(path);
+                        depth = callTrace.length - 1;
+                        const formattedCallTrace = this.callTraceManager.formatMethodPaths(callTrace);
+                        this.performanceTracker.startMethodTiming(operationId, path);
+                        console.log(`\n${'═'.repeat(60)}`);
+                        console.log(`▶ ORIGIN [${operationId}] ${path}`);
+                        if (args.length > 0) {
+                            console.log(`  Args:`, (0,_utilities__WEBPACK_IMPORTED_MODULE_3__.stringifyObject)(args, 4, 0));
+                        }
+                        console.log(`  Call Stack: ${formattedCallTrace.join(' → ')}`);
+                    }
+                    else {
+                        operationId = this.callTraceManager.getActiveOperationId();
+                        callTrace = this.callTraceManager.addMethodToTrace(path);
+                        depth = callTrace.length - 1;
+                        const indent = '  '.repeat(Math.min(depth, 4));
+                        // Track children for this child method too
+                        const childMethodKey = `${operationId}:${path}`;
+                        this.childDurations.set(childMethodKey, []);
+                        this.performanceTracker.startMethodTiming(operationId, path);
+                        console.log(`${indent}└─ CHILD [${operationId}] ${path}`);
+                        if (args.length > 0) {
+                            console.log(`${indent}   Args:`, (0,_utilities__WEBPACK_IMPORTED_MODULE_3__.stringifyObject)(args, 4, 0));
+                        }
+                    }
+                    try {
+                        return originalMethod(...args);
+                    }
+                    finally {
+                        const metrics = this.performanceTracker.endMethodTiming(operationId, path);
+                        const duration = metrics.duration ?? 0;
+                        const formattedDuration = this.performanceTracker.formatDuration(duration);
+                        if (isNewOperation) {
+                            const childDurations = this.childDurations.get(operationId) ?? [];
+                            const totalChildTime = childDurations.reduce((sum, d) => sum + d, 0);
+                            const formattedTotalChildTime = this.performanceTracker.formatDuration(totalChildTime);
+                            const overhead = duration - totalChildTime;
+                            const formattedOverhead = this.performanceTracker.formatDuration(Math.max(0, overhead));
+                            console.log(`\n${'═'.repeat(60)}`);
+                            console.log(`◀ COMPLETE [${operationId}] ${path}`);
+                            console.log(`  Total Duration: ${formattedDuration}`);
+                            if (childDurations.length > 0) {
+                                console.log(`  Children Duration: ${formattedTotalChildTime} (${childDurations.length} calls)`);
+                                console.log(`  Overhead: ${formattedOverhead}`);
+                            }
+                            console.log(`${'═'.repeat(60)}\n`);
+                            this.childDurations.delete(operationId);
+                            this.performanceTracker.cleanupOperation(operationId);
+                            this.callTraceManager.endOperation();
+                        }
+                        else {
+                            const indent = '  '.repeat(Math.min(depth, 4));
+                            const childMethodKey = `${operationId}:${path}`;
+                            const childDurations = this.childDurations.get(childMethodKey) ?? [];
+                            const totalChildTime = childDurations.reduce((sum, d) => sum + d, 0);
+                            const formattedTotalChildTime = this.performanceTracker.formatDuration(totalChildTime);
+                            const overhead = duration - totalChildTime;
+                            const formattedOverhead = this.performanceTracker.formatDuration(Math.max(0, overhead));
+                            console.log(`${indent}   ✓ ${formattedDuration}`);
+                            if (childDurations.length > 0) {
+                                console.log(`${indent}     Children: ${formattedTotalChildTime} (${childDurations.length} calls), Overhead: ${formattedOverhead}`);
+                            }
+                            // Clean up child method tracking
+                            this.childDurations.delete(childMethodKey);
+                            // Find the parent method and add this duration to its children list
+                            // The parent is the method one level up in the call trace
+                            const currentTrace = this.callTraceManager.getCurrentTrace();
+                            if (currentTrace.length > 1) {
+                                // Parent is the second-to-last item in the trace (before we remove current)
+                                const parentPath = currentTrace[currentTrace.length - 2];
+                                // Check if parent is the root operation (trace length 2 means root + this child)
+                                if (currentTrace.length === 2) {
+                                    // Direct child of root - add to root's children list
+                                    const rootChildDurations = this.childDurations.get(operationId);
+                                    if (rootChildDurations) {
+                                        rootChildDurations.push(duration);
+                                    }
+                                }
+                                else {
+                                    // Nested child - add to parent method's children list
+                                    const parentMethodKey = `${operationId}:${parentPath}`;
+                                    const parentChildDurations = this.childDurations.get(parentMethodKey);
+                                    if (parentChildDurations) {
+                                        parentChildDurations.push(duration);
+                                    }
+                                }
+                            }
+                        }
+                        this.callTraceManager.removeMethodFromTrace();
+                    }
+                };
             }
-        };
-        // Use the generic interception utility
-        this.exploreObjectMethods(instance, (methodInfo) => {
-            const originalMethod = methodInfo.instance[methodInfo.methodName].bind(methodInfo.instance);
-            const wrappedMethod = wrapper.wrapMethod(originalMethod, methodInfo);
-            methodInfo.instance[methodInfo.methodName] = wrappedMethod;
-        }, {});
+        });
     }
 }
 
@@ -393,95 +317,61 @@ __webpack_require__.d(__webpack_exports__, {
 });
 /* ESM import */var _Capability__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Capability */ "./src/capabilities/Capability.ts");
 /* ESM import */var _tracing_CallTraceManager__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./tracing/CallTraceManager */ "./src/capabilities/tracing/CallTraceManager.ts");
+/* ESM import */var _utilities_strings__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utilities/strings */ "./src/utilities/strings.ts");
+
 
 
 class TracingCapability extends _Capability__WEBPACK_IMPORTED_MODULE_0__.Capability {
     callTraceManager;
-    log;
-    shouldLogMethod;
+    filter;
     constructor(options) {
         super();
-        this.log = options?.log ?? ((type, operationId, methodName, methodPath, _callTrace, formattedCallTrace, args) => {
-            const stringifiedArgs = args.map(arg => this.stringifyValue(arg, 4));
-            const logData = {
-                methodPath,
-                callStack: formattedCallTrace,
-                args: stringifiedArgs
-            };
-            console.log(`[${type} ${operationId}] ${methodName}`, logData);
-        });
-        this.shouldLogMethod = options?.shouldLog ?? (() => true);
+        this.filter = options?.filter ?? (() => true);
         this.callTraceManager = new _tracing_CallTraceManager__WEBPACK_IMPORTED_MODULE_1__.CallTraceManager();
     }
-    createTracingInterceptor(originalMethod, methodName, methodPath, instance) {
-        return (...args) => {
-            const isNewOperation = this.callTraceManager.isNewOperation();
-            let operationId;
-            let callTrace;
-            if (isNewOperation) {
-                operationId = this.callTraceManager.startNewOperation();
-                callTrace = this.callTraceManager.addMethodToTrace(methodPath);
-                const formattedCallTrace = this.callTraceManager.formatMethodPaths(callTrace);
-                this.log('ORIGIN', operationId, methodName, methodPath, callTrace, formattedCallTrace, args);
-            }
-            else {
-                operationId = this.callTraceManager.getActiveOperationId();
-                callTrace = this.callTraceManager.addMethodToTrace(methodPath);
-                const formattedCallTrace = this.callTraceManager.formatMethodPaths(callTrace);
-                this.log('CHILD', operationId, methodName, methodPath, callTrace, formattedCallTrace, args);
-            }
-            try {
-                const result = originalMethod.apply(instance, args);
-                return result;
-            }
-            finally {
-                if (isNewOperation) {
-                    this.callTraceManager.endOperation();
-                }
-                else {
-                    this.callTraceManager.removeMethodFromTrace();
-                }
-            }
-        };
-    }
     apply(instance) {
-        if (!this.isValidObject(instance)) {
-            return;
-        }
-        const logMethodCall = (type, operationId, methodName, methodPath, callTrace, formattedCallTrace, args) => {
-            if (this.log) {
-                this.log(type, operationId, methodName, methodPath, callTrace, formattedCallTrace, args);
-                return;
-            }
-            const stringifiedArgs = args.map(arg => this.stringifyValue(arg, 4));
-            const logData = {
-                methodPath,
-                callStack: formattedCallTrace,
-                args: stringifiedArgs
-            };
-            console.log(`[${type} ${operationId}] ${methodName}`, logData);
-        };
-        // Create a tracing wrapper
-        const wrapper = {
-            wrapMethod: (originalMethod, methodInfo) => {
-                const metadata = {
-                    parent: methodInfo.parent,
-                    instance: methodInfo.instance,
-                    methodPath: methodInfo.methodPath
+        this.explore(instance, (meta, info) => {
+            if (info.isCallable) {
+                const originalMethod = meta.instance[info.name].bind(meta.instance);
+                meta.instance[info.name] = (...args) => {
+                    const path = `${meta.path}.${String(info.name)}()`;
+                    if (this.filter(path, info, meta) === false) {
+                        return originalMethod(...args);
+                    }
+                    const isNewOperation = this.callTraceManager.isNewOperation();
+                    let operationId;
+                    if (isNewOperation) {
+                        operationId = this.callTraceManager.startNewOperation();
+                        const callTrace = this.callTraceManager.addMethodToTrace(path);
+                        const formattedCallTrace = this.callTraceManager.formatMethodPaths(callTrace);
+                        console.log(`\n${'═'.repeat(60)}`);
+                        console.log(`▶ ORIGIN [${operationId}] ${path}`);
+                        if (args.length > 0) {
+                            console.log(`  Args:`, (0,_utilities_strings__WEBPACK_IMPORTED_MODULE_2__.stringifyObject)(args, 4, 0));
+                        }
+                        console.log(`  Call Stack: ${formattedCallTrace.join(' → ')}`);
+                    }
+                    else {
+                        operationId = this.callTraceManager.getActiveOperationId();
+                        const callTrace = this.callTraceManager.addMethodToTrace(path);
+                        const indent = '  '.repeat(Math.min(callTrace.length - 1, 4));
+                        console.log(`${indent}└─ CHILD [${operationId}] ${path}`);
+                        if (args.length > 0) {
+                            console.log(`${indent}   Args:`, (0,_utilities_strings__WEBPACK_IMPORTED_MODULE_2__.stringifyObject)(args, 4, 0));
+                        }
+                    }
+                    try {
+                        return originalMethod(...args);
+                    }
+                    finally {
+                        this.callTraceManager.removeMethodFromTrace();
+                        if (isNewOperation) {
+                            this.callTraceManager.endOperation();
+                        }
+                    }
                 };
-                const shouldLog = this.shouldLogMethod(methodInfo.methodName, metadata);
-                if (!shouldLog) {
-                    return originalMethod; // Return unwrapped method if not logging
-                }
-                return this.createTracingInterceptor(originalMethod, String(methodInfo.methodName), methodInfo.methodPath.join(' → '), methodInfo.instance);
             }
-        };
-        // Use the generic interception utility
-        this.exploreObjectMethods(instance, (methodInfo) => {
-            const originalMethod = methodInfo.instance[methodInfo.methodName].bind(methodInfo.instance);
-            const wrappedMethod = wrapper.wrapMethod(originalMethod, methodInfo);
-            methodInfo.instance[methodInfo.methodName] = wrappedMethod;
-        }, {});
+        });
     }
 }
 
@@ -594,7 +484,7 @@ class CallTraceManager {
     activeOperationId = null;
     activeCallStack = [];
     startNewOperation() {
-        const operationId = (0,_utilities__WEBPACK_IMPORTED_MODULE_0__.uuid)();
+        const operationId = (0,_utilities__WEBPACK_IMPORTED_MODULE_0__.uuid)(8);
         this.activeOperationId = operationId;
         this.activeCallStack = [];
         return operationId;
@@ -700,6 +590,24 @@ class Block {
     indexOf(name) {
         return this._lines.findIndex(w => typeof w !== "string" && w.name === name);
     }
+    getLines() {
+        return this._lines;
+    }
+    getParent() {
+        return this._parent;
+    }
+    getIndent() {
+        return this._indent;
+    }
+    setLines(lines) {
+        this._lines = lines;
+    }
+    setParent(block) {
+        this._parent = block;
+    }
+    setIndent(indent) {
+        this._indent = indent;
+    }
     getOrDefault(name) {
         if (name.includes('.') === false) {
             return this._lines.find(w => typeof w !== "string" && w.name === name);
@@ -729,6 +637,27 @@ class Block {
     has(name) {
         return this._lines.some(w => typeof w !== "string" && w.name === name);
     }
+    remove(name) {
+        this._lines = this._lines.filter(x => typeof x === "object" && typeof x.name === "string" && x.name !== name);
+    }
+    replace(name, line) {
+        const foundIndex = this._lines.findIndex(x => typeof x !== "string" && x.name === name);
+        if (foundIndex === -1) {
+            throw new Error(`Cannot find line by name.  Name: ${name}`);
+        }
+        const found = this._lines[foundIndex];
+        if (typeof found === "string") {
+            // Replace the line
+            this._lines.splice(foundIndex, 1, line);
+            return;
+        }
+        line.setLines(found.getLines());
+        line.setIndent(found.getIndent());
+        line.setParent(found.getParent());
+        // Replace the line
+        this._lines.splice(foundIndex, 1, line);
+        return;
+    }
     push(line) {
         this._lines.push(line);
     }
@@ -1159,15 +1088,40 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   CompareHandlerBuilder: () => (CompareHandlerBuilder)
 });
+/* ESM import */var _compare_CompareArrayHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./compare/CompareArrayHandler */ "./src/codegen/handlers/compare/CompareArrayHandler.ts");
+/* ESM import */var _compare_CompareDateHandler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./compare/CompareDateHandler */ "./src/codegen/handlers/compare/CompareDateHandler.ts");
 /* ESM import */var _compare_CompareObjectHandler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./compare/CompareObjectHandler */ "./src/codegen/handlers/compare/CompareObjectHandler.ts");
-/* ESM import */var _compare_CompareValueHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./compare/CompareValueHandler */ "./src/codegen/handlers/compare/CompareValueHandler.ts");
+/* ESM import */var _compare_CompareValueHandler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./compare/CompareValueHandler */ "./src/codegen/handlers/compare/CompareValueHandler.ts");
+
+
 
 
-/// Purpose: 
 class CompareHandlerBuilder {
     build() {
         const handler = new _compare_CompareObjectHandler__WEBPACK_IMPORTED_MODULE_0__.CompareObjectHandler();
-        handler.setNext(new _compare_CompareValueHandler__WEBPACK_IMPORTED_MODULE_1__.CompareValueHandler());
+        handler.setNext(new _compare_CompareArrayHandler__WEBPACK_IMPORTED_MODULE_1__.CompareArrayHandler())
+            .setNext(new _compare_CompareDateHandler__WEBPACK_IMPORTED_MODULE_2__.CompareDateHandler())
+            .setNext(new _compare_CompareValueHandler__WEBPACK_IMPORTED_MODULE_3__.CompareValueHandler());
+        return handler;
+    }
+}
+
+
+}),
+"./src/codegen/handlers/CompareIdsHandlerBuilder.ts": 
+/*!**********************************************************!*\
+  !*** ./src/codegen/handlers/CompareIdsHandlerBuilder.ts ***!
+  \**********************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  CompareIdsHandlerBuilder: () => (CompareIdsHandlerBuilder)
+});
+/* ESM import */var _compareIds_CompareIdsKeyHandler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./compareIds/CompareIdsKeyHandler */ "./src/codegen/handlers/compareIds/CompareIdsKeyHandler.ts");
+
+class CompareIdsHandlerBuilder {
+    build() {
+        const handler = new _compareIds_CompareIdsKeyHandler__WEBPACK_IMPORTED_MODULE_0__.CompareIdsKeyHandler();
         return handler;
     }
 }
@@ -1465,10 +1419,12 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   SerializeHandlerBuilder: () => (SerializeHandlerBuilder)
 });
-/* ESM import */var _serialize_SerializeDateHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./serialize/SerializeDateHandler */ "./src/codegen/handlers/serialize/SerializeDateHandler.ts");
-/* ESM import */var _serialize_SerializeObjectHandler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./serialize/SerializeObjectHandler */ "./src/codegen/handlers/serialize/SerializeObjectHandler.ts");
-/* ESM import */var _serialize_SerializeValueHandler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./serialize/SerializeValueHandler */ "./src/codegen/handlers/serialize/SerializeValueHandler.ts");
+/* ESM import */var _serialize_SerializeDateHandler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./serialize/SerializeDateHandler */ "./src/codegen/handlers/serialize/SerializeDateHandler.ts");
+/* ESM import */var _serialize_SerializeObjectHandler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./serialize/SerializeObjectHandler */ "./src/codegen/handlers/serialize/SerializeObjectHandler.ts");
+/* ESM import */var _serialize_SerializeValueHandler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./serialize/SerializeValueHandler */ "./src/codegen/handlers/serialize/SerializeValueHandler.ts");
 /* ESM import */var _serialize_SerializeSerializerHandler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./serialize/SerializeSerializerHandler */ "./src/codegen/handlers/serialize/SerializeSerializerHandler.ts");
+/* ESM import */var _serialize_SerializeFunctionHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./serialize/SerializeFunctionHandler */ "./src/codegen/handlers/serialize/SerializeFunctionHandler.ts");
+
 
 
 
@@ -1478,9 +1434,10 @@ class SerializeHandlerBuilder {
     build() {
         const handler = new _serialize_SerializeSerializerHandler__WEBPACK_IMPORTED_MODULE_0__.SerializeSerializerHandler();
         handler
-            .setNext(new _serialize_SerializeDateHandler__WEBPACK_IMPORTED_MODULE_1__.SerializeDateHandler())
-            .setNext(new _serialize_SerializeValueHandler__WEBPACK_IMPORTED_MODULE_2__.SerializeValueHandler())
-            .setNext(new _serialize_SerializeObjectHandler__WEBPACK_IMPORTED_MODULE_3__.SerializeObjectHandler());
+            .setNext(new _serialize_SerializeFunctionHandler__WEBPACK_IMPORTED_MODULE_1__.SerializeFunctionHandler())
+            .setNext(new _serialize_SerializeDateHandler__WEBPACK_IMPORTED_MODULE_2__.SerializeDateHandler())
+            .setNext(new _serialize_SerializeValueHandler__WEBPACK_IMPORTED_MODULE_3__.SerializeValueHandler())
+            .setNext(new _serialize_SerializeObjectHandler__WEBPACK_IMPORTED_MODULE_4__.SerializeObjectHandler());
         return handler;
     }
 }
@@ -1618,6 +1575,74 @@ class CloneValueHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfo
 }
 
 
+}),
+"./src/codegen/handlers/compare/CompareArrayHandler.ts": 
+/*!*************************************************************!*\
+  !*** ./src/codegen/handlers/compare/CompareArrayHandler.ts ***!
+  \*************************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  CompareArrayHandler: () => (CompareArrayHandler)
+});
+/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../types */ "./src/codegen/handlers/types.ts");
+/* ESM import */var _schema__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../schema */ "./src/schema/types.ts");
+
+
+class CompareArrayHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
+    handle(property, builder) {
+        if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Array) {
+            let compare = builder.getOrDefault("result.variable.compare");
+            const leftCompare = property.getSelectrorPath({ parent: "a" });
+            const rightCompare = property.getSelectrorPath({ parent: "b" });
+            if (compare == null) {
+                compare = builder.get("result")
+                    .assign("const result", { name: "variable" })
+                    .and(`JSON.stringify(${leftCompare}) === JSON.stringify(${rightCompare})`, { name: "compareArray" });
+                return builder;
+            }
+            compare.and(`JSON.stringify(${leftCompare}) === JSON.stringify(${rightCompare})`);
+            return builder;
+        }
+        return super.handle(property, builder);
+    }
+}
+
+
+}),
+"./src/codegen/handlers/compare/CompareDateHandler.ts": 
+/*!************************************************************!*\
+  !*** ./src/codegen/handlers/compare/CompareDateHandler.ts ***!
+  \************************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  CompareDateHandler: () => (CompareDateHandler)
+});
+/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../types */ "./src/codegen/handlers/types.ts");
+/* ESM import */var _schema__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../schema */ "./src/schema/types.ts");
+
+
+class CompareDateHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
+    handle(property, builder) {
+        if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Date) {
+            let compare = builder.getOrDefault("result.variable.compare");
+            const leftCompare = property.getSelectrorPath({ parent: "a" });
+            const rightCompare = property.getSelectrorPath({ parent: "b" });
+            if (compare == null) {
+                compare = builder.get("result")
+                    .assign("const result", { name: "variable" })
+                    .and(`${leftCompare}?.toISOString() === ${rightCompare}?.toISOString()`, { name: "compareDate" });
+                return builder;
+            }
+            compare.and(`${leftCompare}?.toISOString() === ${rightCompare}?.toISOString()`);
+            return builder;
+        }
+        return super.handle(property, builder);
+    }
+}
+
+
 }),
 "./src/codegen/handlers/compare/CompareObjectHandler.ts": 
 /*!**************************************************************!*\
@@ -1676,6 +1701,32 @@ class CompareValueHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyIn
 }
 
 
+}),
+"./src/codegen/handlers/compareIds/CompareIdsKeyHandler.ts": 
+/*!*****************************************************************!*\
+  !*** ./src/codegen/handlers/compareIds/CompareIdsKeyHandler.ts ***!
+  \*****************************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  CompareIdsKeyHandler: () => (CompareIdsKeyHandler)
+});
+/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../types */ "./src/codegen/handlers/types.ts");
+
+class CompareIdsKeyHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
+    handle(property, builder) {
+        if (property.isKey) {
+            const slot = builder.get("ifs");
+            const leftCompare = property.getSelectrorPath({ parent: "a" });
+            const rightCompare = property.getSelectrorPath({ parent: "b" });
+            slot.if(`${leftCompare} != ${rightCompare}`).appendBody("return false;");
+            return builder;
+        }
+        return super.handle(property, builder);
+    }
+}
+
+
 }),
 "./src/codegen/handlers/deserialize/DeserializeComputedValueHandler.ts": 
 /*!*****************************************************************************!*\
@@ -1725,8 +1776,8 @@ class DeserializeDateHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.Propert
         if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Date) {
             const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_2__.SlotPath("result.variable.object");
             let objectBuilder = builder.get(slotPath.get());
-            const entitySelectorPath = property.getSelectrorPath({ parent: "entity" });
-            const entityAssignmentPath = property.getAssignmentPath({ parent: "result" });
+            const entitySelectorPath = property.getSelectrorPath({ parent: "unserialized" });
+            const entityAssignmentPath = property.getAssignmentPath({ parent: "entity", useFromPropertyName: property.isRenamed });
             const assignment = `${property.name}: typeof ${entitySelectorPath} === "string" ? new Date(${entitySelectorPath}) : ${entitySelectorPath}`;
             // if it is nullable or optional, assign in an if block, otherwise we 
             // could unintentionally assign null/undefined to a property that does not exist
@@ -1770,10 +1821,10 @@ class DeserializeDeserializerHandler extends _types__WEBPACK_IMPORTED_MODULE_0__
         if (property.valueDeserializer != null) {
             let objectBuilder = builder.getOrDefault("result.variable.object");
             const assignmentBuilder = builder.getOrDefault("functions");
-            const entitySelectorPath = property.getSelectrorPath({ parent: "entity" });
+            const entitySelectorPath = property.getSelectrorPath({ parent: "unserialized" });
             if (objectBuilder == null) {
                 objectBuilder = builder.get("result")
-                    .assign("const result", { name: "variable" })
+                    .assign("const entity", { name: "variable" })
                     .object({ name: "object" });
             }
             const defaultFunctionWithParameters = this.toNamedFunction(property.valueDeserializer.toString(), assignmentBuilder);
@@ -1839,12 +1890,12 @@ class DeserializeObjectHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.Prope
             const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_2__.SlotPath("result.variable.object");
             let objectBuilder = builder.get(slotPath.get());
             if (property.parent == null) {
-                objectBuilder.nested(property.name, property.name);
+                objectBuilder.nested(property.getResolvedName(), property.name);
                 return builder;
             }
             slotPath.push(...property.getParentPathArray());
             const nestedObjectBuilder = builder.get(slotPath.get());
-            nestedObjectBuilder.nested(property.name, property.name);
+            nestedObjectBuilder.nested(property.getResolvedName(), property.name);
             return builder;
         }
         return super.handle(property, builder);
@@ -1872,10 +1923,10 @@ class DeserializeValueHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.Proper
     handle(property, builder) {
         if (property.type != _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object && property.type != _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Date) {
             let objectBuilder = builder.getOrDefault("result.variable.object");
-            const entitySelectorPath = property.getAssignmentPath({ parent: "entity" });
+            const entitySelectorPath = property.getAssignmentPath({ parent: "unserialized", useFromPropertyName: property.isRenamed });
             if (objectBuilder == null) {
                 objectBuilder = builder.get("result")
-                    .assign("const result", { name: "variable" })
+                    .assign("const entity", { name: "variable" })
                     .object({ name: "object" });
             }
             if (property.parent == null) {
@@ -2888,14 +2939,17 @@ __webpack_require__.d(__webpack_exports__, {
 
 
 /**
- * Handles converting a Date value from JavaScript to a string value
+ * Handles converting a Date value from JavaScript to a string value.  Should handle remapping here because it is the lowest level in the code here.
+ * Remapping higher up could break lower level code
  */
 class SerializeDateHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
     handle(property, builder) {
         if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Date) {
             let objectBuilder = builder.get("if");
-            const entitySelectorPath = property.getSelectrorPath({ parent: "entity" });
-            const entityAssignmentPath = property.getAssignmentPath({ parent: "result" });
+            const entitySelectorPath = property.getSelectrorPath({ parent: "entity", useFromPropertyName: property.isRenamed });
+            const entityAssignmentPath = property.getAssignmentPath({
+                parent: "result"
+            });
             const assignment = `${property.name}: ${entitySelectorPath} instanceof Date ? ${entitySelectorPath}.toISOString() : ${entitySelectorPath}`;
             // if it is nullable or optional, assign in an if block, otherwise we 
             // could unintentionally assign null/undefined to a property that does not exist
@@ -2922,6 +2976,31 @@ class SerializeDateHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyI
 }
 
 
+}),
+"./src/codegen/handlers/serialize/SerializeFunctionHandler.ts": 
+/*!********************************************************************!*\
+  !*** ./src/codegen/handlers/serialize/SerializeFunctionHandler.ts ***!
+  \********************************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  SerializeFunctionHandler: () => (SerializeFunctionHandler)
+});
+/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../types */ "./src/codegen/handlers/types.ts");
+/* ESM import */var _schema__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../schema */ "./src/schema/types.ts");
+
+
+class SerializeFunctionHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
+    handle(property, builder) {
+        if (property.functionBody != null && property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Function) {
+            // Functions should not be serialized
+            return builder;
+        }
+        return super.handle(property, builder);
+    }
+}
+
+
 }),
 "./src/codegen/handlers/serialize/SerializeObjectHandler.ts": 
 /*!******************************************************************!*\
@@ -2942,7 +3021,9 @@ class SerializeObjectHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.Propert
     handle(property, builder) {
         if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object) {
             const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_2__.SlotPath("assignments");
-            const childPath = property.getAssignmentPath({ parent: "result" });
+            const childPath = property.getAssignmentPath({
+                parent: "result"
+            });
             if (property.isNullable || property.isOptional) {
                 // Do nothing if it's nullable or optional as property assignments will check
                 // and create if it does not exist.  This way we can handle null/optional
@@ -2974,7 +3055,7 @@ class SerializeSerializerHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.Pro
         if (property.valueSerializer != null) {
             const objectBuilder = builder.getOrDefault("if");
             const assignmentBuilder = builder.getOrDefault("functions");
-            const entitySelectorPath = property.getAssignmentPath({ parent: "entity" });
+            const entitySelectorPath = property.getAssignmentPath({ parent: "entity", useFromPropertyName: property.isRenamed });
             const resultSelectorPath = property.getAssignmentPath({ parent: "result" });
             const defaultFunctionWithParameters = this.toNamedFunction(property.valueSerializer.toString(), assignmentBuilder);
             defaultFunctionWithParameters.builder.parameters(...defaultFunctionWithParameters.parameters.map((_, i) => ({ name: defaultFunctionWithParameters.parameters[i], callName: entitySelectorPath })));
@@ -3014,7 +3095,7 @@ class SerializeValueHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.Property
     handle(property, builder) {
         if (property.type != _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object && property.type != _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Date) {
             const slot = builder.getOrDefault("if");
-            const entitySelectorPath = property.getAssignmentPath({ parent: "entity" });
+            const entitySelectorPath = property.getAssignmentPath({ parent: "entity", useFromPropertyName: property.isRenamed });
             const resultSelectorPath = property.getAssignmentPath({ parent: "result" });
             if (property.parent == null) {
                 // Only assign if the incoming entity has the property, this allows partial serialization
@@ -3213,14 +3294,13 @@ class PropertyInfoHandler {
         return result;
     }
     setEnrichedProperty(property, root) {
-        const useFromPropertyName = property.from != null;
-        const entitySelectorPath = property.getAssignmentPath({ parent: "entity", useFromPropertyName });
+        const entitySelectorPath = property.getAssignmentPath({ parent: "entity" });
         if (property.parent != null) {
             const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_1__.SlotPath("factory", "function", "enriched", "object", "enriched");
             const path = property.parent.getAssignmentPath({ parent: "enriched" });
             slotPath.push(`[${path}]`);
             const objectBuilder = root.get(slotPath.get());
-            const childEntityPathSelector = property.getSelectrorPath({ parent: "entity", useFromPropertyName });
+            const childEntityPathSelector = property.getSelectrorPath({ parent: "entity" });
             objectBuilder.property(`${property.name}: ${childEntityPathSelector}`);
             return;
         }
@@ -3807,7 +3887,7 @@ class TagCollection {
         return this.data.keys();
     }
     [Symbol.dispose]() {
-        this.data = null;
+        this.data.clear();
     }
     [Symbol.iterator]() {
         return this.data[Symbol.iterator]();
@@ -3918,8 +3998,10 @@ __webpack_require__.d(__webpack_exports__, {
   combineExpressions: () => (combineExpressions),
   toExpression: () => (toExpression)
 });
+/* ESM import */var _assertions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../assertions */ "./src/assertions/index.ts");
 /* ESM import */var _types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./types */ "./src/expressions/types.ts");
 
+
 // Pre-compiled regex patterns for better performance
 const METHOD_REGEX = /([a-zA-Z0-9_.]+)\.(startsWith|endsWith|includes)\(([^)]+)\)(\s*(===|==|!==|!=)\s*(true|false))?/;
 const TRANSFORM_METHOD_REGEX = /([a-zA-Z0-9_.]+)\.(toLowerCase|toUpperCase|toLocaleLowerCase|toLocaleUpperCase)\(\)\.(startsWith|endsWith|includes)\(((?:[^()]|\([^)]*\))*)\)(\s*(===|==|!==|!=)\s*(true|false))?/;
@@ -4007,6 +4089,10 @@ const ERROR_MESSAGES = {
     PARAM_PATH_NOT_FOUND: (value, params) => `Cannot find path in params for .where(). Make sure parameters are not used inline.\r\nPath: ${value}, Params: ${JSON.stringify(params)}`
 };
 const STRINGIFIED_COMPARE_OPERATORS = ["true", "false"];
+const parseUnknown = (value) => {
+    (0,_assertions__WEBPACK_IMPORTED_MODULE_1__.assertString)(value);
+    return JSON.parse(value);
+};
 const combineExpressions = (...expressions) => {
     if (expressions.length === 0) {
         throw new Error("combineExpressions requires at least 1 expression");
@@ -4027,8 +4113,8 @@ const combineExpressions = (...expressions) => {
     return result;
 };
 const toExpression = (schema, fn, params) => {
+    const stringifiedFunction = fn.toString();
     try {
-        const stringifiedFunction = fn.toString();
         // Optimized string parsing
         const arrowIndex = stringifiedFunction.indexOf('=>');
         if (arrowIndex === -1) {
@@ -4062,8 +4148,13 @@ const toExpression = (schema, fn, params) => {
         }
         return parseExpressionToTree(schema, expression, parameterData);
     }
-    catch (e) {
-        console.warn("Error parsing expression", e);
+    catch (error) {
+        console.warn("Error parsing expression", {
+            error,
+            collectionName: schema.collectionName,
+            params,
+            selector: stringifiedFunction
+        });
         return _types__WEBPACK_IMPORTED_MODULE_0__.Expression.NOT_PARSABLE;
     }
 };
@@ -4172,8 +4263,29 @@ function assertIsValueExpression(value) {
     }
 }
 // Helper function to detect if a string is a property path
-const isPropertyPath = (value) => {
-    return value.includes('.') && value.match(/^[a-zA-Z0-9_.]+$/) !== null;
+const isPropertyPath = (value, params) => {
+    // Check for dot notation (e.g., entity.name)
+    if (value.includes('.') && value.match(/^[a-zA-Z0-9_.]+$/) !== null) {
+        return true;
+    }
+    // Check for bracket notation with literal strings (e.g., entity["name"], entity['name'], or entity[\"name\"] with escaped quotes)
+    const literalBracketPattern = /^[a-zA-Z_$][a-zA-Z0-9_$]*(\[\\?["'][^"']+\\?["']\])+$/;
+    if (literalBracketPattern.test(value)) {
+        return true;
+    }
+    // Check for bracket notation with parameter paths (e.g., entity[p.name], entity[params.property])
+    if (params && value.includes('[') && value.includes(']')) {
+        const bracketMatch = value.match(/\[([^\]]+)\]/);
+        if (bracketMatch) {
+            const bracketContent = bracketMatch[1].trim();
+            // Check if it's a parameter path - should start with params.name followed by dot, or be just params.name
+            const isParamPath = bracketContent.startsWith(params.name + '.') || bracketContent === params.name;
+            if (isParamPath || (bracketContent.includes('.') && bracketContent.match(PARAM_PATH_REGEX))) {
+                return true;
+            }
+        }
+    }
+    return false;
 };
 // Helper function to determine if we need to swap the operator for reversed comparisons
 const getSwappedOperator = (operator) => {
@@ -4208,10 +4320,10 @@ const parseCondition = (schema, expression, params) => {
             // This is a parameter path on the left side (e.g., params.distinctPlayers.includes(entity.playerId))
             // For includes method, we need to swap left and right sides
             if (methodMatch[2] === 'includes') {
-                const property = getProperty(schema, rightSide);
+                const property = getProperty(schema, rightSide, params);
                 const value = getValue(leftSide, params); // retrieve the original value
                 const serializer = property.property.valueSerializer;
-                comparator.left = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+                comparator.left = serializer ? getValue(String(property.property.valueSerializer(parseUnknown(value.value)))) : value;
                 comparator.right = property;
             }
             else {
@@ -4221,11 +4333,11 @@ const parseCondition = (schema, expression, params) => {
         }
         else {
             // Normal case: property on left, value on right
-            const property = getProperty(schema, leftSide);
+            const property = getProperty(schema, leftSide, params);
             const serializer = property.property.valueSerializer;
             const value = getValue(rightSide, params); // retrieve the original value
             comparator.left = property;
-            comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+            comparator.right = serializer ? getValue(String(property.property.valueSerializer(parseUnknown(value.value)))) : value;
         }
         // If the comparison is explicitly to false, mark it as negated
         if (methodMatch[6] === "false") {
@@ -4240,13 +4352,13 @@ const parseCondition = (schema, expression, params) => {
         if (isNegation) {
             comparator.negated = isNegation;
         }
-        const property = getProperty(schema, valueTransformMatch[1].trim());
+        const property = getProperty(schema, valueTransformMatch[1].trim(), params);
         const serializer = property.property.valueSerializer;
         const value = getValue(valueTransformMatch[3], params); // retrieve the original value
         // Create the property expression for the left side (no transformer)
         const propertyExpression = property;
         // Create a ValueExpression for the right side with transformer
-        const valueExpression = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+        const valueExpression = serializer ? getValue(String(property.property.valueSerializer(parseUnknown(value.value)))) : value;
         // Set transformer and locale based on the method
         const method = valueTransformMatch[4];
         if (method === 'toLowerCase' || method === 'toLocaleLowerCase') {
@@ -4272,7 +4384,7 @@ const parseCondition = (schema, expression, params) => {
             comparator.negated = isNegation;
         }
         // Create the property expression for the left side with transformer
-        const property = getProperty(schema, transformMethodMatch[1]);
+        const property = getProperty(schema, transformMethodMatch[1], params);
         // Set transformer and locale based on the method
         const method = transformMethodMatch[2];
         if (method === 'toLowerCase' || method === 'toLocaleLowerCase') {
@@ -4313,7 +4425,7 @@ const parseCondition = (schema, expression, params) => {
         }
         const serializer = property.property.valueSerializer;
         comparator.left = property;
-        comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+        comparator.right = serializer ? getValue(String(property.property.valueSerializer(parseUnknown(value.value)))) : value;
         // If the comparison is explicitly to false, mark it as negated
         if (transformMethodMatch[7] === "false") {
             comparator.negated = true;
@@ -4324,8 +4436,8 @@ const parseCondition = (schema, expression, params) => {
         const left = equalityMatch[1].trim();
         const operator = equalityMatch[2];
         const right = equalityMatch[3].trim();
-        const leftIsProperty = isPropertyPath(left);
-        const rightIsProperty = isPropertyPath(right);
+        const leftIsProperty = isPropertyPath(left, params);
+        const rightIsProperty = isPropertyPath(right, params);
         // Determine which side is the property and which is the value
         let propertySide, valueSide, finalOperator;
         if (leftIsProperty && !rightIsProperty) {
@@ -4350,11 +4462,11 @@ const parseCondition = (schema, expression, params) => {
         if (isNegation) {
             comparator.negated = isNegation;
         }
-        const property = getProperty(schema, propertySide);
+        const property = getProperty(schema, propertySide, params);
         const value = getValue(valueSide, params);
         const serializer = property.property.valueSerializer;
         comparator.left = property;
-        comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+        comparator.right = serializer ? getValue(String(property.property.valueSerializer(parseUnknown(value.value)))) : value;
         convertAndAssignValue(comparator.right, comparator.left);
         return comparator;
     }
@@ -4362,8 +4474,8 @@ const parseCondition = (schema, expression, params) => {
         const left = comparisonMatch[1].trim();
         const operator = comparisonMatch[2];
         const right = comparisonMatch[3].trim();
-        const leftIsProperty = isPropertyPath(left);
-        const rightIsProperty = isPropertyPath(right);
+        const leftIsProperty = isPropertyPath(left, params);
+        const rightIsProperty = isPropertyPath(right, params);
         // Determine which side is the property and which is the value
         let propertySide, valueSide, finalOperator;
         if (leftIsProperty && !rightIsProperty) {
@@ -4388,28 +4500,28 @@ const parseCondition = (schema, expression, params) => {
         if (isNegation) {
             comparator.negated = isNegation;
         }
-        const property = getProperty(schema, propertySide);
+        const property = getProperty(schema, propertySide, params);
         const value = getValue(valueSide, params);
         const serializer = property.property.valueSerializer;
         comparator.left = property;
-        comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+        comparator.right = serializer ? getValue(String(property.property.valueSerializer(parseUnknown(value.value)))) : value;
         convertAndAssignValue(comparator.right, comparator.left);
         return comparator;
     }
     // Check for standalone property reference (truthy comparison)
     // Pattern: property name only (e.g., "w.inStock" -> w.inStock === true)
     const standalonePropertyMatch = finalExpression.match(/^[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*)*$/);
-    if (standalonePropertyMatch && isPropertyPath(finalExpression)) {
+    if (standalonePropertyMatch && isPropertyPath(finalExpression, params)) {
         const comparator = getComparator('===');
         if (isNegation) {
             comparator.negated = isNegation;
         }
-        const property = getProperty(schema, finalExpression);
+        const property = getProperty(schema, finalExpression, params);
         const value = getValue('true', params);
         const serializer = property.property.valueSerializer;
         comparator.left = property;
         // need to parse the value so it matches what the serializer expects
-        comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+        comparator.right = serializer ? getValue(String(property.property.valueSerializer(parseUnknown(value.value)))) : value;
         return comparator;
     }
     // If we get here, the expression is too complex for the current parser
@@ -4503,13 +4615,81 @@ const getValueFromParams = (value, params) => {
     }
     return result;
 };
-const getProperty = (schema, value) => {
-    // Optimized string splitting - only split if we have the expected pattern
-    if (!value.includes('.')) {
+const getProperty = (schema, value, params) => {
+    let pathString;
+    // Handle bracket notation (e.g., entity["name"], entity['name'], entity[p.name], or entity[\"name\"] with escaped quotes)
+    if (value.includes('[') && value.includes(']')) {
+        // First try to match literal string brackets: ["name"], ['name'], [\"name\"], [\'name\']
+        const literalBracketMatches = value.matchAll(/\[\\?["']([^"']+)\\?["']\]/g);
+        const pathParts = [];
+        let foundLiteral = false;
+        for (const match of literalBracketMatches) {
+            // match[1] is the property name inside the brackets
+            const propName = match[1];
+            if (propName) {
+                pathParts.push(propName);
+                foundLiteral = true;
+            }
+        }
+        // If no literal matches found, try parameter path in brackets (e.g., [p.name])
+        if (!foundLiteral && params) {
+            // Match brackets containing parameter paths: [p.name], [params.property], etc.
+            const bracketParamMatch = value.match(/\[([^\]]+)\]/);
+            if (bracketParamMatch) {
+                const bracketContent = bracketParamMatch[1].trim();
+                // Check if this is a parameter path
+                // It should start with params.name (e.g., "p") followed by a dot, or be just params.name
+                const isParamPath = bracketContent.startsWith(params.name + '.') || bracketContent === params.name;
+                if (isParamPath || (bracketContent.includes('.') && bracketContent.match(PARAM_PATH_REGEX))) {
+                    try {
+                        // Try to resolve as a parameter path
+                        let paramPath;
+                        if (bracketContent.startsWith(params.name + '.') || bracketContent === params.name) {
+                            // Already has params.name prefix
+                            paramPath = bracketContent;
+                        }
+                        else {
+                            // Add params.name prefix
+                            const paramMatch = bracketContent.match(PARAM_PATH_REGEX);
+                            paramPath = paramMatch
+                                ? `${params.name}.${paramMatch[1]}`
+                                : `${params.name}.${bracketContent}`;
+                        }
+                        const resolvedValue = getValueFromParams(paramPath, params);
+                        // The resolved value should be the property name
+                        if (typeof resolvedValue === 'string') {
+                            pathParts.push(resolvedValue);
+                        }
+                        else {
+                            throw new Error(ERROR_MESSAGES.PROPERTY_NOT_FOUND(value));
+                        }
+                    }
+                    catch (e) {
+                        // Not a valid parameter path, continue to error
+                        throw new Error(ERROR_MESSAGES.PROPERTY_NOT_FOUND(value));
+                    }
+                }
+                else {
+                    throw new Error(ERROR_MESSAGES.PROPERTY_NOT_FOUND(value));
+                }
+            }
+            else {
+                throw new Error(ERROR_MESSAGES.PROPERTY_NOT_FOUND(value));
+            }
+        }
+        if (pathParts.length === 0) {
+            throw new Error(ERROR_MESSAGES.PROPERTY_NOT_FOUND(value));
+        }
+        pathString = pathParts.join(".");
+    }
+    else if (value.includes('.')) {
+        // Handle dot notation (e.g., entity.name)
+        const pathSplit = value.split(/[?!.]/g).slice(1);
+        pathString = pathSplit.join(".");
+    }
+    else {
         throw new Error(ERROR_MESSAGES.PROPERTY_NOT_FOUND(value));
     }
-    const pathSplit = value.split(/[?!.]/g).slice(1);
-    const pathString = pathSplit.join(".");
     // Early exit if no path found
     if (!pathString) {
         throw new Error(ERROR_MESSAGES.PROPERTY_NOT_FOUND(value));
@@ -4874,8 +5054,8 @@ class TrampolinePipeline {
                             this._hasErrored = true;
                         }
                         currentStep = null; // Stop the loop
-                        // Call done with the error to properly notify the caller
-                        queueMicrotask(() => done(currentData, trampolineError));
+                        // We don't call `done` here because an error occurred.
+                        // The application should handle the uncaught exception if desired.
                         break; // Explicitly break loop on error
                     }
                 }
@@ -5002,8 +5182,8 @@ class AsyncPipeline {
                             this._hasErrored = true;
                         }
                         currentStep = null; // Stop the loop
-                        // Call done with the error to properly notify the caller
-                        queueMicrotask(() => done(_results__WEBPACK_IMPORTED_MODULE_0__.Result.error(trampolineError)));
+                        // We don't call `done` here because an error occurred.
+                        // The application should handle the uncaught exception if desired.
                         break; // Explicitly break loop on error
                     }
                 }
@@ -5037,88 +5217,112 @@ class AsyncPipeline {
  */
 class WorkPipeline {
     unitsOfWork = [];
+    _hasErrored = false; // Flag to prevent calling done on error
     filter(done) {
-        const units = this.unitsOfWork;
-        const unitsLength = units.length;
-        // Fast path for empty pipeline
-        if (unitsLength === 0) {
+        this._hasErrored = false; // Reset error flag on new execution
+        if (this.unitsOfWork.length === 0) {
             queueMicrotask(() => done(_results__WEBPACK_IMPORTED_MODULE_0__.Result.success()));
             return;
         }
-        // Fast path for single work unit
-        if (unitsLength === 1) {
-            try {
-                units[0]((result) => {
-                    queueMicrotask(() => done(result));
-                });
-            }
-            catch (error) {
-                done(_results__WEBPACK_IMPORTED_MODULE_0__.Result.error(error));
-            }
-            return;
-        }
-        let isRunning = false;
-        let hasErrored = false;
+        let index = 0;
+        let isRunning = false; // Guard against overlapping trampoline calls
         try {
-            const createStep = (idx) => {
+            // --- Revised Completion Logic --- (Moved up for clarity)
+            const finalStepSentinel = () => {
+                // Only call done if no error has occurred
+                if (!this._hasErrored) {
+                    queueMicrotask(() => done(_results__WEBPACK_IMPORTED_MODULE_0__.Result.success()));
+                }
+                return null; // Stop the trampoline
+            };
+            const createStepRevised = (idx) => {
                 return () => {
-                    if (hasErrored)
-                        return null;
-                    if (idx >= unitsLength) {
-                        if (!hasErrored) {
-                            queueMicrotask(() => done(_results__WEBPACK_IMPORTED_MODULE_0__.Result.success()));
-                        }
-                        return null;
+                    if (this._hasErrored)
+                        return null; // Stop if an error occurred elsewhere
+                    if (idx >= this.unitsOfWork.length) {
+                        return finalStepSentinel(); // Execute the dedicated final step
                     }
-                    const processor = units[idx];
-                    let syncResult = null;
+                    const processor = this.unitsOfWork[idx];
+                    // Initialize syncCallbackResult to null to satisfy StepResult type
+                    let syncCallbackResult = null;
                     let calledSync = false;
                     try {
                         processor((result) => {
+                            // --- Error Handling ---
                             if (result.ok === _results__WEBPACK_IMPORTED_MODULE_0__.Result.ERROR) {
-                                hasErrored = true;
+                                console.error(`Error reported by AsyncPipeline at index ${idx}:`, result.error);
+                                this._hasErrored = true; // Set flag
+                                // Throw the error to be caught by outer try...catch blocks
                                 throw result.error;
                             }
-                            const nextStep = createStep(idx + 1);
+                            // --- /Error Handling ---
+                            // If no error, proceed as before
+                            index = idx + 1; // Update index for the next step
+                            const nextStep = createStepRevised(index); // Use updated index
                             if (isRunning) {
-                                syncResult = nextStep;
+                                // Callback was synchronous
+                                syncCallbackResult = nextStep; // Store next step function
                                 calledSync = true;
                             }
                             else {
+                                // Callback was asynchronous, restart trampoline
                                 trampoline(nextStep);
                             }
                         });
                     }
                     catch (error) {
-                        hasErrored = true;
+                        if (!this._hasErrored) { // Check flag to avoid double logging if error was from callback
+                            console.error(`Error thrown by processor at index ${idx} or its callback:`, error);
+                            this._hasErrored = true;
+                        }
+                        // Rethrow to be caught by the trampoline's catch block
                         throw error;
                     }
-                    return calledSync ? syncResult : null;
+                    if (calledSync) {
+                        // Return the next step function for the sync loop
+                        return syncCallbackResult;
+                    }
+                    else {
+                        // Pause trampoline for async, loop will stop as step returns null
+                        return null;
+                    }
                 };
             };
+            // The trampoline loop
             const trampoline = (step) => {
-                if (isRunning)
+                if (isRunning) {
                     return;
+                }
                 isRunning = true;
                 let currentStep = step;
-                while (currentStep) {
+                while (typeof currentStep === 'function') {
                     try {
-                        if (hasErrored) {
+                        // Stop immediately if an error was flagged elsewhere
+                        if (this._hasErrored) {
                             currentStep = null;
                             break;
                         }
-                        currentStep = currentStep();
+                        currentStep = currentStep(); // Execute step, get next step or null
                     }
-                    catch (error) {
-                        hasErrored = true;
-                        currentStep = null;
-                        queueMicrotask(() => done(_results__WEBPACK_IMPORTED_MODULE_0__.Result.error(error)));
-                        break;
+                    catch (trampolineError) {
+                        // Catch errors propagated from step execution (processor or callback errors)
+                        if (!this._hasErrored) { // Avoid double logging
+                            console.error("Error during trampoline step execution:", trampolineError);
+                            this._hasErrored = true;
+                        }
+                        currentStep = null; // Stop the loop
+                        // We don't call `done` here because an error occurred.
+                        // The application should handle the uncaught exception if desired.
+                        break; // Explicitly break loop on error
                     }
                 }
+                // Loop ends when currentStep is null or loop is broken by error
                 isRunning = false;
+                // Completion check is now handled by finalStepSentinel ensuring `done` isn't called on error.
             };
-            trampoline(createStep(0));
+            // --- Start the process ---
+            index = 0; // Reset index
+            trampoline(createStepRevised(0)); // Start with the revised step creator
         }
         catch (error) {
             done(_results__WEBPACK_IMPORTED_MODULE_0__.Result.error(error));
@@ -5229,6 +5433,7 @@ class EphemeralDataPlugin {
                     }
                 });
             }
+            // If there is no work, just return the result
             if (!hasWork) {
                 done(_results__WEBPACK_IMPORTED_MODULE_2__.PluginEventResult.success(event.id, bulkPersistResult));
                 return;
@@ -5288,7 +5493,10 @@ __webpack_require__.d(__webpack_exports__, {
   QueryOptionsCollection: () => (/* reexport safe */ _query__WEBPACK_IMPORTED_MODULE_2__.QueryOptionsCollection),
   QueryOrdering: () => (/* reexport safe */ _query__WEBPACK_IMPORTED_MODULE_2__.QueryOrdering),
   ReplicationDbPlugin: () => (/* reexport safe */ _replication__WEBPACK_IMPORTED_MODULE_1__.ReplicationDbPlugin),
-  SqlTranslator: () => (/* reexport safe */ _translators__WEBPACK_IMPORTED_MODULE_0__.SqlTranslator)
+  SqlTranslator: () => (/* reexport safe */ _translators__WEBPACK_IMPORTED_MODULE_0__.SqlTranslator),
+  TranslatedArrayValue: () => (/* reexport safe */ _translators__WEBPACK_IMPORTED_MODULE_0__.TranslatedArrayValue),
+  TranslatedGroupValue: () => (/* reexport safe */ _translators__WEBPACK_IMPORTED_MODULE_0__.TranslatedGroupValue),
+  TranslatedSingleValue: () => (/* reexport safe */ _translators__WEBPACK_IMPORTED_MODULE_0__.TranslatedSingleValue)
 });
 /* ESM import */var _translators__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./translators */ "./src/plugins/translators/index.ts");
 /* ESM import */var _replication__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./replication */ "./src/plugins/replication/index.ts");
@@ -5555,9 +5763,6 @@ const getMemoryPluginCollectionSize = (plugin, schema) => {
     }
     throw new Error("Cannot get size of collection for MemoryPlugin, not an instance of MemoryPlugin");
 };
-const HYDRATION_STATUS_PENDING = "hydration-pending";
-const HYDRATION_STATUS_ERROR = "hydration-error";
-const HYDRATION_STATUS_SUCCESS = "hydration-success";
 let hydrationStatus = "hydration-not-started";
 class OptimisticReplicationDbPlugin {
     plugins;
@@ -5877,6 +6082,12 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   DataTranslator: () => (DataTranslator)
 });
+/* ESM import */var _TranslatedArrayValue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./TranslatedArrayValue */ "./src/plugins/translators/TranslatedArrayValue.ts");
+/* ESM import */var _TranslatedGroupValue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./TranslatedGroupValue */ "./src/plugins/translators/TranslatedGroupValue.ts");
+/* ESM import */var _TranslatedSingleValue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./TranslatedSingleValue */ "./src/plugins/translators/TranslatedSingleValue.ts");
+
+
+
 class DataTranslator {
     query;
     functionMap = {
@@ -5889,7 +6100,8 @@ class DataTranslator {
         skip: (data, option) => this.skip(data, option),
         sort: (data, option) => this.sort(data, option),
         sum: (data, option) => this.sum(data, option),
-        take: (data, option) => this.take(data, option)
+        take: (data, option) => this.take(data, option),
+        group: (data, option) => this.group(data, option)
     };
     constructor(query) {
         this.query = query;
@@ -5898,7 +6110,13 @@ class DataTranslator {
         this.query.options.forEach(item => {
             data = this.functionMap[item.name](data, item);
         });
-        return data;
+        if (Array.isArray(data)) {
+            return new _TranslatedArrayValue__WEBPACK_IMPORTED_MODULE_0__.TranslatedArrayValue(data);
+        }
+        if (this.query.options.has("group")) {
+            return new _TranslatedGroupValue__WEBPACK_IMPORTED_MODULE_1__.TranslatedGroupValue(data);
+        }
+        return new _TranslatedSingleValue__WEBPACK_IMPORTED_MODULE_2__.TranslatedSingleValue(data);
     }
 }
 
@@ -5937,24 +6155,54 @@ class JsonTranslator extends _DataTranslator__WEBPACK_IMPORTED_MODULE_0__.DataTr
         if (Array.isArray(data) == false) {
             throw new Error("Can only map an array of data");
         }
-        const response = [];
-        // We want deserialization to flow through mappings
-        // TODO: Speed this up!
-        // Generate a function on the fly?
+        const response = new Array(data.length);
         for (let i = 0, length = data.length; i < length; i++) {
             for (let j = 0, l = option.value.fields.length; j < l; j++) {
                 const field = option.value.fields[j];
                 if (field.property != null) {
                     const value = field.property.getValue(data[i]);
                     if (value != null) {
-                        field.property.setValue(data[i], field.property.deserialize(value));
+                        // Some types do not support deserialization (Array, Function, Computed, etc), just directly set the incoming value
+                        const resolvedValue = field.property.supportsDeserialization ? field.property.deserialize(value) : value;
+                        field.property.setValue(data[i], resolvedValue);
                     }
                 }
             }
-            response.push(option.value.selector(data[i]));
+            response[i] = option.value.selector(data[i]);
         }
         return response;
     }
+    group(data, option) {
+        if (Array.isArray(data) == false) {
+            throw new Error("Can only group an array of data");
+        }
+        const group = {};
+        for (let i = 0, length = data.length; i < length; i++) {
+            const keyValue = option.value.selector(data[i]);
+            if (!group[keyValue]) {
+                group[keyValue] = [];
+            }
+            const item = {};
+            for (let j = 0, l = option.value.fields.length; j < l; j++) {
+                const field = option.value.fields[j];
+                if (field.property != null) {
+                    const value = field.property.getValue(data[i]);
+                    if (value != null) {
+                        // Some types do not support deserialization (Array, Function, Computed, etc), just directly set the incoming value
+                        const resolvedValue = field.property.supportsDeserialization ? field.property.deserialize(value) : value;
+                        field.property.setValue(item, resolvedValue);
+                        continue;
+                    }
+                    // The property exists, lets set it to the value (null/undefined)
+                    if (Object.hasOwn(data[i], field.destinationName)) {
+                        field.property.setValue(item, value);
+                    }
+                }
+            }
+            group[keyValue].push(item);
+        }
+        return group;
+    }
     count(data, _) {
         if (Array.isArray(data)) {
             return data.length;
@@ -6115,6 +6363,30 @@ class SqlTranslator extends _DataTranslator__WEBPACK_IMPORTED_MODULE_0__.DataTra
     sort(data, _) {
         return data;
     }
+    group(data, option) {
+        if (Array.isArray(data) == false) {
+            throw new Error("Can only group an array of data");
+        }
+        const group = {};
+        for (let i = 0, length = data.length; i < length; i++) {
+            const keyValue = option.value.selector(data[i]);
+            if (!group[keyValue]) {
+                group[keyValue] = [];
+            }
+            const item = {};
+            for (let j = 0, l = option.value.fields.length; j < l; j++) {
+                const field = option.value.fields[j];
+                if (field.property != null) {
+                    const value = field.property.getValue(data[i]);
+                    if (value != null) {
+                        field.property.setValue(item, field.property.deserialize(value));
+                    }
+                }
+            }
+            group[keyValue].push(item);
+        }
+        return group;
+    }
     map(data, option) {
         if (Array.isArray(data) == false) {
             throw new Error("Can only map an array of data");
@@ -6142,6 +6414,91 @@ class SqlTranslator extends _DataTranslator__WEBPACK_IMPORTED_MODULE_0__.DataTra
 }
 
 
+}),
+"./src/plugins/translators/TranslatedArrayValue.ts": 
+/*!*********************************************************!*\
+  !*** ./src/plugins/translators/TranslatedArrayValue.ts ***!
+  \*********************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  TranslatedArrayValue: () => (TranslatedArrayValue)
+});
+class TranslatedArrayValue {
+    value;
+    constructor(value) {
+        this.value = value;
+    }
+    forEach(callback) {
+        const data = this.value;
+        for (let i = 0, length = data.length; i < length; i++) {
+            const result = callback(data[i]);
+            if (result) {
+                // reassign if the callback returns a result
+                data[i] = result;
+            }
+        }
+    }
+}
+
+
+}),
+"./src/plugins/translators/TranslatedGroupValue.ts": 
+/*!*********************************************************!*\
+  !*** ./src/plugins/translators/TranslatedGroupValue.ts ***!
+  \*********************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  TranslatedGroupValue: () => (TranslatedGroupValue)
+});
+class TranslatedGroupValue {
+    value;
+    constructor(value) {
+        this.value = value;
+    }
+    forEach(callback) {
+        const group = this.value;
+        const keys = Object.keys(group);
+        for (let i = 0, length = keys.length; i < length; i++) {
+            const key = keys[i];
+            const data = group[key];
+            for (let j = 0, len = data.length; j < len; j++) {
+                const result = callback(data[j]);
+                if (result) {
+                    // reassign if the callback returns a result
+                    data[j] = result;
+                }
+            }
+        }
+    }
+}
+
+
+}),
+"./src/plugins/translators/TranslatedSingleValue.ts": 
+/*!**********************************************************!*\
+  !*** ./src/plugins/translators/TranslatedSingleValue.ts ***!
+  \**********************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  TranslatedSingleValue: () => (TranslatedSingleValue)
+});
+class TranslatedSingleValue {
+    value;
+    constructor(value) {
+        this.value = value;
+    }
+    forEach(callback) {
+        const result = callback(this.value);
+        if (result) {
+            this.value = result;
+        }
+    }
+}
+
+
 }),
 "./src/plugins/translators/index.ts": 
 /*!******************************************!*\
@@ -6152,11 +6509,21 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   DataTranslator: () => (/* reexport safe */ _DataTranslator__WEBPACK_IMPORTED_MODULE_0__.DataTranslator),
   JsonTranslator: () => (/* reexport safe */ _JsonTranslator__WEBPACK_IMPORTED_MODULE_1__.JsonTranslator),
-  SqlTranslator: () => (/* reexport safe */ _SqlTranslator__WEBPACK_IMPORTED_MODULE_2__.SqlTranslator)
+  SqlTranslator: () => (/* reexport safe */ _SqlTranslator__WEBPACK_IMPORTED_MODULE_2__.SqlTranslator),
+  TranslatedArrayValue: () => (/* reexport safe */ _TranslatedArrayValue__WEBPACK_IMPORTED_MODULE_3__.TranslatedArrayValue),
+  TranslatedGroupValue: () => (/* reexport safe */ _TranslatedGroupValue__WEBPACK_IMPORTED_MODULE_4__.TranslatedGroupValue),
+  TranslatedSingleValue: () => (/* reexport safe */ _TranslatedSingleValue__WEBPACK_IMPORTED_MODULE_5__.TranslatedSingleValue)
 });
 /* ESM import */var _DataTranslator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./DataTranslator */ "./src/plugins/translators/DataTranslator.ts");
 /* ESM import */var _JsonTranslator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./JsonTranslator */ "./src/plugins/translators/JsonTranslator.ts");
 /* ESM import */var _SqlTranslator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./SqlTranslator */ "./src/plugins/translators/SqlTranslator.ts");
+/* ESM import */var _TranslatedArrayValue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./TranslatedArrayValue */ "./src/plugins/translators/TranslatedArrayValue.ts");
+/* ESM import */var _TranslatedGroupValue__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./TranslatedGroupValue */ "./src/plugins/translators/TranslatedGroupValue.ts");
+/* ESM import */var _TranslatedSingleValue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./TranslatedSingleValue */ "./src/plugins/translators/TranslatedSingleValue.ts");
+
+
+
+
 
 
 
@@ -6303,10 +6670,16 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   PropertyInfo: () => (PropertyInfo)
 });
-/* ESM import */var _property_types_SchemaArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./property/types/SchemaArray */ "./src/schema/property/types/SchemaArray.ts");
-/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./types */ "./src/schema/types.ts");
+/* ESM import */var _property_types_SchemaArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./property/types/SchemaArray */ "./src/schema/property/types/SchemaArray.ts");
+/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./types */ "./src/schema/types.ts");
 
 
+const SUPPORTED_DESERIALIZATION_TYPES = new Set([
+    _types__WEBPACK_IMPORTED_MODULE_0__.SchemaTypes.Boolean,
+    _types__WEBPACK_IMPORTED_MODULE_0__.SchemaTypes.Date,
+    _types__WEBPACK_IMPORTED_MODULE_0__.SchemaTypes.Number,
+    _types__WEBPACK_IMPORTED_MODULE_0__.SchemaTypes.String,
+]);
 /**
  * Represents metadata and utilities for a property in a schema, including its type, name, parent, children, and serialization details.
  */
@@ -6372,7 +6745,7 @@ class PropertyInfo {
         this.name = name;
         this.type = schema.type;
         this.literals = schema.literals;
-        if (schema instanceof _property_types_SchemaArray__WEBPACK_IMPORTED_MODULE_0__.SchemaArray) {
+        if (schema instanceof _property_types_SchemaArray__WEBPACK_IMPORTED_MODULE_1__.SchemaArray) {
             this.innerSchema = schema.innerSchema;
         }
         this.isNullable = schema.isNullable;
@@ -6416,6 +6789,12 @@ class PropertyInfo {
         this._levelCache = level;
         return level;
     }
+    get isRenamed() {
+        return !!this.from;
+    }
+    get supportsDeserialization() {
+        return this.valueDeserializer != null || SUPPORTED_DESERIALIZATION_TYPES.has(this.type);
+    }
     _getPropertyChain() {
         if (this._propertyChainCache) {
             return this._propertyChainCache;
@@ -6445,6 +6824,9 @@ class PropertyInfo {
         }
         return path;
     }
+    getResolvedName() {
+        return this.from ?? this.name;
+    }
     /**
      * Returns an array of property names representing the path from the root to this property.
      *
@@ -6529,12 +6911,17 @@ class PropertyInfo {
             return null;
         }
         const pathArray = this.getPathArray();
+        const length = pathArray.length;
+        // Fast path for single level properties
+        if (length === 1) {
+            return instance[pathArray[0]];
+        }
         let current = instance;
-        for (const prop of pathArray) {
+        for (let i = 0; i < length; i++) {
             if (current == null) {
                 return null;
             }
-            current = current[prop];
+            current = current[pathArray[i]];
         }
         return current;
     }
@@ -6581,8 +6968,8 @@ class PropertyInfo {
     getSelectrorPath(options) {
         const parts = this._resolvePathArray({
             root: options.parent,
-            assignmentType: options.assignmentType,
-            useFromPropertyName: options.useFromPropertyName
+            assignmentType: options?.assignmentType,
+            useFromPropertyName: options?.useFromPropertyName
         });
         return parts.join("");
     }
@@ -6607,16 +6994,16 @@ class PropertyInfo {
         if (this.valueDeserializer != null) {
             return this.valueDeserializer(value);
         }
-        if (this.type === _types__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Date) {
+        if (this.type === _types__WEBPACK_IMPORTED_MODULE_0__.SchemaTypes.Date) {
             return new Date(value);
         }
-        if (this.type === _types__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.String) {
+        if (this.type === _types__WEBPACK_IMPORTED_MODULE_0__.SchemaTypes.String) {
             return String(value);
         }
-        if (this.type === _types__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Number) {
+        if (this.type === _types__WEBPACK_IMPORTED_MODULE_0__.SchemaTypes.Number) {
             return Number(value);
         }
-        if (this.type === _types__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Boolean) {
+        if (this.type === _types__WEBPACK_IMPORTED_MODULE_0__.SchemaTypes.Boolean) {
             return Boolean(value);
         }
         throw new Error(`Unsupported deserialization for type.  Type: ${this.type}`);
@@ -6638,7 +7025,7 @@ __webpack_require__.d(__webpack_exports__, {
 /* ESM import */var _table_SchemaComputed__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./table/SchemaComputed */ "./src/schema/table/SchemaComputed.ts");
 /* ESM import */var _property_base_SchemaBase__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./property/base/SchemaBase */ "./src/schema/property/base/SchemaBase.ts");
 /* ESM import */var _PropertyInfo__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./PropertyInfo */ "./src/schema/PropertyInfo.ts");
-/* ESM import */var _codegen__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../codegen */ "./src/codegen/blocks.ts");
+/* ESM import */var _codegen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../codegen */ "./src/codegen/blocks.ts");
 /* ESM import */var _codegen_handlers_EnrichmentHandlerBuilder__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../codegen/handlers/EnrichmentHandlerBuilder */ "./src/codegen/handlers/EnrichmentHandlerBuilder.ts");
 /* ESM import */var _codegen_handlers_MergeHandlerBuilder__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../codegen/handlers/MergeHandlerBuilder */ "./src/codegen/handlers/MergeHandlerBuilder.ts");
 /* ESM import */var _codegen_handlers_PrepareHandlerBuilder__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../codegen/handlers/PrepareHandlerBuilder */ "./src/codegen/handlers/PrepareHandlerBuilder.ts");
@@ -6651,11 +7038,13 @@ __webpack_require__.d(__webpack_exports__, {
 /* ESM import */var _codegen_handlers_HashHandlerBuilder__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../codegen/handlers/HashHandlerBuilder */ "./src/codegen/handlers/HashHandlerBuilder.ts");
 /* ESM import */var _codegen_handlers_EnableChangeTrackingHandlerBuilder__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../codegen/handlers/EnableChangeTrackingHandlerBuilder */ "./src/codegen/handlers/EnableChangeTrackingHandlerBuilder.ts");
 /* ESM import */var _codegen_handlers_FreezeHandlerBuilder__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../codegen/handlers/FreezeHandlerBuilder */ "./src/codegen/handlers/FreezeHandlerBuilder.ts");
-/* ESM import */var _errors_SchemaError__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../errors/SchemaError */ "./src/errors/SchemaError.ts");
+/* ESM import */var _errors_SchemaError__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../errors/SchemaError */ "./src/errors/SchemaError.ts");
 /* ESM import */var _codegen_handlers_SerializeHandlerBuilder__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../codegen/handlers/SerializeHandlerBuilder */ "./src/codegen/handlers/SerializeHandlerBuilder.ts");
-/* ESM import */var _utilities__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../utilities */ "./src/utilities/strings.ts");
+/* ESM import */var _utilities__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../utilities */ "./src/utilities/strings.ts");
 /* ESM import */var _types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./types */ "./src/schema/types.ts");
-/* ESM import */var _communication_broadcast__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./communication/broadcast */ "./src/schema/communication/broadcast.ts");
+/* ESM import */var _communication_broadcast__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./communication/broadcast */ "./src/schema/communication/broadcast.ts");
+/* ESM import */var _codegen_handlers_CompareIdsHandlerBuilder__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../codegen/handlers/CompareIdsHandlerBuilder */ "./src/codegen/handlers/CompareIdsHandlerBuilder.ts");
+
 
 
 
@@ -6840,6 +7229,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             const enableChangeTrackingHandlerBuilder = new _codegen_handlers_EnableChangeTrackingHandlerBuilder__WEBPACK_IMPORTED_MODULE_15__.EnableChangeTrackingHandlerBuilder();
             const freezeHandlerBuilder = new _codegen_handlers_FreezeHandlerBuilder__WEBPACK_IMPORTED_MODULE_16__.FreezeHandlerBuilder();
             const serializeHandlerBuilder = new _codegen_handlers_SerializeHandlerBuilder__WEBPACK_IMPORTED_MODULE_17__.SerializeHandlerBuilder();
+            const compareIdsHandlerBuilder = new _codegen_handlers_CompareIdsHandlerBuilder__WEBPACK_IMPORTED_MODULE_18__.CompareIdsHandlerBuilder();
             const enricher = enrichmentHandlerBuilder.build();
             const merge = mergeHandlerFactory.build();
             const prepare = prepareHandlerBuilder.build();
@@ -6853,26 +7243,36 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             const enableChangeTrackingHandler = enableChangeTrackingHandlerBuilder.build();
             const freezeHandler = freezeHandlerBuilder.build();
             const serializeHandler = serializeHandlerBuilder.build();
-            const changeTrackingCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const compareIdsHandler = compareIdsHandlerBuilder.build();
+            const changeTrackingCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             changeTrackingCodeBuilder.raw(`function ${this.createChangeTracker.toString()}`);
             changeTrackingCodeBuilder.slot("declarations").variable("enableChangeTracking").value('createChangeTracker()');
             changeTrackingCodeBuilder.slot("assignment");
             changeTrackingCodeBuilder.slot("return").raw('\treturn enableChangeTracking(entity);');
-            const freezeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const freezeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             freezeCodeBuilder.slot("assignment");
             freezeCodeBuilder.slot("return").raw('\treturn Object.freeze(entity);');
-            const enricherCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const enricherCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             const enricherFunctionRoot = enricherCodeBuilder.factory("factory", { name: "factory" }).parameters({ name: "collectionName", value: this.collectionName });
             const enricherFunctionBody = enricherFunctionRoot.function(undefined, { name: "function" }).parameters("entity", "changeTrackingType").return();
-            enricherFunctionBody.raw(`function ${this.createChangeTracker.toString()}`);
-            enricherFunctionBody.variable("enableChangeTracking").value('changeTrackingType === "proxy" ? createChangeTracker() : e => e');
+            enricherFunctionBody.slot("changeTracker").raw(`\tfunction ${this.createChangeTracker.toString()}`);
+            enricherFunctionBody.slot("enableChangeTracking")
+                .variable("enableChangeTracking")
+                .value('changeTrackingType === "proxy" ? createChangeTracker() : e => e');
+            enricherFunctionBody.slot("append");
             enricherFunctionBody.slot("enriched");
             enricherFunctionBody.slot("declarations");
             enricherFunctionBody.slot("assignment");
             enricherFunctionBody.slot("ifs");
             enricherFunctionBody.slot("tracking").if('changeTrackingType === "immutable"', { name: "freeze" });
-            enricherFunctionBody.raw('\treturn enableChangeTracking(enriched);');
-            const mergeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            enricherFunctionBody.slot("return").raw('\treturn enableChangeTracking(enriched);');
+            const preprocessCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            preprocessCodeBuilder.slot("main");
+            preprocessCodeBuilder.slot("return").raw(`     return result;`);
+            const postprocessCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            postprocessCodeBuilder.slot("main");
+            postprocessCodeBuilder.slot("return").raw(`     return result;`);
+            const mergeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             const mergeFunctionRoot = mergeCodeBuilder.factory("factory", { name: "factory" }).parameters({ name: "collectionName", value: this.collectionName });
             const mergeFunctionBody = mergeFunctionRoot.function(undefined, { name: "function" }).parameters("destination", "source").return();
             const pauseFunctionBody = mergeFunctionBody.function("pause")
@@ -6891,40 +7291,43 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
     unpause();
 
     return destination;`);
-            const prepareCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const prepareCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             prepareCodeBuilder.slot("result");
             prepareCodeBuilder.slot("assignments");
             prepareCodeBuilder.slot("return").raw(`     return result;`);
-            const stripCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const stripCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             stripCodeBuilder.slot("result");
             stripCodeBuilder.slot("return").raw(`     return result;`);
-            const cloneCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const cloneCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             cloneCodeBuilder.slot("result").raw("const result = {};");
             ;
             cloneCodeBuilder.slot("assignments");
             cloneCodeBuilder.slot("if");
             cloneCodeBuilder.slot("return").raw(`     return result;`);
-            const compareCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const compareCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             compareCodeBuilder.slot("result");
             compareCodeBuilder.slot("return").raw(`     return result;`);
-            const deserializeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const compareIdsCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            compareIdsCodeBuilder.slot("ifs");
+            compareIdsCodeBuilder.slot("return").raw(`     return true;`);
+            const deserializeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             deserializeCodeBuilder.slot("functions");
             deserializeCodeBuilder.slot("result");
             deserializeCodeBuilder.slot("if");
-            deserializeCodeBuilder.slot("return").raw(`     return result;`);
-            const serializeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            deserializeCodeBuilder.slot("return").raw(`     return entity;`);
+            const serializeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             serializeCodeBuilder.slot("result").raw("const result = {};");
             serializeCodeBuilder.slot("assignments");
             serializeCodeBuilder.slot("functions");
             serializeCodeBuilder.slot("if");
             serializeCodeBuilder.slot("return").raw(`     return result;`);
-            const idSelectorCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const idSelectorCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             idSelectorCodeBuilder.slot("result");
             idSelectorCodeBuilder.slot("return").raw(`     return result;`);
-            const hashTypeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const hashTypeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             hashTypeCodeBuilder.slot("ifs");
             hashTypeCodeBuilder.slot("return").raw(`     return "Ids";`);
-            const hashCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            const hashCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
             hashCodeBuilder.slot("functions").raw(`
     function stringifyDate(d) {
 
@@ -6979,6 +7382,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                 hashHandler.handle(property, hashCodeBuilder);
                 enableChangeTrackingHandler.handle(property, changeTrackingCodeBuilder);
                 freezeHandler.handle(property, freezeCodeBuilder);
+                compareIdsHandler.handle(property, compareIdsCodeBuilder);
             });
             if (idProperties.length === 0) {
                 throw new Error(`Schema must have a key.  Use .key() to mark a property as a key.  Collection Name: ${this.collectionName}`);
@@ -6987,20 +7391,36 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             const mergeParams = mergeFunctionRoot.getParameters();
             const enrichGenerator = Function(`return ${enricherCodeBuilder.toString()}`);
             const mergeGenerator = Function(`return ${mergeCodeBuilder.toString()}`);
+            // After enricher is used, we modify it to be deserialize and enrich
+            enricherFunctionBody.get("append").insert(deserializeCodeBuilder.get("functions"));
+            enricherFunctionBody.get("append").insert(deserializeCodeBuilder.get("result"));
+            enricherFunctionBody.get("append").insert(deserializeCodeBuilder.get("if"));
+            enricherFunctionRoot.replace("function", new _codegen__WEBPACK_IMPORTED_MODULE_19__.FunctionBuilder(undefined).parameters("unserialized", "changeTrackingType").return());
+            const postProcessGenerator = Function(`return ${enricherCodeBuilder.toString()}`);
+            const postProcessParams = enricherFunctionRoot.getParameters();
+            // Combine prepare and serialize
+            preprocessCodeBuilder.get("main").insert(prepareCodeBuilder.get("result"));
+            preprocessCodeBuilder.get("main").insert(prepareCodeBuilder.get("assignments"));
+            preprocessCodeBuilder.get("main").insert(serializeCodeBuilder.get("assignments"));
+            preprocessCodeBuilder.get("main").insert(serializeCodeBuilder.get("functions"));
+            preprocessCodeBuilder.get("main").insert(serializeCodeBuilder.get("if"));
             const getIdsFunction = Function("entity", idSelectorCodeBuilder.toString());
             const getHashTypeFunction = Function("entity", hashTypeCodeBuilder.toString());
             const prepareFunction = Function("entity", prepareCodeBuilder.toString());
             const cloneFunction = Function("entity", cloneCodeBuilder.toString());
-            const deserializeFunction = Function("entity", deserializeCodeBuilder.toString());
+            const deserializeFunction = Function("unserialized", deserializeCodeBuilder.toString());
             const serializeFunction = Function("entity", serializeCodeBuilder.toString());
             const compareFunction = Function("a", "b", compareCodeBuilder.toString());
-            ;
             const stripFunction = Function("entity", stripCodeBuilder.toString());
             const hashFunction = Function("entity", "type", hashCodeBuilder.toString());
             const enableChangeTrackingFunction = Function("entity", changeTrackingCodeBuilder.toString());
             const freezeFunction = Function("entity", freezeCodeBuilder.toString());
+            const compareIdsFunction = Function("a", "b", compareIdsCodeBuilder.toString());
+            const preprocessFunction = Function("entity", preprocessCodeBuilder.toString());
             const enricherFactoryFunction = enrichGenerator();
+            const postProcessFactoryFunction = postProcessGenerator();
             const mergeFactoryFunction = mergeGenerator();
+            const postProcessFunction = postProcessFactoryFunction(...postProcessParams.map(w => w.value));
             const enricherFunction = enricherFactoryFunction(...enrichParams.map(w => w.value));
             const mergeFunction = mergeFactoryFunction(...mergeParams.map(w => w.value));
             const idPropertyNames = idProperties.map(w => w.name);
@@ -7011,7 +7431,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                 return getIdsFunction(entity)[0];
             };
             const getProperty = (id) => propertyMap.get(id);
-            const id = (0,_utilities__WEBPACK_IMPORTED_MODULE_19__.hash)([...allPropertyNamesAndPaths, this.collectionName].join(","));
+            const id = (0,_utilities__WEBPACK_IMPORTED_MODULE_20__.hash)([...allPropertyNamesAndPaths, this.collectionName].join(","));
             // memoize this by the validProperties
             // TODO: See if we can generate a function to do this and eliminate loops
             const deserializePartial = (item, properties) => {
@@ -7026,8 +7446,9 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                 }
                 return item;
             };
-            return {
-                createSubscription: (signal) => new _communication_broadcast__WEBPACK_IMPORTED_MODULE_20__.SchemaSubscription(id, signal),
+            const result = {
+                preprocess: preprocessFunction,
+                postprocess: postProcessFunction,
                 getId,
                 getProperty,
                 properties,
@@ -7042,6 +7463,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                 deserialize: deserializeFunction,
                 serialize: serializeFunction,
                 compare: compareFunction,
+                compareIds: compareIdsFunction,
                 strip: stripFunction,
                 hash: hashFunction,
                 id,
@@ -7103,9 +7525,13 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                     return indexes;
                 }
             };
+            return {
+                createSubscription: (signal) => new _communication_broadcast__WEBPACK_IMPORTED_MODULE_21__.SchemaSubscription(result, signal),
+                ...result
+            };
         }
         catch (e) {
-            throw new _errors_SchemaError__WEBPACK_IMPORTED_MODULE_21__.SchemaError(e, `Error compiling schema for collection: ${this.collectionName}`);
+            throw new _errors_SchemaError__WEBPACK_IMPORTED_MODULE_22__.SchemaError(e, `Error compiling schema for collection: ${this.collectionName}`);
         }
     }
 }
@@ -7221,43 +7647,81 @@ class SubscriptionListener {
 }
 class SchemaSubscription {
     id;
-    schemaId;
+    schema;
     createdAt;
-    constructor(schemaId, signal) {
+    constructor(schema, signal) {
         this.createdAt = (0,_performance__WEBPACK_IMPORTED_MODULE_0__.now)();
         this.id = (0,_utilities__WEBPACK_IMPORTED_MODULE_1__.uuid)(8);
-        this.schemaId = schemaId;
+        this.schema = schema;
         signal?.addEventListener("abort", () => {
             this.dispose();
         }, { once: true });
     }
     send(changes) {
-        const regisry = getChannelRegistry(this.schemaId);
+        const regisry = getChannelRegistry(this.schema.id);
+        // cannot send raw data, needs to be preprocessed
+        const preprocessedChanges = {
+            adds: new Array(changes.adds.length),
+            removals: new Array(changes.removals.length),
+            unknown: new Array(changes.unknown.length),
+            updates: new Array(changes.updates.length),
+        };
+        for (let i = 0, length = changes.adds.length; i < length; i++) {
+            preprocessedChanges.adds[i] = this.schema.preprocess(changes.adds[i]);
+        }
+        for (let i = 0, length = changes.removals.length; i < length; i++) {
+            preprocessedChanges.removals[i] = this.schema.preprocess(changes.removals[i]);
+        }
+        for (let i = 0, length = changes.unknown.length; i < length; i++) {
+            preprocessedChanges.unknown[i] = this.schema.preprocess(changes.unknown[i]);
+        }
+        for (let i = 0, length = changes.updates.length; i < length; i++) {
+            preprocessedChanges.updates[i] = this.schema.preprocess(changes.updates[i]);
+        }
         // Send message to all listeners.
         // Since we create a new listener when we do onMessage,
         // we don't need to worry about sending to ourselves, it 
         // can't happen
         regisry.sender.send({
-            data: changes,
+            data: preprocessedChanges,
             timestamp: (0,_performance__WEBPACK_IMPORTED_MODULE_0__.now)()
         });
     }
     onMessage(callback) {
-        const regisry = getChannelRegistry(this.schemaId);
+        const regisry = getChannelRegistry(this.schema.id);
         // Link the callback to an instance
         regisry.receiver.addListener(this.id, ({ data, timestamp }) => {
             if (timestamp < this.createdAt) {
                 // Sent before the receiver was even created
                 return;
             }
-            callback(data);
+            // Changes were preprocessed before they were sent, need to postprocess them
+            const postProcessedChanges = {
+                adds: new Array(data.adds.length),
+                removals: new Array(data.removals.length),
+                unknown: new Array(data.unknown.length),
+                updates: new Array(data.updates.length),
+            };
+            for (let i = 0, length = data.adds.length; i < length; i++) {
+                postProcessedChanges.adds[i] = this.schema.preprocess(data.adds[i]);
+            }
+            for (let i = 0, length = data.removals.length; i < length; i++) {
+                postProcessedChanges.removals[i] = this.schema.preprocess(data.removals[i]);
+            }
+            for (let i = 0, length = data.unknown.length; i < length; i++) {
+                postProcessedChanges.unknown[i] = this.schema.preprocess(data.unknown[i]);
+            }
+            for (let i = 0, length = data.updates.length; i < length; i++) {
+                postProcessedChanges.updates[i] = this.schema.preprocess(data.updates[i]);
+            }
+            callback(postProcessedChanges);
         });
     }
     dispose() {
         this[Symbol.dispose]();
     }
     [Symbol.dispose]() {
-        const regisry = getChannelRegistry(this.schemaId);
+        const regisry = getChannelRegistry(this.schema.id);
         // Remove listeners for this instance only
         regisry.receiver.removeListeners(this.id);
     }
@@ -7805,6 +8269,8 @@ __webpack_require__.d(__webpack_exports__, {
   SchemaTracked: () => (SchemaTracked)
 });
 /* ESM import */var _base_SchemaBase__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../base/SchemaBase */ "./src/schema/property/base/SchemaBase.ts");
+/* ESM import */var _SchemaKey__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./SchemaKey */ "./src/schema/property/modifiers/SchemaKey.ts");
+
 
 class SchemaTracked extends _base_SchemaBase__WEBPACK_IMPORTED_MODULE_0__.SchemaBase {
     instance;
@@ -7814,6 +8280,9 @@ class SchemaTracked extends _base_SchemaBase__WEBPACK_IMPORTED_MODULE_0__.Schema
         this.instance = current.instance;
         this.isUnmapped = false;
     }
+    key() {
+        return new _SchemaKey__WEBPACK_IMPORTED_MODULE_1__.SchemaKey(this);
+    }
 }
 
 
@@ -8521,13 +8990,16 @@ __webpack_require__.d(__webpack_exports__, {
   cast: () => (/* reexport safe */ _objects__WEBPACK_IMPORTED_MODULE_3__.cast),
   clone: () => (/* reexport safe */ _objects__WEBPACK_IMPORTED_MODULE_3__.clone),
   combineQueryOptionsCollections: () => (/* reexport safe */ _queryOptionsCollection__WEBPACK_IMPORTED_MODULE_7__.combineQueryOptionsCollections),
+  fastHash: () => (/* reexport safe */ _strings__WEBPACK_IMPORTED_MODULE_1__.fastHash),
   hash: () => (/* reexport safe */ _strings__WEBPACK_IMPORTED_MODULE_1__.hash),
   isDate: () => (/* reexport safe */ _dates__WEBPACK_IMPORTED_MODULE_2__.isDate),
   isNodeRuntime: () => (/* reexport safe */ _runtime__WEBPACK_IMPORTED_MODULE_4__.isNodeRuntime),
   noop: () => (/* reexport safe */ _functions__WEBPACK_IMPORTED_MODULE_9__.noop),
   resolveBulkPersistChanges: () => (/* reexport safe */ _replication__WEBPACK_IMPORTED_MODULE_6__.resolveBulkPersistChanges),
+  stringifyObject: () => (/* reexport safe */ _strings__WEBPACK_IMPORTED_MODULE_1__.stringifyObject),
   toEventArray: () => (/* reexport safe */ _dbPluginEventUtils__WEBPACK_IMPORTED_MODULE_8__.toEventArray),
   toMap: () => (/* reexport safe */ _arrays__WEBPACK_IMPORTED_MODULE_0__.toMap),
+  unsafeCast: () => (/* reexport safe */ _unsafeCast__WEBPACK_IMPORTED_MODULE_10__.unsafeCast),
   uuid: () => (/* reexport safe */ _uuid__WEBPACK_IMPORTED_MODULE_5__.uuid),
   uuidv4: () => (/* reexport safe */ _uuid__WEBPACK_IMPORTED_MODULE_5__.uuidv4)
 });
@@ -8541,6 +9013,8 @@ __webpack_require__.d(__webpack_exports__, {
 /* ESM import */var _queryOptionsCollection__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./queryOptionsCollection */ "./src/utilities/queryOptionsCollection.ts");
 /* ESM import */var _dbPluginEventUtils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./dbPluginEventUtils */ "./src/utilities/dbPluginEventUtils.ts");
 /* ESM import */var _functions__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./functions */ "./src/utilities/functions.ts");
+/* ESM import */var _unsafeCast__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./unsafeCast */ "./src/utilities/unsafeCast.ts");
+
 
 
 
@@ -8649,7 +9123,9 @@ const isNodeRuntime = () => typeof process !== 'undefined' &&
 (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-  hash: () => (hash)
+  fastHash: () => (fastHash),
+  hash: () => (hash),
+  stringifyObject: () => (stringifyObject)
 });
 const hash = (value, seed = 0) => {
     // From Stack Overflow
@@ -8666,6 +9142,158 @@ const hash = (value, seed = 0) => {
     h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
     return 4294967296 * (2097151 & h2) + (h1 >>> 0);
 };
+/**
+ * Fast string hash optimized for comparisons.
+ * Uses djb2 algorithm - very fast and good distribution for short to medium strings.
+ * Same input always produces same output (deterministic).
+ *
+ * @param value - The string to hash
+ * @param seed - Optional seed value (default: 5381)
+ * @returns A positive 32-bit integer hash value
+ *
+ * @example
+ * ```ts
+ * fastHash("test") === fastHash("test") // true
+ * fastHash("test") !== fastHash("test2") // true
+ * ```
+ */
+const fastHash = (value, seed = 5381) => {
+    let hash = seed;
+    for (let i = 0; i < value.length; i++) {
+        hash = ((hash << 5) + hash) + value.charCodeAt(i);
+    }
+    return hash >>> 0; // Convert to unsigned 32-bit integer
+};
+/**
+ * Converts any value to a readable string representation.
+ * Handles primitives, objects, arrays, classes, dates, errors, and functions.
+ * Supports depth limiting to prevent infinite recursion on circular references.
+ *
+ * @param obj - The value to stringify
+ * @param maxDepth - Maximum depth for nested objects (default: 3)
+ * @param currentDepth - Current recursion depth (default: 0)
+ * @returns String representation of the value
+ *
+ * @example
+ * ```ts
+ * stringifyObject({ name: "test", count: 5 }) // '{ name: "test", count: 5 }'
+ * stringifyObject([1, 2, 3]) // '[1, 2, 3]'
+ * stringifyObject(new Date()) // 'Date(2024-01-01T00:00:00.000Z)'
+ * ```
+ */
+function stringifyObject(obj, maxDepth = 3, currentDepth = 0) {
+    if (obj === null)
+        return 'null';
+    if (obj === undefined)
+        return 'undefined';
+    const type = typeof obj;
+    switch (type) {
+        case 'string':
+            return `"${obj}"`;
+        case 'number':
+        case 'boolean':
+            return String(obj);
+        case 'function':
+            return `[Function: ${getFunctionName(obj)}]`;
+        case 'object':
+            if (currentDepth >= maxDepth) {
+                return '[Max Depth Reached]';
+            }
+            return stringifyObjectValue(obj, maxDepth, currentDepth);
+        default:
+            return `[${type}]`;
+    }
+}
+function getFunctionName(fn) {
+    const name = fn.name;
+    return name || 'anonymous';
+}
+function getObjectProperties(obj) {
+    const properties = {};
+    for (const key in obj) {
+        if (obj.hasOwnProperty(key)) {
+            properties[key] = obj[key];
+        }
+    }
+    return properties;
+}
+function stringifyObjectValue(obj, maxDepth, currentDepth) {
+    if (obj === null)
+        return 'null';
+    if (obj instanceof Date) {
+        return `Date(${obj.toISOString()})`;
+    }
+    if (obj instanceof Error) {
+        return `Error(${obj.message})`;
+    }
+    if (obj instanceof RegExp) {
+        return obj.toString();
+    }
+    if (Array.isArray(obj)) {
+        return stringifyArray(obj, maxDepth, currentDepth);
+    }
+    if (obj.constructor && obj.constructor.name !== 'Object') {
+        return stringifyClassInstance(obj, maxDepth, currentDepth);
+    }
+    return stringifyPlainObject(obj, maxDepth, currentDepth);
+}
+function stringifyArray(arr, maxDepth, currentDepth) {
+    if (arr.length === 0)
+        return '[]';
+    const items = arr.slice(0, 5).map(item => stringifyObject(item, maxDepth, currentDepth + 1));
+    const suffix = arr.length > 5 ? `... (+${arr.length - 5} more)` : '';
+    return `[${items.join(', ')}${suffix}]`;
+}
+function stringifyClassInstance(obj, maxDepth, currentDepth) {
+    const className = obj.constructor.name;
+    const properties = getObjectProperties(obj);
+    if (Object.keys(properties).length === 0) {
+        return `${className} {}`;
+    }
+    const props = Object.entries(properties)
+        .slice(0, 5)
+        .map(([key, value]) => {
+        const isPrimitive = value === null || value === undefined ||
+            (typeof value !== 'object' && typeof value !== 'function');
+        const depth = isPrimitive ? currentDepth : currentDepth + 1;
+        return `${key}: ${stringifyObject(value, maxDepth, depth)}`;
+    });
+    const suffix = Object.keys(properties).length > 5 ?
+        `... (+${Object.keys(properties).length - 5} more)` : '';
+    return `${className} { ${props.join(', ')}${suffix} }`;
+}
+function stringifyPlainObject(obj, maxDepth, currentDepth) {
+    const properties = getObjectProperties(obj);
+    if (Object.keys(properties).length === 0) {
+        return '{}';
+    }
+    const props = Object.entries(properties)
+        .slice(0, 5)
+        .map(([key, value]) => {
+        const isPrimitive = value === null || value === undefined ||
+            (typeof value !== 'object' && typeof value !== 'function');
+        const depth = isPrimitive ? currentDepth : currentDepth + 1;
+        return `${key}: ${stringifyObject(value, maxDepth, depth)}`;
+    });
+    const suffix = Object.keys(properties).length > 5 ?
+        `... (+${Object.keys(properties).length - 5} more)` : '';
+    return `{ ${props.join(', ')}${suffix} }`;
+}
+
+
+}),
+"./src/utilities/unsafeCast.ts": 
+/*!*************************************!*\
+  !*** ./src/utilities/unsafeCast.ts ***!
+  \*************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  unsafeCast: () => (unsafeCast)
+});
+const unsafeCast = (value) => {
+    return value;
+};
 
 
 }),
@@ -8862,6 +9490,9 @@ __webpack_require__.d(__webpack_exports__, {
   TagCollection: () => (/* reexport safe */ _collections__WEBPACK_IMPORTED_MODULE_2__.TagCollection),
   TracingCapability: () => (/* reexport safe */ _capabilities__WEBPACK_IMPORTED_MODULE_11__.TracingCapability),
   TrampolinePipeline: () => (/* reexport safe */ _pipeline__WEBPACK_IMPORTED_MODULE_6__.TrampolinePipeline),
+  TranslatedArrayValue: () => (/* reexport safe */ _plugins__WEBPACK_IMPORTED_MODULE_7__.TranslatedArrayValue),
+  TranslatedGroupValue: () => (/* reexport safe */ _plugins__WEBPACK_IMPORTED_MODULE_7__.TranslatedGroupValue),
+  TranslatedSingleValue: () => (/* reexport safe */ _plugins__WEBPACK_IMPORTED_MODULE_7__.TranslatedSingleValue),
   ValueExpression: () => (/* reexport safe */ _expressions__WEBPACK_IMPORTED_MODULE_4__.ValueExpression),
   VariableBuilder: () => (/* reexport safe */ _codegen__WEBPACK_IMPORTED_MODULE_1__.VariableBuilder),
   WorkPipeline: () => (/* reexport safe */ _pipeline__WEBPACK_IMPORTED_MODULE_6__.WorkPipeline),
@@ -8874,6 +9505,7 @@ __webpack_require__.d(__webpack_exports__, {
   clone: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.clone),
   combineExpressions: () => (/* reexport safe */ _expressions__WEBPACK_IMPORTED_MODULE_4__.combineExpressions),
   combineQueryOptionsCollections: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.combineQueryOptionsCollections),
+  fastHash: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.fastHash),
   forEach: () => (/* reexport safe */ _expressions__WEBPACK_IMPORTED_MODULE_4__.forEach),
   getProperties: () => (/* reexport safe */ _expressions__WEBPACK_IMPORTED_MODULE_4__.getProperties),
   hash: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.hash),
@@ -8885,10 +9517,12 @@ __webpack_require__.d(__webpack_exports__, {
   now: () => (/* reexport safe */ _performance__WEBPACK_IMPORTED_MODULE_5__.now),
   resolveBulkPersistChanges: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.resolveBulkPersistChanges),
   s: () => (/* reexport safe */ _schema__WEBPACK_IMPORTED_MODULE_9__.s),
+  stringifyObject: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.stringifyObject),
   toEventArray: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.toEventArray),
   toExpression: () => (/* reexport safe */ _expressions__WEBPACK_IMPORTED_MODULE_4__.toExpression),
   toMap: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.toMap),
   toPromise: () => (/* reexport safe */ _results__WEBPACK_IMPORTED_MODULE_8__.toPromise),
+  unsafeCast: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.unsafeCast),
   uuid: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.uuid),
   uuidv4: () => (/* reexport safe */ _utilities__WEBPACK_IMPORTED_MODULE_10__.uuidv4)
 });
@@ -8990,6 +9624,9 @@ var __webpack_exports__SyncronousQueue = __webpack_exports__.SyncronousQueue;
 var __webpack_exports__TagCollection = __webpack_exports__.TagCollection;
 var __webpack_exports__TracingCapability = __webpack_exports__.TracingCapability;
 var __webpack_exports__TrampolinePipeline = __webpack_exports__.TrampolinePipeline;
+var __webpack_exports__TranslatedArrayValue = __webpack_exports__.TranslatedArrayValue;
+var __webpack_exports__TranslatedGroupValue = __webpack_exports__.TranslatedGroupValue;
+var __webpack_exports__TranslatedSingleValue = __webpack_exports__.TranslatedSingleValue;
 var __webpack_exports__ValueExpression = __webpack_exports__.ValueExpression;
 var __webpack_exports__VariableBuilder = __webpack_exports__.VariableBuilder;
 var __webpack_exports__WorkPipeline = __webpack_exports__.WorkPipeline;
@@ -9002,6 +9639,7 @@ var __webpack_exports__cast = __webpack_exports__.cast;
 var __webpack_exports__clone = __webpack_exports__.clone;
 var __webpack_exports__combineExpressions = __webpack_exports__.combineExpressions;
 var __webpack_exports__combineQueryOptionsCollections = __webpack_exports__.combineQueryOptionsCollections;
+var __webpack_exports__fastHash = __webpack_exports__.fastHash;
 var __webpack_exports__forEach = __webpack_exports__.forEach;
 var __webpack_exports__getProperties = __webpack_exports__.getProperties;
 var __webpack_exports__hash = __webpack_exports__.hash;
@@ -9013,12 +9651,14 @@ var __webpack_exports__noop = __webpack_exports__.noop;
 var __webpack_exports__now = __webpack_exports__.now;
 var __webpack_exports__resolveBulkPersistChanges = __webpack_exports__.resolveBulkPersistChanges;
 var __webpack_exports__s = __webpack_exports__.s;
+var __webpack_exports__stringifyObject = __webpack_exports__.stringifyObject;
 var __webpack_exports__toEventArray = __webpack_exports__.toEventArray;
 var __webpack_exports__toExpression = __webpack_exports__.toExpression;
 var __webpack_exports__toMap = __webpack_exports__.toMap;
 var __webpack_exports__toPromise = __webpack_exports__.toPromise;
+var __webpack_exports__unsafeCast = __webpack_exports__.unsafeCast;
 var __webpack_exports__uuid = __webpack_exports__.uuid;
 var __webpack_exports__uuidv4 = __webpack_exports__.uuidv4;
-export { __webpack_exports__AndBuilder as AndBuilder, __webpack_exports__ArrayBuilder as ArrayBuilder, __webpack_exports__AssignmentBuilder as AssignmentBuilder, __webpack_exports__AsyncPipeline as AsyncPipeline, __webpack_exports__Block as Block, __webpack_exports__BulkPersistChanges as BulkPersistChanges, __webpack_exports__BulkPersistResult as BulkPersistResult, __webpack_exports__Capability as Capability, __webpack_exports__CodeBuilder as CodeBuilder, __webpack_exports__ComparatorExpression as ComparatorExpression, __webpack_exports__ContainerBlock as ContainerBlock, __webpack_exports__DataTranslator as DataTranslator, __webpack_exports__EmptyExpression as EmptyExpression, __webpack_exports__EphemeralDataPlugin as EphemeralDataPlugin, __webpack_exports__Expression as Expression, __webpack_exports__FunctionBuilder as FunctionBuilder, __webpack_exports__FunctionFactoryBuilder as FunctionFactoryBuilder, __webpack_exports__HashType as HashType, __webpack_exports__IdSet as IdSet, __webpack_exports__IfBuilder as IfBuilder, __webpack_exports__JsonTranslator as JsonTranslator, __webpack_exports__MemoryDataCollection as MemoryDataCollection, __webpack_exports__NotParsableExpression as NotParsableExpression, __webpack_exports__ObjectBuilder as ObjectBuilder, __webpack_exports__OperatorExpression as OperatorExpression, __webpack_exports__OptimisticReplicationDbPlugin as OptimisticReplicationDbPlugin, __webpack_exports__PerformanceCapability as PerformanceCapability, __webpack_exports__PluginEventResult as PluginEventResult, __webpack_exports__PropertyExpression as PropertyExpression, __webpack_exports__PropertyInfo as PropertyInfo, __webpack_exports__Query as Query, __webpack_exports__QueryOptionsCollection as QueryOptionsCollection, __webpack_exports__QueryOrdering as QueryOrdering, __webpack_exports__RawBuilder as RawBuilder, __webpack_exports__ReadonlySchemaCollection as ReadonlySchemaCollection, __webpack_exports__ReplicationDbPlugin as ReplicationDbPlugin, __webpack_exports__Result as Result, __webpack_exports__SchemaArray as SchemaArray, __webpack_exports__SchemaBase as SchemaBase, __webpack_exports__SchemaBoolean as SchemaBoolean, __webpack_exports__SchemaCollection as SchemaCollection, __webpack_exports__SchemaComputed as SchemaComputed, __webpack_exports__SchemaDate as SchemaDate, __webpack_exports__SchemaDefault as SchemaDefault, __webpack_exports__SchemaDeserialize as SchemaDeserialize, __webpack_exports__SchemaDistinct as SchemaDistinct, __webpack_exports__SchemaError as SchemaError, __webpack_exports__SchemaFrom as SchemaFrom, __webpack_exports__SchemaFunction as SchemaFunction, __webpack_exports__SchemaIdentity as SchemaIdentity, __webpack_exports__SchemaIndex as SchemaIndex, __webpack_exports__SchemaKey as SchemaKey, __webpack_exports__SchemaNullable as SchemaNullable, __webpack_exports__SchemaNumber as SchemaNumber, __webpack_exports__SchemaObject as SchemaObject, __webpack_exports__SchemaOptional as SchemaOptional, __webpack_exports__SchemaPersistChanges as SchemaPersistChanges, __webpack_exports__SchemaPersistResult as SchemaPersistResult, __webpack_exports__SchemaReadonly as SchemaReadonly, __webpack_exports__SchemaSerialize as SchemaSerialize, __webpack_exports__SchemaString as SchemaString, __webpack_exports__SchemaTracked as SchemaTracked, __webpack_exports__SchemaTypes as SchemaTypes, __webpack_exports__SlotBlock as SlotBlock, __webpack_exports__SqlTranslator as SqlTranslator, __webpack_exports__StringBuilder as StringBuilder, __webpack_exports__SyncronousQueue as SyncronousQueue, __webpack_exports__TagCollection as TagCollection, __webpack_exports__TracingCapability as TracingCapability, __webpack_exports__TrampolinePipeline as TrampolinePipeline, __webpack_exports__ValueExpression as ValueExpression, __webpack_exports__VariableBuilder as VariableBuilder, __webpack_exports__WorkPipeline as WorkPipeline, __webpack_exports__assertDate as assertDate, __webpack_exports__assertInstanceOf as assertInstanceOf, __webpack_exports__assertIsArray as assertIsArray, __webpack_exports__assertIsNotNull as assertIsNotNull, __webpack_exports__assertString as assertString, __webpack_exports__cast as cast, __webpack_exports__clone as clone, __webpack_exports__combineExpressions as combineExpressions, __webpack_exports__combineQueryOptionsCollections as combineQueryOptionsCollections, __webpack_exports__forEach as forEach, __webpack_exports__getProperties as getProperties, __webpack_exports__hash as hash, __webpack_exports__isDate as isDate, __webpack_exports__isNodeRuntime as isNodeRuntime, __webpack_exports__isPropertyExpression as isPropertyExpression, __webpack_exports__measure as measure, __webpack_exports__noop as noop, __webpack_exports__now as now, __webpack_exports__resolveBulkPersistChanges as resolveBulkPersistChanges, __webpack_exports__s as s, __webpack_exports__toEventArray as toEventArray, __webpack_exports__toExpression as toExpression, __webpack_exports__toMap as toMap, __webpack_exports__toPromise as toPromise, __webpack_exports__uuid as uuid, __webpack_exports__uuidv4 as uuidv4 };
+export { __webpack_exports__AndBuilder as AndBuilder, __webpack_exports__ArrayBuilder as ArrayBuilder, __webpack_exports__AssignmentBuilder as AssignmentBuilder, __webpack_exports__AsyncPipeline as AsyncPipeline, __webpack_exports__Block as Block, __webpack_exports__BulkPersistChanges as BulkPersistChanges, __webpack_exports__BulkPersistResult as BulkPersistResult, __webpack_exports__Capability as Capability, __webpack_exports__CodeBuilder as CodeBuilder, __webpack_exports__ComparatorExpression as ComparatorExpression, __webpack_exports__ContainerBlock as ContainerBlock, __webpack_exports__DataTranslator as DataTranslator, __webpack_exports__EmptyExpression as EmptyExpression, __webpack_exports__EphemeralDataPlugin as EphemeralDataPlugin, __webpack_exports__Expression as Expression, __webpack_exports__FunctionBuilder as FunctionBuilder, __webpack_exports__FunctionFactoryBuilder as FunctionFactoryBuilder, __webpack_exports__HashType as HashType, __webpack_exports__IdSet as IdSet, __webpack_exports__IfBuilder as IfBuilder, __webpack_exports__JsonTranslator as JsonTranslator, __webpack_exports__MemoryDataCollection as MemoryDataCollection, __webpack_exports__NotParsableExpression as NotParsableExpression, __webpack_exports__ObjectBuilder as ObjectBuilder, __webpack_exports__OperatorExpression as OperatorExpression, __webpack_exports__OptimisticReplicationDbPlugin as OptimisticReplicationDbPlugin, __webpack_exports__PerformanceCapability as PerformanceCapability, __webpack_exports__PluginEventResult as PluginEventResult, __webpack_exports__PropertyExpression as PropertyExpression, __webpack_exports__PropertyInfo as PropertyInfo, __webpack_exports__Query as Query, __webpack_exports__QueryOptionsCollection as QueryOptionsCollection, __webpack_exports__QueryOrdering as QueryOrdering, __webpack_exports__RawBuilder as RawBuilder, __webpack_exports__ReadonlySchemaCollection as ReadonlySchemaCollection, __webpack_exports__ReplicationDbPlugin as ReplicationDbPlugin, __webpack_exports__Result as Result, __webpack_exports__SchemaArray as SchemaArray, __webpack_exports__SchemaBase as SchemaBase, __webpack_exports__SchemaBoolean as SchemaBoolean, __webpack_exports__SchemaCollection as SchemaCollection, __webpack_exports__SchemaComputed as SchemaComputed, __webpack_exports__SchemaDate as SchemaDate, __webpack_exports__SchemaDefault as SchemaDefault, __webpack_exports__SchemaDeserialize as SchemaDeserialize, __webpack_exports__SchemaDistinct as SchemaDistinct, __webpack_exports__SchemaError as SchemaError, __webpack_exports__SchemaFrom as SchemaFrom, __webpack_exports__SchemaFunction as SchemaFunction, __webpack_exports__SchemaIdentity as SchemaIdentity, __webpack_exports__SchemaIndex as SchemaIndex, __webpack_exports__SchemaKey as SchemaKey, __webpack_exports__SchemaNullable as SchemaNullable, __webpack_exports__SchemaNumber as SchemaNumber, __webpack_exports__SchemaObject as SchemaObject, __webpack_exports__SchemaOptional as SchemaOptional, __webpack_exports__SchemaPersistChanges as SchemaPersistChanges, __webpack_exports__SchemaPersistResult as SchemaPersistResult, __webpack_exports__SchemaReadonly as SchemaReadonly, __webpack_exports__SchemaSerialize as SchemaSerialize, __webpack_exports__SchemaString as SchemaString, __webpack_exports__SchemaTracked as SchemaTracked, __webpack_exports__SchemaTypes as SchemaTypes, __webpack_exports__SlotBlock as SlotBlock, __webpack_exports__SqlTranslator as SqlTranslator, __webpack_exports__StringBuilder as StringBuilder, __webpack_exports__SyncronousQueue as SyncronousQueue, __webpack_exports__TagCollection as TagCollection, __webpack_exports__TracingCapability as TracingCapability, __webpack_exports__TrampolinePipeline as TrampolinePipeline, __webpack_exports__TranslatedArrayValue as TranslatedArrayValue, __webpack_exports__TranslatedGroupValue as TranslatedGroupValue, __webpack_exports__TranslatedSingleValue as TranslatedSingleValue, __webpack_exports__ValueExpression as ValueExpression, __webpack_exports__VariableBuilder as VariableBuilder, __webpack_exports__WorkPipeline as WorkPipeline, __webpack_exports__assertDate as assertDate, __webpack_exports__assertInstanceOf as assertInstanceOf, __webpack_exports__assertIsArray as assertIsArray, __webpack_exports__assertIsNotNull as assertIsNotNull, __webpack_exports__assertString as assertString, __webpack_exports__cast as cast, __webpack_exports__clone as clone, __webpack_exports__combineExpressions as combineExpressions, __webpack_exports__combineQueryOptionsCollections as combineQueryOptionsCollections, __webpack_exports__fastHash as fastHash, __webpack_exports__forEach as forEach, __webpack_exports__getProperties as getProperties, __webpack_exports__hash as hash, __webpack_exports__isDate as isDate, __webpack_exports__isNodeRuntime as isNodeRuntime, __webpack_exports__isPropertyExpression as isPropertyExpression, __webpack_exports__measure as measure, __webpack_exports__noop as noop, __webpack_exports__now as now, __webpack_exports__resolveBulkPersistChanges as resolveBulkPersistChanges, __webpack_exports__s as s, __webpack_exports__stringifyObject as stringifyObject, __webpack_exports__toEventArray as toEventArray, __webpack_exports__toExpression as toExpression, __webpack_exports__toMap as toMap, __webpack_exports__toPromise as toPromise, __webpack_exports__unsafeCast as unsafeCast, __webpack_exports__uuid as uuid, __webpack_exports__uuidv4 as uuidv4 };
 
 //# sourceMappingURL=index.js.map