✨ Add support for item components

packages/core/src/parser/resourceLocation.ts

@@ -14,6 +14,7 @@ const Terminators = new Set([
 	'\r',
 	'\n',
 	'=',
+	'~',
 	',',
 	'"',
 	"'",
@@ -24,6 +25,7 @@ const Terminators = new Set([
 	'(',
 	')',
 	';',
+	'|',
 ])
 export const LegalResourceLocationCharacters = new Set([
 	'a',

packages/java-edition/src/mcfunction/checker/index.ts

@@ -9,7 +9,7 @@ import type { EntitySelectorInvertableArgumentValueNode } from '../node/index.js
 import {
 	BlockNode,
 	EntityNode,
-	ItemNode,
+	ItemStackNode,
 	JsonNode,
 	NbtNode,
 	NbtResourceNode,
@@ -40,8 +40,8 @@ const rootCommand = (
 			block(node, ctx)
 		} else if (EntityNode.is(node)) {
 			entity(node, ctx)
-		} else if (ItemNode.is(node)) {
-			item(node, ctx)
+		} else if (ItemStackNode.is(node)) {
+			itemStack(node, ctx)
 		} else if (ParticleNode.is(node)) {
 			particle(node, ctx)
 		} else if (JsonNode.is(node)) {
@@ -81,15 +81,44 @@ const entity: core.SyncChecker<EntityNode> = (node, ctx) => {
 	}
 }
 
-const item: core.SyncChecker<ItemNode> = (node, ctx) => {
-	if (!node.nbt) {
-		return
+const itemStack: core.SyncChecker<ItemStackNode> = (node, ctx) => {
+	if (node.nbt) {
+		nbt.checker.index(
+			'minecraft:item',
+			core.ResourceLocationNode.toString(node.id, 'full'),
+		)(node.nbt, ctx)
 	}
+	if (node.components) {
+		const groupedComponents = new Map<
+			string,
+			core.PairNode<core.ResourceLocationNode, nbt.NbtNode>[]
+		>()
 
-	nbt.checker.index(
-		'minecraft:item',
-		core.ResourceLocationNode.toString(node.id, 'full'),
-	)(node.nbt, ctx)
+		node.components!.children.forEach(component => {
+			const componentName = core.ResourceLocationNode.toString(
+				component.key!,
+				'full',
+			)
+
+			if (!groupedComponents.has(componentName)) {
+				groupedComponents.set(componentName, [])
+			}
+
+			groupedComponents.get(componentName)!.push(component)
+		})
+
+		groupedComponents.forEach((components) => {
+			if (components.length > 1) {
+				components.forEach(component => {
+					ctx.err.report(
+						localize('mcfunction.parser.duplicate-components'),
+						component.key!.range,
+						core.ErrorSeverity.Warning,
+					)
+				})
+			}
+		})
+	}
 }
 
 const jsonChecker: core.SyncChecker<JsonNode> = (node, ctx) => {
@@ -215,7 +244,7 @@ export function register(meta: core.MetaRegistry) {
 	meta.registerChecker<mcf.CommandNode>('mcfunction:command', command)
 	meta.registerChecker<BlockNode>('mcfunction:block', block)
 	meta.registerChecker<EntityNode>('mcfunction:entity', entity)
-	meta.registerChecker<ItemNode>('mcfunction:item', item)
+	meta.registerChecker<ItemStackNode>('mcfunction:item_stack', itemStack)
 	meta.registerChecker<JsonNode>('mcfunction:json', jsonChecker)
 	meta.registerChecker<ParticleNode>('mcfunction:particle', particle)
 }

packages/java-edition/src/mcfunction/completer/argument.ts

@@ -27,7 +27,7 @@ import {
 import * as json from '@spyglassmc/json'
 import { localeQuote, localize } from '@spyglassmc/locales'
 import type * as mcf from '@spyglassmc/mcfunction'
-import * as nbt from '@spyglassmc/nbt'
+import type * as nbt from '@spyglassmc/nbt'
 import { getTagValues } from '../../common/index.js'
 import { ReleaseVersion } from '../../dependency/common.js'
 import {
@@ -45,6 +45,9 @@ import {
 } from '../common/index.js'
 import type {
 	BlockStatesNode,
+	ComponentListNode,
+	ComponentTestsAllOfNode,
+	ComponentTestsNode,
 	EntitySelectorArgumentsNode,
 } from '../node/index.js'
 import {
@@ -53,7 +56,8 @@ import {
 	EntitySelectorAtVariable,
 	EntitySelectorNode,
 	IntRangeNode,
-	ItemNode,
+	ItemPredicateNode,
+	ItemStackNode,
 	ObjectiveCriteriaNode,
 	ParticleNode,
 	ScoreHolderNode,
@@ -124,7 +128,7 @@ export const getMockNodes: mcf.completer.MockNodesGetter = (
 		case 'minecraft:item_enchantment':
 			return ResourceLocationNode.mock(range, { category: 'enchantment' })
 		case 'minecraft:item_predicate':
-			return ItemNode.mock(range, true)
+			return ItemPredicateNode.mock(range)
 		case 'minecraft:item_slot':
 			return LiteralNode.mock(range, {
 				pool: getItemSlotArgumentValues(ctx),
@@ -134,7 +138,7 @@ export const getMockNodes: mcf.completer.MockNodesGetter = (
 				pool: getItemSlotsArgumentValues(ctx),
 			})
 		case 'minecraft:item_stack':
-			return ItemNode.mock(range, false)
+			return ItemStackNode.mock(range)
 		case 'minecraft:loot_modifier':
 			return ResourceLocationNode.mock(range, { category: 'item_modifier' })
 		case 'minecraft:loot_predicate':
@@ -280,15 +284,70 @@ const blockStates: Completer<BlockStatesNode> = (node, ctx) => {
 	})(node, ctx)
 }
 
+const componentList: Completer<ComponentListNode> = (node, ctx) => {
+	return completer.record<
+		ResourceLocationNode,
+		nbt.NbtNode,
+		ComponentListNode
+	>({
+		key: (
+			_record,
+			pair,
+			ctx,
+			range,
+			_insertValue,
+			_insertComma,
+			_existingKeys,
+		) => {
+			const id = pair?.key ??
+				ResourceLocationNode.mock(pair?.key ?? range, {
+					category: 'data_component_type',
+				})
+			return completer.resourceLocation(id, ctx)
+		},
+		value: () => {
+			return [] // TODO
+		},
+	})(node, ctx)
+}
+
+const componentTests: Completer<ComponentTestsNode> = (node, ctx) => {
+	// TODO: improve this completer
+	return []
+}
+
 const coordinate: Completer<CoordinateNode> = (node, _ctx) => {
 	return [CompletionItem.create('~', node)]
 }
 
-const item: Completer<ItemNode> = (node, ctx) => {
+const itemStack: Completer<ItemStackNode> = (node, ctx) => {
 	const ans: CompletionItem[] = []
 	if (Range.contains(node.id, ctx.offset, true)) {
 		ans.push(...completer.resourceLocation(node.id, ctx))
 	}
+	if (node.components && Range.contains(node.components, ctx.offset, true)) {
+		ans.push(...componentList(node.components, ctx))
+	}
+	if (node.nbt && Range.contains(node.nbt, ctx.offset, true)) {
+		// TODO
+	}
+	return ans
+}
+
+const itemPredicate: Completer<ItemPredicateNode> = (node, ctx) => {
+	const ans: CompletionItem[] = []
+	if (Range.contains(node.id, ctx.offset, true)) {
+		ans.push(CompletionItem.create('*', node, { sortText: '##' }))
+		if (node.id.type === 'resource_location') {
+			ans.push(...completer.resourceLocation(node.id, ctx))
+		}
+	}
+	if (node.tests && Range.contains(node.tests, ctx.offset, true)) {
+		ans.push(...componentTests(node.tests, ctx))
+	}
+	if (node.nbt && Range.contains(node.nbt, ctx.offset, true)) {
+		// TODO
+	}
 	return ans
 }
 
@@ -344,7 +403,7 @@ const particle: Completer<ParticleNode> = (node, ctx) => {
 			VectorNode.mock(ctx.offset, { dimension: 3 }),
 		],
 		falling_dust: [BlockNode.mock(ctx.offset, false)],
-		item: [ItemNode.mock(ctx.offset, false)],
+		item: [ItemStackNode.mock(ctx.offset)],
 		sculk_charge: [FloatNode.mock(ctx.offset)],
 		shriek: [IntegerNode.mock(ctx.offset)],
 		vibration: [
@@ -476,6 +535,14 @@ const vector: Completer<VectorNode> = (node, _ctx) => {
 
 export function register(meta: MetaRegistry) {
 	meta.registerCompleter<BlockNode>('mcfunction:block', block)
+	meta.registerCompleter<ComponentListNode>(
+		'mcfunction:component_list',
+		componentList,
+	)
+	meta.registerCompleter<ComponentTestsNode>(
+		'mcfunction:component_tests',
+		componentTests,
+	)
 	meta.registerCompleter<CoordinateNode>('mcfunction:coordinate', coordinate)
 	meta.registerCompleter<EntitySelectorNode>(
 		'mcfunction:entity_selector',
@@ -486,7 +553,11 @@ export function register(meta: MetaRegistry) {
 		selectorArguments,
 	)
 	meta.registerCompleter<IntRangeNode>('mcfunction:int_range', intRange)
-	meta.registerCompleter<ItemNode>('mcfunction:item', item)
+	meta.registerCompleter<ItemStackNode>('mcfunction:item_stack', itemStack)
+	meta.registerCompleter<ItemPredicateNode>(
+		'mcfunction:item_predicate',
+		itemPredicate,
+	)
 	meta.registerCompleter<ObjectiveCriteriaNode>(
 		'mcfunction:objective_criteria',
 		objectiveCriteria,