@routier/core 0.0.1-alpha.2 → 0.0.1

package/dist/schema/index.js

@@ -494,15 +494,19 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   CloneHandlerBuilder: () => (CloneHandlerBuilder)
 });
+/* ESM import */var _clone_CloneArrayHandler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./clone/CloneArrayHandler */ "./src/codegen/handlers/clone/CloneArrayHandler.ts");
 /* ESM import */var _clone_CloneObjectHandler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./clone/CloneObjectHandler */ "./src/codegen/handlers/clone/CloneObjectHandler.ts");
 /* ESM import */var _clone_CloneValueHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./clone/CloneValueHandler */ "./src/codegen/handlers/clone/CloneValueHandler.ts");
 
 
+
 /// Purpose: 
 class CloneHandlerBuilder {
     build() {
         const handler = new _clone_CloneObjectHandler__WEBPACK_IMPORTED_MODULE_0__.CloneObjectHandler();
-        handler.setNext(new _clone_CloneValueHandler__WEBPACK_IMPORTED_MODULE_1__.CloneValueHandler());
+        handler
+            .setNext(new _clone_CloneValueHandler__WEBPACK_IMPORTED_MODULE_1__.CloneValueHandler())
+            .setNext(new _clone_CloneArrayHandler__WEBPACK_IMPORTED_MODULE_2__.CloneArrayHandler());
         return handler;
     }
 }
@@ -543,10 +547,12 @@ __webpack_require__.d(__webpack_exports__, {
   DeserializeHandlerBuilder: () => (DeserializeHandlerBuilder)
 });
 /* ESM import */var _deserialize_DeserializeObjectHandler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./deserialize/DeserializeObjectHandler */ "./src/codegen/handlers/deserialize/DeserializeObjectHandler.ts");
-/* ESM import */var _deserialize_DeserializeValueHandler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./deserialize/DeserializeValueHandler */ "./src/codegen/handlers/deserialize/DeserializeValueHandler.ts");
-/* ESM import */var _deserialize_DeserializeDateHandler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./deserialize/DeserializeDateHandler */ "./src/codegen/handlers/deserialize/DeserializeDateHandler.ts");
-/* ESM import */var _deserialize_DeserializeComputedValueHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./deserialize/DeserializeComputedValueHandler */ "./src/codegen/handlers/deserialize/DeserializeComputedValueHandler.ts");
-/* ESM import */var _deserialize_DeserializeFunctionHandler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./deserialize/DeserializeFunctionHandler */ "./src/codegen/handlers/deserialize/DeserializeFunctionHandler.ts");
+/* ESM import */var _deserialize_DeserializeValueHandler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./deserialize/DeserializeValueHandler */ "./src/codegen/handlers/deserialize/DeserializeValueHandler.ts");
+/* ESM import */var _deserialize_DeserializeDateHandler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./deserialize/DeserializeDateHandler */ "./src/codegen/handlers/deserialize/DeserializeDateHandler.ts");
+/* ESM import */var _deserialize_DeserializeComputedValueHandler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./deserialize/DeserializeComputedValueHandler */ "./src/codegen/handlers/deserialize/DeserializeComputedValueHandler.ts");
+/* ESM import */var _deserialize_DeserializeFunctionHandler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./deserialize/DeserializeFunctionHandler */ "./src/codegen/handlers/deserialize/DeserializeFunctionHandler.ts");
+/* ESM import */var _deserialize_DeserializeDeserializerHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./deserialize/DeserializeDeserializerHandler */ "./src/codegen/handlers/deserialize/DeserializeDeserializerHandler.ts");
+
 
 
 
@@ -557,10 +563,11 @@ class DeserializeHandlerBuilder {
     build() {
         const handler = new _deserialize_DeserializeObjectHandler__WEBPACK_IMPORTED_MODULE_0__.DeserializeObjectHandler();
         handler
-            .setNext(new _deserialize_DeserializeComputedValueHandler__WEBPACK_IMPORTED_MODULE_1__.DeserializeComputedValueHandler())
-            .setNext(new _deserialize_DeserializeFunctionHandler__WEBPACK_IMPORTED_MODULE_2__.DeserializeFunctionHandler())
-            .setNext(new _deserialize_DeserializeValueHandler__WEBPACK_IMPORTED_MODULE_3__.DeserializeValueHandler())
-            .setNext(new _deserialize_DeserializeDateHandler__WEBPACK_IMPORTED_MODULE_4__.DeserializeDateHandler());
+            .setNext(new _deserialize_DeserializeDeserializerHandler__WEBPACK_IMPORTED_MODULE_1__.DeserializeDeserializerHandler())
+            .setNext(new _deserialize_DeserializeComputedValueHandler__WEBPACK_IMPORTED_MODULE_2__.DeserializeComputedValueHandler())
+            .setNext(new _deserialize_DeserializeFunctionHandler__WEBPACK_IMPORTED_MODULE_3__.DeserializeFunctionHandler())
+            .setNext(new _deserialize_DeserializeValueHandler__WEBPACK_IMPORTED_MODULE_4__.DeserializeValueHandler())
+            .setNext(new _deserialize_DeserializeDateHandler__WEBPACK_IMPORTED_MODULE_5__.DeserializeDateHandler());
         return handler;
     }
 }
@@ -821,18 +828,22 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   SerializeHandlerBuilder: () => (SerializeHandlerBuilder)
 });
