Add the basics of a MinecraftVersion class

src/classes/minecraftVersions.ts

@@ -1,10 +1,14 @@
 import {
   MinecraftVersionId,
+  MinecraftVersionTarget,
+  NumericMinecraftVersion,
   SingleMinecraftVersionSpecifier,
+  getLatestVersion,
   getVersionManifest,
+  resolveMinecraftVersionId,
   resolveSingleMinecraftVersionSpecifier,
 } from "../helpers/minecraftHelpers.js"
-import { StartAndEnd } from "../helpers/util.js"
+import { PromiseMaybe, StartAndEnd, fromPromiseMaybe } from "../helpers/util.js"
 
 export type MinecraftVersionFancyRangeTemplate = {
   start?: MinecraftVersionId
@@ -156,3 +160,34 @@ export class MinecraftVersionRange {
     this.exclusiveEnd = template.exclusiveEnd
   }
 }
+
+export type MinecraftVersionTemplate =
+  | MinecraftVersionId
+  | MinecraftVersionTarget
+  | NumericMinecraftVersion
+
+abstract class MinecraftVersionResolvable {
+  abstract getPossiblyValidId: () => PromiseMaybe<string>
+
+  async getId() {
+    const possiblyValidId = await fromPromiseMaybe(this.getPossiblyValidId())
+
+    // We use resolveMinecraftVersionId() to throw if the version ID is invalid
+    return resolveMinecraftVersionId(possiblyValidId)
+  }
+}
+
+// This class is WIP. In the future it will replace raw version IDs.
+class MinecraftVersion extends MinecraftVersionResolvable {
+  id
+
+  getPossiblyValidId() {
+    //
+    return resolveMinecraftVersionId(this.id)
+  }
+
+  constructor(id: MinecraftVersionId) {
+    super()
+    this.id = id
+  }
+}

src/helpers/util.ts

@@ -3,6 +3,8 @@ import { Response } from "node-fetch"
 import { mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises"
 import path from "node:path"
 
+/** Might be the value itself, or a promise that resolves to that value */
+export type PromiseMaybe<T> = T | Promise<T>
 /** Makes the provided keys (K) of the object (T) optional */
 export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>
 /** Specify a value, or provide a function that returns that value */
@@ -36,12 +38,12 @@ export type Range<T> = StartAndEnd<T> | FancyRange<T>
 export type SearchValue = string | RegExp
 
 export interface ResolvableAny<T, A extends any[] = []> {
-  resolve(...args: A): T | Promise<T>
+  resolve(...args: A): PromiseMaybe<T>
   sync?: boolean
 }
 export interface ResolvableAsync<T, A extends any[] = []>
   extends ResolvableAny<T, A> {
-  resolve(...args: A): T | Promise<T>
+  resolve(...args: A): PromiseMaybe<T>
   sync?: false
 }
 export interface ResolvableSync<T, A extends any[] = []>
@@ -58,6 +60,10 @@ export function isSimpleRange<T>(
   return typeof specifier[0] !== "object" || specifier[0] === null
 }
 
+export async function fromPromiseMaybe<T>(promiseMaybe: PromiseMaybe<T>) {
+  return promiseMaybe instanceof Promise ? await promiseMaybe : promiseMaybe
+}
+
 /* DATA MANIPULATION */
 
 export type RecordLike<K extends string | number | symbol, T> =

src/main.ts

@@ -69,10 +69,6 @@ const targetVersions = new MinecraftVersionRange({
 const targetLanguages = ["en_us", "en_gb"]
 
 try {
-  // const range = new MinecraftVersionRange([null, null])
-  // const allVersions = await range.getVersionIds()
-  // debugger
-
   commandLineArg === "--stats"
     ? await printStats(getStatsFilter())
     : await buildPack()