@spyglassmc/mcdoc 0.3.2 → 0.3.3

package/lib/binder/index.js

@@ -340,7 +340,11 @@ function bindEnumBlock(node, ctx, query, options = {}) {
         query.member(identifier.value, (fieldQuery) => fieldQuery
             .ifDeclared((symbol) => reportDuplicatedDeclaration(ctx, symbol, identifier))
             .elseEnter({
-            usage: { type: 'definition', node: identifier, fullRange: field },
+            usage: {
+                type: 'definition',
+                node: identifier,
+                fullRange: field,
+            },
         }));
     }
 }
@@ -755,7 +759,8 @@ function convertNumericType(node, ctx) {
     }, ctx);
 }
 function convertPrimitiveArray(node, ctx) {
-    const { arrayKind, lengthRange, valueRange } = PrimitiveArrayTypeNode.destruct(node);
+    const { arrayKind, lengthRange, valueRange } = PrimitiveArrayTypeNode
+        .destruct(node);
     return wrapType(node, {
         kind: `${arrayKind.value}_array`,
         lengthRange: convertRange(lengthRange, ctx),

package/lib/common.d.ts

@@ -1,4 +1,4 @@
-export declare type Segments = readonly string[];
+export type Segments = readonly string[];
 export declare function identifierToSeg(identifier: string): Segments;
 export declare function segToIdentifier(seg: Segments): string;
 export interface AdditionalContext {

package/lib/node/index.d.ts

@@ -7,7 +7,7 @@ export interface ModuleNode extends AstNode {
 export declare const ModuleNode: Readonly<{
     is(node: AstNode | undefined): node is ModuleNode;
 }>;
-export declare type TopLevelNode = CommentNode | DispatchStatementNode | EnumNode | InjectionNode | StructNode | TypeAliasNode | UseStatementNode;
+export type TopLevelNode = CommentNode | DispatchStatementNode | EnumNode | InjectionNode | StructNode | TypeAliasNode | UseStatementNode;
 export declare const TopLevelNode: Readonly<{
     is(node: AstNode | undefined): node is TopLevelNode;
 }>;
@@ -43,11 +43,11 @@ export declare const IndexBodyNode: Readonly<{
     };
     is(node: AstNode | undefined): node is IndexBodyNode;
 }>;
-export declare type IndexNode = StaticIndexNode | DynamicIndexNode;
+export type IndexNode = StaticIndexNode | DynamicIndexNode;
 export declare const IndexNode: Readonly<{
     is(node: AstNode | undefined): node is IndexNode;
 }>;
-export declare type StaticIndexNode = LiteralNode | IdentifierNode | StringNode | ResourceLocationNode;
+export type StaticIndexNode = LiteralNode | IdentifierNode | StringNode | ResourceLocationNode;
 export declare const StaticIndexNode: Readonly<{
     is(node: AstNode | undefined): node is StaticIndexNode;
 }>;
@@ -67,11 +67,11 @@ export declare const DynamicIndexNode: Readonly<{
     };
     is(node: AstNode | undefined): node is DynamicIndexNode;
 }>;
-export declare type AccessorKeyNode = LiteralNode | IdentifierNode | StringNode;
+export type AccessorKeyNode = LiteralNode | IdentifierNode | StringNode;
 export declare const AccessorKeyNode: Readonly<{
     is(node: AstNode | undefined): node is AccessorKeyNode;
 }>;
-export declare type TypeNode = AnyTypeNode | BooleanTypeNode | StringTypeNode | LiteralTypeNode | NumericTypeNode | PrimitiveArrayTypeNode | ListTypeNode | TupleTypeNode | EnumNode | StructNode | ReferenceTypeNode | DispatcherTypeNode | UnionTypeNode;
+export type TypeNode = AnyTypeNode | BooleanTypeNode | StringTypeNode | LiteralTypeNode | NumericTypeNode | PrimitiveArrayTypeNode | ListTypeNode | TupleTypeNode | EnumNode | StructNode | ReferenceTypeNode | DispatcherTypeNode | UnionTypeNode;
 export declare const TypeNode: Readonly<{
     is(node: AstNode | undefined): node is TypeNode;
 }>;
@@ -96,7 +96,7 @@ export declare const AttributeNode: Readonly<{
     };
     is(node: AstNode | undefined): node is AttributeNode;
 }>;
-export declare type AttributeValueNode = TypeNode | AttributeTreeNode;
+export type AttributeValueNode = TypeNode | AttributeTreeNode;
 export declare const AttributeValueNode: Readonly<{
     is(node: AstNode | undefined): node is AttributeValueNode;
 }>;
@@ -179,7 +179,7 @@ export declare const LiteralTypeNode: Readonly<{
     };
     is(node: AstNode | undefined): node is LiteralTypeNode;
 }>;
-export declare type LiteralTypeValueNode = LiteralNode | TypedNumberNode | StringNode;
+export type LiteralTypeValueNode = LiteralNode | TypedNumberNode | StringNode;
 export declare const LiteralTypeValueNode: Readonly<{
     is(node: AstNode | undefined): node is LiteralTypeValueNode;
 }>;
@@ -210,7 +210,7 @@ export declare const RangeExclusiveChar = "<";
  * The first bit from the left represents the start, the second bit from the left represents the end.
  * The bit is turned on if the range is exclusive on that end.
  */
-export declare type RangeKind = 0b00 | 0b01 | 0b10 | 0b11;
+export type RangeKind = 0b00 | 0b01 | 0b10 | 0b11;
 export declare function getRangeDelimiter(kind: RangeKind): string;
 export interface FloatRangeNode extends AstNode {
     type: 'mcdoc:float_range';
@@ -267,7 +267,7 @@ export interface EnumNode extends TypeBaseNode<DocCommentsNode | LiteralNode | I
     type: 'mcdoc:enum';
 }
 declare const EnumKinds: Set<"string" | "float" | "byte" | "short" | "int" | "long" | "double">;
-export declare type EnumKind = typeof EnumKinds extends Set<infer V> ? V : never;
+export type EnumKind = typeof EnumKinds extends Set<infer V> ? V : never;
 export declare const EnumNode: Readonly<{
     kinds: Set<"string" | "float" | "byte" | "short" | "int" | "long" | "double">;
     destruct(node: EnumNode): {
@@ -312,11 +312,11 @@ export declare const EnumFieldNode: Readonly<{
     };
     is(node: AstNode | undefined): node is EnumFieldNode;
 }>;
-export declare type EnumValueNode = TypedNumberNode | StringNode;
+export type EnumValueNode = TypedNumberNode | StringNode;
 export declare const EnumValueNode: Readonly<{
     is(node: AstNode | undefined): node is EnumValueNode;
 }>;
-export declare type PrelimNode = AttributeNode | DocCommentsNode;
+export type PrelimNode = AttributeNode | DocCommentsNode;
 export declare const PrelimNode: Readonly<{
     is(node: AstNode | undefined): node is PrelimNode;
 }>;
@@ -384,7 +384,7 @@ export declare const StructBlockNode: Readonly<{
     };
     is(node: AstNode | undefined): node is StructBlockNode;
 }>;
-export declare type StructFieldNode = StructPairFieldNode | StructSpreadFieldNode;
+export type StructFieldNode = StructPairFieldNode | StructSpreadFieldNode;
 export declare const StructFieldNode: Readonly<{
     is(node: AstNode | undefined): node is StructFieldNode;
 }>;
@@ -402,7 +402,7 @@ export declare const StructPairFieldNode: Readonly<{
     };
     is(node: AstNode | undefined): node is StructPairFieldNode;
 }>;
