@reekon-tools/boldr-cad 0.0.0-stage → 1.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 REEKON Tools
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,3 +1,300 @@
-# Temporary Holding Version
+# @reekon-tools/boldr-cad
 
-This version is a temporary placeholder for this package. An operational version to replace this has been submitted for review and is awaiting a staged release.
+BOLDR's 2D layout editor (BOLDR CAD) as a React Native component, plus the
+model, solver and exporters behind it. Walls, doors and windows, spaces,
+dimensions and constraints, wall elevations and markup, drawn with Skia on
+iOS and Android and with react-native-web in a browser. Drawings are kept in
+BOLDR through a small provider interface, so the package has no Firebase
+dependency of its own.
+
+## Install
+
+```sh
+npm install @reekon-tools/boldr-cad
+```
+
+Peer dependencies:
+
+| Package                       | Range     | Needed for                                  |
+| ----------------------------- | --------- | ------------------------------------------- |
+| `react`                       | `>=19`    | always                                      |
+| `react-native`                | `>=0.74`  | always (react-native-web in a browser)      |
+| `@shopify/react-native-skia`  | `>=2.5`   | the editor on iOS and Android               |
+| `react-native-gesture-handler`| `>=2.31`  | the editor on iOS and Android               |
+| `react-native-reanimated`     | `>=4`     | the editor on iOS and Android (pan and zoom run on the UI thread; its Babel plugin must be in the app's config) |
+| `react-native-svg`            | `>=15`    | the editor's icons on iOS and Android       |
+
+Only `./core` (see below) runs without the four native packages.
+
+## How it resolves
+
+The package has two entry points:
+
+- `@reekon-tools/boldr-cad` is the editor: `CadEditor`, the data layer and
+  the device hooks.
+- `@reekon-tools/boldr-cad/core` is the drawing model without React:
+  types, `migrateProject`, project files, unit formatting and the PDF/DXF
+  exporters. For servers and tools.
+
+**React Native hosts read the TypeScript source.** The package exports a
+`react-native` condition that points at `src/`, so Metro compiles it like app
+code and picks the `.native` platform files itself. Nothing is prebuilt for
+native, which also means a local checkout linked into an app is live with no
+build step.
+
+For TypeScript in a React Native app, two compiler options are needed. Expo's
+base tsconfig already sets the first:
+
+```json
+{
+  "compilerOptions": {
+    "customConditions": ["react-native"],
+    "moduleSuffixes": [".ios", ".android", ".native", ""]
+  }
+}
+```
+
+**Web and Node take the built `dist/`** through the `default` and `types`
+conditions. In a Vite app, alias `react-native` to `react-native-web` and let
+`.web.js` win, because the platform files in `dist/` have no bare `X.js`:
+
+```ts
+// vite.config.ts
+resolve: {
+  alias: [{ find: /^react-native$/, replacement: 'react-native-web' }],
+  extensions: ['.web.js', '.web.tsx', '.web.ts', '.mjs', '.js', '.mts', '.ts', '.jsx', '.tsx', '.json'],
+},
+```
+
+`dist/` is emitted with extensionless relative imports, so plain Node cannot
+`import('@reekon-tools/boldr-cad/core')` directly. Run it through a bundler
+(esbuild, tsx, vite-node) as BOLDR's own services do.
+
+## Using the editor
+
+```tsx
+import { CadEditor, openCadDrawing, NotACadDrawing, type CadSync } from '@reekon-tools/boldr-cad';
+
+function DrawingScreen({ provider }: { provider: CadDataProvider }) {
+  const [sync, setSync] = useState<CadSync | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+    openCadDrawing(provider, { onError: e => console.error(e) }).then(
+      s => (cancelled ? s.stop() : setSync(s)),
+      e => { if (e instanceof NotACadDrawing) console.log(e.reason); }, // 'missing' | 'legacy'
+    );
+    return () => { cancelled = true; };
+  }, [provider]);
+
+  if (!sync) return null;
+  return <CadEditor sync={sync} onBack={goBack} theme="dark" devTools={false} />;
+}
+```
+
+Mount one `CadEditor` per screen. Mounting starts an editing session,
+unmounting saves and stops the sync it was given. Without `sync` the drawing
+lives in the browser's own storage, which is what the dev harness uses.
+
+`CadEditor` props:
+
+| Prop          | Type                                                       | Purpose                                                                                                   |
+| ------------- | ---------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
+| `sync`        | `CadSync`                                                  | The drawing, from `openCadDrawing`. Saved there as it changes.                                            |
+| `onBack`      | `() => void`                                               | The top bar's back button. Without it, Back opens the project's pages.                                    |
+| `headerRight` | `ReactNode \| (buttonSize: number) => ReactNode`          | The host's own buttons in the top bar, such as a Bluetooth status icon. As a function it gets the bar's round-button size (42 pt on a phone, 46 otherwise). |
+| `theme`       | `'light' \| 'dark'`                                        | Canvas colors. The chrome is dark either way. Without it, the person's Theme setting decides.             |
+| `units`       | `{ format: (inches: number) => string; metric: boolean; denom?: number }` | Lengths the host's way. Hides Units in Settings.                                           |
+| `fonts`       | `SkiaFonts`                                                | Typefaces for text on the plan by CSS weight, with a fallback. Device only.                                |
+| `pickImage`   | `() => Promise<{ dataUrl: string; w: number; h: number } \| null>` | A photo or plan to trace. In a browser a file picker is the default.                              |
+| `saveFile`    | `(name: string, mime: string, data: string) => void`       | How exports (PDF, DXF, project file) reach the person, e.g. a share sheet. In a browser they download.     |
+| `readOnly`    | `boolean`                                                  | Pan and zoom only, nothing saved. A tap on a link's tile asks, then opens it.                             |
+| `devTools`    | `boolean`                                                  | Reset to the demo, open and save project files, in Settings. Default `true`; turn off in production.     |
+| `links`       | `CadLinks`                                                 | The job's files to link on the drawing, and its lengths for lines (see below). Without it there's nothing to link. |
+
+Fonts on a device, with react-native-skia:
+
+```ts
+const regular = useTypeface(require('./assets/Inter-Regular.ttf'));
+const bold = useTypeface(require('./assets/Inter-Bold.ttf'));
+const fonts: SkiaFonts | null = regular && bold ? { weights: { 400: regular, 700: bold }, fallback: regular } : null;
+```
+
+Wait for the typefaces before mounting the editor.
+
+### Keeping a drawing in BOLDR
+
+`openCadDrawing(provider, options)` loads a drawing through a
+`CadDataProvider` and keeps it in step while the editor is open: only the
+pages that changed are written, each stamped with the session's id; traced
+images are uploaded and stored by reference; pages another device changed are
+taken in when they aren't being edited locally.
+
+```ts
+interface CadDataProvider {
+  subscribeFile(cb: (file: { name: string; meta: CadFileMeta | null } | null) => void): () => void;
+  subscribePages(cb: (pages: Record<string, CadPageDoc>) => void): () => void;
+  writeMeta(meta: CadFileMeta): Promise<void>;
+  writePage(id: string, page: CadPageDoc): Promise<void>;
+  deletePage(id: string): Promise<void>;
+  uploadImage(pageId: string, dataUrl: string): Promise<string>; // returns a URL or a `stored:<path>` reference
+  imageUrl?(ref: string): Promise<string>;                        // turns a stored reference into a URL
+  uploadThumbnail?(dataUrl: string): Promise<void>;
+  measurements?: CadMeasurements;
+}
+```
+
+A drawing is one file document with `fileData: CadFileMeta`
+(`format: 'boldr-cad'`, `version: 1`, `pageOrder`, shared settings) and one
+page document per page (`name`, the sketch, the underlay, and the `rev` of
+the session that wrote it last). Storage paths are relative to the drawing's
+own folder, so copying or moving a drawing with its folder keeps it working.
+
+Options: `initialize: true` starts a new drawing when the file has no drawing
+record yet; `onError` hears about failed writes and uploads. The promise
+rejects with `NotACadDrawing` whose `reason` is `'missing'` (no such file) or
+`'legacy'` (a file from the retired layout tool).
+
+The returned `CadSync` has `stop()`, `idle()` (resolves once every write so
+far has finished), `saveThumbnail(pngDataUrl)` and `imageUrl(ref)`.
+
+**Measurements.** A dimension drawn in the editor is the drawing's alone: no
+measurement is made for it. The person saves one to the drawing's group from
+its bar (Save to group, through `links.saveMeasurement`), and it's linked to
+that measurement from then on. Drawings made by earlier versions kept every
+driving dimension as a measurement of the drawing's file; when the provider
+supplies `measurements`, those still follow their dimensions both ways
+(`create` is no longer called). `setPlaced(ids, linked)` hears every
+measurement the drawing shows: its own, and the job's it's linked to, each with
+its group (and a form's column). `measurementOf(constraint)` gives a
+constraint's value as BOLDR keeps it — lengths in micrometres, angles in
+degrees — or `null` for reference and print dimensions and linked ones.
+
+### Linking the job's files and measurements
+
+With `links`, Annotate gets a yellow + (under the rail; a phone's in the
+trash's corner while nothing's selected) that puts the job's files on the plan
+as tiles, with leaders, opened from the bar. A measurement comes into a drawing
+only as the dimension it drives: in Draft, a line's length keypad (select the
+line, tap +) offers the job's lengths (a page it swipes to on a touch screen,
+Select from list on a desktop), and the one picked sets the line, linked to
+it. A dimension is saved to the group from its bar (Save to group). A new length for a linked dimension asks first: Change both, Only this
+drawing (unlinks), or Cancel.
+
+```ts
+interface CadLinks {
+  pick(req: { want: 'files'; linked: LinkTarget[] }): Promise<LinkTarget[]>; // [] for nothing
+  measurements?(cb: (list: LinkTarget[]) => void): () => void; // the job's lengths and angles, in the order to show them
+  pickMeasurement?(req: { kind: 'length' | 'angle' }): Promise<LinkTarget | null>; // the host's own list (a side drawer)
+  subscribe(targets: LinkTarget[], cb: (info: Record<string, LinkInfo>) => void): () => void;
+  open(target: LinkTarget): void;
+  update?(target: LinkTarget, value: number, capture?: unknown): void; // µm or degrees, the person having said so
+  saveMeasurement?(m: { kind: 'length' | 'angle'; value: number; capture?: unknown }): Promise<LinkTarget | null>;
+  canSave?: boolean; // false where a measurement can't be saved (a form's group)
+}
+```
+
+- A `LinkTarget` is `{ kind: 'file' | 'measurement', id, groupId, columnId? }`
+  plus what it was when it was linked (`name`, `groupName`, `fileType`,
+  `mkind`, `value`, `text`). Resolve it by `groupId` and `id` in the job open
+  now, never by a stored path, so copied and moved jobs keep working.
+- `pick` offers the job's files to pick. BOLDR's pickers show the measurements
+  too, greyed out, and a tap on one says they're added in Draft; anything but
+  a file handed back is dropped.
+- A line's length keypad and a dimension's angle keypad take the job's
+  measurements. On a touch screen the keypad swipes to a page of them; on a
+  desktop it has Select from list, which calls `pickMeasurement` (the host's
+  own list, those of `kind` pickable and the rest greyed out), or shows that
+  page when the host has none. `measurements` calls back with the job's
+  lengths and angles as measurement targets (with `mkind`, `value` in
+  micrometres or degrees, and `text`), again as they change, and not until
+  the whole job's been heard from; the keypad greys out those that aren't its
+  kind. A host keypad (`keypad`) gets `measurementKind` and `pickMeasurement`
+  on such a request: show the job's measurements a swipe away, greying out
+  the other kind, and hand back the one tapped.
+- To draw that page itself, so the list looks as it does everywhere else in
+  the host, pass `measurementList` to `CadEditor`: a function of
+  `{ kind, pick, width, height }` that returns the list's element (for
+  example `page => <JobList {...page} />`). It's rendered as a component of its
+  own from when the page is first shown, and again when what it's given
+  changes. List the job's measurements at that size, grey out the other kind,
+  and call `pick` with the one tapped. BOLDR does on a tablet, with its phone
+  keypad's list. Without it the page is the editor's own grid, made from
+  `measurements`. Either way the page is there only when `links` has
+  `measurements` or `pickMeasurement`, and a desktop shows it only without
+  `pickMeasurement`.
+- `subscribe` answers by `linkKey(target)`, and again whenever that changes.
+  Say `exists: false` only once it's known to be gone, never while loading.
+  `text` is the value written the host's way; `thumbUrl` a picture to show.
+- Pass one `links` object for as long as the drawing is open (memoize it).
+
+**Laser readings.** `laserReading(inches, capture)` takes the host's own record
+of a reading (anything JSON: its device, its number). It's kept on the
+dimension the reading sets and handed back with `saveMeasurement`, or with
+`update` for a linked one, so a measurement saved from a reading records its
+device. A value typed over it isn't the reading's.
+
+For tests and prototypes, `memoryProvider()` is an in-memory provider with
+`remote()` and `remoteMeasurement()` to change things as another device would.
+
+### Measuring devices
+
+```ts
+import { setLaserConnected, laserReading } from '@reekon-tools/boldr-cad';
+
+setLaserConnected(true);        // shows the reading tray, enables the keypad's Laser key
+laserReading(inches, capture);  // into an open keypad, onto the selected wall, or into the tray
+```
+
+`laserReading` returns `false` when no drawing is open to take the value, so
+the host can handle it instead.
+
+## `./core`
+
+```ts
+import { sketchToPdf, pdfFileName, sketchToDxf, dxfFileName, fmtLen, parseLen, projectFromFile, migrateProject } from '@reekon-tools/boldr-cad/core';
+```
+
+The model types (`Project`, `Page`, `Sketch`, `Line`, `Constraint`, ...),
+`migrateProject` for older saves, `projectToFile` / `projectFromFile` for
+project files, the unit helpers (`fmtLen`, `parseLen`, `fmtArea`) and the
+PDF and DXF exporters, which return the file's contents as a string.
+
+Geometry is stored in inches. Units are display only, and switching them
+never changes a drawing.
+
+## Development
+
+```sh
+npm ci
+npm run dev              # the editor in a browser at http://localhost:5173 (react-native-web, saves locally)
+npm test                 # vitest: units, solver, rooms, trim, sync
+npm run e2e              # playwright flows against the dev server (npx playwright install first)
+npm run typecheck        # the browser build
+npm run typecheck:native # the device build (.native files)
+npm run build:lib        # dist/ for web and Node consumers
+npm run build:single     # one self-contained HTML file for testers, in dist-single/
+```
+
+`npm run build` is the browser harness and writes to `dist/` too, replacing
+the library output. `npm run build:lib` always starts from an empty `dist/`.
+
+To work on the package inside an app without publishing, depend on the
+checkout with `link:` (yarn) or `file:` (npm). Metro then needs the checkout
+as a watch folder, the package name mapped to it, and the checkout's own
+`node_modules` blocked so React and React Native aren't bundled twice. The
+BOLDR Pro app derives all three from its `link:` dependencies in
+`metro.config.js`.
+
+## Publishing
+
+```sh
+npm publish --access public
+```
+
+`prepublishOnly` runs the native typecheck, the tests and `build:lib` first,
+so the tarball always carries a fresh `dist/` next to `src/`.
+
+## License
+
+MIT

