From 6bc9d4e1683066e570b46ca21ff654593694e90c Mon Sep 17 00:00:00 2001
From: Siarhei Dudko <admin@sergdudko.tk>
Date: Wed, 15 Jan 2020 09:31:26 +0300
Subject: [PATCH] new wersion: fix space and spec on json

---
 docs/index.html                                    |  2 +-
 docs/index.js.html                                 | 14 +++++++++-----
 docs/module-sergdudko_objectstream-Parser.html     |  2 +-
 docs/module-sergdudko_objectstream-Stringifer.html |  2 +-
 docs/module-sergdudko_objectstream.html            |  4 ++--
 index.js                                           | 12 ++++++++----
 package.json                                       |  2 +-
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 168189c..516295d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -193,7 +193,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-se
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 12:19:17 GMT+0300 (GMT+03:00)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Wed Jan 15 2020 09:30:06 GMT+0300 (GMT+03:00)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/index.js.html b/docs/index.js.html
index bf7d22e..6889aa4 100644
--- a/docs/index.js.html
+++ b/docs/index.js.html
@@ -32,7 +32,7 @@ <h1 class="page-title">Source: index.js</h1>
  * @author Siarhei Dudko &lt;slavianich@gmail.com>
  * @copyright 2019
  * @license MIT
- * @version 1.7.5
+ * @version 1.7.6
  * @requires stream
  * @requires string_decoder
  */
@@ -149,7 +149,11 @@ <h1 class="page-title">Source: index.js</h1>
 	let self = this;
 	const _startToken = Buffer.from(_start)[0],
 		_separatorToken = Buffer.from(_separator)[0],
-		_endToken = Buffer.from(_end)[0];
+		_endToken = Buffer.from(_end)[0],
+		_spaceToken = Buffer.from(' ')[0],
+		_rToken = Buffer.from('\r')[0],
+		_nToken = Buffer.from('\n')[0],
+		_tToken = Buffer.from('\t')[0];
 	self.bytesRead = 0;
 	self.encoding = 'utf8';
 	self.StringDecoder = new StringDecoder(self.encoding);
