@tuongaz/seeflow 0.1.64 → 0.1.68

package/src/server.ts

@@ -100,7 +100,7 @@ export function createApp(options: CreateAppOptions = {}): Hono {
   // don't churn. Route is unauthenticated and stateless.
   app.get('/healthz', (c) => c.json({ status: 'ok' }));
 
-  // Vendored runtime assets (e.g. @tailwindcss/browser@4 for htmlNode).
+  // Vendored runtime assets (e.g. @tailwindcss/browser@4 for type:'html').
   // Served identically in dev and prod so they don't depend on the web
   // bundle. The `{[A-Za-z0-9._-]+}` regex constrains :file to a single safe
   // segment, making traversal (`..`, `/`) impossible by construction.

package/src/status-runner.ts

@@ -159,7 +159,8 @@ interface StatusNode {
 function collectStatusNodes(demo: ResolvedFlow): StatusNode[] {
   const out: StatusNode[] = [];
   for (const node of demo.nodes) {
-    if (node.type !== 'playNode' && node.type !== 'stateNode') continue;
+    // Capabilities are valid on every node type post-flat-types — gate purely
+    // on `statusAction` presence, not on the visual kind.
     const action = node.data.statusAction;
     if (!action) continue;
     out.push({ nodeId: node.id, action });

package/src/watcher.ts

@@ -5,11 +5,18 @@ import { basename, dirname, isAbsolute, join } from 'node:path';
 // contains flow.json). The studio is path-agnostic — whatever path the caller
 // supplied is the project root.
 const projectRootForFlow = (flowPath: string): string => dirname(flowPath);
+import { inlineComponentSpecs } from './component-spec-resolver.ts';
 import type { EventBus } from './events.ts';
 import { resolveFileRefs } from './file-ref.ts';
 import { mergeFlowAndStyle } from './merge.ts';
 import type { Registry } from './registry.ts';
-import { type Flow, FlowSchema, type ResolvedFlow, StyleSchema } from './schema.ts';
+import {
+  type Flow,
+  FlowSchema,
+  type ResolvedFlow,
+  ResolvedFlowSchema,
+  StyleSchema,
+} from './schema.ts';
 
 const DEFAULT_DEBOUNCE_MS = 100;
 
@@ -75,7 +82,7 @@ export interface FlowWatcher {
   ): void;
   /**
    * Relative paths (under the project root) currently being watched because
-   * they're referenced by a node's `data.path` (imageNode). htmlNode content
+   * they're referenced by a node's `data.path` (type:'image' node). type:'html' node content
    * rides on the file:// resolver via `data.html`, not this list. Sorted for
    * stable assertion order. Used by tests.
    */
@@ -96,7 +103,7 @@ interface WatchHandle {
   filePath: string;
   /**
    * Per-directory file watchers for files referenced by node data
-   * (imageNode `path`). Each directory watcher dispatches to
+   * (type:'image' node `path`). Each directory watcher dispatches to
    * specific basenames in its `files` map.
    */
   fileWatchers: Map<string, FileWatchEntry>;
@@ -108,7 +115,7 @@ const resolveFilePath = (repoPath: string, flowPath: string): string =>
 const isCleanRelativePath = (p: string): boolean => {
   if (!p) return false;
   // Reject data URLs early — the pre-launch hard-cut (US-004) replaces
-  // imageNode.data.image with data.path, but defensively skip any lingering
+  // type:'image' node.data.image with data.path, but defensively skip any lingering
   // base64 payloads so we don't try to fs.watch a 5MB string.
   if (p.startsWith('data:')) return false;
   if (isAbsolute(p) || p.startsWith('/') || p.startsWith('\\')) return false;
@@ -119,7 +126,7 @@ const isCleanRelativePath = (p: string): boolean => {
 
 /**
  * Walk raw flow JSON (pre-schema-parse) collecting referenced file paths:
- * `nodes[].data.path` (imageNode). htmlNode content now flows through the
+ * `nodes[].data.path` (type:'image' node). type:'html' node content now flows through the
  * `file://nodes/<id>/view.html` ref handled by the file-ref resolver, so it
  * does NOT need a separate fs.watch entry here. Operates on the raw JSON so
  * the watcher works before those fields are formally validated.
@@ -152,7 +159,7 @@ export interface ReadMergedFlowResult {
   error: string | null;
   /** Sorted relative paths under the project root resolved via file://. */
   fileRefs: string[];
-  /** Flow file paths referenced via imageNode.path. */
+  /** Flow file paths referenced via type:'image' node.path. */
   staticRefs: string[];
 }
 
@@ -225,8 +232,37 @@ export function readMergedFlow(flowPath: string): ReadMergedFlowResult {
     };
   }
 
-  const flow = mergeFlowAndStyle(flowParse.data as Flow, styleParse.data);
-  return { flow, valid: true, error: null, fileRefs: refs, staticRefs };
+  const merged = mergeFlowAndStyle(flowParse.data as Flow, styleParse.data);
+  const {
+    flow: inlined,
+    errors: specErrors,
+    refs: specRefs,
+  } = inlineComponentSpecs(merged, projectRoot);
+  const fileRefs = [...refs, ...specRefs];
+
+  if (specErrors.length > 0) {
+    return {
+      ...empty,
+      error: specErrors.map((e) => `${e.path}: ${e.message}`).join('; '),
+      fileRefs,
+      staticRefs,
+    };
+  }
+
+  const resolvedParse = ResolvedFlowSchema.safeParse(inlined);
+  if (!resolvedParse.success) {
+    const message = resolvedParse.error.issues
+      .map((i) => `${i.path.join('.') || '<root>'}: ${i.message}`)
+      .join('; ');
+    return {
+      ...empty,
+      error: `ResolvedFlow validation failed: ${message}`,
+      fileRefs,
+      staticRefs,
+    };
+  }
+
+  return { flow: resolvedParse.data, valid: true, error: null, fileRefs, staticRefs };
 }
 
 const closeFileWatchers = (handle: WatchHandle): void => {
@@ -337,7 +373,7 @@ export function createWatcher(deps: WatcherDeps): FlowWatcher {
 
       if (!existsSync(dir)) {
         // Directory hasn't been created on disk yet (e.g. blocks/ before any
-        // htmlNode is dropped). Skip silently — next reparse will retry.
+        // type:'html' node is dropped). Skip silently — next reparse will retry.
         continue;
       }
 
@@ -397,7 +433,7 @@ export function createWatcher(deps: WatcherDeps): FlowWatcher {
     snapshots.set(flowId, next);
     lastSeenMtimes.set(flowId, combinedMtimeMs(filePath));
 
-    // Reconcile the referenced-file watch set: imageNode.path from
+    // Reconcile the referenced-file watch set: type:'image' node.path from
     // flow + any file:// targets that resolved cleanly. Schema errors
     // shouldn't drop the watch set — the user is mid-edit and the referenced
     // files are still valid targets, so this reconciles whenever the JSON