@punks/backend-entity-manager 0.0.437 → 0.0.439

package/dist/cjs/types/base/serializer.d.ts

@@ -1,11 +1,16 @@
 /// <reference types="node" />
 import { EntitySerializationFormat, IEntitySerializer } from "../abstractions";
-import { EntityExportFile, EntitySerializerSheetDefinition, ImportEntry } from "../abstractions/serializer";
+import { EntityExportFile, EntitySerializerColumnDefinition, EntitySerializerSheetDefinition, ImportEntry } from "../abstractions/serializer";
 import { EntityServiceLocator } from "../providers/services";
 import { EntityReference } from "../models";
 export type EntitySerializerOptions = {
     delimiter?: string;
 };
+export type ParseColumnValueInput<TSheetItem> = {
+    row: any;
+    columnName: string;
+    parser: EntitySerializerColumnDefinition<TSheetItem>["parser"];
+};
 export declare abstract class EntitySerializer<TEntity, TEntityId, TEntitySearchParameters, TSheetItem, TContext, TPayload = unknown> implements IEntitySerializer<TEntity, TEntityId, TEntitySearchParameters, TSheetItem> {
     protected readonly services: EntityServiceLocator<TEntity, TEntityId>;
     protected readonly options?: EntitySerializerOptions | undefined;

package/dist/esm/index.js

@@ -274,7 +274,7 @@ class EntitySerializer {
         }
         const entity = (definition.autoColumns ? { ...record } : {});
         for (const column of definition.columns) {
-            const columnName = [column.name, ...(column?.aliases ?? [])].find((x) => x in record) ?? "";
+            const columnName = [column.name, ...(column?.aliases ?? [])].find((x) => normalizeSheetColumn(x) in record) ?? null;
             console.log("name", columnName);
             console.log("record", entity);
             if (!columnName)
@@ -286,13 +286,18 @@ class EntitySerializer {
             if (typeof column.selector === "function") {
                 throw new Error("Function selectors are not supported with parseAction specified");
             }
-            const parsedColumn = this.parseColumnValue(record, column);
+            const parsedColumn = this.parseColumnValue({
+                row: record,
+                columnName,
+                parser: column.parser,
+            });
+            console.log("parsed", parsedColumn);
             entity[column.selector] = column.array
                 ? splitArrayColumn(parsedColumn, column.arraySeparator)
                     .map((x) => applyModifiers(x, column.modifiers))
                     .filter((x) => isValidValue(x))
                 : applyModifiers(parsedColumn, column.modifiers);
-            delete entity[column.name];
+            delete entity[columnName];
         }
         const validationErrors = [];
         for (const column of definition.columns) {
@@ -325,10 +330,9 @@ class EntitySerializer {
             },
         };
     }
-    parseColumnValue(row, definition) {
-        const columnName = normalizeSheetColumn(definition.name);
-        const rawValue = row[columnName];
-        return definition.parser ? definition.parser(rawValue) : rawValue;
+    parseColumnValue({ row, columnName, parser, }) {
+        const value = row[normalizeSheetColumn(columnName)];
+        return parser ? parser(value) : value;
     }
     async createSample(format) {
         return await this.buildSampleFile(format);