Merge pull request #242 from pathsim/refactor/codebase-cleanup

codebase cleanup

Author: milanofthe

README.md

@@ -52,7 +52,6 @@ src/
 │   ├── export/            # Export utilities
 │   │   └── svg/           # SVG graph export (renderer, types)
 │   ├── nodes/             # Node type system
-│   │   ├── features/      # Node feature flags
 │   │   ├── generated/     # Auto-generated from PathSim
 │   │   └── shapes/        # Node shape definitions
 │   ├── plotting/          # Plot system

scripts/extract.py

@@ -783,7 +783,7 @@ class TypeScriptGenerator:
     def __init__(self, output_dir: Path):
         self.output_dir = output_dir
 
-    def write_blocks(self, blocks: dict, config: dict) -> None:
+    def write_blocks(self, blocks: dict, config: dict, import_paths: dict[str, str] | None = None) -> None:
         """Write blocks.ts file."""
         lines = [
             "// Auto-generated by scripts/extract.py - DO NOT EDIT",
@@ -820,6 +820,14 @@ def write_blocks(self, blocks: dict, config: dict) -> None:
         lines.append("};")
         lines.append("")
 
+        # Import paths map (block name -> Python import path)
+        if import_paths:
+            lines.append("export const blockImportPaths: Record<string, string> = {")
+            for block_name, path in sorted(import_paths.items()):
+                lines.append(f'  "{block_name}": "{path}",')
+            lines.append("};")
+            lines.append("")
+
         output_path = self.output_dir / "nodes" / "generated" / "blocks.ts"
         output_path.parent.mkdir(parents=True, exist_ok=True)
         output_path.write_text("\n".join(lines), encoding="utf-8")
@@ -1014,7 +1022,7 @@ def main():
         print("\nExtracting blocks...")
         blocks, block_config, block_import_paths = BlockExtractor(config).extract_all()
         if extract_all or args.blocks:
-            generator.write_blocks(blocks, block_config)
+            generator.write_blocks(blocks, block_config, block_import_paths)
         print(f"  Total: {len(blocks)} blocks")
 
     if extract_all or args.events or args.registry:

src/lib/components/FlowCanvas.svelte

@@ -13,6 +13,7 @@
 	} from '@xyflow/svelte';
 	import '@xyflow/svelte/dist/style.css';
 
+	import { isInputFocused } from '$lib/utils/focus';
 	import BaseNode from './nodes/BaseNode.svelte';
 	import EventNode from './nodes/EventNode.svelte';
 	import AnnotationNode from './nodes/AnnotationNode.svelte';
