[#27] Refactoring

Author: ryu1kn

src/lib/csv-stringifier-factory.ts

@@ -6,9 +6,6 @@ import {ObjectStringifierHeader} from './record';
 const DEFAULT_FIELD_DELIMITER = ',';
 const VALID_FIELD_DELIMITERS = [DEFAULT_FIELD_DELIMITER, ';'];
 
-const DEFAULT_RECORD_DELIMITER = '\n';
-const VALID_RECORD_DELIMITERS = [DEFAULT_RECORD_DELIMITER, '\r\n'];
-
 export interface ArrayCsvStringifierParams {
     header?: string[];
     fieldDelimiter?: string;
@@ -25,20 +22,16 @@ export class CsvStringifierFactory {
 
     createArrayCsvStringifier(params: ArrayCsvStringifierParams) {
         const fieldDelimiter = params.fieldDelimiter || DEFAULT_FIELD_DELIMITER;
-        const recordDelimiter = params.recordDelimiter || DEFAULT_RECORD_DELIMITER;
         _validateFieldDelimiter(fieldDelimiter);
-        _validateRecordDelimiter(recordDelimiter);
         const fieldStringifier = new FieldStringifier(fieldDelimiter);
-        return new ArrayCsvStringifier(fieldStringifier, fieldDelimiter, recordDelimiter, params.header);
+        return new ArrayCsvStringifier(fieldStringifier, fieldDelimiter, params.recordDelimiter, params.header);
     }
 
     createObjectCsvStringifier(params: ObjectCsvStringifierParams) {
         const fieldDelimiter = params.fieldDelimiter || DEFAULT_FIELD_DELIMITER;
-        const recordDelimiter = params.recordDelimiter || DEFAULT_RECORD_DELIMITER;
         _validateFieldDelimiter(fieldDelimiter);
-        _validateRecordDelimiter(recordDelimiter);
         const fieldStringifier = new FieldStringifier(fieldDelimiter);
-        return new ObjectCsvStringifier(fieldStringifier, fieldDelimiter, recordDelimiter, params.header);
+        return new ObjectCsvStringifier(fieldStringifier, fieldDelimiter, params.header, params.recordDelimiter);
     }
 
 }
@@ -48,9 +41,3 @@ function _validateFieldDelimiter(delimiter: string): void {
         throw new Error(`Invalid field delimiter \`${delimiter}\` is specified`);
     }
 }
-
-function _validateRecordDelimiter(delimiter: string): void {
-    if (VALID_RECORD_DELIMITERS.indexOf(delimiter) === -1) {
-        throw new Error(`Invalid record delimiter \`${delimiter}\` is specified`);
-    }
-}

src/lib/csv-stringifiers/abstract.ts

@@ -1,15 +1,19 @@
 import {FieldStringifier} from '../field-stringifier';
 import {Field} from '../record';
 
+const DEFAULT_RECORD_DELIMITER = '\n';
+const VALID_RECORD_DELIMITERS = [DEFAULT_RECORD_DELIMITER, '\r\n'];
+
 export abstract class CsvStringifier<T> {
     private readonly fieldStringifier: FieldStringifier;
     private readonly fieldDelimiter: string;
     private readonly recordDelimiter: string;
 
-    constructor(fieldStringifier: FieldStringifier, fieldDelimiter: string, recordDelimiter: string) {
+    constructor(fieldStringifier: FieldStringifier, fieldDelimiter: string, recordDelimiter?: string) {
         this.fieldStringifier = fieldStringifier;
         this.fieldDelimiter = fieldDelimiter;
-        this.recordDelimiter = recordDelimiter;
+        this.recordDelimiter = recordDelimiter || DEFAULT_RECORD_DELIMITER;
+        _validateRecordDelimiter(this.recordDelimiter);
     }
 
     getHeaderString(): string | null {
@@ -32,3 +36,9 @@ export abstract class CsvStringifier<T> {
             .join(this.fieldDelimiter);
     }
 }
+
+function _validateRecordDelimiter(delimiter: string): void {
+    if (VALID_RECORD_DELIMITERS.indexOf(delimiter) === -1) {
+        throw new Error(`Invalid record delimiter \`${delimiter}\` is specified`);
+    }
+}

src/lib/csv-stringifiers/array.ts

@@ -5,7 +5,7 @@ import {Field} from '../record';
 export class ArrayCsvStringifier extends CsvStringifier<Field[]> {
     private readonly header?: string[];
 
-    constructor(fieldStringifier: FieldStringifier, fieldDelimiter: string, recordDelimiter: string, header?: string[]) {
+    constructor(fieldStringifier: FieldStringifier, fieldDelimiter: string, recordDelimiter?: string, header?: string[]) {
         super(fieldStringifier, fieldDelimiter, recordDelimiter);
         this.header = header;
     }

src/lib/csv-stringifiers/object.ts

@@ -6,7 +6,7 @@ import {ObjectMap} from '../lang';
 export class ObjectCsvStringifier extends CsvStringifier<ObjectMap<Field>> {
     private readonly header: ObjectStringifierHeader;
 
-    constructor(fieldStringifier: FieldStringifier, fieldDelimiter: string, recordDelimiter: string, header: ObjectStringifierHeader) {
+    constructor(fieldStringifier: FieldStringifier, fieldDelimiter: string, header: ObjectStringifierHeader, recordDelimiter?: string) {
         super(fieldStringifier, fieldDelimiter, recordDelimiter);
         this.header = header;
     }