Merge branch 'main' into compare/scenario2601-200-parity-20260815

tools/integration-tests/test/auctionFlow.test.ts

@@ -28,11 +28,13 @@ import {
 } from '@sammo-ts/infra';
 import {
     buildNeutralResourceAuctionPlan,
-    createItemInventoryFromSlots,
     ItemLoader,
     ITEM_KEYS,
-    serializeItemInventory,
 } from '@sammo-ts/logic';
+import {
+    createItemInventoryFromSlots,
+    serializeItemInventory,
+} from '@sammo-ts/logic/items/inventory.js';
 
 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 const workspaceRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..');

tools/legacy-db-migration/src/currentSeason.ts

@@ -201,7 +201,7 @@ const migratePaged = async (
     }
 };
 
-export const mapGeneral = (row: SourceRow, options: CurrentSeasonFixtureOptions): TargetRow => {
+const mapGeneral = (row: SourceRow, options: CurrentSeasonFixtureOptions): TargetRow => {
     const id = toNumber(row.no, 'general.no');
     const aux = jsonObjectOrLegacyEmpty(row.aux, `general.${id}.aux`);
     const meta: Record<string, JsonValue> = {
@@ -281,7 +281,7 @@ export const mapGeneral = (row: SourceRow, options: CurrentSeasonFixtureOptions)
     };
 };
 
-export const mapNation = (row: SourceRow, nationEnv: Record<string, JsonValue>): TargetRow => {
+const mapNation = (row: SourceRow, nationEnv: Record<string, JsonValue>): TargetRow => {
     const id = toNumber(row.nation, 'nation.nation');
     const aux = jsonObject(row.aux, `nation.${id}.aux`);
     return {