Skip to content
This repository was archived by the owner on Jun 1, 2022. It is now read-only.

Add tslint #4

Open
nuno-morais wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add tslint #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 37 additions & 34 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ var debug = require("debug");
var fs = require("fs");
var stream = require("stream");
var streamify_1 = require("./streamify");
var d = debug('TP:');
var Parser = (function (_super) {
var d = debug("TP:");
var Parser = /** @class */ (function (_super) {
__extends(Parser, _super);
function Parser(options) {
var _this = _super.call(this, { objectMode: true, highWaterMark: 16 }) || this;
Expand All @@ -25,7 +25,7 @@ var Parser = (function (_super) {
_this.parserOptions = _this.mergeOptions(options);
_this.encoding = _this.parserOptions.encoding;
_this.quote = new Buffer(_this.parserOptions.quote)[0];
_this.escapedQuotes = new RegExp("" + _this.parserOptions.quote + _this.parserOptions.quote, 'g');
_this.escapedQuotes = new RegExp("" + _this.parserOptions.quote + _this.parserOptions.quote, "g");
_this.hasFilters = _this.parserOptions.filters.columns.length > 0 ? true : false;
if (_this.hasFilters) {
_this.columnFilters = _this.parserOptions.filters.columns;
Expand All @@ -34,20 +34,21 @@ var Parser = (function (_super) {
}
Parser.prototype.text2json = function (data, cb) {
var _this = this;
var streaming = typeof cb === 'function' ? false : true;
var streaming = typeof cb === "function" ? false : true;
var dataStream;
if (data instanceof Buffer) {
dataStream = streamify_1.createReadStream(data, {});
}
else if (fs.existsSync(data)) {
dataStream = fs.createReadStream(data);
}
else if (typeof data === 'string' || data instanceof String) {
else if (typeof data === "string" || data instanceof String) {
dataStream = streamify_1.createReadStream(data, {});
}
var hashtable = [];
var headers = [];
var elements = [];
// tslint:disable-next-line:variable-name
var _hash;
var rowsSkipped = 0;
var skipThisRow = this.parserOptions.skipRows > 0;
Expand All @@ -57,14 +58,14 @@ var Parser = (function (_super) {
var i = 0;
var separator = new Buffer(this.parserOptions.separator)[0];
var newline = new Buffer(this.parserOptions.newline)[0];
var crlf = this.parserOptions.newline === '\n' ? false : true;
dataStream.on('data', function (buf) {
var crlf = this.parserOptions.newline === "\n" ? false : true;
dataStream.on("data", function (buf) {
bufEnd = buf.length;
for (i = 0; i < bufEnd; i++) {
if (buf[i] === separator || buf[i] === newline) {
var _parsed = _this._value(buf, colStart, i, elements);
elements = _parsed.values;
balancedQuotes = _parsed.parsed;
var parsed = _this._value(buf, colStart, i, elements);
elements = parsed.values;
balancedQuotes = parsed.parsed;
if (balancedQuotes) {
colStart = i + 1;
}
Expand All @@ -82,18 +83,18 @@ var Parser = (function (_super) {
headers = _this.parserOptions.headers;
}
headers = _this.fillHeaders(headers, elements.length);
_this.emit('headers', headers);
_this.emit("headers", headers);
_this.headersParsed = true;
if (_this.parserOptions.headersOnly) {
//close the stream
// close the stream
dataStream.push(null);
}
try {
_this.columnFilters = _this.normalizeColumnFilters(_this.columnFilters, headers);
}
catch (ex) {
dataStream.emit('error', ex.toString());
//close the stream
dataStream.emit("error", ex.toString());
// close the stream
dataStream.push(null);
}
if (!_this.parserOptions.hasHeader) {
Expand All @@ -119,8 +120,8 @@ var Parser = (function (_super) {
}
}
if (!balancedQuotes && i === bufEnd && colStart < bufEnd) {
var err = 'Unmatched quotes around ' + buf.toString(_this.encoding, colStart, colStart + 20 > bufEnd ? bufEnd : colStart + 20);
dataStream.emit('error', new Error(err));
var err = "Unmatched quotes around " + buf.toString(_this.encoding, colStart, colStart + 20 > bufEnd ? bufEnd : colStart + 20);
dataStream.emit("error", new Error(err));
}
else if (!skipThisRow && i === bufEnd && colStart < bufEnd) {
elements = _this._value(buf, colStart, bufEnd, elements).values;
Expand All @@ -131,7 +132,7 @@ var Parser = (function (_super) {
colStart = bufEnd;
}
});
dataStream.on('end', function () {
dataStream.on("end", function () {
if (!streaming) {
if (_this.parserOptions.headersOnly) {
cb(null, headers);
Expand All @@ -141,16 +142,16 @@ var Parser = (function (_super) {
}
}
else {
_this.emit('end', null);
_this.emit("end", null);
}
hashtable = null;
});
dataStream.on('error', function (err) {
dataStream.on("error", function (err) {
if (!streaming) {
cb(err, hashtable);
}
else {
_this.emit('error', err);
_this.emit("error", err);
}
hashtable = null;
});
Expand All @@ -159,7 +160,7 @@ var Parser = (function (_super) {
Parser.prototype._value = function (buf, start, end, values) {
var balancedQuotes = true;
var hasQuote = false;
var parsedValue = '';
var parsedValue = "";
if (start === end) {
return { parsed: true, values: values };
}
Expand Down Expand Up @@ -187,29 +188,31 @@ var Parser = (function (_super) {
Parser.prototype.normalizeColumnFilters = function (colFilters, headers) {
colFilters = colFilters || headers;
colFilters = colFilters.map(function (c) {
if (typeof c === 'number' && c <= headers.length) {
if (typeof c === "number" && c <= headers.length) {
return c - 1;
}
else if (typeof c === 'string' && headers.indexOf(c) > -1) {
else if (typeof c === "string" && headers.indexOf(c) > -1) {
return headers.indexOf(c);
}
else {
throw new Error('Invalid column name or index [' + c + '] in filters');
throw new Error("Invalid column name or index [" + c + "] in filters");
}
});
return colFilters;
};
Parser.prototype.createHash = function (headers, line, streaming) {
if (streaming === void 0) { streaming = false; }
// tslint:disable-next-line:variable-name
var _hash = {};
if (!this.columnFilters) {
return _hash;
}
for (var i = 0; i < this.columnFilters.length; i++) {
_hash[headers[this.columnFilters[i]]] = line[this.columnFilters[i]];
for (var _i = 0, _a = this.columnFilters; _i < _a.length; _i++) {
var filter = _a[_i];
_hash[headers[filter]] = line[filter];
}
if (streaming) {
this.emit('row', _hash);
this.emit("row", _hash);
_hash = null;
}
return _hash;
Expand All @@ -221,27 +224,27 @@ var Parser = (function (_super) {
}
else if (headers.length === 0) {
for (var i = 0; i < numElements; i++) {
headers.push('_' + (i + 1));
headers.push("_" + (i + 1));
}
}
else if (headers.length < numElements - 1) {
for (var i = headers.length; i < numElements; i++) {
headers.push('_' + (i + 1));
headers.push("_" + (i + 1));
}
}
return headers;
};
Parser.prototype.defaultOptions = function () {
return {
encoding: "utf8",
filters: { columns: [] },
hasHeader: false,
headers: [],
newline: '\n',
separator: ',',
headersOnly: false,
newline: "\n",
quote: '"',
encoding: 'utf8',
separator: ",",
skipRows: 0,
filters: { columns: [] },
headersOnly: false
};
};
Parser.prototype.mergeOptions = function (options) {
Expand Down
6 changes: 3 additions & 3 deletions lib/streamify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var util = require("util");
var stream = require("stream");
var util = require("util");
/**
* Wrap objects as a readable stream
*
Expand All @@ -13,11 +13,11 @@ exports.createReadStream = function (source, options) {
return new MultiStream(source, options);
};
var MultiStream = function (object, options) {
if (object instanceof Buffer || typeof object === 'string') {
if (object instanceof Buffer || typeof object === "string") {
options = options || {};
stream.Readable.call(this, {
encoding: options.encoding,
highWaterMark: options.highWaterMark,
encoding: options.encoding
});
}
else {
Expand Down
Loading