move tests file back to core

.vscode/launch.json

@@ -13,9 +13,9 @@
       "request": "launch",
       "name": "Debug AVA test file in Core",
       "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/ava",
-      "runtimeArgs": ["${file}", "--config", "./ava.config-debug.mjs", "--file-line", "${lineNumber}"],
+      "runtimeArgs": ["${file}", "--config", "../ava.config-debug.mjs", "--file-line", "${lineNumber}"],
       "outputCapture": "std",
-      "cwd": "${workspaceFolder}/packages/core-test",
+      "cwd": "${workspaceFolder}/packages/core/tests",
       "skipFiles": ["<node_internals>/**/*.js"],
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen"

package.json

@@ -6,7 +6,7 @@
     "build": "npm run build:core && npm run build:web",
     "build:core": "npm run build --prefix packages/core",
     "build:web": "npm run build --prefix packages/web",
-    "test:core": "npm run test:watch --prefix packages/core-test",
+    "test:core": "npm run test:watch --prefix packages/core",
     "prepare": "for P in packages/*/; do (cd $P && npm run prepare); done"
   },
   "private": true,

packages/core-test/ava.config-debug.mjs → packages/core/ava.config-debug.mjs

@@ -2,8 +2,8 @@ import * as fs from "fs";
 
 const defaultSettings = {
   extensions: ["ts"],
-  timeout: "100m",
-  require: ["ts-node/register"],
+  timeout: "5s",
+  require: ["ts-node/register", "reflect-metadata"],
 };
 
 const extraSettings = {};

packages/core/ava.config.mjs

@@ -0,0 +1,5 @@
+export default {
+  ignoredByWatcher: ["tests/**/*", "src/**/*"],
+  require: "reflect-metadata",
+  files: ["dist/**/*.test.js"],
+};

packages/core/package.json

@@ -4,6 +4,9 @@
   "scripts": {
     "build": "tsc -b ./tsconfig-public-api.json",
     "build:watch": "tsc -b ./tsconfig-public-api.json --watch",
+    "build:test": "tsc -b ./tests/tsconfig.json --watch",
+    "test": "ava",
+    "test:watch": "ava --watch",
     "prepare": "ts-patch install -s"
   },
   "dependencies": {
@@ -13,10 +16,15 @@
     "shortid": "2.2.16",
     "ts-patch": "3.0.0-beta3",
     "typescript": "5.0.4",
-    "typescript-transform-paths": "3.4.6"
+    "typescript-transform-paths": "3.4.6",
+    "ts-node": "10.9.1"
   },
   "devDependencies": {
-    "@types/shortid": "0.0.29"
+    "@types/chance": "1.1.3",
+    "@types/shortid": "0.0.29",
+    "@types/node": "20.1.0",
+    "ava": "5.2.0",
+    "chance": "1.1.11"
   },
   "types": "dist/public-api.d.ts",
   "main": "dist/public-api.js"

packages/core/src/modules/map/index.ts

@@ -2,5 +2,5 @@ export * from "./interfaces";
 export * from "./map-service";
 export * from "./map-store";
 export * from "./types";
-export * from "./map-module";
 export * from "./party-map-service";
+export * from "./map-module";

packages/core-test/tests/activities/battle.test.ts → packages/core/tests/activities/battle.test.ts

@@ -1,12 +1,7 @@
-import {
-  AttackEffectType,
-  BattleActivityType,
-  EffectType,
-  ItemType,
-  RuneAttackEffectType,
-  UnitType,
-  VillageConfig,
-} from "@rpg-village/core";
+import { UnitType } from "@features/unit";
+import { AttackEffectType, EffectType, ItemType, RuneAttackEffectType } from "@models";
+import { BattleActivityType } from "@modules/battle";
+import { VillageConfig } from "@modules/village";
 
 import { createState, test } from "../utils";
 import { equipmentFactory, runeFactory } from "../utils/factories";

