@spyglassmc/nbt 0.1.0 → 0.1.1

package/lib/checker/index.d.ts

@@ -34,7 +34,7 @@ export declare function path(registry: nbtdoc.ExtendableRootRegistry, id: core.F
 export declare function fieldValue(type: nbtdoc.NbtdocType, options: Options): core.SyncChecker<NbtNode>;
 declare type ResolvedCompoundData = Record<string, {
     data: nbtdoc.NbtdocType;
-    query?: core.SymbolQuery;
+    query: core.SymbolQuery;
 }>;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/checker/index.js

@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fieldValue = exports.path = exports.enum_ = exports.compound = exports.blockStates = exports.definition = exports.index = void 0;
 const core = __importStar(require("@spyglassmc/core"));
 const nbtdoc = __importStar(require("@spyglassmc/nbtdoc"));
+const nbtdoc_1 = require("@spyglassmc/nbtdoc");
 const lib_1 = require("../../../locales/lib");
 const node_1 = require("../node");
 const util_1 = require("../util");
@@ -107,7 +108,7 @@ function compound(data, options = {}) {
             const key = keyNode.value;
             const fieldData = data[key];
             if (fieldData) {
-                fieldData.query?.enter({ usage: { type: 'reference', node: keyNode } });
+                fieldData.query.enter({ usage: { type: 'reference', node: keyNode } });
                 fieldValue(fieldData.data, options)(valueNode, ctx);
             }
             else if (!options.allowUnknownKey) {
@@ -150,7 +151,7 @@ function path(registry, id) {
     return (node, ctx) => {
         const resolveResult = resolveRootRegistry(registry, id, ctx, undefined);
         let data = { type: 'resolved_compound', data: resolveResult.value };
-        let targetType = { type: 'compound', symbol: { category: 'nbtdoc', path: [] } };
+        let targetType = { type: 'index', index: { registry, path: [] } };
         const options = { allowUnknownKey: resolveResult.allowUnknownKey, isPredicate: true };
         let currentCompound;
         for (const child of node.children) {
@@ -169,7 +170,7 @@ function path(registry, id) {
                 if (data?.type === 'resolved_compound') {
                     const fieldData = data.data[child.value];
                     if (fieldData) {
-                        fieldData.query?.enter({ usage: { type: 'reference', node: child } });
+                        fieldData.query.enter({ usage: { type: 'reference', node: child } });
                         if (fieldData.data.type === 'byte_array' || fieldData.data.type === 'int_array' || fieldData.data.type === 'long_array' || fieldData.data.type === 'list') {
                             data = fieldData.data;
                         }
@@ -323,8 +324,13 @@ function fieldValue(type, options) {
             case 'index':
                 node = node;
                 const id = resolveFieldPath(node.parent?.parent, type.index.path);
-                if (type.index.registry && id) {
-                    index(type.index.registry, core.ResourceLocation.lengthen(id), options)(node, ctx);
+                if (type.index.registry) {
+                    if (nbtdoc_1.ExtendableRootRegistry.is(type.index.registry)) {
+                        index(type.index.registry, id ? core.ResourceLocation.lengthen(id) : undefined, options)(node, ctx);
+                    }
+                    else if (id) {
+                        index(type.index.registry, core.ResourceLocation.lengthen(id), options)(node, ctx);
+                    }
                 }
                 break;
             case 'id':
@@ -524,14 +530,7 @@ function resolveSymbolPaths(paths, ctx, compound) {
                 return;
             }
             if (ans[key]) {
-                delete ans[key].query;
-                const existingData = ans[key].data;
-                if (existingData.type === 'union') {
-                    existingData.members.push(data.fieldType);
-                }
-                else {
-                    ans[key].data = { type: 'union', members: [existingData, data.fieldType] };
-                }
+                ans[key].data = nbtdoc.unionTypes(ans[key].data, data.fieldType);
             }
             else {
                 ans[key] = { data: data.fieldType, query: keyQuery };

package/lib/checker/nbtdocUtil.js

@@ -140,8 +140,7 @@ const SpecialStrings = {
     '::minecraft::block::sign::Sign.Text2': 'mcfunction:component',
     '::minecraft::block::sign::Sign.Text3': 'mcfunction:component',
     '::minecraft::block::sign::Sign.Text4': 'mcfunction:component',
-    // TODO
-    // '::minecraft::entity::effectcloud::EffectCloud.Particle': 'mcfunction:particle',
+    '::minecraft::entity::effectcloud::EffectCloud.Particle': 'mcfunction:particle',
     '::minecraft::entity::minecart::CommandMinecart.Command': 'mcfunction:command',
     '::minecraft::entity::mob::LivingEntity.Team': 'mcfunction:team',
     '::minecraft::entity::EntityBase.Tags[]': 'mcfunction:tag',
@@ -156,6 +155,8 @@ exports.getSpecialStringParser = getSpecialStringParser;
 const ExpandableCompounds = [
     '::minecraft::item::ItemBase',
     '::minecraft::entity::marker::Any',
+    '::minecraft::util::any::Any',
+    '::minecraft::util::Any',
 ];
 /**
  * @param nbtdocPath Path of the nbtdoc compound definition.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/nbt",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "author": "SPGoding",
@@ -24,8 +24,8 @@
     "url": "https://github.com/SpyglassMC/Spyglass/issues"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.1.0",
-    "@spyglassmc/locales": "0.1.0",
-    "@spyglassmc/nbtdoc": "0.1.0"
+    "@spyglassmc/core": "0.1.1",
+    "@spyglassmc/locales": "0.1.1",
+    "@spyglassmc/nbtdoc": "0.1.1"
   }
 }