@willcgage/module-schematic 0.86.0 → 0.90.0

package/dist/index.cjs

@@ -1046,6 +1046,10 @@ function stateToDoc(state, recordNumber) {
         track: ind.track,
         fromPos: ind.fromPos,
         toPos: ind.toPos,
+        // Carried, not interpreted. An anchor is what HOLDS the span (ADR
+        // 0001); dropping it here would quietly convert an anchored
+        // industry back into a typed number the next time anyone saved.
+        ...ind.anchor ? { anchor: ind.anchor } : {},
         ...ind.spots?.length ? { spots: ind.spots } : {},
         side: ind.side,
         ...ind.labelMode && ind.labelMode !== "none" ? { labelMode: ind.labelMode } : {},
@@ -1065,7 +1069,11 @@ function stateToDoc(state, recordNumber) {
     ...state.sections.length ? { sections: moduleSections({ sections: state.sections }) } : {},
     // Authored mainline path (module-local inches); only when it's a real path.
     ...state.mainPath.length >= 2 ? { mainPath: state.mainPath } : {},
-    ...state.main2Path.length >= 2 ? { main2Path: state.main2Path } : {}
+    ...state.main2Path.length >= 2 ? { main2Path: state.main2Path } : {},
+    // The pieces the owner drew, carried verbatim (ADR 0001). This function
+    // stays dumb about them on purpose: deriving here would put the derivation
+    // in every save path in both apps. `deriveGraphDoc` is the one place.
+    ...state.graph?.pieces?.length ? { graph: state.graph } : {}
   };
 }
 function docToState(doc, fallbackLength, moduleTracks = []) {
@@ -1210,6 +1218,10 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     sections: moduleSections(d),
     mainPath,
     main2Path,
+    // ⚠️ NOT scaled by `sc()` like every position above it. A piece is placed in
+    // real inches on the board; stretching the module's length does not move it,
+    // and the length is DERIVED from the pieces anyway when a graph is present.
+    ...d.graph?.pieces?.length ? { graph: d.graph } : {},
     crossings: (d.crossings ?? []).map((x) => ({
       id: x.id,
       name: x.name ?? "",
@@ -1244,12 +1256,14 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
         track: s.track,
         fromPos: sc(s.fromPos ?? 0),
         toPos: s.toPos != null ? sc(s.toPos) : len,
-        ...s.side ? { side: s.side } : {}
+        ...s.side ? { side: s.side } : {},
+        ...s.anchor ? { anchor: s.anchor } : {}
       })),
       side: ind.side ?? "above",
       labelMode: ind.labelMode ?? "none",
       carTypes: Array.isArray(ind.carTypes) ? ind.carTypes : [],
-      moduleIndustryId: ind.moduleIndustryId ?? null
+      moduleIndustryId: ind.moduleIndustryId ?? null,
+      ...ind.anchor ? { anchor: ind.anchor } : {}
     }))
   };
 }
@@ -2234,6 +2248,54 @@ function partGeometry(part, library = BUILT_IN_TRACK_PARTS) {
     divergingEndMeasured: de.measured
   };
 }
