@spyglassmc/java-edition 0.1.1 → 0.1.2

package/lib/binder/index.d.ts

@@ -2,8 +2,8 @@ import type { ContextBase, FileCategory, RootUriString, UriBinder } from '@spygl
 export declare const Categories: Map<string, {
     category: FileCategory;
     extname: string;
-    since?: `1.${bigint}` | undefined;
-    until?: `1.${bigint}` | undefined;
+    since?: `1.${number}` | undefined;
+    until?: `1.${number}` | undefined;
 }>;
 export declare function getRels(uri: string, rootUris: readonly RootUriString[]): Generator<string, undefined, unknown>;
 export declare function dissectUri(uri: string, ctx: ContextBase): {

package/lib/binder/index.js

@@ -93,9 +93,9 @@ const uriBinder = (uris, ctx) => {
 };
 exports.uriBinder = uriBinder;
 function matchVersion(target, since, until) {
-    if (since && dependency_1.MajorVersion.cmp(target, since) < 0)
+    if (since && dependency_1.ReleaseVersion.cmp(target, since) < 0)
         return false;
-    if (until && dependency_1.MajorVersion.cmp(until, target) < 0)
+    if (until && dependency_1.ReleaseVersion.cmp(until, target) < 0)
         return false;
     return true;
 }

package/lib/common/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/dependency/common.d.ts

@@ -1,20 +1,23 @@
-export declare type MajorVersion = `1.${bigint}`;
-export declare namespace MajorVersion {
+export declare type ReleaseVersion = `1.${number}`;
+export declare namespace ReleaseVersion {
     /**
      * @returns
      * * `-1` if `a` is older than `b`.
      * * `0` if `a` is the same as `b`.
      * * `1` if `a` is newer than `b`.
      */
-    function cmp(a: MajorVersion, b: MajorVersion): number;
+    function cmp(a: ReleaseVersion, b: ReleaseVersion): number;
 }
 export interface VersionInfo {
-    major: MajorVersion;
+    release: ReleaseVersion;
     id: string;
     name: string;
     isLatest: boolean;
 }
-export declare const PackVersionMap: Record<number, MajorVersion | undefined>;
+/**
+ * A map from `pack_format` numbers to a RegExp. The latest version whose `release_target` matches the RegExp should be used.
+ */
+export declare const PackVersionMap: Record<number, RegExp | undefined>;
 export interface PackMcmeta {
     pack: {
         pack_format: number;

package/lib/dependency/common.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PackMcmeta = exports.PackVersionMap = exports.MajorVersion = void 0;
-var MajorVersion;
-(function (MajorVersion) {
+exports.PackMcmeta = exports.PackVersionMap = exports.ReleaseVersion = void 0;
+var ReleaseVersion;
+(function (ReleaseVersion) {
     /**
      * @returns
      * * `-1` if `a` is older than `b`.
@@ -10,18 +10,21 @@ var MajorVersion;
      * * `1` if `a` is newer than `b`.
      */
     function cmp(a, b) {
-        return Math.sign(Number(a) - Number(b));
+        return Math.sign(Number(a.slice(2)) - Number(b.slice(2)));
     }
-    MajorVersion.cmp = cmp;
-})(MajorVersion = exports.MajorVersion || (exports.MajorVersion = {}));
+    ReleaseVersion.cmp = cmp;
+})(ReleaseVersion = exports.ReleaseVersion || (exports.ReleaseVersion = {}));
 // DOCS: Update here when format_version is changed.
+/**
+ * A map from `pack_format` numbers to a RegExp. The latest version whose `release_target` matches the RegExp should be used.
+ */
 exports.PackVersionMap = {
-    5: '1.15',
-    6: '1.16',
-    7: '1.17',
-    8: '1.18',
-    9: '1.18',
-    10: '1.19',
+    5: /^1\.15.*$/,
+    6: /^1\.16.*$/,
+    7: /^1\.17.*$/,
+    8: /^1\.18(\.1)?$/,
+    9: /^1\.18.*$/,
+    10: /^1\.19.*$/,
 };
 var PackMcmeta;
 (function (PackMcmeta) {

package/lib/dependency/index.d.ts

@@ -26,5 +26,5 @@ export declare function getMcmetaSummary(downloader: core.Downloader, logger: co
  * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
  * 	- `uri`: URI to the `.tar.gz` file.
  */
-export declare function getMcNbtdoc(downloader: core.Downloader, version: string, isLatest: boolean): Promise<core.Dependency>;
+export declare function getVanillaMcdoc(downloader: core.Downloader, version: string, isLatest: boolean): Promise<core.Dependency>;
 //# sourceMappingURL=index.d.ts.map

package/lib/dependency/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -22,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMcNbtdoc = exports.getMcmetaSummary = exports.getVersions = void 0;
+exports.getVanillaMcdoc = exports.getMcmetaSummary = exports.getVersions = void 0;
 __exportStar(require("./common"), exports);
 __exportStar(require("./mcmeta"), exports);
 const core = __importStar(require("@spyglassmc/core"));
@@ -154,19 +158,19 @@ async function downloadGitHubRepo({ defaultBranch, downloader, getTag, repo, isL
  * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
  * 	- `uri`: URI to the `.tar.gz` file.
  */
-async function getMcNbtdoc(downloader, version, isLatest) {
+async function getVanillaMcdoc(downloader, version, isLatest) {
     return {
         info: { startDepth: 1 },
         uri: await downloadGitHubRepo({
-            defaultBranch: 'master',
+            defaultBranch: 'main',
             downloader,
             getTag: v => v,
             isLatest,
-            owner: 'Yurihaia',
-            repo: 'mc-nbtdoc',
+            owner: 'SpyglassMC',
+            repo: 'vanila-mcdoc',
             version,
         }),
     };
 }
-exports.getMcNbtdoc = getMcNbtdoc;
+exports.getVanillaMcdoc = getVanillaMcdoc;
 //# sourceMappingURL=index.js.map

package/lib/dependency/mcmeta.d.ts

@@ -1,6 +1,5 @@
 import * as core from '@spyglassmc/core';
-import type { MajorVersion, PackMcmeta, VersionInfo } from './common';
-export declare function getMajorVersion(version: McmetaVersion): MajorVersion;
+import type { PackMcmeta, VersionInfo } from './common';
 /**
  * @param inputVersion {@link Config.env.gameVersion}
  */

package/lib/dependency/mcmeta.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -19,14 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Fluids = exports.symbolRegistrar = exports.getMcmetaSummaryUris = exports.resolveConfiguredVersion = exports.getMajorVersion = void 0;
+exports.Fluids = exports.symbolRegistrar = exports.getMcmetaSummaryUris = exports.resolveConfiguredVersion = void 0;
 const core = __importStar(require("@spyglassmc/core"));
 const common_1 = require("./common");
-function getMajorVersion(version) {
-    const dotIndex = version.release_target.indexOf('.', 2);
-    return (dotIndex > 2 ? version.release_target.slice(0, dotIndex) : version.release_target);
-}
-exports.getMajorVersion = getMajorVersion;
 /**
  * @param inputVersion {@link Config.env.gameVersion}
  */
@@ -39,7 +38,7 @@ function resolveConfiguredVersion(inputVersion, { packMcmeta, versions }) {
         return {
             id: version.id,
             name: version.name,
-            major: getMajorVersion(version),
+            release: version.release_target,
             isLatest: index === 0,
         };
     }
@@ -50,9 +49,9 @@ function resolveConfiguredVersion(inputVersion, { packMcmeta, versions }) {
     versions = versions.sort((a, b) => b.data_version - a.data_version);
     if (inputVersion === 'auto') {
         if (packMcmeta) {
-            const major = common_1.PackVersionMap[packMcmeta.pack.pack_format];
-            if (major) {
-                return toVersionInfo(versions.findIndex(v => getMajorVersion(v) === major));
+            const regex = common_1.PackVersionMap[packMcmeta.pack.pack_format];
+            if (regex) {
+                return toVersionInfo(versions.findIndex(v => regex.test(v.release_target)));
             }
         }
         return toVersionInfo(0);
@@ -66,12 +65,24 @@ function resolveConfiguredVersion(inputVersion, { packMcmeta, versions }) {
     return toVersionInfo(versions.findIndex(v => inputVersion === v.id.toLowerCase() || inputVersion === v.name.toLowerCase()));
 }
 exports.resolveConfiguredVersion = resolveConfiguredVersion;
+const DataSources = {
+    fastly: 'https://fastly.jsdelivr.net/gh/${user}/${repo}@${tag}/${path}',
+    github: 'https://raw.githubusercontent.com/${user}/${repo}/${tag}/${path}',
+    jsdelivr: 'https://cdn.jsdelivr.net/gh/${user}/${repo}@${tag}/${path}',
+};
 function getMcmetaSummaryUris(version, isLatest, source) {
     const tag = isLatest ? 'summary' : `${version}-summary`;
     function getUri(path) {
-        return source.toLowerCase() === 'jsdelivr'
-            ? `https://cdn.jsdelivr.net/gh/misode/mcmeta@${tag}/${path}`
-            : `https://raw.githubusercontent.com/misode/mcmeta/${tag}/${path}`;
+        const template = DataSources[source.toLowerCase()] ?? source;
+        const ans = template
+            .replace(/\${user}/g, 'misode')
+            .replace(/\${repo}/g, 'mcmeta')
+            .replace(/\${tag}/g, tag)
+            .replace(/\${path}/g, path);
+        if (!core.RemoteUriString.is(ans)) {
+            throw new Error(`Expected a remote URI from data source template but got ${ans}`);
+        }
+        return ans;
     }
     return {
         blocks: getUri('blocks/data.json.gz'),
@@ -82,16 +93,13 @@ function getMcmetaSummaryUris(version, isLatest, source) {
 exports.getMcmetaSummaryUris = getMcmetaSummaryUris;
 function symbolRegistrar(summary) {
     const McmetaSummaryUri = 'mcmeta://summary/registries.json';
-    const SoundsBaseUri = 'https://misode.github.io/sounds/';
-    const WikiBaseUri = 'https://minecraft.fandom.com/wiki/';
-    const getWikiPageName = (id) => id === 'empty' ? 'Air' : id.split('_').map(v => `${v.charAt(0).toUpperCase()}${v.slice(1)}`).join('_');
     /**
      * Add states of blocks or fluids to the symbol table.
      */
     function addStatesSymbols(category, states, symbols) {
         const capitalizedCategory = `${category[0].toUpperCase()}${category.slice(1)}`;
         for (const [id, [properties, defaults]] of Object.entries(states)) {
-            const uri = `${WikiBaseUri}${getWikiPageName(id)}`;
+            const uri = McmetaSummaryUri;
             symbols
                 .query(uri, category, core.ResourceLocation.lengthen(id))
                 .onEach(Object.entries(properties), ([state, values], blockQuery) => {
@@ -127,62 +135,11 @@ function symbolRegistrar(summary) {
         function isCategory(str) {
             return (core.FileCategories.includes(str) || core.RegistryCategories.includes(str));
         }
-        const getUri = (registryId, entryId) => {
-            /* istanbul ignore next */
-            switch (registryId) {
-                case 'attribute':
-                    return `${WikiBaseUri}Attribute#Attributes`;
-                case 'block':
-                case 'enchantment':
-                case 'entity_type':
-                case 'fluid':
-                case 'item':
-                case 'mob_effect':
-                    return `${WikiBaseUri}${getWikiPageName(entryId)}`;
-                case 'block_entity_type':
-                    return `${WikiBaseUri}${getWikiPageName(entryId)}#Block_data`;
-                case 'custom_stat':
-                    return `${WikiBaseUri}Statistics#List_of_custom_statistic_names`;
-                case 'game_event':
-                    return `${WikiBaseUri}Game_event`;
-                case 'loot_condition_type':
-                    return `${WikiBaseUri}Predicate#JSON_structure`;
-                case 'loot_function_type':
-                    return `${WikiBaseUri}Item_modifier#JSON_structure`;
-                case 'loot_number_provider_type':
-                case 'loot_score_provider_type':
-                    return `${WikiBaseUri}Loot_table#Number_Providers`;
-                case 'loot_pool_entry_type':
-                    return `${WikiBaseUri}Loot_table#Tags`;
-                case 'motive':
-                    return `${WikiBaseUri}Painting#Canvases`;
-                case 'potion':
-                    return `${WikiBaseUri}Potion#Item_data`;
-                case 'particle_type':
-                    return `${WikiBaseUri}Java_Edition_data_values#Particles`;
-                case 'recipe_serializer':
-                    return `${WikiBaseUri}Recipe#${entryId}`;
-                case 'sound_event':
-                    return `${SoundsBaseUri}?sound=${entryId}`;
-                case 'stat_type':
-                    return `${WikiBaseUri}Statistics#Statistic_types_and_names`;
-                case 'villager_profession':
-                    return `${WikiBaseUri}Villager#Villager_profession`;
-                case 'villager_type':
-                    return `${WikiBaseUri}Villager#Villager_type`;
-                case 'worldgen/biome_source':
-                    return `${WikiBaseUri}Java_Edition_data_values#Biome_sources`;
-                case 'worldgen/chunk_generator':
-                    return `${WikiBaseUri}Java_Edition_data_values#Chunk_generators`;
-                default:
-                    return McmetaSummaryUri;
-            }
-        };
         for (const [registryId, registry] of Object.entries(registries)) {
             if (isCategory(registryId)) {
                 for (const entryId of registry) {
                     symbols
-                        .query(getUri(registryId, entryId), registryId, core.ResourceLocation.lengthen(entryId))
+                        .query(McmetaSummaryUri, registryId, core.ResourceLocation.lengthen(entryId))
                         .enter({ usage: { type: 'declaration' } });
                 }
             }

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -21,8 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initialize = exports.mcf = exports.json = exports.dependency = void 0;
 const core = __importStar(require("@spyglassmc/core"));
+const mcdoc = __importStar(require("@spyglassmc/mcdoc"));
 const nbt = __importStar(require("@spyglassmc/nbt"));
-const nbtdoc = __importStar(require("@spyglassmc/nbtdoc"));
 const binder_1 = require("./binder");
 const dependency_1 = require("./dependency");
 const jeJson = __importStar(require("./json"));
@@ -55,8 +59,8 @@ const initialize = async (ctx) => {
         return;
     }
     const packMcmeta = await getPackMcmeta();
-    const { major, id: version, isLatest } = (0, dependency_1.resolveConfiguredVersion)(config.env.gameVersion, { packMcmeta, versions });
-    meta.registerDependencyProvider('@mc-nbtdoc', () => (0, dependency_1.getMcNbtdoc)(downloader, version, isLatest));
+    const { release, id: version, isLatest } = (0, dependency_1.resolveConfiguredVersion)(config.env.gameVersion, { packMcmeta, versions });
+    meta.registerDependencyProvider('@vanilla-mcdoc', () => (0, dependency_1.getVanillaMcdoc)(downloader, version, isLatest));
     const summary = await (0, dependency_1.getMcmetaSummary)(downloader, logger, version, isLatest, config.env.dataSource, config.env.mcmetaSummaryOverrides);
     if (!summary.blocks || !summary.commands || !summary.fluids || !summary.registries) {
         ctx.logger.error('[je-initialize] Failed loading mcmeta summaries. Expect everything to be broken.');
@@ -70,18 +74,18 @@ const initialize = async (ctx) => {
         configValidator: core.linter.configValidator.nameConvention,
         linter: core.linter.nameConvention('value'),
         nodePredicate: n => (
-        // nbt compound keys without nbtdoc definition.
+        // nbt compound keys without mcdoc definition.
         (!n.symbol && n.parent?.parent?.type === 'nbt:compound' && core.PairNode.is(n.parent) && n.type === 'string' && n.parent.key === n) ||
-            // nbt path keys without nbtdoc definition.
+            // nbt path keys without mcdoc definition.
             (!n.symbol && n.parent?.type === 'nbt:path' && n.type === 'string') ||
-            // nbtdoc compound key definition outside of `::minecraft` modules.
-            (nbtdoc.CompoundFieldNode.is(n.parent) && nbtdoc.CompoundFieldKey.is(n) && !n.symbol?.path[0]?.startsWith('::minecraft'))),
+            // mcdoc compound key definition outside of `::minecraft` modules.
+            (mcdoc.StructFieldNode.is(n.parent) && mcdoc.StructKeyNode.is(n) && !n.symbol?.path[0]?.startsWith('::minecraft'))),
     });
     jeJson.initialize(ctx);
-    jeMcf.initialize(ctx, summary.commands, major);
+    jeMcf.initialize(ctx, summary.commands, release);
     nbt.initialize(ctx);
     return {
-        loadedVersion: major,
+        loadedVersion: release,
     };
 };
 exports.initialize = initialize;

package/lib/json/checker/data/common.d.ts

@@ -13,7 +13,7 @@ export declare const vertical_anchor: JsonChecker;
 export declare const height_provider: JsonChecker;
 export declare const floatProvider: (min?: number | undefined, max?: number | undefined) => JsonChecker;
 export declare const intProvider: (min?: number | undefined, max?: number | undefined) => JsonChecker;
-export declare const uniformInt: (min?: number | undefined, max?: number | undefined, maxSpread?: number | undefined) => JsonChecker;
+export declare const uniformInt: (min?: number, max?: number, maxSpread?: number) => JsonChecker;
 export declare const inclusiveRange: (min?: number | undefined, max?: number | undefined) => JsonChecker;
 export declare const noise_parameters: JsonChecker;
 export declare const HeightmapType: string[];

package/lib/json/checker/data/tag.js

@@ -26,7 +26,7 @@ const tag = (type) => (0, primitives_1.record)({
             }
             return [undefined, node];
         },
-        report: (node, ctx) => ctx.err.report((0, lib_2.localize)('json.checker.tag-entry.duplicate'), node, 2 /* Warning */),
+        report: (node, ctx) => ctx.err.report((0, lib_2.localize)('json.checker.tag-entry.duplicate'), node, 2 /* ErrorSeverity.Warning */),
     }),
 });
 exports.block_tag = tag('block');

package/lib/json/checker/util/block_states.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/json/checker/util/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/json/checker/util/nbt.d.ts

@@ -1,10 +1,9 @@
 import type { JsonChecker } from '@spyglassmc/json/lib/checker/JsonChecker';
-import type { ExtendableRootRegistry } from '@spyglassmc/nbtdoc';
 interface DefinitionOptions {
     definition: `::${string}::${string}`;
 }
 interface RegistryOptions {
-    registry: ExtendableRootRegistry;
+    registry: string;
     id?: string | undefined;
     idOrTag?: string | undefined;
     ids?: readonly string[] | undefined;

package/lib/json/checker/util/version.d.ts

@@ -1,17 +1,17 @@
 import type { JsonChecker, JsonCheckerContext, record } from '@spyglassmc/json/lib/checker';
-import { MajorVersion } from '../../../dependency';
+import { ReleaseVersion } from '../../../dependency';
 declare type CheckerRecord = Parameters<typeof record>[0];
-export declare function versioned(ctx: JsonCheckerContext, version: MajorVersion, checker: string[]): string[];
-export declare function versioned(ctx: JsonCheckerContext, version: MajorVersion, checker: JsonChecker | undefined): JsonChecker | undefined;
-export declare function versioned(ctx: JsonCheckerContext, version: MajorVersion, checker: CheckerRecord | undefined): CheckerRecord | undefined;
-export declare function versioned(ctx: JsonCheckerContext, checker: string[], version: MajorVersion): string[];
-export declare function versioned(ctx: JsonCheckerContext, checker: JsonChecker | undefined, version: MajorVersion): JsonChecker | undefined;
-export declare function versioned(ctx: JsonCheckerContext, checker: CheckerRecord | undefined, version: MajorVersion): CheckerRecord | undefined;
-export declare function versioned(ctx: JsonCheckerContext, checker: string[], version: MajorVersion, checker2: string[]): string[];
-export declare function versioned(ctx: JsonCheckerContext, checker: JsonChecker, version: MajorVersion, checker2: JsonChecker): JsonChecker;
-export declare function versioned(ctx: JsonCheckerContext, checker: CheckerRecord, version: MajorVersion, checker2: CheckerRecord): CheckerRecord;
-export declare function renamed(ctx: JsonCheckerContext, from: string, version: MajorVersion, to: string, checker: JsonChecker): CheckerRecord | undefined;
-export declare function deprecated(ctx: JsonCheckerContext, version: MajorVersion, checker: JsonChecker | undefined): JsonChecker | {
+export declare function versioned(ctx: JsonCheckerContext, version: ReleaseVersion, checker: string[]): string[];
+export declare function versioned(ctx: JsonCheckerContext, version: ReleaseVersion, checker: JsonChecker | undefined): JsonChecker | undefined;
+export declare function versioned(ctx: JsonCheckerContext, version: ReleaseVersion, checker: CheckerRecord | undefined): CheckerRecord | undefined;
+export declare function versioned(ctx: JsonCheckerContext, checker: string[], version: ReleaseVersion): string[];
+export declare function versioned(ctx: JsonCheckerContext, checker: JsonChecker | undefined, version: ReleaseVersion): JsonChecker | undefined;
+export declare function versioned(ctx: JsonCheckerContext, checker: CheckerRecord | undefined, version: ReleaseVersion): CheckerRecord | undefined;
+export declare function versioned(ctx: JsonCheckerContext, checker: string[], version: ReleaseVersion, checker2: string[]): string[];
+export declare function versioned(ctx: JsonCheckerContext, checker: JsonChecker, version: ReleaseVersion, checker2: JsonChecker): JsonChecker;
+export declare function versioned(ctx: JsonCheckerContext, checker: CheckerRecord, version: ReleaseVersion, checker2: CheckerRecord): CheckerRecord;
+export declare function renamed(ctx: JsonCheckerContext, from: string, version: ReleaseVersion, to: string, checker: JsonChecker): CheckerRecord | undefined;
+export declare function deprecated(ctx: JsonCheckerContext, version: ReleaseVersion, checker: JsonChecker | undefined): JsonChecker | {
     checker: JsonChecker;
     opt?: boolean | undefined;
     def?: (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | any | {

package/lib/json/checker/util/version.js

@@ -7,7 +7,7 @@ function getVersion(ctx) {
     return ctx.project['loadedVersion'];
 }
 function cmpVersion(ctx, target) {
-    return dependency_1.MajorVersion.cmp(getVersion(ctx), target);
+    return dependency_1.ReleaseVersion.cmp(getVersion(ctx), target);
 }
 function versioned(ctx, arg1, arg2, arg3) {
     if (typeof arg1 === 'string') {

package/lib/json/index.js

@@ -2,7 +2,11 @@
 /* istanbul ignore file */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];