@d34dman/flowdrop 0.0.47 → 0.0.49

package/dist/components/form/FormTemplateEditor.svelte

@@ -27,21 +27,24 @@
 		highlightSpecialChars,
 		highlightActiveLine,
 		keymap,
+		tooltips,
 		Decoration,
-		type DecorationSet,
 		ViewPlugin,
-		type ViewUpdate,
 		MatchDecorator
 	} from '@codemirror/view';
-	import { EditorState } from '@codemirror/state';
+	import { EditorState, Compartment } from '@codemirror/state';
 	import { history, historyKeymap, defaultKeymap, indentWithTab } from '@codemirror/commands';
-	import { syntaxHighlighting, defaultHighlightStyle, indentOnInput } from '@codemirror/language';
+	import { syntaxHighlighting, defaultHighlightStyle } from '@codemirror/language';
 	import { oneDark } from '@codemirror/theme-one-dark';
-	import type { VariableSchema, TemplateVariablesConfig } from '../../types/index.js';
-	import {
-		createTemplateAutocomplete,
-		createSimpleTemplateAutocomplete
-	} from './templateAutocomplete.js';
+	import type {
+		VariableSchema,
+		TemplateVariablesConfig,
+		WorkflowNode,
+		WorkflowEdge,
+		AuthProvider
+	} from '../../types/index.js';
+	import { createTemplateAutocomplete } from './templateAutocomplete.js';
+	import { getVariableSchema } from '../../services/variableService.js';
 
 	interface Props {
 		/** Field identifier */
@@ -67,12 +70,6 @@
 		 * @deprecated Use `variables.schema` instead
 		 */
 		variableSchema?: VariableSchema;
-		/**
-		 * Simple variable names for basic hints (backward compatible).
-		 * Used when variableSchema is not provided.
-		 * @deprecated Use `variables.schema` instead
-		 */
-		variableHints?: string[];
 		/** Placeholder variable example for the hint */
 		placeholderExample?: string;
 		/** Whether the field is disabled (read-only) */
@@ -81,6 +78,16 @@
 		ariaDescribedBy?: string;
 		/** Callback when value changes */
 		onChange: (value: string) => void;
+		/** Current workflow node (required for API mode) */
+		node?: WorkflowNode;
+		/** All workflow nodes (required for port-derived variables) */
+		nodes?: WorkflowNode[];
+		/** All workflow edges (required for port-derived variables) */
+		edges?: WorkflowEdge[];
+		/** Workflow ID (required for API mode) */
+		workflowId?: string;
+		/** Auth provider for API requests */
+		authProvider?: AuthProvider;
 	}
 
 	let {
@@ -92,26 +99,83 @@
 		height = '250px',
 		variables,
 		variableSchema,
-		variableHints = [],
 		placeholderExample = 'Hello {{ name }}, your order #{{ order_id }} is ready!',
 		disabled = false,
 		ariaDescribedBy,
-		onChange
+		onChange,
+		node,
+		nodes = [],
+		edges = [],
+		workflowId,
+		authProvider
 	}: Props = $props();
 
+	/** Loading state for API variable fetching */
+	let isLoadingVariables = $state(false);
+
+	/** Error state for API variable fetching */
+	let variableLoadError = $state<string | null>(null);
+
+	/** The effective variable schema (loaded synchronously or asynchronously) */
+	let effectiveVariableSchema = $state<VariableSchema | undefined>(undefined);
+
 	/**
-	 * Get the effective variable schema.
-	 * Prefers variables.schema, falls back to deprecated variableSchema prop.
+	 * Load variable schema on mount or when configuration changes.
+	 * Handles both synchronous (schema-based) and asynchronous (API-based) loading.
 	 */
