@willcgage/module-schematic 0.23.0 → 0.25.0

package/dist/index.d.cts

@@ -94,6 +94,10 @@ interface SchematicTurnout {
     address?: string | null;
     /** Frog number ("size") — #4, #6, #8, etc. Governs the diverging angle. */
     size?: number | null;
+    /** A curved turnout — the diverging route bows into an arc (both routes curve
+     * the same way) instead of leaving as a straight diagonal. Physical-render
+     * only; the operations view stays topological. */
+    curved?: boolean | null;
 }
 interface SchematicSignal {
     id: string;
@@ -359,6 +363,9 @@ interface EditorTurnout {
     kind: TurnoutKind;
     /** Frog number ("size") — #4, #6, #8, etc. Governs the diverging angle. */
     size?: number;
+    /** A curved turnout — the diverging route bows into an arc rather than a
+     * straight diagonal. Physical-render only (the operations view is topological). */
+    curved?: boolean;
 }
 interface EditorCpSignal {
     id: string;

package/dist/index.d.ts

@@ -94,6 +94,10 @@ interface SchematicTurnout {
     address?: string | null;
     /** Frog number ("size") — #4, #6, #8, etc. Governs the diverging angle. */
     size?: number | null;
+    /** A curved turnout — the diverging route bows into an arc (both routes curve
+     * the same way) instead of leaving as a straight diagonal. Physical-render
+     * only; the operations view stays topological. */
+    curved?: boolean | null;
 }
 interface SchematicSignal {
     id: string;
@@ -359,6 +363,9 @@ interface EditorTurnout {
     kind: TurnoutKind;
     /** Frog number ("size") — #4, #6, #8, etc. Governs the diverging angle. */
     size?: number;
+    /** A curved turnout — the diverging route bows into an arc rather than a
+     * straight diagonal. Physical-render only (the operations view is topological). */
+    curved?: boolean;
 }
 interface EditorCpSignal {
     id: string;

package/dist/index.js

@@ -224,6 +224,21 @@ 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);
+  if (!isDouble || bothDouble || !sw || sw.onTrack !== MAIN2_TRACK_ID) {
+    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: 0, 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: 0, fromPos: sw.pos, toPos: state.lengthInches }
+  );
+}
 function main2Track(state) {
   const bothDouble = state.configA === "double" && state.configB === "double";
   const sw = state.turnouts.find(isTransitionTurnout);
@@ -336,7 +351,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
@@ -366,7 +385,8 @@ function stateToDoc(state, recordNumber) {
       divergeTrack: t.divergeTrack,
       kind: t.kind,
       name: t.name || void 0,
-      ...t.size ? { size: t.size } : {}
+      ...t.size ? { size: t.size } : {},
+      ...t.curved ? { curved: true } : {}
     })),
     ...state.crossings.length > 0 ? {
       crossings: state.crossings.map((x) => ({
@@ -527,7 +547,8 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       onTrack: t.onTrack,
       divergeTrack: t.divergeTrack,
       kind: t.kind ?? "right",
-      ...t.size ? { size: t.size } : {}
+      ...t.size ? { size: t.size } : {},
+      ...t.curved ? { curved: true } : {}
     })),
     controlPoints: readControlPoints(d, sc),
     industries: (d.industries ?? []).map((ind) => ({