@adminforth/import-export 1.4.7 → 1.4.8

package/dist/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters } from "adminforth";
+import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters, AdminForthDataTypes } from "adminforth";
 export default class ImportExport extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
@@ -66,9 +66,24 @@ export default class ImportExport extends AdminForthPlugin {
                 });
                 // csv export
                 const columns = this.resourceConfig.columns.filter((col) => !col.virtual);
-                const escapeCSV = (value) => {
-                    if (value === null || value === undefined)
+                const escapeCSV = (value, column) => {
+                    if (value === null || value === undefined) {
                         return '""';
+                    }
+                    if ((column === null || column === void 0 ? void 0 : column.type) === AdminForthDataTypes.FLOAT
+                        || (column === null || column === void 0 ? void 0 : column.type) === AdminForthDataTypes.INTEGER) {
+                        // no quotes for numbers
+                        return String(value);
+                    }
+                    if ((column === null || column === void 0 ? void 0 : column.type) === AdminForthDataTypes.BOOLEAN) {
+                        // no quotes for boolean values
+                        if (value === true) {
+                            return 'true';
+                        }
+                        else if (value === false) {
+                            return 'false';
+                        }
+                    }
                     const str = String(value);
                     if (str.includes(',') || str.includes('"') || str.includes('\n')) {
                         return `"${str.replace(/"/g, '""')}"`;
@@ -76,7 +91,7 @@ export default class ImportExport extends AdminForthPlugin {
                     return `"${str}"`;
                 };
                 let csv = data.data.map((row) => {
-                    return columns.map((col) => escapeCSV(row[col.name])).join(',');
+                    return columns.map((col) => escapeCSV(row[col.name], col)).join(',');
                 }).join('\n');
                 // add headers
                 const headers = columns.map((col) => escapeCSV(col.name)).join(',');

package/index.ts

@@ -1,4 +1,4 @@
-import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters } from "adminforth";
+import { AdminForthPlugin, suggestIfTypo, AdminForthFilterOperators, Filters, AdminForthDataTypes } from "adminforth";
 import type { IAdminForth, IHttpServer, AdminForthResourceColumn, AdminForthComponentDeclaration, AdminForthResource } from "adminforth";
 import type { PluginOptions } from './types.js';
 
@@ -69,8 +69,23 @@ export default class ImportExport extends AdminForthPlugin {
         // csv export
         const columns = this.resourceConfig.columns.filter((col) => !col.virtual);
         
-        const escapeCSV = (value: any) => {
-          if (value === null || value === undefined) return '""';
+        const escapeCSV = (value: any, column?: AdminForthResourceColumn) => {
+          if (value === null || value === undefined) {
+            return '""';
+          }
+          if (column?.type === AdminForthDataTypes.FLOAT 
+              || column?.type === AdminForthDataTypes.INTEGER) {
+            // no quotes for numbers
+            return String(value);
+          }
+          if (column?.type === AdminForthDataTypes.BOOLEAN) {
+            // no quotes for boolean values
+            if (value === true) {
+              return 'true';
+            } else if (value === false) {
+              return 'false';
+            }
+          }
           const str = String(value);
           if (str.includes(',') || str.includes('"') || str.includes('\n')) {
             return `"${str.replace(/"/g, '""')}"`;
@@ -79,7 +94,7 @@ export default class ImportExport extends AdminForthPlugin {
         };
 
         let csv = data.data.map((row) => {
-          return columns.map((col) => escapeCSV(row[col.name])).join(',');
+          return columns.map((col) => escapeCSV(row[col.name], col)).join(',');
         }).join('\n');
 
         // add headers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/import-export",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",