-	const effectiveVariableSchema = $derived.by<VariableSchema | undefined>(() => {
-		if (variables?.schema && Object.keys(variables.schema.variables).length > 0) {
-			return variables.schema;
-		}
+	async function loadVariableSchema() {
+		// Reset error state
+		variableLoadError = null;
+
+		// If we have deprecated variableSchema prop, use it directly
 		if (variableSchema && Object.keys(variableSchema.variables).length > 0) {
-			return variableSchema;
+			effectiveVariableSchema = variableSchema;
+			return;
 		}
-		return undefined;
-	});
+
+		// If no variables config, clear schema
+		if (!variables) {
+			effectiveVariableSchema = undefined;
+			return;
+		}
+
+		// If variables config has static schema only (no API), use it directly
+		if (variables.schema && !variables.api && Object.keys(variables.schema.variables).length > 0) {
+			effectiveVariableSchema = variables.schema;
+			return;
+		}
+
+		// If variables config requires node context (ports or API mode)
+		if ((variables.ports !== undefined || variables.api) && node && nodes && edges) {
+			try {
+				isLoadingVariables = true;
+				effectiveVariableSchema = await getVariableSchema(
+					node,
+					nodes,
+					edges,
+					variables,
+					workflowId,
+					authProvider
+				);
+			} catch (error) {
+				console.error('Failed to load variable schema:', error);
+				variableLoadError = error instanceof Error ? error.message : 'Failed to load variables';
+				effectiveVariableSchema = undefined;
+			} finally {
+				isLoadingVariables = false;
+			}
+		} else {
+			// No schema available
+			effectiveVariableSchema = undefined;
+		}
+	}
+
+	/**
+	 * Retry loading variables after an error
+	 */
+	function retryLoadVariables() {
+		loadVariableSchema();
+	}
 
 	/**
 	 * Whether to show the variable hints section.
@@ -121,13 +185,12 @@
 
 	/**
 	 * Derive the list of top-level variable names for the hints display.
-	 * Prefers effectiveVariableSchema if available, falls back to variableHints.
 	 */
 	const displayVariables = $derived.by(() => {
 		if (effectiveVariableSchema) {
 			return Object.keys(effectiveVariableSchema.variables);
 		}
-		return variableHints;
+		return [];
 	});
 
 	/** Reference to the container element */
@@ -139,37 +202,41 @@
 	/** Flag to prevent update loops */
 	let isInternalUpdate = false;
 
+	/** Compartment for dynamic autocomplete reconfiguration */
+	const autocompleteCompartment = new Compartment();
+
 	/**
-	 * Create a MatchDecorator for {{ variable }} patterns
-	 * This highlights the entire {{ variable }} expression
-	 * Supports:
-	 * - Simple variables: {{ name }}
-	 * - Dot notation: {{ user.name }}, {{ user.address.city }}
-	 * - Array access: {{ items[0] }}, {{ items[0].name }}
-	 * - Mixed: {{ orders[0].items[1].price }}
+	 * Custom Twig syntax highlighter using MatchDecorator
+	 * Highlights three Twig delimiter types with different styles:
+	 * - {{ expression }} — variables/output (purple)
+	 * - {% block %}      — control structures (teal)
+	 * - {# comment #}    — comments (gray/italic)
 	 */
