@spyglassmc/core 0.4.6 → 0.4.7

package/lib/node/ResourceLocationNode.d.ts

@@ -12,16 +12,19 @@ export type ResourceLocationOptions = {
     category: ResourceLocationCategory;
     pool?: undefined;
     allowTag?: false;
+    requireTag?: false;
     allowUnknown?: false;
 } | {
     category: TaggableResourceLocationCategory;
     pool?: undefined;
     allowTag?: boolean;
+    requireTag?: boolean;
     allowUnknown?: false;
 } | {
     category?: undefined;
     pool: string[];
     allowTag?: false;
+    requireTag?: false;
     allowUnknown?: boolean;
 });
 export interface ResourceLocationBaseNode extends AstNode, Partial<ResourceLocation> {

package/lib/parser/resourceLocation.js

@@ -100,6 +100,9 @@ export function resourceLocation(options) {
             if (ans.isTag && !options.allowTag) {
                 ctx.err.report(localize('parser.resource-location.tag-disallowed'), ans);
             }
+            if (!ans.isTag && options.requireTag) {
+                ctx.err.report(localize('parser.resource-location.tag-required'), ans);
+            }
             if (!ans.namespace && options.requireCanonical) {
                 ctx.err.report(localize('parser.resource-location.namespace-expected'), ans);
             }

package/lib/processor/completer/builtin.js

@@ -139,7 +139,9 @@ export const resourceLocation = (node, ctx) => {
     const pool = node.options.pool
         ? optimizePool(node.options.pool)
         : [
-            ...getPool(node.options.category),
+            ...(!node.options.requireTag
+                ? getPool(node.options.category)
+                : []),
             ...(node.options.allowTag
                 ? getPool(`tag/${node.options.category}`).map((v) => `${ResourceLocation.TagPrefix}${v}`)
                 : []),

package/lib/service/Project.js

@@ -125,7 +125,7 @@ export class Project {
         return this.#cacheRoot;
     }
     updateRoots() {
-        const rawRoots = [...this.#dependencyRoots, this.projectRoot];
+        const rawRoots = [...this.#dependencyRoots ?? [], this.projectRoot];
         const ans = new Set(rawRoots);
         // Identify roots indicated by `pack.mcmeta`.
         for (const file of this.getTrackedFiles()) {
@@ -155,7 +155,8 @@ export class Project {
      */
     getTrackedFiles() {
         const extensions = this.meta.getSupportedFileExtensions();
-        const supportedFiles = [...this.#dependencyFiles, ...this.#watchedFiles].filter((file) => extensions.includes(fileUtil.extname(file) ?? ''));
+        const supportedFiles = [...this.#dependencyFiles ?? [], ...this.#watchedFiles]
+            .filter((file) => extensions.includes(fileUtil.extname(file) ?? ''));
         const filteredFiles = this.ignore.filter(supportedFiles);
         return filteredFiles;
     }
@@ -726,13 +727,13 @@ export class Project {
     }
     shouldRemove(uri) {
         return (!this.#clientManagedUris.has(uri)
-            && !this.#dependencyFiles.has(uri)
+            && !this.#dependencyFiles?.has(uri)
             && !this.#watchedFiles.has(uri));
     }
     isOnlyWatched(uri) {
         return (this.#watchedFiles.has(uri)
             && !this.#clientManagedUris.has(uri)
-            && !this.#dependencyFiles.has(uri));
+            && !this.#dependencyFiles?.has(uri));
     }
 }
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/core",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
     "rfdc": "^1.3.0",
     "vscode-languageserver-textdocument": "^1.0.4",
     "whatwg-url": "^14.0.0",
-    "@spyglassmc/locales": "0.3.6"
+    "@spyglassmc/locales": "0.3.7"
   },
   "devDependencies": {
     "@types/decompress": "^4.2.3",