@things-factory/figure-ui 10.1.147 → 10.1.150

package/dist-client/modeller/editor.js

@@ -3,7 +3,7 @@ import { __decorate, __metadata } from "tslib";
 import { LitElement, html, css, nothing } from 'lit';
 import { i18next } from '@operato/i18n';
 import '@operato/layout';
-import { notify } from '@operato/layout';
+import { notify, openPopup } from '@operato/layout';
 import { OxPrompt } from '@operato/popup';
 import { customElement, property, state } from 'lit/decorators.js';
 import { live } from 'lit/directives/live.js';
@@ -32,11 +32,16 @@ import { SidePanelStyles } from './side-panel-styles.js';
 import { ScrollbarStyles } from '@operato/styles';
 import { alignChanges, canMirror, mirrorChanges } from './align.js';
 import { paletteRecipe } from './palette.js';
+import { meshChoicesOf, meshPartIdOf, meshPartOf } from './mesh-import.js';
+import './figure-mesh-choice.js';
+import { uploadFigureMesh } from '../graphql/index.js';
+import { slotMarksOf } from './slot-layout-host.js';
+const NO_MARKS = [];
 import { apexOver, drawnOf } from './section-drawing.js';
 import { END_FACE } from './section-controls.js';
 import { nudgeOf, placementOf } from './stage-model.js';
 import { roomRefitRowsOf } from './occupancy.js';
-import { editRefusalOf, inDeclaredRoom, inputRangeRefusalOf, narrowingRetryOf, partRefusalOf, placementRefusalOf, recipeRefusalOf, removalNoticeOf, sizeRangeRefusalOf } from './refusals.js';
+import { editRefusalOf, inDeclaredRoom, narrowingRetryOf, partNameRefusalOf, partRefusalOf, placedRefusalOf, recipeRefusalOf, removalNoticeOf } from './refusals.js';
 import { endPlaceKeyOf, fieldWordsOf, followOf, measureNow, partSummaryOf, instanceRangeOf, instanceRangeToDeclare, proportionToFollow, rangeDiffers, rangeWith, turnsAboutAJoint, valueNow } from './links.js';
 import { jointFanOf } from './joint-fan.js';
 import { derivedHeld, derivedOf } from './revision.js';
@@ -694,8 +699,7 @@ let FigureEditor = class FigureEditor extends LitElement {
         catch (error) {
             if (this.askClipLoss(error, () => this.run(action)))
                 return;
-            const say = (key, params) => i18next.t(key, params);
-            this.error = sizeRangeRefusalOf(error, say) ?? inputRangeRefusalOf(error, say) ?? this.said(error);
+            this.error = this.said(error);
         }
         finally {
             /* Committed or refused, the value in hand is gone: the figure as it stands is drawn again. */
@@ -799,6 +803,41 @@ let FigureEditor = class FigureEditor extends LitElement {
             this.selected = part.id;
         });
     }
