@dxos/react-ui-table 0.11.1 → 0.12.0-next-73daef452f1464b62efdbca75fb0067c1066f264

package/dist/lib/chunk-types.mjs

@@ -1,8 +1,7 @@
 import { Annotation, DXN, JsonSchema, Obj, Ref, Type, View } from "@dxos/echo";
+import { SchemaAST } from "@dxos/effect";
 import { ViewAnnotation } from "@dxos/schema";
-import * as Match from "effect/Match";
 import * as Schema from "effect/Schema";
-import * as SchemaAST from "effect/SchemaAST";
 import { FormInputAnnotation, LabelAnnotation } from "@dxos/echo/Annotation";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -24,10 +23,7 @@ var Table_exports = /* @__PURE__ */ __exportAll({
 var Table = class extends Type.makeObject(DXN.make("org.dxos.type.table", "0.1.0"))(Schema.Struct({
 	name: Schema.String.pipe(Schema.optional),
 	view: Ref.Ref(View.View).pipe(FormInputAnnotation.set(false)),
-	sizes: Schema.Record({
-		key: Schema.String,
-		value: Schema.Number
-	}).pipe(Schema.mutable, FormInputAnnotation.set(false))
+	sizes: Schema.Record(Schema.String, Schema.Number).pipe(Schema.mutableKey, FormInputAnnotation.set(false))
 }).pipe(LabelAnnotation.set(["name"]), ViewAnnotation.set(["view"]), Annotation.IconAnnotation.set({
 	icon: "ph--table--regular",
 	hue: "green"
@@ -36,28 +32,23 @@ var Table = class extends Type.makeObject(DXN.make("org.dxos.type.table", "0.1.0
 * Make a table as a view of a data set.
 */
 var make = ({ name, sizes = {}, view, jsonSchema }) => {
-	const table = Obj.make(Table, {
-		name,
-		view: Ref.make(view),
-		sizes
-	});
+	const initialSizes = { ...sizes };
 	if (jsonSchema) {
 		const schema = JsonSchema.toEffectSchema(jsonSchema);
-		const properties = SchemaAST.getPropertySignatures(schema.ast);
-		for (const property of properties) {
+		for (const property of SchemaAST.getPropertySignatures(schema.ast)) {
 			const name = property.name.toString();
-			if (sizes?.[name]) {
-				table.sizes[name] = sizes[name];
-				continue;
+			if (initialSizes[name] !== void 0) continue;
+			switch (property.type._tag) {
+				case "Boolean":
+				case "Number": initialSizes[name] = 100;
 			}
-			Match.type().pipe(Match.when({ _tag: "BooleanKeyword" }, () => {
-				table.sizes[name] = 100;
-			}), Match.when({ _tag: "NumberKeyword" }, () => {
-				table.sizes[name] = 100;
-			}), Match.orElse(() => {}))(property.type);
 		}
 	}
-	return table;
+	return Obj.make(Table, {
+		name,
+		view: Ref.make(view),
+		sizes: initialSizes
+	});
 };
 //#endregion
 export { Table_exports as n, Table as t };

package/dist/lib/chunk-types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"chunk-types.mjs","names":[],"sources":["../../src/types/Table.ts"],"sourcesContent":["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Match from 'effect/Match';\nimport * as Schema from 'effect/Schema';\nimport * as SchemaAST from 'effect/SchemaAST';\n\n// QueryAST is referenced indirectly through `Type.InstanceType<typeof TableSchema>`\n// (Ref.Ref(View.View) → View.View → QueryAST.Query) in the emitted .d.ts; the\n// namespace import keeps the inferred types portable.\n// eslint-disable-next-line unused-imports/no-unused-imports\nimport { Annotation, DXN, JsonSchema, Obj, QueryAST, Ref, Type, View } from '@dxos/echo';\nimport { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/Annotation';\nimport { type JsonSchema as JsonSchemaType } from '@dxos/echo/JsonSchema';\nimport { SchemaEx } from '@dxos/effect';\nimport { ViewAnnotation } from '@dxos/schema';\n\n// TODO(wittjosiah): Try to clean up this type inference.\nexport class Table extends Type.makeObject<Table>(DXN.make('org.dxos.type.table', '0.1.0'))(\n  Schema.Struct({\n    name: Schema.String.pipe(Schema.optional),\n\n    view: Ref.Ref(View.View).pipe(FormInputAnnotation.set(false)),\n\n    sizes: Schema.Record({\n      // TODO(wittjosiah): Should be JsonPath.\n      key: Schema.String,\n      value: Schema.Number,\n    }).pipe(Schema.mutable, FormInputAnnotation.set(false)),\n  }).pipe(\n    LabelAnnotation.set(['name']),\n    ViewAnnotation.set(['view']),\n    Annotation.IconAnnotation.set({ icon: 'ph--table--regular', hue: 'green' }),\n  ),\n) {}\n\ntype MakeProps = {\n  name?: string;\n  sizes?: Record<string, number>;\n  view: View.View;\n  /** Required to auto-size columns. */\n  jsonSchema?: JsonSchemaType;\n};\n\n/**\n * Make a table as a view of a data set.\n */\nexport const make = ({ name, sizes = {}, view, jsonSchema }: MakeProps): Table => {\n  const table = Obj.make(Table, { name, view: Ref.make(view), sizes } as Obj.MakeProps<typeof Table>);\n\n  // Preset sizes.\n  if (jsonSchema) {\n    const schema = JsonSchema.toEffectSchema(jsonSchema);\n    const properties = SchemaAST.getPropertySignatures(schema.ast);\n    for (const property of properties) {\n      const name = property.name.toString() as SchemaEx.JsonPath;\n      if (sizes?.[name]) {\n        table.sizes[name] = sizes[name];\n        continue;\n      }\n\n      Match.type<SchemaAST.AST>().pipe(\n        Match.when({ _tag: 'BooleanKeyword' }, () => {\n          table.sizes[name] = 100;\n        }),\n        Match.when({ _tag: 'NumberKeyword' }, () => {\n          table.sizes[name] = 100;\n        }),\n        Match.orElse(() => {\n          // Noop.\n        }),\n      )(property.type);\n    }\n  }\n\n  return table;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAmBA,IAAa,QAAb,cAA2B,KAAK,WAAkB,IAAI,KAAK,uBAAuB,OAAO,CAAC,CAAC,CACzF,OAAO,OAAO;CACZ,MAAM,OAAO,OAAO,KAAK,OAAO,QAAQ;CAExC,MAAM,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,oBAAoB,IAAI,KAAK,CAAC;CAE5D,OAAO,OAAO,OAAO;EAEnB,KAAK,OAAO;EACZ,OAAO,OAAO;CAChB,CAAC,CAAC,CAAC,KAAK,OAAO,SAAS,oBAAoB,IAAI,KAAK,CAAC;AACxD,CAAC,CAAC,CAAC,KACD,gBAAgB,IAAI,CAAC,MAAM,CAAC,GAC5B,eAAe,IAAI,CAAC,MAAM,CAAC,GAC3B,WAAW,eAAe,IAAI;CAAE,MAAM;CAAsB,KAAK;AAAQ,CAAC,CAC5E,CACF,CAAC,CAAC,CAAC;;;;AAaH,IAAa,QAAQ,EAAE,MAAM,QAAQ,CAAC,GAAG,MAAM,iBAAmC;CAChF,MAAM,QAAQ,IAAI,KAAK,OAAO;EAAE;EAAM,MAAM,IAAI,KAAK,IAAI;EAAG;CAAM,CAAgC;CAGlG,IAAI,YAAY;EACd,MAAM,SAAS,WAAW,eAAe,UAAU;EACnD,MAAM,aAAa,UAAU,sBAAsB,OAAO,GAAG;EAC7D,KAAK,MAAM,YAAY,YAAY;GACjC,MAAM,OAAO,SAAS,KAAK,SAAS;GACpC,IAAI,QAAQ,OAAO;IACjB,MAAM,MAAM,QAAQ,MAAM;IAC1B;GACF;GAEA,MAAM,KAAoB,CAAC,CAAC,KAC1B,MAAM,KAAK,EAAE,MAAM,iBAAiB,SAAS;IAC3C,MAAM,MAAM,QAAQ;GACtB,CAAC,GACD,MAAM,KAAK,EAAE,MAAM,gBAAgB,SAAS;IAC1C,MAAM,MAAM,QAAQ;GACtB,CAAC,GACD,MAAM,aAAa,CAEnB,CAAC,CACH,CAAC,CAAC,SAAS,IAAI;EACjB;CACF;CAEA,OAAO;AACT"}
+{"version":3,"file":"chunk-types.mjs","names":[],"sources":["../../src/types/Table.ts"],"sourcesContent":["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\n// QueryAST is referenced indirectly through `Type.InstanceType<typeof TableSchema>`\n// (Ref.Ref(View.View) → View.View → QueryAST.Query) in the emitted .d.ts; the\n// namespace import keeps the inferred types portable.\n// eslint-disable-next-line unused-imports/no-unused-imports\nimport { Annotation, DXN, JsonSchema, Obj, QueryAST, Ref, Type, View } from '@dxos/echo';\nimport { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/Annotation';\nimport { type JsonSchema as JsonSchemaType } from '@dxos/echo/JsonSchema';\nimport { SchemaAST, SchemaEx } from '@dxos/effect';\nimport { ViewAnnotation } from '@dxos/schema';\n\n// TODO(wittjosiah): Try to clean up this type inference.\nexport class Table extends Type.makeObject<Table>(DXN.make('org.dxos.type.table', '0.1.0'))(\n  Schema.Struct({\n    name: Schema.String.pipe(Schema.optional),\n\n    view: Ref.Ref(View.View).pipe(FormInputAnnotation.set(false)),\n\n    // TODO(wittjosiah): Key should be JsonPath.\n    sizes: Schema.Record(Schema.String, Schema.Number).pipe(Schema.mutableKey, FormInputAnnotation.set(false)),\n  }).pipe(\n    LabelAnnotation.set(['name']),\n    ViewAnnotation.set(['view']),\n    Annotation.IconAnnotation.set({ icon: 'ph--table--regular', hue: 'green' }),\n  ),\n) {}\n\ntype MakeProps = {\n  name?: string;\n  sizes?: Record<string, number>;\n  view: View.View;\n  /** Required to auto-size columns. */\n  jsonSchema?: JsonSchemaType;\n};\n\n/**\n * Make a table as a view of a data set.\n */\nexport const make = ({ name, sizes = {}, view, jsonSchema }: MakeProps): Table => {\n  // Preset sizes are computed before construction: Effect 4 records are readonly at the type level,\n  // so the defaults go in as initial props rather than being assigned onto the live object.\n  const initialSizes: Record<string, number> = { ...sizes };\n  if (jsonSchema) {\n    const schema = JsonSchema.toEffectSchema(jsonSchema);\n    for (const property of SchemaAST.getPropertySignatures(schema.ast)) {\n      const name = property.name.toString() as SchemaEx.JsonPath;\n      if (initialSizes[name] !== undefined) {\n        continue;\n      }\n\n      // A plain switch rather than `Match.when({ _tag })`: matching an object pattern against\n      // Effect 4's mutually recursive AST union expands into a mapped type the checker cannot resolve.\n      switch (property.type._tag) {\n        case 'Boolean':\n        case 'Number':\n          initialSizes[name] = 100;\n          break;\n      }\n    }\n  }\n\n  return Obj.make(Table, { name, view: Ref.make(view), sizes: initialSizes } as Obj.MakeProps<typeof Table>);\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAiBA,IAAa,QAAb,cAA2B,KAAK,WAAkB,IAAI,KAAK,uBAAuB,OAAO,CAAC,CAAC,CACzF,OAAO,OAAO;CACZ,MAAM,OAAO,OAAO,KAAK,OAAO,QAAQ;CAExC,MAAM,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC,KAAK,oBAAoB,IAAI,KAAK,CAAC;CAG5D,OAAO,OAAO,OAAO,OAAO,QAAQ,OAAO,MAAM,CAAC,CAAC,KAAK,OAAO,YAAY,oBAAoB,IAAI,KAAK,CAAC;AAC3G,CAAC,CAAC,CAAC,KACD,gBAAgB,IAAI,CAAC,MAAM,CAAC,GAC5B,eAAe,IAAI,CAAC,MAAM,CAAC,GAC3B,WAAW,eAAe,IAAI;CAAE,MAAM;CAAsB,KAAK;AAAQ,CAAC,CAC5E,CACF,CAAC,CAAC,CAAC;;;;AAaH,IAAa,QAAQ,EAAE,MAAM,QAAQ,CAAC,GAAG,MAAM,iBAAmC;CAGhF,MAAM,eAAuC,EAAE,GAAG,MAAM;CACxD,IAAI,YAAY;EACd,MAAM,SAAS,WAAW,eAAe,UAAU;EACnD,KAAK,MAAM,YAAY,UAAU,sBAAsB,OAAO,GAAG,GAAG;GAClE,MAAM,OAAO,SAAS,KAAK,SAAS;GACpC,IAAI,aAAa,UAAU,KAAA,GACzB;GAKF,QAAQ,SAAS,KAAK,MAAtB;IACE,KAAK;IACL,KAAK,UACH,aAAa,QAAQ;GAEzB;EACF;CACF;CAEA,OAAO,IAAI,KAAK,OAAO;EAAE;EAAM,MAAM,IAAI,KAAK,IAAI;EAAG,OAAO;CAAa,CAAgC;AAC3G"}

package/dist/lib/chunk-useTableModel.mjs

@@ -1,6 +1,6 @@
-import { Atom } from "@effect-atom/atom";
+import * as Atom from "effect/unstable/reactivity/Atom";
 import { useCallback, useContext, useEffect, useRef, useState } from "react";
-import { RegistryContext } from "@effect-atom/atom-react";
+import { RegistryContext } from "@effect/atom-react/RegistryContext";
 import { useAsyncEffect } from "@dxos/react-ui";
 import { ViewState, useManagerOptional, useSelection, useSelectionActions } from "@dxos/react-ui-attention";
 import { toPlaneCellIndex } from "@dxos/react-ui-grid";
@@ -341,9 +341,7 @@ var SelectionModel = class extends Resource {
 			case "all":
 				this._registry.set(this._selection, new Set(this._registry.get(this._rows).map((row) => row.id)));
 				break;
-			case "none":
-				this._registry.set(this._selection, /* @__PURE__ */ new Set());
-				break;
+			case "none": this._registry.set(this._selection, /* @__PURE__ */ new Set());
 		}
 	};
 };
@@ -444,7 +442,7 @@ var TableModel = class extends Resource {
 		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: 208,
+			L: 209,
 			S: this,
 			A: ["!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === 'single')", "'Single selection is not compatible with editable tables.'"]
 		});
@@ -517,7 +515,7 @@ var TableModel = class extends Resource {
 		invariant(view, "Table model not initialized", {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file,
-			L: 328,
+			L: 329,
 			S: this,
 			A: ["view", "'Table model not initialized'"]
 		});
@@ -634,7 +632,7 @@ var TableModel = class extends Resource {
 		invariant(this._columnMeta, void 0, {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file,
-			L: 470,
+			L: 471,
 			S: this,
 			A: ["this._columnMeta", ""]
 		});
@@ -656,7 +654,7 @@ var TableModel = class extends Resource {
 		invariant(this._object.view.target, "View must be loaded before initializing column meta", {
 			"~LogMeta": "~LogMeta",
 			F: __dxlog_file,
-			L: 494,
+			L: 495,
 			S: this,
 			A: ["this._object.view.target", "'View must be loaded before initializing column meta'"]
 		});
@@ -784,7 +782,8 @@ var TableModel = class extends Resource {
 		this._registry.set(this._draftRows, newDraftRows);
 	}
 	validateDraftRowData(data) {
-		return validateSchema(toEffectSchema(this._projection.baseSchema), data) || [];
+		const schema = toEffectSchema(this._projection.baseSchema);
+		return validateSchema(schema, data) || [];
 	}
 	commitDraftRow = (draftRowIndex) => {
 		if (draftRowIndex < 0 || draftRowIndex >= this._registry.get(this._draftRows).length) return false;
@@ -818,9 +817,10 @@ var TableModel = class extends Resource {
 		if (fieldIndex === void 0 || fieldIndex < 0 || fieldIndex >= fields.length) return;
 		const field = fields[fieldIndex];
 		let value;
-		if (plane === "frozenRowsEnd") if (row >= 0 && row < this._registry.get(this._draftRows).length) value = SchemaEx.getValue(this._registry.get(this._draftRows)[row].data, field.path);
-		else return;
-		else {
+		if (plane === "frozenRowsEnd") {
+			if (row >= 0 && row < this._registry.get(this._draftRows).length) value = SchemaEx.getValue(this._registry.get(this._draftRows)[row].data, field.path);
+			else return;
+		} else {
 			const sortedRows = this._registry.get(this._sortedRows);
 			value = SchemaEx.getValue(sortedRows[row], field.path);
 		}
@@ -868,7 +868,7 @@ var TableModel = class extends Resource {
 			invariant(currentRow, "Invalid row index", {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file,
-				L: 813,
+				L: 814,
 				S: this,
 				A: ["currentRow", "'Invalid row index'"]
 			});
@@ -878,11 +878,12 @@ var TableModel = class extends Resource {
 			invariant(type, void 0, {
 				"~LogMeta": "~LogMeta",
 				F: __dxlog_file,
-				L: 820,
+				L: 821,
 				S: this,
 				A: ["type", ""]
 			});
-			const validationResult = validateSchema(Type.getSchema(type), snapshot);
+			const schema = Type.getSchema(type);
+			const validationResult = validateSchema(schema, snapshot);
 			if (validationResult && validationResult.length > 0) {
 				const error = validationResult.find((err) => err.path === field.path);
 				if (error) return {
@@ -1168,7 +1169,7 @@ var TablePresentation = class {
 					if (typeof value === "object" && value.value) return `${value.value}`;
 					return "Object";
 				};
-				cell.accessoryHtml = `<div class="flex flex-row gap-1 overflow-x-auto">${targetArray.map(getLabel).filter(Predicate.isNotNullable).map((title) => {
+				cell.accessoryHtml = `<div class="flex flex-row gap-1 overflow-x-auto">${targetArray.map(getLabel).filter(Predicate.isNotNullish).map((title) => {
 					return `<span class="dx-tag" data-hue="neutral">${title}</span>`;
 				}).join("")}</div>`;
 			}
@@ -1477,8 +1478,10 @@ var safeHttpUrl = (value) => {
 */
 var escapeHtmlAttribute = (value) => value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 var cellClassesForRowSelection = (selected, selectionMode) => {
-	if (!selected) if (selectionMode === "single") return ["cursor-pointer!"];
-	else return;
+	if (!selected) {
+		if (selectionMode === "single") return ["cursor-pointer!"];
+		else return;
+	}
 	switch (selectionMode) {
 		case "single": return ["dx-grid__cell--no-focus-unfurl bg-current-surface! hover:bg-hover-surface cursor-pointer!"];
 		case "multiple": return ["bg-grid-cell-selected!"];
@@ -1510,11 +1513,12 @@ var useProjectionModel = (schema, table, registry) => {
 		if (schema && table) {
 			const view = await table.view.load();
 			const jsonSchema = schema.jsonSchema;
+			const change = createEchoChangeCallback(view, Type.getDatabase(schema) != null ? schema : void 0);
 			const projection = new ProjectionModel({
 				registry,
 				view,
 				baseSchema: jsonSchema,
-				change: createEchoChangeCallback(view, Type.getDatabase(schema) != null ? schema : void 0)
+				change
 			});
 			projection.normalizeView();
 			setProjection(projection);