packages/core-test/tests/activities/buildings/training-field/train.test.ts → packages/core/tests/activities/buildings/training-field/train.test.ts

@@ -1,4 +1,4 @@
-import { TrainingFieldActivity } from "@rpg-village/core";
+import { TrainingFieldActivity } from "@modules/village";
 
 import { createState, test } from "../../../utils";
 

packages/core-test/tests/activities/manager.test.ts → packages/core/tests/activities/manager.test.ts

@@ -1,4 +1,6 @@
-import { ActivityType, MapActivity, VillageActivity } from "@rpg-village/core";
+import { ActivityType } from "@modules/activity";
+import { MapActivity } from "@modules/map";
+import { VillageActivity } from "@modules/village";
 
 import { createState, test } from "../utils";
 

packages/core-test/tests/activities/village/build.test.ts → packages/core/tests/activities/village/build.test.ts

@@ -1,18 +1,20 @@
-import { VillageActivity, VillageCommand } from "@rpg-village/core";
+import { VillageActivity, VillageCommand } from "@modules/village";
 
 import { test } from "../../utils";
 
 test("should start a build activity when gold is enough", {
   initState: { village: { stash: { resource: { gold: 100 } }, trainingField: 0 } },
   commands: [VillageCommand.BuildTrainingField],
-  expectedState: (state, t) => t.withRandomId(state.activities, { name: VillageActivity.Build, startArgs: { targetBuilding: 'trainingField' } }),
+  expectedState: (state, t) =>
+    t.withRandomId(state.activities, { name: VillageActivity.Build, startArgs: { targetBuilding: "trainingField" } }),
 });
 
 test("should block the second command for building", {
   initState: { village: { stash: { resource: { gold: 1000 } }, trainingField: 0 } },
   commands: [VillageCommand.BuildTrainingField, VillageCommand.BuildTrainingField],
   expectedState: [
-    (state, t) => t.withRandomId(state.activities, { name: VillageActivity.Build, startArgs: { targetBuilding: 'trainingField' } }),
-    (state, t) => t.deepEqual(state.village, { stash: { resource: { gold: 900 } }, trainingField: 0 }) 
-  ]
+    (state, t) =>
+      t.withRandomId(state.activities, { name: VillageActivity.Build, startArgs: { targetBuilding: "trainingField" } }),
+    (state, t) => t.deepEqual(state.village, { stash: { resource: { gold: 900 } }, trainingField: 0 }),
+  ],
 });

packages/core-test/tests/activities/village/gather-resource-from-portal.test.ts → packages/core/tests/activities/village/gather-resource-from-portal.test.ts

@@ -1,4 +1,4 @@
-import { PortalActivity } from "@rpg-village/core";
+import { PortalActivity } from "@modules/village";
 
 import { createState, test } from "../../utils";
 

packages/core-test/tests/activities/world/explore.test.ts → packages/core/tests/activities/world/explore.test.ts

@@ -1,6 +1,6 @@
 import { values } from "rambda";
 
-import { MapActivity, MapLocationType } from "@rpg-village/core";
+import { MapActivity, MapLocationType } from "@modules/map";
 
 import { createState, test } from "../../utils";
 

packages/core-test/tests/activities/world/travel.test.ts → packages/core/tests/activities/world/travel.test.ts

@@ -1,4 +1,5 @@
-import { ActivityType, MapActivity } from "@rpg-village/core";
+import { ActivityType } from "@modules/activity";
+import { MapActivity } from "@modules/map";
 
 import { createState, stashFactory, test } from "../../utils";
 

packages/core-test/tests/commands/buildings/blacksmith/create-item.test.ts → packages/core/tests/commands/buildings/blacksmith/create-item.test.ts

@@ -1,4 +1,5 @@
-import { BlacksmithCommand, ItemType } from "@rpg-village/core";
+import { ItemType } from "@models";
+import { BlacksmithCommand } from "@modules/village";
 
 import { createState, test } from "../../../utils";
 

