@spyglassmc/java-edition 0.3.18 → 0.3.20

package/lib/mcfunction/parser/argument.js

@@ -97,7 +97,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:entity_summon':
             return wrap(core.resourceLocation({ category: 'entity_type' }));
         case 'minecraft:float_range':
-            return wrap(range('float'));
+            return wrap(range('float', treeNode.properties?.min, treeNode.properties?.max, treeNode.properties?.minSpan, treeNode.properties?.maxSpan));
         case 'minecraft:function':
             return wrap(core.resourceLocation({ category: 'function', allowTag: true }));
         case 'minecraft:gamemode':
@@ -107,7 +107,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:heightmap':
             return wrap(core.literal(...HeightmapValues));
         case 'minecraft:int_range':
-            return wrap(range('integer'));
+            return wrap(range('integer', treeNode.properties?.min, treeNode.properties?.max, treeNode.properties?.minSpan, treeNode.properties?.maxSpan));
         case 'minecraft:item_enchantment':
             return wrap(core.resourceLocation({ category: 'enchantment' }));
         case 'minecraft:item_predicate':
@@ -453,7 +453,7 @@ export const particle = (src, ctx) => {
         return ans;
     })(src, ctx);
 };
-function range(type, min, max, cycleable) {
+function range(type, min, max, minSpan, maxSpan, cycleable) {
     const number = type === 'float'
         ? float(min, max)
         : integer(min, max);
@@ -488,6 +488,17 @@ function range(type, min, max, cycleable) {
             && ans.value[0] > ans.value[1]) {
             ctx.err.report(localize('mcfunction.parser.range.min>max', ans.value[0], ans.value[1]), res);
         }
+        else if (minSpan !== undefined || maxSpan !== undefined) {
+            const span = ans.value[0] !== undefined && ans.value[1] !== undefined
+                ? Math.abs(ans.value[0] - ans.value[1])
+                : (ans.value[0] ?? ans.value[1] ?? Infinity);
+            if (minSpan !== undefined && span < minSpan) {
+                ctx.err.report(localize('mcfunction.parser.range.span-too-small', span, minSpan), res);
+            }
+            else if (maxSpan !== undefined && span > maxSpan) {
+                ctx.err.report(localize('mcfunction.parser.range.span-too-large', span, maxSpan), res);
+            }
+        }
         return ans;
     });
 }
@@ -798,7 +809,7 @@ export function selector(ignoreInvalidPrefix = false) {
                                         });
                                     case 'x_rotation':
                                     case 'y_rotation':
