@formicoidea/labre-core-database 0.49.0 → 0.51.0

package/dist/database-page/view-menu-commands.js

@@ -1,5 +1,5 @@
 import { DataSourcePickerProvider, } from '@formicoidea/labre-core/shared/services';
-import { PROPERTIES_PANEL_TITLE, VIEW_MENU_GROUP, VIEW_MENU_IMPORT, VIEW_MENU_LAYOUT, VIEW_MENU_OPEN_IN, VIEW_MENU_SAVE_TEMPLATE, } from '../translations.js';
+import { PROPERTIES_PANEL_TITLE, VIEW_MENU_COLOR_RULES, VIEW_MENU_GROUP, VIEW_MENU_IMPORT, VIEW_MENU_LAYOUT, VIEW_MENU_OPEN_IN, VIEW_MENU_SAVE_TEMPLATE, } from '../translations.js';
 import { canImportView, currentViewTemplate, requestViewImport, } from '../view-transfer/import-view.js';
 /** The current view's options button on the page: what knows the view. */
 function viewOptions(std, hostBlockId) {
@@ -36,6 +36,7 @@ export function databasePageViewCommands(hostBlockId) {
         setting(hostBlockId, 'group', VIEW_MENU_GROUP, 1),
         setting(hostBlockId, 'open-in', VIEW_MENU_OPEN_IN, 2),
         setting(hostBlockId, 'properties', PROPERTIES_PANEL_TITLE, 3),
+        setting(hostBlockId, 'color-rules', VIEW_MENU_COLOR_RULES, 4),
         {
             id: 'database.view.save-template',
             owner: 'core',
@@ -44,7 +45,7 @@ export function databasePageViewCommands(hostBlockId) {
             labelFallback: VIEW_MENU_SAVE_TEMPLATE[1],
             category: 'view',
             surfaces: ['view-menu'],
-            order: 4,
+            order: 5,
             scope: 'page',
             defaultKeys: { mac: [], other: [] },
             when: std => {
@@ -71,7 +72,7 @@ export function databasePageViewCommands(hostBlockId) {
             labelFallback: VIEW_MENU_IMPORT[1],
             category: 'transfer',
             surfaces: ['view-menu'],
-            order: 5,
+            order: 6,
             scope: 'page',
             defaultKeys: { mac: [], other: [] },
             when: std => {

package/dist/properties-panel/properties-panel.d.ts

@@ -18,16 +18,16 @@ declare const DatabasePropertiesPanel_base: typeof ShadowlessElement & import("@
  * request). It draws nothing of its own beyond the shared side-panel header:
  * the list is the data-view's own `data-view-properties-setting`, the very
  * list the view options' "Properties" pops, so hiding, showing and
- * reordering write through the same `Property` methods, once.
+ * reordering write through the same `Property` methods, once. A row's click
+ * opens the property's menu (the table header's: rename, type, duplicate,
+ * delete) and "New property" adds one, both from that list.
  *
  * A host mounts it with `std` (the editor that shows the database) and
  * `request`; it follows the block as it mounts and unmounts. Read-only, the
  * list is drawn and inert.
  *
- * ponytail: the panel lists the view's properties and their visibility only;
- * rename, retype and "+ property" stay in the table header's own menu, and
- * the host-panels verbs of §10 (for a host that draws its own panel) are not
- * written: the Labre app mounts this element. Add them to
+ * ponytail: the host-panels verbs of §10 (for a host that draws its own
+ * panel) are not written: the Labre app mounts this element. Add them to
  * `@labre/affine/host-panels` when a host draws its own.
  */
 export declare class DatabasePropertiesPanel extends DatabasePropertiesPanel_base {
@@ -36,6 +36,7 @@ export declare class DatabasePropertiesPanel extends DatabasePropertiesPanel_bas
     private readonly _mounts$;
     connectedCallback(): void;
     private _t;
+    private readonly _wording;
     private readonly _close;
     private _renderHeader;
     private _renderBody;

package/dist/properties-panel/properties-panel.js

@@ -65,16 +65,16 @@ export function propertiesPanelView(std, request) {
  * request). It draws nothing of its own beyond the shared side-panel header:
  * the list is the data-view's own `data-view-properties-setting`, the very
  * list the view options' "Properties" pops, so hiding, showing and
- * reordering write through the same `Property` methods, once.
+ * reordering write through the same `Property` methods, once. A row's click
+ * opens the property's menu (the table header's: rename, type, duplicate,
+ * delete) and "New property" adds one, both from that list.
  *
  * A host mounts it with `std` (the editor that shows the database) and
  * `request`; it follows the block as it mounts and unmounts. Read-only, the
  * list is drawn and inert.
  *
- * ponytail: the panel lists the view's properties and their visibility only;
- * rename, retype and "+ property" stay in the table header's own menu, and
- * the host-panels verbs of §10 (for a host that draws its own panel) are not
- * written: the Labre app mounts this element. Add them to
+ * ponytail: the host-panels verbs of §10 (for a host that draws its own
+ * panel) are not written: the Labre app mounts this element. Add them to
  * `@labre/affine/host-panels` when a host draws its own.
  */
 let DatabasePropertiesPanel = (() => {
@@ -222,6 +222,7 @@ let DatabasePropertiesPanel = (() => {
       <div class="affine-database-properties-panel-list" ?inert=${readonly}>
         <data-view-properties-setting
           .view=${view}
+          .wording=${this._wording}
         ></data-view-properties-setting>
       </div>`;
         }
@@ -248,6 +249,7 @@ let DatabasePropertiesPanel = (() => {
             super(...arguments);
             /** Bumped when a block mounts or unmounts, so the view is looked up again. */
             this._mounts$ = signal(0);
+            this._wording = (wording) => this._t(wording);
             this._close = () => {
                 this.std.getOptional(PropertiesPanelProvider)?.close();
             };

package/dist/translations.d.ts

@@ -1,4 +1,4 @@
-import type { ChromeWording } from '@formicoidea/labre-core/shared/services';
+import { type ChromeWording } from '@formicoidea/labre-core/shared/services';
 import type { TranslationKeyManifestEntry } from '@formicoidea/labre-core/std';
 /** The entry that lists the sources the database's views already read. */
 export declare const DATABASE_ADD_VIEW_EXISTING_SOURCE: ChromeWording;
@@ -18,8 +18,20 @@ export declare const VIEW_MENU_GROUP: ChromeWording;
  * is the panel title for the same reason (`PROPERTIES_PANEL_TITLE`).
  */
 export declare const VIEW_MENU_OPEN_IN: ChromeWording;
+/**
+ * "Conditional colors" (ADR 0036): the view settings' own entry
+ * (`DATA_VIEW_COLOR_RULES`), one chrome word, one key, declared once by
+ * `@labre/data-view`, so not listed below.
+ */
+export declare const VIEW_MENU_COLOR_RULES: ChromeWording;
+/** Shared with the frame toolbar: one chrome word, one key (`SAVE_AS_TEMPLATE`). */
 export declare const VIEW_MENU_SAVE_TEMPLATE: ChromeWording;
 export declare const VIEW_MENU_IMPORT: ChromeWording;
+/**
+ * Declared once by `@labre/data-view` (`DATA_VIEW_PROPERTIES`, the list's own
+ * title, in its view options popover too), so not listed below. Restated, not
+ * imported: this bundle imports core alone (`core-database-boundary`).
+ */
 export declare const PROPERTIES_PANEL_TITLE: ChromeWording;
 /** The panel's "Show all" over the view's hidden properties. */
 export declare const PROPERTIES_PANEL_SHOW_ALL: ChromeWording;

package/dist/translations.js

@@ -1,3 +1,4 @@
+import { SAVE_AS_TEMPLATE, } from '@formicoidea/labre-core/shared/services';
 /* ── "+ view" (ADR 0035 §1, §9c, B11; labre ADR-0046 §5) ──────────────── */
 /** The entry that lists the sources the database's views already read. */
 export const DATABASE_ADD_VIEW_EXISTING_SOURCE = [
@@ -43,15 +44,27 @@ export const VIEW_MENU_OPEN_IN = [
     'com.labre.data-view.open-in',
     'Open pages in',
 ];
-export const VIEW_MENU_SAVE_TEMPLATE = [
-    'com.labre.database.view-menu.save-template',
-    'Save as template',
+/**
+ * "Conditional colors" (ADR 0036): the view settings' own entry
+ * (`DATA_VIEW_COLOR_RULES`), one chrome word, one key, declared once by
+ * `@labre/data-view`, so not listed below.
+ */
+export const VIEW_MENU_COLOR_RULES = [
+    'com.labre.data-view.color-rules',
+    'Conditional colors',
 ];
+/** Shared with the frame toolbar: one chrome word, one key (`SAVE_AS_TEMPLATE`). */
+export const VIEW_MENU_SAVE_TEMPLATE = SAVE_AS_TEMPLATE;
 export const VIEW_MENU_IMPORT = [
     'com.labre.database.view-menu.import',
     'Import a view…',
 ];
 /* ── The properties panel (ADR 0035 §9b, issue B10) ────────────────────── */
+/**
+ * Declared once by `@labre/data-view` (`DATA_VIEW_PROPERTIES`, the list's own
+ * title, in its view options popover too), so not listed below. Restated, not
+ * imported: this bundle imports core alone (`core-database-boundary`).
+ */
 export const PROPERTIES_PANEL_TITLE = [
     'com.labre.database.properties-panel.title',
     'Properties',
@@ -117,14 +130,12 @@ const DATABASE_EDITOR_WORDINGS = [
     PICKER_TITLE,
     PROPERTIES_PANEL_HIDE_ALL,
     PROPERTIES_PANEL_SHOW_ALL,
-    PROPERTIES_PANEL_TITLE,
     PROPERTIES_PANEL_UNAVAILABLE,
     SLASH_LINKED_VIEW,
     SLASH_LINKED_VIEW_DESCRIPTION,
     VIEW_MENU_GROUP,
     VIEW_MENU_IMPORT,
     VIEW_MENU_LAYOUT,
-    VIEW_MENU_SAVE_TEMPLATE,
 ];
 /**
  * This package's `com.labre.database.*` wordings, exported from the package

package/dist/view-transfer/remap-view.d.ts

@@ -2,14 +2,17 @@ import type { DataSourcePickerProperty } from '@formicoidea/labre-core/shared/se
 /**
  * What a copied view lost on the way (labre PRD REQ-DB-2: "the dialog says
  * so"): conditions of its filter and keys of its sort that pointed at an
- * ignored property, the grouping by one, and the columns of the ignored
- * properties.
+ * ignored property, the grouping by one, the columns of the ignored
+ * properties, and its colour rules that read one (ADR 0036; `colorRules`
+ * arrived in 0.50, a field a 0.49 reader of this type never reads).
+ * Held by `remap-dropped-signature.unit.spec.ts`.
  */
 export interface RemapDropped {
     filters: number;
     sorts: number;
     group: boolean;
     properties: number;
+    colorRules: number;
 }
 export interface RemappedView {
     /** The view's data for this database, without `id`, `name` or `sourceId`. */
@@ -35,6 +38,10 @@ type Json = Record<string, unknown>;
  *   kept its id;
  * - a manual order of rows (`sort.manuallySort`, a group's
  *   `manuallyCardSort`) names rows of the other database: emptied;
+ * - a colour rule (`colorRules`, ADR 0036) is rewritten as a filter is,
+ *   but a rule that loses any condition is removed whole and counted: a
+ *   rule with fewer conditions would colour rows its author never meant;
+ *   its colour is the shared palette's and is kept as is;
  * - `id`, `name` and `sourceId` are left to the caller; any other key is
  *   copied as is.
  *
@@ -50,6 +57,8 @@ export declare function defaultMapping(from: readonly DataSourcePickerProperty[]
 /**
  * What a view template keeps of a view (labre PRD REQ-DB-4): everything but
  * its filters, its sorts and its manual orders, which belong to one view.
+ * Its colour rules (`colorRules`, ADR 0036) are kept, conditions included:
+ * REQ-DB-4 names them part of a template.
  */
 export declare function viewTemplateData(view: Readonly<Json>): Json;
 export {};

package/dist/view-transfer/remap-view.js

@@ -22,6 +22,10 @@ function isRecord(value) {
  *   kept its id;
  * - a manual order of rows (`sort.manuallySort`, a group's
  *   `manuallyCardSort`) names rows of the other database: emptied;
+ * - a colour rule (`colorRules`, ADR 0036) is rewritten as a filter is,
+ *   but a rule that loses any condition is removed whole and counted: a
+ *   rule with fewer conditions would colour rows its author never meant;
+ *   its colour is the shared palette's and is kept as is;
  * - `id`, `name` and `sourceId` are left to the caller; any other key is
  *   copied as is.
  *
@@ -37,6 +41,7 @@ export function remapView(view, from, to, mapping) {
         sorts: 0,
         group: false,
         properties: 0,
+        colorRules: 0,
     };
     const fromById = new Map(from.map(p => [p.id, p]));
     const toById = new Map(to.map(p => [p.id, p]));
@@ -99,7 +104,7 @@ export function remapView(view, from, to, mapping) {
         }
         return { value, empty: false };
     };
-    const remapFilter = (filter) => {
+    const remapFilter = (filter, onDrop) => {
         if (filter.type === 'group') {
             const conditions = Array.isArray(filter.conditions)
                 ? filter.conditions
@@ -108,7 +113,7 @@ export function remapView(view, from, to, mapping) {
             for (const condition of conditions) {
                 if (!isRecord(condition))
                     continue;
-                const next = remapFilter(condition);
+                const next = remapFilter(condition, onDrop);
                 if (next)
                     kept.push(next);
             }
@@ -118,7 +123,7 @@ export function remapView(view, from, to, mapping) {
         const sourceId = typeof left?.name === 'string' ? left.name : undefined;
         const id = target(sourceId);
         if (!sourceId || !id) {
-            dropped.filters += 1;
+            onDrop();
             return null;
         }
         let empty = false;
@@ -132,24 +137,43 @@ export function remapView(view, from, to, mapping) {
             })
             : filter.args;
         if (empty) {
-            dropped.filters += 1;
+            onDrop();
             return null;
         }
         return { ...filter, left: { ...left, name: id }, args };
     };
+    // A nested group left empty is dropped with its conditions; the root
+    // stays, an empty group being "no filter".
+    const prune = (group) => ({
+        ...group,
+        conditions: group.conditions
+            .map(c => (c.type === 'group' ? prune(c) : c))
+            .filter(c => c.type !== 'group' || c.conditions.length > 0),
+    });
     if (isRecord(data.filter)) {
-        const root = remapFilter(data.filter);
-        // A nested group left empty is dropped with its conditions; the root
-        // stays, an empty group being "no filter".
-        const prune = (group) => ({
-            ...group,
-            conditions: group.conditions
-                .map(c => (c.type === 'group' ? prune(c) : c))
-                .filter(c => c.type !== 'group' || c.conditions.length > 0),
+        const root = remapFilter(data.filter, () => {
+            dropped.filters += 1;
         });
         if (root)
             data.filter = prune(root);
     }
+    if (Array.isArray(data.colorRules)) {
+        const kept = [];
+        for (const rule of data.colorRules) {
+            if (!isRecord(rule) || !isRecord(rule.filter))
+                continue;
+            let lost = false;
+            const filter = remapFilter(rule.filter, () => {
+                lost = true;
+            });
+            if (lost || !filter) {
+                dropped.colorRules += 1;
+                continue;
+            }
+            kept.push({ ...rule, filter: prune(filter) });
+        }
+        data.colorRules = kept;
+    }
     if (isRecord(data.sort)) {
         const sortBy = Array.isArray(data.sort.sortBy) ? data.sort.sortBy : [];
         const kept = [];
@@ -211,6 +235,8 @@ export function defaultMapping(from, to) {
 /**
  * What a view template keeps of a view (labre PRD REQ-DB-4): everything but
  * its filters, its sorts and its manual orders, which belong to one view.
+ * Its colour rules (`colorRules`, ADR 0036) are kept, conditions included:
+ * REQ-DB-4 names them part of a template.
  */
 export function viewTemplateData(view) {
     const data = structuredClone(view);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formicoidea/labre-core-database",
   "description": "Labre core-database editing chrome for @formicoidea/labre-core.",
-  "version": "0.49.0",
+  "version": "0.51.0",
   "type": "module",
   "sideEffects": false,
   "author": "lajola",
@@ -27,7 +27,7 @@
     "dist"
   ],
   "dependencies": {
-    "@formicoidea/labre-core": "0.49.0",
+    "@formicoidea/labre-core": "0.51.0",
     "@blocksuite/icons": "^2.2.12",
     "@preact/signals-core": "^1.8.0",
     "lit": "^3.2.0"