@bablr/agast-helpers 0.11.0 → 0.11.1

package/lib/builders.js

@@ -402,6 +402,8 @@ export const parseObject = (input) => {
 
     obj[key] = value;
 
+    while (chr === ' ') chr = str[++p.idx];
+
     sep = chr === ',' ? chr : null;
     if (sep) {
       chr = str[++p.idx];
@@ -429,13 +431,23 @@ export const parseArray = (input) => {
     chr = str[++p.idx];
   }
 
-  let value = parseExpression(p);
-  chr = str[p.idx];
+  let first = true;
+  while (first || chr === ',') {
+    if (!first && chr === ',') {
+      chr = str[++p.idx];
+      while (chr === ' ') {
+        chr = str[++p.idx];
+      }
+    }
+    let value = parseExpression(p);
+    chr = str[p.idx];
 
-  arr.push(value);
+    arr.push(value);
 
-  while (chr === ' ') {
-    chr = str[++p.idx];
+    while (chr === ' ') {
+      chr = str[++p.idx];
+    }
+    first = false;
   }
 
   if (chr !== ']') throw new Error();
@@ -473,12 +485,31 @@ export const parseString = (input) => {
   return result.join('');
 };
 
+export const parseDigits = (input) => {
+  let p = buildParser(input);
+  let { str } = p;
+  let chr = str[p.idx];
+  let digits = [];
+
+  while (chr >= '0' && chr <= '9') {
+    digits.push(chr);
+    chr = str[++p.idx];
+  }
+
+  return parseInt(digits.join(''), 10);
+};
+
 export const parseUnsignedInteger = (input) => {
   let p = buildParser(input);
   let { str } = p;
   let chr = str[p.idx];
   let digits = [];
 
+  if (chr === '0') {
+    chr = str[++p.idx];
+    return 0;
+  }
+
   while (chr >= '0' && chr <= '9') {
     digits.push(chr);
     chr = str[++p.idx];
@@ -487,6 +518,58 @@ export const parseUnsignedInteger = (input) => {
   return parseInt(digits.join(''), 10);
 };
 
+export const parseInteger = (input) => {
+  let p = buildParser(input);
+  let { str } = p;
+  let chr = str[p.idx];
+  let negative = false;
+
+  if (chr === '-') {
+    negative = true;
+    chr = str[++p.idx];
+  }
+
+  return parseUnsignedInteger(p) * (negative ? -1 : 1);
+};
+
+export const parseNumber = (input) => {
+  let p = buildParser(input);
+  let { str } = p;
+  let chr = str[p.idx];
+  let startIdx = p.idx;
+
+  if (chr === '-') {
+    chr = str[++p.idx];
+  }
+
+  if (chr == '0') {
+    chr = str[++p.idx];
+  } else {
+    parseDigits(p);
+    chr = str[p.idx];
+  }
+
+  if (chr === '.') {
+    chr = str[++p.idx];
+    parseDigits(p);
+    chr = str[p.idx];
+  }
+
+  if (chr === 'e' || chr === 'E') {
+    chr = str[++p.idx];
+
+    if (chr === '+' || chr === '-') {
+      chr = str[++p.idx];
+    }
+
+    parseDigits(p);
+  }
+
+  let endIdx = p.idx;
+
+  return parseFloat(str.slice(startIdx, endIdx));
+};
+
 export const parseEscape = (input) => {
   let p = buildParser(input);
   let { str } = p;
@@ -601,7 +684,7 @@ export const parseExpression = (input) => {
         p.idx += 9;
         return -Infinity;
       } else {
-        throw new Error();
+        return parseNumber(p);
       }
     case '+':
       if (str[p.idx + 1] === 'I' && match(p, '+Infinity')) {
@@ -612,7 +695,7 @@ export const parseExpression = (input) => {
       }
     default:
       if (chr >= '0' && chr <= '9') {
-        return parseUnsignedInteger(p);
+        return parseNumber(p);
       } else {
         throw new Error();
       }

package/lib/print.js

@@ -13,20 +13,22 @@ import {
   StreamTag,
 } from './symbols.js';
 import { parseObject } from './builders.js';
+import { arrayValues } from './iterable.js';
 
 let { isInteger, isFinite } = Number;
 let { isArray } = Array;
-let { freeze } = Object;
+let { freeze, entries } = Object;
 let isString = (val) => typeof val === 'string';
 let isNumber = (val) => typeof val === 'number';
 let isObject = (val) => val && typeof val === 'object' && !isArray(val);
 
-export const printArray = (arr) => `[${arr.map((v) => printExpression(v)).join(', ')}]`;
+export const printArray = (arr) =>
+  `[${[...arrayValues(arr)].map((v) => printExpression(v)).join(', ')}]`;
 
 export const printObject = (obj) => {
-  let entries = Object.entries(obj);
-  return entries.length
-    ? `{ ${entries.map(([k, v]) => `${k}: ${printExpression(v)}`).join(', ')} }`
+  let entries_ = entries(obj);
+  return entries_.length
+    ? `{ ${entries_.map(([k, v]) => `${k}: ${printExpression(v)}`).join(', ')} }`
     : '{}';
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bablr/agast-helpers",
   "description": "Helper functions for working with agAST trees",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "author": "Conrad Buck<conartist6@gmail.com>",
   "type": "module",
   "files": [