@spyglassmc/java-edition 0.3.23 → 0.3.24

package/lib/mcfunction/completer/argument.js

@@ -318,7 +318,7 @@ const scoreHolder = (node, ctx) => {
     }
     else {
         ans = completer.symbol(node.fakeName ?? SymbolNode.mock(node, { category: 'score_holder' }), ctx);
-        ans.push(...selector(EntitySelectorNode.mock(node, { pool: EntitySelectorAtVariable.filterAvailable(ctx) }), ctx));
+        ans.push(...completer.literal(LiteralNode.mock(node, { pool: ['*'] }), ctx), ...selector(EntitySelectorNode.mock(node, { pool: EntitySelectorAtVariable.filterAvailable(ctx) }), ctx));
     }
     return ans;
 };

package/lib/mcfunction/mcdocAttributes.js

@@ -71,7 +71,7 @@ export function registerMcdocAttributes(meta, rootTreeNode) {
         }),
     });
     mcdoc.runtime.registerAttribute(meta, 'item_slots', () => undefined, {
-        stringParser: () => parser.itemSlots,
+        stringParser: (_, __, ctx) => core.literal({ pool: getItemSlotsArgumentValues(ctx) }),
         stringMocker: (_, __, ctx) => core.LiteralNode.mock(ctx.offset, { pool: getItemSlotsArgumentValues(ctx) }),
     });
     mcdoc.runtime.registerAttribute(meta, 'uuid', () => undefined, {

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

@@ -11,7 +11,6 @@ export declare const argument: mcf.ArgumentParserGetter;
 export declare const blockPredicate: core.InfallibleParser<BlockNode>;
 export declare function criterion(advancement: core.FullResourceLocation, usageType?: core.SymbolUsageType, terminators?: string[]): core.InfallibleParser<core.SymbolNode>;
 export declare function entity(amount: 'multiple' | 'single', type: 'entities' | 'players'): core.Parser<EntityNode>;
-export declare const itemSlots: core.InfallibleParser<core.LiteralNode>;
 export declare function jsonParser(typeRef: `::${string}::${string}`): core.Parser<json.TypedJsonNode>;
 export declare const particle: core.InfallibleParser<ParticleNode>;
 /**

package/lib/mcfunction/parser/argument.js

@@ -78,7 +78,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:block_state':
             return wrap(blockState);
         case 'minecraft:color':
-            return wrap(core.map(core.literal(...ColorArgumentValues), (res) => ({
+            return wrap(core.map(commandLiteral({ pool: ColorArgumentValues }), (res) => ({
                 ...res,
                 color: core.Color.NamedColors.has(res.value)
                     ? core.Color.fromCompositeRGB(core.Color.NamedColors.get(res.value))
@@ -93,7 +93,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:entity':
             return wrap(entity(treeNode.properties.amount, treeNode.properties.type));
         case 'minecraft:entity_anchor':
-            return wrap(core.literal(...EntityAnchorArgumentValues));
+            return wrap(commandLiteral({ pool: EntityAnchorArgumentValues }));
         case 'minecraft:entity_summon':
             return wrap(core.resourceLocation({ category: 'entity_type' }));
         case 'minecraft:float_range':
@@ -101,11 +101,11 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:function':
             return wrap(core.resourceLocation({ category: 'function', allowTag: true }));
         case 'minecraft:gamemode':
-            return wrap(core.literal(...GamemodeArgumentValues));
+            return wrap(commandLiteral({ pool: GamemodeArgumentValues }));
         case 'minecraft:game_profile':
             return wrap(entity('multiple', 'players'));
         case 'minecraft:heightmap':
-            return wrap(core.literal(...HeightmapValues));
+            return wrap(commandLiteral({ pool: HeightmapValues }));
         case 'minecraft:int_range':
             return wrap(range('integer', treeNode.properties?.min, treeNode.properties?.max, treeNode.properties?.minSpan, treeNode.properties?.maxSpan));
         case 'minecraft:item_enchantment':
@@ -113,9 +113,13 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:item_predicate':
             return wrap(itemPredicate);
         case 'minecraft:item_slot':
-            return wrap(itemSlot);
+            return wrap((src, ctx) => {
+                return commandLiteral({ pool: getItemSlotArgumentValues(ctx) })(src, ctx);
+            });
         case 'minecraft:item_slots':
-            return wrap(itemSlots);
+            return wrap((src, ctx) => {
+                return commandLiteral({ pool: getItemSlotsArgumentValues(ctx) })(src, ctx);
+            });
         case 'minecraft:item_stack':
             return wrap(itemStack);
         case 'minecraft:loot_modifier':
@@ -141,7 +145,7 @@ export const argument = (rawTreeNode, prevNodes) => {
         case 'minecraft:objective_criteria':
             return wrap(objectiveCriteria);
         case 'minecraft:operation':
-            return wrap(core.literal({ pool: OperationArgumentValues, colorTokenType: 'operator' }));
+            return wrap(commandLiteral({ pool: OperationArgumentValues, colorTokenType: 'operator' }));
         case 'minecraft:particle':
             return wrap(particle);
         case 'minecraft:resource':
@@ -164,20 +168,20 @@ export const argument = (rawTreeNode, prevNodes) => {
             // `BELOWNAME` and `sidebar.team.r--.+++e----__d` are also legal slots.
             // But I do not want to spend time supporting them.
             return wrap((src, ctx) => {
-                return core.literal(...getScoreboardSlotArgumentValues(ctx))(src, ctx);
+                return commandLiteral({ pool: getScoreboardSlotArgumentValues(ctx) })(src, ctx);
             });
         case 'minecraft:style':
             return wrap(jsonParser('::java::server::util::text::TextStyle'));
         case 'minecraft:swizzle':
-            return wrap(core.literal(...SwizzleArgumentValues));
+            return wrap(commandLiteral({ pool: SwizzleArgumentValues }));
         case 'minecraft:team':
             return wrap(team(core.SymbolUsageType.is(treeNode.properties?.usageType)
                 ? treeNode.properties?.usageType
                 : undefined));
         case 'minecraft:template_mirror':
-            return wrap(core.literal(...MirrorValues));
+            return wrap(commandLiteral({ pool: MirrorValues }));
         case 'minecraft:template_rotation':
-            return wrap(core.literal(...RotationValues));
+            return wrap(commandLiteral({ pool: RotationValues }));
         case 'minecraft:time':
             return wrap(time);
         case 'minecraft:uuid':
@@ -310,12 +314,6 @@ export function entity(amount, type) {
 const greedyString = core.string({
     unquotable: { blockList: new Set(['\n', '\r']) },
 });
-const itemSlot = (src, ctx) => {
-    return core.literal(...getItemSlotArgumentValues(ctx))(src, ctx);
-};
-export const itemSlots = (src, ctx) => {
-    return core.literal(...getItemSlotsArgumentValues(ctx))(src, ctx);
-};
 const itemStack = (src, ctx) => {
     const oldFormat = shouldUseOldItemStackFormat(ctx);
     return core.map(core.sequence([
@@ -368,6 +366,16 @@ export function jsonParser(typeRef) {
         targetType: { kind: 'reference', path: typeRef },
     }));
 }
+function commandLiteral(options) {
+    return (src, ctx) => {
+        const ans = core.literal(options)(src, ctx);
+        if (ans.value.length === 0) {
+            ans.value = src.readUntil(...core.Whitespaces);
+            ans.range = core.Range.create(ans.range.start, src);
+        }
+        return ans;
+    };
+}
 const message = (src, ctx) => {
     const ans = {
         type: 'mcfunction:message',
@@ -895,8 +903,11 @@ export function scoreHolderFakeName(usageType) {
 }
 export function scoreHolder(usageType, amount) {
     return core.map(core.select([
-        // Technically score holders can start with *, but this doesn't account for it
-        { prefix: '*', parser: core.literal('*') },
+        {
+            predicate: (src) => src.peek() === '*'
+                && (!src.canRead(2) || src.matchPattern(/^\s/, 1)),
+            parser: core.literal('*'),
+        },
         { prefix: '@', parser: selector() },
         { parser: scoreHolderFakeName(usageType) },
     ]), (res, _src, ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "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.17",
-    "@spyglassmc/json": "0.3.20",
+    "@spyglassmc/core": "0.4.18",
+    "@spyglassmc/json": "0.3.21",
     "@spyglassmc/locales": "0.3.10",
-    "@spyglassmc/mcfunction": "0.2.19",
-    "@spyglassmc/mcdoc": "0.3.21",
-    "@spyglassmc/nbt": "0.3.21"
+    "@spyglassmc/mcfunction": "0.2.20",
+    "@spyglassmc/mcdoc": "0.3.22",
+    "@spyglassmc/nbt": "0.3.22"
   },
   "devDependencies": {
     "fast-glob": "^3.2.5"