package/dist/app/edit.d.ts

@@ -0,0 +1,31 @@
+import type { Constraint, SelItem, Sketch } from '../model/types';
+import { type AddResult, type SolveResult } from '../solver';
+export declare function analyze(): void;
+export declare const solveSketch: (heavy?: string[]) => SolveResult;
+export declare function solveOrRevert(): SolveResult;
+/**
+ * Walls made thicker or thinner, or lines turned into walls: what's measured on walls' faces holds, their centrelines
+ * moving to keep it (a face's length depends on the walls at its corners as well as its own). False — and nothing
+ * moved — when it can't hold.
+ */
+export declare function holdFaces(): boolean;
+/** Re-place locked doors/windows from their dimensions (after any geometry change). */
+export declare function resolveOpeningsNow(): void;
+export declare function existsSel(s: SelItem): boolean;
+/** Run after every model change: clean up, re-analyze, refresh UI, autosave. */
+export declare function afterEdit(): void;
+export declare function undo(): void;
+export declare function redo(): void;
+/**
+ * The things a constraint ties together, each as the points to hold for it: a cabinet (its corners, when it's one of
+ * its edges or corners), a line (its ends), a point.
+ */
+export declare function holdGroups(sk: Sketch, c: Constraint): string[][];
+/**
+ * Add a constraint through the solver and explain the outcome:
+ * reference dimension → toast, conflict → conflict sheet (unless silent).
+ */
+export declare function tryAddConstraint(c: Constraint, { silent, onResolved }?: {
+    onResolved?: (() => void) | null | undefined;
+    silent?: boolean | undefined;
+}): AddResult;

