@willcgage/module-schematic 0.33.0 → 0.35.0

package/dist/index.cjs

@@ -555,18 +555,22 @@ function main1Track(state) {
 }
 function main2Track(state) {
   const bothDouble = state.configA === "double" && state.configB === "double";
-  const sw = state.turnouts.find(isTransitionTurnout);
+  const sws = state.turnouts.filter((t) => isTransitionTurnout(t) && t.divergeTrack === MAIN2_TRACK_ID).sort((a, b) => a.pos - b.pos);
   const lane = state.mainsSwapped ? 0 : 1;
-  if (bothDouble || !sw || sw.divergeTrack !== MAIN2_TRACK_ID) {
+  if (bothDouble || !sws.length) {
     return { id: MAIN2_TRACK_ID, role: "main", lane, from: "A", to: "B" };
   }
-  return state.configA === "double" ? (
-    // Double at A: Main 2 runs from A and ends at the turnout.
-    { id: MAIN2_TRACK_ID, role: "main", lane, fromPos: 0, toPos: sw.pos }
-  ) : (
-    // Double at B: Main 2 begins at the turnout and runs to B.
-    { id: MAIN2_TRACK_ID, role: "main", lane, fromPos: sw.pos, toPos: state.lengthInches }
-  );
+  const track = (fromPos, toPos) => ({
+    id: MAIN2_TRACK_ID,
+    role: "main",
+    lane,
+    fromPos,
+    toPos
+  });
+  if (state.configA === "double") return track(0, sws[0].pos);
+  if (state.configB === "double") return track(sws[0].pos, state.lengthInches);
+  if (sws.length >= 2) return track(sws[0].pos, sws[sws.length - 1].pos);
+  return track(sws[0].pos, state.lengthInches);
 }
 function buildTransition(state) {
   const aDouble = state.configA === "double";
@@ -684,7 +688,12 @@ function stateToDoc(state, recordNumber) {
       // double) Main 2 only runs from the mainline turnout to the double end —
       // the turnout that diverges to main2 is the single source of truth for
       // where the transition sits (fd#175 / FMN-0038).
-      ...!state.loop && (state.configA === "double" || state.configB === "double") ? [main2Track(state)] : [],
+      // …and on a module that's SINGLE at both ends but goes double in the
+      // middle to form a siding: the turnouts are what make Main 2 exist, so a
+      // pair of them is reason enough to emit it (#118). Without this the
+      // second main simply wasn't in the doc, and neither the board nor the
+      // dispatcher panel could draw it.
+      ...!state.loop && (state.configA === "double" || state.configB === "double" || state.turnouts.some((t) => isTransitionTurnout(t) && t.divergeTrack === MAIN2_TRACK_ID)) ? [main2Track(state)] : [],
       ...state.loop && state.loopReturn === "main2" ? [{ id: MAIN2_TRACK_ID, role: "main", lane: 1, fromPos: 0, toPos: state.lengthInches }] : [],
       ...state.extraTracks.map((t) => ({
         id: t.id,
@@ -707,7 +716,8 @@ function stateToDoc(state, recordNumber) {
       kind: t.kind,
       name: t.name || void 0,
       ...t.size ? { size: t.size } : {},
-      ...t.curved ? { curved: true } : {}
+      ...t.curved ? { curved: true } : {},
+      ...t.flipped ? { flipped: true } : {}
     })),
     ...state.crossings.length > 0 ? {
       crossings: state.crossings.map((x) => ({
@@ -878,7 +888,8 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       divergeTrack: t.divergeTrack,
       kind: t.kind ?? "right",
       ...t.size ? { size: t.size } : {},
-      ...t.curved ? { curved: true } : {}
+      ...t.curved ? { curved: true } : {},
+      ...t.flipped ? { flipped: true } : {}
     })),
     controlPoints: readControlPoints(d, sc),
     industries: (d.industries ?? []).map((ind) => ({
@@ -1011,9 +1022,9 @@ function buildCrossover(state) {
   ];
   return { track, turnouts };
 }
-function divergeSideForHand(kind, stubDir) {
+function divergeSideForHand(kind, stubDir, flipped) {
   if (kind !== "left" && kind !== "right") return 0;
-  const s = stubDir >= 0 ? 1 : -1;
+  const s = (stubDir >= 0 ? 1 : -1) * (flipped ? -1 : 1);
   return kind === "left" ? s : -s;
 }
 function moduleFeatures(doc) {