-/* ESM import */var _serialize_SerializeDateHandler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./serialize/SerializeDateHandler */ "./src/codegen/handlers/serialize/SerializeDateHandler.ts");
-/* ESM import */var _serialize_SerializeObjectHandler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./serialize/SerializeObjectHandler */ "./src/codegen/handlers/serialize/SerializeObjectHandler.ts");
-/* ESM import */var _serialize_SerializeValueHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./serialize/SerializeValueHandler */ "./src/codegen/handlers/serialize/SerializeValueHandler.ts");
+/* 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_SerializeSerializerHandler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./serialize/SerializeSerializerHandler */ "./src/codegen/handlers/serialize/SerializeSerializerHandler.ts");
+
 
 
 
 /// Purpose: 
 class SerializeHandlerBuilder {
     build() {
-        const handler = new _serialize_SerializeDateHandler__WEBPACK_IMPORTED_MODULE_0__.SerializeDateHandler();
-        handler.setNext(new _serialize_SerializeValueHandler__WEBPACK_IMPORTED_MODULE_1__.SerializeValueHandler())
-            .setNext(new _serialize_SerializeObjectHandler__WEBPACK_IMPORTED_MODULE_2__.SerializeObjectHandler());
+        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());
         return handler;
     }
 }
@@ -868,6 +879,43 @@ class StripHandlerBuilder {
 }
 
 
