@punks/backend-entity-manager 0.0.355 → 0.0.357

package/dist/cjs/index.js

@@ -234,17 +234,20 @@ class EntitySerializer {
         return records.map((x, i) => this.convertSheetRecord(x, definition, i));
     }
     convertSheetRecord(record, definition, rowIndex) {
-        if (!record._type || record._type !== this.entityName) {
+        if (this.options?.useTypeColumn &&
+            (!record._type || record._type !== this.entityName)) {
             throw new Error(`Invalid record type ${record._type} -> record: \n${JSON.stringify(record)}`);
         }
         const entity = {};
         for (const column of definition.columns) {
             if (column.parseAction) {
                 column.parseAction(record[column.name], entity);
+                continue;
             }
-            else {
-                entity[column.selector] = this.parseColumnValue(record, column);
+            if (typeof column.selector === "function") {
+                throw new Error("Function selectors are not supported with parseAction specified");
             }
+            entity[column.selector] = this.parseColumnValue(record, column);
         }
         const validationErrors = [];
         for (const column of definition.columns) {
@@ -253,13 +256,19 @@ class EntitySerializer {
                 if (!result.isValid) {
                     validationErrors.push({
                         errorCode: validator.key,
+                        column: {
+                            name: column.name,
+                            key: column.key,
+                        },
                     });
                 }
             }
         }
         const idField = definition.columns.find((x) => x.idColumn || x.selector === "id");
         return {
-            id: idField ? entity[idField.selector] : undefined,
+            id: idField
+                ? this.selectColumnValue(entity, idField.selector)
+                : undefined,
             item: entity,
             rowIndex,
             status: {
@@ -354,10 +363,14 @@ class EntitySerializer {
                     fileName,
                     contentType: "text/csv",
                     content: Buffer.from(backendCore.csvBuild(data, [
-                        {
-                            name: "_type",
-                            value: () => this.entityName,
-                        },
+                        ...(this.options?.useTypeColumn
+                            ? [
+                                {
+                                    name: "_type",
+                                    value: () => this.entityName,
+                                },
+                            ]
+                            : []),
                         ...definition.columns.map((c) => ({
                             name: c.name,
                             value: (item) => this.getColumnValue(item, c),
@@ -395,11 +408,14 @@ class EntitySerializer {
         }
     }
     getColumnValue(item, definition) {
-        const rawValue = item[definition.selector];
+        const rawValue = this.selectColumnValue(item, definition.selector);
         return definition.converter
             ? definition.converter(rawValue, item)
             : rawValue;
     }
+    selectColumnValue(item, selector) {
+        return typeof selector === "function" ? selector(item) : item[selector];
+    }
     buildExportFileName(input) {
         return `${input.refDate.toISOString().replaceAll(":", "_")}_${this.entityName}.${input.format}`;
     }
@@ -34841,12 +34857,26 @@ class AppExceptionsFilterBase {
     }
 }
 
+class EntityParseValidationColumn {
+}
+__decorate([
+    swagger.ApiProperty(),
+    __metadata("design:type", String)
+], EntityParseValidationColumn.prototype, "name", void 0);
+__decorate([
+    swagger.ApiProperty(),
+    __metadata("design:type", String)
+], EntityParseValidationColumn.prototype, "key", void 0);
 class EntityParseValidationError {
 }
 __decorate([
     swagger.ApiProperty(),
     __metadata("design:type", String)
 ], EntityParseValidationError.prototype, "errorCode", void 0);
+__decorate([
+    swagger.ApiProperty(),
+    __metadata("design:type", EntityParseValidationColumn)
+], EntityParseValidationError.prototype, "column", void 0);
 class EntityParseStatus {
 }
 __decorate([