Added csvWriteFleDelimiter, csvReadFileDelimiter

Author: hknokh2

src/modules/commands_processors/runCommand.ts

@@ -5,26 +5,26 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import 'reflect-metadata';
-import 'es6-shim';
 
-import { plainToClass } from 'class-transformer';
 import * as fs from 'fs';
+import * as models from '../models';
 import * as path from 'path';
-
+import IPluginInfo from '../models/common_models/IPluginInfo';
 import { ADDON_EVENTS } from '../components/common_components/enumerations';
+import { CommandInitializationError } from '../models/common_models/errors';
+import { Common } from '../components/common_components/common';
+import { CONSTANTS } from '../components/common_components/statics';
+import { plainToClass } from 'class-transformer';
+import 'reflect-metadata';
+import 'es6-shim';
 import {
   Logger,
   RESOURCES,
 } from '../components/common_components/logger';
-import { CONSTANTS } from '../components/common_components/statics';
-import * as models from '../models';
 import {
   MigrationJob as Job,
   ScriptObjectSet,
 } from '../models';
-import { CommandInitializationError } from '../models/common_models/errors';
-import IPluginInfo from '../models/common_models/IPluginInfo';
 
 /**
  * SFDMU:RUN CLI command
@@ -127,6 +127,8 @@ export class RunCommand {
       this.workingJson = JSON.stringify(jsonObject);
       jsonObject.objects = [];
       this.script = plainToClass(models.Script, jsonObject);
+      this.setupGlobalParameters();
+
     } catch (ex: any) {
       throw new CommandInitializationError(this.logger.getResourceString(RESOURCES.incorrectExportJsonFormat, ex.message));
     }
@@ -135,6 +137,11 @@ export class RunCommand {
 
   }
 
+  setupGlobalParameters() {
+    Common.csvReadFileDelimiter = this.script.csvReadFileDelimiter;
+    Common.csvWriteFileDelimiter = this.script.csvWriteFileDelimiter;
+  }
+
 
   /**
    * Setup the Command

src/modules/components/common_components/common.ts

@@ -61,6 +61,8 @@ const createCsvStringifier = require('csv-writer').createObjectCsvStringifier;
 export class Common {
 
   static logger: Logger;
+  static csvReadFileDelimiter: ',' | ';' = ",";
+  static csvWriteFileDelimiter: ',' | ';' = ",";
 
   /**
   * @static Splits array to multiple chunks by max chunk size
@@ -716,6 +718,7 @@ export class Common {
           input = input.replace(/^\uFEFF/, '');
           const records = parse(input, {
             columns: ___columns,
+            delimiter: Common.csvReadFileDelimiter,
             skip_empty_lines: true,
             skip_lines_with_error: true,
             cast: ___csvCast
@@ -819,6 +822,7 @@ export class Common {
         return;
       }
       const csvWriter = createCsvWriter({
+        fieldDelimiter: Common.csvWriteFileDelimiter,
         header: (columns || Object.keys(array[0])).map(x => {
           return {
             id: x,
@@ -1086,15 +1090,15 @@ export class Common {
     return temp.map(el => el.trim()).filter(el => el.length > 0);
   }
 
-/**
- * Extracts QHERE clause from the query string
- *
- * @static
- * @param {string} query The query to process (SELECT Name, a__c FROM Account WHERE b__c = 'test')
- * @return {*}  {string} Dry WHERE clause string (b__c = 'test')
- * @memberof Common
- */
-public static extractWhereClause(query: string): string {
+  /**
+   * Extracts QHERE clause from the query string
+   *
+   * @static
+   * @param {string} query The query to process (SELECT Name, a__c FROM Account WHERE b__c = 'test')
+   * @return {*}  {string} Dry WHERE clause string (b__c = 'test')
+   * @memberof Common
+   */
+  public static extractWhereClause(query: string): string {
     if ((query || '').match(/WHERE/i)) {
       return query.match(/^.*?WHERE.*?(.+?(?=LIMIT|OFFSET|GROUP|ORDER|$))/i)[1].trim();
     }
@@ -1758,17 +1762,17 @@ public static extractWhereClause(query: string): string {
     return entryNames.map(name => enumType[name] as ValType);
   }
 
-   /**
-     * Creates a time delay
-     *
-     * @static
-     * @param {number} time The delay length in ms
-     * @return {*}  {Promise<void>}
-     * @memberof Utils
-     */
-    static async delayAsync(time: number): Promise<void> {
-        return new Promise(resolve => setTimeout(resolve, time));
-    }
+  /**
+    * Creates a time delay
+    *
+    * @static
+    * @param {number} time The delay length in ms
+    * @return {*}  {Promise<void>}
+    * @memberof Utils
+    */
+  static async delayAsync(time: number): Promise<void> {
+    return new Promise(resolve => setTimeout(resolve, time));
+  }
 
 
 }

src/modules/models/script_models/script.ts

@@ -96,6 +96,8 @@ export default class Script implements IAppScript, ISfdmuRunScript {
   simulationMode: boolean = false;
 
   proxyUrl: string;
+  csvReadFileDelimiter: ',' | ';' = ",";
+  csvWriteFileDelimiter: ',' | ';' = ",";
 
   binaryDataCache: DATA_CACHE_TYPES = DATA_CACHE_TYPES.InMemory;
   sourceRecordsCache: DATA_CACHE_TYPES = DATA_CACHE_TYPES.InMemory;