@spyglassmc/nbt 0.3.2 → 0.3.4

package/lib/checker/index.js

@@ -262,7 +262,8 @@ export function path(registry, id) {
 export function fieldValue(type, options) {
     const isInRange = (value, { kind, min = -Infinity, max = Infinity }) => {
         const comparator = (a, b, exclusive) => exclusive ? a < b : a <= b;
-        return (comparator(min, value, kind & 0b10) && comparator(value, max, kind & 0b01));
+        return (comparator(min, value, kind & 0b10) &&
+            comparator(value, max, kind & 0b01));
     };
     const ExpectedTypes = {
         boolean: 'nbt:byte',
@@ -367,7 +368,9 @@ export function fieldValue(type, options) {
                     valueNode = node.parent.parent;
                 }
                 if (core.PairNode.is(valueNode.parent)) {
-                    const structMcdocPath = valueNode.parent.key?.symbol?.parentSymbol?.path.join('::');
+                    const structMcdocPath = valueNode.parent.key?.symbol
+                        ?.parentSymbol
+                        ?.path.join('::');
                     const key = valueNode.parent.key?.value;
                     const path = `${structMcdocPath}.${key}${suffix}`;
                     const parserName = getSpecialStringParser(path);

package/lib/checker/mcdocUtil.js

@@ -64,7 +64,10 @@ const BlockItems = {
     ],
     // Torches.
     'minecraft:torch': ['minecraft:torch', 'minecraft:wall_torch'],
-    'minecraft:soul_torch': ['minecraft:soul_torch', 'minecraft:soul_wall_torch'],
+    'minecraft:soul_torch': [
+        'minecraft:soul_torch',
+        'minecraft:soul_wall_torch',
+    ],
     'minecraft:redstone_torch': [
         'minecraft:redstone_torch',
         'minecraft:redstone_wall_torch',

package/lib/node/index.d.ts

@@ -1,18 +1,18 @@
 import * as core from '@spyglassmc/core';
 import type * as mcdoc from '@spyglassmc/mcdoc';
-export declare type NbtNode = NbtPrimitiveNode | NbtCompoundNode | NbtCollectionNode;
+export type NbtNode = NbtPrimitiveNode | NbtCompoundNode | NbtCollectionNode;
 export declare namespace NbtNode {
     function is(node: core.AstNode | undefined): node is NbtNode;
 }
-export declare type NbtPrimitiveNode = NbtNumberNode | core.StringNode;
+export type NbtPrimitiveNode = NbtNumberNode | core.StringNode;
 export declare namespace NbtPrimitiveNode {
     function is(node: core.AstNode | undefined): node is NbtPrimitiveNode;
 }
-export declare type NbtNumberNode = NbtIntegerAlikeNode | NbtFloatAlikeNode;
+export type NbtNumberNode = NbtIntegerAlikeNode | NbtFloatAlikeNode;
 export declare namespace NbtNumberNode {
     function is(node: core.AstNode | undefined): node is NbtNumberNode;
 }
-export declare type NbtIntegerAlikeNode = NbtByteNode | NbtShortNode | NbtIntNode | NbtLongNode;
+export type NbtIntegerAlikeNode = NbtByteNode | NbtShortNode | NbtIntNode | NbtLongNode;
 export declare namespace NbtIntegerAlikeNode {
     function is(node: core.AstNode | undefined): node is NbtIntegerAlikeNode;
 }
@@ -40,7 +40,7 @@ export interface NbtLongNode extends core.LongBaseNode {
 export declare namespace NbtLongNode {
     function is(node: core.AstNode | undefined): node is NbtLongNode;
 }
-export declare type NbtFloatAlikeNode = NbtFloatNode | NbtDoubleNode;
+export type NbtFloatAlikeNode = NbtFloatNode | NbtDoubleNode;
 export declare namespace NbtFloatAlikeNode {
     function is(node: core.AstNode | undefined): node is NbtFloatAlikeNode;
 }
@@ -62,7 +62,7 @@ export interface NbtCompoundNode extends core.RecordBaseNode<core.StringNode, Nb
 export declare namespace NbtCompoundNode {
     function is(node: core.AstNode | undefined): node is NbtCompoundNode;
 }
-export declare type NbtCollectionNode = NbtListNode | NbtPrimitiveArrayNode;
+export type NbtCollectionNode = NbtListNode | NbtPrimitiveArrayNode;
 export declare namespace NbtCollectionNode {
     function is(node: core.AstNode | undefined): node is NbtCollectionNode;
 }
@@ -73,7 +73,7 @@ export interface NbtListNode extends core.ListNode<NbtNode> {
 export declare namespace NbtListNode {
     function is(node: core.AstNode | undefined): node is NbtListNode;
 }
-export declare type NbtPrimitiveArrayNode = NbtByteArrayNode | NbtIntArrayNode | NbtLongArrayNode;
+export type NbtPrimitiveArrayNode = NbtByteArrayNode | NbtIntArrayNode | NbtLongArrayNode;
 export declare namespace NbtPrimitiveArrayNode {
     function is(node: core.AstNode | undefined): node is NbtPrimitiveArrayNode;
 }

package/lib/parser/path.js

@@ -57,10 +57,22 @@ const key = (children, src, ctx) => {
     const node = core.string({
         colorTokenType: 'property',
         escapable: {},
-        // No single quotes: https://bugs.mojang.com/browse/MC-175504
-        quotes: ['"'],
+        // Single quotes supported since 1.20 Pre-release 2 (roughly pack format 15)
+        // https://bugs.mojang.com/browse/MC-175504
+        quotes: ['"', "'"],
         unquotable: {
-            blockList: new Set(['\n', '\r', '\t', ' ', '"', '[', ']', '.', '{', '}']),
+            blockList: new Set([
+                '\n',
+                '\r',
+                '\t',
+                ' ',
+                '"',
+                '[',
+                ']',
+                '.',
+                '{',
+                '}',
+            ]),
         },
     })(src, ctx);
     children.push(node);

package/lib/parser/primitive.js

@@ -67,7 +67,8 @@ export const primitive = (src, ctx) => {
     if (core.Source.isBrigadierQuote(src.peek())) {
         return string(src, ctx);
     }
-    const { result: unquotedResult, updateSrcAndCtx: updateUnquoted } = core.attempt(string, src, ctx);
+    const { result: unquotedResult, updateSrcAndCtx: updateUnquoted } = core
+        .attempt(string, src, ctx);
     for (const e of NumeralPatterns) {
         if (e.pattern.test(unquotedResult.value)) {
             if (e.group === 0 /* Group.Boolean */) {
@@ -82,13 +83,19 @@ export const primitive = (src, ctx) => {
             let isOutOfRange = false;
             const onOutOfRange = () => (isOutOfRange = true);
             const numeralParser = e.group === 2 /* Group.IntegerAlike */
-                ? // As we already checked the format of the value with `e.pattern` in the if-block, there is no need to check
-                    // it again here in the parser, therefore we just pass in a simple /./ regex.
-                    core.integer({ pattern: /./, min: e.min, max: e.max, onOutOfRange })
+                // As we already checked the format of the value with `e.pattern` in the if-block, there is no need to check
+                // it again here in the parser, therefore we just pass in a simple /./ regex.
+                ? core.integer({
+                    pattern: /./,
+                    min: e.min,
+                    max: e.max,
+                    onOutOfRange,
+                })
                 : e.group === 3 /* Group.LongAlike */
                     ? core.long({ pattern: /./, min: e.min, max: e.max, onOutOfRange })
                     : core.float({ pattern: /./, min: e.min, max: e.max, onOutOfRange });
-            const { result: numeralResult, updateSrcAndCtx: updateNumeral } = core.attempt(numeralParser, src, ctx);
+            const { result: numeralResult, updateSrcAndCtx: updateNumeral } = core
+                .attempt(numeralParser, src, ctx);
             if (isOutOfRange) {
                 ctx.err.report(localize('nbt.parser.number.out-of-range', localizeTag(e.type), localize('nbt.node.string'), e.min, e.max), unquotedResult, 2 /* core.ErrorSeverity.Warning */);
                 break;

package/package.json

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