+}),
+"./src/codegen/handlers/clone/CloneArrayHandler.ts": 
+/*!*********************************************************!*\
+  !*** ./src/codegen/handlers/clone/CloneArrayHandler.ts ***!
+  \*********************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  CloneArrayHandler: () => (CloneArrayHandler)
+});
+/* 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 CloneArrayHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
+    handle(property, builder) {
+        if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Array) {
+            if (property.isNullable || property.isOptional) {
+                // Child properties will take care of this
+                return builder;
+            }
+            const slot = builder.get("assignments");
+            const resultAssignmentPath = property.getAssignmentPath({ parent: "result" });
+            if (property.parent == null) {
+                slot.assign(`${resultAssignmentPath}`).value("{}");
+                return builder;
+            }
+            // slotPath.push(...property.getParentPathArray());
+            // const nestedObjectBuilder = builder.get<ObjectBuilder>(slotPath.get());
+            // nestedObjectBuilder.nested(property.name, property.name)
+            return builder;
+        }
+        return super.handle(property, builder);
+    }
+}
+
+
 }),
 "./src/codegen/handlers/clone/CloneObjectHandler.ts": 
 /*!**********************************************************!*\
@@ -878,24 +926,14 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   CloneObjectHandler: () => (CloneObjectHandler)
 });
-/* ESM import */var _SlotPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../SlotPath */ "./src/codegen/SlotPath.ts");
 /* 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 CloneObjectHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
     handle(property, builder) {
         if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object) {
-            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);
-                return builder;
-            }
-            slotPath.push(...property.getParentPathArray());
-            const nestedObjectBuilder = builder.get(slotPath.get());
-            nestedObjectBuilder.nested(property.name, property.name);
+            // Child properties will take care of this
             return builder;
         }
         return super.handle(property, builder);
@@ -913,7 +951,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   CloneValueHandler: () => (CloneValueHandler)
 });
-/* ESM import */var _SlotPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../SlotPath */ "./src/codegen/SlotPath.ts");
+/* ESM import */var _blocks__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../blocks */ "./src/codegen/blocks.ts");
 /* 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");
 
@@ -921,21 +959,20 @@ __webpack_require__.d(__webpack_exports__, {
 
 class CloneValueHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
     handle(property, builder) {
-        if (property.type != _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object) {
-            let objectBuilder = builder.getOrDefault("result.variable.object");
-            const entitySelectorPath = property.getAssignmentPath({ parent: "entity" });
-            if (objectBuilder == null) {
-                objectBuilder = builder.get("result")
-                    .assign("const result", { name: "variable" })
-                    .object({ name: "object" });
-            }
+        if (property.type != _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object && property.type != _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Array) {
+            const slot = builder.get("if");
+            const entitySelectorPath = property.getSelectrorPath({ parent: "entity" });
+            const resultAssignmentPath = property.getAssignmentPath({ parent: "result" });
             if (property.parent == null) {
-                objectBuilder.property(`${property.name}: ${entitySelectorPath}`);
+                // we are a first level property
+                slot.if(`${entitySelectorPath} != null`).appendBody(`${resultAssignmentPath} = ${entitySelectorPath}`);
                 return builder;
             }
-            const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_2__.SlotPath(...property.getParentPathArray());
-            objectBuilder = objectBuilder.get(slotPath.get());
-            objectBuilder.property(`${property.name}: ${entitySelectorPath}`);
+            // Second level or more property
+            // Need to ensure parent is assigned
+            const propertyParentPath = ["result", ...property.getParentPathArray()];
+            const ifBuilder = new _blocks__WEBPACK_IMPORTED_MODULE_2__.IfBuilder(`${propertyParentPath.join("?.")} == null`).appendBody(`${propertyParentPath.join(".")} = {};`);
+            slot.if(`${entitySelectorPath} != null`).appendBody(ifBuilder.toString()).appendBody(`${resultAssignmentPath} = ${entitySelectorPath}`);
             return builder;
         }
         return super.handle(property, builder);
@@ -1076,6 +1113,47 @@ class DeserializeDateHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.Propert
 }
 
 
+}),
+"./src/codegen/handlers/deserialize/DeserializeDeserializerHandler.ts": 
+/*!****************************************************************************!*\
+  !*** ./src/codegen/handlers/deserialize/DeserializeDeserializerHandler.ts ***!
+  \****************************************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  DeserializeDeserializerHandler: () => (DeserializeDeserializerHandler)
+});
+/* ESM import */var _SlotPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../SlotPath */ "./src/codegen/SlotPath.ts");
+/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../types */ "./src/codegen/handlers/types.ts");
+
+
+class DeserializeDeserializerHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
+    handle(property, builder) {
+        if (property.valueDeserializer != null) {
+            let objectBuilder = builder.getOrDefault("result.variable.object");
+            const assignmentBuilder = builder.getOrDefault("functions");
+            const entitySelectorPath = property.getSelectrorPath({ parent: "entity" });
+            if (objectBuilder == null) {
+                objectBuilder = builder.get("result")
+                    .assign("const result", { name: "variable" })
+                    .object({ name: "object" });
+            }
+            const defaultFunctionWithParameters = this.toNamedFunction(property.valueDeserializer.toString(), assignmentBuilder);
+            defaultFunctionWithParameters.builder.parameters(...defaultFunctionWithParameters.parameters.map((_, i) => ({ name: defaultFunctionWithParameters.parameters[i], callName: entitySelectorPath })));
+            if (property.parent == null) {
+                objectBuilder.property(`${property.name}: ${defaultFunctionWithParameters.builder.toCallable()}`);
+                return builder;
+            }
+            const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_1__.SlotPath(...property.getParentPathArray());
+            objectBuilder = objectBuilder.get(slotPath.get());
+            objectBuilder.property(`${property.name}: ${defaultFunctionWithParameters.builder.toCallable()}`);
+            return builder;
+        }
+        return super.handle(property, builder);
+    }
+}
+
+
 }),
 "./src/codegen/handlers/deserialize/DeserializeFunctionHandler.ts": 
 /*!************************************************************************!*\
@@ -1405,7 +1483,7 @@ class EnrichmentNullableObjectHandler extends _types__WEBPACK_IMPORTED_MODULE_0_
                 if (enrichedSlot == null) {
                     throw new Error(`Error building enricher, could not find slot for ${slotPath.get()}`);
                 }
-                enriched = enrichedSlot.nested(property.name, property.name);
+                enriched = enrichedSlot.nested(property.name, `[${enrichedPath}]`);
             }
             return builder;
         }
@@ -1424,22 +1502,29 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   EnrichmentObjectHandler: () => (EnrichmentObjectHandler)
 });
+/* ESM import */var _SlotPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../SlotPath */ "./src/codegen/SlotPath.ts");
 /* 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 EnrichmentObjectHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
     handle(property, builder) {
         if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object && (property.isNullable || property.isOptional) === false) {
-            const assignmentSlot = builder.get("factory.function.assignment");
-            const childPath = property.getAssignmentPath({ parent: "enriched" });
-            if (assignmentSlot == null) {
-                throw new Error("Error building enricher, could not find slot for factory.function.assignment");
+            const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_2__.SlotPath("factory", "function", "enriched", "object", "enriched");
+            const nestedSlotPath = this.buildSlotPath(property, slotPath);
+            // Generate null check for current level using parent relationships
+            const enrichedPath = property.getAssignmentPath({ parent: "enriched" });
+            const slot = builder.get("factory.function.assignment");
+            slot.assign(enrichedPath).value(`enableChangeTracking(${enrichedPath} || {}, "${property.name}")`);
+            let enriched = builder.getOrDefault(nestedSlotPath.get());
+            if (enriched == null) {
+                const enrichedSlot = builder.get(slotPath.get());
+                if (enrichedSlot == null) {
+                    throw new Error(`Error building enricher, could not find slot for ${slotPath.get()}`);
+                }
+                enriched = enrichedSlot.nested(property.name, `[${enrichedPath}]`);
             }
-            assignmentSlot.assign(childPath, { name: `[${childPath}]` }).call("enableChangeTracking", { name: "builder" });
-            const changeTrackingSlot = builder.get("factory.function.tracking.freeze");
-            const selectorPath = property.getSelectrorPath({ parent: "enriched" });
-            changeTrackingSlot.if(`${selectorPath} != null`, { unshift: true }).unshiftBody(`${selectorPath} = Object.freeze(${selectorPath})`);
             return builder;
         }
         return super.handle(property, builder);
@@ -2170,8 +2255,7 @@ __webpack_require__.d(__webpack_exports__, {
 class SerializeDateHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
     handle(property, builder) {
         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());
+            let objectBuilder = builder.get("if");
             const entitySelectorPath = property.getSelectrorPath({ parent: "entity" });
             const entityAssignmentPath = property.getAssignmentPath({ parent: "result" });
             const assignment = `${property.name}: ${entitySelectorPath} instanceof Date ? ${entitySelectorPath}.toISOString() : ${entitySelectorPath}`;
@@ -2185,12 +2269,14 @@ class SerializeDateHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyI
             }
             // A date cannot be a nested object, just do the assignment
             if (property.parent == null) {
-                objectBuilder.property(assignment);
+                objectBuilder.if(`Object.hasOwn(entity, "${property.name}")`).appendBody(`${entityAssignmentPath} = ${entitySelectorPath}`);
                 return builder;
             }
-            slotPath.push(...property.getParentPathArray());
-            const nestedObjectBuilder = builder.get(slotPath.get());
-            nestedObjectBuilder.property(assignment);
+            // TODO: SOLVE THIS, IT IS CLOSE
+            //const slotPath = new SlotPath(...property.getParentPathArray());
+            // slotPath.push(...property.getParentPathArray());
+            // const nestedObjectBuilder = builder.get<ObjectBuilder>(slotPath.get());
+            // nestedObjectBuilder.property(assignment)
             return builder;
         }
         return super.handle(property, builder);
@@ -2217,15 +2303,52 @@ __webpack_require__.d(__webpack_exports__, {
 class SerializeObjectHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
     handle(property, builder) {
         if (property.type === _schema__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object) {
-            const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_2__.SlotPath("result.variable.object");
-            let objectBuilder = builder.get(slotPath.get());
+            const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_2__.SlotPath("assignments");
+            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
+                return builder;
+            }
+            const slot = builder.get(slotPath.get());
+            slot.assign(`${childPath}`, { name: `[${childPath}]` }).value("{}");
+            return builder;
+        }
+        return super.handle(property, builder);
+    }
+}
+
+
+}),
+"./src/codegen/handlers/serialize/SerializeSerializerHandler.ts": 
+/*!**********************************************************************!*\
+  !*** ./src/codegen/handlers/serialize/SerializeSerializerHandler.ts ***!
+  \**********************************************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  SerializeSerializerHandler: () => (SerializeSerializerHandler)
+});
+/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../types */ "./src/codegen/handlers/types.ts");
+
+class SerializeSerializerHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
+    handle(property, builder) {
+        if (property.valueSerializer != null) {
+            const objectBuilder = builder.getOrDefault("if");
+            const assignmentBuilder = builder.getOrDefault("functions");
+            const entitySelectorPath = property.getAssignmentPath({ parent: "entity" });
+            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 })));
             if (property.parent == null) {
-                objectBuilder.nested(property.name, property.name);
+                objectBuilder.if(`Object.hasOwn(entity, "${property.name}")`).appendBody(`${resultSelectorPath} = ${defaultFunctionWithParameters.builder.toCallable()}`);
                 return builder;
             }