package/dist/app/edit.js

@@ -0,0 +1,196 @@
+import { drivingDim } from '../model/openings';
+import { edgeOf, wallOf } from '../model/planGeom';
+import { CONS_LABEL } from '../model/constraints';
+import { HS, stepRedo, stepUndo } from '../model/history';
+import { pushedOut, syncFaces } from '../model/facesolve';
+import { elevSyncFrame, fitState, overflow, pastWallMsg, restoreFit } from '../editor/elevation';
+import { resolveOpenings } from '../model/openings';
+import { gc, restorePos, snapshotPos } from '../model/sketch';
+import { page, planSK, saveSoon, SK } from '../model/store';
+import { cabOfPoint, cabPoints } from '../model/faces';
+import { requestDraw } from '../render/view';
+import { solver } from '../solver';
+import { cancelTool } from '../tools/registry';
+import { fmtLen } from '../units';
+import { ed } from './state';
+import { refreshDrawerSoon, renderElevation, showConflict, toast, updateCtx, updateStatus } from '../editor/ports';
+import { refreshLinks } from '../editor/links';
+import { followLinked } from '../editor/linkFollow';
+export function analyze() {
+    ed.ana = solver.analyzeDOF(SK());
+}
+export const solveSketch = (heavy) => solver.solve(SK(), heavy);
+export function solveOrRevert() {
+    const sk = SK(), snap = snapshotPos(sk);
+    const s = solver.solve(sk);
+    if (!s.ok)
+        restorePos(sk, snap);
+    return s;
+}
+/**
+ * Walls made thicker or thinner, or lines turned into walls: what's measured on walls' faces holds, their centrelines
+ * moving to keep it (a face's length depends on the walls at its corners as well as its own). False — and nothing
+ * moved — when it can't hold.
+ */
+export function holdFaces() {
+    if (!Object.values(SK().cons).some(c => c.face || c.faces))
+        return true;
+    return solveOrRevert().ok;
+}
+/** Re-place locked doors/windows from their dimensions (after any geometry change). */
+export function resolveOpeningsNow() {
+    ed.badOpeningDims = resolveOpenings(planSK());
+}
+export function existsSel(s) {
+    const sk = SK();
+    switch (s.type) {
+        case 'point': return !!sk.points[s.id];
+        case 'line': return !!sk.lines[s.id];
+        case 'circle': return !!sk.circles[s.id];
+        case 'arc': return !!sk.arcs[s.id];
+        case 'cons':
+        case 'dim': return !!sk.cons[s.id];
+        case 'room': return !!sk.rooms[s.id];
+        case 'opening': return !!planSK().openings[s.id];
+        case 'cab': return !!sk.cabs?.[s.id];
+        case 'elev': return true;
+        case 'oanchor': return !!planSK().openings[s.id.split('|')[0]];
+        case 'wface': return !!wallOf(sk, edgeOf(s.id)[0]);
+        case 'odim': {
+            const [op, part] = s.id.split('|'), o = planSK().openings[op];
+            return !!o && (part === 'w' || (part.startsWith('d:') ? (o.dims || []).some(d => d.id === part.slice(2)) : !drivingDim(o)));
+        }
+        case 'note': return sk.notes.some(n => n.id === s.id);
+        case 'underlay': return page().underlays.some(u => u.id === s.id);
+    }
+    return false;
+}
+/** Run after every model change: clean up, re-analyze, refresh UI, autosave. */
+export function afterEdit() {
+    ed.editSeq++;
+    gc(planSK()); // the plan, and each wall face
+    resolveOpeningsNow();
+    // what's drawn on wall faces follows the plan's corners, doors and windows
+    ed.badFaceCons = syncFaces(planSK());
+    elevSyncFrame(); // the open wall's frame (its length, its corners) as the plan has it now
+    ed.sel = ed.sel.filter(s => existsSel(s));
+    analyze();
+    updateCtx();
+    updateStatus();
+    refreshDrawerSoon();
+    requestDraw();
+    renderElevation();
+    refreshLinks(); // (what's linked may have changed: the host is asked about it)
+    followLinked(); // (and an undo may have put a linked dimension at something else than the job says)
+    saveSoon();
+}
+export function undo() {
+    if (!HS().u.length) {
+        toast('Nothing to undo', { warn: true });
+        return;
+    }
+    cancelTool();
+    stepUndo();
+    ed.sel = [];
+    afterEdit();
+    toast('Undone');
+}
+export function redo() {
+    const h = HS();
+    if (!h.u.length && !h.r.length)
+        return;
+    if (!h.r.length) {
+        toast('Nothing to redo', { warn: true });
+        return;
+    }
+    cancelTool();
+    stepRedo();
+    ed.sel = [];
+    afterEdit();
+    toast('Redone');
+}
+/** Solve with these points held exactly where they are (fixed for the solve, then as they were). */
+function solveHolding(sk, hold) {
+    const pts = hold.map(id => sk.points[id]).filter(Boolean), had = pts.map(p => p.fixed);
+    pts.forEach(p => { p.fixed = true; });
+    const s = solver.solve(sk);
+    pts.forEach((p, i) => { if (had[i])
+        p.fixed = true;
+    else
+        delete p.fixed; });
+    return s;
+}
+/**
+ * The things a constraint ties together, each as the points to hold for it: a cabinet (its corners, when it's one of
+ * its edges or corners), a line (its ends), a point.
+ */
+export function holdGroups(sk, c) {
+    const face = sk, groups = [], seen = new Set();
+    const add = (key, pts) => { if (!seen.has(key) && pts.length) {
+        seen.add(key);
+        groups.push(pts);
+    } };
+    const point = (pid) => {
+        if (!pid || !sk.points[pid])
+            return;
+        const cab = cabOfPoint(sk, pid);
+        if (cab)
+            add('cab:' + cab, cabPoints(face.cabs[cab]));
+        else
+            add('pt:' + pid, [pid]);
+    };
+    for (const lid of [c.l, c.l1, c.l2, c.line]) {
+        const l = lid ? sk.lines[lid] : undefined;
+        if (!l)
+            continue;
+        if (l.cab && face.cabs?.[l.cab])
+            add('cab:' + l.cab, cabPoints(face.cabs[l.cab]));
+        else
+            add('line:' + lid, [l.a, l.b]);
+    }
+    for (const pid of [c.a, c.b, c.p])
+        point(pid);
+    return groups;
+}
+/**
+ * Add a constraint through the solver and explain the outcome:
+ * reference dimension → toast, conflict → conflict sheet (unless silent).
+ */
+export function tryAddConstraint(c, { silent = false, onResolved = null } = {}) {
+    // nothing may be pushed past its wall (in the wall view, past the wall; in the plan, a wall made shorter than
+    // what's on it): a constraint that would is taken back
+    const sk = SK(), was = overflow(sk), held = fitState(sk);
+    const r = solver.addConstraint(sk, c, { explain: !silent });
+    // met by moving everything a little, it ran past the wall: try keeping each thing it ties still in turn, so the
+    // other one moves to meet it (a short cabinet lifted to line up with a tall one, not the tall one sunk into the floor)
+    if (r.ok && r.id && !r.ref && pushedOut(was, overflow(sk))) {
+        for (const hold of holdGroups(sk, c)) {
+            restoreFit(sk, held);
+            if (solveHolding(sk, hold).ok && !pushedOut(was, overflow(sk)))
+                return r;
+        }
+        delete sk.cons[r.id];
+        restoreFit(sk, held);
+        if (!silent)
+            toast(pastWallMsg(), { warn: true });
+        return { ok: false };
+    }
+    if (silent)
+        return r;
+    if (r.ref) {
+        toast(r.refSame
+            ? 'Added as a reference dimension. Other constraints already set this value.'
+            : 'Kept as a reference dimension (' + fmtLen(c.value) + '). Other constraints already set this value — remove one to drive it.', { warn: !r.refSame });
+    }
+    else if (r.redundant) {
+        toast(CONS_LABEL[c.type] + ' is already true — other constraints set it.', { warn: true });
+    }
+    else if (r.conflict === 'dependent') {
+        showConflict({ title: 'Can’t add ' + (CONS_LABEL[c.type] || 'constraint').toLowerCase(), msg: 'It fights with constraints already on the drawing. Remove one of these to apply it.', ids: r.culprits || [], pending: c, onResolved });
+    }
+    else if (r.conflict === 'unsatisfiable') {
+        showConflict({ title: 'That doesn’t fit', msg: 'The drawing can’t satisfy this together with the constraints below. Remove one, or change a dimension.', ids: r.culprits || [], pending: c, onResolved });
+    }
+    return r;
+}
+//# sourceMappingURL=edit.js.map

package/dist/app/edit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/app/edit.ts"],"names":[],"mappings":"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"}