-export declare type StructKeyNode = StringNode | IdentifierNode | StructMapKeyNode;
+export type StructKeyNode = StringNode | IdentifierNode | StructMapKeyNode;
 export declare const StructKeyNode: Readonly<{
     is(node: AstNode | undefined): node is StructKeyNode;
 }>;
@@ -456,7 +456,7 @@ export declare const InjectionNode: Readonly<{
     };
     is(node: AstNode | undefined): node is InjectionNode;
 }>;
-export declare type InjectionContentNode = EnumInjectionNode | StructInjectionNode;
+export type InjectionContentNode = EnumInjectionNode | StructInjectionNode;
 export declare const InjectionContentNode: Readonly<{
     is(node: AstNode | undefined): node is InjectionContentNode;
 }>;

package/lib/node/index.js

@@ -127,7 +127,8 @@ export const AttributeTreeNode = Object.freeze({
         };
     },
     is(node) {
-        return (node?.type === 'mcdoc:attribute/tree');
+        return (node?.type ===
+            'mcdoc:attribute/tree');
     },
 });
 export const AttributeTreePosValuesNode = Object.freeze({
@@ -183,7 +184,8 @@ export const AnyTypeNode = Object.freeze({
 });
 export const BooleanTypeNode = Object.freeze({
     is(node) {
-        return node?.type === 'mcdoc:type/boolean';
+        return node?.type ===
+            'mcdoc:type/boolean';
     },
 });
 export const IntRangeNode = Object.freeze({
@@ -201,7 +203,8 @@ export const LiteralTypeNode = Object.freeze({
         };
     },
     is(node) {
-        return node?.type === 'mcdoc:type/literal';
+        return node?.type ===
+            'mcdoc:type/literal';
     },
 });
 export const LiteralTypeValueNode = Object.freeze({
@@ -217,7 +220,8 @@ export const TypedNumberNode = Object.freeze({
         };
     },
     is(node) {
-        return node?.type === 'mcdoc:typed_number';
+        return node?.type ===
+            'mcdoc:typed_number';
     },
 });
 export const NumericTypeNode = Object.freeze({
@@ -229,7 +233,8 @@ export const NumericTypeNode = Object.freeze({
         };
     },
     is(node) {
-        return (node?.type === 'mcdoc:type/numeric_type');
+        return (node?.type ===
+            'mcdoc:type/numeric_type');
     },
 });
 export const RangeExclusiveChar = '<';
@@ -399,7 +404,8 @@ export const DocCommentsNode = Object.freeze({
         return comments.join('\n');
     },
     is(node) {
-        return node?.type === 'mcdoc:doc_comments';
+        return node?.type ===
+            'mcdoc:doc_comments';
     },
 });
 export const EnumBlockNode = Object.freeze({
@@ -454,7 +460,8 @@ export const ReferenceTypeNode = Object.freeze({
         };
     },
     is(node) {
-        return (node?.type === 'mcdoc:type/reference');
+        return (node?.type ===
+            'mcdoc:type/reference');
     },
 });
 export const TypeParamBlockNode = Object.freeze({
@@ -499,7 +506,8 @@ export const StructBlockNode = Object.freeze({
         };
     },
     is(node) {
-        return node?.type === 'mcdoc:struct/block';
+        return node?.type ===
+            'mcdoc:struct/block';
     },
 });
 export const StructFieldNode = Object.freeze({
@@ -558,7 +566,8 @@ export const DispatcherTypeNode = Object.freeze({
         };
     },
     is(node) {
-        return (node?.type === 'mcdoc:type/dispatcher');
+        return (node?.type ===
+            'mcdoc:type/dispatcher');
     },
 });
 export const UnionTypeNode = Object.freeze({
@@ -588,7 +597,8 @@ export const InjectionContentNode = Object.freeze({
 });
 export const EnumInjectionNode = Object.freeze({
     is(node) {
-        return (node?.type === 'mcdoc:injection/enum');
+        return (node?.type ===
+            'mcdoc:injection/enum');
     },
 });
 export const StructInjectionNode = Object.freeze({

package/lib/parser/index.js

@@ -425,7 +425,12 @@ const structBlock = setType('mcdoc:struct/block', syntax([
         },
     ]),
 ], true));
-export const struct = setType('mcdoc:struct', syntax([prelim, keyword('struct'), optional(failOnEmpty(identifier)), structBlock], true));
+export const struct = setType('mcdoc:struct', syntax([
+    prelim,
+    keyword('struct'),
+    optional(failOnEmpty(identifier)),
+    structBlock,
+], true));
 const enumInjection = setType('mcdoc:injection/enum', syntax([
     literal('enum'),
     punctuation('('),

package/lib/type/index.d.ts

@@ -4,20 +4,20 @@ export interface Attribute {
     name: string;
     value?: AttributeValue;
 }
-export declare type AttributeValue = McdocType | {
+export type AttributeValue = McdocType | {
     kind: 'tree';
     values: AttributeTree;
 };
-export declare type AttributeTree = {
+export type AttributeTree = {
     [key: string | number]: AttributeValue;
 };
-export declare type NumericRange = {
+export type NumericRange = {
     kind: RangeKind;
     min?: number;
     max?: number;
 };
 export declare const StaticIndexKeywords: readonly ["fallback", "none", "unknown"];
-export declare type StaticIndexKeyword = typeof StaticIndexKeywords[number];
+export type StaticIndexKeyword = (typeof StaticIndexKeywords)[number];
 export interface StaticIndex {
     kind: 'static';
     value: string;
@@ -28,11 +28,11 @@ export interface DynamicIndex {
         keyword: 'key' | 'parent';
     })[];
 }
-export declare type Index = StaticIndex | DynamicIndex;
+export type Index = StaticIndex | DynamicIndex;
 /**
  * Corresponds to the IndexBodyNode
  */
-export declare type ParallelIndices = Index[];
+export type ParallelIndices = Index[];
 export interface DispatcherData {
     registry: FullResourceLocation;
     parallelIndices: ParallelIndices;
@@ -44,7 +44,7 @@ export interface StructType {
     kind: 'struct';
     fields: StructTypeField[];
 }
-export declare type StructTypeField = StructTypePairField | StructTypeSpreadField;
+export type StructTypeField = StructTypePairField | StructTypeSpreadField;
 export interface StructTypePairField {
     kind: 'pair';
     attributes?: Attribute[];
@@ -106,7 +106,7 @@ export interface StringType {
     kind: 'string';
     lengthRange?: NumericRange;
 }
-export declare type LiteralValue = {
+export type LiteralValue = {
     kind: 'boolean';
     value: boolean;
 } | {
@@ -122,28 +122,28 @@ export interface LiteralType {
     value: LiteralValue;
 }
 export declare const LiteralNumberSuffixes: readonly ["b", "s", "l", "f", "d"];
-export declare type LiteralNumberSuffix = typeof LiteralNumberSuffixes[number];
+export type LiteralNumberSuffix = (typeof LiteralNumberSuffixes)[number];
 export declare const LiteralNumberCaseInsensitiveSuffixes: readonly ["b", "s", "l", "f", "d", "B", "S", "L", "F", "D"];
-export declare type LiteralNumberCaseInsensitiveSuffix = typeof LiteralNumberCaseInsensitiveSuffixes[number];
+export type LiteralNumberCaseInsensitiveSuffix = (typeof LiteralNumberCaseInsensitiveSuffixes)[number];
 export interface NumericType {
     kind: NumericTypeKind;
     valueRange?: NumericRange;
 }
 export declare const NumericTypeIntKinds: readonly ["byte", "short", "int", "long"];
-export declare type NumericTypeIntKind = typeof NumericTypeIntKinds[number];
+export type NumericTypeIntKind = (typeof NumericTypeIntKinds)[number];
 export declare const NumericTypeFloatKinds: readonly ["float", "double"];
-export declare type NumericTypeFloatKind = typeof NumericTypeFloatKinds[number];
+export type NumericTypeFloatKind = (typeof NumericTypeFloatKinds)[number];
 export declare const NumericTypeKinds: readonly ["byte", "short", "int", "long", "float", "double"];
-export declare type NumericTypeKind = typeof NumericTypeKinds[number];
+export type NumericTypeKind = (typeof NumericTypeKinds)[number];
 export interface PrimitiveArrayType {
     kind: 'byte_array' | 'int_array' | 'long_array';
     valueRange?: NumericRange;
     lengthRange?: NumericRange;
 }
 export declare const PrimitiveArrayValueKinds: readonly ["byte", "int", "long"];
-export declare type PrimitiveArrayValueKind = typeof PrimitiveArrayValueKinds[number];
+export type PrimitiveArrayValueKind = (typeof PrimitiveArrayValueKinds)[number];
 export declare const PrimitiveArrayKinds: readonly ("byte_array" | "int_array" | "long_array")[];
-export declare type PrimitiveArrayKind = typeof PrimitiveArrayKinds[number];
+export type PrimitiveArrayKind = (typeof PrimitiveArrayKinds)[number];
 export interface ListType {
     kind: 'list';
     item: McdocType;
@@ -153,27 +153,27 @@ export interface TupleType {
     kind: 'tuple';
     items: McdocType[];
 }
-export declare type McdocType = DispatcherType | EnumType | KeywordType | ListType | LiteralType | NumericType | PrimitiveArrayType | ReferenceType | StringType | StructType | TupleType | UnionType | AttributedType | IndexedType | TemplateType | ConcreteType;
+export type McdocType = DispatcherType | EnumType | KeywordType | ListType | LiteralType | NumericType | PrimitiveArrayType | ReferenceType | StringType | StructType | TupleType | UnionType | AttributedType | IndexedType | TemplateType | ConcreteType;
 export declare namespace McdocType {
     function toString(type: McdocType | undefined): string;
 }
 /**
  * A type that doesn't include a dispatcher type.
  */
-export declare type DispatchedType = Exclude<McdocType, DispatcherType | UnionType> | UnionType<DispatchedType>;
+export type DispatchedType = Exclude<McdocType, DispatcherType | UnionType> | UnionType<DispatchedType>;
 /**
  * A type that doesn't include a reference type.
  */
-export declare type DereferencedType = Exclude<McdocType, ReferenceType | UnionType> | UnionType<DereferencedType>;
+export type DereferencedType = Exclude<McdocType, ReferenceType | UnionType> | UnionType<DereferencedType>;
 /**
  * A type that doesn't include a dispatcher type or a reference type.
  */
-export declare type TangibleType = Exclude<McdocType, DispatcherType | ReferenceType | UnionType> | UnionType<TangibleType>;
+export type TangibleType = Exclude<McdocType, DispatcherType | ReferenceType | UnionType> | UnionType<TangibleType>;
 /**
  * A type that is {@link TangibleType} and doesn't have any indices.
  */
-export declare type ResolvedType = (Exclude<McdocType, DispatcherType | ReferenceType | UnionType> | UnionType<ResolvedType>) & NoIndices;
-declare type NoIndices = {
+export type ResolvedType = (Exclude<McdocType, DispatcherType | ReferenceType | UnionType> | UnionType<ResolvedType>) & NoIndices;
+type NoIndices = {
     indices?: undefined;
 };
 export interface FlatStructType {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/mcdoc",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "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.2",
+    "@spyglassmc/locales": "0.3.2"
   }
 }