@spyglassmc/java-edition 0.2.0 → 0.3.0

package/lib/common/index.js

@@ -13,7 +13,8 @@ export function getTagValues(category, id, ctx) {
         ? node.value
         : node.children.find(n => n.key?.value === 'id').value.value;
     const set = getUris(category, id, ctx).reduce((ans, uri) => {
-        const result = ctx.getDocAndNode(uri);
+        // const result = ctx.getDocAndNode(uri)
+        const result = undefined; // FIXME: Use global symbol table to get the result
         if (!result || result.node.parserErrors.length || result.node.checkerErrors?.length) {
             return ans;
         }

package/lib/json/checker/data/advancement.js

@@ -415,8 +415,8 @@ export const advancement = as('advancement', record({
     })),
     parent: opt(resource('advancement')),
     criteria: object(string(undefined, undefined, (node, ctx) => {
-        // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-        if (!ctx.ensureChecked) {
+        // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+        if (!ctx.ensureBindingStarted) {
             return;
         }
         const parts = dissectUri(ctx.doc.uri, ctx);
@@ -429,8 +429,8 @@ export const advancement = as('advancement', record({
         });
     }), () => criterion),
     requirements: opt(listOf(listOf((node, ctx) => {
-        // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-        if (!ctx.ensureChecked) {
+        // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+        if (!ctx.ensureBindingStarted) {
             return;
         }
         const parts = dissectUri(ctx.doc.uri, ctx);

package/lib/json/checker/data/feature.js

@@ -87,8 +87,8 @@ const block_state_provider = as('block_state_provider', dispatch('type', (type,
             states: listOf(block_state),
         },
         randomized_int_state_provider: {
-            // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-            property: (ctx.ensureChecked) ? literal(blockProviderProperties(props.find(p => p.key?.value === 'source')?.value, ctx)) : simpleString,
+            // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+            property: (ctx.ensureBindingStarted) ? literal(blockProviderProperties(props.find(p => p.key?.value === 'source')?.value, ctx)) : simpleString,
             values: intProvider(),
             source: block_state_provider,
         },

package/lib/json/checker/data/tag.d.ts

@@ -1,7 +1,7 @@
-export declare const block_tag: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const entity_type_tag: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const fluid_tag: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const function_tag: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const game_event_tag: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const item_tag: import("@spyglassmc/json/lib/checker").JsonChecker;
+export declare const block_tag: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const entity_type_tag: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const fluid_tag: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const function_tag: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const game_event_tag: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const item_tag: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
 //# sourceMappingURL=tag.d.ts.map

package/lib/json/checker/util/advancement.js

@@ -1,8 +1,8 @@
 import { literal, simpleString } from '@spyglassmc/json/lib/checker/index.js';
 export function criterionReference(advancement) {
     return (node, ctx) => {
-        // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-        if (!ctx.ensureChecked) {
+        // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+        if (!ctx.ensureBindingStarted) {
             simpleString(node, ctx);
             return;
         }

package/lib/json/checker/util/block_states.js

@@ -9,8 +9,8 @@ export function blockStateMap({ category, id, ids, tag, mixedTypes, requireAll }
         else if (id) {
             ids = [id];
         }
-        // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-        if (!ids?.length || !ctx.ensureChecked) {
+        // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+        if (!ids?.length || !ctx.ensureBindingStarted) {
             const values = mixedTypes ? any([boolean, simpleString, intBounds()]) : simpleString;
             object(simpleString, () => requireAll ? values : opt(values))(node, ctx);
             return;
@@ -40,8 +40,8 @@ export function blockStateList({ category, id, ids, tag }) {
         else if (id) {
             ids = [id];
         }
-        // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-        if (!ids?.length || !ctx.ensureChecked) {
+        // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+        if (!ids?.length || !ctx.ensureBindingStarted) {
             listOf(simpleString)(node, ctx);
             return;
         }

package/lib/json/checker/util/color.js

@@ -27,18 +27,18 @@ export function stringColor() {
         return Color.fromCompositeInt(value);
     };
     return (node, ctx) => {
-        ctx.ops.set(node, 'expectation', [{ type: 'json:string', typedoc: 'String("Color")', pool: Color.ColorNames }]);
+        node.expectation = [{ type: 'json:string', typedoc: 'String("Color")', pool: Color.ColorNames }];
         if (!JsonStringNode.is(node)) {
             ctx.err.report(localize('expected', localize('string')), node);
         }
         else {
             const result = parseStringValue(parser, node.value, node.valueMap, ctx);
             if (result !== Failure) {
-                ctx.ops.set(node, 'color', {
+                node.color = {
                     value: result,
                     format: [ColorFormat.HexRGB],
                     range: { start: node.range.start + 1, end: node.range.end - 1 },
-                });
+                };
             }
         }
     };
@@ -49,10 +49,10 @@ export function intColor() {
             ctx.err.report(localize('expected', localize('integer')), node);
         }
         else {
-            ctx.ops.set(node, 'color', {
+            node.color = {
                 value: Color.fromCompositeInt(node.value),
                 format: [ColorFormat.CompositeInt],
-            });
+            };
         }
     };
 }

package/lib/json/checker/util/nbt.js

@@ -15,8 +15,8 @@ function isDefinitionOptions(options) {
 }
 function definitionNbt({ definition }) {
     return (node, ctx) => {
-        // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-        if (!ctx.ensureChecked) {
+        // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+        if (!ctx.ensureBindingStarted) {
             simpleString(node, ctx);
             return;
         }
@@ -28,8 +28,8 @@ function definitionNbt({ definition }) {
 function registryNbt(options) {
     return (node, ctx) => {
         const ids = getIds(options, ctx);
-        // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-        if (!ctx.ensureChecked) {
+        // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+        if (!ctx.ensureBindingStarted) {
             simpleString(node, ctx);
             return;
         }
@@ -41,8 +41,8 @@ function registryNbt(options) {
 export function nbtPath(options) {
     return (node, ctx) => {
         const ids = getIds(options, ctx);
-        // FIXME: Temporary solution to make tests pass when ensureChecked is not given.
-        if (!ctx.ensureChecked) {
+        // FIXME: Temporary solution to make tests pass when ensureBindingStarted is not given.
+        if (!ctx.ensureBindingStarted) {
             simpleString(node, ctx);
             return;
         }

package/lib/json/checker/util/uuid.d.ts

@@ -1,2 +1,2 @@
-export declare const uuid: import("@spyglassmc/json/lib/checker/JsonChecker").JsonChecker;
+export declare const uuid: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
 //# sourceMappingURL=uuid.d.ts.map

package/lib/mcfunction/completer/argument.js

@@ -180,6 +180,7 @@ const particle = (node, ctx) => {
         falling_dust: [BlockNode.mock(ctx.offset, false)],
         item: [ItemNode.mock(ctx.offset, false)],
         sculk_charge: [FloatNode.mock(ctx.offset)],
+        shriek: [IntegerNode.mock(ctx.offset)],
         vibration: [VectorNode.mock(ctx.offset, { dimension: 3 }), VectorNode.mock(ctx.offset, { dimension: 3 }), IntegerNode.mock(ctx.offset)],
     };
     if (ParticleNode.isSpecialType(id)) {

package/lib/mcfunction/node/argument.d.ts

@@ -14,7 +14,7 @@ export interface BlockNode extends core.AstNode {
     nbt?: nbt.NbtCompoundNode;
 }
 export declare namespace BlockNode {
-    function is(node: core.AstNode | undefined): node is BlockNode;
+    function is(node: core.DeepReadonly<core.AstNode> | undefined): node is BlockNode;
     function mock(range: core.RangeLike, isPredicate: boolean): BlockNode;
 }
 export declare const CoordinateNotations: readonly ["", "~", "^"];
@@ -78,7 +78,7 @@ export interface EntitySelectorNode extends core.AstNode {
     typeLimited?: boolean;
 }
 export declare namespace EntitySelectorNode {
-    function is(node: core.AstNode | undefined): node is EntitySelectorNode;
+    function is<T extends core.DeepReadonly<core.AstNode> | undefined>(node: T): node is core.NodeIsHelper<EntitySelectorNode, T>;
     function mock(range: core.RangeLike): EntitySelectorNode;
     const ArgumentKeys: Set<"predicate" | "tag" | "team" | "type" | "level" | "advancements" | "nbt" | "name" | "scores" | "limit" | "x" | "y" | "z" | "distance" | "gamemode" | "sort" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
     type ArgumentKey = typeof ArgumentKeys extends Set<infer T> ? T : undefined;
@@ -87,7 +87,7 @@ export declare namespace EntitySelectorNode {
         Duplicated = 1,
         NotApplicable = 2
     }
-    function canKeyExist(selector: EntitySelectorNode, argument: EntitySelectorArgumentsNode, key: string): Result;
+    function canKeyExist(selector: core.DeepReadonly<EntitySelectorNode>, argument: core.DeepReadonly<EntitySelectorArgumentsNode>, key: string): Result;
 }
 export interface EntityNode extends core.AstNode {
     type: 'mcfunction:entity';
@@ -143,7 +143,7 @@ export interface ParticleNode extends core.AstNode {
     id: core.ResourceLocationNode;
 }
 export declare namespace ParticleNode {
-    const SpecialTypes: Set<"block" | "item" | "block_marker" | "dust" | "dust_color_transition" | "falling_dust" | "sculk_charge" | "vibration">;
+    const SpecialTypes: Set<"block" | "item" | "block_marker" | "dust" | "dust_color_transition" | "falling_dust" | "sculk_charge" | "shriek" | "vibration">;
     export type SpecialType = typeof SpecialTypes extends Set<infer T> ? T : undefined;
     export function isSpecialType(type: string | undefined): type is SpecialType;
     export function is(node: core.AstNode | undefined): node is ParticleNode;

package/lib/mcfunction/node/argument.js

@@ -207,6 +207,7 @@ export var ParticleNode;
         'falling_dust',
         'item',
         'sculk_charge',
+        'shriek',
         'vibration',
     ]);
     function isSpecialType(type) {

package/lib/mcfunction/parser/argument.js

@@ -360,7 +360,8 @@ export const particle = (() => {
         falling_dust: blockState,
         item: itemStack,
         sculk_charge: float(),
-        vibration: sequence([vec, vec, integer()], sep),
+        shriek: integer(),
+        vibration: sequence([vec, integer()], sep),
     };
     return core.map(sequence([
         core.resourceLocation({ category: 'particle_type' }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,12 +17,12 @@
     "release:dry": "npm publish --dry-run"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.2.0",
-    "@spyglassmc/json": "0.2.0",
-    "@spyglassmc/locales": "0.2.0",
-    "@spyglassmc/mcfunction": "0.2.0",
-    "@spyglassmc/mcdoc": "0.2.0",
-    "@spyglassmc/nbt": "0.2.0"
+    "@spyglassmc/core": "0.3.0",
+    "@spyglassmc/json": "0.3.0",
+    "@spyglassmc/locales": "0.3.0",
+    "@spyglassmc/mcfunction": "0.2.1",
+    "@spyglassmc/mcdoc": "0.3.0",
+    "@spyglassmc/nbt": "0.3.0"
   },
   "devDependencies": {
     "fast-glob": "^3.2.5",