Skip to content

Commit 1b8f14c

Browse files
committed
Merge branch 'dev'
2 parents 51040a8 + 482240e commit 1b8f14c

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ Default: `1000`
7575

7676
The batch size.
7777

78-
### lineOnly
78+
### noParseLine
7979

8080
Type: `Boolean`
8181
Default: `false`
8282

83-
True to include only lines, false otherwise.
83+
True to not parse line, false otherwise.
8484

8585
```js
86-
parser.parseFile('/path/to/file', { lineOnly: true }, function(err, results) {
86+
parser.parseFile('/path/to/file', { noParseLine: true }, function(err, results) {
8787
});
8888
```
8989

src/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ const iterateArray = (arr = [], opts = {}, iteratee = noop, done = noop) => {
7373
// @param {string} line The G-code line
7474
const parseLine = (line, options) => {
7575
options = options || {};
76-
options.lineOnly = options.lineOnly || false;
76+
options.noParseLine = options.noParseLine || false;
7777

7878
const result = {
7979
line: line
8080
};
8181

82-
if (!options.lineOnly) {
82+
if (!options.noParseLine) {
8383
let n; // Line number
8484
let cs; // Checksum
8585
const words = [];
@@ -190,13 +190,13 @@ class GCodeLineStream extends Transform {
190190
};
191191
options = {
192192
batchSize: 1000,
193-
lineOnly: false
193+
noParseLine: false
194194
};
195195
lineBuffer = '';
196196

197197
// @param {object} [options] The options object
198198
// @param {number} [options.batchSize] The batch size.
199-
// @param {boolean} [options.lineOnly] True to contain only lines, false otherwise.
199+
// @param {boolean} [options.noParseLine] True to not parse line, false otherwise.
200200
constructor(options = {}) {
201201
super({ objectMode: true });
202202

@@ -247,7 +247,7 @@ class GCodeLineStream extends Transform {
247247
iterateArray(lines, { batchSize: this.options.batchSize }, (line, key) => {
248248
line = _.trimEnd(line);
249249
if (line.length > 0) {
250-
const result = parseLine(line, { lineOnly: this.options.lineOnly });
250+
const result = parseLine(line, { noParseLine: this.options.noParseLine });
251251
this.push(result);
252252
}
253253
}, next);
@@ -256,7 +256,7 @@ class GCodeLineStream extends Transform {
256256
if (this.lineBuffer) {
257257
const line = _.trimEnd(this.lineBuffer);
258258
if (line.length > 0) {
259-
const result = parseLine(line, { lineOnly: this.options.lineOnly });
259+
const result = parseLine(line, { noParseLine: this.options.noParseLine });
260260
this.push(result);
261261
}
262262

test/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('G-code Parser', (done) => {
4242
it('should not parse G-code commands.', (done) => {
4343
const file = 'test/fixtures/circle.gcode';
4444

45-
parseFile(file, { lineOnly: true }, (err, results) => {
45+
parseFile(file, { noParseLine: true }, (err, results) => {
4646
expect(results.length).to.be.equal(7);
4747
done();
4848
})

0 commit comments

Comments
 (0)