From ea19ee9f210217dae4419081c28e03b7fdec2b74 Mon Sep 17 00:00:00 2001 From: Exelo Date: Fri, 13 Nov 2026 18:25:34 +0100 Subject: [PATCH 1/5] chore: move the example games to the examples repo cube-3d, pong-3d and pong-network now live in NanoForge-dev/examples (basics/graphics-3d, demos/pong-3d, demos/pong-network); the docs link there. --- .prettierignore | 1 - docs/docs/graphics-3d/index.mdx | 2 +- docs/docs/network/index.mdx | 2 +- example/.gitignore | 1 - example/cube-3d/.gitignore | 0 example/cube-3d/.prettierignore | 11 - example/cube-3d/apps/client/.prettierignore | 11 - example/cube-3d/apps/client/assets/.gitkeep | 0 example/cube-3d/apps/client/eslint.config.js | 3 - .../cube-3d/apps/client/nanoforge.config.ts | 5 - example/cube-3d/apps/client/package.json | 36 -- .../cube-3d/apps/client/prettier.config.js | 3 - .../apps/client/src/components/components.ts | 19 - example/cube-3d/apps/client/src/main.ts | 53 --- .../apps/client/src/systems/systems.ts | 16 - example/cube-3d/apps/client/tsconfig.json | 6 - example/cube-3d/nanoforge.config.ts | 6 - example/cube-3d/package.json | 26 -- example/cube-3d/prettier.config.js | 3 - example/cube-3d/tsconfig.json | 6 - example/pong-3d/.gitignore | 0 example/pong-3d/.prettierignore | 11 - example/pong-3d/apps/client/.prettierignore | 11 - example/pong-3d/apps/client/assets/.gitkeep | 0 example/pong-3d/apps/client/eslint.config.js | 3 - .../pong-3d/apps/client/nanoforge.config.ts | 5 - example/pong-3d/apps/client/package.json | 38 -- .../pong-3d/apps/client/prettier.config.js | 3 - example/pong-3d/apps/client/src/arena.ts | 73 ---- .../apps/client/src/components/components.ts | 59 ---- example/pong-3d/apps/client/src/field.ts | 13 - example/pong-3d/apps/client/src/main.ts | 95 ----- .../pong-3d/apps/client/src/scenes/.gitkeep | 0 .../apps/client/src/systems/systems.ts | 121 ------- example/pong-3d/apps/client/tsconfig.json | 6 - example/pong-3d/apps/server/.prettierignore | 11 - example/pong-3d/apps/server/assets/.gitkeep | 0 example/pong-3d/apps/server/eslint.config.js | 3 - .../pong-3d/apps/server/nanoforge.config.ts | 5 - example/pong-3d/apps/server/package.json | 35 -- .../pong-3d/apps/server/prettier.config.js | 3 - .../apps/server/src/components/components.ts | 41 --- example/pong-3d/apps/server/src/main.ts | 46 --- .../pong-3d/apps/server/src/scenes/.gitkeep | 0 .../apps/server/src/systems/systems.ts | 173 ---------- example/pong-3d/apps/server/tsconfig.json | 6 - example/pong-3d/nanoforge.config.ts | 7 - example/pong-3d/package.json | 31 -- example/pong-3d/prettier.config.js | 3 - example/pong-3d/shared/protocol.ts | 23 -- example/pong-3d/tsconfig.json | 6 - example/pong-network/.gitignore | 0 example/pong-network/.prettierignore | 11 - .../pong-network/apps/client/.prettierignore | 11 - .../pong-network/apps/client/assets/.gitkeep | 0 .../pong-network/apps/client/eslint.config.js | 3 - .../apps/client/nanoforge.config.ts | 5 - example/pong-network/apps/client/package.json | 37 -- .../apps/client/prettier.config.js | 3 - .../apps/client/src/components/components.ts | 66 ---- example/pong-network/apps/client/src/main.ts | 111 ------ .../apps/client/src/scenes/.gitkeep | 0 .../apps/client/src/systems/systems.ts | 80 ----- .../pong-network/apps/client/tsconfig.json | 6 - .../pong-network/apps/server/.prettierignore | 11 - .../pong-network/apps/server/assets/.gitkeep | 0 .../pong-network/apps/server/eslint.config.js | 3 - .../apps/server/nanoforge.config.ts | 5 - example/pong-network/apps/server/package.json | 35 -- .../apps/server/prettier.config.js | 3 - .../apps/server/src/components/components.ts | 41 --- example/pong-network/apps/server/src/main.ts | 46 --- .../apps/server/src/scenes/.gitkeep | 0 .../apps/server/src/systems/systems.ts | 174 ---------- .../pong-network/apps/server/tsconfig.json | 6 - example/pong-network/nanoforge.config.ts | 6 - example/pong-network/package.json | 33 -- example/pong-network/prettier.config.js | 3 - example/pong-network/shared/protocol.ts | 13 - .../pong-network/test/pong-network.spec.ts | 11 - example/pong-network/tsconfig.json | 6 - example/pong-network/tsconfig.spec.json | 10 - pnpm-lock.yaml | 324 ------------------ pnpm-workspace.yaml | 1 - 84 files changed, 2 insertions(+), 2103 deletions(-) delete mode 100644 example/.gitignore delete mode 100644 example/cube-3d/.gitignore delete mode 100644 example/cube-3d/.prettierignore delete mode 100644 example/cube-3d/apps/client/.prettierignore delete mode 100644 example/cube-3d/apps/client/assets/.gitkeep delete mode 100644 example/cube-3d/apps/client/eslint.config.js delete mode 100644 example/cube-3d/apps/client/nanoforge.config.ts delete mode 100644 example/cube-3d/apps/client/package.json delete mode 100644 example/cube-3d/apps/client/prettier.config.js delete mode 100644 example/cube-3d/apps/client/src/components/components.ts delete mode 100644 example/cube-3d/apps/client/src/main.ts delete mode 100644 example/cube-3d/apps/client/src/systems/systems.ts delete mode 100644 example/cube-3d/apps/client/tsconfig.json delete mode 100644 example/cube-3d/nanoforge.config.ts delete mode 100644 example/cube-3d/package.json delete mode 100644 example/cube-3d/prettier.config.js delete mode 100644 example/cube-3d/tsconfig.json delete mode 100644 example/pong-3d/.gitignore delete mode 100644 example/pong-3d/.prettierignore delete mode 100644 example/pong-3d/apps/client/.prettierignore delete mode 100644 example/pong-3d/apps/client/assets/.gitkeep delete mode 100644 example/pong-3d/apps/client/eslint.config.js delete mode 100644 example/pong-3d/apps/client/nanoforge.config.ts delete mode 100644 example/pong-3d/apps/client/package.json delete mode 100644 example/pong-3d/apps/client/prettier.config.js delete mode 100644 example/pong-3d/apps/client/src/arena.ts delete mode 100644 example/pong-3d/apps/client/src/components/components.ts delete mode 100644 example/pong-3d/apps/client/src/field.ts delete mode 100644 example/pong-3d/apps/client/src/main.ts delete mode 100644 example/pong-3d/apps/client/src/scenes/.gitkeep delete mode 100644 example/pong-3d/apps/client/src/systems/systems.ts delete mode 100644 example/pong-3d/apps/client/tsconfig.json delete mode 100644 example/pong-3d/apps/server/.prettierignore delete mode 100644 example/pong-3d/apps/server/assets/.gitkeep delete mode 100644 example/pong-3d/apps/server/eslint.config.js delete mode 100644 example/pong-3d/apps/server/nanoforge.config.ts delete mode 100644 example/pong-3d/apps/server/package.json delete mode 100644 example/pong-3d/apps/server/prettier.config.js delete mode 100644 example/pong-3d/apps/server/src/components/components.ts delete mode 100644 example/pong-3d/apps/server/src/main.ts delete mode 100644 example/pong-3d/apps/server/src/scenes/.gitkeep delete mode 100644 example/pong-3d/apps/server/src/systems/systems.ts delete mode 100644 example/pong-3d/apps/server/tsconfig.json delete mode 100644 example/pong-3d/nanoforge.config.ts delete mode 100644 example/pong-3d/package.json delete mode 100644 example/pong-3d/prettier.config.js delete mode 100644 example/pong-3d/shared/protocol.ts delete mode 100644 example/pong-3d/tsconfig.json delete mode 100644 example/pong-network/.gitignore delete mode 100644 example/pong-network/.prettierignore delete mode 100644 example/pong-network/apps/client/.prettierignore delete mode 100644 example/pong-network/apps/client/assets/.gitkeep delete mode 100644 example/pong-network/apps/client/eslint.config.js delete mode 100644 example/pong-network/apps/client/nanoforge.config.ts delete mode 100644 example/pong-network/apps/client/package.json delete mode 100644 example/pong-network/apps/client/prettier.config.js delete mode 100644 example/pong-network/apps/client/src/components/components.ts delete mode 100644 example/pong-network/apps/client/src/main.ts delete mode 100644 example/pong-network/apps/client/src/scenes/.gitkeep delete mode 100644 example/pong-network/apps/client/src/systems/systems.ts delete mode 100644 example/pong-network/apps/client/tsconfig.json delete mode 100644 example/pong-network/apps/server/.prettierignore delete mode 100644 example/pong-network/apps/server/assets/.gitkeep delete mode 100644 example/pong-network/apps/server/eslint.config.js delete mode 100644 example/pong-network/apps/server/nanoforge.config.ts delete mode 100644 example/pong-network/apps/server/package.json delete mode 100644 example/pong-network/apps/server/prettier.config.js delete mode 100644 example/pong-network/apps/server/src/components/components.ts delete mode 100644 example/pong-network/apps/server/src/main.ts delete mode 100644 example/pong-network/apps/server/src/scenes/.gitkeep delete mode 100644 example/pong-network/apps/server/src/systems/systems.ts delete mode 100644 example/pong-network/apps/server/tsconfig.json delete mode 100644 example/pong-network/nanoforge.config.ts delete mode 100644 example/pong-network/package.json delete mode 100644 example/pong-network/prettier.config.js delete mode 100644 example/pong-network/shared/protocol.ts delete mode 100644 example/pong-network/test/pong-network.spec.ts delete mode 100644 example/pong-network/tsconfig.json delete mode 100644 example/pong-network/tsconfig.spec.json diff --git a/.prettierignore b/.prettierignore index 316374a7..046e01e9 100644 --- a/.prettierignore +++ b/.prettierignore @@ -8,7 +8,6 @@ pnpm-workspace.yaml packages/ modules/ -example/ utils/ releases/ .nanoforge/ diff --git a/docs/docs/graphics-3d/index.mdx b/docs/docs/graphics-3d/index.mdx index 22f92d38..9f777e8c 100644 --- a/docs/docs/graphics-3d/index.mdx +++ b/docs/docs/graphics-3d/index.mdx @@ -13,7 +13,7 @@ description: "Render a 3D scene with @nanoforge-dev/graphics-3d, built on Three. ## Your first 3D scene in 5 minutes -The [`cube-3d` example](https://github.com/NanoForge-dev/Engine/tree/main/example/cube-3d) is this page as a complete app. +The [`graphics-3d` example](https://github.com/NanoForge-dev/examples/tree/main/basics/graphics-3d) is this page as a complete app. ### 1. Install diff --git a/docs/docs/network/index.mdx b/docs/docs/network/index.mdx index 944c8b54..6d29281e 100644 --- a/docs/docs/network/index.mdx +++ b/docs/docs/network/index.mdx @@ -63,7 +63,7 @@ await app.init(options); // starts listening - "@node-datachannel/*" ``` -Then send and receive packets: see [Client networking](./network-client) and [Server networking](./network-server). The [pong-network example](https://github.com/NanoForge-dev/Engine/tree/main/example/pong-network) is a complete game. +Then send and receive packets: see [Client networking](./network-client) and [Server networking](./network-server). The [pong-network example](https://github.com/NanoForge-dev/examples/tree/main/demos/pong-network) is a complete game. ## Environment variables diff --git a/example/.gitignore b/example/.gitignore deleted file mode 100644 index 71e9c16c..00000000 --- a/example/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/debug/ \ No newline at end of file diff --git a/example/cube-3d/.gitignore b/example/cube-3d/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/example/cube-3d/.prettierignore b/example/cube-3d/.prettierignore deleted file mode 100644 index 64b127c9..00000000 --- a/example/cube-3d/.prettierignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock -bun.lock - -.turbo/ -node_modules/ -dist/ -coverage/ -CHANGELOG.md diff --git a/example/cube-3d/apps/client/.prettierignore b/example/cube-3d/apps/client/.prettierignore deleted file mode 100644 index 64b127c9..00000000 --- a/example/cube-3d/apps/client/.prettierignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock -bun.lock - -.turbo/ -node_modules/ -dist/ -coverage/ -CHANGELOG.md diff --git a/example/cube-3d/apps/client/assets/.gitkeep b/example/cube-3d/apps/client/assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/cube-3d/apps/client/eslint.config.js b/example/cube-3d/apps/client/eslint.config.js deleted file mode 100644 index 62ec06dc..00000000 --- a/example/cube-3d/apps/client/eslint.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-eslint-config"; - -export default config; diff --git a/example/cube-3d/apps/client/nanoforge.config.ts b/example/cube-3d/apps/client/nanoforge.config.ts deleted file mode 100644 index 77607cbd..00000000 --- a/example/cube-3d/apps/client/nanoforge.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { defineConfig } from "@nanoforge-dev/config"; - -export default defineConfig({ - type: "client", -}); diff --git a/example/cube-3d/apps/client/package.json b/example/cube-3d/apps/client/package.json deleted file mode 100644 index 86ccc4b6..00000000 --- a/example/cube-3d/apps/client/package.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "cube-3d-client", - "version": "0.0.0", - "description": "", - "author": "", - "type": "module", - "scripts": { - "lint": "prettier --check . && eslint --format=pretty \"src/**/*.ts\"", - "format": "prettier --write . && eslint --fix --format=pretty \"src/**/*.ts\"" - }, - "devDependencies": { - "@nanoforge-dev/asset": "workspace:*", - "@nanoforge-dev/common": "workspace:*", - "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/ecs": "workspace:*", - "@nanoforge-dev/graphics-3d": "workspace:*", - "@nanoforge-dev/utils-eslint-config": "workspace:*", - "@nanoforge-dev/utils-prettier-config": "workspace:*", - "@trivago/prettier-plugin-sort-imports": "catalog:lint", - "@types/three": "catalog:graphics", - "eslint": "catalog:lint", - "lint-staged": "catalog:ci", - "prettier": "catalog:lint", - "three": "catalog:graphics", - "typescript": "catalog:core" - }, - "private": true, - "lint-staged": { - "**": [ - "prettier --ignore-unknown --write" - ], - "src/**/*.ts": [ - "eslint --fix" - ] - } -} diff --git a/example/cube-3d/apps/client/prettier.config.js b/example/cube-3d/apps/client/prettier.config.js deleted file mode 100644 index 27d0e269..00000000 --- a/example/cube-3d/apps/client/prettier.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-prettier-config"; - -export default config; diff --git a/example/cube-3d/apps/client/src/components/components.ts b/example/cube-3d/apps/client/src/components/components.ts deleted file mode 100644 index 00c93430..00000000 --- a/example/cube-3d/apps/client/src/components/components.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { Object3D } from "@nanoforge-dev/graphics-3d/three"; - -/** The 3D object an entity shows. Add the object to `ctx.graphics.scene` to render it. */ -export class Model { - name = "Model"; - - constructor(public object: Object3D) {} -} - -/** Rotation speed around each axis, in degrees per second. */ -export class Spin { - name = "Spin"; - - constructor( - public x = 0, - public y = 0, - public z = 0, - ) {} -} diff --git a/example/cube-3d/apps/client/src/main.ts b/example/cube-3d/apps/client/src/main.ts deleted file mode 100644 index c2e79f09..00000000 --- a/example/cube-3d/apps/client/src/main.ts +++ /dev/null @@ -1,53 +0,0 @@ -import type { ClientRunOptions } from "@nanoforge-dev/common"; -import { NanoforgeFactory } from "@nanoforge-dev/core"; -import { EcsLibrary } from "@nanoforge-dev/ecs/client"; -import { Graphics3DLibrary } from "@nanoforge-dev/graphics-3d"; -import { - BoxGeometry, - Color, - DirectionalLight, - HemisphereLight, - Mesh, - MeshStandardMaterial, -} from "@nanoforge-dev/graphics-3d/three"; - -import { Model, Spin } from "./components/components"; -import { spin } from "./systems/systems"; - -export const main = async (options: ClientRunOptions): Promise => { - // 1. Create the app and register the libraries it uses. - const app = NanoforgeFactory.createClient({ - tickRate: 60, - viewport: { width: 1920, height: 1080, fit: "contain" }, - }); - const graphics = new Graphics3DLibrary(); - const ecs = new EcsLibrary(); - app.use(graphics); - app.use(ecs); - - await app.init(options); - - // 2. Set up the scene: a background, a camera looking at the origin, and lights. - const { scene, camera } = graphics; - scene.background = new Color("#20232a"); - camera.position.set(0, 1.5, 4); - camera.lookAt(0, 0, 0); - - const sun = new DirectionalLight("white", 3); - sun.position.set(3, 5, 4); - scene.add(new HemisphereLight("white", "#445566", 1), sun); - - // 3. Add a cube to the scene, and an entity that spins it. - const mesh = new Mesh(new BoxGeometry(1, 1, 1), new MeshStandardMaterial({ color: "#44aa88" })); - scene.add(mesh); - - const registry = ecs.registry; - const cube = registry.spawnEntity(); - registry.addComponent(cube, new Model(mesh)); - registry.addComponent(cube, new Spin(20, 90, 0)); - - // 4. Run the systems every tick. graphics-3d renders the scene after them. - registry.addSystem(spin); - - await app.run(); -}; diff --git a/example/cube-3d/apps/client/src/systems/systems.ts b/example/cube-3d/apps/client/src/systems/systems.ts deleted file mode 100644 index b359f32a..00000000 --- a/example/cube-3d/apps/client/src/systems/systems.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { Context } from "@nanoforge-dev/common"; -import type { Registry } from "@nanoforge-dev/ecs/client"; -import { MathUtils } from "@nanoforge-dev/graphics-3d/three"; - -import { Model, Spin } from "../components/components"; - -/** Turns every model that has a `Spin`. */ -export function spin(registry: Registry, ctx: Context) { - const seconds = ctx.app.delta / 1000; - - registry.getZipper([Model, Spin]).forEach(({ Model, Spin }) => { - Model.object.rotation.x += MathUtils.degToRad(Spin.x) * seconds; - Model.object.rotation.y += MathUtils.degToRad(Spin.y) * seconds; - Model.object.rotation.z += MathUtils.degToRad(Spin.z) * seconds; - }); -} diff --git a/example/cube-3d/apps/client/tsconfig.json b/example/cube-3d/apps/client/tsconfig.json deleted file mode 100644 index f90a806b..00000000 --- a/example/cube-3d/apps/client/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], - "exclude": ["node_modules", "dist", ".nanoforge"] -} diff --git a/example/cube-3d/nanoforge.config.ts b/example/cube-3d/nanoforge.config.ts deleted file mode 100644 index 99f24783..00000000 --- a/example/cube-3d/nanoforge.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineConfig } from "@nanoforge-dev/config"; - -export default defineConfig({ - type: "workspace", - packages: ["apps/*"], -}); diff --git a/example/cube-3d/package.json b/example/cube-3d/package.json deleted file mode 100644 index 31078482..00000000 --- a/example/cube-3d/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "cube-3d", - "version": "0.0.0", - "description": "", - "author": "", - "type": "module", - "scripts": { - "start": "nf start", - "lint": "prettier --check .", - "format": "prettier --write ." - }, - "devDependencies": { - "@nanoforge-dev/cli": "^2.3.0", - "@nanoforge-dev/config": "catalog:config", - "@trivago/prettier-plugin-sort-imports": "catalog:lint", - "lint-staged": "catalog:ci", - "prettier": "catalog:lint", - "typescript": "catalog:core" - }, - "private": true, - "lint-staged": { - "**": [ - "prettier --ignore-unknown --write" - ] - } -} diff --git a/example/cube-3d/prettier.config.js b/example/cube-3d/prettier.config.js deleted file mode 100644 index 27d0e269..00000000 --- a/example/cube-3d/prettier.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-prettier-config"; - -export default config; diff --git a/example/cube-3d/tsconfig.json b/example/cube-3d/tsconfig.json deleted file mode 100644 index b1528990..00000000 --- a/example/cube-3d/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.json", - "include": ["test/**/*.ts"], - "exclude": ["node_modules", "**/dist", "**/.nanoforge"] -} diff --git a/example/pong-3d/.gitignore b/example/pong-3d/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-3d/.prettierignore b/example/pong-3d/.prettierignore deleted file mode 100644 index 64b127c9..00000000 --- a/example/pong-3d/.prettierignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock -bun.lock - -.turbo/ -node_modules/ -dist/ -coverage/ -CHANGELOG.md diff --git a/example/pong-3d/apps/client/.prettierignore b/example/pong-3d/apps/client/.prettierignore deleted file mode 100644 index 64b127c9..00000000 --- a/example/pong-3d/apps/client/.prettierignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock -bun.lock - -.turbo/ -node_modules/ -dist/ -coverage/ -CHANGELOG.md diff --git a/example/pong-3d/apps/client/assets/.gitkeep b/example/pong-3d/apps/client/assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-3d/apps/client/eslint.config.js b/example/pong-3d/apps/client/eslint.config.js deleted file mode 100644 index 62ec06dc..00000000 --- a/example/pong-3d/apps/client/eslint.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-eslint-config"; - -export default config; diff --git a/example/pong-3d/apps/client/nanoforge.config.ts b/example/pong-3d/apps/client/nanoforge.config.ts deleted file mode 100644 index 77607cbd..00000000 --- a/example/pong-3d/apps/client/nanoforge.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { defineConfig } from "@nanoforge-dev/config"; - -export default defineConfig({ - type: "client", -}); diff --git a/example/pong-3d/apps/client/package.json b/example/pong-3d/apps/client/package.json deleted file mode 100644 index 86b61146..00000000 --- a/example/pong-3d/apps/client/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "pong-3d-client", - "version": "0.0.0", - "description": "", - "author": "", - "type": "module", - "scripts": { - "lint": "prettier --check . && eslint --format=pretty \"src/**/*.ts\"", - "format": "prettier --write . && eslint --fix --format=pretty \"src/**/*.ts\"" - }, - "devDependencies": { - "@nanoforge-dev/asset": "workspace:*", - "@nanoforge-dev/common": "workspace:*", - "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/ecs": "workspace:*", - "@nanoforge-dev/env": "workspace:*", - "@nanoforge-dev/graphics-3d": "workspace:*", - "@nanoforge-dev/input": "workspace:*", - "@nanoforge-dev/network": "workspace:*", - "@nanoforge-dev/utils-eslint-config": "workspace:*", - "@nanoforge-dev/utils-prettier-config": "workspace:*", - "@trivago/prettier-plugin-sort-imports": "catalog:lint", - "eslint": "catalog:lint", - "lint-staged": "catalog:ci", - "prettier": "catalog:lint", - "three": "catalog:graphics", - "typescript": "catalog:core" - }, - "private": true, - "lint-staged": { - "**": [ - "prettier --ignore-unknown --write" - ], - "src/**/*.ts": [ - "eslint --fix" - ] - } -} diff --git a/example/pong-3d/apps/client/prettier.config.js b/example/pong-3d/apps/client/prettier.config.js deleted file mode 100644 index 27d0e269..00000000 --- a/example/pong-3d/apps/client/prettier.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-prettier-config"; - -export default config; diff --git a/example/pong-3d/apps/client/src/arena.ts b/example/pong-3d/apps/client/src/arena.ts deleted file mode 100644 index 0ddb8ab5..00000000 --- a/example/pong-3d/apps/client/src/arena.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { - BoxGeometry, - Color, - DirectionalLight, - HemisphereLight, - Mesh, - MeshStandardMaterial, - PlaneGeometry, - type Scene, - SphereGeometry, -} from "@nanoforge-dev/graphics-3d/three"; - -import { FIELD, PADDLE } from "../../../shared/protocol"; -import { SCALE } from "./field"; - -const WIDTH = FIELD.width * SCALE; -const DEPTH = FIELD.height * SCALE; - -/** Adds the table, its borders and the lights to the scene. */ -export const buildArena = (scene: Scene): void => { - scene.background = new Color("#10141c"); - - const table = new Mesh( - new PlaneGeometry(WIDTH, DEPTH), - new MeshStandardMaterial({ color: "#2f6b2a", roughness: 0.9 }), - ); - table.rotation.x = -Math.PI / 2; - table.receiveShadow = true; - - const centerLine = new Mesh( - new PlaneGeometry(0.1, DEPTH), - new MeshStandardMaterial({ color: "#94cc75" }), - ); - centerLine.rotation.x = -Math.PI / 2; - centerLine.position.y = 0.01; - - const borderMaterial = new MeshStandardMaterial({ color: "#c8d0dc" }); - const borderGeometry = new BoxGeometry(WIDTH + 0.4, 0.4, 0.2); - const top = new Mesh(borderGeometry, borderMaterial); - top.position.set(0, 0.2, -DEPTH / 2 - 0.1); - const bottom = new Mesh(borderGeometry, borderMaterial); - bottom.position.set(0, 0.2, DEPTH / 2 + 0.1); - for (const border of [top, bottom]) border.castShadow = border.receiveShadow = true; - - const sun = new DirectionalLight("white", 2.5); - sun.position.set(-4, 12, 6); - sun.castShadow = true; - sun.shadow.mapSize.set(2048, 2048); - Object.assign(sun.shadow.camera, { left: -12, right: 12, top: 8, bottom: -8 }); - - scene.add(table, centerLine, top, bottom, new HemisphereLight("#dfe8ff", "#20301c", 1.2), sun); -}; - -/** A paddle: a box as long as the 2D paddle is tall. */ -export const createPaddle = (color: string): Mesh => { - const paddle = new Mesh( - new BoxGeometry(PADDLE.width * SCALE, 0.4, PADDLE.height * SCALE), - new MeshStandardMaterial({ color, roughness: 0.4 }), - ); - paddle.castShadow = true; - return paddle; -}; - -export const BALL_RADIUS = 0.25; - -export const createBall = (): Mesh => { - const ball = new Mesh( - new SphereGeometry(BALL_RADIUS, 32, 16), - new MeshStandardMaterial({ color: "#ff4d3d", roughness: 0.3, emissive: "#401008" }), - ); - ball.castShadow = true; - return ball; -}; diff --git a/example/pong-3d/apps/client/src/components/components.ts b/example/pong-3d/apps/client/src/components/components.ts deleted file mode 100644 index 64c5bc80..00000000 --- a/example/pong-3d/apps/client/src/components/components.ts +++ /dev/null @@ -1,59 +0,0 @@ -import type { Object3D, Vector3 } from "@nanoforge-dev/graphics-3d/three"; -import type { InputEnum } from "@nanoforge-dev/input"; - -export class NetworkId { - constructor(public id: number) {} -} - -/** A paddle, tagged with the seat it belongs to. */ -export class Paddle { - constructor(public seat: 1 | 2) {} -} - -/** Position in server field units (1920 × 1080, y down). */ -export class Position { - constructor( - public x = 0, - public y = 0, - ) {} -} - -/** Speed in field units per millisecond. */ -export class Velocity { - constructor( - public x = 0, - public y = 0, - ) {} -} - -/** - * The 3D object drawn at the entity's `Position`. The offset goes from the - * position to the object's center, in field units (paddles are placed by - * their top-left corner). - */ -export class Model { - constructor( - public object: Object3D, - public offsetX = 0, - public offsetY = 0, - ) {} -} - -/** - * The local player: which paddle it controls (0 while spectating), and the - * keys that move it left and right on screen. - */ -export class Player { - seat: 0 | 1 | 2 = 0; - sent: "up" | "down" | "stop" = "stop"; - - constructor( - public left: InputEnum[], - public right: InputEnum[], - ) {} -} - -/** Where the camera looks, eased toward its goal every tick. */ -export class CameraRig { - look: Vector3 | undefined = undefined; -} diff --git a/example/pong-3d/apps/client/src/field.ts b/example/pong-3d/apps/client/src/field.ts deleted file mode 100644 index e50e2a4b..00000000 --- a/example/pong-3d/apps/client/src/field.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Vector3 } from "@nanoforge-dev/graphics-3d/three"; - -import { FIELD } from "../../../shared/protocol"; - -/** World units per field unit: the 1920 × 1080 field is 19.2 × 10.8 in 3D. */ -export const SCALE = 1 / 100; - -/** - * Field point → world point. The field lies on the ground (y = 0), centered - * on the origin: field x goes along world x, field y (down) along world z. - */ -export const fieldToWorld = (x: number, y: number, height = 0, target = new Vector3()): Vector3 => - target.set((x - FIELD.width / 2) * SCALE, height, (y - FIELD.height / 2) * SCALE); diff --git a/example/pong-3d/apps/client/src/main.ts b/example/pong-3d/apps/client/src/main.ts deleted file mode 100644 index 3d5e55b6..00000000 --- a/example/pong-3d/apps/client/src/main.ts +++ /dev/null @@ -1,95 +0,0 @@ -import type { ClientRunOptions } from "@nanoforge-dev/common"; -import { NanoforgeFactory } from "@nanoforge-dev/core"; -import { EcsLibrary } from "@nanoforge-dev/ecs/client"; -import { Graphics3DLibrary } from "@nanoforge-dev/graphics-3d"; -import { InputEnum, InputLibrary } from "@nanoforge-dev/input"; -import { ControllerLibrary } from "@nanoforge-dev/input/controller"; -import { NetworkClientLibrary } from "@nanoforge-dev/network/client"; - -import { AssignId, PADDLE, Play, Seat } from "../../../shared/protocol"; -import { BALL_RADIUS, buildArena, createBall, createPaddle } from "./arena"; -import { - CameraRig, - Model, - NetworkId, - Paddle, - Player, - Position, - Velocity, -} from "./components/components"; -import { applyMoves, controlPlayer, draw, followCamera, move } from "./systems/systems"; - -export const main = async (options: ClientRunOptions): Promise => { - const app = NanoforgeFactory.createClient({ - tickRate: 60, - viewport: { width: 1920, height: 1080, fit: "contain" }, - }); - const graphics = new Graphics3DLibrary(); - const ecs = new EcsLibrary(); - const network = new NetworkClientLibrary(); - const input = new InputLibrary(); - const controller = new ControllerLibrary(); - - app.use(graphics); - app.use(ecs); - app.use(network); - app.use(input); - app.use(controller); - - await app.init(options); - - graphics.renderer.shadowMap.enabled = true; - buildArena(graphics.scene); - - const registry = ecs.registry; - - const spawnModel = (model: Model) => { - const entity = registry.spawnEntity(); - registry.addComponent(entity, new Position()); - registry.addComponent(entity, new Velocity()); - registry.addComponent(entity, model); - graphics.scene.add(model.object); - return entity; - }; - - const ball = createBall(); - ball.position.y = BALL_RADIUS; - const paddle1 = createPaddle("#4d8dff"); - const paddle2 = createPaddle("#ff9f40"); - paddle1.position.y = paddle2.position.y = 0.2; - - // The server sends each entity's network id once we joined; game state follows in `Move` packets. - const entities = { - ball: spawnModel(new Model(ball)), - paddle1: spawnModel(new Model(paddle1, PADDLE.width / 2, PADDLE.height / 2)), - paddle2: spawnModel(new Model(paddle2, PADDLE.width / 2, PADDLE.height / 2)), - }; - registry.addComponent(entities.paddle1, new Paddle(1)); - registry.addComponent(entities.paddle2, new Paddle(2)); - - const me = registry.spawnEntity(); - registry.addComponent( - me, - new Player([InputEnum.ArrowLeft, InputEnum.KeyA], [InputEnum.ArrowRight, InputEnum.KeyD]), - ); - registry.addComponent(me, new CameraRig()); - - // Dispatched before the systems, so an entity gets its id before `applyMoves` reads its moves. - network.packets.on(AssignId, ({ assigned, id }) => { - registry.addComponent(entities[assigned], new NetworkId(id)); - }); - network.packets.on(Seat, ({ paddle }) => { - registry.getZipper([Player]).forEach(({ Player }) => (Player.seat = paddle)); - console.info(paddle === 0 ? "Spectating" : `Playing paddle ${paddle}`); - }); - - registry.addSystem(applyMoves); - registry.addSystem(move); - registry.addSystem(controlPlayer); - registry.addSystem(draw); - registry.addSystem(followCamera); - - network.packets.send(Play); - - await app.run(); -}; diff --git a/example/pong-3d/apps/client/src/scenes/.gitkeep b/example/pong-3d/apps/client/src/scenes/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-3d/apps/client/src/systems/systems.ts b/example/pong-3d/apps/client/src/systems/systems.ts deleted file mode 100644 index bc7f84b1..00000000 --- a/example/pong-3d/apps/client/src/systems/systems.ts +++ /dev/null @@ -1,121 +0,0 @@ -import { type Context } from "@nanoforge-dev/common"; -import { type Registry } from "@nanoforge-dev/ecs/client"; -import { Vector3 } from "@nanoforge-dev/graphics-3d/three"; -import type { InputEnum } from "@nanoforge-dev/input"; -import { ControllerAxis, ControllerButton } from "@nanoforge-dev/input/controller"; - -import { FIELD, Input, Move, PADDLE } from "../../../../shared/protocol"; -import { - CameraRig, - Model, - NetworkId, - Paddle, - Player, - Position, - Velocity, -} from "../components/components"; -import { fieldToWorld } from "../field"; - -/** Predicts movement between two server updates. */ -export function move(registry: Registry, ctx: Context) { - registry.getZipper([Position, Velocity]).forEach(({ Position, Velocity }) => { - Position.x += Velocity.x * ctx.app.delta; - Position.y += Velocity.y * ctx.app.delta; - }); -} - -/** Applies the server's positions and velocities. */ -export function applyMoves(registry: Registry, ctx: Context) { - const zipper = registry.getZipper([NetworkId, Position, Velocity]); - - for (const { data } of ctx.network.packets.read(Move)) { - const it = zipper.find((entity) => entity.NetworkId.id === data.id); - if (!it) continue; - it.Position.x = data.position.x; - it.Position.y = data.position.y; - it.Velocity.x = data.velocity.x; - it.Velocity.y = data.velocity.y; - } -} - -/** - * Sends the player's input. The camera looks down the table from behind the - * paddle, so "left" and "right" on screen are "up" and "down" on the field, - * swapped for the right paddle. - */ -export function controlPlayer(registry: Registry, ctx: Context) { - const input = ctx.input; - const pad = ctx.controller; - - registry.getZipper([Player]).forEach(({ Player }) => { - if (Player.seat === 0) return; - const stickX = pad.getAxis(ControllerAxis.LeftStickX); - const left = - Player.left.some((key: InputEnum) => input.isKeyPressed(key)) || - pad.isButtonPressed(ControllerButton.DPadLeft) || - stickX < -0.5; - const right = - Player.right.some((key: InputEnum) => input.isKeyPressed(key)) || - pad.isButtonPressed(ControllerButton.DPadRight) || - stickX > 0.5; - - let key: "up" | "down" | "stop" = "stop"; - if (left !== right) key = right === (Player.seat === 1) ? "down" : "up"; - if (key === Player.sent) return; - ctx.network.packets.send(Input, { key }); - Player.sent = key; - }); -} - -/** Places every model at its entity's position. */ -export function draw(registry: Registry) { - registry.getZipper([Model, Position]).forEach(({ Model, Position }) => { - const { object } = Model; - fieldToWorld( - Position.x + Model.offsetX, - Position.y + Model.offsetY, - object.position.y, - object.position, - ); - }); -} - -// Above and behind the right end of the table, framing both paddles. -const SPECTATOR_EYE = fieldToWorld(FIELD.width + 900, FIELD.height / 2, 12); -const SPECTATOR_LOOK = fieldToWorld(FIELD.width / 2 + 270, FIELD.height / 2); -const eye = new Vector3(); -const look = new Vector3(); - -/** - * Players see the table from just above and behind their own paddle, - * following it. Spectators see it from above its right end. - */ -export function followCamera(registry: Registry, ctx: Context) { - const players = registry.getZipper([Player, CameraRig]); - const paddles = registry.getZipper([Paddle, Position]); - - players.forEach(({ Player, CameraRig }) => { - const paddle = paddles.find((entity) => entity.Paddle.seat === Player.seat); - if (Player.seat !== 0 && paddle) { - const side = Player.seat === 1 ? 1 : -1; - const centerY = paddle.Position.y + PADDLE.height / 2; - // Behind and above the paddle, looking just short of the center line: the paddle stays in view. - fieldToWorld(paddle.Position.x + PADDLE.width / 2 - side * 400, centerY, 3, eye); - fieldToWorld(FIELD.width / 2 - side * 200, (centerY + FIELD.height / 2) / 2, 0, look); - } else { - eye.copy(SPECTATOR_EYE); - look.copy(SPECTATOR_LOOK); - } - - const camera = ctx.graphics.camera; - if (!CameraRig.look) { - CameraRig.look = look.clone(); - camera.position.copy(eye); - } - // Eases toward the goal in about a fifth of a second, whatever the frame rate. - const t = 1 - Math.exp(-ctx.app.delta / 120); - camera.position.lerp(eye, t); - CameraRig.look.lerp(look, t); - camera.lookAt(CameraRig.look); - }); -} diff --git a/example/pong-3d/apps/client/tsconfig.json b/example/pong-3d/apps/client/tsconfig.json deleted file mode 100644 index f90a806b..00000000 --- a/example/pong-3d/apps/client/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], - "exclude": ["node_modules", "dist", ".nanoforge"] -} diff --git a/example/pong-3d/apps/server/.prettierignore b/example/pong-3d/apps/server/.prettierignore deleted file mode 100644 index 64b127c9..00000000 --- a/example/pong-3d/apps/server/.prettierignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock -bun.lock - -.turbo/ -node_modules/ -dist/ -coverage/ -CHANGELOG.md diff --git a/example/pong-3d/apps/server/assets/.gitkeep b/example/pong-3d/apps/server/assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-3d/apps/server/eslint.config.js b/example/pong-3d/apps/server/eslint.config.js deleted file mode 100644 index 62ec06dc..00000000 --- a/example/pong-3d/apps/server/eslint.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-eslint-config"; - -export default config; diff --git a/example/pong-3d/apps/server/nanoforge.config.ts b/example/pong-3d/apps/server/nanoforge.config.ts deleted file mode 100644 index 43a3fef2..00000000 --- a/example/pong-3d/apps/server/nanoforge.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { defineConfig } from "@nanoforge-dev/config"; - -export default defineConfig({ - type: "server", -}); diff --git a/example/pong-3d/apps/server/package.json b/example/pong-3d/apps/server/package.json deleted file mode 100644 index e7a86838..00000000 --- a/example/pong-3d/apps/server/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "pong-3d-server", - "version": "0.0.0", - "description": "", - "author": "", - "type": "module", - "scripts": { - "lint": "prettier --check . && eslint --format=pretty \"src/**/*.ts\"", - "format": "prettier --write . && eslint --fix --format=pretty \"src/**/*.ts\"" - }, - "devDependencies": { - "@nanoforge-dev/asset": "workspace:*", - "@nanoforge-dev/common": "workspace:*", - "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/env": "workspace:*", - "@nanoforge-dev/ecs": "workspace:*", - "@nanoforge-dev/network": "workspace:*", - "@nanoforge-dev/utils-eslint-config": "workspace:*", - "@nanoforge-dev/utils-prettier-config": "workspace:*", - "@trivago/prettier-plugin-sort-imports": "catalog:lint", - "eslint": "catalog:lint", - "lint-staged": "catalog:ci", - "prettier": "catalog:lint", - "typescript": "catalog:core" - }, - "private": true, - "lint-staged": { - "**": [ - "prettier --ignore-unknown --write" - ], - "src/**/*.ts": [ - "eslint --fix" - ] - } -} diff --git a/example/pong-3d/apps/server/prettier.config.js b/example/pong-3d/apps/server/prettier.config.js deleted file mode 100644 index 27d0e269..00000000 --- a/example/pong-3d/apps/server/prettier.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-prettier-config"; - -export default config; diff --git a/example/pong-3d/apps/server/src/components/components.ts b/example/pong-3d/apps/server/src/components/components.ts deleted file mode 100644 index 9bb8846e..00000000 --- a/example/pong-3d/apps/server/src/components/components.ts +++ /dev/null @@ -1,41 +0,0 @@ -export class Velocity { - name = "Velocity"; - x: number; - y: number; - - constructor(x: number, y: number) { - this.x = x; - this.y = y; - } -} - -export class Position { - name = "Position"; - x: number; - y: number; - - constructor(x: number, y: number) { - this.x = x; - this.y = y; - } -} - -export class Circle { - name = "Circle"; - radius: number; - - constructor(radius: number) { - this.radius = radius; - } -} - -export class Rectangle { - name = "Rectangle"; - width: number; - height: number; - - constructor(width: number, height: number) { - this.width = width; - this.height = height; - } -} diff --git a/example/pong-3d/apps/server/src/main.ts b/example/pong-3d/apps/server/src/main.ts deleted file mode 100644 index 62ec77ea..00000000 --- a/example/pong-3d/apps/server/src/main.ts +++ /dev/null @@ -1,46 +0,0 @@ -import type { RunOptions } from "@nanoforge-dev/common"; -import { NanoforgeFactory } from "@nanoforge-dev/core"; -import { EcsLibrary } from "@nanoforge-dev/ecs/server"; -import { NetworkServerLibrary } from "@nanoforge-dev/network/server"; - -import { Input, Play } from "../../../shared/protocol"; -import { Position, Velocity } from "./components/components"; -import { bounce, handleClientInput, handlePlay, move, onClientDisconnect } from "./systems/systems"; - -export const main = async (options: RunOptions): Promise => { - const app = NanoforgeFactory.createServer({ tickRate: 60 }); - const ecs = new EcsLibrary(); - const network = new NetworkServerLibrary(); - - app.use(ecs); - app.use(network); - - await app.init(options); - - network.clients.onDisconnect(onClientDisconnect); - - const registry = ecs.registry; - - const ball = registry.spawnEntity(); - registry.addComponent(ball, new Position(960, 540)); - registry.addComponent(ball, new Velocity(0, 0)); - - const paddle1 = registry.spawnEntity(); - registry.addComponent(paddle1, new Position(20, 390)); - registry.addComponent(paddle1, new Velocity(0, 0)); - - const paddle2 = registry.spawnEntity(); - registry.addComponent(paddle2, new Position(1850, 390)); - registry.addComponent(paddle2, new Velocity(0, 0)); - - const zip = () => registry.getZipper([Position, Velocity]); - network.packets.on(Play, (_, { clientId, ctx }) => handlePlay(clientId, ctx.network, zip())); - network.packets.on(Input, ({ key }, { clientId, ctx }) => - handleClientInput(clientId, key, ctx.network, zip()), - ); - - registry.addSystem(bounce); - registry.addSystem(move); - - await app.run(); -}; diff --git a/example/pong-3d/apps/server/src/scenes/.gitkeep b/example/pong-3d/apps/server/src/scenes/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-3d/apps/server/src/systems/systems.ts b/example/pong-3d/apps/server/src/systems/systems.ts deleted file mode 100644 index 50de1c62..00000000 --- a/example/pong-3d/apps/server/src/systems/systems.ts +++ /dev/null @@ -1,173 +0,0 @@ -import { type Context } from "@nanoforge-dev/common"; -import { type Registry } from "@nanoforge-dev/ecs/server"; -import { - Channel, - type ClientId, - type ClientInfo, - type NetworkServerContextApi, -} from "@nanoforge-dev/network/server"; - -import { AssignId, Move, Seat } from "../../../../shared/protocol"; -import { Position, Velocity } from "../components/components"; - -let cli1: ClientId | null = null; -let cli2: ClientId | null = null; -const paddleSpeed = 1; - -let roundStart = 0; - -export function move(registry: Registry, ctx: Context) { - const entities = registry.getZipper([Position, Velocity]); - - entities.forEach(({ Position, Velocity }) => { - Position.x += Velocity.x * ctx.app.delta; - Position.y += Velocity.y * ctx.app.delta; - }); -} - -function sendMoveAll( - id: number, - vel: Velocity, - pos: Position, - network: NetworkServerContextApi, - channel: Channel, -) { - network.packets.sendToAll( - Move, - { id: id, position: { x: pos.x, y: pos.y }, velocity: { x: vel.x, y: vel.y } }, - { channel }, - ); -} - -/** Free the paddle of a player who left. */ -export function onClientDisconnect(info: ClientInfo) { - if (info.id === cli1) cli1 = null; - if (info.id === cli2) cli2 = null; -} - -function connectNewClient(newCli: ClientId, network: NetworkServerContextApi, zip: any) { - network.packets.sendToClient(newCli, AssignId, { assigned: "ball", id: 0 }); - network.packets.sendToClient(newCli, AssignId, { assigned: "paddle1", id: 1 }); - network.packets.sendToClient(newCli, AssignId, { assigned: "paddle2", id: 2 }); - sendMoveAll(0, zip[0].Velocity, zip[0].Position, network, Channel.ReliableOrdered); - sendMoveAll(1, zip[1].Velocity, zip[1].Position, network, Channel.ReliableOrdered); - sendMoveAll(2, zip[2].Velocity, zip[2].Position, network, Channel.ReliableOrdered); -} - -export function handleClientInput( - clientId: ClientId, - key: string, - network: NetworkServerContextApi, - zip: any, -) { - let id; - - if (clientId === cli1) { - id = 1; - } else if (clientId === cli2) { - id = 2; - } else { - return; - } - const paddle = zip[id]; - - if (key === "up") { - paddle.Velocity.y = -paddleSpeed; - if (paddle.Position.y < 0) { - paddle.Position.y = 0; - paddle.Velocity.y = 0; - } - } - if (key === "down") { - paddle.Velocity.y = paddleSpeed; - if (paddle.Position.y > 780) { - paddle.Position.y = 780; - paddle.Velocity.y = 0; - } - } - if (key === "stop") { - paddle.Velocity.y = 0; - } - sendMoveAll(id, paddle.Velocity, paddle.Position, network, Channel.UnreliableOrdered); -} - -/** Seats a new client on a free paddle, or as a spectator, and sends it the game state. */ -export function handlePlay(client: ClientId, network: NetworkServerContextApi, zip: any) { - if (client == cli1 || client == cli2) return; - let paddle: 0 | 1 | 2 = 0; - if (cli1 === null) { - cli1 = client; - paddle = 1; - } else if (cli2 === null) { - cli2 = client; - paddle = 2; - } - network.packets.sendToClient(client, Seat, { paddle }); - connectNewClient(client, network, zip); -} - -function checkOutOfTerrain(id: number, paddle: any, network: NetworkServerContextApi) { - if (paddle.Position.y < 0) { - paddle.Position.y = 0; - paddle.Velocity.y = 0; - sendMoveAll(id, paddle.Velocity, paddle.Position, network, Channel.UnreliableOrdered); - } - if (paddle.Position.y > 780) { - paddle.Position.y = 780; - paddle.Velocity.y = 0; - sendMoveAll(id, paddle.Velocity, paddle.Position, network, Channel.UnreliableOrdered); - } -} - -export const bounce = (registry: Registry, ctx: Context) => { - const network = ctx.network; - const zip = registry.getZipper([Position, Velocity]); - checkOutOfTerrain(1, zip[1], network); - checkOutOfTerrain(2, zip[2], network); - if (roundStart < 3000 && roundStart != -1) { - roundStart += ctx.app.delta; - return; - } - if (roundStart >= 3000) { - roundStart = -1; - zip[0].Velocity.x = 1; - sendMoveAll(0, zip[0].Velocity, zip[0].Position, network, Channel.UnreliableUnordered); - return; - } - let bounced = false; - if (zip[0].Position.y <= 0 || zip[0].Position.y >= 1080) { - zip[0].Velocity.y *= -1; - bounced = true; - } - if ( - (zip[0].Position.x <= 65 && - zip[1].Position.y - 15 <= zip[0].Position.y && - zip[0].Position.y - 15 <= zip[1].Position.y + 300) || - (zip[0].Position.x >= 1835 && - zip[2].Position.y - 15 <= zip[0].Position.y && - zip[0].Position.y - 15 <= zip[2].Position.y + 300) - ) { - let paddleTouched = 1; - if (zip[0].Position.x >= 1835) { - paddleTouched = 2; - } - const prevSpeed = Math.sqrt(zip[0].Velocity.x ** 2 + zip[0].Velocity.y ** 2); - const newSpeed = prevSpeed * 1.1; - const posOnPaddle = (zip[0].Position.y - zip[paddleTouched].Position.y + 15) / 330; - const baseAngle = posOnPaddle * ((6 * Math.PI) / 8) + Math.PI / 8 - Math.PI / 2; - const outAngle = zip[0].Position.x < 960 ? baseAngle : -baseAngle + Math.PI; - zip[0].Velocity.x = Math.cos(outAngle) * newSpeed; - zip[0].Velocity.y = Math.sin(outAngle) * newSpeed; - bounced = true; - } else if (zip[0].Position.x <= 15 || zip[0].Position.x >= 1905) { - zip[0].Position.x = 960; - zip[0].Position.y = 540; - zip[0].Velocity.x = 0; - zip[0].Velocity.y = 0; - roundStart = 0; - bounced = true; - } - if (bounced) { - sendMoveAll(0, zip[0].Velocity, zip[0].Position, network, Channel.UnreliableUnordered); - } -}; diff --git a/example/pong-3d/apps/server/tsconfig.json b/example/pong-3d/apps/server/tsconfig.json deleted file mode 100644 index f90a806b..00000000 --- a/example/pong-3d/apps/server/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], - "exclude": ["node_modules", "dist", ".nanoforge"] -} diff --git a/example/pong-3d/nanoforge.config.ts b/example/pong-3d/nanoforge.config.ts deleted file mode 100644 index af48def1..00000000 --- a/example/pong-3d/nanoforge.config.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { defineConfig } from "@nanoforge-dev/config"; - -export default defineConfig({ - type: "workspace", - packages: ["apps/*"], - network: "p2p", -}); diff --git a/example/pong-3d/package.json b/example/pong-3d/package.json deleted file mode 100644 index 174aeb9e..00000000 --- a/example/pong-3d/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "pong-3d", - "version": "0.0.0", - "description": "", - "author": "", - "type": "module", - "scripts": { - "start": "nf start", - "lint": "prettier --check .", - "format": "prettier --write ." - }, - "devDependencies": { - "@nanoforge-dev/asset": "workspace:*", - "@nanoforge-dev/cli": "^2.3.0", - "@nanoforge-dev/common": "workspace:*", - "@nanoforge-dev/config": "catalog:config", - "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/env": "workspace:*", - "@nanoforge-dev/network": "workspace:*", - "@trivago/prettier-plugin-sort-imports": "catalog:lint", - "lint-staged": "catalog:ci", - "prettier": "catalog:lint", - "typescript": "catalog:core" - }, - "private": true, - "lint-staged": { - "**": [ - "prettier --ignore-unknown --write" - ] - } -} diff --git a/example/pong-3d/prettier.config.js b/example/pong-3d/prettier.config.js deleted file mode 100644 index 27d0e269..00000000 --- a/example/pong-3d/prettier.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-prettier-config"; - -export default config; diff --git a/example/pong-3d/shared/protocol.ts b/example/pong-3d/shared/protocol.ts deleted file mode 100644 index 8c81c411..00000000 --- a/example/pong-3d/shared/protocol.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Channel, definePacket } from "@nanoforge-dev/network"; - -type Vector = { x: number; y: number }; - -/** - * The game runs on the server in 2D field units: a 1920 × 1080 field, x to - * the right, y down. Clients draw it in 3D. - */ -export const FIELD = { width: 1920, height: 1080 } as const; -export const PADDLE = { width: 30, height: 300 } as const; - -export const Play = definePacket("play"); -export const Input = definePacket<{ key: "up" | "down" | "stop" }>("input"); - -/** Which paddle a client controls: 1 (left), 2 (right), or 0 when it spectates. */ -export const Seat = definePacket<{ paddle: 0 | 1 | 2 }>("seat"); - -export const AssignId = definePacket<{ assigned: "ball" | "paddle1" | "paddle2"; id: number }>( - "assignId", -); -export const Move = definePacket<{ id: number; position: Vector; velocity: Vector }>("move", { - channel: Channel.UnreliableOrdered, -}); diff --git a/example/pong-3d/tsconfig.json b/example/pong-3d/tsconfig.json deleted file mode 100644 index b1528990..00000000 --- a/example/pong-3d/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.json", - "include": ["test/**/*.ts"], - "exclude": ["node_modules", "**/dist", "**/.nanoforge"] -} diff --git a/example/pong-network/.gitignore b/example/pong-network/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-network/.prettierignore b/example/pong-network/.prettierignore deleted file mode 100644 index 64b127c9..00000000 --- a/example/pong-network/.prettierignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock -bun.lock - -.turbo/ -node_modules/ -dist/ -coverage/ -CHANGELOG.md diff --git a/example/pong-network/apps/client/.prettierignore b/example/pong-network/apps/client/.prettierignore deleted file mode 100644 index 64b127c9..00000000 --- a/example/pong-network/apps/client/.prettierignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock -bun.lock - -.turbo/ -node_modules/ -dist/ -coverage/ -CHANGELOG.md diff --git a/example/pong-network/apps/client/assets/.gitkeep b/example/pong-network/apps/client/assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-network/apps/client/eslint.config.js b/example/pong-network/apps/client/eslint.config.js deleted file mode 100644 index 62ec06dc..00000000 --- a/example/pong-network/apps/client/eslint.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-eslint-config"; - -export default config; diff --git a/example/pong-network/apps/client/nanoforge.config.ts b/example/pong-network/apps/client/nanoforge.config.ts deleted file mode 100644 index 77607cbd..00000000 --- a/example/pong-network/apps/client/nanoforge.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { defineConfig } from "@nanoforge-dev/config"; - -export default defineConfig({ - type: "client", -}); diff --git a/example/pong-network/apps/client/package.json b/example/pong-network/apps/client/package.json deleted file mode 100644 index 02bf8685..00000000 --- a/example/pong-network/apps/client/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "pong-network-client", - "version": "0.0.0", - "description": "", - "author": "", - "type": "module", - "scripts": { - "lint": "prettier --check . && eslint --format=pretty \"src/**/*.ts\"", - "format": "prettier --write . && eslint --fix --format=pretty \"src/**/*.ts\"" - }, - "devDependencies": { - "@nanoforge-dev/asset": "workspace:*", - "@nanoforge-dev/common": "workspace:*", - "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/env": "workspace:*", - "@nanoforge-dev/ecs": "workspace:*", - "@nanoforge-dev/network": "workspace:*", - "@nanoforge-dev/graphics-2d": "workspace:*", - "@nanoforge-dev/input": "workspace:*", - "@nanoforge-dev/utils-eslint-config": "workspace:*", - "@nanoforge-dev/utils-prettier-config": "workspace:*", - "@trivago/prettier-plugin-sort-imports": "catalog:lint", - "eslint": "catalog:lint", - "lint-staged": "catalog:ci", - "prettier": "catalog:lint", - "typescript": "catalog:core" - }, - "private": true, - "lint-staged": { - "**": [ - "prettier --ignore-unknown --write" - ], - "src/**/*.ts": [ - "eslint --fix" - ] - } -} diff --git a/example/pong-network/apps/client/prettier.config.js b/example/pong-network/apps/client/prettier.config.js deleted file mode 100644 index 27d0e269..00000000 --- a/example/pong-network/apps/client/prettier.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-prettier-config"; - -export default config; diff --git a/example/pong-network/apps/client/src/components/components.ts b/example/pong-network/apps/client/src/components/components.ts deleted file mode 100644 index 616891b0..00000000 --- a/example/pong-network/apps/client/src/components/components.ts +++ /dev/null @@ -1,66 +0,0 @@ -import type { Circle, Rect } from "@nanoforge-dev/graphics-2d"; -import type { InputEnum } from "@nanoforge-dev/input"; - -import { layer } from "../main"; - -export class NetworkId { - name = "NetworkId"; - constructor(public id: number) {} -} - -export class Velocity { - name = "Velocity"; - x: number; - y: number; - - constructor(x: number, y: number) { - this.x = x; - this.y = y; - } -} - -export class Position { - name = "Position"; - x: number; - y: number; - - constructor(x: number, y: number) { - this.x = x; - this.y = y; - } -} - -export class CircleComponent { - name = "CircleComponent"; - component: Circle; - - constructor(component: Circle) { - this.component = component; - layer.add(this.component); - } -} - -export class RectangleComponent { - name = "RectangleComponent"; - component: Rect; - - constructor(component: Rect) { - this.component = component; - layer.add(this.component); - } -} - -export class Controller { - name = "Controller"; - up: InputEnum; - down: InputEnum; - lastPressedUp: boolean; - lastPressedDown: boolean; - - constructor(up: InputEnum, down: InputEnum) { - this.up = up; - this.down = down; - this.lastPressedUp = false; - this.lastPressedDown = false; - } -} diff --git a/example/pong-network/apps/client/src/main.ts b/example/pong-network/apps/client/src/main.ts deleted file mode 100644 index e5fc8556..00000000 --- a/example/pong-network/apps/client/src/main.ts +++ /dev/null @@ -1,111 +0,0 @@ -import type { ClientRunOptions } from "@nanoforge-dev/common"; -import { NanoforgeFactory } from "@nanoforge-dev/core"; -import { EcsLibrary } from "@nanoforge-dev/ecs/client"; -import { Circle, Graphics2DLibrary, Layer, Rect } from "@nanoforge-dev/graphics-2d"; -import { InputEnum, InputLibrary } from "@nanoforge-dev/input"; -import { ControllerLibrary } from "@nanoforge-dev/input/controller"; -import { NetworkClientLibrary } from "@nanoforge-dev/network/client"; - -import { AssignId, Play } from "../../../shared/protocol"; -import { - CircleComponent, - Controller, - NetworkId, - Position, - RectangleComponent, - Velocity, -} from "./components/components"; -import { applyMoves, controlPlayer, draw, move } from "./systems/systems"; - -export const layer = new Layer(); - -export const main = async (options: ClientRunOptions): Promise => { - const app = NanoforgeFactory.createClient({ - tickRate: 60, - viewport: { width: 1920, height: 1080, fit: "contain" }, - }); - const graphics = new Graphics2DLibrary(); - const ecs = new EcsLibrary(); - const network = new NetworkClientLibrary(); - const input = new InputLibrary(); - const controller = new ControllerLibrary(); - - app.use(graphics); - app.use(ecs); - app.use(network); - app.use(input); - app.use(controller); - - await app.init(options); - - // TEMP controller test: log connections and rumble on connect. - controller.onConnect((c) => { - console.log("Manette connectée :", c.id, "mapping:", c.mapping); - void controller.vibrate({ duration: 300 }); - }); - controller.onDisconnect((c) => console.log("Manette déconnectée :", c.id)); - - const registry = ecs.registry; - - graphics.stage.add(layer); - - const terrain = registry.spawnEntity(); - registry.addComponent(terrain, new Position(0, 0)); - registry.addComponent( - terrain, - new RectangleComponent(new Rect({ fill: "rgb(58,99,39)", width: 1920, height: 1080 })), - ); - const terrainLine = registry.spawnEntity(); - registry.addComponent(terrainLine, new Position(955, 0)); - registry.addComponent( - terrainLine, - new RectangleComponent(new Rect({ fill: "rgb(148,204,117)", width: 10, height: 1080 })), - ); - - const ball = registry.spawnEntity(); - registry.addComponent(ball, new Velocity(0, 0)); - registry.addComponent(ball, new Position(0, 0)); - registry.addComponent( - ball, - new CircleComponent( - new Circle({ - radius: 30, - fill: "red", - }), - ), - ); - - const me = registry.spawnEntity(); - registry.addComponent(me, new Controller(InputEnum.ArrowUp, InputEnum.ArrowDown)); - - const paddle1 = registry.spawnEntity(); - registry.addComponent(paddle1, new Position(0, 0)); - registry.addComponent(paddle1, new Velocity(0, 0)); - registry.addComponent( - paddle1, - new RectangleComponent(new Rect({ fill: "blue", width: 30, height: 300 })), - ); - - const paddle2 = registry.spawnEntity(); - registry.addComponent(paddle2, new Position(0, 0)); - registry.addComponent(paddle2, new Velocity(0, 0)); - registry.addComponent( - paddle2, - new RectangleComponent(new Rect({ fill: "blue", width: 30, height: 300 })), - ); - - // Dispatched before the systems, so an entity gets its id before `applyMoves` reads its moves. - network.packets.on(AssignId, ({ assigned, id }) => { - const index = { ball: 2, paddle1: 4, paddle2: 5 }[assigned]; - registry.addComponent(registry.entityFromIndex(index), new NetworkId(id)); - }); - - registry.addSystem(applyMoves); - registry.addSystem(move); - registry.addSystem(controlPlayer); - registry.addSystem(draw); - - network.packets.send(Play); - - await app.run(); -}; diff --git a/example/pong-network/apps/client/src/scenes/.gitkeep b/example/pong-network/apps/client/src/scenes/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-network/apps/client/src/systems/systems.ts b/example/pong-network/apps/client/src/systems/systems.ts deleted file mode 100644 index 575ff1a4..00000000 --- a/example/pong-network/apps/client/src/systems/systems.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { type Context } from "@nanoforge-dev/common"; -import { type Registry } from "@nanoforge-dev/ecs/client"; -import { ControllerAxis, ControllerButton } from "@nanoforge-dev/input/controller"; - -import { Input, Move } from "../../../../shared/protocol"; -import { - CircleComponent, - Controller, - NetworkId, - Position, - RectangleComponent, - Velocity, -} from "../components/components"; - -export function move(registry: Registry, ctx: Context) { - const entities = registry.getZipper([Position, Velocity]); - - entities.forEach(({ Position, Velocity }) => { - Position.x += Velocity.x * ctx.app.delta; - Position.y += Velocity.y * ctx.app.delta; - }); -} - -export const controlPlayer = (registry: Registry, ctx: Context) => { - const entities = registry.getZipper([Controller]); - const input = ctx.input; - const network = ctx.network; - const pad = ctx.controller; - - entities.forEach(({ Controller }) => { - // TEMP controller test: D-pad or left stick drive the paddle too. - const stickY = pad.getAxis(ControllerAxis.LeftStickY); - const upPressed = - !!input.isKeyPressed(Controller.up) || - pad.isButtonPressed(ControllerButton.DPadUp) || - stickY < -0.5; - const downPressed = - !!input.isKeyPressed(Controller.down) || - pad.isButtonPressed(ControllerButton.DPadDown) || - stickY > 0.5; - if (upPressed == downPressed) { - if (Controller.lastPressedUp || Controller.lastPressedDown) { - network.packets.send(Input, { key: "stop" }); - Controller.lastPressedDown = false; - Controller.lastPressedUp = false; - } - } else if (upPressed && !Controller.lastPressedUp) { - network.packets.send(Input, { key: "up" }); - Controller.lastPressedUp = true; - } else if (downPressed && !Controller.lastPressedDown) { - network.packets.send(Input, { key: "down" }); - Controller.lastPressedDown = true; - } - }); -}; - -export function draw(registry: Registry) { - const circles = registry.getZipper([CircleComponent, Position]); - const rectangles = registry.getZipper([RectangleComponent, Position]); - - circles.forEach(({ CircleComponent, Position }) => { - CircleComponent.component.setPosition(Position); - }); - rectangles.forEach(({ RectangleComponent, Position }) => { - RectangleComponent.component.setPosition(Position); - }); -} - -export function applyMoves(registry: Registry, ctx: Context) { - const zipper = registry.getZipper([NetworkId, Position, Velocity]); - - for (const { data } of ctx.network.packets.read(Move)) { - const it = zipper.find((entity) => entity.NetworkId.id === data.id); - if (!it) continue; - it.Position.x = data.position.x; - it.Position.y = data.position.y; - it.Velocity.x = data.velocity.x; - it.Velocity.y = data.velocity.y; - } -} diff --git a/example/pong-network/apps/client/tsconfig.json b/example/pong-network/apps/client/tsconfig.json deleted file mode 100644 index f90a806b..00000000 --- a/example/pong-network/apps/client/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], - "exclude": ["node_modules", "dist", ".nanoforge"] -} diff --git a/example/pong-network/apps/server/.prettierignore b/example/pong-network/apps/server/.prettierignore deleted file mode 100644 index 64b127c9..00000000 --- a/example/pong-network/apps/server/.prettierignore +++ /dev/null @@ -1,11 +0,0 @@ -# Ignore files for PNPM, NPM and YARN -pnpm-lock.yaml -package-lock.json -yarn.lock -bun.lock - -.turbo/ -node_modules/ -dist/ -coverage/ -CHANGELOG.md diff --git a/example/pong-network/apps/server/assets/.gitkeep b/example/pong-network/apps/server/assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-network/apps/server/eslint.config.js b/example/pong-network/apps/server/eslint.config.js deleted file mode 100644 index 62ec06dc..00000000 --- a/example/pong-network/apps/server/eslint.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-eslint-config"; - -export default config; diff --git a/example/pong-network/apps/server/nanoforge.config.ts b/example/pong-network/apps/server/nanoforge.config.ts deleted file mode 100644 index 43a3fef2..00000000 --- a/example/pong-network/apps/server/nanoforge.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { defineConfig } from "@nanoforge-dev/config"; - -export default defineConfig({ - type: "server", -}); diff --git a/example/pong-network/apps/server/package.json b/example/pong-network/apps/server/package.json deleted file mode 100644 index 039508dd..00000000 --- a/example/pong-network/apps/server/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "pong-network-server", - "version": "0.0.0", - "description": "", - "author": "", - "type": "module", - "scripts": { - "lint": "prettier --check . && eslint --format=pretty \"src/**/*.ts\"", - "format": "prettier --write . && eslint --fix --format=pretty \"src/**/*.ts\"" - }, - "devDependencies": { - "@nanoforge-dev/asset": "workspace:*", - "@nanoforge-dev/common": "workspace:*", - "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/env": "workspace:*", - "@nanoforge-dev/ecs": "workspace:*", - "@nanoforge-dev/network": "workspace:*", - "@nanoforge-dev/utils-eslint-config": "workspace:*", - "@nanoforge-dev/utils-prettier-config": "workspace:*", - "@trivago/prettier-plugin-sort-imports": "catalog:lint", - "eslint": "catalog:lint", - "lint-staged": "catalog:ci", - "prettier": "catalog:lint", - "typescript": "catalog:core" - }, - "private": true, - "lint-staged": { - "**": [ - "prettier --ignore-unknown --write" - ], - "src/**/*.ts": [ - "eslint --fix" - ] - } -} diff --git a/example/pong-network/apps/server/prettier.config.js b/example/pong-network/apps/server/prettier.config.js deleted file mode 100644 index 27d0e269..00000000 --- a/example/pong-network/apps/server/prettier.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-prettier-config"; - -export default config; diff --git a/example/pong-network/apps/server/src/components/components.ts b/example/pong-network/apps/server/src/components/components.ts deleted file mode 100644 index 9bb8846e..00000000 --- a/example/pong-network/apps/server/src/components/components.ts +++ /dev/null @@ -1,41 +0,0 @@ -export class Velocity { - name = "Velocity"; - x: number; - y: number; - - constructor(x: number, y: number) { - this.x = x; - this.y = y; - } -} - -export class Position { - name = "Position"; - x: number; - y: number; - - constructor(x: number, y: number) { - this.x = x; - this.y = y; - } -} - -export class Circle { - name = "Circle"; - radius: number; - - constructor(radius: number) { - this.radius = radius; - } -} - -export class Rectangle { - name = "Rectangle"; - width: number; - height: number; - - constructor(width: number, height: number) { - this.width = width; - this.height = height; - } -} diff --git a/example/pong-network/apps/server/src/main.ts b/example/pong-network/apps/server/src/main.ts deleted file mode 100644 index 62ec77ea..00000000 --- a/example/pong-network/apps/server/src/main.ts +++ /dev/null @@ -1,46 +0,0 @@ -import type { RunOptions } from "@nanoforge-dev/common"; -import { NanoforgeFactory } from "@nanoforge-dev/core"; -import { EcsLibrary } from "@nanoforge-dev/ecs/server"; -import { NetworkServerLibrary } from "@nanoforge-dev/network/server"; - -import { Input, Play } from "../../../shared/protocol"; -import { Position, Velocity } from "./components/components"; -import { bounce, handleClientInput, handlePlay, move, onClientDisconnect } from "./systems/systems"; - -export const main = async (options: RunOptions): Promise => { - const app = NanoforgeFactory.createServer({ tickRate: 60 }); - const ecs = new EcsLibrary(); - const network = new NetworkServerLibrary(); - - app.use(ecs); - app.use(network); - - await app.init(options); - - network.clients.onDisconnect(onClientDisconnect); - - const registry = ecs.registry; - - const ball = registry.spawnEntity(); - registry.addComponent(ball, new Position(960, 540)); - registry.addComponent(ball, new Velocity(0, 0)); - - const paddle1 = registry.spawnEntity(); - registry.addComponent(paddle1, new Position(20, 390)); - registry.addComponent(paddle1, new Velocity(0, 0)); - - const paddle2 = registry.spawnEntity(); - registry.addComponent(paddle2, new Position(1850, 390)); - registry.addComponent(paddle2, new Velocity(0, 0)); - - const zip = () => registry.getZipper([Position, Velocity]); - network.packets.on(Play, (_, { clientId, ctx }) => handlePlay(clientId, ctx.network, zip())); - network.packets.on(Input, ({ key }, { clientId, ctx }) => - handleClientInput(clientId, key, ctx.network, zip()), - ); - - registry.addSystem(bounce); - registry.addSystem(move); - - await app.run(); -}; diff --git a/example/pong-network/apps/server/src/scenes/.gitkeep b/example/pong-network/apps/server/src/scenes/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/example/pong-network/apps/server/src/systems/systems.ts b/example/pong-network/apps/server/src/systems/systems.ts deleted file mode 100644 index 0f2c2ac7..00000000 --- a/example/pong-network/apps/server/src/systems/systems.ts +++ /dev/null @@ -1,174 +0,0 @@ -import { type Context } from "@nanoforge-dev/common"; -import { type Registry } from "@nanoforge-dev/ecs/server"; -import { - Channel, - type ClientId, - type ClientInfo, - type NetworkServerContextApi, -} from "@nanoforge-dev/network/server"; - -import { AssignId, Move } from "../../../../shared/protocol"; -import { Position, Velocity } from "../components/components"; - -let cli1: ClientId | null = null; -let cli2: ClientId | null = null; -const paddleSpeed = 1; - -let roundStart = 0; - -export function move(registry: Registry, ctx: Context) { - const entities = registry.getZipper([Position, Velocity]); - - entities.forEach(({ Position, Velocity }) => { - Position.x += Velocity.x * ctx.app.delta; - Position.y += Velocity.y * ctx.app.delta; - }); -} - -function sendMoveAll( - id: number, - vel: Velocity, - pos: Position, - network: NetworkServerContextApi, - channel: Channel, -) { - network.packets.sendToAll( - Move, - { id: id, position: { x: pos.x, y: pos.y }, velocity: { x: vel.x, y: vel.y } }, - { channel }, - ); -} - -/** Free the paddle of a player who left. */ -export function onClientDisconnect(info: ClientInfo) { - if (info.id === cli1) cli1 = null; - if (info.id === cli2) cli2 = null; -} - -function connectNewClient(newCli: ClientId, network: NetworkServerContextApi, zip: any) { - network.packets.sendToClient(newCli, AssignId, { assigned: "ball", id: 0 }); - network.packets.sendToClient(newCli, AssignId, { assigned: "paddle1", id: 1 }); - network.packets.sendToClient(newCli, AssignId, { assigned: "paddle2", id: 2 }); - sendMoveAll(0, zip[0].Velocity, zip[0].Position, network, Channel.ReliableOrdered); - sendMoveAll(1, zip[1].Velocity, zip[1].Position, network, Channel.ReliableOrdered); - sendMoveAll(2, zip[2].Velocity, zip[2].Position, network, Channel.ReliableOrdered); -} - -export function handleClientInput( - clientId: ClientId, - key: string, - network: NetworkServerContextApi, - zip: any, -) { - let id; - - if (clientId === cli1) { - id = 1; - } else if (clientId === cli2) { - id = 2; - } else { - return; - } - const paddle = zip[id]; - - if (key === "up") { - paddle.Velocity.y = -paddleSpeed; - if (paddle.Position.y < 0) { - paddle.Position.y = 0; - paddle.Velocity.y = 0; - } - } - if (key === "down") { - paddle.Velocity.y = paddleSpeed; - if (paddle.Position.y > 780) { - paddle.Position.y = 780; - paddle.Velocity.y = 0; - } - } - if (key === "stop") { - paddle.Velocity.y = 0; - } - sendMoveAll(id, paddle.Velocity, paddle.Position, network, Channel.UnreliableOrdered); -} - -export function handlePlay(client: ClientId, network: NetworkServerContextApi, zip: any) { - if (client == cli1 || client == cli2) return; - if (cli1 === null) { - cli1 = client; - } else if (cli2 === null) { - cli2 = client; - } else { - return; - } - connectNewClient(client, network, zip); -} - -function checkOutOfTerrain(id: number, paddle: any, network: NetworkServerContextApi) { - if (paddle.Position.y < 0) { - paddle.Position.y = 0; - paddle.Velocity.y = 0; - sendMoveAll(id, paddle.Velocity, paddle.Position, network, Channel.UnreliableOrdered); - } - if (paddle.Position.y > 780) { - paddle.Position.y = 780; - paddle.Velocity.y = 0; - sendMoveAll(id, paddle.Velocity, paddle.Position, network, Channel.UnreliableOrdered); - } -} - -export const bounce = (registry: Registry, ctx: Context) => { - const network = ctx.network; - const zip = registry.getZipper([Position, Velocity]); - checkOutOfTerrain(1, zip[1], network); - checkOutOfTerrain(2, zip[2], network); - if (roundStart < 3000 && roundStart != -1) { - roundStart += ctx.app.delta; - return; - } - if (roundStart >= 3000) { - roundStart = -1; - zip[0].Velocity.x = 1; - sendMoveAll(0, zip[0].Velocity, zip[0].Position, network, Channel.UnreliableUnordered); - return; - } - let bounced = false; - if (zip[0].Position.y <= 0 || zip[0].Position.y >= 1080) { - zip[0].Velocity.y *= -1; - bounced = true; - } - if ( - (zip[0].Position.x <= 65 && - zip[1].Position.y - 15 <= zip[0].Position.y && - zip[0].Position.y - 15 <= zip[1].Position.y + 300) || - (zip[0].Position.x >= 1835 && - zip[2].Position.y - 15 <= zip[0].Position.y && - zip[0].Position.y - 15 <= zip[2].Position.y + 300) - ) { - let paddleTouched = 1; - if (zip[0].Position.x >= 1835) { - paddleTouched = 2; - } - const prevSpeed = Math.sqrt(zip[0].Velocity.x ** 2 + zip[0].Velocity.y ** 2); - const newSpeed = prevSpeed * 1.1; - const posOnPaddle = - (zip[0].Position.y - - (zip[0].Position.x < 960 ? zip[paddleTouched].Position.y : zip[paddleTouched].Position.y) + - 15) / - 330; - const baseAngle = posOnPaddle * ((6 * Math.PI) / 8) + Math.PI / 8 - Math.PI / 2; - const outAngle = zip[0].Position.x < 960 ? baseAngle : -baseAngle + Math.PI; - zip[0].Velocity.x = Math.cos(outAngle) * newSpeed; - zip[0].Velocity.y = Math.sin(outAngle) * newSpeed; - bounced = true; - } else if (zip[0].Position.x <= 15 || zip[0].Position.x >= 1905) { - zip[0].Position.x = 960; - zip[0].Position.y = 540; - zip[0].Velocity.x = 0; - zip[0].Velocity.y = 0; - roundStart = 0; - bounced = true; - } - if (bounced) { - sendMoveAll(0, zip[0].Velocity, zip[0].Position, network, Channel.UnreliableUnordered); - } -}; diff --git a/example/pong-network/apps/server/tsconfig.json b/example/pong-network/apps/server/tsconfig.json deleted file mode 100644 index f90a806b..00000000 --- a/example/pong-network/apps/server/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], - "exclude": ["node_modules", "dist", ".nanoforge"] -} diff --git a/example/pong-network/nanoforge.config.ts b/example/pong-network/nanoforge.config.ts deleted file mode 100644 index 99f24783..00000000 --- a/example/pong-network/nanoforge.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineConfig } from "@nanoforge-dev/config"; - -export default defineConfig({ - type: "workspace", - packages: ["apps/*"], -}); diff --git a/example/pong-network/package.json b/example/pong-network/package.json deleted file mode 100644 index 47eaf1a2..00000000 --- a/example/pong-network/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "pong-network", - "version": "0.0.0", - "description": "", - "author": "", - "type": "module", - "scripts": { - "start": "nf start", - "lint": "prettier --check .", - "format": "prettier --write .", - "test:unit": "vitest run --config ../../vitest.config.ts" - }, - "devDependencies": { - "@nanoforge-dev/asset": "workspace:*", - "@nanoforge-dev/cli": "^2.3.0", - "@nanoforge-dev/common": "workspace:*", - "@nanoforge-dev/config": "catalog:config", - "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/env": "workspace:*", - "@nanoforge-dev/network": "workspace:*", - "@trivago/prettier-plugin-sort-imports": "catalog:lint", - "lint-staged": "catalog:ci", - "prettier": "catalog:lint", - "typescript": "catalog:core", - "vitest": "catalog:test" - }, - "private": true, - "lint-staged": { - "**": [ - "prettier --ignore-unknown --write" - ] - } -} diff --git a/example/pong-network/prettier.config.js b/example/pong-network/prettier.config.js deleted file mode 100644 index 27d0e269..00000000 --- a/example/pong-network/prettier.config.js +++ /dev/null @@ -1,3 +0,0 @@ -import config from "@nanoforge-dev/utils-prettier-config"; - -export default config; diff --git a/example/pong-network/shared/protocol.ts b/example/pong-network/shared/protocol.ts deleted file mode 100644 index 555aa576..00000000 --- a/example/pong-network/shared/protocol.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Channel, definePacket } from "@nanoforge-dev/network"; - -type Vector = { x: number; y: number }; - -export const Play = definePacket("play"); -export const Input = definePacket<{ key: "up" | "down" | "stop" }>("input"); - -export const AssignId = definePacket<{ assigned: "ball" | "paddle1" | "paddle2"; id: number }>( - "assignId", -); -export const Move = definePacket<{ id: number; position: Vector; velocity: Vector }>("move", { - channel: Channel.UnreliableOrdered, -}); diff --git a/example/pong-network/test/pong-network.spec.ts b/example/pong-network/test/pong-network.spec.ts deleted file mode 100644 index 47075589..00000000 --- a/example/pong-network/test/pong-network.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NfNotFound } from "@nanoforge-dev/common"; -import { describe, expect, it } from "vitest"; - -// The client app instantiates a Konva layer at import time and needs a real browser canvas. -import { main as serverMain } from "../apps/server/src/main"; - -describe("pong-network server", () => { - it("should reject startup when libecs.wasm is missing", async () => { - await expect(serverMain({ files: new Map(), env: {} })).rejects.toBeInstanceOf(NfNotFound); - }); -}); diff --git a/example/pong-network/tsconfig.json b/example/pong-network/tsconfig.json deleted file mode 100644 index b1528990..00000000 --- a/example/pong-network/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.json", - "include": ["test/**/*.ts"], - "exclude": ["node_modules", "**/dist", "**/.nanoforge"] -} diff --git a/example/pong-network/tsconfig.spec.json b/example/pong-network/tsconfig.spec.json deleted file mode 100644 index 8270caba..00000000 --- a/example/pong-network/tsconfig.spec.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true, - "skipLibCheck": true - }, - "include": ["test/**/*.spec.ts"], - "exclude": ["node_modules"] -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 90debd30..ccf72b2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -431,330 +431,6 @@ importers: specifier: catalog:core version: 6.0.3 - example/cube-3d: - devDependencies: - '@nanoforge-dev/cli': - specifier: ^2.3.0 - version: 2.3.0(@types/node@26.4.0)(synckit@0.11.13) - '@nanoforge-dev/config': - specifier: catalog:config - version: 2.3.0(synckit@0.11.13) - '@trivago/prettier-plugin-sort-imports': - specifier: catalog:lint - version: 6.0.2(prettier@3.9.6)(supports-color@10.2.2) - lint-staged: - specifier: catalog:ci - version: 17.4.1 - prettier: - specifier: catalog:lint - version: 3.9.6 - typescript: - specifier: catalog:core - version: 6.0.3 - - example/cube-3d/apps/client: - devDependencies: - '@nanoforge-dev/asset': - specifier: workspace:* - version: link:../../../../packages/asset - '@nanoforge-dev/common': - specifier: workspace:* - version: link:../../../../packages/common - '@nanoforge-dev/core': - specifier: workspace:* - version: link:../../../../packages/core - '@nanoforge-dev/ecs': - specifier: workspace:* - version: link:../../../../modules/ecs - '@nanoforge-dev/graphics-3d': - specifier: workspace:* - version: link:../../../../modules/graphics-3d - '@nanoforge-dev/utils-eslint-config': - specifier: workspace:* - version: link:../../../../utils/eslint-config - '@nanoforge-dev/utils-prettier-config': - specifier: workspace:* - version: link:../../../../utils/prettier-config - '@trivago/prettier-plugin-sort-imports': - specifier: catalog:lint - version: 6.0.2(prettier@3.9.6)(supports-color@10.2.2) - '@types/three': - specifier: catalog:graphics - version: 0.187.0 - eslint: - specifier: catalog:lint - version: 10.9.1(jiti@2.6.1)(supports-color@10.2.2) - lint-staged: - specifier: catalog:ci - version: 17.4.1 - prettier: - specifier: catalog:lint - version: 3.9.6 - three: - specifier: catalog:graphics - version: 0.187.0 - typescript: - specifier: catalog:core - version: 6.0.3 - - example/pong-3d: - devDependencies: - '@nanoforge-dev/asset': - specifier: workspace:* - version: link:../../packages/asset - '@nanoforge-dev/cli': - specifier: ^2.3.0 - version: 2.3.0(@types/node@26.4.0)(synckit@0.11.13) - '@nanoforge-dev/common': - specifier: workspace:* - version: link:../../packages/common - '@nanoforge-dev/config': - specifier: catalog:config - version: 2.3.0(synckit@0.11.13) - '@nanoforge-dev/core': - specifier: workspace:* - version: link:../../packages/core - '@nanoforge-dev/env': - specifier: workspace:* - version: link:../../packages/env - '@nanoforge-dev/network': - specifier: workspace:* - version: link:../../modules/network - '@trivago/prettier-plugin-sort-imports': - specifier: catalog:lint - version: 6.0.2(prettier@3.9.6)(supports-color@10.2.2) - lint-staged: - specifier: catalog:ci - version: 17.4.1 - prettier: - specifier: catalog:lint - version: 3.9.6 - typescript: - specifier: catalog:core - version: 6.0.3 - - example/pong-3d/apps/client: - devDependencies: - '@nanoforge-dev/asset': - specifier: workspace:* - version: link:../../../../packages/asset - '@nanoforge-dev/common': - specifier: workspace:* - version: link:../../../../packages/common - '@nanoforge-dev/core': - specifier: workspace:* - version: link:../../../../packages/core - '@nanoforge-dev/ecs': - specifier: workspace:* - version: link:../../../../modules/ecs - '@nanoforge-dev/env': - specifier: workspace:* - version: link:../../../../packages/env - '@nanoforge-dev/graphics-3d': - specifier: workspace:* - version: link:../../../../modules/graphics-3d - '@nanoforge-dev/input': - specifier: workspace:* - version: link:../../../../modules/input - '@nanoforge-dev/network': - specifier: workspace:* - version: link:../../../../modules/network - '@nanoforge-dev/utils-eslint-config': - specifier: workspace:* - version: link:../../../../utils/eslint-config - '@nanoforge-dev/utils-prettier-config': - specifier: workspace:* - version: link:../../../../utils/prettier-config - '@trivago/prettier-plugin-sort-imports': - specifier: catalog:lint - version: 6.0.2(prettier@3.9.6)(supports-color@10.2.2) - eslint: - specifier: catalog:lint - version: 10.9.1(jiti@2.6.1)(supports-color@10.2.2) - lint-staged: - specifier: catalog:ci - version: 17.4.1 - prettier: - specifier: catalog:lint - version: 3.9.6 - three: - specifier: catalog:graphics - version: 0.187.0 - typescript: - specifier: catalog:core - version: 6.0.3 - - example/pong-3d/apps/server: - devDependencies: - '@nanoforge-dev/asset': - specifier: workspace:* - version: link:../../../../packages/asset - '@nanoforge-dev/common': - specifier: workspace:* - version: link:../../../../packages/common - '@nanoforge-dev/core': - specifier: workspace:* - version: link:../../../../packages/core - '@nanoforge-dev/ecs': - specifier: workspace:* - version: link:../../../../modules/ecs - '@nanoforge-dev/env': - specifier: workspace:* - version: link:../../../../packages/env - '@nanoforge-dev/network': - specifier: workspace:* - version: link:../../../../modules/network - '@nanoforge-dev/utils-eslint-config': - specifier: workspace:* - version: link:../../../../utils/eslint-config - '@nanoforge-dev/utils-prettier-config': - specifier: workspace:* - version: link:../../../../utils/prettier-config - '@trivago/prettier-plugin-sort-imports': - specifier: catalog:lint - version: 6.0.2(prettier@3.9.6)(supports-color@10.2.2) - eslint: - specifier: catalog:lint - version: 10.9.1(jiti@2.6.1)(supports-color@10.2.2) - lint-staged: - specifier: catalog:ci - version: 17.4.1 - prettier: - specifier: catalog:lint - version: 3.9.6 - typescript: - specifier: catalog:core - version: 6.0.3 - - example/pong-network: - devDependencies: - '@nanoforge-dev/asset': - specifier: workspace:* - version: link:../../packages/asset - '@nanoforge-dev/cli': - specifier: ^2.3.0 - version: 2.3.0(@types/node@26.4.0)(synckit@0.11.13) - '@nanoforge-dev/common': - specifier: workspace:* - version: link:../../packages/common - '@nanoforge-dev/config': - specifier: catalog:config - version: 2.3.0(synckit@0.11.13) - '@nanoforge-dev/core': - specifier: workspace:* - version: link:../../packages/core - '@nanoforge-dev/env': - specifier: workspace:* - version: link:../../packages/env - '@nanoforge-dev/network': - specifier: workspace:* - version: link:../../modules/network - '@trivago/prettier-plugin-sort-imports': - specifier: catalog:lint - version: 6.0.2(prettier@3.9.6)(supports-color@10.2.2) - lint-staged: - specifier: catalog:ci - version: 17.4.1 - prettier: - specifier: catalog:lint - version: 3.9.6 - typescript: - specifier: catalog:core - version: 6.0.3 - vitest: - specifier: catalog:test - version: 4.1.11(@types/node@26.4.0)(@vitest/coverage-v8@4.1.11)(vite@8.2.2(@types/node@26.4.0)(jiti@2.6.1)(yaml@2.9.0)) - - example/pong-network/apps/client: - devDependencies: - '@nanoforge-dev/asset': - specifier: workspace:* - version: link:../../../../packages/asset - '@nanoforge-dev/common': - specifier: workspace:* - version: link:../../../../packages/common - '@nanoforge-dev/core': - specifier: workspace:* - version: link:../../../../packages/core - '@nanoforge-dev/ecs': - specifier: workspace:* - version: link:../../../../modules/ecs - '@nanoforge-dev/env': - specifier: workspace:* - version: link:../../../../packages/env - '@nanoforge-dev/graphics-2d': - specifier: workspace:* - version: link:../../../../modules/graphics-2d - '@nanoforge-dev/input': - specifier: workspace:* - version: link:../../../../modules/input - '@nanoforge-dev/network': - specifier: workspace:* - version: link:../../../../modules/network - '@nanoforge-dev/utils-eslint-config': - specifier: workspace:* - version: link:../../../../utils/eslint-config - '@nanoforge-dev/utils-prettier-config': - specifier: workspace:* - version: link:../../../../utils/prettier-config - '@trivago/prettier-plugin-sort-imports': - specifier: catalog:lint - version: 6.0.2(prettier@3.9.6)(supports-color@10.2.2) - eslint: - specifier: catalog:lint - version: 10.9.1(jiti@2.6.1)(supports-color@10.2.2) - lint-staged: - specifier: catalog:ci - version: 17.4.1 - prettier: - specifier: catalog:lint - version: 3.9.6 - typescript: - specifier: catalog:core - version: 6.0.3 - - example/pong-network/apps/server: - devDependencies: - '@nanoforge-dev/asset': - specifier: workspace:* - version: link:../../../../packages/asset - '@nanoforge-dev/common': - specifier: workspace:* - version: link:../../../../packages/common - '@nanoforge-dev/core': - specifier: workspace:* - version: link:../../../../packages/core - '@nanoforge-dev/ecs': - specifier: workspace:* - version: link:../../../../modules/ecs - '@nanoforge-dev/env': - specifier: workspace:* - version: link:../../../../packages/env - '@nanoforge-dev/network': - specifier: workspace:* - version: link:../../../../modules/network - '@nanoforge-dev/utils-eslint-config': - specifier: workspace:* - version: link:../../../../utils/eslint-config - '@nanoforge-dev/utils-prettier-config': - specifier: workspace:* - version: link:../../../../utils/prettier-config - '@trivago/prettier-plugin-sort-imports': - specifier: catalog:lint - version: 6.0.2(prettier@3.9.6)(supports-color@10.2.2) - eslint: - specifier: catalog:lint - version: 10.9.1(jiti@2.6.1)(supports-color@10.2.2) - lint-staged: - specifier: catalog:ci - version: 17.4.1 - prettier: - specifier: catalog:lint - version: 3.9.6 - typescript: - specifier: catalog:core - version: 6.0.3 - modules/ecs: dependencies: '@nanoforge-dev/common': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 404db746..9be5c509 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -5,7 +5,6 @@ packages: - e2e/game/** - e2e/game-2d/** - e2e/game-3d/** - - example/** allowBuilds: bun: true From c58ed54b6d0555104fbc9203fdc00d800d4c92e8 Mon Sep 17 00:00:00 2001 From: Exelo Date: Fri, 13 Nov 2026 20:18:50 +0100 Subject: [PATCH 2/5] test(e2e): move the test games to the editor's item format One component or system per file with the editor's TSDoc tags, EditorLibrary registered last, editor-lib from the workspace, and @nanoforge-dev/cli and config 3.0.1. --- e2e/game-2d/apps/client/package.json | 1 + .../client/src/components/player.component.ts | 16 + e2e/game-2d/apps/client/src/main.ts | 31 +- .../client/src/systems/move-player.system.ts | 28 + e2e/game-2d/package.json | 2 +- e2e/game-3d/apps/client/package.json | 1 + .../client/src/components/model.component.ts | 16 + e2e/game-3d/apps/client/src/main.ts | 32 +- .../client/src/systems/turn-model.system.ts | 28 + e2e/game-3d/package.json | 2 +- e2e/game/apps/client/package.json | 7 +- .../src/components/example.component.ts | 45 +- e2e/game/apps/client/src/main.ts | 2 + .../apps/client/src/systems/example.system.ts | 19 +- e2e/game/apps/server/package.json | 3 +- .../src/components/example.component.ts | 45 +- e2e/game/apps/server/src/main.ts | 2 + .../apps/server/src/systems/example.system.ts | 19 +- e2e/game/package.json | 2 +- pnpm-lock.yaml | 606 ++++++++++++++---- pnpm-workspace.yaml | 2 +- 21 files changed, 639 insertions(+), 270 deletions(-) create mode 100644 e2e/game-2d/apps/client/src/components/player.component.ts create mode 100644 e2e/game-2d/apps/client/src/systems/move-player.system.ts create mode 100644 e2e/game-3d/apps/client/src/components/model.component.ts create mode 100644 e2e/game-3d/apps/client/src/systems/turn-model.system.ts diff --git a/e2e/game-2d/apps/client/package.json b/e2e/game-2d/apps/client/package.json index 0c1782d9..ade88988 100644 --- a/e2e/game-2d/apps/client/package.json +++ b/e2e/game-2d/apps/client/package.json @@ -6,6 +6,7 @@ "@nanoforge-dev/common": "workspace:*", "@nanoforge-dev/core": "workspace:*", "@nanoforge-dev/ecs": "workspace:*", + "@nanoforge-dev/editor-lib": "workspace:*", "@nanoforge-dev/graphics-2d": "workspace:*", "@nanoforge-dev/input": "workspace:*", "typescript": "catalog:core" diff --git a/e2e/game-2d/apps/client/src/components/player.component.ts b/e2e/game-2d/apps/client/src/components/player.component.ts new file mode 100644 index 00000000..8c8f27c7 --- /dev/null +++ b/e2e/game-2d/apps/client/src/components/player.component.ts @@ -0,0 +1,16 @@ +import { type Rect } from "@nanoforge-dev/graphics-2d"; + +/** + * The square the arrow keys move, read by the `movePlayer` system. + * + * @component + * @side client + */ +export class Player { + name = "Player"; + + constructor( + /** The square drawn for the player: the system moves it. */ + public shape: Rect, + ) {} +} diff --git a/e2e/game-2d/apps/client/src/main.ts b/e2e/game-2d/apps/client/src/main.ts index c1945e4c..1706c47e 100644 --- a/e2e/game-2d/apps/client/src/main.ts +++ b/e2e/game-2d/apps/client/src/main.ts @@ -1,8 +1,12 @@ -import type { ClientRunOptions, Context } from "@nanoforge-dev/common"; +import type { ClientRunOptions } from "@nanoforge-dev/common"; import { NanoforgeFactory } from "@nanoforge-dev/core"; -import { EcsLibrary, type Registry } from "@nanoforge-dev/ecs/client"; +import { EcsLibrary } from "@nanoforge-dev/ecs/client"; +import { EditorLibrary } from "@nanoforge-dev/editor-lib"; import { Circle, Graphics2DLibrary, Rect } from "@nanoforge-dev/graphics-2d"; -import { InputEnum, InputLibrary } from "@nanoforge-dev/input"; +import { InputLibrary } from "@nanoforge-dev/input"; + +import { Player } from "./components/player.component"; +import { movePlayer } from "./systems/move-player.system"; /** Read by the Playwright tests in `e2e/graphics`. */ export interface E2EState { @@ -10,15 +14,6 @@ export interface E2EState { player: { x: number; y: number }; } -class Player { - name = "Player"; - - constructor(public shape: Rect) {} -} - -// Fixed step per tick, not per second: screenshots and positions must not depend on frame timing. -const SPEED = 5; - export const main = async (options: ClientRunOptions): Promise => { const app = NanoforgeFactory.createClient({ tickRate: 60, @@ -30,6 +25,7 @@ export const main = async (options: ClientRunOptions): Promise => { app.use(graphics); app.use(ecs); app.use(input); + app.use(new EditorLibrary()); await app.init(options); @@ -45,16 +41,7 @@ export const main = async (options: ClientRunOptions): Promise => { const state: E2EState = { tick: 0, player: { x: square.x(), y: square.y() } }; (window as unknown as { __e2e: E2EState }).__e2e = state; - registry.addSystem((registry: Registry, ctx: Context) => { - registry.getZipper([Player]).forEach(({ Player }) => { - const dx = - (ctx.input.isKeyPressed(InputEnum.ArrowRight) ? SPEED : 0) - - (ctx.input.isKeyPressed(InputEnum.ArrowLeft) ? SPEED : 0); - Player.shape.x(Player.shape.x() + dx); - state.player = { x: Player.shape.x(), y: Player.shape.y() }; - }); - state.tick++; - }); + registry.addSystem(movePlayer); await app.run(); }; diff --git a/e2e/game-2d/apps/client/src/systems/move-player.system.ts b/e2e/game-2d/apps/client/src/systems/move-player.system.ts new file mode 100644 index 00000000..091f3d2d --- /dev/null +++ b/e2e/game-2d/apps/client/src/systems/move-player.system.ts @@ -0,0 +1,28 @@ +import type { Context } from "@nanoforge-dev/common"; +import { type Registry } from "@nanoforge-dev/ecs/client"; +import { InputEnum } from "@nanoforge-dev/input"; + +import { Player } from "../components/player.component"; +import type { E2EState } from "../main"; + +// Fixed step per tick, not per second: screenshots and positions must not depend on frame timing. +const SPEED = 5; + +/** + * Moves the `Player` square horizontally while an arrow key is held, and reports its position and + * the tick count in `window.__e2e` for the Playwright tests. + * + * @system + * @side client + */ +export const movePlayer = (registry: Registry, ctx: Context) => { + const state = (window as unknown as { __e2e: E2EState }).__e2e; + registry.getZipper([Player]).forEach(({ Player }) => { + const dx = + (ctx.input.isKeyPressed(InputEnum.ArrowRight) ? SPEED : 0) - + (ctx.input.isKeyPressed(InputEnum.ArrowLeft) ? SPEED : 0); + Player.shape.x(Player.shape.x() + dx); + state.player = { x: Player.shape.x(), y: Player.shape.y() }; + }); + state.tick++; +}; diff --git a/e2e/game-2d/package.json b/e2e/game-2d/package.json index 603c7f09..0a2f0ec0 100644 --- a/e2e/game-2d/package.json +++ b/e2e/game-2d/package.json @@ -8,7 +8,7 @@ "start": "nf start" }, "devDependencies": { - "@nanoforge-dev/cli": "^2.3.0", + "@nanoforge-dev/cli": "^3.0.1", "@nanoforge-dev/config": "catalog:config", "typescript": "catalog:core" }, diff --git a/e2e/game-3d/apps/client/package.json b/e2e/game-3d/apps/client/package.json index 60c65bce..98de8297 100644 --- a/e2e/game-3d/apps/client/package.json +++ b/e2e/game-3d/apps/client/package.json @@ -6,6 +6,7 @@ "@nanoforge-dev/common": "workspace:*", "@nanoforge-dev/core": "workspace:*", "@nanoforge-dev/ecs": "workspace:*", + "@nanoforge-dev/editor-lib": "workspace:*", "@nanoforge-dev/graphics-3d": "workspace:*", "@nanoforge-dev/input": "workspace:*", "@types/three": "catalog:graphics", diff --git a/e2e/game-3d/apps/client/src/components/model.component.ts b/e2e/game-3d/apps/client/src/components/model.component.ts new file mode 100644 index 00000000..8186f791 --- /dev/null +++ b/e2e/game-3d/apps/client/src/components/model.component.ts @@ -0,0 +1,16 @@ +import { type Object3D } from "@nanoforge-dev/graphics-3d/three"; + +/** + * A Three.js object the arrow keys turn, read by the `turnModel` system. + * + * @component + * @side client + */ +export class Model { + name = "Model"; + + constructor( + /** The object in the scene: the system turns it around its Y axis. */ + public object: Object3D, + ) {} +} diff --git a/e2e/game-3d/apps/client/src/main.ts b/e2e/game-3d/apps/client/src/main.ts index a327a7b9..453b5698 100644 --- a/e2e/game-3d/apps/client/src/main.ts +++ b/e2e/game-3d/apps/client/src/main.ts @@ -1,6 +1,7 @@ -import type { ClientRunOptions, Context } from "@nanoforge-dev/common"; +import type { ClientRunOptions } from "@nanoforge-dev/common"; import { NanoforgeFactory } from "@nanoforge-dev/core"; -import { EcsLibrary, type Registry } from "@nanoforge-dev/ecs/client"; +import { EcsLibrary } from "@nanoforge-dev/ecs/client"; +import { EditorLibrary } from "@nanoforge-dev/editor-lib"; import { type Graphics3DBackend, Graphics3DLibrary } from "@nanoforge-dev/graphics-3d"; import { BoxGeometry, @@ -9,9 +10,11 @@ import { HemisphereLight, Mesh, MeshStandardMaterial, - type Object3D, } from "@nanoforge-dev/graphics-3d/three"; -import { InputEnum, InputLibrary } from "@nanoforge-dev/input"; +import { InputLibrary } from "@nanoforge-dev/input"; + +import { Model } from "./components/model.component"; +import { turnModel } from "./systems/turn-model.system"; /** Read by the Playwright tests in `e2e/graphics`. */ export interface E2EState { @@ -20,15 +23,6 @@ export interface E2EState { cube: { rotationY: number }; } -class Model { - name = "Model"; - - constructor(public object: Object3D) {} -} - -// Fixed step per tick, not per second: screenshots and rotations must not depend on frame timing. -const TURN = 0.05; - export const main = async (options: ClientRunOptions): Promise => { const app = NanoforgeFactory.createClient({ tickRate: 60, @@ -41,6 +35,7 @@ export const main = async (options: ClientRunOptions): Promise => { app.use(graphics); app.use(ecs); app.use(input); + app.use(new EditorLibrary()); await app.init(options); @@ -67,16 +62,7 @@ export const main = async (options: ClientRunOptions): Promise => { }; (window as unknown as { __e2e: E2EState }).__e2e = state; - registry.addSystem((registry: Registry, ctx: Context) => { - registry.getZipper([Model]).forEach(({ Model }) => { - const turn = - (ctx.input.isKeyPressed(InputEnum.ArrowRight) ? TURN : 0) - - (ctx.input.isKeyPressed(InputEnum.ArrowLeft) ? TURN : 0); - Model.object.rotation.y += turn; - state.cube = { rotationY: Model.object.rotation.y }; - }); - state.tick++; - }); + registry.addSystem(turnModel); await app.run(); }; diff --git a/e2e/game-3d/apps/client/src/systems/turn-model.system.ts b/e2e/game-3d/apps/client/src/systems/turn-model.system.ts new file mode 100644 index 00000000..74855006 --- /dev/null +++ b/e2e/game-3d/apps/client/src/systems/turn-model.system.ts @@ -0,0 +1,28 @@ +import type { Context } from "@nanoforge-dev/common"; +import { type Registry } from "@nanoforge-dev/ecs/client"; +import { InputEnum } from "@nanoforge-dev/input"; + +import { Model } from "../components/model.component"; +import type { E2EState } from "../main"; + +// Fixed step per tick, not per second: screenshots and rotations must not depend on frame timing. +const TURN = 0.05; + +/** + * Turns the `Model` object around its Y axis while an arrow key is held, and reports its rotation + * and the tick count in `window.__e2e` for the Playwright tests. + * + * @system + * @side client + */ +export const turnModel = (registry: Registry, ctx: Context) => { + const state = (window as unknown as { __e2e: E2EState }).__e2e; + registry.getZipper([Model]).forEach(({ Model }) => { + const turn = + (ctx.input.isKeyPressed(InputEnum.ArrowRight) ? TURN : 0) - + (ctx.input.isKeyPressed(InputEnum.ArrowLeft) ? TURN : 0); + Model.object.rotation.y += turn; + state.cube = { rotationY: Model.object.rotation.y }; + }); + state.tick++; +}; diff --git a/e2e/game-3d/package.json b/e2e/game-3d/package.json index 4ea60046..872ead65 100644 --- a/e2e/game-3d/package.json +++ b/e2e/game-3d/package.json @@ -8,7 +8,7 @@ "start": "nf start" }, "devDependencies": { - "@nanoforge-dev/cli": "^2.3.0", + "@nanoforge-dev/cli": "^3.0.1", "@nanoforge-dev/config": "catalog:config", "typescript": "catalog:core" }, diff --git a/e2e/game/apps/client/package.json b/e2e/game/apps/client/package.json index 198e90fa..3b1ec519 100644 --- a/e2e/game/apps/client/package.json +++ b/e2e/game/apps/client/package.json @@ -12,13 +12,14 @@ "@nanoforge-dev/asset": "workspace:*", "@nanoforge-dev/common": "workspace:*", "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/env": "workspace:*", "@nanoforge-dev/ecs": "workspace:*", - "@nanoforge-dev/network": "workspace:*", + "@nanoforge-dev/editor-lib": "workspace:*", + "@nanoforge-dev/env": "workspace:*", "@nanoforge-dev/graphics-2d": "workspace:*", - "@nanoforge-dev/sound": "workspace:*", "@nanoforge-dev/input": "workspace:*", "@nanoforge-dev/music": "workspace:*", + "@nanoforge-dev/network": "workspace:*", + "@nanoforge-dev/sound": "workspace:*", "typescript": "catalog:core" }, "private": true, diff --git a/e2e/game/apps/client/src/components/example.component.ts b/e2e/game/apps/client/src/components/example.component.ts index 25f486bd..2e01eef2 100644 --- a/e2e/game/apps/client/src/components/example.component.ts +++ b/e2e/game/apps/client/src/components/example.component.ts @@ -1,11 +1,18 @@ -import { type EditorComponentManifest } from "@nanoforge-dev/ecs/client"; - +/** + * Counts down from `paramB`: the `exampleSystem` stops the game once it reaches 0. + * + * @component + * @side client + */ export class ExampleComponent { - name = this.constructor.name; + name = "ExampleComponent"; constructor( + /** Set to `end` by `exampleSystem` once `paramB` reaches 0. */ public paramA: string, + /** Ticks left before the game stops. */ public paramB: number, + /** Whether `paramAOrDefault` returns `paramA`. */ public paramC: boolean = false, ) {} @@ -21,35 +28,3 @@ export class ExampleComponent { this.paramB += 1; } } - -// * Required to generate code -export default ExampleComponent.name; - -// * Required for the editor to display the component and generate code -export const EDITOR_COMPONENT_MANIFEST: EditorComponentManifest = { - name: "Example", - description: "Example component description", - params: [ - { - type: "string", - name: "Param A", - description: "Param A description", - example: "Example value", - }, - { - type: "number", - name: "Param B", - description: "Param B description", - example: 3, - }, - { - type: "boolean", - name: "Param C", - description: "Param C description", - example: true, - default: false, - // Not required because it has a default value - optional: true, - }, - ], -}; diff --git a/e2e/game/apps/client/src/main.ts b/e2e/game/apps/client/src/main.ts index 989aa900..e528de9e 100644 --- a/e2e/game/apps/client/src/main.ts +++ b/e2e/game/apps/client/src/main.ts @@ -1,6 +1,7 @@ import type { ClientRunOptions } from "@nanoforge-dev/common"; import { NanoforgeFactory } from "@nanoforge-dev/core"; import { EcsLibrary } from "@nanoforge-dev/ecs/client"; +import { EditorLibrary } from "@nanoforge-dev/editor-lib"; import { Graphics2DLibrary } from "@nanoforge-dev/graphics-2d"; import { InputLibrary } from "@nanoforge-dev/input"; import { MusicLibrary } from "@nanoforge-dev/music"; @@ -26,6 +27,7 @@ export const main = async (options: ClientRunOptions): Promise => { app.use(music); app.use(network); app.use(sound); + app.use(new EditorLibrary()); await app.init({ ...options, diff --git a/e2e/game/apps/client/src/systems/example.system.ts b/e2e/game/apps/client/src/systems/example.system.ts index e98af998..0cb56239 100644 --- a/e2e/game/apps/client/src/systems/example.system.ts +++ b/e2e/game/apps/client/src/systems/example.system.ts @@ -1,8 +1,14 @@ import { type Context } from "@nanoforge-dev/common"; -import { type EditorSystemManifest, type Registry } from "@nanoforge-dev/ecs/client"; +import { type Registry } from "@nanoforge-dev/ecs/client"; import { ExampleComponent } from "../components/example.component"; +/** + * Counts `ExampleComponent.paramB` down every tick, then stops the game once it reached 0. + * + * @system + * @side client + */ export const exampleSystem = (registry: Registry, ctx: Context) => { const entities = registry.getZipper([ExampleComponent]); @@ -18,14 +24,3 @@ export const exampleSystem = (registry: Registry, ctx: Context) => { entity.ExampleComponent.paramB = entity.ExampleComponent.paramB - 1; }); }; - -// * Required to generate code -export default exampleSystem.name; - -// * Required for the editor to display the system and generate code -export const EDITOR_SYSTEM_MANIFEST: EditorSystemManifest = { - name: "Example", - description: - "This system end the game when paramB reaches 0 for any entity with ExampleComponent", - dependencies: ["ExampleComponent"], -}; diff --git a/e2e/game/apps/server/package.json b/e2e/game/apps/server/package.json index 4a55affd..d265679a 100644 --- a/e2e/game/apps/server/package.json +++ b/e2e/game/apps/server/package.json @@ -12,8 +12,9 @@ "@nanoforge-dev/asset": "workspace:*", "@nanoforge-dev/common": "workspace:*", "@nanoforge-dev/core": "workspace:*", - "@nanoforge-dev/env": "workspace:*", "@nanoforge-dev/ecs": "workspace:*", + "@nanoforge-dev/editor-lib": "workspace:*", + "@nanoforge-dev/env": "workspace:*", "@nanoforge-dev/network": "workspace:*", "typescript": "catalog:core" }, diff --git a/e2e/game/apps/server/src/components/example.component.ts b/e2e/game/apps/server/src/components/example.component.ts index 39d9fce0..e109623e 100644 --- a/e2e/game/apps/server/src/components/example.component.ts +++ b/e2e/game/apps/server/src/components/example.component.ts @@ -1,11 +1,18 @@ -import { type EditorComponentManifest } from "@nanoforge-dev/ecs/server"; - +/** + * Counts down from `paramB`: the `exampleSystem` stops the game once it reaches 0. + * + * @component + * @side server + */ export class ExampleComponent { - name = this.constructor.name; + name = "ExampleComponent"; constructor( + /** Set to `end` by `exampleSystem` once `paramB` reaches 0. */ public paramA: string, + /** Ticks left before the game stops. */ public paramB: number, + /** Whether `paramAOrDefault` returns `paramA`. */ public paramC: boolean = false, ) {} @@ -21,35 +28,3 @@ export class ExampleComponent { this.paramB += 1; } } - -// * Required to generate code -export default ExampleComponent.name; - -// * Required for the editor to display the component and generate code -export const EDITOR_COMPONENT_MANIFEST: EditorComponentManifest = { - name: "Example", - description: "Example component description", - params: [ - { - type: "string", - name: "Param A", - description: "Param A description", - example: "Example value", - }, - { - type: "number", - name: "Param B", - description: "Param B description", - example: 3, - }, - { - type: "boolean", - name: "Param C", - description: "Param C description", - example: true, - default: false, - // Not required because it has a default value - optional: true, - }, - ], -}; diff --git a/e2e/game/apps/server/src/main.ts b/e2e/game/apps/server/src/main.ts index 0fef76aa..07ac375a 100644 --- a/e2e/game/apps/server/src/main.ts +++ b/e2e/game/apps/server/src/main.ts @@ -1,6 +1,7 @@ import { type RunOptions } from "@nanoforge-dev/common"; import { NanoforgeFactory } from "@nanoforge-dev/core"; import { EcsLibrary } from "@nanoforge-dev/ecs/server"; +import { EditorLibrary } from "@nanoforge-dev/editor-lib"; import { ExampleComponent } from "./components/example.component"; import { exampleSystem } from "./systems/example.system"; @@ -14,6 +15,7 @@ export const main = async (options: RunOptions): Promise => { app.use(ecs); app.use(ticker); + app.use(new EditorLibrary()); await app.init(options); diff --git a/e2e/game/apps/server/src/systems/example.system.ts b/e2e/game/apps/server/src/systems/example.system.ts index ee900db8..e4ef6eba 100644 --- a/e2e/game/apps/server/src/systems/example.system.ts +++ b/e2e/game/apps/server/src/systems/example.system.ts @@ -1,8 +1,14 @@ import { type Context } from "@nanoforge-dev/common"; -import { type EditorSystemManifest, type Registry } from "@nanoforge-dev/ecs/server"; +import { type Registry } from "@nanoforge-dev/ecs/server"; import { ExampleComponent } from "../components/example.component"; +/** + * Counts `ExampleComponent.paramB` down every tick, then stops the game once it reached 0. + * + * @system + * @side server + */ export const exampleSystem = (registry: Registry, ctx: Context) => { const entities = registry.getZipper([ExampleComponent]); @@ -18,14 +24,3 @@ export const exampleSystem = (registry: Registry, ctx: Context) => { entity.ExampleComponent.paramB = entity.ExampleComponent.paramB - 1; }); }; - -// * Required to generate code -export default exampleSystem.name; - -// * Required for the editor to display the system and generate code -export const EDITOR_SYSTEM_MANIFEST: EditorSystemManifest = { - name: "Example", - description: - "This system end the game when paramB reaches 0 for any entity with ExampleComponent", - dependencies: ["ExampleComponent"], -}; diff --git a/e2e/game/package.json b/e2e/game/package.json index f149088d..86b50903 100644 --- a/e2e/game/package.json +++ b/e2e/game/package.json @@ -9,7 +9,7 @@ }, "devDependencies": { "@nanoforge-dev/asset": "workspace:*", - "@nanoforge-dev/cli": "^2.3.0", + "@nanoforge-dev/cli": "^3.0.1", "@nanoforge-dev/common": "workspace:*", "@nanoforge-dev/config": "catalog:config", "@nanoforge-dev/core": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ccf72b2b..a33e856a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -119,7 +119,7 @@ catalogs: version: 21.2.4 '@commitlint/config-conventional': specifier: ^21.2.2 - version: 21.2.2 + version: 21.2.4 '@favware/cliff-jumper': specifier: ^6.0.0 version: 6.1.0 @@ -131,8 +131,8 @@ catalogs: version: 17.4.1 config: '@nanoforge-dev/config': - specifier: ^2.3.0 - version: 2.3.0 + specifier: ^3.0.1 + version: 3.0.1 core: '@types/bun': specifier: ^1.4.2 @@ -225,7 +225,7 @@ importers: version: 21.2.4(conventional-commits-parser@7.1.2)(typescript@6.0.3) '@commitlint/config-conventional': specifier: catalog:ci - version: 21.2.2 + version: 21.2.4 '@nanoforge-dev/utils-eslint-config': specifier: workspace:* version: link:utils/eslint-config @@ -281,14 +281,14 @@ importers: specifier: workspace:* version: link:../../packages/asset '@nanoforge-dev/cli': - specifier: ^2.3.0 - version: 2.3.0(@types/node@26.4.0)(synckit@0.11.13) + specifier: ^3.0.1 + version: 3.0.1(@types/node@26.4.0)(synckit@0.11.13) '@nanoforge-dev/common': specifier: workspace:* version: link:../../packages/common '@nanoforge-dev/config': specifier: catalog:config - version: 2.3.0(synckit@0.11.13) + version: 3.0.1(synckit@0.11.13) '@nanoforge-dev/core': specifier: workspace:* version: link:../../packages/core @@ -302,11 +302,11 @@ importers: e2e/game-2d: devDependencies: '@nanoforge-dev/cli': - specifier: ^2.3.0 - version: 2.3.0(@types/node@26.4.0)(synckit@0.11.13) + specifier: ^3.0.1 + version: 3.0.1(@types/node@26.4.0)(synckit@0.11.13) '@nanoforge-dev/config': specifier: catalog:config - version: 2.3.0(synckit@0.11.13) + version: 3.0.1(synckit@0.11.13) typescript: specifier: catalog:core version: 6.0.3 @@ -322,6 +322,9 @@ importers: '@nanoforge-dev/ecs': specifier: workspace:* version: link:../../../../modules/ecs + '@nanoforge-dev/editor-lib': + specifier: workspace:* + version: link:../../../../modules/editor '@nanoforge-dev/graphics-2d': specifier: workspace:* version: link:../../../../modules/graphics-2d @@ -335,11 +338,11 @@ importers: e2e/game-3d: devDependencies: '@nanoforge-dev/cli': - specifier: ^2.3.0 - version: 2.3.0(@types/node@26.4.0)(synckit@0.11.13) + specifier: ^3.0.1 + version: 3.0.1(@types/node@26.4.0)(synckit@0.11.13) '@nanoforge-dev/config': specifier: catalog:config - version: 2.3.0(synckit@0.11.13) + version: 3.0.1(synckit@0.11.13) typescript: specifier: catalog:core version: 6.0.3 @@ -355,6 +358,9 @@ importers: '@nanoforge-dev/ecs': specifier: workspace:* version: link:../../../../modules/ecs + '@nanoforge-dev/editor-lib': + specifier: workspace:* + version: link:../../../../modules/editor '@nanoforge-dev/graphics-3d': specifier: workspace:* version: link:../../../../modules/graphics-3d @@ -385,6 +391,9 @@ importers: '@nanoforge-dev/ecs': specifier: workspace:* version: link:../../../../modules/ecs + '@nanoforge-dev/editor-lib': + specifier: workspace:* + version: link:../../../../modules/editor '@nanoforge-dev/env': specifier: workspace:* version: link:../../../../packages/env @@ -421,6 +430,9 @@ importers: '@nanoforge-dev/ecs': specifier: workspace:* version: link:../../../../modules/ecs + '@nanoforge-dev/editor-lib': + specifier: workspace:* + version: link:../../../../modules/editor '@nanoforge-dev/env': specifier: workspace:* version: link:../../../../packages/env @@ -1016,8 +1028,8 @@ importers: packages: - '@angular-devkit/core@22.1.8': - resolution: {integrity: sha512-34lsgg2FwMVBX7nR/ZqzRUcdvdYPvSB8XAEr2GudXAyZwLI9ehzfQlagAWR/gEb8p4uCFZW0r7uU0toxydq4Rw==} + '@angular-devkit/core@22.2.7': + resolution: {integrity: sha512-cchZAMsV4d76RDZBlWzPhYxM/Hb6bmq71oUngdrwehMbBbdQu3W9C2tGlvxuPxbRKru9ZlUa14YVXQ0+QnhFtw==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: chokidar: ^5.0.0 @@ -1025,13 +1037,13 @@ packages: chokidar: optional: true - '@angular-devkit/schematics-cli@22.1.8': - resolution: {integrity: sha512-SsGG8ompVzprmYE9sHi2L7DYZ+i1sD+YDfun6Rg2vkTCusejtD4SSGVxwuR6++dT22ZpN16OqUTmii/0bhE4xA==} + '@angular-devkit/schematics-cli@22.2.7': + resolution: {integrity: sha512-9Od0E8TiYTQWm/03QjYWnsryZA8ZSjTf/k5z61nPd/jgloVNvSW8kxC7/YMw+RoXh2idMzjiJxraKxg+gJxzPw==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} hasBin: true - '@angular-devkit/schematics@22.1.8': - resolution: {integrity: sha512-Pv3cPa/44kvEwYcqwx4Ns5dhIDmcFNSHhbpheqiEG1Z/u4e2t4zHKDtE3eHZB+8o+IcC7xJj+d+AqGR44RoZDA==} + '@angular-devkit/schematics@22.2.7': + resolution: {integrity: sha512-a1h7xNqBLQVo1e5eCyOU3axSbA9AFU6nnSH5QhlNhggfMeZde+eBrueSt25xsewoxlKO8EvkVT3+knMUkDYiGQ==} engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} '@babel/code-frame@7.29.7': @@ -1080,10 +1092,6 @@ packages: engines: {node: '>=22.12.0'} hasBin: true - '@commitlint/config-conventional@21.2.2': - resolution: {integrity: sha512-NxA37SZviusFUEYOQZ5hNnZ1h7O/KiemPkxjOlpzKJNnWxThiwc6/SaZhaPa8fyLvfRBAywhQhJJk8XESHWlpQ==} - engines: {node: '>=22.12.0'} - '@commitlint/config-conventional@21.2.4': resolution: {integrity: sha512-IRldtwgNmR0SySR7wizFbhRmq45lPt6H3XCNTMyVN7jrPLgi8JlTRR6Eg1HLWUQt9P1Lh3k6eY25ilDa47EE6w==} engines: {node: '>=22.12.0'} @@ -1144,10 +1152,6 @@ packages: resolution: {integrity: sha512-Y5gmQ+KxzqCrBFJfLvFEPvvwD3LDiNZoTT2yeFBm96M8qhmqSzQc5DvX3rheAaAMjyIvMXOCLS/mWfdpONsjyQ==} engines: {node: '>=22.12.0'} - '@commitlint/types@21.2.0': - resolution: {integrity: sha512-7zVFCDB2reMvJH5dmbKnOQPjZEvjdJTH8jc0U/PIPU1r3/+vf5pD1HlfitV2MWsWXrvu7u39iY1lyLUPOaN0Gw==} - engines: {node: '>=22.12.0'} - '@commitlint/types@21.2.3': resolution: {integrity: sha512-sGEA473TlCvhCGNoTBY9OXZVWdscIXdGt0dm8EpB+2MRfmt8LNh/X56P/T3nCtEB+eH5qGEa3odphSAoUxSfSQ==} engines: {node: '>=22.12.0'} @@ -1267,6 +1271,10 @@ packages: resolution: {integrity: sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + '@inquirer/ansi@2.1.0': + resolution: {integrity: sha512-63GU5AD9KhNbWM0jlhHoMJTEFck2upFOPxHlnCKf3xYTV3rjTUUQfodihmTnfYQzMLS29oy8lK/gA1eJgu4bhA==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + '@inquirer/checkbox@5.2.5': resolution: {integrity: sha512-bRt8J8m+Fot9CXv+zNQGXUq2ET0MggR1fPz7v6edN6MFYmsbfGnMmkmWZJEegMKqrAC8ej/o1sqisHZXZJMAfQ==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1276,6 +1284,15 @@ packages: '@types/node': optional: true + '@inquirer/checkbox@5.3.0': + resolution: {integrity: sha512-3QQSO87A+JoRtOtjtsgX2enwTL+3+VBVrkUpdqrIxMOgn5+W5sE57PcCPAiNUIESHxV4Q6mNEGxq2xLmRa0/yw==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/confirm@6.3.2': resolution: {integrity: sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1285,6 +1302,15 @@ packages: '@types/node': optional: true + '@inquirer/confirm@6.4.0': + resolution: {integrity: sha512-+DCZxrOF01Q/1SzTQkgycAQPS/Jf+Yol0h1P/MVmopukTsxGOu1h/LKqf30y0eHKFZYYrgUMVhGDhEbPmSPi9A==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/core@12.0.3': resolution: {integrity: sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1294,6 +1320,15 @@ packages: '@types/node': optional: true + '@inquirer/core@12.1.0': + resolution: {integrity: sha512-6H7usRWw4Gdjgpaem10CA5MfZ/xoYPGyInriR1Xubqjv+SVo8LIJ1erpFxW5JgCza6VZVZiKLTko7RtUU3AQMg==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/editor@5.3.3': resolution: {integrity: sha512-YsKkS2q63IiLtaDK/9nqzdComN97SDQrmKiyNggN+ceP4ty+Z6VwyTz3FpjeUWeW1Efss2xHFKCC9sx7hnrsxg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1303,6 +1338,15 @@ packages: '@types/node': optional: true + '@inquirer/editor@5.4.0': + resolution: {integrity: sha512-L7vdCe4jnMpzhDisu1tAnr4WGvfPOVz+vNFXyIIL7O2Ycn/n90sn1ARvg+4cwzLf+us51BE/cX7uhnrLcal3+g==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/expand@5.1.5': resolution: {integrity: sha512-uHuXLmXW+TtIfT/9vSBotypAkqn1n34Ul+CLGPos/xANyO4Ff5xZzkYhbKR4NEcfVK4a9mHQOpwVZzluSHFRGw==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1312,6 +1356,15 @@ packages: '@types/node': optional: true + '@inquirer/expand@5.2.0': + resolution: {integrity: sha512-AOp2KQk7QojUyWOP7VkqdBWmxLRaVH58wQMx3N4//P530EDtpVp1EWIjAJubx9ZohWS/UCEpIkA1TuiNki0iOA==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/external-editor@3.0.5': resolution: {integrity: sha512-f3QQJRIX5ZEneBHNUIuPjmbdzHnmRFJA8r2dkcb8q+OM5Uv5KtnuAttQumnrjcBVBM3mcTX1CkmtAkU58VRZxg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1321,10 +1374,23 @@ packages: '@types/node': optional: true + '@inquirer/external-editor@3.1.0': + resolution: {integrity: sha512-27JAkF38nXqXaoveU28iA/+Z8nutnF8B3JsbdToPHn9WnkrsMtZ0/YoJ29YwbtFexYIo+tIy6ikMvTdHKjjmGA==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/figures@2.0.9': resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + '@inquirer/figures@2.1.0': + resolution: {integrity: sha512-CR9u2PME23jxy2SOyTb117efwAAPm98Zr+LoWI+PiQ55D6U8Yeu/HyFTxwytKhPa6oxAGzdsm2Kg7oLS6B9z8w==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + '@inquirer/input@5.1.6': resolution: {integrity: sha512-HtcJhB2QFVXbLuJ5S3syhNbTUVxYvwqV4VRBDkQceBloC9bmTViUoRFP5PbSaDZb3HzfPmpuU/gG4ybVBz4FHA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1334,6 +1400,15 @@ packages: '@types/node': optional: true + '@inquirer/input@5.2.0': + resolution: {integrity: sha512-sIUPnN2X7M+7dq3RUd+e9QRacYnM+6B+kSucwQgj5VC5Eo/f+CIr2NyPBumxsViI+wzfokkgop/3x3KfHxNyJw==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/number@4.2.3': resolution: {integrity: sha512-6Yuwh1NGSbu1Lo4N1EWjXs1jKRntLg/ZCwhmeorEHde90v1XxAozdbd4Iu30eOQLW+6h1hp2O9ujNfLSbTPJnA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1343,6 +1418,15 @@ packages: '@types/node': optional: true + '@inquirer/number@4.3.0': + resolution: {integrity: sha512-xYkX4sPVgox0F7yQwpz/MByWjOGdLEf1pdjH+Lji2gAzSs2xezz5bN5YgS1n0tx9wo0mRhGvq1KJGtvDZ9XXcQ==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/password@5.2.2': resolution: {integrity: sha512-W9zYdyzogK+6110mqwaSJWCBu2yA5Q/OfnGSjjZB1bNpHlmUozXxTl0+QOZBNeVd6Qo81/qT75gW05gLAtITxw==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1352,9 +1436,9 @@ packages: '@types/node': optional: true - '@inquirer/prompts@8.5.2': - resolution: {integrity: sha512-IYR/3C/paEVVQYQvdDlFZVjRCJVYHHON0XXMH91KO9GSxs0TdKYWlUdvfQl2EfAHDxUaN3IBffkE/BDTh5nJ6g==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} + '@inquirer/password@5.3.0': + resolution: {integrity: sha512-KVqW4G/UbMK06uBN76xF89JKYC9YBWU7v+Kc2tUwMCO8pg3ASBr0HVabl1KaSqF94O2KiRu8aKx4EicN78PK+A==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} peerDependencies: '@types/node': '>=18' peerDependenciesMeta: @@ -1370,6 +1454,15 @@ packages: '@types/node': optional: true + '@inquirer/prompts@8.8.0': + resolution: {integrity: sha512-yYVT2Eo3mafb9tnU2Mr3+wh5wLCWyspExqVoPSMCIfBIn3ZUTE4IDfbCMbMgXaOH0tH+JZEhOtfczQhDzOjIGg==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/rawlist@5.3.5': resolution: {integrity: sha512-1oHky1ONfCOwNrnkQGDE1oaSij/3fI6HFMSf2H/WsGO2lEyDX9My82iggITSy9ddSZ8yk8j9v41OI0fVoSIoaA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1379,6 +1472,15 @@ packages: '@types/node': optional: true + '@inquirer/rawlist@5.4.0': + resolution: {integrity: sha512-x42wcy465GM5/mHNKBFdAJbLlLyzmYqr/DEa6F49nHpI+03EFwRCRKeLGQakx5XqZ4unc2yFuS78qAD4Rb0iFA==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/search@4.3.3': resolution: {integrity: sha512-fyuIU1Nbpvwlikjg3gXwJFDI11+EFjqQ7P+iByfmivIKQ1vmaykNrD/vy5unHuUqUpsOsnvJ25//tPF7E/RBRA==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1388,6 +1490,15 @@ packages: '@types/node': optional: true + '@inquirer/search@4.4.0': + resolution: {integrity: sha512-UJ+9tkzPT1AjnvjuPFYcOdO3BVeN28bfSXajYRFZTRgA9OiNl4k2Nn2cHHPwiIDyPHlvOnmE9ZOHyXhPHtvb+A==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/select@5.2.5': resolution: {integrity: sha512-9kc15hr8r/kI+3DO/xLog5nOzTz1jqsHXa6JBFzmQKhkoJ8Slda1I1L/uD8ZSZ9tF1yp79wwXe7mclvX1rqR2Q==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1397,6 +1508,15 @@ packages: '@types/node': optional: true + '@inquirer/select@5.3.0': + resolution: {integrity: sha512-Fmgfl0qjqCQo+/tjQpgnRXKh5N7/VpYcJh+AlYU2eHmHZLMGUBDzo+Gwc2ODzWJfXNRZmgaMhz4qULcO/C/rXg==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@inquirer/type@4.1.1': resolution: {integrity: sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==} engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} @@ -1406,6 +1526,15 @@ packages: '@types/node': optional: true + '@inquirer/type@4.3.0': + resolution: {integrity: sha512-/IA8q2nyjgyl0NGSjqiRXB8gh3We7Pzx9C0c+6Zoolu905jFc79anerrUG7+n65+qs310DRK43yi2WDI8nY59A==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true + '@isaacs/fs-minipass@4.0.1': resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==} engines: {node: '>=18.0.0'} @@ -1423,33 +1552,37 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@nanoforge-dev/cli@2.3.0': - resolution: {integrity: sha512-VVEodsvmLIIdQpwJ7KU/ei/q0Xupr/dhGqDDdc9QC9YnYg1KiSwbv9RD0ncFIUJU2O4kn+b4HIHKxp4e3n4gLQ==} + '@nanoforge-dev/cli@3.0.1': + resolution: {integrity: sha512-ZfrbETcAcX3vsPLO1WLSCJc2ERCAcIpbdi9Df5bmH3XLinQkDAcESkN9JkaI/vgV08A7xhTjV8zSDSwF0T73Xg==} engines: {node: '26'} hasBin: true - '@nanoforge-dev/config@2.3.0': - resolution: {integrity: sha512-+RKaLm9NnT+ddbA1GVjhNOi3y9qW9/Hc0sU1bozYA/MLPnTP4EwMfuIxl0R3sackGsu2EO9Zqu8TPgt87JWdFg==} + '@nanoforge-dev/config@3.0.1': + resolution: {integrity: sha512-XWRScOotb8IirerRx/mWLmUVYye3lo0PN/5a0MUp/eoSrhz0S6zzhGHEupRuC8aeHTjsQT7ctM3P6YyKSHZLaQ==} engines: {node: '26'} '@nanoforge-dev/editor@0.1.4': resolution: {integrity: sha512-bqbrH8ulFSiZz1iisJHtHeEzj1RV/70uErCYHeW4DIhVPsWbBfWKFvg/ghAbmPk5vsj0YnhDX6DSpik4S1QoiQ==} engines: {node: '25'} - '@nanoforge-dev/loader-client@1.6.0': - resolution: {integrity: sha512-hW4jz6QSVuF9wC6CIJfE2cmHGFCXNZFEy6dBYicaRFNZ/USF7FJBjyQvwyI5MoWdjwo0A7U/zPUfRe/3TuHzgA==} + '@nanoforge-dev/loader-client@1.7.0': + resolution: {integrity: sha512-zDj0yQ8cZyHHjAYDVIyB79mh4dK7WRgZG7Kc+d/43t2WX/pX2HqBVkpLcDPkA9cNOKpCRYWd3LyYISlz53gzyg==} + engines: {node: '26'} + + '@nanoforge-dev/loader-server@1.7.0': + resolution: {integrity: sha512-Yd/BYORhoar5znNSD7kGirAc1Al0q5t8iscbb07QWKeXWA+DLKjPSuKJC6ykysFkbs9HiZU59oOfxyvNL4h3Pw==} engines: {node: '26'} - '@nanoforge-dev/loader-server@1.6.0': - resolution: {integrity: sha512-Jnc9WHUMfCo8R11qPlIFPJ0COuwX6BJ8HkSTpyTMugNKvN9dcUIwiJ72NydLDGWeTbqqXGIcpFkIkX8APYP+WQ==} + '@nanoforge-dev/loader-website@1.7.0': + resolution: {integrity: sha512-x1fV3RYUUxru39sF5HJcfutNnifMMTIEHW92jgkR9gz06ZlZ+rQofuegXgAnEzs0dEXa+rhNQ/iXYbqOZvq6YQ==} engines: {node: '26'} - '@nanoforge-dev/loader-website@1.6.0': - resolution: {integrity: sha512-szo3/jPBFqUvgYeyHIN6LfzyK0GFxkgTtPJaNcqyFKEkSytUxRdplE4r+WykcMVIk7LlUwbZ56wai7RS38cPfg==} + '@nanoforge-dev/registry@3.0.1': + resolution: {integrity: sha512-EzSaszYtrPldD5Do7jdQK3TLLb8uCirY6NQjKXkeGw31X+sUXor4h5GAaoxELWMzPnv9BbKtggSaVaQIt7s8IQ==} engines: {node: '26'} - '@nanoforge-dev/schematics@2.3.0': - resolution: {integrity: sha512-QpxyZu8DuddTp0IEmIEiYnGCDdfLDhYvlEFuLlCrLF0Lyuf4Dgl51RUIZ0HnN1MDO2U1Ps14cYwo+3QgM3djCw==} + '@nanoforge-dev/schematics@3.0.1': + resolution: {integrity: sha512-iK2vC0gPEh2mQ81IB4+jfGw/ZNOLMDnS9HRBXH5tWB0mdN5GA32viblhW0oYPX2/tWrLC9YiCPgEE4AL8Zwz6w==} engines: {node: '26'} '@node-datachannel/android-arm64@0.33.4': @@ -1542,65 +1675,129 @@ packages: cpu: [arm64] os: [darwin] + '@oven/bun-darwin-aarch64@1.4.4': + resolution: {integrity: sha512-zW/hxwc8sJAILGwB5eTC4i48ouGXf0V4lrxmEOk3JIE6JkYVW1TZh1E2pIempqsezgW1sckTIIDudFON8bJ2Mw==} + cpu: [arm64] + os: [darwin] + '@oven/bun-darwin-x64@1.4.2': resolution: {integrity: sha512-gZTxZuLjkUhAWjTETu3tw0WhsEdNkJ64daj60ybhPf835a2yollV3yTkK9JozvzKPx4TRFzLSl8C+U525pxVbw==} cpu: [x64] os: [darwin] + '@oven/bun-darwin-x64@1.4.4': + resolution: {integrity: sha512-oKGcxLsvh4oHjAo28nPm8c/xN0o/OmGyj1IHYc94vprkWsW2hNg2keEZt5f40cI5Hvu4jDlSRTR0UNpv1UIAxw==} + cpu: [x64] + os: [darwin] + '@oven/bun-freebsd-aarch64@1.4.2': resolution: {integrity: sha512-SMNItMw1Z8QeeQVKnw8jA7xQNkeXdP+OPgin4Wi/QTx/B8RHHLnuZfqmFy7NtVeT2NF0kKYppW4WWd2CCYZjhQ==} cpu: [arm64] os: [freebsd] + '@oven/bun-freebsd-aarch64@1.4.4': + resolution: {integrity: sha512-klvA9FlwLxZj3JYIOPQA4bbnHIC3uas8kBE4GaGGkeVgAQP/k8hAzYkOqkSaqHBDbxLrTyFEQArEAevJq6NJzg==} + cpu: [arm64] + os: [freebsd] + '@oven/bun-freebsd-x64@1.4.2': resolution: {integrity: sha512-THbPKXhO54N0DpFRKZNDZpQ7dpbX0bWASuARckAUS9wRtFIHsiY+uULXJvxJGo2YD1YewvXQ4G8Fj7XT5oBCiw==} cpu: [x64] os: [freebsd] + '@oven/bun-freebsd-x64@1.4.4': + resolution: {integrity: sha512-sF1xS/scbyN94P2d0eTiarO6JHxrIvhZNT9hnWjQXW5nwKRtfuP+UYnIMNyvW1BQPcZFP/cvfLBNUIe1ea4zPA==} + cpu: [x64] + os: [freebsd] + '@oven/bun-linux-aarch64-android@1.4.2': resolution: {integrity: sha512-3mZKO2rhsNgbAUtAHC1UKUlF2zTxFraDZT/Elv8wzyH0fJL9h+Iv3TgB9lO63w89PRn3eFe+NRA1bhVgikKNPQ==} cpu: [arm64] os: [android] + '@oven/bun-linux-aarch64-android@1.4.4': + resolution: {integrity: sha512-5lvn3at5vRC0GxvmiqEiV2/e23tnRi0q5pzR40yfDvDA3OW7PSkt4chF1nA9vnAJhro4/l+ol1FmNP6D3cf/oA==} + cpu: [arm64] + os: [android] + '@oven/bun-linux-aarch64-musl@1.4.2': resolution: {integrity: sha512-+Sm6y+lSiSFBOtXmnekp5Q6n1tUKlyv71FCPWBc61Cgb14T5eBs8SN/nh4MUCOKzONkI3O+as3MGUgikS4aCBQ==} cpu: [arm64] os: [linux] libc: [musl] + '@oven/bun-linux-aarch64-musl@1.4.4': + resolution: {integrity: sha512-QFd0P+mHJxbZFbUla4MgiE5OwxysHaUIYxL2pPNkpWtaI7v4ShOpr8OhBmsuyB0xn5rv/ZJnPsj2y8+bB9+g/A==} + cpu: [arm64] + os: [linux] + libc: [musl] + '@oven/bun-linux-aarch64@1.4.2': resolution: {integrity: sha512-3BBP9ovJ2RGHFH6Ae1CAtxNtG1+YY6GD6rmYbsUosoAk9+OEl6zeDQ/k4fBkc6dYOJCtWnx8hUxzNzQATSmvYQ==} cpu: [arm64] os: [linux] libc: [glibc] + '@oven/bun-linux-aarch64@1.4.4': + resolution: {integrity: sha512-ZTVtpf9zmHSBVPX1sBwe5agGb/rN34yPGg/Hby8e2Ax2uCUA2URZKlZH7qLntK7qaFJCMXh9v0GWNYN2zINz1w==} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@oven/bun-linux-x64-android@1.4.2': resolution: {integrity: sha512-6HC5tzcC79113n2IHCTJMWv+HsQImv4ZFEK2XpYLxY6HbT8tM4cUM2Zv1bHZBQsS3jv/zYBamDJ1UX7If0d5tw==} cpu: [x64] os: [android] + '@oven/bun-linux-x64-android@1.4.4': + resolution: {integrity: sha512-3dMicj9C1DhaIfDkwt/9GtpU0W+q+GazbG9OIlEyL3Q1BBEz2e6ZRz/JiO8D/ECC0caXAqvnpFudehcLlgIwWQ==} + cpu: [x64] + os: [android] + '@oven/bun-linux-x64-musl@1.4.2': resolution: {integrity: sha512-vVTKUg1bnPhRP/Hp73jIVoFh2vPFNYEqYX0ERKfZBOQEEHitNAeukZzzuUDZS0SoDCIpuWUGSpd/CDMbjdR+Uw==} cpu: [x64] os: [linux] libc: [musl] + '@oven/bun-linux-x64-musl@1.4.4': + resolution: {integrity: sha512-lEEjNOJJrbGZu2NVcPI4uXdILcpspezWkA8R/Jr0RCGhM6zQd0Y7JBIIKNAmbX59EeWpeEz7Q78iLbpcAUypUA==} + cpu: [x64] + os: [linux] + libc: [musl] + '@oven/bun-linux-x64@1.4.2': resolution: {integrity: sha512-9/E/UXOTpSo3YsV5g+FhtTd/qTpiWoKuxS12cqtuYA1ssu9fRAoPQnipFgGyck3tWO63iUdxBiygq+kELFawng==} cpu: [x64] os: [linux] libc: [glibc] + '@oven/bun-linux-x64@1.4.4': + resolution: {integrity: sha512-CHbbkmHVM28T1GFq+6GL4Ao4ujwwYwj1CxFFwEFzLanPfNsId9AhbIP0Q4reWuWBkGimUkoQygrK7Rgjtj3vog==} + cpu: [x64] + os: [linux] + libc: [glibc] + '@oven/bun-windows-aarch64@1.4.2': resolution: {integrity: sha512-8EJ1ST7339WJE3poPW5nBgVW/lWf9HBz4W27ZUNhburKmcBLOByPyE6DP9fHD8FQGm5c+ilUN2hX1mrW0jxq9Q==} cpu: [arm64] os: [win32] + '@oven/bun-windows-aarch64@1.4.4': + resolution: {integrity: sha512-n0ep5ZRPCZY1+dqFJpnnRUZB1wy4GYU6At8RF+pyzySCLjkN9R4rFh2PtBHAgF/lg1vOl3/CeER3pDM+p40ATA==} + cpu: [arm64] + os: [win32] + '@oven/bun-windows-x64@1.4.2': resolution: {integrity: sha512-+bN6OuVld/9diT/RLSXSW7JE6CvNE3gL9XsAEjULi1nUsXd6DNO6GuA9jNdNb3r8PdJFnYHr5aypNV1Oj3Rd9g==} cpu: [x64] os: [win32] + '@oven/bun-windows-x64@1.4.4': + resolution: {integrity: sha512-a3LNctBVO8PjePsFZfwDleF2JXYf2BfQ1u/PLRnBDLnC2Riml+4+LgJpKj4xRGhB92KweGyQI5PXaTkP9qypMQ==} + cpu: [x64] + os: [win32] + '@oxc-project/types@0.147.0': resolution: {integrity: sha512-IJ3s6ltHLp45S0bh7phkX+gJO7A1Wuz2EaqpAhb8WjqDwbzMiWKHhyyT42tskaWjEYXtHtVCPpnBJVT9+dcRLg==} @@ -2280,8 +2477,8 @@ packages: resolution: {integrity: sha512-BJ8/l4R5LRE7hW9WdSuGYrLSHi2ynxeFpDFbH0K/CgNeY/tyhk+vO6TYxXC5r5CpUhNVX310xzPsN/H9lCdfOA==} engines: {node: '>=14'} - ansis@4.4.0: - resolution: {integrity: sha512-9k3v7xcHwgdO/DruxGIg4HtjvlAZlcnsX/mzqUb1t3NkYnl9kK2UJ+Gq0io+vQf7iT//BD/HB/NBkUR1LWxoeA==} + ansis@4.5.0: + resolution: {integrity: sha512-KwIVkfFfJSSzBmZhDGuTmkhWqTdyB5oNVzzznBJbBZ5bZtHiqSrcugRF0RKJKT4Ss3d7ZrcjnlFVDlQNmtWfWw==} engines: {node: '>=14'} argparse@2.0.1: @@ -2331,6 +2528,12 @@ packages: os: [darwin, linux, android, freebsd, win32] hasBin: true + bun@1.4.4: + resolution: {integrity: sha512-hj0ASdG6PNjLZGFAXktWb3Uaj/dcv/1wCsIttoEXADNIQBsGjTr+5uLKYbrDkuc7NT0Tkj4yPIqJI2jDxXdvVg==} + cpu: [arm64, x64] + os: [darwin, linux, android, freebsd, win32] + hasBin: true + bundle-name@4.1.0: resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==} engines: {node: '>=18'} @@ -2402,6 +2605,10 @@ packages: resolution: {integrity: sha512-z67u4ZhzCL/Tydu1lJARtEZYWbWaN7oYLHbsuzocr6y4N6WZAagG3RQ4FW61V1/0+jImpj293XfrcYnd1qxtPg==} engines: {node: '>=22.12.0'} + commander@15.1.0: + resolution: {integrity: sha512-cgnQ88TRrWcC7pVq46RzJVRMktu3W2RcbnoidnfBsl1bmDCBwJS/udcIZpKoCrbAYYaCqsz1yZCVIgbIaU3ddQ==} + engines: {node: '>=22.12.0'} + content-type@3.0.0: resolution: {integrity: sha512-AIi5H6p0xk5uknXcN3/rmhP8jgp69OfSe/JuKiQAFprJ7UGw7mwj7m4XcmDzlrnJDG+cGpphAINGdU3g3g7kDw==} engines: {node: '>=22'} @@ -2491,8 +2698,8 @@ packages: resolution: {integrity: sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==} engines: {node: '>=12'} - dotenv@18.0.3: - resolution: {integrity: sha512-/8CJTyL817qPnfbQrJgOEcrU3fDrJkRIoXBE566wHuvIXKOCHUZhPqGPbCPi9SogjdGnreF0TlvnTgK6J/8zpA==} + dotenv@18.0.10: + resolution: {integrity: sha512-89FAA1xchzK2mxVWdr5F/0rldwiueXs6zJM86rO66EzekR1iBdiXRthyG+m5GvkJaFH3C2LESzamTkgndmLT2A==} engines: {node: '>=12'} hasBin: true @@ -3049,8 +3256,8 @@ packages: magic-string@0.30.21: resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} - magic-string@1.0.0: - resolution: {integrity: sha512-CGvjzMN08iv6w1mm4/x3Gh1hLb4VnyRUA15FFpl6CsCIGGoe36k7kY5KNz9QDbSBN5I/fWHM6ZlIkUTa5xdUEA==} + magic-string@1.4.1: + resolution: {integrity: sha512-8lyCu36ErXR0J9uaGKlKQoiLZKmtI63YGLE8G2o9jyRPdr4X47LusSOwgOJOzcVtp81fTAAjxR7BwKz682Jhow==} magicast@0.5.4: resolution: {integrity: sha512-llBEhWm1SacoRwgHUoQJYtwp4PBLF4faQi5TCpIGyGs9n4y5+juI0tDgyKIfpqxckRHaHzouUEph3THklWh03w==} @@ -3104,6 +3311,10 @@ packages: resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==} engines: {node: ^20.17.0 || >=22.9.0} + mute-stream@4.0.0: + resolution: {integrity: sha512-gSrprq0fJ3EiOErzjdIZrjysVVmJ4uu1QWfCDss5LypA5OXvrMje5Ym5z6V6RLyJ2eF87lasX7t6a0AnFvZblg==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} + nanoid@3.3.18: resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -3200,10 +3411,6 @@ packages: resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==} engines: {node: '>=8.6'} - picomatch@4.0.5: - resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==} - engines: {node: '>=12'} - picomatch@4.0.7: resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} engines: {node: '>=12'} @@ -3269,9 +3476,6 @@ packages: resolution: {integrity: sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==} engines: {node: '>= 20.19.0'} - reflect-metadata@0.2.2: - resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==} - require-from-string@2.0.2: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} @@ -3330,6 +3534,11 @@ packages: engines: {node: '>=10'} hasBin: true + semver@7.8.6: + resolution: {integrity: sha512-9lpSSU4Mly3mrtruwLs1eLK6+gzbzqeBFwRNjIjE+9LuDpWdYctrQlQ3ej1Ilgi7gknpsTRnPoLP8DpCHqHIJw==} + engines: {node: '>=10'} + hasBin: true + shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} @@ -3357,8 +3566,8 @@ packages: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} - source-map@0.7.6: - resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==} + source-map@0.8.0: + resolution: {integrity: sha512-d8EqvL+k/SOXCreS/SUzg2ciyHqBBLcN/yuRjFsbvVhHTE2pgei7oAhmPM7kWFbkX6OSMQfUq4KbkF3au9lhYQ==} engines: {node: '>= 12'} stackback@0.0.2: @@ -3702,36 +3911,36 @@ packages: yuku-parser@0.8.7: resolution: {integrity: sha512-vRD9nwt4L3aYpxNqeSC4WqLv58xrXef0Ong1Mc45CTXTIpvLafx7JO05sczmQZwdLEZvywrLOGdNC5+Rp5N1BQ==} - zod@4.6.5: - resolution: {integrity: sha512-v5l/aFXZQeai4awLbOpSoHecE9UiMrnfx75tEXLjNonXVARxQ5mOeipTjROUchszUNCqnE+hqAMujRsRHsut2Q==} + zod@4.6.7: + resolution: {integrity: sha512-g8W2D2kU6a8untc053fX1uVBKzM7yqAxW/3zwk83+6RyF2+SKOuV+c0wBDhUwzV1PaGapmZH+rmcUzPf+3CGwg==} snapshots: - '@angular-devkit/core@22.1.8(chokidar@5.0.0)': + '@angular-devkit/core@22.2.7(chokidar@5.0.0)': dependencies: ajv: 8.20.0 ajv-formats: 3.0.1(ajv@8.20.0) jsonc-parser: 3.3.1 - picomatch: 4.0.5 + picomatch: 4.0.7 rxjs: 7.8.2 - source-map: 0.7.6 + source-map: 0.8.0 optionalDependencies: chokidar: 5.0.0 - '@angular-devkit/schematics-cli@22.1.8(@types/node@26.4.0)(chokidar@5.0.0)': + '@angular-devkit/schematics-cli@22.2.7(@types/node@26.4.0)(chokidar@5.0.0)': dependencies: - '@angular-devkit/core': 22.1.8(chokidar@5.0.0) - '@angular-devkit/schematics': 22.1.8(chokidar@5.0.0) - '@inquirer/prompts': 8.5.2(@types/node@26.4.0) + '@angular-devkit/core': 22.2.7(chokidar@5.0.0) + '@angular-devkit/schematics': 22.2.7(chokidar@5.0.0) + '@inquirer/prompts': 8.7.2(@types/node@26.4.0) transitivePeerDependencies: - '@types/node' - chokidar - '@angular-devkit/schematics@22.1.8(chokidar@5.0.0)': + '@angular-devkit/schematics@22.2.7(chokidar@5.0.0)': dependencies: - '@angular-devkit/core': 22.1.8(chokidar@5.0.0) + '@angular-devkit/core': 22.2.7(chokidar@5.0.0) jsonc-parser: 3.3.1 - magic-string: 1.0.0 + magic-string: 1.4.1 ora: 9.4.1 rxjs: 7.8.2 transitivePeerDependencies: @@ -3801,11 +4010,6 @@ snapshots: - conventional-commits-parser - typescript - '@commitlint/config-conventional@21.2.2': - dependencies: - '@commitlint/types': 21.2.0 - conventional-changelog-conventionalcommits: 10.4.0 - '@commitlint/config-conventional@21.2.4': dependencies: '@commitlint/types': 21.2.3 @@ -3893,11 +4097,6 @@ snapshots: dependencies: escalade: 3.2.0 - '@commitlint/types@21.2.0': - dependencies: - conventional-commits-parser: 7.1.2 - picocolors: 1.1.1 - '@commitlint/types@21.2.3': dependencies: conventional-commits-parser: 7.1.2 @@ -4011,6 +4210,8 @@ snapshots: '@inquirer/ansi@2.0.8': {} + '@inquirer/ansi@2.1.0': {} + '@inquirer/checkbox@5.2.5(@types/node@26.4.0)': dependencies: '@inquirer/ansi': 2.0.8 @@ -4020,6 +4221,15 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/checkbox@5.3.0(@types/node@26.4.0)': + dependencies: + '@inquirer/ansi': 2.1.0 + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/figures': 2.1.0 + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/confirm@6.3.2(@types/node@26.4.0)': dependencies: '@inquirer/core': 12.0.3(@types/node@26.4.0) @@ -4027,6 +4237,13 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/confirm@6.4.0(@types/node@26.4.0)': + dependencies: + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/core@12.0.3(@types/node@26.4.0)': dependencies: '@inquirer/ansi': 2.0.8 @@ -4039,6 +4256,18 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/core@12.1.0(@types/node@26.4.0)': + dependencies: + '@inquirer/ansi': 2.1.0 + '@inquirer/figures': 2.1.0 + '@inquirer/type': 4.3.0(@types/node@26.4.0) + cli-width: 4.1.0 + fast-wrap-ansi: 0.2.2 + mute-stream: 4.0.0 + signal-exit: 4.1.0 + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/editor@5.3.3(@types/node@26.4.0)': dependencies: '@inquirer/core': 12.0.3(@types/node@26.4.0) @@ -4047,6 +4276,14 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/editor@5.4.0(@types/node@26.4.0)': + dependencies: + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/external-editor': 3.1.0(@types/node@26.4.0) + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/expand@5.1.5(@types/node@26.4.0)': dependencies: '@inquirer/core': 12.0.3(@types/node@26.4.0) @@ -4054,6 +4291,13 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/expand@5.2.0(@types/node@26.4.0)': + dependencies: + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/external-editor@3.0.5(@types/node@26.4.0)': dependencies: chardet: 2.2.0 @@ -4061,8 +4305,17 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/external-editor@3.1.0(@types/node@26.4.0)': + dependencies: + chardet: 2.2.0 + iconv-lite: 0.7.3 + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/figures@2.0.9': {} + '@inquirer/figures@2.1.0': {} + '@inquirer/input@5.1.6(@types/node@26.4.0)': dependencies: '@inquirer/core': 12.0.3(@types/node@26.4.0) @@ -4070,6 +4323,13 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/input@5.2.0(@types/node@26.4.0)': + dependencies: + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/number@4.2.3(@types/node@26.4.0)': dependencies: '@inquirer/core': 12.0.3(@types/node@26.4.0) @@ -4077,6 +4337,13 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/number@4.3.0(@types/node@26.4.0)': + dependencies: + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/password@5.2.2(@types/node@26.4.0)': dependencies: '@inquirer/ansi': 2.0.8 @@ -4085,18 +4352,11 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 - '@inquirer/prompts@8.5.2(@types/node@26.4.0)': + '@inquirer/password@5.3.0(@types/node@26.4.0)': dependencies: - '@inquirer/checkbox': 5.2.5(@types/node@26.4.0) - '@inquirer/confirm': 6.3.2(@types/node@26.4.0) - '@inquirer/editor': 5.3.3(@types/node@26.4.0) - '@inquirer/expand': 5.1.5(@types/node@26.4.0) - '@inquirer/input': 5.1.6(@types/node@26.4.0) - '@inquirer/number': 4.2.3(@types/node@26.4.0) - '@inquirer/password': 5.2.2(@types/node@26.4.0) - '@inquirer/rawlist': 5.3.5(@types/node@26.4.0) - '@inquirer/search': 4.3.3(@types/node@26.4.0) - '@inquirer/select': 5.2.5(@types/node@26.4.0) + '@inquirer/ansi': 2.1.0 + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/type': 4.3.0(@types/node@26.4.0) optionalDependencies: '@types/node': 26.4.0 @@ -4115,6 +4375,21 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/prompts@8.8.0(@types/node@26.4.0)': + dependencies: + '@inquirer/checkbox': 5.3.0(@types/node@26.4.0) + '@inquirer/confirm': 6.4.0(@types/node@26.4.0) + '@inquirer/editor': 5.4.0(@types/node@26.4.0) + '@inquirer/expand': 5.2.0(@types/node@26.4.0) + '@inquirer/input': 5.2.0(@types/node@26.4.0) + '@inquirer/number': 4.3.0(@types/node@26.4.0) + '@inquirer/password': 5.3.0(@types/node@26.4.0) + '@inquirer/rawlist': 5.4.0(@types/node@26.4.0) + '@inquirer/search': 4.4.0(@types/node@26.4.0) + '@inquirer/select': 5.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/rawlist@5.3.5(@types/node@26.4.0)': dependencies: '@inquirer/core': 12.0.3(@types/node@26.4.0) @@ -4122,6 +4397,13 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/rawlist@5.4.0(@types/node@26.4.0)': + dependencies: + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/search@4.3.3(@types/node@26.4.0)': dependencies: '@inquirer/core': 12.0.3(@types/node@26.4.0) @@ -4130,6 +4412,14 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/search@4.4.0(@types/node@26.4.0)': + dependencies: + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/figures': 2.1.0 + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/select@5.2.5(@types/node@26.4.0)': dependencies: '@inquirer/ansi': 2.0.8 @@ -4139,10 +4429,23 @@ snapshots: optionalDependencies: '@types/node': 26.4.0 + '@inquirer/select@5.3.0(@types/node@26.4.0)': + dependencies: + '@inquirer/ansi': 2.1.0 + '@inquirer/core': 12.1.0(@types/node@26.4.0) + '@inquirer/figures': 2.1.0 + '@inquirer/type': 4.3.0(@types/node@26.4.0) + optionalDependencies: + '@types/node': 26.4.0 + '@inquirer/type@4.1.1(@types/node@26.4.0)': optionalDependencies: '@types/node': 26.4.0 + '@inquirer/type@4.3.0(@types/node@26.4.0)': + optionalDependencies: + '@types/node': 26.4.0 + '@isaacs/fs-minipass@4.0.1': dependencies: minipass: 7.1.3 @@ -4161,36 +4464,34 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.6.0 - '@nanoforge-dev/cli@2.3.0(@types/node@26.4.0)(synckit@0.11.13)': + '@nanoforge-dev/cli@3.0.1(@types/node@26.4.0)(synckit@0.11.13)': dependencies: - '@angular-devkit/schematics': 22.1.8(chokidar@5.0.0) - '@angular-devkit/schematics-cli': 22.1.8(@types/node@26.4.0)(chokidar@5.0.0) - '@inquirer/prompts': 8.7.2(@types/node@26.4.0) - '@nanoforge-dev/config': 2.3.0(synckit@0.11.13) + '@angular-devkit/schematics': 22.2.7(chokidar@5.0.0) + '@angular-devkit/schematics-cli': 22.2.7(@types/node@26.4.0)(chokidar@5.0.0) + '@inquirer/prompts': 8.8.0(@types/node@26.4.0) + '@nanoforge-dev/config': 3.0.1(synckit@0.11.13) '@nanoforge-dev/editor': 0.1.4 - '@nanoforge-dev/loader-client': 1.6.0 - '@nanoforge-dev/loader-server': 1.6.0 - '@nanoforge-dev/schematics': 2.3.0(chokidar@5.0.0) - ansis: 4.4.0 - bun: 1.4.2 + '@nanoforge-dev/loader-client': 1.7.0 + '@nanoforge-dev/loader-server': 1.7.0 + '@nanoforge-dev/registry': 3.0.1 + '@nanoforge-dev/schematics': 3.0.1(chokidar@5.0.0) + ansis: 4.5.0 + bun: 1.4.4 chokidar: 5.0.0 - class-transformer: 0.5.1 - class-validator: 0.15.1 - commander: 15.0.0 - dotenv: 18.0.3 + commander: 15.1.0 + dotenv: 18.0.10 node-emoji: 2.2.0 open: 11.0.4 ora: 9.4.1 rc9: 3.1.0 - reflect-metadata: 0.2.2 transitivePeerDependencies: - '@types/node' - synckit - '@nanoforge-dev/config@2.3.0(synckit@0.11.13)': + '@nanoforge-dev/config@3.0.1(synckit@0.11.13)': dependencies: unrun: 0.3.1(synckit@0.11.13) - zod: 4.6.5 + zod: 4.6.7 transitivePeerDependencies: - synckit @@ -4204,23 +4505,29 @@ snapshots: tar: 7.5.22 typescript: 6.0.3 - '@nanoforge-dev/loader-client@1.6.0': + '@nanoforge-dev/loader-client@1.7.0': dependencies: - '@nanoforge-dev/loader-website': 1.6.0 + '@nanoforge-dev/loader-website': 1.7.0 bun: 1.4.2 commander: 15.0.0 - '@nanoforge-dev/loader-server@1.6.0': + '@nanoforge-dev/loader-server@1.7.0': dependencies: bun: 1.4.2 commander: 15.0.0 - '@nanoforge-dev/loader-website@1.6.0': {} + '@nanoforge-dev/loader-website@1.7.0': {} + + '@nanoforge-dev/registry@3.0.1': + dependencies: + fflate: 0.8.3 + semver: 7.8.6 + zod: 4.6.7 - '@nanoforge-dev/schematics@2.3.0(chokidar@5.0.0)': + '@nanoforge-dev/schematics@3.0.1(chokidar@5.0.0)': dependencies: - '@angular-devkit/core': 22.1.8(chokidar@5.0.0) - '@angular-devkit/schematics': 22.1.8(chokidar@5.0.0) + '@angular-devkit/core': 22.2.7(chokidar@5.0.0) + '@angular-devkit/schematics': 22.2.7(chokidar@5.0.0) rxjs: 7.8.2 transitivePeerDependencies: - chokidar @@ -4304,39 +4611,75 @@ snapshots: '@oven/bun-darwin-aarch64@1.4.2': optional: true + '@oven/bun-darwin-aarch64@1.4.4': + optional: true + '@oven/bun-darwin-x64@1.4.2': optional: true + '@oven/bun-darwin-x64@1.4.4': + optional: true + '@oven/bun-freebsd-aarch64@1.4.2': optional: true + '@oven/bun-freebsd-aarch64@1.4.4': + optional: true + '@oven/bun-freebsd-x64@1.4.2': optional: true + '@oven/bun-freebsd-x64@1.4.4': + optional: true + '@oven/bun-linux-aarch64-android@1.4.2': optional: true + '@oven/bun-linux-aarch64-android@1.4.4': + optional: true + '@oven/bun-linux-aarch64-musl@1.4.2': optional: true + '@oven/bun-linux-aarch64-musl@1.4.4': + optional: true + '@oven/bun-linux-aarch64@1.4.2': optional: true + '@oven/bun-linux-aarch64@1.4.4': + optional: true + '@oven/bun-linux-x64-android@1.4.2': optional: true + '@oven/bun-linux-x64-android@1.4.4': + optional: true + '@oven/bun-linux-x64-musl@1.4.2': optional: true + '@oven/bun-linux-x64-musl@1.4.4': + optional: true + '@oven/bun-linux-x64@1.4.2': optional: true + '@oven/bun-linux-x64@1.4.4': + optional: true + '@oven/bun-windows-aarch64@1.4.2': optional: true + '@oven/bun-windows-aarch64@1.4.4': + optional: true + '@oven/bun-windows-x64@1.4.2': optional: true + '@oven/bun-windows-x64@1.4.4': + optional: true + '@oxc-project/types@0.147.0': {} '@oxfmt/binding-android-arm-eabi@0.35.0': @@ -4832,7 +5175,7 @@ snapshots: ansis@4.3.1: {} - ansis@4.4.0: {} + ansis@4.5.0: {} argparse@2.0.1: {} @@ -4885,6 +5228,21 @@ snapshots: '@oven/bun-windows-aarch64': 1.4.2 '@oven/bun-windows-x64': 1.4.2 + bun@1.4.4: + optionalDependencies: + '@oven/bun-darwin-aarch64': 1.4.4 + '@oven/bun-darwin-x64': 1.4.4 + '@oven/bun-freebsd-aarch64': 1.4.4 + '@oven/bun-freebsd-x64': 1.4.4 + '@oven/bun-linux-aarch64': 1.4.4 + '@oven/bun-linux-aarch64-android': 1.4.4 + '@oven/bun-linux-aarch64-musl': 1.4.4 + '@oven/bun-linux-x64': 1.4.4 + '@oven/bun-linux-x64-android': 1.4.4 + '@oven/bun-linux-x64-musl': 1.4.4 + '@oven/bun-windows-aarch64': 1.4.4 + '@oven/bun-windows-x64': 1.4.4 + bundle-name@4.1.0: dependencies: run-applescript: 7.1.0 @@ -4941,6 +5299,8 @@ snapshots: commander@15.0.0: {} + commander@15.1.0: {} + content-type@3.0.0: {} conventional-changelog-angular@9.4.0: @@ -5015,7 +5375,7 @@ snapshots: dotenv@17.4.2: {} - dotenv@18.0.3: {} + dotenv@18.0.10: {} dts-resolver@3.0.0: {} @@ -5481,7 +5841,7 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.6.0 - magic-string@1.0.0: + magic-string@1.4.1: dependencies: '@jridgewell/sourcemap-codec': 1.6.0 @@ -5535,6 +5895,8 @@ snapshots: mute-stream@3.0.0: {} + mute-stream@4.0.0: {} + nanoid@3.3.18: {} natural-compare@1.4.0: {} @@ -5665,8 +6027,6 @@ snapshots: picomatch@2.3.2: {} - picomatch@4.0.5: {} - picomatch@4.0.7: {} playwright-core@1.64.1: {} @@ -5714,8 +6074,6 @@ snapshots: readdirp@5.1.1: {} - reflect-metadata@0.2.2: {} - require-from-string@2.0.2: {} resolve-from@4.0.0: {} @@ -5774,6 +6132,8 @@ snapshots: semver@7.8.5: {} + semver@7.8.6: {} + shebang-command@2.0.0: dependencies: shebang-regex: 3.0.0 @@ -5792,7 +6152,7 @@ snapshots: source-map-js@1.2.1: {} - source-map@0.7.6: {} + source-map@0.8.0: {} stackback@0.0.2: {} @@ -6086,4 +6446,4 @@ snapshots: '@yuku-parser/binding-win32-arm64': 0.8.7 '@yuku-parser/binding-win32-x64': 0.8.7 - zod@4.6.5: {} + zod@4.6.7: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 9be5c509..230336a9 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -23,7 +23,7 @@ catalogs: husky: ^9.1.7 lint-staged: ^17.4.1 config: - '@nanoforge-dev/config': ^2.3.0 + '@nanoforge-dev/config': ^3.0.1 core: '@types/bun': ^1.4.2 '@types/node': ^26.4.0 From 931f4e22c2551e6645f9cfa6b11374141acfd050 Mon Sep 17 00:00:00 2001 From: Exelo Date: Fri, 13 Nov 2026 20:26:45 +0100 Subject: [PATCH 3/5] feat: add pnpm examples to test the example games against this engine Copies chosen games of a local examples checkout into the gitignored .examples/, links their engine dependencies to this repository's packages and installs them as their own pnpm workspace, so the engine's lockfile never changes. --- .gitignore | 3 + .prettierignore | 1 + AGENTS.md | 11 ++- README.md | 16 +++++ e2e/examples.test.ts | 72 +++++++++++++++++++ package.json | 4 +- pnpm-lock.yaml | 6 ++ pnpm-workspace.yaml | 1 + scripts/examples.ts | 167 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 273 insertions(+), 8 deletions(-) create mode 100644 e2e/examples.test.ts create mode 100644 scripts/examples.ts diff --git a/.gitignore b/.gitignore index ffa7c9d9..69b16003 100644 --- a/.gitignore +++ b/.gitignore @@ -244,3 +244,6 @@ references/ packages/old-core/ playwright-report/ test-results/ + +# Copies made by pnpm examples +.examples/ diff --git a/.prettierignore b/.prettierignore index 046e01e9..22a839a3 100644 --- a/.prettierignore +++ b/.prettierignore @@ -11,6 +11,7 @@ modules/ utils/ releases/ .nanoforge/ +.examples/ .turbo/ node_modules/ diff --git a/AGENTS.md b/AGENTS.md index 2dd3310d..68493e99 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -21,7 +21,7 @@ Nanoforge Engine is Nanoforge's game engine for the web browser. It is a monorep ## Project Structure -A pnpm monorepo with several package folders grouped by role (`packages/*`, `modules/*`, `utils/*`), plus test apps (`e2e/game`, `e2e/game-2d`, `e2e/game-3d`) and example games (`example/*`). +A pnpm monorepo with several package folders grouped by role (`packages/*`, `modules/*`, `utils/*`), plus test apps (`e2e/game`, `e2e/game-2d`, `e2e/game-3d`). The example games live in the [examples](https://github.com/NanoForge-dev/examples) repo; `pnpm examples` copies some of them here to test them against this engine (see Main Commands). ``` Engine/ @@ -48,15 +48,11 @@ Engine/ │ ├── game-2d/ @nanoforge-dev/e2e-game-2d (private) — 2D game rendered by the graphics e2e tests │ ├── game-3d/ @nanoforge-dev/e2e-game-3d (private) — 3D game rendered by the graphics e2e tests │ └── graphics/ Playwright specs (.spec.ts) and their reference screenshots; not a package -├── example/ # Example games (unscoped private packages) -│ ├── pong-network/ Networked Pong, used as an integration test -│ ├── pong-3d/ Networked 3D Pong (graphics-3d + network) -│ └── cube-3d/ Minimal graphics-3d scene ├── docs/ │ ├── docs/ Hand-written Mintlify pages (one folder per topic) + navigation.json │ ├── design/ Design proposals (e.g. graphics-3d-editor-proposal.md) │ └── typedoc/ mintlify.mjs, the typedoc plugin; the API reference is generated into docs/references (gitignored) -└── scripts/ nightly.sh, the nightly test runner +└── scripts/ nightly.sh, the nightly test runner; examples.ts, behind `pnpm examples` ``` Each package of `packages/*` and `modules/*` follows the same layout convention: `src/` (code), `test/` (unit tests), `package.json` with dual ESM/CJS exports (`dist/index.js` + `dist/index.cjs` + `.d.ts`/`.d.cts` types). The `utils/*` packages are a bare `index.js`, ESM only, with no build step. @@ -75,9 +71,10 @@ From the repo root: - `pnpm build` — builds all packages via Turborepo (`turbo run build --concurrency=5`). - `pnpm format` — Prettier write + `turbo run format` per package. - `pnpm lint` — Prettier check + `turbo run lint` per package (ESLint). -- `pnpm test` — `test:unit` (per package, via Turborepo) then `test:e2e` (Vitest on `e2e/**/*.test.ts`, today `e2e/game.test.ts`). +- `pnpm test` — `test:unit` (per package, via Turborepo) then `test:e2e` (Vitest on `e2e/**/*.test.ts`, today `e2e/game.test.ts` and `e2e/examples.test.ts`). - `pnpm test:e2e:graphics` — Playwright screenshot tests (`e2e/graphics/.spec.ts`), not part of `pnpm test`. Each game is built and served with `nf build && nf start -p ` (`game-2d` on 3101, `game-3d` on 3102). Needs Chromium (`pnpm exec playwright install chromium`); screenshots are only compared on Linux, since the references come from CI's Linux Chromium. - `pnpm run docs` — builds the packages then runs `typedoc`, which writes the API reference of `packages/*` and `modules/*` as `.mdx` pages into `docs/references`. Use `pnpm run docs`: plain `pnpm docs` is pnpm's built-in command that opens a package's documentation in the browser. +- `pnpm examples [--from ] [--games | --all]` — `scripts/examples.ts` (run by Node's type stripping, no build): copies examples (`basics|demos|games/` of a local [examples](https://github.com/NanoForge-dev/examples) checkout: `--from`, else `$NANOFORGE_EXAMPLES`, else `../examples`) into the gitignored `.examples//`, rewrites their dependencies on this repo's packages to `link:`, and runs `pnpm install` in each copy. Each copy is its own pnpm workspace (its `pnpm-workspace.yaml`), so the engine's lockfile and workspace never change. Without `--games`/`--all` it shows a checkbox (terminal only). Needs `pnpm build` first. Only direct dependencies are linked. Its logic is tested by `e2e/examples.test.ts`. - `scripts/nightly.sh` — nightly test runner: unit tests with coverage (it only scans `packages/*`) then the Vitest e2e tests, and writes JSON and Markdown reports into `$REPORT_DIR` (default `reports/`). Needs `jq`. Within an individual package/module (e.g. `packages/core`): diff --git a/README.md b/README.md index 3cbb5393..9e7785e2 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,22 @@ And then create a new project : nf new ``` +Example games are in the [examples repository](https://github.com/NanoForge-dev/examples). + +## Test the examples against this engine + +`pnpm examples` copies example games from a local checkout of the examples repository into `.examples//` (gitignored), points their engine dependencies at the packages of this repository (`link:`), and installs them. The checkout itself is only read. + +```bash +pnpm build # the copies use the built packages +pnpm examples # pick the examples in a list +pnpm examples --games input-keyboard,pong-3d # or name them (or group/name) +pnpm examples --all --from ~/code/examples # every example of a given checkout +cd .examples/basics/input-keyboard && pnpm build && pnpm start +``` + +The checkout is `--from `, else `$NANOFORGE_EXAMPLES`, else `../examples`; in a terminal, it asks when none is found. Running it again replaces the copies of the chosen examples. + ## Packages - `@nanoforge-dev/asset` ([source][asset-source]) - The built-in asset library, to read the files shipped with a game diff --git a/e2e/examples.test.ts b/e2e/examples.test.ts new file mode 100644 index 00000000..6f40510d --- /dev/null +++ b/e2e/examples.test.ts @@ -0,0 +1,72 @@ +import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "fs"; +import { tmpdir } from "os"; +import { dirname, join } from "path"; +import { afterAll, describe, expect, it } from "vitest"; + +import { copyExample, listExamples, pickExamples } from "../scripts/examples"; + +const TMP = mkdtempSync(join(tmpdir(), "nf-examples-")); +const CHECKOUT = join(TMP, "examples"); + +const write = (path: string, content: unknown) => { + mkdirSync(dirname(join(CHECKOUT, path)), { recursive: true }); + writeFileSync( + join(CHECKOUT, path), + typeof content === "string" ? content : JSON.stringify(content), + ); +}; + +const deps = { "@nanoforge-dev/core": "^3.0.0", "@nanoforge-dev/cli": "^3.0.1" }; +write("basics/pong/package.json", { devDependencies: deps }); +write("basics/pong/apps/client/package.json", { dependencies: deps }); +write("basics/pong/src/main.ts", "export {};"); +for (const skipped of [ + "node_modules/x/index.js", + "dist/main.js", + ".nanoforge/cache", + "pnpm-lock.yaml", +]) + write(`basics/pong/${skipped}`, ""); +write("demos/pong/package.json", {}); +write("games/not-an-example/README.md", ""); + +const examples = listExamples(CHECKOUT); +const PACKAGES = new Map([["@nanoforge-dev/core", "/engine/packages/core"]]); + +afterAll(() => rmSync(TMP, { recursive: true, force: true })); + +describe("pnpm examples", () => { + it("lists the folders of basics, demos and games holding a package.json", () => { + expect(examples.map((example) => example.id).sort()).toEqual(["basics/pong", "demos/pong"]); + }); + + it("picks by group/name and refuses ambiguous or unknown names", () => { + expect(pickExamples(examples, ["demos/pong"]).map((example) => example.id)).toEqual([ + "demos/pong", + ]); + expect(() => pickExamples(examples, ["pong"])).toThrow(/ambiguous/); + expect(() => pickExamples(examples, ["../pong"])).toThrow(/Unknown/); + }); + + it("copies without installs and builds, and links the local packages", () => { + const dest = join(TMP, "copy"); + mkdirSync(dest); + writeFileSync(join(dest, "stale.txt"), ""); + for (const pong of pickExamples(examples, ["basics/pong"])) copyExample(pong, dest, PACKAGES); + + expect(existsSync(join(dest, "stale.txt"))).toBe(false); + expect(existsSync(join(dest, "src/main.ts"))).toBe(true); + for (const skipped of ["node_modules", "dist", ".nanoforge", "pnpm-lock.yaml"]) + expect(existsSync(join(dest, skipped))).toBe(false); + expect(existsSync(join(dest, "pnpm-workspace.yaml"))).toBe(true); + for (const [file, field] of [ + ["package.json", "devDependencies"], + ["apps/client/package.json", "dependencies"], + ] as const) + expect(JSON.parse(readFileSync(join(dest, file), "utf8"))[field]).toEqual({ + "@nanoforge-dev/core": "link:/engine/packages/core", + "@nanoforge-dev/cli": "^3.0.1", + }); + expect(existsSync(join(CHECKOUT, "basics/pong/dist/main.js"))).toBe(true); + }); +}); diff --git a/package.json b/package.json index 8b2e8a21..e5dc0f0f 100644 --- a/package.json +++ b/package.json @@ -28,11 +28,13 @@ "test:e2e": "vitest run --config vitest.config.e2e.ts", "test:e2e:graphics": "playwright test", "prepare": "husky", - "docs": "turbo run build --concurrency=5 && typedoc" + "docs": "turbo run build --concurrency=5 && typedoc", + "examples": "node scripts/examples.ts" }, "devDependencies": { "@commitlint/cli": "catalog:ci", "@commitlint/config-conventional": "catalog:ci", + "@inquirer/prompts": "catalog:core", "@nanoforge-dev/utils-eslint-config": "workspace:*", "@nanoforge-dev/utils-prettier-config": "workspace:*", "@playwright/test": "catalog:test", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a33e856a..fa96f84c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -134,6 +134,9 @@ catalogs: specifier: ^3.0.1 version: 3.0.1 core: + '@inquirer/prompts': + specifier: ^8.8.0 + version: 8.8.0 '@types/bun': specifier: ^1.4.2 version: 1.4.2 @@ -226,6 +229,9 @@ importers: '@commitlint/config-conventional': specifier: catalog:ci version: 21.2.4 + '@inquirer/prompts': + specifier: catalog:core + version: 8.8.0(@types/node@26.4.0) '@nanoforge-dev/utils-eslint-config': specifier: workspace:* version: link:utils/eslint-config diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 230336a9..b3e89e12 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -25,6 +25,7 @@ catalogs: config: '@nanoforge-dev/config': ^3.0.1 core: + '@inquirer/prompts': ^8.8.0 '@types/bun': ^1.4.2 '@types/node': ^26.4.0 turbo: ^2.11.10 diff --git a/scripts/examples.ts b/scripts/examples.ts new file mode 100644 index 00000000..6dee0d5d --- /dev/null +++ b/scripts/examples.ts @@ -0,0 +1,167 @@ +/** + * `pnpm examples`: copies games of a local NanoForge examples checkout into `.examples/` and points + * their engine dependencies at this repository's packages, to test them against the local engine. + * The checkout is only read: the copies are installed and built, never the real games. + * + * Runs with Node's type stripping: no enums, no parameter properties. + */ +import { checkbox, input } from "@inquirer/prompts"; +import { execFileSync } from "node:child_process"; +import { + cpSync, + existsSync, + readFileSync, + readdirSync, + rmSync, + statSync, + writeFileSync, +} from "node:fs"; +import { basename, dirname, join, resolve } from "node:path"; +import { fileURLToPath } from "node:url"; +import { parseArgs } from "node:util"; + +export interface Example { + /** `/`, its path in the checkout and in `.examples/`. */ + id: string; + name: string; + dir: string; +} + +const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), ".."); +export const COPY_ROOT = join(ROOT, ".examples"); +const GROUPS = ["basics", "demos", "games"]; +const PACKAGE_FOLDERS = ["packages", "modules", "utils"]; +const SKIPPED = new Set(["node_modules", "dist", ".nanoforge", "pnpm-lock.yaml"]); +const DEPENDENCY_FIELDS = ["dependencies", "devDependencies", "optionalDependencies"]; + +const USAGE = `Usage: pnpm examples [--from ] (--games | --all) + +Copies examples into .examples// and installs them against this engine. +The checkout is --from, else $NANOFORGE_EXAMPLES, else ../examples. +Without --games or --all, asks which ones to copy (terminal only).`; + +const readJson = (file: string) => JSON.parse(readFileSync(file, "utf8")); + +/** The public packages of this repository, by npm name: `@nanoforge-dev/editor-lib` → `modules/editor`. */ +export const localPackages = (root = ROOT): Map => { + const packages = new Map(); + for (const folder of PACKAGE_FOLDERS) + for (const entry of readdirSync(join(root, folder))) { + const file = join(root, folder, entry, "package.json"); + if (!existsSync(file)) continue; + const pkg = readJson(file); + if (!pkg.private) packages.set(pkg.name, join(root, folder, entry)); + } + return packages; +}; + +/** The examples of a checkout: the folders of `basics/`, `demos/` and `games/` holding a `package.json`. */ +export const listExamples = (checkout: string): Example[] => + GROUPS.filter((group) => existsSync(join(checkout, group))).flatMap((group) => + readdirSync(join(checkout, group)) + .filter((name) => existsSync(join(checkout, group, name, "package.json"))) + .map((name) => ({ id: `${group}/${name}`, name, dir: join(checkout, group, name) })), + ); + +/** Picks examples by `name` or `group/name`; throws on an unknown or ambiguous one. */ +export const pickExamples = (examples: Example[], wanted: string[]): Example[] => + wanted.map((want) => { + const found = examples.filter((example) => example.id === want || example.name === want); + const [only, ...others] = found; + if (only && others.length === 0) return only; + if (!only) + throw new Error(`Unknown example "${want}". Known: ${examples.map((e) => e.id).join(", ")}`); + throw new Error(`"${want}" is ambiguous: use ${found.map((e) => e.id).join(" or ")}`); + }); + +const packageFiles = (dir: string): string[] => + readdirSync(dir).flatMap((entry) => { + const path = join(dir, entry); + if (statSync(path).isDirectory()) return packageFiles(path); + return entry === "package.json" ? [path] : []; + }); + +/** + * Copies an example to `dest` (replacing a previous copy) without its installs, builds and lockfile, + * then points every dependency on a local package at it with `link:`. + */ +export const copyExample = (example: Example, dest: string, packages: Map) => { + rmSync(dest, { recursive: true, force: true }); + cpSync(example.dir, dest, { recursive: true, filter: (src) => !SKIPPED.has(basename(src)) }); + // Its own workspace root, so pnpm never installs it into this repository's workspace. + if (!existsSync(join(dest, "pnpm-workspace.yaml"))) + writeFileSync( + join(dest, "pnpm-workspace.yaml"), + "packages:\n - apps/*\nallowBuilds:\n bun: true\n", + ); + // shortcut: only direct dependencies are linked; a published package depending on the engine + // still gets its own copy. Add `overrides` to the copy's pnpm-workspace.yaml if an example needs it. + for (const file of packageFiles(dest)) { + const pkg = readJson(file); + for (const field of DEPENDENCY_FIELDS) + for (const name of Object.keys(pkg[field] ?? {})) + if (packages.has(name)) pkg[field][name] = `link:${packages.get(name)}`; + writeFileSync(file, `${JSON.stringify(pkg, null, 2)}\n`); + } +}; + +const findCheckout = async (from: string | undefined): Promise => { + const candidate = from ?? process.env.NANOFORGE_EXAMPLES ?? join(ROOT, "..", "examples"); + if (existsSync(candidate)) return resolve(candidate); + if (from ?? process.env.NANOFORGE_EXAMPLES) + throw new Error(`No examples checkout at ${candidate}`); + if (!process.stdin.isTTY) throw new Error(`No examples checkout found.\n\n${USAGE}`); + const answer = await input({ + message: "Path to your NanoForge examples checkout:", + validate: (value) => existsSync(value) || "No folder there", + }); + return resolve(answer); +}; + +const main = async () => { + const { values } = parseArgs({ + options: { + from: { type: "string" }, + games: { type: "string" }, + all: { type: "boolean", default: false }, + help: { type: "boolean", short: "h", default: false }, + }, + }); + if (values.help) return console.log(USAGE); + + const checkout = await findCheckout(values.from); + const examples = listExamples(checkout); + if (examples.length === 0) throw new Error(`No example in ${checkout} (basics/, demos/, games/)`); + + let chosen: Example[]; + if (values.all) chosen = examples; + else if (values.games) chosen = pickExamples(examples, values.games.split(",")); + else if (process.stdin.isTTY) + chosen = await checkbox({ + message: "Examples to copy", + choices: examples.map((example) => ({ name: example.id, value: example })), + required: true, + }); + else throw new Error(USAGE); + + const packages = localPackages(); + const unbuilt = [...packages].filter( + ([name, dir]) => !name.startsWith("@nanoforge-dev/utils-") && !existsSync(join(dir, "dist")), + ); + if (unbuilt.length > 0) + throw new Error(`Run pnpm build first: ${unbuilt.map(([name]) => name).join(", ")} not built`); + + for (const example of chosen) { + const dest = join(COPY_ROOT, example.id); + console.log(`\n${example.id} → ${dest}`); + copyExample(example, dest, packages); + execFileSync("pnpm", ["install", "--no-frozen-lockfile"], { cwd: dest, stdio: "inherit" }); + } + console.log(`\nDone. In a copy: pnpm build && pnpm start (or pnpm dev).`); +}; + +if (import.meta.main) + main().catch((error: unknown) => { + console.error(error instanceof Error ? error.message : error); + process.exit(1); + }); From 76fa976007ade8e2b8e734dec0d57783993f24c3 Mon Sep 17 00:00:00 2001 From: Exelo Date: Fri, 13 Nov 2026 20:30:28 +0100 Subject: [PATCH 4/5] fix: copy the files behind symlinks in pnpm examples A copied link would point back into the examples checkout and let the copy edit the real game. --- e2e/examples.test.ts | 13 ++++++++++++- scripts/examples.ts | 7 ++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/e2e/examples.test.ts b/e2e/examples.test.ts index 6f40510d..223e4bea 100644 --- a/e2e/examples.test.ts +++ b/e2e/examples.test.ts @@ -1,4 +1,13 @@ -import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "fs"; +import { + existsSync, + lstatSync, + mkdirSync, + mkdtempSync, + readFileSync, + rmSync, + symlinkSync, + writeFileSync, +} from "fs"; import { tmpdir } from "os"; import { dirname, join } from "path"; import { afterAll, describe, expect, it } from "vitest"; @@ -27,6 +36,7 @@ for (const skipped of [ "pnpm-lock.yaml", ]) write(`basics/pong/${skipped}`, ""); +symlinkSync(join(CHECKOUT, "basics/pong/src/main.ts"), join(CHECKOUT, "basics/pong/linked.ts")); write("demos/pong/package.json", {}); write("games/not-an-example/README.md", ""); @@ -56,6 +66,7 @@ describe("pnpm examples", () => { expect(existsSync(join(dest, "stale.txt"))).toBe(false); expect(existsSync(join(dest, "src/main.ts"))).toBe(true); + expect(lstatSync(join(dest, "linked.ts")).isSymbolicLink()).toBe(false); for (const skipped of ["node_modules", "dist", ".nanoforge", "pnpm-lock.yaml"]) expect(existsSync(join(dest, skipped))).toBe(false); expect(existsSync(join(dest, "pnpm-workspace.yaml"))).toBe(true); diff --git a/scripts/examples.ts b/scripts/examples.ts index 6dee0d5d..366864b0 100644 --- a/scripts/examples.ts +++ b/scripts/examples.ts @@ -87,7 +87,12 @@ const packageFiles = (dir: string): string[] => */ export const copyExample = (example: Example, dest: string, packages: Map) => { rmSync(dest, { recursive: true, force: true }); - cpSync(example.dir, dest, { recursive: true, filter: (src) => !SKIPPED.has(basename(src)) }); + // Dereferenced: a link into the checkout would let the copy write to the real game. + cpSync(example.dir, dest, { + recursive: true, + dereference: true, + filter: (src) => !SKIPPED.has(basename(src)), + }); // Its own workspace root, so pnpm never installs it into this repository's workspace. if (!existsSync(join(dest, "pnpm-workspace.yaml"))) writeFileSync( From 9d25b0f684520762138721804bfc5c54d344894e Mon Sep 17 00:00:00 2001 From: Exelo Date: Fri, 13 Nov 2026 21:23:04 +0100 Subject: [PATCH 5/5] fix: resolve examples paths from the caller's folder and trim game names --- scripts/examples.ts | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/examples.ts b/scripts/examples.ts index 366864b0..7b960441 100644 --- a/scripts/examples.ts +++ b/scripts/examples.ts @@ -111,16 +111,19 @@ export const copyExample = (example: Example, dest: string, packages: Map => { - const candidate = from ?? process.env.NANOFORGE_EXAMPLES ?? join(ROOT, "..", "examples"); - if (existsSync(candidate)) return resolve(candidate); + // pnpm runs scripts from the engine root: a relative path is the user's, from INIT_CWD. + const fromUser = (path: string) => resolve(process.env.INIT_CWD ?? ".", path); + const given = from ?? process.env.NANOFORGE_EXAMPLES; + const candidate = given ? fromUser(given) : join(ROOT, "..", "examples"); + if (existsSync(candidate)) return candidate; if (from ?? process.env.NANOFORGE_EXAMPLES) throw new Error(`No examples checkout at ${candidate}`); if (!process.stdin.isTTY) throw new Error(`No examples checkout found.\n\n${USAGE}`); const answer = await input({ message: "Path to your NanoForge examples checkout:", - validate: (value) => existsSync(value) || "No folder there", + validate: (value) => existsSync(fromUser(value)) || `No folder at ${fromUser(value)}`, }); - return resolve(answer); + return fromUser(answer); }; const main = async () => { @@ -140,7 +143,14 @@ const main = async () => { let chosen: Example[]; if (values.all) chosen = examples; - else if (values.games) chosen = pickExamples(examples, values.games.split(",")); + else if (values.games) + chosen = pickExamples( + examples, + values.games + .split(",") + .map((name) => name.trim()) + .filter(Boolean), + ); else if (process.stdin.isTTY) chosen = await checkbox({ message: "Examples to copy",