@spyglassmc/java-edition 0.3.8 → 0.3.10

package/lib/binder/index.d.ts

@@ -1,15 +1,17 @@
-import type { ContextBase, FileCategory, RootUriString, UriBinder } from '@spyglassmc/core';
-export declare const Categories: Map<string, {
-    category: FileCategory;
-    extname: string;
-    since?: `1.${number}` | undefined;
-    until?: `1.${number}` | undefined;
-}>;
+import type { CheckerContext, Config, RootUriString, UriBinder, UriBinderContext } from '@spyglassmc/core';
 export declare function getRels(uri: string, rootUris: readonly RootUriString[]): Generator<string, undefined, unknown>;
-export declare function dissectUri(uri: string, ctx: ContextBase): {
-    category: "function" | "advancement" | "chat_type" | "damage_type" | "dimension" | "dimension_type" | "item_modifier" | "loot_table" | "predicate" | "recipe" | "structure" | "trim_material" | "trim_pattern" | "tag/function" | "tag/activity" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/chunk_status" | "tag/custom_stat" | "tag/enchantment" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/game_event" | "tag/height_provider_type" | "tag/int_provider_type" | "tag/item" | "tag/loot_condition_type" | "tag/loot_function_type" | "tag/loot_nbt_provider_type" | "tag/loot_number_provider_type" | "tag/loot_pool_entry_type" | "tag/loot_score_provider_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/sound_event" | "tag/stat_type" | "tag/villager_profession" | "tag/villager_type" | "tag/worldgen/biome_source" | "tag/worldgen/block_placer_type" | "tag/worldgen/block_state_provider_type" | "tag/worldgen/carver" | "tag/worldgen/chunk_generator" | "tag/worldgen/decorator" | "tag/worldgen/feature" | "tag/worldgen/feature_size_type" | "tag/worldgen/foliage_placer_type" | "tag/worldgen/material_condition" | "tag/worldgen/material_rule" | "tag/worldgen/placement_modifier_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/worldgen/biome" | "tag/worldgen/configured_carver" | "tag/worldgen/configured_feature" | "tag/worldgen/configured_structure_feature" | "tag/worldgen/configured_surface_builder" | "tag/worldgen/density_function" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/template_pool" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/template_pool";
+export declare function dissectUri(uri: string, ctx: UriBinderContext): {
     namespace: string;
     identifier: string;
+    expected: string | undefined;
+    path: string;
+    category: "function" | "advancement" | "banner_pattern" | "chat_type" | "damage_type" | "dimension" | "dimension_type" | "enchantment" | "enchantment_provider" | "item_modifier" | "jukebox_song" | "loot_table" | "painting_variant" | "predicate" | "recipe" | "structure" | "trim_material" | "trim_pattern" | "wolf_variant" | "tag/function" | "tag/activity" | "tag/armor_material" | "tag/attribute" | "tag/block" | "tag/block_entity_type" | "tag/block_predicate_type" | "tag/block_type" | "tag/cat_variant" | "tag/chunk_status" | "tag/command_argument_type" | "tag/creative_mode_tab" | "tag/custom_stat" | "tag/data_component_type" | "tag/decorated_pot_pattern" | "tag/enchantment_effect_component_type" | "tag/enchantment_entity_effect_type" | "tag/enchantment_level_based_value_type" | "tag/enchantment_location_based_effect_type" | "tag/enchantment_provider_type" | "tag/enchantment_value_effect_type" | "tag/entity_sub_predicate_type" | "tag/entity_type" | "tag/float_provider_type" | "tag/fluid" | "tag/frog_variant" | "tag/game_event" | "tag/height_provider_type" | "tag/instrument" | "tag/int_provider_type" | "tag/item" | "tag/item_sub_predicate_type" | "tag/loot_condition_type" | "tag/loot_function_type" | "tag/loot_nbt_provider_type" | "tag/loot_number_provider_type" | "tag/loot_pool_entry_type" | "tag/loot_score_provider_type" | "tag/map_decoration_type" | "tag/memory_module_type" | "tag/menu" | "tag/mob_effect" | "tag/motive" | "tag/number_format_type" | "tag/particle_type" | "tag/point_of_interest_type" | "tag/pos_rule_test" | "tag/position_source_type" | "tag/potion" | "tag/recipe_serializer" | "tag/recipe_type" | "tag/rule_block_entity_modifier" | "tag/rule_test" | "tag/schedule" | "tag/sensor_type" | "tag/sound_event" | "tag/stat_type" | "tag/trigger_type" | "tag/villager_profession" | "tag/villager_type" | "tag/worldgen/biome_source" | "tag/worldgen/block_placer_type" | "tag/worldgen/block_state_provider_type" | "tag/worldgen/carver" | "tag/worldgen/chunk_generator" | "tag/worldgen/decorator" | "tag/worldgen/density_function_type" | "tag/worldgen/feature" | "tag/worldgen/feature_size_type" | "tag/worldgen/foliage_placer_type" | "tag/worldgen/material_condition" | "tag/worldgen/material_rule" | "tag/worldgen/placement_modifier_type" | "tag/worldgen/pool_alias_binding" | "tag/worldgen/root_placer_type" | "tag/worldgen/structure_feature" | "tag/worldgen/structure_piece" | "tag/worldgen/structure_placement" | "tag/worldgen/structure_pool_element" | "tag/worldgen/structure_processor" | "tag/worldgen/structure_type" | "tag/worldgen/surface_builder" | "tag/worldgen/tree_decorator_type" | "tag/worldgen/trunk_placer_type" | "tag/advancement" | "tag/banner_pattern" | "tag/chat_type" | "tag/damage_type" | "tag/dimension" | "tag/dimension_type" | "tag/enchantment" | "tag/enchantment_provider" | "tag/item_modifier" | "tag/jukebox_song" | "tag/loot_table" | "tag/painting_variant" | "tag/predicate" | "tag/recipe" | "tag/structure" | "tag/trim_material" | "tag/trim_pattern" | "tag/wolf_variant" | "tag/worldgen/biome" | "tag/worldgen/configured_carver" | "tag/worldgen/configured_feature" | "tag/worldgen/configured_structure_feature" | "tag/worldgen/configured_surface_builder" | "tag/worldgen/density_function" | "tag/worldgen/flat_level_generator_preset" | "tag/worldgen/multi_noise_biome_source_parameter_list" | "tag/worldgen/noise" | "tag/worldgen/noise_settings" | "tag/worldgen/placed_feature" | "tag/worldgen/processor_list" | "tag/worldgen/structure" | "tag/worldgen/structure_set" | "tag/worldgen/template_pool" | "tag/worldgen/world_preset" | "worldgen/biome" | "worldgen/configured_carver" | "worldgen/configured_feature" | "worldgen/configured_structure_feature" | "worldgen/configured_surface_builder" | "worldgen/density_function" | "worldgen/flat_level_generator_preset" | "worldgen/multi_noise_biome_source_parameter_list" | "worldgen/noise" | "worldgen/noise_settings" | "worldgen/placed_feature" | "worldgen/processor_list" | "worldgen/structure" | "worldgen/structure_set" | "worldgen/template_pool" | "worldgen/world_preset";
+    ext: `.${string}`;
+    since?: `1.${number}` | undefined;
+    until?: `1.${number}` | undefined;
+    ok: boolean;
 } | undefined;
 export declare const uriBinder: UriBinder;
+export declare function registerCustomResources(config: Config): void;
+export declare function reportDissectError(realPath: string, expectedPath: string | undefined, ctx: CheckerContext): void;
 //# sourceMappingURL=index.d.ts.map

package/lib/binder/index.js

@@ -1,165 +1,147 @@
-import { fileUtil, TaggableResourceLocationCategories } from '@spyglassmc/core';
+import { fileUtil, Range, TaggableResourceLocationCategories, } from '@spyglassmc/core';
+import { localeQuote, localize } from '@spyglassmc/locales';
 import { ReleaseVersion } from '../dependency/index.js';
-export const Categories = (() => {
-    const NonTaggableRegistries = new Set([
-        'block',
-        'fluid',
-        'function',
-        'game_event',
-        'item', // They have the legacy `tags/${plural}` path.
-        'worldgen/block_placer_type',
-        'worldgen/surface_builder', // They are removed at some point.
-    ]);
-    const ans = new Map([
-        ['advancements', { category: 'advancement', extname: '.json' }],
-        ['dimension', { category: 'dimension', extname: '.json', since: '1.16' }],
-        [
-            'dimension_type',
-            { category: 'dimension_type', extname: '.json', since: '1.16' },
-        ],
-        ['functions', { category: 'function', extname: '.mcfunction' }],
-        [
-            'item_modifiers',
-            { category: 'item_modifier', extname: '.json', since: '1.17' },
-        ],
-        ['loot_tables', { category: 'loot_table', extname: '.json' }],
-        ['predicates', { category: 'predicate', extname: '.json' }],
-        ['recipes', { category: 'recipe', extname: '.json' }],
-        ['tags/blocks', { category: 'tag/block', extname: '.json' }],
-        ['tags/entity_types', { category: 'tag/entity_type', extname: '.json' }],
-        ['tags/fluids', { category: 'tag/fluid', extname: '.json' }],
-        ['tags/functions', { category: 'tag/function', extname: '.json' }],
-        [
-            'tags/game_events',
-            { category: 'tag/game_event', extname: '.json', since: '1.17' },
-        ],
-        ['tags/items', { category: 'tag/item', extname: '.json' }],
-        [
-            'worldgen/biome',
-            { category: 'worldgen/biome', extname: '.json', since: '1.16' },
-        ],
-        [
-            'worldgen/configured_carver',
-            {
-                category: 'worldgen/configured_carver',
-                extname: '.json',
-                since: '1.16',
-            },
-        ],
-        [
-            'worldgen/configured_feature',
-            {
-                category: 'worldgen/configured_feature',
-                extname: '.json',
-                since: '1.16',
-            },
-        ],
-        [
-            'worldgen/configured_structure_feature',
-            {
-                category: 'worldgen/configured_structure_feature',
-                extname: '.json',
-                since: '1.16',
-            },
-        ],
-        [
-            'worldgen/configured_surface_builder',
-            {
-                category: 'worldgen/configured_surface_builder',
-                extname: '.json',
-                since: '1.16',
-                until: '1.17',
-            },
-        ],
-        [
-            'worldgen/density_function',
-            {
-                category: 'worldgen/density_function',
-                extname: '.json',
-                since: '1.18',
-            },
-        ],
-        [
-            'worldgen/noise',
-            { category: 'worldgen/noise', extname: '.json', since: '1.18' },
-        ],
-        [
-            'worldgen/noise_settings',
-            {
-                category: 'worldgen/noise_settings',
-                extname: '.json',
-                since: '1.16',
-            },
-        ],
-        [
-            'worldgen/placed_feature',
-            {
-                category: 'worldgen/placed_feature',
-                extname: '.json',
-                since: '1.18',
-            },
-        ],
-        [
-            'worldgen/processor_list',
-            {
-                category: 'worldgen/processor_list',
-                extname: '.json',
-                since: '1.16',
-            },
-        ],
-        [
-            'worldgen/template_pool',
-            {
-                category: 'worldgen/template_pool',
-                extname: '.json',
-                since: '1.16',
-            },
-        ],
-    ]);
-    for (const registry of TaggableResourceLocationCategories) {
-        if (NonTaggableRegistries.has(registry)) {
-            continue;
-        }
-        ans.set(`tags/${registry}`, {
-            category: `tag/${registry}`,
-            extname: '.json',
-            since: '1.18',
-        });
+const Resources = new Map();
+function resource(path, resource = {}) {
+    Resources.set(path, {
+        path,
+        category: resource.category ?? path,
+        ext: resource.ext ?? '.json',
+        ...resource,
+    });
+}
+// Pre-1.21 data pack plurals
+resource('advancements', { category: 'advancement', until: '1.21' });
+resource('functions', { category: 'function', until: '1.21', ext: '.mcfunction' });
+resource('item_modifiers', { category: 'item_modifier', since: '1.17', until: '1.21' });
+resource('loot_tables', { category: 'loot_table', until: '1.21' });
+resource('predicates', { category: 'predicate', until: '1.21' });
+resource('recipes', { category: 'recipe', until: '1.21' });
+resource('structures', { category: 'structure', until: '1.21', ext: '.nbt' });
+resource('tags/blocks', { category: 'tag/block', until: '1.21' });
+resource('tags/entity_types', { category: 'tag/entity_type', until: '1.21' });
+resource('tags/fluids', { category: 'tag/fluid', until: '1.21' });
+resource('tags/functions', { category: 'tag/function', until: '1.21' });
+resource('tags/game_events', { category: 'tag/game_event', since: '1.17', until: '1.21' });
+resource('tags/items', { category: 'tag/item', until: '1.21' });
+// Post-1.21 data pack non-plurals
+resource('advancement', { since: '1.21' });
+resource('function', { since: '1.21', ext: '.mcfunction' });
+resource('item_modifier', { since: '1.21' });
+resource('loot_table', { since: '1.21' });
+resource('predicate', { since: '1.21' });
+resource('recipe', { since: '1.21' });
+resource('structure', { since: '1.21', ext: '.nbt' });
+resource('tags/block', { category: 'tag/block', since: '1.21' });
+resource('tags/entity_type', { category: 'tag/entity_type', since: '1.21' });
+resource('tags/fluid', { category: 'tag/fluid', since: '1.21' });
+resource('tags/function', { category: 'tag/function', since: '1.21' });
+resource('tags/game_event', { category: 'tag/game_event', since: '1.21' });
+resource('tags/item', { category: 'tag/item', since: '1.21' });
+// Data pack
+resource('banner_pattern', { since: '1.20.5' });
+resource('chat_type', { since: '1.19' });
+resource('damage_type', { since: '1.19.4' });
+resource('enchantment', { since: '1.21' });
+resource('enchantment_provider', { since: '1.21' });
+resource('jukebox_song', { since: '1.21' });
+resource('painting_variant', { since: '1.21' });
+resource('trim_pattern', { since: '1.19.4' });
+resource('trim_material', { since: '1.19.4' });
+resource('wolf_variant', { since: '1.20.5' });
+// Worldgen
+resource('dimension', { since: '1.16' });
+resource('dimension_type', { since: '1.16' });
+resource('worldgen/biome', { since: '1.16.2' });
+resource('worldgen/configured_carver', { since: '1.16.2' });
+resource('worldgen/configured_feature', { since: '1.16.2' });
+resource('worldgen/configured_structure_feature', { since: '1.16.2', until: '1.19' });
+resource('worldgen/density_function', { since: '1.18.2' });
+resource('worldgen/flat_level_generator_preset', { since: '1.19' });
+resource('worldgen/multi_noise_biome_source_parameter_list', { since: '1.19.4' });
+resource('worldgen/noise', { since: '1.18' });
+resource('worldgen/noise_settings', { since: '1.16.2' });
+resource('worldgen/placed_feature', { since: '1.18' });
+resource('worldgen/processor_list', { since: '1.16.2' });
+resource('worldgen/configured_surface_builder', { since: '1.16.2', until: '1.18' });
+resource('worldgen/structure', { since: '1.19' });
+resource('worldgen/structure_set', { since: '1.18.2' });
+resource('worldgen/template_pool', { since: '1.16.2' });
+resource('worldgen/world_preset', { since: '1.19' });
+// Tags
+const NonTaggableRegistries = new Set([
+    // Legacy plural paths
+    'block',
+    'fluid',
+    'function',
+    'game_event',
+    'item',
+    // Removed before 1.18
+    'worldgen/block_placer_type',
+    'worldgen/surface_builder',
+]);
+for (const registry of TaggableResourceLocationCategories) {
+    if (NonTaggableRegistries.has(registry)) {
+        continue;
     }
-    return ans;
-})();
+    resource(`tags/${registry}`, { category: `tag/${registry}`, since: '1.18' });
+}
 export function* getRels(uri, rootUris) {
     yield* fileUtil.getRels(uri, rootUris);
     const parts = uri.split('/');
     for (let i = parts.length - 2; i >= 0; i--) {
-        if (parts[i] === 'data') {
+        if (parts[i] === 'data') { // TODO: support assets
             yield parts.slice(i).join('/');
         }
     }
     return undefined;
 }
 export function dissectUri(uri, ctx) {
-    const regex = /^data\/([^\/]+)\/((?:tags\/|worldgen\/)?[a-z_]+)\/(.*)(\.(?:mcfunction|json))$/;
     const rels = getRels(uri, ctx.roots);
+    const release = ctx.project['loadedVersion'];
+    if (!release) {
+        return undefined;
+    }
     for (const rel of rels) {
-        const match = rel.match(regex);
-        if (!match) {
+        const parts = rel.split('/');
+        if (parts.length < 4) {
             continue;
         }
-        const def = Categories.get(match[2]);
-        if (!def || def.extname !== match[4]) {
+        const [pack, namespace, ...rest] = parts;
+        if (pack !== 'data') {
+            continue; // TODO: support assets
+        }
+        let resource = undefined;
+        let matchIndex = 0;
+        for (let i = 1; i < rest.length; i += 1) {
+            const res = Resources.get(rest.slice(0, i).join('/'));
+            if (res) {
+                resource = res;
+                matchIndex = i;
+            }
+        }
+        if (!resource) {
             continue;
         }
-        const loadedVersion = ctx.project['loadedVersion'];
-        if (!loadedVersion || // FIXME: check why this can be undefined sometimes
-            !matchVersion(loadedVersion, def.since, def.until)) {
+        let identifier = rest.slice(matchIndex).join('/');
+        if (!identifier.endsWith(resource.ext)) {
             continue;
         }
-        return {
-            category: def.category,
-            namespace: match[1],
-            identifier: match[3],
-        };
+        identifier = identifier.slice(0, -resource.ext.length);
+        if (!matchVersion(release, resource.since, resource.until)) {
+            let expected = undefined;
+            for (const [path, other] of Resources) {
+                if (other.category !== resource.category) {
+                    continue;
+                }
+                if (matchVersion(release, other.since, other.until)) {
+                    expected = path;
+                    break;
+                }
+            }
+            return { ok: false, ...resource, namespace, identifier, expected };
+        }
+        return { ok: true, ...resource, namespace, identifier, expected: undefined };
     }
     return undefined;
 }
@@ -167,21 +149,38 @@ export const uriBinder = (uris, ctx) => {
     for (const uri of uris) {
         const parts = dissectUri(uri, ctx);
         if (parts) {
-            ctx.symbols
-                .query(uri, parts.category, `${parts.namespace}:${parts.identifier}`)
-                .enter({
-                usage: {
-                    type: 'definition',
-                },
+            ctx.symbols.query(uri, parts.category, `${parts.namespace}:${parts.identifier}`).enter({
+                usage: { type: 'definition' },
             });
         }
     }
 };
+export function registerCustomResources(config) {
+    for (const [path, res] of Object.entries(config.env.customResources)) {
+        if (res.pack === undefined || res.pack === 'data') {
+            resource(path, { ...res, category: res.category });
+        }
+    }
+}
 function matchVersion(target, since, until) {
-    if (since && ReleaseVersion.cmp(target, since) < 0)
+    if (since && ReleaseVersion.cmp(target, since) < 0) {
         return false;
-    if (until && ReleaseVersion.cmp(until, target) < 0)
+    }
+    if (until && ReleaseVersion.cmp(until, target) <= 0) {
         return false;
+    }
     return true;
 }
+export function reportDissectError(realPath, expectedPath, ctx) {
+    const release = ctx.project['loadedVersion'];
+    if (!release) {
+        return;
+    }
+    if (expectedPath) {
+        ctx.err.report(localize('java-edition.binder.wrong-folder', localeQuote(realPath), release, localeQuote(expectedPath)), Range.Beginning, 0 /* ErrorSeverity.Hint */);
+    }
+    else {
+        ctx.err.report(localize('java-edition.binder.wrong-version', localeQuote(realPath), release), Range.Beginning, 0 /* ErrorSeverity.Hint */);
+    }
+}
 //# sourceMappingURL=index.js.map

package/lib/common/index.js

@@ -4,27 +4,24 @@ import * as json from '@spyglassmc/json';
  * @returns An array of URIs corresponding to the specified resource.
  */
 export function getUris(category, id, ctx) {
-    return (ctx.symbols
-        .query(ctx.doc, category, core.ResourceLocation.lengthen(id))
-        .symbol?.definition?.map((v) => v.uri) ?? []);
+    return (ctx.symbols.query(ctx.doc, category, core.ResourceLocation.lengthen(id)).symbol
+        ?.definition?.map((v) => v.uri) ?? []);
 }
 export function getTagValues(category, id, ctx) {
     const resolveValueNode = (node) => json.JsonStringNode.is(node)
         ? node.value
-        : node.children.find((n) => n.key?.value === 'id')
-            .value.value;
+        : node.children.find((n) => n.key?.value === 'id').value.value;
     const set = getUris(category, id, ctx).reduce((ans, uri) => {
         // const result = ctx.getDocAndNode(uri)
         const result = undefined; // FIXME: Use global symbol table to get the result
-        if (!result ||
-            result.node.parserErrors.length ||
-            result.node.checkerErrors?.length) {
+        if (!result || result.node.parserErrors.length || result.node.checkerErrors?.length) {
             return ans;
         }
         // No errors in the node. We can assume it is a semantically correct tag file.
         const rootNode = result.node.children[0];
         const replaceNode = rootNode.children.find((n) => n.key?.value === 'replace')?.value;
-        const valuesNode = rootNode.children.find((n) => n.key?.value === 'values')?.value;
+        const valuesNode = rootNode.children.find((n) => n.key?.value === 'values')
+            ?.value;
         const replace = replaceNode?.value;
         const values = valuesNode.children.map((n) => core.ResourceLocation.lengthen(resolveValueNode(n.value)));
         if (replace) {

package/lib/dependency/common.d.ts

@@ -7,6 +7,11 @@ export declare namespace ReleaseVersion {
      * * `1` if `a` is newer than `b`.
      */
     function cmp(a: ReleaseVersion, b: ReleaseVersion): number;
+    /**
+     * @returns `true` if `version` is newer than `since` (inclusive) and older
+     * than `until` (exclusive)
+     */
+    function isBetween(version: ReleaseVersion, since: ReleaseVersion, until: ReleaseVersion): boolean;
 }
 export interface VersionInfo {
     release: ReleaseVersion;

package/lib/dependency/common.js

@@ -10,6 +10,14 @@ export var ReleaseVersion;
         return Math.sign(Number(a.slice(2)) - Number(b.slice(2)));
     }
     ReleaseVersion.cmp = cmp;
+    /**
+     * @returns `true` if `version` is newer than `since` (inclusive) and older
+     * than `until` (exclusive)
+     */
+    function isBetween(version, since, until) {
+        return cmp(version, since) >= 0 && cmp(version, until) < 0;
+    }
+    ReleaseVersion.isBetween = isBetween;
 })(ReleaseVersion || (ReleaseVersion = {}));
 export var PackMcmeta;
 (function (PackMcmeta) {

package/lib/dependency/index.js

@@ -2,6 +2,7 @@ export * from './common.js';
 export * from './mcmeta.js';
 import * as core from '@spyglassmc/core';
 import { Fluids, getMcmetaSummaryUris } from './mcmeta.js';
+// Memory cache TTL in milliseconds
 const DownloaderTtl = 15_000;
 /* istanbul ignore next */
 /**
@@ -70,16 +71,11 @@ export async function getMcmetaSummary(externals, downloader, logger, version, i
     ];
     return { blocks, commands, fluids, registries, checksum };
 }
-function getGitRef({ defaultBranch, getTag, isLatest, version, }) {
-    return isLatest
-        ? `refs/heads/${defaultBranch}`
-        : `refs/tags/${getTag(version)}`;
+function getGitRef({ defaultBranch, getTag, isLatest, version }) {
+    return isLatest ? `refs/heads/${defaultBranch}` : `refs/tags/${getTag(version)}`;
 }
 const GitHubApiDownloadOptions = {
-    headers: {
-        Accept: 'application/vnd.github.v3+json',
-        'User-Agent': 'SpyglassMC',
-    },
+    headers: { Accept: 'application/vnd.github.v3+json', 'User-Agent': 'SpyglassMC' },
 };
 function getCacheOptionsBasedOnGitHubCommitSha(owner, repo, ref) {
     return {
@@ -111,7 +107,7 @@ function getCacheOptionsBasedOnGitHubCommitSha(owner, repo, ref) {
  *
  * @returns The URI to the `.tar.gz` file.
  */
-async function downloadGitHubRepo({ defaultBranch, downloader, getTag, repo, isLatest, owner, version, }) {
+async function downloadGitHubRepo({ defaultBranch, downloader, getTag, repo, isLatest, owner, version }) {
     const ref = getGitRef({ defaultBranch, getTag, isLatest, version });
     const out = {};
     await downloader.download({
@@ -142,10 +138,7 @@ export async function getVanillaDatapack(downloader, version, isLatest) {
         isLatest,
         version,
     });
-    return {
-        info: { startDepth: 1 },
-        uri,
-    };
+    return { info: { startDepth: 1 }, uri };
 }
 /**
  * @throws Network/file system errors.
@@ -167,9 +160,6 @@ export async function getVanillaMcdoc(downloader) {
         options: GitHubApiDownloadOptions,
         ttl: DownloaderTtl,
     }, out);
-    return {
-        info: { startDepth: 1 },
-        uri: out.cacheUri,
-    };
+    return { info: { startDepth: 1 }, uri: out.cacheUri };
 }
 //# sourceMappingURL=index.js.map

package/lib/dependency/mcmeta.d.ts

@@ -3,10 +3,7 @@ import type { PackMcmeta, VersionInfo } from './common.js';
 /**
  * @param inputVersion {@link core.Config.env.gameVersion}
  */
-export declare function resolveConfiguredVersion(inputVersion: string, { packMcmeta, versions, }: {
-    packMcmeta: PackMcmeta | undefined;
-    versions: McmetaVersions;
-}): VersionInfo;
+export declare function resolveConfiguredVersion(inputVersion: string, versions: McmetaVersions, getPackMcmeta: () => Promise<PackMcmeta | undefined>): Promise<VersionInfo>;
 export declare function getMcmetaSummaryUris(version: string, isLatest: boolean, source: string): {
     blocks: core.RemoteUriString;
     commands: core.RemoteUriString;
@@ -36,14 +33,11 @@ export interface McmetaSummary {
     registries: McmetaRegistries;
 }
 export interface McmetaStates {
-    [id: string]: [
-        {
-            [name: string]: string[];
-        },
-        {
-            [name: string]: string;
-        }
-    ];
+    [id: string]: [{
+        [name: string]: string[];
+    }, {
+        [name: string]: string;
+    }];
 }
 export type McmetaCommands = RootTreeNode;
 interface BaseTreeNode {