@spyglassmc/mcdoc 0.3.2 → 0.3.4

package/lib/parser/index.d.ts

@@ -17,9 +17,9 @@ export declare const string: InfallibleParser<StringNode>;
 export declare const identifier: InfallibleParser<IdentifierNode>;
 export declare const path: InfallibleParser<PathNode>;
 export declare const attribute: Parser<AttributeNode>;
-export declare const dispatchStatement: Parser<DispatchStatementNode>;
 export declare const docComment: Parser<CommentNode>;
 export declare const docComments: InfallibleParser<DocCommentsNode>;
+export declare const dispatchStatement: Parser<DispatchStatementNode>;
 export declare const float: InfallibleParser<FloatNode>;
 export declare const typedNumber: InfallibleParser<TypedNumberNode>;
 export declare const enum_: Parser<EnumNode>;

package/lib/parser/index.js

@@ -328,9 +328,18 @@ const typeParamBlock = setType('mcdoc:type_param_block', syntax([
     ]),
 ]));
 const noop = () => undefined;
+export const docComment = core.comment({
+    singleLinePrefixes: new Set(['///']),
+    includesEol: true,
+});
+export const docComments = setType('mcdoc:doc_comments', repeat(docComment, (src) => {
+    src.skipWhitespace();
+    return [];
+}));
+const prelim = syntax([optional(failOnEmpty(docComments)), attributes]);
 const optionalTypeParamBlock = select([{ prefix: '<', parser: typeParamBlock }, { parser: noop }]);
 export const dispatchStatement = setType('mcdoc:dispatch_statement', syntax([
-    attributes,
+    prelim,
     keyword('dispatch'),
     resLoc({
         category: 'mcdoc/dispatcher',
@@ -341,15 +350,6 @@ export const dispatchStatement = setType('mcdoc:dispatch_statement', syntax([
     literal('to'),
     { get: () => type },
 ], true));
-export const docComment = core.comment({
-    singleLinePrefixes: new Set(['///']),
-    includesEol: true,
-});
-export const docComments = setType('mcdoc:doc_comments', repeat(docComment, (src) => {
-    src.skipWhitespace();
-    return [];
-}));
-const prelim = syntax([optional(failOnEmpty(docComments)), attributes]);
 const enumType = literal(['byte', 'short', 'int', 'long', 'string', 'float', 'double'], { colorTokenType: 'type' });
 export const float = core.float({
     pattern: /^[-+]?(?:[0-9]+(?:[eE][-+]?[0-9]+)?|[0-9]*\.[0-9]+(?:[eE][-+]?[0-9]+)?)$/,
@@ -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('('),
@@ -490,7 +495,7 @@ function typeBase(type, parser) {
         syntaxRepeat(select([
             { prefix: '<', parser: typeArgBlock },
             { parser: failOnError(indexBody()) },
-        ])),
+        ]), true),
     ], true));
 }
 export const anyType = typeBase('mcdoc:type/any', keyword('any', { colorTokenType: 'type' }));
@@ -561,13 +566,13 @@ export const numericType = typeBase('mcdoc:type/numeric_type', select([
         parser: syntax([
             keyword(NumericTypeFloatKinds, { colorTokenType: 'type' }),
             atFloatRange,
-        ]),
+        ], true),
     },
     {
         parser: syntax([
             keyword(NumericTypeIntKinds, { colorTokenType: 'type' }),
             atIntRange,
-        ]),
+        ], true),
     },
 ]));
 export const primitiveArrayType = typeBase('mcdoc:type/primitive_array', syntax([

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 declare const StaticIndexKeywords: readonly ["fallback", "none", "unknown", "spawnitem"];
+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/lib/type/index.js

@@ -5,6 +5,7 @@ export const StaticIndexKeywords = Object.freeze([
     'fallback',
     'none',
     'unknown',
+    'spawnitem',
 ]);
 export const EmptyUnion = Object.freeze({
     kind: 'union',

package/package.json

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