@spyglassmc/java-edition 0.1.0 → 0.1.3

package/lib/mcfunction/checker/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -25,7 +29,6 @@ const json = __importStar(require("@spyglassmc/json"));
 const lib_1 = require("@spyglassmc/locales/lib");
 const mcf = __importStar(require("@spyglassmc/mcfunction"));
 const nbt = __importStar(require("@spyglassmc/nbt"));
-const nbtdoc = __importStar(require("@spyglassmc/nbtdoc"));
 const common_1 = require("../../common");
 const text_component_1 = require("../../json/checker/data/text_component");
 const node_1 = require("../node");
@@ -43,6 +46,23 @@ const getNode = (nodes, index) => {
     return nodes[index]?.children[0];
 };
 const rootCommand = (nodes, index, ctx) => {
+    for (const { children: [node] } of nodes) {
+        if (node_1.BlockNode.is(node)) {
+            block(node, ctx);
+        }
+        else if (node_1.EntityNode.is(node)) {
+            entity(node, ctx);
+        }
+        else if (node_1.ItemNode.is(node)) {
+            item(node, ctx);
+        }
+        else if (node_1.ParticleNode.is(node)) {
+            particle(node, ctx);
+        }
+        else if (json.JsonNode.is(node)) {
+            (0, text_component_1.text_component)(node, { ...ctx, context: '' });
+        }
+    }
     if (getName(nodes, index) === 'data') {
         if (getName(nodes, index + 1) === 'get') {
             nbtPath(nodes, index + 2, ctx);
@@ -53,26 +73,61 @@ const rootCommand = (nodes, index, ctx) => {
         else if (getName(nodes, index + 1) === 'modify') {
             nbtPath(nodes, index + 2, ctx);
             const targetPath = getNode(nodes, index + 4);
-            const operation = getName(nodes, index + 5);
-            const sourceTypeIndex = operation === 'insert' ? index + 7 : index + 6;
-            if (getName(nodes, sourceTypeIndex) === 'from') {
-                // `from <$nbtPath$>`
-                nbtPath(nodes, sourceTypeIndex + 1, ctx);
-                const sourcePath = getNode(nodes, sourceTypeIndex + 3);
-                if (nbt.NbtPathNode.is(targetPath) && nbt.NbtPathNode.is(sourcePath)) {
-                    const { errorMessage } = nbtdoc.checkAssignability({ source: sourcePath.targetType, target: targetPath.targetType });
-                    if (errorMessage) {
-                        ctx.err.report(errorMessage, core.Range.span(targetPath, sourcePath), 2 /* Warning */);
-                    }
-                }
-            }
-            else if (getName(nodes, sourceTypeIndex) === 'value') {
-                // `value <value: nbt_tag>`
-                const valueNode = getNode(nodes, sourceTypeIndex + 1);
-                if (nbt.NbtPathNode.is(targetPath) && targetPath.targetType && nbt.NbtNode.is(valueNode)) {
-                    nbt.checker.fieldValue(targetPath.targetType, { allowUnknownKey: true })(valueNode, ctx);
-                }
-            }
+            // if (nbt.NbtPathNode.is(targetPath)) {
+            // 	const operationNode = getNode(nodes, index + 5)
+            // 	const operation = getName(nodes, index + 5) as 'append' | 'insert' | 'merge' | 'prepend' | 'set' | undefined
+            // 	const sourceTypeIndex = operation === 'insert' ? index + 7 : index + 6
+            // 	let targetMcdocType: mcdoc.McdocType | undefined = targetPath.targetType ? mcdoc.simplifyType(targetPath.targetType) : undefined
+            // 	const isType = (type: mcdoc.McdocType['kind']) => !targetMcdocType || targetMcdocType.kind === type || (targetMcdocType.type === 'union' && targetMcdocType.members.some(m => m.type === type))
+            // 	if (operation === 'merge') {
+            // 		if (!(isType('compound') || isType('index'))) {
+            // 			ctx.err.report(
+            // 				localize('mcfunction.checker.command.data-modify-unapplicable-operation', localeQuote(operation), localize('nbt.node.compound'), localeQuote(mcdoc.McdocType.toString(targetMcdocType))),
+            // 				core.Range.span(targetPath, operationNode!),
+            // 				core.ErrorSeverity.Warning
+            // 			)
+            // 			targetMcdocType = undefined
+            // 		}
+            // 	} else if (operation === 'append' || operation === 'insert' || operation === 'prepend') {
+            // 		if (isType('list') || isType('byte_array') || isType('int_array') || isType('long_array')) {
+            // 			if (targetMcdocType?.type === 'list') {
+            // 				targetMcdocType = targetMcdocType.item
+            // 			} else if (targetMcdocType?.type === 'byte_array') {
+            // 				targetMcdocType = { type: 'byte', valueRange: targetMcdocType.valueRange }
+            // 			} else if (targetMcdocType?.type === 'int_array') {
+            // 				targetMcdocType = { type: 'int', valueRange: targetMcdocType.valueRange }
+            // 			} else if (targetMcdocType?.type === 'long_array') {
+            // 				targetMcdocType = { type: 'long', valueRange: targetMcdocType.valueRange }
+            // 			}
+            // 		} else {
+            // 			ctx.err.report(
+            // 				localize('mcfunction.checker.command.data-modify-unapplicable-operation', localeQuote(operation), localize('nbt.node.list'), localeQuote(mcdoc.McdocType.toString(targetMcdocType))),
+            // 				core.Range.span(targetPath, operationNode!),
+            // 				core.ErrorSeverity.Warning
+            // 			)
+            // 			targetMcdocType = undefined
+            // 		}
+            // 	}
+            // 	if (targetMcdocType) {
+            // 		if (getName(nodes, sourceTypeIndex) === 'from') {
+            // 			// `from <$nbtPath$>`
+            // 			nbtPath(nodes, sourceTypeIndex + 1, ctx)
+            // 			const sourcePath = getNode(nodes, sourceTypeIndex + 3)
+            // 			if (nbt.NbtPathNode.is(sourcePath)) {
+            // 				const { errorMessage } = mcdoc.checkAssignability({ source: sourcePath.targetType, target: targetMcdocType })
+            // 				if (errorMessage) {
+            // 					ctx.err.report(errorMessage, core.Range.span(targetPath, sourcePath), core.ErrorSeverity.Warning)
+            // 				}
+            // 			}
+            // 		} else if (getName(nodes, sourceTypeIndex) === 'value') {
+            // 			// `value <value: nbt_tag>`
+            // 			const valueNode = getNode(nodes, sourceTypeIndex + 1)
+            // 			if (nbt.NbtNode.is(valueNode)) {
+            // 				nbt.checker.fieldValue(targetMcdocType, { allowUnknownKey: true })(valueNode, ctx)
+            // 			}
+            // 		}
+            // 	}
+            // }
         }
         else if (getName(nodes, index + 1) === 'remove') {
             nbtPath(nodes, index + 2, ctx);
@@ -94,12 +149,34 @@ const rootCommand = (nodes, index, ctx) => {
     else if (getName(nodes, index) === 'summon') {
         summonNbt(nodes, index + 1, ctx);
     }
-    for (const { children: [node] } of nodes) {
-        if (json.JsonNode.is(node)) {
-            (0, text_component_1.text_component)(node, { ...ctx, context: '' });
-        }
+};
+//#region Checkers for argument nodes
+const block = (node, ctx) => {
+    if (!node.nbt) {
+        return;
     }
+    nbt.checker.index('block', core.ResourceLocationNode.toString(node.id, 'full'))(node.nbt, ctx);
+};
+const entity = (node, ctx) => {
+    const nbtPair = node.selector?.arguments?.children.find(pair => pair.key?.value === 'nbt');
+    if (!nbtPair) {
+        return;
+    }
+    const types = (0, exports.getTypesFromEntity)(node, ctx);
+    const nbtValue = nbtPair.value;
+    nbt.checker.index('entity_type', types)(nbtValue, ctx);
+};
+const item = (node, ctx) => {
+    if (!node.nbt) {
+        return;
+    }
+    nbt.checker.index('item', core.ResourceLocationNode.toString(node.id, 'full'))(node.nbt, ctx);
+};
+const particle = (node, ctx) => {
+    core.checker.dispatchSync(node, ctx);
 };
+//#endregion
+//#region Checkers for command argument structure.
 /**
  * - `block <targetPos: block_pos> <nbt: nbt_compound_tag>`
  * - `entity <target: entity> <nbt: nbt_compound_tag>`
@@ -178,6 +255,7 @@ const summonNbt = (nodes, index, ctx) => {
         nbt.checker.index('entity_type', core.ResourceLocationNode.toString(typeNode, 'full'))(nbtNode, ctx);
     }
 };
+//#endregion
 const getTypesFromEntity = (entity, ctx) => {
     if (entity.playerName !== undefined || entity.selector?.playersOnly) {
         return ['minecraft:player'];
@@ -212,6 +290,10 @@ const getTypesFromEntity = (entity, ctx) => {
 exports.getTypesFromEntity = getTypesFromEntity;
 function register(meta) {
     meta.registerChecker('mcfunction:command', exports.command);
+    meta.registerChecker('mcfunction:block', block);
+    meta.registerChecker('mcfunction:entity', entity);
+    meta.registerChecker('mcfunction:item', item);
+    meta.registerChecker('mcfunction:particle', particle);
 }
 exports.register = register;
 //# sourceMappingURL=index.js.map

package/lib/mcfunction/colorizer/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/mcfunction/common/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/mcfunction/completer/argument.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -150,7 +154,7 @@ const blockStates = (node, ctx) => {
             return Object.keys(states)
                 .filter(k => pair?.key?.value === k || !existingKeys.some(ek => ek.value === k))
                 .map(k => core_1.CompletionItem.create(k, range, {
-                kind: 10 /* Property */,
+                kind: 10 /* CompletionKind.Property */,
                 detail: (0, locales_1.localize)('mcfunction.completer.block.states.default-value', (0, locales_1.localeQuote)(states[k][0])),
                 insertText: new core_1.InsertTextBuilder()
                     .literal(k)
@@ -162,7 +166,7 @@ const blockStates = (node, ctx) => {
         value: (_record, pair, ctx) => {
             if (pair.key && states[pair.key.value]) {
                 return states[pair.key.value].map(v => core_1.CompletionItem.create(v, pair.value ?? ctx.offset, {
-                    kind: 12 /* Value */,
+                    kind: 12 /* CompletionKind.Value */,
                 }));
             }
             return [];
@@ -245,9 +249,9 @@ const selectorArguments = (node, ctx) => {
     return core_1.completer.record({
         key: (record, pair, _ctx, range, insertValue, insertComma) => {
             return [...node_1.EntitySelectorNode.ArgumentKeys]
-                .filter(k => node_1.EntitySelectorNode.canKeyExist(selector, record, k) === 0 /* Ok */)
+                .filter(k => node_1.EntitySelectorNode.canKeyExist(selector, record, k) === 0 /* EntitySelectorNode.Result.Ok */)
                 .map(k => core_1.CompletionItem.create(k, range, {
-                kind: 10 /* Property */,
+                kind: 10 /* CompletionKind.Property */,
                 insertText: new core_1.InsertTextBuilder()
                     .literal(k)
                     .if(insertValue, b => b.literal('=').placeholder()) // TODO
@@ -264,7 +268,7 @@ const selectorArguments = (node, ctx) => {
     })(node, ctx);
 };
 const intRange = (node, _ctx) => {
-    return [core_1.CompletionItem.create('-2147483648..2147483647', node, { kind: 21 /* Constant */ })];
+    return [core_1.CompletionItem.create('-2147483648..2147483647', node, { kind: 21 /* CompletionKind.Constant */ })];
 };
 const vector = (node, _ctx) => {
     const createCompletion = (coordinate, sortText) => core_1.CompletionItem.create(new Array(node.options.dimension).fill(coordinate).join(' '), node, { sortText });

package/lib/mcfunction/completer/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/mcfunction/index.d.ts

@@ -1,8 +1,8 @@
 import type * as core from '@spyglassmc/core';
-import type { MajorVersion, McmetaCommands } from '../dependency';
+import type { McmetaCommands, ReleaseVersion } from '../dependency';
 export * as checker from './checker';
 export * as colorizer from './colorizer';
 export * as completer from './completer';
 export * as parser from './parser';
-export declare const initialize: (ctx: core.ProjectInitializerContext, commands: McmetaCommands, majorVersion: MajorVersion) => void;
+export declare const initialize: (ctx: core.ProjectInitializerContext, commands: McmetaCommands, releaseVersion: ReleaseVersion) => void;
 //# sourceMappingURL=index.d.ts.map

package/lib/mcfunction/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -27,46 +31,33 @@ const completer = __importStar(require("./completer"));
 const inlayHintProvider_1 = require("./inlayHintProvider");
 const parser = __importStar(require("./parser"));
 const signatureHelpProvider_1 = require("./signatureHelpProvider");
-const tree_1 = require("./tree");
+const patch_1 = require("./tree/patch");
 exports.checker = __importStar(require("./checker"));
 exports.colorizer = __importStar(require("./colorizer"));
 exports.completer = __importStar(require("./completer"));
 exports.parser = __importStar(require("./parser"));
-// DOCS: Update here when a new major version of Minecraft is released.
-const Trees = new Map([
-    ['1.15', tree_1.Tree1_15],
-    ['1.16', tree_1.Tree1_16],
-    ['1.17', tree_1.Tree1_17],
-    ['1.18', tree_1.Tree1_18],
-    ['1.19', tree_1.Tree1_19],
-]);
-const LatestTree = (() => {
-    const values = [...Trees.values()];
-    return values[values.length - 1];
-})();
 /* istanbul ignore next */
-const initialize = (ctx, commands, majorVersion) => {
+const initialize = (ctx, commands, releaseVersion) => {
     const { meta } = ctx;
     mcf.initialize(ctx);
-    mcf.CommandTreeRegistry.instance.register(majorVersion, commands, Trees.get(majorVersion) ?? LatestTree);
+    mcf.CommandTreeRegistry.instance.register(releaseVersion, commands, (0, patch_1.getPatch)(releaseVersion));
     meta.registerLanguage('mcfunction', {
         extensions: ['.mcfunction'],
-        parser: mcf.entry(majorVersion, parser.argument),
-        completer: mcf.completer.entry(majorVersion, completer.getMockNodes),
+        parser: mcf.entry(releaseVersion, parser.argument),
+        completer: mcf.completer.entry(releaseVersion, completer.getMockNodes),
         triggerCharacters: [' ', '[', '=', '!', ',', '{', ':', '/', '.', '"', "'"],
     });
     meta.registerParser('mcfunction:block_predicate', parser.blockPredicate);
     meta.registerParser('mcfunction:component', parser.component);
-    // TODO: 'mcfunction:particle'
-    // TODO: Uncomment in `SpecialStrings` in `nbtdocUtil.ts` as well.
+    meta.registerParser('mcfunction:particle', parser.particle);
     meta.registerParser('mcfunction:tag', parser.tag());
     meta.registerParser('mcfunction:team', parser.team());
-    meta.registerParser('mcfunction:command', mcf.command(mcf.CommandTreeRegistry.instance.get(majorVersion), parser.argument));
+    meta.registerParser('mcfunction:command', mcf.command(mcf.CommandTreeRegistry.instance.get(releaseVersion), parser.argument));
     checker.register(meta);
     colorizer.register(meta);
     completer.register(meta);
     meta.registerInlayHintProvider(inlayHintProvider_1.inlayHintProvider);
-    meta.registerSignatureHelpProvider((0, signatureHelpProvider_1.signatureHelpProvider)(majorVersion));
+    meta.registerSignatureHelpProvider((0, signatureHelpProvider_1.signatureHelpProvider)(releaseVersion));
 };
 exports.initialize = initialize;
 //# sourceMappingURL=index.js.map

package/lib/mcfunction/inlayHintProvider.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -80,7 +80,7 @@ export interface EntitySelectorNode extends core.AstNode {
 export declare namespace EntitySelectorNode {
     function is(node: core.AstNode | undefined): node is EntitySelectorNode;
     function mock(range: core.RangeLike): EntitySelectorNode;
-    const ArgumentKeys: Set<"predicate" | "tag" | "team" | "type" | "x" | "y" | "z" | "sort" | "level" | "advancements" | "nbt" | "name" | "scores" | "limit" | "distance" | "gamemode" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
+    const ArgumentKeys: Set<"sort" | "type" | "predicate" | "tag" | "team" | "x" | "y" | "z" | "level" | "advancements" | "nbt" | "name" | "scores" | "limit" | "distance" | "gamemode" | "dx" | "dy" | "dz" | "x_rotation" | "y_rotation">;
     type ArgumentKey = typeof ArgumentKeys extends Set<infer T> ? T : undefined;
     const enum Result {
         Ok = 0,
@@ -111,6 +111,7 @@ export interface ItemNode extends core.AstNode {
     nbt?: nbt.NbtCompoundNode;
 }
 export declare namespace ItemNode {
+    function is(node: core.AstNode | undefined): node is ItemNode;
     function mock(range: core.RangeLike, isPredicate: boolean): ItemNode;
 }
 export interface IntRangeNode extends core.AstNode {
@@ -145,6 +146,7 @@ export declare namespace ParticleNode {
     const SpecialTypes: Set<"block" | "item" | "block_marker" | "dust" | "dust_color_transition" | "falling_dust" | "sculk_charge" | "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;
     export function mock(range: core.RangeLike): ParticleNode;
     export {};
 }

package/lib/mcfunction/node/argument.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -134,26 +138,26 @@ var EntitySelectorNode;
             case 'dz':
             case 'x_rotation':
             case 'y_rotation':
-                return hasKey(key) ? 1 /* Duplicated */ : 0 /* Ok */;
+                return hasKey(key) ? 1 /* Result.Duplicated */ : 0 /* Result.Ok */;
             case 'gamemode':
             case 'name':
             case 'team':
-                return hasNonInvertedKey(key) ? 1 /* Duplicated */ : 0 /* Ok */;
+                return hasNonInvertedKey(key) ? 1 /* Result.Duplicated */ : 0 /* Result.Ok */;
             case 'limit':
             case 'sort':
                 return selector.currentEntity
-                    ? 2 /* NotApplicable */
+                    ? 2 /* Result.NotApplicable */
                     : hasKey(key)
-                        ? 1 /* Duplicated */
-                        : 0 /* Ok */;
+                        ? 1 /* Result.Duplicated */
+                        : 0 /* Result.Ok */;
             case 'type':
                 return selector.typeLimited
                     ? hasKey(key)
-                        ? 1 /* Duplicated */
-                        : 2 /* NotApplicable */
-                    : 0 /* Ok */;
+                        ? 1 /* Result.Duplicated */
+                        : 2 /* Result.NotApplicable */
+                    : 0 /* Result.Ok */;
         }
-        return 0 /* Ok */;
+        return 0 /* Result.Ok */;
     }
     EntitySelectorNode.canKeyExist = canKeyExist;
 })(EntitySelectorNode = exports.EntitySelectorNode || (exports.EntitySelectorNode = {}));
@@ -166,6 +170,10 @@ var EntityNode;
 })(EntityNode = exports.EntityNode || (exports.EntityNode = {}));
 var ItemNode;
 (function (ItemNode) {
+    function is(node) {
+        return node?.type === 'mcfunction:item';
+    }
+    ItemNode.is = is;
     function mock(range, isPredicate) {
         const id = core.ResourceLocationNode.mock(range, { category: 'item', allowTag: isPredicate });
         return {
@@ -231,6 +239,10 @@ var ParticleNode;
         return SpecialTypes.has(type);
     }
     ParticleNode.isSpecialType = isSpecialType;
+    function is(node) {
+        return node?.type === 'mcfunction:particle';
+    }
+    ParticleNode.is = is;
     function mock(range) {
         const id = core.ResourceLocationNode.mock(range, { category: 'particle_type' });
         return {
@@ -273,7 +285,7 @@ var VectorNode;
             range: core.Range.get(range),
             children: [],
             options,
-            system: 0 /* World */,
+            system: 0 /* CoordinateSystem.World */,
         };
     }
     VectorNode.mock = mock;

package/lib/mcfunction/node/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,7 +1,7 @@
 import * as core from '@spyglassmc/core';
 import * as json from '@spyglassmc/json';
 import * as mcf from '@spyglassmc/mcfunction';
-import type { BlockNode } from '../node';
+import type { BlockNode, ParticleNode } from '../node';
 /**
  * @returns The parser for the specified argument tree node. All argument parsers used in the `mcfunction` package
  * fail on empty input.
@@ -9,6 +9,7 @@ import type { BlockNode } from '../node';
 export declare const argument: mcf.ArgumentParserGetter;
 export declare const blockPredicate: core.InfallibleParser<BlockNode>;
 export declare const component: core.Parser<json.JsonNode>;
+export declare const particle: core.InfallibleParser<ParticleNode>;
 export declare const scoreHolderFakeName: core.Parser<core.SymbolNode>;
 export declare function tag(terminators?: string[]): core.InfallibleParser<core.SymbolNode>;
 export declare function team(usageType?: core.SymbolUsageType, terminators?: string[]): core.InfallibleParser<core.SymbolNode>;

package/lib/mcfunction/parser/argument.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.team = exports.tag = exports.scoreHolderFakeName = exports.component = exports.blockPredicate = exports.argument = void 0;
+exports.team = exports.tag = exports.scoreHolderFakeName = exports.particle = exports.component = exports.blockPredicate = exports.argument = void 0;
 const core = __importStar(require("@spyglassmc/core"));
 const core_1 = require("@spyglassmc/core");
 const json = __importStar(require("@spyglassmc/json"));
@@ -56,8 +60,8 @@ const FakeNameMaxLength = 40;
 const ObjectiveMaxLength = 16;
 const PlayerNameMaxLength = 16;
 function shouldValidateLength(ctx) {
-    const major = ctx.project['loadedVersion'];
-    return !major || dependency_1.MajorVersion.cmp(major, '1.18') < 0;
+    const release = ctx.project['loadedVersion'];
+    return !release || dependency_1.ReleaseVersion.cmp(release, '1.18') < 0;
 }
 /**
  * @returns The parser for the specified argument tree node. All argument parsers used in the `mcfunction` package
@@ -163,7 +167,7 @@ const argument = (rawTreeNode) => {
                 colorTokenType: 'operator',
             }));
         case 'minecraft:particle':
-            return wrap(particle);
+            return wrap(exports.particle);
         case 'minecraft:resource':
         case 'minecraft:resource_or_tag':
             return wrap(core.resourceLocation({
@@ -363,7 +367,7 @@ const message = (src, ctx) => {
     }
     return ans;
 };
-const particle = (() => {
+exports.particle = (() => {
     const sep = core.map(mcf.sep, () => []);
     const vec = vector({ dimension: 3 });
     const color = core.map(vec, res => ({
@@ -909,10 +913,10 @@ function vector(options) {
             range: core.Range.create(src),
             children: [],
             options,
-            system: 0 /* World */,
+            system: 0 /* CoordinateSystem.World */,
         };
         if (src.peek() === '^') {
-            ans.system = 1 /* Local */;
+            ans.system = 1 /* CoordinateSystem.Local */;
         }
         for (let i = 0; i < options.dimension; i++) {
             if (i > 0) {
@@ -920,11 +924,11 @@ function vector(options) {
             }
             const coord = options.integersOnly ? coordinate(options.integersOnly)(src, ctx) : coordinate(options.integersOnly)(src, ctx);
             ans.children.push(coord);
-            if ((ans.system === 1 /* Local */) !== (coord.notation === '^')) {
+            if ((ans.system === 1 /* CoordinateSystem.Local */) !== (coord.notation === '^')) {
                 ctx.err.report((0, locales_1.localize)('mcfunction.parser.vector.mixed'), coord);
             }
         }
-        if (options.noLocal && ans.system === 1 /* Local */) {
+        if (options.noLocal && ans.system === 1 /* CoordinateSystem.Local */) {
             ctx.err.report((0, locales_1.localize)('mcfunction.parser.vector.local-disallowed'), ans);
         }
         ans.range.end = src.cursor;

package/lib/mcfunction/parser/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/mcfunction/signatureHelpProvider.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,7 +1,2 @@
-export * from './1.15';
-export * from './1.16';
-export * from './1.17';
-export * from './1.18';
-export * from './1.19';
 export * from './argument';
 //# sourceMappingURL=index.d.ts.map