@willcgage/module-schematic 0.38.0 → 0.40.0

package/dist/index.cjs

@@ -561,41 +561,38 @@ function emptyEditorState(lengthInches) {
     sections: [],
     controlPoints: [],
     industries: [],
-    mainPath: []
+    mainPath: [],
+    main2Path: []
   };
 }
 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" };
+    return { id: MAIN2_TRACK_ID, role: "main", lane, from: "A", to: "B", ...authored };
   }
   const track = (fromPos, toPos) => ({
     id: MAIN2_TRACK_ID,
     role: "main",
     lane,
     fromPos,
-    toPos
+    toPos,
+    ...authored
   });
   if (state.configA === "double") return track(0, sws[0].pos);
   if (state.configB === "double") return track(sws[0].pos, state.lengthInches);
@@ -614,12 +611,12 @@ 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,
+    // 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,
     kind: aDouble ? "left" : "right"
   };
   const cpId = nextId("cp", state.controlPoints.map((c) => c.id));
@@ -796,7 +793,8 @@ function stateToDoc(state, recordNumber) {
     // that never used them keeps exactly the doc it had before (#96 phase 2).
     ...state.sections.length ? { sections: moduleSections({ sections: state.sections }) } : {},
     // Authored mainline path (module-local inches); only when it's a real path.
-    ...state.mainPath.length >= 2 ? { mainPath: state.mainPath } : {}
+    ...state.mainPath.length >= 2 ? { mainPath: state.mainPath } : {},
+    ...state.main2Path.length >= 2 ? { main2Path: state.main2Path } : {}
   };
 }
 function docToState(doc, fallbackLength, moduleTracks = []) {
@@ -881,6 +879,8 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     ...Number.isFinite(p.bulge) && p.bulge ? { bulge: p.bulge } : {}
   }));
   const mainPath = trackPath(d.mainPath) ?? [];
+  const main2Track_ = (d.tracks ?? []).find((t) => t.id === MAIN2_TRACK_ID);
+  const main2Path = trackPath(d.main2Path ?? main2Track_?.path) ?? [];
   return {
     lengthInches: len,
     loop,
@@ -902,6 +902,7 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     sectionBreaks: (d.sectionBreaks ?? []).filter((n) => Number.isFinite(n)).map((n) => sc(n)),
     sections: moduleSections(d),
     mainPath,
+    main2Path,
     crossings: (d.crossings ?? []).map((x) => ({
       id: x.id,
       name: x.name ?? "",