-            slotPath.push(...property.getParentPathArray());
-            const nestedObjectBuilder = builder.get(slotPath.get());
-            nestedObjectBuilder.nested(property.name, property.name);
+            // TODO: SOLVE THIS
+            //const slotPath = new SlotPath(...property.getParentPathArray());
+            // const slotPath = new SlotPath(...property.getParentPathArray());
+            // objectBuilder = objectBuilder.get<ObjectBuilder>(slotPath.get());
+            // objectBuilder.property(`${property.name}: ${defaultFunctionWithParameters.builder.toCallable()}`);
             return builder;
         }
         return super.handle(property, builder);
@@ -2243,7 +2366,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   SerializeValueHandler: () => (SerializeValueHandler)
 });
-/* ESM import */var _SlotPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../SlotPath */ "./src/codegen/SlotPath.ts");
+/* ESM import */var _blocks__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../blocks */ "./src/codegen/blocks.ts");
 /* 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");
 
@@ -2252,20 +2375,24 @@ __webpack_require__.d(__webpack_exports__, {
 class SerializeValueHandler extends _types__WEBPACK_IMPORTED_MODULE_0__.PropertyInfoHandler {
     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 slot = builder.getOrDefault("if");
             const entitySelectorPath = property.getAssignmentPath({ parent: "entity" });
-            if (objectBuilder == null) {
-                objectBuilder = builder.get("result")
-                    .assign("const result", { name: "variable" })
-                    .object({ name: "object" });
-            }
+            const resultSelectorPath = property.getAssignmentPath({ parent: "result" });
             if (property.parent == null) {
-                objectBuilder.property(`${property.name}: ${entitySelectorPath}`);
+                // Only assign if the incoming entity has the property, this allows partial serialization
+                // Basically only serialize what is there
+                slot.if(`Object.hasOwn(entity, "${property.name}")`).appendBody(`${resultSelectorPath} = ${entitySelectorPath}`);
                 return builder;
             }
-            const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_2__.SlotPath(...property.getParentPathArray());
-            objectBuilder = objectBuilder.get(slotPath.get());
-            objectBuilder.property(`${property.name}: ${entitySelectorPath}`);
+            const parentSelectPath = ["entity", ...property.getParentPathArray()].join(".");
+            const parentAssignPath = ["result", ...property.getParentPathArray()].join(".");
+            const ifSlot = slot.if(`Object.hasOwn(${parentSelectPath}, "${property.name}")`);
+            if (property.parent.isNullable || property.parent.isOptional) {
+                // Do this for nullable/optional parents.  Parent will be null if its nullable/optional
+                const conditionallyCreateParent = new _blocks__WEBPACK_IMPORTED_MODULE_2__.IfBuilder(`${parentAssignPath} == null`).appendBody(`${parentAssignPath} = {}`);
+                ifSlot.appendBody(conditionallyCreateParent.toString());
+            }
+            ifSlot.appendBody(`${resultSelectorPath} = ${entitySelectorPath}`);
             return builder;
         }
         return super.handle(property, builder);
@@ -2451,11 +2578,10 @@ class PropertyInfoHandler {
         const useFromPropertyName = property.from != null;
         const entitySelectorPath = property.getAssignmentPath({ parent: "entity", useFromPropertyName });
         if (property.parent != null) {
-            const slotPath = new _SlotPath__WEBPACK_IMPORTED_MODULE_1__.SlotPath("factory", "function", "assignment");
+            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 builder = root.get(slotPath.get());
-            const objectBuilder = builder.getValue;
+            const objectBuilder = root.get(slotPath.get());
             const childEntityPathSelector = property.getSelectrorPath({ parent: "entity", useFromPropertyName });
             objectBuilder.property(`${property.name}: ${childEntityPathSelector}`);
             return;
@@ -2601,6 +2727,39 @@ class SchemaError extends Error {
 }
 
 
+}),
+"./src/performance/index.ts": 
+/*!**********************************!*\
+  !*** ./src/performance/index.ts ***!
+  \**********************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  measure: () => (measure),
+  now: () => (now)
+});
+const measurements = {};
+const now = () => {
+    if (typeof performance !== 'undefined' && performance.now) {
+        // Browser or modern Node.js
+        return performance.now();
+    }
+    // Fallback for older environments
+    return Date.now();
+};
+const measure = {
+    start: (name) => {
+        measurements[name] = now();
+    },
+    end: (name) => {
+        const start = measurements[name];
+        delete measurements[name];
+        const delta = now() - start;
+        console.log(`[ROUTIER] - Performance: ${name} took ${delta}`);
+    }
+};
+
+
 }),
 "./src/schema/PropertyInfo.ts": 
 /*!************************************!*\
@@ -2942,28 +3101,28 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
   SchemaDefinition: () => (SchemaDefinition)
 });
-/* ESM import */var _table_SchemaFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./table/SchemaFunction */ "./src/schema/table/SchemaFunction.ts");
-/* ESM import */var _table_SchemaComputed__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./table/SchemaComputed */ "./src/schema/table/SchemaComputed.ts");
-/* ESM import */var _property_base_SchemaBase__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./property/base/SchemaBase */ "./src/schema/property/base/SchemaBase.ts");
-/* ESM import */var _PropertyInfo__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./PropertyInfo */ "./src/schema/PropertyInfo.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_6__ = __webpack_require__(/*! ../codegen/handlers/EnrichmentHandlerBuilder */ "./src/codegen/handlers/EnrichmentHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_MergeHandlerBuilder__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../codegen/handlers/MergeHandlerBuilder */ "./src/codegen/handlers/MergeHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_PrepareHandlerBuilder__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../codegen/handlers/PrepareHandlerBuilder */ "./src/codegen/handlers/PrepareHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_StripHandlerBuilder__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../codegen/handlers/StripHandlerBuilder */ "./src/codegen/handlers/StripHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_CloneHandlerBuilder__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../codegen/handlers/CloneHandlerBuilder */ "./src/codegen/handlers/CloneHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_CompareHandlerBuilder__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../codegen/handlers/CompareHandlerBuilder */ "./src/codegen/handlers/CompareHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_DeserializeHandlerBuilder__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../codegen/handlers/DeserializeHandlerBuilder */ "./src/codegen/handlers/DeserializeHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_HashTypeHandlerBuilder__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../codegen/handlers/HashTypeHandlerBuilder */ "./src/codegen/handlers/HashTypeHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_IdSelectorHandlerBuilder__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../codegen/handlers/IdSelectorHandlerBuilder */ "./src/codegen/handlers/IdSelectorHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_HashHandlerBuilder__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../codegen/handlers/HashHandlerBuilder */ "./src/codegen/handlers/HashHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_EnableChangeTrackingHandlerBuilder__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../codegen/handlers/EnableChangeTrackingHandlerBuilder */ "./src/codegen/handlers/EnableChangeTrackingHandlerBuilder.ts");
-/* ESM import */var _codegen_handlers_FreezeHandlerBuilder__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../codegen/handlers/FreezeHandlerBuilder */ "./src/codegen/handlers/FreezeHandlerBuilder.ts");
+/* ESM import */var _table_SchemaFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./table/SchemaFunction */ "./src/schema/table/SchemaFunction.ts");
+/* 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_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");
+/* ESM import */var _codegen_handlers_StripHandlerBuilder__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../codegen/handlers/StripHandlerBuilder */ "./src/codegen/handlers/StripHandlerBuilder.ts");
+/* ESM import */var _codegen_handlers_CloneHandlerBuilder__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../codegen/handlers/CloneHandlerBuilder */ "./src/codegen/handlers/CloneHandlerBuilder.ts");
+/* ESM import */var _codegen_handlers_CompareHandlerBuilder__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../codegen/handlers/CompareHandlerBuilder */ "./src/codegen/handlers/CompareHandlerBuilder.ts");
+/* ESM import */var _codegen_handlers_DeserializeHandlerBuilder__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../codegen/handlers/DeserializeHandlerBuilder */ "./src/codegen/handlers/DeserializeHandlerBuilder.ts");
+/* ESM import */var _codegen_handlers_HashTypeHandlerBuilder__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../codegen/handlers/HashTypeHandlerBuilder */ "./src/codegen/handlers/HashTypeHandlerBuilder.ts");
+/* ESM import */var _codegen_handlers_IdSelectorHandlerBuilder__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../codegen/handlers/IdSelectorHandlerBuilder */ "./src/codegen/handlers/IdSelectorHandlerBuilder.ts");
+/* 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 _codegen_handlers_SerializeHandlerBuilder__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../codegen/handlers/SerializeHandlerBuilder */ "./src/codegen/handlers/SerializeHandlerBuilder.ts");
-/* ESM import */var _utilities__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utilities */ "./src/utilities/uuid.ts");
-/* ESM import */var _utilities__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../utilities */ "./src/utilities/strings.ts");
-/* ESM import */var _types__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./types */ "./src/schema/types.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 _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");
 
 
 
