@willcgage/module-schematic 0.24.0 → 0.26.0

package/dist/index.cjs

@@ -210,6 +210,7 @@ function emptyEditorState(lengthInches) {
     loopReturn: "same",
     configA: "single",
     configB: "single",
+    mainsSwapped: false,
     extraTracks: [],
     turnouts: [],
     crossings: [],
@@ -226,18 +227,35 @@ function emptyEditorState(lengthInches) {
 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" };
+  }
+  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 }
+  );
+}
 function main2Track(state) {
   const bothDouble = state.configA === "double" && state.configB === "double";
   const sw = state.turnouts.find(isTransitionTurnout);
+  const lane = state.mainsSwapped ? 0 : 1;
   if (bothDouble || !sw || sw.divergeTrack !== MAIN2_TRACK_ID) {
-    return { id: MAIN2_TRACK_ID, role: "main", lane: 1, from: "A", to: "B" };
+    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: 1, fromPos: 0, toPos: sw.pos }
+    { 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: 1, fromPos: sw.pos, toPos: state.lengthInches }
+    { id: MAIN2_TRACK_ID, role: "main", lane, fromPos: sw.pos, toPos: state.lengthInches }
   );
 }
 function buildTransition(state) {
@@ -294,6 +312,7 @@ function stateToDoc(state, recordNumber) {
     lengthInches: state.lengthInches,
     ...state.loop ? { loop: true } : {},
     ...state.loop && state.loopReturn === "main2" ? { loopReturn: "main2" } : {},
+    ...state.mainsSwapped ? { mainsSwapped: true } : {},
     endplates: withWidths(
       withPoses(
         [
@@ -338,7 +357,11 @@ function stateToDoc(state, recordNumber) {
       state.loop ? (
         // The main runs the lead from A and turns back at the balloon.
         { id: MAIN_TRACK_ID, role: "main", lane: 0, fromPos: 0, toPos: state.lengthInches }
-      ) : { id: MAIN_TRACK_ID, role: "main", lane: 0, from: "A", to: "B" },
+      ) : (
+        // Normally A→B; partial when MAIN 2 is the through main and Main 1 is
+        // the one that ends at the transition turnout (#FMN-0043).
+        main1Track(state)
+      ),
       // Double track: Main 2 is a real entity so turnouts/signals can attach.
       // On a loop it exists only for a Main 2 directional return (the U joins
       // the two lanes at the balloon); a same-main loop's parallel lead legs
@@ -501,6 +524,7 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     lengthInches: len,
     loop,
     loopReturn: loop && d.loopReturn === "main2" ? "main2" : "same",
+    mainsSwapped: d.mainsSwapped === true,
     configA: configOf("A"),
     // On a loop, a missing B means pure turnback; present = interchange loop.
     configB: loop && !hasB ? "none" : configOf("B"),