@spyglassmc/mcfunction 0.2.3 → 0.2.5

package/lib/colorizer/index.d.ts

@@ -1,3 +1,5 @@
 import * as core from '@spyglassmc/core';
+import type { CommandMacroNode } from '../node/index.js';
 export declare function register(meta: core.MetaRegistry): void;
+export declare const macro: core.Colorizer<CommandMacroNode>;
 //# sourceMappingURL=index.d.ts.map

package/lib/colorizer/index.js

@@ -1,6 +1,10 @@
 import * as core from '@spyglassmc/core';
 export function register(meta) {
+    meta.registerColorizer('mcfunction:command_macro', macro);
     meta.registerColorizer('mcfunction:command_child/literal', core.colorizer.literal);
     meta.registerColorizer('mcfunction:command_child/trailing', core.colorizer.error);
 }
+export const macro = (node, ctx) => {
+    return [core.ColorToken.create(node, 'string')];
+};
 //# sourceMappingURL=index.js.map

package/lib/completer/index.d.ts

@@ -2,7 +2,7 @@ import * as core from '@spyglassmc/core';
 import type { McfunctionNode } from '../node/index.js';
 import { CommandNode } from '../node/index.js';
 import type { ArgumentTreeNode, RootTreeNode } from '../tree/index.js';
-export declare type MockNodesGetter = (treeNode: ArgumentTreeNode, range: core.RangeLike) => core.Arrayable<core.AstNode>;
+export type MockNodesGetter = (treeNode: ArgumentTreeNode, range: core.RangeLike) => core.Arrayable<core.AstNode>;
 /**
  * @param getMockNodes A function that returns a mock AST Node from given {@link ArgumentTreeNode}. These mock nodes
  * will be used for completing the argument.

package/lib/completer/index.js

@@ -1,4 +1,5 @@
 import * as core from '@spyglassmc/core';
+import { CommandMacroNode } from '../node/index.js';
 import { CommandNode } from '../node/index.js';
 import { categorizeTreeChildren, CommandTreeRegistry, redirect, resolveParentTreeNode, } from '../tree/index.js';
 /**
@@ -9,7 +10,7 @@ export function entry(commandTreeName, getMockNodes) {
     return (node, ctx) => {
         const tree = CommandTreeRegistry.instance.get(commandTreeName);
         const childNode = core.AstNode.findChild(node, ctx.offset, true);
-        if (core.CommentNode.is(childNode)) {
+        if (core.CommentNode.is(childNode) || CommandMacroNode.is(childNode)) {
             return [];
         }
         else {

package/lib/node/command.d.ts

@@ -7,6 +7,12 @@ export declare namespace CommandNode {
     function is(node: core.AstNode): node is CommandNode;
     function mock(range: core.RangeLike): CommandNode;
 }
+export interface CommandMacroNode extends core.AstNode {
+    type: 'mcfunction:command_macro';
+}
+export declare namespace CommandMacroNode {
+    function is<T extends core.DeepReadonly<core.AstNode> | undefined>(obj: T): obj is core.InheritReadonly<CommandMacroNode, T>;
+}
 export interface CommandChildNode extends core.AstNode {
     type: 'mcfunction:command_child';
     /**

package/lib/node/command.js

@@ -15,6 +15,14 @@ export var CommandNode;
     }
     CommandNode.mock = mock;
 })(CommandNode || (CommandNode = {}));
+export var CommandMacroNode;
+(function (CommandMacroNode) {
+    function is(obj) {
+        return obj?.type ===
+            'mcfunction:command_macro';
+    }
+    CommandMacroNode.is = is;
+})(CommandMacroNode || (CommandMacroNode = {}));
 export var CommandChildNode;
 (function (CommandChildNode) {
     function is(node) {

package/lib/node/entry.d.ts

@@ -1,6 +1,6 @@
 import type * as core from '@spyglassmc/core';
-import type { CommandNode } from './command.js';
-export interface McfunctionNode extends core.SequenceNode<CommandNode | core.CommentNode> {
+import type { CommandMacroNode, CommandNode } from './command.js';
+export interface McfunctionNode extends core.SequenceNode<CommandNode | CommandMacroNode | core.CommentNode> {
     type: 'mcfunction:entry';
 }
 export declare namespace McfunctionNode {

package/lib/parser/argument.d.ts

@@ -7,6 +7,6 @@ import type { ArgumentTreeNode } from '../tree/index.js';
  *
  * @returns The parser corresponding to that tree node, or `undefined` if such parser doesn't exist.
  */
-export declare type ArgumentParserGetter = (treeNode: ArgumentTreeNode) => core.Parser | undefined;
+export type ArgumentParserGetter = (treeNode: ArgumentTreeNode) => core.Parser | undefined;
 export declare function argumentTreeNodeToString(name: string, treeNode: ArgumentTreeNode): string;
 //# sourceMappingURL=argument.d.ts.map

package/lib/parser/entry.js

@@ -16,6 +16,14 @@ export function entry(commandTreeName, argument) {
             if (src.peek() === '#') {
                 result = comment(src, ctx);
             }
+            else if (src.peek() === '$') {
+                const start = src.cursor;
+                src.skipLine();
+                result = {
+                    type: 'mcfunction:command_macro',
+                    range: core.Range.create(start, src),
+                };
+            }
             else {
                 result = command(CommandTreeRegistry.instance.get(commandTreeName), argument)(src, ctx);
             }

package/lib/tree/type.d.ts

@@ -22,11 +22,11 @@ export interface LiteralTreeNode extends BaseTreeNode {
 export interface RootTreeNode extends BaseTreeNode {
     type: 'root';
 }
-export declare type TreeNode = ArgumentTreeNode | LiteralTreeNode | RootTreeNode;
-declare type RecursivePartial<T> = T extends object ? {
+export type TreeNode = ArgumentTreeNode | LiteralTreeNode | RootTreeNode;
+type RecursivePartial<T> = T extends object ? {
     [K in keyof T]?: RecursivePartial<T[K]>;
 } : T;
-export declare type PartialTreeNode = RecursivePartial<TreeNode>;
-export declare type PartialRootTreeNode = RecursivePartial<RootTreeNode>;
+export type PartialTreeNode = RecursivePartial<TreeNode>;
+export type PartialRootTreeNode = RecursivePartial<RootTreeNode>;
 export {};
 //# sourceMappingURL=type.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/mcfunction",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
     "url": "https://github.com/SpyglassMC/Spyglass/issues"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.4.1",
-    "@spyglassmc/locales": "0.3.1"
+    "@spyglassmc/core": "0.4.3",
+    "@spyglassmc/locales": "0.3.3"
   }
 }