@@ -169,8 +173,8 @@ <h1 class="page-title">Source: index.js</h1>
 		}
 		if(self.LeftBrace !== 0) {
 			self.StringBufferArray.push(_buffer.slice(s,s+1)); 
-		} else if((_startToken !== _buffer[s]) &amp;&amp; (_endToken !== _buffer[s]) &amp;&amp; (_separatorToken !== _buffer[s])){
-			error.push(new Error('Unexpected token '+_buffer.slice(s,s+1).toString(self.encoding)+' in JSON at position '+s));
+		} else if((_startToken !== _buffer[s]) &amp;&amp; (_endToken !== _buffer[s]) &amp;&amp; (_separatorToken !== _buffer[s]) &amp;&amp; (_spaceToken !== _buffer[s]) &amp;&amp; (_rToken !== _buffer[s]) &amp;&amp; (_nToken !== _buffer[s]) &amp;&amp; (_tToken !== _buffer[s])){
+			error.push(new Error('Unexpected token '+_buffer.slice(s,s+1).toString(self.encoding)+' in JSON at position '+(self.bytesRead+s)));
 		}
 	}
 	self.transform = new Stream.Transform({
@@ -292,7 +296,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-se
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 12:19:17 GMT+0300 (GMT+03:00)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Wed Jan 15 2020 09:30:06 GMT+0300 (GMT+03:00)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/module-sergdudko_objectstream-Parser.html b/docs/module-sergdudko_objectstream-Parser.html
index 3577015..c9db0b8 100644
--- a/docs/module-sergdudko_objectstream-Parser.html
+++ b/docs/module-sergdudko_objectstream-Parser.html
@@ -275,7 +275,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-se
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 12:19:17 GMT+0300 (GMT+03:00)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Wed Jan 15 2020 09:30:06 GMT+0300 (GMT+03:00)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/module-sergdudko_objectstream-Stringifer.html b/docs/module-sergdudko_objectstream-Stringifer.html
index 5decb5c..98b7d16 100644
--- a/docs/module-sergdudko_objectstream-Stringifer.html
+++ b/docs/module-sergdudko_objectstream-Stringifer.html
@@ -275,7 +275,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-se
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 12:19:17 GMT+0300 (GMT+03:00)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Wed Jan 15 2020 09:30:06 GMT+0300 (GMT+03:00)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/docs/module-sergdudko_objectstream.html b/docs/module-sergdudko_objectstream.html
index 68a66b4..c48239b 100644
--- a/docs/module-sergdudko_objectstream.html
+++ b/docs/module-sergdudko_objectstream.html
@@ -62,7 +62,7 @@ <h1 class="page-title">Module: sergdudko/objectstream</h1>
 
     
     <dt class="tag-version">Version:</dt>
-    <dd class="tag-version"><ul class="dummy"><li>1.7.5</li></ul></dd>
+    <dd class="tag-version"><ul class="dummy"><li>1.7.6</li></ul></dd>
     
 
     
@@ -190,7 +190,7 @@ <h2><a href="index.html">Home</a></h2><h3>Modules</h3><ul><li><a href="module-se
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Thu Jan 09 2020 12:19:17 GMT+0300 (GMT+03:00)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.3</a> on Wed Jan 15 2020 09:30:06 GMT+0300 (GMT+03:00)
 </footer>
 
 <script> prettyPrint(); </script>
diff --git a/index.js b/index.js
index 15caabd..67944a0 100644
--- a/index.js
+++ b/index.js
@@ -4,7 +4,7 @@
  * @author Siarhei Dudko <slavianich@gmail.com>
  * @copyright 2019
  * @license MIT
- * @version 1.7.5
+ * @version 1.7.6
  * @requires stream
  * @requires string_decoder
  */
@@ -121,7 +121,11 @@ let Parser = function(_start = '', _separator = '', _end = ''){
 	let self = this;
 	const _startToken = Buffer.from(_start)[0],
 		_separatorToken = Buffer.from(_separator)[0],
-		_endToken = Buffer.from(_end)[0];
+		_endToken = Buffer.from(_end)[0],
+		_spaceToken = Buffer.from(' ')[0],
+		_rToken = Buffer.from('\r')[0],
+		_nToken = Buffer.from('\n')[0],
+		_tToken = Buffer.from('\t')[0];
 	self.bytesRead = 0;
 	self.encoding = 'utf8';
 	self.StringDecoder = new StringDecoder(self.encoding);
@@ -141,8 +145,8 @@ let Parser = function(_start = '', _separator = '', _end = ''){
 		}
 		if(self.LeftBrace !== 0) {
 			self.StringBufferArray.push(_buffer.slice(s,s+1)); 
-		} else if((_startToken !== _buffer[s]) && (_endToken !== _buffer[s]) && (_separatorToken !== _buffer[s])){
-			error.push(new Error('Unexpected token '+_buffer.slice(s,s+1).toString(self.encoding)+' in JSON at position '+s));
+		} else if((_startToken !== _buffer[s]) && (_endToken !== _buffer[s]) && (_separatorToken !== _buffer[s]) && (_spaceToken !== _buffer[s]) && (_rToken !== _buffer[s]) && (_nToken !== _buffer[s]) && (_tToken !== _buffer[s])){
+			error.push(new Error('Unexpected token '+_buffer.slice(s,s+1).toString(self.encoding)+' in JSON at position '+(self.bytesRead+s)));
 		}
 	}
 	self.transform = new Stream.Transform({
diff --git a/package.json b/package.json
index 9ac2799..0730004 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sergdudko/objectstream",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "Creates a stream to convert json from string or convert json to string.",
   "main": "index.js",
   "scripts": {