@willcgage/module-schematic 0.39.0 → 0.41.0

package/dist/index.js

@@ -567,25 +567,19 @@ function isTransitionTurnout(t) {
   return t.onTrack === MAIN_TRACK_ID && t.divergeTrack === MAIN2_TRACK_ID || t.onTrack === MAIN2_TRACK_ID && t.divergeTrack === MAIN_TRACK_ID;
 }
 function main1Track(state) {
-  const bothDouble = state.configA === "double" && state.configB === "double";
-  const isDouble = state.configA === "double" || state.configB === "double";
   const sw = state.turnouts.find(isTransitionTurnout);
-  const lane = state.mainsSwapped && isDouble ? 1 : 0;
-  if (!isDouble || bothDouble || !sw || sw.onTrack !== MAIN2_TRACK_ID) {
-    return { id: MAIN_TRACK_ID, role: "main", lane, from: "A", to: "B" };
+  const legacyThroughMain2 = !!sw && sw.onTrack === MAIN2_TRACK_ID && sw.divergeTrack === MAIN_TRACK_ID;
+  const isDouble = state.configA === "double" || state.configB === "double";
+  const bothDouble = state.configA === "double" && state.configB === "double";
+  if (!isDouble || bothDouble || !legacyThroughMain2) {
+    return { id: MAIN_TRACK_ID, role: "main", lane: 0, from: "A", to: "B" };
   }
-  return state.configA === "double" ? (
-    // Double at A: Main 1 runs from A and ends at the turnout.
-    { id: MAIN_TRACK_ID, role: "main", lane, fromPos: 0, toPos: sw.pos }
-  ) : (
-    // Double at B: Main 1 begins at the turnout and runs to B.
-    { id: MAIN_TRACK_ID, role: "main", lane, fromPos: sw.pos, toPos: state.lengthInches }
-  );
+  return state.configA === "double" ? { id: MAIN_TRACK_ID, role: "main", lane: 0, fromPos: 0, toPos: sw.pos } : { id: MAIN_TRACK_ID, role: "main", lane: 0, fromPos: sw.pos, toPos: state.lengthInches };
 }
 function main2Track(state) {
   const bothDouble = state.configA === "double" && state.configB === "double";
   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;
+  const lane = state.mainsSwapped ? -1 : 1;
   const authored = state.main2Path.length >= 2 ? { path: state.main2Path } : {};
   if (bothDouble || !sws.length) {
     return { id: MAIN2_TRACK_ID, role: "main", lane, from: "A", to: "B", ...authored };
@@ -615,13 +609,17 @@ function buildTransition(state) {
     id: swId,
     name: "End of Double Track",
     pos,
-    // The turnout sits ON the ending main (Main 2, the upper track) and diverges
-    // down to the continuous Main 1 — the modeller's view of the junction. Left
-    // hand when the double end is west (Main 2 comes down going east), right
-    // when it's east (mirror).
-    onTrack: MAIN2_TRACK_ID,
-    divergeTrack: MAIN_TRACK_ID,
-    kind: aDouble ? "left" : "right"
+    // The turnout sits ON the through mainline (Main 1) and diverges TO Main 2,
+    // the second main being added to start the double track — the modeller's
+    // view of the junction, and the direction an owner authors it (Steve
+    // Branton, #131). Main 1 runs the full module; Main 2 is the branch.
+    onTrack: MAIN_TRACK_ID,
+    divergeTrack: MAIN2_TRACK_ID,
+    // Hand so the diverging leg lands on Main 2's side. Main 2 extends toward
+    // the double end (sign −1 west / +1 east) and sits above (+1) or, when the
+    // mains are swapped, below (−1). divergeSideForHand(left)=sign(toward),
+    // (right)=−sign(toward), so pick the hand whose side matches Main 2's (#131).
+    kind: (aDouble ? -1 : 1) === (state.mainsSwapped ? -1 : 1) ? "left" : "right"
   };
   const cpId = nextId("cp", state.controlPoints.map((c) => c.id));
   const sig = (facing) => ({