@willcgage/module-schematic 0.49.2 → 0.49.4

package/dist/index.d.cts

@@ -1000,6 +1000,10 @@ interface ModuleFeatures {
         fromFrac: number;
         toFrac: number;
     } | null;
+    /** Main 2's drawn lane — +1 above Main 1 by default, −1 below when the mains
+     * are swapped (#131/#172). Null when there is no Main 2. Renderers must draw
+     * Main 2 (and its diverges) at THIS lane, never a hard-coded +1. */
+    main2Lane: number | null;
     /** Single↔double transition, fully described (#FMN-0043). The `through` main
      * runs the whole module; the `branch` main exists only on the double side and
      * merges at `atFrac`. EITHER main can be through/branch — the surviving single

package/dist/index.d.ts

@@ -1000,6 +1000,10 @@ interface ModuleFeatures {
         fromFrac: number;
         toFrac: number;
     } | null;
+    /** Main 2's drawn lane — +1 above Main 1 by default, −1 below when the mains
+     * are swapped (#131/#172). Null when there is no Main 2. Renderers must draw
+     * Main 2 (and its diverges) at THIS lane, never a hard-coded +1. */
+    main2Lane: number | null;
     /** Single↔double transition, fully described (#FMN-0043). The `through` main
      * runs the whole module; the `branch` main exists only on the double side and
      * merges at `atFrac`. EITHER main can be through/branch — the surviving single

package/dist/index.js

@@ -931,17 +931,24 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       trackB: x.tracks?.[1] ?? MAIN_TRACK_ID
     })),
     extraTracks,
-    turnouts: (d.turnouts ?? []).map((t) => ({
-      id: t.id,
-      name: t.name ?? "",
-      pos: sc(t.pos),
-      onTrack: t.onTrack,
-      divergeTrack: t.divergeTrack,
-      kind: t.kind ?? "right",
-      ...t.size ? { size: t.size } : {},
-      ...t.curved ? { curved: true } : {},
-      ...t.flipped ? { flipped: true } : {}
-    })),
+    turnouts: (d.turnouts ?? []).map((t) => {
+      let divergeTrack = t.divergeTrack;
+      if (divergeTrack === t.onTrack) {
+        if (t.onTrack === MAIN_TRACK_ID) divergeTrack = MAIN2_TRACK_ID;
+        else if (t.onTrack === MAIN2_TRACK_ID) divergeTrack = MAIN_TRACK_ID;
+      }
+      return {
+        id: t.id,
+        name: t.name ?? "",
+        pos: sc(t.pos),
+        onTrack: t.onTrack,
+        divergeTrack,
+        kind: t.kind ?? "right",
+        ...t.size ? { size: t.size } : {},
+        ...t.curved ? { curved: true } : {},
+        ...t.flipped ? { flipped: true } : {}
+      };
+    }),
     controlPoints: readControlPoints(d, sc),
     industries: (d.industries ?? []).map((ind) => ({
       id: ind.id,
@@ -1287,9 +1294,10 @@ function moduleFeatures(doc) {
       };
     });
   });
+  const main2Lane = trackLane.has(MAIN2_TRACK_ID) ? trackLane.get(MAIN2_TRACK_ID) : null;
   const allLanes = [
     0,
-    doubleMain ? 1 : 0,
+    main2Lane ?? (doubleMain ? 1 : 0),
     ...extraTracks.map((t) => t.lane),
     ...signals.map((s) => s.lane),
     ...crossings.flatMap((x) => [x.laneA, x.laneB]),
@@ -1317,6 +1325,7 @@ function moduleFeatures(doc) {
     doubleMain,
     loop,
     main2Extent,
+    main2Lane,
     transition,
     loopInterchange: loop && doc.endplates.filter((e) => !e.at).length >= 2,
     loopReturn: loop && doc.loopReturn === "main2" ? "main2" : "same",