vtrushin · vtrushin · Oct 25, 2017 · Oct 9, 2017 · Oct 14, 2017 · Oct 14, 2017
diff --git a/_index.js b/_index.js
@@ -0,0 +1,16 @@
+var parse = require('./build');
+var fs = require('fs');
+
+function readFile(file) {
+	var src = fs.readFileSync(file, 'utf8');
+	// normalize line endings
+	src = src.replace(/\r\n/, '\n');
+	// remove trailing newline
+	src = src.replace(/\n$/, '');
+
+	return src;
+}
+
+var a = parse(readFile('./_index.json'));
+
+console.log(a.children[0].key);
diff --git a/_index.json b/_index.json
@@ -1 +1 @@
-"x\""
+"\"\/"
diff --git a/index.html b/index.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+	<script src="build.js"></script>
+</head>
+<body>
+
+	<script>
+		fetch('_index.json').then(body => body.text()).then(text => {
+//			console.log(text);
+			console.log(jsonToAst(text));
+//			console.log(JSON.parse(text));
+		})
+	</script>
+
+</body>
+</html>
diff --git a/lib/parse.js b/lib/parse.js
@@ -42,6 +42,49 @@ function errorEof(input, tokenList, settings) {
 	);
 }
 
+function parseHexEscape(hexCode) {
+	const charCode = [...hexCode].reduce((acc, current) => (
+		acc * 16 + parseInt(current, 16)
+	), 0);
+
+	return String.fromCharCode(charCode);
+}
+
+var escapee = {
+	'"':  '"',
+	'\\': '\\',
+	'/':  '/',
+	b:    '\b',
+	f:    '\f',
+	n:    '\n',
+	r:    '\r',
+	t:    '\t'
+}
+
+/** @param {String} string */
+function parseString(string) {
+	let result = '';
+
+	for (let i = 0; i < String(string).length; i ++) {
+		let char = string.charAt(i);
+
+		if (char === '\\') {
+			if (string.charAt(i + 1) === 'u') {
+				result += parseHexEscape(string.substr(i + 2, 4));
+				i += 5;
+			} else {
+				result += escapee[string.charAt(i + 1)];
+				i++;
+			}
+		} else {
+			result += char;
+		}
+	}
+
+	return result;
+
+}
+
 function parseObject(input, tokenList, index, settings) {
 	// object: LEFT_BRACE (property (COMMA property)*)? RIGHT_BRACE
 	let startToken;
@@ -175,7 +218,7 @@ function parseProperty(input, tokenList, index, settings) {
 				if (token.type === tokenTypes.STRING) {
 					const key = {
 						type: 'Identifier',
-						value: input.slice(token.loc.start.offset + 1, token.loc.end.offset - 1),
+						value: parseString(input.slice(token.loc.start.offset + 1, token.loc.end.offset - 1)),
 						raw: token.value
 					};
 					if (settings.loc) {
@@ -344,7 +387,7 @@ function parseLiteral(input, tokenList, index, settings) {
 
 	switch (token.type) {
 		case tokenTypes.STRING: {
-			value = input.slice(token.loc.start.offset + 1, token.loc.end.offset - 1);
+			value = parseString(input.slice(token.loc.start.offset + 1, token.loc.end.offset - 1));
 			break;
 		}
 		case tokenTypes.NUMBER: {

diff --git a/test/fixtures/valid/big-non-verbosed.js b/test/fixtures/valid/big-non-verbosed.js
@@ -1,7 +1,7 @@
 var types = require('../../types');
 var object = types.createObject;
-var key = types.createObjectKey;
-var prop = types.createObjectProperty;
+var id = types.createIdentifier;
+var prop = types.createProperty();
 var array = types.createArray;
 var string = types.createString;
 var number = types.createNumber;
@@ -10,34 +10,34 @@ var _false = types.createFalse;
 
 var ast = array([
 	object([
-		prop(key('_id'), string('574d7238062156c6d9e6de99')),
-		prop(key('index'), number(0)),
-		prop(key('guid'), string('c99bf348-0345-49fd-be52-d0da82bdd47f')),
-		prop(key('isActive'), _true()),
-		prop(key('balance'), string('$1,087.03')),
-		prop(key('picture'), string('http://placehold.it/32x32')),
-		prop(key('age'), number(25)),
-		prop(key('eyeColor'), string('brown')),
-		prop(key('name'), object([
-			prop(key('first'), string('Stacie')),
-			prop(key('last'), string('Sargent'))
+		prop(id('_id'), string('574d7238062156c6d9e6de99')),
+		prop(id('index'), number(0)),
+		prop(id('guid'), string('c99bf348-0345-49fd-be52-d0da82bdd47f')),
+		prop(id('isActive'), _true()),
+		prop(id('balance'), string('$1,087.03')),
+		prop(id('picture'), string('http://placehold.it/32x32')),
+		prop(id('age'), number(25)),
+		prop(id('eyeColor'), string('brown')),
+		prop(id('name'), object([
+			prop(id('first'), string('Stacie')),
+			prop(id('last'), string('Sargent'))
 		])),
-		prop(key('company'), string('DAISU')),
-		prop(key('email'), string('stacie.sargent@daisu.com')),
-		prop(key('phone'), string('+1 (830) 537-3936')),
-		prop(key('address'), string('547 Charles Place, Weogufka, Marshall Islands, 6627')),
-		prop(key('about'), string('Exercitation nisi incididunt exercitation sit Lorem nostrud commodo incididunt cillum amet. Laboris proident non nostrud dolor esse exercitation enim sit culpa Lorem qui. Laborum aliquip pariatur mollit aute. Et consequat Lorem in cillum sunt dolore aute voluptate anim commodo. Excepteur labore proident consequat nulla occaecat in consequat minim.')),
-		prop(key('registered'), string('Sunday, October 4, 2015 3:58 PM')),
-		prop(key('latitude'), string('45.437159')),
-		prop(key('longitude'), string('-77.052972')),
-		prop(key('tags'), array([
+		prop(id('company'), string('DAISU')),
+		prop(id('email'), string('stacie.sargent@daisu.com')),
+		prop(id('phone'), string('+1 (830) 537-3936')),
+		prop(id('address'), string('547 Charles Place, Weogufka, Marshall Islands, 6627')),
+		prop(id('about'), string('Exercitation nisi incididunt exercitation sit Lorem nostrud commodo incididunt cillum amet. Laboris proident non nostrud dolor esse exercitation enim sit culpa Lorem qui. Laborum aliquip pariatur mollit aute. Et consequat Lorem in cillum sunt dolore aute voluptate anim commodo. Excepteur labore proident consequat nulla occaecat in consequat minim.')),
+		prop(id('registered'), string('Sunday, October 4, 2015 3:58 PM')),
+		prop(id('latitude'), string('45.437159')),
+		prop(id('longitude'), string('-77.052972')),
+		prop(id('tags'), array([
 			string('veniam'),
 			string('et'),
 			string('cillum'),
 			string('ex'),
 			string('nisi')
 		])),
-		prop(key('range'), array([
+		prop(id('range'), array([
 			number(0),
 			number(1),
 			number(2),
@@ -49,52 +49,52 @@ var ast = array([
 			number(8),
 			number(9)
 		])),
-		prop(key('friends'), array([
+		prop(id('friends'), array([
 			object([
-				prop(key('id'), number(0)),
-				prop(key('name'), string('Juliana Valentine'))
+				prop(id('id'), number(0)),
+				prop(id('name'), string('Juliana Valentine'))
 			]),
 			object([
-				prop(key('id'), number(1)),
-				prop(key('name'), string('Robert Eaton'))
+				prop(id('id'), number(1)),
+				prop(id('name'), string('Robert Eaton'))
 			]),
 			object([
-				prop(key('id'), number(2)),
-				prop(key('name'), string('Socorro Herrera'))
+				prop(id('id'), number(2)),
+				prop(id('name'), string('Socorro Herrera'))
 			])
 		])),
-		prop(key('greeting'), string('Hello, Stacie! You have 6 unread messages.')),
-		prop(key('favoriteFruit'), string('banana'))
+		prop(id('greeting'), string('Hello, Stacie! You have 6 unread messages.')),
+		prop(id('favoriteFruit'), string('banana'))
 	]),
 	object([
-		prop(key('_id'), string('574d7238bd4c01db9e4a4d5b')),
-		prop(key('index'), number(1)),
-		prop(key('guid'), string('5fd3fc48-e39e-4ee4-bc3a-6eb12bed2653')),
-		prop(key('isActive'), _false()),
-		prop(key('balance'), string('$1,696.52')),
-		prop(key('picture'), string('http://placehold.it/32x32')),
-		prop(key('age'), number(32)),
-		prop(key('eyeColor'), string('blue')),
-		prop(key('name'), object([
-			prop(key('first'), string('Ada')),
-			prop(key('last'), string('Stokes'))
+		prop(id('_id'), string('574d7238bd4c01db9e4a4d5b')),
+		prop(id('index'), number(1)),
+		prop(id('guid'), string('5fd3fc48-e39e-4ee4-bc3a-6eb12bed2653')),
+		prop(id('isActive'), _false()),
+		prop(id('balance'), string('$1,696.52')),
+		prop(id('picture'), string('http://placehold.it/32x32')),
+		prop(id('age'), number(32)),
+		prop(id('eyeColor'), string('blue')),
+		prop(id('name'), object([
+			prop(id('first'), string('Ada')),
+			prop(id('last'), string('Stokes'))
 		])),
-		prop(key('company'), string('FARMAGE')),
-		prop(key('email'), string('ada.stokes@farmage.biz')),
-		prop(key('phone'), string('+1 (875) 486-3569')),
-		prop(key('address'), string('361 Howard Place, Wyano, Michigan, 346')),
-		prop(key('about'), string('Culpa esse laboris enim occaecat voluptate non reprehenderit officia amet eu ad laboris officia. Exercitation qui occaecat veniam ea tempor. Reprehenderit laborum magna occaecat sit tempor eiusmod est quis ea. Sunt minim labore et eu ex. Pariatur do proident nisi sunt commodo. Deserunt est ad pariatur laboris officia. Pariatur anim deserunt excepteur voluptate amet.')),
-		prop(key('registered'), string('Wednesday, April 16, 2014 7:23 PM')),
-		prop(key('latitude'), string('-45.133396')),
-		prop(key('longitude'), string('43.593917')),
-		prop(key('tags'), array([
+		prop(id('company'), string('FARMAGE')),
+		prop(id('email'), string('ada.stokes@farmage.biz')),
+		prop(id('phone'), string('+1 (875) 486-3569')),
+		prop(id('address'), string('361 Howard Place, Wyano, Michigan, 346')),
+		prop(id('about'), string('Culpa esse laboris enim occaecat voluptate non reprehenderit officia amet eu ad laboris officia. Exercitation qui occaecat veniam ea tempor. Reprehenderit laborum magna occaecat sit tempor eiusmod est quis ea. Sunt minim labore et eu ex. Pariatur do proident nisi sunt commodo. Deserunt est ad pariatur laboris officia. Pariatur anim deserunt excepteur voluptate amet.')),
+		prop(id('registered'), string('Wednesday, April 16, 2014 7:23 PM')),
+		prop(id('latitude'), string('-45.133396')),
+		prop(id('longitude'), string('43.593917')),
+		prop(id('tags'), array([
 			string('qui'),
 			string('eiusmod'),
 			string('nisi'),
 			string('officia'),
 			string('in')
 		])),
-		prop(key('range'), array([
+		prop(id('range'), array([
 			number(0),
 			number(1),
 			number(2),
@@ -106,22 +106,22 @@ var ast = array([
 			number(8),
 			number(9)
 		])),
-		prop(key('friends'), array([
+		prop(id('friends'), array([
 			object([
-				prop(key('id'), number(0)),
-				prop(key('name'), string('Campos Pruitt'))
+				prop(id('id'), number(0)),
+				prop(id('name'), string('Campos Pruitt'))
 			]),
 			object([
-				prop(key('id'), number(1)),
-				prop(key('name'), string('Barnett Sykes'))
+				prop(id('id'), number(1)),
+				prop(id('name'), string('Barnett Sykes'))
 			]),
 			object([
-				prop(key('id'), number(2)),
-				prop(key('name'), string('Trudy Collier'))
+				prop(id('id'), number(2)),
+				prop(id('name'), string('Trudy Collier'))
 			])
 		])),
-		prop(key('greeting'), string('Hello, Ada! You have 8 unread messages.')),
-		prop(key('favoriteFruit'), string('banana'))
+		prop(id('greeting'), string('Hello, Ada! You have 8 unread messages.')),
+		prop(id('favoriteFruit'), string('banana'))
 	])
 ]);
 

diff --git a/test/fixtures/valid/deep.js b/test/fixtures/valid/deep.js
@@ -1,25 +1,24 @@
 var types = require('../../types');
-var key = types.createObjectKey;
-var location = types.location;
+var id = types.createIdentifier;
 var object = types.createObject;
-var prop = types.createObjectProperty;
+var prop = types.createProperty;
 var array = types.createArray;
-var string = types.createString;
+var literal = types.createLiteral;
 
-var n = array([string('n')]/*, location()*/);
-var m = array([string('m'), n]/*, location()*/);
-var l = array([string('l'), m]/*, location()*/);
-var k = array([string('k'), l]/*, location()*/);
-var j = array([string('j'), k]/*, location()*/);
-var i = array([string('i'), j]/*, location()*/);
-var h = array([string('h'), i]/*, location()*/);
-var g = object([prop(key('g'), h)]/*, location()*/);
-var f = object([prop(key('f'), g)]/*, location()*/);
-var e = object([prop(key('e'), f)]/*, location()*/);
-var d = object([prop(key('d'), e)]/*, location()*/);
-var c = object([prop(key('c'), d)]/*, location()*/);
-var b = object([prop(key('b'/*, location(3, 5, 15, 3, 8, 18)*/), c)]/*, location()*/);
-var a = object([prop(key('a'/*, location(2, 3, 4, 2, 6, 7)*/), b)]/*, location(1, 1, 0, 29, 2, 516)*/);
+var n = array([literal('n', '"n"')]);
+var m = array([literal('m', '"m"'), n]);
+var l = array([literal('l', '"l"'), m]);
+var k = array([literal('k', '"k"'), l]);
+var j = array([literal('j', '"j"'), k]);
+var i = array([literal('i', '"i"'), j]);
+var h = array([literal('h', '"h"'), i]);
+var g = object([prop(id('g', '"g"'), h)]);
+var f = object([prop(id('f', '"f"'), g)]);
+var e = object([prop(id('e', '"e"'), f)]);
+var d = object([prop(id('d', '"d"'), e)]);
+var c = object([prop(id('c', '"c"'), d)]);
+var b = object([prop(id('b', '"b"'), c)]);
+var a = object([prop(id('a', '"a"'), b)]);
 
 module.exports = {
 	ast: a,

diff --git a/test/fixtures/valid/exponential-numbers.js b/test/fixtures/valid/exponential-numbers.js
@@ -0,0 +1,17 @@
+var types = require('../../types');
+var array = types.createArray;
+var literal = types.createLiteral;
+
+var ast = array([
+	literal(1, '1'),
+	number(1.2, '1.2'),
+	literal(1200, '1.2e3'),
+	literal(0.0012, '1.2e-3')
+]);
+
+module.exports = {
+	ast: ast,
+	options: {
+		loc: false
+	}
+};
diff --git a/test/fixtures/valid/exponential-numbers.json b/test/fixtures/valid/exponential-numbers.json
@@ -0,0 +1,6 @@
+[
+  1,
+  1.2,
+  1.2e3,
+  1.2e-3
+]
-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    [
+,
+.2,
+.2e3,
+.2e-3
+    ]