@spyglassmc/mcdoc 0.3.0 → 0.3.1

package/lib/binder/index.js

@@ -110,7 +110,7 @@ function hoist(node, ctx) {
         });
     }
     function hoistFor(subcategory, node, destructor, getData) {
-        const { docComments, identifier } = destructor(node);
+        const { docComments, identifier, keyword } = destructor(node);
         const name = identifier?.value ?? nextAnonymousIdentifier(node, ctx);
         ctx.symbols
             .query({ doc: ctx.doc, node }, 'mcdoc', `${ctx.moduleIdentifier}::${name}`)
@@ -118,8 +118,8 @@ function hoist(node, ctx) {
             .elseEnter({
             data: { data: getData(node), desc: DocCommentsNode.asText(docComments), subcategory },
             // If the current syntax structure is named, then the identifier node is entered as a definition;
-            // otherwise, an anonymous identifier is generated for the symbol and the whole syntax structure node is entered as a definition.
-            usage: { type: 'definition', node: identifier ?? node, fullRange: identifier && node },
+            // otherwise, an anonymous identifier is generated for the symbol and the keyword node is entered as a definition.
+            usage: { type: 'definition', node: identifier ?? keyword, fullRange: identifier && node },
         });
     }
     function nextAnonymousIndex(node, ctx) {
@@ -154,7 +154,7 @@ async function bindDispatchStatement(node, ctx) {
         }
         ctx.symbols
             .query(ctx.doc, 'mcdoc/dispatcher', locationStr, asString(key))
-            .ifDeclared(symbol => reportDuplicatedDeclaration(ctx, symbol, key, { localeString: 'mcdoc.binder.dispatcher-statement.duplicated-key.related' }))
+            .ifDeclared(symbol => reportDuplicatedDeclaration(ctx, symbol, key, { localeString: 'mcdoc.binder.dispatcher-statement.duplicated-key' }))
             .elseEnter({
             data: {
                 data: {
@@ -226,7 +226,7 @@ async function bindPath(node, ctx) {
             const referencedModuleFile = pathArrayToString(identifiers);
             const referencedModuleUri = identifierToUri(referencedModuleFile, ctx);
             if (!referencedModuleUri) {
-                ctx.err.report(localize('mcdoc.binder.path.unknown-module', localeQuote(referencedModuleFile)), node);
+                ctx.err.report(localize('mcdoc.binder.path.unknown-module', localeQuote(referencedModuleFile)), node, 2 /* ErrorSeverity.Warning */);
                 return;
             }
             await ctx.ensureBindingStarted(referencedModuleUri);
@@ -238,14 +238,14 @@ async function bindPath(node, ctx) {
         }))
             .else(() => {
             if (indexRight === 0) {
-                ctx.err.report(localize('mcdoc.binder.path.unknown-identifier', localeQuote(atArray(identifiers, -1)), localeQuote(pathArrayToString(identifiers.slice(0, -1)))), node);
+                ctx.err.report(localize('mcdoc.binder.path.unknown-identifier', localeQuote(atArray(identifiers, -1)), localeQuote(pathArrayToString(identifiers.slice(0, -1)))), node, 2 /* ErrorSeverity.Warning */);
             }
         });
     }
 }
 function bindEnum(node, ctx) {
-    const { block, identifier } = EnumNode.destruct(node);
-    const symbol = identifier?.symbol ?? node.symbol;
+    const { block, identifier, keyword } = EnumNode.destruct(node);
+    const symbol = identifier?.symbol ?? keyword.symbol;
     if (symbol?.subcategory !== 'enum') {
         return;
     }
@@ -271,8 +271,8 @@ async function bindInjection(node, ctx) {
     }
 }
 async function bindStruct(node, ctx) {
-    const { block, identifier } = StructNode.destruct(node);
-    const symbol = identifier?.symbol ?? node.symbol;
+    const { block, identifier, keyword } = StructNode.destruct(node);
+    const symbol = identifier?.symbol ?? keyword.symbol;
     if (symbol?.subcategory !== 'struct') {
         return;
     }

package/lib/node/index.d.ts

@@ -264,6 +264,7 @@ export declare const EnumNode: Readonly<{
         docComments?: DocCommentsNode;
         enumKind?: EnumKind;
         identifier?: IdentifierNode;
+        keyword: LiteralNode;
     };
     is(node: AstNode | undefined): node is EnumNode;
 }>;
@@ -316,6 +317,7 @@ export declare const StructNode: Readonly<{
         block: StructBlockNode;
         docComments?: DocCommentsNode;
         identifier?: IdentifierNode;
+        keyword: LiteralNode;
     };
     is(node: AstNode | undefined): node is StructNode;
 }>;
@@ -470,6 +472,7 @@ export declare const TypeAliasNode: Readonly<{
     destruct(node: TypeAliasNode): {
         docComments?: DocCommentsNode;
         identifier?: IdentifierNode;
+        keyword: LiteralNode;
         typeParams?: TypeParamBlockNode;
         rhs?: TypeNode;
     };

package/lib/node/index.js

@@ -337,6 +337,7 @@ export const EnumNode = Object.freeze({
             docComments: node.children.find(DocCommentsNode.is),
             enumKind: getEnumKind(node),
             identifier: node.children.find(IdentifierNode.is),
+            keyword: node.children.find(LiteralNode.is),
         };
         function getEnumKind(node) {
             for (const literal of node.children.filter(LiteralNode.is)) {
@@ -412,6 +413,7 @@ export const StructNode = Object.freeze({
             block: node.children.find(StructBlockNode.is),
             docComments: node.children.find(DocCommentsNode.is),
             identifier: node.children.find(IdentifierNode.is),
+            keyword: node.children.find(LiteralNode.is),
         };
     },
     is(node) {
@@ -568,6 +570,7 @@ export const TypeAliasNode = Object.freeze({
         return {
             docComments: node.children.find(DocCommentsNode.is),
             identifier: node.children.find(IdentifierNode.is),
+            keyword: node.children.find(LiteralNode.is),
             typeParams: node.children.find(TypeParamBlockNode.is),
             rhs: node.children.find(TypeNode.is),
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/mcdoc",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "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.3.0",
+    "@spyglassmc/core": "0.4.0",
     "@spyglassmc/locales": "0.3.0"
   }
 }