@sandstone-mc/mcdoc-ts-generator 0.1.4 → 0.1.6

package/dist/cli.js

@@ -28,6 +28,8 @@ function pascal_case(name) {
   return words.map((word) => word[0].toUpperCase() + word.slice(1)).join("");
 }
 function pluralize(name) {
+  if (name.endsWith("ey"))
+    return name + "s";
   if (name.endsWith("y"))
     return name.slice(0, -1) + "ies";
   if (name.endsWith("s") || name.endsWith("ch") || name.endsWith("sh") || name.endsWith("x") || name.endsWith("z"))
@@ -1803,15 +1805,12 @@ function mcdoc_string(type) {
     }).with({ name: "time_pattern" }, () => {
       return (args) => static_value3.time;
     }).with({ name: "translation_key" }, () => {
-      const TRANSLATION_KEYS = "TRANSLATION_KEYS";
-      const LiteralUnion = "LiteralUnion";
+      const Registry = "::java::registry::Registry";
       return (args) => ({
-        type: factory17.createTypeReferenceNode(LiteralUnion, [
-          factory17.createTypeReferenceNode(TRANSLATION_KEYS)
-        ]),
+        type: factory17.createIndexedAccessTypeNode(factory17.createTypeReferenceNode("Registry"), Bind.StringLiteral("minecraft:translation_key")),
         imports: {
-          ordered: [`sandstone::arguments::${TRANSLATION_KEYS}`, `sandstone::${LiteralUnion}`],
-          check: new Map([[`sandstone::arguments::${TRANSLATION_KEYS}`, 0], [`sandstone::${LiteralUnion}`, 1]])
+          ordered: [Registry],
+          check: new Map([[Registry, 0]])
         }
       });
     }).with({ name: "translation_value" }, () => {
@@ -2543,10 +2542,13 @@ function dispatcher_symbol(id, name, members, dispatcher_properties, module_map,
 var DispatcherSymbol = dispatcher_symbol;
 
 // src/typegen/export.ts
+import { TaggableResourceLocationCategories } from "@spyglassmc/core";
 import ts25 from "typescript";
 var { factory: factory24 } = ts25;
 function export_registry(resolved_registries) {
   let imports;
+  imports = add_import(imports, "sandstone::Set");
+  imports = add_import(imports, "sandstone::SetType");
   const properties = [];
   for (const [registry_name, { import_path, registry }] of resolved_registries) {
     imports = add_import(imports, import_path);
@@ -2554,8 +2556,10 @@ function export_registry(resolved_registries) {
     properties.push(factory24.createPropertySignature(undefined, factory24.createStringLiteral(registry_id), undefined, factory24.createTypeReferenceNode(registry)));
   }
   const registry_type = factory24.createTypeAliasDeclaration([factory24.createToken(ts25.SyntaxKind.ExportKeyword)], "Registry", undefined, factory24.createTypeLiteralNode(properties));
+  const registries_set = factory24.createVariableStatement([factory24.createToken(ts25.SyntaxKind.ExportKeyword)], factory24.createVariableDeclarationList([factory24.createVariableDeclaration("REGISTRIES_SET", undefined, undefined, factory24.createNewExpression(factory24.createIdentifier("Set"), undefined, [factory24.createAsExpression(factory24.createArrayLiteralExpression(TaggableResourceLocationCategories.map((category) => factory24.createStringLiteral(category, true)), true), factory24.createTypeReferenceNode("const"))]))], ts25.NodeFlags.Const));
+  const registries_type = factory24.createTypeAliasDeclaration([factory24.createToken(ts25.SyntaxKind.ExportKeyword)], "REGISTRIES", undefined, factory24.createTypeReferenceNode("SetType", [factory24.createTypeQueryNode(factory24.createIdentifier("REGISTRIES_SET"))]));
   return {
-    exports: [registry_type],
+    exports: [registry_type, registries_set, registries_type],
     paths: new Set,
     ...add({ imports })
   };
@@ -2632,9 +2636,9 @@ class TypesGenerator {
   resolved_symbols = new Map;
   resolved_dispatchers = new Map;
   constructor() {}
-  resolve_types(symbols) {
+  resolve_types(symbols, translation_keys) {
     console.log("registries");
-    this.resolve_registry_symbols(symbols);
+    this.resolve_registry_symbols(symbols, translation_keys);
     const registry_exports = export_registry(this.resolved_registries);
     this.resolved_symbols.set("::java::registry", registry_exports);
     const dispatchers = symbols.getVisibleSymbols("mcdoc/dispatcher");
@@ -2651,12 +2655,12 @@ class TypesGenerator {
     const dispatcher_exports = export_dispatcher(this.resolved_dispatchers);
     this.resolved_symbols.set("mcdoc::dispatcher", dispatcher_exports);
   }
-  resolve_registry_symbols(registries) {
-    for (const registry_name of AllCategories) {
+  resolve_registry_symbols(registries, translation_keys) {
+    for (const registry_name of [...AllCategories]) {
       if (registry_name === "mcdoc" || registry_name === "mcdoc/dispatcher") {
         continue;
       }
-      const registry = Object.keys(registries.getVisibleSymbols(registry_name));
+      const registry = registry_name === "translation_key" ? translation_keys : Object.keys(registries.getVisibleSymbols(registry_name));
       if (registry.length === 0)
         continue;
       const type_name = pluralize(registry_name.split("/").join("_")).toUpperCase();
@@ -2881,7 +2885,13 @@ function handle_imports(imports) {
     } else if (path[1] === "java") {
       file = `sandstone/arguments/generated/${path.slice(2).join("/")}.js`;
     } else if (path[0] === "sandstone") {
-      file = path.length === 1 ? "sandstone" : `${path.join("/")}.js`;
+      if (path.length === 1) {
+        file = "sandstone";
+      } else if (path[1] === "arguments" && path.length === 2) {
+        file = "sandstone/arguments";
+      } else {
+        file = `${path.join("/")}.js`;
+      }
     } else {
       throw new Error(`[mcdoc_import] Unsupported import location "${path[0]}" in "${import_path}"`);
     }
@@ -2979,6 +2989,18 @@ async function fetchBlockStates(versionId) {
   }
   return [result, etag];
 }
+async function fetchTranslationKeys() {
+  console.debug(`[fetchTranslationKeys] latest from github`);
+  const result = new Map;
+  try {
+    const req = await fetchWithCache(`https://raw.githubusercontent.com/misode/mcmeta/refs/heads/assets-tiny/assets/minecraft/lang/en_us.json`);
+    const data = await req.json();
+    return Object.keys(data).map((key) => `minecraft:${key}`);
+  } catch (e) {
+    console.warn("Error occurred while fetching translation keys:", errorMessage(e));
+  }
+  return [];
+}
 var VanillaMcdocUri = "mcdoc://vanilla-mcdoc/symbols.json";
 function vanillaMcdocRegistrar(vanillaMcdoc) {
   return (symbols) => {
@@ -3053,7 +3075,7 @@ async function generate(options = {}) {
   await service.project.ready();
   await service.project.cacheService.save();
   const type_gen = new TypesGenerator;
-  type_gen.resolve_types(service.project.symbols);
+  type_gen.resolve_types(service.project.symbols, await fetchTranslationKeys());
   for await (const [symbol_path, { exports, imports }] of type_gen.resolved_symbols.entries()) {
     const parts = symbol_path.split("::");
     if (parts[0] === "") {
@@ -3079,7 +3101,8 @@ async function generate(options = {}) {
         baseUrl: "./",
         paths: {
           sandstone: ["../sandstone-types/index.ts"],
-          "sandstone/arguments/generated/*": [`./*`]
+          "sandstone/arguments": ["../sandstone-types/arguments/index.ts"],
+          "sandstone/arguments/generated/*": ["./*"]
         }
       }
     }, null, 2));

package/dist/index.d.ts

@@ -14,4 +14,5 @@ export declare function fetchVanillaMcdoc(): Promise<VanillaMcdocSymbols>;
 export declare function fetchRegistries(versionId: string): Promise<readonly [Map<string, string[]>, string]>;
 export type BlockStateData = [Record<string, string[]>, Record<string, string>];
 export declare function fetchBlockStates(versionId: string): Promise<readonly [Map<string, BlockStateData>, string]>;
+export declare function fetchTranslationKeys(): Promise<string[]>;
 export declare function generate(options?: GeneratorOptions): Promise<void>;

package/dist/index.js

@@ -26,6 +26,8 @@ function pascal_case(name) {
   return words.map((word) => word[0].toUpperCase() + word.slice(1)).join("");
 }
 function pluralize(name) {
+  if (name.endsWith("ey"))
+    return name + "s";
   if (name.endsWith("y"))
     return name.slice(0, -1) + "ies";
   if (name.endsWith("s") || name.endsWith("ch") || name.endsWith("sh") || name.endsWith("x") || name.endsWith("z"))
@@ -1801,15 +1803,12 @@ function mcdoc_string(type) {
     }).with({ name: "time_pattern" }, () => {
       return (args) => static_value3.time;
     }).with({ name: "translation_key" }, () => {
-      const TRANSLATION_KEYS = "TRANSLATION_KEYS";
-      const LiteralUnion = "LiteralUnion";
+      const Registry = "::java::registry::Registry";
       return (args) => ({
-        type: factory17.createTypeReferenceNode(LiteralUnion, [
-          factory17.createTypeReferenceNode(TRANSLATION_KEYS)
-        ]),
+        type: factory17.createIndexedAccessTypeNode(factory17.createTypeReferenceNode("Registry"), Bind.StringLiteral("minecraft:translation_key")),
         imports: {
-          ordered: [`sandstone::arguments::${TRANSLATION_KEYS}`, `sandstone::${LiteralUnion}`],
-          check: new Map([[`sandstone::arguments::${TRANSLATION_KEYS}`, 0], [`sandstone::${LiteralUnion}`, 1]])
+          ordered: [Registry],
+          check: new Map([[Registry, 0]])
         }
       });
     }).with({ name: "translation_value" }, () => {
@@ -2541,10 +2540,13 @@ function dispatcher_symbol(id, name, members, dispatcher_properties, module_map,
 var DispatcherSymbol = dispatcher_symbol;
 
 // src/typegen/export.ts
+import { TaggableResourceLocationCategories } from "@spyglassmc/core";
 import ts25 from "typescript";
 var { factory: factory24 } = ts25;
 function export_registry(resolved_registries) {
   let imports;
+  imports = add_import(imports, "sandstone::Set");
+  imports = add_import(imports, "sandstone::SetType");
   const properties = [];
   for (const [registry_name, { import_path, registry }] of resolved_registries) {
     imports = add_import(imports, import_path);
@@ -2552,8 +2554,10 @@ function export_registry(resolved_registries) {
     properties.push(factory24.createPropertySignature(undefined, factory24.createStringLiteral(registry_id), undefined, factory24.createTypeReferenceNode(registry)));
   }
   const registry_type = factory24.createTypeAliasDeclaration([factory24.createToken(ts25.SyntaxKind.ExportKeyword)], "Registry", undefined, factory24.createTypeLiteralNode(properties));
+  const registries_set = factory24.createVariableStatement([factory24.createToken(ts25.SyntaxKind.ExportKeyword)], factory24.createVariableDeclarationList([factory24.createVariableDeclaration("REGISTRIES_SET", undefined, undefined, factory24.createNewExpression(factory24.createIdentifier("Set"), undefined, [factory24.createAsExpression(factory24.createArrayLiteralExpression(TaggableResourceLocationCategories.map((category) => factory24.createStringLiteral(category, true)), true), factory24.createTypeReferenceNode("const"))]))], ts25.NodeFlags.Const));
+  const registries_type = factory24.createTypeAliasDeclaration([factory24.createToken(ts25.SyntaxKind.ExportKeyword)], "REGISTRIES", undefined, factory24.createTypeReferenceNode("SetType", [factory24.createTypeQueryNode(factory24.createIdentifier("REGISTRIES_SET"))]));
   return {
-    exports: [registry_type],
+    exports: [registry_type, registries_set, registries_type],
     paths: new Set,
     ...add({ imports })
   };
@@ -2630,9 +2634,9 @@ class TypesGenerator {
   resolved_symbols = new Map;
   resolved_dispatchers = new Map;
   constructor() {}
-  resolve_types(symbols) {
+  resolve_types(symbols, translation_keys) {
     console.log("registries");
-    this.resolve_registry_symbols(symbols);
+    this.resolve_registry_symbols(symbols, translation_keys);
     const registry_exports = export_registry(this.resolved_registries);
     this.resolved_symbols.set("::java::registry", registry_exports);
     const dispatchers = symbols.getVisibleSymbols("mcdoc/dispatcher");
@@ -2649,12 +2653,12 @@ class TypesGenerator {
     const dispatcher_exports = export_dispatcher(this.resolved_dispatchers);
     this.resolved_symbols.set("mcdoc::dispatcher", dispatcher_exports);
   }
-  resolve_registry_symbols(registries) {
-    for (const registry_name of AllCategories) {
+  resolve_registry_symbols(registries, translation_keys) {
+    for (const registry_name of [...AllCategories]) {
       if (registry_name === "mcdoc" || registry_name === "mcdoc/dispatcher") {
         continue;
       }
-      const registry = Object.keys(registries.getVisibleSymbols(registry_name));
+      const registry = registry_name === "translation_key" ? translation_keys : Object.keys(registries.getVisibleSymbols(registry_name));
       if (registry.length === 0)
         continue;
       const type_name = pluralize(registry_name.split("/").join("_")).toUpperCase();
@@ -2879,7 +2883,13 @@ function handle_imports(imports) {
     } else if (path[1] === "java") {
       file = `sandstone/arguments/generated/${path.slice(2).join("/")}.js`;
     } else if (path[0] === "sandstone") {
-      file = path.length === 1 ? "sandstone" : `${path.join("/")}.js`;
+      if (path.length === 1) {
+        file = "sandstone";
+      } else if (path[1] === "arguments" && path.length === 2) {
+        file = "sandstone/arguments";
+      } else {
+        file = `${path.join("/")}.js`;
+      }
     } else {
       throw new Error(`[mcdoc_import] Unsupported import location "${path[0]}" in "${import_path}"`);
     }
@@ -2977,6 +2987,18 @@ async function fetchBlockStates(versionId) {
   }
   return [result, etag];
 }
+async function fetchTranslationKeys() {
+  console.debug(`[fetchTranslationKeys] latest from github`);
+  const result = new Map;
+  try {
+    const req = await fetchWithCache(`https://raw.githubusercontent.com/misode/mcmeta/refs/heads/assets-tiny/assets/minecraft/lang/en_us.json`);
+    const data = await req.json();
+    return Object.keys(data).map((key) => `minecraft:${key}`);
+  } catch (e) {
+    console.warn("Error occurred while fetching translation keys:", errorMessage(e));
+  }
+  return [];
+}
 var VanillaMcdocUri = "mcdoc://vanilla-mcdoc/symbols.json";
 function vanillaMcdocRegistrar(vanillaMcdoc) {
   return (symbols) => {
@@ -3051,7 +3073,7 @@ async function generate(options = {}) {
   await service.project.ready();
   await service.project.cacheService.save();
   const type_gen = new TypesGenerator;
-  type_gen.resolve_types(service.project.symbols);
+  type_gen.resolve_types(service.project.symbols, await fetchTranslationKeys());
   for await (const [symbol_path, { exports, imports }] of type_gen.resolved_symbols.entries()) {
     const parts = symbol_path.split("::");
     if (parts[0] === "") {
@@ -3077,7 +3099,8 @@ async function generate(options = {}) {
         baseUrl: "./",
         paths: {
           sandstone: ["../sandstone-types/index.ts"],
-          "sandstone/arguments/generated/*": [`./*`]
+          "sandstone/arguments": ["../sandstone-types/arguments/index.ts"],
+          "sandstone/arguments/generated/*": ["./*"]
         }
       }
     }, null, 2));
@@ -3088,6 +3111,7 @@ export {
   mcdoc_raw,
   generate,
   fetchVanillaMcdoc,
+  fetchTranslationKeys,
   fetchRegistries,
   fetchBlockStates
 };

package/dist/typegen/export.d.ts

@@ -2,14 +2,14 @@ import ts from 'typescript';
 import { type NonEmptyList } from './mcdoc/utils';
 import type { ResolvedDispatcher, ResolvedRegistry } from '.';
 export declare function export_registry(resolved_registries: Map<string, ResolvedRegistry>): {
-    readonly exports: ts.TypeAliasDeclaration[];
+    readonly exports: (ts.TypeAliasDeclaration | ts.VariableStatement)[];
     readonly paths: Set<string>;
 } | {
     readonly imports: {
         readonly ordered: NonEmptyList<string>;
         readonly check: Map<string, number>;
     };
-    readonly exports: ts.TypeAliasDeclaration[];
+    readonly exports: (ts.TypeAliasDeclaration | ts.VariableStatement)[];
     readonly paths: Set<string>;
 };
 /**

package/dist/typegen/index.d.ts

@@ -31,7 +31,7 @@ export declare class TypesGenerator {
     readonly resolved_symbols: Map<string, ResolvedSymbol>;
     readonly resolved_dispatchers: Map<string, ResolvedDispatcher>;
     constructor();
-    resolve_types(symbols: SymbolUtil): void;
+    resolve_types(symbols: SymbolUtil, translation_keys: string[]): void;
     private resolve_registry_symbols;
     private resolve_module_symbols;
     private resolve_dispatcher_symbols;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sandstone-mc/mcdoc-ts-generator",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Generate TypeScript types from Minecraft mcdoc definitions",
   "type": "module",
   "main": "./dist/index.js",