@dxos/react-ui-table 0.8.4-main.fcfe5033a5 → 0.8.4-staging.60fe92afc8

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License 
-Copyright (c) 2022 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-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:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-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.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/dist/lib/browser/{chunk-F7Y374KL.mjs → chunk-4KOQTPFC.mjs}

@@ -237,12 +237,12 @@ var tableControls = {
 // src/model/table-model.ts
 import { Atom as Atom2 } from "@effect-atom/atom-react";
 import { Resource as Resource2 } from "@dxos/context";
-import { Format as Format2, Obj, Order, Query, Ref } from "@dxos/echo";
-import { toEffectSchema } from "@dxos/echo/internal";
-import { getSnapshot } from "@dxos/echo/internal";
-import { getValue, setValue } from "@dxos/effect";
+import { Format as Format2, Obj, Order, Query, Ref, Type } from "@dxos/echo";
+import { toEffectSchema } from "@dxos/echo/JsonSchema";
+import { getSnapshot } from "@dxos/echo/Obj";
+import { SchemaEx } from "@dxos/effect";
 import { invariant } from "@dxos/invariant";
-import { ObjectId } from "@dxos/keys";
+import { EntityId } from "@dxos/keys";
 import { formatForEditing, parseValue } from "@dxos/react-ui-form";
 import { validateSchema } from "@dxos/schema";
 
@@ -383,10 +383,10 @@ var SelectionModel = class extends Resource {
 // src/model/table-model.ts
 var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-table/src/model/table-model.ts";
 var createEchoChangeCallback = (table) => ({
-  table: (mutate) => Obj.change(table, (table2) => mutate(table2)),
+  table: (mutate) => Obj.update(table, (table2) => mutate(table2)),
   row: (row, mutate) => {
     if (Obj.isObject(row)) {
-      Obj.change(row, (row2) => mutate(row2));
+      Obj.update(row, (row2) => mutate(row2));
     } else {
       mutate(row);
     }
@@ -451,15 +451,7 @@ var TableModel = class extends Resource2 {
       ...defaultFeatures,
       ...features
     };
-    invariant(!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === "single"), "Single selection is not compatible with editable tables.", {
-      F: __dxlog_file,
-      L: 197,
-      S: this,
-      A: [
-        "!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === 'single')",
-        "'Single selection is not compatible with editable tables.'"
-      ]
-    });
+    invariant(!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === "single"), "Single selection is not compatible with editable tables.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 94, S: this, A: ["!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === 'single')", "'Single selection is not compatible with editable tables.'"] });
     this._visibleRange = Atom2.make({
       start: {
         row: 0,
@@ -474,8 +466,12 @@ var TableModel = class extends Resource2 {
     this._draftRows = Atom2.make([]);
     this._inMemorySort = Atom2.make(void 0);
     this._cellUpdateCounter = Atom2.make(0);
-    this._persistedSort = Atom2.make((_get) => {
-      const viewSnapshot = Obj.getSnapshot(this.view);
+    this._persistedSort = Atom2.make((get) => {
+      const view = get(this._object.view.atom);
+      if (!view) {
+        return void 0;
+      }
+      const viewSnapshot = Obj.getSnapshot(view);
       const ast = viewSnapshot.query.ast;
       const orders = extractOrder(ast);
       if (orders && orders.length > 0) {
@@ -510,8 +506,8 @@ var TableModel = class extends Resource2 {
       const sorted = [
         ...rows
       ].sort((a, b) => {
-        const aValue = getValue(a, field.path);
-        const bValue = getValue(b, field.path);
+        const aValue = SchemaEx.getValue(a, field.path);
+        const bValue = SchemaEx.getValue(b, field.path);
         return compareValues(aValue, bValue, fieldProjection.props.format, sort.direction);
       });
       return sorted;
@@ -538,19 +534,11 @@ var TableModel = class extends Resource2 {
     this._onRowAction = onRowAction;
   }
   get id() {
-    return Obj.getDXN(this._object).toString();
+    return Obj.getURI(this._object);
   }
   get view() {
     const view = this._object.view.target;
-    invariant(view, "Table model not initialized", {
-      F: __dxlog_file,
-      L: 308,
-      S: this,
-      A: [
-        "view",
-        "'Table model not initialized'"
-      ]
-    });
+    invariant(view, "Table model not initialized", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 190, S: this, A: ["view", "'Table model not initialized'"] });
     return view;
   }
   get table() {
@@ -610,15 +598,7 @@ var TableModel = class extends Resource2 {
     return this._pinnedRows;
   }
   get columnMeta() {
-    invariant(this._columnMeta, void 0, {
-      F: __dxlog_file,
-      L: 381,
-      S: this,
-      A: [
-        "this._columnMeta",
-        ""
-      ]
-    });
+    invariant(this._columnMeta, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 244, S: this, A: ["this._columnMeta", ""] });
     return this._columnMeta;
   }
   get selection() {
@@ -637,15 +617,7 @@ var TableModel = class extends Resource2 {
     await this._selection.open(this._ctx);
   }
   initializeColumnMeta() {
-    invariant(this._object.view.target, "View must be loaded before initializing column meta", {
-      F: __dxlog_file,
-      L: 405,
-      S: this,
-      A: [
-        "this._object.view.target",
-        "'View must be loaded before initializing column meta'"
-      ]
-    });
+    invariant(this._object.view.target, "View must be loaded before initializing column meta", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 263, S: this, A: ["this._object.view.target", "'View must be loaded before initializing column meta'"] });
     this._columnMeta = Atom2.make((get) => {
       const fields = get(this._projection.fields);
       const meta = Object.fromEntries(fields.map((field, index) => [
@@ -756,7 +728,7 @@ var TableModel = class extends Resource2 {
       return;
     }
     const draftData = {
-      id: ObjectId.random()
+      id: EntityId.random()
     };
     const validationErrors = this.validateDraftRowData(draftData);
     const draftRow = {
@@ -839,13 +811,13 @@ var TableModel = class extends Resource2 {
     let value;
     if (plane === "frozenRowsEnd") {
       if (row >= 0 && row < this._registry.get(this._draftRows).length) {
-        value = getValue(this._registry.get(this._draftRows)[row].data, field.path);
+        value = SchemaEx.getValue(this._registry.get(this._draftRows)[row].data, field.path);
       } else {
         return void 0;
       }
     } else {
       const sortedRows = this._registry.get(this._sortedRows);
-      value = getValue(sortedRows[row], field.path);
+      value = SchemaEx.getValue(sortedRows[row], field.path);
     }
     if (value == null) {
       return "";
@@ -856,7 +828,7 @@ var TableModel = class extends Resource2 {
         if (!field.referencePath) {
           return "";
         }
-        return getValue(value.target, field.referencePath);
+        return SchemaEx.getValue(value.target, field.referencePath);
       }
       default: {
         return formatForEditing({
@@ -891,7 +863,7 @@ var TableModel = class extends Resource2 {
       const snapshot = {
         ...draftRow.data
       };
-      setValue(snapshot, field.path, transformedValue);
+      SchemaEx.setValue(snapshot, field.path, transformedValue);
       const validationErrors = this.validateDraftRowData(snapshot);
       if (validationErrors.length > 0) {
         const error = validationErrors.find((err) => err.path === field.path);
@@ -907,45 +879,23 @@ var TableModel = class extends Resource2 {
       };
     } else {
       const currentRow = this._registry.get(this._rows)[row];
-      invariant(currentRow, "Invalid row index", {
-        F: __dxlog_file,
-        L: 693,
-        S: this,
-        A: [
-          "currentRow",
-          "'Invalid row index'"
-        ]
-      });
+      invariant(currentRow, "Invalid row index", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 537, S: this, A: ["currentRow", "'Invalid row index'"] });
       const snapshot = {
         ...getSnapshot(currentRow)
       };
-      setValue(snapshot, field.path, transformedValue);
-      const schema = Obj.getSchema(currentRow);
-      invariant(schema, void 0, {
-        F: __dxlog_file,
-        L: 699,
-        S: this,
-        A: [
-          "schema",
-          ""
-        ]
-      });
+      SchemaEx.setValue(snapshot, field.path, transformedValue);
+      const type = Obj.getType(currentRow);
+      invariant(type, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 544, S: this, A: ["type", ""] });
+      const schema = Type.getSchema(type);
       const validationResult = validateSchema(schema, snapshot);
       if (validationResult && validationResult.length > 0) {
-        const error = validationResult[0];
-        invariant(error.path === field.path, void 0, {
-          F: __dxlog_file,
-          L: 704,
-          S: this,
-          A: [
-            "error.path === field.path",
-            ""
-          ]
-        });
-        return {
-          valid: false,
-          error: error.message
-        };
+        const error = validationResult.find((err) => err.path === field.path);
+        if (error) {
+          return {
+            valid: false,
+            error: error.message
+          };
+        }
       }
       return {
         valid: true
@@ -966,14 +916,14 @@ var TableModel = class extends Resource2 {
     }
     if (plane === "frozenRowsEnd") {
       if (row >= 0 && row < this._registry.get(this._draftRows).length) {
-        setValue(this._registry.get(this._draftRows)[row].data, field.path, transformedValue);
+        SchemaEx.setValue(this._registry.get(this._draftRows)[row].data, field.path, transformedValue);
         this.validateDraftRow(row);
       }
     } else {
       const sortedRows = this._registry.get(this._sortedRows);
       const rowData = sortedRows[row];
       this._change.row(rowData, (mutableRow) => {
-        setValue(mutableRow, field.path, transformedValue);
+        SchemaEx.setValue(mutableRow, field.path, transformedValue);
       });
     }
   };
@@ -987,10 +937,10 @@ var TableModel = class extends Resource2 {
     const field = fields[col];
     const sortedRows = this._registry.get(this._sortedRows);
     const rowData = sortedRows[row];
-    const value = getValue(rowData, field.path);
+    const value = SchemaEx.getValue(rowData, field.path);
     const updatedValue = update(value);
     this._change.row(rowData, (mutableRow) => {
-      setValue(mutableRow, field.path, updatedValue);
+      SchemaEx.setValue(mutableRow, field.path, updatedValue);
     });
   }
   /**
@@ -1105,12 +1055,12 @@ var TableModel = class extends Resource2 {
       const field = this._projection.getFields().find((f) => f.id === inMemorySort.fieldId);
       if (field) {
         const newQuery = baseQuery.orderBy(Order.property(field.path, inMemorySort.direction));
-        Obj.change(view, (view2) => {
+        Obj.update(view, (view2) => {
           view2.query.ast = newQuery.ast;
         });
       }
     } else {
-      Obj.change(view, (view2) => {
+      Obj.update(view, (view2) => {
         view2.query.ast = baseQuery.ast;
       });
     }
@@ -1168,7 +1118,8 @@ var editorTextToCellValue = (props, value) => {
 import { Atom as Atom3 } from "@effect-atom/atom-react";
 import * as Predicate from "effect/Predicate";
 import { Obj as Obj2 } from "@dxos/echo";
-import { Format as Format3, TypeEnum, getValue as getValue2 } from "@dxos/echo/internal";
+import { Format as Format3, TypeEnum } from "@dxos/echo/Format";
+import { SchemaEx as SchemaEx2 } from "@dxos/effect";
 import { cellClassesForFieldType, formatForDisplay } from "@dxos/react-ui-form";
 import { toPlaneCellIndex } from "@dxos/react-ui-grid";
 import { VIEW_FIELD_LIMIT } from "@dxos/schema";
@@ -1249,7 +1200,7 @@ var TablePresentation = class {
     const { props } = this.getFieldProjection(field.id);
     const cell = {
       get value() {
-        const value = getValue2(obj, field.path);
+        const value = SchemaEx2.getValue(obj, field.path);
         if (value == null) {
           return "";
         }
@@ -1266,7 +1217,7 @@ var TablePresentation = class {
             if (!field.referencePath) {
               return "";
             }
-            return getValue2(value.target, field.referencePath);
+            return SchemaEx2.getValue(value.target, field.referencePath);
           }
           default: {
             return formatForDisplay({
@@ -1289,7 +1240,7 @@ var TablePresentation = class {
     }
     cell.className = mx(classes);
     if (props.type === TypeEnum.Array) {
-      const targetArray = getValue2(obj, field.path);
+      const targetArray = SchemaEx2.getValue(obj, field.path);
       if (targetArray && Array.isArray(targetArray)) {
         const getLabel = (value) => {
           if (!value) {
@@ -1312,18 +1263,18 @@ var TablePresentation = class {
         const tags = targetArray.map(getLabel).filter(Predicate.isNotNullable).map((title) => {
           return `<span class="dx-tag" data-hue="neutral">${title}</span>`;
         }).join("");
-        cell.accessoryHtml = `<div role='none' class="flex flex-row gap-1 overflow-x-auto">${tags}</div>`;
+        cell.accessoryHtml = `<div class="flex flex-row gap-1 overflow-x-auto">${tags}</div>`;
       }
     }
     if (props.format === Format3.TypeFormat.Ref && props.referenceSchema) {
-      const targetObj = getValue2(obj, field.path)?.target;
+      const targetObj = SchemaEx2.getValue(obj, field.path)?.target;
       if (targetObj) {
-        const dxn = Obj2.getDXN(targetObj)?.toString();
-        cell.accessoryHtml = `<div role="none" class="absolute end-0 inset-y-0 p-(--dx-grid-cell-content-padding-block)"><dx-anchor dxn=${dxn} class="dx-button w-6 aspect-square min-h-0" data-dx-grid-action="accessory"><dx-icon icon="ph--link-simple--regular"/></dx-anchor></div>`;
+        const uri = Obj2.getURI(targetObj);
+        cell.accessoryHtml = `<div role="none" class="absolute end-0 inset-y-0 p-(--dx-grid-cell-content-padding-block)"><dx-anchor uri=${uri} class="dx-button w-6 aspect-square min-h-0" data-dx-grid-action="accessory"><dx-icon icon="ph--link-simple--regular"/></dx-anchor></div>`;
       }
     }
     if (props.format === Format3.TypeFormat.Boolean) {
-      const value = getValue2(obj, field.path);
+      const value = SchemaEx2.getValue(obj, field.path);
       cell.accessoryHtml = tableControls.switch.render({
         colIndex,
         rowIndex: displayIndex,
@@ -1332,7 +1283,7 @@ var TablePresentation = class {
       cell.readonly = "no-text-select";
     }
     if (props.format === Format3.TypeFormat.SingleSelect) {
-      const value = getValue2(obj, field.path);
+      const value = SchemaEx2.getValue(obj, field.path);
       const options = this.model.projection.getFieldProjection(field.id).props.options;
       if (options) {
         const option = options.find((o) => o.id === value);
@@ -1342,7 +1293,7 @@ var TablePresentation = class {
       }
     }
     if (props.format === Format3.TypeFormat.MultiSelect) {
-      const values = getValue2(obj, field.path);
+      const values = SchemaEx2.getValue(obj, field.path);
       const options = this.model.projection.getFieldProjection(field.id).props.options;
       if (options && values && values.length > 0) {
         const tags = values.map((value) => {
@@ -1591,11 +1542,11 @@ var cellClassesForRowSelection = (selected, selectionMode) => {
   switch (selectionMode) {
     case "single":
       return [
-        "dx-grid__cell--no-focus-unfurl !bg-current-surface hover:bg-hover-surface cursor-pointer!"
+        "dx-grid__cell--no-focus-unfurl bg-current-surface! hover:bg-hover-surface cursor-pointer!"
       ];
     case "multiple":
       return [
-        "!bg-grid-cell-selected"
+        "bg-grid-cell-selected!"
       ];
   }
 };
@@ -1622,7 +1573,7 @@ var useAddRow = ({ db, schema }) => {
 
 // src/hooks/useProjectionModel.ts
 import { useState } from "react";
-import { JsonSchema, Type } from "@dxos/echo";
+import { Type as Type2 } from "@dxos/echo";
 import { useAsyncEffect } from "@dxos/react-ui";
 import { ProjectionModel, createEchoChangeCallback as createEchoChangeCallback2 } from "@dxos/schema";
 var useProjectionModel = (schema, table, registry) => {
@@ -1630,8 +1581,8 @@ var useProjectionModel = (schema, table, registry) => {
   useAsyncEffect(async () => {
     if (schema && table) {
       const view = await table.view.load();
-      const jsonSchema = Type.isMutable(schema) ? schema.jsonSchema : JsonSchema.toJsonSchema(schema);
-      const change = createEchoChangeCallback2(view, Type.isMutable(schema) ? schema : void 0);
+      const jsonSchema = schema.jsonSchema;
+      const change = createEchoChangeCallback2(view, Type2.getDatabase(schema) != null ? schema : void 0);
       const projection2 = new ProjectionModel({
         registry,
         view,
@@ -1657,7 +1608,7 @@ import { useSelected, useSelectionActions } from "@dxos/react-ui-attention";
 import { isNonNullable } from "@dxos/util";
 var useTableModel = ({ object, projection, db, rows, rowActions, features, onSelectionChanged, onRowAction, ...props }) => {
   const registry = useContext(RegistryContext);
-  const selected = useSelected(object && Obj4.getDXN(object).toString(), "multi");
+  const selected = useSelected(object && Obj4.getURI(object), "multi");
   const initialSelection = useMemo(() => selected, [
     object
   ]);
@@ -1748,4 +1699,4 @@ export {
   useProjectionModel,
   useTableModel
 };
-//# sourceMappingURL=chunk-F7Y374KL.mjs.map
+//# sourceMappingURL=chunk-4KOQTPFC.mjs.map