Skip to content

Commit 0b9f177

Browse files
authored
Merge pull request #361 from geofflangenderfer/master
renamed variables to better reflect their purpose
2 parents 02f4cfb + 917e3b0 commit 0b9f177

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/rowSplit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe("Test delimiters", function () {
3232
assert(returnedDelimiter === ",");
3333
});
3434

35-
it("should accetp an array with potential delimiters", function () {
35+
it("should accept an array with potential delimiters", function () {
3636
var rowStr = "a$b$c";
3737
var returnedDelimiter = getDelimiter(rowStr, { delimiter: [",", ";", "$"] });
3838
assert(returnedDelimiter === '$');

src/rowSplit.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Fileline } from "./fileline";
44
import getEol from "./getEol";
55
import { filterArray, trimLeft, trimRight } from "./util";
66

7-
const defaulDelimiters = [",", "|", "\t", ";", ":"];
7+
const defaultDelimiters = [",", "|", "\t", ";", ":"];
88
export class RowSplit {
99
private quote: string;
1010
private trim: boolean;
@@ -134,24 +134,24 @@ export class RowSplit {
134134
return { cells: row, closed: !inquote };
135135
}
136136
private getDelimiter(fileline: Fileline): string {
137-
let checker;
137+
let possibleDelimiters;
138138
if (this.conv.parseParam.delimiter === "auto") {
139-
checker = defaulDelimiters;
139+
possibleDelimiters = defaultDelimiters;
140140
} else if (this.conv.parseParam.delimiter instanceof Array) {
141-
checker = this.conv.parseParam.delimiter;
141+
possibleDelimiters = this.conv.parseParam.delimiter;
142142
} else {
143143
return this.conv.parseParam.delimiter;
144144
}
145145
let count = 0;
146-
let rtn = ",";
147-
checker.forEach(function (delim) {
146+
let delimiter = ",";
147+
possibleDelimiters.forEach(function (delim) {
148148
const delimCount = fileline.split(delim).length;
149149
if (delimCount > count) {
150-
rtn = delim;
150+
delimiter = delim;
151151
count = delimCount;
152152
}
153153
});
154-
return rtn;
154+
return delimiter;
155155
}
156156
private isQuoteOpen(str: string): boolean {
157157
const quote = this.quote;

0 commit comments

Comments
 (0)