Merge branch 'dev'

Author: cheton

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Cheton Wu
+Copyright (c) 2015-2016 Cheton Wu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -22,9 +22,9 @@ parser.parseStream(stream, function(err, data) {
     console.log(data);
 });
 
-// Parse from text string
+// Parse from string
 var text = fs.readFileSync(file, 'utf8');
-parser.parseText(text, function(err, data) {
+parser.parseString(text, function(err, data) {
     console.log(data);
 });
 ```

dist/index.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.parseText = exports.parseFile = exports.parseStream = exports.GCodeParser = undefined;
+exports.parseString = exports.parseFile = exports.parseStream = exports.GCodeParser = undefined;
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 var _lodash = require('lodash');
 
@@ -35,8 +35,8 @@ var streamify = function streamify(text) {
 };
 
 var stripComments = function stripComments(s) {
-    var re1 = /^\s+|\s+$/g; // Strip leading and trailing spaces
-    var re2 = /\s*[#;].*$/g; // Strip everything after # or ; to the end of the line, including preceding spaces
+    var re1 = /\s*[%#;].*/g; // Strip everything after %, #, or ; to the end of the line, including preceding spaces
+    var re2 = /\s*\(.*\)/g; // Remove anything inside the parentheses
     return s.replace(re1, '').replace(re2, '');
 };
 
@@ -84,17 +84,18 @@ var GCodeParser = function (_Transform) {
                 chunk = chunk.toString(encoding);
             }
 
-            var lines = chunk.split(/\r\n|\r|\n/g);
+            var lines = stripComments(chunk).split(/\r\n|\r|\n/g);
+
             _lodash2.default.each(lines, function (line) {
-                line = _lodash2.default.trim(stripComments(line));
-                if (line.length === 0) {
+                var list = removeSpaces(line).match(/([a-zA-Z][0-9\+\-\.]*)|(\*[0-9]+)/igm) || [];
+
+                if (list.length === 0) {
                     return;
                 }
 
                 var n = undefined; // Line number
                 var cs = undefined; // Checksum
                 var words = [];
-                var list = removeSpaces(line).match(/([a-zA-Z][0-9\+\-\.]*)|(\*[0-9]+)/igm) || [];
 
                 _lodash2.default.each(list, function (word) {
                     var letter = word[0].toUpperCase();
@@ -182,12 +183,12 @@ var parseFile = function parseFile(file, callback) {
     return parseStream(s, callback);
 };
 
-var parseText = function parseText(text, callback) {
+var parseString = function parseString(text, callback) {
     var s = streamify(text);
     return parseStream(s, callback);
 };
 
 exports.GCodeParser = GCodeParser;
 exports.parseStream = parseStream;
 exports.parseFile = parseFile;
-exports.parseText = parseText;
+exports.parseString = parseString;

index.js

@@ -10,8 +10,8 @@ const streamify = (text) => {
 };
 
 const stripComments = (s) => {
-    let re1 = /^\s+|\s+$/g; // Strip leading and trailing spaces
-    let re2 = /\s*[#;].*$/g; // Strip everything after # or ; to the end of the line, including preceding spaces
+    const re1 = /\s*[%#;].*/g; // Strip everything after %, #, or ; to the end of the line, including preceding spaces
+    const re2 = /\s*\(.*\)/g; // Remove anything inside the parentheses
     return s.replace(re1, '').replace(re2, '');
 };
 
@@ -49,18 +49,20 @@ class GCodeParser extends Transform {
             chunk = chunk.toString(encoding);
         }
 
-        let lines = chunk.split(/\r\n|\r|\n/g);
+        const lines = stripComments(chunk)
+            .split(/\r\n|\r|\n/g);
+
         _.each(lines, (line) => {
-            line = _.trim(stripComments(line));
-            if (line.length === 0) {
+            const list = removeSpaces(line)
+                .match(/([a-zA-Z][0-9\+\-\.]*)|(\*[0-9]+)/igm) || [];
+
+            if (list.length === 0) {
                 return;
             }
 
             let n; // Line number
             let cs; // Checksum
             let words = [];
-            let list = removeSpaces(line)
-                .match(/([a-zA-Z][0-9\+\-\.]*)|(\*[0-9]+)/igm) || [];
 
             _.each(list, (word) => {
                 let letter = word[0].toUpperCase();
@@ -143,7 +145,7 @@ const parseFile = (file, callback) => {
     return parseStream(s, callback);
 };
 
-const parseText = (text, callback) => {
+const parseString = (text, callback) => {
     let s = streamify(text);
     return parseStream(s, callback);
 };
@@ -152,5 +154,5 @@ export {
     GCodeParser,
     parseStream,
     parseFile,
-    parseText
+    parseString
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcode-parser",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "A G-code parser for Node.js",
   "author": "Cheton Wu <[email protected]>",
   "homepage": "https://github.com/cheton/gcode-parser",

test/index.js

@@ -1,15 +1,15 @@
 import chai from 'chai';
 import fs from 'fs';
-import { GCodeParser, parseFile, parseText, parseStream } from '../dist/';
+import { GCodeParser, parseFile, parseString, parseStream } from '../dist/';
 import _ from 'lodash';
 
 const expect = chai.expect;
 const should = chai.should();
 
 describe('G-code Parser', (done) => {
     describe('Pass a null value as the first argument', (done) => {
-        it('should call parseText\'s callback.', (done) => {
-            parseText(null, (err, results) => {
+        it('should call parseString\'s callback.', (done) => {
+            parseString(null, (err, results) => {
                 expect(err).to.be.okay;
                 done();
             });
@@ -31,7 +31,7 @@ describe('G-code Parser', (done) => {
     describe('Pass an empty text as the first argument', (done) => {
         it('should get empty results.', (done) => {
             let sampleText = '';
-            parseText(sampleText, (err, results) => {
+            parseString(sampleText, (err, results) => {
                 expect(results.length).to.be.empty;
                 done();
             });
@@ -54,7 +54,7 @@ describe('G-code Parser', (done) => {
                 '  ' // empty line
             ].join('\n');
 
-            parseText(sampleText, (err, results) => {
+            parseString(sampleText, (err, results) => {
 console.log(sampleText, err, results);
 
                 expect(results.length).to.be.empty;
@@ -73,7 +73,7 @@ console.log(sampleText, err, results);
         });
     });
 
-    describe('parseStream / parseText / parseFile', (done) => {
+    describe('parseFile / parseStream / parseString', (done) => {
         let expectedResults = [
             {
                 line: 'G0 X-5 Y0 Z0 F200',
@@ -112,17 +112,17 @@ console.log(sampleText, err, results);
             });
         });
 
-        it('should get the expected results in the parseText\'s callback.', (done) => {
-            let text = fs.readFileSync('test/fixtures/circle.gcode', 'utf8');
-            parseText(text, (err, results) => {
+        it('should get the expected results in the parseStream\'s callback.', (done) => {
+            let stream = fs.createReadStream('test/fixtures/circle.gcode', { encoding: 'utf8' });
+            parseStream(stream, (err, results) => {
                 expect(results).to.deep.equal(expectedResults);
                 done();
             });
         });
 
-        it('should get the expected results in the parseStream\'s callback.', (done) => {
-            let stream = fs.createReadStream('test/fixtures/circle.gcode', { encoding: 'utf8' });
-            parseStream(stream, (err, results) => {
+        it('should get the expected results in the parseString\'s callback.', (done) => {
+            let text = fs.readFileSync('test/fixtures/circle.gcode', 'utf8');
+            parseString(text, (err, results) => {
                 expect(results).to.deep.equal(expectedResults);
                 done();
             });