+function pieceRoutePaths(piece, library = BUILT_IN_TRACK_PARTS) {
+  const part = library.find((p) => p.id === piece.partId);
+  if (!part) return [];
+  const geo = partGeometry(part, library);
+  if (!geo) return [];
+  const joints = placedJoints([piece], library);
+  const at = (id) => joints.find((j) => j.joint === id);
+  const RAD = Math.PI / 180;
+  const c = Math.cos(piece.rotationDeg * RAD);
+  const s = Math.sin(piece.rotationDeg * RAD);
+  const place = (x, y) => {
+    const ly = piece.flipped ? -y : y;
+    return { x: piece.x + x * c - ly * s, y: piece.y + x * s + ly * c };
+  };
+  const out = [];
+  for (const route of geo.routes) {
+    const a = at(route[0]);
+    const b = at(route[1]);
+    if (!a || !b) continue;
+    const ends = [{ x: a.x, y: a.y }, { x: b.x, y: b.y }];
+    const diverging = route.some((r) => r === "diverge" || r === "legA" || r === "legB");
+    if (!diverging || part.kind === "flex") {
+      out.push({ route, points: ends });
+      continue;
+    }
+    const lead = part.lead?.inches ?? 0;
+    const pts0 = part.pointsOffset?.inches ?? 0;
+    const far = geo.joints.find((j) => j.id === route[1]) ?? geo.joints.find((j) => j.id === route[0]);
+    if (!far || !(lead > 0)) {
+      out.push({ route, points: ends });
+      continue;
+    }
+    const isWye = part.kind === "wye";
+    const closure = turnoutClosure(isWye ? part.frogNumber * 2 : part.frogNumber, {
+      leadInches: lead
+    });
+    const mirror = route.includes("legB") ? -1 : 1;
+    const pts = [place(0, 0), place(pts0, 0)];
+    const steps = 12;
+    for (let i = 1; i <= steps; i++) {
+      const x = pts0 + (far.x - pts0) * i / steps;
+      pts.push(place(x, mirror * closure.offsetAt(x - pts0)));
+    }
+    pts[pts.length - 1] = { x: b.x, y: b.y };
+    out.push({ route, points: route[0] === "throat" ? pts : pts.slice().reverse() });
+  }
+  return out;
+}
 function partsPlaceable(library = BUILT_IN_TRACK_PARTS) {
   const placeable = [];
   const blocked = [];
@@ -2318,6 +2380,36 @@ function buildTrackGraph(pieces, library = BUILT_IN_TRACK_PARTS, snapInches = JO
   }
   return { joints, connections, open, conflicts, unplaceable };
 }
+function snapPiece(moving, others, library = BUILT_IN_TRACK_PARTS, withinInches = 0.5) {
+  const mine = placedJoints([moving], library);
+  if (!mine.length) return null;
+  const graph = buildTrackGraph(others, library);
+  const taken = new Set(graph.connections.flatMap((c2) => [c2.a, c2.b]));
+  const open = graph.joints.filter((j) => !taken.has(j.key));
+  let best = null;
+  for (const m of mine)
+    for (const t of open) {
+      const d = Math.hypot(t.x - m.x, t.y - m.y);
+      if (d <= withinInches && (!best || d < best.d)) best = { m, t, d };
+    }
+  if (!best) return null;
+  const RAD = Math.PI / 180;
+  const dRot = norm360(best.t.headingDeg + 180 - best.m.headingDeg);
+  const c = Math.cos(dRot * RAD);
+  const s = Math.sin(dRot * RAD);
+  const ox = moving.x - best.m.x;
+  const oy = moving.y - best.m.y;
+  return {
+    piece: {
+      ...moving,
+      rotationDeg: norm360(moving.rotationDeg + dRot),
+      x: best.t.x + ox * c - oy * s,
+      y: best.t.y + ox * s + oy * c
+    },
+    from: best.m.key,
+    to: best.t.key
+  };
+}
 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]));
@@ -2348,6 +2440,7 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
       bornAt,
       endsAt: null,
       pieces: [],
+      spans: [],
       lateral: 0
     };
     let cur = startKey;
@@ -2405,7 +2498,15 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
       for (const j of graph.joints)
         if (j.piece === here.piece && Math.abs(j.y) > Math.abs(route.lateral))
           route.lateral = j.y;
+      const entered = pos;
       pos += gap(here, exit);
+      route.spans.push({
+        piece: here.piece,
+        entryJoint: here.joint,
+        exitJoint,
+        fromPos: entered,
+        toPos: pos
+      });
       route.toPos = pos;
       const next = exit ? link.get(exit.key) : void 0;
       if (!next) break;
@@ -2422,6 +2523,12 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
       warnings.push(`the route diverging at ${b.from} is not connected to anything`);
       continue;
     }
+    const already = routes.find((r2) => r2.pieces.includes(byKey.get(start).piece));
+    if (already) {
+      const swFar = turnouts.find((t) => t.id === b.from);
+      if (swFar && !swFar.divergeRoute) swFar.divergeRoute = already.id;
+      continue;
+    }
     n += 1;
     const r = walk(start, b.at + b.skew, `route${n}`, b.from);
     r.fromPos = b.at;
@@ -2436,6 +2543,153 @@ function walkTrackGraph(graph, pieces, startAt, library = BUILT_IN_TRACK_PARTS)
   for (const c of graph.conflicts) warnings.push(c.reason);
   return { routes, turnouts, warnings };
 }
