Compare commits
15 Commits
9e03d36482
...
v0.0.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
f8a2a95bc1
|
|||
|
c9dd143916
|
|||
|
898dd49aee
|
|||
|
9fb69d760f
|
|||
|
bafbcca2b8
|
|||
|
8ad9e5535c
|
|||
|
|
43a3c54838 | ||
|
11eaeb719b
|
|||
|
74c2978cd1
|
|||
|
4fdc247904
|
|||
|
c3f8b4b5aa
|
|||
|
67591c0572
|
|||
|
de1f9d6ab6
|
|||
|
6acce72fb8
|
|||
|
cf8943b205
|
@@ -5,21 +5,36 @@ mkdir -p app/static
|
||||
|
||||
cp CHANGELOG.md app/static/CHANGELOG.md
|
||||
|
||||
# Derive branch/tag info
|
||||
REF_TYPE="${GITHUB_REF_TYPE:-branch}"
|
||||
REF_NAME="${GITHUB_REF_NAME:-$(basename "$GITHUB_REF")}"
|
||||
BRANCH="${GITHUB_HEAD_REF:-}"
|
||||
if [[ -z "$BRANCH" && "$REF_TYPE" == "branch" ]]; then
|
||||
BRANCH="$REF_NAME"
|
||||
fi
|
||||
|
||||
# Determine last tag and commits since
|
||||
LAST_TAG="$(git describe --tags --abbrev=0 2>/dev/null || true)"
|
||||
if [[ -n "$LAST_TAG" ]]; then
|
||||
COMMITS_SINCE_LAST_RELEASE="$(git rev-list --count "${LAST_TAG}..HEAD")"
|
||||
else
|
||||
COMMITS_SINCE_LAST_RELEASE="0"
|
||||
fi
|
||||
|
||||
cat >app/static/git.json <<EOF
|
||||
{
|
||||
"ref": "${GITEA_REF:-}",
|
||||
"ref_name": "${GITEA_REF_NAME:-}",
|
||||
"ref_type": "${GITEA_REF_TYPE:-}",
|
||||
"sha": "${GITEA_SHA:-}",
|
||||
"run_number": "${GITEA_RUN_NUMBER:-}",
|
||||
"server_url": "${GITEA_SERVER_URL:-}",
|
||||
"event_name": "${GITEA_EVENT_NAME:-}",
|
||||
"workflow": "${GITEA_WORKFLOW:-}",
|
||||
"job": "${GITEA_JOB:-}",
|
||||
"commit_message": "${GITEA_COMMIT_MESSAGE:-}",
|
||||
"commit_timestamp": "${GITEA_COMMIT_TIMESTAMP:-}",
|
||||
"branch": "${GITEA_HEAD_REF:-}",
|
||||
"base_branch": "${GITEA_BASE_REF:-}"
|
||||
"ref": "${GITHUB_REF:-}",
|
||||
"ref_name": "${REF_NAME}",
|
||||
"ref_type": "${REF_TYPE}",
|
||||
"sha": "${GITHUB_SHA:-}",
|
||||
"run_number": "${GITHUB_RUN_NUMBER:-}",
|
||||
"event_name": "${GITHUB_EVENT_NAME:-}",
|
||||
"workflow": "${GITHUB_WORKFLOW:-}",
|
||||
"job": "${GITHUB_JOB:-}",
|
||||
"commit_message": "$(git log -1 --pretty=%B)",
|
||||
"commit_timestamp": "$(git log -1 --pretty=%cI)",
|
||||
"branch": "${BRANCH}",
|
||||
"commits_since_last_release": "${COMMITS_SINCE_LAST_RELEASE}"
|
||||
}
|
||||
EOF
|
||||
|
||||
|
||||
@@ -5,16 +5,21 @@ TAG="$GITHUB_REF_NAME"
|
||||
VERSION=$(echo "$TAG" | sed 's/^v//')
|
||||
DATE=$(date +%Y-%m-%d)
|
||||
|
||||
echo "🚀 Creating release for $TAG (safe mode)"
|
||||
echo "🚀 Creating release for $TAG"
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# 1. Extract release notes from annotated tag
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
# Ensure the local git knows this is an annotated tag with metadata
|
||||
git fetch origin "refs/tags/$TAG:refs/tags/$TAG" --force
|
||||
|
||||
# %(contents) gets the whole message.
|
||||
# If you want ONLY what you typed after the first line, use %(contents:body)
|
||||
NOTES=$(git tag -l "$TAG" --format='%(contents)')
|
||||
|
||||
if [ -z "$NOTES" ]; then
|
||||
echo "❌ Tag message is empty"
|
||||
if [ -z "$(echo "$NOTES" | tr -d '[:space:]')" ]; then
|
||||
echo "❌ Tag message is empty or tag is not annotated"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -23,10 +28,8 @@ git checkout main
|
||||
# -------------------------------------------------------------------
|
||||
# 2. Update all package.json versions
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
echo "🔧 Updating package.json versions to $VERSION"
|
||||
|
||||
find . -name package.json ! -path "*/node_modules/*" | while read file; do
|
||||
find . -name package.json ! -path "*/node_modules/*" | while read -r file; do
|
||||
tmp_file="$file.tmp"
|
||||
jq --arg v "$VERSION" '.version = $v' "$file" >"$tmp_file"
|
||||
mv "$tmp_file" "$file"
|
||||
@@ -35,20 +38,18 @@ done
|
||||
# -------------------------------------------------------------------
|
||||
# 3. Generate commit list since last release
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
# Get the previous tag (fallback to empty if none)
|
||||
LAST_TAG=$(git tag --sort=-creatordate | grep -v "^$TAG$" | head -n 1 || echo "")
|
||||
|
||||
if [ -n "$LAST_TAG" ]; then
|
||||
COMMITS=$(git log "$LAST_TAG"..HEAD --pretty=format:'[%h](https://git.max-richter.dev/max/nodarium/commit/%H) %s')
|
||||
# Filter out previous 'chore(release)' commits so the list stays clean
|
||||
COMMITS=$(git log "$LAST_TAG"..HEAD --pretty=format:'* [%h](https://git.max-richter.dev/max/nodarium/commit/%H) %s' | grep -v "chore(release)")
|
||||
else
|
||||
COMMITS=$(git log HEAD --pretty=format:'[%h](https://git.max-richter.dev/max/nodarium/commit/%H) %s')
|
||||
COMMITS=$(git log HEAD --pretty=format:'* [%h](https://git.max-richter.dev/max/nodarium/commit/%H) %s' | grep -v "chore(release)")
|
||||
fi
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# 4. Update CHANGELOG.md (prepend)
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
tmp_changelog="CHANGELOG.tmp"
|
||||
{
|
||||
echo "## $TAG ($DATE)"
|
||||
@@ -56,7 +57,7 @@ tmp_changelog="CHANGELOG.tmp"
|
||||
echo "$NOTES"
|
||||
echo ""
|
||||
if [ -n "$COMMITS" ]; then
|
||||
echo "All Commits:"
|
||||
echo "### All Commits in this version:"
|
||||
echo "$COMMITS"
|
||||
echo ""
|
||||
fi
|
||||
@@ -74,24 +75,17 @@ pnpm exec dprint fmt CHANGELOG.md
|
||||
# -------------------------------------------------------------------
|
||||
# 5. Create release commit
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
git config user.name "release-bot"
|
||||
git config user.email "release-bot@ci"
|
||||
|
||||
git add CHANGELOG.md $(find . -name package.json ! -path "*/node_modules/*")
|
||||
|
||||
# Skip commit if nothing changed
|
||||
if git diff --cached --quiet; then
|
||||
echo "No changes to commit for release $TAG"
|
||||
exit 0
|
||||
else
|
||||
git commit -m "chore(release): $TAG"
|
||||
git push origin main
|
||||
fi
|
||||
|
||||
git commit -m "chore(release): $TAG"
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# 6. Push changes
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
git push origin main
|
||||
|
||||
echo "✅ Release commit for $TAG created successfully (tag untouched)"
|
||||
cp CHANGELOG.md app/static/CHANGELOG.md
|
||||
echo "✅ Release process for $TAG complete"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@nodarium/app",
|
||||
"private": true,
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.3",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
@@ -18,7 +18,7 @@
|
||||
"dependencies": {
|
||||
"@nodarium/ui": "workspace:*",
|
||||
"@nodarium/utils": "workspace:*",
|
||||
"@sveltejs/kit": "^2.50.0",
|
||||
"@sveltejs/kit": "^2.50.2",
|
||||
"@tailwindcss/vite": "^4.1.18",
|
||||
"@threlte/core": "8.3.1",
|
||||
"@threlte/extras": "9.7.1",
|
||||
@@ -34,11 +34,11 @@
|
||||
"@eslint/js": "^9.39.2",
|
||||
"@iconify-json/tabler": "^1.2.26",
|
||||
"@iconify/tailwind4": "^1.2.1",
|
||||
"@nodarium/types": "workspace:",
|
||||
"@nodarium/types": "workspace:^",
|
||||
"@playwright/test": "^1.58.1",
|
||||
"@sveltejs/adapter-static": "^3.0.10",
|
||||
"@sveltejs/vite-plugin-svelte": "^6.2.4",
|
||||
"@tsconfig/svelte": "^5.0.6",
|
||||
"@tsconfig/svelte": "^5.0.7",
|
||||
"@types/file-saver": "^2.0.7",
|
||||
"@types/three": "^0.182.0",
|
||||
"@vitest/browser-playwright": "^4.0.18",
|
||||
@@ -46,8 +46,8 @@
|
||||
"eslint": "^9.39.2",
|
||||
"eslint-plugin-svelte": "^3.14.0",
|
||||
"globals": "^17.3.0",
|
||||
"svelte": "^5.46.4",
|
||||
"svelte-check": "^4.3.5",
|
||||
"svelte": "^5.49.2",
|
||||
"svelte-check": "^4.3.6",
|
||||
"tslib": "^2.8.1",
|
||||
"typescript": "^5.9.3",
|
||||
"typescript-eslint": "^8.54.0",
|
||||
@@ -55,7 +55,7 @@
|
||||
"vite-plugin-comlink": "^5.3.0",
|
||||
"vite-plugin-glsl": "^1.5.5",
|
||||
"vite-plugin-wasm": "^3.5.0",
|
||||
"vitest": "^4.0.17",
|
||||
"vitest": "^4.0.18",
|
||||
"vitest-browser-svelte": "^2.0.2"
|
||||
}
|
||||
}
|
||||
|
||||
265
app/src/lib/graph-interface/graph-manager.svelte.test.ts
Normal file
265
app/src/lib/graph-interface/graph-manager.svelte.test.ts
Normal file
@@ -0,0 +1,265 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import { GraphManager } from './graph-manager.svelte';
|
||||
import {
|
||||
createMockNodeRegistry,
|
||||
mockFloatInputNode,
|
||||
mockFloatOutputNode,
|
||||
mockGeometryOutputNode,
|
||||
mockPathInputNode,
|
||||
mockVec3OutputNode
|
||||
} from './test-utils';
|
||||
|
||||
describe('GraphManager', () => {
|
||||
describe('getPossibleSockets', () => {
|
||||
describe('when dragging an output socket', () => {
|
||||
it('should return compatible input sockets based on type', () => {
|
||||
const registry = createMockNodeRegistry([
|
||||
mockFloatOutputNode,
|
||||
mockFloatInputNode,
|
||||
mockGeometryOutputNode,
|
||||
mockPathInputNode
|
||||
]);
|
||||
|
||||
const manager = new GraphManager(registry);
|
||||
|
||||
const floatInputNode = manager.createNode({
|
||||
type: 'test/node/input',
|
||||
position: [100, 100],
|
||||
props: {}
|
||||
});
|
||||
|
||||
const floatOutputNode = manager.createNode({
|
||||
type: 'test/node/output',
|
||||
position: [0, 0],
|
||||
props: {}
|
||||
});
|
||||
|
||||
expect(floatInputNode).toBeDefined();
|
||||
expect(floatOutputNode).toBeDefined();
|
||||
|
||||
const possibleSockets = manager.getPossibleSockets({
|
||||
node: floatOutputNode!,
|
||||
index: 0,
|
||||
position: [0, 0]
|
||||
});
|
||||
|
||||
expect(possibleSockets.length).toBe(1);
|
||||
const socketNodeIds = possibleSockets.map(([node]) => node.id);
|
||||
expect(socketNodeIds).toContain(floatInputNode!.id);
|
||||
});
|
||||
|
||||
it('should exclude self node from possible sockets', () => {
|
||||
const registry = createMockNodeRegistry([
|
||||
mockFloatOutputNode,
|
||||
mockFloatInputNode
|
||||
]);
|
||||
|
||||
const manager = new GraphManager(registry);
|
||||
|
||||
const floatInputNode = manager.createNode({
|
||||
type: 'test/node/input',
|
||||
position: [100, 100],
|
||||
props: {}
|
||||
});
|
||||
|
||||
expect(floatInputNode).toBeDefined();
|
||||
|
||||
const possibleSockets = manager.getPossibleSockets({
|
||||
node: floatInputNode!,
|
||||
index: 'value',
|
||||
position: [0, 0]
|
||||
});
|
||||
|
||||
const socketNodeIds = possibleSockets.map(([node]) => node.id);
|
||||
expect(socketNodeIds).not.toContain(floatInputNode!.id);
|
||||
});
|
||||
|
||||
it('should exclude parent nodes from possible sockets when dragging output', () => {
|
||||
const registry = createMockNodeRegistry([
|
||||
mockFloatOutputNode,
|
||||
mockFloatInputNode
|
||||
]);
|
||||
|
||||
const manager = new GraphManager(registry);
|
||||
|
||||
const parentNode = manager.createNode({
|
||||
type: 'test/node/output',
|
||||
position: [0, 0],
|
||||
props: {}
|
||||
});
|
||||
|
||||
const childNode = manager.createNode({
|
||||
type: 'test/node/input',
|
||||
position: [100, 100],
|
||||
props: {}
|
||||
});
|
||||
|
||||
expect(parentNode).toBeDefined();
|
||||
expect(childNode).toBeDefined();
|
||||
|
||||
if (parentNode && childNode) {
|
||||
manager.createEdge(parentNode, 0, childNode, 'value');
|
||||
}
|
||||
|
||||
const possibleSockets = manager.getPossibleSockets({
|
||||
node: parentNode!,
|
||||
index: 0,
|
||||
position: [0, 0]
|
||||
});
|
||||
|
||||
const socketNodeIds = possibleSockets.map(([node]) => node.id);
|
||||
expect(socketNodeIds).not.toContain(childNode!.id);
|
||||
});
|
||||
|
||||
it('should return sockets compatible with accepts property', () => {
|
||||
const registry = createMockNodeRegistry([
|
||||
mockGeometryOutputNode,
|
||||
mockPathInputNode
|
||||
]);
|
||||
|
||||
const manager = new GraphManager(registry);
|
||||
|
||||
const geometryOutputNode = manager.createNode({
|
||||
type: 'test/node/geometry',
|
||||
position: [0, 0],
|
||||
props: {}
|
||||
});
|
||||
|
||||
const pathInputNode = manager.createNode({
|
||||
type: 'test/node/path',
|
||||
position: [100, 100],
|
||||
props: {}
|
||||
});
|
||||
|
||||
expect(geometryOutputNode).toBeDefined();
|
||||
expect(pathInputNode).toBeDefined();
|
||||
|
||||
const possibleSockets = manager.getPossibleSockets({
|
||||
node: geometryOutputNode!,
|
||||
index: 0,
|
||||
position: [0, 0]
|
||||
});
|
||||
|
||||
const socketNodeIds = possibleSockets.map(([node]) => node.id);
|
||||
expect(socketNodeIds).toContain(pathInputNode!.id);
|
||||
});
|
||||
|
||||
it('should return empty array when no compatible sockets exist', () => {
|
||||
const registry = createMockNodeRegistry([
|
||||
mockVec3OutputNode,
|
||||
mockFloatInputNode
|
||||
]);
|
||||
|
||||
const manager = new GraphManager(registry);
|
||||
|
||||
const vec3OutputNode = manager.createNode({
|
||||
type: 'test/node/vec3',
|
||||
position: [0, 0],
|
||||
props: {}
|
||||
});
|
||||
|
||||
const floatInputNode = manager.createNode({
|
||||
type: 'test/node/input',
|
||||
position: [100, 100],
|
||||
props: {}
|
||||
});
|
||||
|
||||
expect(vec3OutputNode).toBeDefined();
|
||||
expect(floatInputNode).toBeDefined();
|
||||
|
||||
const possibleSockets = manager.getPossibleSockets({
|
||||
node: vec3OutputNode!,
|
||||
index: 0,
|
||||
position: [0, 0]
|
||||
});
|
||||
|
||||
const socketNodeIds = possibleSockets.map(([node]) => node.id);
|
||||
expect(socketNodeIds).not.toContain(floatInputNode!.id);
|
||||
expect(possibleSockets.length).toBe(0);
|
||||
});
|
||||
|
||||
it('should return socket info with correct socket key for inputs', () => {
|
||||
const registry = createMockNodeRegistry([
|
||||
mockFloatOutputNode,
|
||||
mockFloatInputNode
|
||||
]);
|
||||
|
||||
const manager = new GraphManager(registry);
|
||||
|
||||
const floatOutputNode = manager.createNode({
|
||||
type: 'test/node/output',
|
||||
position: [0, 0],
|
||||
props: {}
|
||||
});
|
||||
|
||||
const floatInputNode = manager.createNode({
|
||||
type: 'test/node/input',
|
||||
position: [100, 100],
|
||||
props: {}
|
||||
});
|
||||
|
||||
expect(floatOutputNode).toBeDefined();
|
||||
expect(floatInputNode).toBeDefined();
|
||||
|
||||
const possibleSockets = manager.getPossibleSockets({
|
||||
node: floatOutputNode!,
|
||||
index: 0,
|
||||
position: [0, 0]
|
||||
});
|
||||
|
||||
const matchingSocket = possibleSockets.find(([node]) => node.id === floatInputNode!.id);
|
||||
expect(matchingSocket).toBeDefined();
|
||||
expect(matchingSocket![1]).toBe('value');
|
||||
});
|
||||
|
||||
it('should return multiple compatible sockets', () => {
|
||||
const registry = createMockNodeRegistry([
|
||||
mockFloatOutputNode,
|
||||
mockFloatInputNode,
|
||||
mockGeometryOutputNode,
|
||||
mockPathInputNode
|
||||
]);
|
||||
|
||||
const manager = new GraphManager(registry);
|
||||
|
||||
const floatOutputNode = manager.createNode({
|
||||
type: 'test/node/output',
|
||||
position: [0, 0],
|
||||
props: {}
|
||||
});
|
||||
|
||||
const geometryOutputNode = manager.createNode({
|
||||
type: 'test/node/geometry',
|
||||
position: [200, 0],
|
||||
props: {}
|
||||
});
|
||||
|
||||
const floatInputNode = manager.createNode({
|
||||
type: 'test/node/input',
|
||||
position: [100, 100],
|
||||
props: {}
|
||||
});
|
||||
|
||||
const pathInputNode = manager.createNode({
|
||||
type: 'test/node/path',
|
||||
position: [300, 100],
|
||||
props: {}
|
||||
});
|
||||
|
||||
expect(floatOutputNode).toBeDefined();
|
||||
expect(geometryOutputNode).toBeDefined();
|
||||
expect(floatInputNode).toBeDefined();
|
||||
expect(pathInputNode).toBeDefined();
|
||||
|
||||
const possibleSocketsForFloat = manager.getPossibleSockets({
|
||||
node: floatOutputNode!,
|
||||
index: 0,
|
||||
position: [0, 0]
|
||||
});
|
||||
|
||||
expect(possibleSocketsForFloat.length).toBe(1);
|
||||
expect(possibleSocketsForFloat.map(([n]) => n.id)).toContain(floatInputNode!.id);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -757,12 +757,16 @@ export class GraphManager extends EventEmitter<{
|
||||
(n) => n.id !== node.id && !parents.has(n.id)
|
||||
);
|
||||
|
||||
// get edges from this socket
|
||||
const edges = new SvelteMap(
|
||||
this.getEdgesFromNode(node)
|
||||
.filter((e) => e[1] === index)
|
||||
.map((e) => [e[2].id, e[3]])
|
||||
);
|
||||
const edges = new SvelteMap<number, string[]>();
|
||||
this.getEdgesFromNode(node)
|
||||
.filter((e) => e[1] === index)
|
||||
.forEach((e) => {
|
||||
if (edges.has(e[2].id)) {
|
||||
edges.get(e[2].id)?.push(e[3]);
|
||||
} else {
|
||||
edges.set(e[2].id, [e[3]]);
|
||||
}
|
||||
});
|
||||
|
||||
const ownType = nodeType.outputs?.[index];
|
||||
|
||||
@@ -775,7 +779,7 @@ export class GraphManager extends EventEmitter<{
|
||||
|
||||
if (
|
||||
areSocketsCompatible(ownType, otherType)
|
||||
&& edges.get(node.id) !== key
|
||||
&& !edges.get(node.id)?.includes(key)
|
||||
) {
|
||||
sockets.push([node, key]);
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ export class MouseEventManager {
|
||||
}
|
||||
}
|
||||
|
||||
if (_socket && smallestDist < 0.9) {
|
||||
if (_socket && smallestDist < 1.5) {
|
||||
this.state.mousePosition = _socket.position;
|
||||
this.state.hoveredSocket = _socket;
|
||||
} else {
|
||||
|
||||
@@ -35,8 +35,8 @@
|
||||
);
|
||||
const pathHover = $derived(
|
||||
createNodePath({
|
||||
depth: 8.5,
|
||||
height: 50,
|
||||
depth: 7,
|
||||
height: 40,
|
||||
y: 49,
|
||||
cornerTop,
|
||||
rightBump,
|
||||
@@ -113,6 +113,9 @@
|
||||
stroke: var(--stroke);
|
||||
stroke-width: var(--stroke-width);
|
||||
d: var(--path);
|
||||
|
||||
stroke-linejoin: round;
|
||||
shape-rendering: geometricPrecision;
|
||||
}
|
||||
|
||||
.content {
|
||||
|
||||
@@ -39,16 +39,6 @@
|
||||
const aspectRatio = 0.5;
|
||||
|
||||
const path = $derived(
|
||||
createNodePath({
|
||||
depth: 7,
|
||||
height: 20,
|
||||
y: 50.5,
|
||||
cornerBottom,
|
||||
leftBump,
|
||||
aspectRatio
|
||||
})
|
||||
);
|
||||
const pathDisabled = $derived(
|
||||
createNodePath({
|
||||
depth: 6,
|
||||
height: 18,
|
||||
@@ -60,8 +50,8 @@
|
||||
);
|
||||
const pathHover = $derived(
|
||||
createNodePath({
|
||||
depth: 8,
|
||||
height: 25,
|
||||
depth: 7,
|
||||
height: 20,
|
||||
y: 50.5,
|
||||
cornerBottom,
|
||||
leftBump,
|
||||
@@ -74,7 +64,7 @@
|
||||
class="wrapper"
|
||||
data-node-type={node.type}
|
||||
data-node-input={id}
|
||||
class:disabled={!graphState?.possibleSocketIds.has(socketId)}
|
||||
class:possible-socket={graphState?.possibleSocketIds.has(socketId)}
|
||||
>
|
||||
{#key id && graphId}
|
||||
<div class="content" class:disabled={graph?.inputSockets?.has(socketId)}>
|
||||
@@ -91,10 +81,9 @@
|
||||
</div>
|
||||
|
||||
{#if node?.state?.type?.inputs?.[id]?.internal !== true}
|
||||
<div data-node-socket class="large target"></div>
|
||||
<div
|
||||
data-node-socket
|
||||
class="small target"
|
||||
class="target"
|
||||
onmousedown={handleMouseDown}
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@@ -112,7 +101,6 @@
|
||||
style={`
|
||||
--path: path("${path}");
|
||||
--hover-path: path("${pathHover}");
|
||||
--hover-path-disabled: path("${pathDisabled}");
|
||||
`}
|
||||
>
|
||||
<path vector-effect="non-scaling-stroke"></path>
|
||||
@@ -128,28 +116,22 @@
|
||||
}
|
||||
|
||||
.target {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
position: absolute;
|
||||
border-radius: 50%;
|
||||
top: 50%;
|
||||
transform: translateY(-50%) translateX(-50%);
|
||||
/* background: red; */
|
||||
/* opacity: 0.1; */
|
||||
}
|
||||
|
||||
.small.target {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
.possible-socket .target {
|
||||
box-shadow: 0px 0px 10px rgba(255, 255, 255, 0.5);
|
||||
background-color: rgba(255, 255, 255, 0.2);
|
||||
z-index: -10;
|
||||
}
|
||||
|
||||
.large.target {
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
cursor: unset;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
:global(.hovering-sockets) .large.target {
|
||||
pointer-events: all;
|
||||
.target:hover ~ svg path{
|
||||
d: var(--hover-path);
|
||||
}
|
||||
|
||||
.content {
|
||||
@@ -179,19 +161,16 @@
|
||||
stroke: var(--stroke);
|
||||
stroke-width: var(--stroke-width);
|
||||
d: var(--path);
|
||||
}
|
||||
|
||||
:global {
|
||||
.hovering-sockets .large:hover ~ svg path {
|
||||
d: var(--hover-path);
|
||||
}
|
||||
stroke-linejoin: round;
|
||||
shape-rendering: geometricPrecision;
|
||||
}
|
||||
|
||||
.content.disabled {
|
||||
opacity: 0.2;
|
||||
}
|
||||
|
||||
.disabled svg path {
|
||||
d: var(--hover-path-disabled) !important;
|
||||
.possible-socket svg path {
|
||||
d: var(--hover-path);
|
||||
}
|
||||
</style>
|
||||
|
||||
86
app/src/lib/graph-interface/test-utils.ts
Normal file
86
app/src/lib/graph-interface/test-utils.ts
Normal file
@@ -0,0 +1,86 @@
|
||||
import type { NodeDefinition, NodeId, NodeRegistry } from '@nodarium/types';
|
||||
|
||||
export function createMockNodeRegistry(nodes: NodeDefinition[]): NodeRegistry {
|
||||
const nodesMap = new Map(nodes.map(n => [n.id, n]));
|
||||
return {
|
||||
status: 'ready' as const,
|
||||
load: async (nodeIds: NodeId[]) => {
|
||||
const loaded: NodeDefinition[] = [];
|
||||
for (const id of nodeIds) {
|
||||
if (nodesMap.has(id)) {
|
||||
loaded.push(nodesMap.get(id)!);
|
||||
}
|
||||
}
|
||||
return loaded;
|
||||
},
|
||||
getNode: (id: string) => nodesMap.get(id as NodeId),
|
||||
getAllNodes: () => Array.from(nodesMap.values()),
|
||||
register: async () => {
|
||||
throw new Error('Not implemented in mock');
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export const mockFloatOutputNode: NodeDefinition = {
|
||||
id: 'test/node/output',
|
||||
inputs: {},
|
||||
outputs: ['float'],
|
||||
meta: { title: 'Float Output' },
|
||||
execute: () => new Int32Array()
|
||||
};
|
||||
|
||||
export const mockFloatInputNode: NodeDefinition = {
|
||||
id: 'test/node/input',
|
||||
inputs: { value: { type: 'float' } },
|
||||
outputs: [],
|
||||
meta: { title: 'Float Input' },
|
||||
execute: () => new Int32Array()
|
||||
};
|
||||
|
||||
export const mockGeometryOutputNode: NodeDefinition = {
|
||||
id: 'test/node/geometry',
|
||||
inputs: {},
|
||||
outputs: ['geometry'],
|
||||
meta: { title: 'Geometry Output' },
|
||||
execute: () => new Int32Array()
|
||||
};
|
||||
|
||||
export const mockPathInputNode: NodeDefinition = {
|
||||
id: 'test/node/path',
|
||||
inputs: { input: { type: 'path', accepts: ['geometry'] } },
|
||||
outputs: [],
|
||||
meta: { title: 'Path Input' },
|
||||
execute: () => new Int32Array()
|
||||
};
|
||||
|
||||
export const mockVec3OutputNode: NodeDefinition = {
|
||||
id: 'test/node/vec3',
|
||||
inputs: {},
|
||||
outputs: ['vec3'],
|
||||
meta: { title: 'Vec3 Output' },
|
||||
execute: () => new Int32Array()
|
||||
};
|
||||
|
||||
export const mockIntegerInputNode: NodeDefinition = {
|
||||
id: 'test/node/integer',
|
||||
inputs: { value: { type: 'integer' } },
|
||||
outputs: [],
|
||||
meta: { title: 'Integer Input' },
|
||||
execute: () => new Int32Array()
|
||||
};
|
||||
|
||||
export const mockBooleanOutputNode: NodeDefinition = {
|
||||
id: 'test/node/boolean',
|
||||
inputs: {},
|
||||
outputs: ['boolean'],
|
||||
meta: { title: 'Boolean Output' },
|
||||
execute: () => new Int32Array()
|
||||
};
|
||||
|
||||
export const mockBooleanInputNode: NodeDefinition = {
|
||||
id: 'test/node/boolean-input',
|
||||
inputs: { value: { type: 'boolean' } },
|
||||
outputs: [],
|
||||
meta: { title: 'Boolean Input' },
|
||||
execute: () => new Int32Array()
|
||||
};
|
||||
@@ -1,11 +1,6 @@
|
||||
<script lang="ts">
|
||||
type Change = { type: string; content: string };
|
||||
|
||||
async function fetchChangelog() {
|
||||
const res = await fetch('/CHANGELOG.md');
|
||||
return await res.text();
|
||||
}
|
||||
|
||||
const typeMap: Record<string, string> = {
|
||||
fix: 'bg-layer-2 bg-red-800',
|
||||
feat: 'bg-layer-2 bg-green-800',
|
||||
@@ -15,6 +10,16 @@
|
||||
default: 'bg-layer-2 text-text'
|
||||
};
|
||||
|
||||
async function fetchChangelog() {
|
||||
const res = await fetch('/CHANGELOG.md');
|
||||
return await res.text();
|
||||
}
|
||||
|
||||
async function fetchGitInfo() {
|
||||
const res = await fetch('/git.json');
|
||||
return await res.json();
|
||||
}
|
||||
|
||||
function parseChangelog(md: string) {
|
||||
const lines = md.split('\n');
|
||||
const parsed: (string | Change)[] = [];
|
||||
@@ -45,8 +50,13 @@
|
||||
parsed.push({ type: 'default', content: line });
|
||||
}
|
||||
|
||||
// Remove trailing horizontal rule
|
||||
let lastLine = parsed.at(-1);
|
||||
if (lastLine !== undefined && typeof lastLine !== 'string' && lastLine.type === 'hr') {
|
||||
if (
|
||||
lastLine !== undefined
|
||||
&& typeof lastLine !== 'string'
|
||||
&& lastLine.type === 'hr'
|
||||
) {
|
||||
parsed.pop();
|
||||
}
|
||||
|
||||
@@ -55,20 +65,41 @@
|
||||
</script>
|
||||
|
||||
<div class="p-4 font-mono text-text">
|
||||
{#await fetchChangelog()}
|
||||
{#await Promise.all([fetchChangelog(), fetchGitInfo()])}
|
||||
<p>Loading...</p>
|
||||
{:then md}
|
||||
{:then [md, git]}
|
||||
<div class="mb-4 p-3 bg-layer-2 text-xs">
|
||||
<p><strong>Branch:</strong> {git.branch}</p>
|
||||
<p>
|
||||
<strong>Commit:</strong>
|
||||
{git.sha.slice(0, 7)} – {git.commit_message}
|
||||
</p>
|
||||
<p>
|
||||
<strong>Commits since last release:</strong>
|
||||
{git.commits_since_last_release}
|
||||
</p>
|
||||
<p>
|
||||
<strong>Timestamp:</strong>
|
||||
{new Date(git.commit_timestamp).toLocaleString()}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{#each parseChangelog(md) as item (item)}
|
||||
{#if typeof item === 'string'}
|
||||
<h2 class="text-xl font-semibold mt-4 mb-4 text-layer-1">{item}</h2>
|
||||
{:else if item.type === 'hr'}
|
||||
<p></p>
|
||||
{:else}
|
||||
<p class="px-3 py-1 mb-1 leading-8 border-b-1 border-b-outline last:border-b-0">
|
||||
{:else if item.type === 'hr'}{:else}
|
||||
<p class="py-1 mb-1 leading-8 border-b border-b-outline last:border-b-0">
|
||||
{#if item.type !== 'default'}
|
||||
<span class="p-1 rounded-sm font-semibold {typeMap[item.type]}">
|
||||
<span
|
||||
class="
|
||||
p-1 rounded-sm opacity-80 font-semibold {typeMap[
|
||||
item.type
|
||||
]}
|
||||
"
|
||||
>
|
||||
{item.content.split(':')[0]}
|
||||
</span> {item.content.split(':').slice(1).join(':').trim()}
|
||||
</span>
|
||||
{item.content.split(':').slice(1).join(':').trim()}
|
||||
{:else}
|
||||
{item.content}
|
||||
{/if}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.3",
|
||||
"scripts": {
|
||||
"postinstall": "pnpm run -r --filter 'ui' build",
|
||||
"lint": "pnpm run -r --parallel lint",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nodarium/types",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.3",
|
||||
"description": "",
|
||||
"main": "src/index.ts",
|
||||
"scripts": {
|
||||
@@ -17,7 +17,7 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"zod": "^4.3.5"
|
||||
"zod": "^4.3.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"dprint": "^0.51.1"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nodarium/ui",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.3",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build && npm run package",
|
||||
@@ -33,25 +33,25 @@
|
||||
"@eslint/compat": "^2.0.2",
|
||||
"@eslint/eslintrc": "^3.3.3",
|
||||
"@eslint/js": "^9.39.2",
|
||||
"@nodarium/types": "workspace:",
|
||||
"@nodarium/types": "workspace:^",
|
||||
"@playwright/test": "^1.58.1",
|
||||
"@sveltejs/adapter-static": "^3.0.10",
|
||||
"@sveltejs/kit": "^2.50.0",
|
||||
"@sveltejs/kit": "^2.50.2",
|
||||
"@sveltejs/package": "^2.5.7",
|
||||
"@sveltejs/vite-plugin-svelte": "^6.2.4",
|
||||
"@testing-library/svelte": "^5.3.1",
|
||||
"@types/eslint": "^9.6.1",
|
||||
"@types/three": "^0.182.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.53.0",
|
||||
"@typescript-eslint/parser": "^8.53.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.54.0",
|
||||
"@typescript-eslint/parser": "^8.54.0",
|
||||
"@vitest/browser-playwright": "^4.0.18",
|
||||
"dprint": "^0.51.1",
|
||||
"eslint": "^9.39.2",
|
||||
"eslint-plugin-svelte": "^3.14.0",
|
||||
"globals": "^17.3.0",
|
||||
"publint": "^0.3.16",
|
||||
"svelte": "^5.46.4",
|
||||
"svelte-check": "^4.3.5",
|
||||
"publint": "^0.3.17",
|
||||
"svelte": "^5.49.2",
|
||||
"svelte-check": "^4.3.6",
|
||||
"svelte-eslint-parser": "^1.4.1",
|
||||
"tslib": "^2.8.1",
|
||||
"typescript": "^5.9.3",
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
// normalize bounds
|
||||
if (min > max) [min, max] = [max, min];
|
||||
if (value > max) max = value;
|
||||
|
||||
let inputEl: HTMLInputElement | undefined = $state();
|
||||
|
||||
@@ -27,11 +26,18 @@
|
||||
return Math.min(max, Math.max(min, v));
|
||||
}
|
||||
|
||||
function snap(v: number) {
|
||||
if (step) v = Math.round(v / step) * step;
|
||||
function snap(v: number, s = step) {
|
||||
if (s) v = Math.round(v / s) * s;
|
||||
return +v.toFixed(3);
|
||||
}
|
||||
|
||||
function getAutoStep(v: number): number {
|
||||
const abs = Math.abs(v);
|
||||
if (abs === 0) return 0.1; // fallback for 0
|
||||
const exponent = Math.floor(Math.log10(abs));
|
||||
return Math.pow(10, exponent);
|
||||
}
|
||||
|
||||
let dragging = $state(false);
|
||||
let startValue = 0;
|
||||
let rect: DOMRect;
|
||||
@@ -59,7 +65,8 @@
|
||||
value = snap(
|
||||
e.ctrlKey
|
||||
? startValue + delta
|
||||
: clamp(startValue + delta)
|
||||
: clamp(startValue + delta),
|
||||
(e.altKey && !step) ? getAutoStep(value) : step
|
||||
);
|
||||
}
|
||||
|
||||
@@ -105,7 +112,7 @@
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
value = snap(clamp(value));
|
||||
value = snap(value);
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -130,7 +137,7 @@
|
||||
<div
|
||||
class="absolute inset-y-0 left-0 bg-layer-3 opacity-30 pointer-events-none transition-[width]"
|
||||
class:transition-none={dragging}
|
||||
style={`width: ${Math.min((value - min) / (max - min), 1) * 100}%`}
|
||||
style={`width: ${Math.max(0, Math.min((value - min) / (max - min), 1) * 100)}%`}
|
||||
>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -42,4 +42,18 @@ describe('InputNumber', () => {
|
||||
await expect.element(input).toHaveAttribute('min', '0');
|
||||
await expect.element(input).toHaveAttribute('max', '10');
|
||||
});
|
||||
|
||||
it('should not clamp value on init when value exceeds min/max', async () => {
|
||||
render(InputNumber, { value: 100, min: 0, max: 10 });
|
||||
|
||||
const input = page.getByRole('spinbutton');
|
||||
await expect.element(input).toHaveValue(100);
|
||||
});
|
||||
|
||||
it('should not clamp value on init when value is below min', async () => {
|
||||
render(InputNumber, { value: -50, min: 0, max: 10 });
|
||||
|
||||
const input = page.getByRole('spinbutton');
|
||||
await expect.element(input).toHaveValue(-50);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nodarium/utils",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.3",
|
||||
"description": "",
|
||||
"main": "src/index.ts",
|
||||
"scripts": {
|
||||
@@ -12,11 +12,11 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@nodarium/types": "workspace:"
|
||||
"@nodarium/types": "workspace:^"
|
||||
},
|
||||
"devDependencies": {
|
||||
"dprint": "^0.51.1",
|
||||
"vite": "^7.3.1",
|
||||
"vitest": "^4.0.17"
|
||||
"vitest": "^4.0.18"
|
||||
}
|
||||
}
|
||||
|
||||
1211
pnpm-lock.yaml
generated
1211
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user