@spyglassmc/nbt 0.3.7 → 0.3.9

package/lib/parser/path.js

@@ -2,11 +2,7 @@ import * as core from '@spyglassmc/core';
 import { arrayToMessage, localeQuote, localize } from '@spyglassmc/locales';
 import { compound } from './compound.js';
 export const path = (src, ctx) => {
-    const ans = {
-        type: 'nbt:path',
-        children: [],
-        range: core.Range.create(src),
-    };
+    const ans = { type: 'nbt:path', children: [], range: core.Range.create(src) };
     let expectedParts = ['filter', 'key'];
     let currentPart = nextPart(src);
     let cursor;
@@ -25,7 +21,12 @@ export const path = (src, ctx) => {
     return ans;
 };
 const filter = (children, src, ctx) => {
-    children.push(compound(src, ctx));
+    const node = compound(src, ctx);
+    children.push({
+        type: 'nbt:path/filter',
+        range: node.range,
+        children: [node],
+    });
     return src.trySkip('.') ? ['key'] : ['end'];
 };
 const index = (children, src, ctx) => {
@@ -54,28 +55,19 @@ const index = (children, src, ctx) => {
     return src.trySkip('.') ? ['index', 'key'] : ['end', 'index'];
 };
 const key = (children, src, ctx) => {
-    const node = core.string({
+    const node = core.setType('nbt:string', core.string({
         colorTokenType: 'property',
         escapable: {},
         // 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',
-                ' ',
-                '"',
-                '[',
-                ']',
-                '.',
-                '{',
-                '}',
-            ]),
-        },
-    })(src, ctx);
-    children.push(node);
+        unquotable: { blockList: new Set(['\n', '\r', '\t', ' ', '"', '[', ']', '.', '{', '}']) },
+    }))(src, ctx);
+    children.push({
+        type: 'nbt:path/key',
+        range: node.range,
+        children: [node],
+    });
     return src.trySkip('.') ? ['index', 'key'] : ['end', 'filter', 'index'];
 };
 function nextPart(src) {
@@ -96,9 +88,5 @@ function nextPart(src) {
 function localizePart(part) {
     return localize(`nbt.node.path.${part}`);
 }
-const PartParsers = {
-    filter,
-    index,
-    key,
-};
+const PartParsers = { filter, index, key };
 //# sourceMappingURL=path.js.map

package/lib/parser/primitive.d.ts

@@ -1,5 +1,7 @@
 import * as core from '@spyglassmc/core';
 import type { NbtPrimitiveNode } from '../node/index.js';
-export declare const string: core.InfallibleParser<core.StringNode>;
+export declare const string: core.InfallibleParser<Omit<core.StringNode, "type"> & {
+    type: "nbt:string";
+}>;
 export declare const primitive: core.InfallibleParser<NbtPrimitiveNode>;
 //# sourceMappingURL=primitive.d.ts.map

package/lib/parser/primitive.js

@@ -62,13 +62,12 @@ const NumeralPatterns = [
     { pattern: /^true$/i, type: 'nbt:byte', value: 1, group: 0 /* Group.Boolean */ },
     { pattern: /^false$/i, type: 'nbt:byte', value: 0, group: 0 /* Group.Boolean */ },
 ];
-export const string = core.brigadierString;
+export const string = core.setType('nbt:string', core.brigadierString);
 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 */) {
@@ -85,17 +84,11 @@ export const primitive = (src, ctx) => {
             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,
-                })
+                ? 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;
@@ -105,10 +98,7 @@ export const primitive = (src, ctx) => {
                 src.skip();
                 numeralResult.range.end++;
             }
-            return {
-                ...numeralResult,
-                type: e.type,
-            };
+            return { ...numeralResult, type: e.type };
         }
     }
     updateUnquoted();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/nbt",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "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.5",
-    "@spyglassmc/locales": "0.3.5",
-    "@spyglassmc/mcdoc": "0.3.7"
+    "@spyglassmc/core": "0.4.6",
+    "@spyglassmc/locales": "0.3.6",
+    "@spyglassmc/mcdoc": "0.3.9"
   }
 }