Make the JavaScript parser compliant with JSON5 specs

Author: JuliaGerasymenko

lib/serde-fallback.js

@@ -283,16 +283,16 @@ Parser.prototype.parseValue = function() {
   this.skipClutter();
 
   const look = this.lookahead();
-  if (this.isInitialDigit(look)) {
-    return this.parseNumber();
-  } else if (this.isLetter(look)) {
+  if (this.isLetter(look)) {
     return this.parseIdentifier();
   } else if (this.isQuoteCharacter(look)) {
     return this.parseString();
   } else if (look === '[') {
     return this.parseArray();
   } else if (look === '{') {
     return this.parseObject();
+  } else if (this.isInitialDigit(look) || look === 'I' || 'N') {
+    return this.parseNumber();
   } else {
     return this.throwUnexpected();
   }
@@ -319,13 +319,13 @@ Parser.prototype.parseNumber = function() {
 
     if (this.isDecimalDigit(look)) {
       this.throwError('Use new octal literals syntax');
-    } else if (look === 'b') {
+    } else if (look === 'b' || look === 'B') {
       base = 2;
       this.advance();
-    } else if (look === 'o') {
+    } else if (look === 'o' || look === 'O') {
       base = 8;
       this.advance();
-    } else if (look === 'x') {
+    } else if (look === 'x' || look === 'X') {
       base = 16;
       this.advance();
     } else {
@@ -341,6 +341,10 @@ Parser.prototype.parseNumber = function() {
     this.throwError('Invalid number format');
   }
 
+  if (value === Infinity) {
+    this.throwError('Invalid number format');
+  }
+
   return negateResult ? -value : value;
 };
 
@@ -470,6 +474,17 @@ Parser.prototype.parseString = function() {
       } else if (look === 'u') {
         this.retreat();
         string += this.parseUnicodeCharacter();
+      } else if (controlCharacter === undefined) {
+        if (string.slice(-1) !== ' ') {
+          if (this.advance() === ' ') {
+            string += ' ';
+            this.retreat();
+          } else {
+            this.retreat();
+            string += look;
+          }
+        }
+        this.skipWhitespace();
       } else {
         string += look;
       }
@@ -659,15 +674,21 @@ Parser.prototype.parseObjectKey = function() {
     return this.parseString();
   }
 
+  if (this.isInitialDigit(this.lookahead())) {
+    return this.parseNumber();
+  }
   if (!this.isInitialIdentifierCharacter(this.lookahead())) {
     this.throwExpected('String or identifier');
   }
 
   let key = '';
   while (this.isIdentifierCharacter(this.lookahead())) {
     key += this.advance();
+    while (this.lookahead() === '\\') {
+      this.advance();
+      key += this.parseUnicodeCharacter();
+    }
   }
-
   return key;
 };
 

lib/stringify.js

@@ -76,8 +76,10 @@ const STRINGIFIERS = {
         continue;
       }
 
-      if (!/^[a-zA-Z_$][\w$]*$/.test(key)) {
+      if (/^[a-zA-Z_$][/\w$]*$/.test(key)) {
         key = STRINGIFIERS.string(key);
+      } else {
+        key = STRINGIFIERS.number(key);
       }
 
       if (firstKey) {
@@ -126,7 +128,6 @@ function stringifyInternal(value, replacer, space, indent, key = '', holder) {
   } else {
     type = typeof value;
   }
-
   const stringifier = STRINGIFIERS[type];
   if (stringifier) return stringifier(value, replacer, space, indent);