Compare commits
1 Commits
main
..
9c9a7b8c67
| Author | SHA1 | Date | |
|---|---|---|---|
 max
|
9c9a7b8c67
|
@@ -65,9 +65,6 @@ jobs:
|
||||
- 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
|
||||
|
||||
|
||||
-131
@@ -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)
|
||||
|
||||
## Features
|
||||
|
||||
+13
-139
@@ -1,59 +1,35 @@
|
||||
import type { Graph, Graph as GraphType, NodeId } from '@nodarium/types';
|
||||
import { createLogger, createPerformanceStore, splitNestedArray } from '@nodarium/utils';
|
||||
|
||||
import { mkdir, writeFile } from 'node:fs/promises';
|
||||
import { freemem, loadavg, totalmem } from 'node:os';
|
||||
import { resolve } from 'node:path';
|
||||
|
||||
import { MemoryRuntimeExecutor } from '../src/lib/runtime/runtime-executor.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 lottaFacesTemplate from './templates/lotta-faces.json' assert { type: 'json' };
|
||||
import plantTemplate from './templates/plant.json' assert { type: 'json' };
|
||||
|
||||
const registry = new BenchmarkRegistry();
|
||||
const r = new MemoryRuntimeExecutor(registry);
|
||||
const perfStore = createPerformanceStore();
|
||||
|
||||
const log = createLogger('bench');
|
||||
|
||||
const templates: Record<string, Graph> = {
|
||||
plant: plantTemplate as unknown as GraphType,
|
||||
'plant': plantTemplate 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;
|
||||
} {
|
||||
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;
|
||||
|
||||
const vertexCount = part[1];
|
||||
const faceCount = part[2];
|
||||
if (type === 2) {
|
||||
const instanceCount = part[3] >>> 0;
|
||||
|
||||
const instanceCount = part[3];
|
||||
totalVertices += vertexCount * instanceCount;
|
||||
totalFaces += faceCount * instanceCount;
|
||||
} else {
|
||||
@@ -61,144 +37,42 @@ function countGeometry(result: Int32Array): {
|
||||
totalFaces += faceCount;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
totalVertices,
|
||||
totalFaces
|
||||
};
|
||||
return { totalVertices, totalFaces };
|
||||
}
|
||||
|
||||
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('warming up');
|
||||
|
||||
// Warm up the runtime? maybe this does something?
|
||||
for (let index = 0; index < 10; index++) {
|
||||
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');
|
||||
|
||||
const perfStore = createPerformanceStore();
|
||||
|
||||
r.perf = perfStore;
|
||||
|
||||
let res: Int32Array | undefined;
|
||||
|
||||
const cgroupBefore = await readCgroupCpuStat();
|
||||
|
||||
let res;
|
||||
for (let i = 0; i < amount; i++) {
|
||||
r.perf?.startRun();
|
||||
|
||||
res = await r.execute(g, { randomSeed: true });
|
||||
|
||||
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');
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
};
|
||||
return r.perf.get();
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const outPath = resolve('benchmark/out/');
|
||||
|
||||
await mkdir(outPath, { recursive: true });
|
||||
|
||||
for (const key in templates) {
|
||||
log.log('executing ' + key);
|
||||
|
||||
const perfData = await run(templates[key], 100);
|
||||
|
||||
await writeFile(
|
||||
resolve(outPath, key + '.json'),
|
||||
JSON.stringify(perfData, null, 2)
|
||||
);
|
||||
|
||||
await writeFile(resolve(outPath, key + '.json'), JSON.stringify(perfData));
|
||||
await new Promise(res => setTimeout(res, 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -8,6 +8,9 @@ test('test', async ({ page }) => {
|
||||
|
||||
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: 'New', exact: true }).click();
|
||||
await page.getByRole('combobox').selectOption('2');
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
+31
-31
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"name": "@nodarium/app",
|
||||
"private": true,
|
||||
"version": "0.0.6",
|
||||
"version": "0.0.5",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
"predev": "rm static/CHANGELOG.md && ln -s ../../CHANGELOG.md static/CHANGELOG.md",
|
||||
"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:e2e": "playwright test",
|
||||
"preview": "vite preview",
|
||||
@@ -18,49 +18,49 @@
|
||||
"bench": "tsx ./benchmark/index.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nodarium/planty": "workspace:*",
|
||||
"@nodarium/ui": "workspace:*",
|
||||
"@nodarium/utils": "workspace:*",
|
||||
"@sveltejs/kit": "^2.59.0",
|
||||
"@tailwindcss/vite": "^4.2.4",
|
||||
"@threlte/core": "8.5.11",
|
||||
"@threlte/extras": "9.15.1",
|
||||
"@nodarium/planty": "workspace:*",
|
||||
"@sveltejs/kit": "^2.50.2",
|
||||
"@tailwindcss/vite": "^4.1.18",
|
||||
"@threlte/core": "8.3.1",
|
||||
"@threlte/extras": "9.7.1",
|
||||
"comlink": "^4.4.2",
|
||||
"file-saver": "^2.0.5",
|
||||
"idb": "^8.0.3",
|
||||
"jsondiffpatch": "^0.7.3",
|
||||
"micromark": "^4.0.2",
|
||||
"tailwindcss": "^4.2.4",
|
||||
"three": "^0.184.0"
|
||||
"tailwindcss": "^4.1.18",
|
||||
"three": "^0.182.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/compat": "^2.0.5",
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@iconify-json/tabler": "^1.2.33",
|
||||
"@iconify/tailwind4": "^1.2.3",
|
||||
"@eslint/compat": "^2.0.2",
|
||||
"@eslint/js": "^9.39.2",
|
||||
"@iconify-json/tabler": "^1.2.26",
|
||||
"@iconify/tailwind4": "^1.2.1",
|
||||
"@nodarium/types": "workspace:^",
|
||||
"@playwright/test": "^1.59.1",
|
||||
"@playwright/test": "^1.58.1",
|
||||
"@sveltejs/adapter-static": "^3.0.10",
|
||||
"@sveltejs/vite-plugin-svelte": "^7.0.0",
|
||||
"@tsconfig/svelte": "^5.0.8",
|
||||
"@sveltejs/vite-plugin-svelte": "^6.2.4",
|
||||
"@tsconfig/svelte": "^5.0.7",
|
||||
"@types/file-saver": "^2.0.7",
|
||||
"@types/three": "^0.184.0",
|
||||
"@vitest/browser-playwright": "^4.1.5",
|
||||
"dprint": "^0.54.0",
|
||||
"eslint": "^10.3.0",
|
||||
"eslint-plugin-svelte": "^3.17.1",
|
||||
"globals": "^17.6.0",
|
||||
"svelte": "^5.55.5",
|
||||
"svelte-check": "^4.4.7",
|
||||
"@types/three": "^0.182.0",
|
||||
"@vitest/browser-playwright": "^4.0.18",
|
||||
"dprint": "^0.51.1",
|
||||
"eslint": "^9.39.2",
|
||||
"eslint-plugin-svelte": "^3.14.0",
|
||||
"globals": "^17.3.0",
|
||||
"svelte": "^5.49.2",
|
||||
"svelte-check": "^4.3.6",
|
||||
"tslib": "^2.8.1",
|
||||
"tsx": "^4.21.0",
|
||||
"typescript": "^6.0.3",
|
||||
"typescript-eslint": "^8.59.1",
|
||||
"vite": "^8.0.10",
|
||||
"typescript": "^5.9.3",
|
||||
"typescript-eslint": "^8.54.0",
|
||||
"vite": "^7.3.1",
|
||||
"vite-plugin-comlink": "^5.3.0",
|
||||
"vite-plugin-glsl": "^1.6.0",
|
||||
"vite-plugin-wasm": "^3.6.0",
|
||||
"vitest": "^4.1.5",
|
||||
"vitest-browser-svelte": "^2.1.1"
|
||||
"vite-plugin-glsl": "^1.5.5",
|
||||
"vite-plugin-wasm": "^3.5.0",
|
||||
"vitest": "^4.0.18",
|
||||
"vitest-browser-svelte": "^2.0.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
<script lang="ts">
|
||||
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
|
||||
class="bg-layer-2 opacity-75 hover:opacity-100 cursor-pointer rounded-sm p-1 px-2"
|
||||
onclick={() => exitToGroup()}
|
||||
>
|
||||
Root
|
||||
</button>
|
||||
|
||||
{#each intermediateGroups as entry (entry.id)}
|
||||
<span class="i-[tabler--arrow-right]"></span>
|
||||
<button
|
||||
class="bg-layer-2 opacity-75 hover:opacity-100 cursor-pointer rounded-sm p-1 px-2"
|
||||
onclick={() => exitToGroup(entry.id)}
|
||||
>
|
||||
{getGroupName(entry.id)}
|
||||
</button>
|
||||
{/each}
|
||||
|
||||
<span class="i-[tabler--arrow-right]"></span>
|
||||
<button class="bg-layer-2 opacity-100 cursor-pointer rounded-sm p-1 px-2">
|
||||
{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>
|
||||
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);
|
||||
});
|
||||
});
|
||||
@@ -152,6 +152,10 @@ export class GraphState {
|
||||
this.edges.delete(edgeId);
|
||||
}
|
||||
|
||||
getEdgeData() {
|
||||
return this.edges;
|
||||
}
|
||||
|
||||
updateNodePosition(node: NodeInstance) {
|
||||
if (
|
||||
node.state.x === node.position[0]
|
||||
@@ -186,6 +190,29 @@ export class GraphState {
|
||||
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: '__internal/node/debug',
|
||||
position: [node.position[0] + 30, node.position[1]],
|
||||
props: {}
|
||||
});
|
||||
|
||||
if (debugNode) {
|
||||
this.graph.createEdge(node, 0, debugNode, 'input');
|
||||
}
|
||||
}
|
||||
|
||||
copyNodes() {
|
||||
if (this.activeNodeId === -1 && !this.selectedNodes?.size) {
|
||||
return;
|
||||
@@ -213,10 +240,6 @@ export class GraphState {
|
||||
};
|
||||
}
|
||||
|
||||
unGroupSelectedNodes() {
|
||||
return this.graph.ungroupNode(this.activeNodeId);
|
||||
}
|
||||
|
||||
groupSelectedNodes() {
|
||||
return this.graph.groupNodes([...this.selectedNodes.keys(), this.activeNodeId]);
|
||||
}
|
||||
@@ -339,8 +362,7 @@ export class GraphState {
|
||||
for (const node of this.graph.nodes.values()) {
|
||||
const x = node.position[0];
|
||||
const y = node.position[1];
|
||||
const nodeType = this.graph.getNodeType(node);
|
||||
const height = nodeType ? getNodeHeight(nodeType) : 20;
|
||||
const height = getNodeHeight(this.graph.getNodeType(node)!);
|
||||
if (downX > x && downX < x + 20 && downY > y && downY < y + height) {
|
||||
clickedNodeId = node.id;
|
||||
break;
|
||||
@@ -352,7 +374,6 @@ export class GraphState {
|
||||
}
|
||||
|
||||
isNodeInView(node: NodeInstance) {
|
||||
if (!node) return false;
|
||||
const height = getNodeHeight(this.graph.getNodeType(node)!);
|
||||
const width = 20;
|
||||
return node.position[0] > this.cameraBounds[0] - width
|
||||
@@ -369,7 +390,7 @@ export class GraphState {
|
||||
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);
|
||||
const ok = this.graph.enterGroup(this.activeNodeId, [...this.cameraPosition]);
|
||||
if (ok) {
|
||||
this.activeNodeId = -1;
|
||||
this.clearSelection();
|
||||
@@ -379,7 +400,8 @@ export class GraphState {
|
||||
exitGroupNode() {
|
||||
const result = this.graph.exitGroup();
|
||||
if (!result) return;
|
||||
this.activeNodeId = result.nodeId;
|
||||
this.cameraPosition = result.camera;
|
||||
this.activeNodeId = -1;
|
||||
this.clearSelection();
|
||||
}
|
||||
|
||||
@@ -387,13 +409,6 @@ export class GraphState {
|
||||
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,
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
import AddMenu from '../components/AddMenu.svelte';
|
||||
import BoxSelection from '../components/BoxSelection.svelte';
|
||||
import Camera from '../components/Camera.svelte';
|
||||
import GroupBreadcrumps from '../components/GroupBreadcrumps.svelte';
|
||||
import HelpView from '../components/HelpView.svelte';
|
||||
import Debug from '../debug/Debug.svelte';
|
||||
import EdgeEl from '../edges/Edge.svelte';
|
||||
@@ -96,17 +95,11 @@
|
||||
graphState.addMenuPosition = null;
|
||||
}
|
||||
|
||||
function getSocketType(node: NodeInstance, index: number | string): string {
|
||||
function getSocketType(node: NodeInstance, index: number | string, e: unknown): string {
|
||||
const nodeType = graph.getNodeType(node);
|
||||
if (typeof index === 'string') {
|
||||
return nodeType?.inputs?.[index].type || 'unknown';
|
||||
}
|
||||
|
||||
if (node.type === '__internal/group/input') {
|
||||
const key = Object.keys(nodeType?.inputs || {})[index];
|
||||
return nodeType?.inputs?.[key].type || 'unknown';
|
||||
}
|
||||
|
||||
return nodeType?.outputs?.[index] || 'unknown';
|
||||
}
|
||||
</script>
|
||||
@@ -121,7 +114,6 @@
|
||||
bind:this={graphState.wrapper}
|
||||
class="graph-wrapper"
|
||||
style="height: 100%"
|
||||
class:is-inside-group={graph.isInsideGroup}
|
||||
class:is-panning={graphState.isPanning}
|
||||
class:is-hovering={graphState.hoveredNodeId !== -1}
|
||||
aria-label="Graph"
|
||||
@@ -129,7 +121,6 @@
|
||||
tabindex="0"
|
||||
bind:clientWidth={graphState.width}
|
||||
bind:clientHeight={graphState.height}
|
||||
style:--padding-right="{safePadding?.right || 0}px"
|
||||
onkeydown={(ev) => keymap.handleKeyboardEvent(ev)}
|
||||
onmousedown={(ev) => mouseEvents.handleMouseDown(ev)}
|
||||
oncontextmenu={(ev) => mouseEvents.handleContextMenu(ev)}
|
||||
@@ -145,8 +136,6 @@
|
||||
/>
|
||||
<label for="drop-zone"></label>
|
||||
|
||||
<GroupBreadcrumps />
|
||||
|
||||
<Canvas shadows={false} renderMode="on-demand" colorManagementEnabled={false}>
|
||||
<Camera
|
||||
bind:camera={graphState.camera}
|
||||
@@ -180,6 +169,12 @@
|
||||
{/if}
|
||||
|
||||
{#if graph.status === 'idle'}
|
||||
{#if graph.isInsideGroup}
|
||||
<HTML transform={false}>
|
||||
<button class="exit-group" onclick={() => graphState.exitGroupNode()}>↑ Exit Group</button>
|
||||
</HTML>
|
||||
{/if}
|
||||
|
||||
{#if graphState.addMenuPosition}
|
||||
<AddMenu
|
||||
onnode={handleNodeCreation}
|
||||
@@ -193,8 +188,8 @@
|
||||
{#if graphState.activeSocket}
|
||||
<EdgeEl
|
||||
z={graphState.cameraPosition[2]}
|
||||
inputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
|
||||
outputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
|
||||
inputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index, 'c')}
|
||||
outputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index, 'd')}
|
||||
x1={graphState.activeSocket.position[0]}
|
||||
y1={graphState.activeSocket.position[1]}
|
||||
x2={graphState.edgeEndPosition?.[0] ?? graphState.mousePosition[0]}
|
||||
@@ -207,8 +202,8 @@
|
||||
<EdgeEl
|
||||
id={graph.getEdgeId(edge)}
|
||||
z={graphState.cameraPosition[2]}
|
||||
inputType={getSocketType(edge[0], edge[1])}
|
||||
outputType={getSocketType(edge[2], edge[3])}
|
||||
inputType={getSocketType(edge[0], edge[1], 'a')}
|
||||
outputType={getSocketType(edge[2], edge[3], 'b')}
|
||||
{x1}
|
||||
{y1}
|
||||
{x2}
|
||||
@@ -227,10 +222,10 @@
|
||||
style:transform={`scale(${graphState.cameraPosition[2] * 0.1})`}
|
||||
class:hovering-sockets={graphState.activeSocket}
|
||||
>
|
||||
{#each graph.nodeArray as node, index (node.id)}
|
||||
{#each graph.getAllNodes() as node (node.id)}
|
||||
<NodeEl
|
||||
bind:node={graph.nodeArray[index]}
|
||||
inView={node ? graphState.isNodeInView(node) : false}
|
||||
{node}
|
||||
inView={graphState.isNodeInView(node)}
|
||||
/>
|
||||
{/each}
|
||||
</div>
|
||||
@@ -255,6 +250,26 @@
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
:global(.exit-group) {
|
||||
position: fixed;
|
||||
top: 12px;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
z-index: 1000;
|
||||
padding: 4px 12px;
|
||||
background: var(--color-layer-2);
|
||||
border: 1px solid var(--stroke);
|
||||
border-radius: 4px;
|
||||
color: inherit;
|
||||
font-size: 0.85em;
|
||||
cursor: pointer;
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
:global(.exit-group:hover) {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.wrapper {
|
||||
position: absolute;
|
||||
z-index: 100;
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
graph,
|
||||
registry,
|
||||
safePadding,
|
||||
// eslint-disable-next-line no-useless-assignment
|
||||
settings = $bindable(),
|
||||
activeNode = $bindable(),
|
||||
backgroundType = $bindable('grid'),
|
||||
@@ -84,8 +83,8 @@
|
||||
|
||||
manager.on('save', (save) => onsave?.(save));
|
||||
|
||||
onMount(() => {
|
||||
if (graph) {
|
||||
$effect(() => {
|
||||
if (graph && (manager.status !== 'idle' || manager.graph.id !== graph.id)) {
|
||||
manager.load(graph);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -2,7 +2,7 @@ type Color = { hue: number; saturation: number; lightness: number };
|
||||
|
||||
export class ColorGenerator {
|
||||
private colors: Map<string, Color> = new Map();
|
||||
// private lightnessLevels = [10, 60];
|
||||
private lightnessLevels = [10, 60];
|
||||
|
||||
constructor(predefined: Record<string, Color>) {
|
||||
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 {
|
||||
if (this.colors.has(id)) {
|
||||
return this.colorToHsl(this.colors.get(id)!);
|
||||
|
||||
@@ -190,7 +190,7 @@ export class MouseEventManager {
|
||||
// if we clicked on a node
|
||||
if (clickedNodeId !== -1) {
|
||||
if (event.ctrlKey && event.shiftKey) {
|
||||
this.graph.tryConnectToDebugNode(clickedNodeId);
|
||||
this.state.tryConnectToDebugNode(clickedNodeId);
|
||||
return;
|
||||
}
|
||||
if (this.state.activeNodeId === -1) {
|
||||
|
||||
@@ -1,16 +1,6 @@
|
||||
import type {
|
||||
Edge,
|
||||
NodeDefinition,
|
||||
NodeInstance,
|
||||
SerializedEdge,
|
||||
SerializedNode
|
||||
} from '@nodarium/types';
|
||||
import type { NodeDefinition, NodeInstance } from '@nodarium/types';
|
||||
|
||||
export function getParameterHeight(node: NodeDefinition, inputKey: string) {
|
||||
if (node.id === '__internal/group/input') {
|
||||
return 50;
|
||||
}
|
||||
|
||||
const input = node.inputs?.[inputKey];
|
||||
if (!input) {
|
||||
return 0;
|
||||
@@ -33,31 +23,17 @@ export function getParameterHeight(node: NodeDefinition, inputKey: string) {
|
||||
return 50;
|
||||
}
|
||||
|
||||
export function serializeNode(node: SerializedNode | NodeInstance): SerializedNode {
|
||||
return {
|
||||
id: node.id,
|
||||
position: [...node.position],
|
||||
type: node.type,
|
||||
props: node.props
|
||||
};
|
||||
}
|
||||
|
||||
export function serializeEdge(edge: SerializedEdge | Edge): SerializedEdge {
|
||||
if (typeof edge[0] === 'number' && typeof edge[2] === 'number') {
|
||||
return [edge[0], edge[1], edge[2], edge[3]];
|
||||
}
|
||||
const e = edge as Edge;
|
||||
return [e[0].id, e[1], e[2].id, e[3]];
|
||||
}
|
||||
|
||||
const nodeHeightCache: Record<string, number> = {};
|
||||
export function getNodeHeight(node: NodeDefinition) {
|
||||
if (!node || !('inputs' in node)) {
|
||||
return 5;
|
||||
if (!node) {
|
||||
console.trace('Node is undefined', node);
|
||||
}
|
||||
if (node.id in nodeHeightCache) {
|
||||
return nodeHeightCache[node.id];
|
||||
}
|
||||
if (!node?.inputs) {
|
||||
return 5;
|
||||
}
|
||||
let height = 5;
|
||||
|
||||
for (const key in node.inputs) {
|
||||
@@ -68,34 +44,3 @@ export function getNodeHeight(node: NodeDefinition) {
|
||||
nodeHeightCache[node.id] = 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;
|
||||
}
|
||||
|
||||
@@ -66,17 +66,8 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
|
||||
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()
|
||||
});
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
};
|
||||
let { node = $bindable(), inView }: Props = $props();
|
||||
|
||||
const nodeType = $derived(node ? graph.getNodeType(node) : undefined);
|
||||
const nodeType = $derived(graph.getNodeType(node)!);
|
||||
|
||||
const isActive = $derived(graphState.activeNodeId === node.id);
|
||||
const isSelected = $derived(graphState.selectedNodes.has(node.id));
|
||||
@@ -33,17 +33,15 @@
|
||||
);
|
||||
|
||||
const sectionHeights = $derived(
|
||||
nodeType
|
||||
? Object
|
||||
.keys(nodeType?.inputs || {})
|
||||
Object
|
||||
.keys(nodeType.inputs || {})
|
||||
.map(key => getParameterHeight(nodeType, key) / 10)
|
||||
.filter(b => !!b)
|
||||
: [5]
|
||||
);
|
||||
|
||||
let meshRef: Mesh | undefined = $state();
|
||||
|
||||
const height = $derived(nodeType ? getNodeHeight(nodeType) : 20);
|
||||
const height = $derived(getNodeHeight(nodeType));
|
||||
|
||||
const zoom = $derived(graphState.cameraPosition[2]);
|
||||
|
||||
|
||||
@@ -23,17 +23,7 @@
|
||||
|
||||
const cornerTop = 10;
|
||||
const nodeType = $derived(graph.getNodeType(node));
|
||||
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 rightBump = $derived(!!nodeType?.outputs?.length);
|
||||
const aspectRatio = 0.25;
|
||||
|
||||
const path = $derived(
|
||||
@@ -42,7 +32,6 @@
|
||||
height: 34,
|
||||
y: 49,
|
||||
cornerTop,
|
||||
cornerBottom,
|
||||
rightBump,
|
||||
aspectRatio
|
||||
})
|
||||
@@ -53,7 +42,6 @@
|
||||
height: 40,
|
||||
y: 49,
|
||||
cornerTop,
|
||||
cornerBottom,
|
||||
rightBump,
|
||||
aspectRatio
|
||||
})
|
||||
@@ -83,9 +71,8 @@
|
||||
{#if appSettings.value.debug.advancedMode}
|
||||
<span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span>
|
||||
{/if}
|
||||
{nodeType?.meta?.title || node.type?.split('/').pop()}
|
||||
{node.type.split('/').pop()}
|
||||
</div>
|
||||
{#if rightBump}
|
||||
<div
|
||||
class="target"
|
||||
role="button"
|
||||
@@ -93,7 +80,6 @@
|
||||
onmousedown={handleMouseDown}
|
||||
>
|
||||
</div>
|
||||
{/if}
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 100 100"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
let { node = $bindable(), input, id, isLast }: Props = $props();
|
||||
|
||||
let nodeType = $derived(graph.getNodeType(node)!);
|
||||
const nodeType = $derived(graph.getNodeType(node)!);
|
||||
|
||||
const inputType = $derived(nodeType.inputs?.[id]);
|
||||
|
||||
@@ -29,27 +29,14 @@
|
||||
function handleMouseDown(ev: MouseEvent) {
|
||||
ev.preventDefault();
|
||||
ev.stopPropagation();
|
||||
|
||||
if (node.type === '__internal/group/input') {
|
||||
const outputIndex = Object.entries(nodeType?.inputs ?? {}).findIndex(([key]) => key === id);
|
||||
graphState.setDownSocket({
|
||||
node,
|
||||
index: outputIndex,
|
||||
position: graphState.getSocketPosition(node, outputIndex)
|
||||
});
|
||||
} else {
|
||||
graphState.setDownSocket({
|
||||
node,
|
||||
index: id,
|
||||
position: graphState.getSocketPosition(node, id)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const leftBump = $derived(
|
||||
nodeType.inputs?.[id].internal !== true && node.type !== '__internal/group/input'
|
||||
);
|
||||
const rightBump = $derived(node.type === '__internal/group/input');
|
||||
const leftBump = $derived(nodeType.inputs?.[id].internal !== true);
|
||||
const cornerBottom = $derived(isLast ? 5 : 0);
|
||||
const aspectRatio = 0.5;
|
||||
|
||||
@@ -59,7 +46,6 @@
|
||||
height: 2000 / height,
|
||||
y: 50.5,
|
||||
cornerBottom,
|
||||
rightBump,
|
||||
leftBump,
|
||||
aspectRatio
|
||||
})
|
||||
@@ -69,7 +55,6 @@
|
||||
depth: 7,
|
||||
height: 2200 / height,
|
||||
y: 50.5,
|
||||
rightBump,
|
||||
cornerBottom,
|
||||
leftBump,
|
||||
aspectRatio
|
||||
@@ -91,7 +76,6 @@
|
||||
<div
|
||||
class="wrapper"
|
||||
data-node-type={node.type}
|
||||
class:is-group-input={node.type === '__internal/group/input'}
|
||||
data-node-input={id}
|
||||
style:height="{height}px"
|
||||
style:--socket-color={hoverColor}
|
||||
@@ -146,11 +130,6 @@
|
||||
transform: translateY(-50%) translateX(-50%);
|
||||
}
|
||||
|
||||
.is-group-input .target {
|
||||
right: 0px;
|
||||
transform: translateY(-50%) translateX(50%);
|
||||
}
|
||||
|
||||
.possible-socket .target::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
export const debugNode = {
|
||||
id: '__internal/node/debug',
|
||||
meta: {
|
||||
title: 'Debug'
|
||||
},
|
||||
id: '__internal/debug/instance',
|
||||
inputs: {
|
||||
input: {
|
||||
type: '*',
|
||||
label: ''
|
||||
type: '*'
|
||||
}
|
||||
},
|
||||
execute(_data: Int32Array): Int32Array {
|
||||
|
||||
@@ -2,8 +2,7 @@ export const groupNode = {
|
||||
id: '__internal/group/instance',
|
||||
meta: { title: 'Group' },
|
||||
inputs: {
|
||||
groupId: {
|
||||
label: '',
|
||||
input: {
|
||||
type: 'select',
|
||||
values: []
|
||||
}
|
||||
|
||||
@@ -80,6 +80,7 @@ export function createGeometryPool(parentScene: Group, material: Material) {
|
||||
}
|
||||
|
||||
const normals = new Float32Array(data.buffer, index * 4, vertexCount * 3);
|
||||
index = index + vertexCount * 3;
|
||||
|
||||
if (
|
||||
geometry.userData?.faceCount !== faceCount
|
||||
|
||||
@@ -1,23 +1,13 @@
|
||||
import type { Graph } from '@nodarium/types';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { expandGroups } from './runtime-executor';
|
||||
import type { Graph } from '@nodarium/types';
|
||||
|
||||
// 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 } : {})
|
||||
};
|
||||
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] {
|
||||
function edge(from: number, fromSocket: number, to: number, toSocket: string): [number, number, number, string] {
|
||||
return [from, fromSocket, to, toSocket];
|
||||
}
|
||||
|
||||
|
||||
@@ -6,42 +6,11 @@ import type {
|
||||
RuntimeExecutor,
|
||||
SyncCache
|
||||
} from '@nodarium/types';
|
||||
import {
|
||||
concatEncodedArrays,
|
||||
createLogger,
|
||||
encodeFloat,
|
||||
fastHashArrayBuffer,
|
||||
type PerformanceStore
|
||||
} from '@nodarium/utils';
|
||||
import type { RuntimeNode } from './types';
|
||||
|
||||
const log = createLogger('runtime-executor');
|
||||
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 nodes = [...graph.nodes];
|
||||
let edges = [...graph.edges];
|
||||
|
||||
let changed = true;
|
||||
@@ -77,16 +46,10 @@ export function expandGroups(graph: Graph): Graph {
|
||||
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) {
|
||||
for (const intEdge of fromInput) {
|
||||
const toId = idMap.get(intEdge[2]);
|
||||
if (toId !== undefined) newEdges.push([extEdge[0], extEdge[1], toId, intEdge[3]]);
|
||||
}
|
||||
@@ -124,6 +87,17 @@ export function expandGroups(graph: Graph): Graph {
|
||||
|
||||
return { ...graph, nodes, edges };
|
||||
}
|
||||
import {
|
||||
concatEncodedArrays,
|
||||
createLogger,
|
||||
encodeFloat,
|
||||
fastHashArrayBuffer,
|
||||
type PerformanceStore
|
||||
} from '@nodarium/utils';
|
||||
import type { RuntimeNode } from './types';
|
||||
|
||||
const log = createLogger('runtime-executor');
|
||||
log.mute();
|
||||
|
||||
function getValue(input: NodeInput, value?: unknown) {
|
||||
if (value === undefined && 'value' in input) {
|
||||
@@ -185,8 +159,8 @@ export class MemoryRuntimeExecutor implements RuntimeExecutor {
|
||||
// Only load non-virtual types (virtual nodes are resolved locally)
|
||||
const nonVirtualTypes = graph.nodes
|
||||
.map(node => node.type)
|
||||
.filter(t => !t.startsWith('__internal/'));
|
||||
await this.registry.load(nonVirtualTypes);
|
||||
.filter(t => !t.startsWith('__virtual/'));
|
||||
await this.registry.load(nonVirtualTypes as any);
|
||||
|
||||
const typeMap = new Map<string, NodeDefinition>();
|
||||
for (const node of graph.nodes) {
|
||||
|
||||
@@ -204,13 +204,6 @@
|
||||
|
||||
.input-boolean > label {
|
||||
order: 2;
|
||||
font-size: 1em;
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
label {
|
||||
font-size: 0.8em;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.first-level.input {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
import { type Snippet } from '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 }>();
|
||||
|
||||
$effect(() => {
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
<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}
|
||||
/>
|
||||
{:else}
|
||||
<p class="mx-4 mt-4">Node has no settings</p>
|
||||
{/if}
|
||||
@@ -1,103 +1,32 @@
|
||||
<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;
|
||||
};
|
||||
import type { NodeInstance } from '@nodarium/types';
|
||||
import ActiveNodeSelected from './ActiveNodeSelected.svelte';
|
||||
|
||||
type Props = {
|
||||
manager: GraphManager;
|
||||
node: NodeInstance | undefined;
|
||||
};
|
||||
|
||||
const { manager, node = $bindable() }: Props = $props();
|
||||
|
||||
function filterInputs(inputs?: Record<string, NodeInput>) {
|
||||
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[]>;
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
const isGroupInstance = $derived(node?.type === '__internal/group/instance');
|
||||
|
||||
$effect(() => {
|
||||
if (store) {
|
||||
updateNode();
|
||||
}
|
||||
});
|
||||
let { manager, node = $bindable() }: Props = $props();
|
||||
</script>
|
||||
|
||||
{#if !isGroupInstance && Object.keys(nodeDefinition).length}
|
||||
<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>Node Settings</h3>
|
||||
</div>
|
||||
<NestedSettings
|
||||
id="activeNodeSettings"
|
||||
bind:value={store}
|
||||
type={nodeDefinition}
|
||||
/>
|
||||
|
||||
{#if node}
|
||||
{#key node.id}
|
||||
{#if node}
|
||||
<ActiveNodeSelected {manager} bind:node />
|
||||
{/if}
|
||||
{/key}
|
||||
{:else}
|
||||
<p class="mx-4 mt-4">No node selected</p>
|
||||
{/if}
|
||||
|
||||
{#if manager?.graph.groups.length}
|
||||
<button onclick={() => manager.removeUnusedGroups()}>
|
||||
remove unused groups
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
@@ -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,135 +0,0 @@
|
||||
<script lang="ts">
|
||||
import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
|
||||
import type { GroupDefinition } from '@nodarium/types';
|
||||
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 class="remove-all" 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;
|
||||
}
|
||||
|
||||
.remove-all {
|
||||
background: none;
|
||||
border: 1px solid var(--color-outline);
|
||||
border-radius: 4px;
|
||||
color: var(--color-text);
|
||||
cursor: pointer;
|
||||
font-family: var(--font-family);
|
||||
font-size: 0.85em;
|
||||
padding: 0.2em 0.5em;
|
||||
}
|
||||
|
||||
.remove-all:hover {
|
||||
border-color: var(--color-active);
|
||||
}
|
||||
|
||||
.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>
|
||||
@@ -5,7 +5,6 @@
|
||||
import { debounceAsyncFunction } from '$lib/helpers';
|
||||
import { createKeyMap } from '$lib/helpers/createKeyMap';
|
||||
import { debugNode } from '$lib/node-registry/debugNode';
|
||||
import { groupNode } from '$lib/node-registry/groupNode.js';
|
||||
import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
|
||||
import NodeStore from '$lib/node-store/NodeStore.svelte';
|
||||
import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte';
|
||||
@@ -22,7 +21,6 @@
|
||||
import Changelog from '$lib/sidebar/panels/Changelog.svelte';
|
||||
import ExportSettings from '$lib/sidebar/panels/ExportSettings.svelte';
|
||||
import GraphSource from '$lib/sidebar/panels/GraphSource.svelte';
|
||||
import GroupSettings from '$lib/sidebar/panels/GroupSettings.svelte';
|
||||
import Keymap from '$lib/sidebar/panels/Keymap.svelte';
|
||||
import { panelState } from '$lib/sidebar/PanelState.svelte';
|
||||
import Sidebar from '$lib/sidebar/Sidebar.svelte';
|
||||
@@ -39,7 +37,7 @@
|
||||
|
||||
const registryCache = new IndexDBCache('node-registry');
|
||||
|
||||
const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode, groupNode]);
|
||||
const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode]);
|
||||
const workerRuntime = new WorkerRuntimeExecutor();
|
||||
const runtimeCache = new MemoryRuntimeCache();
|
||||
const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
|
||||
@@ -96,7 +94,7 @@
|
||||
randomSeed: { type: 'boolean', value: false }
|
||||
});
|
||||
$effect(() => {
|
||||
if (graphSettings && graphSettingTypes && manager?.loaded) {
|
||||
if (graphSettings && graphSettingTypes) {
|
||||
manager?.setSettings($state.snapshot(graphSettings));
|
||||
}
|
||||
});
|
||||
@@ -172,7 +170,6 @@
|
||||
config={tutorialConfig}
|
||||
actions={{
|
||||
'setup-default': () => {
|
||||
console.log('setup-default');
|
||||
const ts = new Date().toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' });
|
||||
pm.handleCreateProject(
|
||||
structuredClone(templates.defaultPlant) as unknown as Graph,
|
||||
@@ -180,16 +177,15 @@
|
||||
);
|
||||
},
|
||||
'load-tutorial-template': () => {
|
||||
console.log('load-tutorial-template');
|
||||
if (!pm.graph) return;
|
||||
const g = structuredClone(templates.tutorial) as unknown as Graph;
|
||||
g.id = pm.graph.id;
|
||||
g.meta = { ...pm.graph.meta };
|
||||
manager.load(g);
|
||||
pm.graph = g;
|
||||
pm.saveGraph(g);
|
||||
graphInterface.state.centerNode(graphInterface.manager.getAllNodes()[0]);
|
||||
},
|
||||
'open-github-nodes': () => {
|
||||
console.log('open-github-nodes');
|
||||
window.open(
|
||||
'https://github.com/jim-fx/nodarium/tree/main/nodes/max/plantarium',
|
||||
'__blank'
|
||||
@@ -258,12 +254,11 @@
|
||||
</Grid.Cell>
|
||||
<Grid.Cell>
|
||||
{#if pm.graph}
|
||||
{#key pm.graph.id}
|
||||
<GraphInterface
|
||||
graph={pm.graph}
|
||||
bind:this={graphInterface}
|
||||
registry={nodeRegistry}
|
||||
safePadding={{ right: sidebarOpen ? 321 : undefined }}
|
||||
safePadding={{ right: sidebarOpen ? 330 : undefined }}
|
||||
backgroundType={appSettings.value.nodeInterface.backgroundType}
|
||||
snapToGrid={appSettings.value.nodeInterface.snapToGrid}
|
||||
bind:activeNode
|
||||
@@ -273,7 +268,6 @@
|
||||
onsave={(g) => pm.saveGraph(g)}
|
||||
onresult={(result) => handleUpdate(result as Graph)}
|
||||
/>
|
||||
{/key}
|
||||
{/if}
|
||||
<Sidebar bind:open={sidebarOpen}>
|
||||
<Panel id="general" title="General" icon="i-[tabler--settings]">
|
||||
@@ -327,9 +321,7 @@
|
||||
hidden={!appSettings.value.debug.advancedMode}
|
||||
icon="i-[tabler--code]"
|
||||
>
|
||||
{#if manager?.status === 'idle'}
|
||||
<GraphSource graph={manager.serialize()} />
|
||||
{/if}
|
||||
<GraphSource graph={manager?.serialize()} />
|
||||
</Panel>
|
||||
<Panel
|
||||
id="benchmark"
|
||||
@@ -344,16 +336,12 @@
|
||||
title="Graph Settings"
|
||||
icon="i-[custom--graph] bg-blue-400"
|
||||
>
|
||||
<span class="block h-[1px]"></span>
|
||||
<NestedSettings
|
||||
id="graph-settings"
|
||||
type={graphSettingTypes}
|
||||
bind:value={graphSettings}
|
||||
/>
|
||||
{#key activeNode}
|
||||
<ActiveNodeSettings {manager} bind:node={activeNode} />
|
||||
<GroupSettings graphState={graphInterface?.state} {manager} bind:node={activeNode} />
|
||||
{/key}
|
||||
</Panel>
|
||||
<Panel
|
||||
id="changelog"
|
||||
|
||||
+35
-47
@@ -47,7 +47,6 @@ User Interaction
|
||||
```
|
||||
|
||||
**Event flow:**
|
||||
|
||||
1. User edits graph → GraphManager mutates state
|
||||
2. GraphManager emits `save` → ProjectManager persists to IndexDB
|
||||
3. GraphManager emits `result` → Runtime executes graph → Viewer updates
|
||||
@@ -57,7 +56,7 @@ User Interaction
|
||||
## Critical Files
|
||||
|
||||
| File | Role |
|
||||
| ------------------------------------------------------ | --------------------------------------------------------------------- |
|
||||
|------|------|
|
||||
| `app/src/routes/+page.svelte` | Wires all systems; creates GraphManager, runtime, registry |
|
||||
| `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 |
|
||||
@@ -84,56 +83,54 @@ User Interaction
|
||||
```typescript
|
||||
// packages/types/src/types.ts
|
||||
|
||||
type NodeId = `${string}/${string}/${string}`; // e.g. "max/plantarium/stem"
|
||||
type NodeId = `${string}/${string}/${string}` // e.g. "max/plantarium/stem"
|
||||
|
||||
type NodeInstance = {
|
||||
id: number;
|
||||
type: NodeId;
|
||||
position: [number, number];
|
||||
props?: Record<string, number | number[]>; // current parameter values
|
||||
meta?: { title?: string; lastModified?: string };
|
||||
state: NodeRuntimeState; // runtime-only, NOT serialized
|
||||
};
|
||||
id: number
|
||||
type: NodeId
|
||||
position: [number, number]
|
||||
props?: Record<string, number | number[]> // current parameter values
|
||||
meta?: { title?: string; lastModified?: string }
|
||||
state: NodeRuntimeState // runtime-only, NOT serialized
|
||||
}
|
||||
|
||||
type NodeRuntimeState = {
|
||||
type?: NodeDefinition; // resolved definition
|
||||
parents?: NodeInstance[];
|
||||
children?: NodeInstance[];
|
||||
x?: number;
|
||||
y?: number; // interpolated position
|
||||
mesh?: Mesh; // Three.js mesh reference
|
||||
ref?: HTMLElement;
|
||||
};
|
||||
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
|
||||
};
|
||||
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 Edge = [NodeInstance, number, NodeInstance, string]
|
||||
|
||||
type Graph = {
|
||||
nodes: NodeInstance[];
|
||||
edges: [number, number, number, string][]; // serialized (IDs, not refs)
|
||||
settings: Record<string, unknown>;
|
||||
groups: GroupDefinition[];
|
||||
};
|
||||
nodes: NodeInstance[]
|
||||
edges: [number, number, number, string][] // serialized (IDs, not refs)
|
||||
settings: Record<string, unknown>
|
||||
groups: GroupDefinition[]
|
||||
}
|
||||
|
||||
type GroupDefinition = {
|
||||
id: number;
|
||||
nodes: NodeInstance[];
|
||||
edges: Edge[];
|
||||
inputs?: Record<string, NodeInput>;
|
||||
outputs?: string[];
|
||||
};
|
||||
id: number
|
||||
nodes: NodeInstance[]
|
||||
edges: Edge[]
|
||||
inputs?: Record<string, NodeInput>
|
||||
outputs?: string[]
|
||||
}
|
||||
```
|
||||
|
||||
### NodeInput socket types
|
||||
|
||||
`float` | `integer` | `boolean` | `select` | `seed` | `vec3` | `geometry` | `path` | `shape` | `color` | `*` (wildcard)
|
||||
|
||||
Each input can have: `value` (default), `label`, `hidden`, `external`, `setting` (link to graph setting), `accepts` (extra compatible types).
|
||||
@@ -143,43 +140,34 @@ Each input can have: `value` (default), `label`, `hidden`, `external`, `setting`
|
||||
## 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`.
|
||||
|
||||
---
|
||||
@@ -191,7 +179,7 @@ Group selected nodes with **Ctrl+G**. A `GroupDefinition` is stored in `Graph.gr
|
||||
**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 |
|
||||
|
||||
+1
-1
@@ -20,6 +20,6 @@
|
||||
"packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316",
|
||||
"devDependencies": {
|
||||
"chokidar-cli": "catalog:",
|
||||
"dprint": "^0.54.0"
|
||||
"dprint": "^0.51.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nodarium/planty",
|
||||
"version": "0.0.6",
|
||||
"version": "0.0.1",
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
"build": "vite build",
|
||||
@@ -10,8 +10,8 @@
|
||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||
"lint": "eslint .",
|
||||
"format": "dprint fmt -c '../../.dprint.jsonc' .",
|
||||
"format:check": "dprint check -c '../../.dprint.jsonc' ."
|
||||
"format": "dprint fmt -c '../.dprint.jsonc' .",
|
||||
"format:check": "dprint check -c '../.dprint.jsonc' ."
|
||||
},
|
||||
"files": [
|
||||
"dist",
|
||||
@@ -34,29 +34,29 @@
|
||||
"svelte": "^5.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/compat": "^2.0.5",
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@nodarium/ui": "workspace:*",
|
||||
"@eslint/compat": "^2.0.4",
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@sveltejs/adapter-auto": "^7.0.1",
|
||||
"@sveltejs/kit": "^2.59.0",
|
||||
"@sveltejs/kit": "^2.57.0",
|
||||
"@sveltejs/package": "^2.5.7",
|
||||
"@sveltejs/vite-plugin-svelte": "^7.0.0",
|
||||
"@tailwindcss/vite": "^4.2.4",
|
||||
"@types/node": "^25.6.0",
|
||||
"eslint": "^10.3.0",
|
||||
"@tailwindcss/vite": "^4.2.2",
|
||||
"@types/node": "^24",
|
||||
"eslint": "^10.2.0",
|
||||
"eslint-config-prettier": "^10.1.8",
|
||||
"eslint-plugin-svelte": "^3.17.1",
|
||||
"globals": "^17.6.0",
|
||||
"prettier": "^3.8.3",
|
||||
"eslint-plugin-svelte": "^3.17.0",
|
||||
"globals": "^17.4.0",
|
||||
"prettier": "^3.8.1",
|
||||
"prettier-plugin-svelte": "^3.5.1",
|
||||
"prettier-plugin-tailwindcss": "^0.8.0",
|
||||
"prettier-plugin-tailwindcss": "^0.7.2",
|
||||
"publint": "^0.3.18",
|
||||
"svelte": "^5.55.5",
|
||||
"svelte-check": "^4.4.7",
|
||||
"tailwindcss": "^4.2.4",
|
||||
"typescript": "^6.0.3",
|
||||
"typescript-eslint": "^8.59.1",
|
||||
"vite": "^8.0.10"
|
||||
"svelte": "^5.55.2",
|
||||
"svelte-check": "^4.4.6",
|
||||
"tailwindcss": "^4.2.2",
|
||||
"typescript": "^6.0.2",
|
||||
"typescript-eslint": "^8.58.1",
|
||||
"vite": "^8.0.7"
|
||||
},
|
||||
"keywords": [
|
||||
"svelte"
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
"skipLibCheck": true,
|
||||
"sourceMap": true,
|
||||
"strict": true,
|
||||
"module": "NodeNext",
|
||||
"moduleResolution": "bundler"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nodarium/types",
|
||||
"version": "0.0.6",
|
||||
"version": "0.0.5",
|
||||
"description": "",
|
||||
"type": "module",
|
||||
"main": "src/index.ts",
|
||||
@@ -18,9 +18,9 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"zod": "^4.4.3"
|
||||
"zod": "^4.3.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"dprint": "^0.54.0"
|
||||
"dprint": "^0.51.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@ export type {
|
||||
NodeDefinition,
|
||||
NodeId,
|
||||
NodeInstance,
|
||||
SerializedEdge,
|
||||
SerializedNode,
|
||||
Socket
|
||||
} from './types';
|
||||
|
||||
@@ -61,10 +61,8 @@ export const NodeInputBooleanSchema = z.object({
|
||||
export const NodeInputSelectSchema = z.object({
|
||||
...DefaultOptionsSchema.shape,
|
||||
type: z.literal('select'),
|
||||
options: z.array(
|
||||
z.union([z.string(), z.object({ value: z.number(), label: z.string() })])
|
||||
).optional(),
|
||||
value: z.union([z.string(), z.number()]).optional()
|
||||
options: z.array(z.string()).optional(),
|
||||
value: z.string().optional()
|
||||
});
|
||||
|
||||
export const NodeInputSeedSchema = z.object({
|
||||
|
||||
@@ -76,13 +76,8 @@ export type Socket = {
|
||||
|
||||
export type Edge = [NodeInstance, number, NodeInstance, string];
|
||||
|
||||
const SerializedEdgeSchema = z.tuple([z.number(), z.number(), z.number(), z.string()]);
|
||||
|
||||
export type SerializedEdge = z.infer<typeof SerializedEdgeSchema>;
|
||||
|
||||
export const GroupSchema = z.object({
|
||||
id: z.number(),
|
||||
name: z.string().optional(),
|
||||
nodes: z.array(NodeSchema),
|
||||
edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()])),
|
||||
inputs: z.record(z.string(), NodeInputSchema).optional(),
|
||||
@@ -104,7 +99,7 @@ export const GraphSchema = z.object({
|
||||
.optional(),
|
||||
settings: z.record(z.string(), z.any()).optional(),
|
||||
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)
|
||||
});
|
||||
|
||||
|
||||
+30
-31
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nodarium/ui",
|
||||
"version": "0.0.6",
|
||||
"version": "0.0.5",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
@@ -30,47 +30,46 @@
|
||||
"svelte": "^4.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/compat": "^2.0.5",
|
||||
"@eslint/eslintrc": "^3.3.5",
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@eslint/compat": "^2.0.2",
|
||||
"@eslint/eslintrc": "^3.3.3",
|
||||
"@eslint/js": "^9.39.2",
|
||||
"@nodarium/types": "workspace:^",
|
||||
"@playwright/test": "^1.59.1",
|
||||
"@playwright/test": "^1.58.1",
|
||||
"@sveltejs/adapter-static": "^3.0.10",
|
||||
"@sveltejs/kit": "^2.59.0",
|
||||
"@sveltejs/kit": "^2.50.2",
|
||||
"@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",
|
||||
"@types/eslint": "^9.6.1",
|
||||
"@types/node": "^25.6.0",
|
||||
"@types/three": "^0.184.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.59.1",
|
||||
"@typescript-eslint/parser": "^8.59.1",
|
||||
"@vitest/browser-playwright": "^4.1.5",
|
||||
"dprint": "^0.54.0",
|
||||
"eslint": "^10.3.0",
|
||||
"eslint-plugin-svelte": "^3.17.1",
|
||||
"globals": "^17.6.0",
|
||||
"publint": "^0.3.18",
|
||||
"svelte": "^5.55.5",
|
||||
"svelte-check": "^4.4.7",
|
||||
"svelte-eslint-parser": "^1.6.0",
|
||||
"@types/three": "^0.182.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.54.0",
|
||||
"@typescript-eslint/parser": "^8.54.0",
|
||||
"@vitest/browser-playwright": "^4.0.18",
|
||||
"dprint": "^0.51.1",
|
||||
"eslint": "^9.39.2",
|
||||
"eslint-plugin-svelte": "^3.14.0",
|
||||
"globals": "^17.3.0",
|
||||
"publint": "^0.3.17",
|
||||
"svelte": "^5.49.2",
|
||||
"svelte-check": "^4.3.6",
|
||||
"svelte-eslint-parser": "^1.4.1",
|
||||
"tslib": "^2.8.1",
|
||||
"typescript": "^6.0.3",
|
||||
"typescript-eslint": "^8.59.1",
|
||||
"vite": "^8.0.10",
|
||||
"vitest": "^4.1.5",
|
||||
"vitest-browser-svelte": "^2.1.1"
|
||||
"typescript": "^5.9.3",
|
||||
"typescript-eslint": "^8.54.0",
|
||||
"vite": "^7.3.1",
|
||||
"vitest": "^4.0.18",
|
||||
"vitest-browser-svelte": "^2.0.2"
|
||||
},
|
||||
"svelte": "./dist/index.js",
|
||||
"types": "./dist/index.d.ts",
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@iconify-json/tabler": "^1.2.33",
|
||||
"@iconify/tailwind4": "^1.2.3",
|
||||
"@nodarium/ui": "workspace:*",
|
||||
"@tailwindcss/vite": "^4.2.4",
|
||||
"@threlte/core": "^8.5.11",
|
||||
"@threlte/extras": "^9.15.1",
|
||||
"tailwindcss": "^4.2.4"
|
||||
"@iconify-json/tabler": "^1.2.26",
|
||||
"@iconify/tailwind4": "^1.2.1",
|
||||
"@tailwindcss/vite": "^4.1.18",
|
||||
"@threlte/core": "^8.3.1",
|
||||
"@threlte/extras": "^9.7.1",
|
||||
"tailwindcss": "^4.1.18"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<script module lang="ts">
|
||||
// eslint-disable-next-line svelte/prefer-svelte-reactivity
|
||||
<script module>
|
||||
const cache = new Map<string, Record<string, boolean>>();
|
||||
|
||||
function getStore(root: string): Record<string, boolean> {
|
||||
@@ -60,7 +59,7 @@
|
||||
}
|
||||
return [] as [string, unknown][];
|
||||
});
|
||||
const showKeys = $derived(!isArr || typeof items[0]?.[1] === 'object');
|
||||
const showKeys = $derived(!isArr || typeof items[0]?.[1] === "object")
|
||||
|
||||
function toggle(next: boolean) {
|
||||
open = next;
|
||||
@@ -89,13 +88,7 @@
|
||||
class:bg-layer-3={flashing}
|
||||
>
|
||||
{#if key !== undefined}
|
||||
<button
|
||||
class="text-text hover:bg-layer-3 cursor-pointer"
|
||||
title="Copy value"
|
||||
onclick={() => navigator.clipboard.writeText(JSON.stringify({ [key]: value }, null, 2))}
|
||||
>
|
||||
{key}
|
||||
</button><span class="text-text/40">: </span>
|
||||
<span class="text-text">{key}</span><span class="text-text/40">: </span>
|
||||
{/if}
|
||||
|
||||
{#if isExpandable}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
@source inline("{hover:,}{bg-,outline-,text-,}layer-3{/30,/50,}");
|
||||
@source inline("{hover:,}{bg-,outline-,text-,}active");
|
||||
@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-,}text");
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ export { default as InputNumber } from './inputs/InputNumber.svelte';
|
||||
export { default as InputSelect } from './inputs/InputSelect.svelte';
|
||||
export { default as InputShape } from './inputs/InputShape.svelte';
|
||||
export { default as InputVec3 } from './inputs/InputVec3.svelte';
|
||||
export { default as SocketTable } from './inputs/SocketTable.svelte';
|
||||
|
||||
export { default as Details } from './Details.svelte';
|
||||
export { default as JsonViewer } from './JsonViewer.svelte';
|
||||
|
||||
@@ -1,22 +1,16 @@
|
||||
<script lang="ts">
|
||||
type SelectOption = string | { value: number; label: string };
|
||||
|
||||
interface Props {
|
||||
options?: SelectOption[];
|
||||
options?: string[];
|
||||
value?: number;
|
||||
id?: string;
|
||||
}
|
||||
|
||||
let { options = [], value = $bindable(0), id = '' }: Props = $props();
|
||||
|
||||
const normalized = $derived(
|
||||
options.map((opt, i) => typeof opt === 'string' ? { value: i, label: opt } : opt)
|
||||
);
|
||||
</script>
|
||||
|
||||
<select {id} bind:value class="bg-layer-2 text-text">
|
||||
{#each normalized as opt (opt.value)}
|
||||
<option value={opt.value}>{opt.label}</option>
|
||||
{#each options as label, i (label)}
|
||||
<option value={i}>{label}</option>
|
||||
{/each}
|
||||
</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>
|
||||
@@ -1,5 +1,4 @@
|
||||
<script lang="ts">
|
||||
import type { NodeInput } from '@nodarium/types';
|
||||
import '$lib/app.css';
|
||||
import {
|
||||
Details,
|
||||
@@ -12,7 +11,6 @@
|
||||
JsonViewer,
|
||||
ShortCut
|
||||
} from '$lib';
|
||||
import SocketTable from '$lib/inputs/SocketTable.svelte';
|
||||
import Section from './Section.svelte';
|
||||
import Theme from './Theme.svelte';
|
||||
import ThemeSelector from './ThemeSelector.svelte';
|
||||
@@ -23,7 +21,7 @@
|
||||
let vecValue = $state([0.2, 0.3, 0.4]);
|
||||
const options = ['strawberry', 'raspberry', 'chickpeas'];
|
||||
let selectValue = $state(0);
|
||||
let selectValue2 = $state(0);
|
||||
const d = $derived(options[selectValue]);
|
||||
let checked = $state(false);
|
||||
let colorValue = $state<[number, number, number]>([59, 130, 246]);
|
||||
let mirrorShape = $state(true);
|
||||
@@ -40,17 +38,6 @@
|
||||
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) {
|
||||
@@ -95,28 +82,9 @@
|
||||
<InputVec3 bind:value={vecValue} />
|
||||
</Section>
|
||||
|
||||
<Section title="Select">
|
||||
<p>
|
||||
Select with simple values
|
||||
<br>
|
||||
<b>value={options[selectValue]}</b>
|
||||
</p>
|
||||
<Section title="Select" value={d}>
|
||||
<i>Select with simple values</i>
|
||||
<InputSelect bind:value={selectValue} {options} />
|
||||
<br>
|
||||
<br>
|
||||
<p>
|
||||
Select with <i>{option: number, label: string}[]</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 title="Checkbox" value={checked}>
|
||||
@@ -163,18 +131,6 @@
|
||||
</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">
|
||||
<div class="flex gap-4">
|
||||
<ShortCut ctrl key="S" />
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
'custom'
|
||||
];
|
||||
|
||||
// eslint-disable-next-line no-useless-assignment
|
||||
let { theme = $bindable() } = $props();
|
||||
|
||||
let themeIndex = $state(0);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nodarium/utils",
|
||||
"version": "0.0.6",
|
||||
"version": "0.0.5",
|
||||
"description": "",
|
||||
"main": "./src/index.ts",
|
||||
"type": "module",
|
||||
@@ -16,8 +16,8 @@
|
||||
"@nodarium/types": "workspace:^"
|
||||
},
|
||||
"devDependencies": {
|
||||
"dprint": "^0.54.0",
|
||||
"vite": "^8.0.10",
|
||||
"vitest": "^4.1.5"
|
||||
"dprint": "^0.51.1",
|
||||
"vite": "^7.3.1",
|
||||
"vitest": "^4.0.18"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 = (() => {
|
||||
let maxLength = 5;
|
||||
return (scope: string) => {
|
||||
@@ -63,35 +6,18 @@ export const createLogger = (() => {
|
||||
|
||||
let isGrouped = false;
|
||||
|
||||
function s(color: string, ...args: unknown[]) {
|
||||
function s(color: string, ...args: any) {
|
||||
return isGrouped
|
||||
? [...args]
|
||||
: [`[%c${scope.padEnd(maxLength, ' ')}]:`, `color: ${color}`, ...args];
|
||||
}
|
||||
|
||||
function record(level: string, args: unknown[]) {
|
||||
logBuffer.push({ time: formatTime(), scope, level, args });
|
||||
}
|
||||
|
||||
return {
|
||||
log: (...args: unknown[]) => {
|
||||
record('log', args);
|
||||
!muted && console.log(...s('#888', ...args));
|
||||
},
|
||||
info: (...args: unknown[]) => {
|
||||
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);
|
||||
log: (...args: any[]) => !muted && console.log(...s('#888', ...args)),
|
||||
info: (...args: any[]) => !muted && console.info(...s('#888', ...args)),
|
||||
warn: (...args: any[]) => !muted && console.warn(...s('#888', ...args)),
|
||||
error: (...args: any[]) => console.error(...s('#f88', ...args)),
|
||||
group: (...args: any[]) => {
|
||||
if (!muted) {
|
||||
console.groupCollapsed(...s('#888', ...args));
|
||||
isGrouped = true;
|
||||
|
||||
Generated
+2034
-1030
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,6 @@ packages:
|
||||
|
||||
catalog:
|
||||
chokidar-cli: github:open-cli-tools/chokidar-cli#semver:v4.0.0
|
||||
|
||||
onlyBuiltDependencies:
|
||||
- "@tailwindcss/oxide"
|
||||
- esbuild
|
||||
|
||||
Reference in New Issue
Block a user