@willcgage/module-schematic 0.49.4 → 0.49.6

package/dist/index.d.cts

@@ -668,7 +668,9 @@ declare const N_CAR_LENGTH_INCHES = 3.3;
 /** How many cars fit in a span, from its drawn length — the derived capacity a
  * siding or an industry spot holds (never typed). */
 declare function carCapacity(fromPos: number, toPos: number, carLengthInches?: number): number;
-/** Parse a jsonb value into a schematic doc, or null if it isn't one. */
+/** Parse a jsonb value into a schematic doc, or null if it isn't one.
+ * EVERY read path goes through here (catalog, module page, my-modules, FD), so
+ * it's also where a stored doc gets healed — see healSelfDivergingTurnouts. */
 declare function asModuleSchematic(x: unknown): ModuleSchematicDoc | null;
 interface EditorTrack {
     id: string;

package/dist/index.d.ts

@@ -668,7 +668,9 @@ declare const N_CAR_LENGTH_INCHES = 3.3;
 /** How many cars fit in a span, from its drawn length — the derived capacity a
  * siding or an industry spot holds (never typed). */
 declare function carCapacity(fromPos: number, toPos: number, carLengthInches?: number): number;
-/** Parse a jsonb value into a schematic doc, or null if it isn't one. */
+/** Parse a jsonb value into a schematic doc, or null if it isn't one.
+ * EVERY read path goes through here (catalog, module page, my-modules, FD), so
+ * it's also where a stored doc gets healed — see healSelfDivergingTurnouts. */
 declare function asModuleSchematic(x: unknown): ModuleSchematicDoc | null;
 interface EditorTrack {
     id: string;

package/dist/index.js

@@ -462,13 +462,15 @@ function moduleFootprint(input) {
   const authored = benchworkOutline(input);
   const offA = input.endplateTrackOffsets?.["A"] ?? 0;
   const offB = input.endplateTrackOffsets?.["B"] ?? 0;
-  const sectionOutlines = sectionFootprints(input, {
+  const secs = input.sections ?? [];
+  const sectionsOwnShape = secs.length > 1 || secs.some((s) => (s.outline?.length ?? 0) >= 3);
+  const sectionOutlines = sectionsOwnShape ? sectionFootprints(input, {
     centerline,
     widthA,
     widthB,
     offsetA: offA,
     offsetB: offB
-  });
+  }) : [];
   return {
     centerline,
     band: benchworkBand(centerline, widthA, widthB, offA, offB),
@@ -537,12 +539,23 @@ function carCapacity(fromPos, toPos, carLengthInches = N_CAR_LENGTH_INCHES) {
   if (!(carLengthInches > 0)) return 0;
   return Math.max(0, Math.floor(Math.abs(toPos - fromPos) / carLengthInches));
 }
+function healSelfDivergingTurnouts(turnouts) {
+  if (!turnouts?.some((t) => t.onTrack === t.divergeTrack)) return turnouts;
+  return turnouts.map((t) => {
+    if (t.onTrack !== t.divergeTrack) return t;
+    if (t.onTrack === MAIN_TRACK_ID) return { ...t, divergeTrack: MAIN2_TRACK_ID };
+    if (t.onTrack === MAIN2_TRACK_ID) return { ...t, divergeTrack: MAIN_TRACK_ID };
+    return t;
+  });
+}
 function asModuleSchematic(x) {
   if (!x || typeof x !== "object") return null;
   const d = x;
   if (typeof d.version !== "number") return null;
   if (!Array.isArray(d.endplates) || !Array.isArray(d.tracks)) return null;
-  return d;
+  const doc = d;
+  const healed = healSelfDivergingTurnouts(doc.turnouts);
+  return healed === doc.turnouts ? doc : { ...doc, turnouts: healed };
 }
 function emptyEditorState(lengthInches) {
   return {
@@ -931,24 +944,19 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       trackB: x.tracks?.[1] ?? MAIN_TRACK_ID
     })),
     extraTracks,
-    turnouts: (d.turnouts ?? []).map((t) => {
-      let divergeTrack = t.divergeTrack;
-      if (divergeTrack === t.onTrack) {
-        if (t.onTrack === MAIN_TRACK_ID) divergeTrack = MAIN2_TRACK_ID;
-        else if (t.onTrack === MAIN2_TRACK_ID) divergeTrack = MAIN_TRACK_ID;
-      }
-      return {
-        id: t.id,
-        name: t.name ?? "",
-        pos: sc(t.pos),
-        onTrack: t.onTrack,
-        divergeTrack,
-        kind: t.kind ?? "right",
-        ...t.size ? { size: t.size } : {},
-        ...t.curved ? { curved: true } : {},
-        ...t.flipped ? { flipped: true } : {}
-      };
-    }),
+    // Heal a turnout that diverges into the track it sits on (#172) with the
+    // same helper the read path uses, so the editor and every renderer agree.
+    turnouts: (healSelfDivergingTurnouts(d.turnouts) ?? []).map((t) => ({
+      id: t.id,
+      name: t.name ?? "",
+      pos: sc(t.pos),
+      onTrack: t.onTrack,
+      divergeTrack: t.divergeTrack,
+      kind: t.kind ?? "right",
+      ...t.size ? { size: t.size } : {},
+      ...t.curved ? { curved: true } : {},
+      ...t.flipped ? { flipped: true } : {}
+    })),
     controlPoints: readControlPoints(d, sc),
     industries: (d.industries ?? []).map((ind) => ({
       id: ind.id,