ComposeOptions should not have activeEdge -- should have `current…

….start` and `current.end` node

TODO.md

@@ -1,7 +1,5 @@
 # type
 
-`ComposeOptions` should not have `activeEdge` -- should have `start` and `end` node
-
 extract `compose`
 
 - let `Word` be algebraic data type
@@ -25,7 +23,7 @@ extract `cut`
 
 # example
 
-Nat -- `mul` -- with `nat_dup` and `nat_drop`
+Nat -- `mul` -- with `nat_dup` and `nat_erase`
 
 Nat -- `max` -- with `max_aux`
 

src/lang/graph/findPortInActiveEdge.ts

@@ -1,20 +1,18 @@
-import { ActiveEdge, Node, Port } from "../graph"
+import { Node, Port } from "../graph"
 
-export function findPortInActiveEdge(
+export function findPortInNodes(
   nodeName: string,
   portName: string,
-  activeEdge: ActiveEdge,
+  nodes: Array<Node>,
 ): Port | undefined {
-  if (nodeName === activeEdge.start.node.name) {
-    return findPortInNode(portName, activeEdge.start.node)
-  }
-
-  if (nodeName === activeEdge.end.node.name) {
-    return findPortInNode(portName, activeEdge.end.node)
+  for (const node of nodes) {
+    if (nodeName === node.name) {
+      return findPortInNode(portName, node)
+    }
   }
 }
 
-function findPortInNode(portName: string, node: Node): Port | undefined {
+export function findPortInNode(portName: string, node: Node): Port | undefined {
   for (const port of node.input) {
     if (port.name === portName) {
       return port.connection?.port

src/lang/run/interact.ts

@@ -8,6 +8,11 @@ export function interact(mod: Mod, net: Net, activeEdge: ActiveEdge): void {
   removeNodeAndEdges(net, activeEdge.start.node)
 
   for (const word of activeEdge.rule.words) {
-    word.compose(mod, net, { activeEdge })
+    word.compose(mod, net, {
+      current: {
+        start: activeEdge.start.node,
+        end: activeEdge.end.node,
+      },
+    })
   }
 }

src/lang/word/Word.ts

@@ -1,11 +1,11 @@
 import { Ctx } from "../ctx"
-import { ActiveEdge } from "../graph"
+import { Node } from "../graph"
 import { Mod } from "../mod"
 import { Net } from "../net"
 import { Span } from "../span"
 
 export interface ComposeOptions {
-  activeEdge?: ActiveEdge
+  current?: { start: Node; end: Node }
 }
 
 export interface CutOptions {

src/lang/words/PortPush.ts

@@ -1,5 +1,5 @@
 import { Ctx } from "../ctx"
-import { findPortInActiveEdge } from "../graph/findPortInActiveEdge"
+import { findPortInNodes } from "../graph/findPortInActiveEdge"
 import { Mod } from "../mod"
 import { Net } from "../net"
 import { disconnect } from "../net/disconnect"
@@ -14,13 +14,16 @@ export class PortPush implements Word {
   ) {}
 
   compose(mod: Mod, net: Net, options?: ComposeOptions): void {
-    const { activeEdge } = options || {}
+    const { current } = options || {}
 
-    if (activeEdge === undefined) {
+    if (current === undefined) {
       throw new Error(`[PortPush.compose] expect current activeEdge`)
     }
 
-    const found = findPortInActiveEdge(this.nodeName, this.portName, activeEdge)
+    const found = findPortInNodes(this.nodeName, this.portName, [
+      current.start,
+      current.end,
+    ])
 
     if (found === undefined) {
       throw new Error(

src/lang/words/PortReconnect.ts

@@ -1,5 +1,5 @@
 import { Ctx } from "../ctx"
-import { findPortInActiveEdge } from "../graph/findPortInActiveEdge"
+import { findPortInNodes } from "../graph/findPortInActiveEdge"
 import { Mod } from "../mod"
 import { Net } from "../net"
 import { connect } from "../net/connect"
@@ -15,13 +15,16 @@ export class PortReconnect implements Word {
   ) {}
 
   compose(mod: Mod, net: Net, options?: ComposeOptions): void {
-    const { activeEdge } = options || {}
+    const { current } = options || {}
 
-    if (activeEdge === undefined) {
+    if (current === undefined) {
       throw new Error(`[PortReconnect.compose] expect current activeEdge`)
     }
 
-    const found = findPortInActiveEdge(this.nodeName, this.portName, activeEdge)
+    const found = findPortInNodes(this.nodeName, this.portName, [
+      current.start,
+      current.end,
+    ])
 
     if (found === undefined) {
       throw new Error(