+    /**
+     * A GLB made into a mesh part (ADR-0129): the server reads and keeps it, the author picks the whole file or one node
+     * of it, and the part is added as one step of the history, standing where it stood in the file. A file the server
+     * refuses is said in its words; nothing is added.
+     */
+    async importMesh(file) {
+        if (!this.session)
+            return;
+        let upload;
+        try {
+            upload = await uploadFigureMesh(file);
+        }
+        catch (error) {
+            this.error = this.said(error);
+            return;
+        }
+        const choices = meshChoicesOf(upload);
+        /* Only the whole file and the one node that is all of it: there is nothing to choose between. */
+        const choice = choices.length <= 2
+            ? {}
+            : await openPopup(html `<figure-mesh-choice .choices=${choices}></figure-mesh-choice>`, {
+                backdrop: true,
+                size: 'small',
+                title: i18next.t('figure.title.choose-mesh-part')
+            }).result;
+        if (!choice)
+            return;
+        const node = upload.summary.nodes.find(n => n.index === choice.node);
+        this.run(() => {
+            const taken = new Set(this.session.read().geometry.map(g => g.id));
+            const id = meshPartIdOf(node?.name ?? file.name.replace(/\.glb$/i, ''), taken);
+            this.session.add(meshPartOf(upload, choice, id));
+            this.selected = id;
+        });
+    }
     /**
      * The list's own operations, as part edits — each one step of the session's history. The copy and the moved
      * part stay selected.
@@ -990,12 +1029,7 @@ let FigureEditor = class FigureEditor extends LitElement {
             this.changed();
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            this.error = /carried by a joint/.test(message)
-                ? i18next.t('figure.text.gizmo-joint-places', { part: partLabelOf(id) })
-                : /is fastened to/.test(message)
-                    ? i18next.t('figure.text.gizmo-fastening-places', { part: partLabelOf(id) })
-                    : this.said(error);
+            this.error = placedRefusalOf(error, partLabelOf(id), (key, params) => i18next.t(key, params)) ?? this.said(error);
             this.requestUpdate();
         }
     }
@@ -1119,13 +1153,8 @@ let FigureEditor = class FigureEditor extends LitElement {
         }
         catch (error) {
             input.value = from;
-            const code = error?.code;
-            this.error =
-                code === 'PART_ID'
-                    ? i18next.t(/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(name) ? 'figure.text.part-name-taken' : 'figure.text.part-name-invalid', { name })
-                    : error instanceof Error
-                        ? error.message
-                        : String(error);
+            /* Whether a name is a name is the kernel's rule, said from its refusal (ADR-0127), not checked again here. */
+            this.error = partNameRefusalOf(error, (key, params) => i18next.t(key, params)) ?? this.said(error);
         }
     }
     previewWordsNow() {
@@ -1255,9 +1284,7 @@ let FigureEditor = class FigureEditor extends LitElement {
                     ? i18next.t('figure.text.follow-would-loop')
                     : code === 'FASTEN_CYCLE' || code === 'ATTACH_CYCLE'
                         ? i18next.t('figure.text.fasten-would-loop')
-                        : sizeRangeRefusalOf(error, (key, params) => i18next.t(key, params)) ??
-                            placementRefusalOf(error, (key, params) => i18next.t(key, params)) ??
-                            this.said(error);
+                        : this.said(error);
             return false;
         }
     }
@@ -1620,13 +1647,7 @@ let FigureEditor = class FigureEditor extends LitElement {
         }
         catch (error) {
             input.value = String(field.value);
-            const code = error?.code;
-            const message = error instanceof Error ? error.message : String(error);
-            const found = /\((\d[\d.]*) mm\) a pitch under ([\d.]+) mm makes more than (\d+)/.exec(message);
-            this.error =
-                code === 'INPUT_RANGE' && found
-                    ? i18next.t('figure.text.repeat-pitch-too-small', { length: Number(found[1]).toLocaleString(), min: found[2], limit: found[3] })
-                    : this.said(error);
+            this.error = this.said(error);
         }
     }
     /** Choose a part, from the list, the canvas or a place row. A figure-level tab gives way to the part's properties. */
@@ -1828,6 +1849,18 @@ let FigureEditor = class FigureEditor extends LitElement {
         const trying = this.middle === 'preview' ? this.renderRoot.querySelector('figure-preview')?.tried?.() : undefined;
         return { ...(this.selected ? { part: this.selected } : {}), ...(trying ? { trying } : {}) };
     }
+    /**
+     * The slots the figure's slot layout unfolds to, where they fall now (ADR-0118): drawn while the places are being
+     * edited. Made again only when the evaluation is new, so the canvas is not stood up again for nothing.
+     */
+    slotMarks(view, asset) {
+        const places = view.bindings ?? [];
+        if (this.slotMarksDrawn?.of !== places) {
+            const layout = asset?.document?.capabilities?.slotLayout?.layout;
+            this.slotMarksDrawn = { of: places, marks: slotMarksOf(places, layout) };
+        }
+        return this.slotMarksDrawn.marks;
+    }
     choose(id) {
         /* A copy on the canvas selects its repeat: the part the author made. */
         this.selected = id ? ownerOf(id) : id;
@@ -2092,6 +2125,7 @@ let FigureEditor = class FigureEditor extends LitElement {
           @show-model-settings=${() => this.showModelSettings()}
           ?locked=${unavailable}
           @add-part=${(e) => this.add(e.detail.kind)}
+          @import-mesh=${(e) => this.importMesh(e.detail.file)}
           .recipeCount=${this.templates.length}
           @open-recipe-catalog=${() => ((this.catalogOpen = true), (this.recipeError = ''))}
           @select-part=${(e) => this.choose(e.detail.id)}
@@ -2130,6 +2164,7 @@ let FigureEditor = class FigureEditor extends LitElement {
           .fan=${this.fanOf(shown, live)}
           .ghost=${this.previewShown().ghost}
           .highlight=${this.previewShown().highlight}
+          .marks=${this.tab === 'capability' ? this.slotMarks(view, asset) : NO_MARKS}
           .palette=${view.palette ?? {}}
           .context=${view.context ?? ''}
           .selected=${this.selected}