libpetri 2.1.0 → 2.3.0

package/dist/{petri-net-BDrj4XZE.d.ts → petri-net-CKZYPOsL.d.ts}

@@ -1360,8 +1360,28 @@ declare class PetriNetBuilder {
      *         channel name is unknown on the interface, or when caller- and
      *         instance-side transition timings conflict (per [MOD-021]).
      */
+    compose(instance: Instance<unknown>): this;
     compose(instance: Instance<unknown>, portMappings: ReadonlyMap<string, Place<unknown>> | Record<string, Place<unknown>>): this;
     compose(instance: Instance<unknown>, bind: (b: ComposeBindings) => void): this;
+    /**
+     * Identity-default auto-compose per **MOD-024**.
+     *
+     * Each declared interface port auto-binds to its own `port.place` — the
+     * Place the SubnetDef builder declared via `.inputPort(name, hostPlace)`
+     * (or `outputPort` / `inoutPort`). If the host builder already declares
+     * the equal place, the two merge; if not, the place arrives implicitly
+     * via the rewritten transitions' arcs (same flow as explicit `bindPort`).
+     *
+     * If the subnet declares no interface ports at all, body places are
+     * checked against this builder's place set **by name** (matching the
+     * existing TS Place equality semantics; see [CORE-002] note in
+     * `spec/11-modular-composition.md` MOD-024). Body places that don't match
+     * stay private under their prefixed names per [MOD-010].
+     *
+     * Channels are NOT auto-bound — transition identity is too delicate for
+     * inference. If the subnet declares any channel, this overload throws.
+     */
+    private composeAuto;
     /**
      * @internal Shared compose implementation: validates port and channel
      * bindings, builds the place-substitution map, walks every renamed-body
@@ -1396,6 +1416,16 @@ declare class PetriNetBuilder {
      * channel-handle map — but the prefixed names remain stable.
      */
     private composeInternal;
+    /**
+     * Shared post-mergeMap pipeline: rewrites renamed-body transitions
+     * through `mergeMap`, applies channel merges per **MOD-021**, and adds
+     * the surviving transitions to the builder.
+     *
+     * Used by both the explicit-binding path (`composeInternal`) and the
+     * auto-compose path (`composeAuto` per **MOD-024**). The two paths differ
+     * only in how the (renamed Place name → host Place) `mergeMap` is built.
+     */
+    private applyComposition;
     /**
      * Registers one or more {@link FusionSet} declarations on this builder, per
      * **MOD-060** (fusion set declaration) and **MOD-061** (fusion resolution

package/dist/verification/index.d.ts

@@ -1,5 +1,5 @@
-import { b as Transition, a as Place, P as PetriNet, E as EnvironmentPlace, aG as MarkingState, aH as PInvariant, aI as MarkingStateBuilder, aJ as SmtProperty, aK as SmtVerificationResult } from '../petri-net-BDrj4XZE.js';
-export { aL as DeadlockFree, aM as MutualExclusion, aN as PlaceBound, aO as Proven, aP as SmtStatistics, aQ as TokenSupplier, aR as Unknown, aS as Unreachable, aT as Verdict, X as VerificationHarness, Y as VerificationResult, aU as Violated, aV as deadlockFree, aW as isProven, aX as isViolated, aY as mutualExclusion, aZ as pInvariant, a_ as pInvariantToString, a$ as placeBound, b0 as propertyDescription, b1 as unreachable } from '../petri-net-BDrj4XZE.js';
+import { b as Transition, a as Place, P as PetriNet, E as EnvironmentPlace, aG as MarkingState, aH as PInvariant, aI as MarkingStateBuilder, aJ as SmtProperty, aK as SmtVerificationResult } from '../petri-net-CKZYPOsL.js';
+export { aL as DeadlockFree, aM as MutualExclusion, aN as PlaceBound, aO as Proven, aP as SmtStatistics, aQ as TokenSupplier, aR as Unknown, aS as Unreachable, aT as Verdict, X as VerificationHarness, Y as VerificationResult, aU as Violated, aV as deadlockFree, aW as isProven, aX as isViolated, aY as mutualExclusion, aZ as pInvariant, a_ as pInvariantToString, a$ as placeBound, b0 as propertyDescription, b1 as unreachable } from '../petri-net-CKZYPOsL.js';
 import { Expr, init, Bool, FuncDecl } from 'z3-solver';
 
 /**

package/dist/viewer/index.d.ts

@@ -135,6 +135,16 @@ declare const VIEWER_CSS_VARIABLES: readonly ["--lpv-bg", "--lpv-header-bg", "--
  * @module viewer
  */
 
+/**
+ * Subnet (cluster) visibility mode.
+ *
+ * - `'show'` — render the DOT as-is with `subgraph cluster_*` groupings
+ *   visible (the default; the post-subnets layout).
+ * - `'hide'` — render a flattened variant that drops cluster wrappers
+ *   and the `ltail`/`lhead` cluster references on cross-cluster edges.
+ *   Same nodes and edges, no visual grouping.
+ */
+type SubnetVisibility = 'show' | 'hide';
 /** Handle returned by {@link mount}. */
 interface ViewerHandle {
     /** The rendered root `<svg>` element. */
@@ -147,6 +157,22 @@ interface ViewerHandle {
     readonly collapsedPrefixes: ReadonlySet<string>;
     /** Currently active "show only <prefix>" filter, or null. */
     readonly activeFilter: string | null;
+    /** Current subnet visibility mode. */
+    readonly subnets: SubnetVisibility;
+    /**
+     * Switch between the clustered (`'show'`) and flat (`'hide'`) views.
+     * Triggers an internal re-mount via the canonical {@link mount} path —
+     * the SVG is regenerated because Graphviz lays out cluster boundaries
+     * during layout. Returns the new handle; the old one is disposed.
+     *
+     * After re-mount, the host container dispatches a bubbling
+     * `libpetri-viewer:remount` CustomEvent whose `detail.handle` is the
+     * fresh handle. Consumers that cache the handle (e.g. the debug-ui)
+     * should listen on the container and update their reference.
+     */
+    setSubnets(mode: SubnetVisibility): Promise<ViewerHandle>;
+    /** Flip {@link subnets} to the other mode and re-mount. See {@link setSubnets}. */
+    toggleSubnets(): Promise<ViewerHandle>;
     /** Collapse a single cluster by prefix. No-op if unknown. */
     collapse(prefix: string): void;
     /** Expand a single cluster by prefix. No-op if unknown. */
@@ -203,6 +229,15 @@ interface MountOptions {
      * cached on the DOT hash; re-mounts on identical DOT skip the pipeline.
      */
     readonly layout?: 'elk' | 'graphviz';
+    /**
+     * Initial subnet visibility mode. Defaults to `'show'` (clustered view).
+     * Pass `'hide'` to mount with the flat view from the start. The chrome
+     * button toggles between the two at runtime; see {@link ViewerHandle.setSubnets}.
+     *
+     * If `previousHandle` is supplied and `subnets` is omitted, the previous
+     * handle's mode is inherited so live re-renders preserve the user's choice.
+     */
+    readonly subnets?: SubnetVisibility;
 }
 /**
  * Render a DOT source, mount the resulting SVG into `container`, wire pan/zoom,
@@ -224,4 +259,4 @@ interface MountOptions {
  */
 declare function mount(dotSource: string | null, container: HTMLElement, opts?: MountOptions): Promise<ViewerHandle>;
 
-export { type ClusterDescriptor, DEFAULT_PANZOOM_OPTS, type MountOptions, type PanzoomInstance, type PanzoomOptions, VIEWER_CSS_VARIABLES, type ViewerHandle, colorForPrefix, discoverClusters, mount };
+export { type ClusterDescriptor, DEFAULT_PANZOOM_OPTS, type MountOptions, type PanzoomInstance, type PanzoomOptions, type SubnetVisibility, VIEWER_CSS_VARIABLES, type ViewerHandle, colorForPrefix, discoverClusters, mount };

package/dist/viewer/index.js

@@ -655,11 +655,46 @@ var VIEWER_CSS_VARIABLES = [
   "--lpv-faded-cluster-opacity"
 ];
 
+// src/viewer/dot-flatten.ts
+var CLUSTER_OPEN = /^\s*subgraph\s+cluster_[A-Za-z0-9_]+\s*\{\s*$/;
+var ONLY_CLOSE_BRACE = /^\s*\}\s*$/;
+function flattenClusters(dot) {
+  const lines = dot.split("\n");
+  const out = [];
+  let clusterDepth = 0;
+  for (const line of lines) {
+    if (CLUSTER_OPEN.test(line)) {
+      clusterDepth++;
+      continue;
+    }
+    if (clusterDepth > 0) {
+      if (ONLY_CLOSE_BRACE.test(line)) {
+        clusterDepth--;
+        continue;
+      }
+      if (line.includes("[") || line.includes("->")) {
+        out.push(stripClusterEdgeAttrs(line));
+      }
+      continue;
+    }
+    if (line.includes("->") && (line.includes("ltail=") || line.includes("lhead="))) {
+      out.push(stripClusterEdgeAttrs(line));
+      continue;
+    }
+    out.push(line);
+  }
+  return out.join("\n");
+}
+function stripClusterEdgeAttrs(line) {
+  return line.replace(/,\s*ltail="cluster_[^"]*"/g, "").replace(/,\s*lhead="cluster_[^"]*"/g, "").replace(/\[\s*ltail="cluster_[^"]*"\s*,\s*/g, "[").replace(/\[\s*lhead="cluster_[^"]*"\s*,\s*/g, "[").replace(/\[\s*ltail="cluster_[^"]*"\s*\]/g, "[]").replace(/\[\s*lhead="cluster_[^"]*"\s*\]/g, "[]");
+}
+
 // src/viewer/index.ts
 async function mount(dotSource, container, opts = {}) {
   const previousHandle = opts.previousHandle ?? null;
   const preservedCollapsed = previousHandle ? new Set(previousHandle.collapsedPrefixes) : /* @__PURE__ */ new Set();
   const preservedFilter = previousHandle?.activeFilter ?? null;
+  const subnetsMode = opts.subnets ?? previousHandle?.subnets ?? "show";
   if (previousHandle) {
     previousHandle.dispose();
   }
@@ -673,7 +708,8 @@ async function mount(dotSource, container, opts = {}) {
   } else {
     const renderModule = await import("../render-QK57X4TP.js");
     const useElk = (opts.layout ?? "elk") === "elk";
-    svg = useElk ? await renderModule.renderDotToSvgWithElkLayout(dotSource) : await renderModule.renderDotToSvg(dotSource);
+    const renderedDot = subnetsMode === "hide" ? flattenClusters(dotSource) : dotSource;
+    svg = useElk ? await renderModule.renderDotToSvgWithElkLayout(renderedDot) : await renderModule.renderDotToSvg(renderedDot);
     container.innerHTML = "";
     container.appendChild(svg);
   }
@@ -716,6 +752,19 @@ async function mount(dotSource, container, opts = {}) {
     fsBtn.title = "Toggle fullscreen";
     fsBtn.textContent = "Fullscreen";
     fsBtn.addEventListener("click", () => toggleFullscreen(container, fsBtn));
+    const subnetsBtn = document.createElement("button");
+    subnetsBtn.type = "button";
+    subnetsBtn.className = "diagram-btn btn-subnets";
+    subnetsBtn.title = subnetsMode === "show" ? "Hide subnet groupings" : "Show subnet groupings";
+    subnetsBtn.textContent = subnetsMode === "show" ? "Flat view" : "Subnets view";
+    if (dotSource == null) {
+      subnetsBtn.disabled = true;
+      subnetsBtn.title = "Subnet toggle unavailable for pre-rendered SVG";
+    }
+    subnetsBtn.addEventListener("click", () => {
+      void handle.toggleSubnets();
+    });
+    controls.appendChild(subnetsBtn);
     controls.appendChild(resetBtn);
     controls.appendChild(fsBtn);
     chromeRoot.appendChild(controls);
@@ -723,7 +772,7 @@ async function mount(dotSource, container, opts = {}) {
       container.style.position = "relative";
     }
     container.appendChild(chromeRoot);
-    if (layoutMode === "elk" && clusters.size > 0) {
+    if (layoutMode === "elk" && subnetsMode === "show" && clusters.size > 0) {
       sidebarHandle = mountSidebar(container, clusters, {
         onVisibilityChange: (state) => handle.setVisibility(state),
         onHighlightModeChange: (enabled) => {
@@ -748,6 +797,29 @@ async function mount(dotSource, container, opts = {}) {
     get activeFilter() {
       return activeFilter;
     },
+    get subnets() {
+      return subnetsMode;
+    },
+    setSubnets(mode) {
+      if (dotSource == null) return Promise.resolve(handle);
+      if (mode === subnetsMode) return Promise.resolve(handle);
+      return mount(dotSource, container, {
+        ...opts,
+        previousHandle: handle,
+        subnets: mode
+      }).then((next) => {
+        container.dispatchEvent(
+          new CustomEvent("libpetri-viewer:remount", {
+            bubbles: true,
+            detail: { handle: next, subnets: mode }
+          })
+        );
+        return next;
+      });
+    },
+    toggleSubnets() {
+      return handle.setSubnets(subnetsMode === "show" ? "hide" : "show");
+    },
     collapse(prefix) {
       if (disposed) return;
       const cluster = clusters.get(prefix);