fix(data): support Factorio 2.1 prototype dumps

Author: ApocDev

app/src/db/import-factorio.test.ts

@@ -27,6 +27,28 @@ const runImport = (raw: Record<string, unknown>) => {
   return new Database(fx.file, { readonly: true });
 };
 
+describe("importFactorioDump — recipe categories", () => {
+  it("imports Factorio 2.1 categories with 2.0 and engine-default fallbacks", () => {
+    const db = runImport({
+      recipe: {
+        soil: { categories: ["soil-extraction"], results: [] },
+        legacy: { category: "smelting", results: [] },
+        defaulted: { results: [] },
+      },
+    });
+    const rows = db.prepare(`SELECT name, category FROM recipes ORDER BY name`).all() as {
+      name: string;
+      category: string;
+    }[];
+    expect(rows).toEqual([
+      { name: "defaulted", category: "crafting" },
+      { name: "legacy", category: "smelting" },
+      { name: "soil", category: "soil-extraction" },
+    ]);
+    db.close();
+  });
+});
+
 // Fixture values are a real slice of the Py dump (data-raw-dump.json):
 // technology.microfilters grants change-recipe-productivity fawogae-spore +0.15
 // and navens-spore +0.4; technology.mining-productivity-1 grants

app/src/db/import-factorio.ts

@@ -84,6 +84,11 @@ const jsonList = (x: unknown): string | null => {
   return a.length ? JSON.stringify(a) : null;
 };
 
+/** Factorio 2.1 dumps recipe `categories` as a one-element array; 2.0 used the
+ * singular `category`. Recipes without either field use the engine default. */
+const recipeCategory = (r: Record<string, unknown>): string =>
+  arr<string>(r.categories)[0] ?? (r.category as string | undefined) ?? "crafting";
+
 const TABLES = [
   "recipe_ingredients",
   "recipe_products",
@@ -262,7 +267,7 @@ export function importFactorioDump(
           (mainProduct ? productDisplay[mainProduct] : undefined) ??
           null,
         kind: "real",
-        category: r.category ?? "crafting",
+        category: recipeCategory(r),
         energy_required: r.energy_required ?? 0.5,
         enabled: r.enabled === false ? 0 : 1,
         hidden: r.hidden ? 1 : 0,

app/src/server/dump.server.ts

@@ -51,7 +51,7 @@ const HELPER_INFO = {
   version: "0.1.0",
   title: "PyOps dump helper",
   author: "PyOps",
-  factorio_version: "2.0",
+  factorio_version: "2.1",
   description:
     "Enables pypostprocessing's planner (YAFC) integration during data dumps so TURD sub-techs and planner-friendly prototypes land in data-raw-dump.json. Enable ONLY while dumping - do not play with this mod active.",
   dependencies: ["? pypostprocessing"],
@@ -64,6 +64,18 @@ const HELPER_DATA_LUA = `-- pypostprocessing's data-final-fixes checks this mark
 data.data_crawler = "yafc pyops"
 `;
 
+const HELPER_DATA_UPDATES_LUA = `-- yafc.lua resets these globals before requiring their prototype modules again.
+-- Factorio 2.1 keeps the modules cached, so the second require otherwise leaves
+-- the reset tables empty and the planner integration crashes while iterating them.
+for name in pairs(package.loaded) do
+  if string.find(name, "/scripts/digosaurus/digosaurus-prototypes", 1, true)
+      or string.find(name, "/scripts/biofluid/biofluid-prototypes", 1, true)
+      or string.find(name, "/prototypes/turd", 1, true) then
+    package.loaded[name] = nil
+  end
+end
+`;
+
 const HELPER_FINAL_FIXES_LUA = `-- pypostprocessing's yafc.lua was written for YAFC's lenient Lua crawler; the
 -- real engine validates prototypes. Patch up anything it left incomplete.
 -- This mod is dump-only: never play with it enabled.
@@ -226,6 +238,7 @@ export async function writeHelperMod() {
   await mkdir(dir, { recursive: true });
   await writeFile(join(dir, "info.json"), JSON.stringify(HELPER_INFO, null, 2));
   await writeFile(join(dir, "data.lua"), HELPER_DATA_LUA);
+  await writeFile(join(dir, "data-updates.lua"), HELPER_DATA_UPDATES_LUA);
   await writeFile(join(dir, "data-final-fixes.lua"), HELPER_FINAL_FIXES_LUA);
 }
 

docs/data-pipeline.md

@@ -19,7 +19,9 @@ orchestrated end-to-end from **Settings › Game data** in the UI
 4. **Import** the dump into SQLite (`app/src/db/import-factorio.ts`), then
    synthesize the recipes the engine doesn't model as recipes: mining, boiling,
    burning, spoiling, planting (agricultural towers), rocket launches, and
-   per-temperature fluid variants (`app/src/db/synthesize.ts`).
+   per-temperature fluid variants (`app/src/db/synthesize.ts`). Recipe categories
+   come from Factorio 2.1's `categories` array, with the singular 2.0 `category`
+   field retained as an import fallback.
 5. **Rebuild the icon atlas** (`buildIconAtlas`, `app/src/server/icon-atlas.ts`):
    pack the dumped sprites into content-hash-deduped 4096² sheets + a
    `(type, name) → slot` manifest, written to the data dir's `icon-data/`. The app
@@ -100,9 +102,11 @@ and then repairs the fallout so a real `--dump-data` run succeeds: it normalizes
 1.x-style `result =` recipes, fills in missing icons and fluid-box volumes, drops
 recipes whose result item never got created (and scrubs the now-dangling
 `unlock-recipe` tech effects), and rebuilds TURD sub-tech unlock effects that the
-integration leaves empty. It's strictly a dump-time tool — `dump.server.ts` enables it,
-runs the dumps, and disables it again in a `finally` block so it never lingers for
-normal play.
+integration leaves empty. On Factorio 2.1 it also evicts the Py modules that the
+integration intentionally re-runs after resetting their globals, avoiding stale
+`require` cache results. It's strictly a dump-time tool — `dump.server.ts` enables
+it, runs the dumps, and disables it again in a `finally` block so it never lingers
+for normal play.
 
 ## Data model notes