@@ -2985,54 +3144,10 @@ __webpack_require__.d(__webpack_exports__, {
 
 
 
-// This is intented to run the "OnMessage" event whenever we "send".  For context
-// when we make a change, we query to see if we have any changes.  We need to run a fetch because we could have 
-// many db sets
-class CollectionSubscription {
-    _channel;
-    _id = (0,_utilities__WEBPACK_IMPORTED_MODULE_0__.uuid)();
-    _callback = null;
-    constructor(id, signal) {
-        // The id is the computed id from the collection.  We need a static id so we can communicate across different
-        // instances of a data store
-        this._channel = new BroadcastChannel(`__routier-unidirectional-subscription-channel-${id}`);
-        this._channel.onmessage = (event) => {
-            const message = event.data;
-            if (message.id === this._id) {
-                return;
-            }
-            if (this._callback != null) {
-                this._callback(message.changes);
-            }
-        };
-        if (signal) {
-            signal.addEventListener("abort", () => {
-                this[Symbol.dispose]();
-            }, { once: true });
-        }
-    }
-    send(changes) {
-        const message = {
-            id: this._id,
-            changes
-        };
-        this._channel.postMessage(message);
-    }
-    onMessage(callback) {
-        this._callback = callback;
-    }
-    dispose() {
-        this[Symbol.dispose]();
-    }
-    [Symbol.dispose]() {
-        this._channel.onmessage = null;
-        this._channel.close();
-        this._channel = null;
-    }
-}
-class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODULE_1__.SchemaBase {
+
+class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODULE_0__.SchemaBase {
     instance;
-    type = _types__WEBPACK_IMPORTED_MODULE_2__.SchemaTypes.Definition;
+    type = _types__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Definition;
     collectionName;
     constructor(collectionName, schema) {
         super();
@@ -3043,8 +3158,8 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
     }
     modify(builder) {
         const b = {
-            function: (fn, injected) => new _table_SchemaFunction__WEBPACK_IMPORTED_MODULE_3__.SchemaFunction(fn, injected),
-            computed: (fn, injected) => new _table_SchemaComputed__WEBPACK_IMPORTED_MODULE_4__.SchemaComputed(fn, injected)
+            function: (fn, injected) => new _table_SchemaFunction__WEBPACK_IMPORTED_MODULE_2__.SchemaFunction(fn, injected),
+            computed: (fn, injected) => new _table_SchemaComputed__WEBPACK_IMPORTED_MODULE_3__.SchemaComputed(fn, injected)
         };
         const r = builder(b);
         return new SchemaDefinition(this.collectionName, { ...this.instance, ...r });
@@ -3056,7 +3171,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
         const properties = [];
         for (let i = 0; i < explore.length; i++) {
             const item = explore[i];
-            if (item.instance.type === _types__WEBPACK_IMPORTED_MODULE_2__.SchemaTypes.Definition) {
+            if (item.instance.type === _types__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Definition) {
                 explore.push({
                     path: null,
                     instance: item.instance.instance,
@@ -3071,8 +3186,8 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                 const previousParent = item.parents.length === 0
                     ? null
                     : item.parents[item.parents.length - 1].propertyInfo;
-                if (propertyInstance.type === _types__WEBPACK_IMPORTED_MODULE_2__.SchemaTypes.Object) {
-                    const propertyInfo = new _PropertyInfo__WEBPACK_IMPORTED_MODULE_5__.PropertyInfo(propertyInstance, key, previousParent);
+                if (propertyInstance.type === _types__WEBPACK_IMPORTED_MODULE_1__.SchemaTypes.Object) {
+                    const propertyInfo = new _PropertyInfo__WEBPACK_IMPORTED_MODULE_4__.PropertyInfo(propertyInstance, key, previousParent);
                     explore.push({
                         path: [item.path, key].filter((w) => w != null).join("."),
                         instance: propertyInstance.instance,
@@ -3089,7 +3204,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                     previousParent.children.push(propertyInfo);
                     continue;
                 }
-                const childPrimitivePropertyInfo = new _PropertyInfo__WEBPACK_IMPORTED_MODULE_5__.PropertyInfo(item.instance[key], key, previousParent);
+                const childPrimitivePropertyInfo = new _PropertyInfo__WEBPACK_IMPORTED_MODULE_4__.PropertyInfo(item.instance[key], key, previousParent);
                 if (previousParent === null) {
                     properties.push(childPrimitivePropertyInfo);
                     continue;
@@ -3179,19 +3294,19 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             const schema = this;
             const properties = [];
             const propertyMap = new Map();
-            const enrichmentHandlerBuilder = new _codegen_handlers_EnrichmentHandlerBuilder__WEBPACK_IMPORTED_MODULE_6__.EnrichmentHandlerBuilder();
-            const mergeHandlerFactory = new _codegen_handlers_MergeHandlerBuilder__WEBPACK_IMPORTED_MODULE_7__.MergeHandlerBuilder();
-            const prepareHandlerBuilder = new _codegen_handlers_PrepareHandlerBuilder__WEBPACK_IMPORTED_MODULE_8__.PrepareHandlerBuilder();
-            const stripHandlerBuilder = new _codegen_handlers_StripHandlerBuilder__WEBPACK_IMPORTED_MODULE_9__.StripHandlerBuilder();
-            const cloneHandlerBuilder = new _codegen_handlers_CloneHandlerBuilder__WEBPACK_IMPORTED_MODULE_10__.CloneHandlerBuilder();
-            const compareHandlerBuilder = new _codegen_handlers_CompareHandlerBuilder__WEBPACK_IMPORTED_MODULE_11__.CompareHandlerBuilder();
-            const deserializeHandlerBuilder = new _codegen_handlers_DeserializeHandlerBuilder__WEBPACK_IMPORTED_MODULE_12__.DeserializeHandlerBuilder();
-            const hashTypeHandlerBuilder = new _codegen_handlers_HashTypeHandlerBuilder__WEBPACK_IMPORTED_MODULE_13__.HashTypeHandlerBuilder();
-            const idSelectorHandlerBuilder = new _codegen_handlers_IdSelectorHandlerBuilder__WEBPACK_IMPORTED_MODULE_14__.IdSelectorHandlerBuilder();
-            const hashHandlerBuilder = new _codegen_handlers_HashHandlerBuilder__WEBPACK_IMPORTED_MODULE_15__.HashHandlerBuilder();
-            const enableChangeTrackingHandlerBuilder = new _codegen_handlers_EnableChangeTrackingHandlerBuilder__WEBPACK_IMPORTED_MODULE_16__.EnableChangeTrackingHandlerBuilder();
-            const freezeHandlerBuilder = new _codegen_handlers_FreezeHandlerBuilder__WEBPACK_IMPORTED_MODULE_17__.FreezeHandlerBuilder();
-            const serializeHandlerBuilder = new _codegen_handlers_SerializeHandlerBuilder__WEBPACK_IMPORTED_MODULE_18__.SerializeHandlerBuilder();
+            const enrichmentHandlerBuilder = new _codegen_handlers_EnrichmentHandlerBuilder__WEBPACK_IMPORTED_MODULE_5__.EnrichmentHandlerBuilder();
+            const mergeHandlerFactory = new _codegen_handlers_MergeHandlerBuilder__WEBPACK_IMPORTED_MODULE_6__.MergeHandlerBuilder();
+            const prepareHandlerBuilder = new _codegen_handlers_PrepareHandlerBuilder__WEBPACK_IMPORTED_MODULE_7__.PrepareHandlerBuilder();
+            const stripHandlerBuilder = new _codegen_handlers_StripHandlerBuilder__WEBPACK_IMPORTED_MODULE_8__.StripHandlerBuilder();
+            const cloneHandlerBuilder = new _codegen_handlers_CloneHandlerBuilder__WEBPACK_IMPORTED_MODULE_9__.CloneHandlerBuilder();
+            const compareHandlerBuilder = new _codegen_handlers_CompareHandlerBuilder__WEBPACK_IMPORTED_MODULE_10__.CompareHandlerBuilder();
+            const deserializeHandlerBuilder = new _codegen_handlers_DeserializeHandlerBuilder__WEBPACK_IMPORTED_MODULE_11__.DeserializeHandlerBuilder();
+            const hashTypeHandlerBuilder = new _codegen_handlers_HashTypeHandlerBuilder__WEBPACK_IMPORTED_MODULE_12__.HashTypeHandlerBuilder();
+            const idSelectorHandlerBuilder = new _codegen_handlers_IdSelectorHandlerBuilder__WEBPACK_IMPORTED_MODULE_13__.IdSelectorHandlerBuilder();
+            const hashHandlerBuilder = new _codegen_handlers_HashHandlerBuilder__WEBPACK_IMPORTED_MODULE_14__.HashHandlerBuilder();
+            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 enricher = enrichmentHandlerBuilder.build();
             const merge = mergeHandlerFactory.build();
             const prepare = prepareHandlerBuilder.build();
@@ -3205,15 +3320,15 @@ 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_19__.CodeBuilder();
+            const changeTrackingCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.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_19__.CodeBuilder();
+            const freezeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
             freezeCodeBuilder.slot("assignment");
             freezeCodeBuilder.slot("return").raw('\treturn Object.freeze(entity);');
-            const enricherCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            const enricherCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.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()}`);
@@ -3224,7 +3339,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             enricherFunctionBody.slot("ifs");
             enricherFunctionBody.slot("tracking").if('changeTrackingType === "immutable"', { name: "freeze" });
             enricherFunctionBody.raw('\treturn enableChangeTracking(enriched);');
-            const mergeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            const mergeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.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")
@@ -3243,34 +3358,40 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
     unpause();
 
     return destination;`);
-            const prepareCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            const prepareCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
             prepareCodeBuilder.slot("result");
             prepareCodeBuilder.slot("assignments");
             prepareCodeBuilder.slot("return").raw(`     return result;`);
-            const stripCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            const stripCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
             stripCodeBuilder.slot("result");
             stripCodeBuilder.slot("return").raw(`     return result;`);
-            const cloneCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
-            cloneCodeBuilder.slot("result");
+            const cloneCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.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_19__.CodeBuilder();
+            const compareCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
             compareCodeBuilder.slot("result");
             compareCodeBuilder.slot("return").raw(`     return result;`);
-            const deserializeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            const deserializeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
+            deserializeCodeBuilder.slot("functions");
             deserializeCodeBuilder.slot("result");
             deserializeCodeBuilder.slot("if");
             deserializeCodeBuilder.slot("return").raw(`     return result;`);
-            const serializeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
-            serializeCodeBuilder.slot("result");
+            const serializeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.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_19__.CodeBuilder();
+            const idSelectorCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
             idSelectorCodeBuilder.slot("result");
             idSelectorCodeBuilder.slot("return").raw(`     return result;`);
-            const hashTypeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            const hashTypeCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
             hashTypeCodeBuilder.slot("ifs");
             hashTypeCodeBuilder.slot("return").raw(`     return "Ids";`);
-            const hashCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_19__.CodeBuilder();
+            const hashCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
             hashCodeBuilder.slot("functions").raw(`
     function stringifyDate(d) {
 
@@ -3296,7 +3417,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             hashCodeBuilder.raw(`   return result;`);
             const idProperties = [];
             const allPropertyNamesAndPaths = [];
-            let hashType = _types__WEBPACK_IMPORTED_MODULE_2__.HashType.Ids;
+            let hashType = _types__WEBPACK_IMPORTED_MODULE_1__.HashType.Ids;
             let hasIdentities = false;
             let hasIdentityKeys = false;
             this._iterate(schema, (property) => {
@@ -3352,13 +3473,12 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             const idPropertyNames = idProperties.map(w => w.name);
             const getId = (entity) => {
                 if (idPropertyNames.length > 1) {
-                    return hashFunction(entity, _types__WEBPACK_IMPORTED_MODULE_2__.HashType.Ids);
+                    return hashFunction(entity, _types__WEBPACK_IMPORTED_MODULE_1__.HashType.Ids);
                 }
                 return getIdsFunction(entity)[0];
             };
             const getProperty = (id) => propertyMap.get(id);
-            const id = (0,_utilities__WEBPACK_IMPORTED_MODULE_20__.hash)([...allPropertyNamesAndPaths, this.collectionName].join(","));
-            const paths = new Set(properties.map(x => x.getAssignmentPath()));
+            const id = (0,_utilities__WEBPACK_IMPORTED_MODULE_19__.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) => {
@@ -3374,7 +3494,7 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
                 return item;
             };
             return {
-                createSubscription: (signal) => new CollectionSubscription(id, signal),
+                createSubscription: (signal) => new _communication_broadcast__WEBPACK_IMPORTED_MODULE_20__.SchemaSubscription(id, signal),
                 getId,
                 getProperty,
                 properties,
@@ -3493,6 +3613,124 @@ const s = {
 };
 
 
+}),
+"./src/schema/communication/broadcast.ts": 
+/*!***********************************************!*\
+  !*** ./src/schema/communication/broadcast.ts ***!
+  \***********************************************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+  SchemaSubscription: () => (SchemaSubscription)
+});
+/* ESM import */var _performance__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../performance */ "./src/performance/index.ts");
+/* ESM import */var _utilities__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../utilities */ "./src/utilities/uuid.ts");
+
+
+const registry = {};
+const getChannelRegistry = (schemaId) => {
+    if (registry[schemaId]) {
+        return registry[schemaId];
+    }
+    const channel = new SchemaChannel(schemaId);
+    registry[schemaId] = channel;
+    return channel;
+};
+// Must have a sender and receiver.  Sender cannot listen for it's own message
+class SchemaChannel {
+    sender;
+    receiver;
+    constructor(schemaId) {
+        this.sender = new SchemaChannelSender(schemaId);
+        this.receiver = new SchemaChannelReceiver(schemaId);
+    }
+}
+class SchemaChannelSender {
+    broadcastChannel;
+    constructor(schemaId) {
+        this.broadcastChannel = new BroadcastChannel(`__routier-schema-subscription-channel:${schemaId}`);
+    }
+    send(changes) {
+        this.broadcastChannel.postMessage(changes);
+    }
+}
+class SchemaChannelReceiver {
+    broadcastChannel;
+    subscriptions = [];
+    constructor(schemaId) {
+        this.broadcastChannel = new BroadcastChannel(`__routier-schema-subscription-channel:${schemaId}`);
+        this.broadcastChannel.onmessage = (e) => {
+            // We can't send to the same instance it is not possbile
+            const stampedChanges = e.data;
+            for (let i = 0, length = this.subscriptions.length; i < length; i++) {
+                const subscription = this.subscriptions[i];
+                subscription.action(stampedChanges);
+            }
+        };
+    }
+    addListener(id, listener) {
+        this.subscriptions.push(new SubscriptionListener(id, listener));
+    }
+    removeListeners(id) {
+        this.subscriptions = this.subscriptions.filter(w => w.id !== id);
+    }
+}
+class SubscriptionListener {
+    id;
+    listener;
+    constructor(id, listener) {
+        this.id = id;
+        this.listener = listener;
+    }
+    action(changes) {
+        this.listener(changes);
+    }
+}
+class SchemaSubscription {
+    id;
+    schemaId;
+    createdAt;
+    constructor(schemaId, signal) {
+        this.createdAt = (0,_performance__WEBPACK_IMPORTED_MODULE_0__.now)();
+        this.id = (0,_utilities__WEBPACK_IMPORTED_MODULE_1__.uuid)(8);
+        this.schemaId = schemaId;
+        signal?.addEventListener("abort", () => {
+            this.dispose();
+        }, { once: true });
+    }
+    send(changes) {
+        const regisry = getChannelRegistry(this.schemaId);
+        // 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,
+            timestamp: (0,_performance__WEBPACK_IMPORTED_MODULE_0__.now)()
+        });
+    }
+    onMessage(callback) {
+        const regisry = getChannelRegistry(this.schemaId);
+        // 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);
+        });
+    }
+    dispose() {
+        this[Symbol.dispose]();
+    }
+    [Symbol.dispose]() {
+        const regisry = getChannelRegistry(this.schemaId);
+        // Remove listeners for this instance only
+        regisry.receiver.removeListeners(this.id);
+    }
+}
+
+
 }),
 "./src/schema/property/base/SchemaBase.ts": 
 /*!************************************************!*\
@@ -3967,7 +4205,7 @@ class SchemaSerialize extends _base_SchemaBase__WEBPACK_IMPORTED_MODULE_0__.Sche
         this.instance = current.instance;
         this.valueSerializer = serializer;
     }
-    deserializer(deserializer) {
+    deserialize(deserializer) {
         return new _SchemaDeserialize__WEBPACK_IMPORTED_MODULE_1__.SchemaDeserialize(deserializer, this);
     }
 }