@spyglassmc/nbt 0.3.31 → 0.3.33

package/lib/parser/collection.js

@@ -1,6 +1,6 @@
 import * as core from '@spyglassmc/core';
 import { localize } from '@spyglassmc/locales';
-import { localizeTag } from '../util.js';
+import { localizeTag, newSyntax } from '../util.js';
 import { entry } from './entry.js';
 import { primitive } from './primitive.js';
 export const list = (src, ctx) => {
@@ -15,14 +15,10 @@ export const list = (src, ctx) => {
     ans.type = 'nbt:list';
     ans.valueType = ans.children[0]?.value?.type;
     // Check if every element is of the same type.
-    if (ans.valueType) {
-        // TODO: don't have this inline java-edition version check
-        const release = ctx.project['loadedVersion'];
-        if (release && Number(release.slice(2)) < Number('1.21.5'.slice(2))) {
-            for (const { value } of ans.children) {
-                if (value && value.type !== ans.valueType) {
-                    ctx.err.report(localize('expected-got', localizeTag(ans.valueType), localizeTag(value.type)), value);
-                }
+    if (ans.valueType && !newSyntax(ctx)) {
+        for (const { value } of ans.children) {
+            if (value && value.type !== ans.valueType) {
+                ctx.err.report(localize('expected-got', localizeTag(ans.valueType), localizeTag(value.type)), value);
             }
         }
     }

package/lib/parser/primitive.d.ts

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

package/lib/parser/primitive.js

@@ -1,6 +1,6 @@
 import * as core from '@spyglassmc/core';
 import { localize } from '@spyglassmc/locales';
-import { localizeTag } from '../util.js';
+import { localizeTag, newSyntax } from '../util.js';
 const FloatMaximum = (2 - 2 ** -23) * 2 ** 127;
 const NumeralPatterns = [
     {
@@ -62,7 +62,15 @@ 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.setType('nbt:string', core.brigadierString);
+const NbtStringOptions = {
+    escapable: { characters: ['b', 'f', 'n', 'r', 's', 't'], unicode: true },
+    quotes: ['"', "'"],
+    unquotable: core.BrigadierUnquotableOption,
+};
+export const string = (src, ctx) => {
+    const options = newSyntax(ctx) ? NbtStringOptions : core.BrigadierStringOptions;
+    return core.setType('nbt:string', core.string(options))(src, ctx);
+};
 export const primitive = (src, ctx) => {
     if (core.Source.isBrigadierQuote(src.peek())) {
         return string(src, ctx);

package/lib/util.d.ts

@@ -1,3 +1,5 @@
+import type { ParserContext } from '@spyglassmc/core';
 import type { NbtNode } from './node/index.js';
 export declare function localizeTag(type: NbtNode['type']): string;
+export declare function newSyntax(ctx: ParserContext): boolean;
 //# sourceMappingURL=util.d.ts.map

package/lib/util.js

@@ -2,4 +2,9 @@ import { localize } from '@spyglassmc/locales';
 export function localizeTag(type) {
     return localize(`nbt.node.${type.replace(/^nbt:/, '')}`);
 }
+export function newSyntax(ctx) {
+    // TODO: don't have this inline java-edition version check
+    const release = ctx.project['loadedVersion'];
+    return !release || Number(release.slice(2)) >= Number('1.21.5'.slice(2));
+}
 //# sourceMappingURL=util.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/nbt",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "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.26",
-    "@spyglassmc/locales": "0.3.12",
-    "@spyglassmc/mcdoc": "0.3.30"
+    "@spyglassmc/core": "0.4.28",
+    "@spyglassmc/locales": "0.3.14",
+    "@spyglassmc/mcdoc": "0.3.32"
   }
 }