Skip to content

Fix code export import paths for toolbox blocks #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milanofthe merged 1 commit into from
Mar 8, 2026
Merged

Fix code export import paths for toolbox blocks #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/lib/utils/codePreviewHeader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import { nodeRegistry, type NodeInstance } from '$lib/nodes';
import { eventRegistry, type EventInstance } from '$lib/events';
import { NODE_TYPES } from '$lib/constants/nodeTypes';
import { blockImportPaths } from '$lib/nodes/generated/blocks';

/**
* Extract Python identifiers from a string (parameter values)
Expand Down Expand Up @@ -134,10 +135,21 @@ export function generateBlockCodeHeader(node: NodeInstance, codeContext: string)
const blockClasses = new Set<string>();
collectSubsystemBlockClasses(node, blockClasses);
if (blockClasses.size > 0) {
lines.push(`from pathsim.blocks import ${[...blockClasses].sort().join(', ')}`);
// Group block classes by import path
const importGroups = new Map<string, string[]>();
for (const cls of [...blockClasses].sort()) {
const importPath = blockImportPaths[cls] || 'pathsim.blocks';
const group = importGroups.get(importPath) || [];
group.push(cls);
importGroups.set(importPath, group);
}
for (const [importPath, classes] of importGroups) {
lines.push(`from ${importPath} import ${classes.join(', ')}`);
}
}
} else {
lines.push(`from pathsim.blocks import ${typeDef.blockClass}`);
const importPath = blockImportPaths[typeDef.blockClass] || 'pathsim.blocks';
lines.push(`from ${importPath} import ${typeDef.blockClass}`);
}

// Extract referenced code context
Expand Down