Compare commits
1 Commits
v0.0.6
..
9c9a7b8c67
| Author | SHA1 | Date | |
|---|---|---|---|
 max
|
9c9a7b8c67
|
@@ -65,9 +65,6 @@ jobs:
|
|||||||
- name: 🔧 Setup
|
- name: 🔧 Setup
|
||||||
uses: ./.gitea/actions/setup
|
uses: ./.gitea/actions/setup
|
||||||
|
|
||||||
- name: 🏗️ Build Web Assets
|
|
||||||
run: pnpm build
|
|
||||||
|
|
||||||
- name: 🧪 Run Tests
|
- name: 🧪 Run Tests
|
||||||
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" pnpm test:e2e
|
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" pnpm test:e2e
|
||||||
|
|
||||||
|
|||||||
+13
-139
@@ -1,59 +1,35 @@
|
|||||||
import type { Graph, Graph as GraphType, NodeId } from '@nodarium/types';
|
import type { Graph, Graph as GraphType, NodeId } from '@nodarium/types';
|
||||||
import { createLogger, createPerformanceStore, splitNestedArray } from '@nodarium/utils';
|
import { createLogger, createPerformanceStore, splitNestedArray } from '@nodarium/utils';
|
||||||
|
|
||||||
import { mkdir, writeFile } from 'node:fs/promises';
|
import { mkdir, writeFile } from 'node:fs/promises';
|
||||||
import { freemem, loadavg, totalmem } from 'node:os';
|
|
||||||
import { resolve } from 'node:path';
|
import { resolve } from 'node:path';
|
||||||
|
|
||||||
import { MemoryRuntimeExecutor } from '../src/lib/runtime/runtime-executor.ts';
|
import { MemoryRuntimeExecutor } from '../src/lib/runtime/runtime-executor.ts';
|
||||||
import { BenchmarkRegistry } from './benchmarkRegistry.ts';
|
import { BenchmarkRegistry } from './benchmarkRegistry.ts';
|
||||||
|
|
||||||
import {
|
|
||||||
getMachineInfo,
|
|
||||||
measureCpuUsage,
|
|
||||||
readCgroupCpuStat,
|
|
||||||
readCpuSnapshot,
|
|
||||||
readProcMemInfo,
|
|
||||||
SystemSample
|
|
||||||
} from './systemStats.ts';
|
|
||||||
import defaultPlantTemplate from './templates/default.json' assert { type: 'json' };
|
import defaultPlantTemplate from './templates/default.json' assert { type: 'json' };
|
||||||
import lottaFacesTemplate from './templates/lotta-faces.json' assert { type: 'json' };
|
import lottaFacesTemplate from './templates/lotta-faces.json' assert { type: 'json' };
|
||||||
import plantTemplate from './templates/plant.json' assert { type: 'json' };
|
import plantTemplate from './templates/plant.json' assert { type: 'json' };
|
||||||
|
|
||||||
const registry = new BenchmarkRegistry();
|
const registry = new BenchmarkRegistry();
|
||||||
const r = new MemoryRuntimeExecutor(registry);
|
const r = new MemoryRuntimeExecutor(registry);
|
||||||
|
const perfStore = createPerformanceStore();
|
||||||
|
|
||||||
const log = createLogger('bench');
|
const log = createLogger('bench');
|
||||||
|
|
||||||
const templates: Record<string, Graph> = {
|
const templates: Record<string, Graph> = {
|
||||||
plant: plantTemplate as unknown as GraphType,
|
'plant': plantTemplate as unknown as GraphType,
|
||||||
'lotta-faces': lottaFacesTemplate as unknown as GraphType,
|
'lotta-faces': lottaFacesTemplate as unknown as GraphType,
|
||||||
default: defaultPlantTemplate as unknown as GraphType
|
'default': defaultPlantTemplate as unknown as GraphType
|
||||||
};
|
};
|
||||||
|
|
||||||
function average(values: number[]) {
|
function countGeometry(result: Int32Array): { totalVertices: number; totalFaces: number } {
|
||||||
if (values.length === 0) return 0;
|
|
||||||
return values.reduce((a, b) => a + b, 0) / values.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
function countGeometry(result: Int32Array): {
|
|
||||||
totalVertices: number;
|
|
||||||
totalFaces: number;
|
|
||||||
} {
|
|
||||||
const parts = splitNestedArray(result);
|
const parts = splitNestedArray(result);
|
||||||
|
|
||||||
let totalVertices = 0;
|
let totalVertices = 0;
|
||||||
let totalFaces = 0;
|
let totalFaces = 0;
|
||||||
|
|
||||||
for (const part of parts) {
|
for (const part of parts) {
|
||||||
const type = part[0];
|
const type = part[0];
|
||||||
|
const vertexCount = part[1];
|
||||||
const vertexCount = part[1] >>> 0;
|
const faceCount = part[2];
|
||||||
const faceCount = part[2] >>> 0;
|
|
||||||
|
|
||||||
if (type === 2) {
|
if (type === 2) {
|
||||||
const instanceCount = part[3] >>> 0;
|
const instanceCount = part[3];
|
||||||
|
|
||||||
totalVertices += vertexCount * instanceCount;
|
totalVertices += vertexCount * instanceCount;
|
||||||
totalFaces += faceCount * instanceCount;
|
totalFaces += faceCount * instanceCount;
|
||||||
} else {
|
} else {
|
||||||
@@ -61,144 +37,42 @@ function countGeometry(result: Int32Array): {
|
|||||||
totalFaces += faceCount;
|
totalFaces += faceCount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return { totalVertices, totalFaces };
|
||||||
return {
|
|
||||||
totalVertices,
|
|
||||||
totalFaces
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function run(g: GraphType, amount: number) {
|
async function run(g: GraphType, amount: number) {
|
||||||
await registry.load(g.nodes.map(n => n.type) as NodeId[]);
|
await registry.load(plantTemplate.nodes.map(n => n.type) as NodeId[]);
|
||||||
|
|
||||||
log.log('loaded ' + g.nodes.length + ' nodes');
|
log.log('loaded ' + g.nodes.length + ' nodes');
|
||||||
|
|
||||||
log.log('warming up');
|
log.log('warming up');
|
||||||
|
|
||||||
|
// Warm up the runtime? maybe this does something?
|
||||||
for (let index = 0; index < 10; index++) {
|
for (let index = 0; index < 10; index++) {
|
||||||
await r.execute(g, { randomSeed: true });
|
await r.execute(g, { randomSeed: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
const systemSamples: SystemSample[] = [];
|
|
||||||
|
|
||||||
let previousCpuSnapshot = await readCpuSnapshot();
|
|
||||||
|
|
||||||
const sampler = setInterval(async () => {
|
|
||||||
try {
|
|
||||||
const cpu = await measureCpuUsage(previousCpuSnapshot);
|
|
||||||
|
|
||||||
previousCpuSnapshot = cpu.snapshot;
|
|
||||||
|
|
||||||
const [l1, l5, l15] = loadavg();
|
|
||||||
|
|
||||||
systemSamples.push({
|
|
||||||
timestamp: Date.now(),
|
|
||||||
|
|
||||||
cpuUsagePercent: cpu.usagePercent,
|
|
||||||
cpuStealPercent: cpu.stealPercent,
|
|
||||||
|
|
||||||
load1: l1,
|
|
||||||
load5: l5,
|
|
||||||
load15: l15,
|
|
||||||
|
|
||||||
freeMemory: freemem(),
|
|
||||||
totalMemory: totalmem()
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
}
|
|
||||||
}, 1000);
|
|
||||||
|
|
||||||
log.log('executing');
|
log.log('executing');
|
||||||
|
|
||||||
const perfStore = createPerformanceStore();
|
|
||||||
|
|
||||||
r.perf = perfStore;
|
r.perf = perfStore;
|
||||||
|
let res;
|
||||||
let res: Int32Array | undefined;
|
|
||||||
|
|
||||||
const cgroupBefore = await readCgroupCpuStat();
|
|
||||||
|
|
||||||
for (let i = 0; i < amount; i++) {
|
for (let i = 0; i < amount; i++) {
|
||||||
r.perf?.startRun();
|
r.perf?.startRun();
|
||||||
|
|
||||||
res = await r.execute(g, { randomSeed: true });
|
res = await r.execute(g, { randomSeed: true });
|
||||||
|
|
||||||
r.perf?.stopRun();
|
r.perf?.stopRun();
|
||||||
|
|
||||||
const { totalVertices, totalFaces } = countGeometry(res!);
|
const { totalVertices, totalFaces } = countGeometry(res!);
|
||||||
|
|
||||||
r.perf?.addToLastRun('total-vertices', totalVertices);
|
r.perf?.addToLastRun('total-vertices', totalVertices);
|
||||||
r.perf?.addToLastRun('total-faces', totalFaces);
|
r.perf?.addToLastRun('total-faces', totalFaces);
|
||||||
}
|
}
|
||||||
|
|
||||||
const cgroupAfter = await readCgroupCpuStat();
|
|
||||||
|
|
||||||
clearInterval(sampler);
|
|
||||||
|
|
||||||
log.log('finished');
|
log.log('finished');
|
||||||
|
return r.perf.get();
|
||||||
return {
|
|
||||||
data: r.perf.get(),
|
|
||||||
metadata: {
|
|
||||||
timestamp: new Date().toISOString(),
|
|
||||||
|
|
||||||
machine: getMachineInfo(),
|
|
||||||
|
|
||||||
process: {
|
|
||||||
pid: process.pid,
|
|
||||||
uptime: process.uptime(),
|
|
||||||
|
|
||||||
memoryUsage: process.memoryUsage()
|
|
||||||
},
|
|
||||||
|
|
||||||
system: {
|
|
||||||
averages: {
|
|
||||||
cpuUsagePercent: average(
|
|
||||||
systemSamples.map(s => s.cpuUsagePercent)
|
|
||||||
),
|
|
||||||
|
|
||||||
cpuStealPercent: average(
|
|
||||||
systemSamples.map(s => s.cpuStealPercent)
|
|
||||||
),
|
|
||||||
|
|
||||||
load1: average(systemSamples.map(s => s.load1)),
|
|
||||||
load5: average(systemSamples.map(s => s.load5)),
|
|
||||||
load15: average(systemSamples.map(s => s.load15)),
|
|
||||||
|
|
||||||
freeMemory: average(
|
|
||||||
systemSamples.map(s => s.freeMemory)
|
|
||||||
)
|
|
||||||
},
|
|
||||||
|
|
||||||
samples: systemSamples,
|
|
||||||
|
|
||||||
meminfo: await readProcMemInfo()
|
|
||||||
},
|
|
||||||
|
|
||||||
cgroup: {
|
|
||||||
before: cgroupBefore,
|
|
||||||
after: cgroupAfter
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
const outPath = resolve('benchmark/out/');
|
const outPath = resolve('benchmark/out/');
|
||||||
|
|
||||||
await mkdir(outPath, { recursive: true });
|
await mkdir(outPath, { recursive: true });
|
||||||
|
|
||||||
for (const key in templates) {
|
for (const key in templates) {
|
||||||
log.log('executing ' + key);
|
log.log('executing ' + key);
|
||||||
|
|
||||||
const perfData = await run(templates[key], 100);
|
const perfData = await run(templates[key], 100);
|
||||||
|
await writeFile(resolve(outPath, key + '.json'), JSON.stringify(perfData));
|
||||||
await writeFile(
|
|
||||||
resolve(outPath, key + '.json'),
|
|
||||||
JSON.stringify(perfData, null, 2)
|
|
||||||
);
|
|
||||||
|
|
||||||
await new Promise(res => setTimeout(res, 200));
|
await new Promise(res => setTimeout(res, 200));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 page.goto('http://localhost:4173', { waitUntil: 'load' });
|
||||||
|
|
||||||
|
// await expect(page).toHaveScreenshot();
|
||||||
|
await expect(page.locator('.graph-wrapper')).toHaveScreenshot();
|
||||||
|
|
||||||
await page.getByRole('button', { name: 'projects' }).click();
|
await page.getByRole('button', { name: 'projects' }).click();
|
||||||
await page.getByRole('button', { name: 'New', exact: true }).click();
|
await page.getByRole('button', { name: 'New', exact: true }).click();
|
||||||
await page.getByRole('combobox').selectOption('2');
|
await page.getByRole('combobox').selectOption('2');
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
+31
-31
@@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "@nodarium/app",
|
"name": "@nodarium/app",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.0.6",
|
"version": "0.0.5",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
"predev": "rm static/CHANGELOG.md && ln -s ../../CHANGELOG.md static/CHANGELOG.md",
|
"predev": "rm static/CHANGELOG.md && ln -s ../../CHANGELOG.md static/CHANGELOG.md",
|
||||||
"build": "svelte-kit sync && vite build",
|
"build": "svelte-kit sync && vite build",
|
||||||
"test:unit": "vitest --browser=false",
|
"test:unit": "vitest",
|
||||||
"test": "npm run test:unit -- --run && npm run test:e2e",
|
"test": "npm run test:unit -- --run && npm run test:e2e",
|
||||||
"test:e2e": "playwright test",
|
"test:e2e": "playwright test",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
@@ -18,49 +18,49 @@
|
|||||||
"bench": "tsx ./benchmark/index.ts"
|
"bench": "tsx ./benchmark/index.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nodarium/planty": "workspace:*",
|
|
||||||
"@nodarium/ui": "workspace:*",
|
"@nodarium/ui": "workspace:*",
|
||||||
"@nodarium/utils": "workspace:*",
|
"@nodarium/utils": "workspace:*",
|
||||||
"@sveltejs/kit": "^2.59.0",
|
"@nodarium/planty": "workspace:*",
|
||||||
"@tailwindcss/vite": "^4.2.4",
|
"@sveltejs/kit": "^2.50.2",
|
||||||
"@threlte/core": "8.5.11",
|
"@tailwindcss/vite": "^4.1.18",
|
||||||
"@threlte/extras": "9.15.1",
|
"@threlte/core": "8.3.1",
|
||||||
|
"@threlte/extras": "9.7.1",
|
||||||
"comlink": "^4.4.2",
|
"comlink": "^4.4.2",
|
||||||
"file-saver": "^2.0.5",
|
"file-saver": "^2.0.5",
|
||||||
"idb": "^8.0.3",
|
"idb": "^8.0.3",
|
||||||
"jsondiffpatch": "^0.7.3",
|
"jsondiffpatch": "^0.7.3",
|
||||||
"micromark": "^4.0.2",
|
"micromark": "^4.0.2",
|
||||||
"tailwindcss": "^4.2.4",
|
"tailwindcss": "^4.1.18",
|
||||||
"three": "^0.184.0"
|
"three": "^0.182.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/compat": "^2.0.5",
|
"@eslint/compat": "^2.0.2",
|
||||||
"@eslint/js": "^10.0.1",
|
"@eslint/js": "^9.39.2",
|
||||||
"@iconify-json/tabler": "^1.2.33",
|
"@iconify-json/tabler": "^1.2.26",
|
||||||
"@iconify/tailwind4": "^1.2.3",
|
"@iconify/tailwind4": "^1.2.1",
|
||||||
"@nodarium/types": "workspace:^",
|
"@nodarium/types": "workspace:^",
|
||||||
"@playwright/test": "^1.59.1",
|
"@playwright/test": "^1.58.1",
|
||||||
"@sveltejs/adapter-static": "^3.0.10",
|
"@sveltejs/adapter-static": "^3.0.10",
|
||||||
"@sveltejs/vite-plugin-svelte": "^7.0.0",
|
"@sveltejs/vite-plugin-svelte": "^6.2.4",
|
||||||
"@tsconfig/svelte": "^5.0.8",
|
"@tsconfig/svelte": "^5.0.7",
|
||||||
"@types/file-saver": "^2.0.7",
|
"@types/file-saver": "^2.0.7",
|
||||||
"@types/three": "^0.184.0",
|
"@types/three": "^0.182.0",
|
||||||
"@vitest/browser-playwright": "^4.1.5",
|
"@vitest/browser-playwright": "^4.0.18",
|
||||||
"dprint": "^0.54.0",
|
"dprint": "^0.51.1",
|
||||||
"eslint": "^10.3.0",
|
"eslint": "^9.39.2",
|
||||||
"eslint-plugin-svelte": "^3.17.1",
|
"eslint-plugin-svelte": "^3.14.0",
|
||||||
"globals": "^17.6.0",
|
"globals": "^17.3.0",
|
||||||
"svelte": "^5.55.5",
|
"svelte": "^5.49.2",
|
||||||
"svelte-check": "^4.4.7",
|
"svelte-check": "^4.3.6",
|
||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"tsx": "^4.21.0",
|
"tsx": "^4.21.0",
|
||||||
"typescript": "^6.0.3",
|
"typescript": "^5.9.3",
|
||||||
"typescript-eslint": "^8.59.1",
|
"typescript-eslint": "^8.54.0",
|
||||||
"vite": "^8.0.10",
|
"vite": "^7.3.1",
|
||||||
"vite-plugin-comlink": "^5.3.0",
|
"vite-plugin-comlink": "^5.3.0",
|
||||||
"vite-plugin-glsl": "^1.6.0",
|
"vite-plugin-glsl": "^1.5.5",
|
||||||
"vite-plugin-wasm": "^3.6.0",
|
"vite-plugin-wasm": "^3.5.0",
|
||||||
"vitest": "^4.1.5",
|
"vitest": "^4.0.18",
|
||||||
"vitest-browser-svelte": "^2.1.1"
|
"vitest-browser-svelte": "^2.0.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,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);
|
this.edges.delete(edgeId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getEdgeData() {
|
||||||
|
return this.edges;
|
||||||
|
}
|
||||||
|
|
||||||
updateNodePosition(node: NodeInstance) {
|
updateNodePosition(node: NodeInstance) {
|
||||||
if (
|
if (
|
||||||
node.state.x === node.position[0]
|
node.state.x === node.position[0]
|
||||||
@@ -186,6 +190,29 @@ export class GraphState {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tryConnectToDebugNode(nodeId: number) {
|
||||||
|
const node = this.graph.nodes.get(nodeId);
|
||||||
|
if (!node) return;
|
||||||
|
if (node.type.endsWith('/debug')) return;
|
||||||
|
if (!node.state.type?.outputs?.length) return;
|
||||||
|
for (const _node of this.graph.nodes.values()) {
|
||||||
|
if (_node.type.endsWith('/debug')) {
|
||||||
|
this.graph.createEdge(node, 0, _node, 'input');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const debugNode = this.graph.createNode({
|
||||||
|
type: '__internal/node/debug',
|
||||||
|
position: [node.position[0] + 30, node.position[1]],
|
||||||
|
props: {}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (debugNode) {
|
||||||
|
this.graph.createEdge(node, 0, debugNode, 'input');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
copyNodes() {
|
copyNodes() {
|
||||||
if (this.activeNodeId === -1 && !this.selectedNodes?.size) {
|
if (this.activeNodeId === -1 && !this.selectedNodes?.size) {
|
||||||
return;
|
return;
|
||||||
@@ -213,10 +240,6 @@ export class GraphState {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
unGroupSelectedNodes() {
|
|
||||||
return this.graph.ungroupNode(this.activeNodeId);
|
|
||||||
}
|
|
||||||
|
|
||||||
groupSelectedNodes() {
|
groupSelectedNodes() {
|
||||||
return this.graph.groupNodes([...this.selectedNodes.keys(), this.activeNodeId]);
|
return this.graph.groupNodes([...this.selectedNodes.keys(), this.activeNodeId]);
|
||||||
}
|
}
|
||||||
@@ -339,8 +362,7 @@ export class GraphState {
|
|||||||
for (const node of this.graph.nodes.values()) {
|
for (const node of this.graph.nodes.values()) {
|
||||||
const x = node.position[0];
|
const x = node.position[0];
|
||||||
const y = node.position[1];
|
const y = node.position[1];
|
||||||
const nodeType = this.graph.getNodeType(node);
|
const height = getNodeHeight(this.graph.getNodeType(node)!);
|
||||||
const height = nodeType ? getNodeHeight(nodeType) : 20;
|
|
||||||
if (downX > x && downX < x + 20 && downY > y && downY < y + height) {
|
if (downX > x && downX < x + 20 && downY > y && downY < y + height) {
|
||||||
clickedNodeId = node.id;
|
clickedNodeId = node.id;
|
||||||
break;
|
break;
|
||||||
@@ -352,7 +374,6 @@ export class GraphState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
isNodeInView(node: NodeInstance) {
|
isNodeInView(node: NodeInstance) {
|
||||||
if (!node) return false;
|
|
||||||
const height = getNodeHeight(this.graph.getNodeType(node)!);
|
const height = getNodeHeight(this.graph.getNodeType(node)!);
|
||||||
const width = 20;
|
const width = 20;
|
||||||
return node.position[0] > this.cameraBounds[0] - width
|
return node.position[0] > this.cameraBounds[0] - width
|
||||||
@@ -369,7 +390,7 @@ export class GraphState {
|
|||||||
if (this.activeNodeId === -1) return;
|
if (this.activeNodeId === -1) return;
|
||||||
const node = this.graph.getNode(this.activeNodeId);
|
const node = this.graph.getNode(this.activeNodeId);
|
||||||
if (!node || node.type !== '__internal/group/instance') return;
|
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) {
|
if (ok) {
|
||||||
this.activeNodeId = -1;
|
this.activeNodeId = -1;
|
||||||
this.clearSelection();
|
this.clearSelection();
|
||||||
@@ -379,7 +400,8 @@ export class GraphState {
|
|||||||
exitGroupNode() {
|
exitGroupNode() {
|
||||||
const result = this.graph.exitGroup();
|
const result = this.graph.exitGroup();
|
||||||
if (!result) return;
|
if (!result) return;
|
||||||
this.activeNodeId = result.nodeId;
|
this.cameraPosition = result.camera;
|
||||||
|
this.activeNodeId = -1;
|
||||||
this.clearSelection();
|
this.clearSelection();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -387,13 +409,6 @@ export class GraphState {
|
|||||||
node: NodeInstance,
|
node: NodeInstance,
|
||||||
index: string | number
|
index: string | number
|
||||||
): [number, 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') {
|
if (typeof index === 'number') {
|
||||||
return [
|
return [
|
||||||
(node?.state?.x ?? node.position[0]) + 20,
|
(node?.state?.x ?? node.position[0]) + 20,
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
import AddMenu from '../components/AddMenu.svelte';
|
import AddMenu from '../components/AddMenu.svelte';
|
||||||
import BoxSelection from '../components/BoxSelection.svelte';
|
import BoxSelection from '../components/BoxSelection.svelte';
|
||||||
import Camera from '../components/Camera.svelte';
|
import Camera from '../components/Camera.svelte';
|
||||||
import GroupBreadcrumps from '../components/GroupBreadcrumps.svelte';
|
|
||||||
import HelpView from '../components/HelpView.svelte';
|
import HelpView from '../components/HelpView.svelte';
|
||||||
import Debug from '../debug/Debug.svelte';
|
import Debug from '../debug/Debug.svelte';
|
||||||
import EdgeEl from '../edges/Edge.svelte';
|
import EdgeEl from '../edges/Edge.svelte';
|
||||||
@@ -96,17 +95,11 @@
|
|||||||
graphState.addMenuPosition = null;
|
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);
|
const nodeType = graph.getNodeType(node);
|
||||||
if (typeof index === 'string') {
|
if (typeof index === 'string') {
|
||||||
return nodeType?.inputs?.[index].type || 'unknown';
|
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';
|
return nodeType?.outputs?.[index] || 'unknown';
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -121,7 +114,6 @@
|
|||||||
bind:this={graphState.wrapper}
|
bind:this={graphState.wrapper}
|
||||||
class="graph-wrapper"
|
class="graph-wrapper"
|
||||||
style="height: 100%"
|
style="height: 100%"
|
||||||
class:is-inside-group={graph.isInsideGroup}
|
|
||||||
class:is-panning={graphState.isPanning}
|
class:is-panning={graphState.isPanning}
|
||||||
class:is-hovering={graphState.hoveredNodeId !== -1}
|
class:is-hovering={graphState.hoveredNodeId !== -1}
|
||||||
aria-label="Graph"
|
aria-label="Graph"
|
||||||
@@ -129,7 +121,6 @@
|
|||||||
tabindex="0"
|
tabindex="0"
|
||||||
bind:clientWidth={graphState.width}
|
bind:clientWidth={graphState.width}
|
||||||
bind:clientHeight={graphState.height}
|
bind:clientHeight={graphState.height}
|
||||||
style:--padding-right="{safePadding?.right || 0}px"
|
|
||||||
onkeydown={(ev) => keymap.handleKeyboardEvent(ev)}
|
onkeydown={(ev) => keymap.handleKeyboardEvent(ev)}
|
||||||
onmousedown={(ev) => mouseEvents.handleMouseDown(ev)}
|
onmousedown={(ev) => mouseEvents.handleMouseDown(ev)}
|
||||||
oncontextmenu={(ev) => mouseEvents.handleContextMenu(ev)}
|
oncontextmenu={(ev) => mouseEvents.handleContextMenu(ev)}
|
||||||
@@ -145,8 +136,6 @@
|
|||||||
/>
|
/>
|
||||||
<label for="drop-zone"></label>
|
<label for="drop-zone"></label>
|
||||||
|
|
||||||
<GroupBreadcrumps />
|
|
||||||
|
|
||||||
<Canvas shadows={false} renderMode="on-demand" colorManagementEnabled={false}>
|
<Canvas shadows={false} renderMode="on-demand" colorManagementEnabled={false}>
|
||||||
<Camera
|
<Camera
|
||||||
bind:camera={graphState.camera}
|
bind:camera={graphState.camera}
|
||||||
@@ -180,6 +169,12 @@
|
|||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if graph.status === 'idle'}
|
{#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}
|
{#if graphState.addMenuPosition}
|
||||||
<AddMenu
|
<AddMenu
|
||||||
onnode={handleNodeCreation}
|
onnode={handleNodeCreation}
|
||||||
@@ -193,8 +188,8 @@
|
|||||||
{#if graphState.activeSocket}
|
{#if graphState.activeSocket}
|
||||||
<EdgeEl
|
<EdgeEl
|
||||||
z={graphState.cameraPosition[2]}
|
z={graphState.cameraPosition[2]}
|
||||||
inputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
|
inputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index, 'c')}
|
||||||
outputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index)}
|
outputType={getSocketType(graphState.activeSocket.node, graphState.activeSocket.index, 'd')}
|
||||||
x1={graphState.activeSocket.position[0]}
|
x1={graphState.activeSocket.position[0]}
|
||||||
y1={graphState.activeSocket.position[1]}
|
y1={graphState.activeSocket.position[1]}
|
||||||
x2={graphState.edgeEndPosition?.[0] ?? graphState.mousePosition[0]}
|
x2={graphState.edgeEndPosition?.[0] ?? graphState.mousePosition[0]}
|
||||||
@@ -207,8 +202,8 @@
|
|||||||
<EdgeEl
|
<EdgeEl
|
||||||
id={graph.getEdgeId(edge)}
|
id={graph.getEdgeId(edge)}
|
||||||
z={graphState.cameraPosition[2]}
|
z={graphState.cameraPosition[2]}
|
||||||
inputType={getSocketType(edge[0], edge[1])}
|
inputType={getSocketType(edge[0], edge[1], 'a')}
|
||||||
outputType={getSocketType(edge[2], edge[3])}
|
outputType={getSocketType(edge[2], edge[3], 'b')}
|
||||||
{x1}
|
{x1}
|
||||||
{y1}
|
{y1}
|
||||||
{x2}
|
{x2}
|
||||||
@@ -227,10 +222,10 @@
|
|||||||
style:transform={`scale(${graphState.cameraPosition[2] * 0.1})`}
|
style:transform={`scale(${graphState.cameraPosition[2] * 0.1})`}
|
||||||
class:hovering-sockets={graphState.activeSocket}
|
class:hovering-sockets={graphState.activeSocket}
|
||||||
>
|
>
|
||||||
{#each graph.nodeArray as node, index (node.id)}
|
{#each graph.getAllNodes() as node (node.id)}
|
||||||
<NodeEl
|
<NodeEl
|
||||||
bind:node={graph.nodeArray[index]}
|
{node}
|
||||||
inView={node ? graphState.isNodeInView(node) : false}
|
inView={graphState.isNodeInView(node)}
|
||||||
/>
|
/>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
@@ -255,6 +250,26 @@
|
|||||||
height: 100%;
|
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 {
|
.wrapper {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
|
|||||||
@@ -29,7 +29,6 @@
|
|||||||
graph,
|
graph,
|
||||||
registry,
|
registry,
|
||||||
safePadding,
|
safePadding,
|
||||||
// eslint-disable-next-line no-useless-assignment
|
|
||||||
settings = $bindable(),
|
settings = $bindable(),
|
||||||
activeNode = $bindable(),
|
activeNode = $bindable(),
|
||||||
backgroundType = $bindable('grid'),
|
backgroundType = $bindable('grid'),
|
||||||
@@ -84,8 +83,8 @@
|
|||||||
|
|
||||||
manager.on('save', (save) => onsave?.(save));
|
manager.on('save', (save) => onsave?.(save));
|
||||||
|
|
||||||
onMount(() => {
|
$effect(() => {
|
||||||
if (graph) {
|
if (graph && (manager.status !== 'idle' || manager.graph.id !== graph.id)) {
|
||||||
manager.load(graph);
|
manager.load(graph);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ type Color = { hue: number; saturation: number; lightness: number };
|
|||||||
|
|
||||||
export class ColorGenerator {
|
export class ColorGenerator {
|
||||||
private colors: Map<string, Color> = new Map();
|
private colors: Map<string, Color> = new Map();
|
||||||
// private lightnessLevels = [10, 60];
|
private lightnessLevels = [10, 60];
|
||||||
|
|
||||||
constructor(predefined: Record<string, Color>) {
|
constructor(predefined: Record<string, Color>) {
|
||||||
for (const [id, colorStr] of Object.entries(predefined)) {
|
for (const [id, colorStr] of Object.entries(predefined)) {
|
||||||
@@ -10,14 +10,6 @@ export class ColorGenerator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public getColors() {
|
|
||||||
return Object.fromEntries(
|
|
||||||
this.colors.entries().map(([key, col]) => {
|
|
||||||
return [key, this.colorToHsl(col)];
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public getColor(id: string): string {
|
public getColor(id: string): string {
|
||||||
if (this.colors.has(id)) {
|
if (this.colors.has(id)) {
|
||||||
return this.colorToHsl(this.colors.get(id)!);
|
return this.colorToHsl(this.colors.get(id)!);
|
||||||
|
|||||||
@@ -190,7 +190,7 @@ export class MouseEventManager {
|
|||||||
// if we clicked on a node
|
// if we clicked on a node
|
||||||
if (clickedNodeId !== -1) {
|
if (clickedNodeId !== -1) {
|
||||||
if (event.ctrlKey && event.shiftKey) {
|
if (event.ctrlKey && event.shiftKey) {
|
||||||
this.graph.tryConnectToDebugNode(clickedNodeId);
|
this.state.tryConnectToDebugNode(clickedNodeId);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.state.activeNodeId === -1) {
|
if (this.state.activeNodeId === -1) {
|
||||||
|
|||||||
@@ -1,16 +1,6 @@
|
|||||||
import type {
|
import type { NodeDefinition, NodeInstance } from '@nodarium/types';
|
||||||
Edge,
|
|
||||||
NodeDefinition,
|
|
||||||
NodeInstance,
|
|
||||||
SerializedEdge,
|
|
||||||
SerializedNode
|
|
||||||
} from '@nodarium/types';
|
|
||||||
|
|
||||||
export function getParameterHeight(node: NodeDefinition, inputKey: string) {
|
export function getParameterHeight(node: NodeDefinition, inputKey: string) {
|
||||||
if (node.id === '__internal/group/input') {
|
|
||||||
return 50;
|
|
||||||
}
|
|
||||||
|
|
||||||
const input = node.inputs?.[inputKey];
|
const input = node.inputs?.[inputKey];
|
||||||
if (!input) {
|
if (!input) {
|
||||||
return 0;
|
return 0;
|
||||||
@@ -33,31 +23,17 @@ export function getParameterHeight(node: NodeDefinition, inputKey: string) {
|
|||||||
return 50;
|
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> = {};
|
const nodeHeightCache: Record<string, number> = {};
|
||||||
export function getNodeHeight(node: NodeDefinition) {
|
export function getNodeHeight(node: NodeDefinition) {
|
||||||
if (!node || !('inputs' in node)) {
|
if (!node) {
|
||||||
return 5;
|
console.trace('Node is undefined', node);
|
||||||
}
|
}
|
||||||
if (node.id in nodeHeightCache) {
|
if (node.id in nodeHeightCache) {
|
||||||
return nodeHeightCache[node.id];
|
return nodeHeightCache[node.id];
|
||||||
}
|
}
|
||||||
|
if (!node?.inputs) {
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
let height = 5;
|
let height = 5;
|
||||||
|
|
||||||
for (const key in node.inputs) {
|
for (const key in node.inputs) {
|
||||||
@@ -68,34 +44,3 @@ export function getNodeHeight(node: NodeDefinition) {
|
|||||||
nodeHeightCache[node.id] = height;
|
nodeHeightCache[node.id] = height;
|
||||||
return height;
|
return height;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function areSocketsCompatible(
|
|
||||||
output: string | undefined,
|
|
||||||
inputs: string | (string | undefined)[] | undefined
|
|
||||||
) {
|
|
||||||
if (output === '*') return true;
|
|
||||||
if (Array.isArray(inputs) && output) {
|
|
||||||
return inputs.includes('*') || inputs.includes(output);
|
|
||||||
}
|
|
||||||
return inputs === output;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function areEdgesEqual(firstEdge: Edge, secondEdge: Edge) {
|
|
||||||
if (firstEdge[0].id !== secondEdge[0].id) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (firstEdge[1] !== secondEdge[1]) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (firstEdge[2].id !== secondEdge[2].id) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (firstEdge[3] !== secondEdge[3]) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -66,17 +66,8 @@ export function setupKeymaps(keymap: Keymap, graph: GraphManager, graphState: Gr
|
|||||||
callback: () => graphState.groupSelectedNodes()
|
callback: () => graphState.groupSelectedNodes()
|
||||||
});
|
});
|
||||||
|
|
||||||
keymap.addShortcut({
|
|
||||||
key: 'g',
|
|
||||||
alt: true,
|
|
||||||
preventDefault: true,
|
|
||||||
description: 'Ungroup selected nodes',
|
|
||||||
callback: () => graphState.unGroupSelectedNodes()
|
|
||||||
});
|
|
||||||
|
|
||||||
keymap.addShortcut({
|
keymap.addShortcut({
|
||||||
key: 'Tab',
|
key: 'Tab',
|
||||||
preventDefault: true,
|
|
||||||
description: 'Enter selected node group',
|
description: 'Enter selected node group',
|
||||||
callback: () => graphState.enterGroupNode()
|
callback: () => graphState.enterGroupNode()
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
};
|
};
|
||||||
let { node = $bindable(), inView }: Props = $props();
|
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 isActive = $derived(graphState.activeNodeId === node.id);
|
||||||
const isSelected = $derived(graphState.selectedNodes.has(node.id));
|
const isSelected = $derived(graphState.selectedNodes.has(node.id));
|
||||||
@@ -33,17 +33,15 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
const sectionHeights = $derived(
|
const sectionHeights = $derived(
|
||||||
nodeType
|
Object
|
||||||
? Object
|
.keys(nodeType.inputs || {})
|
||||||
.keys(nodeType?.inputs || {})
|
|
||||||
.map(key => getParameterHeight(nodeType, key) / 10)
|
.map(key => getParameterHeight(nodeType, key) / 10)
|
||||||
.filter(b => !!b)
|
.filter(b => !!b)
|
||||||
: [5]
|
|
||||||
);
|
);
|
||||||
|
|
||||||
let meshRef: Mesh | undefined = $state();
|
let meshRef: Mesh | undefined = $state();
|
||||||
|
|
||||||
const height = $derived(nodeType ? getNodeHeight(nodeType) : 20);
|
const height = $derived(getNodeHeight(nodeType));
|
||||||
|
|
||||||
const zoom = $derived(graphState.cameraPosition[2]);
|
const zoom = $derived(graphState.cameraPosition[2]);
|
||||||
|
|
||||||
|
|||||||
@@ -23,17 +23,7 @@
|
|||||||
|
|
||||||
const cornerTop = 10;
|
const cornerTop = 10;
|
||||||
const nodeType = $derived(graph.getNodeType(node));
|
const nodeType = $derived(graph.getNodeType(node));
|
||||||
const rightBump = $derived(
|
const rightBump = $derived(!!nodeType?.outputs?.length);
|
||||||
!!nodeType?.outputs?.length && node.type !== '__internal/group/input'
|
|
||||||
);
|
|
||||||
const cornerBottom = $derived(
|
|
||||||
node.type === '__internal/group/input'
|
|
||||||
? (Object.keys(nodeType?.inputs ?? {}).length ? 0 : 10)
|
|
||||||
: node.type === '__internal/group/output'
|
|
||||||
? (nodeType?.outputs?.length ? 0 : 10)
|
|
||||||
: 0
|
|
||||||
);
|
|
||||||
|
|
||||||
const aspectRatio = 0.25;
|
const aspectRatio = 0.25;
|
||||||
|
|
||||||
const path = $derived(
|
const path = $derived(
|
||||||
@@ -42,7 +32,6 @@
|
|||||||
height: 34,
|
height: 34,
|
||||||
y: 49,
|
y: 49,
|
||||||
cornerTop,
|
cornerTop,
|
||||||
cornerBottom,
|
|
||||||
rightBump,
|
rightBump,
|
||||||
aspectRatio
|
aspectRatio
|
||||||
})
|
})
|
||||||
@@ -53,7 +42,6 @@
|
|||||||
height: 40,
|
height: 40,
|
||||||
y: 49,
|
y: 49,
|
||||||
cornerTop,
|
cornerTop,
|
||||||
cornerBottom,
|
|
||||||
rightBump,
|
rightBump,
|
||||||
aspectRatio
|
aspectRatio
|
||||||
})
|
})
|
||||||
@@ -83,9 +71,8 @@
|
|||||||
{#if appSettings.value.debug.advancedMode}
|
{#if appSettings.value.debug.advancedMode}
|
||||||
<span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span>
|
<span class="bg-white text-black! mr-2 px-1 rounded-sm opacity-30">{node.id}</span>
|
||||||
{/if}
|
{/if}
|
||||||
{nodeType?.meta?.title || node.type?.split('/').pop()}
|
{node.type.split('/').pop()}
|
||||||
</div>
|
</div>
|
||||||
{#if rightBump}
|
|
||||||
<div
|
<div
|
||||||
class="target"
|
class="target"
|
||||||
role="button"
|
role="button"
|
||||||
@@ -93,7 +80,6 @@
|
|||||||
onmousedown={handleMouseDown}
|
onmousedown={handleMouseDown}
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
|
||||||
<svg
|
<svg
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
viewBox="0 0 100 100"
|
viewBox="0 0 100 100"
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
let { node = $bindable(), input, id, isLast }: Props = $props();
|
let { node = $bindable(), input, id, isLast }: Props = $props();
|
||||||
|
|
||||||
let nodeType = $derived(graph.getNodeType(node)!);
|
const nodeType = $derived(graph.getNodeType(node)!);
|
||||||
|
|
||||||
const inputType = $derived(nodeType.inputs?.[id]);
|
const inputType = $derived(nodeType.inputs?.[id]);
|
||||||
|
|
||||||
@@ -29,27 +29,14 @@
|
|||||||
function handleMouseDown(ev: MouseEvent) {
|
function handleMouseDown(ev: MouseEvent) {
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
ev.stopPropagation();
|
ev.stopPropagation();
|
||||||
|
|
||||||
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({
|
graphState.setDownSocket({
|
||||||
node,
|
node,
|
||||||
index: id,
|
index: id,
|
||||||
position: graphState.getSocketPosition(node, id)
|
position: graphState.getSocketPosition(node, id)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
const leftBump = $derived(
|
const leftBump = $derived(nodeType.inputs?.[id].internal !== true);
|
||||||
nodeType.inputs?.[id].internal !== true && node.type !== '__internal/group/input'
|
|
||||||
);
|
|
||||||
const rightBump = $derived(node.type === '__internal/group/input');
|
|
||||||
const cornerBottom = $derived(isLast ? 5 : 0);
|
const cornerBottom = $derived(isLast ? 5 : 0);
|
||||||
const aspectRatio = 0.5;
|
const aspectRatio = 0.5;
|
||||||
|
|
||||||
@@ -59,7 +46,6 @@
|
|||||||
height: 2000 / height,
|
height: 2000 / height,
|
||||||
y: 50.5,
|
y: 50.5,
|
||||||
cornerBottom,
|
cornerBottom,
|
||||||
rightBump,
|
|
||||||
leftBump,
|
leftBump,
|
||||||
aspectRatio
|
aspectRatio
|
||||||
})
|
})
|
||||||
@@ -69,7 +55,6 @@
|
|||||||
depth: 7,
|
depth: 7,
|
||||||
height: 2200 / height,
|
height: 2200 / height,
|
||||||
y: 50.5,
|
y: 50.5,
|
||||||
rightBump,
|
|
||||||
cornerBottom,
|
cornerBottom,
|
||||||
leftBump,
|
leftBump,
|
||||||
aspectRatio
|
aspectRatio
|
||||||
@@ -91,7 +76,6 @@
|
|||||||
<div
|
<div
|
||||||
class="wrapper"
|
class="wrapper"
|
||||||
data-node-type={node.type}
|
data-node-type={node.type}
|
||||||
class:is-group-input={node.type === '__internal/group/input'}
|
|
||||||
data-node-input={id}
|
data-node-input={id}
|
||||||
style:height="{height}px"
|
style:height="{height}px"
|
||||||
style:--socket-color={hoverColor}
|
style:--socket-color={hoverColor}
|
||||||
@@ -146,11 +130,6 @@
|
|||||||
transform: translateY(-50%) translateX(-50%);
|
transform: translateY(-50%) translateX(-50%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.is-group-input .target {
|
|
||||||
right: 0px;
|
|
||||||
transform: translateY(-50%) translateX(50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.possible-socket .target::before {
|
.possible-socket .target::before {
|
||||||
content: "";
|
content: "";
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
export const debugNode = {
|
export const debugNode = {
|
||||||
id: '__internal/node/debug',
|
id: '__internal/debug/instance',
|
||||||
meta: {
|
|
||||||
title: 'Debug'
|
|
||||||
},
|
|
||||||
inputs: {
|
inputs: {
|
||||||
input: {
|
input: {
|
||||||
type: '*',
|
type: '*'
|
||||||
label: ''
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
execute(_data: Int32Array): Int32Array {
|
execute(_data: Int32Array): Int32Array {
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ export const groupNode = {
|
|||||||
id: '__internal/group/instance',
|
id: '__internal/group/instance',
|
||||||
meta: { title: 'Group' },
|
meta: { title: 'Group' },
|
||||||
inputs: {
|
inputs: {
|
||||||
groupId: {
|
input: {
|
||||||
label: '',
|
|
||||||
type: 'select',
|
type: 'select',
|
||||||
values: []
|
values: []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ export function createGeometryPool(parentScene: Group, material: Material) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const normals = new Float32Array(data.buffer, index * 4, vertexCount * 3);
|
const normals = new Float32Array(data.buffer, index * 4, vertexCount * 3);
|
||||||
|
index = index + vertexCount * 3;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
geometry.userData?.faceCount !== faceCount
|
geometry.userData?.faceCount !== faceCount
|
||||||
|
|||||||
@@ -1,23 +1,13 @@
|
|||||||
import type { Graph } from '@nodarium/types';
|
|
||||||
import { describe, expect, it } from 'vitest';
|
import { describe, expect, it } from 'vitest';
|
||||||
import { expandGroups } from './runtime-executor';
|
import { expandGroups } from './runtime-executor';
|
||||||
|
import type { Graph } from '@nodarium/types';
|
||||||
|
|
||||||
// Helpers to build minimal serialized nodes/edges
|
// Helpers to build minimal serialized nodes/edges
|
||||||
function node(id: number, type: string, props?: Record<string, number>) {
|
function node(id: number, type: string, props?: Record<string, number>) {
|
||||||
return {
|
return { id, type: type as Graph['nodes'][0]['type'], position: [0, 0] as [number, number], ...(props ? { props } : {}) };
|
||||||
id,
|
|
||||||
type: type as Graph['nodes'][0]['type'],
|
|
||||||
position: [0, 0] as [number, number],
|
|
||||||
...(props ? { props } : {})
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function edge(
|
function edge(from: number, fromSocket: number, to: number, toSocket: string): [number, number, number, string] {
|
||||||
from: number,
|
|
||||||
fromSocket: number,
|
|
||||||
to: number,
|
|
||||||
toSocket: string
|
|
||||||
): [number, number, number, string] {
|
|
||||||
return [from, fromSocket, to, toSocket];
|
return [from, fromSocket, to, toSocket];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,42 +6,11 @@ import type {
|
|||||||
RuntimeExecutor,
|
RuntimeExecutor,
|
||||||
SyncCache
|
SyncCache
|
||||||
} from '@nodarium/types';
|
} 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 {
|
export function expandGroups(graph: Graph): Graph {
|
||||||
if (!graph.groups || graph.groups.length === 0) return graph;
|
if (!graph.groups || graph.groups.length === 0) return graph;
|
||||||
|
|
||||||
function groupContainsSelf(groupId: number, visited = new Set<number>()): boolean {
|
let nodes = [...graph.nodes];
|
||||||
if (visited.has(groupId)) return true;
|
|
||||||
visited.add(groupId);
|
|
||||||
const group = graph.groups!.find(g => g.id === groupId);
|
|
||||||
if (!group) return false;
|
|
||||||
for (const n of group.nodes) {
|
|
||||||
if (n.type === '__internal/group/instance') {
|
|
||||||
const nestedId = n.props?.groupId as number | undefined;
|
|
||||||
if (nestedId !== undefined && groupContainsSelf(nestedId, visited)) return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const group of graph.groups) {
|
|
||||||
if (groupContainsSelf(group.id)) {
|
|
||||||
throw new Error(`Circular group reference: group ${group.id} contains itself`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const nodes = [...graph.nodes];
|
|
||||||
let edges = [...graph.edges];
|
let edges = [...graph.edges];
|
||||||
|
|
||||||
let changed = true;
|
let changed = true;
|
||||||
@@ -77,16 +46,10 @@ export function expandGroups(graph: Graph): Graph {
|
|||||||
const newEdges: Graph['edges'] = [];
|
const newEdges: Graph['edges'] = [];
|
||||||
|
|
||||||
// external_source → [inputBoundary →] internal_target
|
// 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) {
|
if (inputBoundary) {
|
||||||
const fromInput = group.edges.filter(e => e[0] === inputBoundary.id);
|
const fromInput = group.edges.filter(e => e[0] === inputBoundary.id);
|
||||||
for (const extEdge of incomingExternal) {
|
for (const extEdge of incomingExternal) {
|
||||||
const inputIndex = parseInt((extEdge[3] as string).replace('input_', ''), 10);
|
for (const intEdge of fromInput) {
|
||||||
const matchingIntEdges = fromInput.filter(e => e[1] === inputIndex);
|
|
||||||
for (const intEdge of matchingIntEdges) {
|
|
||||||
const toId = idMap.get(intEdge[2]);
|
const toId = idMap.get(intEdge[2]);
|
||||||
if (toId !== undefined) newEdges.push([extEdge[0], extEdge[1], toId, intEdge[3]]);
|
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 };
|
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) {
|
function getValue(input: NodeInput, value?: unknown) {
|
||||||
if (value === undefined && 'value' in input) {
|
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)
|
// Only load non-virtual types (virtual nodes are resolved locally)
|
||||||
const nonVirtualTypes = graph.nodes
|
const nonVirtualTypes = graph.nodes
|
||||||
.map(node => node.type)
|
.map(node => node.type)
|
||||||
.filter(t => !t.startsWith('__internal/'));
|
.filter(t => !t.startsWith('__virtual/'));
|
||||||
await this.registry.load(nonVirtualTypes);
|
await this.registry.load(nonVirtualTypes as any);
|
||||||
|
|
||||||
const typeMap = new Map<string, NodeDefinition>();
|
const typeMap = new Map<string, NodeDefinition>();
|
||||||
for (const node of graph.nodes) {
|
for (const node of graph.nodes) {
|
||||||
|
|||||||
@@ -204,13 +204,6 @@
|
|||||||
|
|
||||||
.input-boolean > label {
|
.input-boolean > label {
|
||||||
order: 2;
|
order: 2;
|
||||||
font-size: 1em;
|
|
||||||
opacity: 0.9;
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
font-size: 0.8em;
|
|
||||||
opacity: 0.7;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.first-level.input {
|
.first-level.input {
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
import { type Snippet } from 'svelte';
|
import { type Snippet } from 'svelte';
|
||||||
import { panelState as state } from './PanelState.svelte';
|
import { panelState as state } from './PanelState.svelte';
|
||||||
|
|
||||||
// eslint-disable-next-line no-useless-assignment
|
|
||||||
let { children, open = $bindable(false) } = $props<{ children?: Snippet; open?: boolean }>();
|
let { children, open = $bindable(false) } = $props<{ children?: Snippet; open?: boolean }>();
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
|
|||||||
@@ -0,0 +1,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">
|
<script lang="ts">
|
||||||
import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
|
import type { GraphManager } from '$lib/graph-interface/graph-manager.svelte';
|
||||||
import NestedSettings from '$lib/settings/NestedSettings.svelte';
|
import type { NodeInstance } from '@nodarium/types';
|
||||||
import type { NodeId, NodeInput, NodeInstance } from '@nodarium/types';
|
import ActiveNodeSelected from './ActiveNodeSelected.svelte';
|
||||||
|
|
||||||
type InternalNodeInput = NodeInput & {
|
|
||||||
__node_type?: NodeId;
|
|
||||||
__node_input: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
manager: GraphManager;
|
manager: GraphManager;
|
||||||
node: NodeInstance | undefined;
|
node: NodeInstance | undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
const { manager, node = $bindable() }: Props = $props();
|
let { 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();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
</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'>
|
||||||
<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>
|
<h3>Node Settings</h3>
|
||||||
</div>
|
</div>
|
||||||
<NestedSettings
|
|
||||||
id="activeNodeSettings"
|
{#if node}
|
||||||
bind:value={store}
|
{#key node.id}
|
||||||
type={nodeDefinition}
|
{#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}
|
{/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 { debounceAsyncFunction } from '$lib/helpers';
|
||||||
import { createKeyMap } from '$lib/helpers/createKeyMap';
|
import { createKeyMap } from '$lib/helpers/createKeyMap';
|
||||||
import { debugNode } from '$lib/node-registry/debugNode';
|
import { debugNode } from '$lib/node-registry/debugNode';
|
||||||
import { groupNode } from '$lib/node-registry/groupNode.js';
|
|
||||||
import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
|
import { IndexDBCache, RemoteNodeRegistry } from '$lib/node-registry/index';
|
||||||
import NodeStore from '$lib/node-store/NodeStore.svelte';
|
import NodeStore from '$lib/node-store/NodeStore.svelte';
|
||||||
import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte';
|
import PerformanceViewer from '$lib/performance/PerformanceViewer.svelte';
|
||||||
@@ -22,7 +21,6 @@
|
|||||||
import Changelog from '$lib/sidebar/panels/Changelog.svelte';
|
import Changelog from '$lib/sidebar/panels/Changelog.svelte';
|
||||||
import ExportSettings from '$lib/sidebar/panels/ExportSettings.svelte';
|
import ExportSettings from '$lib/sidebar/panels/ExportSettings.svelte';
|
||||||
import GraphSource from '$lib/sidebar/panels/GraphSource.svelte';
|
import GraphSource from '$lib/sidebar/panels/GraphSource.svelte';
|
||||||
import GroupSettings from '$lib/sidebar/panels/GroupSettings.svelte';
|
|
||||||
import Keymap from '$lib/sidebar/panels/Keymap.svelte';
|
import Keymap from '$lib/sidebar/panels/Keymap.svelte';
|
||||||
import { panelState } from '$lib/sidebar/PanelState.svelte';
|
import { panelState } from '$lib/sidebar/PanelState.svelte';
|
||||||
import Sidebar from '$lib/sidebar/Sidebar.svelte';
|
import Sidebar from '$lib/sidebar/Sidebar.svelte';
|
||||||
@@ -39,7 +37,7 @@
|
|||||||
|
|
||||||
const registryCache = new IndexDBCache('node-registry');
|
const registryCache = new IndexDBCache('node-registry');
|
||||||
|
|
||||||
const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode, groupNode]);
|
const nodeRegistry = new RemoteNodeRegistry('', registryCache, [debugNode]);
|
||||||
const workerRuntime = new WorkerRuntimeExecutor();
|
const workerRuntime = new WorkerRuntimeExecutor();
|
||||||
const runtimeCache = new MemoryRuntimeCache();
|
const runtimeCache = new MemoryRuntimeCache();
|
||||||
const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
|
const memoryRuntime = new MemoryRuntimeExecutor(nodeRegistry, runtimeCache);
|
||||||
@@ -96,7 +94,7 @@
|
|||||||
randomSeed: { type: 'boolean', value: false }
|
randomSeed: { type: 'boolean', value: false }
|
||||||
});
|
});
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (graphSettings && graphSettingTypes && manager?.loaded) {
|
if (graphSettings && graphSettingTypes) {
|
||||||
manager?.setSettings($state.snapshot(graphSettings));
|
manager?.setSettings($state.snapshot(graphSettings));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -172,7 +170,6 @@
|
|||||||
config={tutorialConfig}
|
config={tutorialConfig}
|
||||||
actions={{
|
actions={{
|
||||||
'setup-default': () => {
|
'setup-default': () => {
|
||||||
console.log('setup-default');
|
|
||||||
const ts = new Date().toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' });
|
const ts = new Date().toLocaleTimeString('en-US', { hour: '2-digit', minute: '2-digit' });
|
||||||
pm.handleCreateProject(
|
pm.handleCreateProject(
|
||||||
structuredClone(templates.defaultPlant) as unknown as Graph,
|
structuredClone(templates.defaultPlant) as unknown as Graph,
|
||||||
@@ -180,16 +177,15 @@
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
'load-tutorial-template': () => {
|
'load-tutorial-template': () => {
|
||||||
console.log('load-tutorial-template');
|
|
||||||
if (!pm.graph) return;
|
if (!pm.graph) return;
|
||||||
const g = structuredClone(templates.tutorial) as unknown as Graph;
|
const g = structuredClone(templates.tutorial) as unknown as Graph;
|
||||||
g.id = pm.graph.id;
|
g.id = pm.graph.id;
|
||||||
g.meta = { ...pm.graph.meta };
|
g.meta = { ...pm.graph.meta };
|
||||||
manager.load(g);
|
pm.graph = g;
|
||||||
|
pm.saveGraph(g);
|
||||||
graphInterface.state.centerNode(graphInterface.manager.getAllNodes()[0]);
|
graphInterface.state.centerNode(graphInterface.manager.getAllNodes()[0]);
|
||||||
},
|
},
|
||||||
'open-github-nodes': () => {
|
'open-github-nodes': () => {
|
||||||
console.log('open-github-nodes');
|
|
||||||
window.open(
|
window.open(
|
||||||
'https://github.com/jim-fx/nodarium/tree/main/nodes/max/plantarium',
|
'https://github.com/jim-fx/nodarium/tree/main/nodes/max/plantarium',
|
||||||
'__blank'
|
'__blank'
|
||||||
@@ -258,12 +254,11 @@
|
|||||||
</Grid.Cell>
|
</Grid.Cell>
|
||||||
<Grid.Cell>
|
<Grid.Cell>
|
||||||
{#if pm.graph}
|
{#if pm.graph}
|
||||||
{#key pm.graph.id}
|
|
||||||
<GraphInterface
|
<GraphInterface
|
||||||
graph={pm.graph}
|
graph={pm.graph}
|
||||||
bind:this={graphInterface}
|
bind:this={graphInterface}
|
||||||
registry={nodeRegistry}
|
registry={nodeRegistry}
|
||||||
safePadding={{ right: sidebarOpen ? 321 : undefined }}
|
safePadding={{ right: sidebarOpen ? 330 : undefined }}
|
||||||
backgroundType={appSettings.value.nodeInterface.backgroundType}
|
backgroundType={appSettings.value.nodeInterface.backgroundType}
|
||||||
snapToGrid={appSettings.value.nodeInterface.snapToGrid}
|
snapToGrid={appSettings.value.nodeInterface.snapToGrid}
|
||||||
bind:activeNode
|
bind:activeNode
|
||||||
@@ -273,7 +268,6 @@
|
|||||||
onsave={(g) => pm.saveGraph(g)}
|
onsave={(g) => pm.saveGraph(g)}
|
||||||
onresult={(result) => handleUpdate(result as Graph)}
|
onresult={(result) => handleUpdate(result as Graph)}
|
||||||
/>
|
/>
|
||||||
{/key}
|
|
||||||
{/if}
|
{/if}
|
||||||
<Sidebar bind:open={sidebarOpen}>
|
<Sidebar bind:open={sidebarOpen}>
|
||||||
<Panel id="general" title="General" icon="i-[tabler--settings]">
|
<Panel id="general" title="General" icon="i-[tabler--settings]">
|
||||||
@@ -327,9 +321,7 @@
|
|||||||
hidden={!appSettings.value.debug.advancedMode}
|
hidden={!appSettings.value.debug.advancedMode}
|
||||||
icon="i-[tabler--code]"
|
icon="i-[tabler--code]"
|
||||||
>
|
>
|
||||||
{#if manager?.status === 'idle'}
|
<GraphSource graph={manager?.serialize()} />
|
||||||
<GraphSource graph={manager.serialize()} />
|
|
||||||
{/if}
|
|
||||||
</Panel>
|
</Panel>
|
||||||
<Panel
|
<Panel
|
||||||
id="benchmark"
|
id="benchmark"
|
||||||
@@ -344,16 +336,12 @@
|
|||||||
title="Graph Settings"
|
title="Graph Settings"
|
||||||
icon="i-[custom--graph] bg-blue-400"
|
icon="i-[custom--graph] bg-blue-400"
|
||||||
>
|
>
|
||||||
<span class="block h-[1px]"></span>
|
|
||||||
<NestedSettings
|
<NestedSettings
|
||||||
id="graph-settings"
|
id="graph-settings"
|
||||||
type={graphSettingTypes}
|
type={graphSettingTypes}
|
||||||
bind:value={graphSettings}
|
bind:value={graphSettings}
|
||||||
/>
|
/>
|
||||||
{#key activeNode}
|
|
||||||
<ActiveNodeSettings {manager} bind:node={activeNode} />
|
<ActiveNodeSettings {manager} bind:node={activeNode} />
|
||||||
<GroupSettings graphState={graphInterface?.state} {manager} bind:node={activeNode} />
|
|
||||||
{/key}
|
|
||||||
</Panel>
|
</Panel>
|
||||||
<Panel
|
<Panel
|
||||||
id="changelog"
|
id="changelog"
|
||||||
|
|||||||
+35
-47
@@ -47,7 +47,6 @@ User Interaction
|
|||||||
```
|
```
|
||||||
|
|
||||||
**Event flow:**
|
**Event flow:**
|
||||||
|
|
||||||
1. User edits graph → GraphManager mutates state
|
1. User edits graph → GraphManager mutates state
|
||||||
2. GraphManager emits `save` → ProjectManager persists to IndexDB
|
2. GraphManager emits `save` → ProjectManager persists to IndexDB
|
||||||
3. GraphManager emits `result` → Runtime executes graph → Viewer updates
|
3. GraphManager emits `result` → Runtime executes graph → Viewer updates
|
||||||
@@ -57,7 +56,7 @@ User Interaction
|
|||||||
## Critical Files
|
## Critical Files
|
||||||
|
|
||||||
| File | Role |
|
| File | Role |
|
||||||
| ------------------------------------------------------ | --------------------------------------------------------------------- |
|
|------|------|
|
||||||
| `app/src/routes/+page.svelte` | Wires all systems; creates GraphManager, runtime, registry |
|
| `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-manager.svelte.ts` | Central graph logic: createNode, createEdge, serialize, load, history |
|
||||||
| `app/src/lib/graph-interface/graph-state.svelte.ts` | UI state: camera, selection, mouse, clipboard, groupSelectedNodes |
|
| `app/src/lib/graph-interface/graph-state.svelte.ts` | UI state: camera, selection, mouse, clipboard, groupSelectedNodes |
|
||||||
@@ -84,56 +83,54 @@ User Interaction
|
|||||||
```typescript
|
```typescript
|
||||||
// packages/types/src/types.ts
|
// 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 = {
|
type NodeInstance = {
|
||||||
id: number;
|
id: number
|
||||||
type: NodeId;
|
type: NodeId
|
||||||
position: [number, number];
|
position: [number, number]
|
||||||
props?: Record<string, number | number[]>; // current parameter values
|
props?: Record<string, number | number[]> // current parameter values
|
||||||
meta?: { title?: string; lastModified?: string };
|
meta?: { title?: string; lastModified?: string }
|
||||||
state: NodeRuntimeState; // runtime-only, NOT serialized
|
state: NodeRuntimeState // runtime-only, NOT serialized
|
||||||
};
|
}
|
||||||
|
|
||||||
type NodeRuntimeState = {
|
type NodeRuntimeState = {
|
||||||
type?: NodeDefinition; // resolved definition
|
type?: NodeDefinition // resolved definition
|
||||||
parents?: NodeInstance[];
|
parents?: NodeInstance[]
|
||||||
children?: NodeInstance[];
|
children?: NodeInstance[]
|
||||||
x?: number;
|
x?: number; y?: number // interpolated position
|
||||||
y?: number; // interpolated position
|
mesh?: Mesh // Three.js mesh reference
|
||||||
mesh?: Mesh; // Three.js mesh reference
|
ref?: HTMLElement
|
||||||
ref?: HTMLElement;
|
}
|
||||||
};
|
|
||||||
|
|
||||||
type NodeDefinition = {
|
type NodeDefinition = {
|
||||||
id: NodeId;
|
id: NodeId
|
||||||
inputs?: Record<string, NodeInput>;
|
inputs?: Record<string, NodeInput>
|
||||||
outputs?: string[]; // output type names
|
outputs?: string[] // output type names
|
||||||
meta?: { title?: string; description?: string };
|
meta?: { title?: string; description?: string }
|
||||||
execute(input: Int32Array): Int32Array; // WASM function
|
execute(input: Int32Array): Int32Array // WASM function
|
||||||
};
|
}
|
||||||
|
|
||||||
// Edge: [fromNode, outputIndex, toNode, inputSocketName]
|
// Edge: [fromNode, outputIndex, toNode, inputSocketName]
|
||||||
type Edge = [NodeInstance, number, NodeInstance, string];
|
type Edge = [NodeInstance, number, NodeInstance, string]
|
||||||
|
|
||||||
type Graph = {
|
type Graph = {
|
||||||
nodes: NodeInstance[];
|
nodes: NodeInstance[]
|
||||||
edges: [number, number, number, string][]; // serialized (IDs, not refs)
|
edges: [number, number, number, string][] // serialized (IDs, not refs)
|
||||||
settings: Record<string, unknown>;
|
settings: Record<string, unknown>
|
||||||
groups: GroupDefinition[];
|
groups: GroupDefinition[]
|
||||||
};
|
}
|
||||||
|
|
||||||
type GroupDefinition = {
|
type GroupDefinition = {
|
||||||
id: number;
|
id: number
|
||||||
nodes: NodeInstance[];
|
nodes: NodeInstance[]
|
||||||
edges: Edge[];
|
edges: Edge[]
|
||||||
inputs?: Record<string, NodeInput>;
|
inputs?: Record<string, NodeInput>
|
||||||
outputs?: string[];
|
outputs?: string[]
|
||||||
};
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### NodeInput socket types
|
### NodeInput socket types
|
||||||
|
|
||||||
`float` | `integer` | `boolean` | `select` | `seed` | `vec3` | `geometry` | `path` | `shape` | `color` | `*` (wildcard)
|
`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).
|
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
|
## Patterns & Conventions
|
||||||
|
|
||||||
### Svelte 5 reactivity
|
### 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.
|
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
|
### 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.
|
`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
|
### 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).
|
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
|
### Socket compatibility
|
||||||
|
|
||||||
```typescript
|
```typescript
|
||||||
areSocketsCompatible(outputType: string, inputType: string | string[]): boolean
|
areSocketsCompatible(outputType: string, inputType: string | string[]): boolean
|
||||||
// '*' wildcard matches any type; 'geometry' accepts ['geometry', 'instances']
|
// '*' wildcard matches any type; 'geometry' accepts ['geometry', 'instances']
|
||||||
```
|
```
|
||||||
|
|
||||||
### WASM execution interface
|
### WASM execution interface
|
||||||
|
|
||||||
Every node exposes a single function: `execute(input: Int32Array): Int32Array`.
|
Every node exposes a single function: `execute(input: Int32Array): Int32Array`.
|
||||||
Data encoding (Plantarium):
|
Data encoding (Plantarium):
|
||||||
|
|
||||||
- `[0, stemDepth, ...x,y,z,thickness]` — path
|
- `[0, stemDepth, ...x,y,z,thickness]` — path
|
||||||
- `[1, vertexCount, faceCount, ...faces, ...vertices, ...normals]` — geometry
|
- `[1, vertexCount, faceCount, ...faces, ...vertices, ...normals]` — geometry
|
||||||
- `[2, vertexCount, faceCount, instanceCount, stemDepth, ...]` — instances
|
- `[2, vertexCount, faceCount, instanceCount, stemDepth, ...]` — instances
|
||||||
|
|
||||||
### Event emitter
|
### 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.
|
`GraphManager extends EventEmitter<{ save, result, settings }>`. Subscribe with `manager.on('result', cb)`. Used to decouple the editor UI from runtime execution and persistence.
|
||||||
|
|
||||||
### History
|
### History
|
||||||
|
|
||||||
Every mutation goes through `HistoryManager`. Call `this.history.save(this.serialize())` before mutations; undo/redo replays jsondiffpatch deltas.
|
Every mutation goes through `HistoryManager`. Call `this.history.save(this.serialize())` before mutations; undo/redo replays jsondiffpatch deltas.
|
||||||
|
|
||||||
### Internal node IDs
|
### 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`.
|
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:**
|
**Known gaps as of 2026-05-03:**
|
||||||
|
|
||||||
| Issue | Location |
|
| Issue | Location |
|
||||||
| ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------ |
|
|-------|----------|
|
||||||
| `createGroupNode()` called but not defined | `graph-state.svelte.ts:334` → missing in `graph-manager.svelte.ts` |
|
| `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.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 |
|
| 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",
|
"packageManager": "pnpm@10.28.1+sha512.7d7dbbca9e99447b7c3bf7a73286afaaf6be99251eb9498baefa7d406892f67b879adb3a1d7e687fc4ccc1a388c7175fbaae567a26ab44d1067b54fcb0d6a316",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"chokidar-cli": "catalog:",
|
"chokidar-cli": "catalog:",
|
||||||
"dprint": "^0.54.0"
|
"dprint": "^0.51.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@nodarium/planty",
|
"name": "@nodarium/planty",
|
||||||
"version": "0.0.6",
|
"version": "0.0.1",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"format": "dprint fmt -c '../../.dprint.jsonc' .",
|
"format": "dprint fmt -c '../.dprint.jsonc' .",
|
||||||
"format:check": "dprint check -c '../../.dprint.jsonc' ."
|
"format:check": "dprint check -c '../.dprint.jsonc' ."
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"dist",
|
"dist",
|
||||||
@@ -34,29 +34,29 @@
|
|||||||
"svelte": "^5.0.0"
|
"svelte": "^5.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/compat": "^2.0.5",
|
|
||||||
"@eslint/js": "^10.0.1",
|
|
||||||
"@nodarium/ui": "workspace:*",
|
"@nodarium/ui": "workspace:*",
|
||||||
|
"@eslint/compat": "^2.0.4",
|
||||||
|
"@eslint/js": "^10.0.1",
|
||||||
"@sveltejs/adapter-auto": "^7.0.1",
|
"@sveltejs/adapter-auto": "^7.0.1",
|
||||||
"@sveltejs/kit": "^2.59.0",
|
"@sveltejs/kit": "^2.57.0",
|
||||||
"@sveltejs/package": "^2.5.7",
|
"@sveltejs/package": "^2.5.7",
|
||||||
"@sveltejs/vite-plugin-svelte": "^7.0.0",
|
"@sveltejs/vite-plugin-svelte": "^7.0.0",
|
||||||
"@tailwindcss/vite": "^4.2.4",
|
"@tailwindcss/vite": "^4.2.2",
|
||||||
"@types/node": "^25.6.0",
|
"@types/node": "^24",
|
||||||
"eslint": "^10.3.0",
|
"eslint": "^10.2.0",
|
||||||
"eslint-config-prettier": "^10.1.8",
|
"eslint-config-prettier": "^10.1.8",
|
||||||
"eslint-plugin-svelte": "^3.17.1",
|
"eslint-plugin-svelte": "^3.17.0",
|
||||||
"globals": "^17.6.0",
|
"globals": "^17.4.0",
|
||||||
"prettier": "^3.8.3",
|
"prettier": "^3.8.1",
|
||||||
"prettier-plugin-svelte": "^3.5.1",
|
"prettier-plugin-svelte": "^3.5.1",
|
||||||
"prettier-plugin-tailwindcss": "^0.8.0",
|
"prettier-plugin-tailwindcss": "^0.7.2",
|
||||||
"publint": "^0.3.18",
|
"publint": "^0.3.18",
|
||||||
"svelte": "^5.55.5",
|
"svelte": "^5.55.2",
|
||||||
"svelte-check": "^4.4.7",
|
"svelte-check": "^4.4.6",
|
||||||
"tailwindcss": "^4.2.4",
|
"tailwindcss": "^4.2.2",
|
||||||
"typescript": "^6.0.3",
|
"typescript": "^6.0.2",
|
||||||
"typescript-eslint": "^8.59.1",
|
"typescript-eslint": "^8.58.1",
|
||||||
"vite": "^8.0.10"
|
"vite": "^8.0.7"
|
||||||
},
|
},
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"svelte"
|
"svelte"
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
|
"module": "NodeNext",
|
||||||
"moduleResolution": "bundler"
|
"moduleResolution": "bundler"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@nodarium/types",
|
"name": "@nodarium/types",
|
||||||
"version": "0.0.6",
|
"version": "0.0.5",
|
||||||
"description": "",
|
"description": "",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "src/index.ts",
|
"main": "src/index.ts",
|
||||||
@@ -18,9 +18,9 @@
|
|||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"zod": "^4.4.3"
|
"zod": "^4.3.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"dprint": "^0.54.0"
|
"dprint": "^0.51.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ export type {
|
|||||||
NodeDefinition,
|
NodeDefinition,
|
||||||
NodeId,
|
NodeId,
|
||||||
NodeInstance,
|
NodeInstance,
|
||||||
SerializedEdge,
|
|
||||||
SerializedNode,
|
SerializedNode,
|
||||||
Socket
|
Socket
|
||||||
} from './types';
|
} from './types';
|
||||||
|
|||||||
@@ -61,10 +61,8 @@ export const NodeInputBooleanSchema = z.object({
|
|||||||
export const NodeInputSelectSchema = z.object({
|
export const NodeInputSelectSchema = z.object({
|
||||||
...DefaultOptionsSchema.shape,
|
...DefaultOptionsSchema.shape,
|
||||||
type: z.literal('select'),
|
type: z.literal('select'),
|
||||||
options: z.array(
|
options: z.array(z.string()).optional(),
|
||||||
z.union([z.string(), z.object({ value: z.number(), label: z.string() })])
|
value: z.string().optional()
|
||||||
).optional(),
|
|
||||||
value: z.union([z.string(), z.number()]).optional()
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export const NodeInputSeedSchema = z.object({
|
export const NodeInputSeedSchema = z.object({
|
||||||
|
|||||||
@@ -76,13 +76,8 @@ export type Socket = {
|
|||||||
|
|
||||||
export type Edge = [NodeInstance, number, NodeInstance, string];
|
export type Edge = [NodeInstance, number, NodeInstance, string];
|
||||||
|
|
||||||
const SerializedEdgeSchema = z.tuple([z.number(), z.number(), z.number(), z.string()]);
|
|
||||||
|
|
||||||
export type SerializedEdge = z.infer<typeof SerializedEdgeSchema>;
|
|
||||||
|
|
||||||
export const GroupSchema = z.object({
|
export const GroupSchema = z.object({
|
||||||
id: z.number(),
|
id: z.number(),
|
||||||
name: z.string().optional(),
|
|
||||||
nodes: z.array(NodeSchema),
|
nodes: z.array(NodeSchema),
|
||||||
edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()])),
|
edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()])),
|
||||||
inputs: z.record(z.string(), NodeInputSchema).optional(),
|
inputs: z.record(z.string(), NodeInputSchema).optional(),
|
||||||
@@ -104,7 +99,7 @@ export const GraphSchema = z.object({
|
|||||||
.optional(),
|
.optional(),
|
||||||
settings: z.record(z.string(), z.any()).optional(),
|
settings: z.record(z.string(), z.any()).optional(),
|
||||||
nodes: z.array(NodeSchema),
|
nodes: z.array(NodeSchema),
|
||||||
edges: z.array(SerializedEdgeSchema),
|
edges: z.array(z.tuple([z.number(), z.number(), z.number(), z.string()])),
|
||||||
groups: z.array(GroupSchema)
|
groups: z.array(GroupSchema)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+30
-31
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@nodarium/ui",
|
"name": "@nodarium/ui",
|
||||||
"version": "0.0.6",
|
"version": "0.0.5",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "vite build",
|
"build": "vite build",
|
||||||
@@ -30,47 +30,46 @@
|
|||||||
"svelte": "^4.0.0"
|
"svelte": "^4.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/compat": "^2.0.5",
|
"@eslint/compat": "^2.0.2",
|
||||||
"@eslint/eslintrc": "^3.3.5",
|
"@eslint/eslintrc": "^3.3.3",
|
||||||
"@eslint/js": "^10.0.1",
|
"@eslint/js": "^9.39.2",
|
||||||
"@nodarium/types": "workspace:^",
|
"@nodarium/types": "workspace:^",
|
||||||
"@playwright/test": "^1.59.1",
|
"@playwright/test": "^1.58.1",
|
||||||
"@sveltejs/adapter-static": "^3.0.10",
|
"@sveltejs/adapter-static": "^3.0.10",
|
||||||
"@sveltejs/kit": "^2.59.0",
|
"@sveltejs/kit": "^2.50.2",
|
||||||
"@sveltejs/package": "^2.5.7",
|
"@sveltejs/package": "^2.5.7",
|
||||||
"@sveltejs/vite-plugin-svelte": "^7.0.0",
|
"@sveltejs/vite-plugin-svelte": "^6.2.4",
|
||||||
"@testing-library/svelte": "^5.3.1",
|
"@testing-library/svelte": "^5.3.1",
|
||||||
"@types/eslint": "^9.6.1",
|
"@types/eslint": "^9.6.1",
|
||||||
"@types/node": "^25.6.0",
|
"@types/three": "^0.182.0",
|
||||||
"@types/three": "^0.184.0",
|
"@typescript-eslint/eslint-plugin": "^8.54.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.59.1",
|
"@typescript-eslint/parser": "^8.54.0",
|
||||||
"@typescript-eslint/parser": "^8.59.1",
|
"@vitest/browser-playwright": "^4.0.18",
|
||||||
"@vitest/browser-playwright": "^4.1.5",
|
"dprint": "^0.51.1",
|
||||||
"dprint": "^0.54.0",
|
"eslint": "^9.39.2",
|
||||||
"eslint": "^10.3.0",
|
"eslint-plugin-svelte": "^3.14.0",
|
||||||
"eslint-plugin-svelte": "^3.17.1",
|
"globals": "^17.3.0",
|
||||||
"globals": "^17.6.0",
|
"publint": "^0.3.17",
|
||||||
"publint": "^0.3.18",
|
"svelte": "^5.49.2",
|
||||||
"svelte": "^5.55.5",
|
"svelte-check": "^4.3.6",
|
||||||
"svelte-check": "^4.4.7",
|
"svelte-eslint-parser": "^1.4.1",
|
||||||
"svelte-eslint-parser": "^1.6.0",
|
|
||||||
"tslib": "^2.8.1",
|
"tslib": "^2.8.1",
|
||||||
"typescript": "^6.0.3",
|
"typescript": "^5.9.3",
|
||||||
"typescript-eslint": "^8.59.1",
|
"typescript-eslint": "^8.54.0",
|
||||||
"vite": "^8.0.10",
|
"vite": "^7.3.1",
|
||||||
"vitest": "^4.1.5",
|
"vitest": "^4.0.18",
|
||||||
"vitest-browser-svelte": "^2.1.1"
|
"vitest-browser-svelte": "^2.0.2"
|
||||||
},
|
},
|
||||||
"svelte": "./dist/index.js",
|
"svelte": "./dist/index.js",
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@iconify-json/tabler": "^1.2.33",
|
|
||||||
"@iconify/tailwind4": "^1.2.3",
|
|
||||||
"@nodarium/ui": "workspace:*",
|
"@nodarium/ui": "workspace:*",
|
||||||
"@tailwindcss/vite": "^4.2.4",
|
"@iconify-json/tabler": "^1.2.26",
|
||||||
"@threlte/core": "^8.5.11",
|
"@iconify/tailwind4": "^1.2.1",
|
||||||
"@threlte/extras": "^9.15.1",
|
"@tailwindcss/vite": "^4.1.18",
|
||||||
"tailwindcss": "^4.2.4"
|
"@threlte/core": "^8.3.1",
|
||||||
|
"@threlte/extras": "^9.7.1",
|
||||||
|
"tailwindcss": "^4.1.18"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<script module lang="ts">
|
<script module>
|
||||||
// eslint-disable-next-line svelte/prefer-svelte-reactivity
|
|
||||||
const cache = new Map<string, Record<string, boolean>>();
|
const cache = new Map<string, Record<string, boolean>>();
|
||||||
|
|
||||||
function getStore(root: string): Record<string, boolean> {
|
function getStore(root: string): Record<string, boolean> {
|
||||||
@@ -60,7 +59,7 @@
|
|||||||
}
|
}
|
||||||
return [] as [string, unknown][];
|
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) {
|
function toggle(next: boolean) {
|
||||||
open = next;
|
open = next;
|
||||||
@@ -89,13 +88,7 @@
|
|||||||
class:bg-layer-3={flashing}
|
class:bg-layer-3={flashing}
|
||||||
>
|
>
|
||||||
{#if key !== undefined}
|
{#if key !== undefined}
|
||||||
<button
|
<span class="text-text">{key}</span><span class="text-text/40">: </span>
|
||||||
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>
|
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if isExpandable}
|
{#if isExpandable}
|
||||||
@@ -113,7 +106,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<JsonViewer
|
<JsonViewer
|
||||||
value={v}
|
value={v}
|
||||||
key={showKeys ? k : undefined}
|
key={showKeys ? k : undefined }
|
||||||
depth={depth + 1}
|
depth={depth + 1}
|
||||||
path={path ? `${path}/${k}` : k}
|
path={path ? `${path}/${k}` : k}
|
||||||
/>{#if i < items.length - 1}<span class="text-text/20">,</span>{/if}
|
/>{#if i < items.length - 1}<span class="text-text/20">,</span>{/if}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
@source inline("{hover:,}{bg-,outline-,text-,}layer-3{/30,/50,}");
|
@source inline("{hover:,}{bg-,outline-,text-,}layer-3{/30,/50,}");
|
||||||
@source inline("{hover:,}{bg-,outline-,text-,}active");
|
@source inline("{hover:,}{bg-,outline-,text-,}active");
|
||||||
@source inline("{hover:,}{bg-,outline-,text-,}selected");
|
@source inline("{hover:,}{bg-,outline-,text-,}selected");
|
||||||
@source inline("{hover:,}{bg-,outline-,text-,border-,divide-}outline{!,}");
|
@source inline("{hover:,}{bg-,outline-,text-,}outline{!,}");
|
||||||
@source inline("{hover:,}{bg-,outline-,text-,}connection");
|
@source inline("{hover:,}{bg-,outline-,text-,}connection");
|
||||||
@source inline("{hover:,}{bg-,outline-,text-,}text");
|
@source inline("{hover:,}{bg-,outline-,text-,}text");
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ export { default as InputNumber } from './inputs/InputNumber.svelte';
|
|||||||
export { default as InputSelect } from './inputs/InputSelect.svelte';
|
export { default as InputSelect } from './inputs/InputSelect.svelte';
|
||||||
export { default as InputShape } from './inputs/InputShape.svelte';
|
export { default as InputShape } from './inputs/InputShape.svelte';
|
||||||
export { default as InputVec3 } from './inputs/InputVec3.svelte';
|
export { default as InputVec3 } from './inputs/InputVec3.svelte';
|
||||||
export { default as SocketTable } from './inputs/SocketTable.svelte';
|
|
||||||
|
|
||||||
export { default as Details } from './Details.svelte';
|
export { default as Details } from './Details.svelte';
|
||||||
export { default as JsonViewer } from './JsonViewer.svelte';
|
export { default as JsonViewer } from './JsonViewer.svelte';
|
||||||
|
|||||||
@@ -1,22 +1,16 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
type SelectOption = string | { value: number; label: string };
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
options?: SelectOption[];
|
options?: string[];
|
||||||
value?: number;
|
value?: number;
|
||||||
id?: string;
|
id?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
let { options = [], value = $bindable(0), id = '' }: Props = $props();
|
let { options = [], value = $bindable(0), id = '' }: Props = $props();
|
||||||
|
|
||||||
const normalized = $derived(
|
|
||||||
options.map((opt, i) => typeof opt === 'string' ? { value: i, label: opt } : opt)
|
|
||||||
);
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<select {id} bind:value class="bg-layer-2 text-text">
|
<select {id} bind:value class="bg-layer-2 text-text">
|
||||||
{#each normalized as opt (opt.value)}
|
{#each options as label, i (label)}
|
||||||
<option value={opt.value}>{opt.label}</option>
|
<option value={i}>{label}</option>
|
||||||
{/each}
|
{/each}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
@@ -1,118 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import type { NodeInput } from '@nodarium/types';
|
|
||||||
type Props = {
|
|
||||||
inputs?: Record<string, NodeInput>;
|
|
||||||
colors: Record<string, string>;
|
|
||||||
onremove?: (key: string) => void;
|
|
||||||
types: string[];
|
|
||||||
};
|
|
||||||
let { inputs = $bindable(), onremove, colors = {}, types = ['seed', 'float', 'path'] }: Props =
|
|
||||||
$props();
|
|
||||||
|
|
||||||
let potentialRow = $state<
|
|
||||||
{
|
|
||||||
type: string;
|
|
||||||
label: string;
|
|
||||||
} | undefined
|
|
||||||
>();
|
|
||||||
|
|
||||||
function showPotentialRow() {
|
|
||||||
potentialRow = {
|
|
||||||
type: types[0],
|
|
||||||
label: 'Input ' + Object.keys(inputs ?? {}).length
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function realizePotentialRow() {
|
|
||||||
if (inputs) inputs[`input_${Object.keys(inputs).length}`] = potentialRow as NodeInput;
|
|
||||||
potentialRow = undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
function removeRow(key?: string) {
|
|
||||||
if (!key) {
|
|
||||||
potentialRow = undefined;
|
|
||||||
} else if (inputs) {
|
|
||||||
onremove?.(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getColor(type: string) {
|
|
||||||
if (type in colors) {
|
|
||||||
return colors[type];
|
|
||||||
}
|
|
||||||
|
|
||||||
return '#f00';
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#snippet row(input: { type: string; label?: string }, remove: () => void, add?: () => void)}
|
|
||||||
<div class="flex min-w-0">
|
|
||||||
<span
|
|
||||||
style:background={getColor(input.type)}
|
|
||||||
data-type={input.type}
|
|
||||||
class="block opacity-50 min-w-2 ml-2 w-2 h-2 my-auto rounded-sm"
|
|
||||||
></span>
|
|
||||||
<select
|
|
||||||
class="text-[0.9em] border-r w-19 shrink-0 px-2 py-1 border-outline"
|
|
||||||
bind:value={input.type}
|
|
||||||
>
|
|
||||||
{#each types as type (type)}
|
|
||||||
<option>
|
|
||||||
<span
|
|
||||||
style="background: {getColor(type)}; width: 5px; height: 5px; border-radius: 5px;"
|
|
||||||
></span>
|
|
||||||
{type}
|
|
||||||
</option>
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
<input
|
|
||||||
class="px-2 grow min-w-30 border-r border-outline text-[0.9em]"
|
|
||||||
type="text"
|
|
||||||
bind:value={input.label}
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
class="px-2 cursor-pointer opacity-50 hover:opacity-100 hover:bg-red-400"
|
|
||||||
onclick={remove}
|
|
||||||
aria-label="remove"
|
|
||||||
>
|
|
||||||
{#if add}
|
|
||||||
<span class="py-1 block i-[tabler--cancel]"></span>
|
|
||||||
{:else}
|
|
||||||
<span class="py-1 block i-[tabler--trash]"></span>
|
|
||||||
{/if}
|
|
||||||
</button>
|
|
||||||
{#if add}
|
|
||||||
<button
|
|
||||||
class="px-2 border-l hover:bg-green-300 opacity-50 hover:opacity-100 hover:text-layer-1 border-outline cursor-pointer"
|
|
||||||
onclick={add}
|
|
||||||
aria-label="add"
|
|
||||||
>
|
|
||||||
<span class="py-1 block i-[tabler--circle-plus]"></span>
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/snippet}
|
|
||||||
|
|
||||||
<div class="rounded-sm overflow-hidden bg-layer-2 divide-y divide-outline outline-1 outline-outline">
|
|
||||||
{#each Object.entries(inputs ?? {}) as [key, input] (key)}
|
|
||||||
{@render row(input, () => removeRow(key))}
|
|
||||||
{/each}
|
|
||||||
{#if potentialRow}
|
|
||||||
<div class="opacity-80">
|
|
||||||
{@render row(potentialRow, () => removeRow(), () => realizePotentialRow())}
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
<div class="opacity-40">
|
|
||||||
<div class="flex h-[27px]">
|
|
||||||
<div class="flex-1"></div>
|
|
||||||
<button
|
|
||||||
class="border-l hover:bg-green-300 hover:text-layer-1 border-outline py-1 px-2 cursor-pointer"
|
|
||||||
onclick={() => showPotentialRow()}
|
|
||||||
aria-label="remove"
|
|
||||||
>
|
|
||||||
<span class="block i-[tabler--circle-plus]"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { NodeInput } from '@nodarium/types';
|
|
||||||
import '$lib/app.css';
|
import '$lib/app.css';
|
||||||
import {
|
import {
|
||||||
Details,
|
Details,
|
||||||
@@ -12,7 +11,6 @@
|
|||||||
JsonViewer,
|
JsonViewer,
|
||||||
ShortCut
|
ShortCut
|
||||||
} from '$lib';
|
} from '$lib';
|
||||||
import SocketTable from '$lib/inputs/SocketTable.svelte';
|
|
||||||
import Section from './Section.svelte';
|
import Section from './Section.svelte';
|
||||||
import Theme from './Theme.svelte';
|
import Theme from './Theme.svelte';
|
||||||
import ThemeSelector from './ThemeSelector.svelte';
|
import ThemeSelector from './ThemeSelector.svelte';
|
||||||
@@ -23,7 +21,7 @@
|
|||||||
let vecValue = $state([0.2, 0.3, 0.4]);
|
let vecValue = $state([0.2, 0.3, 0.4]);
|
||||||
const options = ['strawberry', 'raspberry', 'chickpeas'];
|
const options = ['strawberry', 'raspberry', 'chickpeas'];
|
||||||
let selectValue = $state(0);
|
let selectValue = $state(0);
|
||||||
let selectValue2 = $state(0);
|
const d = $derived(options[selectValue]);
|
||||||
let checked = $state(false);
|
let checked = $state(false);
|
||||||
let colorValue = $state<[number, number, number]>([59, 130, 246]);
|
let colorValue = $state<[number, number, number]>([59, 130, 246]);
|
||||||
let mirrorShape = $state(true);
|
let mirrorShape = $state(true);
|
||||||
@@ -40,17 +38,6 @@
|
|||||||
settings: { seed: 42, enabled: true }
|
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() {
|
function randomlyUpdateJson() {
|
||||||
const rand = Math.floor(Math.random() * 5);
|
const rand = Math.floor(Math.random() * 5);
|
||||||
if (rand === 0) {
|
if (rand === 0) {
|
||||||
@@ -95,28 +82,9 @@
|
|||||||
<InputVec3 bind:value={vecValue} />
|
<InputVec3 bind:value={vecValue} />
|
||||||
</Section>
|
</Section>
|
||||||
|
|
||||||
<Section title="Select">
|
<Section title="Select" value={d}>
|
||||||
<p>
|
<i>Select with simple values</i>
|
||||||
Select with simple values
|
|
||||||
<br>
|
|
||||||
<b>value={options[selectValue]}</b>
|
|
||||||
</p>
|
|
||||||
<InputSelect bind:value={selectValue} {options} />
|
<InputSelect bind:value={selectValue} {options} />
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
<p>
|
|
||||||
Select with <i>{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>
|
||||||
|
|
||||||
<Section title="Checkbox" value={checked}>
|
<Section title="Checkbox" value={checked}>
|
||||||
@@ -163,18 +131,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</Section>
|
</Section>
|
||||||
|
|
||||||
<Section title="Socket Table">
|
|
||||||
<SocketTable
|
|
||||||
colors={{
|
|
||||||
seed: '#f00',
|
|
||||||
float: '#0f0',
|
|
||||||
path: '#00f'
|
|
||||||
}}
|
|
||||||
types={['seed', 'float', 'path']}
|
|
||||||
bind:inputs={socketTypes}
|
|
||||||
/>
|
|
||||||
</Section>
|
|
||||||
|
|
||||||
<Section title="Shortcut">
|
<Section title="Shortcut">
|
||||||
<div class="flex gap-4">
|
<div class="flex gap-4">
|
||||||
<ShortCut ctrl key="S" />
|
<ShortCut ctrl key="S" />
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
'custom'
|
'custom'
|
||||||
];
|
];
|
||||||
|
|
||||||
// eslint-disable-next-line no-useless-assignment
|
|
||||||
let { theme = $bindable() } = $props();
|
let { theme = $bindable() } = $props();
|
||||||
|
|
||||||
let themeIndex = $state(0);
|
let themeIndex = $state(0);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@nodarium/utils",
|
"name": "@nodarium/utils",
|
||||||
"version": "0.0.6",
|
"version": "0.0.5",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "./src/index.ts",
|
"main": "./src/index.ts",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -16,8 +16,8 @@
|
|||||||
"@nodarium/types": "workspace:^"
|
"@nodarium/types": "workspace:^"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"dprint": "^0.54.0",
|
"dprint": "^0.51.1",
|
||||||
"vite": "^8.0.10",
|
"vite": "^7.3.1",
|
||||||
"vitest": "^4.1.5"
|
"vitest": "^4.0.18"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,60 +1,3 @@
|
|||||||
interface LogEntry {
|
|
||||||
time: string;
|
|
||||||
scope: string;
|
|
||||||
level: string;
|
|
||||||
args: unknown[];
|
|
||||||
}
|
|
||||||
|
|
||||||
const logBuffer: LogEntry[] = [];
|
|
||||||
const startTime = Date.now();
|
|
||||||
|
|
||||||
function formatTime(): string {
|
|
||||||
const ms = Date.now() - startTime;
|
|
||||||
const h = Math.floor(ms / 3600000).toString().padStart(2, '0');
|
|
||||||
const m = Math.floor((ms % 3600000) / 60000).toString().padStart(2, '0');
|
|
||||||
const s = Math.floor((ms % 60000) / 1000).toString().padStart(2, '0');
|
|
||||||
const mss = (ms % 1000).toString().padStart(3, '0');
|
|
||||||
return `${h}:${m}:${s}.${mss}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function serialize(arg: unknown): string {
|
|
||||||
if (typeof arg === 'string') return arg;
|
|
||||||
try {
|
|
||||||
return JSON.stringify(arg);
|
|
||||||
} catch {
|
|
||||||
return String(arg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatEntry(entry: LogEntry, scopeWidth: number): string {
|
|
||||||
const scope = `[${entry.scope}]`.padEnd(scopeWidth + 2);
|
|
||||||
const level = entry.level.toUpperCase().padEnd(5);
|
|
||||||
const msg = entry.args.map(serialize).join(' ');
|
|
||||||
return `${entry.time} ${scope} ${level} ${msg}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
(globalThis as Record<string, unknown>).copyLogs = () => {
|
|
||||||
if (logBuffer.length === 0) {
|
|
||||||
console.log('%c[logger] No log entries to copy', 'color: #888');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const scopeWidth = logBuffer.reduce((max, e) => Math.max(max, e.scope.length), 0);
|
|
||||||
const lines = [
|
|
||||||
`=== Log Export (${logBuffer.length} entries) ===`,
|
|
||||||
'',
|
|
||||||
...logBuffer.map(e => formatEntry(e, scopeWidth))
|
|
||||||
].join('\n');
|
|
||||||
|
|
||||||
navigator.clipboard.writeText(lines).then(() => {
|
|
||||||
console.log(`%c[logger] Copied ${logBuffer.length} entries to clipboard`, 'color: #4f4');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
(globalThis as Record<string, unknown>).clearLogs = () => {
|
|
||||||
logBuffer.length = 0;
|
|
||||||
console.log('%c[logger] Log buffer cleared', 'color: #888');
|
|
||||||
};
|
|
||||||
|
|
||||||
export const createLogger = (() => {
|
export const createLogger = (() => {
|
||||||
let maxLength = 5;
|
let maxLength = 5;
|
||||||
return (scope: string) => {
|
return (scope: string) => {
|
||||||
@@ -63,35 +6,18 @@ export const createLogger = (() => {
|
|||||||
|
|
||||||
let isGrouped = false;
|
let isGrouped = false;
|
||||||
|
|
||||||
function s(color: string, ...args: unknown[]) {
|
function s(color: string, ...args: any) {
|
||||||
return isGrouped
|
return isGrouped
|
||||||
? [...args]
|
? [...args]
|
||||||
: [`[%c${scope.padEnd(maxLength, ' ')}]:`, `color: ${color}`, ...args];
|
: [`[%c${scope.padEnd(maxLength, ' ')}]:`, `color: ${color}`, ...args];
|
||||||
}
|
}
|
||||||
|
|
||||||
function record(level: string, args: unknown[]) {
|
|
||||||
logBuffer.push({ time: formatTime(), scope, level, args });
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
log: (...args: unknown[]) => {
|
log: (...args: any[]) => !muted && console.log(...s('#888', ...args)),
|
||||||
record('log', args);
|
info: (...args: any[]) => !muted && console.info(...s('#888', ...args)),
|
||||||
!muted && console.log(...s('#888', ...args));
|
warn: (...args: any[]) => !muted && console.warn(...s('#888', ...args)),
|
||||||
},
|
error: (...args: any[]) => console.error(...s('#f88', ...args)),
|
||||||
info: (...args: unknown[]) => {
|
group: (...args: any[]) => {
|
||||||
record('info', args);
|
|
||||||
!muted && console.info(...s('#888', ...args));
|
|
||||||
},
|
|
||||||
warn: (...args: unknown[]) => {
|
|
||||||
record('warn', args);
|
|
||||||
!muted && console.warn(...s('#888', ...args));
|
|
||||||
},
|
|
||||||
error: (...args: unknown[]) => {
|
|
||||||
record('error', args);
|
|
||||||
console.error(...s('#f88', ...args));
|
|
||||||
},
|
|
||||||
group: (...args: unknown[]) => {
|
|
||||||
record('group', args);
|
|
||||||
if (!muted) {
|
if (!muted) {
|
||||||
console.groupCollapsed(...s('#888', ...args));
|
console.groupCollapsed(...s('#888', ...args));
|
||||||
isGrouped = true;
|
isGrouped = true;
|
||||||
|
|||||||
Generated
+2034
-1030
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,6 @@ packages:
|
|||||||
|
|
||||||
catalog:
|
catalog:
|
||||||
chokidar-cli: github:open-cli-tools/chokidar-cli#semver:v4.0.0
|
chokidar-cli: github:open-cli-tools/chokidar-cli#semver:v4.0.0
|
||||||
|
|
||||||
onlyBuiltDependencies:
|
onlyBuiltDependencies:
|
||||||
- "@tailwindcss/oxide"
|
- "@tailwindcss/oxide"
|
||||||
- esbuild
|
- esbuild
|
||||||
|
|||||||
Reference in New Issue
Block a user