@pylonts/dsl 1.1.3 → 1.1.5

package/src/page-flow.ts

@@ -1,154 +1,154 @@
-import { SchemaBase } from './dsl.js';
-import type { ActionSchema } from './action.js';
-import { Page, getRegisteredPages, clearRegisteredPages } from './page.js';
-import type { PageDef } from './page-def.js';
-import type { NavigationAction } from './navigation.js';
-
-// Page-driven flow: every node is a page, and a page belongs to an app.
-// Leaf nodes are pages too — a journey starts at a page and ends at a page.
-// Page definitions (PageSchema/Page/actions) live in page.ts; this file
-// models the flow graph between pages.
-
-export interface PageEdge extends SchemaBase {
-  /** Trigger action; undefined = default path (success/normal). */
-  when?: ActionSchema;
-  start: Page;
-  end: Page;
-}
-
-export interface PageFlow extends SchemaBase {
-  /** Entry page. */
-  start: Page;
-  /** All pages explicitly declared by the caller. */
-  pages: Page[];
-  edges: PageEdge[];
-}
-
-export function pageEdge(start: Page, end: Page, when?: ActionSchema, description?: string): PageEdge {
-  // Auto name for uniformity with SchemaBase; `when` stays the branch marker.
-  return { name: `${start.name}->${end.name}`, start, end, when, description };
-}
-
-export function definePageFlow(
-  name: string,
-  schema: {
-    start: Page;
-    pages: Page[];
-    edges: PageEdge[];
-    description?: string;
-  },
-): PageFlow {
-  const { start, pages, edges: explicitEdges, description } = schema;
-
-  // Resolve the back action from any page's actions list (PageSchema at runtime)
-  const backAction = findBackAction(pages);
-
-  // Auto-generate back edges: for every explicit edge A→B (not itself a back),
-  // if B has no explicit back edge and no existing edge B→A, add B→A with back.
-  const hasExplicitBack = new Set<Page>();
-  for (const e of explicitEdges) {
-    if (e.when && e.when.name === 'back') hasExplicitBack.add(e.start);
-  }
-  const hasReverse = new Set<string>();
-  for (const e of explicitEdges) {
-    hasReverse.add(`${e.start.name}->${e.end.name}`);
-  }
-  const generatedBackEdges: PageEdge[] = [];
-  if (backAction) {
-    for (const e of explicitEdges) {
-      if (e.when && e.when.name === 'back') continue;
-      if (hasExplicitBack.has(e.end)) continue;
-      if (hasReverse.has(`${e.end.name}->${e.start.name}`)) continue;
-      generatedBackEdges.push({
-        name: `${e.end.name}->${e.start.name}`,
-        start: e.end,
-        end: e.start,
-        when: backAction,
-        description: 'auto-generated back edge',
-      });
-      hasExplicitBack.add(e.end);
-    }
-  }
-  const edges = [...explicitEdges, ...generatedBackEdges];
-
-  // Validate: every registered page must be in the flow's pages
-  const registered = getRegisteredPages();
-  const orphaned: string[] = [];
-  for (const rp of registered) {
-    // Compare by object identity — caller passes the same reference
-    if (!pages.includes(rp as unknown as Page)) {
-      orphaned.push(rp.name);
-    }
-  }
-  if (orphaned.length > 0) {
-    throw new Error(
-      `[definePageFlow "${name}"] orphaned pages (defined but not in flow): ${orphaned.join(', ')}`,
-    );
-  }
-  clearRegisteredPages();
-
-  // Validate: start must be in pages
-  if (!pages.includes(start)) {
-    throw new Error(
-      `[definePageFlow "${name}"] start page "${start.name}" not in pages`,
-    );
-  }
-
-  // Validate: every page appears in at least one edge
-  const inEdge = new Set<Page>();
-  for (const e of edges) {
-    inEdge.add(e.start);
-    inEdge.add(e.end);
-  }
-  const isolated: string[] = [];
-  for (const p of pages) {
-    if (!inEdge.has(p)) isolated.push(p.name);
-  }
-  if (isolated.length > 0) {
-    throw new Error(
-      `[definePageFlow "${name}"] isolated pages (no edges): ${isolated.join(', ')}`,
-    );
-  }
-
-  // Validate: all pages reachable from start
-  const adj = new Map<Page, Page[]>();
-  for (const p of pages) adj.set(p, []);
-  for (const e of edges) {
-    const neighbors = adj.get(e.start);
-    if (neighbors) neighbors.push(e.end);
-  }
-  const visited = new Set<Page>();
-  const stack: Page[] = [start];
-  while (stack.length > 0) {
-    const cur = stack.pop()!;
-    if (visited.has(cur)) continue;
-    visited.add(cur);
-    for (const next of adj.get(cur) ?? []) {
-      if (!visited.has(next)) stack.push(next);
-    }
-  }
-  const unreachable: string[] = [];
-  for (const p of pages) {
-    if (!visited.has(p)) unreachable.push(p.name);
-  }
-  if (unreachable.length > 0) {
-    throw new Error(
-      `[definePageFlow "${name}"] unreachable pages: ${unreachable.join(', ')}`,
-    );
-  }
-
-  return { name, description, start, pages, edges };
-}
-
-/** Walk all pages' pageDef.actions (PageSchema runtime shape) to find a NavigationAction with method 'back'. */
-function findBackAction(pages: Page[]): NavigationAction | undefined {
-  for (const p of pages) {
-    const pageDef = (p as unknown as Record<string, unknown>).pageDef as PageDef | undefined;
-    if (!pageDef?.actions) continue;
-    for (const a of pageDef.actions) {
-      const na = a as NavigationAction;
-      if (na.type === 'navigation' && na.method === 'back') return na;
-    }
-  }
-  return undefined;
+import { SchemaBase } from './dsl.js';
+import type { ActionSchema } from './action.js';
+import { Page, getRegisteredPages, clearRegisteredPages } from './page.js';
+import type { PageDef } from './page-def.js';
+import type { NavigationAction } from './navigation.js';
+
+// Page-driven flow: every node is a page, and a page belongs to an app.
+// Leaf nodes are pages too — a journey starts at a page and ends at a page.
+// Page definitions (PageSchema/Page/actions) live in page.ts; this file
+// models the flow graph between pages.
+
+export interface PageEdge extends SchemaBase {
+  /** Trigger action; undefined = default path (success/normal). */
+  when?: ActionSchema;
+  start: Page;
+  end: Page;
+}
+
+export interface PageFlow extends SchemaBase {
+  /** Entry page. */
+  start: Page;
+  /** All pages explicitly declared by the caller. */
+  pages: Page[];
+  edges: PageEdge[];
+}
+
+export function pageEdge(start: Page, end: Page, when?: ActionSchema, description?: string): PageEdge {
+  // Auto name for uniformity with SchemaBase; `when` stays the branch marker.
+  return { name: `${start.name}->${end.name}`, start, end, when, description };
+}
+
+export function definePageFlow(
+  name: string,
+  schema: {
+    start: Page;
+    pages: Page[];
+    edges: PageEdge[];
+    description?: string;
+  },
+): PageFlow {
+  const { start, pages, edges: explicitEdges, description } = schema;
+
+  // Resolve the back action from any page's actions list (PageSchema at runtime)
+  const backAction = findBackAction(pages);
+
+  // Auto-generate back edges: for every explicit edge A→B (not itself a back),
+  // if B has no explicit back edge and no existing edge B→A, add B→A with back.
+  const hasExplicitBack = new Set<Page>();
+  for (const e of explicitEdges) {
+    if (e.when && e.when.name === 'back') hasExplicitBack.add(e.start);
+  }
+  const hasReverse = new Set<string>();
+  for (const e of explicitEdges) {
+    hasReverse.add(`${e.start.name}->${e.end.name}`);
+  }
+  const generatedBackEdges: PageEdge[] = [];
+  if (backAction) {
+    for (const e of explicitEdges) {
+      if (e.when && e.when.name === 'back') continue;
+      if (hasExplicitBack.has(e.end)) continue;
+      if (hasReverse.has(`${e.end.name}->${e.start.name}`)) continue;
+      generatedBackEdges.push({
+        name: `${e.end.name}->${e.start.name}`,
+        start: e.end,
+        end: e.start,
+        when: backAction,
+        description: 'auto-generated back edge',
+      });
+      hasExplicitBack.add(e.end);
+    }
+  }
+  const edges = [...explicitEdges, ...generatedBackEdges];
+
+  // Validate: every registered page must be in the flow's pages
+  const registered = getRegisteredPages();
+  const orphaned: string[] = [];
+  for (const rp of registered) {
+    // Compare by object identity — caller passes the same reference
+    if (!pages.includes(rp as unknown as Page)) {
+      orphaned.push(rp.name);
+    }
+  }
+  if (orphaned.length > 0) {
+    throw new Error(
+      `[definePageFlow "${name}"] orphaned pages (defined but not in flow): ${orphaned.join(', ')}`,
+    );
+  }
+  clearRegisteredPages();
+
+  // Validate: start must be in pages
+  if (!pages.includes(start)) {
+    throw new Error(
+      `[definePageFlow "${name}"] start page "${start.name}" not in pages`,
+    );
+  }
+
+  // Validate: every page appears in at least one edge
+  const inEdge = new Set<Page>();
+  for (const e of edges) {
+    inEdge.add(e.start);
+    inEdge.add(e.end);
+  }
+  const isolated: string[] = [];
+  for (const p of pages) {
+    if (!inEdge.has(p)) isolated.push(p.name);
+  }
+  if (isolated.length > 0) {
+    throw new Error(
+      `[definePageFlow "${name}"] isolated pages (no edges): ${isolated.join(', ')}`,
+    );
+  }
+
+  // Validate: all pages reachable from start
+  const adj = new Map<Page, Page[]>();
+  for (const p of pages) adj.set(p, []);
+  for (const e of edges) {
+    const neighbors = adj.get(e.start);
+    if (neighbors) neighbors.push(e.end);
+  }
+  const visited = new Set<Page>();
+  const stack: Page[] = [start];
+  while (stack.length > 0) {
+    const cur = stack.pop()!;
+    if (visited.has(cur)) continue;
+    visited.add(cur);
+    for (const next of adj.get(cur) ?? []) {
+      if (!visited.has(next)) stack.push(next);
+    }
+  }
+  const unreachable: string[] = [];
+  for (const p of pages) {
+    if (!visited.has(p)) unreachable.push(p.name);
+  }
+  if (unreachable.length > 0) {
+    throw new Error(
+      `[definePageFlow "${name}"] unreachable pages: ${unreachable.join(', ')}`,
+    );
+  }
+
+  return { name, description, start, pages, edges };
+}
+
+/** Walk all pages' pageDef.actions (PageSchema runtime shape) to find a NavigationAction with method 'back'. */
+function findBackAction(pages: Page[]): NavigationAction | undefined {
+  for (const p of pages) {
+    const pageDef = (p as unknown as Record<string, unknown>).pageDef as PageDef | undefined;
+    if (!pageDef?.actions) continue;
+    for (const a of pageDef.actions) {
+      const na = a as NavigationAction;
+      if (na.type === 'navigation' && na.method === 'back') return na;
+    }
+  }
+  return undefined;
 }

package/src/page.ts

@@ -1,77 +1,77 @@
-import { SchemaBase } from './dsl.js';
-import { FrontAppSchema } from './project.js';
-import type { PageDef } from './page-def.js';
-import type { RouteDataSchema } from './route.js';
-
-// Page definitions: standalone page schemas and the page node type used by
-// page-driven flows. Kept separate from page-flow.ts (the flow graph itself).
-
-// Module-level registry: every definePage/defineTabPage call registers its
-// result so definePageFlow can check that no page is left out.
-const _pageRegistry = new Set<PageSchema>();
-
-export function getRegisteredPages(): ReadonlySet<PageSchema> {
-  return _pageRegistry;
-}
-
-export function clearRegisteredPages(): void {
-  _pageRegistry.clear();
-}
-
-/** Standalone page definition. A page is a shared value object: it belongs to
- *  exactly one frontend app. Actions live in the page skeleton (PageDef.actions),
- *  not on the page itself — the page only carries what the flow/topology needs. */
-export interface PageSchema extends SchemaBase {
-  /** Short display name for topology diagrams. */
-  label: string;
-  /** The frontend app this page belongs to (shared instance from project.config). */
-  app: FrontAppSchema;
-  /** Full page skeleton definition (optional). */
-  pageDef?: PageDef;
-  /** Route params this page expects (e.g. detail page expects productId). */
-  params?: RouteDataSchema;
-}
-
-export function definePage(schema: {
-  name: string;
-  label: string;
-  description?: string;
-  app: FrontAppSchema;
-  pageDef?: PageDef;
-  params?: RouteDataSchema;
-}): PageSchema {
-  const p: PageSchema = { ...schema };
-  _pageRegistry.add(p);
-  return p;
-}
-
-/** Page with bottom tab navigation. tabs collects the child pages reachable via tab switch. */
-export interface TabPageSchema extends PageSchema {
-  tabs: PageSchema[];
-}
-
-export function defineTabPage(schema: {
-  name: string;
-  label: string;
-  description?: string;
-  app: FrontAppSchema;
-  tabs: PageSchema[];
-  pageDef?: PageDef;
-  params?: RouteDataSchema;
-}): TabPageSchema {
-  const p: TabPageSchema = { ...schema };
-  _pageRegistry.add(p);
-  return p;
-}
-
-/** A page node in a page-driven flow: every node is a page, and a page belongs to an app. */
-export interface Page extends SchemaBase {
-  /** Short display name for topology diagrams. */
-  label?: string;
-  /** The frontend app this page belongs to (shared instance from project.config). */
-  app: FrontAppSchema;
-}
-
-export function page(app: FrontAppSchema, name: string, description?: string, label?: string): Page {
-  return { name, label, app, description };
+import { SchemaBase } from './dsl.js';
+import { FrontAppSchema } from './project.js';
+import type { PageDef } from './page-def.js';
+import type { RouteDataSchema } from './route.js';
+
+// Page definitions: standalone page schemas and the page node type used by
+// page-driven flows. Kept separate from page-flow.ts (the flow graph itself).
+
+// Module-level registry: every definePage/defineTabPage call registers its
+// result so definePageFlow can check that no page is left out.
+const _pageRegistry = new Set<PageSchema>();
+
+export function getRegisteredPages(): ReadonlySet<PageSchema> {
+  return _pageRegistry;
+}
+
+export function clearRegisteredPages(): void {
+  _pageRegistry.clear();
+}
+
+/** Standalone page definition. A page is a shared value object: it belongs to
+ *  exactly one frontend app. Actions live in the page skeleton (PageDef.actions),
+ *  not on the page itself — the page only carries what the flow/topology needs. */
+export interface PageSchema extends SchemaBase {
+  /** Short display name for topology diagrams. */
+  label: string;
+  /** The frontend app this page belongs to (shared instance from project.config). */
+  app: FrontAppSchema;
+  /** Full page skeleton definition (optional). */
+  pageDef?: PageDef;
+  /** Route params this page expects (e.g. detail page expects productId). */
+  params?: RouteDataSchema;
+}
+
+export function definePage(schema: {
+  name: string;
+  label: string;
+  description?: string;
+  app: FrontAppSchema;
+  pageDef?: PageDef;
+  params?: RouteDataSchema;
+}): PageSchema {
+  const p: PageSchema = { ...schema };
+  _pageRegistry.add(p);
+  return p;
+}
+
+/** Page with bottom tab navigation. tabs collects the child pages reachable via tab switch. */
+export interface TabPageSchema extends PageSchema {
+  tabs: PageSchema[];
+}
+
+export function defineTabPage(schema: {
+  name: string;
+  label: string;
+  description?: string;
+  app: FrontAppSchema;
+  tabs: PageSchema[];
+  pageDef?: PageDef;
+  params?: RouteDataSchema;
+}): TabPageSchema {
+  const p: TabPageSchema = { ...schema };
+  _pageRegistry.add(p);
+  return p;
+}
+
+/** A page node in a page-driven flow: every node is a page, and a page belongs to an app. */
+export interface Page extends SchemaBase {
+  /** Short display name for topology diagrams. */
+  label?: string;
+  /** The frontend app this page belongs to (shared instance from project.config). */
+  app: FrontAppSchema;
+}
+
+export function page(app: FrontAppSchema, name: string, description?: string, label?: string): Page {
+  return { name, label, app, description };
 }

package/src/popup.ts

@@ -1,25 +1,25 @@
-import type { ActionSchema } from './action.js';
-import type { RefSchema } from './ref.js';
-
-/** Display a toast notification. React: toast/message UI. Mini-program: wx.showToast. */
-export interface ToastAction extends ActionSchema {
-  type: 'toast';
-  message: string | RefSchema;
-  icon?: 'success' | 'error' | 'loading' | 'none';
-}
-
-/** Display an alert dialog. React: modal. Mini-program: wx.showModal. */
-export interface AlertAction extends ActionSchema {
-  type: 'alert';
-  title: string | RefSchema;
-  content: string | RefSchema;
-}
-
-export const popup = {
-  toast(message: string | RefSchema, icon?: 'success' | 'error' | 'loading' | 'none'): ToastAction {
-    return { name: 'toast', type: 'toast', message, icon };
-  },
-  alert(title: string | RefSchema, content: string | RefSchema): AlertAction {
-    return { name: 'alert', type: 'alert', title, content };
-  },
-};
+import type { ActionSchema } from './action.js';
+import type { RefSchema } from './ref.js';
+
+/** Display a toast notification. React: toast/message UI. Mini-program: wx.showToast. */
+export interface ToastAction extends ActionSchema {
+  type: 'toast';
+  message: string | RefSchema;
+  icon?: 'success' | 'error' | 'loading' | 'none';
+}
+
+/** Display an alert dialog. React: modal. Mini-program: wx.showModal. */
+export interface AlertAction extends ActionSchema {
+  type: 'alert';
+  title: string | RefSchema;
+  content: string | RefSchema;
+}
+
+export const popup = {
+  toast(message: string | RefSchema, icon?: 'success' | 'error' | 'loading' | 'none'): ToastAction {
+    return { name: 'toast', type: 'toast', message, icon };
+  },
+  alert(title: string | RefSchema, content: string | RefSchema): AlertAction {
+    return { name: 'alert', type: 'alert', title, content };
+  },
+};