@routier/core 0.0.1-alpha.3 → 0.0.2

package/dist/plugins/translators/SqlTranslator.d.ts

@@ -5,10 +5,11 @@ export declare class SqlTranslator<TRoot extends {}, TShape> extends DataTransla
     min<TResult extends string | number | Date>(data: unknown, _: QueryOption<TShape, "min">): TResult;
     max<TResult extends string | number | Date>(data: unknown, _: QueryOption<TShape, "max">): TResult;
     sum<TResult extends number>(data: unknown, _: QueryOption<TShape, "sum">): TResult;
+    private shapeResult;
     distinct<TResult>(data: unknown, _: QueryOption<TShape, "distinct">): TResult;
     filter<TResult>(data: unknown, _: QueryOption<TShape, "filter">): TResult;
     skip(data: unknown, _: QueryOption<TShape, "skip">): TShape;
     take(data: unknown, _: QueryOption<TShape, "take">): TShape;
     sort(data: unknown, _: QueryOption<TShape, "sort">): TShape;
-    map(data: unknown, _: QueryOption<TShape, "map">): TShape;
+    map(data: unknown, option: QueryOption<TShape, "map">): TShape;
 }

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;
@@ -3240,17 +3366,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();
@@ -3347,7 +3479,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) => {
@@ -4074,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);
     }
 }