-	const variableMatcher = new MatchDecorator({
-		// Match {{ variable_name }} patterns with dot notation and array indices
-		regexp: /\{\{\s*[\w]+(?:\.[\w]+|\[\d+\]|\[\*\])*\s*\}\}/g,
-		decoration: Decoration.mark({ class: 'cm-template-variable' })
+	const twigMatcher = new MatchDecorator({
+		regexp: /\{\{.*?\}\}|\{%.*?%\}|\{#.*?#\}/g,
+		decoration: (match) => {
+			const text = match[0];
+			if (text.startsWith('{{')) {
+				return Decoration.mark({ class: 'cm-twig-expression' });
+			} else if (text.startsWith('{%')) {
+				return Decoration.mark({ class: 'cm-twig-block' });
+			} else {
+				return Decoration.mark({ class: 'cm-twig-comment' });
+			}
+		}
 	});
 
-	/**
-	 * ViewPlugin that applies the variable highlighting decorations
-	 */
-	const variableHighlighter = ViewPlugin.fromClass(
+	const twigHighlighter = ViewPlugin.fromClass(
 		class {
-			decorations: DecorationSet;
+			decorations;
 			constructor(view: EditorView) {
-				this.decorations = variableMatcher.createDeco(view);
+				this.decorations = twigMatcher.createDeco(view);
 			}
-			update(update: ViewUpdate) {
-				this.decorations = variableMatcher.updateDeco(update, this.decorations);
+			update(update: import('@codemirror/view').ViewUpdate) {
+				this.decorations = twigMatcher.updateDeco(update, this.decorations);
 			}
 		},
-		{
-			decorations: (v) => v.decorations
-		}
+		{ decorations: (v) => v.decorations }
 	);
 
 	/**
@@ -191,6 +258,9 @@
 	 */
 	function createExtensions() {
 		const extensions = [
+			// Position tooltips using fixed strategy so they aren't clipped by container overflow
+			tooltips({ position: 'fixed' }),
+
 			// Essential visual features
 			lineNumbers(),
 			highlightActiveLineGutter(),
@@ -201,20 +271,16 @@
 			// Editing features (skip when read-only)
 			...(disabled
 				? []
-				: [
-						history(),
-						indentOnInput(),
-						keymap.of([...defaultKeymap, ...historyKeymap, indentWithTab])
-					]),
+				: [history(), keymap.of([...defaultKeymap, ...historyKeymap, indentWithTab])]),
 
 			// Read-only: prevent document changes and mark content as non-editable
 			...(disabled ? [EditorState.readOnly.of(true), EditorView.editable.of(false)] : []),
 
-			// Syntax highlighting
-			syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
+			// Syntax highlighting - use default for light mode, oneDark handles dark mode
+			...(darkTheme ? [] : [syntaxHighlighting(defaultHighlightStyle, { fallback: true })]),
 
-			// Template-specific variable highlighter
-			variableHighlighter,
+			// Twig syntax highlighting ({{ expressions }}, {% blocks %}, {# comments #})
+			twigHighlighter,
 
 			// Update listener (only fires on user edit when not disabled)
 			EditorView.updateListener.of(handleUpdate),
@@ -239,14 +305,27 @@
 				'.cm-line': {
 					padding: '0 0.5rem'
 				},
-				// Style for the highlighted {{ variable }} pattern
-				'.cm-template-variable': {
+				// Twig expression: {{ variable }}
+				'.cm-twig-expression': {
 					color: '#a855f7',
 					backgroundColor: 'rgba(168, 85, 247, 0.1)',
 					borderRadius: '3px',
 					padding: '1px 2px',
 					fontWeight: '500'
 				},
+				// Twig block: {% for ... %}
+				'.cm-twig-block': {
+					color: '#14b8a6',
+					backgroundColor: 'rgba(20, 184, 166, 0.1)',
+					borderRadius: '3px',
+					padding: '1px 2px',
+					fontWeight: '500'
+				},
+				// Twig comment: {# ... #}
+				'.cm-twig-comment': {
+					color: '#6b7280',
+					fontStyle: 'italic'
+				},
 				// Autocomplete dropdown styling
 				'.cm-tooltip.cm-tooltip-autocomplete': {
 					backgroundColor: 'var(--fd-background, #ffffff)',
@@ -285,26 +364,32 @@
 			EditorState.tabSize.of(2)
 		];
 
-		// Add autocomplete extension when variables are available (and not disabled)
-		if (!disabled) {
-			if (effectiveVariableSchema) {
-				// Use full autocomplete with nested drilling
-				extensions.push(createTemplateAutocomplete(effectiveVariableSchema));
-			} else if (variableHints.length > 0) {
-				// Fallback to simple autocomplete with just variable names
-				extensions.push(createSimpleTemplateAutocomplete(variableHints));
-			}
+		// Add autocomplete compartment (can be reconfigured dynamically)
+		// When disabled or no schema, use empty array
+		if (!disabled && effectiveVariableSchema) {
+			extensions.push(
+				autocompleteCompartment.of(createTemplateAutocomplete(effectiveVariableSchema))
+			);
+		} else {
+			extensions.push(autocompleteCompartment.of([]));
 		}
 
 		if (darkTheme) {
 			extensions.push(oneDark);
-			// Add dark theme override for variable highlighting and autocomplete
+			// Add dark theme overrides for Twig highlighting and autocomplete
 			extensions.push(
 				EditorView.theme({
-					'.cm-template-variable': {
+					'.cm-twig-expression': {
 						color: '#c084fc',
 						backgroundColor: 'rgba(192, 132, 252, 0.15)'
 					},
+					'.cm-twig-block': {
+						color: '#5eead4',
+						backgroundColor: 'rgba(94, 234, 212, 0.1)'
+					},
+					'.cm-twig-comment': {
+						color: '#6b7280'
+					},
 					'.cm-tooltip.cm-tooltip-autocomplete': {
 						backgroundColor: '#1e1e1e',
 						border: '1px solid #3e4451',
@@ -341,19 +426,23 @@
 	}
 
 	/**
-	 * Initialize CodeMirror editor on mount
+	 * Initialize CodeMirror editor and load variables on mount
 	 */
 	onMount(() => {
 		if (!containerRef) {
 			return;
 		}
 
-		editorView = new EditorView({
-			state: EditorState.create({
-				doc: value,
-				extensions: createExtensions()
-			}),
-			parent: containerRef
+		// Load variables first
+		loadVariableSchema().then(() => {
+			// Then create editor with loaded schema
+			editorView = new EditorView({
+				state: EditorState.create({
+					doc: value,
+					extensions: createExtensions()
+				}),
+				parent: containerRef
+			});
 		});
 	});
 
@@ -389,6 +478,26 @@
 			isInternalUpdate = false;
 		}
 	});
+
+	/**
+	 * Reconfigure editor when variable schema changes (e.g., after async loading)
+	 */
+	$effect(() => {
+		// Only track effectiveVariableSchema changes
+		const schema = effectiveVariableSchema;
+
+		if (!editorView) {
+			return;
+		}
+
+		// When effectiveVariableSchema changes, reconfigure the autocomplete compartment
+		// This happens after async API loading completes
+		const newAutocomplete = !disabled && schema ? createTemplateAutocomplete(schema) : [];
+
+		editorView.dispatch({
+			effects: [autocompleteCompartment.reconfigure(newAutocomplete)]
+		});
+	});
 </script>
 
 <div class="form-template-editor">
@@ -412,6 +521,54 @@
 		aria-label="Template editor"
 	></div>
 
+	<!-- Loading banner (shown while fetching variables from API) -->
+	{#if isLoadingVariables}
+		<div class="form-template-editor__banner form-template-editor__banner--loading">
+			<svg
+				class="form-template-editor__banner-icon form-template-editor__banner-icon--spin"
+				xmlns="http://www.w3.org/2000/svg"
+				fill="none"
+				viewBox="0 0 24 24"
+			>
+				<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"
+				></circle>
+				<path
+					class="opacity-75"
+					fill="currentColor"
+					d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+				></path>
+			</svg>
+			<span>Loading variables...</span>
+		</div>
+	{/if}
+
+	<!-- Error banner (shown when API fetch fails) -->
+	{#if variableLoadError}
+		<div class="form-template-editor__banner form-template-editor__banner--error">
+			<svg
+				class="form-template-editor__banner-icon"
+				xmlns="http://www.w3.org/2000/svg"
+				viewBox="0 0 20 20"
+				fill="currentColor"
+			>
+				<path
+					fill-rule="evenodd"
+					d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-5a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0v-4.5A.75.75 0 0110 5zm0 10a1 1 0 100-2 1 1 0 000 2z"
+					clip-rule="evenodd"
+				/>
+			</svg>
+			<span>{variableLoadError}</span>
+			<button
+				type="button"
+				class="form-template-editor__banner-btn"
+				onclick={retryLoadVariables}
+				title="Retry loading variables"
+			>
+				Retry
+			</button>
+		</div>
+	{/if}
+
 	<!-- Variable hints section (shown when variables are available and showHints is true) -->
 	{#if showHints && displayVariables.length > 0}
 		<div class="form-template-editor__hints">
@@ -613,4 +770,68 @@
 		font-family: 'JetBrains Mono', 'Fira Code', 'Monaco', 'Menlo', monospace;
 		font-size: 0.625rem;
 	}
+
+	/* Loading and error banners */
+	.form-template-editor__banner {
+		display: flex;
+		align-items: center;
+		gap: 0.5rem;
+		margin-top: 0.625rem;
+		padding: 0.625rem 0.75rem;
+		border-radius: var(--fd-radius-md);
+		font-size: 0.75rem;
+	}
+
+	.form-template-editor__banner--loading {
+		background-color: rgba(59, 130, 246, 0.1);
+		border: 1px solid rgba(59, 130, 246, 0.3);
+		color: rgb(29, 78, 216);
+	}
+
+	.form-template-editor__banner--error {
+		background-color: rgba(239, 68, 68, 0.1);
+		border: 1px solid rgba(239, 68, 68, 0.3);
+		color: rgb(185, 28, 28);
+	}
+
+	.form-template-editor__banner-icon {
+		width: 1rem;
+		height: 1rem;
+		flex-shrink: 0;
+	}
+
+	.form-template-editor__banner-icon--spin {
+		animation: spin 1s linear infinite;
+	}
+
+	@keyframes spin {
+		from {
+			transform: rotate(0deg);
+		}
+		to {
+			transform: rotate(360deg);
+		}
+	}
+
+	.form-template-editor__banner-btn {
+		margin-left: auto;
+		padding: 0.25rem 0.625rem;
+		background-color: rgba(239, 68, 68, 0.15);
+		border: 1px solid rgba(239, 68, 68, 0.3);
+		border-radius: var(--fd-radius-sm);
+		font-size: 0.6875rem;
+		font-weight: 500;
+		color: rgb(185, 28, 28);
+		cursor: pointer;
+		transition: all var(--fd-transition-fast);
+	}
+
+	.form-template-editor__banner-btn:hover {
+		background-color: rgba(239, 68, 68, 0.25);
+		border-color: rgba(239, 68, 68, 0.5);
+	}
+
+	.form-template-editor__banner-btn:active {
+		transform: scale(0.98);
+	}
 </style>

package/dist/components/form/FormTemplateEditor.svelte.d.ts

@@ -1,4 +1,4 @@
-import type { VariableSchema, TemplateVariablesConfig } from '../../types/index.js';
+import type { VariableSchema, TemplateVariablesConfig, WorkflowNode, WorkflowEdge, AuthProvider } from '../../types/index.js';
 interface Props {
     /** Field identifier */
     id: string;
@@ -23,12 +23,6 @@ interface Props {
      * @deprecated Use `variables.schema` instead
      */
     variableSchema?: VariableSchema;
-    /**
-     * Simple variable names for basic hints (backward compatible).
-     * Used when variableSchema is not provided.
-     * @deprecated Use `variables.schema` instead
-     */
-    variableHints?: string[];
     /** Placeholder variable example for the hint */
     placeholderExample?: string;
     /** Whether the field is disabled (read-only) */
@@ -37,6 +31,16 @@ interface Props {
     ariaDescribedBy?: string;
     /** Callback when value changes */
     onChange: (value: string) => void;
+    /** Current workflow node (required for API mode) */
+    node?: WorkflowNode;
+    /** All workflow nodes (required for port-derived variables) */
+    nodes?: WorkflowNode[];
+    /** All workflow edges (required for port-derived variables) */
+    edges?: WorkflowEdge[];
+    /** Workflow ID (required for API mode) */
+    workflowId?: string;
+    /** Auth provider for API requests */
+    authProvider?: AuthProvider;
 }
 declare const FormTemplateEditor: import("svelte").Component<Props, {}, "">;
 type FormTemplateEditor = ReturnType<typeof FormTemplateEditor>;

package/dist/components/form/index.d.ts

@@ -44,4 +44,4 @@ export { default as FormCodeEditor } from './FormCodeEditor.svelte';
 export { default as FormMarkdownEditor } from './FormMarkdownEditor.svelte';
 export { default as FormTemplateEditor } from './FormTemplateEditor.svelte';
 export { default as FormAutocomplete } from './FormAutocomplete.svelte';
-export { createTemplateAutocomplete, createSimpleTemplateAutocomplete } from './templateAutocomplete.js';
+export { createTemplateAutocomplete } from './templateAutocomplete.js';

package/dist/components/form/index.js

@@ -49,4 +49,4 @@ export { default as FormMarkdownEditor } from './FormMarkdownEditor.svelte';
 export { default as FormTemplateEditor } from './FormTemplateEditor.svelte';
 export { default as FormAutocomplete } from './FormAutocomplete.svelte';
 // Template autocomplete utilities
-export { createTemplateAutocomplete, createSimpleTemplateAutocomplete } from './templateAutocomplete.js';
+export { createTemplateAutocomplete } from './templateAutocomplete.js';

package/dist/components/form/templateAutocomplete.d.ts

@@ -10,8 +10,8 @@
  *
  * @module components/form/templateAutocomplete
  */
-import type { Extension } from "@codemirror/state";
-import type { VariableSchema } from "../../types/index.js";
+import type { Extension } from '@codemirror/state';
+import type { VariableSchema } from '../../types/index.js';
 /**
  * Creates a CodeMirror extension for template variable autocomplete.
  *
@@ -27,12 +27,3 @@ import type { VariableSchema } from "../../types/index.js";
  * ```
  */
 export declare function createTemplateAutocomplete(schema: VariableSchema): Extension;
-/**
- * Creates a simple autocomplete extension that triggers when user types {{
- * and shows top-level variables only (no drilling).
- * Used as a fallback when full variable schema is not available.
- *
- * @param variableHints - Simple array of variable names
- * @returns A CodeMirror extension that provides basic autocomplete
- */
-export declare function createSimpleTemplateAutocomplete(variableHints: string[]): Extension;