@willcgage/module-schematic 0.92.1 → 0.94.0

package/dist/index.cjs

@@ -2442,7 +2442,35 @@ function snapPiece(moving, others, library = BUILT_IN_TRACK_PARTS, withinInches
     to: best.t.key
   };
 }
+function fitFlexBetween(piece, others, library = BUILT_IN_TRACK_PARTS, withinInches = 0.5) {
+  const part = library.find((p) => p.id === piece.partId);
+  if (part?.kind !== "flex" || piece.radiusInches) return null;
+  const mine = placedJoints([piece], library);
+  const far = mine.find((j) => j.joint === "b");
+  const near = mine.find((j) => j.joint === "a");
+  if (!far || !near) return null;
+  const graph = buildTrackGraph(others, library);
+  const taken = new Set(graph.connections.flatMap((c) => [c.a, c.b]));
+  let best = null;
+  for (const j of graph.joints) {
+    if (taken.has(j.key)) continue;
+    if (Math.hypot(j.x - near.x, j.y - near.y) <= JOINT_SNAP_INCHES) continue;
+    const d = Math.hypot(j.x - far.x, j.y - far.y);
+    if (d <= withinInches && (!best || d < best.d)) best = { j, d };
+  }
+  if (!best) return null;
+  const dx = best.j.x - piece.x;
+  const dy = best.j.y - piece.y;
+  const len = Math.hypot(dx, dy);
+  if (!(len > 0)) return null;
+  return {
+    ...piece,
+    rotationDeg: norm360(Math.atan2(dy, dx) * 180 / Math.PI),
+    lengthInches: Math.round(len * 1e3) / 1e3
+  };
+}
 var danglingDivergeWarning = (id) => `the route diverging at ${id} is not connected to anything`;
+var unreachedWarning = (id) => `${id} is not reachable from the endplate \u2014 nothing connects it`;
 function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS) {
   const byKey = new Map(graph.joints.map((j) => [j.key, j]));
   const pieceById = new Map(pieces.map((p) => [p.id, p]));
@@ -2580,11 +2608,14 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
     if (sw && !sw.divergeRoute) sw.divergeRoute = r.id;
   }
   const reached = new Set(routes.flatMap((r) => r.pieces));
+  const unreached = [];
   for (const p of pieces)
-    if (!reached.has(p.id) && !graph.unplaceable.some((u) => u.piece === p.id))
-      warnings.push(`${p.id} is not reachable from the endplate \u2014 nothing connects it`);
+    if (!reached.has(p.id) && !graph.unplaceable.some((u) => u.piece === p.id)) {
+      warnings.push(unreachedWarning(p.id));
+      unreached.push(p.id);
+    }
   for (const c of graph.conflicts) warnings.push(c.reason);