packages/core-test/tests/commands/buildings/blacksmith/upgrade-item.test.ts → packages/core/tests/commands/buildings/blacksmith/upgrade-item.test.ts

@@ -1,4 +1,5 @@
-import { AttackEffectType, BlacksmithCommand, EffectType, EquipmentSlot, StashLocation } from "@rpg-village/core";
+import { AttackEffectType, EffectType, EquipmentSlot } from "@models";
+import { BlacksmithCommand, StashLocation } from "@modules/village";
 
 import { createState, test } from "../../../utils";
 

packages/core-test/tests/commands/buildings/portals/enter-portal.test.ts → packages/core/tests/commands/buildings/portals/enter-portal.test.ts

@@ -1,4 +1,5 @@
-import { MapLocationType, PortalCommand } from "@rpg-village/core";
+import { MapLocationType } from "@modules/map";
+import { PortalCommand } from "@modules/village";
 
 import { createState, test } from "../../../utils";
 

packages/core-test/tests/commands/buildings/portals/leave-portal.test.ts → packages/core/tests/commands/buildings/portals/leave-portal.test.ts

@@ -1,4 +1,5 @@
-import { MapLocationType, PortalActivity, PortalCommand } from "@rpg-village/core";
+import { MapLocationType } from "@modules/map";
+import { PortalActivity, PortalCommand } from "@modules/village";
 
 import { createState, test } from "../../../utils";
 

packages/core-test/tests/commands/buildings/portals/open-portal.test.ts → packages/core/tests/commands/buildings/portals/open-portal.test.ts

@@ -1,6 +1,7 @@
 import { values } from "rambda";
 
-import { AttackEffectType, EffectType, ItemType, PortalCommand } from "@rpg-village/core";
+import { AttackEffectType, EffectType, ItemType } from "@models";
+import { PortalCommand } from "@modules/village";
 
 import { createState, test } from "../../../utils";
 

packages/core-test/tests/commands/buildings/rune-workshop/create-rune.test.ts → packages/core/tests/commands/buildings/rune-workshop/create-rune.test.ts

@@ -1,4 +1,5 @@
-import { ItemType, RuneWorkshopCommand } from "@rpg-village/core";
+import { ItemType } from "@models";
+import { RuneWorkshopCommand } from "@modules/village";
 
 import { createState, test } from "../../../utils";
 

packages/core/tests/commands/buildings/rune-workshop/dismantle-rune.test.ts

@@ -0,0 +1,19 @@
+import { ItemType } from "@models";
+import { RuneWorkshopCommand } from "@modules/village";
+
+import { createState, test } from "../../../utils";
+
+test("should empower rune with soul", {
+  initState: createState(({ village }) => [
+    village({ stash: { resource: { soul: 5 }, items: [{ id: "rune", itemType: ItemType.Rune, soul: 2 }] } }),
+  ]),
+  commands: [
+    {
+      command: RuneWorkshopCommand.DismantleRune,
+      args: {
+        runeId: "rune",
+      },
+    },
+  ],
+  expectedState: { village: { stash: { resource: { soul: 7 }, items: [] } } },
+});

packages/core/tests/commands/buildings/rune-workshop/empower-rune.test.ts

@@ -0,0 +1,22 @@
+import { ItemType } from "@models";
+import { RuneWorkshopCommand } from "@modules/village";
+
+import { createState, test } from "../../../utils";
+
+test("should empower rune with soul", {
+  initState: createState(({ village }) => [
+    village({ stash: { resource: { soul: 5 }, items: [{ id: "rune", itemType: ItemType.Rune, soul: 1 }] } }),
+  ]),
+  commands: [
+    {
+      command: RuneWorkshopCommand.EmpowerRune,
+      args: {
+        runeId: "rune",
+        soul: 1,
+      },
+    },
+  ],
+  expectedState: {
+    village: { stash: { resource: { soul: 4 }, items: [{ id: "rune", itemType: ItemType.Rune, soul: 2 }] } },
+  },
+});