@willcgage/module-schematic 0.70.0 → 0.72.0

package/dist/index.js

@@ -469,8 +469,12 @@ function moduleFootprint(input) {
   const widthA = endplateWidthFor(input.endplateWidths, "A");
   const widthB = endplateWidthFor(input.endplateWidths, "B");
   const authored = benchworkOutline(input);
-  const offA = input.endplateTrackOffsets?.["A"] ?? 0;
-  const offB = input.endplateTrackOffsets?.["B"] ?? 0;
+  const offOf = (i, id) => input.endplateTrackOffsets?.[id] ?? endplateCentreOffsetInches({
+    config: input.endplateConfigs?.[i],
+    main2Below: input.mainsSwapped === true
+  });
+  const offA = offOf(0, "A");
+  const offB = offOf(1, "B");
   const secs = input.sections ?? [];
   const sectionsOwnShape = secs.length > 1 || secs.some((s) => (s.outline?.length ?? 0) >= 3);
   const sectionOutlines = sectionsOwnShape ? sectionFootprints(input, {
@@ -494,13 +498,19 @@ function moduleFootprint(input) {
     sectionOutlines
   };
 }
-function endplateTrackOffsetFor(config, authoredTrackOffset) {
-  const v = -endplateTrackOffsetInches(authoredTrackOffset, config);
+function endplateCentreOffsetInches(input) {
+  const v = -endplateTrackOffsetInches(
+    input.authoredTrackOffsetInches,
+    input.config ?? void 0,
+    input.main2Below
+  );
   return v === 0 ? 0 : v;
 }
-function endplateTrackOffsetInches(authored, config) {
+function endplateTrackOffsetInches(authored, config, main2Below = false) {
   if (typeof authored === "number" && Number.isFinite(authored)) return authored;
-  return config === "double" ? -FREEMO_TRACK_SPACING_INCHES / 2 : 0;
+  if (config !== "double") return 0;
+  const half = FREEMO_TRACK_SPACING_INCHES / 2;
+  return main2Below ? half : -half;
 }
 function checkEndplateWidth(input) {
   const width = endplateWidthInches(input);
@@ -512,8 +522,13 @@ function checkEndplateWidth(input) {
       requiredInches: FREEMO_ENDPLATE_WIDTH_MIN_INCHES
     });
   }
-  const off = endplateTrackOffsetInches(input.trackOffsetInches, input.config ?? void 0);
-  const centres = input.config === "double" ? [off, off + FREEMO_TRACK_SPACING_INCHES] : [off];
+  const off = endplateTrackOffsetInches(
+    input.trackOffsetInches,
+    input.config ?? void 0,
+    input.main2Below
+  );
+  const second = off + (input.main2Below ? -1 : 1) * FREEMO_TRACK_SPACING_INCHES;
+  const centres = input.config === "double" ? [off, second] : [off];
   const worst = Math.max(...centres.map((c) => Math.abs(c)));
   const clearance = width / 2 - worst;
   if (clearance < FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES) {
@@ -524,6 +539,18 @@ function checkEndplateWidth(input) {
       requiredInches: required
     });
   }
+  if (input.config === "double") {
+    const mid = (off + second) / 2;
+    if (Math.abs(mid) > 0.01) {
+      issues.push({
+        code: "offcentre",
+        message: `The two tracks sit ${round2(Math.abs(mid))}\u2033 off the centre of this endplate. The standard recommends they straddle it \u2014 Main 1 at ${round2((input.main2Below ? 1 : -1) * (FREEMO_TRACK_SPACING_INCHES / 2))}\u2033. Clear the offset to use that.`,
+        // Not a width problem — no wider plate fixes it — so hand back the
+        // width unchanged rather than imply one would.
+        requiredInches: width
+      });
+    }
+  }
   return issues;
 }
 var round2 = (n) => Math.round(n * 100) / 100;
@@ -583,6 +610,7 @@ function emptyEditorState(lengthInches) {
     crossings: [],
     branches: [],
     poseOverrides: {},
+    flexByTrack: {},
     endplateWidths: {},
     endplateTrackOffsets: {},
     outline: [],
@@ -684,6 +712,18 @@ function withWidths(endplates, widths, offsets = {}) {
     return out;
   });
 }
