Types and optional quotes

Not the best implementation possible, but i didn't want to modify the module structure

Author: Foresteam

index.d.ts

@@ -0,0 +1,10 @@
+declare module "mojangson" {
+	interface MojangsonEntry {
+		value: object;
+		type: string;
+	}
+	function simplify(data: object): object;
+	function stringify({ value, type }: MojangsonEntry, quotes?: boolean): string;
+	function parse(text: string): object;
+	function normalize(str: string, quotes?: boolean): string;
+}

index.js

@@ -1,8 +1,8 @@
 const nearley = require('nearley')
 const grammar = require('./grammar')
 
-function simplify (data) {
-  function transform (value, type) {
+function simplify(data) {
+  function transform(value, type) {
     if (type === 'compound') {
       return Object.keys(value).reduce(function (acc, key) {
         acc[key] = simplify(value[key])
@@ -17,53 +17,59 @@ function simplify (data) {
   return transform(data.value, data.type)
 }
 
-function stringify ({ value, type }) {
+function stringify({ value, type }, quotes = false) {
   if (type === 'compound') {
     const str = []
     const entries = Object.entries(value)
     for (let i = 0; i < entries.length; i++) {
       const _type = entries[i][0]
-      let _value = stringify(entries[i][1])
-      if (_type === 'string') _value = normalizeString(_value)
-      str.push(`${_type}:${_value}`)
+      let _value = stringify(entries[i][1], quotes)
+      if (_type === 'string') _value = normalizeString(_value, quotes)
+      if (quotes)
+        str.push(`"${_type}":${_value}`)
+        else
+        str.push(`${_type}:${_value}`)
+
     }
     return `{${str.join(',')}}`
   } else if (type === 'list') {
     if (!Array.isArray(value.value)) return '[]'
-    const arrayElements = getArrayValues(value)
+    const arrayElements = getArrayValues(value, quotes)
     return `[${arrayElements}]`
   } else if (type === 'byteArray' || type === 'intArray' || type === 'longArray') {
     const prefix = getArrayPrefix(type)
-    const arrayElements = getArrayValues(value)
+    const arrayElements = getArrayValues(value, quotes)
     return `[${prefix}${arrayElements}]`
   }
   let str = value + getSuffix(value, type)
-  if (type === 'string') str = normalizeString(str)
+  if (type === 'string') str = normalizeString(str, quotes)
   return str
 }
 
-function normalizeString (str) {
+function normalizeString(str, quotes) {
   str = str.replace(/"/g, '\\"')
   if (/'|{|}|\[|\]|:|;|,|\(|\)|§|=/g.test(str) || str === '') str = `"${str}"`
+  if (quotes && !str.startsWith('"'))
+    str = `"${str}"`
   return str
 }
 
-function getArrayValues ({ value: arr, type }) {
+function getArrayValues({ value: arr, type }, quotes) {
   const hasMissingEl = hasMissingElements(arr)
   const str = []
   // add nullable length that way [] is pased as []
   for (let i = 0; i < arr.length; i++) {
     let curr = arr[i]
     if (curr !== undefined) {
-      curr = stringify({ value: curr, type })
+      curr = stringify({ value: curr, type }, quotes)
       if (hasMissingEl) str.push(`${i}:${curr}`)
       else str.push(curr)
     }
   }
   return str.join(',')
 }
 
-function hasMissingElements (arr) {
+function hasMissingElements(arr) {
   for (let i = 0; i < arr.length; i++) {
     if (arr[i] === undefined) return true
   }
@@ -72,7 +78,7 @@ function hasMissingElements (arr) {
 
 const getArrayPrefix = type => type.charAt(0).toUpperCase() + ';'
 
-function getSuffix (val, type) {
+function getSuffix(val, type) {
   if (type === 'double') return ((val >> 0) === val) ? 'd' : ''
   return { int: '', byte: 'b', short: 's', float: 'f', long: 'l', string: '' }[type]
 }
@@ -83,11 +89,11 @@ function getSuffix (val, type) {
  * @returns {string} the normalized mojangson
  */
 
-function normalize (str) {
-  return stringify(parse(str))
+function normalize(str, quotes = false) {
+  return stringify(parse(str), quotes)
 }
 
-function parse (text) {
+function parse(text) {
   try {
     const parserNE = new nearley.Parser(nearley.Grammar.fromCompiled(grammar))
     parserNE.feed(text)
@@ -103,4 +109,4 @@ module.exports = {
   simplify,
   stringify,
   normalize
-}
+}

package.json

@@ -3,6 +3,7 @@
   "version": "2.0.2",
   "description": "A mojangson parser written in node.js",
   "main": "index.js",
+  "types": "index.d.ts",
   "repository": {
     "type": "git",
     "url": "git://github.com/rom1504/node-mojangson.git"