+function resolveGraphAnchor(anchor, walk, pieces, library = BUILT_IN_TRACK_PARTS) {
+  const piece = pieces.find((p) => p.id === anchor.piece);
+  const part = piece ? library.find((x) => x.id === piece.partId) : void 0;
+  const origin = part?.kind === "flex" ? "a" : "throat";
+  for (const r of walk.routes) {
+    const span = r.spans.find((s) => s.piece === anchor.piece);
+    if (!span) continue;
+    if (span.entryJoint === origin)
+      return { pos: span.fromPos + anchor.atInches, routeId: r.id, reversed: false };
+    if (span.exitJoint === origin)
+      return { pos: span.toPos - anchor.atInches, routeId: r.id, reversed: true };
+    return null;
+  }
+  return null;
+}
+function graphToDoc(pieces, input) {
+  const library = input.library ?? BUILT_IN_TRACK_PARTS;
+  const graph = buildTrackGraph(pieces, library);
+  const walk = walkTrackGraph(graph, pieces, input.startAt, library);
+  const warnings = [...walk.warnings];
+  const round = (n) => Math.round(n * 100) / 100;
+  const base = input.base ?? {};
+  const endplates = base.endplates && base.endplates.length ? base.endplates : [{ id: "A", label: "West" }, { id: "B", label: "East" }];
+  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 trackIdOf = /* @__PURE__ */ new Map([["main", MAIN_TRACK_ID]]);
+  for (const r of branches) trackIdOf.set(r.id, r.pieces[0]);
+  const laneOf = (r) => {
+    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 tracks = [
+    {
+      id: MAIN_TRACK_ID,
+      role: "main",
+      lane: 0,
+      from: epA?.id ?? "A",
+      ...epB ? { to: epB.id } : {}
+    }
+  ];
+  for (const r of branches) {
+    const id = trackIdOf.get(r.id);
+    const meta = input.meta?.[id] ?? {};
+    tracks.push({
+      id,
+      // 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),
+      fromPos: round(Math.min(r.fromPos, r.toPos)),
+      toPos: round(Math.max(r.fromPos, r.toPos)),
+      ...meta.trackName ? { trackName: meta.trackName } : {},
+      ...meta.capacityFeet != null ? { capacityFeet: meta.capacityFeet } : {},
+      ...meta.moduleTrackId != null ? { moduleTrackId: meta.moduleTrackId } : {}
+    });
+  }
+  const pieceById = new Map(pieces.map((p) => [p.id, p]));
+  const turnouts = [];
+  for (const t of walk.turnouts) {
+    const diverge = t.divergeRoute ? trackIdOf.get(t.divergeRoute) : void 0;
+    if (!diverge) {
+      warnings.push(
+        `${t.id} is placed but its diverging route goes nowhere, so it is not in the operations view`
+      );
+      continue;
+    }
+    const piece = pieceById.get(t.id);
+    const part = piece ? library.find((p) => p.id === piece.partId) : void 0;
+    turnouts.push({
+      id: t.id,
+      pos: round(t.pos),
+      onTrack: trackIdOf.get(t.onRoute) ?? MAIN_TRACK_ID,
+      divergeTrack: diverge,
+      ...piece?.name ? { name: piece.name } : {},
+      ...part?.frogNumber != null ? { size: part.frogNumber } : {},
+      ...part ? { partId: part.id } : {}
+    });
+  }
+  turnouts.sort((a, b) => a.pos - b.pos);
+  const place = (a, what) => {
+    if (!a) return null;
+    const hit = resolveGraphAnchor(a, walk, pieces, library);
+    if (!hit) {
+      warnings.push(
+        `${what} is anchored to ${a.piece}, which is not on any route \u2014 its authored position stands`
+      );
+      return null;
+    }
+    return hit;
+  };
+  const spanAt = (hit, from, to) => {
+    const len = Math.abs(to - from);
+    return hit.reversed ? [round(hit.pos - len), round(hit.pos)] : [round(hit.pos), round(hit.pos + len)];
+  };
+  const industries = base.industries?.map((ind) => {
+    const hit = place(ind.anchor, `industry "${ind.name}"`);
+    const spots = ind.spots?.map((s) => {
+      const sh = place(s.anchor, `a spot of industry "${ind.name}"`);
+      if (!sh) return s;
+      const [from, to] = spanAt(sh, s.fromPos, s.toPos);
+      return { ...s, track: trackIdOf.get(sh.routeId) ?? s.track, fromPos: from, toPos: to };
+    });
+    if (!hit) return spots ? { ...ind, spots } : ind;
+    const [fromPos, toPos] = spanAt(hit, ind.fromPos, ind.toPos);
+    return {
+      ...ind,
+      track: trackIdOf.get(hit.routeId) ?? ind.track,
+      fromPos,
+      toPos,
+      ...spots ? { spots } : {}
+    };
+  });
+  const signals = base.signals?.map((sig) => {
+    const hit = place(sig.anchor, `signal "${sig.name ?? sig.id}"`);
+    return hit ? { ...sig, pos: round(hit.pos), track: trackIdOf.get(hit.routeId) ?? sig.track } : sig;
+  });
+  const doc = {
+    version: 1,
+    ...base,
+    lengthInches,
+    endplates,
+    tracks,
+    turnouts,
+    ...industries ? { industries } : {},
+    ...signals ? { signals } : {}
+  };
+  return { doc, graph, walk, warnings };
+}
+function deriveGraphDoc(doc, library = BUILT_IN_TRACK_PARTS) {
+  const g = doc.graph;
+  if (!g || !g.pieces?.length || !g.startAt) return { doc, warnings: [] };
+  const meta = {};
+  for (const t of doc.tracks ?? []) {
+    if (t.role === "main") continue;
+    meta[t.id] = {
+      ...t.trackName ? { trackName: t.trackName } : {},
+      ...t.capacityFeet != null ? { capacityFeet: t.capacityFeet } : {},
+      ...t.moduleTrackId != null ? { moduleTrackId: t.moduleTrackId } : {}
+    };
+  }
+  const out = graphToDoc(g.pieces, { startAt: g.startAt, base: doc, meta, library });
+  return { doc: out.doc, warnings: out.warnings };
+}
 function frogCasting(cl, opts = {}) {
   const g = opts.gaugeInches ?? RAIL_GAUGE_INCHES;
   const w = opts.reachInches ?? g * 1.5;
@@ -3107,6 +3361,7 @@ exports.checkEndplateWidth = checkEndplateWidth;
 exports.clearancePointPastFrogInches = clearancePointPastFrogInches;
 exports.crossoverPinches = crossoverPinches;
 exports.deriveEndplatePoses = deriveEndplatePoses;
+exports.deriveGraphDoc = deriveGraphDoc;
 exports.divergeSideForHand = divergeSideForHand;
 exports.docToState = docToState;
 exports.emptyEditorState = emptyEditorState;
@@ -3124,6 +3379,7 @@ exports.frogCasting = frogCasting;
 exports.frogNumberFromName = frogNumberFromName;
 exports.fromSectionRelative = fromSectionRelative;
 exports.geometryTurnDegrees = geometryTurnDegrees;
+exports.graphToDoc = graphToDoc;
 exports.hasNoFarEndplate = hasNoFarEndplate;
 exports.importedPartToTrackPart = importedPartToTrackPart;
 exports.inchesToScaleFeet = inchesToScaleFeet;
@@ -3149,11 +3405,13 @@ exports.partOutlineAtFrog = partOutlineAtFrog;
 exports.partsPlaceable = partsPlaceable;
 exports.pastFrogInchesForSize = pastFrogInchesForSize;
 exports.pathLengthInches = pathLengthInches;
+exports.pieceRoutePaths = pieceRoutePaths;
 exports.placedJoints = placedJoints;
 exports.poseNeedsManual = poseNeedsManual;
 exports.poseOverridesFromDoc = poseOverridesFromDoc;
 exports.remapPos = remapPos;
 exports.resizeFlexPiece = resizeFlexPiece;
+exports.resolveGraphAnchor = resolveGraphAnchor;
 exports.returnLoop = returnLoop;
 exports.sampleBenchworkOutline = sampleBenchworkOutline;
 exports.samplePartSegments = samplePartSegments;
@@ -3170,6 +3428,7 @@ exports.sectionSpansOrWhole = sectionSpansOrWhole;
 exports.sectionedCenterline = sectionedCenterline;
 exports.sectionedEndPose = sectionedEndPose;
 exports.sliceCenterline = sliceCenterline;
+exports.snapPiece = snapPiece;
 exports.spanOverhang = spanOverhang;
 exports.stateToDoc = stateToDoc;
 exports.storedPartToTrackPart = storedPartToTrackPart;