-  return { routes, turnouts, warnings, danglingDiverges };
+  return { routes, turnouts, warnings, danglingDiverges, unreached };
 }
 function resolveGraphAnchor(anchor, walk, pieces, library = BUILT_IN_TRACK_PARTS) {
   const piece = pieces.find((p) => p.id === anchor.piece);
@@ -2613,14 +2644,36 @@ function graphToDoc(pieces, input) {
   const epA = endplates[0];
   const epB = endplates[1];
   const main = walk.routes.find((r) => r.id === "main");
-  const lengthInches = round(main.toPos);
-  const branches = walk.routes.filter((r) => r.id !== "main" && r.pieces.length);
+  const walk2 = input.start2 ? walkTrackGraph(graph, pieces, input.start2, library) : null;
+  const main2 = walk2?.routes.find((r) => r.id === "main") ?? null;
+  const claimed = new Set(walk.routes.flatMap((r) => r.pieces));
+  if (main2 && main2.pieces.some((p) => claimed.has(p))) {
+    warnings.push(
+      "Main 2 starts on track that Main 1 already runs along \u2014 they are one run, not two"
+    );
+  }
+  const twoMains = !!main2 && !main2.pieces.some((p) => claimed.has(p));
+  const main2Lane = twoMains ? (graph.joints.find((j) => j.key === `${input.start2.piece}.${input.start2.joint}`)?.y ?? 1) >= 0 ? 1 : -1 : 0;
+  const lengthInches = round(Math.max(main.toPos, twoMains ? main2.toPos : 0));
+  const branches = [
+    ...walk.routes.filter((r) => r.id !== "main" && r.pieces.length),
+    ...twoMains ? walk2.routes.filter((r) => r.id !== "main" && r.pieces.length).map((r) => ({ ...r, id: `main2:${r.id}`, bornAt: r.bornAt })) : []
+  ];
   const trackIdOf = /* @__PURE__ */ new Map([["main", MAIN_TRACK_ID]]);
+  if (twoMains) trackIdOf.set("main2:main", MAIN2_TRACK_ID);
   for (const r of branches) trackIdOf.set(r.id, r.pieces[0]);
-  const laneOf = (r) => {
+  const emitted = /* @__PURE__ */ new Set();
+  const uniqueBranches = branches.filter((r) => {
+    const id = trackIdOf.get(r.id);
+    if (emitted.has(id)) return false;
+    emitted.add(id);
+    return true;
+  });
+  const laneOf = (r, among) => {
     const side = Math.sign(r.lateral) || 1;
-    const sameSide = branches.filter((x) => (Math.sign(x.lateral) || 1) === side).sort((a, b) => Math.abs(a.lateral) - Math.abs(b.lateral));
-    return side * (sameSide.indexOf(r) + 1);
+    const sameSide = among.filter((x) => (Math.sign(x.lateral) || 1) === side).sort((a, b) => Math.abs(a.lateral) - Math.abs(b.lateral));
+    const taken = side === main2Lane ? 1 : 0;
+    return side * (sameSide.indexOf(r) + 1 + taken);
   };
   const tracks = [
     {
@@ -2629,9 +2682,22 @@ function graphToDoc(pieces, input) {
       lane: 0,
       from: epA?.id ?? "A",
       ...epB ? { to: epB.id } : {}
-    }
+    },
+    ...twoMains ? [
+      {
+        id: MAIN2_TRACK_ID,
+        role: "main",
+        lane: main2Lane,
+        from: epA?.id ?? "A",
+        ...epB ? { to: epB.id } : {},
+        // ⚠️ Its own extent, because a second main need not run the whole
+        // module: on a transition module it starts or stops partway.
+        fromPos: round(Math.min(main2.fromPos, main2.toPos)),
+        toPos: round(Math.max(main2.fromPos, main2.toPos))
+      }
+    ] : []
   ];
-  for (const r of branches) {
+  for (const r of uniqueBranches) {
     const id = trackIdOf.get(r.id);
     const meta = input.meta?.[id] ?? {};
     tracks.push({
@@ -2639,7 +2705,7 @@ function graphToDoc(pieces, input) {
       // It runs back into a second turnout, or it doesn't. That is the whole
       // difference between a siding and a spur, and it is read, not declared.
       role: r.endsAt ? "siding" : "spur",
-      lane: laneOf(r),
+      lane: laneOf(r, uniqueBranches),
       fromPos: round(Math.min(r.fromPos, r.toPos)),
       toPos: round(Math.max(r.fromPos, r.toPos)),
       ...meta.trackName ? { trackName: meta.trackName } : {},
@@ -2647,9 +2713,29 @@ function graphToDoc(pieces, input) {
       ...meta.moduleTrackId != null ? { moduleTrackId: meta.moduleTrackId } : {}
     });
   }
+  if (walk2) {
+    const seen = /* @__PURE__ */ new Set([
+      ...walk.routes.flatMap((r) => r.pieces),
+      ...walk2.routes.flatMap((r) => r.pieces)
+    ]);
+    const covered = new Set([...walk.unreached, ...walk2.unreached].filter((id) => seen.has(id)));
+    const drop = new Set([...covered].map(unreachedWarning));
+    const d2 = new Set(walk2.danglingDiverges.map(danglingDivergeWarning));
+    for (let i = warnings.length - 1; i >= 0; i--) if (drop.has(warnings[i])) warnings.splice(i, 1);
+    for (const w of walk2.warnings)
+      if (!d2.has(w) && !drop.has(w) && !warnings.includes(w)) warnings.push(w);
+  }
   const pieceById = new Map(pieces.map((p) => [p.id, p]));
   const turnouts = [];
-  for (const t of walk.turnouts) {
+  const allTurnouts = [
+    ...walk.turnouts,
+    ...twoMains ? walk2.turnouts.map((t) => ({
+      ...t,
+      onRoute: t.onRoute === "main" ? "main2:main" : `main2:${t.onRoute}`,
+      divergeRoute: t.divergeRoute ? `main2:${t.divergeRoute}` : null
+    })) : []
+  ];
+  for (const t of allTurnouts) {
     const diverge = t.divergeRoute ? trackIdOf.get(t.divergeRoute) : void 0;
     if (!diverge) {
       warnings.push(
@@ -2670,6 +2756,12 @@ function graphToDoc(pieces, input) {
     });
   }
   turnouts.sort((a, b) => a.pos - b.pos);
+  for (const t of tracks) {
+    if (t.role === "main") continue;
+    const ends = turnouts.filter((sw) => sw.divergeTrack === t.id);
+    if (ends.length >= 2 && new Set(ends.map((sw) => sw.onTrack)).size >= 2)
+      t.role = "crossover";
+  }
   const place = (a, what) => {
     if (!a) return null;
     const hit = resolveGraphAnchor(a, walk, pieces, library);
@@ -2731,7 +2823,13 @@ function deriveGraphDoc(doc, library = BUILT_IN_TRACK_PARTS) {
       ...t.moduleTrackId != null ? { moduleTrackId: t.moduleTrackId } : {}
     };
   }
-  const out = graphToDoc(g.pieces, { startAt: g.startAt, base: doc, meta, library });
+  const out = graphToDoc(g.pieces, {
+    startAt: g.startAt,
+    start2: g.start2 ?? null,
+    base: doc,
+    meta,
+    library
+  });
   return { doc: out.doc, warnings: out.warnings };
 }
 function frogCasting(cl, opts = {}) {
@@ -3417,6 +3515,7 @@ exports.endplateFaceSegments = endplateFaceSegments;
 exports.endplateLead = endplateLead;
 exports.endplateTrackOffsetInches = endplateTrackOffsetInches;
 exports.endplateWidthInches = endplateWidthInches;
+exports.fitFlexBetween = fitFlexBetween;
 exports.flexPartFor = flexPartFor;
 exports.flexParts = flexParts;
 exports.flexPieces = flexPieces;