@spyglassmc/java-edition 0.3.25 → 0.3.27

package/lib/binder/index.d.ts

@@ -1,5 +1,17 @@
-import type { CheckerContext, Config, RootUriString, UriBinder, UriBinderContext } from '@spyglassmc/core';
+import type { CheckerContext, Config, FileCategory, MetaRegistry, RootUriString, UriBinder, UriBinderContext } from '@spyglassmc/core';
+import { ReleaseVersion } from '../dependency/index.js';
+interface Resource {
+    path: string;
+    category: FileCategory;
+    ext: `.${string}`;
+    pack: 'data' | 'assets';
+    identifier?: string;
+    since?: ReleaseVersion;
+    until?: ReleaseVersion;
+}
+export declare function getResources(): Generator<Resource, undefined, undefined>;
 export declare function getRels(uri: string, rootUris: readonly RootUriString[]): Generator<string, undefined, unknown>;
+export declare function getRoots(uri: string, rootUris: readonly RootUriString[]): Generator<RootUriString, undefined, unknown>;
 export declare function dissectUri(uri: string, ctx: UriBinderContext): {
     namespace: string;
     identifier: string;
@@ -15,4 +27,6 @@ export declare function dissectUri(uri: string, ctx: UriBinderContext): {
 export declare const uriBinder: UriBinder;
 export declare function registerCustomResources(config: Config): void;
 export declare function reportDissectError(realPath: string, expectedPath: string | undefined, ctx: CheckerContext): void;
+export declare function registerUriBuilders(meta: MetaRegistry): void;
+export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/binder/index.js

@@ -127,6 +127,12 @@ resource('', {
     identifier: 'regional_compliancies',
 });
 resource('', { pack: 'assets', category: 'gpu_warnlist', identifier: 'gpu_warnlist' });
+export function* getResources() {
+    for (const resources of Resources.values()) {
+        yield* resources;
+    }
+    return undefined;
+}
 export function* getRels(uri, rootUris) {
     yield* fileUtil.getRels(uri, rootUris);
     const parts = uri.split('/');
@@ -137,6 +143,16 @@ export function* getRels(uri, rootUris) {
     }
     return undefined;
 }
+export function* getRoots(uri, rootUris) {
+    yield* fileUtil.getRoots(uri, rootUris);
+    const parts = uri.split('/');
+    for (let i = parts.length - 2; i >= 0; i--) {
+        if (parts[i] === 'data' || parts[i] === 'assets') {
+            yield `${parts.slice(0, i).join('/')}/`;
+        }
+    }
+    return undefined;
+}
 export function dissectUri(uri, ctx) {
     const rels = getRels(uri, ctx.roots);
     const release = ctx.project['loadedVersion'];
@@ -249,4 +265,36 @@ export function reportDissectError(realPath, expectedPath, ctx) {
         ctx.err.report(localize('java-edition.binder.wrong-version', localeQuote(realPath), release), Range.Beginning, 0 /* ErrorSeverity.Hint */);
     }
 }
+function uriBuilder(resources) {
+    return (identifier, ctx) => {
+        const root = getRoots(ctx.doc.uri, ctx.roots).next().value;
+        if (!root) {
+            return undefined;
+        }
+        const release = ctx.project['loadedVersion'];
+        if (!release) {
+            return undefined;
+        }
+        const resource = resources.find(r => matchVersion(release, r.since, r.until));
+        if (!resource) {
+            return undefined;
+        }
+        const sepIndex = identifier.indexOf(':');
+        const namespace = sepIndex > 0 ? identifier.slice(0, sepIndex) : 'minecraft';
+        const path = identifier.slice(sepIndex + 1);
+        return `${root}${resource.pack}/${namespace}/${resource.path}/${path}${resource.ext}`;
+    };
+}
+export function registerUriBuilders(meta) {
+    const resourcesByCategory = new Map();
+    for (const resource of getResources()) {
+        resourcesByCategory.set(resource.category, [
+            ...resourcesByCategory.get(resource.category) ?? [],
+            resource,
+        ]);
+    }
+    for (const [category, resources] of resourcesByCategory.entries()) {
+        meta.registerUriBuilder(category, uriBuilder(resources));
+    }
+}
 //# sourceMappingURL=index.js.map

package/lib/index.js

@@ -2,7 +2,7 @@ import * as core from '@spyglassmc/core';
 import * as json from '@spyglassmc/json';
 import * as mcdoc from '@spyglassmc/mcdoc';
 import * as nbt from '@spyglassmc/nbt';
-import { uriBinder } from './binder/index.js';
+import { registerUriBuilders, uriBinder } from './binder/index.js';
 import { getMcmetaSummary, getVanillaDatapack, getVanillaMcdoc, getVanillaResourcepack, getVersions, PackMcmeta, resolveConfiguredVersion, symbolRegistrar, } from './dependency/index.js';
 import * as jeJson from './json/index.js';
 import { registerMcdocAttributes, registerPackFormatAttribute } from './mcdocAttributes.js';
@@ -52,6 +52,7 @@ export const initialize = async (ctx) => {
         return packs;
     }
     meta.registerUriBinder(uriBinder);
+    registerUriBuilders(meta);
     const versions = await getVersions(ctx.externals, ctx.downloader);
     if (!versions) {
         ctx.logger.error('[je-initialize] Failed loading game version list. Expect everything to be broken.');

package/lib/mcfunction/completer/argument.js

@@ -150,10 +150,10 @@ const block = (node, ctx) => {
     if (Range.contains(node.id, ctx.offset, true)) {
         ans.push(...completer.resourceLocation(node.id, ctx));
     }
-    if (node.states && Range.contains(Range.translate(node.states, 1, -1), ctx.offset, true)) {
+    if (node.states?.innerRange && Range.contains(node.states.innerRange, ctx.offset, true)) {
         ans.push(...blockStates(node.states, ctx));
     }
-    if (node.nbt && Range.contains(Range.translate(node.nbt, 1, -1), ctx.offset, true)) {
+    if (node.nbt?.innerRange && Range.contains(node.nbt.innerRange, ctx.offset, true)) {
         ans.push(...completer.dispatch(node.nbt, ctx));
     }
     return ans;
@@ -183,7 +183,7 @@ const blockStates = (node, ctx) => {
     })(node, ctx);
 };
 const componentList = (node, ctx) => {
-    if (!Range.contains(Range.translate(node, 1, -1), ctx.offset, true)) {
+    if (!node.innerRange || !Range.contains(node.innerRange, ctx.offset, true)) {
         return [];
     }
     const completeKey = (key) => {
@@ -326,7 +326,7 @@ const selector = (node, ctx) => {
     if (Range.contains(node.children[0], ctx.offset, true)) {
         return completer.literal(node.children[0], ctx);
     }
-    if (node.arguments && Range.contains(Range.translate(node.arguments, 1, -1), ctx.offset, true)) {
+    if (node.arguments?.innerRange && Range.contains(node.arguments.innerRange, ctx.offset, true)) {
         return selectorArguments(node.arguments, ctx);
     }
     return [];

package/lib/mcfunction/node/argument.d.ts

@@ -124,6 +124,7 @@ export declare namespace ItemStackNode {
 export interface ComponentListNode extends core.AstNode {
     type: 'mcfunction:component_list';
     children: (ComponentNode | ComponentRemovalNode)[];
+    innerRange?: core.Range;
 }
 export declare namespace ComponentListNode {
     function is(node: core.AstNode): node is ComponentListNode;

package/lib/mcfunction/parser/argument.js

@@ -1085,6 +1085,7 @@ const components = (src, ctx) => {
     if (!src.trySkip('[')) {
         return core.Failure;
     }
+    ans.innerRange = core.Range.create(src);
     src.skipWhitespace();
     while (src.canRead() && src.peek() !== ']') {
         const start = src.cursor;
@@ -1139,6 +1140,7 @@ const components = (src, ctx) => {
         }
     }
     src.skipWhitespace();
+    ans.innerRange.end = src.cursor;
     core.literal(']')(src, ctx);
     ans.range.end = src.cursor;
     return ans;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.25",
+  "version": "0.3.27",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,16 +17,14 @@
     "release:dry": "npm publish --dry-run"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.4.19",
-    "@spyglassmc/json": "0.3.22",
-    "@spyglassmc/locales": "0.3.10",
-    "@spyglassmc/mcfunction": "0.2.21",
-    "@spyglassmc/mcdoc": "0.3.23",
-    "@spyglassmc/nbt": "0.3.23"
-  },
-  "devDependencies": {
-    "fast-glob": "^3.2.5"
+    "@spyglassmc/core": "0.4.21",
+    "@spyglassmc/json": "0.3.24",
+    "@spyglassmc/locales": "0.3.12",
+    "@spyglassmc/mcfunction": "0.2.23",
+    "@spyglassmc/mcdoc": "0.3.25",
+    "@spyglassmc/nbt": "0.3.25"
   },
+  "devDependencies": {},
   "publishConfig": {
     "access": "public"
   },