@routier/core 0.0.1-alpha.3 → 0.0.1

package/dist/index.js

@@ -21,7 +21,13 @@ function assertDate(data) {
 }
 function assertIsNotNull(data, message) {
     if (data == null) {
-        throw new TypeError(message ?? 'Assertion failed, data is null');
+        if (message == null) {
+            throw new TypeError('Assertion failed, data is null');
+        }
+        if (typeof message === "string") {
+            throw new TypeError(message);
+        }
+        throw new TypeError(message());
     }
 }
 function assertIsArray(data, message) {
@@ -541,15 +547,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;
     }
 }
@@ -590,10 +600,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");
+
 
 
 
@@ -604,10 +616,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;
     }
 }
@@ -868,18 +881,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;
     }
 }
@@ -915,6 +932,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": 
 /*!**********************************************************!*\
@@ -925,24 +979,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);
@@ -960,7 +1004,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");
 
@@ -968,21 +1012,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);
@@ -1123,6 +1166,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": 
 /*!************************************************************************!*\
@@ -1452,7 +1536,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;
         }
@@ -1471,22 +1555,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);
@@ -2217,8 +2308,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}`;
@@ -2232,12 +2322,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);
@@ -2264,15 +2356,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);
@@ -2290,7 +2419,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");
 
@@ -2299,20 +2428,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);
@@ -2498,11 +2631,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;
@@ -3289,6 +3421,7 @@ const ERROR_MESSAGES = {
     PROPERTY_NOT_FOUND: (path) => `Error parsing query, could not find PropertyInfo for path: ${path}`,
     PARAM_PATH_NOT_FOUND: (value, params) => `Cannot find path in params for .where(). Make sure parameters are not used inline.\r\nPath: ${value}, Params: ${JSON.stringify(params)}`
 };
+const STRINGIFIED_COMPARE_OPERATORS = ["true", "false"];
 const combineExpressions = (...expressions) => {
     if (expressions.length === 0) {
         throw new Error("combineExpressions requires at least 1 expression");
@@ -3490,8 +3623,11 @@ const parseCondition = (schema, expression, params) => {
             // This is a parameter path on the left side (e.g., params.distinctPlayers.includes(entity.playerId))
             // For includes method, we need to swap left and right sides
             if (methodMatch[2] === 'includes') {
-                comparator.left = getValue(leftSide, params);
-                comparator.right = getProperty(schema, rightSide);
+                const property = getProperty(schema, rightSide);
+                const value = getValue(leftSide, params); // retrieve the original value
+                const serializer = property.property.valueSerializer;
+                comparator.left = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+                comparator.right = property;
             }
             else {
                 // For other methods, return NOT_PARSABLE for now
@@ -3500,8 +3636,11 @@ const parseCondition = (schema, expression, params) => {
         }
         else {
             // Normal case: property on left, value on right
-            comparator.left = getProperty(schema, leftSide);
-            comparator.right = getValue(rightSide, params);
+            const property = getProperty(schema, leftSide);
+            const serializer = property.property.valueSerializer;
+            const value = getValue(rightSide, params); // retrieve the original value
+            comparator.left = property;
+            comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
         }
         // If the comparison is explicitly to false, mark it as negated
         if (methodMatch[6] === "false") {
@@ -3516,10 +3655,13 @@ const parseCondition = (schema, expression, params) => {
         if (isNegation) {
             comparator.negated = isNegation;
         }
+        const property = getProperty(schema, valueTransformMatch[1].trim());
+        const serializer = property.property.valueSerializer;
+        const value = getValue(valueTransformMatch[3], params); // retrieve the original value
         // Create the property expression for the left side (no transformer)
-        const propertyExpression = getProperty(schema, valueTransformMatch[1].trim());
+        const propertyExpression = property;
         // Create a ValueExpression for the right side with transformer
-        const valueExpression = getValue(valueTransformMatch[3], params);
+        const valueExpression = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
         // Set transformer and locale based on the method
         const method = valueTransformMatch[4];
         if (method === 'toLowerCase' || method === 'toLocaleLowerCase') {
@@ -3545,47 +3687,48 @@ const parseCondition = (schema, expression, params) => {
             comparator.negated = isNegation;
         }
         // Create the property expression for the left side with transformer
-        const propertyExpression = getProperty(schema, transformMethodMatch[1]);
+        const property = getProperty(schema, transformMethodMatch[1]);
         // Set transformer and locale based on the method
         const method = transformMethodMatch[2];
         if (method === 'toLowerCase' || method === 'toLocaleLowerCase') {
-            propertyExpression.transformer = 'to-lower-case';
+            property.transformer = 'to-lower-case';
             if (method === 'toLocaleLowerCase') {
-                propertyExpression.locale = 'en-US'; // Default locale, could be extracted from method call
+                property.locale = 'en-US'; // Default locale, could be extracted from method call
             }
         }
         else {
-            propertyExpression.transformer = 'to-upper-case';
+            property.transformer = 'to-upper-case';
             if (method === 'toLocaleUpperCase') {
-                propertyExpression.locale = 'en-US'; // Default locale, could be extracted from method call
+                property.locale = 'en-US'; // Default locale, could be extracted from method call
             }
         }
         // Create a ValueExpression for the right side
-        let valueExpression = getValue(transformMethodMatch[4], params);
+        let value = getValue(transformMethodMatch[4], params);
         // Check if the value also has a transformation (but only if it's not already handled by value-side check)
         const valueTransformMatch = transformMethodMatch[4].match(/^([^)]+)\.(toLowerCase|toUpperCase|toLocaleLowerCase|toLocaleUpperCase)\(\)$/);
         if (valueTransformMatch) {
             // Create a new ValueExpression with the base value and transformer
-            valueExpression = new _types__WEBPACK_IMPORTED_MODULE_0__.ValueExpression({
+            value = new _types__WEBPACK_IMPORTED_MODULE_0__.ValueExpression({
                 value: valueTransformMatch[1].replace(/^["']|["']$/g, '') // Remove quotes
             });
             // Set transformer and locale based on the method
             const valueMethod = valueTransformMatch[2];
             if (valueMethod === 'toLowerCase' || valueMethod === 'toLocaleLowerCase') {
-                valueExpression.transformer = 'to-lower-case';
+                value.transformer = 'to-lower-case';
                 if (valueMethod === 'toLocaleLowerCase') {
-                    valueExpression.locale = 'en-US'; // Default locale
+                    value.locale = 'en-US'; // Default locale
                 }
             }
             else {
-                valueExpression.transformer = 'to-upper-case';
+                value.transformer = 'to-upper-case';
                 if (valueMethod === 'toLocaleUpperCase') {
-                    valueExpression.locale = 'en-US'; // Default locale
+                    value.locale = 'en-US'; // Default locale
                 }
             }
         }
-        comparator.left = propertyExpression;
-        comparator.right = valueExpression;
+        const serializer = property.property.valueSerializer;
+        comparator.left = property;
+        comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
         // If the comparison is explicitly to false, mark it as negated
         if (transformMethodMatch[7] === "false") {
             comparator.negated = true;
@@ -3622,8 +3765,11 @@ const parseCondition = (schema, expression, params) => {
         if (isNegation) {
             comparator.negated = isNegation;
         }
-        comparator.left = getProperty(schema, propertySide);
-        comparator.right = getValue(valueSide, params);
+        const property = getProperty(schema, propertySide);
+        const value = getValue(valueSide, params);
+        const serializer = property.property.valueSerializer;
+        comparator.left = property;
+        comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
         convertAndAssignValue(comparator.right, comparator.left);
         return comparator;
     }
@@ -3657,11 +3803,30 @@ const parseCondition = (schema, expression, params) => {
         if (isNegation) {
             comparator.negated = isNegation;
         }
-        comparator.left = getProperty(schema, propertySide);
-        comparator.right = getValue(valueSide, params);
+        const property = getProperty(schema, propertySide);
+        const value = getValue(valueSide, params);
+        const serializer = property.property.valueSerializer;
+        comparator.left = property;
+        comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
         convertAndAssignValue(comparator.right, comparator.left);
         return comparator;
     }
+    // Check for standalone property reference (truthy comparison)
+    // Pattern: property name only (e.g., "w.inStock" -> w.inStock === true)
+    const standalonePropertyMatch = finalExpression.match(/^[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*)*$/);
+    if (standalonePropertyMatch && isPropertyPath(finalExpression)) {
+        const comparator = getComparator('===');
+        if (isNegation) {
+            comparator.negated = isNegation;
+        }
+        const property = getProperty(schema, finalExpression);
+        const value = getValue('true', params);
+        const serializer = property.property.valueSerializer;
+        comparator.left = property;
+        // need to parse the value so it matches what the serializer expects
+        comparator.right = serializer ? getValue(String(property.property.valueSerializer(JSON.parse(value.value)))) : value;
+        return comparator;
+    }
     // If we get here, the expression is too complex for the current parser
     // This is expected for complex real-world expressions
     throw new Error(`Unsupported expression format: ${finalExpression}`);
@@ -3721,6 +3886,17 @@ const getValue = (value, params) => {
             }
         }
     }
+    if (STRINGIFIED_COMPARE_OPERATORS.includes(value)) {
+        return new _types__WEBPACK_IMPORTED_MODULE_0__.ValueExpression({ value });
+    }
+    if (isNaN(numValue)) {
+        // value is a variable passed in by the dev, we cannot evaluate it's value
+        // need to fallback to select all by throwing an error
+        throw new Error(`Cannot derive value from variable, please pass parameters into the expression.
+
+Example: .where(([x, params]) => x.id === params.id, { id: someVar.id })
+Issue At: ${value}`);
+    }
     // Default case: return as-is
     return new _types__WEBPACK_IMPORTED_MODULE_0__.ValueExpression({ value });
 };
@@ -4511,7 +4687,11 @@ class EphemeralDataPlugin {
                     done(_results__WEBPACK_IMPORTED_MODULE_1__.PluginEventResult.error(event.id, r.error));
                     return;
                 }
-                const translated = translator.translate(collection.records);
+                const cloned = [];
+                for (let i = 0, length = collection.records.length; i < length; i++) {
+                    cloned.push(event.operation.schema.clone(collection.records[i]));
+                }
+                const translated = translator.translate(cloned);
                 done(_results__WEBPACK_IMPORTED_MODULE_1__.PluginEventResult.success(event.id, translated));
             });
         }
@@ -5589,6 +5769,9 @@ class JsonTranslator extends _DataTranslator__WEBPACK_IMPORTED_MODULE_0__.DataTr
     }
     sum(data, _) {
         (0,_assertions__WEBPACK_IMPORTED_MODULE_1__.assertIsArray)(data, this._formatDataNotArrayError("sum"));
+        if (data.length === 0) {
+            throw new Error("Cannot perform operation on empty array, result query contains no data");
+        }
         const map = this.query.options.getLast("map");
         let sum = 0;
         const field = this._getSelectionField("sum", map);
@@ -5684,15 +5867,26 @@ __webpack_require__.d(__webpack_exports__, {
 
 class SqlTranslator extends _DataTranslator__WEBPACK_IMPORTED_MODULE_0__.DataTranslator {
     count(data, _) {
+        if (Array.isArray(data) && data.length > 0) {
+            // Count should be returned as the property alias on the query
+            return data[0].count;
+        }
         return data;
     }
     min(data, _) {
-        return data;
+        return this.shapeResult(data);
     }
     max(data, _) {
-        return data;
+        return this.shapeResult(data);
     }
     sum(data, _) {
+        return this.shapeResult(data);
+    }
+    shapeResult(data) {
+        if (Array.isArray(data) && data.length > 0) {
+            // Shape the result
+            return data[0];
+        }
         return data;
     }
     distinct(data, _) {
@@ -5710,8 +5904,29 @@ class SqlTranslator extends _DataTranslator__WEBPACK_IMPORTED_MODULE_0__.DataTra
     sort(data, _) {
         return data;
     }
-    map(data, _) {
-        return data;
+    map(data, option) {
+        if (Array.isArray(data) == false) {
+            throw new Error("Can only map an array of data");
+        }
+        if (this.query.options.has("count") && data.length === 1) {
+            // data here is the shape of { count: number }[] and will map to nothing.  
+            // Return the original data and let count take care of this
+            return data;
+        }
+        const response = [];
+        for (let i = 0, length = data.length; i < length; i++) {
+            for (let j = 0, l = option.value.fields.length; j < l; j++) {
+                const field = option.value.fields[j];
+                if (field.property != null) {
+                    const value = field.property.getValue(data[i]);
+                    if (value != null) {
+                        field.property.setValue(data[i], field.property.deserialize(value));
+                    }
+                }
+            }
+            response.push(option.value.selector(data[i]));
+        }
+        return response;
     }
 }
 
@@ -6473,17 +6688,23 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             stripCodeBuilder.slot("result");
             stripCodeBuilder.slot("return").raw(`     return result;`);
             const cloneCodeBuilder = new _codegen__WEBPACK_IMPORTED_MODULE_18__.CodeBuilder();
-            cloneCodeBuilder.slot("result");
+            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();
             compareCodeBuilder.slot("result");
             compareCodeBuilder.slot("return").raw(`     return result;`);
             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_18__.CodeBuilder();
-            serializeCodeBuilder.slot("result");
+            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();
@@ -6580,7 +6801,6 @@ class SchemaDefinition extends _property_base_SchemaBase__WEBPACK_IMPORTED_MODUL
             };
             const getProperty = (id) => propertyMap.get(id);
             const id = (0,_utilities__WEBPACK_IMPORTED_MODULE_19__.hash)([...allPropertyNamesAndPaths, this.collectionName].join(","));
-            const paths = new Set(properties.map(x => x.getAssignmentPath()));
             // memoize this by the validProperties
             // TODO: See if we can generate a function to do this and eliminate loops
             const deserializePartial = (item, properties) => {
@@ -7357,7 +7577,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);
     }
 }