@spyglassmc/json 0.2.0 → 0.3.0

package/lib/checker/primitives/boolean.js

@@ -1,7 +1,7 @@
 import { localize } from '@spyglassmc/locales';
 import { JsonBooleanNode } from '../../node/index.js';
 export function boolean(node, ctx) {
-    ctx.ops.set(node, 'expectation', [{ type: 'json:boolean', typedoc: 'Boolean' }]);
+    node.expectation = [{ type: 'json:boolean', typedoc: 'Boolean' }];
     if (!JsonBooleanNode.is(node)) {
         ctx.err.report(localize('expected', localize('boolean')), node);
     }

package/lib/checker/primitives/list.js

@@ -3,9 +3,9 @@ import { JsonArrayNode, JsonStringNode } from '../../node/index.js';
 import { expectation } from './util.js';
 export function listOf(checker) {
     return (node, ctx) => {
-        ctx.ops.set(node, 'expectation', [{ type: 'json:array', typedoc: 'Array' }]);
+        node.expectation = [{ type: 'json:array', typedoc: 'Array' }];
         if (!ctx.depth || ctx.depth <= 0) {
-            ctx.ops.set(node.expectation[0], 'items', expectation(checker, ctx));
+            node.expectation[0].items = expectation(checker, ctx);
         }
         if (!JsonArrayNode.is(node)) {
             ctx.err.report(localize('expected', localize('array')), node);

package/lib/checker/primitives/number.js

@@ -3,7 +3,7 @@ import { JsonNumberNode } from '../../node/index.js';
 const number = (type) => (min, max) => {
     return (node, ctx) => {
         const typedoc = 'Number' + (min === undefined && max === undefined ? '' : `(${min ?? '-∞'}, ${max ?? '+∞'})`);
-        ctx.ops.set(node, 'expectation', [{ type: 'json:number', typedoc }]);
+        node.expectation = [{ type: 'json:number', typedoc }];
         if (!JsonNumberNode.is(node) || (type === 'integer' && !Number.isInteger(node.value))) {
             ctx.err.report(localize('expected', localize(type)), node);
         }

package/lib/checker/primitives/object.js

@@ -7,22 +7,22 @@ function isComplex(checker) {
 }
 export function object(keys, values, options = {}) {
     return (node, ctx) => {
-        ctx.ops.set(node, 'expectation', [{ type: 'json:object', typedoc: 'Object' }]);
+        node.expectation = [{ type: 'json:object', typedoc: 'Object' }];
         if (!ctx.depth || ctx.depth <= 0) {
             if (Array.isArray(keys) && values) {
                 const fields = keys.map(key => [key, values(key, ctx)]).filter(([_, v]) => v !== undefined);
-                ctx.ops.set(node.expectation[0], 'fields', fields.map(([key, prop]) => {
+                node.expectation[0].fields = fields.map(([key, prop]) => {
                     return {
                         key,
                         value: expectation(isComplex(prop) ? prop.checker : prop, ctx),
                         ...isComplex(prop) && (prop.opt || prop.deprecated) ? { opt: true } : {},
                         ...isComplex(prop) && prop.deprecated ? { deprecated: true } : {},
                     };
-                }));
+                });
             }
             else if (typeof keys === 'function' && values) {
-                ctx.ops.set(node.expectation[0], 'keys', expectation(keys, ctx)
-                    ?.filter(JsonStringExpectation.is));
+                node.expectation[0].keys = expectation(keys, ctx)
+                    ?.filter(JsonStringExpectation.is);
             }
         }
         if (!JsonObjectNode.is(node)) {

package/lib/checker/primitives/string.d.ts

@@ -1,4 +1,4 @@
-import type { AllCategory, AstNode, Checker, Parser, ResourceLocationCategory, TaggableResourceLocationCategory } from '@spyglassmc/core';
+import type { AllCategory, AstNode, Parser, ResourceLocationCategory, SyncChecker, TaggableResourceLocationCategory } from '@spyglassmc/core';
 import { Lazy } from '@spyglassmc/core';
 import type { JsonExpectation } from '../../node/index.js';
 import { JsonStringNode } from '../../node/index.js';
@@ -6,7 +6,7 @@ import type { JsonChecker } from '../JsonChecker.js';
 export declare function resource(id: TaggableResourceLocationCategory, allowTag?: boolean): JsonChecker;
 export declare function resource(id: ResourceLocationCategory | string[], allowTag?: false): JsonChecker;
 export declare function literal(value: AllCategory | readonly string[]): JsonChecker;
-export declare function string<T extends AstNode>(name: string | readonly string[] | undefined, parser: Lazy<Parser<T>>, checker?: Lazy<Checker<T>>, expectation?: Partial<JsonExpectation>): JsonChecker;
-export declare function string(name?: string | readonly string[], parser?: undefined, checker?: Lazy<Checker<JsonStringNode>>, expectation?: Partial<JsonExpectation>): JsonChecker;
+export declare function string<T extends AstNode>(name: string | readonly string[] | undefined, parser: Lazy<Parser<T>>, checker?: Lazy<SyncChecker<T>>, expectation?: Partial<JsonExpectation>): JsonChecker;
+export declare function string(name?: string | readonly string[], parser?: undefined, checker?: Lazy<SyncChecker<JsonStringNode>>, expectation?: Partial<JsonExpectation>): JsonChecker;
 export declare const simpleString: JsonChecker;
 //# sourceMappingURL=string.d.ts.map

package/lib/checker/primitives/string.js

@@ -14,7 +14,7 @@ export function literal(value) {
 }
 export function string(name, parser, checker, expectation) {
     return (node, ctx) => {
-        ctx.ops.set(node, 'expectation', [{ type: 'json:string', typedoc: typedoc(name), ...expectation }]);
+        node.expectation = [{ type: 'json:string', typedoc: typedoc(name), ...expectation }];
         if (!JsonStringNode.is(node)) {
             ctx.err.report(localize('expected', localize('string')), node);
         }

package/lib/checker/primitives/util.js

@@ -1,4 +1,4 @@
-import { ErrorReporter, Operations, Range } from '@spyglassmc/core';
+import { ErrorReporter, Range, StateProxy } from '@spyglassmc/core';
 import { arrayToMessage, localize } from '@spyglassmc/locales';
 export function ref(checker) {
     return (node, ctx) => {
@@ -15,12 +15,11 @@ export function attempt(checker, node, ctx) {
     const tempCtx = {
         ...ctx,
         err: new ErrorReporter(),
-        ops: new Operations(),
         symbols: ctx.symbols.clone(),
     };
     checker(node, tempCtx);
     const tempExpectation = node.expectation;
-    tempCtx.ops.undo();
+    StateProxy.undoChanges(node);
     const totalErrorSpan = tempCtx.err.errors
         .map(e => e.range.end - e.range.start)
         .reduce((a, b) => a + b, 0);
@@ -30,7 +29,7 @@ export function attempt(checker, node, ctx) {
         expectation: tempExpectation,
         updateNodeAndCtx: () => {
             ctx.err.absorb(tempCtx.err);
-            tempCtx.ops.redo();
+            StateProxy.redoChanges(node);
             tempCtx.symbols.applyDelayedEdits();
         },
     };
@@ -53,11 +52,11 @@ export function any(checkers = []) {
         else {
             sameTypeAttempts[0].updateNodeAndCtx();
         }
-        ctx.ops.set(node, 'expectation', allExpectations);
+        node.expectation = allExpectations;
     };
 }
 export function expectation(checker, ctx) {
-    const node = { type: 'json:null', range: Range.create(0) };
+    const node = StateProxy.create({ type: 'json:null', range: Range.create(0) });
     const tempCtx = {
         ...ctx,
         err: new ErrorReporter(),

package/lib/index.d.ts

@@ -5,5 +5,5 @@ export * as completer from './completer/index.js';
 export * as formatter from './formatter/index.js';
 export * from './node/index.js';
 export * as parser from './parser/index.js';
-export declare const initialize: core.ProjectInitializer;
+export declare const initialize: core.SyncProjectInitializer;
 //# sourceMappingURL=index.d.ts.map

package/lib/node/JsonAstNode.d.ts

@@ -1,4 +1,4 @@
-import type { ItemNode, PairNode } from '@spyglassmc/core';
+import type { DeepReadonly, ItemNode, PairNode } from '@spyglassmc/core';
 import * as core from '@spyglassmc/core';
 export declare type JsonNode = JsonObjectNode | JsonArrayNode | JsonStringNode | JsonNumberNode | JsonBooleanNode | JsonNullNode;
 export declare type JsonRelatedNode = JsonNode | JsonPairNode | JsonItemNode;
@@ -11,9 +11,9 @@ interface JsonBaseAstNode {
 }
 export declare type JsonExpectation = JsonObjectExpectation | JsonArrayExpectation | JsonStringExpectation | JsonNumberExpectation | JsonBooleanExpectation;
 export declare namespace JsonExpectation {
-    function isArray(e: JsonExpectation): e is JsonArrayExpectation;
-    function isObject(e: JsonExpectation): e is JsonObjectExpectation;
-    function isString(e: JsonExpectation): e is JsonStringExpectation;
+    function isArray(e: DeepReadonly<JsonExpectation>): e is DeepReadonly<JsonArrayExpectation>;
+    function isObject(e: DeepReadonly<JsonExpectation>): e is DeepReadonly<JsonObjectExpectation>;
+    function isString(e: DeepReadonly<JsonExpectation>): e is DeepReadonly<JsonStringExpectation>;
 }
 interface JsonBaseExpectation {
     typedoc: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/json",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "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.2.0",
-    "@spyglassmc/locales": "0.2.0"
+    "@spyglassmc/core": "0.3.0",
+    "@spyglassmc/locales": "0.3.0"
   }
 }