-                                        return core.map(range('float', undefined, undefined, true), (res, _, ctx) => {
+                                        return core.map(range('float', undefined, undefined, undefined, undefined, true), (res, _, ctx) => {
                                             if (hasKey(key.value)) {
                                                 ctx.err.report(localize('duplicate-key', localeQuote(key.value)), key);
                                             }
@@ -883,9 +894,12 @@ export function scoreHolderFakeName(usageType) {
     return validateLength(symbol({ category: 'score_holder', usageType }), FakeNameMaxLength, 'mcfunction.parser.score_holder.fake-name.too-long');
 }
 export function scoreHolder(usageType, amount) {
-    return core.map(core.select([{ predicate: (src) => src.peek() === '@', parser: selector() }, {
-            parser: scoreHolderFakeName(usageType),
-        }]), (res, _src, ctx) => {
+    return core.map(core.select([
+        // Technically score holders can start with *, but this doesn't account for it
+        { prefix: '*', parser: core.literal('*') },
+        { prefix: '@', parser: selector() },
+        { parser: scoreHolderFakeName(usageType) },
+    ]), (res, _src, ctx) => {
         const ans = {
             type: 'mcfunction:score_holder',
             range: res.range,
@@ -894,9 +908,12 @@ export function scoreHolder(usageType, amount) {
         if (core.SymbolNode.is(res)) {
             ans.fakeName = res;
         }
-        else {
+        else if (EntitySelectorNode.is(res)) {
             ans.selector = res;
         }
+        else {
+            ans.wildcard = res;
+        }
         if (amount === 'single' && ans.selector && !ans.selector.single) {
             ctx.err.report(localize('mcfunction.parser.entity-selector.multiple-disallowed'), ans);
         }
@@ -1046,24 +1063,75 @@ function vector(options) {
         return ans;
     };
 }
-const components = core.map(core.record({
-    start: '[',
-    pair: {
-        key: core.resourceLocation({ category: 'data_component_type' }),
-        sep: '=',
-        value: nbt.parser.entry,
-        end: ',',
-        trailingEnd: true,
-    },
-    end: ']',
-}), (res) => {
+const components = (src, ctx) => {
+    const release = ctx.project['loadedVersion'];
+    const allowComponentRemoval = !release || ReleaseVersion.cmp(release, '1.21') >= 0;
     const ans = {
         type: 'mcfunction:component_list',
-        range: res.range,
-        children: res.children,
+        range: core.Range.create(src),
+        children: [],
     };
+    if (!src.trySkip('[')) {
+        return core.Failure;
+    }
+    src.skipWhitespace();
+    while (src.canRead() && src.peek() !== ']') {
+        const start = src.cursor;
+        if (allowComponentRemoval && src.tryPeek('!')) {
+            const prefix = core.literal('!')(src, ctx);
+            src.skipWhitespace();
+            const key = core.resourceLocation({ category: 'data_component_type' })(src, ctx);
+            ans.children.push({
+                type: 'mcfunction:component_removal',
+                range: core.Range.create(start, src),
+                children: [prefix, key],
+                prefix,
+                key,
+            });
+            src.skipWhitespace();
+        }
+        else {
+            const key = core.resourceLocation({ category: 'data_component_type' })(src, ctx);
+            src.skipWhitespace();
+            core.literal('=')(src, ctx);
+            src.skipWhitespace();
+            const value = nbt.parser.entry(src, ctx);
+            if (value === core.Failure) {
+                ctx.err.report(localize('expected', localize('parser.record.value')), core.Range.create(src, () => src.skipUntilOrEnd(',', ']', '\r', '\n')));
+                ans.children.push({
+                    type: 'mcfunction:component',
+                    range: core.Range.create(start, src),
+                    children: [key],
+                    key,
+                    value: undefined,
+                });
+            }
+            else {
+                ans.children.push({
+                    type: 'mcfunction:component',
+                    range: core.Range.create(start, src),
+                    children: [key, value],
+                    key,
+                    value,
+                });
+            }
+            src.skipWhitespace();
+        }
+        if (src.trySkip(',')) {
+            src.skipWhitespace();
+            if (src.peek() === ']') {
+                break;
+            }
+        }
+        else {
+            break;
+        }
+    }
+    src.skipWhitespace();
+    core.literal(']')(src, ctx);
+    ans.range.end = src.cursor;
     return ans;
-});
+};
 const componentTest = (src, ctx) => {
     const start = src.cursor;
     src.skipWhitespace();
@@ -1076,6 +1144,7 @@ const componentTest = (src, ctx) => {
         key.options.pool = ['minecraft:count'];
     }
     if (src.trySkip('=')) {
+        src.skipWhitespace();
         const ans = {
             type: 'mcfunction:component_test_exact',
             range: core.Range.create(start, src),
@@ -1097,6 +1166,7 @@ const componentTest = (src, ctx) => {
         return ans;
     }
     if (src.trySkip('~')) {
+        src.skipWhitespace();
         if (key.options.category !== undefined) {
             key.options.category = 'item_sub_predicate_type';
         }

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

@@ -74,8 +74,15 @@ export interface MinecraftEntityAnchorArgumentTreeNode extends mcf.ArgumentTreeN
 export interface MinecraftEntitySummonArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:entity_summon';
 }
+export interface RangeProperties extends Record<string, unknown> {
+    min: number;
+    max: number;
+    minSpan: number;
+    maxSpan: number;
+}
 export interface MinecraftFloatRangeArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:float_range';
+    properties?: RangeProperties;
 }
 export interface MinecraftFunctionArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:function';
@@ -91,6 +98,7 @@ export interface MinecraftHeightmapArgumentTreeNode extends mcf.ArgumentTreeNode
 }
 export interface MinecraftIntRangeArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:int_range';
+    properties?: RangeProperties;
 }
 export interface MinecraftItemEnchantmentArgumentTreeNode extends mcf.ArgumentTreeNode {
     parser: 'minecraft:item_enchantment';

package/lib/mcfunction/tree/patch.js

@@ -23,16 +23,25 @@ export function getPatch(release) {
                                                 children: {
                                                     add: {
                                                         children: {
+                                                            id: {
+                                                                properties: {
+                                                                    category: 'attribute_modifier',
+                                                                },
+                                                            },
                                                             uuid: {
                                                                 properties: {
                                                                     category: 'attribute_modifier_uuid',
-                                                                    usageType: 'definition',
                                                                 },
                                                             },
                                                         },
                                                     },
                                                     remove: {
                                                         children: {
+                                                            id: {
+                                                                properties: {
+                                                                    category: 'attribute_modifier',
+                                                                },
+                                                            },
                                                             uuid: {
                                                                 properties: {
                                                                     category: 'attribute_modifier_uuid',
@@ -44,6 +53,11 @@ export function getPatch(release) {
                                                         children: {
                                                             get: {
                                                                 children: {
+                                                                    id: {
+                                                                        properties: {
+                                                                            category: 'attribute_modifier',
+                                                                        },
+                                                                    },
                                                                     uuid: {
                                                                         properties: {
                                                                             category: 'attribute_modifier_uuid',
@@ -501,6 +515,10 @@ export function getPatch(release) {
                             roll: {
                                 children: {
                                     range: {
+                                        properties: {
+                                            minSpan: 1,
+                                            maxSpan: 2147483646,
+                                        },
                                         children: {
                                             sequence: {
                                                 properties: {
@@ -515,6 +533,10 @@ export function getPatch(release) {
                             value: {
                                 children: {
                                     range: {
+                                        properties: {
+                                            minSpan: 1,
+                                            maxSpan: 2147483646,
+                                        },
                                         children: {
                                             sequence: {
                                                 properties: {
@@ -635,9 +657,6 @@ export function getPatch(release) {
                                 children: {
                                     name: {
                                         parser: 'spyglassmc:tag',
-                                        properties: {
-                                            usageType: 'definition',
-                                        },
                                     },
                                 },
                             },
@@ -937,6 +956,22 @@ const ExecuteStoreTarget = Object.freeze({
                 },
             },
         },
+        score: {
+            children: {
+                targets: {
+                    properties: {
+                        usageType: 'definition',
+                    },
+                    children: {
+                        objective: {
+                            properties: {
+                                accessType: 1 /* SymbolAccessType.Write */,
+                            },
+                        },
+                    },
+                },
+            },
+        },
     },
 });
 const LootSource = Object.freeze({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.18",
+  "version": "0.3.20",
   "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.4.14",
-    "@spyglassmc/json": "0.3.16",
-    "@spyglassmc/locales": "0.3.8",
-    "@spyglassmc/mcfunction": "0.2.16",
-    "@spyglassmc/mcdoc": "0.3.17",
-    "@spyglassmc/nbt": "0.3.17"
+    "@spyglassmc/core": "0.4.16",
+    "@spyglassmc/json": "0.3.18",
+    "@spyglassmc/locales": "0.3.10",
+    "@spyglassmc/mcfunction": "0.2.18",
+    "@spyglassmc/mcdoc": "0.3.19",
+    "@spyglassmc/nbt": "0.3.19"
   },
   "devDependencies": {
     "fast-glob": "^3.2.5"