+function withFlex(state, tracks) {
+  return tracks.map((t) => {
+    const f = state.flexByTrack?.[t.id];
+    if (!f) return t;
+    const cuts = f.cuts?.filter((c) => Number.isFinite(c)).sort((a, b) => a - b);
+    return {
+      ...t,
+      ...f.partId ? { flexPartId: f.partId } : {},
+      ...cuts ? { flexCuts: cuts } : {}
+    };
+  });
+}
 function stateToDoc(state, recordNumber) {
   return {
     version: 1,
@@ -737,7 +777,10 @@ function stateToDoc(state, recordNumber) {
       state.endplateWidths,
       state.endplateTrackOffsets
     ),
-    tracks: [
+    // Flex settings are attached to every track at once, at the end — the array
+    // below has half a dozen branches and adding two fields to each of them is
+    // how they'd end up disagreeing (#193).
+    tracks: withFlex(state, [
       state.loop ? (
         // The main runs the lead from A and turns back at the balloon.
         { id: MAIN_TRACK_ID, role: "main", lane: 0, fromPos: 0, toPos: state.lengthInches }
@@ -772,7 +815,7 @@ function stateToDoc(state, recordNumber) {
         ...state.loop && t.inLoop ? { inLoop: true } : {},
         ...t.path && t.path.length >= 2 ? { path: t.path } : {}
       }))
-    ],
+    ]),
     turnouts: state.turnouts.map((t) => ({
       id: t.id,
       pos: t.pos,
@@ -914,6 +957,12 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
     if (typeof e.trackOffsetInches === "number" && Number.isFinite(e.trackOffsetInches))
       endplateTrackOffsets[e.id] = e.trackOffsetInches;
   }
+  const flexByTrack = {};
+  for (const t of d.tracks ?? []) {
+    const partId = typeof t.flexPartId === "string" && t.flexPartId ? t.flexPartId : void 0;
+    const cuts = Array.isArray(t.flexCuts) ? t.flexCuts.filter((c) => Number.isFinite(c)).map(sc).sort((a, b) => a - b) : void 0;
+    if (partId || cuts) flexByTrack[t.id] = { ...partId ? { partId } : {}, ...cuts ? { cuts } : {} };
+  }
   const outline = (d.outline ?? []).filter((p) => p && Number.isFinite(p.x) && Number.isFinite(p.y)).map((p) => ({
     x: p.x,
     y: p.y,
@@ -950,6 +999,7 @@ function docToState(doc, fallbackLength, moduleTracks = []) {
       trackId: ep.trackId ?? null
     })),
     poseOverrides,
+    flexByTrack,
     endplateWidths,
     endplateTrackOffsets,
     outline,
@@ -1247,10 +1297,141 @@ var ATLAS_CODE55_N = [
     innerRadius: { inches: 15, source: "manufacturer", note: "Atlas product listing" }
   }
 ];
-var BUILT_IN_TRACK_PARTS = [...ATLAS_CODE55_N];
+var FLEX_TRACK_PARTS = [
+  {
+    id: "atlas-c55-n-flex",
+    manufacturer: "Atlas",
+    line: "Code 55",
+    scale: "N",
+    name: "Code 55 Flex Track",
+    kind: "flex",
+    overallLength: {
+      inches: 30,
+      source: "manufacturer",
+      note: "nominal product length, reported by Will Gage 2026-07-26"
+    }
+  },
+  {
+    id: "me-c55-n-flex",
+    manufacturer: "Micro Engineering",
+    line: "Code 55",
+    scale: "N",
+    name: "Code 55 Flex Track",
+    kind: "flex",
+    overallLength: {
+      inches: 36,
+      source: "manufacturer",
+      note: "nominal product length, reported by Will Gage 2026-07-26"
+    }
+  }
+];
+var DEFAULT_FLEX_PART_ID = "atlas-c55-n-flex";
+var BUILT_IN_TRACK_PARTS = [...ATLAS_CODE55_N, ...FLEX_TRACK_PARTS];
+function flexParts(library = BUILT_IN_TRACK_PARTS) {
+  return library.filter((p) => p.kind === "flex");
+}
+function flexPartFor(id, library = BUILT_IN_TRACK_PARTS) {
+  const chosen = id ? library.find((p) => p.id === id && p.kind === "flex") : null;
+  return chosen ?? library.find((p) => p.id === DEFAULT_FLEX_PART_ID) ?? flexParts(library)[0] ?? null;
+}
+function maxFlexPieceInches(id, library = BUILT_IN_TRACK_PARTS) {
+  return flexPartFor(id, library)?.overallLength?.inches ?? 30;
+}
 function trackPart(id, library = BUILT_IN_TRACK_PARTS) {
   return library.find((p) => p.id === id) ?? null;
 }
+var FLEX_EPS = 1e-6;
+var FLEX_MIN_PIECE_INCHES = 1;
+function flexPieces(input) {
+  const lo = Math.min(input.fromPos, input.toPos);
+  const hi = Math.max(input.fromPos, input.toPos);
+  if (!(hi - lo > FLEX_EPS)) return [];
+  const max = input.maxPieceInches > FLEX_EPS ? input.maxPieceInches : Infinity;
+  const blocks = (input.occupied ?? []).map((s) => ({
+    from: Math.max(lo, Math.min(s.fromPos, s.toPos)),
+    to: Math.min(hi, Math.max(s.fromPos, s.toPos))
+  })).filter((s) => s.to - s.from >= -FLEX_EPS && s.from < hi + FLEX_EPS && s.to > lo - FLEX_EPS).sort((a, b) => a.from - b.from);
+  const merged = [];
+  for (const b of blocks) {
+    const last = merged[merged.length - 1];
+    if (last && b.from <= last.to + FLEX_EPS) last.to = Math.max(last.to, b.to);
+    else merged.push({ ...b });
+  }
+  const gaps = [];
+  let cursor = lo;
+  for (const b of merged) {
+    if (b.from - cursor > FLEX_EPS) gaps.push({ from: cursor, to: b.from });
+    cursor = Math.max(cursor, b.to);
+  }
+  if (hi - cursor > FLEX_EPS) gaps.push({ from: cursor, to: hi });
+  const authored = input.cuts != null;
+  const out = [];
+  for (const g of gaps) {
+    let inner;
+    if (authored) {
+      inner = [...new Set(input.cuts)].filter((c) => c > g.from + FLEX_EPS && c < g.to - FLEX_EPS).sort((a, b) => a - b);
+    } else {
+      inner = [];
+      for (let at = g.from + max; at < g.to - FLEX_EPS; at += max) inner.push(at);
+      const tail = g.to - (inner[inner.length - 1] ?? g.from);
+      if (inner.length && tail < FLEX_MIN_PIECE_INCHES) {
+        const start = inner.length >= 2 ? inner[inner.length - 2] : g.from;
+        inner[inner.length - 1] = start + (g.to - start) / 2;
+      }
+    }
+    const bounds = [g.from, ...inner, g.to];
+    for (let i = 0; i < bounds.length - 1; i++) {
+      const from = bounds[i];
+      const to = bounds[i + 1];
+      out.push({
+        index: out.length,
+        fromPos: from,
+        toPos: to,
+        lengthInches: to - from,
+        overlong: to - from > max + FLEX_EPS,
+        // The run's own ends are runEnd; anything else is a part body, except
+        // where a cut put a neighbouring piece there.
+        fromEnd: i > 0 ? "piece" : from <= lo + FLEX_EPS ? "runEnd" : "part",
+        toEnd: i < bounds.length - 2 ? "piece" : to >= hi - FLEX_EPS ? "runEnd" : "part"
+      });
+    }
+  }
+  return out;
+}
+function turnoutFacing(input) {
+  const far = input.divergeFarPos;
+  const geometric = typeof far === "number" && Number.isFinite(far) ? Math.sign(far - input.pos) || 1 : 1;
+  return input.flipped ? -geometric : geometric;
+}
+function turnoutOccupiedSpan(input) {
+  const e = input.extent;
+  if (!e) return null;
+  const a = input.pos - input.facing * e.behindPoints;
+  const b = input.pos + input.facing * e.aheadOfPoints;
+  return { fromPos: Math.min(a, b), toPos: Math.max(a, b) };
+}
+function resizeFlexPiece(pieces, index, nextLengthInches) {
+  const piece = pieces[index];
+  const next = pieces[index + 1];
+  if (!piece || !next) return null;
+  if (piece.toEnd !== "piece") return null;
+  if (!Number.isFinite(nextLengthInches)) return null;
+  const pair = piece.lengthInches + next.lengthInches;
+  if (pair < 2 * FLEX_MIN_PIECE_INCHES) return null;
+  const want = Math.max(
+    FLEX_MIN_PIECE_INCHES,
+    Math.min(pair - FLEX_MIN_PIECE_INCHES, nextLengthInches)
+  );
+  const moved = piece.fromPos + want;
+  return pieces.filter((p) => p.toEnd === "piece").map((p) => p.index === index ? moved : p.toPos).map((v) => Math.round(v * 1e3) / 1e3).sort((a, b) => a - b);
+}
+function flexUsage(pieces) {
+  return {
+    pieces: pieces.length,
+    totalInches: pieces.reduce((a, p) => a + p.lengthInches, 0),
+    overlong: pieces.filter((p) => p.overlong).length
+  };
+}
 var TIE_HALF_LENGTH_INCHES = 0.319;
 function partExtent(part) {
   const pts = part?.pointsOffset;
@@ -2146,6 +2327,6 @@ function poseOverridesFromDoc(doc) {
   return out;
 }
 
-export { ATLAS_CODE55_N, BUILT_IN_TRACK_PARTS, CODE55_RAIL_HEIGHT_INCHES, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, MAIN2_TRACK_ID, MAIN_TRACK_ID, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, RAIL_GAUGE_INCHES, TIE_HALF_LENGTH_INCHES, TURNOUT_LEAD_INCHES_PER_FROG, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateFaceSegments, endplateLead, endplateTrackOffsetFor, endplateTrackOffsetInches, endplateWidthInches, frogCasting, frogNumberFromName, fromSectionRelative, geometryTurnDegrees, hasNoFarEndplate, importedPartToTrackPart, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, leadInchesForSize, mergeImportedParts, mergeStoredParts, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, parseXtpLibrary, partExtent, partExtentForSize, partOutlineAtFrog, pastFrogInchesForSize, pathLengthInches, poseNeedsManual, poseOverridesFromDoc, remapPos, returnLoop, sampleBenchworkOutline, samplePartSegments, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, storedPartToTrackPart, toSectionRelative, trackMeetsEndplateIssues, trackPart, trackPath, turnoutClosure, turnoutPartForSize };
+export { ATLAS_CODE55_N, BUILT_IN_TRACK_PARTS, CODE55_RAIL_HEIGHT_INCHES, DEFAULT_FLEX_PART_ID, ENDPLATE_FASCIA_CLEAR_INCHES, ENDPLATE_LEAD_INCHES, FLEX_TRACK_PARTS, FREEMO_ENDPLATE_TRACK_FASCIA_CLEARANCE_INCHES, FREEMO_ENDPLATE_WIDTH_MIN_INCHES, FREEMO_ENDPLATE_WIDTH_RECOMMENDED_INCHES, FREEMO_TRACK_SPACING_INCHES, MAIN2_TRACK_ID, MAIN_TRACK_ID, N_CAR_LENGTH_INCHES, N_SCALE_RATIO, RAIL_GAUGE_INCHES, TIE_HALF_LENGTH_INCHES, TURNOUT_LEAD_INCHES_PER_FROG, WHOLE_MODULE_SECTION_ID, asModuleSchematic, benchworkBand, benchworkOutline, buildCrossover, buildPassingSiding, buildTransition, carCapacity, checkEndplateWidth, deriveEndplatePoses, divergeSideForHand, docToState, emptyEditorState, endplateCentreOffsetInches, endplateFaceSegments, endplateLead, endplateTrackOffsetInches, endplateWidthInches, flexPartFor, flexParts, flexPieces, flexUsage, frogCasting, frogNumberFromName, fromSectionRelative, geometryTurnDegrees, hasNoFarEndplate, importedPartToTrackPart, inchesToScaleFeet, isLoopDoc, isTransitionTurnout, leadInchesForSize, maxFlexPieceInches, mergeImportedParts, mergeStoredParts, moduleCenterline, moduleFeatures, moduleFootprint, moduleLengthFromSections, moduleSections, nextId, parseXtpLibrary, partExtent, partExtentForSize, partOutlineAtFrog, pastFrogInchesForSize, pathLengthInches, poseNeedsManual, poseOverridesFromDoc, remapPos, resizeFlexPiece, returnLoop, sampleBenchworkOutline, samplePartSegments, samplePath, scaleFeetToInches, sectionAdjacency, sectionBand, sectionBreaksFromSections, sectionComponents, sectionFootprints, sectionNeighbours, sectionSpans, sectionSpansOrWhole, sectionedCenterline, sectionedEndPose, sliceCenterline, stateToDoc, storedPartToTrackPart, toSectionRelative, trackMeetsEndplateIssues, trackPart, trackPath, turnoutClosure, turnoutFacing, turnoutOccupiedSpan, turnoutPartForSize };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map