@adminforth/import-export 1.5.4 → 1.6.1

package/dist/index.js

@@ -7,8 +7,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters, AdminForthDataTypes, rejectApiRawFilters, interpretResource, ActionCheckSource, AllowedActionsEnum } from "adminforth";
+import { AdminForthPlugin, parseBody, suggestIfTypo, AdminForthFilterOperators, Filters, AdminForthDataTypes, rejectApiRawFilters, interpretResource, ActionCheckSource, AllowedActionsEnum } from "adminforth";
 import pLimit from 'p-limit';
+import { z } from "zod";
+const exportCsvBodySchema = z.object({
+    filters: z.any(),
+    sort: z.any(),
+}).strict();
+const importCsvBodySchema = z.object({
+    data: z.record(z.string(), z.array(z.unknown())),
+}).strict();
 export default class ImportExport extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
@@ -113,8 +121,12 @@ export default class ImportExport extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/export-csv`,
-            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers }) {
-                const { filters, sort } = body;
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, headers, response }) {
+                const parsed = parseBody(exportCsvBodySchema, body, response);
+                if ('error' in parsed)
+                    return parsed.error;
+                const payload = parsed.data;
+                const { filters, sort } = payload;
                 if (!filters || !sort) {
                     return { ok: false, error: 'Missing filters or sort in request body' };
                 }
@@ -146,7 +158,14 @@ export default class ImportExport extends AdminForthPlugin {
                 });
                 const fields = columns.map((col) => col.name);
                 const rows = data.data.map((row) => {
-                    return columns.map((col) => row[col.name]);
+                    return columns.map((col) => {
+                        var _a;
+                        const value = row[col.name];
+                        if (col.type === AdminForthDataTypes.JSON || ((_a = col.isArray) === null || _a === void 0 ? void 0 : _a.enabled)) {
+                            return value == null ? value : JSON.stringify(value);
+                        }
+                        return value;
+                    });
                 });
                 this.tryToAuditLogAction('export', `Export CSV with filters: ${JSON.stringify(filters)} and sort: ${JSON.stringify(sort)}. Total records: ${rows.length}`, adminUser, headers);
                 return {
@@ -161,7 +180,11 @@ export default class ImportExport extends AdminForthPlugin {
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/import-csv`,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, query, headers, cookies, requestUrl, response }) {
-                const { data } = body;
+                const parsed = parseBody(importCsvBodySchema, body, response);
+                if ('error' in parsed)
+                    return parsed.error;
+                const payload = parsed.data;
+                const { data } = payload;
                 if (!data || typeof data !== 'object') {
                     return { ok: false, error: 'Invalid data format. Expected an object with column names as keys and arrays of values as values.' };
                 }
@@ -233,7 +256,11 @@ export default class ImportExport extends AdminForthPlugin {
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/import-csv-new-only`,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, query, headers, cookies, requestUrl, response }) {
-                const { data } = body;
+                const parsed = parseBody(importCsvBodySchema, body, response);
+                if ('error' in parsed)
+                    return parsed.error;
+                const payload = parsed.data;
+                const { data } = payload;
                 if (!data || typeof data !== 'object') {
                     return { ok: false, error: 'Invalid data format. Expected an object with column names as keys and arrays of values as values.' };
                 }
@@ -284,7 +311,11 @@ export default class ImportExport extends AdminForthPlugin {
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/check-records`,
-            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser }) {
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser, response }) {
+                const parsed = parseBody(importCsvBodySchema, body, response);
+                if ('error' in parsed)
+                    return parsed.error;
+                const payload = parsed.data;
                 const access = yield this.ensureAnyAllowed(adminUser, [
                     { source: ActionCheckSource.ListRequest, action: AllowedActionsEnum.list },
                     { source: ActionCheckSource.ShowRequest, action: AllowedActionsEnum.show },
@@ -292,7 +323,7 @@ export default class ImportExport extends AdminForthPlugin {
                 if (!access.ok) {
                     return { ok: false, error: access.error };
                 }
-                const { data } = body;
+                const { data } = payload;
                 const primaryKeyColumn = this.resourceConfig.columns.find(col => col.primaryKey);
                 const columns = this.getColumnNames(data);
                 const rows = this.buildRowsFromData(data, columns, undefined, { coerceTypes: false });
@@ -355,6 +386,7 @@ export default class ImportExport extends AdminForthPlugin {
         return rows;
     }
     coerceValue(resourceCol, val) {
+        var _a;
         if (!resourceCol || val === '') {
             return val;
         }
@@ -368,6 +400,17 @@ export default class ImportExport extends AdminForthPlugin {
             }
             return val === 1 || val === true;
         }
+        if (resourceCol.type === AdminForthDataTypes.JSON || ((_a = resourceCol.isArray) === null || _a === void 0 ? void 0 : _a.enabled)) {
+            if (typeof val === 'string') {
+                try {
+                    return JSON.parse(val);
+                }
+                catch (_b) {
+                    return val;
+                }
+            }
+            return val;
+        }
         return val;
     }
 }

package/index.ts

@@ -1,7 +1,17 @@
-import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters, AdminForthDataTypes, rejectApiRawFilters, interpretResource, ActionCheckSource, AllowedActionsEnum } from "adminforth";
+import { AdminForthPlugin, parseBody, suggestIfTypo, AdminForthFilterOperators, Filters, AdminForthDataTypes, rejectApiRawFilters, interpretResource, ActionCheckSource, AllowedActionsEnum } from "adminforth";
 import type { IAdminForth, IHttpServer, AdminForthResourceColumn, AdminForthComponentDeclaration, AdminForthResource, AdminUser } from "adminforth";
 import type { PluginOptions } from './types.js';
 import pLimit from 'p-limit';
+import { z } from "zod";
+
+const exportCsvBodySchema = z.object({
+  filters: z.any(),
+  sort: z.any(),
+}).strict();
+
+const importCsvBodySchema = z.object({
+  data: z.record(z.string(), z.array(z.unknown())),
+}).strict();
 
 export default class ImportExport extends AdminForthPlugin {
   options: PluginOptions;
@@ -127,8 +137,11 @@ export default class ImportExport extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/export-csv`,
-      handler: async ({ body, adminUser, headers }) => {
-        const { filters, sort } = body;
+      handler: async ({ body, adminUser, headers, response }) => {
+        const parsed = parseBody(exportCsvBodySchema, body, response);
+        if ('error' in parsed) return parsed.error;
+        const payload = parsed.data;
+        const { filters, sort } = payload;
         if (!filters || !sort) {
           return { ok: false, error: 'Missing filters or sort in request body' };
         }
@@ -168,7 +181,13 @@ export default class ImportExport extends AdminForthPlugin {
         const fields = columns.map((col) => col.name);
 
         const rows = data.data.map((row) => {
-          return columns.map((col) => row[col.name]);
+          return columns.map((col) => {
+            const value = row[col.name];
+            if (col.type === AdminForthDataTypes.JSON || col.isArray?.enabled) {
+              return value == null ? value : JSON.stringify(value);
+            }
+            return value;
+          });
         });
 
         this.tryToAuditLogAction('export', `Export CSV with filters: ${JSON.stringify(filters)} and sort: ${JSON.stringify(sort)}. Total records: ${rows.length}`, adminUser, headers);
@@ -186,7 +205,10 @@ export default class ImportExport extends AdminForthPlugin {
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/import-csv`,
       handler: async ({ body, adminUser, query, headers, cookies, requestUrl, response }) => {
-        const { data } = body;
+        const parsed = parseBody(importCsvBodySchema, body, response);
+        if ('error' in parsed) return parsed.error;
+        const payload = parsed.data;
+        const { data } = payload;
         if (!data || typeof data !== 'object') {
           return { ok: false, error: 'Invalid data format. Expected an object with column names as keys and arrays of values as values.' };
         }
@@ -268,7 +290,10 @@ export default class ImportExport extends AdminForthPlugin {
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/import-csv-new-only`,
       handler: async ({ body, adminUser, query, headers, cookies, requestUrl, response }) => {
-        const { data } = body;
+        const parsed = parseBody(importCsvBodySchema, body, response);
+        if ('error' in parsed) return parsed.error;
+        const payload = parsed.data;
+        const { data } = payload;
         if (!data || typeof data !== 'object') {
           return { ok: false, error: 'Invalid data format. Expected an object with column names as keys and arrays of values as values.' };
         }
@@ -328,7 +353,10 @@ export default class ImportExport extends AdminForthPlugin {
     server.endpoint({
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/check-records`,
-      handler: async ({ body, adminUser }) => {
+      handler: async ({ body, adminUser, response }) => {
+        const parsed = parseBody(importCsvBodySchema, body, response);
+        if ('error' in parsed) return parsed.error;
+        const payload = parsed.data;
         const access = await this.ensureAnyAllowed(
           adminUser,
           [
@@ -340,7 +368,7 @@ export default class ImportExport extends AdminForthPlugin {
         if (!access.ok) {
           return { ok: false, error: access.error };
         }
-        const { data } = body as { data: Record<string, unknown[]> };
+        const { data } = payload;
         const primaryKeyColumn = this.resourceConfig.columns.find(col => col.primaryKey);
         const columns = this.getColumnNames(data);
         const rows = this.buildRowsFromData(data, columns, undefined, { coerceTypes: false });
@@ -446,6 +474,17 @@ export default class ImportExport extends AdminForthPlugin {
       return val === 1 || val === true;
     }
 
+    if (resourceCol.type === AdminForthDataTypes.JSON || resourceCol.isArray?.enabled) {
+      if (typeof val === 'string') {
+        try {
+          return JSON.parse(val);
+        } catch {
+          return val;
+        }
+      }
+      return val;
+    }
+
     return val;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/import-export",
-  "version": "1.5.4",
+  "version": "1.6.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -25,11 +25,11 @@
   "license": "MIT",
   "description": "CSV import/export plugin for adminforth",
   "peerDependencies": {
-    "adminforth": "^3.6.21"
+    "adminforth": "^3.7.1"
   },
   "devDependencies": {
     "@types/node": "^22.10.7",
-    "adminforth": "^3.6.21",
+    "adminforth": "^3.7.1",
     "semantic-release": "^24.2.1",
     "semantic-release-slack-bot": "^4.0.2",
     "typescript": "^5.7.3"
@@ -60,6 +60,7 @@
     ]
   },
   "dependencies": {
-    "p-limit": "^7.3.0"
+    "p-limit": "^7.3.0",
+    "zod": "^4.3.6"
   }
 }