@spyglassmc/json 0.3.5 → 0.3.7

package/lib/formatter/index.js

@@ -21,11 +21,12 @@ const object = (node, ctx) => {
     });
     return `{\n${fields.join(',\n')}\n${ctx.indent()}}`;
 };
+const number = (node, ctx) => ctx.meta.getFormatter(node.value.type)(node.value, ctx);
 export function register(meta) {
     meta.registerFormatter('json:array', array);
     meta.registerFormatter('json:boolean', core.formatter.boolean);
     meta.registerFormatter('json:null', () => 'null');
-    meta.registerFormatter('json:number', core.formatter.float);
+    meta.registerFormatter('json:number', number);
     meta.registerFormatter('json:object', object);
     meta.registerFormatter('json:string', core.formatter.string);
 }

package/lib/node/JsonAstNode.d.ts

@@ -71,9 +71,10 @@ export declare namespace JsonStringNode {
 export interface JsonNumberExpectation extends JsonBaseExpectation {
     readonly type: 'json:number';
 }
-export interface JsonNumberNode extends core.FloatBaseNode, JsonBaseAstNode {
+export interface JsonNumberNode extends JsonBaseAstNode, core.AstNode {
     readonly type: 'json:number';
-    readonly value: number;
+    readonly children: [core.LongNode | core.FloatNode];
+    readonly value: core.LongNode | core.FloatNode;
 }
 export declare namespace JsonNumberNode {
     function is(obj: object): obj is JsonNumberNode;

package/lib/parser/array.js

@@ -1,15 +1,10 @@
 import * as core from '@spyglassmc/core';
 import { entry } from './entry.js';
-export const array = (src, ctx) => {
-    const parser = core.list({
-        start: '[',
-        value: entry,
-        sep: ',',
-        trailingSep: false,
-        end: ']',
-    });
-    const ans = parser(src, ctx);
-    ans.type = 'json:array';
-    return ans;
-};
+export const array = (ctx, src) => core.setType('json:array', core.list({
+    start: '[',
+    value: entry,
+    sep: ',',
+    trailingSep: false,
+    end: ']',
+}))(ctx, src);
 //# sourceMappingURL=array.js.map

package/lib/parser/boolean.js

@@ -1,6 +1,6 @@
 import * as core from '@spyglassmc/core';
 import { Range } from '@spyglassmc/core';
-export const boolean = (src, ctx) => {
+export const boolean = (src, _ctx) => {
     const start = src.cursor;
     if (src.trySkip('false')) {
         return {

package/lib/parser/number.js

@@ -1,11 +1,24 @@
 import * as core from '@spyglassmc/core';
 export const number = (src, ctx) => {
-    const parser = core.float({
-        // Regex form of the chart from https://www.json.org.
-        pattern: /^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][-+]?\d+)?$/,
-    });
-    const ans = parser(src, ctx);
-    ans.type = 'json:number';
-    return ans;
+    const value = core.select([
+        {
+            regex: /^-?(?:0|[1-9]\d*)(?!\d|[.eE])/,
+            parser: core.long({
+                pattern: /^-?(?:0|[1-9]\d*)$/,
+            }),
+        },
+        {
+            parser: core.float({
+                // Regex form of the chart from https://www.json.org.
+                pattern: /^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][-+]?\d+)?$/,
+            }),
+        },
+    ])(src, ctx);
+    return {
+        type: 'json:number',
+        children: [value],
+        value: value,
+        range: value.range,
+    };
 };
 //# sourceMappingURL=number.js.map

package/lib/parser/object.js

@@ -1,17 +1,15 @@
 import * as core from '@spyglassmc/core';
 import { entry } from './entry.js';
 import { string } from './string.js';
-export const object = (src, ctx) => {
-    return core.setType('json:object', core.record({
-        start: '{',
-        pair: {
-            key: string,
-            sep: ':',
-            value: entry,
-            end: ',',
-            trailingEnd: false,
-        },
-        end: '}',
-    }))(src, ctx);
-};
+export const object = (src, ctx) => core.setType('json:object', core.record({
+    start: '{',
+    pair: {
+        key: string,
+        sep: ':',
+        value: entry,
+        end: ',',
+        trailingEnd: false,
+    },
+    end: '}',
+}))(src, ctx);
 //# sourceMappingURL=object.js.map

package/lib/parser/string.js

@@ -6,10 +6,5 @@ export const JsonStringOptions = {
     },
     quotes: ['"'],
 };
-export const string = (src, ctx) => {
-    const parser = core.string(JsonStringOptions);
-    const ans = parser(src, ctx);
-    ans.type = 'json:string';
-    return ans;
-};
+export const string = (src, ctx) => core.setType('json:string', core.string(JsonStringOptions))(src, ctx);
 //# sourceMappingURL=string.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/json",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
     "url": "https://github.com/SpyglassMC/Spyglass/issues"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.4.4",
-    "@spyglassmc/locales": "0.3.4"
+    "@spyglassmc/core": "0.4.5",
+    "@spyglassmc/locales": "0.3.5"
   }
 }