@willcgage/module-schematic 0.11.0 → 0.13.0

package/dist/index.d.cts

@@ -280,6 +280,16 @@ declare function buildPassingSiding(state: EditorState): {
     turnouts: EditorTurnout[];
     controlPoints: EditorControlPoint[];
 };
+/**
+ * Build a crossover as one unit: a short connector track between Main 1 and
+ * Main 2, with a turnout on each main. The two turnouts sit on different lanes,
+ * so the feature resolver draws it as a diagonal (not a lane-paralleling siding)
+ * — this is what connects the two dots (#bug2). Needs a double-track module.
+ */
+declare function buildCrossover(state: EditorState): {
+    track: EditorTrack;
+    turnouts: EditorTurnout[];
+} | null;
 interface DrawTrack {
     id: string;
     role: TrackRole;
@@ -291,6 +301,13 @@ interface DrawTrack {
      * of the diverge diagonal. A spur off Main 2 starts at lane 1, not lane 0;
      * without this, renderers draw what looks like a crossover. */
     divergesFromLane: number;
+    /** The end that meets the main at its turnout (throat) and the far stub end,
+     * as fractions of length. Direction-preserving: unlike fromFrac/toFrac (always
+     * sorted West→East), these keep WHICH end joins, so an east-facing spur draws
+     * its throat on the east. A siding meets the main at both ends — there
+     * throat=fromFrac, stub=toFrac (the fields are only meaningful for spurs). */
+    throatFrac: number;
+    stubFrac: number;
     /** Inside the balloon of a loop module (#165). */
     inLoop: boolean;
 }
@@ -311,6 +328,10 @@ interface DrawSignal {
     /** Owning control point's id, when the signal came from a CP group — lets a
      * renderer join the drawn signal back to interlocking-level state (aspects). */
     cp?: string;
+    /** 0-based rank among signals that would otherwise land on the exact same
+     * spot (same lane + side + position). Renderers offset each further from the
+     * track by `stack` so a control point's signals never overlap. */
+    stack: number;
 }
 /** A grade crossing / diamond — draw an X spanning the two lanes (#170). */
 interface DrawCrossing {
@@ -320,6 +341,18 @@ interface DrawCrossing {
     laneA: number;
     laneB: number;
 }
+/** A crossover — a connector track joining two parallel mains through a turnout
+ * on each. Draw a straight diagonal between the two turnout points (unlike a
+ * siding, which parallels a lane between its turnouts). Detected structurally:
+ * a track whose turnouts sit on two different lanes. */
+interface DrawCrossover {
+    id: string;
+    name: string;
+    fromPosFrac: number;
+    fromLane: number;
+    toPosFrac: number;
+    toLane: number;
+}
 /** A branch endplate — draw a connector stub + arrow + label off the given
  * side (the CATS/US&S off-band idiom, #170). */
 interface BranchConnector {
@@ -348,6 +381,8 @@ interface ModuleFeatures {
     signals: DrawSignal[];
     /** Grade crossings / diamonds (#170). */
     crossings: DrawCrossing[];
+    /** Crossovers — connector tracks between two mains (drawn as a diagonal). */
+    crossovers: DrawCrossover[];
     /** Branch endplates — junction connectors off the module (#170). */
     branchConnectors: BranchConnector[];
     /** Main 2's extent when it doesn't run the full module — a single↔double
@@ -362,6 +397,17 @@ interface ModuleFeatures {
     laneMin: number;
     laneMax: number;
 }
+/**
+ * Which side of the main a diverging track draws on, given the turnout's HAND
+ * and the direction the track body runs along the main from the turnout
+ * (`stubDir`: +1 = the body extends east / toward B, −1 = west / toward A).
+ * Returns +1 (above the main) or −1 (below); 0 for a wye or unset hand (keep the
+ * authored side). A left-hand turnout throws its route to the same side its body
+ * runs (facing the frog, left is the inside of a body running that way); a
+ * right-hand throws to the opposite side. `kind` is the source of truth for the
+ * drawn side (#bug1) — the stored lane's sign is reconciled to match it.
+ */
+declare function divergeSideForHand(kind: TurnoutKind | undefined, stubDir: number): -1 | 0 | 1;
 /**
  * Resolve a schematic doc into positioned drawables. `pos` (inches) becomes a
  * fraction of the module length; endplate A = 0, B = length; turnouts sit at
@@ -433,4 +479,4 @@ declare function poseOverridesFromDoc(doc: ModuleSchematicDoc): Record<string, {
     heading: number;
 }>;
 
-export { type BranchConnector, type DrawCrossing, type DrawSignal, type DrawTrack, type DrawTurnout, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type GeometryType, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_SCALE_RATIO, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, buildPassingSiding, buildTransition, deriveEndplatePoses, docToState, emptyEditorState, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, moduleFeatures, nextId, poseNeedsManual, poseOverridesFromDoc, scaleFeetToInches, stateToDoc };
+export { type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawSignal, type DrawTrack, type DrawTurnout, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type GeometryType, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_SCALE_RATIO, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, buildCrossover, buildPassingSiding, buildTransition, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, moduleFeatures, nextId, poseNeedsManual, poseOverridesFromDoc, scaleFeetToInches, stateToDoc };

package/dist/index.d.ts

@@ -280,6 +280,16 @@ declare function buildPassingSiding(state: EditorState): {
     turnouts: EditorTurnout[];
     controlPoints: EditorControlPoint[];
 };
+/**
+ * Build a crossover as one unit: a short connector track between Main 1 and
+ * Main 2, with a turnout on each main. The two turnouts sit on different lanes,
+ * so the feature resolver draws it as a diagonal (not a lane-paralleling siding)
+ * — this is what connects the two dots (#bug2). Needs a double-track module.
+ */
+declare function buildCrossover(state: EditorState): {
+    track: EditorTrack;
+    turnouts: EditorTurnout[];
+} | null;
 interface DrawTrack {
     id: string;
     role: TrackRole;
@@ -291,6 +301,13 @@ interface DrawTrack {
      * of the diverge diagonal. A spur off Main 2 starts at lane 1, not lane 0;
      * without this, renderers draw what looks like a crossover. */
     divergesFromLane: number;
+    /** The end that meets the main at its turnout (throat) and the far stub end,
+     * as fractions of length. Direction-preserving: unlike fromFrac/toFrac (always
+     * sorted West→East), these keep WHICH end joins, so an east-facing spur draws
+     * its throat on the east. A siding meets the main at both ends — there
+     * throat=fromFrac, stub=toFrac (the fields are only meaningful for spurs). */
+    throatFrac: number;
+    stubFrac: number;
     /** Inside the balloon of a loop module (#165). */
     inLoop: boolean;
 }
@@ -311,6 +328,10 @@ interface DrawSignal {
     /** Owning control point's id, when the signal came from a CP group — lets a
      * renderer join the drawn signal back to interlocking-level state (aspects). */
     cp?: string;
+    /** 0-based rank among signals that would otherwise land on the exact same
+     * spot (same lane + side + position). Renderers offset each further from the
+     * track by `stack` so a control point's signals never overlap. */
+    stack: number;
 }
 /** A grade crossing / diamond — draw an X spanning the two lanes (#170). */
 interface DrawCrossing {
@@ -320,6 +341,18 @@ interface DrawCrossing {
     laneA: number;
     laneB: number;
 }
+/** A crossover — a connector track joining two parallel mains through a turnout
+ * on each. Draw a straight diagonal between the two turnout points (unlike a
+ * siding, which parallels a lane between its turnouts). Detected structurally:
+ * a track whose turnouts sit on two different lanes. */
+interface DrawCrossover {
+    id: string;
+    name: string;
+    fromPosFrac: number;
+    fromLane: number;
+    toPosFrac: number;
+    toLane: number;
+}
 /** A branch endplate — draw a connector stub + arrow + label off the given
  * side (the CATS/US&S off-band idiom, #170). */
 interface BranchConnector {
@@ -348,6 +381,8 @@ interface ModuleFeatures {
     signals: DrawSignal[];
     /** Grade crossings / diamonds (#170). */
     crossings: DrawCrossing[];
+    /** Crossovers — connector tracks between two mains (drawn as a diagonal). */
+    crossovers: DrawCrossover[];
     /** Branch endplates — junction connectors off the module (#170). */
     branchConnectors: BranchConnector[];
     /** Main 2's extent when it doesn't run the full module — a single↔double
@@ -362,6 +397,17 @@ interface ModuleFeatures {
     laneMin: number;
     laneMax: number;
 }
+/**
+ * Which side of the main a diverging track draws on, given the turnout's HAND
+ * and the direction the track body runs along the main from the turnout
+ * (`stubDir`: +1 = the body extends east / toward B, −1 = west / toward A).
+ * Returns +1 (above the main) or −1 (below); 0 for a wye or unset hand (keep the
+ * authored side). A left-hand turnout throws its route to the same side its body
+ * runs (facing the frog, left is the inside of a body running that way); a
+ * right-hand throws to the opposite side. `kind` is the source of truth for the
+ * drawn side (#bug1) — the stored lane's sign is reconciled to match it.
+ */
+declare function divergeSideForHand(kind: TurnoutKind | undefined, stubDir: number): -1 | 0 | 1;
 /**
  * Resolve a schematic doc into positioned drawables. `pos` (inches) becomes a
  * fraction of the module length; endplate A = 0, B = length; turnouts sit at
@@ -433,4 +479,4 @@ declare function poseOverridesFromDoc(doc: ModuleSchematicDoc): Record<string, {
     heading: number;
 }>;
 
-export { type BranchConnector, type DrawCrossing, type DrawSignal, type DrawTrack, type DrawTurnout, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type GeometryType, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_SCALE_RATIO, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, buildPassingSiding, buildTransition, deriveEndplatePoses, docToState, emptyEditorState, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, moduleFeatures, nextId, poseNeedsManual, poseOverridesFromDoc, scaleFeetToInches, stateToDoc };
+export { type BranchConnector, type DrawCrossing, type DrawCrossover, type DrawSignal, type DrawTrack, type DrawTurnout, type EditorBranch, type EditorControlPoint, type EditorCpSignal, type EditorCrossing, type EditorState, type EditorTrack, type EditorTurnout, type EndplateBConfig, type EndplatePose, type GeometryType, MAIN2_TRACK_ID, MAIN_TRACK_ID, type ModuleFeatures, type ModuleGeometryInput, type ModuleSchematicDoc, type ModuleTrackRow, N_SCALE_RATIO, type SchematicBlock, type SchematicControlPoint, type SchematicCrossing, type SchematicEndplate, type SchematicEndplateTrack, type SchematicSignal, type SchematicTrack, type SchematicTurnout, type SignalFacing, type SignalSide, type TrackConfig, type TrackRole, type TurnoutKind, asModuleSchematic, buildCrossover, buildPassingSiding, buildTransition, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, moduleFeatures, nextId, poseNeedsManual, poseOverridesFromDoc, scaleFeetToInches, stateToDoc };

package/dist/index.js

@@ -61,7 +61,9 @@ function buildTransition(state) {
     pos,
     onTrack: MAIN_TRACK_ID,
     divergeTrack: MAIN2_TRACK_ID,
-    kind: aDouble ? "left" : "right"
+    // Main 2 sits above (lane 1); the throw that runs toward the double end is
+    // left when that end is east (single at A), right when it's west (#bug1).
+    kind: aDouble ? "right" : "left"
   };
   const cpId = nextId("cp", state.controlPoints.map((c) => c.id));
   const sig = (facing) => ({
@@ -347,8 +349,8 @@ function buildPassingSiding(state) {
   const swW = nextId("sw", swIds);
   const swE = nextId("sw", [...swIds, swW]);
   const turnouts = [
-    { id: swW, name: "West Siding", pos: fromPos, onTrack: MAIN_TRACK_ID, divergeTrack: sidId, kind: "right" },
-    { id: swE, name: "East Siding", pos: toPos, onTrack: MAIN_TRACK_ID, divergeTrack: sidId, kind: "left" }
+    { id: swW, name: "West Siding", pos: fromPos, onTrack: MAIN_TRACK_ID, divergeTrack: sidId, kind: "left" },
+    { id: swE, name: "East Siding", pos: toPos, onTrack: MAIN_TRACK_ID, divergeTrack: sidId, kind: "right" }
   ];
   const cpIds = state.controlPoints.map((c) => c.id);
   const cpW = nextId("cp", cpIds);
@@ -367,6 +369,39 @@ function buildPassingSiding(state) {
   ];
   return { track, turnouts, controlPoints };
 }
+function buildCrossover(state) {
+  const hasSecond = state.configA === "double" || state.configB === "double";
+  if (state.loop || !hasSecond) return null;
+  const len = state.lengthInches > 0 ? state.lengthInches : 24;
+  const mid = Math.round(len / 2);
+  const gap = Math.max(3, Math.round(len * 0.04));
+  const w = Math.round(mid - gap / 2);
+  const e = Math.round(mid + gap / 2);
+  const trackIds = [MAIN_TRACK_ID, MAIN2_TRACK_ID, ...state.extraTracks.map((t) => t.id)];
+  const xoId = nextId("xo", trackIds);
+  const track = {
+    id: xoId,
+    role: "crossover",
+    lane: 1,
+    fromPos: w,
+    toPos: e,
+    moduleTrackId: null,
+    trackName: "Crossover"
+  };
+  const swIds = state.turnouts.map((t) => t.id);
+  const sw1 = nextId("sw", swIds);
+  const sw2 = nextId("sw", [...swIds, sw1]);
+  const turnouts = [
+    { id: sw1, name: "Crossover", pos: w, onTrack: MAIN_TRACK_ID, divergeTrack: xoId, kind: "left" },
+    { id: sw2, name: "Crossover", pos: e, onTrack: MAIN2_TRACK_ID, divergeTrack: xoId, kind: "right" }
+  ];
+  return { track, turnouts };
+}
+function divergeSideForHand(kind, stubDir) {
+  if (kind !== "left" && kind !== "right") return 0;
+  const s = stubDir >= 0 ? 1 : -1;
+  return kind === "left" ? s : -s;
+}
 function moduleFeatures(doc) {
   const len = doc.lengthInches && doc.lengthInches > 0 ? doc.lengthInches : Math.max(
     1,
@@ -393,23 +428,70 @@ function moduleFeatures(doc) {
     const sw = (doc.turnouts ?? []).find((t) => t.divergeTrack === trackId);
     return sw ? trackLane.get(sw.onTrack) ?? 0 : 0;
   };
+  const turnoutsByTrack = /* @__PURE__ */ new Map();
+  for (const sw of doc.turnouts ?? []) {
+    const arr = turnoutsByTrack.get(sw.divergeTrack) ?? [];
+    arr.push(sw);
+    turnoutsByTrack.set(sw.divergeTrack, arr);
+  }
+  const isCrossover = (trackId) => {
+    const sws = turnoutsByTrack.get(trackId) ?? [];
+    if (sws.length < 2) return false;
+    return new Set(sws.map((s) => trackLane.get(s.onTrack) ?? 0)).size >= 2;
+  };
+  const extentOf = (t) => {
+    const from = t.fromPos ?? posOf(t.from);
+    const to = t.toPos ?? posOf(t.to);
+    return from == null || to == null ? null : [from, to];
+  };
+  for (const t of doc.tracks) {
+    if (t.role === "main" || isCrossover(t.id)) continue;
+    const sw = turnoutsByTrack.get(t.id)?.[0];
+    if (!sw) continue;
+    const ext = extentOf(t);
+    if (!ext) continue;
+    const [from, to] = ext;
+    const far = Math.abs(to - sw.pos) >= Math.abs(from - sw.pos) ? to : from;
+    const side = divergeSideForHand(sw.kind, far - sw.pos);
+    if (side !== 0) trackLane.set(t.id, side * Math.abs(t.lane));
+  }
   const extraTracks = [];
   for (const t of doc.tracks) {
     if (t.role === "main") continue;
-    const from = t.fromPos ?? posOf(t.from);
-    const to = t.toPos ?? posOf(t.to);
-    if (from == null || to == null) continue;
+    if (isCrossover(t.id)) continue;
+    const ext = extentOf(t);
+    if (!ext) continue;
+    const [from, to] = ext;
+    const sw = turnoutsByTrack.get(t.id)?.[0];
+    const throatAtTo = sw != null && Math.abs(to - sw.pos) < Math.abs(from - sw.pos);
+    const throat = throatAtTo ? to : from;
+    const stub = throatAtTo ? from : to;
     extraTracks.push({
       id: t.id,
       role: t.role,
-      lane: t.lane,
+      lane: trackLane.get(t.id) ?? t.lane,
       fromFrac: clampFrac(Math.min(from, to)),
       toFrac: clampFrac(Math.max(from, to)),
+      throatFrac: clampFrac(throat),
+      stubFrac: clampFrac(stub),
       capacityFeet: t.capacityFeet ?? null,
       divergesFromLane: divergeOrigin(t.id),
       inLoop: t.inLoop === true
     });
   }
+  const crossovers = [];
+  for (const t of doc.tracks) {
+    if (!isCrossover(t.id)) continue;
+    const [s1, s2] = turnoutsByTrack.get(t.id);
+    crossovers.push({
+      id: t.id,
+      name: t.trackName ?? "",
+      fromPosFrac: clampFrac(s1.pos),
+      fromLane: trackLane.get(s1.onTrack) ?? 0,
+      toPosFrac: clampFrac(s2.pos),
+      toLane: trackLane.get(s2.onTrack) ?? 1
+    });
+  }
   const turnouts = (doc.turnouts ?? []).map((t) => ({
     id: t.id,
     name: t.name ?? "",
@@ -424,11 +506,19 @@ function moduleFeatures(doc) {
     lane: s.track ? trackLane.get(s.track) ?? 0 : 0,
     facing: s.facing ?? "AtoB",
     side: s.side === "below" ? "below" : "above",
-    ...cp ? { cp } : {}
+    ...cp ? { cp } : {},
+    stack: 0
   });
   const signals = Array.isArray(doc.controlPoints) ? doc.controlPoints.flatMap(
     (c) => (c.signals ?? []).map((s) => drawSignal(s, c.name ?? "", c.id))
   ) : (doc.signals ?? []).map((s) => drawSignal(s, s.name ?? ""));
+  const stackCount = /* @__PURE__ */ new Map();
+  for (const s of signals) {
+    const key = `${s.lane}|${s.side}|${Math.round(s.posFrac * 1e3)}`;
+    const n = stackCount.get(key) ?? 0;
+    s.stack = n;
+    stackCount.set(key, n + 1);
+  }
   const crossings = (doc.crossings ?? []).map((x) => ({
     id: x.id,
     name: x.name ?? "",
@@ -447,7 +537,8 @@ function moduleFeatures(doc) {
     doubleMain ? 1 : 0,
     ...extraTracks.map((t) => t.lane),
     ...signals.map((s) => s.lane),
-    ...crossings.flatMap((x) => [x.laneA, x.laneB])
+    ...crossings.flatMap((x) => [x.laneA, x.laneB]),
+    ...crossovers.flatMap((x) => [x.fromLane, x.toLane])
   ];
   const loop = isLoopDoc(doc);
   const main2 = doc.tracks.find((t) => t.id === MAIN2_TRACK_ID);
@@ -467,6 +558,7 @@ function moduleFeatures(doc) {
     turnouts,
     signals,
     crossings,
+    crossovers,
     branchConnectors,
     laneMin: Math.min(...allLanes),
     laneMax: Math.max(...allLanes)
@@ -570,6 +662,6 @@ function poseOverridesFromDoc(doc) {
   return out;
 }
 
-export { MAIN2_TRACK_ID, MAIN_TRACK_ID, N_SCALE_RATIO, asModuleSchematic, buildPassingSiding, buildTransition, deriveEndplatePoses, docToState, emptyEditorState, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, moduleFeatures, nextId, poseNeedsManual, poseOverridesFromDoc, scaleFeetToInches, stateToDoc };
+export { MAIN2_TRACK_ID, MAIN_TRACK_ID, N_SCALE_RATIO, asModuleSchematic, buildCrossover, buildPassingSiding, buildTransition, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, geometryTurnDegrees, inchesToScaleFeet, isLoopDoc, moduleFeatures, nextId, poseNeedsManual, poseOverridesFromDoc, scaleFeetToInches, stateToDoc };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map