@willcgage/module-schematic 0.65.0 → 0.67.0

package/dist/index.d.cts

@@ -789,9 +789,11 @@ interface EditorBranch {
      * draws track to it; the plate is placed first, connected later). */
     trackId?: string | null;
 }
-/** Endplate B on a loop module: a standard endplate makes the balloon an
- * INTERCHANGE (a second route connects at the loop, e.g. Seaford); "none"
- * makes it a pure turnback. Non-loop modules always have a real B. */
+/** Endplate B's configuration — or `"none"`, meaning **the module has no far
+ * endplate**: an end of the line, a pocket, or a loop's pure turnback. On a
+ * loop, a standard endplate B instead makes the balloon an INTERCHANGE (a second
+ * route connects there, e.g. Seaford). A module presents one conforming face,
+ * or two, or more; the standard governs the faces it offers, not how many (#184). */
 type EndplateBConfig = TrackConfig | "none";
 interface EditorState {
     lengthInches: number;
@@ -972,24 +974,32 @@ interface DrawCrossover {
     toLane: number;
 }
 /**
- * A route leaving the module at a third endplate (#170) — Main 3, whatever the
- * owner labels it (#181). Drawn as an ELBOW: it diverges from its host main at
- * `posFrac`, drops to its own `lane`, then runs to `endFrac` and ends at an
- * endplate face.
+ * A route leaving the module at a third endplate — and an endplate is an
+ * endplate, whatever letter it carries (#183).
  *
- * The run is the branch's OWN arc length laid along the strip, not its
- * projection onto the module axis — a square 90° exit projects to zero, which
- * is exactly the case that made branches invisible here. Straightening the
- * route out at its true length is the same idiom this whole view applies to the
- * main; `posFrac → endFrac` is therefore a real axis, and `lengthInches` maps
- * onto it, so anything positioned along the branch has somewhere to draw.
+ * There is no split in the standard between "the two ends" and "the others": an
+ * endplate is the standardised face where a module joins another module, and a
+ * module may present two, three, or one. So a route to C is drawn the way a
+ * route to A or B is drawn — **it runs to the edge of the module and terminates
+ * in an endplate face carrying its letter**, rather than stopping partway along
+ * the strip as a stub.
+ *
+ * ⚠️ Because it runs the full width it would otherwise read as just another
+ * parallel main, which is exactly the confusion a dispatcher must not have. Its
+ * lane is therefore placed with a clear GAP beyond every other lane (see
+ * `laneGapFromOthers`), and it ends at a plate rather than running off the edge.
+ * The two requirements — full width, and not-a-parallel-main — are in tension by
+ * design, and the separation is what resolves it.
+ *
+ * The LETTER is the module's own fact and is fine to draw. The DESTINATION
+ * ("to Fillmore") depends on which module is physically attached at that
+ * junction, so it stays Free-Dispatcher's to derive at runtime.
  */
 interface BranchConnector {
     /** Endplate id — "C", "D", … */
     id: string;
-    /** The endplate's label. MR draws no text (the destination depends on what's
-     * physically attached, so FD derives the panel label at runtime) — this is
-     * the owner's local name, for tooltips and FD's fallback. */
+    /** The owner's local name for the plate. NOT the destination — that depends
+     * on what's physically attached, so FD derives it at runtime. */
     label: string;
     /** The route's own name, from the track. */
     name: string;
@@ -1005,12 +1015,15 @@ interface BranchConnector {
     fromLane: number;
     /** Which side of the module it exits. */
     side: "up" | "down";
-    /** The branch's own lane, signed by `side` and placed clear of every other
-     * lane (so it never collides) — already folded into laneMin/laneMax. */
+    /** The branch's own lane, signed by `side`, placed a clear GAP beyond every
+     * other lane so it can't be mistaken for a parallel main — already folded
+     * into laneMin/laneMax. */
     lane: number;
-    /** Where the run ends, and the endplate face is drawn. */
+    /** Where the run ends and the endplate face is drawn: the module EDGE, 0 or
+     * 1, because this is an end of the module like any other (#183). */
     endFrac: number;
-    /** The route's own arc length, inches. */
+    /** The route's own arc length on this module, inches — for the tooltip. The
+     * drawn run is the strip's width, not this. */
     lengthInches: number;
 }
 /** An industry — draw a car-spot span beside its track's lane, on `side`, with
@@ -1656,8 +1669,10 @@ interface ModuleGeometryInput {
     geometryType?: string | null;
     geometryDegrees?: number | null;
     geometryOffsetInches?: number | null;
-    /** Axial endplate configs (A first, then B). Missing → single. */
-    endplateConfigs?: ("single" | "double" | null | undefined)[];
+    /** Axial endplate configs (A first, then B). Missing → single. `"none"` at B
+     * means the module has no far endplate at all — an end of the line, a pocket,
+     * or a turnback (#184). */
+    endplateConfigs?: ("single" | "double" | "none" | null | undefined)[];
     /** Branch endplates (from the schematic doc, #170), positioned along the
      * mainline axis. */
     branches?: {

package/dist/index.d.ts

@@ -789,9 +789,11 @@ interface EditorBranch {
      * draws track to it; the plate is placed first, connected later). */
     trackId?: string | null;
 }
-/** Endplate B on a loop module: a standard endplate makes the balloon an
- * INTERCHANGE (a second route connects at the loop, e.g. Seaford); "none"
- * makes it a pure turnback. Non-loop modules always have a real B. */
+/** Endplate B's configuration — or `"none"`, meaning **the module has no far
+ * endplate**: an end of the line, a pocket, or a loop's pure turnback. On a
+ * loop, a standard endplate B instead makes the balloon an INTERCHANGE (a second
+ * route connects there, e.g. Seaford). A module presents one conforming face,
+ * or two, or more; the standard governs the faces it offers, not how many (#184). */
 type EndplateBConfig = TrackConfig | "none";
 interface EditorState {
     lengthInches: number;
@@ -972,24 +974,32 @@ interface DrawCrossover {
     toLane: number;
 }
 /**
- * A route leaving the module at a third endplate (#170) — Main 3, whatever the
- * owner labels it (#181). Drawn as an ELBOW: it diverges from its host main at
- * `posFrac`, drops to its own `lane`, then runs to `endFrac` and ends at an
- * endplate face.
+ * A route leaving the module at a third endplate — and an endplate is an
+ * endplate, whatever letter it carries (#183).
  *
- * The run is the branch's OWN arc length laid along the strip, not its
- * projection onto the module axis — a square 90° exit projects to zero, which
- * is exactly the case that made branches invisible here. Straightening the
- * route out at its true length is the same idiom this whole view applies to the
- * main; `posFrac → endFrac` is therefore a real axis, and `lengthInches` maps
- * onto it, so anything positioned along the branch has somewhere to draw.
+ * There is no split in the standard between "the two ends" and "the others": an
+ * endplate is the standardised face where a module joins another module, and a
+ * module may present two, three, or one. So a route to C is drawn the way a
+ * route to A or B is drawn — **it runs to the edge of the module and terminates
+ * in an endplate face carrying its letter**, rather than stopping partway along
+ * the strip as a stub.
+ *
+ * ⚠️ Because it runs the full width it would otherwise read as just another
+ * parallel main, which is exactly the confusion a dispatcher must not have. Its
+ * lane is therefore placed with a clear GAP beyond every other lane (see
+ * `laneGapFromOthers`), and it ends at a plate rather than running off the edge.
+ * The two requirements — full width, and not-a-parallel-main — are in tension by
+ * design, and the separation is what resolves it.
+ *
+ * The LETTER is the module's own fact and is fine to draw. The DESTINATION
+ * ("to Fillmore") depends on which module is physically attached at that
+ * junction, so it stays Free-Dispatcher's to derive at runtime.
  */
 interface BranchConnector {
     /** Endplate id — "C", "D", … */
     id: string;
-    /** The endplate's label. MR draws no text (the destination depends on what's
-     * physically attached, so FD derives the panel label at runtime) — this is
-     * the owner's local name, for tooltips and FD's fallback. */
+    /** The owner's local name for the plate. NOT the destination — that depends
+     * on what's physically attached, so FD derives it at runtime. */
     label: string;
     /** The route's own name, from the track. */
     name: string;
@@ -1005,12 +1015,15 @@ interface BranchConnector {
     fromLane: number;
     /** Which side of the module it exits. */
     side: "up" | "down";
-    /** The branch's own lane, signed by `side` and placed clear of every other
-     * lane (so it never collides) — already folded into laneMin/laneMax. */
+    /** The branch's own lane, signed by `side`, placed a clear GAP beyond every
+     * other lane so it can't be mistaken for a parallel main — already folded
+     * into laneMin/laneMax. */
     lane: number;
-    /** Where the run ends, and the endplate face is drawn. */
+    /** Where the run ends and the endplate face is drawn: the module EDGE, 0 or
+     * 1, because this is an end of the module like any other (#183). */
     endFrac: number;
-    /** The route's own arc length, inches. */
+    /** The route's own arc length on this module, inches — for the tooltip. The
+     * drawn run is the strip's width, not this. */
     lengthInches: number;
 }
 /** An industry — draw a car-spot span beside its track's lane, on `side`, with
@@ -1656,8 +1669,10 @@ interface ModuleGeometryInput {
     geometryType?: string | null;
     geometryDegrees?: number | null;
     geometryOffsetInches?: number | null;
-    /** Axial endplate configs (A first, then B). Missing → single. */
-    endplateConfigs?: ("single" | "double" | null | undefined)[];
+    /** Axial endplate configs (A first, then B). Missing → single. `"none"` at B
+     * means the module has no far endplate at all — an end of the line, a pocket,
+     * or a turnback (#184). */
+    endplateConfigs?: ("single" | "double" | "none" | null | undefined)[];
     /** Branch endplates (from the schematic doc, #170), positioned along the
      * mainline axis. */
     branches?: {

package/dist/index.js

@@ -701,18 +701,20 @@ function stateToDoc(state, recordNumber) {
             ]
           ) : [
             { id: "A", label: "West", tracks: [{ trackId: MAIN_TRACK_ID, lane: 0, config: state.configA }] },
-            // Non-loop modules always have a real B ("none" never applies).
-            {
-              id: "B",
-              label: "East",
-              tracks: [
-                {
-                  trackId: MAIN_TRACK_ID,
-                  lane: 0,
-                  config: state.configB === "none" ? "single" : state.configB
-                }
-              ]
-            }
+            // ⚠️ `configB: "none"` means the module HAS NO FAR ENDPLATE, and
+            // that is not loop-only (#184). An *end of the line* or a *pocket*
+            // presents one conforming face and the track simply stops. The
+            // standard governs the ends a module offers for joining; it never
+            // required a module to offer two. This used to coerce "none" to
+            // "single" and emit a B regardless, so a single-ended module was
+            // impossible to author.
+            ...state.configB !== "none" ? [
+              {
+                id: "B",
+                label: "East",
+                tracks: [{ trackId: MAIN_TRACK_ID, lane: 0, config: state.configB }]
+              }
+            ] : []
           ],
           // Branch endplates C, D, … — junction connections at pos, off one side
           // (#170). A set can carry several (e.g. a second railroad through).
@@ -1777,8 +1779,9 @@ function moduleFeatures(doc) {
     ...crossings.flatMap((x) => [x.laneA, x.laneB]),
     ...crossovers.flatMap((x) => [x.fromLane, x.toLane])
   ];
-  let upLane = Math.max(...baseLanes, 0);
-  let downLane = Math.min(...baseLanes, 0);
+  const LANE_GAP_FROM_OTHERS = 2;
+  let upLane = Math.max(...baseLanes, 0) + (LANE_GAP_FROM_OTHERS - 1);
+  let downLane = Math.min(...baseLanes, 0) - (LANE_GAP_FROM_OTHERS - 1);
   const branchConnectors = doc.endplates.filter(
     (e) => e.id !== "A" && e.id !== "B" && e.at && !!e.trackId && (doc.tracks ?? []).some((t) => t.id === e.trackId)
   ).map((e) => {
@@ -1789,10 +1792,6 @@ function moduleFeatures(doc) {
     const lane = side === "down" ? --downLane : ++upLane;
     const runInches = pathLengthInches(trk.path) || Math.abs(e.at.pos - startPos) || FREEMO_ENDPLATE_WIDTH_MIN_INCHES;
     const toB = e.at.pos >= startPos;
-    const fits = (p) => p >= 0 && p <= len;
-    const ahead = startPos + runInches;
-    const behind = startPos - runInches;
-    const endPos = toB && fits(ahead) ? ahead : !toB && fits(behind) ? behind : fits(toB ? behind : ahead) ? toB ? behind : ahead : ahead;
     return {
       id: e.id,
       label: e.label ?? e.id,
@@ -1803,7 +1802,7 @@ function moduleFeatures(doc) {
       fromLane: sw ? trackLane.get(sw.onTrack) ?? 0 : 0,
       side,
       lane,
-      endFrac: clampFrac(endPos),
+      endFrac: toB ? 1 : 0,
       lengthInches: runInches
     };
   });
@@ -1985,7 +1984,7 @@ function deriveEndplatePoses(geo) {
       trackOffsets: offsetsFor(cfg(0), half)
     })
   );
-  const noB = geo.geometryType === "dead_end" || geo.loop === true;
+  const noB = geo.geometryType === "dead_end" || geo.loop === true || geo.endplateConfigs?.[1] === "none";
   const end = sectionedEndPose({ sections: geo.sections });
   if (!noB && end) {
     poses.push(