@spyglassmc/java-edition 0.3.1 → 0.3.2

package/lib/mcfunction/completer/argument.js

@@ -1,9 +1,9 @@
-import { AstNode, BooleanNode, BrigadierStringOptions, completer, CompletionItem, FloatNode, getStates, InsertTextBuilder, IntegerNode, LiteralNode, Range, ResourceLocation, ResourceLocationNode, StringNode, SymbolNode } from '@spyglassmc/core';
+import { AstNode, BooleanNode, BrigadierStringOptions, completer, CompletionItem, FloatNode, getStates, InsertTextBuilder, IntegerNode, LiteralNode, Range, ResourceLocation, ResourceLocationNode, StringNode, SymbolNode, } from '@spyglassmc/core';
 import * as json from '@spyglassmc/json';
 import { localeQuote, localize } from '@spyglassmc/locales';
 import { getTagValues } from '../../common/index.js';
-import { ColorArgumentValues, EntityAnchorArgumentValues, ItemSlotArgumentValues, OperationArgumentValues, ScoreboardSlotArgumentValues, SwizzleArgumentValues } from '../common/index.js';
-import { BlockNode, CoordinateNode, EntitySelectorNode, IntRangeNode, ItemNode, ObjectiveCriteriaNode, ParticleNode, ScoreHolderNode, VectorNode } from '../node/index.js';
+import { ColorArgumentValues, EntityAnchorArgumentValues, ItemSlotArgumentValues, OperationArgumentValues, ScoreboardSlotArgumentValues, SwizzleArgumentValues, } from '../common/index.js';
+import { BlockNode, CoordinateNode, EntitySelectorNode, IntRangeNode, ItemNode, ObjectiveCriteriaNode, ParticleNode, ScoreHolderNode, VectorNode, } from '../node/index.js';
 export const getMockNodes = (rawTreeNode, range) => {
     const treeNode = rawTreeNode;
     switch (treeNode.parser) {
@@ -68,7 +68,10 @@ export const getMockNodes = (rawTreeNode, range) => {
         case 'minecraft:objective_criteria':
             return ObjectiveCriteriaNode.mock(range);
         case 'minecraft:operation':
-            return LiteralNode.mock(range, { pool: OperationArgumentValues, colorTokenType: 'operator' });
+            return LiteralNode.mock(range, {
+                pool: OperationArgumentValues,
+                colorTokenType: 'operator',
+            });
         case 'minecraft:particle':
             return ParticleNode.mock(range);
         case 'minecraft:resource':
@@ -109,7 +112,8 @@ const block = (node, ctx) => {
     if (Range.contains(node.id, ctx.offset, true)) {
         ans.push(...completer.resourceLocation(node.id, ctx));
     }
-    if (node.states && Range.contains(Range.translate(node.states, 1, -1), ctx.offset, true)) {
+    if (node.states &&
+        Range.contains(Range.translate(node.states, 1, -1), ctx.offset, true)) {
         ans.push(...blockStates(node.states, ctx));
     }
     return ans;
@@ -125,20 +129,21 @@ const blockStates = (node, ctx) => {
     return completer.record({
         key: (_record, pair, _ctx, range, insertValue, insertComma, existingKeys) => {
             return Object.keys(states)
-                .filter(k => pair?.key?.value === k || !existingKeys.some(ek => ek.value === k))
-                .map(k => CompletionItem.create(k, range, {
+                .filter((k) => pair?.key?.value === k ||
+                !existingKeys.some((ek) => ek.value === k))
+                .map((k) => CompletionItem.create(k, range, {
                 kind: 10 /* CompletionKind.Property */,
                 detail: localize('mcfunction.completer.block.states.default-value', localeQuote(states[k][0])),
                 insertText: new InsertTextBuilder()
                     .literal(k)
-                    .if(insertValue, b => b.literal('=').placeholder(...states[k]))
-                    .if(insertComma, b => b.literal(','))
+                    .if(insertValue, (b) => b.literal('=').placeholder(...states[k]))
+                    .if(insertComma, (b) => b.literal(','))
                     .build(),
             }));
         },
         value: (_record, pair, ctx) => {
             if (pair.key && states[pair.key.value]) {
-                return states[pair.key.value].map(v => CompletionItem.create(v, pair.value ?? ctx.offset, {
+                return states[pair.key.value].map((v) => CompletionItem.create(v, pair.value ?? ctx.offset, {
                     kind: 12 /* CompletionKind.Value */,
                 }));
             }
@@ -157,11 +162,17 @@ const item = (node, ctx) => {
     return ans;
 };
 const objectiveCriteria = (node, ctx) => {
-    const ans = ObjectiveCriteriaNode.SimpleValues.map(v => CompletionItem.create(v, node));
-    if (!node.children?.[0] || Range.contains(node.children[0], ctx.offset, true)) {
-        ans.push(...completer.resourceLocation(node.children?.[0] ?? ResourceLocationNode.mock(node, { category: 'stat_type', namespacePathSep: '.' }), ctx));
+    const ans = ObjectiveCriteriaNode.SimpleValues.map((v) => CompletionItem.create(v, node));
+    if (!node.children?.[0] ||
+        Range.contains(node.children[0], ctx.offset, true)) {
+        ans.push(...completer.resourceLocation(node.children?.[0] ??
+            ResourceLocationNode.mock(node, {
+                category: 'stat_type',
+                namespacePathSep: '.',
+            }), ctx));
     }
-    if (node.children?.[1] && Range.contains(node.children[1], ctx.offset, true)) {
+    if (node.children?.[1] &&
+        Range.contains(node.children[1], ctx.offset, true)) {
         ans.push(...completer.resourceLocation(node.children[1], ctx));
     }
     return ans;
@@ -175,16 +186,28 @@ const particle = (node, ctx) => {
     const map = {
         block: [BlockNode.mock(ctx.offset, false)],
         block_marker: [BlockNode.mock(ctx.offset, false)],
-        dust: [VectorNode.mock(ctx.offset, { dimension: 3 }), FloatNode.mock(ctx.offset)],
-        dust_color_transition: [VectorNode.mock(ctx.offset, { dimension: 3 }), FloatNode.mock(ctx.offset), VectorNode.mock(ctx.offset, { dimension: 3 })],
+        dust: [
+            VectorNode.mock(ctx.offset, { dimension: 3 }),
+            FloatNode.mock(ctx.offset),
+        ],
+        dust_color_transition: [
+            VectorNode.mock(ctx.offset, { dimension: 3 }),
+            FloatNode.mock(ctx.offset),
+            VectorNode.mock(ctx.offset, { dimension: 3 }),
+        ],
         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)],
+        vibration: [
+            VectorNode.mock(ctx.offset, { dimension: 3 }),
+            VectorNode.mock(ctx.offset, { dimension: 3 }),
+            IntegerNode.mock(ctx.offset),
+        ],
     };
     if (ParticleNode.isSpecialType(id)) {
-        const numParamsBefore = node.children?.slice(1).filter(n => n.range.end < ctx.offset).length ?? 0;
+        const numParamsBefore = node.children?.slice(1).filter((n) => n.range.end < ctx.offset).length ??
+            0;
         const mock = map[id][numParamsBefore];
         if (mock) {
             return completer.dispatch(mock, ctx);
@@ -210,7 +233,8 @@ const selector = (node, ctx) => {
     if (Range.contains(node.children[0], ctx.offset, true)) {
         return completer.literal(node.children[0], ctx);
     }
-    if (node.arguments && Range.contains(Range.translate(node.arguments, 1, -1), ctx.offset, true)) {
+    if (node.arguments &&
+        Range.contains(Range.translate(node.arguments, 1, -1), ctx.offset, true)) {
         return selectorArguments(node.arguments, ctx);
     }
     return [];
@@ -223,13 +247,14 @@ const selectorArguments = (node, ctx) => {
     return completer.record({
         key: (record, pair, _ctx, range, insertValue, insertComma) => {
             return [...EntitySelectorNode.ArgumentKeys]
-                .filter(k => EntitySelectorNode.canKeyExist(selector, record, k) === 0 /* EntitySelectorNode.Result.Ok */)
-                .map(k => CompletionItem.create(k, range, {
+                .filter((k) => EntitySelectorNode.canKeyExist(selector, record, k) ===
+                0 /* EntitySelectorNode.Result.Ok */)
+                .map((k) => CompletionItem.create(k, range, {
                 kind: 10 /* CompletionKind.Property */,
                 insertText: new InsertTextBuilder()
                     .literal(k)
-                    .if(insertValue, b => b.literal('=').placeholder()) // TODO
-                    .if(insertComma, b => b.literal(','))
+                    .if(insertValue, (b) => b.literal('=').placeholder()) // TODO
+                    .if(insertComma, (b) => b.literal(','))
                     .build(),
             }));
         },
@@ -242,7 +267,11 @@ const selectorArguments = (node, ctx) => {
     })(node, ctx);
 };
 const intRange = (node, _ctx) => {
-    return [CompletionItem.create('-2147483648..2147483647', node, { kind: 21 /* CompletionKind.Constant */ })];
+    return [
+        CompletionItem.create('-2147483648..2147483647', node, {
+            kind: 21 /* CompletionKind.Constant */,
+        }),
+    ];
 };
 const vector = (node, _ctx) => {
     const createCompletion = (coordinate, sortText) => CompletionItem.create(new Array(node.options.dimension).fill(coordinate).join(' '), node, { sortText });

package/lib/mcfunction/inlayHintProvider.js

@@ -5,11 +5,16 @@ export const inlayHintProvider = (node, ctx) => {
         return [];
     }
     const ans = [];
-    core.traversePreOrder(node, _ => true, mcf.CommandChildNode.is, n => {
+    core.traversePreOrder(node, (_) => true, mcf.CommandChildNode.is, (n) => {
         const node = n;
         const config = ctx.config.env.feature.inlayHint;
-        if (config === true || (typeof config === 'object' && config.enabledNodes.includes(node.children[0].type))) {
-            ans.push({ offset: node.range.start, text: `${node.path[node.path.length - 1]}:` });
+        if (config === true ||
+            (typeof config === 'object' &&
+                config.enabledNodes.includes(node.children[0].type))) {
+            ans.push({
+                offset: node.range.start,
+                text: `${node.path[node.path.length - 1]}:`,
+            });
         }
     });
     return ans;

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

@@ -59,14 +59,14 @@ export declare type EntitySelectorVariable = typeof EntitySelectorVariables[numb
 export declare namespace EntitySelectorVariable {
     function is(value: string): value is EntitySelectorVariable;
 }
-export declare const EntitySelectorAtVariables: ("@p" | "@a" | "@e" | "@r" | "@s")[];
+export declare const EntitySelectorAtVariables: ("@a" | "@e" | "@p" | "@r" | "@s")[];
 export declare type EntitySelectorAtVariable = typeof EntitySelectorAtVariables[number];
 export declare namespace EntitySelectorAtVariable {
     function is(value: string): value is EntitySelectorAtVariable;
 }
 export interface EntitySelectorNode extends core.AstNode {
     type: 'mcfunction:entity_selector';
-    children: [core.LiteralNode, ...[] | [EntitySelectorArgumentsNode]];
+    children: [core.LiteralNode, ...([] | [EntitySelectorArgumentsNode])];
     variable: EntitySelectorVariable;
     arguments?: EntitySelectorArgumentsNode;
     currentEntity?: boolean;
@@ -80,7 +80,7 @@ export interface EntitySelectorNode extends core.AstNode {
 export declare namespace 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">;
+    const ArgumentKeys: Set<"predicate" | "tag" | "team" | "type" | "level" | "advancements" | "nbt" | "name" | "distance" | "gamemode" | "limit" | "scores" | "sort" | "x" | "y" | "z" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
     type ArgumentKey = typeof ArgumentKeys extends Set<infer T> ? T : undefined;
     const enum Result {
         Ok = 0,

package/lib/mcfunction/node/argument.js

@@ -14,7 +14,10 @@ export var BlockNode;
     }
     BlockNode.is = is;
     function mock(range, isPredicate) {
-        const id = core.ResourceLocationNode.mock(range, { category: 'block', allowTag: isPredicate });
+        const id = core.ResourceLocationNode.mock(range, {
+            category: 'block',
+            allowTag: isPredicate,
+        });
         return {
             type: 'mcfunction:block',
             range: core.Range.get(range),
@@ -42,9 +45,7 @@ export var CoordinateNode;
     function toDegree(node) {
         // TODO: For relative coordinates, const value = (node.value + baseCoordinate) % 360
         const value = node.value % 360;
-        return value >= 180
-            ? value - 360
-            : value < -180 ? value + 360 : value;
+        return value >= 180 ? value - 360 : value < -180 ? value + 360 : value;
     }
     CoordinateNode.toDegree = toDegree;
 })(CoordinateNode || (CoordinateNode = {}));
@@ -52,7 +53,8 @@ export var EntitySelectorArgumentsNode;
 (function (EntitySelectorArgumentsNode) {
     /* istanbul ignore next */
     function is(node) {
-        return node.type === 'mcfunction:entity_selector/arguments';
+        return (node.type ===
+            'mcfunction:entity_selector/arguments');
     }
     EntitySelectorArgumentsNode.is = is;
 })(EntitySelectorArgumentsNode || (EntitySelectorArgumentsNode = {}));
@@ -65,7 +67,7 @@ export var EntitySelectorVariable;
     }
     EntitySelectorVariable.is = is;
 })(EntitySelectorVariable || (EntitySelectorVariable = {}));
-export const EntitySelectorAtVariables = EntitySelectorVariables.map(v => `@${v}`);
+export const EntitySelectorAtVariables = EntitySelectorVariables.map((v) => `@${v}`);
 export var EntitySelectorAtVariable;
 (function (EntitySelectorAtVariable) {
     /* istanbul ignore next */
@@ -78,11 +80,15 @@ export var EntitySelectorNode;
 (function (EntitySelectorNode) {
     /* istanbul ignore next */
     function is(node) {
-        return node?.type === 'mcfunction:entity_selector';
+        return (node?.type ===
+            'mcfunction:entity_selector');
     }
     EntitySelectorNode.is = is;
     function mock(range) {
-        const literal = core.LiteralNode.mock(range, { pool: EntitySelectorAtVariables, colorTokenType: 'keyword' });
+        const literal = core.LiteralNode.mock(range, {
+            pool: EntitySelectorAtVariables,
+            colorTokenType: 'keyword',
+        });
         return {
             type: 'mcfunction:entity_selector',
             range: core.Range.get(range),
@@ -92,13 +98,33 @@ export var EntitySelectorNode;
     }
     EntitySelectorNode.mock = mock;
     EntitySelectorNode.ArgumentKeys = new Set([
-        'advancements', 'distance', 'gamemode', 'level', 'limit', 'name',
-        'nbt', 'predicate', 'scores', 'sort', 'tag', 'team', 'type',
-        'x', 'y', 'z', 'dx', 'dy', 'dz', 'x_rotation', 'y_rotation',
+        'advancements',
+        'distance',
+        'gamemode',
+        'level',
+        'limit',
+        'name',
+        'nbt',
+        'predicate',
+        'scores',
+        'sort',
+        'tag',
+        'team',
+        'type',
+        'x',
+        'y',
+        'z',
+        'dx',
+        'dy',
+        'dz',
+        'x_rotation',
+        'y_rotation',
     ]);
     function canKeyExist(selector, argument, key) {
-        const hasKey = (key) => !!argument.children.find(p => p.key?.value === key);
-        const hasNonInvertedKey = (key) => !!argument.children.find(p => p.key?.value === key && !p.value?.inverted);
+        const hasKey = (key) => !!argument.children.find((p) => p.key?.value === key);
+        const hasNonInvertedKey = (key) => !!argument.children.find((p) => p.key?.value === key &&
+            !p.value
+                ?.inverted);
         switch (key) {
             case 'advancements':
             case 'distance':
@@ -149,7 +175,10 @@ export var ItemNode;
     }
     ItemNode.is = is;
     function mock(range, isPredicate) {
-        const id = core.ResourceLocationNode.mock(range, { category: 'item', allowTag: isPredicate });
+        const id = core.ResourceLocationNode.mock(range, {
+            category: 'item',
+            allowTag: isPredicate,
+        });
         return {
             type: 'mcfunction:item',
             range: core.Range.get(range),
@@ -174,8 +203,17 @@ export var IntRangeNode;
 export var ObjectiveCriteriaNode;
 (function (ObjectiveCriteriaNode) {
     ObjectiveCriteriaNode.SimpleValues = [
-        'air', 'armor', 'deathCount', 'dummy', 'food', 'health', 'level',
-        'playerKillCount', 'totalKillCount', 'trigger', 'xp',
+        'air',
+        'armor',
+        'deathCount',
+        'dummy',
+        'food',
+        'health',
+        'level',
+        'playerKillCount',
+        'totalKillCount',
+        'trigger',
+        'xp',
     ];
     ObjectiveCriteriaNode.ComplexCategories = new Map([
         ['broken', 'item'],
@@ -219,7 +257,9 @@ export var ParticleNode;
     }
     ParticleNode.is = is;
     function mock(range) {
-        const id = core.ResourceLocationNode.mock(range, { category: 'particle_type' });
+        const id = core.ResourceLocationNode.mock(range, {
+            category: 'particle_type',
+        });
         return {
             type: 'mcfunction:particle',
             range: core.Range.get(range),