@@ -63,12 +64,7 @@
 
 	// Keyboard shortcuts for node manipulation
 	function handleKeydown(event: KeyboardEvent) {
-		// Ignore if typing in an input field or code editor
-		const isInputFocused =
-			event.target instanceof HTMLInputElement ||
-			event.target instanceof HTMLTextAreaElement ||
-			(event.target as HTMLElement)?.closest?.('.cm-editor');
-		if (isInputFocused) return;
+		if (isInputFocused(event)) return;
 
 		// Handle Delete key (SvelteFlow's deleteKeyCode doesn't work reliably for 'Delete')
 		if (event.key === 'Delete') {

src/lib/components/edges/ArrowEdge.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { BaseEdge, getSmoothStepPath, type EdgeProps } from '@xyflow/svelte';
 	import { hoveredHandle, selectedNodeHighlight } from '$lib/stores/hoveredHandle';
+	import { onDestroy } from 'svelte';
 
 	let {
 		id,
@@ -20,11 +21,16 @@
 
 	// Check if this edge is connected to the hovered handle
 	let hovered = $state<{ nodeId: string; handleId: string; color?: string } | null>(null);
-	hoveredHandle.subscribe((h) => (hovered = h));
+	const unsubscribeHovered = hoveredHandle.subscribe((h) => (hovered = h));
 
 	// Check if this edge is connected to a selected node
 	let selectedNode = $state<{ nodeId: string; color?: string } | null>(null);
-	selectedNodeHighlight.subscribe((s) => (selectedNode = s));
+	const unsubscribeSelected = selectedNodeHighlight.subscribe((s) => (selectedNode = s));
+
+	onDestroy(() => {
+		unsubscribeHovered();
+		unsubscribeSelected();
+	});
 
 	const isHoverHighlighted = $derived(() => {
 		if (!hovered) return false;

src/lib/nodes/features/index.ts

@@ -1342,3 +1342,68 @@ export const blockConfig: Record<string, string[]> = {
   Recording: ["Scope", "Spectrum"],
   Chemical: ["Process", "Bubbler4", "Splitter", "GLC"],
 };
+
+export const blockImportPaths: Record<string, string> = {
+  "ADC": "pathsim.blocks",
+  "Abs": "pathsim.blocks",
+  "Adder": "pathsim.blocks",
+  "Amplifier": "pathsim.blocks",
+  "AntiWindupPID": "pathsim.blocks",
+  "Bubbler4": "pathsim_chem.tritium",
+  "ButterworthBandpassFilter": "pathsim.blocks",
+  "ButterworthBandstopFilter": "pathsim.blocks",
+  "ButterworthHighpassFilter": "pathsim.blocks",
+  "ButterworthLowpassFilter": "pathsim.blocks",
+  "ChirpPhaseNoiseSource": "pathsim.blocks",
+  "Clip": "pathsim.blocks",
+  "ClockSource": "pathsim.blocks",
+  "Constant": "pathsim.blocks",
+  "Cos": "pathsim.blocks",
+  "Counter": "pathsim.blocks",
+  "CounterDown": "pathsim.blocks",
+  "CounterUp": "pathsim.blocks",
+  "DAC": "pathsim.blocks",
+  "Delay": "pathsim.blocks",
+  "Differentiator": "pathsim.blocks",
+  "DynamicalSystem": "pathsim.blocks",
+  "Exp": "pathsim.blocks",
+  "FIR": "pathsim.blocks",
+  "Function": "pathsim.blocks",
+  "GLC": "pathsim_chem.tritium",
+  "GaussianPulseSource": "pathsim.blocks",
+  "Integrator": "pathsim.blocks",
+  "Interface": "pathsim.blocks",
+  "LUT": "pathsim.blocks",
+  "LUT1D": "pathsim.blocks",
+  "Log": "pathsim.blocks",
+  "Log10": "pathsim.blocks",
+  "Mod": "pathsim.blocks",
+  "Multiplier": "pathsim.blocks",
+  "ODE": "pathsim.blocks",
+  "PID": "pathsim.blocks",
+  "PinkNoise": "pathsim.blocks",
+  "Pow": "pathsim.blocks",
+  "Process": "pathsim_chem.tritium",
+  "PulseSource": "pathsim.blocks",
+  "RandomNumberGenerator": "pathsim.blocks",
+  "Relay": "pathsim.blocks",
+  "SampleHold": "pathsim.blocks",
+  "Scope": "pathsim.blocks",
+  "Sin": "pathsim.blocks",
+  "SinusoidalSource": "pathsim.blocks",
+  "Source": "pathsim.blocks",
+  "Spectrum": "pathsim.blocks",
+  "Splitter": "pathsim_chem.tritium",
+  "Sqrt": "pathsim.blocks",
+  "SquareWaveSource": "pathsim.blocks",
+  "StateSpace": "pathsim.blocks",
+  "StepSource": "pathsim.blocks",
+  "Subsystem": "pathsim.blocks",
+  "Switch": "pathsim.blocks",
+  "Tan": "pathsim.blocks",
+  "Tanh": "pathsim.blocks",
+  "TransferFunctionNumDen": "pathsim.blocks",
+  "TransferFunctionZPG": "pathsim.blocks",
+  "TriangleWaveSource": "pathsim.blocks",
+  "WhiteNoise": "pathsim.blocks",
+};

src/lib/nodes/features/registry.ts

@@ -1,11 +1,10 @@
 /**
  * Node type definitions
  *
- * Re-exports types from centralized location for backwards compatibility.
- * New code should import from '$lib/types' directly.
+ * Re-exports types from centralized locations for convenience.
  */
 
-// Re-export all node-related types from centralized location
+// Re-export all node-related types
 export type {
 	PortDirection,
 	PortDefinition,
@@ -21,50 +20,12 @@ export type {
 	Annotation
 } from '$lib/types/nodes';
 
-// Re-export simulation types used in this module
+// Re-export simulation types
 export type { SolverType, SimulationSettings } from '$lib/types/simulation';
 
 // Re-export schema types
 export type { GraphFile } from '$lib/types/schema';
 export { GRAPH_FILE_VERSION } from '$lib/types/schema';
 
-// Import extracted defaults from PathSim (generated by scripts/extract-simulation.py)
-import { extractedSimulationParams, uiOnlyParams } from '$lib/simulation/generated/simulation';
-import type { SolverType, SimulationSettings } from '$lib/types/simulation';
-
-// Helper to get default value from extracted params
-function getExtractedDefault(key: string): string {
-	const param = extractedSimulationParams[key];
-	return param?.default ?? '';
-}
-
-// Default values for simulation settings (used as placeholders and code gen fallback)
-// Values extracted from PathSim via scripts/extract-simulation.py
-export const DEFAULT_SIMULATION_SETTINGS: SimulationSettings = {
-	duration: getExtractedDefault('duration'),
-	dt: getExtractedDefault('dt'),
-	solver: (getExtractedDefault('solver') || 'SSPRK22') as SolverType,
-	adaptive: true,
-	atol: getExtractedDefault('atol'),
-	rtol: getExtractedDefault('rtol'),
-	ftol: getExtractedDefault('ftol'),
-	dt_min: getExtractedDefault('dt_min'),
-	dt_max: getExtractedDefault('dt_max'),
-	ghostTraces: parseInt(uiOnlyParams.ghostTraces?.default || '0'),
-	plotResults: uiOnlyParams.plotResults?.default === 'true'
-};
-
-// Initial empty settings (defaults shown as placeholders)
-export const INITIAL_SIMULATION_SETTINGS: SimulationSettings = {
-	duration: '',
-	dt: '',
-	solver: 'SSPRK22', // Solver always has a value (selected from matrix)
-	adaptive: true,
-	atol: '',
-	rtol: '',
-	ftol: '',
-	dt_min: '',
-	dt_max: '',
-	ghostTraces: 0,
-	plotResults: true
-};
+// Re-export simulation defaults
+export { DEFAULT_SIMULATION_SETTINGS, INITIAL_SIMULATION_SETTINGS } from '$lib/simulation/defaults';