@spyglassmc/mcfunction 0.2.2 → 0.2.4

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,6 +1,6 @@
 import * as core from '@spyglassmc/core';
 import { CommandNode } from '../node/index.js';
-import { categorizeTreeChildren, CommandTreeRegistry, redirect, resolveParentTreeNode } from '../tree/index.js';
+import { categorizeTreeChildren, CommandTreeRegistry, redirect, resolveParentTreeNode, } from '../tree/index.js';
 /**
  * @param getMockNodes A function that returns a mock AST Node from given {@link ArgumentTreeNode}. These mock nodes
  * will be used for completing the argument.
@@ -26,9 +26,9 @@ export function command(tree, getMockNodes) {
         }
         const lastChildNode = core.AstNode.findLastChild(node, ctx.offset);
         if (!lastChildNode) {
-            return Object
-                .keys(tree.children ?? {})
-                .map(v => core.CompletionItem.create(v, ctx.offset, { kind: 14 /* core.CompletionKind.Keyword */ }));
+            return Object.keys(tree.children ?? {}).map((v) => core.CompletionItem.create(v, ctx.offset, {
+                kind: 14 /* core.CompletionKind.Keyword */,
+            }));
         }
         const treePath = lastChildNode.path;
         const { treeNode: parentTreeNode } = resolveParentTreeNode(redirect(tree, treePath), tree);
@@ -37,9 +37,10 @@ export function command(tree, getMockNodes) {
         }
         const { literalTreeNodes, argumentTreeNodes } = categorizeTreeChildren(parentTreeNode.children);
         return [
-            ...literalTreeNodes.map(([name]) => core.CompletionItem.create(name, ctx.offset, { kind: 14 /* core.CompletionKind.Keyword */ })),
-            ...argumentTreeNodes.flatMap(([_name, treeNode]) => core.Arrayable.toArray(getMockNodes(treeNode, ctx.offset))
-                .flatMap(n => core.completer.dispatch(n, ctx))),
+            ...literalTreeNodes.map(([name]) => core.CompletionItem.create(name, ctx.offset, {
+                kind: 14 /* core.CompletionKind.Keyword */,
+            })),
+            ...argumentTreeNodes.flatMap(([_name, treeNode]) => core.Arrayable.toArray(getMockNodes(treeNode, ctx.offset)).flatMap((n) => core.completer.dispatch(n, ctx))),
         ];
     };
 }

package/lib/node/command.js

@@ -25,7 +25,8 @@ export var CommandChildNode;
 export var LiteralCommandChildNode;
 (function (LiteralCommandChildNode) {
     function is(node) {
-        return node?.type === 'mcfunction:command_child/literal';
+        return (node?.type ===
+            'mcfunction:command_child/literal');
     }
     LiteralCommandChildNode.is = is;
 })(LiteralCommandChildNode || (LiteralCommandChildNode = {}));

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/command.js

@@ -56,14 +56,15 @@ function dispatch(ans, src, ctx, path, rootTreeNode, parentTreeNode, argument) {
             ? literal(literalTreeNodes.map(([name, _treeNode]) => name), parent.type === 'root')
             : undefined;
         const parsers = [
-            ...literalParser ? [literalParser] : [],
-            ...argumentParsers.map(v => v.parser),
+            ...(literalParser ? [literalParser] : []),
+            ...argumentParsers.map((v) => v.parser),
         ];
         const out = { index: 0 };
         const parser = parsers.length > 1 ? core.any(parsers, out) : parsers[0];
         const result = parser(src, ctx);
         if (result !== core.Failure) {
-            const takenName = argumentParsers[out.index - (literalParser ? 1 : 0)]?.name ?? result.value;
+            const takenName = argumentParsers[out.index - (literalParser ? 1 : 0)]?.name ??
+                result.value;
             const childPath = [...path, takenName];
             ans.push({
                 type: 'mcfunction:command_child',
@@ -79,7 +80,8 @@ function dispatch(ans, src, ctx, path, rootTreeNode, parentTreeNode, argument) {
             if (ctx.config.env.permissionLevel < requiredPermissionLevel) {
                 ctx.err.report(localize('mcfunction.parser.no-permission', requiredPermissionLevel, ctx.config.env.permissionLevel), result);
             }
-            if (result.type === 'mcfunction:command_child/unknown') {
+            if (result.type ===
+                'mcfunction:command_child/unknown') {
                 // Encountered an unsupported parser. Stop parsing this command.
                 return false;
             }
@@ -134,8 +136,7 @@ function wrapWithBrackets(syntax, executable) {
     return executable ? `[${syntax}]` : syntax;
 }
 export function treeNodeChildrenToStringArray(children, executable = false) {
-    const entries = Object.entries(children)
-        .map(([name, treeNode]) => wrapWithBrackets(treeNodeToString(name, treeNode), executable));
+    const entries = Object.entries(children).map(([name, treeNode]) => wrapWithBrackets(treeNodeToString(name, treeNode), executable));
     return entries;
 }
 export function treeNodeChildrenToString(children) {

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/lib/tree/util.js

@@ -3,9 +3,14 @@ export function redirect(rootTreeNode, path) {
 }
 export function resolveParentTreeNode(parentTreeNode, rootTreeNode, parentPath) {
     if (parentTreeNode?.redirect) {
-        return { treeNode: redirect(rootTreeNode, parentTreeNode.redirect), path: [...parentTreeNode.redirect] };
+        return {
+            treeNode: redirect(rootTreeNode, parentTreeNode.redirect),
+            path: [...parentTreeNode.redirect],
+        };
     }
-    else if (parentTreeNode && !parentTreeNode.children && !parentTreeNode.executable) {
+    else if (parentTreeNode &&
+        !parentTreeNode.children &&
+        !parentTreeNode.executable) {
         // The `execute.run` literal tree node doesn't have any property.
         // We should use children from the root tree node in this case.
         return { treeNode: rootTreeNode, path: [] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/mcfunction",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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.0",
-    "@spyglassmc/locales": "0.3.0"
+    "@spyglassmc/core": "0.4.2",
+    "@spyglassmc/locales": "0.3.2"
   }
 }