12 Commits

Author SHA1 Message Date
max dab03753a2 chore: debug ci ssh
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m19s
📊 Benchmark the Runtime / release (pull_request) Successful in 1m5s
2026-04-24 14:53:16 +02:00
max 26c7e915ef chore: debug ci ssh
📊 Benchmark the Runtime / release (pull_request) Failing after 1m3s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 56s
2026-04-24 14:51:22 +02:00
max a3a1f6af35 chore: debug ci ssh
📊 Benchmark the Runtime / release (pull_request) Failing after 1m16s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m5s
2026-04-24 14:42:17 +02:00
max 4615489128 chore: debug ci ssh
📊 Benchmark the Runtime / release (pull_request) Failing after 1m10s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m12s
2026-04-24 14:40:38 +02:00
max b23ad01c74 chore: debug ci ssh
📊 Benchmark the Runtime / release (pull_request) Failing after 1m16s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m11s
2026-04-24 14:36:35 +02:00
max 237d04b4f1 chore: use ssh private key in ci
📊 Benchmark the Runtime / release (pull_request) Failing after 1m1s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m7s
2026-04-24 14:35:10 +02:00
max 5b8eabc32d chore: use ssh private key in ci
📊 Benchmark the Runtime / release (pull_request) Failing after 1m0s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 57s
2026-04-24 14:30:27 +02:00
max 7011c3653d chore: use ssh private key in ci
📊 Benchmark the Runtime / release (pull_request) Failing after 1m5s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 55s
2026-04-24 14:25:55 +02:00
max 059022e8a8 chore: upgrade ci container image
📊 Benchmark the Runtime / release (pull_request) Failing after 2m26s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m15s
2026-04-24 14:12:27 +02:00
max e9dce2e79c feat(ci): push benchmarks to different repo
🚀 Lint & Test & Deploy / release (pull_request) Failing after 54s
📊 Benchmark the Runtime / release (pull_request) Failing after 1m11s
2026-04-24 13:52:23 +02:00
max fd1da58cd9 feat(ci): push benchmarks to different repo
📊 Benchmark the Runtime / release (pull_request) Failing after 47s
🚀 Lint & Test & Deploy / release (pull_request) Failing after 55s
2026-04-24 13:48:55 +02:00
max b1418f6778 feat: initial group nodes /w some bugs
🚀 Lint & Test & Deploy / release (pull_request) Failing after 1m12s
📊 Benchmark the Runtime / release (pull_request) Successful in 50s
2026-04-24 13:38:32 +02:00
98 changed files with 4523 additions and 6456 deletions
-28
View File
@@ -1,28 +0,0 @@
name: Setup
description: Restore caches and install pnpm dependencies (run after checkout)
runs:
using: composite
steps:
- name: 💾 Setup pnpm Cache
uses: actions/cache@v4
with:
path: .pnpm-store
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-
- name: 🦀 Cache Cargo
uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-
- name: 📦 Install Dependencies
shell: bash
run: pnpm install --frozen-lockfile --store-dir .pnpm-store
+35 -15
View File
@@ -12,7 +12,7 @@ env:
CARGO_TARGET_DIR: target CARGO_TARGET_DIR: target
jobs: jobs:
benchmark: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69 container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
@@ -23,10 +23,29 @@ jobs:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.GITEA_TOKEN }} token: ${{ secrets.GITEA_TOKEN }}
- name: 🔧 Setup - name: 💾 Setup pnpm Cache
uses: ./.gitea/actions/setup uses: actions/cache@v4
with:
path: ${{ env.PNPM_CACHE_FOLDER }}
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-
- name: 🛠️ Build Nodes - name: 🦀 Cache Cargo
uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-
- name: 📦 Install Dependencies
run: pnpm install --frozen-lockfile --store-dir ${{ env.PNPM_CACHE_FOLDER }}
- name: 🛠️Build Nodes
run: pnpm build:nodes run: pnpm build:nodes
- name: 🏃 Execute Runtime - name: 🏃 Execute Runtime
@@ -37,13 +56,8 @@ jobs:
mkdir -p ~/.ssh mkdir -p ~/.ssh
echo "${{ secrets.GIT_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519 echo "${{ secrets.GIT_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519
cat >> ~/.ssh/config <<'EOF'
Host git.max-richter.dev
Port 2222
IdentityFile ~/.ssh/id_ed25519
IdentitiesOnly yes
EOF
ssh-keyscan -p 2222 -H git.max-richter.dev >> ~/.ssh/known_hosts ssh-keyscan -p 2222 -H git.max-richter.dev >> ~/.ssh/known_hosts
ssh -vvv -p 2222 -i ~/.ssh/id_ed25519 -T git@git.max-richter.dev
- name: 📤 Push Results - name: 📤 Push Results
env: env:
@@ -52,16 +66,22 @@ jobs:
git config --global user.name "nodarium-bot" git config --global user.name "nodarium-bot"
git config --global user.email "nodarium-bot@max-richter.dev" git config --global user.email "nodarium-bot@max-richter.dev"
# 2. Clone the benchmarks repo into a temp folder
git config --global core.sshCommand "ssh -vv -p 2222 -i ~/.ssh/id_ed25519 -o IdentitiesOnly=yes"
git clone git@git.max-richter.dev:max/nodarium-benchmarks.git target_bench_repo git clone git@git.max-richter.dev:max/nodarium-benchmarks.git target_bench_repo
BRANCH="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}" # 3. Create a directory structure based on the branch
SAFE_PR_NAME=$(printf "%s" "$BRANCH" | tr '/' '-') # This allows the UI to "switch between branches"
DEST_DIR="target_bench_repo/data/$SAFE_PR_NAME/$(date +%s)" BRANCH_NAME="${{ github.ref_name }}"
DEST_DIR="target_bench_repo/data/$BRANCH_NAME/$(date +%s)"
mkdir -p "$DEST_DIR" mkdir -p "$DEST_DIR"
# 4. Copy the new results
# Assuming your bench tool outputs a file named 'results.json'
cp app/benchmark/out/*.json "$DEST_DIR/" cp app/benchmark/out/*.json "$DEST_DIR/"
# 5. Commit and Push
cd target_bench_repo cd target_bench_repo
git add . git add .
git commit -m "Update benchmarks for $SAFE_PR_NAME: ${{ gitea.sha }}" git commit -m "Update benchmarks for $BRANCH_NAME: ${{ github.sha }}"
git push origin main git push origin main
+23 -58
View File
@@ -13,7 +13,7 @@ env:
CARGO_TARGET_DIR: target CARGO_TARGET_DIR: target
jobs: jobs:
quality: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69 container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
@@ -24,8 +24,27 @@ jobs:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.GITEA_TOKEN }} token: ${{ secrets.GITEA_TOKEN }}
- name: 🔧 Setup - name: 💾 Setup pnpm Cache
uses: ./.gitea/actions/setup uses: actions/cache@v4
with:
path: ${{ env.PNPM_CACHE_FOLDER }}
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-
- name: 🦀 Cache Cargo
uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-
- name: 📦 Install Dependencies
run: pnpm install --frozen-lockfile --store-dir ${{ env.PNPM_CACHE_FOLDER }}
- name: 🧹 Quality Control - name: 🧹 Quality Control
run: | run: |
@@ -33,61 +52,7 @@ jobs:
pnpm format:check pnpm format:check
pnpm check pnpm check
pnpm build pnpm build
xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" pnpm test
test-unit:
runs-on: ubuntu-latest
container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
steps:
- name: 📑 Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GITEA_TOKEN }}
- name: 🔧 Setup
uses: ./.gitea/actions/setup
- name: 🧪 Run Tests
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" pnpm test:unit
test-e2e:
runs-on: ubuntu-latest
container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
steps:
- name: 📑 Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GITEA_TOKEN }}
- name: 🔧 Setup
uses: ./.gitea/actions/setup
- name: 🏗️ Build Web Assets
run: pnpm build
- name: 🧪 Run Tests
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" pnpm test:e2e
deploy:
runs-on: ubuntu-latest
needs: [quality, test-e2e, test-unit]
container: git.max-richter.dev/max/nodarium-ci:a56e8f445edb6064ae7a7b3b783fb7445f1b4e69
steps:
- name: 📑 Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GITEA_TOKEN }}
- name: 🔧 Setup
uses: ./.gitea/actions/setup
- name: 🏗️ Build Web Assets
run: pnpm build
- name: 🚀 Create Release Commit - name: 🚀 Create Release Commit
if: gitea.ref_type == 'tag' if: gitea.ref_type == 'tag'
-131
View File
@@ -1,134 +1,3 @@
# v0.0.6 (2026-05-05)
## Features
- Upgrade graph source panel and JSON viewer with click-to-copy and improved select handling.
- Capture system stats in benchmark runs.
- Split CI into unit and end-to-end pipelines.
- Add `LLM.md` documentation.
- Add 🍀 Planty Tutorial Helper
- Add a way to group nodes
## Node Groups
Node Groups introduce a way to structure graphs into nested, navigable subgraphs for better organization and reuse.
- Nested graph workflows with full runtime support
- Group input and output nodes defining clear boundaries
- Named groups for organization and identification
- Breadcrumb navigation for navigating nested levels
- Context-aware UI when editing inside groups
- Reliable enter/exit transitions with state restoration
- Ability to ungroup nodes back into the main graph
## Planty
Planty is a Clippy-inspired in-app tutorial and guidance system that helps users understand and use the graph editor through contextual assistance.
- Context-aware hints based on user actions in the graph
- Step-by-step onboarding flows for core features
- Inline guidance tied to nodes, sockets, and interactions
- Lightweight runtime integration without external build requirements
## Fixes
- Fix benchmark execution and CI integration issues
- Resolve debug node ID mismatch
- Fix ESLint, TypeScript, Playwright, and test synchronization issues
- Fix packaging issues in `@nodarium/planty` and UI library
- Restore correct graph references after exiting node groups
## Refactors
- Remove graph element handling from `graphManager`
- Restrict panel rendering to selected nodes only
- Move JSON viewer into shared UI package
- Clean up CI workflows
## Chores
- Upgrade dependencies via `pnpm upgrade`
- Add SvelteKit sync before E2E tests
- Remove flaky screenshot artifacts
- General formatting, linting, and test maintenance
---
- [82c2f08](https://git.max-richter.dev/max/nodarium/commit/82c2f08a5653ccd596c6982a1d9efa4b20a0b624) chore: cleanup changelog
- [a00db40](https://git.max-richter.dev/max/nodarium/commit/a00db400bba909db5da499e8484d6ed5541c4ad7) fix: dont crash when no groups exist
- [2d9eb0c](https://git.max-richter.dev/max/nodarium/commit/2d9eb0c0879611c2355e52100b150dd39b924684) fix: make planty work
- [954f572](https://git.max-richter.dev/max/nodarium/commit/954f5726c305508329856b6707a41b77f297c4bf) Merge pull request 'feat: initial node groups' (#44) from feat/group-node-own into main
- [63d5b80](https://git.max-richter.dev/max/nodarium/commit/63d5b8079d785b4fe1e689611cd38e5dd4d3ecb6) chore: pnpm format
- [3e32ca4](https://git.max-richter.dev/max/nodarium/commit/3e32ca419a1b914cbe64d98d887a89f4f5abb0e2) feat: ungroup nodes
- [f0cb12a](https://git.max-richter.dev/max/nodarium/commit/f0cb12a088609f5bd56096f7c1f244af0a1f91d8) chore: fix some type issues
- [1d60090](https://git.max-richter.dev/max/nodarium/commit/1d60090ffe1a93af4c0df6f36741957ac13b1a73) chore: fixup graph manager tests
- [5b55056](https://git.max-richter.dev/max/nodarium/commit/5b55056fc12271b87393cf9ef3b61cdf518a9857) chore: remove graph element in graphManager
- [e2c2b1a](https://git.max-richter.dev/max/nodarium/commit/e2c2b1a4d73e0953ddd0125cabe83649b58c8996) chore: remove e2e test screenshots (too flaky)
- [7f082ad](https://git.max-richter.dev/max/nodarium/commit/7f082ad8f6f144b92947000b91ceddce3c52704b) feat: implement node sockets ui
- [ed11195](https://git.max-richter.dev/max/nodarium/commit/ed1119532750d47a1395ced92fe310a6aa5e070e) chore: refactor graphStack to be simpler
- [8ad62cf](https://git.max-richter.dev/max/nodarium/commit/8ad62cfc8e8c60e4e72fdaa3d8caca75a7472da6) feat: add node group breadcrumbs
- [bff140a](https://git.max-richter.dev/max/nodarium/commit/bff140a764ff0b6ed2c6e42814a088ca9e2ef1ee) feat: show different ui when inside group
- [85e2fd1](https://git.max-richter.dev/max/nodarium/commit/85e2fd1a7126aab4a544eea3d185cfc63754cb73) fix: use correct id for debug node
- [5beb031](https://git.max-richter.dev/max/nodarium/commit/5beb03196d46434f617442cc55d721c7d3eebe33) fix: broken format command for @nodarium/planty
- [83e0e47](https://git.max-richter.dev/max/nodarium/commit/83e0e47082ed0d9fbd60e67a6d6c9ed65a9f4f24) refactor: only show group/node panel when selected
- [106797d](https://git.max-richter.dev/max/nodarium/commit/106797de32f0d57059c481770e734b555900421d) feat: make group input/output node work
- [1a56ba9](https://git.max-richter.dev/max/nodarium/commit/1a56ba986d761be545c2cf0236f9c374222da6b1) damn dude
- [703f531](https://git.max-richter.dev/max/nodarium/commit/703f531cd370c2d440a696a68413ea6d5f54019f) chore: make eslint and playwright happy
- [0ed22f2](https://git.max-richter.dev/max/nodarium/commit/0ed22f20b913837b8e90d45aa1a4ada1a90a9313) chore: pnpm upgrade
- [733b0a2](https://git.max-richter.dev/max/nodarium/commit/733b0a2ceb3be6fac1eda5bbf856a4bd1f724e36) chore: sync sveltekit app before e2e
- [8f60816](https://git.max-richter.dev/max/nodarium/commit/8f60816c7841c845120e71590e1c4672d218703e) chore: sync sveltekit app before e2e
- [cd7b51d](https://git.max-richter.dev/max/nodarium/commit/cd7b51d86a1243e0714d9be73588db56c844086c) chore: sync sveltekit app before e2e
- [6c9cd15](https://git.max-richter.dev/max/nodarium/commit/6c9cd1505d72c1c0600910f56ee158d07b7e4811) chore: sync sveltekit app before e2e
- [db5ee8b](https://git.max-richter.dev/max/nodarium/commit/db5ee8ba29812e6865706966ff690ef335ff5e4f) fix: make eslint happy
- [a6b9ca4](https://git.max-richter.dev/max/nodarium/commit/a6b9ca43155b5e9357570705b6f45ba4fc3490a8) feat: capture system stats in benchmark
- [d4910ab](https://git.max-richter.dev/max/nodarium/commit/d4910aba8c5408fb9321b1a22d4c35eae8142309) chore: pnpm format
- [e695c76](https://git.max-richter.dev/max/nodarium/commit/e695c7649015b88d8ca6662bfee5dc0329dd89ac) chore: make eslint happy
- [2a54fa7](https://git.max-richter.dev/max/nodarium/commit/2a54fa7590c1834904a45fb0fc1fd0aa371f0120) feat: add name to groups
- [6d5cac6](https://git.max-richter.dev/max/nodarium/commit/6d5cac65e8acf013ac0a4a61baf3bbc423252d53) feat(ui): click-to-copy on node values in jsonviewer
- [3ee074b](https://git.max-richter.dev/max/nodarium/commit/3ee074b11c9bc216ce7221f5611c8177cef9b313) feat(ui): make inputselect also handle value+label options
- [59a1e63](https://git.max-richter.dev/max/nodarium/commit/59a1e63396635d05543fa4636de5800ce4899a2a) feat: add unit tests for graph state
- [317d155](https://git.max-richter.dev/max/nodarium/commit/317d1552cea5a234ab1ab87684be9a3724b1976f) fix: graph correctly restore html refs after exiting node group
- [78439b1](https://git.max-richter.dev/max/nodarium/commit/78439b19e96e6dbdfb31cc794f5b6e1ff005e26e) fix: make benchmark work
- [ef217b1](https://git.max-richter.dev/max/nodarium/commit/ef217b1c409c25d6054515e1f705831ddbf5a24b) feat: some updates
- [7499b80](https://git.max-richter.dev/max/nodarium/commit/7499b80789e99b87df54d6891597fac7edb56b0f) fix: make the runtime work with groups
- [a5b663f](https://git.max-richter.dev/max/nodarium/commit/a5b663f6fc5e67d5ef67b128c22cdc7363232de5) feat(ci): split e2e and unit tests
- [0550670](https://git.max-richter.dev/max/nodarium/commit/05506704bf68dfd289a1c5130d5d86ddd98954b1) feat: let claude fix ci
- [63188e5](https://git.max-richter.dev/max/nodarium/commit/63188e57fd2cf055161508ee88cbef0cd941e662) feat: let claude fix ci
- [4572d30](https://git.max-richter.dev/max/nodarium/commit/4572d30005d3538f357d4e9f1fb637c1a6559fb1) feat: let claude refactor ci
- [ccc376d](https://git.max-richter.dev/max/nodarium/commit/ccc376d158f209b85a62d98919ac716e46e3e253) feat: store total vertices/faces in benchmarkl
- [7e432e9](https://git.max-richter.dev/max/nodarium/commit/7e432e9033f7fdc73c21bb363cf502c1d8085407) chore: update ci workflow
- [01f5837](https://git.max-richter.dev/max/nodarium/commit/01f58377c21048f95c839504a3e8c46c27ba12ae) feat: make more node group features work
- [6ef5dc2](https://git.max-richter.dev/max/nodarium/commit/6ef5dc28ed9a4874a7b5fb2a9dca73efd1632519) chore: move jsonviewer into ui package
- [3450d70](https://git.max-richter.dev/max/nodarium/commit/3450d7004781ea58f61d563967441a251c817a9b) docs: add LLM.md
- [731b9e9](https://git.max-richter.dev/max/nodarium/commit/731b9e9b1e52598e11044874a46976e517a1150c) feat: upgrade graph source panel
- [72f07d0](https://git.max-richter.dev/max/nodarium/commit/72f07d0a501fa715c40cf0e7c17527ef3f98e96b) feat: initial node groups
- [a56e8f4](https://git.max-richter.dev/max/nodarium/commit/a56e8f445edb6064ae7a7b3b783fb7445f1b4e69) feat(ci): install openssh client
- [1257274](https://git.max-richter.dev/max/nodarium/commit/12572742eb3ba1641cc744a18d330e88df50e9d0) fix(planty): remove debug span
- [7aa9979](https://git.max-richter.dev/max/nodarium/commit/7aa9979e355fcf90342e8b5f1d233b879bb6c71f) chore: update e2e tests
- [fc35a68](https://git.max-richter.dev/max/nodarium/commit/fc35a68826885ac7e9c624b39a5c0fe7d1cb83f0) fix: dont package ui library
- [aba6f03](https://git.max-richter.dev/max/nodarium/commit/aba6f03bcce3e4363f0f22337d0000083bfff9a9) fix: dont package ui library
- [2d6fd00](https://git.max-richter.dev/max/nodarium/commit/2d6fd00fd1ba31bfa943b6d3a4a628bd5132f668) fix: dont package ui library
- [d231946](https://git.max-richter.dev/max/nodarium/commit/d231946e50975dfa1b41696cefbbc2f742480ea8) fix: remove unused imports
- [e2f4a24](https://git.max-richter.dev/max/nodarium/commit/e2f4a24f759b917d3c7c1ca0b8347312785a03e5) fix(planty): make sure config is completely static
- [58d39cd](https://git.max-richter.dev/max/nodarium/commit/58d39cd101298e6a41922d18466899f7bf4a0f97) feat: improve planty ux
- [7ebb129](https://git.max-richter.dev/max/nodarium/commit/7ebb1297ac75987b3348dd81a57e0d25ed0a7405) feat(app): make zoom in nicer
- [23f65a1](https://git.max-richter.dev/max/nodarium/commit/23f65a1c63650faba2051a2c87f7625378b4b0c6) fix: remove unused header div
- [acdc582](https://git.max-richter.dev/max/nodarium/commit/acdc582e957df149ab723d268ac2e205595db199) feat: use ui and planty without build
- [7a3e9eb](https://git.max-richter.dev/max/nodarium/commit/7a3e9eb893182e46e72e203df1eb7532a4652ddd) chore: update test screenshot
- [be82312](https://git.max-richter.dev/max/nodarium/commit/be82312ea049b21e5ff859163e54ba6da88328a0) chore: update test screenshot
- [84f67e9](https://git.max-richter.dev/max/nodarium/commit/84f67e9c33a1141d7e0c3332375576cd0898a47a) fix: update planty types
- [491e345](https://git.max-richter.dev/max/nodarium/commit/491e345c2ff1893916848380e8941fa77dff44ec) feat: build planty in post install
- [ba501b2](https://git.max-richter.dev/max/nodarium/commit/ba501b211db1d70930fa461e1fd82abb5b639c00) fix: correct tsconfig for planty
- [7d76b9e](https://git.max-richter.dev/max/nodarium/commit/7d76b9e1f77ab934289bb18df6197bfd58ce3eeb) fix: mark planty as type:module
- [5d4e2e9](https://git.max-richter.dev/max/nodarium/commit/5d4e2e928093cac39192960d9de21a0e1710904e) fix: make formatter happy
- [4de15b1](https://git.max-richter.dev/max/nodarium/commit/4de15b19c8bdb35e53ba0d3e3e459cdbb12aee9d) feat: wire up planty with nodarium/app
- [168e6fc](https://git.max-richter.dev/max/nodarium/commit/168e6fcc19dc55383b0b21d2b3ebab733058fb94) feat: update some node default settings
- [c0eb75d](https://git.max-richter.dev/max/nodarium/commit/c0eb75d53c4251d041744b19a37c44d0d4a1728c) feat: new planty package
- [2ec9bfc](https://git.max-richter.dev/max/nodarium/commit/2ec9bfc3c96a97aaf29557c70f76b7bf08156e15) feat(ci): compress benchmark data
- [c975206](https://git.max-richter.dev/max/nodarium/commit/c97520617a0d48a765544feebf2d510400db8fb8) fix(ci): use older upload-artifact action
- [6475790](https://git.max-richter.dev/max/nodarium/commit/64757901766efb7ccbd3693ebc63ba1367fe6d88) fix(ci): build nodes before benchmarking
- [580ec73](https://git.max-richter.dev/max/nodarium/commit/580ec7346599e5d538ff53f31808ff770b4a8095) ci: run benchmark in ci
# v0.0.5 (2026-02-13) # v0.0.5 (2026-02-13)
## Features ## Features
Generated
-2
View File
@@ -66,7 +66,6 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
name = "leaf" name = "leaf"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"glam",
"nodarium_macros", "nodarium_macros",
"nodarium_utils", "nodarium_utils",
] ]
@@ -118,7 +117,6 @@ dependencies = [
name = "noise" name = "noise"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"glam",
"nodarium_macros", "nodarium_macros",
"nodarium_utils", "nodarium_utils",
"noise 0.9.0", "noise 0.9.0",
-1
View File
@@ -5,7 +5,6 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH PATH=/usr/local/cargo/bin:$PATH
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
openssh-client \
ca-certificates=20230311+deb12u1 \ ca-certificates=20230311+deb12u1 \
gpg=2.2.40-1.1+deb12u2 \ gpg=2.2.40-1.1+deb12u2 \
gpg-agent=2.2.40-1.1+deb12u2 \ gpg-agent=2.2.40-1.1+deb12u2 \
+9 -159
View File
@@ -1,204 +1,54 @@
import type { Graph, Graph as GraphType, NodeId } from '@nodarium/types'; import type { Graph, Graph as GraphType, NodeId } from '@nodarium/types';
import { createLogger, createPerformanceStore, splitNestedArray } from '@nodarium/utils'; import { createLogger, createPerformanceStore } from '@nodarium/utils';
import { mkdir, writeFile } from 'node:fs/promises'; import { mkdir, writeFile } from 'node:fs/promises';
import { freemem, loadavg, totalmem } from 'node:os';
import { resolve } from 'node:path'; import { resolve } from 'node:path';
import { MemoryRuntimeExecutor } from '../src/lib/runtime/runtime-executor.ts'; import { MemoryRuntimeExecutor } from '../src/lib/runtime/runtime-executor.ts';
import { BenchmarkRegistry } from './benchmarkRegistry.ts'; import { BenchmarkRegistry } from './benchmarkRegistry.ts';
import {
getMachineInfo,
measureCpuUsage,
readCgroupCpuStat,
readCpuSnapshot,
readProcMemInfo,
SystemSample
} from './systemStats.ts';
import defaultPlantTemplate from './templates/default.json' assert { type: 'json' }; import defaultPlantTemplate from './templates/default.json' assert { type: 'json' };
import lottaFacesTemplate from './templates/lotta-faces.json' assert { type: 'json' }; import lottaFacesTemplate from './templates/lotta-faces.json' assert { type: 'json' };
import plantTemplate from './templates/plant.json' assert { type: 'json' }; import plantTemplate from './templates/plant.json' assert { type: 'json' };
const registry = new BenchmarkRegistry(); const registry = new BenchmarkRegistry();
const r = new MemoryRuntimeExecutor(registry); const r = new MemoryRuntimeExecutor(registry);
const perfStore = createPerformanceStore();
const log = createLogger('bench'); const log = createLogger('bench');
const templates: Record<string, Graph> = { const templates: Record<string, Graph> = {
plant: plantTemplate as unknown as GraphType, 'plant': plantTemplate as unknown as GraphType,
'lotta-faces': lottaFacesTemplate as unknown as GraphType, 'lotta-faces': lottaFacesTemplate as unknown as GraphType,
default: defaultPlantTemplate as unknown as GraphType 'default': defaultPlantTemplate as unknown as GraphType
}; };
function average(values: number[]) {
if (values.length === 0) return 0;
return values.reduce((a, b) => a + b, 0) / values.length;
}
function countGeometry(result: Int32Array): {
totalVertices: number;
totalFaces: number;
} {
const parts = splitNestedArray(result);
let totalVertices = 0;
let totalFaces = 0;
for (const part of parts) {
const type = part[0];
const vertexCount = part[1] >>> 0;
const faceCount = part[2] >>> 0;
if (type === 2) {
const instanceCount = part[3] >>> 0;
totalVertices += vertexCount * instanceCount;
totalFaces += faceCount * instanceCount;
} else {
totalVertices += vertexCount;
totalFaces += faceCount;
}
}
return {
totalVertices,
totalFaces
};
}
async function run(g: GraphType, amount: number) { async function run(g: GraphType, amount: number) {
await registry.load(g.nodes.map(n => n.type) as NodeId[]); await registry.load(plantTemplate.nodes.map(n => n.type) as NodeId[]);
log.log('loaded ' + g.nodes.length + ' nodes'); log.log('loaded ' + g.nodes.length + ' nodes');
log.log('warming up'); log.log('warming up');
// Warm up the runtime? maybe this does something?
for (let index = 0; index < 10; index++) { for (let index = 0; index < 10; index++) {
await r.execute(g, { randomSeed: true }); await r.execute(g, { randomSeed: true });
} }
const systemSamples: SystemSample[] = [];
let previousCpuSnapshot = await readCpuSnapshot();
const sampler = setInterval(async () => {
try {
const cpu = await measureCpuUsage(previousCpuSnapshot);
previousCpuSnapshot = cpu.snapshot;
const [l1, l5, l15] = loadavg();
systemSamples.push({
timestamp: Date.now(),
cpuUsagePercent: cpu.usagePercent,
cpuStealPercent: cpu.stealPercent,
load1: l1,
load5: l5,
load15: l15,
freeMemory: freemem(),
totalMemory: totalmem()
});
} catch (err) {
console.error(err);
}
}, 1000);
log.log('executing'); log.log('executing');
const perfStore = createPerformanceStore();
r.perf = perfStore; r.perf = perfStore;
let res: Int32Array | undefined;
const cgroupBefore = await readCgroupCpuStat();
for (let i = 0; i < amount; i++) { for (let i = 0; i < amount; i++) {
r.perf?.startRun(); r.perf?.startRun();
await r.execute(g, { randomSeed: true });
res = await r.execute(g, { randomSeed: true });
r.perf?.stopRun(); r.perf?.stopRun();
const { totalVertices, totalFaces } = countGeometry(res!);
r.perf?.addToLastRun('total-vertices', totalVertices);
r.perf?.addToLastRun('total-faces', totalFaces);
} }
const cgroupAfter = await readCgroupCpuStat();
clearInterval(sampler);
log.log('finished'); log.log('finished');
return r.perf.get();
return {
data: r.perf.get(),
metadata: {
timestamp: new Date().toISOString(),
machine: getMachineInfo(),
process: {
pid: process.pid,
uptime: process.uptime(),
memoryUsage: process.memoryUsage()
},
system: {
averages: {
cpuUsagePercent: average(
systemSamples.map(s => s.cpuUsagePercent)
),
cpuStealPercent: average(
systemSamples.map(s => s.cpuStealPercent)
),
load1: average(systemSamples.map(s => s.load1)),
load5: average(systemSamples.map(s => s.load5)),
load15: average(systemSamples.map(s => s.load15)),
freeMemory: average(
systemSamples.map(s => s.freeMemory)
)
},
samples: systemSamples,
meminfo: await readProcMemInfo()
},
cgroup: {
before: cgroupBefore,
after: cgroupAfter
}
}
};
} }
async function main() { async function main() {
const outPath = resolve('benchmark/out/'); const outPath = resolve('benchmark/out/');
await mkdir(outPath, { recursive: true }); await mkdir(outPath, { recursive: true });
for (const key in templates) { for (const key in templates) {
log.log('executing ' + key); log.log('executing ' + key);
const perfData = await run(templates[key], 100); const perfData = await run(templates[key], 100);
await writeFile(resolve(outPath, key + '.json'), JSON.stringify(perfData));
await writeFile(
resolve(outPath, key + '.json'),
JSON.stringify(perfData, null, 2)
);
await new Promise(res => setTimeout(res, 200)); await new Promise(res => setTimeout(res, 200));
} }
} }
-129
View File
@@ -1,129 +0,0 @@
import { readFile } from 'node:fs/promises';
import { cpus, totalmem } from 'node:os';
export type CpuSnapshot = {
idle: number;
total: number;
steal: number;
};
export type SystemSample = {
timestamp: number;
cpuUsagePercent: number;
cpuStealPercent: number;
load1: number;
load5: number;
load15: number;
freeMemory: number;
totalMemory: number;
};
export async function readCpuSnapshot(): Promise<CpuSnapshot> {
const stat = await readFile('/proc/stat', 'utf8');
const line = stat.split('\n')[0];
const parts: number[] = line
.trim()
.split(/\s+/)
.slice(1)
.map((v: unknown) => Number(v));
const idle = parts[3];
const iowait = parts[4];
const steal = parts[7];
return {
idle: idle + iowait,
total: parts.reduce((a, b) => a + b, 0),
steal: steal ?? 0
};
}
export async function measureCpuUsage(
previous: CpuSnapshot
): Promise<{
snapshot: CpuSnapshot;
usagePercent: number;
stealPercent: number;
}> {
const current = await readCpuSnapshot();
const idle = current.idle - previous.idle;
const total = current.total - previous.total;
const steal = current.steal - previous.steal;
return {
snapshot: current,
usagePercent: total === 0 ? 0 : 100 * (1 - idle / total),
stealPercent: total === 0 ? 0 : 100 * (steal / total)
};
}
export async function readCgroupCpuStat() {
const possiblePaths = [
'/sys/fs/cgroup/cpu.stat',
'/sys/fs/cgroup/cpu/cpu.stat'
];
for (const path of possiblePaths) {
try {
const txt: string = await readFile(path, 'utf8');
return Object.fromEntries(
txt
.trim()
.split('\n')
.map(line => {
const [k, v] = line.trim().split(/\s+/);
return [k, Number(v)];
})
);
} catch {
// continue
}
}
return null;
}
export async function readProcMemInfo() {
try {
const txt = await readFile('/proc/meminfo', 'utf8');
const result: Record<string, number> = {};
for (const line of txt.split('\n')) {
const match = line.match(/^(\w+):\s+(\d+)/);
if (!match) continue;
result[match[1]] = Number(match[2]);
}
return result;
} catch {
return null;
}
}
export function getMachineInfo() {
const cpuInfo = cpus();
return {
platform: process.platform,
arch: process.arch,
nodeVersion: process.version,
cpuModel: cpuInfo[0]?.model ?? 'unknown',
cpuCount: cpuInfo.length,
totalMemory: totalmem(),
ci: {
githubActions: process.env.GITHUB_ACTIONS ?? false,
runnerName: process.env.RUNNER_NAME ?? null,
runnerOs: process.env.RUNNER_OS ?? null,
runnerArch: process.env.RUNNER_ARCH ?? null
}
};
}
+3
View File
@@ -8,6 +8,9 @@ test('test', async ({ page }) => {
await page.goto('http://localhost:4173', { waitUntil: 'load' }); await page.goto('http://localhost:4173', { waitUntil: 'load' });
// await expect(page).toHaveScreenshot();
await expect(page.locator('.graph-wrapper')).toHaveScreenshot();
await page.getByRole('button', { name: 'projects' }).click(); await page.getByRole('button', { name: 'projects' }).click();
await page.getByRole('button', { name: 'New', exact: true }).click(); await page.getByRole('button', { name: 'New', exact: true }).click();
await page.getByRole('combobox').selectOption('2'); await page.getByRole('combobox').selectOption('2');
Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

+31 -31
View File
@@ -1,13 +1,13 @@
{ {
"name": "@nodarium/app", "name": "@nodarium/app",
"private": true, "private": true,
"version": "0.0.6", "version": "0.0.5",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
"predev": "rm static/CHANGELOG.md && ln -s ../../CHANGELOG.md static/CHANGELOG.md", "predev": "rm static/CHANGELOG.md && ln -s ../../CHANGELOG.md static/CHANGELOG.md",
"build": "svelte-kit sync && vite build", "build": "svelte-kit sync && vite build",
"test:unit": "vitest --browser=false", "test:unit": "vitest",
"test": "npm run test:unit -- --run && npm run test:e2e", "test": "npm run test:unit -- --run && npm run test:e2e",
"test:e2e": "playwright test", "test:e2e": "playwright test",
"preview": "vite preview", "preview": "vite preview",
@@ -18,49 +18,49 @@
"bench": "tsx ./benchmark/index.ts" "bench": "tsx ./benchmark/index.ts"
}, },
"dependencies": { "dependencies": {
"@nodarium/planty": "workspace:*",
"@nodarium/ui": "workspace:*", "@nodarium/ui": "workspace:*",
"@nodarium/utils": "workspace:*", "@nodarium/utils": "workspace:*",
"@sveltejs/kit": "^2.59.0", "@nodarium/planty": "workspace:*",
"@tailwindcss/vite": "^4.2.4", "@sveltejs/kit": "^2.50.2",
"@threlte/core": "8.5.11", "@tailwindcss/vite": "^4.1.18",
"@threlte/extras": "9.15.1", "@threlte/core": "8.3.1",
"@threlte/extras": "9.7.1",
"comlink": "^4.4.2", "comlink": "^4.4.2",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"idb": "^8.0.3", "idb": "^8.0.3",
"jsondiffpatch": "^0.7.3", "jsondiffpatch": "^0.7.3",
"micromark": "^4.0.2", "micromark": "^4.0.2",
"tailwindcss": "^4.2.4", "tailwindcss": "^4.1.18",
"three": "^0.184.0" "three": "^0.182.0"
}, },
"devDependencies": { "devDependencies": {
"@eslint/compat": "^2.0.5", "@eslint/compat": "^2.0.2",
"@eslint/js": "^10.0.1", "@eslint/js": "^9.39.2",
"@iconify-json/tabler": "^1.2.33", "@iconify-json/tabler": "^1.2.26",
"@iconify/tailwind4": "^1.2.3", "@iconify/tailwind4": "^1.2.1",
"@nodarium/types": "workspace:^", "@nodarium/types": "workspace:^",
"@playwright/test": "^1.59.1", "@playwright/test": "^1.58.1",
"@sveltejs/adapter-static": "^3.0.10", "@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/vite-plugin-svelte": "^7.0.0", "@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tsconfig/svelte": "^5.0.8", "@tsconfig/svelte": "^5.0.7",
"@types/file-saver": "^2.0.7", "@types/file-saver": "^2.0.7",
"@types/three": "^0.184.0", "@types/three": "^0.182.0",
"@vitest/browser-playwright": "^4.1.5", "@vitest/browser-playwright": "^4.0.18",
"dprint": "^0.54.0", "dprint": "^0.51.1",
"eslint": "^10.3.0", "eslint": "^9.39.2",
"eslint-plugin-svelte": "^3.17.1", "eslint-plugin-svelte": "^3.14.0",
"globals": "^17.6.0", "globals": "^17.3.0",
"svelte": "^5.55.5", "svelte": "^5.49.2",
"svelte-check": "^4.4.7", "svelte-check": "^4.3.6",
"tslib": "^2.8.1", "tslib": "^2.8.1",
"tsx": "^4.21.0", "tsx": "^4.21.0",
"typescript": "^6.0.3", "typescript": "^5.9.3",
"typescript-eslint": "^8.59.1", "typescript-eslint": "^8.54.0",
"vite": "^8.0.10", "vite": "^7.3.1",
"vite-plugin-comlink": "^5.3.0", "vite-plugin-comlink": "^5.3.0",
"vite-plugin-glsl": "^1.6.0", "vite-plugin-glsl": "^1.5.5",
"vite-plugin-wasm": "^3.6.0", "vite-plugin-wasm": "^3.5.0",
"vitest": "^4.1.5", "vitest": "^4.0.18",
"vitest-browser-svelte": "^2.1.1" "vitest-browser-svelte": "^2.0.2"
} }
} }
@@ -1,12 +1,10 @@
<script lang="ts"> <script lang="ts">
import { appSettings } from '$lib/settings/app-settings.svelte'; import { appSettings } from '$lib/settings/app-settings.svelte';
import { T, useThrelte } from '@threlte/core'; import { T } from '@threlte/core';
import { colors } from '../graph/colors.svelte'; import { colors } from '../graph/colors.svelte';
import BackgroundFrag from './Background.frag'; import BackgroundFrag from './Background.frag';
import BackgroundVert from './Background.vert'; import BackgroundVert from './Background.vert';
const { invalidate } = useThrelte();
type Props = { type Props = {
minZoom?: number; minZoom?: number;
maxZoom?: number; maxZoom?: number;
@@ -35,16 +33,9 @@
let bw = $derived(width / cameraPosition[2]); let bw = $derived(width / cameraPosition[2]);
let bh = $derived(height / cameraPosition[2]); let bh = $derived(height / cameraPosition[2]);
$effect(() => {
if (appSettings.value.theme) {
setTimeout(() => invalidate(), 10);
}
});
</script> </script>
<T.Group <T.Group
visible={!appSettings.value.theme.includes('contrast')}
position.x={cameraPosition[0]} position.x={cameraPosition[0]}
position.z={cameraPosition[1]} position.z={cameraPosition[1]}
position.y={-1.0} position.y={-1.0}
@@ -185,8 +185,6 @@
> >
{node.meta?.title ?? node.id.split('/').at(-1)} {node.meta?.title ?? node.id.split('/').at(-1)}
</div> </div>
{:else}
<div class="no-results">No results for "{value}"</div>
{/each} {/each}
</div> </div>
</div> </div>
@@ -243,11 +241,4 @@
background: var(--color-layer-2); background: var(--color-layer-2);
opacity: 1; opacity: 1;
} }
.no-results {
padding: 1em 0.9em;
font-size: 0.85em;
opacity: 0.45;
font-style: italic;
}
</style> </style>
@@ -1,68 +0,0 @@
<script lang="ts">
import { Button } from '@nodarium/ui';
import { getGraphManager } from '../graph-state.svelte';
const graph = getGraphManager();
function getGroupName(groupId: number) {
const group = graph.getGroup(groupId);
return group?.name || `Group#${groupId}`;
}
function exitToGroup(targetId?: number) {
while (graph.currentGroupId !== (targetId ?? null)) {
graph.exitGroup();
}
}
// Intermediate groups: parent stack entries that are groups (not the root graph).
const intermediateGroups = $derived(
graph.parentStack.filter(e => e.id !== graph.id)
);
</script>
<div class="shadow" class:is-inside-group={graph.isInsideGroup}></div>
{#if graph.isInsideGroup}
<div class="group-name flex gap-1 items-center">
<Button variant="ghost" size="sm" onclick={() => exitToGroup()}>Root</Button>
{#each intermediateGroups as entry (entry.id)}
<span class="i-[tabler--arrow-right]"></span>
<Button variant="ghost" size="sm" onclick={() => exitToGroup(entry.id)}>
{getGroupName(entry.id)}
</Button>
{/each}
<span class="i-[tabler--arrow-right]"></span>
<Button variant="ghost" size="sm" class="opacity-100!">
{getGroupName(graph.currentGroupId!)}
</Button>
</div>
{/if}
<style>
.shadow {
position: absolute;
top: -5px;
left: -5px;
right: calc(var(--padding-right) - 5px);
bottom: -5px;
z-index: 1;
transition: box-shadow 0.3s ease;
box-shadow: 0 0 0px 0px var(--color-layer-2) inset;
pointer-events: none;
}
.shadow.is-inside-group {
box-shadow: 0 0 0px 8px var(--color-layer-2) inset;
}
.group-name {
position: absolute;
left: calc(50% - var(--padding-right) / 2);
transition: left 0.3s ease;
top: 12px;
transform: translateX(-50%);
z-index: 1000;
}
</style>
@@ -1,4 +1,4 @@
import { assert, describe, expect, it } from 'vitest'; import { describe, expect, it } from 'vitest';
import { GraphManager } from './graph-manager.svelte'; import { GraphManager } from './graph-manager.svelte';
import { import {
createMockNodeRegistry, createMockNodeRegistry,
@@ -9,399 +9,257 @@ import {
mockVec3OutputNode mockVec3OutputNode
} from './test-utils'; } from './test-utils';
describe('groupNodes', () => { describe('GraphManager', () => {
it('should not do anything if no nodes are selected', () => { describe('getPossibleSockets', () => {
const registry = createMockNodeRegistry([ describe('when dragging an output socket', () => {
mockFloatOutputNode, it('should return compatible input sockets based on type', () => {
mockFloatInputNode, const registry = createMockNodeRegistry([
mockGeometryOutputNode, mockFloatOutputNode,
mockPathInputNode mockFloatInputNode,
]); mockGeometryOutputNode,
mockPathInputNode
]);
const manager = new GraphManager(registry); const manager = new GraphManager(registry);
const floatInputNode = manager.createNode({ const floatInputNode = manager.createNode({
type: 'test/node/input', type: 'test/node/input',
position: [100, 100], position: [100, 100],
props: {} props: {}
}); });
assert.isDefined(floatInputNode); const floatOutputNode = manager.createNode({
type: 'test/node/output',
position: [0, 0],
props: {}
});
const floatOutputNode = manager.createNode({ expect(floatInputNode).toBeDefined();
type: 'test/node/output', expect(floatOutputNode).toBeDefined();
position: [0, 0],
props: {}
});
assert.isDefined(floatOutputNode);
const edge = manager.createEdge(floatInputNode, 0, floatOutputNode, 'input'); const possibleSockets = manager.getPossibleSockets({
assert.isDefined(edge); node: floatOutputNode!,
manager.save(); index: 0,
position: [0, 0]
});
manager.groupNodes([]); expect(possibleSockets.length).toBe(1);
const socketNodeIds = possibleSockets.map(([node]) => node.id);
const graph = manager.serialize(); expect(socketNodeIds).toContain(floatInputNode!.id);
expect(graph.nodes.length).toBe(2);
expect(graph.edges.length).toBe(1);
expect(graph.groups.length).toBe(0);
});
it('should group selected nodes and create a group node', () => {
const registry = createMockNodeRegistry([
mockFloatOutputNode,
mockFloatInputNode,
mockGeometryOutputNode,
mockPathInputNode
]);
const manager = new GraphManager(registry);
const floatInputNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
});
assert.isDefined(floatInputNode);
const floatOutputNode = manager.createNode({
type: 'test/node/output',
position: [0, 0],
props: {}
});
assert.isDefined(floatOutputNode);
const edge = manager.createEdge(floatInputNode, 0, floatOutputNode, 'input');
assert.isDefined(edge);
manager.save();
const groupNode = manager.groupNodes([floatInputNode.id]);
assert.isDefined(groupNode);
const graph = manager.serialize();
expect(graph.nodes.map(n => n.id), 'graph to contain group node').to.contain(groupNode.id);
expect(graph.groups[0].nodes.map(n => n.id), 'group graph to contain float node').to.contain(
floatInputNode.id
);
expect(graph.nodes.map(n => n.id)).not.to.contain(floatInputNode.id);
expect(graph.nodes.length).toBe(2);
expect(graph.edges.length).toBe(1);
expect(graph.groups.length).toBe(1);
});
it('should rewire external edges when grouping a middle node in a chain', () => {
const registry = createMockNodeRegistry([mockFloatOutputNode, mockFloatInputNode]);
const manager = new GraphManager(registry);
// A → B → C (float chain: output → middle → input)
const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
const nodeB = manager.createNode({ type: 'test/node/output', position: [100, 0], props: {} });
const nodeC = manager.createNode({ type: 'test/node/input', position: [200, 0], props: {} });
assert.isDefined(nodeA);
assert.isDefined(nodeB);
assert.isDefined(nodeC);
manager.createEdge(nodeA, 0, nodeB, 'input');
manager.createEdge(nodeB, 0, nodeC, 'value');
const groupNode = manager.groupNodes([nodeB.id]);
assert.isDefined(groupNode);
const graph = manager.serialize();
// Top-level: A, C, groupNode — B is gone
expect(graph.nodes.length, 'top-level node count').toBe(3);
const topLevelIds = graph.nodes.map(n => n.id);
expect(topLevelIds).toContain(nodeA.id);
expect(topLevelIds).toContain(nodeC.id);
expect(topLevelIds).toContain(groupNode.id);
expect(topLevelIds).not.toContain(nodeB.id);
// Both original edges survive, now routing through the group node
expect(graph.edges.length, 'edge count unchanged').toBe(2);
const edgeSources = graph.edges.map(e => e[0]);
const edgeTargets = graph.edges.map(e => e[2]);
expect(edgeTargets).toContain(groupNode.id); // A → groupNode
expect(edgeSources).toContain(groupNode.id); // groupNode → C
// One group definition was created
expect(graph.groups.length).toBe(1);
const group = graph.groups[0];
// Group contains B plus the two boundary nodes
const groupNodeIds = group.nodes.map(n => n.id);
expect(groupNodeIds).toContain(nodeB.id);
const inputBoundary = group.nodes.find(n => n.type === '__internal/group/input');
const outputBoundary = group.nodes.find(n => n.type === '__internal/group/output');
expect(inputBoundary, 'group input boundary node').toBeDefined();
expect(outputBoundary, 'group output boundary node').toBeDefined();
// Group declares one input slot and one output slot
expect(Object.keys(group.inputs ?? {}).length, 'group input count').toBe(1);
expect(group.outputs?.length, 'group output count').toBe(1);
// Internal edges wire: inputBoundary → B → outputBoundary
expect(group.edges.length, 'internal edge count').toBe(2);
const internalSources = group.edges.map(e => e[0]);
const internalTargets = group.edges.map(e => e[2]);
expect(internalTargets).toContain(nodeB.id);
expect(internalSources).toContain(nodeB.id);
});
});
describe('getPossibleSockets', () => {
describe('when dragging an output socket', () => {
it('should return compatible input sockets based on type', () => {
const registry = createMockNodeRegistry([
mockFloatOutputNode,
mockFloatInputNode,
mockGeometryOutputNode,
mockPathInputNode
]);
const manager = new GraphManager(registry);
const floatInputNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
}); });
const floatOutputNode = manager.createNode({ it('should exclude self node from possible sockets', () => {
type: 'test/node/output', const registry = createMockNodeRegistry([
position: [0, 0], mockFloatOutputNode,
props: {} mockFloatInputNode
]);
const manager = new GraphManager(registry);
const floatInputNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
});
expect(floatInputNode).toBeDefined();
const possibleSockets = manager.getPossibleSockets({
node: floatInputNode!,
index: 'value',
position: [0, 0]
});
const socketNodeIds = possibleSockets.map(([node]) => node.id);
expect(socketNodeIds).not.toContain(floatInputNode!.id);
}); });
expect(floatInputNode).toBeDefined(); it('should exclude parent nodes from possible sockets when dragging output', () => {
expect(floatOutputNode).toBeDefined(); const registry = createMockNodeRegistry([
mockFloatOutputNode,
mockFloatInputNode
]);
const possibleSockets = manager.getPossibleSockets({ const manager = new GraphManager(registry);
node: floatOutputNode!,
index: 0, const parentNode = manager.createNode({
position: [0, 0] type: 'test/node/output',
position: [0, 0],
props: {}
});
const childNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
});
expect(parentNode).toBeDefined();
expect(childNode).toBeDefined();
if (parentNode && childNode) {
manager.createEdge(parentNode, 0, childNode, 'value');
}
const possibleSockets = manager.getPossibleSockets({
node: parentNode!,
index: 0,
position: [0, 0]
});
const socketNodeIds = possibleSockets.map(([node]) => node.id);
expect(socketNodeIds).not.toContain(childNode!.id);
}); });
expect(possibleSockets.length).toBe(1); it('should return sockets compatible with accepts property', () => {
const socketNodeIds = possibleSockets.map(([node]) => node.id); const registry = createMockNodeRegistry([
expect(socketNodeIds).toContain(floatInputNode!.id); mockGeometryOutputNode,
}); mockPathInputNode
]);
it('should exclude self node from possible sockets', () => { const manager = new GraphManager(registry);
const registry = createMockNodeRegistry([
mockFloatOutputNode,
mockFloatInputNode
]);
const manager = new GraphManager(registry); const geometryOutputNode = manager.createNode({
type: 'test/node/geometry',
position: [0, 0],
props: {}
});
const floatInputNode = manager.createNode({ const pathInputNode = manager.createNode({
type: 'test/node/input', type: 'test/node/path',
position: [100, 100], position: [100, 100],
props: {} props: {}
});
expect(geometryOutputNode).toBeDefined();
expect(pathInputNode).toBeDefined();
const possibleSockets = manager.getPossibleSockets({
node: geometryOutputNode!,
index: 0,
position: [0, 0]
});
const socketNodeIds = possibleSockets.map(([node]) => node.id);
expect(socketNodeIds).toContain(pathInputNode!.id);
}); });
expect(floatInputNode).toBeDefined(); it('should return empty array when no compatible sockets exist', () => {
const registry = createMockNodeRegistry([
mockVec3OutputNode,
mockFloatInputNode
]);
const possibleSockets = manager.getPossibleSockets({ const manager = new GraphManager(registry);
node: floatInputNode!,
index: 'value', const vec3OutputNode = manager.createNode({
position: [0, 0] type: 'test/node/vec3',
position: [0, 0],
props: {}
});
const floatInputNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
});
expect(vec3OutputNode).toBeDefined();
expect(floatInputNode).toBeDefined();
const possibleSockets = manager.getPossibleSockets({
node: vec3OutputNode!,
index: 0,
position: [0, 0]
});
const socketNodeIds = possibleSockets.map(([node]) => node.id);
expect(socketNodeIds).not.toContain(floatInputNode!.id);
expect(possibleSockets.length).toBe(0);
}); });
const socketNodeIds = possibleSockets.map(([node]) => node.id); it('should return socket info with correct socket key for inputs', () => {
expect(socketNodeIds).not.toContain(floatInputNode!.id); const registry = createMockNodeRegistry([
}); mockFloatOutputNode,
mockFloatInputNode
]);
it('should exclude parent nodes from possible sockets when dragging output', () => { const manager = new GraphManager(registry);
const registry = createMockNodeRegistry([
mockFloatOutputNode,
mockFloatInputNode
]);
const manager = new GraphManager(registry); const floatOutputNode = manager.createNode({
type: 'test/node/output',
position: [0, 0],
props: {}
});
const parentNode = manager.createNode({ const floatInputNode = manager.createNode({
type: 'test/node/output', type: 'test/node/input',
position: [0, 0], position: [100, 100],
props: {} props: {}
});
expect(floatOutputNode).toBeDefined();
expect(floatInputNode).toBeDefined();
const possibleSockets = manager.getPossibleSockets({
node: floatOutputNode!,
index: 0,
position: [0, 0]
});
const matchingSocket = possibleSockets.find(([node]) => node.id === floatInputNode!.id);
expect(matchingSocket).toBeDefined();
expect(matchingSocket![1]).toBe('value');
}); });
const childNode = manager.createNode({ it('should return multiple compatible sockets', () => {
type: 'test/node/input', const registry = createMockNodeRegistry([
position: [100, 100], mockFloatOutputNode,
props: {} mockFloatInputNode,
mockGeometryOutputNode,
mockPathInputNode
]);
const manager = new GraphManager(registry);
const floatOutputNode = manager.createNode({
type: 'test/node/output',
position: [0, 0],
props: {}
});
const geometryOutputNode = manager.createNode({
type: 'test/node/geometry',
position: [200, 0],
props: {}
});
const floatInputNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
});
const pathInputNode = manager.createNode({
type: 'test/node/path',
position: [300, 100],
props: {}
});
expect(floatOutputNode).toBeDefined();
expect(geometryOutputNode).toBeDefined();
expect(floatInputNode).toBeDefined();
expect(pathInputNode).toBeDefined();
const possibleSocketsForFloat = manager.getPossibleSockets({
node: floatOutputNode!,
index: 0,
position: [0, 0]
});
expect(possibleSocketsForFloat.length).toBe(1);
expect(possibleSocketsForFloat.map(([n]) => n.id)).toContain(floatInputNode!.id);
}); });
expect(parentNode).toBeDefined();
expect(childNode).toBeDefined();
if (parentNode && childNode) {
manager.createEdge(parentNode, 0, childNode, 'value');
}
const possibleSockets = manager.getPossibleSockets({
node: parentNode!,
index: 0,
position: [0, 0]
});
const socketNodeIds = possibleSockets.map(([node]) => node.id);
expect(socketNodeIds).not.toContain(childNode!.id);
});
it('should return sockets compatible with accepts property', () => {
const registry = createMockNodeRegistry([
mockGeometryOutputNode,
mockPathInputNode
]);
const manager = new GraphManager(registry);
const geometryOutputNode = manager.createNode({
type: 'test/node/geometry',
position: [0, 0],
props: {}
});
const pathInputNode = manager.createNode({
type: 'test/node/path',
position: [100, 100],
props: {}
});
expect(geometryOutputNode).toBeDefined();
expect(pathInputNode).toBeDefined();
const possibleSockets = manager.getPossibleSockets({
node: geometryOutputNode!,
index: 0,
position: [0, 0]
});
const socketNodeIds = possibleSockets.map(([node]) => node.id);
expect(socketNodeIds).toContain(pathInputNode!.id);
});
it('should return empty array when no compatible sockets exist', () => {
const registry = createMockNodeRegistry([
mockVec3OutputNode,
mockFloatInputNode
]);
const manager = new GraphManager(registry);
const vec3OutputNode = manager.createNode({
type: 'test/node/vec3',
position: [0, 0],
props: {}
});
const floatInputNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
});
expect(vec3OutputNode).toBeDefined();
expect(floatInputNode).toBeDefined();
const possibleSockets = manager.getPossibleSockets({
node: vec3OutputNode!,
index: 0,
position: [0, 0]
});
const socketNodeIds = possibleSockets.map(([node]) => node.id);
expect(socketNodeIds).not.toContain(floatInputNode!.id);
expect(possibleSockets.length).toBe(0);
});
it('should return socket info with correct socket key for inputs', () => {
const registry = createMockNodeRegistry([
mockFloatOutputNode,
mockFloatInputNode
]);
const manager = new GraphManager(registry);
const floatOutputNode = manager.createNode({
type: 'test/node/output',
position: [0, 0],
props: {}
});
const floatInputNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
});
expect(floatOutputNode).toBeDefined();
expect(floatInputNode).toBeDefined();
const possibleSockets = manager.getPossibleSockets({
node: floatOutputNode!,
index: 0,
position: [0, 0]
});
const matchingSocket = possibleSockets.find(([node]) => node.id === floatInputNode!.id);
expect(matchingSocket).toBeDefined();
expect(matchingSocket![1]).toBe('value');
});
it('should return multiple compatible sockets', () => {
const registry = createMockNodeRegistry([
mockFloatOutputNode,
mockFloatInputNode,
mockGeometryOutputNode,
mockPathInputNode
]);
const manager = new GraphManager(registry);
const floatOutputNode = manager.createNode({
type: 'test/node/output',
position: [0, 0],
props: {}
});
const geometryOutputNode = manager.createNode({
type: 'test/node/geometry',
position: [200, 0],
props: {}
});
const floatInputNode = manager.createNode({
type: 'test/node/input',
position: [100, 100],
props: {}
});
const pathInputNode = manager.createNode({
type: 'test/node/path',
position: [300, 100],
props: {}
});
expect(floatOutputNode).toBeDefined();
expect(geometryOutputNode).toBeDefined();
expect(floatInputNode).toBeDefined();
expect(pathInputNode).toBeDefined();
const possibleSocketsForFloat = manager.getPossibleSockets({
node: floatOutputNode!,
index: 0,
position: [0, 0]
});
expect(possibleSocketsForFloat.length).toBe(1);
expect(possibleSocketsForFloat.map(([n]) => n.id)).toContain(floatInputNode!.id);
}); });
}); });
}); });
File diff suppressed because it is too large Load Diff
@@ -1,262 +0,0 @@
import { assert, describe, expect, it } from 'vitest';
import { GraphManager } from './graph-manager.svelte';
import { GraphState } from './graph-state.svelte';
import { createMockNodeRegistry, mockFloatInputNode, mockFloatOutputNode } from './test-utils';
// GraphState constructor reads localStorage synchronously — mock before any instantiation
Object.defineProperty(globalThis, 'localStorage', {
value: {
getItem: () => null,
setItem: () => {},
removeItem: () => {},
clear: () => {},
length: 0,
key: () => null
} as Storage,
writable: true,
configurable: true
});
function createFixture() {
const registry = createMockNodeRegistry([mockFloatOutputNode, mockFloatInputNode]);
const manager = new GraphManager(registry);
const state = new GraphState(manager);
return { manager, state };
}
describe('clearSelection', () => {
it('empties selectedNodes', () => {
const { state } = createFixture();
state.selectedNodes.add(1);
state.selectedNodes.add(2);
state.clearSelection();
expect(state.selectedNodes.size).toBe(0);
});
});
describe('projectScreenToWorld', () => {
it('maps the viewport centre to the camera position', () => {
const { state } = createFixture();
// cameraPosition default: [140, 100, 3.5], width=100, height=100
state.width = 100;
state.height = 100;
state.cameraPosition = [140, 100, 3.5];
const [wx, wy] = state.projectScreenToWorld(50, 50);
expect(wx).toBeCloseTo(140);
expect(wy).toBeCloseTo(100);
});
it('offsets correctly for a point not at centre', () => {
const { state } = createFixture();
state.width = 100;
state.height = 100;
state.cameraPosition = [0, 0, 2];
const [wx, wy] = state.projectScreenToWorld(100, 50);
// x: 0 + (100 - 50) / 2 = 25
expect(wx).toBeCloseTo(25);
expect(wy).toBeCloseTo(0);
});
});
describe('groupSelectedNodes', () => {
it('delegates to graph.groupNodes with selected IDs and activeNodeId', () => {
const { manager, state } = createFixture();
const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
const nodeB = manager.createNode({ type: 'test/node/input', position: [100, 0], props: {} });
assert.isDefined(nodeA);
assert.isDefined(nodeB);
state.selectedNodes.add(nodeA!.id);
state.activeNodeId = nodeB!.id;
const groupNode = state.groupSelectedNodes();
assert.isDefined(groupNode);
const graph = manager.serialize();
expect(graph.groups.length).toBe(1);
expect(graph.nodes.map(n => n.id)).toContain(groupNode!.id);
});
it('works when only activeNodeId is set with no extra selection', () => {
const { manager, state } = createFixture();
const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
assert.isDefined(nodeA);
state.activeNodeId = nodeA!.id;
const groupNode = state.groupSelectedNodes();
assert.isDefined(groupNode);
expect(manager.groups.length).toBe(1);
});
});
describe('enterGroupNode', () => {
it('does nothing when activeNodeId is -1', () => {
const { manager, state } = createFixture();
state.activeNodeId = -1;
state.enterGroupNode();
expect(manager.parentStack.length).toBe(0);
});
it('does nothing when the active node is not a group instance', () => {
const { manager, state } = createFixture();
const node = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
assert.isDefined(node);
state.activeNodeId = node!.id;
state.enterGroupNode();
expect(manager.parentStack.length).toBe(0);
});
it('enters the group, pushes graphStack, and clears UI state', () => {
const { manager, state } = createFixture();
const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
assert.isDefined(nodeA);
const groupNode = manager.groupNodes([nodeA!.id]);
assert.isDefined(groupNode);
state.selectedNodes.add(nodeA!.id);
state.activeNodeId = groupNode!.id;
state.cameraPosition = [10, 20, 5];
state.enterGroupNode();
expect(manager.parentStack.length).toBe(1);
expect(state.activeNodeId).toBe(-1);
expect(state.selectedNodes.size).toBe(0);
expect(manager.isInsideGroup).toBe(true);
});
});
describe('exitGroupNode', () => {
it('does nothing when not inside a group', () => {
const { manager, state } = createFixture();
const before = [...state.cameraPosition];
state.exitGroupNode();
expect(manager.parentStack.length).toBe(0);
expect(state.cameraPosition).toEqual(before);
});
it('clears activeNodeId and selection after exit', () => {
const { manager, state } = createFixture();
const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
assert.isDefined(nodeA);
const groupNode = manager.groupNodes([nodeA!.id]);
assert.isDefined(groupNode);
state.activeNodeId = groupNode!.id;
state.enterGroupNode();
state.activeNodeId = 99;
state.selectedNodes.add(99);
state.exitGroupNode();
// Group instance node is re-selected on exit; internal selection is cleared
expect(state.activeNodeId).toBe(groupNode!.id);
expect(state.selectedNodes.size).toBe(0);
});
it('restores outer nodes to manager after exit', () => {
const { manager, state } = createFixture();
const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
const nodeB = manager.createNode({ type: 'test/node/input', position: [100, 0], props: {} });
assert.isDefined(nodeA);
assert.isDefined(nodeB);
manager.createEdge(nodeA!, 0, nodeB!, 'value');
const groupNode = manager.groupNodes([nodeA!.id]);
assert.isDefined(groupNode);
state.activeNodeId = groupNode!.id;
state.enterGroupNode();
// Inside the group: nodeA is an internal node so it IS active; the outer
// nodes (nodeB, groupNode) are saved and no longer in the active Map.
expect(manager.nodes.has(nodeA!.id)).toBe(true);
expect(manager.nodes.has(nodeB!.id)).toBe(false);
state.exitGroupNode();
// After exit: outer nodes are restored
expect(manager.nodes.has(nodeB!.id)).toBe(true);
expect(manager.nodes.has(groupNode!.id)).toBe(true);
expect(manager.isInsideGroup).toBe(false);
});
it('isInsideGroup is false after exiting the only group level', () => {
const { manager, state } = createFixture();
const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
assert.isDefined(nodeA);
const groupNode = manager.groupNodes([nodeA!.id]);
assert.isDefined(groupNode);
state.activeNodeId = groupNode!.id;
state.enterGroupNode();
expect(manager.isInsideGroup).toBe(true);
state.exitGroupNode();
expect(manager.isInsideGroup).toBe(false);
});
});
describe('copyNodes / pasteNodes', () => {
it('copies the active node into the clipboard', () => {
const { manager, state } = createFixture();
const node = manager.createNode({ type: 'test/node/output', position: [10, 20], props: {} });
assert.isDefined(node);
state.activeNodeId = node!.id;
state.mousePosition = [0, 0];
state.copyNodes();
assert.isNotNull(state.clipboard);
expect(state.clipboard!.nodes.map(n => n.id)).toContain(node!.id);
});
it('includes edges between copied nodes', () => {
const { manager, state } = createFixture();
const nodeA = manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
const nodeB = manager.createNode({ type: 'test/node/input', position: [100, 0], props: {} });
assert.isDefined(nodeA);
assert.isDefined(nodeB);
manager.createEdge(nodeA!, 0, nodeB!, 'value');
state.activeNodeId = nodeA!.id;
state.selectedNodes.add(nodeB!.id);
state.mousePosition = [0, 0];
state.copyNodes();
assert.isNotNull(state.clipboard);
expect(state.clipboard!.edges.length).toBe(1);
});
it('pastes nodes and adds them to the graph', () => {
const { manager, state } = createFixture();
const node = manager.createNode({ type: 'test/node/output', position: [10, 20], props: {} });
assert.isDefined(node);
state.activeNodeId = node!.id;
state.mousePosition = [0, 0];
state.copyNodes();
const countBefore = manager.nodes.size;
state.mousePosition = [50, 50];
state.pasteNodes();
expect(manager.nodes.size).toBe(countBefore + 1);
});
it('does nothing when clipboard is empty', () => {
const { manager, state } = createFixture();
manager.createNode({ type: 'test/node/output', position: [0, 0], props: {} });
const countBefore = manager.nodes.size;
state.pasteNodes();
expect(manager.nodes.size).toBe(countBefore);
});
});
+67 -128
View File
@@ -1,16 +1,11 @@
import { animate, debounce, lerp } from '$lib/helpers'; import { animate, lerp } from '$lib/helpers';
import type { NodeInstance, SerializedEdge, SerializedNode, Socket } from '@nodarium/types'; import type { NodeInstance, Socket } from '@nodarium/types';
import { getContext, setContext } from 'svelte'; import { getContext, setContext } from 'svelte';
import { SvelteMap, SvelteSet } from 'svelte/reactivity'; import { SvelteMap, SvelteSet } from 'svelte/reactivity';
import type { OrthographicCamera, Vector3 } from 'three'; import type { OrthographicCamera, Vector3 } from 'three';
import type { GraphManager } from './graph-manager.svelte'; import type { GraphManager } from './graph-manager.svelte';
import { ColorGenerator } from './graph/colors'; import { ColorGenerator } from './graph/colors';
import { import { getNodeHeight, getSocketPosition } from './helpers/nodeHelpers';
getNodeHeight,
getParameterHeight,
serializeEdge,
serializeNode
} from './helpers/nodeHelpers';
const graphStateKey = Symbol('graph-state'); const graphStateKey = Symbol('graph-state');
export function getGraphState() { export function getGraphState() {
@@ -62,20 +57,12 @@ export class GraphState {
colors = new ColorGenerator(predefinedColors); colors = new ColorGenerator(predefinedColors);
constructor(private graph: GraphManager) { constructor(private graph: GraphManager) {
const saveCameraPosition = debounce(() => {
localStorage.setItem(
'cameraPosition',
`[${this.cameraPosition[0]},${this.cameraPosition[1]},${this.cameraPosition[2]}]`
);
}, 500);
$effect.root(() => { $effect.root(() => {
$effect(() => { $effect(() => {
// Read values to subscribe to reactivity, then flush lazily. localStorage.setItem(
void this.cameraPosition[0]; 'cameraPosition',
void this.cameraPosition[1]; `[${this.cameraPosition[0]},${this.cameraPosition[1]},${this.cameraPosition[2]}]`
void this.cameraPosition[2]; );
saveCameraPosition();
}); });
}); });
const storedPosition = localStorage.getItem('cameraPosition'); const storedPosition = localStorage.getItem('cameraPosition');
@@ -108,10 +95,13 @@ export class GraphState {
cameraPosition: [number, number, number] = $state([140, 100, 3.5]); cameraPosition: [number, number, number] = $state([140, 100, 3.5]);
clipboard: null | { clipboard: null | {
nodes: SerializedNode[]; nodes: NodeInstance[];
edges: SerializedEdge[]; edges: [number, number, number, string][];
} = null; } = null;
// Saved camera position per group so re-entering restores where you left off
groupCameras = new Map<string, [number, number, number]>();
cameraBounds = $derived([ cameraBounds = $derived([
this.cameraPosition[0] - this.width / this.cameraPosition[2] / 2, this.cameraPosition[0] - this.width / this.cameraPosition[2] / 2,
this.cameraPosition[0] + this.width / this.cameraPosition[2] / 2, this.cameraPosition[0] + this.width / this.cameraPosition[2] / 2,
@@ -165,25 +155,8 @@ export class GraphState {
this.edges.delete(edgeId); this.edges.delete(edgeId);
} }
private _dirtyPositions = new SvelteSet<NodeInstance>(); getEdgeData() {
private _positionFlushPending = false; return this.edges;
private _flushPositions() {
for (const node of this._dirtyPositions) {
if (node.state['x'] !== undefined && node.state['y'] !== undefined) {
if (node.state.ref) {
node.state.ref.style.setProperty('--nx', `${node.state.x * 10}px`);
node.state.ref.style.setProperty('--ny', `${node.state.y * 10}px`);
}
} else {
if (node.state.ref) {
node.state.ref.style.setProperty('--nx', `${node.position[0] * 10}px`);
node.state.ref.style.setProperty('--ny', `${node.position[1] * 10}px`);
}
}
}
this._dirtyPositions.clear();
this._positionFlushPending = false;
} }
updateNodePosition(node: NodeInstance) { updateNodePosition(node: NodeInstance) {
@@ -195,10 +168,16 @@ export class GraphState {
delete node.state.y; delete node.state.y;
} }
this._dirtyPositions.add(node); if (node.state['x'] !== undefined && node.state['y'] !== undefined) {
if (!this._positionFlushPending) { if (node.state.ref) {
this._positionFlushPending = true; node.state.ref.style.setProperty('--nx', `${node.state.x * 10}px`);
requestAnimationFrame(() => this._flushPositions()); node.state.ref.style.setProperty('--ny', `${node.state.y * 10}px`);
}
} else {
if (node.state.ref) {
node.state.ref.style.setProperty('--nx', `${node.position[0] * 10}px`);
node.state.ref.style.setProperty('--ny', `${node.position[1] * 10}px`);
}
} }
} }
@@ -214,14 +193,39 @@ export class GraphState {
return 1; return 1;
} }
tryConnectToDebugNode(nodeId: number) {
const node = this.graph.nodes.get(nodeId);
if (!node) return;
if (node.type.endsWith('/debug')) return;
if (!node.state.type?.outputs?.length) return;
for (const _node of this.graph.nodes.values()) {
if (_node.type.endsWith('/debug')) {
this.graph.createEdge(node, 0, _node, 'input');
return;
}
}
const debugNode = this.graph.createNode({
type: 'max/plantarium/debug',
position: [node.position[0] + 30, node.position[1]],
props: {}
});
if (debugNode) {
this.graph.createEdge(node, 0, debugNode, 'input');
}
}
copyNodes() { copyNodes() {
if (this.activeNodeId === -1 && !this.selectedNodes?.size) { if (this.activeNodeId === -1 && !this.selectedNodes?.size) {
return; return;
} }
const ids = new SvelteSet([this.activeNodeId, ...(this.selectedNodes?.values() || [])]); let nodes = [
let nodes = [...ids] this.activeNodeId,
...(this.selectedNodes?.values() || [])
]
.map((id) => this.graph.getNode(id)) .map((id) => this.graph.getNode(id))
.filter((b): b is NodeInstance => !!b); .filter(b => !!b);
const edges = this.graph.getEdgesBetweenNodes(nodes); const edges = this.graph.getEdgesBetweenNodes(nodes);
nodes = nodes.map((node) => ({ nodes = nodes.map((node) => ({
@@ -229,23 +233,16 @@ export class GraphState {
position: [ position: [
this.mousePosition[0] - node.position[0], this.mousePosition[0] - node.position[0],
this.mousePosition[1] - node.position[1] this.mousePosition[1] - node.position[1]
] ],
tmp: undefined
})); }));
this.clipboard = { this.clipboard = {
nodes: nodes.map(n => serializeNode(n)), nodes: nodes,
edges: edges.map(e => serializeEdge(e)) edges: edges
}; };
} }
unGroupSelectedNodes() {
return this.graph.ungroupNode(this.activeNodeId);
}
groupSelectedNodes() {
return this.graph.groupNodes([...this.selectedNodes.keys(), this.activeNodeId]);
}
centerNode(node?: NodeInstance) { centerNode(node?: NodeInstance) {
const average = [0, 0, 4]; const average = [0, 0, 4];
if (node) { if (node) {
@@ -280,16 +277,13 @@ export class GraphState {
pasteNodes() { pasteNodes() {
if (!this.clipboard) return; if (!this.clipboard) return;
// Create fresh node objects — never mutate clipboard so repeat pastes work correctly. const nodes = this.clipboard.nodes
// State is also spread (with cleared parents/children) so createGraph's mutations .map((node) => {
// don't corrupt the clipboard's stored state references. node.position[0] = this.mousePosition[0] - node.position[0];
const nodes = this.clipboard.nodes.map((node) => ({ node.position[1] = this.mousePosition[1] - node.position[1];
...node, return node;
position: [ })
this.mousePosition[0] - node.position[0], .filter(Boolean) as NodeInstance[];
this.mousePosition[1] - node.position[1]
] as [number, number]
}));
const newNodes = this.graph.createGraph(nodes, this.clipboard.edges); const newNodes = this.graph.createGraph(nodes, this.clipboard.edges);
this.selectedNodes.clear(); this.selectedNodes.clear();
@@ -310,7 +304,7 @@ export class GraphState {
if (edge[3] === index) { if (edge[3] === index) {
node = edge[0]; node = edge[0];
index = edge[1]; index = edge[1];
position = this.getSocketPosition(node, index); position = getSocketPosition(node, index);
this.graph.removeEdge(edge); this.graph.removeEdge(edge);
break; break;
} }
@@ -330,7 +324,7 @@ export class GraphState {
return { return {
node, node,
index, index,
position: this.getSocketPosition(node, index) position: getSocketPosition(node, index)
}; };
}); });
} }
@@ -367,8 +361,7 @@ export class GraphState {
for (const node of this.graph.nodes.values()) { for (const node of this.graph.nodes.values()) {
const x = node.position[0]; const x = node.position[0];
const y = node.position[1]; const y = node.position[1];
const nodeType = this.graph.getNodeType(node); const height = getNodeHeight(node.state.type!);
const height = nodeType ? getNodeHeight(nodeType) : 20;
if (downX > x && downX < x + 20 && downY > y && downY < y + height) { if (downX > x && downX < x + 20 && downY > y && downY < y + height) {
clickedNodeId = node.id; clickedNodeId = node.id;
break; break;
@@ -380,8 +373,7 @@ export class GraphState {
} }
isNodeInView(node: NodeInstance) { isNodeInView(node: NodeInstance) {
if (!node) return false; const height = getNodeHeight(node.state.type!);
const height = getNodeHeight(this.graph.getNodeType(node)!);
const width = 20; const width = 20;
return node.position[0] > this.cameraBounds[0] - width return node.position[0] > this.cameraBounds[0] - width
&& node.position[0] < this.cameraBounds[1] && node.position[0] < this.cameraBounds[1]
@@ -392,57 +384,4 @@ export class GraphState {
openNodePalette() { openNodePalette() {
this.addMenuPosition = [this.mousePosition[0], this.mousePosition[1]]; this.addMenuPosition = [this.mousePosition[0], this.mousePosition[1]];
} }
enterGroupNode() {
if (this.activeNodeId === -1) return;
const node = this.graph.getNode(this.activeNodeId);
if (!node || node.type !== '__internal/group/instance') return;
const ok = this.graph.enterGroup(this.activeNodeId);
if (ok) {
this.activeNodeId = -1;
this.clearSelection();
}
}
exitGroupNode() {
const result = this.graph.exitGroup();
if (!result) return;
this.activeNodeId = result.nodeId;
this.clearSelection();
}
getSocketPosition(
node: NodeInstance,
index: string | number
): [number, number] {
if (node.type === '__internal/group/input' && typeof index === 'number') {
return [
(node?.state?.x ?? node.position[0]) + 20,
(node?.state?.y ?? node.position[1]) + 2.5 + 5 * index + 5
];
}
if (typeof index === 'number') {
return [
(node?.state?.x ?? node.position[0]) + 20,
(node?.state?.y ?? node.position[1]) + 2.5 + 10 * index
];
} else {
let height = 5;
const nodeType = this.graph.getNodeType(node)!;
const inputs = nodeType.inputs || {};
for (const inputKey in inputs) {
const h = getParameterHeight(nodeType, inputKey) / 10;
if (inputKey === index) {
height += h / 2;
break;
}
height += h;
}
return [
node?.state?.x ?? node.position[0],
(node?.state?.y ?? node.position[1]) + height
];
}
}
} }
+10 -21
View File
@@ -7,16 +7,15 @@
import AddMenu from '../components/AddMenu.svelte'; import AddMenu from '../components/AddMenu.svelte';
import BoxSelection from '../components/BoxSelection.svelte'; import BoxSelection from '../components/BoxSelection.svelte';
import Camera from '../components/Camera.svelte'; import Camera from '../components/Camera.svelte';
import GroupBreadcrumps from '../components/GroupBreadcrumps.svelte';
import HelpView from '../components/HelpView.svelte'; import HelpView from '../components/HelpView.svelte';
import Debug from '../debug/Debug.svelte'; import Debug from '../debug/Debug.svelte';
import EdgeEl from '../edges/Edge.svelte'; import EdgeEl from '../edges/Edge.svelte';
import { getGraphManager, getGraphState } from '../graph-state.svelte'; import { getGraphManager, getGraphState } from '../graph-state.svelte';
import { getSocketPosition } from '../helpers/nodeHelpers';
import NodeEl from '../node/Node.svelte'; import NodeEl from '../node/Node.svelte';
import { maxZoom, minZoom } from './constants'; import { maxZoom, minZoom } from './constants';
import { FileDropEventManager } from './drop.events'; import { FileDropEventManager } from './drop.events';
import { MouseEventManager } from './mouse.events'; import { MouseEventManager } from './mouse.events';
import ZoomIndicator from './ZoomIndicator.svelte';
const { const {
keymap, keymap,
@@ -40,8 +39,8 @@
return [0, 0, 0, 0]; return [0, 0, 0, 0];
} }
const pos1 = graphState.getSocketPosition(fromNode, edge[1]); const pos1 = getSocketPosition(fromNode, edge[1]);
const pos2 = graphState.getSocketPosition(toNode, edge[3]); const pos2 = getSocketPosition(toNode, edge[3]);
return [pos1[0], pos1[1], pos2[0], pos2[1]]; return [pos1[0], pos1[1], pos2[0], pos2[1]];
} }
@@ -98,17 +97,13 @@
} }
function getSocketType(node: NodeInstance, index: number | string): string { function getSocketType(node: NodeInstance, index: number | string): string {
const nodeType = graph.getNodeType(node);
if (typeof index === 'string') { if (typeof index === 'string') {
return nodeType?.inputs?.[index].type || 'unknown'; return node.state.type?.inputs?.[index].type || 'unknown';
} }
if (node.type === '__virtual/group/instance') {
if (node.type === '__internal/group/input') { index += 1;
const key = Object.keys(nodeType?.inputs || {})[index];
return nodeType?.inputs?.[key].type || 'unknown';
} }
return node.state.type?.outputs?.[index] || 'unknown';
return nodeType?.outputs?.[index] || 'unknown';
} }
</script> </script>
@@ -122,7 +117,6 @@
bind:this={graphState.wrapper} bind:this={graphState.wrapper}
class="graph-wrapper" class="graph-wrapper"
style="height: 100%" style="height: 100%"
class:is-inside-group={graph.isInsideGroup}
class:is-panning={graphState.isPanning} class:is-panning={graphState.isPanning}
class:is-hovering={graphState.hoveredNodeId !== -1} class:is-hovering={graphState.hoveredNodeId !== -1}
aria-label="Graph" aria-label="Graph"
@@ -130,7 +124,6 @@
tabindex="0" tabindex="0"
bind:clientWidth={graphState.width} bind:clientWidth={graphState.width}
bind:clientHeight={graphState.height} bind:clientHeight={graphState.height}
style:--padding-right="{safePadding?.right || 0}px"
onkeydown={(ev) => keymap.handleKeyboardEvent(ev)} onkeydown={(ev) => keymap.handleKeyboardEvent(ev)}
onmousedown={(ev) => mouseEvents.handleMouseDown(ev)} onmousedown={(ev) => mouseEvents.handleMouseDown(ev)}
oncontextmenu={(ev) => mouseEvents.handleContextMenu(ev)} oncontextmenu={(ev) => mouseEvents.handleContextMenu(ev)}
@@ -146,8 +139,6 @@
/> />
<label for="drop-zone"></label> <label for="drop-zone"></label>
<GroupBreadcrumps />
<Canvas shadows={false} renderMode="on-demand" colorManagementEnabled={false}> <Canvas shadows={false} renderMode="on-demand" colorManagementEnabled={false}>
<Camera <Camera
bind:camera={graphState.camera} bind:camera={graphState.camera}
@@ -228,10 +219,10 @@
style:transform={`scale(${graphState.cameraPosition[2] * 0.1})`} style:transform={`scale(${graphState.cameraPosition[2] * 0.1})`}
class:hovering-sockets={graphState.activeSocket} class:hovering-sockets={graphState.activeSocket}
> >
{#each graph.nodeArray as node, index (node)} {#each graph.nodes.values() as node (node.id)}
<NodeEl <NodeEl
bind:node={graph.nodeArray[index]} {node}
inView={node ? graphState.isNodeInView(node) : false} inView={graphState.isNodeInView(node)}
/> />
{/each} {/each}
</div> </div>
@@ -248,8 +239,6 @@
<HelpView registry={graph.registry} /> <HelpView registry={graph.registry} />
{/if} {/if}
<ZoomIndicator {safePadding} />
<style> <style>
.graph-wrapper { .graph-wrapper {
position: relative; position: relative;
@@ -1,7 +1,6 @@
<script lang="ts"> <script lang="ts">
import { createKeyMap } from '$lib/helpers/createKeyMap'; import { createKeyMap } from '$lib/helpers/createKeyMap';
import type { Graph, NodeInstance, NodeRegistry } from '@nodarium/types'; import type { Graph, NodeInstance, NodeRegistry } from '@nodarium/types';
import { onMount } from 'svelte';
import { GraphManager } from '../graph-manager.svelte'; import { GraphManager } from '../graph-manager.svelte';
import { GraphState, setGraphManager, setGraphState } from '../graph-state.svelte'; import { GraphState, setGraphManager, setGraphState } from '../graph-state.svelte';
import { setupKeymaps } from '../keymaps'; import { setupKeymaps } from '../keymaps';
@@ -29,7 +28,6 @@
graph, graph,
registry, registry,
safePadding, safePadding,
// eslint-disable-next-line no-useless-assignment
settings = $bindable(), settings = $bindable(),
activeNode = $bindable(), activeNode = $bindable(),
backgroundType = $bindable('grid'), backgroundType = $bindable('grid'),
@@ -84,11 +82,100 @@
manager.on('save', (save) => onsave?.(save)); manager.on('save', (save) => onsave?.(save));
onMount(() => { $effect(() => {
if (graph) { if (graph) {
manager.load(graph); manager.load(graph);
} }
}); });
function navigateToBreadcrumb(index: number) {
const crumbs = manager.breadcrumbs;
const depth = crumbs.length - 1 - index;
let restoredCamera: [number, number, number] | false = false;
for (let i = 0; i < depth; i++) {
const groupId = manager.currentGroupContext;
if (groupId) {
state.groupCameras.set(groupId, [...state.cameraPosition] as [number, number, number]);
}
restoredCamera = manager.exitGroup();
}
state.activeNodeId = -1;
state.clearSelection();
if (restoredCamera !== false) {
state.cameraPosition[0] = restoredCamera[0];
state.cameraPosition[1] = restoredCamera[1];
state.cameraPosition[2] = restoredCamera[2];
} else {
state.centerNode();
}
}
</script> </script>
{#if manager.isInsideGroup}
<div class="breadcrumb-bar">
{#each manager.breadcrumbs as crumb, i}
{#if i > 0}
<span class="sep"></span>
{/if}
<button
class="crumb"
class:active={i === manager.breadcrumbs.length - 1}
onclick={() => navigateToBreadcrumb(i)}
>
{crumb.name}
</button>
{/each}
</div>
{/if}
<GraphEl {keymap} {safePadding} /> <GraphEl {keymap} {safePadding} />
<style>
.breadcrumb-bar {
position: absolute;
top: 8px;
left: 50%;
transform: translateX(-50%);
z-index: 100;
display: flex;
align-items: center;
gap: 4px;
background: rgba(10, 15, 28, 0.85);
border: 1px solid rgba(255, 255, 255, 0.12);
border-radius: 6px;
padding: 4px 10px;
font-size: 12px;
pointer-events: all;
backdrop-filter: blur(8px);
}
.sep {
opacity: 0.4;
font-size: 14px;
}
.crumb {
background: none;
border: none;
color: rgba(255, 255, 255, 0.6);
cursor: pointer;
padding: 2px 4px;
border-radius: 4px;
font-size: 12px;
transition: color 0.15s, background 0.15s;
}
.crumb:hover {
color: white;
background: rgba(255, 255, 255, 0.08);
}
.crumb.active {
color: white;
cursor: default;
}
.crumb.active:hover {
background: none;
}
</style>
@@ -1,52 +0,0 @@
<script lang="ts">
import { getGraphState } from '../graph-state.svelte';
const { safePadding }: {
safePadding?: { left?: number; right?: number; bottom?: number; top?: number };
} = $props();
const graphState = getGraphState();
</script>
<div class="zoom-indicator" style:right="calc({safePadding?.right ?? 0}px + 10px)">
<button
class="fit-btn"
title="Fit to view (.)"
onclick={() => graphState.centerNode()}
aria-label="Fit nodes to view"
>
</button>
<span>{Math.round(graphState.cameraPosition[2] * 10)}%</span>
</div>
<style>
.zoom-indicator {
position: absolute;
bottom: 10px;
display: flex;
align-items: center;
gap: 4px;
font-family: var(--font-family);
font-size: 0.75em;
color: var(--color-text);
opacity: 0.35;
z-index: 10;
transition: opacity 0.15s, right 0.2s;
pointer-events: auto;
}
.zoom-indicator:hover {
opacity: 0.9;
}
.fit-btn {
background: none;
border: none;
color: inherit;
cursor: pointer;
font-size: 1.1em;
line-height: 1;
padding: 0;
}
</style>
+1 -9
View File
@@ -2,7 +2,7 @@ type Color = { hue: number; saturation: number; lightness: number };
export class ColorGenerator { export class ColorGenerator {
private colors: Map<string, Color> = new Map(); private colors: Map<string, Color> = new Map();
// private lightnessLevels = [10, 60]; private lightnessLevels = [10, 60];
constructor(predefined: Record<string, Color>) { constructor(predefined: Record<string, Color>) {
for (const [id, colorStr] of Object.entries(predefined)) { for (const [id, colorStr] of Object.entries(predefined)) {
@@ -10,14 +10,6 @@ export class ColorGenerator {
} }
} }
public getColors() {
return Object.fromEntries(
this.colors.entries().map(([key, col]) => {
return [key, this.colorToHsl(col)];
})
);
}
public getColor(id: string): string { public getColor(id: string): string {
if (this.colors.has(id)) { if (this.colors.has(id)) {
return this.colorToHsl(this.colors.get(id)!); return this.colorToHsl(this.colors.get(id)!);
@@ -1,5 +1,4 @@
import { GraphSchema, type NodeId } from '@nodarium/types'; import { GraphSchema, type NodeId } from '@nodarium/types';
import { toast } from '@nodarium/ui';
import type { GraphManager } from '../graph-manager.svelte'; import type { GraphManager } from '../graph-manager.svelte';
import type { GraphState } from '../graph-state.svelte'; import type { GraphState } from '../graph-state.svelte';
@@ -42,9 +41,6 @@ export class FileDropEventManager {
props, props,
position: pos position: pos
}); });
}).catch((e) => {
toast(`Failed to load node: ${nodeId}`, 'error');
console.error(e);
}); });
} else if (event.dataTransfer.files.length) { } else if (event.dataTransfer.files.length) {
const file = event.dataTransfer.files[0]; const file = event.dataTransfer.files[0];
@@ -69,13 +65,8 @@ export class FileDropEventManager {
reader.onload = (e) => { reader.onload = (e) => {
const buffer = e.target?.result as ArrayBuffer; const buffer = e.target?.result as ArrayBuffer;
if (buffer) { if (buffer) {
try { const state = GraphSchema.parse(JSON.parse(buffer.toString()));
const state = GraphSchema.parse(JSON.parse(buffer.toString())); this.graph.load(state);
this.graph.load(state);
} catch (e) {
toast('Failed to load graph: invalid file', 'error');
console.error(e);
}
} }
}; };
reader.readAsText(file); reader.readAsText(file);
@@ -9,7 +9,6 @@ import { EdgeInteractionManager } from './edge.events';
export class MouseEventManager { export class MouseEventManager {
edgeInteractionManager: EdgeInteractionManager; edgeInteractionManager: EdgeInteractionManager;
private pendingSelectionFrame = false;
constructor( constructor(
private graph: GraphManager, private graph: GraphManager,
@@ -191,7 +190,7 @@ export class MouseEventManager {
// if we clicked on a node // if we clicked on a node
if (clickedNodeId !== -1) { if (clickedNodeId !== -1) {
if (event.ctrlKey && event.shiftKey) { if (event.ctrlKey && event.shiftKey) {
this.graph.tryConnectToDebugNode(clickedNodeId); this.state.tryConnectToDebugNode(clickedNodeId);
return; return;
} }
if (this.state.activeNodeId === -1) { if (this.state.activeNodeId === -1) {
@@ -283,31 +282,24 @@ export class MouseEventManager {
if (this.state.boxSelection) { if (this.state.boxSelection) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
if (!this.pendingSelectionFrame) { const mouseD = this.state.projectScreenToWorld(
this.pendingSelectionFrame = true; this.state.mouseDown[0],
requestAnimationFrame(() => { this.state.mouseDown[1]
this.pendingSelectionFrame = false; );
if (!this.state.mouseDown) return; const x1 = Math.min(mouseD[0], this.state.mousePosition[0]);
const mouseD = this.state.projectScreenToWorld( const x2 = Math.max(mouseD[0], this.state.mousePosition[0]);
this.state.mouseDown[0], const y1 = Math.min(mouseD[1], this.state.mousePosition[1]);
this.state.mouseDown[1] const y2 = Math.max(mouseD[1], this.state.mousePosition[1]);
); for (const node of this.graph.nodes.values()) {
const x1 = Math.min(mouseD[0], this.state.mousePosition[0]); if (!node?.state) continue;
const x2 = Math.max(mouseD[0], this.state.mousePosition[0]); const x = node.position[0];
const y1 = Math.min(mouseD[1], this.state.mousePosition[1]); const y = node.position[1];
const y2 = Math.max(mouseD[1], this.state.mousePosition[1]); const height = getNodeHeight(node.state.type!);
for (const node of this.graph.nodes.values()) { if (x > x1 - 20 && x < x2 && y > y1 - height && y < y2) {
if (!node?.state) continue; this.state.selectedNodes?.add(node.id);
const x = node.position[0]; } else {
const y = node.position[1]; this.state.selectedNodes?.delete(node.id);
const height = getNodeHeight(node.state.type!); }
if (x > x1 - 20 && x < x2 && y > y1 - height && y < y2) {
this.state.selectedNodes?.add(node.id);
} else {
this.state.selectedNodes?.delete(node.id);
}
}
});
} }
return; return;
} }
@@ -1,18 +1,11 @@
import type { import type { NodeDefinition, NodeInstance } from '@nodarium/types';
Edge,
NodeDefinition,
NodeInstance,
SerializedEdge,
SerializedNode
} from '@nodarium/types';
export function getParameterHeight(node: NodeDefinition, inputKey: string) { export function getParameterHeight(node: NodeDefinition, inputKey: string) {
if (node.id === '__internal/group/input') {
return 50;
}
const input = node.inputs?.[inputKey]; const input = node.inputs?.[inputKey];
if (!input) { if (!input) {
if (inputKey.startsWith('__virtual')) {
return 50;
}
return 0; return 0;
} }
@@ -33,31 +26,44 @@ export function getParameterHeight(node: NodeDefinition, inputKey: string) {
return 50; return 50;
} }
export function serializeNode(node: SerializedNode | NodeInstance): SerializedNode { export function getSocketPosition(
return { node: NodeInstance,
id: node.id, index: string | number
position: [...node.position], ): [number, number] {
type: node.type, if (typeof index === 'number') {
props: node.props ? JSON.parse(JSON.stringify(node.props)) : undefined return [
}; (node?.state?.x ?? node.position[0]) + 20,
} (node?.state?.y ?? node.position[1]) + 2.5 + 10 * index
];
export function serializeEdge(edge: SerializedEdge | Edge): SerializedEdge { } else {
if (typeof edge[0] === 'number' && typeof edge[2] === 'number') { let height = 5;
return [edge[0], edge[1], edge[2], edge[3]]; const nodeType = node.state.type!;
const inputs = nodeType.inputs || {};
for (const inputKey in inputs) {
const h = getParameterHeight(nodeType, inputKey) / 10;
if (inputKey === index) {
height += h / 2;
break;
}
height += h;
}
return [
node?.state?.x ?? node.position[0],
(node?.state?.y ?? node.position[1]) + height
];
} }
const e = edge as Edge;
return [e[0].id, e[1], e[2].id, e[3]];
} }
const nodeHeightCache: Record<string, number> = {}; const nodeHeightCache: Record<string, number> = {};
export function getNodeHeight(node: NodeDefinition) { export function getNodeHeight(node: NodeDefinition) {
if (!node || !('inputs' in node)) { // Don't cache virtual nodes — their inputs can change dynamically
return 5; const isVirtual = (node.id as string).startsWith('__virtual/');
} if (!isVirtual && node.id in nodeHeightCache) {
if (node.id in nodeHeightCache) {
return nodeHeightCache[node.id]; return nodeHeightCache[node.id];
} }
if (!node?.inputs) {
return 5;
}
let height = 5; let height = 5;
for (const key in node.inputs) { for (const key in node.inputs) {
@@ -65,37 +71,8 @@ export function getNodeHeight(node: NodeDefinition) {
height += h; height += h;
} }
nodeHeightCache[node.id] = height; if (!isVirtual) {
nodeHeightCache[node.id] = height;
}
return height; return height;
} }
export function areSocketsCompatible(
output: string | undefined,
inputs: string | (string | undefined)[] | undefined
) {
if (output === '*') return true;
if (Array.isArray(inputs) && output) {
return inputs.includes('*') || inputs.includes(output);
}
return inputs === output;
}
export function areEdgesEqual(firstEdge: Edge, secondEdge: Edge) {
if (firstEdge[0].id !== secondEdge[0].id) {
return false;
}
if (firstEdge[1] !== secondEdge[1]) {
return false;
}
if (firstEdge[2].id !== secondEdge[2].id) {
return false;
}
if (firstEdge[3] !== secondEdge[3]) {
return false;
}
return true;
}
+93 -28
View File
@@ -1,6 +1,5 @@
import type { createKeyMap } from '$lib/helpers/createKeyMap'; import type { createKeyMap } from '$lib/helpers/createKeyMap';
import { panelState } from '$lib/sidebar/PanelState.svelte'; import { panelState } from '$lib/sidebar/PanelState.svelte';
import { toast } from '@nodarium/ui';
import FileSaver from 'file-saver'; import FileSaver from 'file-saver';
import type { GraphManager } from './graph-manager.svelte'; import type { GraphManager } from './graph-manager.svelte';
import type { GraphState } from './graph-state.svelte'; import type { GraphState } from './graph-state.svelte';
@@ -46,11 +45,25 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
keymap.addShortcut({ keymap.addShortcut({
key: 'Escape', key: 'Escape',
description: 'Deselect nodes', description: 'Deselect nodes / Exit group',
callback: () => { callback: () => {
if (graph.isInsideGroup) { if (graph.isInsideGroup) {
graphState.exitGroupNode(); const groupId = graph.currentGroupContext;
return; if (groupId) {
graphState.groupCameras.set(
groupId,
[...graphState.cameraPosition] as [number, number, number]
);
}
const savedCamera = graph.exitGroup();
if (savedCamera !== false) {
graphState.activeNodeId = -1;
graphState.clearSelection();
graphState.cameraPosition[0] = savedCamera[0];
graphState.cameraPosition[1] = savedCamera[1];
graphState.cameraPosition[2] = savedCamera[2];
return;
}
} }
graphState.activeNodeId = -1; graphState.activeNodeId = -1;
graphState.clearSelection(); graphState.clearSelection();
@@ -59,29 +72,6 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
} }
}); });
keymap.addShortcut({
key: 'g',
ctrl: true,
preventDefault: true,
description: 'Group selected nodes',
callback: () => graphState.groupSelectedNodes()
});
keymap.addShortcut({
key: 'g',
alt: true,
preventDefault: true,
description: 'Ungroup selected nodes',
callback: () => graphState.unGroupSelectedNodes()
});
keymap.addShortcut({
key: 'Tab',
preventDefault: true,
description: 'Enter selected node group',
callback: () => graphState.enterGroupNode()
});
keymap.addShortcut({ keymap.addShortcut({
key: 'A', key: 'A',
shift: true, shift: true,
@@ -147,7 +137,6 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
type: 'application/json;charset=utf-8' type: 'application/json;charset=utf-8'
}); });
FileSaver.saveAs(blob, 'nodarium-graph.json'); FileSaver.saveAs(blob, 'nodarium-graph.json');
toast('Graph downloaded', 'success', 1500);
} }
}); });
@@ -188,4 +177,80 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
if (!edge) graph.smartConnect(nodes[1], nodes[0]); if (!edge) graph.smartConnect(nodes[1], nodes[0]);
} }
}); });
keymap.addShortcut({
key: 'g',
ctrl: true,
preventDefault: true,
description: 'Group selected nodes',
callback: () => {
if (!graphState.isBodyFocused()) return;
const nodeIds = Array.from(
new Set([
...(graphState.selectedNodes.size > 0 ? graphState.selectedNodes.values() : []),
...(graphState.activeNodeId !== -1 ? [graphState.activeNodeId] : [])
])
);
if (nodeIds.length === 0) return;
const groupNode = graph.createGroup(nodeIds);
if (groupNode) {
graphState.selectedNodes.clear();
graphState.activeNodeId = groupNode.id;
}
}
});
keymap.addShortcut({
key: 'g',
alt: true,
shift: true,
preventDefault: true,
description: 'Ungroup selected node',
callback: () => {
if (!graphState.isBodyFocused()) return;
const nodeId = graphState.activeNodeId !== -1
? graphState.activeNodeId
: graphState.selectedNodes.size === 1
? [...graphState.selectedNodes.values()][0]
: -1;
if (nodeId === -1) return;
graph.ungroup(nodeId);
graphState.activeNodeId = -1;
graphState.clearSelection();
}
});
keymap.addShortcut({
key: 'Tab',
preventDefault: true,
description: 'Enter focused group node',
callback: () => {
if (!graphState.isBodyFocused()) return;
const entered = graph.enterGroup(
graphState.activeNodeId,
[...graphState.cameraPosition] as [number, number, number]
);
if (entered) {
graphState.activeNodeId = -1;
graphState.clearSelection();
// Restore group-specific camera if we've been here before, else snap to center
const groupId = graph.currentGroupContext;
const saved = groupId ? graphState.groupCameras.get(groupId) : undefined;
if (saved) {
graphState.cameraPosition[0] = saved[0];
graphState.cameraPosition[1] = saved[1];
graphState.cameraPosition[2] = saved[2];
} else {
const nodes = [...graph.nodes.values()];
if (nodes.length) {
const avgX = nodes.reduce((s, n) => s + n.position[0], 0) / nodes.length;
const avgY = nodes.reduce((s, n) => s + n.position[1], 0) / nodes.length;
graphState.cameraPosition[0] = avgX;
graphState.cameraPosition[1] = avgY;
graphState.cameraPosition[2] = 10;
}
}
}
}
});
} }
+7 -10
View File
@@ -3,14 +3,13 @@
import type { NodeInstance } from '@nodarium/types'; import type { NodeInstance } from '@nodarium/types';
import { T } from '@threlte/core'; import { T } from '@threlte/core';
import { type Mesh } from 'three'; import { type Mesh } from 'three';
import { getGraphManager, getGraphState } from '../graph-state.svelte'; import { getGraphState } from '../graph-state.svelte';
import { colors } from '../graph/colors.svelte'; import { colors } from '../graph/colors.svelte';
import { getNodeHeight, getParameterHeight } from '../helpers/nodeHelpers'; import { getNodeHeight, getParameterHeight } from '../helpers/nodeHelpers';
import NodeFrag from './Node.frag'; import NodeFrag from './Node.frag';
import NodeVert from './Node.vert'; import NodeVert from './Node.vert';
import NodeHtml from './NodeHTML.svelte'; import NodeHtml from './NodeHTML.svelte';
const graph = getGraphManager();
const graphState = getGraphState(); const graphState = getGraphState();
type Props = { type Props = {
@@ -19,7 +18,7 @@
}; };
let { node = $bindable(), inView }: Props = $props(); let { node = $bindable(), inView }: Props = $props();
const nodeType = $derived(node ? graph.getNodeType(node) : undefined); const nodeType = $derived(node.state.type!);
const isActive = $derived(graphState.activeNodeId === node.id); const isActive = $derived(graphState.activeNodeId === node.id);
const isSelected = $derived(graphState.selectedNodes.has(node.id)); const isSelected = $derived(graphState.selectedNodes.has(node.id));
@@ -33,17 +32,15 @@
); );
const sectionHeights = $derived( const sectionHeights = $derived(
nodeType Object
? Object .keys(nodeType.inputs || {})
.keys(nodeType?.inputs || {}) .map(key => getParameterHeight(nodeType, key) / 10)
.map(key => getParameterHeight(nodeType, key) / 10) .filter(b => !!b)
.filter(b => !!b)
: [5]
); );
let meshRef: Mesh | undefined = $state(); let meshRef: Mesh | undefined = $state();
const height = $derived(nodeType ? getNodeHeight(nodeType) : 20); const height = getNodeHeight(node.state.type!);
const zoom = $derived(graphState.cameraPosition[2]); const zoom = $derived(graphState.cameraPosition[2]);
@@ -1,13 +1,13 @@
<script lang="ts"> <script lang="ts">
import type { NodeInstance } from '@nodarium/types'; import type { NodeDefinition, NodeInstance } from '@nodarium/types';
import { getGraphManager, getGraphState } from '../graph-state.svelte'; import { getGraphManager, getGraphState } from '../graph-state.svelte';
import NodeHeader from './NodeHeader.svelte'; import NodeHeader from './NodeHeader.svelte';
import NodeParameter from './NodeParameter.svelte'; import NodeParameter from './NodeParameter.svelte';
let ref: HTMLDivElement; let ref: HTMLDivElement;
const graph = getGraphManager();
const graphState = getGraphState(); const graphState = getGraphState();
const manager = getGraphManager();
type Props = { type Props = {
node: NodeInstance; node: NodeInstance;
@@ -31,13 +31,37 @@
const zOffset = Math.random() - 0.5; const zOffset = Math.random() - 0.5;
const zLimit = 2 - zOffset; const zLimit = 2 - zOffset;
const nodeType = $derived(graph.getNodeType(node)); function buildParameters(node: NodeInstance, inputs: NodeDefinition['inputs']) {
let parameters = Object.entries(inputs || {}).filter(
const parameters = $derived(
Object.entries(nodeType?.inputs || {}).filter(
(p) => p[1].type !== 'seed' && !('setting' in p[1]) && p[1]?.hidden !== true (p) => p[1].type !== 'seed' && !('setting' in p[1]) && p[1]?.hidden !== true
) || {} );
);
if (node.type === '__virtual/group/instance') {
parameters = [['__virtual/groupId', {
type: 'select',
value: node.props?.groupId as string,
options: [...manager?.groups?.keys()]
}], ...parameters];
}
return parameters;
}
const parameters = $derived(buildParameters(node, node?.state?.type?.inputs || {}));
const currentGroupId = $derived((node.props?.groupId as string) ?? '');
function onGroupSelect(event: Event) {
const select = event.target as HTMLSelectElement;
const newGroupId = select.value;
if (!manager || newGroupId === currentGroupId) return;
const newGroupDef = manager.groupNodeDefinitions.get(`__virtual/group/${newGroupId}`);
if (!newGroupDef) return;
node.props = { ...(node.props ?? {}), groupId: newGroupId };
node.state = { type: newGroupDef };
manager.execute();
manager.save();
}
$effect(() => { $effect(() => {
if ('state' in node && !node.state.ref) { if ('state' in node && !node.state.ref) {
@@ -60,6 +84,22 @@
> >
<NodeHeader {node} /> <NodeHeader {node} />
{#if false && node.type === '__virtual/group/instance'}
<div class="group-param">
<select
value={currentGroupId}
onchange={onGroupSelect}
onmousedown={(e) => e.stopPropagation()}
onclick={(e) => e.stopPropagation()}
onkeydown={(e) => e.stopPropagation()}
>
{#each manager?.groups?.entries() ?? [] as [gid, gdef]}
<option value={gid}>{gdef.name}</option>
{/each}
</select>
</div>
{/if}
{#each parameters as [key, value], i (key)} {#each parameters as [key, value], i (key)}
<NodeParameter <NodeParameter
bind:node bind:node
@@ -71,6 +111,24 @@
</div> </div>
<style> <style>
.group-param {
padding: 5px 8px;
border-bottom: solid 1px var(--color-layer-2);
background: var(--color-layer-1);
}
.group-param select {
width: 100%;
background: var(--color-layer-2);
color: var(--color-text);
border: 1px solid rgba(255, 255, 255, 0.12);
border-radius: 4px;
padding: 4px 6px;
font-size: 0.8em;
cursor: pointer;
box-sizing: border-box;
}
.node { .node {
box-sizing: border-box; box-sizing: border-box;
user-select: none !important; user-select: none !important;
@@ -1,11 +1,11 @@
<script lang="ts"> <script lang="ts">
import { appSettings } from '$lib/settings/app-settings.svelte'; import { appSettings } from '$lib/settings/app-settings.svelte';
import type { NodeInstance, Socket } from '@nodarium/types'; import type { NodeInstance, Socket } from '@nodarium/types';
import { getGraphManager, getGraphState } from '../graph-state.svelte'; import { getGraphState } from '../graph-state.svelte';
import { createNodePath } from '../helpers/index.js'; import { createNodePath } from '../helpers/index.js';
import { getSocketPosition } from '../helpers/nodeHelpers';
const graphState = getGraphState(); const graphState = getGraphState();
const graph = getGraphManager();
const { node }: { node: NodeInstance } = $props(); const { node }: { node: NodeInstance } = $props();
@@ -16,24 +16,13 @@
graphState.setDownSocket?.({ graphState.setDownSocket?.({
node, node,
index: 0, index: 0,
position: graphState.getSocketPosition?.(node, 0) position: getSocketPosition?.(node, 0)
}); });
} }
} }
const cornerTop = 10; const cornerTop = 10;
const nodeType = $derived(graph.getNodeType(node)); const rightBump = $derived(!!node?.state?.type?.outputs?.length);
const rightBump = $derived(
!!nodeType?.outputs?.length && node.type !== '__internal/group/input'
);
const cornerBottom = $derived(
node.type === '__internal/group/input'
? (Object.keys(nodeType?.inputs ?? {}).length ? 0 : 10)
: node.type === '__internal/group/output'
? (nodeType?.outputs?.length ? 0 : 10)
: 0
);
const aspectRatio = 0.25; const aspectRatio = 0.25;
const path = $derived( const path = $derived(
@@ -42,7 +31,6 @@
height: 34, height: 34,
y: 49, y: 49,
cornerTop, cornerTop,
cornerBottom,
rightBump, rightBump,
aspectRatio aspectRatio
}) })
@@ -53,7 +41,6 @@
height: 40, height: 40,
y: 49, y: 49,
cornerTop, cornerTop,
cornerBottom,
rightBump, rightBump,
aspectRatio aspectRatio
}) })
@@ -83,17 +70,15 @@
{#if appSettings.value.debug.advancedMode} {#if appSettings.value.debug.advancedMode}
<span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span> <span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span>
{/if} {/if}
{nodeType?.meta?.title || node.type?.split('/').pop()} {node.state?.type?.meta?.title ?? node.type.split('/').pop()}
</div>
<div
class="target"
role="button"
tabindex="0"
onmousedown={handleMouseDown}
>
</div> </div>
{#if rightBump}
<div
class="target"
role="button"
tabindex="0"
onmousedown={handleMouseDown}
>
</div>
{/if}
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 100 100" viewBox="0 0 100 100"
@@ -45,7 +45,7 @@
$effect(() => { $effect(() => {
const a = $state.snapshot(value); const a = $state.snapshot(value);
const b = $state.snapshot(node?.props?.[id]); const b = $state.snapshot(node?.props?.[id]) as number | number[] | undefined;
const isDiff = Array.isArray(a) ? diffArray(a, b) : a !== b; const isDiff = Array.isArray(a) ? diffArray(a, b) : a !== b;
if (value !== undefined && isDiff) { if (value !== undefined && isDiff) {
node.props = { ...node.props, [id]: a }; node.props = { ...node.props, [id]: a };
@@ -2,7 +2,7 @@
import type { NodeInput, NodeInstance, Socket } from '@nodarium/types'; import type { NodeInput, NodeInstance, Socket } from '@nodarium/types';
import { getGraphManager, getGraphState } from '../graph-state.svelte'; import { getGraphManager, getGraphState } from '../graph-state.svelte';
import { createNodePath } from '../helpers'; import { createNodePath } from '../helpers';
import { getParameterHeight } from '../helpers/nodeHelpers'; import { getParameterHeight, getSocketPosition } from '../helpers/nodeHelpers';
import NodeInputEl from './NodeInput.svelte'; import NodeInputEl from './NodeInput.svelte';
type Props = { type Props = {
@@ -19,7 +19,7 @@
let { node = $bindable(), input, id, isLast }: Props = $props(); let { node = $bindable(), input, id, isLast }: Props = $props();
let nodeType = $derived(graph.getNodeType(node)!); const nodeType = $derived(node.state.type!);
const inputType = $derived(nodeType.inputs?.[id]); const inputType = $derived(nodeType.inputs?.[id]);
@@ -29,27 +29,14 @@
function handleMouseDown(ev: MouseEvent) { function handleMouseDown(ev: MouseEvent) {
ev.preventDefault(); ev.preventDefault();
ev.stopPropagation(); ev.stopPropagation();
graphState.setDownSocket({
if (node.type === '__internal/group/input') { node,
const outputIndex = Object.entries(nodeType?.inputs ?? {}).findIndex(([key]) => key === id); index: id,
graphState.setDownSocket({ position: getSocketPosition(node, id)
node, });
index: outputIndex,
position: graphState.getSocketPosition(node, outputIndex)
});
} else {
graphState.setDownSocket({
node,
index: id,
position: graphState.getSocketPosition(node, id)
});
}
} }
const leftBump = $derived( const leftBump = $derived(!id.startsWith('__virtual') && nodeType.inputs?.[id].internal !== true);
nodeType.inputs?.[id].internal !== true && node.type !== '__internal/group/input'
);
const rightBump = $derived(node.type === '__internal/group/input');
const cornerBottom = $derived(isLast ? 5 : 0); const cornerBottom = $derived(isLast ? 5 : 0);
const aspectRatio = 0.5; const aspectRatio = 0.5;
@@ -59,7 +46,6 @@
height: 2000 / height, height: 2000 / height,
y: 50.5, y: 50.5,
cornerBottom, cornerBottom,
rightBump,
leftBump, leftBump,
aspectRatio aspectRatio
}) })
@@ -69,7 +55,6 @@
depth: 7, depth: 7,
height: 2200 / height, height: 2200 / height,
y: 50.5, y: 50.5,
rightBump,
cornerBottom, cornerBottom,
leftBump, leftBump,
aspectRatio aspectRatio
@@ -91,7 +76,6 @@
<div <div
class="wrapper" class="wrapper"
data-node-type={node.type} data-node-type={node.type}
class:is-group-input={node.type === '__internal/group/input'}
data-node-input={id} data-node-input={id}
style:height="{height}px" style:height="{height}px"
style:--socket-color={hoverColor} style:--socket-color={hoverColor}
@@ -99,7 +83,7 @@
> >
{#key id && graphId} {#key id && graphId}
<div class="content" class:disabled={graph?.inputSockets?.has(socketId)}> <div class="content" class:disabled={graph?.inputSockets?.has(socketId)}>
{#if inputType?.label !== ''} {#if inputType?.label !== '' && !id.startsWith('__virtual')}
<label for={elementId} title={input.description}>{input.label || id}</label> <label for={elementId} title={input.description}>{input.label || id}</label>
{/if} {/if}
{#if inputType?.external !== true} {#if inputType?.external !== true}
@@ -146,11 +130,6 @@
transform: translateY(-50%) translateX(-50%); transform: translateY(-50%) translateX(-50%);
} }
.is-group-input .target {
right: 0px;
transform: translateY(-50%) translateX(50%);
}
.possible-socket .target::before { .possible-socket .target::before {
content: ""; content: "";
position: absolute; position: absolute;
+2 -6
View File
@@ -23,11 +23,7 @@ export function createMockNodeRegistry(nodes: NodeDefinition[]): NodeRegistry {
export const mockFloatOutputNode: NodeDefinition = { export const mockFloatOutputNode: NodeDefinition = {
id: 'test/node/output', id: 'test/node/output',
inputs: { inputs: {},
'input': {
type: 'float'
}
},
outputs: ['float'], outputs: ['float'],
meta: { title: 'Float Output' }, meta: { title: 'Float Output' },
execute: () => new Int32Array() execute: () => new Int32Array()
@@ -36,7 +32,7 @@ export const mockFloatOutputNode: NodeDefinition = {
export const mockFloatInputNode: NodeDefinition = { export const mockFloatInputNode: NodeDefinition = {
id: 'test/node/input', id: 'test/node/input',
inputs: { value: { type: 'float' } }, inputs: { value: { type: 'float' } },
outputs: ['float'], outputs: [],
meta: { title: 'Float Input' }, meta: { title: 'Float Input' },
execute: () => new Int32Array() execute: () => new Int32Array()
}; };
+1 -2
View File
@@ -4,8 +4,7 @@ export function grid(width: number, height: number) {
const graph: Graph = { const graph: Graph = {
id: Math.floor(Math.random() * 100000), id: Math.floor(Math.random() * 100000),
edges: [], edges: [],
nodes: [], nodes: []
groups: []
}; };
const amount = width * height; const amount = width * height;
+1 -2
View File
@@ -47,7 +47,6 @@ export function tree(depth: number): Graph {
return { return {
id: Math.floor(Math.random() * 100000), id: Math.floor(Math.random() * 100000),
nodes, nodes,
edges, edges
groups: []
}; };
} }
+2 -6
View File
@@ -1,12 +1,8 @@
export const debugNode = { export const debugNode = {
id: '__internal/node/debug', id: 'max/plantarium/debug',
meta: {
title: 'Debug'
},
inputs: { inputs: {
input: { input: {
type: '*', type: '*'
label: ''
} }
}, },
execute(_data: Int32Array): Int32Array { execute(_data: Int32Array): Int32Array {
-14
View File
@@ -1,14 +0,0 @@
export const groupNode = {
id: '__internal/group/instance',
meta: { title: 'Group' },
inputs: {
groupId: {
label: '',
type: 'select',
values: []
}
},
execute(_data: Int32Array): Int32Array {
return _data;
}
} as const;
+25
View File
@@ -0,0 +1,25 @@
import type { NodeDefinition } from '@nodarium/types';
export const groupInputNode: NodeDefinition = {
id: '__virtual/group/input',
inputs: {},
outputs: [],
execute(_data: Int32Array): Int32Array { return _data; }
} as unknown as NodeDefinition;
export const groupOutputNode: NodeDefinition = {
id: '__virtual/group/output',
inputs: {},
outputs: [],
execute(_data: Int32Array): Int32Array { return _data; }
} as unknown as NodeDefinition;
// Stub registered in the registry so it appears in AddMenu.
// Actual inputs/outputs are resolved from props.groupId at runtime.
export const groupNode: NodeDefinition = {
id: '__virtual/group/instance',
meta: { title: 'Group' },
inputs: {},
outputs: [],
execute(_data: Int32Array): Int32Array { return _data; }
} as unknown as NodeDefinition;
@@ -88,7 +88,6 @@ export class RemoteNodeRegistry implements NodeRegistry {
} }
async fetchNodeDefinition(nodeId: `${string}/${string}/${string}`) { async fetchNodeDefinition(nodeId: `${string}/${string}/${string}`) {
if (nodeId.startsWith('__internal/')) return;
return this.fetchJson(`nodes/${nodeId}.json`); return this.fetchJson(`nodes/${nodeId}.json`);
} }
@@ -110,8 +109,6 @@ export class RemoteNodeRegistry implements NodeRegistry {
return this.nodes.get(id)!; return this.nodes.get(id)!;
} }
if (id.startsWith('__internal/')) return;
const wasmBuffer = await this.fetchNodeWasm(id); const wasmBuffer = await this.fetchNodeWasm(id);
try { try {
@@ -136,14 +133,12 @@ export class RemoteNodeRegistry implements NodeRegistry {
} }
async register(id: string, wasmBuffer: ArrayBuffer) { async register(id: string, wasmBuffer: ArrayBuffer) {
const wrapper = (() => { let wrapper: ReturnType<typeof createWasmWrapper> = null!;
try { try {
return createWasmWrapper(wasmBuffer); wrapper = createWasmWrapper(wasmBuffer);
} catch (error) { } catch (error) {
console.error(`Failed to create node wrapper for node: ${id}`, error); console.error(`Failed to create node wrapper for node: ${id}`, error);
throw error; }
}
})();
const rawDefinition = wrapper.get_definition(); const rawDefinition = wrapper.get_definition();
const definition = NodeDefinitionSchema.safeParse(rawDefinition); const definition = NodeDefinitionSchema.safeParse(rawDefinition);
@@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import { defaultPlant, lottaFaces, plant, simple } from '$lib/graph-templates'; import { defaultPlant, lottaFaces, plant, simple } from '$lib/graph-templates';
import type { Graph } from '$lib/types'; import type { Graph } from '$lib/types';
import { Button, ConfirmDialog, InputSelect, Spinner } from '@nodarium/ui'; import { InputSelect } from '@nodarium/ui';
import type { ProjectManager } from './project-manager.svelte'; import type { ProjectManager } from './project-manager.svelte';
const { projectManager } = $props<{ projectManager: ProjectManager }>(); const { projectManager } = $props<{ projectManager: ProjectManager }>();
@@ -31,27 +31,16 @@
newProjectName = ''; newProjectName = '';
showNewProject = false; showNewProject = false;
} }
let pendingDeleteId = $state<number | null>(null);
let confirmOpen = $state(false);
function requestDelete(id: number, e: MouseEvent) {
e.stopPropagation();
pendingDeleteId = id;
confirmOpen = true;
}
function confirmDelete() {
if (pendingDeleteId !== null) {
projectManager.handleDeleteProject(pendingDeleteId);
pendingDeleteId = null;
}
}
</script> </script>
<header class="flex justify-between px-4 h-[70px] border-b-1 border-outline items-center bg-layer-2"> <header class="flex justify-between px-4 h-[70px] border-b-1 border-outline items-center bg-layer-2">
<h3>Project</h3> <h3>Project</h3>
<Button onclick={() => (showNewProject = !showNewProject)}>New</Button> <button
class="px-3 py-1 bg-layer-1 rounded"
onclick={() => (showNewProject = !showNewProject)}
>
New
</button>
</header> </header>
{#if showNewProject} {#if showNewProject}
@@ -64,11 +53,20 @@
onkeydown={(e) => e.key === 'Enter' && handleCreate()} onkeydown={(e) => e.key === 'Enter' && handleCreate()}
/> />
<InputSelect options={templates.map(t => t.name)} bind:value={selectedTemplateIndex} /> <InputSelect options={templates.map(t => t.name)} bind:value={selectedTemplateIndex} />
<Button variant="primary" class="self-end" onclick={() => handleCreate()}>Create</Button> <button
class="cursor-pointer self-end px-3 py-1 bg-selected rounded"
onclick={() => handleCreate()}
>
Create
</button>
</div> </div>
{/if} {/if}
<div class="text-white min-h-screen"> <div class="text-white min-h-screen">
{#if projectManager.loading}
<p>Loading...</p>
{/if}
<ul> <ul>
{#each projectManager.projects as project (project.id)} {#each projectManager.projects as project (project.id)}
<li> <li>
@@ -91,35 +89,16 @@
<div class="flex justify-between items-center grow"> <div class="flex justify-between items-center grow">
<span>{project.meta?.title || 'Untitled'}</span> <span>{project.meta?.title || 'Untitled'}</span>
<button <button
class="opacity-20 hover:opacity-70 transition-opacity cursor-pointer p-1 rounded text-red-400" class="text-layer-1! bg-red-500 w-7 text-xl rounded-sm cursor-pointer opacity-20 hover:opacity-80"
onclick={(e) => requestDelete(project.id!, e)} onclick={() => {
aria-label="Delete project" projectManager.handleDeleteProject(project.id!);
}}
> >
<span class="i-[tabler--trash] w-4 h-4 block"></span> ×
</button> </button>
</div> </div>
</div> </div>
</li> </li>
{:else}
{#if projectManager.loading}
<div class="flex items-center gap-2 p-4">
<Spinner size={12} />
<p>Loading</p>
</div>
{:else}
<li class="px-4 py-8 text-center opacity-40 text-sm">
No projects yet.<br />Press <b>New</b> to create one.
</li>
{/if}
{/each} {/each}
</ul> </ul>
</div> </div>
<ConfirmDialog
bind:open={confirmOpen}
title="Delete project?"
message="This cannot be undone. The project and all its data will be permanently removed."
confirmLabel="Delete"
cancelLabel="Cancel"
onconfirm={confirmDelete}
/>
@@ -10,16 +10,14 @@ export class ProjectManager {
'node.activeProjectId', 'node.activeProjectId',
undefined undefined
); );
public readonly loading = $derived( public readonly loading = $derived(this.graph?.id !== this.activeProjectId.value);
this.projects.length && this.graph?.id !== this.activeProjectId.value
);
constructor() { constructor() {
this.init(); this.init();
} }
async saveGraph(g: Graph) { async saveGraph(g: Graph) {
await db.saveGraph(g); db.saveGraph(g);
} }
private async init() { private async init() {
+1 -1
View File
@@ -32,7 +32,7 @@ function writePath(scene: Group, data: Int32Array): Vector3[] {
// Instanced spheres at points // Instanced spheres at points
if (positions.length > 0) { if (positions.length > 0) {
const sphereGeometry = new SphereGeometry(0.02, 8, 8); // keep low-poly const sphereGeometry = new SphereGeometry(0.05, 8, 8); // keep low-poly
const sphereMaterial = new MeshBasicMaterial({ const sphereMaterial = new MeshBasicMaterial({
color: 0xff0000, color: 0xff0000,
depthTest: false depthTest: false
+1 -1
View File
@@ -80,6 +80,7 @@ export function createGeometryPool(parentScene: Group, material: Material) {
} }
const normals = new Float32Array(data.buffer, index * 4, vertexCount * 3); const normals = new Float32Array(data.buffer, index * 4, vertexCount * 3);
index = index + vertexCount * 3;
if ( if (
geometry.userData?.faceCount !== faceCount geometry.userData?.faceCount !== faceCount
@@ -207,7 +208,6 @@ export function createInstancedGeometryPool(
existingInstance existingInstance
&& instanceCount > existingInstance.geometry.userData.count && instanceCount > existingInstance.geometry.userData.count
) { ) {
existingInstance.geometry.dispose();
scene.remove(existingInstance); scene.remove(existingInstance);
instances.splice(instances.indexOf(existingInstance), 1); instances.splice(instances.indexOf(existingInstance), 1);
existingInstance = new InstancedMesh(geometry, material, instanceCount); existingInstance = new InstancedMesh(geometry, material, instanceCount);
@@ -0,0 +1,18 @@
import type { Graph, RuntimeExecutor } from '@nodarium/types';
export class RemoteRuntimeExecutor implements RuntimeExecutor {
constructor(private url: string) {}
async execute(graph: Graph, settings: Record<string, unknown>): Promise<Int32Array> {
const res = await fetch(this.url, {
method: 'POST',
body: JSON.stringify({ graph, settings })
});
if (!res.ok) {
throw new Error(`Failed to execute graph`);
}
return new Int32Array(await res.arrayBuffer());
}
}
@@ -1,164 +0,0 @@
import type { Graph } from '@nodarium/types';
import { describe, expect, it } from 'vitest';
import { expandGroups } from './runtime-executor';
// Helpers to build minimal serialized nodes/edges
function node(id: number, type: string, props?: Record<string, number>) {
return {
id,
type: type as Graph['nodes'][0]['type'],
position: [0, 0] as [number, number],
...(props ? { props } : {})
};
}
function edge(
from: number,
fromSocket: number,
to: number,
toSocket: string
): [number, number, number, string] {
return [from, fromSocket, to, toSocket];
}
describe('expandGroups', () => {
it('returns graph unchanged when there are no groups', () => {
const graph: Graph = {
id: 1,
nodes: [node(0, 'test/node/output'), node(1, 'test/node/input')],
edges: [edge(0, 0, 1, 'value')],
groups: []
};
const result = expandGroups(graph);
expect(result.nodes.length).toBe(2);
expect(result.edges.length).toBe(1);
expect(result).toBe(graph); // same reference — no copy needed
});
it('expands a simple group: A → [B] → C rewires to A → B → C', () => {
// IDs: A=1, B=2, C=3, groupNode=4, group.id=5, inputBoundary=6, outputBoundary=7
const groupId = 5;
const groupNodeId = 4;
const remappedB = (groupNodeId + 1) * 1_000_000 + 2; // 5_000_002
const graph: Graph = {
id: 1,
nodes: [
node(1, 'test/node/output'),
node(groupNodeId, '__internal/group/instance', { groupId }),
node(3, 'test/node/input')
],
edges: [
edge(1, 0, groupNodeId, 'input_0'), // A → group
edge(groupNodeId, 0, 3, 'value') // group → C
],
groups: [{
id: groupId,
nodes: [
node(6, '__internal/group/input'),
node(2, 'test/node/output'),
node(7, '__internal/group/output')
],
edges: [
edge(6, 0, 2, 'input'), // inputBoundary → B
edge(2, 0, 7, 'Out') // B → outputBoundary
],
inputs: { input_0: { type: 'float' } },
outputs: [{ type: 'float', label: 'Output 0' }]
}]
};
const result = expandGroups(graph);
const ids = result.nodes.map(n => n.id);
expect(ids).not.toContain(groupNodeId);
expect(ids).toContain(remappedB);
expect(ids).toContain(1); // A
expect(ids).toContain(3); // C
expect(result.nodes.length).toBe(3); // A, B(remapped), C
expect(result.edges).toContainEqual(edge(1, 0, remappedB, 'input')); // A → B
expect(result.edges).toContainEqual(edge(remappedB, 0, 3, 'value')); // B → C
expect(result.edges.length).toBe(2);
});
it('expands a group with two internal nodes (B→D) and preserves the internal edge', () => {
// A → [B → D] → C
const groupId = 10;
const groupNodeId = 5;
const remappedB = (groupNodeId + 1) * 1_000_000 + 1; // 6_000_001
const remappedD = (groupNodeId + 1) * 1_000_000 + 2; // 6_000_002
const graph: Graph = {
id: 1,
nodes: [
node(0, 'test/node/output'),
node(groupNodeId, '__internal/group/instance', { groupId }),
node(9, 'test/node/input')
],
edges: [
edge(0, 0, groupNodeId, 'input_0'),
edge(groupNodeId, 0, 9, 'value')
],
groups: [{
id: groupId,
nodes: [
node(3, '__internal/group/input'),
node(1, 'test/node/output'), // B
node(2, 'test/node/output'), // D
node(4, '__internal/group/output')
],
edges: [
edge(3, 0, 1, 'input'), // inputBoundary → B
edge(1, 0, 2, 'input'), // B → D (internal)
edge(2, 0, 4, 'Out') // D → outputBoundary
],
inputs: { input_0: { type: 'float' } },
outputs: [{ type: 'float' }]
}]
};
const result = expandGroups(graph);
expect(result.nodes.map(n => n.id)).not.toContain(groupNodeId);
expect(result.nodes.map(n => n.id)).toContain(remappedB);
expect(result.nodes.map(n => n.id)).toContain(remappedD);
expect(result.edges).toContainEqual(edge(0, 0, remappedB, 'input')); // A → B
expect(result.edges).toContainEqual(edge(remappedB, 0, remappedD, 'input')); // B → D (internal)
expect(result.edges).toContainEqual(edge(remappedD, 0, 9, 'value')); // D → C
expect(result.edges.length).toBe(3);
});
it('expands a group with no external connections (isolated)', () => {
const groupId = 20;
const groupNodeId = 1;
const remappedB = (groupNodeId + 1) * 1_000_000 + 2; // 2_000_002
const graph: Graph = {
id: 1,
nodes: [node(groupNodeId, '__internal/group/instance', { groupId })],
edges: [],
groups: [{
id: groupId,
nodes: [
node(3, '__internal/group/input'),
node(2, 'test/node/output'),
node(4, '__internal/group/output')
],
edges: [
edge(3, 0, 2, 'input'),
edge(2, 0, 4, 'Out')
]
}]
};
const result = expandGroups(graph);
expect(result.nodes.map(n => n.id)).not.toContain(groupNodeId);
expect(result.nodes.map(n => n.id)).toContain(remappedB);
expect(result.edges.length).toBe(0);
});
});
+143 -123
View File
@@ -6,6 +6,142 @@ import type {
RuntimeExecutor, RuntimeExecutor,
SyncCache SyncCache
} from '@nodarium/types'; } from '@nodarium/types';
function isGroupInstanceType(type: string): boolean {
return type === '__virtual/group/instance';
}
export function expandGroups(graph: Graph): Graph {
if (!graph.groups || Object.keys(graph.groups).length === 0) {
return graph;
}
let nodes = [...graph.nodes];
let edges = [...graph.edges];
const groups = graph.groups;
let changed = true;
while (changed) {
changed = false;
for (let i = 0; i < nodes.length; i++) {
const node = nodes[i];
if (!isGroupInstanceType(node.type)) continue;
const groupId = (node.props as Record<string, unknown> | undefined)?.groupId as string | undefined;
if (!groupId) continue;
const group = groups[groupId];
if (!group) continue;
changed = true;
// Recursively expand nested groups inside this group's internal graph
const expandedInternal = expandGroups({
id: 0,
nodes: group.graph.nodes,
edges: group.graph.edges,
groups
});
const ID_PREFIX = node.id * 1000000;
const idMap = new Map<number, number>();
const inputVirtualNode = expandedInternal.nodes.find(
n => n.type === '__virtual/group/input'
);
const outputVirtualNode = expandedInternal.nodes.find(
n => n.type === '__virtual/group/output'
);
const realInternalNodes = expandedInternal.nodes.filter(
n => n.type !== '__virtual/group/input' && n.type !== '__virtual/group/output'
);
for (const n of realInternalNodes) {
idMap.set(n.id, ID_PREFIX + n.id);
}
const parentIncomingEdges = edges.filter(e => e[2] === node.id);
const parentOutgoingEdges = edges.filter(e => e[0] === node.id);
// Edges from/to virtual nodes in the expanded internal graph
const edgesFromInput = expandedInternal.edges.filter(
e => e[0] === inputVirtualNode?.id
);
const edgesToOutput = expandedInternal.edges.filter(
e => e[2] === outputVirtualNode?.id
);
const newEdges: Graph['edges'] = [];
// Short-circuit: parent source → internal target (via group input)
for (const parentEdge of parentIncomingEdges) {
const socketName = parentEdge[3];
const socketIdx = group.inputs.findIndex(s => s.name === socketName);
if (socketIdx === -1) continue;
for (const internalEdge of edgesFromInput.filter(e => e[1] === socketIdx)) {
const remappedId = idMap.get(internalEdge[2]);
if (remappedId !== undefined) {
newEdges.push([parentEdge[0], parentEdge[1], remappedId, internalEdge[3]]);
}
}
}
// Short-circuit: internal source → parent target (via group output)
for (const parentEdge of parentOutgoingEdges) {
const outputIdx = parentEdge[1];
const outputSocketName = group.outputs[outputIdx]?.name;
if (!outputSocketName) continue;
for (const internalEdge of edgesToOutput.filter(e => e[3] === outputSocketName)) {
const remappedId = idMap.get(internalEdge[0]);
if (remappedId !== undefined) {
newEdges.push([remappedId, internalEdge[1], parentEdge[2], parentEdge[3]]);
}
}
}
// Remap internal-to-internal edges
const internalEdges = expandedInternal.edges.filter(
e => e[0] !== inputVirtualNode?.id
&& e[0] !== outputVirtualNode?.id
&& e[2] !== inputVirtualNode?.id
&& e[2] !== outputVirtualNode?.id
);
for (const e of internalEdges) {
const fromId = idMap.get(e[0]);
const toId = idMap.get(e[2]);
if (fromId !== undefined && toId !== undefined) {
newEdges.push([fromId, e[1], toId, e[3]]);
}
}
// Remove the group node
nodes.splice(i, 1);
// Add remapped internal nodes
for (const n of realInternalNodes) {
nodes.push({ ...n, id: idMap.get(n.id)! });
}
// Remove group node's edges and add short-circuit edges
const groupEdgeKeys = new Set([
...parentIncomingEdges.map(e => `${e[0]}-${e[1]}-${e[2]}-${e[3]}`),
...parentOutgoingEdges.map(e => `${e[0]}-${e[1]}-${e[2]}-${e[3]}`)
]);
edges = edges.filter(
e => !groupEdgeKeys.has(`${e[0]}-${e[1]}-${e[2]}-${e[3]}`)
);
edges.push(...newEdges);
break; // Restart loop with updated nodes array
}
}
return { ...graph, nodes, edges };
}
import { import {
concatEncodedArrays, concatEncodedArrays,
createLogger, createLogger,
@@ -18,113 +154,6 @@ import type { RuntimeNode } from './types';
const log = createLogger('runtime-executor'); const log = createLogger('runtime-executor');
log.mute(); log.mute();
export function expandGroups(graph: Graph): Graph {
if (!graph.groups || graph.groups.length === 0) return graph;
function groupContainsSelf(groupId: number, visited = new Set<number>()): boolean {
if (visited.has(groupId)) return true;
visited.add(groupId);
const group = graph.groups!.find(g => g.id === groupId);
if (!group) return false;
for (const n of group.nodes) {
if (n.type === '__internal/group/instance') {
const nestedId = n.props?.groupId as number | undefined;
if (nestedId !== undefined && groupContainsSelf(nestedId, visited)) return true;
}
}
return false;
}
for (const group of graph.groups) {
if (groupContainsSelf(group.id)) {
throw new Error(`Circular group reference: group ${group.id} contains itself`);
}
}
const nodes = [...graph.nodes];
let edges = [...graph.edges];
let changed = true;
while (changed) {
changed = false;
for (let i = 0; i < nodes.length; i++) {
const node = nodes[i];
if (node.type !== '__internal/group/instance') continue;
const groupId = node.props?.groupId as number | undefined;
if (groupId === undefined) continue;
const group = graph.groups.find(g => g.id === groupId);
if (!group) continue;
changed = true;
const ID_OFFSET = (node.id + 1) * 1_000_000;
const idMap = new Map<number, number>();
const inputBoundary = group.nodes.find(n => n.type === '__internal/group/input');
const outputBoundary = group.nodes.find(n => n.type === '__internal/group/output');
const realNodes = group.nodes.filter(
n => n.type !== '__internal/group/input' && n.type !== '__internal/group/output'
);
for (const n of realNodes) idMap.set(n.id, ID_OFFSET + n.id);
const incomingExternal = edges.filter(e => e[2] === node.id);
const outgoingExternal = edges.filter(e => e[0] === node.id);
const newEdges: Graph['edges'] = [];
// external_source → [inputBoundary →] internal_target
//
// External socket names are "input_N" where N equals the input boundary's
// output index. Match each external edge only to the internal edges that
// originate from that specific output slot — not a cartesian product of all.
if (inputBoundary) {
const fromInput = group.edges.filter(e => e[0] === inputBoundary.id);
for (const extEdge of incomingExternal) {
const inputIndex = parseInt((extEdge[3] as string).replace('input_', ''), 10);
const matchingIntEdges = fromInput.filter(e => e[1] === inputIndex);
for (const intEdge of matchingIntEdges) {
const toId = idMap.get(intEdge[2]);
if (toId !== undefined) newEdges.push([extEdge[0], extEdge[1], toId, intEdge[3]]);
}
}
}
// internal_source → [outputBoundary →] external_target
if (outputBoundary) {
const toOutput = group.edges.filter(e => e[2] === outputBoundary.id);
for (const extEdge of outgoingExternal) {
for (const intEdge of toOutput) {
const fromId = idMap.get(intEdge[0]);
if (fromId !== undefined) newEdges.push([fromId, intEdge[1], extEdge[2], extEdge[3]]);
}
}
}
// internal-to-internal edges (skip boundary edges)
for (const e of group.edges) {
if (e[0] === inputBoundary?.id || e[2] === outputBoundary?.id) continue;
const fromId = idMap.get(e[0]);
const toId = idMap.get(e[2]);
if (fromId !== undefined && toId !== undefined) newEdges.push([fromId, e[1], toId, e[3]]);
}
nodes.splice(i, 1);
for (const n of realNodes) nodes.push({ ...n, id: idMap.get(n.id)! });
edges = edges.filter(e => e[0] !== node.id && e[2] !== node.id);
edges.push(...newEdges);
break;
}
}
return { ...graph, nodes, edges };
}
function getValue(input: NodeInput, value?: unknown) { function getValue(input: NodeInput, value?: unknown) {
if (value === undefined && 'value' in input) { if (value === undefined && 'value' in input) {
value = input.value; value = input.value;
@@ -134,15 +163,6 @@ function getValue(input: NodeInput, value?: unknown) {
return encodeFloat(value as number); return encodeFloat(value as number);
} }
if (input.type === 'select' && typeof value !== 'number') {
const index = input.options?.indexOf(value as string);
if (index === undefined || index < 0) {
// Defaultl to the first option
return 0;
}
return index;
}
if (Array.isArray(value)) { if (Array.isArray(value)) {
if (input.type === 'vec3' || input.type === 'shape') { if (input.type === 'vec3' || input.type === 'shape') {
return [ return [
@@ -168,8 +188,6 @@ function getValue(input: NodeInput, value?: unknown) {
return value; return value;
} }
console.log({ input, value });
throw new Error(`Unknown input type ${input.type}`); throw new Error(`Unknown input type ${input.type}`);
} }
@@ -184,7 +202,9 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
constructor( constructor(
private registry: NodeRegistry, private registry: NodeRegistry,
public cache?: SyncCache<Int32Array> public cache?: SyncCache<Int32Array>
) {} ) {
this.cache = undefined;
}
private async getNodeDefinitions(graph: Graph) { private async getNodeDefinitions(graph: Graph) {
if (this.registry.status !== 'ready') { if (this.registry.status !== 'ready') {
@@ -194,8 +214,8 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
// Only load non-virtual types (virtual nodes are resolved locally) // Only load non-virtual types (virtual nodes are resolved locally)
const nonVirtualTypes = graph.nodes const nonVirtualTypes = graph.nodes
.map(node => node.type) .map(node => node.type)
.filter(t => !t.startsWith('__internal/')); .filter(t => !t.startsWith('__virtual/'));
await this.registry.load(nonVirtualTypes); await this.registry.load(nonVirtualTypes as any);
const typeMap = new Map<string, NodeDefinition>(); const typeMap = new Map<string, NodeDefinition>();
for (const node of graph.nodes) { for (const node of graph.nodes) {
@@ -342,7 +362,7 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
if (inputNode) { if (inputNode) {
if (results[inputNode.id] === undefined) { if (results[inputNode.id] === undefined) {
throw new Error( throw new Error(
`Node ${node.type} is missing input from node ${inputNode.type}#${inputNode.id}` `Node ${node.type} is missing input from node ${inputNode.type}`
); );
} }
return results[inputNode.id]; return results[inputNode.id];
@@ -408,7 +428,7 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
log.groupEnd(); log.groupEnd();
} catch (e) { } catch (e) {
log.groupEnd(); log.groupEnd();
throw e; log.error(`Error executing node ${node_type.id || node.id}`, e);
} }
} }
@@ -1,13 +1,18 @@
import { debugNode } from '$lib/node-registry/debugNode'; import { debugNode } from '$lib/node-registry/debugNode';
import { groupInputNode, groupNode, groupOutputNode } from '$lib/node-registry/groupNodes';
import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index'; import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
import type { Graph } from '@nodarium/types'; import type { Graph } from '@nodarium/types';
import { createPerformanceStore } from '@nodarium/utils'; import { createPerformanceStore } from '@nodarium/utils';
import * as Comlink from 'comlink'; import { expandGroups, MemoryRuntimeExecutor } from './runtime-executor';
import { MemoryRuntimeExecutor } from './runtime-executor';
import { MemoryRuntimeCache } from './runtime-executor-cache'; import { MemoryRuntimeCache } from './runtime-executor-cache';
const indexDbCache = new IndexDBCache('node-registry'); const indexDbCache = new IndexDBCache('node-registry');
const nodeRegistry = new RemoteNodeRegistry('', indexDbCache, [debugNode]); const nodeRegistry = new RemoteNodeRegistry('', indexDbCache, [
debugNode,
groupInputNode,
groupOutputNode,
groupNode
]);
const cache = new MemoryRuntimeCache(); const cache = new MemoryRuntimeCache();
const executor = new MemoryRuntimeExecutor(nodeRegistry, cache); const executor = new MemoryRuntimeExecutor(nodeRegistry, cache);
@@ -35,13 +40,16 @@ export async function executeGraph(
graph: Graph, graph: Graph,
settings: Record<string, unknown> settings: Record<string, unknown>
): Promise<Int32Array> { ): Promise<Int32Array> {
await nodeRegistry.load(graph.nodes.map((n) => n.type)); // Expand groups before loading types so we only load real (non-virtual) node types
const expandedGraph = expandGroups(graph);
await nodeRegistry.load(
expandedGraph.nodes
.map(n => n.type)
.filter(t => !t.startsWith('__virtual/')) as any
);
performanceStore.startRun(); performanceStore.startRun();
const res = await executor.execute(graph, settings); const res = await executor.execute(graph, settings);
performanceStore.stopRun(); performanceStore.stopRun();
if (res?.buffer) {
return Comlink.transfer(res, [res.buffer]);
}
return res; return res;
} }
@@ -12,8 +12,8 @@ export class WorkerRuntimeExecutor implements RuntimeExecutor {
getPerformanceData() { getPerformanceData() {
return this.worker.getPerformanceData(); return this.worker.getPerformanceData();
} }
async getDebugData() { getDebugData() {
return await this.worker.getDebugData(); return this.worker.getDebugData();
} }
set useRuntimeCache(useCache: boolean) { set useRuntimeCache(useCache: boolean) {
this.worker.setUseRuntimeCache(useCache); this.worker.setUseRuntimeCache(useCache);
+10 -10
View File
@@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import { localState } from '$lib/helpers/localState.svelte'; import { localState } from '$lib/helpers/localState.svelte';
import type { NodeInput } from '@nodarium/types'; import type { NodeInput } from '@nodarium/types';
import Input, { Button as UiButton } from '@nodarium/ui'; import Input from '@nodarium/ui';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import NestedSettings from './NestedSettings.svelte'; import NestedSettings from './NestedSettings.svelte';
@@ -126,9 +126,9 @@
{@const inputType = type[key]} {@const inputType = type[key]}
<div class="input input-{inputType.type}" class:first-level={depth === 1}> <div class="input input-{inputType.type}" class:first-level={depth === 1}>
{#if inputType.type === 'button'} {#if inputType.type === 'button'}
<UiButton onclick={() => onButtonClick?.(id)}> <button onclick={() => onButtonClick?.(id)}>
{inputType.label || key} {inputType.label || key}
</UiButton> </button>
{:else} {:else}
{#if inputType.label !== ''} {#if inputType.label !== ''}
<label for={id}>{inputType.label || key}</label> <label for={id}>{inputType.label || key}</label>
@@ -204,13 +204,6 @@
.input-boolean > label { .input-boolean > label {
order: 2; order: 2;
font-size: 1em;
opacity: 0.9;
}
label {
font-size: 0.8em;
opacity: 0.7;
} }
.first-level.input { .first-level.input {
@@ -224,6 +217,13 @@
gap: 10px; gap: 10px;
} }
button {
cursor: pointer;
background: var(--color-layer-2);
padding-block: 5px;
border-radius: 4px;
}
hr { hr {
margin: 0; margin: 0;
left: 0; left: 0;
-1
View File
@@ -2,7 +2,6 @@
import { type Snippet } from 'svelte'; import { type Snippet } from 'svelte';
import { panelState as state } from './PanelState.svelte'; import { panelState as state } from './PanelState.svelte';
// eslint-disable-next-line no-useless-assignment
let { children, open = $bindable(false) } = $props<{ children?: Snippet; open?: boolean }>(); let { children, open = $bindable(false) } = $props<{ children?: Snippet; open?: boolean }>();
$effect(() => { $effect(() => {
@@ -0,0 +1,99 @@
<script lang="ts">
import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
import NestedSettings from '$lib/settings/NestedSettings.svelte';
import type { NodeId, NodeInput, NodeInstance } from '@nodarium/types';
type InternalNodeInput = NodeInput & {
__node_type?: NodeId;
__node_input: string;
};
type Props = {
manager: GraphManager;
node: NodeInstance;
};
const { manager, node = $bindable() }: Props = $props();
function filterInputs(inputs?: Record<string, NodeInput>) {
const _inputs = $state.snapshot(
inputs as Record<string, InternalNodeInput>
);
return Object.fromEntries(
Object.entries(structuredClone(_inputs ?? {}))
.filter(([, value]) => {
return value.hidden === true;
})
.map(([key, value]) => {
value.__node_type = node.state.type?.id;
value.__node_input = key;
return [key, value];
})
);
}
const nodeDefinition = filterInputs(node.state.type?.inputs);
type Store = Record<string, number | number[]>;
let store = $state<Store>(createStore(node?.props, nodeDefinition));
function createStore(
props: NodeInstance['props'],
inputs: Record<string, NodeInput>
): Store {
const store: Store = {};
Object.keys(inputs).forEach((key) => {
if (props) {
const value = props[key] !== undefined ? props[key] : inputs[key].value;
if (Array.isArray(value) || typeof value === 'number') {
store[key] = value;
} else if (typeof value === 'boolean') {
store[key] = value ? 1 : 0;
} else {
console.error('Wrong error', { value });
}
}
});
return store;
}
let lastPropsHash = '';
function updateNode() {
if (!node || !store) return;
let needsUpdate = false;
Object.keys(store).forEach((_key: string) => {
node.props = node.props || {};
const key = _key as keyof typeof store;
if (node && store) {
needsUpdate = true;
const value = store[key];
if (value !== undefined) {
node.props[key] = value;
}
}
});
let propsHash = JSON.stringify(node.props);
if (propsHash === lastPropsHash) {
return;
}
lastPropsHash = propsHash;
if (needsUpdate) {
manager.save();
manager.execute();
}
}
$effect(() => {
if (store) {
updateNode();
}
});
</script>
{#if Object.keys(nodeDefinition).length}
<NestedSettings
id="activeNodeSettings"
bind:value={store}
type={nodeDefinition}
/>
{/if}
@@ -1,103 +1,31 @@
<script lang="ts"> <script lang="ts">
import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte'; import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
import NestedSettings from '$lib/settings/NestedSettings.svelte'; import type { NodeInstance } from '@nodarium/types';
import type { NodeId, NodeInput, NodeInstance } from '@nodarium/types'; import ActiveNodeSelected from './ActiveNodeSelected.svelte';
type InternalNodeInput = NodeInput & {
__node_type?: NodeId;
__node_input: string;
};
type Props = { type Props = {
manager: GraphManager; manager: GraphManager;
node: NodeInstance | undefined; node: NodeInstance;
}; };
const { manager, node = $bindable() }: Props = $props(); let { manager, node = $bindable() }: Props = $props();
function filterInputs(inputs?: Record<string, NodeInput>) { const inputs = $derived(node?.state?.type?.inputs || {});
if (!node) return {};
return Object.fromEntries(
Object.entries(inputs ?? {})
.filter(([, value]) => {
return value.hidden === true;
})
.map(([key, value]) => {
const v = value as InternalNodeInput;
v.__node_type = node.state.type?.id;
v.__node_input = key;
return [key, v];
})
);
}
const nodeDefinition = node ? filterInputs(node.state.type?.inputs) : {};
type Store = Record<string, number | number[]>; const hasSettings = $derived(
let store = $state<Store>(createStore(node?.props, nodeDefinition)); Object.values(inputs).find(entry => {
function createStore( return entry.hidden === true;
props: NodeInstance['props'], }) !== undefined
inputs: Record<string, NodeInput> );
): Store {
const store: Store = {};
Object.keys(inputs).forEach((key) => {
if (props) {
const value = props[key] !== undefined ? props[key] : inputs[key].value;
if (Array.isArray(value) || typeof value === 'number') {
store[key] = value;
} else if (typeof value === 'boolean') {
store[key] = value ? 1 : 0;
} else {
console.error('Wrong error', { value });
}
}
});
return store;
}
let lastPropsHash = ''; $inspect({ inputs, hasSettings });
function updateNode() {
if (!node || !store) return;
let needsUpdate = false;
Object.keys(store).forEach((_key: string) => {
node.props = node.props || {};
const key = _key as keyof typeof store;
if (node && store) {
needsUpdate = true;
const value = store[key];
if (value !== undefined) {
node.props[key] = value;
}
}
});
let propsHash = JSON.stringify(node.props);
if (propsHash === lastPropsHash) {
return;
}
lastPropsHash = propsHash;
if (needsUpdate) {
manager.save();
manager.execute();
}
}
const isGroupInstance = $derived(node?.type === '__internal/group/instance');
$effect(() => {
if (store) {
updateNode();
}
});
</script> </script>
{#if !isGroupInstance && Object.keys(nodeDefinition).length} {#key node.id}
<div class='{node?"border-l-2 pl-3.5!":""} bg-layer-2 flex items-center h-[70px] border-b-1 border-l-selected border-b-outline pl-4'> {#if node && hasSettings}
<h3>Node Settings</h3> <div class="border-l-2 pl-3.5! bg-layer-2 flex items-center h-[70px] border-b-1 border-l-selected border-b-outline pl-4">
</div> <h3>Node Settings</h3>
<NestedSettings </div>
id="activeNodeSettings" <ActiveNodeSelected {manager} bind:node />
bind:value={store} {/if}
type={nodeDefinition} {/key}
/>
{/if}
@@ -8,7 +8,7 @@
import { humanizeDuration } from '$lib/helpers'; import { humanizeDuration } from '$lib/helpers';
import { localState } from '$lib/helpers/localState.svelte'; import { localState } from '$lib/helpers/localState.svelte';
import Monitor from '$lib/performance/Monitor.svelte'; import Monitor from '$lib/performance/Monitor.svelte';
import { Button, InputNumber } from '@nodarium/ui'; import { InputNumber } from '@nodarium/ui';
import { writable } from 'svelte/store'; import { writable } from 'svelte/store';
function calculateStandardDeviation(array: number[]) { function calculateStandardDeviation(array: number[]) {
@@ -112,7 +112,7 @@
onclick={() => copyContent(result?.stdev + '')} onclick={() => copyContent(result?.stdev + '')}
>(click to copy)</i> >(click to copy)</i>
<div> <div>
<Button onclick={() => (isRunning = false)}>reset</Button> <button onclick={() => (isRunning = false)}>reset</button>
</div> </div>
{:else if isRunning} {:else if isRunning}
<p>WarmUp ({$warmUp}/{warmUpAmount})</p> <p>WarmUp ({$warmUp}/{warmUpAmount})</p>
@@ -126,7 +126,7 @@
{:else} {:else}
<label for="bench-samples">Samples</label> <label for="bench-samples">Samples</label>
<InputNumber id="bench-sample" bind:value={amount.value} max={1000} step={1} /> <InputNumber id="bench-sample" bind:value={amount.value} max={1000} step={1} />
<Button variant="primary" onclick={benchmark} disabled={isRunning}>start</Button> <button onclick={benchmark} disabled={isRunning}>start</button>
{/if} {/if}
</div> </div>
@@ -1,5 +1,4 @@
<script lang="ts"> <script lang="ts">
import { Button, toast } from '@nodarium/ui';
import FileSaver from 'file-saver'; import FileSaver from 'file-saver';
import type { Group } from 'three'; import type { Group } from 'three';
import type { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js'; import type { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js';
@@ -29,12 +28,11 @@
exporter.parse( exporter.parse(
scene, scene,
(gltf) => { (gltf) => {
// download .gltf file
download(gltf as ArrayBuffer, 'plant', 'text/plain', 'gltf'); download(gltf as ArrayBuffer, 'plant', 'text/plain', 'gltf');
toast('Exported as GLTF', 'success');
}, },
(err) => { (err) => {
const msg = err instanceof Error ? err.message : String(err); console.log(err);
toast(`GLTF export failed: ${msg}`, 'error');
} }
); );
} }
@@ -47,18 +45,13 @@
objExporter = new m.OBJExporter(); objExporter = new m.OBJExporter();
return objExporter; return objExporter;
})); }));
try { const result = exporter.parse(scene);
const result = exporter.parse(scene); // download .obj file
download(result, 'plant', 'text/plain', 'obj'); download(result, 'plant', 'text/plain', 'obj');
toast('Exported as OBJ', 'success');
} catch (err) {
const msg = err instanceof Error ? err.message : String(err);
toast(`OBJ export failed: ${msg}`, 'error');
}
} }
</script> </script>
<div class="p-4 flex gap-2"> <div class="p-4">
<Button onclick={exportObj}>export obj</Button> <button onclick={exportObj}>export obj</button>
<Button onclick={exportGltf}>export gltf</Button> <button onclick={exportGltf}>export gltf</button>
</div> </div>
+13 -16
View File
@@ -1,23 +1,20 @@
<script lang="ts"> <script lang="ts">
import type { Graph } from '$lib/types'; import type { Graph } from '$lib/types';
import { JsonViewer } from '@nodarium/ui';
const { graph }: { graph?: Graph } = $props(); const { graph }: { graph?: Graph } = $props();
const data = $derived( function convert(g: Graph): string {
graph return JSON.stringify(
? { {
...graph, ...g,
nodes: graph.nodes.map((n: object) => ({ ...n, state: undefined })) nodes: g.nodes.map((n: object) => ({ ...n, tmp: undefined, state: undefined }))
} },
: null null,
); 2
);
}
</script> </script>
<div class="overflow-auto p-2"> <pre>
{#if data} {graph ? convert(graph) : "No graph loaded"}
<JsonViewer value={data} path="graph" /> </pre>
{:else}
<span class="font-mono text-xs text-neutral-500">No graph loaded</span>
{/if}
</div>
@@ -0,0 +1,148 @@
<script lang="ts">
import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
import { InputSelect } from '@nodarium/ui';
type Props = { manager: GraphManager; groupId: string };
const { manager, groupId }: Props = $props();
$inspect({ groupId });
const group = $derived(manager.groups.get(groupId));
const COMMON_TYPES = ['plant', 'float', 'int', 'vec3', 'bool'];
let selectedTypeIdx = $state(0);
let customType = $state('');
function rename(e: Event) {
if (!group) return;
const name = (e.target as HTMLInputElement).value.trim();
if (!name) return;
group.name = name;
if (manager.graph.groups?.[groupId]) manager.graph.groups[groupId].name = name;
const def = manager.groupNodeDefinitions.get(`__virtual/group/${groupId}`);
if (def?.meta) def.meta.title = name;
manager.save();
}
function addSocket() {
const type = customType.trim() || COMMON_TYPES[selectedTypeIdx];
if (!type) return;
manager.addGroupSocket('input', type);
customType = '';
}
function removeSocket(index: number) {
manager.removeGroupSocket('input', index);
}
</script>
<div class="bg-layer-2 flex items-center h-[70px] border-b-1 border-outline pl-4">
<h3>Group Settings</h3>
</div>
<div class="px-4 py-3 flex flex-col gap-4">
<div class="flex flex-col gap-1.5">
<span class="section-label">Group name</span>
<input
type="text"
value={group?.name ?? ''}
onchange={rename}
onkeydown={(e) => e.stopPropagation()}
placeholder="Group name"
class="bg-layer-2 text-text rounded-[5px] px-2 py-1.5 text-sm w-full box-border outline outline-1 outline-outline"
/>
</div>
<div class="flex flex-col gap-1.5">
<span class="section-label">Inputs</span>
{#if (group?.inputs?.length ?? 0) === 0}
<p class="text-sm opacity-40 italic m-0">No inputs yet</p>
{:else}
<ul class="socket-list">
{#each group?.inputs ?? [] as socket, i}
<li class="socket-item">
<span class="flex-1 opacity-80 text-sm">{socket.name}</span>
<span class="text-xs opacity-45 italic">{socket.type}</span>
<button class="remove-btn" onclick={() => removeSocket(i)} title="Remove">×</button>
</li>
{/each}
</ul>
{/if}
<div class="flex gap-1.5 items-center">
<InputSelect options={COMMON_TYPES} bind:value={selectedTypeIdx} />
<input
type="text"
placeholder="custom type…"
bind:value={customType}
onkeydown={(e) => {
e.stopPropagation();
if (e.key === 'Enter') addSocket();
}}
class="bg-layer-2 text-text rounded-[5px] px-2 py-1 text-sm flex-1 min-w-0 outline outline-1 outline-outline"
/>
<button class="add-btn" onclick={addSocket}>+ Add</button>
</div>
</div>
</div>
<style>
.section-label {
font-size: 0.72em;
text-transform: uppercase;
letter-spacing: 0.06em;
opacity: 0.5;
}
.socket-list {
list-style: none;
margin: 0;
padding: 0;
display: flex;
flex-direction: column;
gap: 3px;
}
.socket-item {
display: flex;
align-items: center;
gap: 6px;
background: var(--color-layer-2);
border-radius: 5px;
padding: 4px 8px;
outline: 1px solid var(--color-outline);
}
.remove-btn {
background: none;
border: none;
color: var(--color-text);
cursor: pointer;
opacity: 0.4;
padding: 0 2px;
font-size: 1.1em;
line-height: 1;
}
.remove-btn:hover {
opacity: 1;
}
.add-btn {
background: var(--color-layer-2);
color: var(--color-text);
border: none;
outline: 1px solid var(--color-outline);
border-radius: 5px;
padding: 0.4em 0.7em;
font-size: 0.8em;
cursor: pointer;
white-space: nowrap;
font-family: var(--font-family);
}
.add-btn:hover {
outline-color: var(--color-selected);
}
</style>
@@ -1,156 +0,0 @@
<script lang="ts">
import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
import { GraphState } from '$lib/graph-interface/graph-state.svelte';
import type { NodeInstance } from '@nodarium/types';
import { SocketTable } from '@nodarium/ui';
import UnusedGroupsPanel from './UnusedGroupsPanel.svelte';
type Props = {
manager: GraphManager;
graphState: GraphState;
node?: NodeInstance;
};
const { manager, graphState, node = $bindable() }: Props = $props();
const activeGroup = $derived.by(() => {
if (node?.type === '__internal/group/instance') {
let group = manager.getGroup(node.props?.groupId as number);
if (group) return group;
}
if (manager?.isInsideGroup && manager.currentGroupId !== null) {
return manager.getGroup(manager.currentGroupId);
}
});
const groupName = $derived(activeGroup?.name ?? '');
function handleRename(e: Event) {
const name = (e.target as HTMLInputElement).value;
if (activeGroup) manager.renameGroup(activeGroup.id, name);
}
function handleRemoveInput(key: string) {
if (!activeGroup) return;
const group = manager.getGroup(activeGroup?.id);
const inputs = $state.snapshot(group?.inputs ?? {});
delete inputs[key];
activeGroup.inputs = inputs;
manager.nodes = manager.nodes;
manager.save();
}
const types = $derived(
Array.from(
new Set(
manager?.registry
? manager.registry.getAllNodes()
.flatMap(n =>
Object.values(n.inputs ?? {})
.map(v => v.type)
)
: []
)
)
);
let outputType = $derived(activeGroup?.outputs?.[0]?.type ?? 'unknown');
$effect(() => {
if (!activeGroup) return;
const group = manager.getGroup(activeGroup?.id);
const outputs = $state.snapshot(group?.outputs ?? []);
if (outputs?.[0]?.type === outputType) return;
activeGroup.outputs = [
{
label: outputs[0]?.label ?? 'Output',
type: outputType
}
];
manager.nodes = manager.nodes;
manager.save();
});
</script>
{#if activeGroup}
<div class='{node?"border-l-2 pl-3.5!":""} bg-layer-2 flex items-center h-[70px] border-b-1 border-l-selected border-b-outline pl-4'>
<h3>Group Settings</h3>
</div>
{/if}
{#if activeGroup}
{#key activeGroup.id}
<div class="p-4 group-settings">
<label for="group-name">Group name</label>
<input
id="group-name"
type="text"
placeholder="Group {activeGroup.id}"
value={groupName}
oninput={handleRename}
/>
<label for="group-name">Group Inputs</label>
<div>
<SocketTable
{types}
onremove={handleRemoveInput}
bind:inputs={activeGroup.inputs}
colors={graphState?.colors?.getColors()}
/>
</div>
<label for="group-name mb-2">Group output</label>
<div class="flex bg-layer-2 rounded-sm outline outline-outline w-min">
<span
style:background={graphState?.colors?.getColor(outputType)}
class="block opacity-50 min-w-2 ml-2 w-2 h-2 my-auto rounded-sm"
></span>
<select
class="text-[0.9em] shrink-0 px-2 py-1 border-outline"
bind:value={outputType}
>
{#each types as type (type)}
<option>
<span
style="background: {graphState?.colors?.getColor(type)}; width: 5px; height: 5px; border-radius: 5px;"
></span>
{type}
</option>
{/each}
</select>
</div>
</div>
{/key}
{/if}
{#if manager && !manager.isInsideGroup}
<UnusedGroupsPanel {manager} />
{/if}
<style>
.group-settings {
display: flex;
flex-direction: column;
gap: 0.4em;
}
label {
font-size: 0.8em;
opacity: 0.7;
}
.group-settings input {
background: var(--color-layer-1);
border: 1px solid var(--color-outline);
border-radius: 4px;
color: var(--color-text);
font-family: var(--font-family);
font-size: 0.9em;
padding: 0.4em 0.6em;
}
.group-settings input:focus {
outline: 1px solid var(--color-active);
}
</style>
@@ -1,122 +0,0 @@
<script lang="ts">
import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
import type { GroupDefinition } from '@nodarium/types';
import { Button } from '@nodarium/ui';
import { SvelteMap, SvelteSet } from 'svelte/reactivity';
type Props = { manager: GraphManager };
const { manager }: Props = $props();
type GroupNode = { group: GroupDefinition; children: GroupNode[] };
const unusedTree = $derived.by((): GroupNode[] => {
const unused = manager.getUnusedGroups();
if (!unused.length) return [];
const unusedIds = new Set(unused.map(g => g.id));
// Build child map: which unused groups reference which other unused groups
const childrenOf = new SvelteMap<number, number[]>();
const referencedBy = new SvelteSet<number>();
for (const group of unused) {
const refs: number[] = [];
for (const node of group.nodes) {
if (node.type === '__internal/group/instance' && node.props?.groupId !== undefined) {
const childId = node.props.groupId as number;
if (unusedIds.has(childId)) {
refs.push(childId);
referencedBy.add(childId);
}
}
}
childrenOf.set(group.id, refs);
}
const byId = new Map(unused.map(g => [g.id, g]));
function buildNode(g: GroupDefinition): GroupNode {
return {
group: g,
children: (childrenOf.get(g.id) ?? []).map(id => buildNode(byId.get(id)!))
};
}
return unused
.filter(g => !referencedBy.has(g.id))
.map(buildNode);
});
</script>
{#if unusedTree.length}
<div class="panel p-4">
<div class="header">
<span>Unused groups</span>
<Button size="sm" variant="destructive" onclick={() => manager.removeUnusedGroups()}>
Remove all
</Button>
</div>
<ul class="tree">
{#snippet treeNode(node: GroupNode)}
<li>
<span class="group-name">{node.group.name || `Group #${node.group.id}`}</span>
{#if node.children.length}
<ul>
{#each node.children as child (child.group.id)}
{@render treeNode(child)}
{/each}
</ul>
{/if}
</li>
{/snippet}
{#each unusedTree as node (node.group.id)}
{@render treeNode(node)}
{/each}
</ul>
</div>
{/if}
<style>
.panel {
border-top: 1px solid var(--color-outline);
margin-top: -1px;
border-bottom: 1px solid var(--color-outline);
}
.header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 0.5em;
font-size: 0.8em;
opacity: 0.7;
}
.tree {
list-style: none;
margin: 0;
padding: 0;
}
.tree ul {
list-style: none;
margin: 0;
padding-left: 1.2em;
border-left: 1px solid var(--color-outline);
}
.tree li {
padding: 0.15em 0;
}
.group-name {
font-size: 0.85em;
}
.tree ul .group-name::before {
content: '└ ';
opacity: 0.4;
}
</style>
+60 -93
View File
@@ -4,10 +4,10 @@
import Grid from '$lib/grid'; import Grid from '$lib/grid';
import { debounceAsyncFunction } from '$lib/helpers'; import { debounceAsyncFunction } from '$lib/helpers';
import { createKeyMap } from '$lib/helpers/createKeyMap'; import { createKeyMap } from '$lib/helpers/createKeyMap';
import { debugNode } from '$lib/node-registry/debugNode'; import { debugNode } from '$lib/node-registry/debugNode.js';
import { groupNode } from '$lib/node-registry/groupNode.js'; import { groupInputNode, groupNode, groupOutputNode } from '$lib/node-registry/groupNodes.js';
import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index'; import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
import NodeStore from '$lib/node-store/NodeStore.svelte';
import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte'; import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte';
import { ProjectManager } from '$lib/project-manager/project-manager.svelte'; import { ProjectManager } from '$lib/project-manager/project-manager.svelte';
import ProjectManagerEl from '$lib/project-manager/ProjectManager.svelte'; import ProjectManagerEl from '$lib/project-manager/ProjectManager.svelte';
@@ -22,26 +22,29 @@
import Changelog from '$lib/sidebar/panels/Changelog.svelte'; import Changelog from '$lib/sidebar/panels/Changelog.svelte';
import ExportSettings from '$lib/sidebar/panels/ExportSettings.svelte'; import ExportSettings from '$lib/sidebar/panels/ExportSettings.svelte';
import GraphSource from '$lib/sidebar/panels/GraphSource.svelte'; import GraphSource from '$lib/sidebar/panels/GraphSource.svelte';
import GroupSettings from '$lib/sidebar/panels/GroupSettings.svelte'; import GroupContextPanel from '$lib/sidebar/panels/GroupContextPanel.svelte';
import Keymap from '$lib/sidebar/panels/Keymap.svelte'; import Keymap from '$lib/sidebar/panels/Keymap.svelte';
import { panelState } from '$lib/sidebar/PanelState.svelte'; import { panelState } from '$lib/sidebar/PanelState.svelte';
import Sidebar from '$lib/sidebar/Sidebar.svelte'; import Sidebar from '$lib/sidebar/Sidebar.svelte';
import { tutorialConfig } from '$lib/tutorial/tutorial-config'; import { tutorialConfig } from '$lib/tutorial/tutorial-config';
import { Planty } from '@nodarium/planty'; import { Planty } from '@nodarium/planty';
import type { Graph, NodeInstance } from '@nodarium/types'; import type { Graph, NodeInstance } from '@nodarium/types';
import { Spinner, Toast, toast } from '@nodarium/ui';
import { createPerformanceStore } from '@nodarium/utils'; import { createPerformanceStore } from '@nodarium/utils';
import type { Group } from 'three'; import type { Group } from 'three';
let performanceStore = createPerformanceStore(); let performanceStore = createPerformanceStore();
let planty = $state<ReturnType<typeof Planty>>(); let planty = $state<ReturnType<typeof Planty>>();
let pendingSave = false;
const { data } = $props(); const { data } = $props();
const registryCache = new IndexDBCache('node-registry'); const registryCache = new IndexDBCache('node-registry');
const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode, groupNode]); const nodeRegistry = new RemoteNodeRegistry('', registryCache, [
debugNode,
groupInputNode,
groupOutputNode,
groupNode
]);
const workerRuntime = new WorkerRuntimeExecutor(); const workerRuntime = new WorkerRuntimeExecutor();
const runtimeCache = new MemoryRuntimeCache(); const runtimeCache = new MemoryRuntimeCache();
const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache); const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
@@ -53,8 +56,8 @@
); );
$effect(() => { $effect(() => {
workerRuntime.useRegistryCache = appSettings.value.debug.cache.useRegistryCache; workerRuntime.useRegistryCache = appSettings.value.debug.cache.useRuntimeCache;
workerRuntime.useRuntimeCache = appSettings.value.debug.cache.useRuntimeCache; workerRuntime.useRuntimeCache = appSettings.value.debug.cache.useRegistryCache;
if (appSettings.value.debug.cache.useRegistryCache) { if (appSettings.value.debug.cache.useRegistryCache) {
nodeRegistry.cache = registryCache; nodeRegistry.cache = registryCache;
@@ -69,19 +72,8 @@
} }
}); });
$effect(() => {
const handler = (e: BeforeUnloadEvent) => {
if (pendingSave) {
e.preventDefault();
}
};
window.addEventListener('beforeunload', handler);
return () => window.removeEventListener('beforeunload', handler);
});
let activeNode = $state<NodeInstance | undefined>(undefined); let activeNode = $state<NodeInstance | undefined>(undefined);
let scene = $state<Group>(null!); let scene = $state<Group>(null!);
let isExecuting = $state(false);
let sidebarOpen = $state(false); let sidebarOpen = $state(false);
let graphInterface = $state<ReturnType<typeof GraphInterface>>(null!); let graphInterface = $state<ReturnType<typeof GraphInterface>>(null!);
@@ -109,21 +101,15 @@
randomSeed: { type: 'boolean', value: false } randomSeed: { type: 'boolean', value: false }
}); });
$effect(() => { $effect(() => {
if (graphSettings && graphSettingTypes && manager?.loaded) { if (graphSettings && graphSettingTypes) {
manager?.setSettings($state.snapshot(graphSettings)); manager?.setSettings($state.snapshot(graphSettings));
} }
}); });
let timeout: ReturnType<typeof setTimeout>;
async function update( async function update(
g: Graph, g: Graph,
s: Record<string, unknown> = $state.snapshot(graphSettings) s: Record<string, unknown> = $state.snapshot(graphSettings)
) { ) {
if (timeout) clearTimeout(timeout);
timeout = setTimeout(() => {
isExecuting = true;
}, 100);
performanceStore.startRun(); performanceStore.startRun();
try { try {
let a = performance.now(); let a = performance.now();
@@ -146,11 +132,8 @@
} }
viewerComponent?.update(graphResult); viewerComponent?.update(graphResult);
} catch (error) { } catch (error) {
const msg = error instanceof Error ? error.message : String(error); console.log('errors', error);
toast(`Execution failed: ${msg}`, 'error');
} finally { } finally {
clearTimeout(timeout);
isExecuting = false;
performanceStore.stopRun(); performanceStore.stopRun();
} }
} }
@@ -194,7 +177,6 @@
config={tutorialConfig} config={tutorialConfig}
actions={{ actions={{
'setup-default': () => { 'setup-default': () => {
console.log('setup-default');
const ts = new Date().toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' }); const ts = new Date().toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' });
pm.handleCreateProject( pm.handleCreateProject(
structuredClone(templates.defaultPlant) as unknown as Graph, structuredClone(templates.defaultPlant) as unknown as Graph,
@@ -202,16 +184,15 @@
); );
}, },
'load-tutorial-template': () => { 'load-tutorial-template': () => {
console.log('load-tutorial-template');
if (!pm.graph) return; if (!pm.graph) return;
const g = structuredClone(templates.tutorial) as unknown as Graph; const g = structuredClone(templates.tutorial) as unknown as Graph;
g.id = pm.graph.id; g.id = pm.graph.id;
g.meta = { ...pm.graph.meta }; g.meta = { ...pm.graph.meta };
manager.load(g); pm.graph = g;
pm.saveGraph(g);
graphInterface.state.centerNode(graphInterface.manager.getAllNodes()[0]); graphInterface.state.centerNode(graphInterface.manager.getAllNodes()[0]);
}, },
'open-github-nodes': () => { 'open-github-nodes': () => {
console.log('open-github-nodes');
window.open( window.open(
'https://github.com/jim-fx/nodarium/tree/main/nodes/max/plantarium', 'https://github.com/jim-fx/nodarium/tree/main/nodes/max/plantarium',
'__blank' '__blank'
@@ -270,43 +251,30 @@
<header></header> <header></header>
<Grid.Row> <Grid.Row>
<Grid.Cell> <Grid.Cell>
<div class="viewer-cell"> <Viewer
<Viewer bind:scene
bind:scene bind:this={viewerComponent}
bind:this={viewerComponent} perf={performanceStore}
perf={performanceStore} debugData={debugData}
debugData={debugData} centerCamera={appSettings.value.centerCamera}
centerCamera={appSettings.value.centerCamera} />
/>
{#if isExecuting}
<div class="viewer-spinner" aria-label="Executing graph">
<Spinner size={28} />
</div>
{/if}
</div>
</Grid.Cell> </Grid.Cell>
<Grid.Cell> <Grid.Cell>
{#if pm.graph} {#if pm.graph}
{#key pm.graph.id} <GraphInterface
<GraphInterface graph={pm.graph}
graph={pm.graph} bind:this={graphInterface}
bind:this={graphInterface} registry={nodeRegistry}
registry={nodeRegistry} safePadding={{ right: sidebarOpen ? 330 : undefined }}
safePadding={{ right: sidebarOpen ? 321 : undefined }} backgroundType={appSettings.value.nodeInterface.backgroundType}
backgroundType={appSettings.value.nodeInterface.backgroundType} snapToGrid={appSettings.value.nodeInterface.snapToGrid}
snapToGrid={appSettings.value.nodeInterface.snapToGrid} bind:activeNode
bind:activeNode bind:showHelp={appSettings.value.nodeInterface.showHelp}
bind:showHelp={appSettings.value.nodeInterface.showHelp} bind:settings={graphSettings}
bind:settings={graphSettings} bind:settingTypes={graphSettingTypes}
bind:settingTypes={graphSettingTypes} onsave={(g) => pm.saveGraph(g)}
onsave={async (g) => { onresult={(result) => handleUpdate(result as Graph)}
pendingSave = true; />
await pm.saveGraph(g);
pendingSave = false;
}}
onresult={(result) => handleUpdate(result as Graph)}
/>
{/key}
{/if} {/if}
<Sidebar bind:open={sidebarOpen}> <Sidebar bind:open={sidebarOpen}>
<Panel id="general" title="General" icon="i-[tabler--settings]"> <Panel id="general" title="General" icon="i-[tabler--settings]">
@@ -332,7 +300,15 @@
<Panel id="exports" title="Exporter" icon="i-[tabler--package-export]"> <Panel id="exports" title="Exporter" icon="i-[tabler--package-export]">
<ExportSettings {scene} /> <ExportSettings {scene} />
</Panel> </Panel>
{#if 0 > 1}
<Panel
id="node-store"
title="Node Store"
icon="i-[tabler--database] bg-green-400"
>
<NodeStore registry={nodeRegistry} />
</Panel>
{/if}
<Panel <Panel
id="performance" id="performance"
title="Performance" title="Performance"
@@ -352,9 +328,7 @@
hidden={!appSettings.value.debug.advancedMode} hidden={!appSettings.value.debug.advancedMode}
icon="i-[tabler--code]" icon="i-[tabler--code]"
> >
{#if manager?.status === 'idle'} <GraphSource graph={pm.graph ?? manager?.serialize()} />
<GraphSource graph={manager.serialize()} />
{/if}
</Panel> </Panel>
<Panel <Panel
id="benchmark" id="benchmark"
@@ -369,16 +343,25 @@
title="Graph Settings" title="Graph Settings"
icon="i-[custom--graph] bg-blue-400" icon="i-[custom--graph] bg-blue-400"
> >
<span class="block h-[1px]"></span>
<NestedSettings <NestedSettings
id="graph-settings" id="graph-settings"
type={graphSettingTypes} type={graphSettingTypes}
bind:value={graphSettings} bind:value={graphSettings}
/> />
{#key activeNode} {#if activeNode?.id}
<ActiveNodeSettings {manager} bind:node={activeNode} /> <ActiveNodeSettings {manager} bind:node={activeNode} />
<GroupSettings graphState={graphInterface?.state} {manager} bind:node={activeNode} /> {/if}
{/key} {#if manager?.isInsideGroup}
<GroupContextPanel
{manager}
groupId={manager.currentGroupContext!}
/>
{:else if activeNode?.type === '__virtual/group/instance'}
<GroupContextPanel
{manager}
groupId={activeNode?.props?.groupId as string}
/>
{/if}
</Panel> </Panel>
<Panel <Panel
id="changelog" id="changelog"
@@ -392,8 +375,6 @@
</Grid.Row> </Grid.Row>
</div> </div>
<Toast />
<style> <style>
header { header {
background-color: var(--color-layer-1); background-color: var(--color-layer-1);
@@ -426,20 +407,6 @@
grid-template-rows: 0px 1fr; grid-template-rows: 0px 1fr;
} }
.viewer-cell {
position: relative;
height: 100%;
}
.viewer-spinner {
position: absolute;
bottom: 12px;
right: 12px;
color: var(--color-text, #cecece);
opacity: 0.6;
pointer-events: none;
}
.wrapper :global(canvas) { .wrapper :global(canvas) {
transition: opacity 0.3s ease; transition: opacity 0.3s ease;
opacity: 1; opacity: 1;
+282 -186
View File
@@ -1,216 +1,312 @@
# Nodarium LLM Reference # Nodarium - LLM Documentation
## What It Is ## Overview
Nodarium is a **node-based visual programming editor**. Users wire together nodes on a 2D canvas; each node is a WebAssembly module that receives typed inputs and produces typed outputs. A live Three.js viewer renders the resulting 3D geometry/paths/instances. Nodarium is a **WebAssembly-based visual programming language** for creating procedural 3D plants. The app features a node-based interface where users connect WASM modules to generate plant models in real-time. Currently used to develop https://nodes.max-richter.dev, a procedural modelling tool for 3D plants.
--- ## Architecture
## Repository Layout ### Core Components
``` #### 1. Node System (`app/static/nodes/`)
/
├── app/ # SvelteKit web app
│ └── src/
│ ├── routes/+page.svelte # App entry point
│ └── lib/
│ ├── graph-interface/ # Canvas editor (UI + state)
│ ├── runtime/ # WASM execution engine
│ ├── node-registry/ # Fetch & cache node definitions
│ ├── project-manager/ # IndexDB persistence
│ ├── result-viewer/ # Three.js 3D output
│ ├── sidebar/ # UI panels
│ └── settings/ # App + graph settings
├── packages/
│ ├── types/ # Shared TypeScript types + Zod schemas
│ ├── utils/ # Logging, hashing, WASM wrapping, perf
│ ├── ui/ # Reusable Svelte UI components
│ ├── planty/ # Tutorial system
│ └── macros/ # Build-time macros
└── docs/
```
--- WASM-based nodes that perform computations. All nodes must implement the NodeDefinition interface.
## Core Architecture - **Node Storage**: `app/static/nodes/max/plantarium/`
- `box.wasm` - Box geometry node
- `branch.wasm` - Branch generation
- `float.wasm` - Float value node
- `gravity.wasm` - Gravity/physics node
- `instance.wasm` - Instance rendering
- `leaf.wasm` - Leaf geometry
- `math.wasm` - Math operations
- `noise.wasm` - Noise generation
- `output.wasm` - Output node
- `random.wasm` - Random value generation
- `rotate.wasm` - Rotation node
- `shape.wasm` - Shape geometry
- `stem.wasm` - Stem generation
- `triangle.wasm` - Triangle geometry
- `vec3.wasm` - Vector3 node
``` - **Node Registry**: `app/src/lib/node-registry.ts`
User Interaction - Loads and manages WASM nodes
└── GraphInterface - `getNodeWasm()` - Creates WASM wrapper from bytes
├── GraphState ← UI: selection, camera, mouse, clipboard - `getNode()` - Retrieves node definition
└── GraphManager ← Logic: nodes, edges, history, serialization
├── NodeRegistry ← fetches WASM definitions (remote API + IndexDB cache)
├── HistoryManager ← undo/redo (jsondiffpatch deltas)
└── emit('result') → RuntimeExecutor
└── node.execute(Int32Array) per node
└── ResultViewer (Three.js/Threlte)
```
**Event flow:** - **Debug Node**: `app/src/lib/node-registry/debugNode.js`
- Special debug node with wildcard inputs
- Variable-height nodes and parameters
- Quick-connect shortcut
1. User edits graph → GraphManager mutates state #### 2. Graph Interface
2. GraphManager emits `save` → ProjectManager persists to IndexDB
3. GraphManager emits `result` → Runtime executes graph → Viewer updates
--- Visual node editor built with Svelte 5.
## Critical Files - **Main Wrapper**: `app/src/lib/graph-interface/graph/Wrapper.svelte`
- Entry point for graph interface
- Manages GraphManager and GraphState
| File | Role | - **GraphManager**: `app/src/lib/graph-interface/graph-manager.svelte.ts`
| ------------------------------------------------------ | --------------------------------------------------------------------- | - Core entity managing the node graph
| `app/src/routes/+page.svelte` | Wires all systems; creates GraphManager, runtime, registry | - Handles node connections and execution flow
| `app/src/lib/graph-interface/graph-manager.svelte.ts` | Central graph logic: createNode, createEdge, serialize, load, history |
| `app/src/lib/graph-interface/graph-state.svelte.ts` | UI state: camera, selection, mouse, clipboard, groupSelectedNodes |
| `app/src/lib/graph-interface/graph/Graph.svelte` | Canvas renderer |
| `app/src/lib/graph-interface/node/Node.svelte` | 3D mesh node (Three.js shader) |
| `app/src/lib/graph-interface/node/NodeHTML.svelte` | HTML overlay: labels + parameters |
| `app/src/lib/graph-interface/node/NodeHeader.svelte` | Node title bar |
| `app/src/lib/graph-interface/keymaps.ts` | Keyboard shortcuts |
| `app/src/lib/graph-interface/helpers/nodeHelpers.ts` | Node height calculations |
| `app/src/lib/graph-interface/graph/colors.svelte.ts` | Socket type → color mapping |
| `app/src/lib/runtime/runtime-executor.ts` | Executes nodes in DAG order; expandGroups() |
| `app/src/lib/node-registry/index.ts` | RemoteNodeRegistry entry |
| `app/src/lib/node-registry/groupNode.ts` | Built-in group node definition |
| `app/src/lib/node-registry/debugNode.ts` | Built-in debug node |
| `app/src/lib/sidebar/panels/ActiveNodeSettings.svelte` | Per-node settings panel |
| `packages/types/src/types.ts` | Graph, NodeInstance, NodeDefinition, Edge, GroupDefinition |
| `packages/types/src/inputs.ts` | NodeInput union types (float, vec3, geometry, path, …) |
| `packages/utils/src/wasm.ts` | createWasmWrapper() — wraps WASM bytes into a NodeDefinition |
--- - **GraphState**: `app/src/lib/graph-interface/graph-state.svelte.ts`
- Tracks UI state (selection, snapping, help, active nodes)
## Key Types - **Graph Components**:
- `app/src/lib/graph-interface/graph/` - Graph rendering
- `app/src/lib/graph-interface/node/` - Node rendering
- `app/src/lib/graph-interface/edges/` - Edge rendering
- `app/src/lib/graph-interface/components/` - UI components (AddMenu, Socket, etc.)
- `app/src/lib/graph-interface/debug/` - Debug overlays
- `app/src/lib/graph-interface/background/` - Grid/dots backgrounds
- **Helpers**:
- `app/src/lib/helpers/` - Utility functions
- `app/src/lib/helpers/createKeyMap.ts` - Keyboard shortcuts
#### 3. Runtime Execution
Performs graph execution via WASM nodes.
- **Runtime Executors** (`app/src/lib/runtime/`):
- **MemoryRuntime**: Direct WASM execution in main thread
- **WorkerRuntime**: WebWorker-based execution for performance
- Both implement the RuntimeExecutor interface
- **Runtime Cache**: `app/src/lib/runtime/cache.ts`
- Memory-based caching for graph execution
- **Execution Flow**:
1. Graph serialized from graph interface
2. Runtime executes nodes in topological order
3. Results passed through connected edges
4. Final mesh output rendered
#### 4. 3D Viewer (`app/src/lib/result-viewer/`)
Three.js-based rendering for 3D output.
- **Viewer**: `app/src/lib/result-viewer/Viewer.svelte`
- Renders generated 3D meshes
- Uses @threlte/core (Svelte-Three.js wrapper)
#### 5. Application Structure (`app/src/routes/`)
SvelteKit application routing.
- **Main Page**: `app/src/routes/+page.svelte`
- Combines GraphInterface + 3D Viewer
- Manages runtime selection (memory vs worker)
- Handles settings and performance tracking
- **Layout**: `app/src/routes/+layout.svelte`
- Application shell
- **Server**: `app/src/routes/+layout.server.ts`
- Loads git metadata and changelog
#### 6. Settings System (`app/src/lib/settings/`)
Application and graph settings.
- **App Settings**: `app/src/lib/settings/app-settings.svelte.ts`
- Debug mode, themes, node interface options
- **NestedSettings**: `app/src/lib/settings/NestedSettings.svelte`
- Recursive settings UI component
#### 7. Sidebar Panels (`app/src/lib/sidebar/`)
- `app/src/lib/sidebar/Sidebar.svelte` - Main sidebar
- `app/src/lib/sidebar/panels/` - Individual panels:
- `ActiveNodeSettings.svelte` - Selected node properties
- `BenchmarkPanel.svelte` - Performance benchmarking
- `Changelog.svelte` - Version history
- `ExportSettings.svelte` - Export options
- `GraphSource.svelte` - Graph JSON view
- `Keymap.svelte` - Keyboard shortcuts
#### 8. Project Management (`app/src/lib/project-manager/`)
- `app/src/lib/project-manager/project-manager.svelte` - Project save/load
- Uses IndexedDB for persistence
#### 9. Node Store (`app/src/lib/node-store/`)
- `app/src/lib/node-store/NodeStore.svelte`
- Remote node registry management
- IndexDBCache for offline storage
#### 10. Graph Templates (`app/src/lib/graph-templates/`)
Pre-built graph templates for testing:
- Grid, Tree, LottaFaces, LottaNodes, LottaNodesAndFaces
## Key Types (`app/src/lib/types.ts`)
```typescript ```typescript
// packages/types/src/types.ts interface NodeDefinition {
id: string;
name: string;
inputs: Socket[];
outputs: Socket[];
parameters: Parameter[];
execute: (inputs: any[], parameters: any[]) => any[];
}
type NodeId = `${string}/${string}/${string}`; // e.g. "max/plantarium/stem" interface Socket {
id: string;
name: string;
type: string; // datatype (e.g., "number", "vec3", "*")
defaultValue?: any;
optional?: boolean;
}
type NodeInstance = { interface Parameter {
id: number; id: string;
type: NodeId; name: string;
position: [number, number]; type: string;
props?: Record<string, number | number[]>; // current parameter values defaultValue: any;
meta?: { title?: string; lastModified?: string }; min?: number;
state: NodeRuntimeState; // runtime-only, NOT serialized max?: number;
}; options?: string[];
}
type NodeRuntimeState = { interface Graph {
type?: NodeDefinition; // resolved definition
parents?: NodeInstance[];
children?: NodeInstance[];
x?: number;
y?: number; // interpolated position
mesh?: Mesh; // Three.js mesh reference
ref?: HTMLElement;
};
type NodeDefinition = {
id: NodeId;
inputs?: Record<string, NodeInput>;
outputs?: string[]; // output type names
meta?: { title?: string; description?: string };
execute(input: Int32Array): Int32Array; // WASM function
};
// Edge: [fromNode, outputIndex, toNode, inputSocketName]
type Edge = [NodeInstance, number, NodeInstance, string];
type Graph = {
nodes: NodeInstance[];
edges: [number, number, number, string][]; // serialized (IDs, not refs)
settings: Record<string, unknown>;
groups: GroupDefinition[];
};
type GroupDefinition = {
id: number;
nodes: NodeInstance[]; nodes: NodeInstance[];
edges: Edge[]; edges: Edge[];
inputs?: Record<string, NodeInput>; }
outputs?: string[];
}; interface NodeInstance {
id: number;
nodeId: string;
position: { x: number; y: number };
parameters: Record<string, any>;
}
interface Edge {
id: number;
fromNode: number;
fromSocket: string;
toNode: number;
toSocket: string;
}
``` ```
### NodeInput socket types ## Development Workflow
`float` | `integer` | `boolean` | `select` | `seed` | `vec3` | `geometry` | `path` | `shape` | `color` | `*` (wildcard) ### Prerequisites
Each input can have: `value` (default), `label`, `hidden`, `external`, `setting` (link to graph setting), `accepts` (extra compatible types). - Node.js
- pnpm
- Rust
- wasm-pack
--- ### Build Commands
## Patterns & Conventions
### Svelte 5 reactivity
The codebase uses Svelte 5 runes throughout — `$state`, `$derived`, `$effect`. Collections use `SvelteMap<K,V>` and `SvelteSet<T>` (from `svelte/reactivity`) instead of plain Map/Set so that mutations trigger reactive updates.
### Context API
`GraphManager` and `GraphState` are provided via Svelte context (`setContext` / `getContext`) inside `GraphInterface`. All child components (Node, Edge, etc.) consume them via context rather than props.
### Edge representation
In memory, edges are `[NodeInstance, outputIndex, NodeInstance, inputSocketName]` — direct object references for fast traversal. On serialization (`Graph.edges`), they become `[nodeId, outputIndex, nodeId, inputSocketName]` (plain IDs).
### Socket compatibility
```typescript
areSocketsCompatible(outputType: string, inputType: string | string[]): boolean
// '*' wildcard matches any type; 'geometry' accepts ['geometry', 'instances']
```
### WASM execution interface
Every node exposes a single function: `execute(input: Int32Array): Int32Array`.
Data encoding (Plantarium):
- `[0, stemDepth, ...x,y,z,thickness]` — path
- `[1, vertexCount, faceCount, ...faces, ...vertices, ...normals]` — geometry
- `[2, vertexCount, faceCount, instanceCount, stemDepth, ...]` — instances
### Event emitter
`GraphManager extends EventEmitter<{ save, result, settings }>`. Subscribe with `manager.on('result', cb)`. Used to decouple the editor UI from runtime execution and persistence.
### History
Every mutation goes through `HistoryManager`. Call `this.history.save(this.serialize())` before mutations; undo/redo replays jsondiffpatch deltas.
### Internal node IDs
Built-in nodes use the `__internal/` namespace: `__internal/group/instance`, `__internal/node/debug`. Virtual boundary nodes use `__virtual/`: `__virtual/group/input`, `__virtual/group/output`.
---
## In-Progress: Node Groups (`feat/group-node-own`)
Group selected nodes with **Ctrl+G**. A `GroupDefinition` is stored in `Graph.groups[]`; a group instance node (`__internal/group/instance`) referencing it by `props.groupId` replaces the selected nodes.
**Known gaps as of 2026-05-03:**
| Issue | Location |
| ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------ |
| `createGroupNode()` called but not defined | `graph-state.svelte.ts:334` → missing in `graph-manager.svelte.ts` |
| Runtime expects `group.graph.nodes/edges`; schema has flat `nodes/edges` | `runtime-executor.ts` vs `types.ts` |
| Runtime expects `group.inputs` as array; schema defines it as `Record<string, NodeInput>` | Same mismatch |
| `enterGroupNode()` is a stub — no group navigation | `graph-state.svelte.ts` |
| `serialize()` writes parent-graph edges into group instead of group-internal edges | `graph-manager.svelte.ts` |
---
## Dev Commands
Run from `app/`:
```bash ```bash
npm run dev # start dev server (Vite) # Install dependencies
npm run build # production build pnpm i
npm run check # svelte-check + tsc
npm run lint # eslint # Build WASM nodes
npm run test # unit (vitest) + e2e (playwright) pnpm build:nodes
npm run test:unit # vitest only
npm run test:e2e # playwright only # Start development server
npm run bench # benchmark runner cd app && pnpm dev
# Run tests
cd app && pnpm test
# Lint and typecheck
cd app && pnpm lint
cd app && pnpm check
# Format code
cd app && pnpm format
``` ```
### Creating New Nodes
See `docs/DEVELOPING_NODES.md` for detailed instructions on creating custom WASM nodes.
## Features
### Current Features
- Visual node-based programming with real-time 3D preview
- WebAssembly nodes for high-performance computation
- Debug node with wildcard inputs and runtime integration
- Color-coded node sockets and edges (indicating data types)
- Variable-height nodes and parameters
- Edge dragging with valid socket highlighting
- InputNumber snapping to predefined values (Alt+click)
- Project save/load with IndexedDB
- Performance monitoring and benchmarking
- Changelog viewer
- Advanced mode settings
### UI Components
- **InputNumber**: Numeric input with arrow controls
- **InputColor**: Color picker
- **InputShape**: Shape selector with preview
- **InputSelect**: Dropdown with options
## File Structure
```
nodarium/
├── app/
│ ├── src/
│ │ ├── lib/
│ │ │ ├── config.ts
│ │ │ ├── graph-interface/ # Node editor
│ │ │ ├── graph-manager.svelte.ts
│ │ │ ├── graph-state.svelte.ts
│ │ │ ├── graph-templates/ # Test templates
│ │ │ ├── grid/
│ │ │ ├── helpers/
│ │ │ ├── node-registry.ts
│ │ │ ├── node-registry/ # Node loading
│ │ │ ├── node-store/
│ │ │ ├── performance/
│ │ │ ├── project-manager/
│ │ │ ├── result-viewer/ # 3D viewer
│ │ │ ├── runtime/ # Execution
│ │ │ ├── settings/ # App settings
│ │ │ ├── sidebar/
│ │ │ └── types.ts
│ │ └── routes/
│ │ ├── +page.svelte
│ │ └── +layout.svelte
│ ├── static/
│ │ └── nodes/
│ │ └── max/
│ │ └── plantarium/ # WASM nodes
│ └── package.json
├── docs/
│ ├── ARCHITECTURE.md
│ ├── DEVELOPING_NODES.md
│ ├── NODE_DEFINITION.md
│ └── PLANTARIUM.md
├── nodes/ # WASM node source (Rust)
└── package.json
```
## Release Process
1. Create annotated tag:
```bash
git tag -a v1.0.0 -m "Release notes"
git push origin v1.0.0
```
2. CI workflow:
- Runs lint, format check, type check
- Builds project
- Updates package.json versions
- Generates CHANGELOG.md
- Creates Gitea release
-645
View File
@@ -1,645 +0,0 @@
# Comprehensive UX Practices for Web Applications
## Introduction
This document consolidates many of the most important practical UX principles for modern web applications.
---
# 1. Core UX Principles
## 1.1 Visibility of System Status
Users should always understand:
- What the system is doing
- Whether an action succeeded
- Whether work is still in progress
- Whether an error occurred
### Good Practices
- Show loading indicators immediately
- Show success confirmations after important actions
- Show inline validation messages
- Display progress for long-running tasks
- Use skeleton loading states instead of blank screens
- Prevent silent failures
- Avoid ambiguous UI states
### Bad Practices
- Buttons with no feedback after clicking
- Infinite spinners without explanation
- Hidden background operations
- Saving without visible confirmation
---
## 1.2 Predictability and Consistency
Users build mental models quickly.
Breaking established expectations increases cognitive load and causes mistakes.
### Good Practices
- Use consistent layouts
- Keep interaction patterns stable
- Reuse common UI conventions
- Keep naming and terminology consistent
- Use standard keyboard shortcuts
- Make similar components behave similarly
### Bad Practices
- Different button styles for identical actions
- Inconsistent navigation behavior
- Custom controls that ignore platform conventions
- Unexpected modal behavior
---
## 1.3 Recognition Over Recall
Interfaces should minimize memory requirements.
Users should recognize options instead of remembering information.
### Good Practices
- Show recent searches
- Use autocomplete
- Display contextual hints
- Preserve previously entered values
- Use visible labels
- Keep important actions visible
### Bad Practices
- Placeholder-only labels
- Hidden functionality
- Requiring users to remember previous state
- Removing useful context during workflows
---
## 1.4 Error Prevention
Preventing mistakes is better than handling mistakes.
### Good Practices
- Disable impossible actions
- Validate input early
- Warn before destructive operations
- Use constrained input formats
- Use safe defaults
- Prefer undo over confirmation dialogs
### Bad Practices
- Destructive actions near common actions
- Easy accidental deletion
- Poor validation timing
- Irreversible operations without recovery
---
# 2. Input and Form UX
Forms are one of the most important and failure-prone areas in web applications.
---
## 2.1 Input Focus Behavior
### Good Practices
- Autofocus the primary field when appropriate
- Preserve focus during rerenders
- Preserve cursor position
- Support keyboard-first workflows
- Use logical tab ordering
### Auto-Selecting Input Text
Auto-selecting text on focus is context-dependent.
### Good Use Cases
- Quantity fields
- Rename dialogs
- Editable defaults
- Quick replacement workflows
- Temporary values users often replace entirely
### Bad Use Cases
- Long textareas
- Complex text editing
- Fields users commonly partially edit
- Rich text editing
### Principle
Only auto-select when full replacement is more likely than partial editing.
---
## 2.2 Labels and Placeholders
### Good Practices
- Always use visible labels
- Use placeholders only as supplementary examples
- Keep labels visible after typing
- Associate labels correctly for accessibility
### Bad Practices
- Placeholder-only forms
- Ambiguous labels
- Labels that disappear during editing
---
## 2.3 Validation
### Recommended Validation Timing
| Validation Type | Timing |
| ------------------- | --------- |
| Format validation | Immediate |
| Semantic validation | On blur |
| Server validation | On submit |
### Good Practices
- Show errors near the relevant field
- Explain how to fix issues
- Preserve entered values after errors
- Validate incrementally
- Use clear language
### Bad Practices
- Generic “Invalid input” messages
- Clearing form data after errors
- Delayed validation surprises
- Validation that interrupts typing
---
## 2.4 Input Types
### Good Practices
Use appropriate HTML input types:
- `email`
- `tel`
- `number`
- `date`
- `password`
- `search`
### Benefits
- Better mobile keyboards
- Native validation
- Improved accessibility
- Better autofill support
---
## 2.5 Form Submission
### Good Practices
- Enter submits forms when expected
- Escape cancels dialogs
- Show loading states during submission
- Prevent duplicate submissions
- Preserve draft state
- Allow keyboard submission
### Bad Practices
- Disabled submit buttons without explanation
- Hidden validation failures
- Silent submission failures
---
## 2.6 Dropdowns and Selection UX
### Good Practices
- Use radio buttons for small option sets
- Use searchable selects for large datasets
- Prefer autocomplete for many options
- Show selected state clearly
### Bad Practices
- Massive unsearchable dropdowns
- Nested dropdown hierarchies
- Multi-select controls without search
---
# 3. Navigation UX
---
## 3.1 Orientation
Users should always know:
- Where they are
- How they got there
- What they can do next
- How to go back
### Good Practices
- Highlight active navigation
- Use breadcrumbs when helpful
- Use meaningful page titles
- Preserve navigation consistency
---
## 3.2 Navigation Structure
### Good Practices
- Keep hierarchy shallow
- Group related actions
- Use descriptive names
- Keep primary actions stable
### Bad Practices
- Deep nesting
- Ambiguous navigation labels
- Constantly moving actions
---
## 3.3 URL Design
### Good Practices
- Use readable URLs
- Make URLs shareable
- Preserve app state in URLs when useful
- Support browser history correctly
### Bad Practices
- Opaque generated URLs
- Broken back button behavior
- Losing state during navigation
---
# 4. Interaction Design
---
## 4.1 Click Targets
### Good Practices
- Large clickable areas
- Adequate spacing between actions
- Clear hover/focus states
- Touch-friendly sizing
### Bad Practices
- Tiny clickable regions
- Overlapping interactive elements
- Hidden hit areas
---
## 4.2 Feedback
Every interaction should produce feedback.
### Good Practices
- Hover states
- Active states
- Loading indicators
- Success states
- Error states
- Optimistic updates when appropriate
### Bad Practices
- Dead-feeling interfaces
- Invisible processing
- Delayed reactions
---
## 4.3 Destructive Actions
### Good Practices
- Require confirmation for dangerous actions
- Prefer undo systems
- Visually distinguish destructive buttons
- Separate destructive actions spatially
### Bad Practices
- Immediate irreversible deletion
- Dangerous actions near common actions
- Ambiguous destructive wording
---
## 4.4 Modal UX
### Good Practices
- Trap keyboard focus
- Support Escape to close
- Restore focus after closing
- Prevent background interaction
- Keep modal purpose focused
### Bad Practices
- Nested modals
- Full workflows inside modals
- Losing unsaved work accidentally
---
# 5. Performance UX
Performance is a UX feature.
Users interpret slowness as unreliability.
---
## 5.1 Perceived Performance
### Good Practices
- Show immediate visual response
- Use optimistic UI updates
- Preload likely next content
- Stream content progressively
- Use skeleton loaders
### Bad Practices
- Blank screens during loading
- Long blocking operations
- Frozen interfaces
---
## 5.2 Layout Stability
### Good Practices
- Prevent layout shift
- Reserve image dimensions
- Avoid moving buttons during loading
- Keep skeletons aligned with final layout
### Bad Practices
- Jumping content
- Shifting controls
- Reflow-heavy rendering
---
## 5.3 Responsiveness
### Good Practices
- Keep UI interactive during async operations
- Avoid blocking the main thread
- Debounce expensive operations
- Virtualize large lists
### Bad Practices
- UI freezes
- Excessive rerenders
- Laggy typing experiences
---
# 6. Accessibility
Accessibility improves usability for everyone.
---
## 6.1 Keyboard Accessibility
### Good Practices
- Full keyboard navigation
- Visible focus indicators
- Logical tab order
- Keyboard shortcuts for power users
### Bad Practices
- Mouse-only workflows
- Hidden focus state
- Keyboard traps
---
## 6.2 Semantic HTML
### Good Practices
- Use proper semantic elements
- Use buttons for actions
- Use links for navigation
- Use headings correctly
### Bad Practices
- Clickable divs without accessibility support
- Fake buttons
- Missing semantic structure
---
## 6.3 Visual Accessibility
### Good Practices
- Sufficient color contrast
- Support reduced motion
- Avoid color-only communication
- Use scalable typography
### Bad Practices
- Tiny text
- Low contrast interfaces
- Flashing animations
---
## 6.4 Screen Reader Support
### Good Practices
- Proper labels
- Meaningful alt text
- ARIA only when necessary
- Correct live regions for updates
### Bad Practices
- Unlabeled controls
- Excessive ARIA misuse
- Non-announced state changes
---
# 7. Enterprise Application UX
Enterprise UX differs significantly from marketing-oriented consumer interfaces.
Power users often prioritize efficiency over visual minimalism.
---
## 7.1 Dense Information Design
### Good Practices
- Efficient data density
- Resizable tables
- Sticky headers
- Multi-column layouts
- High information throughput
### Bad Practices
- Excessive whitespace
- Oversimplified dashboards
- Hidden operational controls
---
## 7.2 Table UX
### Good Practices
- Sorting
- Filtering
- Column resizing
- Pagination or virtualization
- Keyboard navigation
- Export functionality
- Persistent user preferences
### Bad Practices
- Non-sortable enterprise tables
- Horizontal scrolling nightmares
- Missing filtering
---
## 7.3 Power User Workflows
### Good Practices
- Keyboard shortcuts
- Bulk actions
- Batch editing
- Command palettes
- State persistence
- Fast navigation
### Bad Practices
- Forced wizard workflows
- Excessive confirmations
- Repetitive manual work
---
# 8. Mobile UX
---
## 8.1 Touch Design
### Good Practices
- Large touch targets
- Thumb-friendly layouts
- Avoid hover dependencies
- Mobile-friendly spacing
### Bad Practices
- Tiny controls
- Hover-only interactions
- Precision-dependent gestures
---
## 8.2 Mobile Forms
### Good Practices
- Mobile keyboard optimization
- Minimal typing
- Autofill support
- Step-by-step flows when necessary
### Bad Practices
- Long complex forms
- Tiny input fields
- Excessive required typing
---
# 9. Cognitive Psychology and UX
---
## 9.1 Hicks Law
More choices increase decision time.
### Applications
- Reduce unnecessary options
- Group related actions
- Prioritize primary actions
---
## 9.2 Fittss Law
Closer and larger targets are easier to use.
### Applications
- Large primary buttons
- Edge/corner placement for important actions
@@ -83,14 +83,6 @@
"min": 0, "min": 0,
"max": 360, "max": 360,
"step": 0.01, "step": 0.01,
"value": 137.5
},
"angle": {
"type": "float",
"description": "Upward tilt of branches. 0 = horizontal, positive = upward, negative = drooping.",
"min": -90,
"max": 90,
"step": 1,
"value": 0 "value": 0
} }
} }
+1 -3
View File
@@ -78,9 +78,7 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
continue; continue;
} }
let up_angle = evaluate_float(args[10]) * PI / 180.0; let branch_direction = rotate_vector_by_angle(orthogonal, direction, rotation_angle);
let tilted = (orthogonal * up_angle.cos() + direction * up_angle.sin()).normalize();
let branch_direction = rotate_vector_by_angle(tilted, direction, rotation_angle);
log!( log!(
"BRANCH depth: {}, branch_origin: {:?}, direction_at: {:?}, branch_direction: {:?}", "BRANCH depth: {}, branch_origin: {:?}, direction_at: {:?}, branch_direction: {:?}",
+7 -16
View File
@@ -13,28 +13,19 @@
"max": 1, "max": 1,
"value": 1 "value": 1
}, },
"curviness": {
"type": "float",
"hidden": true,
"min": 0,
"max": 1,
"value": 0.5
},
"depth": { "depth": {
"type": "integer", "type": "integer",
"min": 1, "min": 1,
"max": 10, "max": 10,
"hidden": true, "hidden": true,
"value": 1 "value": 1
},
"elasticity": {
"type": "float",
"description": "How rigid the stem is. 0 = rope (uniform droop), 1 = stiff rod (only the tip bends).",
"min": 0,
"max": 1,
"step": 0.05,
"value": 0.3
},
"mode": {
"type": "select",
"internal": true,
"label": "Mode",
"options": ["closed-form", "chain"],
"hidden": true,
"description": "closed-form lerps each segment toward gravity; chain is a forward-kinematic cantilever where each segment rotates by an angle that grows along the stem."
} }
} }
} }
+31 -109
View File
@@ -20,11 +20,7 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
let args = split_args(input); let args = split_args(input);
let plants = split_args(args[0]); let plants = split_args(args[0]);
let depth = evaluate_int(args[2]); let depth = evaluate_int(args[3]);
let elasticity = evaluate_float(args[3]).clamp(0.0, 1.0);
let mode = evaluate_int(args[4]); // 0 = closed-form, 1 = verlet
// 0 → sqrt (rope), 1 → ~4.5 (only the tip droops)
let bend_exponent = 0.5 + elasticity * 4.0;
let mut max_depth = 0; let mut max_depth = 0;
for path_data in plants.iter() { for path_data in plants.iter() {
@@ -46,124 +42,50 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
let mut output_data = path_data.clone(); let mut output_data = path_data.clone();
let output = wrap_path_mut(&mut output_data); let output = wrap_path_mut(&mut output_data);
if mode == 1 { let mut offset_vec = Vec3::ZERO;
// Forward-kinematic cantilever chain. Each segment rotates around
// an axis perpendicular to (rest_dir, gravity) by an angle that
// grows with alpha along the stem. Positions are built from the
// anchored base outward, so segment lengths are preserved by
// construction (no iteration, no rescaling, no oscillation).
let raw_strength = evaluate_float(args[1]); for i in 0..path.length - 1 {
let gravity_dir = Vec3::new(0.0, -1.0, 0.0); let alpha = i as f32 / (path.length - 1) as f32;
let start_index = i * 4;
// Tip bend angle in radians. PI/2 = horizontal tip at strength=1. let start_point = Vec3::from_slice(&path.points[start_index..start_index + 3]);
let max_angle = raw_strength * std::f32::consts::FRAC_PI_2; let end_point = Vec3::from_slice(&path.points[start_index + 4..start_index + 7]);
let original: Vec<Vec3> = (0..path.length) let direction = end_point - start_point;
.map(|i| {
let s = i * 4;
Vec3::from_slice(&path.points[s..s + 3])
})
.collect();
let seg_lens: Vec<f32> = (0..path.length - 1) let length = direction.length();
.map(|i| (original[i + 1] - original[i]).length())
.collect();
let rest_dirs: Vec<Vec3> = (0..path.length - 1)
.map(|i| {
let d = original[i + 1] - original[i];
let l = d.length();
if l > 0.0001 { d / l } else { Vec3::Y }
})
.collect();
let mut cur = vec![Vec3::ZERO; path.length]; let curviness = evaluate_float(args[2]);
cur[0] = original[0]; let strength =
evaluate_float(args[1]) / curviness.max(0.0001) * evaluate_float(args[1]);
for i in 1..path.length { log!(
let seg_idx = i - 1; "length: {}, curviness: {}, strength: {}",
let alpha = if path.length > 2 { length,
seg_idx as f32 / (path.length - 2) as f32 curviness,
} else { strength
1.0 );
};
let bend_angle = max_angle * alpha.powf(bend_exponent);
let rest_dir = rest_dirs[seg_idx]; let down_point = Vec3::new(0.0, -length * strength, 0.0);
let mut bend_axis = rest_dir.cross(gravity_dir);
let axis_len = bend_axis.length();
bend_axis = if axis_len > 0.0001 {
bend_axis / axis_len
} else {
// rest_dir parallel to gravity — pick an arbitrary
// perpendicular axis to break symmetry.
Vec3::X
};
// Rodrigues' rotation formula let mut mid_point = lerp_vec3(direction, down_point, curviness * alpha.sqrt());
let (sin_a, cos_a) = bend_angle.sin_cos();
let bent_dir = rest_dir * cos_a
+ bend_axis.cross(rest_dir) * sin_a
+ bend_axis * bend_axis.dot(rest_dir) * (1.0 - cos_a);
cur[i] = cur[i - 1] + bent_dir * seg_lens[seg_idx]; if mid_point[0] == 0.0 && mid_point[2] == 0.0 {
mid_point[0] += 0.0001;
mid_point[2] += 0.0001;
} }
for i in 0..path.length { // Correct midpoint length
let s = i * 4; mid_point *= length / mid_point.length();
output.points[s] = cur[i].x;
output.points[s + 1] = cur[i].y;
output.points[s + 2] = cur[i].z;
}
} else {
// Closed-form: per-segment lerp toward a downward vector
let mut offset_vec = Vec3::ZERO;
for i in 0..path.length - 1 { let final_end_point = start_point + mid_point;
let alpha = i as f32 / (path.length - 1) as f32; let offset_end_point = end_point + offset_vec;
let start_index = i * 4;
let start_point = Vec3::from_slice(&path.points[start_index..start_index + 3]); output.points[start_index + 4] = offset_end_point[0];
let end_point = output.points[start_index + 5] = offset_end_point[1];
Vec3::from_slice(&path.points[start_index + 4..start_index + 7]); output.points[start_index + 6] = offset_end_point[2];
let direction = end_point - start_point; offset_vec += final_end_point - end_point;
let length = direction.length();
let curviness = elasticity.max(0.0001);
let strength_arg = evaluate_float(args[1]) * 10.0;
let strength = strength_arg / curviness * strength_arg;
log!(
"length: {}, curviness: {}, strength: {}",
length,
curviness,
strength
);
let down_point = Vec3::new(0.0, -length * strength, 0.0);
let mut mid_point =
lerp_vec3(direction, down_point, curviness * alpha.powf(bend_exponent));
if mid_point[0] == 0.0 && mid_point[2] == 0.0 {
mid_point[0] += 0.0001;
mid_point[2] += 0.0001;
}
// Correct midpoint length
mid_point *= length / mid_point.length();
let final_end_point = start_point + mid_point;
let offset_end_point = end_point + offset_vec;
output.points[start_index + 4] = offset_end_point[0];
output.points[start_index + 5] = offset_end_point[1];
output.points[start_index + 6] = offset_end_point[2];
offset_vec += final_end_point - end_point;
}
} }
output_data output_data
}) })
-1
View File
@@ -8,6 +8,5 @@ edition = "2018"
crate-type = ["cdylib", "rlib"] crate-type = ["cdylib", "rlib"]
[dependencies] [dependencies]
glam = "0.30.10"
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
-27
View File
@@ -19,33 +19,6 @@
"max": 64, "max": 64,
"value": 1, "value": 1,
"hidden": true "hidden": true
},
"yCurve": {
"type": "float",
"description": "Curl the leaf upward along its length (radians). 0 = flat, ~1.57 = 90° tip curl.",
"min": -3.14,
"max": 3.14,
"step": 0.05,
"value": 0,
"hidden": true
},
"yTwist": {
"type": "float",
"description": "Twist around the leaf's spine. Combined with yCurve, produces a 3D spiral.",
"min": -6.28,
"max": 6.28,
"step": 0.05,
"value": 0,
"hidden": true
},
"xCurve": {
"type": "float",
"description": "Curl each cross-section into an arc, mirrored around the midrib. 0 = flat, ~1.57 = U-shape.",
"min": -3.14,
"max": 3.14,
"step": 0.05,
"value": 0,
"hidden": true
} }
} }
} }
+9 -83
View File
@@ -1,7 +1,6 @@
use std::convert::TryInto; use std::convert::TryInto;
use std::f32::consts::PI; use std::f32::consts::PI;
use glam::Vec3;
use nodarium_macros::nodarium_definition_file; use nodarium_macros::nodarium_definition_file;
use nodarium_macros::nodarium_execute; use nodarium_macros::nodarium_execute;
use nodarium_utils::encode_float; use nodarium_utils::encode_float;
@@ -43,9 +42,6 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
let input_path = split_args(args[0])[0]; let input_path = split_args(args[0])[0];
let size = evaluate_float(args[1]); let size = evaluate_float(args[1]);
let width_resolution = evaluate_int(args[2]).max(3) as usize; let width_resolution = evaluate_int(args[2]).max(3) as usize;
let y_curve = evaluate_float(args[3]);
let y_twist = evaluate_float(args[4]);
let x_curve = evaluate_float(args[5]);
let path_length = (input_path.len() - 4) / 2; let path_length = (input_path.len() - 4) / 2;
let slice_count = path_length; let slice_count = path_length;
@@ -97,97 +93,27 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
// Writing Positions // Writing Positions
let width = 50.0; let width = 50.0;
let leaf_length: f32 = 100.0;
let mut positions = vec![[0.0f32; 3]; position_amount]; let mut positions = vec![[0.0f32; 3]; position_amount];
// Pre-compute a local frame (center, normal=local-Y, binormal=local-X) for
// each slice by walking the FK chain. At each step we bend around the
// current binormal (curls the leaf) and twist around the current tangent
// (rotates the bend plane → spiral).
let segs = (slice_count - 1).max(1) as f32;
let bend_per_step = y_curve / segs;
let twist_per_step = y_twist / segs;
let mut centers: Vec<Vec3> = Vec::with_capacity(slice_count);
let mut frame_n: Vec<Vec3> = Vec::with_capacity(slice_count);
let mut frame_b: Vec<Vec3> = Vec::with_capacity(slice_count);
let mut tangent = Vec3::new(0.0, 0.0, 1.0);
let mut normal = Vec3::new(0.0, 1.0, 0.0);
let mut binormal = Vec3::new(1.0, 0.0, 0.0);
let pz_first = decode_float(input_path[2 + 1]);
let mut center = Vec3::new(0.0, 0.0, pz_first - leaf_length);
for i in 0..slice_count { for i in 0..slice_count {
centers.push(center); let ax = i as f32 / (slice_count -1) as f32;
frame_n.push(normal);
frame_b.push(binormal);
if i + 1 < slice_count {
let pz_curr = decode_float(input_path[2 + i * 2 + 1]);
let pz_next = decode_float(input_path[2 + (i + 1) * 2 + 1]);
let seg_len = pz_next - pz_curr;
center = center + tangent * seg_len;
// Bend around binormal — tilts tangent toward normal
let (sin_b, cos_b) = bend_per_step.sin_cos();
let new_t = tangent * cos_b + normal * sin_b;
let new_n = -tangent * sin_b + normal * cos_b;
tangent = new_t;
normal = new_n;
// Twist around tangent — rotates normal/binormal so the next bend
// happens in a rotated plane
let (sin_tw, cos_tw) = twist_per_step.sin_cos();
let new_n2 = normal * cos_tw + binormal * sin_tw;
let new_b = -normal * sin_tw + binormal * cos_tw;
normal = new_n2;
binormal = new_b;
}
}
for i in 0..slice_count {
let ax = i as f32 / segs;
let px = decode_float(input_path[2 + i * 2 + 0]); let px = decode_float(input_path[2 + i * 2 + 0]);
let hw = width - px; // half-width at this slice let pz = decode_float(input_path[2 + i * 2 + 1]);
let c = centers[i];
let n = frame_n[i];
let b = frame_b[i];
for j in 0..width_resolution { for j in 0..width_resolution {
let alpha = j as f32 / (width_resolution - 1) as f32; let alpha = j as f32 / (width_resolution - 1) as f32;
// Signed cross-section parameter, -1 (left edge) → +1 (right edge) let x = 2.0 * (-px * (alpha - 0.5) + alpha * width);
let t = 2.0 * alpha - 1.0; let py = calculate_y(alpha-0.5)*5.0*(ax*PI).sin();
let py_local = calculate_y(alpha - 0.5) * 5.0 * (ax * PI).sin(); let pz_val = pz - 100.0;
// X-curl: each cross-section traces a circular arc with curvature
// x_curve / hw. Because theta = x_curve * t is signed around the
// midrib, sin/cos give a mirrored arc (left and right edges curl
// the same direction).
let theta = x_curve * t;
let (sin_t, cos_t) = theta.sin_cos();
let (b_arc, n_arc) = if x_curve.abs() < 0.0001 {
(t * hw, 0.0)
} else {
let r = hw / x_curve;
(r * sin_t, r * (1.0 - cos_t))
};
// Cross-section bulge follows the rotated local frame
let b_total = b_arc - py_local * sin_t;
let n_total = n_arc + py_local * cos_t;
let world = c + b * b_total + n * n_total;
let pos_idx = i * width_resolution + j; let pos_idx = i * width_resolution + j;
positions[pos_idx] = [world.x, world.y, world.z]; positions[pos_idx] = [x - width, py, pz_val];
let flat_idx = offset + pos_idx * 3; let flat_idx = offset + pos_idx * 3;
out[flat_idx + 0] = encode_float(world.x * size); out[flat_idx + 0] = encode_float((x - width) * size);
out[flat_idx + 1] = encode_float(world.y * size); out[flat_idx + 1] = encode_float(py * size);
out[flat_idx + 2] = encode_float(world.z * size); out[flat_idx + 2] = encode_float(pz_val * size);
} }
} }
-1
View File
@@ -8,7 +8,6 @@ edition = "2018"
crate-type = ["cdylib", "rlib"] crate-type = ["cdylib", "rlib"]
[dependencies] [dependencies]
glam = "0.30.10"
nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" } nodarium_macros = { version = "0.1.0", path = "../../../../packages/macros" }
nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" } nodarium_utils = { version = "0.1.0", path = "../../../../packages/utils" }
noise = "0.9.0" noise = "0.9.0"
+3 -9
View File
@@ -15,9 +15,9 @@
}, },
"strength": { "strength": {
"type": "float", "type": "float",
"min": 0, "min": 0.1,
"max": 1, "max": 10,
"value": 0.5 "value": 2
}, },
"fixBottom": { "fixBottom": {
"type": "float", "type": "float",
@@ -52,12 +52,6 @@
"max": 5, "max": 5,
"value": 1, "value": 1,
"hidden": true "hidden": true
},
"preserveLength": {
"type": "boolean",
"label": "Preserve length",
"value": true,
"hidden": true
} }
} }
} }
+11 -71
View File
@@ -1,4 +1,3 @@
use glam::Vec3;
use nodarium_macros::nodarium_definition_file; use nodarium_macros::nodarium_definition_file;
use nodarium_macros::nodarium_execute; use nodarium_macros::nodarium_execute;
use nodarium_utils::{ use nodarium_utils::{
@@ -31,7 +30,6 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
let depth = evaluate_int(args[6]); let depth = evaluate_int(args[6]);
let octaves = evaluate_int(args[7]); let octaves = evaluate_int(args[7]);
let preserve_length = evaluate_int(args[8]) != 0;
let noise_x: HybridMulti<OpenSimplex> = let noise_x: HybridMulti<OpenSimplex> =
HybridMulti::new(seed as u32 + 1).set_octaves(octaves as usize); HybridMulti::new(seed as u32 + 1).set_octaves(octaves as usize);
@@ -67,82 +65,24 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
let length = path.get_length() as f64; let length = path.get_length() as f64;
if preserve_length { for i in 0..path.length {
// Snapshot original positions so we can derive each segment's original let a = i as f64 / (path.length - 1) as f64;
// direction even after we've modified earlier points.
let orig: Vec<f32> = path.points[..path.length * 4].to_vec();
// Anchor the base (fix_bottom=1 → scale=0, no displacement at root) let px = j as f64 + a * length * scale;
let scale0 = lerp(1.0, 0.0, fix_bottom); let py = a * scale as f64;
path.points[0] += noise_x.get([j as f64, 0.0]) as f32
path.points[i * 4] += noise_x.get([px, py]) as f32
* directional_strength[0] * directional_strength[0]
* strength * strength
* scale0; * lerp(1.0, a as f32, fix_bottom);
path.points[1] += noise_y.get([j as f64, 0.0]) as f32 path.points[i * 4 + 1] += noise_y.get([px, py]) as f32
* directional_strength[1] * directional_strength[1]
* strength * strength
* scale0; * lerp(1.0, a as f32, fix_bottom);
path.points[2] += noise_z.get([j as f64, 0.0]) as f32 path.points[i * 4 + 2] += noise_z.get([px, py]) as f32
* directional_strength[2] * directional_strength[2]
* strength * strength
* scale0; * lerp(1.0, a as f32, fix_bottom);
let mut prev = Vec3::new(path.points[0], path.points[1], path.points[2]);
for i in 1..path.length {
let a = i as f64 / (path.length - 1) as f64;
let px = j as f64 + a * length * scale;
let py = a * scale as f64;
let sf = lerp(1.0, a as f32, fix_bottom);
let orig_dir = Vec3::new(
orig[i * 4] - orig[(i - 1) * 4],
orig[i * 4 + 1] - orig[(i - 1) * 4 + 1],
orig[i * 4 + 2] - orig[(i - 1) * 4 + 2],
);
let orig_len = orig_dir.length();
let perturb = Vec3::new(
noise_x.get([px, py]) as f32 * directional_strength[0] * strength * sf,
noise_y.get([px, py]) as f32 * directional_strength[1] * strength * sf,
noise_z.get([px, py]) as f32 * directional_strength[2] * strength * sf,
);
// Perturb the original direction and rescale to original length.
// Biasing toward orig_dir prevents the segment from folding back.
let mut new_dir = orig_dir + perturb;
let nd_len = new_dir.length();
if nd_len > 0.0001 && orig_len > 0.0001 {
new_dir *= orig_len / nd_len;
} else {
new_dir = orig_dir;
}
let cur = prev + new_dir;
path.points[i * 4] = cur.x;
path.points[i * 4 + 1] = cur.y;
path.points[i * 4 + 2] = cur.z;
prev = cur;
}
} else {
for i in 0..path.length {
let a = i as f64 / (path.length - 1) as f64;
let px = j as f64 + a * length * scale;
let py = a * scale as f64;
let sf = lerp(1.0, a as f32, fix_bottom);
path.points[i * 4] += noise_x.get([px, py]) as f32
* directional_strength[0]
* strength
* sf;
path.points[i * 4 + 1] += noise_y.get([px, py]) as f32
* directional_strength[1]
* strength
* sf;
path.points[i * 4 + 2] += noise_z.get([px, py]) as f32
* directional_strength[2]
* strength
* sf;
}
} }
path_data path_data
}) })
+1 -1
View File
@@ -29,7 +29,7 @@
"type": "boolean", "type": "boolean",
"internal": true, "internal": true,
"hidden": true, "hidden": true,
"value": false, "value": true,
"description": "If multiple objects are connected, should we rotate them as one or spread them?" "description": "If multiple objects are connected, should we rotate them as one or spread them?"
} }
} }
+2 -3
View File
@@ -6,8 +6,7 @@
"qa": "pnpm lint && pnpm check && pnpm test", "qa": "pnpm lint && pnpm check && pnpm test",
"format": "pnpm dprint fmt", "format": "pnpm dprint fmt",
"format:check": "pnpm dprint check", "format:check": "pnpm dprint check",
"test:e2e": "pnpm run -r --parallel test:e2e", "test": "pnpm run -r --parallel test",
"test:unit": "pnpm run -r --parallel test:unit",
"check": "pnpm run -r --parallel check", "check": "pnpm run -r --parallel check",
"build": "pnpm build:nodes && pnpm build:app", "build": "pnpm build:nodes && pnpm build:app",
"build:app": "BASE_PATH=/ui pnpm -r --filter 'ui' build && pnpm -r --filter 'app'... build", "build:app": "BASE_PATH=/ui pnpm -r --filter 'ui' build && pnpm -r --filter 'app'... build",
@@ -20,6 +19,6 @@
"packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316", "packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316",
"devDependencies": { "devDependencies": {
"chokidar-cli": "catalog:", "chokidar-cli": "catalog:",
"dprint": "^0.54.0" "dprint": "^0.51.1"
} }
} }
+19 -19
View File
@@ -1,6 +1,6 @@
{ {
"name": "@nodarium/planty", "name": "@nodarium/planty",
"version": "0.0.6", "version": "0.0.1",
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
"build": "vite build", "build": "vite build",
@@ -10,8 +10,8 @@
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "eslint .", "lint": "eslint .",
"format": "dprint fmt -c '../../.dprint.jsonc' .", "format": "dprint fmt -c '../.dprint.jsonc' .",
"format:check": "dprint check -c '../../.dprint.jsonc' ." "format:check": "dprint check -c '../.dprint.jsonc' ."
}, },
"files": [ "files": [
"dist", "dist",
@@ -34,29 +34,29 @@
"svelte": "^5.0.0" "svelte": "^5.0.0"
}, },
"devDependencies": { "devDependencies": {
"@eslint/compat": "^2.0.5",
"@eslint/js": "^10.0.1",
"@nodarium/ui": "workspace:*", "@nodarium/ui": "workspace:*",
"@eslint/compat": "^2.0.4",
"@eslint/js": "^10.0.1",
"@sveltejs/adapter-auto": "^7.0.1", "@sveltejs/adapter-auto": "^7.0.1",
"@sveltejs/kit": "^2.59.0", "@sveltejs/kit": "^2.57.0",
"@sveltejs/package": "^2.5.7", "@sveltejs/package": "^2.5.7",
"@sveltejs/vite-plugin-svelte": "^7.0.0", "@sveltejs/vite-plugin-svelte": "^7.0.0",
"@tailwindcss/vite": "^4.2.4", "@tailwindcss/vite": "^4.2.2",
"@types/node": "^25.6.0", "@types/node": "^24",
"eslint": "^10.3.0", "eslint": "^10.2.0",
"eslint-config-prettier": "^10.1.8", "eslint-config-prettier": "^10.1.8",
"eslint-plugin-svelte": "^3.17.1", "eslint-plugin-svelte": "^3.17.0",
"globals": "^17.6.0", "globals": "^17.4.0",
"prettier": "^3.8.3", "prettier": "^3.8.1",
"prettier-plugin-svelte": "^3.5.1", "prettier-plugin-svelte": "^3.5.1",
"prettier-plugin-tailwindcss": "^0.8.0", "prettier-plugin-tailwindcss": "^0.7.2",
"publint": "^0.3.18", "publint": "^0.3.18",
"svelte": "^5.55.5", "svelte": "^5.55.2",
"svelte-check": "^4.4.7", "svelte-check": "^4.4.6",
"tailwindcss": "^4.2.4", "tailwindcss": "^4.2.2",
"typescript": "^6.0.3", "typescript": "^6.0.2",
"typescript-eslint": "^8.59.1", "typescript-eslint": "^8.58.1",
"vite": "^8.0.10" "vite": "^8.0.7"
}, },
"keywords": [ "keywords": [
"svelte" "svelte"
+1
View File
@@ -9,6 +9,7 @@
"skipLibCheck": true, "skipLibCheck": true,
"sourceMap": true, "sourceMap": true,
"strict": true, "strict": true,
"module": "NodeNext",
"moduleResolution": "bundler" "moduleResolution": "bundler"
} }
} }
+3 -3
View File
@@ -1,6 +1,6 @@
{ {
"name": "@nodarium/types", "name": "@nodarium/types",
"version": "0.0.6", "version": "0.0.5",
"description": "", "description": "",
"type": "module", "type": "module",
"main": "src/index.ts", "main": "src/index.ts",
@@ -18,9 +18,9 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"zod": "^4.4.3" "zod": "^4.3.6"
}, },
"devDependencies": { "devDependencies": {
"dprint": "^0.54.0" "dprint": "^0.51.1"
} }
} }
+3 -3
View File
@@ -4,13 +4,13 @@ export type {
Box, Box,
Edge, Edge,
Graph, Graph,
GroupDefinition, GroupSocket,
NodeDefinition, NodeDefinition,
NodeGroupDefinition,
NodeId, NodeId,
NodeInstance, NodeInstance,
SerializedEdge,
SerializedNode, SerializedNode,
Socket Socket
} from './types'; } from './types';
export { GraphSchema, GroupSchema, NodeSchema } from './types'; export { GraphSchema, NodeSchema } from './types';
export { NodeDefinitionSchema } from './types'; export { NodeDefinitionSchema } from './types';
+3 -4
View File
@@ -61,10 +61,8 @@ export const NodeInputBooleanSchema = z.object({
export const NodeInputSelectSchema = z.object({ export const NodeInputSelectSchema = z.object({
...DefaultOptionsSchema.shape, ...DefaultOptionsSchema.shape,
type: z.literal('select'), type: z.literal('select'),
options: z.array( options: z.array(z.string()).optional(),
z.union([z.string(), z.object({ value: z.number(), label: z.string() })]) value: z.string().optional()
).optional(),
value: z.union([z.string(), z.number()]).optional()
}); });
export const NodeInputSeedSchema = z.object({ export const NodeInputSeedSchema = z.object({
@@ -105,6 +103,7 @@ export const NodeInputSchema = z.union([
NodeInputIntegerSchema, NodeInputIntegerSchema,
NodeInputShapeSchema, NodeInputShapeSchema,
NodeInputSelectSchema, NodeInputSelectSchema,
NodeInputSeedSchema,
NodeInputVec3Schema, NodeInputVec3Schema,
NodeInputGeometrySchema, NodeInputGeometrySchema,
NodeInputPathSchema, NodeInputPathSchema,
+26 -17
View File
@@ -51,7 +51,7 @@ export const NodeSchema = z.object({
id: z.number(), id: z.number(),
type: NodeIdSchema, type: NodeIdSchema,
props: z props: z
.record(z.string(), z.union([z.number(), z.array(z.number())])) .record(z.string(), z.union([z.number(), z.array(z.number()), z.string()]))
.optional(), .optional(),
meta: z meta: z
.object({ .object({
@@ -76,24 +76,33 @@ export type Socket = {
export type Edge = [NodeInstance, number, NodeInstance, string]; export type Edge = [NodeInstance, number, NodeInstance, string];
const SerializedEdgeSchema = z.tuple([z.number(), z.number(), z.number(), z.string()]); export type GroupSocket = {
name: string;
type: string;
};
export type SerializedEdge = z.infer<typeof SerializedEdgeSchema>; export type NodeGroupDefinition = {
id: string;
name: string;
inputs: GroupSocket[];
outputs: GroupSocket[];
graph: {
nodes: SerializedNode[];
edges: [number, number, number, string][];
};
};
export const GroupSchema = z.object({ const NodeGroupDefinitionSchema: z.ZodType<NodeGroupDefinition> = z.object({
id: z.number(), id: z.string(),
name: z.string().optional(), name: z.string(),
nodes: z.array(NodeSchema), inputs: z.array(z.object({ name: z.string(), type: z.string() })),
edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()])), outputs: z.array(z.object({ name: z.string(), type: z.string() })),
inputs: z.record(z.string(), NodeInputSchema).optional(), graph: z.object({
outputs: z.array(z.object({ nodes: z.array(NodeSchema),
type: z.string(), edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()]))
label: z.string().optional() })
})).optional()
}); });
export type GroupDefinition = z.infer<typeof GroupSchema>;
export const GraphSchema = z.object({ export const GraphSchema = z.object({
id: z.number(), id: z.number(),
meta: z meta: z
@@ -104,8 +113,8 @@ export const GraphSchema = z.object({
.optional(), .optional(),
settings: z.record(z.string(), z.any()).optional(), settings: z.record(z.string(), z.any()).optional(),
nodes: z.array(NodeSchema), nodes: z.array(NodeSchema),
edges: z.array(SerializedEdgeSchema), edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()])),
groups: z.array(GroupSchema) groups: z.record(z.string(), NodeGroupDefinitionSchema).optional()
}); });
export type Graph = z.infer<typeof GraphSchema>; export type Graph = z.infer<typeof GraphSchema>;
+30 -31
View File
@@ -1,6 +1,6 @@
{ {
"name": "@nodarium/ui", "name": "@nodarium/ui",
"version": "0.0.6", "version": "0.0.5",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "vite build",
@@ -30,47 +30,46 @@
"svelte": "^4.0.0" "svelte": "^4.0.0"
}, },
"devDependencies": { "devDependencies": {
"@eslint/compat": "^2.0.5", "@eslint/compat": "^2.0.2",
"@eslint/eslintrc": "^3.3.5", "@eslint/eslintrc": "^3.3.3",
"@eslint/js": "^10.0.1", "@eslint/js": "^9.39.2",
"@nodarium/types": "workspace:^", "@nodarium/types": "workspace:^",
"@playwright/test": "^1.59.1", "@playwright/test": "^1.58.1",
"@sveltejs/adapter-static": "^3.0.10", "@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.59.0", "@sveltejs/kit": "^2.50.2",
"@sveltejs/package": "^2.5.7", "@sveltejs/package": "^2.5.7",
"@sveltejs/vite-plugin-svelte": "^7.0.0", "@sveltejs/vite-plugin-svelte": "^6.2.4",
"@testing-library/svelte": "^5.3.1", "@testing-library/svelte": "^5.3.1",
"@types/eslint": "^9.6.1", "@types/eslint": "^9.6.1",
"@types/node": "^25.6.0", "@types/three": "^0.182.0",
"@types/three": "^0.184.0", "@typescript-eslint/eslint-plugin": "^8.54.0",
"@typescript-eslint/eslint-plugin": "^8.59.1", "@typescript-eslint/parser": "^8.54.0",
"@typescript-eslint/parser": "^8.59.1", "@vitest/browser-playwright": "^4.0.18",
"@vitest/browser-playwright": "^4.1.5", "dprint": "^0.51.1",
"dprint": "^0.54.0", "eslint": "^9.39.2",
"eslint": "^10.3.0", "eslint-plugin-svelte": "^3.14.0",
"eslint-plugin-svelte": "^3.17.1", "globals": "^17.3.0",
"globals": "^17.6.0", "publint": "^0.3.17",
"publint": "^0.3.18", "svelte": "^5.49.2",
"svelte": "^5.55.5", "svelte-check": "^4.3.6",
"svelte-check": "^4.4.7", "svelte-eslint-parser": "^1.4.1",
"svelte-eslint-parser": "^1.6.0",
"tslib": "^2.8.1", "tslib": "^2.8.1",
"typescript": "^6.0.3", "typescript": "^5.9.3",
"typescript-eslint": "^8.59.1", "typescript-eslint": "^8.54.0",
"vite": "^8.0.10", "vite": "^7.3.1",
"vitest": "^4.1.5", "vitest": "^4.0.18",
"vitest-browser-svelte": "^2.1.1" "vitest-browser-svelte": "^2.0.2"
}, },
"svelte": "./dist/index.js", "svelte": "./dist/index.js",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@iconify-json/tabler": "^1.2.33",
"@iconify/tailwind4": "^1.2.3",
"@nodarium/ui": "workspace:*", "@nodarium/ui": "workspace:*",
"@tailwindcss/vite": "^4.2.4", "@iconify-json/tabler": "^1.2.26",
"@threlte/core": "^8.5.11", "@iconify/tailwind4": "^1.2.1",
"@threlte/extras": "^9.15.1", "@tailwindcss/vite": "^4.1.18",
"tailwindcss": "^4.2.4" "@threlte/core": "^8.3.1",
"@threlte/extras": "^9.7.1",
"tailwindcss": "^4.1.18"
} }
} }
-55
View File
@@ -1,55 +0,0 @@
<script lang="ts">
import type { Snippet } from 'svelte';
interface Props {
variant?: 'default' | 'primary' | 'destructive' | 'ghost';
size?: 'sm' | 'md';
disabled?: boolean;
class?: string;
onclick?: (e: MouseEvent) => void;
children?: Snippet;
type?: 'button' | 'submit' | 'reset';
}
let {
variant = 'default',
size = 'md',
disabled = false,
class: _class = '',
onclick,
children,
type = 'button'
}: Props = $props();
const variantClasses = {
default: 'bg-layer-2 border border-outline text-text hover:opacity-85',
primary: 'bg-selected text-white border border-transparent hover:opacity-88',
destructive: 'bg-red-600 text-white border border-transparent hover:opacity-88',
ghost: 'bg-layer-2 border border-transparent text-text opacity-75 hover:opacity-100'
};
const sizeClasses = {
sm: 'px-2 py-0.5 text-xs',
md: 'px-3 py-1 text-sm'
};
</script>
<button
{type}
{disabled}
class:py-1={size === 'sm'}
class:px-1={size === 'sm'}
class:py-2={size !== 'sm'}
class="
inline-flex items-center gap-1.5 rounded cursor-pointer
font-(--font-family) leading-none whitespace-nowrap
transition-opacity duration-100
disabled:opacity-40 disabled:cursor-not-allowed
{variantClasses[variant]}
{sizeClasses[size]}
{_class}
"
{onclick}
>
{@render children?.()}
</button>
-95
View File
@@ -1,95 +0,0 @@
<script lang="ts">
import type { Snippet } from 'svelte';
import Button from './Button.svelte';
interface Props {
open?: boolean;
title?: string;
message?: string;
confirmLabel?: string;
cancelLabel?: string;
onconfirm?: () => void;
oncancel?: () => void;
children?: Snippet;
}
let {
open = $bindable(false),
title = 'Are you sure?',
message,
confirmLabel = 'Confirm',
cancelLabel = 'Cancel',
onconfirm,
oncancel,
children
}: Props = $props();
let dialogEl: HTMLDialogElement;
$effect(() => {
if (!dialogEl) return;
if (open) {
dialogEl.showModal();
} else {
dialogEl.close();
}
});
function confirm() {
open = false;
onconfirm?.();
}
function cancel() {
open = false;
oncancel?.();
}
function handleKeydown(e: KeyboardEvent) {
if (e.key === 'Enter') {
e.preventDefault();
confirm();
}
}
function handleCancel(e: Event) {
e.preventDefault();
cancel();
}
</script>
<dialog
bind:this={dialogEl}
class="m-auto bg-layer-1 border border-outline rounded-md p-0 text-text max-w-md w-full backdrop:bg-black/50"
oncancel={handleCancel}
onkeydown={handleKeydown}
onclick={(e) => {
if (e.target === dialogEl) cancel();
}}
>
<div class="px-6 py-5 flex flex-col gap-3">
<h3 class="m-0 text-sm font-semibold">{title}</h3>
{#if message}
<p class="m-0 text-xs opacity-75 leading-relaxed">{message}</p>
{/if}
{#if children}
<div class="text-xs">
{@render children()}
</div>
{/if}
<div class="flex justify-end gap-2 mt-1">
<Button onclick={cancel}>{cancelLabel}</Button>
<Button variant="primary" onclick={confirm}>{confirmLabel}</Button>
</div>
</div>
</dialog>
<style>
dialog {
font-family: var(--font-family);
}
dialog::backdrop {
background: rgba(0, 0, 0, 0.5);
}
</style>
-150
View File
@@ -1,150 +0,0 @@
<script module lang="ts">
// eslint-disable-next-line svelte/prefer-svelte-reactivity
const cache = new Map<string, Record<string, boolean>>();
function getStore(root: string): Record<string, boolean> {
if (!cache.has(root)) {
try {
const raw = localStorage.getItem(`json_viewer:${root}`);
cache.set(root, raw ? JSON.parse(raw) : {});
} catch {
cache.set(root, {});
}
}
return cache.get(root)!;
}
function readOpen(path: string, fallback: boolean): boolean {
const root = path.split('/')[0];
const store = getStore(root);
return path in store ? store[path] : fallback;
}
function writeOpen(path: string, value: boolean) {
const root = path.split('/')[0];
const store = getStore(root);
store[path] = value;
try {
localStorage.setItem(`json_viewer:${root}`, JSON.stringify(store));
} catch { /* quota exceeded etc */ }
}
</script>
<script lang="ts">
import { browser } from '$app/environment';
import JsonViewer from './JsonViewer.svelte';
import { toast } from './toast.svelte';
let {
value,
key,
depth = 0,
path = ''
}: { value: unknown; key?: string; depth?: number; path?: string } = $props();
const defaultOpen = $derived(depth < 4);
let open = $derived(browser && path ? readOpen(path, defaultOpen) : defaultOpen);
let flashing = $state(false);
const isArr = $derived(Array.isArray(value));
const isExpandable = $derived(value !== null && typeof value === 'object');
const open_bracket = $derived(isArr ? '[' : '{');
const close_bracket = $derived(isArr ? ']' : '}');
const items = $derived.by(() => {
if (isArr) {
return (value as unknown[]).map((v, i) => [String(i), v] as [string, unknown]);
}
if (value !== null && typeof value === 'object') {
return Object.entries(value as Record<string, unknown>).filter(
([, v]) => v !== undefined
);
}
return [] as [string, unknown][];
});
const showKeys = $derived(!isArr || typeof items[0]?.[1] === 'object');
function toggle(next: boolean) {
open = next;
if (browser && path) writeOpen(path, next);
}
let prevJson = '';
let flashTimeout: ReturnType<typeof setTimeout> | null = null;
function copyValue() {
navigator.clipboard.writeText(JSON.stringify(key ? { [key]: value } : value, null, 2));
toast('Value copied to clipboard', 'success');
}
$effect(() => {
const json = JSON.stringify(value);
if (prevJson && json !== prevJson) {
if (flashTimeout) clearTimeout(flashTimeout);
flashing = true;
flashTimeout = setTimeout(() => {
flashing = false;
flashTimeout = null;
}, 500);
}
prevJson = json;
});
</script>
<span
class="font-mono text-xs leading-[1.6] rounded transition-[background-color] duration-500"
class:bg-layer-3={flashing}
>
{#if key !== undefined}
<button
class="text-text hover:bg-layer-3 cursor-pointer"
title="Copy value"
onclick={() => copyValue()}
>
{key}
</button><span class="text-text/40">: </span>
{/if}
{#if isExpandable}
{#if items.length === 0}
<span class="text-text/50">{open_bracket}{close_bracket}</span>
{:else if open}
{#if depth > 0}
<button class="w-3 text-text/50 hover:text-text" onclick={() => toggle(false)}>
</button>
{/if}
<span class="text-text/50">{open_bracket}</span>
<div class="pl-4 border-l border-outline">
{#each items as [k, v], i (k)}
<div>
<JsonViewer
value={v}
key={showKeys ? k : undefined}
depth={depth + 1}
path={path ? `${path}/${k}` : k}
/>{#if i < items.length - 1}<span class="text-text/20">,</span>{/if}
</div>
{/each}
</div>
<span class="text-text/50">{close_bracket}</span>
{:else}
<button
class="inline text-text/50 hover:text-text"
onclick={() => toggle(true)}
>
<span class="w-3 inline-block"></span>
{open_bracket}<span class="text-text/40 mx-1">{items.length}</span>{close_bracket}
</button>
{/if}
{:else if value === null}
<span class="text-emerald-500!">null</span>
{:else if typeof value === 'boolean'}
<span class="text-blue-500!">{value}</span>
{:else if typeof value === 'number'}
<span class="text-orange-400!">{value}</span>
{:else if typeof value === 'string'}
<span class="text-emerald-500!">"{value}"</span>
{:else}
<span class="text-text/70">{String(value)}</span>
{/if}
</span>
-27
View File
@@ -1,27 +0,0 @@
<script lang="ts">
interface Props {
size?: number;
class?: string;
}
let { size = 20, class: _class = '' }: Props = $props();
</script>
<svg
class="animate-spin text-text shrink-0 {_class}"
width={size}
height={size}
viewBox="0 0 24 24"
fill="none"
aria-label="Loading"
role="status"
>
<circle
cx="12"
cy="12"
r="10"
stroke="currentColor"
stroke-width="2.5"
stroke-linecap="round"
stroke-dasharray="40 20"
/>
</svg>
-31
View File
@@ -1,31 +0,0 @@
<script lang="ts">
import { fly, slide } from 'svelte/transition';
import { toasts } from './toast.svelte';
const typeClasses: Record<string, string> = {
success: 'border-l-green-500',
error: 'border-l-red-500',
info: 'border-l-active'
};
</script>
<div
class="fixed bottom-4 right-4 flex flex-col items-end gap-2 z-9999 pointer-events-none"
role="status"
aria-live="polite"
aria-atomic="false"
>
{#each toasts.value as item (item.id)}
<div
in:slide={{ duration: 250 }}
out:fly={{ x: 100, duration: 250 }}
class="
bg-layer-2 text-text border border-outline rounded
px-3.5 py-2 text-sm min-w-45 max-w-xs w-fit
border-l-3 {typeClasses[item.type] ?? 'border-l-outline'}
"
>
{item.message}
</div>
{/each}
</div>
+1 -1
View File
@@ -9,7 +9,7 @@
@source inline("{hover:,}{bg-,outline-,text-,}layer-3{/30,/50,}"); @source inline("{hover:,}{bg-,outline-,text-,}layer-3{/30,/50,}");
@source inline("{hover:,}{bg-,outline-,text-,}active"); @source inline("{hover:,}{bg-,outline-,text-,}active");
@source inline("{hover:,}{bg-,outline-,text-,}selected"); @source inline("{hover:,}{bg-,outline-,text-,}selected");
@source inline("{hover:,}{bg-,outline-,text-,border-,divide-}outline{!,}"); @source inline("{hover:,}{bg-,outline-,text-,}outline{!,}");
@source inline("{hover:,}{bg-,outline-,text-,}connection"); @source inline("{hover:,}{bg-,outline-,text-,}connection");
@source inline("{hover:,}{bg-,outline-,text-,}text"); @source inline("{hover:,}{bg-,outline-,text-,}text");
-8
View File
@@ -2,20 +2,12 @@ export { default as Input } from './Input.svelte';
export { default as InputCheckbox } from './inputs/InputCheckbox.svelte'; export { default as InputCheckbox } from './inputs/InputCheckbox.svelte';
export { default as InputColor } from './inputs/InputColor.svelte'; export { default as InputColor } from './inputs/InputColor.svelte';
export { default as InputNumber } from './inputs/InputNumber.svelte'; export { default as InputNumber } from './inputs/InputNumber.svelte';
export { default as InputSearch } from './inputs/InputSearch.svelte';
export { default as InputSelect } from './inputs/InputSelect.svelte'; export { default as InputSelect } from './inputs/InputSelect.svelte';
export { default as InputShape } from './inputs/InputShape.svelte'; export { default as InputShape } from './inputs/InputShape.svelte';
export { default as InputVec3 } from './inputs/InputVec3.svelte'; export { default as InputVec3 } from './inputs/InputVec3.svelte';
export { default as SocketTable } from './inputs/SocketTable.svelte';
export { default as Button } from './Button.svelte';
export { default as ConfirmDialog } from './ConfirmDialog.svelte';
export { default as Details } from './Details.svelte'; export { default as Details } from './Details.svelte';
export { default as JsonViewer } from './JsonViewer.svelte';
export { default as ShortCut } from './ShortCut.svelte'; export { default as ShortCut } from './ShortCut.svelte';
export { default as Spinner } from './Spinner.svelte';
export { default as Toast } from './Toast.svelte';
export { toast } from './toast.svelte';
import Input from './Input.svelte'; import Input from './Input.svelte';
export default Input; export default Input;
+1 -2
View File
@@ -46,7 +46,7 @@
class="h-full w-8 cursor-pointer appearance-none p-0" class="h-full w-8 cursor-pointer appearance-none p-0"
/> />
</label> </label>
<div class="flex items-center gap-1 px-2 py-1 border-l border-outline"> <div class="flex items-center gap-1 px-2 py-1">
<span class="pointer-events-none text-text opacity-30">#</span> <span class="pointer-events-none text-text opacity-30">#</span>
<input <input
type="text" type="text"
@@ -64,6 +64,5 @@
margin-top: -1px; margin-top: -1px;
margin-right: -1px; margin-right: -1px;
height: calc(100% + 2px); height: calc(100% + 2px);
width: calc(100% + 2px);
} }
</style> </style>
@@ -1,99 +1 @@
<script lang="ts">
type SelectOption = string | { value: number; label: string };
interface Props {
options?: SelectOption[];
value?: number;
id?: string;
placeholder?: string;
}
let {
options = [],
value = $bindable(0),
id = '',
placeholder = 'Search…'
}: Props = $props();
const normalized = $derived(
options.map((opt, i) => typeof opt === 'string' ? { value: i, label: opt } : opt)
);
const selected = $derived(normalized.find((o) => o.value === value));
let query = $state('');
let open = $state(false);
let container: HTMLDivElement;
const filtered = $derived(
query === ''
? normalized
: normalized.filter((o) => o.label.toLowerCase().includes(query.toLowerCase()))
);
function select(val: number) {
value = val;
query = '';
open = false;
}
function handleKeydown(e: KeyboardEvent) {
if (e.key === 'Escape') {
open = false;
query = '';
}
if (e.key === 'ArrowDown' && filtered.length) {
const idx = filtered.findIndex((o) => o.value === value);
value = filtered[(idx + 1) % filtered.length].value;
}
if (e.key === 'ArrowUp' && filtered.length) {
const idx = filtered.findIndex((o) => o.value === value);
value = filtered[(idx - 1 + filtered.length) % filtered.length].value;
}
if (e.key === 'Enter' && filtered.length) {
const match = filtered.find((o) => o.value === value) ?? filtered[0];
select(match.value);
}
}
function handleBlur(e: FocusEvent) {
if (!container.contains(e.relatedTarget as Node)) {
open = false;
query = '';
}
}
</script>
<div class="relative w-full" bind:this={container} onblur={handleBlur}>
<input
{id}
type="text"
class:rounded-b-none!={open}
class="w-full bg-layer-2 text-text outline outline-outline px-3 py-2 rounded-md border-none font-(--font-family) text-sm box-border focus:outline-2 focus:outline-active"
placeholder={open ? placeholder : (selected?.label ?? placeholder)}
bind:value={query}
onfocus={() => (open = true)}
onkeydown={handleKeydown}
autocomplete="off"
/>
{#if open}
<div
class="absolute w-[calc(100%+2px)] -ml-px top-[calc(100%+2px)] left-0 right-0 bg-layer-1 border border-outline rounded-b-md max-h-50 overflow-y-auto z-100"
role="listbox"
>
{#each filtered as opt (opt.value)}
<div
class="px-3 py-2 text-sm text-text cursor-pointer font-(--font-family) {opt.value === value ? 'bg-layer-2' : 'hover:bg-layer-2'}"
role="option"
aria-selected={opt.value === value}
tabindex="-1"
onmousedown={() => select(opt.value)}
>
{opt.label}
</div>
{:else}
<div class="px-3 py-2 text-xs text-text opacity-45 italic">No results</div>
{/each}
</div>
{/if}
</div>
@@ -1,22 +1,16 @@
<script lang="ts"> <script lang="ts">
type SelectOption = string | { value: number; label: string };
interface Props { interface Props {
options?: SelectOption[]; options?: string[];
value?: number; value?: number;
id?: string; id?: string;
} }
let { options = [], value = $bindable(0), id = '' }: Props = $props(); let { options = [], value = $bindable(0), id = '' }: Props = $props();
const normalized = $derived(
options.map((opt, i) => typeof opt === 'string' ? { value: i, label: opt } : opt)
);
</script> </script>
<select {id} bind:value class="bg-layer-2 text-text"> <select {id} bind:value class="bg-layer-2 text-text">
{#each normalized as opt (opt.value)} {#each options as label, i (label)}
<option value={opt.value}>{opt.label}</option> <option value={i}>{label}</option>
{/each} {/each}
</select> </select>
@@ -1,118 +0,0 @@
<script lang="ts">
import type { NodeInput } from '@nodarium/types';
type Props = {
inputs?: Record<string, NodeInput>;
colors: Record<string, string>;
onremove?: (key: string) => void;
types: string[];
};
let { inputs = $bindable(), onremove, colors = {}, types = ['seed', 'float', 'path'] }: Props =
$props();
let potentialRow = $state<
{
type: string;
label: string;
} | undefined
>();
function showPotentialRow() {
potentialRow = {
type: types[0],
label: 'Input ' + Object.keys(inputs ?? {}).length
};
}
function realizePotentialRow() {
if (inputs) inputs[`input_${Object.keys(inputs).length}`] = potentialRow as NodeInput;
potentialRow = undefined;
}
function removeRow(key?: string) {
if (!key) {
potentialRow = undefined;
} else if (inputs) {
onremove?.(key);
}
}
function getColor(type: string) {
if (type in colors) {
return colors[type];
}
return '#f00';
}
</script>
{#snippet row(input: { type: string; label?: string }, remove: () => void, add?: () => void)}
<div class="flex min-w-0">
<span
style:background={getColor(input.type)}
data-type={input.type}
class="block opacity-50 min-w-2 ml-2 w-2 h-2 my-auto rounded-sm"
></span>
<select
class="text-[0.9em] border-r w-19 shrink-0 px-2 py-1 border-outline"
bind:value={input.type}
>
{#each types as type (type)}
<option>
<span
style="background: {getColor(type)}; width: 5px; height: 5px; border-radius: 5px;"
></span>
{type}
</option>
{/each}
</select>
<input
class="px-2 grow min-w-30 border-r border-outline text-[0.9em]"
type="text"
bind:value={input.label}
/>
<button
class="px-2 cursor-pointer opacity-50 hover:opacity-100 hover:bg-red-400"
onclick={remove}
aria-label="remove"
>
{#if add}
<span class="py-1 block i-[tabler--cancel]"></span>
{:else}
<span class="py-1 block i-[tabler--trash]"></span>
{/if}
</button>
{#if add}
<button
class="px-2 border-l hover:bg-green-300 opacity-50 hover:opacity-100 hover:text-layer-1 border-outline cursor-pointer"
onclick={add}
aria-label="add"
>
<span class="py-1 block i-[tabler--circle-plus]"></span>
</button>
{/if}
</div>
{/snippet}
<div class="rounded-sm overflow-hidden bg-layer-2 divide-y divide-outline outline-1 outline-outline">
{#each Object.entries(inputs ?? {}) as [key, input] (key)}
{@render row(input, () => removeRow(key))}
{/each}
{#if potentialRow}
<div class="opacity-80">
{@render row(potentialRow, () => removeRow(), () => realizePotentialRow())}
</div>
{:else}
<div class="opacity-40">
<div class="flex h-[27px]">
<div class="flex-1"></div>
<button
class="border-l hover:bg-green-300 hover:text-layer-1 border-outline py-1 px-2 cursor-pointer"
onclick={() => showPotentialRow()}
aria-label="remove"
>
<span class="block i-[tabler--circle-plus]"></span>
</button>
</div>
</div>
{/if}
</div>
-24
View File
@@ -1,24 +0,0 @@
export type ToastType = 'info' | 'success' | 'error';
export type ToastItem = {
id: number;
message: string;
type: ToastType;
};
let _toasts = $state<ToastItem[]>([]);
let _nextId = 0;
export const toasts = {
get value() {
return _toasts;
}
};
export function toast(message: string, type: ToastType = 'info', duration = 3000) {
const id = _nextId++;
_toasts.push({ id, message, type });
setTimeout(() => {
_toasts = _toasts.filter((t) => t.id !== id);
}, duration);
}
+3 -155
View File
@@ -1,24 +1,15 @@
<script lang="ts"> <script lang="ts">
import type { NodeInput } from '@nodarium/types';
import '$lib/app.css'; import '$lib/app.css';
import { import {
Button,
ConfirmDialog,
Details, Details,
InputCheckbox, InputCheckbox,
InputColor, InputColor,
InputNumber, InputNumber,
InputSearch,
InputSelect, InputSelect,
InputShape, InputShape,
InputVec3, InputVec3,
JsonViewer, ShortCut
ShortCut,
Spinner,
Toast,
toast
} from '$lib'; } from '$lib';
import SocketTable from '$lib/inputs/SocketTable.svelte';
import Section from './Section.svelte'; import Section from './Section.svelte';
import Theme from './Theme.svelte'; import Theme from './Theme.svelte';
import ThemeSelector from './ThemeSelector.svelte'; import ThemeSelector from './ThemeSelector.svelte';
@@ -29,52 +20,14 @@
let vecValue = $state([0.2, 0.3, 0.4]); let vecValue = $state([0.2, 0.3, 0.4]);
const options = ['strawberry', 'raspberry', 'chickpeas']; const options = ['strawberry', 'raspberry', 'chickpeas'];
let selectValue = $state(0); let selectValue = $state(0);
let selectValue2 = $state(0); const d = $derived(options[selectValue]);
let checked = $state(false); let checked = $state(false);
let colorValue = $state<[number, number, number]>([59, 130, 246]); let colorValue = $state<[number, number, number]>([59, 130, 246]);
let mirrorShape = $state(true); let mirrorShape = $state(true);
let detailsOpen = $state(false); let detailsOpen = $state(false);
let jsonValue = $state({
id: 1,
nodes: [{ id: 0, type: 'max/test/node', position: [0, 0] }, {
id: 1,
type: 'max/test/other',
position: [100, 50]
}],
edges: [[0, 0, 1, 'input']],
groups: [],
settings: { seed: 42, enabled: true }
});
let socketTypes: Record<string, NodeInput> = $state({
input_0: {
'label': 'Input 0',
'type': 'path'
},
input_1: {
'label': 'Input 1',
'type': 'float'
}
});
function randomlyUpdateJson() {
const rand = Math.floor(Math.random() * 5);
if (rand === 0) {
jsonValue.nodes[0].position[0] += 1;
} else if (rand === 1) {
jsonValue.nodes[0].position[1] += 1;
} else if (rand === 2) {
jsonValue.settings.seed += 1;
} else if (rand === 3) {
jsonValue.settings.enabled = !jsonValue.settings.enabled;
} else if (rand === 4) {
jsonValue.id += Math.floor(Math.random() * 10 - 5);
}
}
let points = $state([]); let points = $state([]);
let theme = $state('dark'); let theme = $state('dark');
let confirmOpen = $state(false);
</script> </script>
<main class="flex flex-col gap-8 py-8"> <main class="flex flex-col gap-8 py-8">
@@ -83,17 +36,6 @@
<ThemeSelector bind:theme /> <ThemeSelector bind:theme />
</div> </div>
<Section title="Button">
<div class="flex flex-wrap gap-3 items-center">
<Button>Default</Button>
<Button variant="primary">Primary</Button>
<Button variant="destructive">Destructive</Button>
<Button variant="ghost">Ghost</Button>
<Button disabled>Disabled</Button>
<Button size="sm">Small</Button>
</div>
</Section>
<Section title="InputNumber"> <Section title="InputNumber">
<Theme /> <Theme />
</Section> </Section>
@@ -113,35 +55,8 @@
<InputVec3 bind:value={vecValue} /> <InputVec3 bind:value={vecValue} />
</Section> </Section>
<Section title="InputSearch" value={options[selectValue]}> <Section title="Select" value={d}>
<div class="flex flex-col gap-2">
<p>Searchable select — type to filter</p>
<InputSearch bind:value={selectValue} {options} />
</div>
</Section>
<Section title="Select">
<p>
Select with simple values
<br>
<b>value={options[selectValue]}</b>
</p>
<InputSelect bind:value={selectValue} {options} /> <InputSelect bind:value={selectValue} {options} />
<br>
<br>
<p>
Select with <i>&lbrace;option: number, label: string&rbrace;[]</i>
<br>
<b>value={selectValue2}</b>
</p>
<InputSelect
bind:value={selectValue2}
options={[
{ value: 0, label: 'Zero' },
{ value: 1, label: 'One' },
{ value: 2, label: 'Two' }
]}
/>
</Section> </Section>
<Section title="Checkbox" value={checked}> <Section title="Checkbox" value={checked}>
@@ -171,35 +86,6 @@
</Details> </Details>
</Section> </Section>
<Section title="JsonViewer">
{#snippet header()}
<Button
onclick={() => randomlyUpdateJson()}
class="-mt-1 bg-layer-2 p-1 px-2 rounded-sm cursor-pointer"
>
update
</Button>
{/snippet}
<div class="w-64 bg-layer-1 p-2 rounded">
<JsonViewer
value={jsonValue}
path="demo"
/>
</div>
</Section>
<Section title="Socket Table">
<SocketTable
colors={{
seed: '#f00',
float: '#0f0',
path: '#00f'
}}
types={['seed', 'float', 'path']}
bind:inputs={socketTypes}
/>
</Section>
<Section title="Shortcut"> <Section title="Shortcut">
<div class="flex gap-4"> <div class="flex gap-4">
<ShortCut ctrl key="S" /> <ShortCut ctrl key="S" />
@@ -207,46 +93,8 @@
<ShortCut alt ctrl key="delete" /> <ShortCut alt ctrl key="delete" />
</div> </div>
</Section> </Section>
<Section title="Spinner">
<div class="flex gap-6 items-center">
<Spinner size={16} />
<Spinner size={24} />
<Spinner size={36} />
</div>
</Section>
<Section title="Toast">
<div class="flex gap-3">
<Button onclick={() => toast('Project saved successfully', 'success')}>
Success toast
</Button>
<Button onclick={() => toast('Something went wrong', 'error')}>
Error toast
</Button>
<Button onclick={() => toast('Graph is executing…', 'info')}>
Info toast
</Button>
</div>
</Section>
<Section title="ConfirmDialog">
<Button onclick={() => (confirmOpen = true)}>
Open dialog
</Button>
<ConfirmDialog
bind:open={confirmOpen}
title="Delete project?"
message="This action cannot be undone. The project and all its data will be permanently removed."
confirmLabel="Delete"
cancelLabel="Cancel"
onconfirm={() => toast('Project deleted', 'error')}
/>
</Section>
</main> </main>
<Toast />
<style> <style>
main { main {
max-width: 800px; max-width: 800px;
@@ -12,7 +12,6 @@
'custom' 'custom'
]; ];
// eslint-disable-next-line no-useless-assignment
let { theme = $bindable() } = $props(); let { theme = $bindable() } = $props();
let themeIndex = $state(0); let themeIndex = $state(0);
+4 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "@nodarium/utils", "name": "@nodarium/utils",
"version": "0.0.6", "version": "0.0.5",
"description": "", "description": "",
"main": "./src/index.ts", "main": "./src/index.ts",
"type": "module", "type": "module",
@@ -16,8 +16,8 @@
"@nodarium/types": "workspace:^" "@nodarium/types": "workspace:^"
}, },
"devDependencies": { "devDependencies": {
"dprint": "^0.54.0", "dprint": "^0.51.1",
"vite": "^8.0.10", "vite": "^7.3.1",
"vitest": "^4.1.5" "vitest": "^4.0.18"
} }
} }
+6 -80
View File
@@ -1,60 +1,3 @@
interface LogEntry {
time: string;
scope: string;
level: string;
args: unknown[];
}
const logBuffer: LogEntry[] = [];
const startTime = Date.now();
function formatTime(): string {
const ms = Date.now() - startTime;
const h = Math.floor(ms / 3600000).toString().padStart(2, '0');
const m = Math.floor((ms % 3600000) / 60000).toString().padStart(2, '0');
const s = Math.floor((ms % 60000) / 1000).toString().padStart(2, '0');
const mss = (ms % 1000).toString().padStart(3, '0');
return `${h}:${m}:${s}.${mss}`;
}
function serialize(arg: unknown): string {
if (typeof arg === 'string') return arg;
try {
return JSON.stringify(arg);
} catch {
return String(arg);
}
}
function formatEntry(entry: LogEntry, scopeWidth: number): string {
const scope = `[${entry.scope}]`.padEnd(scopeWidth + 2);
const level = entry.level.toUpperCase().padEnd(5);
const msg = entry.args.map(serialize).join(' ');
return `${entry.time} ${scope} ${level} ${msg}`;
}
(globalThis as Record<string, unknown>).copyLogs = () => {
if (logBuffer.length === 0) {
console.log('%c[logger] No log entries to copy', 'color: #888');
return;
}
const scopeWidth = logBuffer.reduce((max, e) => Math.max(max, e.scope.length), 0);
const lines = [
`=== Log Export (${logBuffer.length} entries) ===`,
'',
...logBuffer.map(e => formatEntry(e, scopeWidth))
].join('\n');
navigator.clipboard.writeText(lines).then(() => {
console.log(`%c[logger] Copied ${logBuffer.length} entries to clipboard`, 'color: #4f4');
});
};
(globalThis as Record<string, unknown>).clearLogs = () => {
logBuffer.length = 0;
console.log('%c[logger] Log buffer cleared', 'color: #888');
};
export const createLogger = (() => { export const createLogger = (() => {
let maxLength = 5; let maxLength = 5;
return (scope: string) => { return (scope: string) => {
@@ -63,35 +6,18 @@ export const createLogger = (() => {
let isGrouped = false; let isGrouped = false;
function s(color: string, ...args: unknown[]) { function s(color: string, ...args: any) {
return isGrouped return isGrouped
? [...args] ? [...args]
: [`[%c${scope.padEnd(maxLength, ' ')}]:`, `color: ${color}`, ...args]; : [`[%c${scope.padEnd(maxLength, ' ')}]:`, `color: ${color}`, ...args];
} }
function record(level: string, args: unknown[]) {
logBuffer.push({ time: formatTime(), scope, level, args });
}
return { return {
log: (...args: unknown[]) => { log: (...args: any[]) => !muted && console.log(...s('#888', ...args)),
record('log', args); info: (...args: any[]) => !muted && console.info(...s('#888', ...args)),
!muted && console.log(...s('#888', ...args)); warn: (...args: any[]) => !muted && console.warn(...s('#888', ...args)),
}, error: (...args: any[]) => console.error(...s('#f88', ...args)),
info: (...args: unknown[]) => { group: (...args: any[]) => {
record('info', args);
!muted && console.info(...s('#888', ...args));
},
warn: (...args: unknown[]) => {
record('warn', args);
!muted && console.warn(...s('#888', ...args));
},
error: (...args: unknown[]) => {
record('error', args);
console.error(...s('#f88', ...args));
},
group: (...args: unknown[]) => {
record('group', args);
if (!muted) { if (!muted) {
console.groupCollapsed(...s('#888', ...args)); console.groupCollapsed(...s('#888', ...args));
isGrouped = true; isGrouped = true;
-9
View File
@@ -4,7 +4,6 @@ export interface PerformanceStore {
startRun(): void; startRun(): void;
stopRun(): void; stopRun(): void;
addPoint(name: string, value?: number): void; addPoint(name: string, value?: number): void;
addToLastRun(name: string, value: number): void;
endPoint(name?: string): void; endPoint(name?: string): void;
mergeData(data: PerformanceData[number]): void; mergeData(data: PerformanceData[number]): void;
get: () => PerformanceData; get: () => PerformanceData;
@@ -64,13 +63,6 @@ export function createPerformanceStore(): PerformanceStore {
} }
} }
function addToLastRun(name: string, value: number) {
const last = data[data.length - 1];
if (!last) return;
last[name] = last[name] || [];
last[name].push(value);
}
function get() { function get() {
return data; return data;
} }
@@ -102,7 +94,6 @@ export function createPerformanceStore(): PerformanceStore {
startRun, startRun,
stopRun, stopRun,
addPoint, addPoint,
addToLastRun,
endPoint, endPoint,
mergeData, mergeData,
get get
+2034 -1024
View File
File diff suppressed because it is too large Load Diff
-1
View File
@@ -7,7 +7,6 @@ packages:
catalog: catalog:
chokidar-cli: github:open-cli-tools/chokidar-cli#semver:v4.0.0 chokidar-cli: github:open-cli-tools/chokidar-cli#semver:v4.0.0
onlyBuiltDependencies: onlyBuiltDependencies:
- "@tailwindcss/oxide" - "@tailwindcss/oxide"
- esbuild - esbuild