@drax/crud-back 0.31.0 → 0.33.1

package/dist/controllers/AbstractFastifyController.js

@@ -343,6 +343,7 @@ class AbstractFastifyController extends CommonController {
             request.rbac.assertPermission(this.permission.View);
             const format = request.query.format || 'JSON';
             const headers = request.query.headers ? request.query.headers.split(",") : [];
+            const headersTranslate = request.query.headersTranslate ? request.query.headersTranslate.split(",") : [];
             const separator = request.query.separator || ";";
             const fileName = request.query.fileName || "export";
             const limit = request.query.limit;
@@ -360,6 +361,7 @@ class AbstractFastifyController extends CommonController {
                 fileName,
                 format,
                 headers,
+                headersTranslate,
                 limit,
                 orderBy,
                 order,

package/dist/exports/AbstractExport.js

@@ -6,6 +6,9 @@ class AbstractExport {
         this.destinationPath = options.destinationPath;
         this.headers = Array.isArray(options.headers) ? options.headers : options.headers.split(',');
         this.fileName = options.fileName;
+        if (options.headersTranslate) {
+            this.headersTranslate = Array.isArray(options.headersTranslate) ? options.headersTranslate : options.headersTranslate.split(',');
+        }
     }
     createDirIfNotExist() {
         createDirIfNotExist(this.destinationPath);

package/dist/exports/ExportCsv.js

@@ -25,7 +25,9 @@ class ExportCsv extends AbstractExport {
                     time: Date.now() - start,
                     message: 'Export successful',
                 }));
-                const csvHeaders = this.headers.join(this.separator);
+                let csvHeaders = this.headers.join(this.separator);
+                if (this.headersTranslate && this.headersTranslate.length)
+                    csvHeaders = this.headersTranslate.join(this.separator);
                 writableStream.write(csvHeaders + '\n');
                 if (this.isIterableAsync(this.cursor)) {
                     for await (const record of this.cursor) {
@@ -61,24 +63,31 @@ class ExportCsv extends AbstractExport {
             else {
                 value = record[header];
             }
-            if (value === undefined) {
+            if (value === undefined || value === null) {
                 fields.push('');
                 continue;
             }
             if (Array.isArray(value)) {
                 if (value.length > 0 && typeof value[0] === 'object') {
-                    fields.push(JSON.stringify(value));
+                    value = JSON.stringify(value);
                 }
                 else {
-                    fields.push(value.join(','));
+                    value = value.join(',');
                 }
             }
             else if (typeof value === 'object') {
-                fields.push(JSON.stringify(value));
+                value = JSON.stringify(value);
             }
             else {
-                fields.push(value.toString());
+                value = value.toString();
             }
+            if (value.includes(this.separator) ||
+                value.includes('"') ||
+                value.includes('\n') ||
+                value.includes('\r')) {
+                value = '"' + value.replace(/"/g, '""') + '"';
+            }
+            fields.push(value);
         }
         return fields.join(this.separator);
     }

package/dist/regexs/QueryFilterRegex.js

@@ -1,3 +1,3 @@
-const QueryFilterRegex = /^(?:[a-zA-Z0-9_\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_\-:\., áéíóúÁÉÍÓÚ]+)(?:\|[a-zA-Z0-9_\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_\-:\., áéíóúÁÉÍÓÚ]+)*$/;
+const QueryFilterRegex = /^(?:[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]+)(?:\|[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]+)*$/;
 export default QueryFilterRegex;
 export { QueryFilterRegex };

package/dist/services/AbstractService.js

@@ -200,7 +200,7 @@ class AbstractService {
             throw e;
         }
     }
-    async export({ format = 'JSON', headers = [], separator = ';', fileName = 'export', orderBy = '', order = false, search = '', filters = [] }, destinationPath) {
+    async export({ format = 'JSON', headers = [], headersTranslate = [], separator = ';', fileName = 'export', orderBy = '', order = false, search = '', filters = [] }, destinationPath) {
         try {
             let cursor;
             let exporter;
@@ -215,7 +215,7 @@ class AbstractService {
                     exporter = new ExportJson({ cursor, destinationPath: destinationPath, headers, fileName });
                     return await exporter.process();
                 case 'CSV':
-                    exporter = new ExportCsv({ cursor, destinationPath: destinationPath, headers, fileName, separator });
+                    exporter = new ExportCsv({ cursor, destinationPath: destinationPath, headers, headersTranslate, fileName, separator });
                     return await exporter.process();
                 default:
                     throw new Error(`Unsupported export format: ${format}`);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.31.0",
+  "version": "0.33.1",
   "description": "Crud utils across modules",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -22,10 +22,10 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^0.31.0",
-    "@drax/common-share": "^0.31.0",
-    "@drax/identity-share": "^0.31.0",
-    "@drax/media-back": "^0.31.0",
+    "@drax/common-back": "^0.33.0",
+    "@drax/common-share": "^0.33.0",
+    "@drax/identity-share": "^0.33.0",
+    "@drax/media-back": "^0.33.1",
     "@graphql-tools/load-files": "^7.0.0",
     "@graphql-tools/merge": "^9.0.4",
     "mongoose": "^8.6.3",
@@ -45,5 +45,5 @@
     "tsc-alias": "^1.8.10",
     "typescript": "^5.6.2"
   },
-  "gitHead": "01589f8197801c0b8ad13a10d398e41d6cb2a25a"
+  "gitHead": "bb0468049ef3388a464c991fa170226739a6f2d2"
 }

package/src/controllers/AbstractFastifyController.ts

@@ -36,6 +36,7 @@ type CustomRequest = FastifyRequest<{
         search?: string
         filters?: string
         headers?: string
+        headersTranslate?: string
         separator?: string
         fileName?: string
     }
@@ -464,6 +465,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
             const format = request.query.format as 'CSV' | 'JSON' || 'JSON'
             const headers = request.query.headers ? request.query.headers.split(",") : []
+            const headersTranslate = request.query.headersTranslate ? request.query.headersTranslate.split(",") : []
             const separator = request.query.separator || ";"
             const fileName = request.query.fileName || "export"
             const limit = request.query.limit
@@ -485,6 +487,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
                 fileName,
                 format,
                 headers,
+                headersTranslate,
                 limit,
                 orderBy,
                 order,

package/src/exports/AbstractExport.ts

@@ -6,6 +6,7 @@ interface ExportOptions {
     cursor: any
     destinationPath: string
     headers: string[] | string
+    headersTranslate?: string[] | string
     fileName: string
 }
 
@@ -16,6 +17,7 @@ class AbstractExport {
     protected cursor: any
     protected destinationPath: string
     protected headers: string[]
+    protected headersTranslate?: string[]
 
     protected fileName: string
     protected relativeFilePath: string
@@ -25,6 +27,9 @@ class AbstractExport {
         this.destinationPath = options.destinationPath;
         this.headers = Array.isArray(options.headers) ? options.headers : options.headers.split(',');
         this.fileName = options.fileName;
+        if(options.headersTranslate){
+            this.headersTranslate = Array.isArray(options.headersTranslate) ? options.headersTranslate : options.headersTranslate.split(',');
+        }
     }
 
 

package/src/exports/ExportCsv.ts

@@ -40,8 +40,9 @@ class ExportCsv extends AbstractExport {
                     message: 'Export successful',
                 }))
 
+                let csvHeaders = this.headers.join(this.separator);
+                if(this.headersTranslate && this.headersTranslate.length) csvHeaders = this.headersTranslate.join(this.separator)
 
-                const csvHeaders = this.headers.join(this.separator);
                 writableStream.write(csvHeaders + '\n');
 
                 if (this.isIterableAsync(this.cursor)) {
@@ -81,27 +82,37 @@ class ExportCsv extends AbstractExport {
                 value = record[header];
             }
 
-            if (value === undefined) {
+            if (value === undefined || value === null) {
                 fields.push('');
                 continue;
             }
 
             if (Array.isArray(value)) {
                 if (value.length > 0 && typeof value[0] === 'object') {
-                    fields.push(JSON.stringify(value));
+                    value = JSON.stringify(value);
                 } else {
-                    fields.push(value.join(','));
+                    value = value.join(',');
                 }
             } else if (typeof value === 'object') {
-                fields.push(JSON.stringify(value));
-
+                value = JSON.stringify(value);
             } else {
-                fields.push(value.toString());
+                value = value.toString();
+            }
+
+            if (
+                value.includes(this.separator) ||
+                value.includes('"') ||
+                value.includes('\n') ||
+                value.includes('\r')
+            ) {
+                value = '"' + value.replace(/"/g, '""') + '"';
             }
+
+            fields.push(value);
         }
         return fields.join(this.separator);
     }
 
 }
 
-export default ExportCsv;
+export default ExportCsv;

package/src/regexs/QueryFilterRegex.ts

@@ -1,4 +1,4 @@
-const QueryFilterRegex = /^(?:[a-zA-Z0-9_\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_\-:\., áéíóúÁÉÍÓÚ]+)(?:\|[a-zA-Z0-9_\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_\-:\., áéíóúÁÉÍÓÚ]+)*$/
+const QueryFilterRegex = /^(?:[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]+)(?:\|[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]+)*$/
 
 export default QueryFilterRegex
 export {QueryFilterRegex}

package/src/services/AbstractService.ts

@@ -265,6 +265,7 @@ abstract class AbstractService<T, C, U> implements IDraxCrudService<T, C, U> {
     async export({
                      format = 'JSON',
                      headers = [],
+                     headersTranslate = [],
                      separator = ';',
                      fileName = 'export',
                      orderBy = '',
@@ -289,7 +290,7 @@ abstract class AbstractService<T, C, U> implements IDraxCrudService<T, C, U> {
                     exporter = new ExportJson({cursor, destinationPath: destinationPath, headers, fileName});
                     return await exporter.process()
                 case 'CSV':
-                    exporter = new ExportCsv({cursor, destinationPath: destinationPath, headers, fileName, separator});
+                    exporter = new ExportCsv({cursor, destinationPath: destinationPath, headers, headersTranslate, fileName, separator});
                     return await exporter.process()
                 default:
                     throw new Error(`Unsupported export format: ${format}`);