@spyglassmc/nbt 0.2.0 → 0.3.0

package/lib/checker/index.js

@@ -1,6 +1,6 @@
 import * as core from '@spyglassmc/core';
-import * as mcdoc from '@spyglassmc/mcdoc';
 import { localeQuote, localize } from '@spyglassmc/locales';
+import * as mcdoc from '@spyglassmc/mcdoc';
 import { NbtListNode } from '../node/index.js';
 import { localizeTag } from '../util.js';
 import { getBlocksFromItem, getEntityFromItem, getSpecialStringParser } from './mcdocUtil.js';
@@ -241,7 +241,10 @@ export function path(registry, id) {
     };
 }
 export function fieldValue(type, options) {
-    const isInRange = (value, [min, max]) => (min ?? -Infinity) <= value && value <= (max ?? Infinity);
+    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);
+    };
     const ExpectedTypes = {
         boolean: 'nbt:byte',
         byte: 'nbt:byte',
@@ -276,12 +279,12 @@ export function fieldValue(type, options) {
             case 'long_array':
                 node = node;
                 if (type.lengthRange && !isInRange(node.children.length, type.lengthRange)) {
-                    ctx.err.report(localize('expected', localize('nbt.checker.collection.length-between', localizeTag(node.type), type.lengthRange[0] ?? '-∞', type.lengthRange[1] ?? '+∞')), node, 2 /* core.ErrorSeverity.Warning */);
+                    ctx.err.report(localize('expected', localize('nbt.checker.collection.length-between', localizeTag(node.type), type.lengthRange.min ?? '-∞', type.lengthRange.max ?? '+∞')), node, 2 /* core.ErrorSeverity.Warning */);
                 }
                 if (type.valueRange) {
                     for (const { value: childNode } of node.children) {
                         if (childNode && !isInRange(Number(childNode.value), type.valueRange)) {
-                            ctx.err.report(localize('number.between', type.valueRange[0] ?? '-∞', type.valueRange[1] ?? '+∞'), node, 2 /* core.ErrorSeverity.Warning */);
+                            ctx.err.report(localize('number.between', type.valueRange.min ?? '-∞', type.valueRange.max ?? '+∞'), node, 2 /* core.ErrorSeverity.Warning */);
                         }
                     }
                 }
@@ -294,7 +297,7 @@ export function fieldValue(type, options) {
             case 'double':
                 node = node;
                 if (type.valueRange && !isInRange(Number(node.value), type.valueRange)) {
-                    ctx.err.report(localize('number.between', type.valueRange[0] ?? '-∞', type.valueRange[1] ?? '+∞'), node, 2 /* core.ErrorSeverity.Warning */);
+                    ctx.err.report(localize('number.between', type.valueRange.min ?? '-∞', type.valueRange.max ?? '+∞'), node, 2 /* core.ErrorSeverity.Warning */);
                 }
                 break;
             case 'dispatcher':
@@ -312,7 +315,7 @@ export function fieldValue(type, options) {
                 node = node;
                 type = mcdoc.simplifyListType(type);
                 if (type.lengthRange && !isInRange(node.children.length, type.lengthRange)) {
-                    ctx.err.report(localize('expected', localize('nbt.checker.collection.length-between', localizeTag(node.type), type.lengthRange[0] ?? '-∞', type.lengthRange[1] ?? '+∞')), node, 2 /* core.ErrorSeverity.Warning */);
+                    ctx.err.report(localize('expected', localize('nbt.checker.collection.length-between', localizeTag(node.type), type.lengthRange.min ?? '-∞', type.lengthRange.max ?? '+∞')), node, 2 /* core.ErrorSeverity.Warning */);
                 }
                 for (const { value: childNode } of node.children) {
                     if (childNode) {
@@ -338,7 +341,7 @@ export function fieldValue(type, options) {
                             const parser = ctx.meta.getParser(parserName);
                             const result = core.parseStringValue(parser, node.value, node.valueMap, ctx);
                             if (result !== core.Failure) {
-                                ctx.ops.set(node, 'children', [result]);
+                                node.children = [result];
                                 result.parent = node;
                             }
                         }

package/lib/index.d.ts

@@ -3,5 +3,5 @@ export * as checker from './checker/index.js';
 export * as colorizer from './colorizer/index.js';
 export * from './node/index.js';
 export * as parser from './parser/index.js';
-export declare const initialize: core.ProjectInitializer;
+export declare const initialize: core.SyncProjectInitializer;
 //# sourceMappingURL=index.d.ts.map

package/lib/node/index.d.ts

@@ -67,8 +67,8 @@ export declare namespace NbtCollectionNode {
     function is(node: core.AstNode | undefined): node is NbtCollectionNode;
 }
 export interface NbtListNode extends core.ListNode<NbtNode> {
-    readonly type: 'nbt:list';
-    readonly valueType?: NbtNode['type'];
+    type: 'nbt:list';
+    valueType?: NbtNode['type'];
 }
 export declare namespace NbtListNode {
     function is(node: core.AstNode | undefined): node is NbtListNode;
@@ -78,19 +78,19 @@ export declare namespace NbtPrimitiveArrayNode {
     function is(node: core.AstNode | undefined): node is NbtPrimitiveArrayNode;
 }
 export interface NbtByteArrayNode extends core.ListNode<NbtByteNode> {
-    readonly type: 'nbt:byte_array';
+    type: 'nbt:byte_array';
 }
 export declare namespace NbtByteArrayNode {
     function is(node: core.AstNode | undefined): node is NbtByteArrayNode;
 }
 export interface NbtIntArrayNode extends core.ListNode<NbtIntNode> {
-    readonly type: 'nbt:int_array';
+    type: 'nbt:int_array';
 }
 export declare namespace NbtIntArrayNode {
     function is(node: core.AstNode | undefined): node is NbtIntArrayNode;
 }
 export interface NbtLongArrayNode extends core.ListNode<NbtLongNode> {
-    readonly type: 'nbt:long_array';
+    type: 'nbt:long_array';
 }
 export declare namespace NbtLongArrayNode {
     function is(node: core.AstNode | undefined): node is NbtLongArrayNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/nbt",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "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.2.0",
-    "@spyglassmc/locales": "0.2.0",
-    "@spyglassmc/mcdoc": "0.2.0"
+    "@spyglassmc/core": "0.3.0",
+    "@spyglassmc/locales": "0.3.0",
+    "@spyglassmc/mcdoc": "0.3.0"
   }
 }