@dxos/react-ui-table 0.8.3 → 0.8.4-main.28f8d3d

package/src/util/table.ts

@@ -2,126 +2,52 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { Match } from 'effect';
 
-import {
-  type EchoSchema,
-  Format,
-  FormatEnum,
-  type JsonPath,
-  type JsonProp,
-  Ref,
-  TypedObject,
-  TypeEnum,
-} from '@dxos/echo-schema';
-import { type Client, PublicKey } from '@dxos/react-client';
-import { live, type Space } from '@dxos/react-client/echo';
-import { createFieldId, createView, getSchemaProperties, ViewProjection, type ViewType } from '@dxos/schema';
+import { Obj } from '@dxos/echo';
+import { type JsonPath, type JsonSchemaType, toEffectSchema } from '@dxos/echo-schema';
+import { type SimpleType } from '@dxos/effect';
+import { type CreateViewFromSpaceProps, type DataType, createViewFromSpace, getSchemaProperties } from '@dxos/schema';
 
-import { type TableType } from '../types';
+import { TableView } from '../types';
 
-// TODO(ZaymonFC): We don't need the client anymore.
-type InitialiseTableProps = {
-  client: Client;
-  space: Space;
-  table: TableType;
-  typename?: string;
-  initialRow?: boolean;
+type CreateTableProps = Omit<CreateViewFromSpaceProps, 'presentation'> & {
+  sizes?: Record<string, number>;
 };
 
-export const initializeTable = async ({
-  client,
-  space,
-  table,
-  typename,
-  initialRow = true,
-}: InitialiseTableProps): Promise<Schema.Schema.AnyNoContext> => {
-  if (typename) {
-    const schema = await space.db.graph.getSchemaByTypename(typename, space.db);
-    if (!schema) {
-      throw new Error(`Schema not found: ${typename}`);
+export const createTable = async ({
+  sizes,
+  ...props
+}: CreateTableProps): Promise<{
+  jsonSchema: JsonSchemaType;
+  view: DataType.View;
+  schema: ReturnType<typeof toEffectSchema>;
+}> => {
+  const table = Obj.make(TableView, { sizes: {} });
+  const { jsonSchema, view } = await createViewFromSpace({ ...props, presentation: table });
+
+  // Preset sizes.
+  const schema = toEffectSchema(jsonSchema);
+  const shouldIncludeId = props.fields?.find((field) => field === 'id') !== undefined;
+  const properties = getSchemaProperties(schema.ast, {}, shouldIncludeId);
+  for (const property of properties) {
+    if (sizes?.[property.name]) {
+      table.sizes[property.name as JsonPath] = sizes[property.name];
+      continue;
     }
 
-    const fields = getSchemaProperties(schema.ast).map((prop) => prop.name);
-
-    table.view = Ref.make(
-      createView({
-        // TODO(ZaymonFC): Don't hardcode name?
-        name: 'View',
-        typename: schema.typename,
-        jsonSchema: schema.jsonSchema,
-        fields,
+    Match.type<SimpleType>().pipe(
+      Match.when('boolean', () => {
+        table.sizes[property.name as JsonPath] = 100;
       }),
-    );
-
-    return schema;
-  } else {
-    const [schema] = await space.db.schemaRegistry.register([createContactSchema()]);
-    const fields = ContactFields;
-
-    table.view = Ref.make(
-      createView({
-        name: 'View',
-        typename: schema.typename,
-        jsonSchema: schema.jsonSchema,
-        fields,
+      Match.when('number', () => {
+        table.sizes[property.name as JsonPath] = 100;
       }),
-    );
-
-    createProjection(schema, table.view.target!);
-
-    if (initialRow) {
-      // TODO(burdon): Last (first) row should not be in db and should be managed by the model.
-      space.db.add(live(schema, {}));
-    }
-
-    return schema;
+      Match.orElse(() => {
+        // Noop.
+      }),
+    )(property.type);
   }
-};
-
-const createContactSchema = () =>
-  TypedObject({
-    typename: `example.com/type/${PublicKey.random().truncate()}`,
-    version: '0.1.0',
-  })({
-    name: Schema.optional(Schema.String).annotations({ title: 'Name' }),
-    active: Schema.optional(Schema.Boolean).annotations({ title: 'Active' }),
-    email: Schema.optional(Format.Email),
-    salary: Schema.optional(Format.Currency()).annotations({ title: 'Salary' }),
-  });
-
-const ContactFields = ['name', 'email', 'salary', 'active'];
-
-const createProjection = (schema: EchoSchema, view: ViewType): ViewProjection => {
-  const projection = new ViewProjection(schema.jsonSchema, view);
-  projection.setFieldProjection({
-    field: {
-      id: view.fields.find((f) => f.path === 'salary')!.id,
-      path: 'salary' as JsonPath,
-      size: 150,
-    },
-  });
-  projection.setFieldProjection({
-    field: {
-      id: view.fields.find((f) => f.path === 'active')!.id,
-      path: 'active' as JsonPath,
-      size: 100,
-    },
-  });
-  projection.setFieldProjection({
-    field: {
-      id: createFieldId(),
-      path: 'manager' as JsonPath,
-      referencePath: 'name' as JsonPath,
-    },
-    props: {
-      property: 'manager' as JsonProp,
-      type: TypeEnum.Ref,
-      format: FormatEnum.Ref,
-      referenceSchema: schema.typename,
-      title: 'Manager',
-    },
-  });
 
-  return projection;
+  return { jsonSchema, schema, view };
 };

package/dist/lib/browser/chunk-TL7CKQQV.mjs

@@ -1,27 +0,0 @@
-// packages/ui/react-ui-table/src/types/table.ts
-import { Schema } from "effect";
-import { Type } from "@dxos/echo";
-import { ObjectId, Ref, Expando, LabelAnnotation } from "@dxos/echo-schema";
-import { ViewType } from "@dxos/schema";
-var TableSchema = Schema.Struct({
-  id: ObjectId,
-  name: Schema.optional(Schema.String),
-  view: Schema.optional(Ref(ViewType)),
-  // TODO(burdon): Document why threads is included here?
-  threads: Schema.optional(Schema.Array(Ref(
-    Expando
-    /* ThreadType */
-  )))
-}).pipe(LabelAnnotation.set([
-  "name"
-]));
-var TableType = TableSchema.pipe(Type.Obj({
-  typename: "dxos.org/type/Table",
-  version: "0.1.0"
-}));
-
-export {
-  TableSchema,
-  TableType
-};
-//# sourceMappingURL=chunk-TL7CKQQV.mjs.map

package/dist/lib/browser/chunk-TL7CKQQV.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/types/table.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { Schema } from 'effect';\n\n// import { ThreadType } from '@dxos/plugin-space/types';\nimport { Type } from '@dxos/echo';\nimport { ObjectId, Ref, Expando, LabelAnnotation } from '@dxos/echo-schema';\nimport { ViewType } from '@dxos/schema';\n\nexport const TableSchema = Schema.Struct({\n  id: ObjectId,\n  name: Schema.optional(Schema.String),\n  view: Schema.optional(Ref(ViewType)),\n  // TODO(burdon): Document why threads is included here?\n  threads: Schema.optional(Schema.Array(Ref(Expando /* ThreadType */))),\n}).pipe(LabelAnnotation.set(['name']));\n\n// TODO(burdon): Move out of react-ui-xxx.\nexport const TableType = TableSchema.pipe(\n  Type.Obj({\n    typename: 'dxos.org/type/Table',\n    version: '0.1.0',\n  }),\n);\nexport interface TableType extends Schema.Schema.Type<typeof TableType> {}\n"],
-  "mappings": ";AAIA,SAASA,cAAc;AAGvB,SAASC,YAAY;AACrB,SAASC,UAAUC,KAAKC,SAASC,uBAAuB;AACxD,SAASC,gBAAgB;AAElB,IAAMC,cAAcC,OAAOC,OAAO;EACvCC,IAAIC;EACJC,MAAMJ,OAAOK,SAASL,OAAOM,MAAM;EACnCC,MAAMP,OAAOK,SAASG,IAAIC,QAAAA,CAAAA;;EAE1BC,SAASV,OAAOK,SAASL,OAAOW,MAAMH;IAAII;;EAAsB,CAAA,CAAA;AAClE,CAAA,EAAGC,KAAKC,gBAAgBC,IAAI;EAAC;CAAO,CAAA;AAG7B,IAAMC,YAAYjB,YAAYc,KACnCI,KAAKC,IAAI;EACPC,UAAU;EACVC,SAAS;AACX,CAAA,CAAA;",
-  "names": ["Schema", "Type", "ObjectId", "Ref", "Expando", "LabelAnnotation", "ViewType", "TableSchema", "Schema", "Struct", "id", "ObjectId", "name", "optional", "String", "view", "Ref", "ViewType", "threads", "Array", "Expando", "pipe", "LabelAnnotation", "set", "TableType", "Type", "Obj", "typename", "version"]
-}

package/dist/lib/node/chunk-O2VPBNS5.cjs

@@ -1,50 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_O2VPBNS5_exports = {};
-__export(chunk_O2VPBNS5_exports, {
-  TableSchema: () => TableSchema,
-  TableType: () => TableType
-});
-module.exports = __toCommonJS(chunk_O2VPBNS5_exports);
-var import_effect = require("effect");
-var import_echo = require("@dxos/echo");
-var import_echo_schema = require("@dxos/echo-schema");
-var import_schema = require("@dxos/schema");
-var TableSchema = import_effect.Schema.Struct({
-  id: import_echo_schema.ObjectId,
-  name: import_effect.Schema.optional(import_effect.Schema.String),
-  view: import_effect.Schema.optional((0, import_echo_schema.Ref)(import_schema.ViewType)),
-  // TODO(burdon): Document why threads is included here?
-  threads: import_effect.Schema.optional(import_effect.Schema.Array((0, import_echo_schema.Ref)(
-    import_echo_schema.Expando
-    /* ThreadType */
-  )))
-}).pipe(import_echo_schema.LabelAnnotation.set([
-  "name"
-]));
-var TableType = TableSchema.pipe(import_echo.Type.Obj({
-  typename: "dxos.org/type/Table",
-  version: "0.1.0"
-}));
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  TableSchema,
-  TableType
-});
-//# sourceMappingURL=chunk-O2VPBNS5.cjs.map

package/dist/lib/node/chunk-O2VPBNS5.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/types/table.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { Schema } from 'effect';\n\n// import { ThreadType } from '@dxos/plugin-space/types';\nimport { Type } from '@dxos/echo';\nimport { ObjectId, Ref, Expando, LabelAnnotation } from '@dxos/echo-schema';\nimport { ViewType } from '@dxos/schema';\n\nexport const TableSchema = Schema.Struct({\n  id: ObjectId,\n  name: Schema.optional(Schema.String),\n  view: Schema.optional(Ref(ViewType)),\n  // TODO(burdon): Document why threads is included here?\n  threads: Schema.optional(Schema.Array(Ref(Expando /* ThreadType */))),\n}).pipe(LabelAnnotation.set(['name']));\n\n// TODO(burdon): Move out of react-ui-xxx.\nexport const TableType = TableSchema.pipe(\n  Type.Obj({\n    typename: 'dxos.org/type/Table',\n    version: '0.1.0',\n  }),\n);\nexport interface TableType extends Schema.Schema.Type<typeof TableType> {}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAIA,oBAAuB;AAGvB,kBAAqB;AACrB,yBAAwD;AACxD,oBAAyB;AAElB,IAAMA,cAAcC,qBAAOC,OAAO;EACvCC,IAAIC;EACJC,MAAMJ,qBAAOK,SAASL,qBAAOM,MAAM;EACnCC,MAAMP,qBAAOK,aAASG,wBAAIC,sBAAAA,CAAAA;;EAE1BC,SAASV,qBAAOK,SAASL,qBAAOW,UAAMH;IAAII;;EAAsB,CAAA,CAAA;AAClE,CAAA,EAAGC,KAAKC,mCAAgBC,IAAI;EAAC;CAAO,CAAA;AAG7B,IAAMC,YAAYjB,YAAYc,KACnCI,iBAAKC,IAAI;EACPC,UAAU;EACVC,SAAS;AACX,CAAA,CAAA;",
-  "names": ["TableSchema", "Schema", "Struct", "id", "ObjectId", "name", "optional", "String", "view", "Ref", "ViewType", "threads", "Array", "Expando", "pipe", "LabelAnnotation", "set", "TableType", "Type", "Obj", "typename", "version"]
-}