Comparing version 1.1.2 to 1.1.3
@@ -6,2 +6,3 @@ /// <reference types="node" /> | ||
fileSize?: number; | ||
offset: number; | ||
private numBuffer; | ||
@@ -8,0 +9,0 @@ /** |
@@ -5,2 +5,3 @@ "use strict"; | ||
function AbstractTokenizer() { | ||
this.offset = 0; | ||
this.numBuffer = new Buffer(4); | ||
@@ -7,0 +8,0 @@ } |
@@ -6,3 +6,2 @@ /// <reference types="node" /> | ||
fileSize: number; | ||
private fileOffset; | ||
private peekOffset; | ||
@@ -9,0 +8,0 @@ constructor(fd: number, fileSize?: number); |
@@ -22,3 +22,2 @@ "use strict"; | ||
_this.fileSize = fileSize; | ||
_this.fileOffset = 0; | ||
_this.peekOffset = 0; | ||
@@ -38,3 +37,3 @@ return _this; | ||
if (position) { | ||
this.fileOffset = position; | ||
this.offset = position; | ||
} | ||
@@ -44,6 +43,6 @@ if (!length) { | ||
} | ||
return fs.read(this.fd, buffer, offset, length, this.fileOffset).then(function (res) { | ||
return fs.read(this.fd, buffer, offset, length, this.offset).then(function (res) { | ||
if (res.bytesRead < length) | ||
throw _1.EndOfFile; | ||
_this.fileOffset += res.bytesRead; | ||
_this.offset += res.bytesRead; | ||
// debug("Read:" + buffer.slice(offset, length).toString("hex")); | ||
@@ -67,4 +66,4 @@ return res.bytesRead; | ||
} | ||
else if (this.peekOffset < this.fileOffset) { | ||
this.peekOffset = this.fileOffset; | ||
else if (this.peekOffset < this.offset) { | ||
this.peekOffset = this.offset; | ||
} | ||
@@ -86,3 +85,3 @@ if (!length) { | ||
FileTokenizer.prototype.ignore = function (length) { | ||
this.fileOffset += length; | ||
this.offset += length; | ||
return Promise.resolve(null); | ||
@@ -89,0 +88,0 @@ }; |
@@ -17,2 +17,6 @@ /// <reference types="node" /> | ||
/** | ||
* Offset in bytes (= number of bytes read) since beginning of file or stream | ||
*/ | ||
offset: number; | ||
/** | ||
* Peek (read ahead) buffer from tokenizer | ||
@@ -19,0 +23,0 @@ * @param buffer |
@@ -32,6 +32,11 @@ "use strict"; | ||
ReadStreamTokenizer.prototype.readBuffer = function (buffer, offset, length) { | ||
var _this = this; | ||
if (!length) { | ||
length = buffer.length; | ||
} | ||
return this.streamReader.read(buffer, offset, length) // ToDo: looks like wrong return type is defined in fs.read | ||
return this.streamReader.read(buffer, offset, length) | ||
.then(function (bytesRead) { | ||
_this.offset += bytesRead; | ||
return bytesRead; | ||
}) | ||
.catch(function (err) { | ||
@@ -38,0 +43,0 @@ if (err === then_read_stream_1.StreamReader.EndOfStream) |
{ | ||
"name": "strtok3", | ||
"version": "1.1.2", | ||
"version": "1.1.3", | ||
"description": "A promise based streaming tokenizer", | ||
@@ -38,3 +38,3 @@ "author": { | ||
"@types/mocha": "^2.2.41", | ||
"@types/node": "^8.0.20", | ||
"@types/node": "^8.0.24", | ||
"chai": "^4.1.1", | ||
@@ -46,3 +46,3 @@ "coveralls": "^2.13.1", | ||
"tslint": "^5.6.0", | ||
"typescript": "^2.4.2" | ||
"typescript": "^2.5.1" | ||
}, | ||
@@ -49,0 +49,0 @@ "dependencies": { |
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
135285
3480