@routier/core 0.0.5 → 0.0.7

package/dist/schema/index.js

@@ -63,6 +63,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);
@@ -92,6 +110,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);
     }
@@ -522,15 +561,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;
     }
 }
@@ -828,10 +892,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");
+
 
 
 
@@ -841,9 +907,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;
     }
 }
@@ -900,10 +967,11 @@ class CloneArrayHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfo
                 // Child properties will take care of this
                 return builder;
             }
-            const slot = builder.get("assignments");
-            const resultAssignmentPath = property.getAssignmentPath({ parent: "result" });
+            const entitySelectorPath = property.getSelectrorPath({ parent: "entity" });
             if (property.parent == null) {
-                slot.assign(`${resultAssignmentPath}`).value("{}");
+                const resultAssignmentPath = property.getAssignmentPath({ parent: "result" });
+                const slot = builder.get("if");
+                slot.if(`${entitySelectorPath} != null`).appendBody(`${resultAssignmentPath} = [...${entitySelectorPath}]`);
                 return builder;
             }
             // slotPath.push(...property.getParentPathArray());
@@ -980,6 +1048,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": 
 /*!**************************************************************!*\
@@ -1038,6 +1174,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": 
 /*!*****************************************************************************!*\
@@ -1087,8 +1249,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
@@ -1132,10 +1294,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);
@@ -1201,12 +1363,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);
@@ -1234,10 +1396,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) {
@@ -2250,14 +2412,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
@@ -2284,6 +2449,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": 
 /*!******************************************************************!*\
@@ -2304,7 +2494,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
@@ -2336,7 +2528,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 })));
@@ -2376,7 +2568,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
@@ -2575,14 +2767,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;
         }
@@ -2770,10 +2961,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.
  */
@@ -2839,7 +3036,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;
@@ -2883,6 +3080,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;
@@ -2912,6 +3115,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.
      *
@@ -2996,12 +3202,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;
     }
@@ -3048,8 +3259,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("");
     }
@@ -3074,16 +3285,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}`);
@@ -3105,7 +3316,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");
@@ -3118,11 +3329,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");
+
 
 
 
@@ -3307,6 +3520,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();
@@ -3320,26 +3534,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")
@@ -3358,40 +3582,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) {
 
@@ -3446,6 +3673,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}`);
@@ -3454,20 +3682,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);
@@ -3478,7 +3722,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) => {
@@ -3493,8 +3737,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,
@@ -3509,6 +3754,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                 deserialize: deserializeFunction,
                 serialize: serializeFunction,
                 compare: compareFunction,
+                compareIds: compareIdsFunction,
                 strip: stripFunction,
                 hash: hashFunction,
                 id,
@@ -3570,9 +3816,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}`);
         }
     }
 }
@@ -3688,43 +3938,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);
     }
@@ -4222,6 +4510,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;
@@ -4231,6 +4521,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);
+    }
 }
 
 
@@ -4844,7 +5137,9 @@ var HashType;
 (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
@@ -4861,6 +5156,143 @@ 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} }`;
+}
 
 
 }),