@dxos/react-ui-table 0.8.2-main.2f9c567 → 0.8.2-main.5885341

package/src/components/Table/relations.stories.tsx

@@ -5,15 +5,14 @@
 import '@dxos-theme';
 
 import { type StoryObj, type Meta } from '@storybook/react';
-import { SchemaAST } from 'effect';
 import React, { useEffect, useMemo } from 'react';
 
-import { type BaseObject, ImmutableSchema, type BaseSchema, type HasId } from '@dxos/echo-schema';
+import { AST, type BaseObject, ImmutableSchema, type BaseSchema, type HasId } from '@dxos/echo-schema';
 import { getAnnotation } from '@dxos/effect';
 import { faker } from '@dxos/random';
 import { live, makeRef } from '@dxos/react-client/echo';
 import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
-import { DataType, createView, ViewProjection, ViewType } from '@dxos/schema';
+import { Contact, createView, Organization, ViewProjection, ViewType } from '@dxos/schema';
 import { createAsyncGenerator, type ValueGenerator } from '@dxos/schema/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
@@ -34,9 +33,9 @@ const useTestModel = <T extends BaseObject & HasId>(schema: BaseSchema<T>, count
   const { space } = useClientProvider();
 
   const table = useMemo(() => {
-    // const { typename } = pipe(schema.ast, SchemaAST.getAnnotation<TypeAnnotation>(TypeAnnotationId), Option.getOrThrow);
+    // const { typename } = pipe(schema.ast, AST.getAnnotation<TypeAnnotation>(TypeAnnotationId), Option.getOrThrow);
     const typename = schema.typename;
-    const name = getAnnotation<string>(SchemaAST.TitleAnnotationId)(schema.ast) ?? typename;
+    const name = getAnnotation<string>(AST.TitleAnnotationId)(schema.ast) ?? typename;
     const view = createView({ name, typename, jsonSchema: schema.jsonSchema });
     return live(TableType, { view: makeRef(view) });
   }, [schema]);
@@ -82,12 +81,12 @@ const useTestModel = <T extends BaseObject & HasId>(schema: BaseSchema<T>, count
 
 const DefaultStory = () => {
   // TODO(burdon): Remove need for ImmutableSchema wrapper at API-level.
-  const orgSchema = useMemo(() => new ImmutableSchema(DataType.Organization), []);
-  const { model: orgModel, presentation: orgPresentation } = useTestModel<DataType.Organization>(orgSchema, 50);
+  const orgSchema = useMemo(() => new ImmutableSchema(Organization), []);
+  const { model: orgModel, presentation: orgPresentation } = useTestModel<Organization>(orgSchema, 50);
 
   // TODO(burdon): Generate links with references.
-  const contactSchema = useMemo(() => new ImmutableSchema(DataType.Person), []);
-  const { model: contactModel, presentation: contactPresentation } = useTestModel<DataType.Person>(contactSchema, 50);
+  const contactSchema = useMemo(() => new ImmutableSchema(Contact), []);
+  const { model: contactModel, presentation: contactPresentation } = useTestModel<Contact>(contactSchema, 50);
 
   return (
     <div className='is-full bs-full grid grid-cols-2 divide-x divide-separator'>
@@ -107,7 +106,7 @@ const meta: Meta<typeof DefaultStory> = {
   parameters: { translations },
   decorators: [
     withClientProvider({
-      types: [TableType, ViewType, DataType.Organization, DataType.Person],
+      types: [TableType, ViewType, Organization, Contact],
       createIdentity: true,
       createSpace: true,
     }),

package/src/components/testing.ts

@@ -2,10 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import { useEffect } from 'react';
 
-import { setValue, toJsonSchema, TypeEnum, TypedObject, FormatEnum, ObjectId } from '@dxos/echo-schema';
+import { setValue, toJsonSchema, S, TypeEnum, TypedObject, FormatEnum } from '@dxos/echo-schema';
 import { faker } from '@dxos/random';
 import { live, makeRef } from '@dxos/react-client/echo';
 import { createView, type ViewProjection } from '@dxos/schema';
@@ -13,11 +12,11 @@ import { createView, type ViewProjection } from '@dxos/schema';
 import { TableType } from '../types';
 
 export const TestSchema = TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
-  id: ObjectId,
-  name: Schema.optional(Schema.String),
-  age: Schema.optional(Schema.Number),
-  active: Schema.optional(Schema.Boolean),
-  netWorth: Schema.optional(Schema.Number),
+  id: S.String,
+  name: S.optional(S.String),
+  age: S.optional(S.Number),
+  active: S.optional(S.Boolean),
+  netWorth: S.optional(S.Number),
 });
 
 export const createTable = (schema = TestSchema) => {

package/src/model/table-model.test.ts

@@ -3,10 +3,9 @@
 //
 
 import { computed } from '@preact/signals-core';
-import { Schema } from 'effect';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { TypedObject } from '@dxos/echo-schema';
+import { S, TypedObject } from '@dxos/echo-schema';
 import { updateCounter } from '@dxos/echo-schema/testing';
 import { registerSignalsRuntime } from '@dxos/echo-signals';
 import { createEchoSchema } from '@dxos/live-object/testing';
@@ -100,8 +99,8 @@ describe('TableModel', () => {
 });
 
 class Test extends TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
-  title: Schema.String,
-  completed: Schema.Boolean,
+  title: S.String,
+  completed: S.Boolean,
 }) {}
 
 const createTableModel = (props: Partial<TableModelProps> = {}): TableModel => {

package/src/model/table-presentation.test.ts

@@ -2,10 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import { describe, expect, it, beforeEach } from 'vitest';
 
-import { TypedObject } from '@dxos/echo-schema';
+import { S, TypedObject } from '@dxos/echo-schema';
 import { live, makeRef } from '@dxos/live-object';
 import { createEchoSchema } from '@dxos/live-object/testing';
 import { createView, ViewProjection } from '@dxos/schema';
@@ -90,8 +89,8 @@ describe('TablePresentation', () => {
 });
 
 class Test extends TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
-  title: Schema.String,
-  completed: Schema.Boolean,
+  title: S.String,
+  completed: S.Boolean,
 }) {}
 
 const createTableModel = (props: Partial<TableModelProps> = {}): TableModel => {

package/src/types/table.ts

@@ -2,28 +2,20 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
-
-import { Type } from '@dxos/echo';
+import { EchoObject, Expando, LabelAnnotationId, ObjectId, Ref, S } from '@dxos/echo-schema';
 // import { ThreadType } from '@dxos/plugin-space/types';
-import { LabelAnnotationId } from '@dxos/echo-schema';
 import { ViewType } from '@dxos/schema';
 
-export const TableSchema = Schema.Struct({
-  id: Type.ObjectId,
-  name: Schema.optional(Schema.String),
-  view: Schema.optional(Type.Ref(ViewType)),
+export const TableSchema = S.Struct({
+  id: ObjectId,
+  name: S.optional(S.String),
+  view: S.optional(Ref(ViewType)),
   // TODO(burdon): Document why threads is included here?
-  threads: Schema.optional(Schema.Array(Type.Ref(Type.Expando /* ThreadType */))),
+  threads: S.optional(S.Array(Ref(Expando /* ThreadType */))),
 }).annotations({
   // TODO(burdon): Move annotation to property.
   [LabelAnnotationId]: 'name',
 });
 
-export const TableType = TableSchema.pipe(
-  Type.def({
-    typename: 'dxos.org/type/Table',
-    version: '0.1.0',
-  }),
-);
-export interface TableType extends Schema.Schema.Type<typeof TableType> {}
+export const TableType = TableSchema.pipe(EchoObject({ typename: 'dxos.org/type/Table', version: '0.1.0' }));
+export interface TableType extends S.Schema.Type<typeof TableType> {}

package/src/util/table.ts

@@ -2,14 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema, SchemaAST } from 'effect';
-
 import {
+  AST,
   type EchoSchema,
   Format,
   FormatEnum,
   type JsonPath,
   type JsonProp,
+  S,
   TypedObject,
   TypeEnum,
 } from '@dxos/echo-schema';
@@ -34,7 +34,7 @@ export const initializeTable = async ({
   table,
   typename,
   initialRow = true,
-}: InitialiseTableProps): Promise<Schema.Schema.AnyNoContext> => {
+}: InitialiseTableProps): Promise<S.Schema.AnyNoContext> => {
   if (typename) {
     const schema = await space.db.graph.getSchemaByTypename(typename, space.db);
     if (!schema) {
@@ -82,10 +82,10 @@ const ContactSchema = TypedObject({
   typename: `example.com/type/${PublicKey.random().truncate()}`,
   version: '0.1.0',
 })({
-  name: Schema.optional(Schema.String).annotations({ [SchemaAST.TitleAnnotationId]: 'Name' }),
-  active: Schema.optional(Schema.Boolean),
-  email: Schema.optional(Format.Email),
-  salary: Schema.optional(Format.Currency()).annotations({ [SchemaAST.TitleAnnotationId]: 'Salary' }),
+  name: S.optional(S.String).annotations({ [AST.TitleAnnotationId]: 'Name' }),
+  active: S.optional(S.Boolean),
+  email: S.optional(Format.Email),
+  salary: S.optional(Format.Currency()).annotations({ [AST.TitleAnnotationId]: 'Salary' }),
 });
 
 const ContactFields = ['name', 'email', 'salary', 'active'];

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

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

package/dist/lib/browser/chunk-UGGYKLOH.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\nimport { Type } from '@dxos/echo';\n// import { ThreadType } from '@dxos/plugin-space/types';\nimport { LabelAnnotationId } from '@dxos/echo-schema';\nimport { ViewType } from '@dxos/schema';\n\nexport const TableSchema = Schema.Struct({\n  id: Type.ObjectId,\n  name: Schema.optional(Schema.String),\n  view: Schema.optional(Type.Ref(ViewType)),\n  // TODO(burdon): Document why threads is included here?\n  threads: Schema.optional(Schema.Array(Type.Ref(Type.Expando /* ThreadType */))),\n}).annotations({\n  // TODO(burdon): Move annotation to property.\n  [LabelAnnotationId]: 'name',\n});\n\nexport const TableType = TableSchema.pipe(\n  Type.def({\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;AAEvB,SAASC,YAAY;AAErB,SAASC,yBAAyB;AAClC,SAASC,gBAAgB;AAElB,IAAMC,cAAcC,OAAOC,OAAO;EACvCC,IAAIC,KAAKC;EACTC,MAAML,OAAOM,SAASN,OAAOO,MAAM;EACnCC,MAAMR,OAAOM,SAASH,KAAKM,IAAIC,QAAAA,CAAAA;;EAE/BC,SAASX,OAAOM,SAASN,OAAOY,MAAMT,KAAKM;IAAIN,KAAKU;;EAAsB,CAAA,CAAA;AAC5E,CAAA,EAAGC,YAAY;;EAEb,CAACC,iBAAAA,GAAoB;AACvB,CAAA;AAEO,IAAMC,YAAYjB,YAAYkB,KACnCd,KAAKe,IAAI;EACPC,UAAU;EACVC,SAAS;AACX,CAAA,CAAA;",
-  "names": ["Schema", "Type", "LabelAnnotationId", "ViewType", "TableSchema", "Schema", "Struct", "id", "Type", "ObjectId", "name", "optional", "String", "view", "Ref", "ViewType", "threads", "Array", "Expando", "annotations", "LabelAnnotationId", "TableType", "pipe", "def", "typename", "version"]
-}

package/dist/lib/node/chunk-2QLLIPZK.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\nimport { Type } from '@dxos/echo';\n// import { ThreadType } from '@dxos/plugin-space/types';\nimport { LabelAnnotationId } from '@dxos/echo-schema';\nimport { ViewType } from '@dxos/schema';\n\nexport const TableSchema = Schema.Struct({\n  id: Type.ObjectId,\n  name: Schema.optional(Schema.String),\n  view: Schema.optional(Type.Ref(ViewType)),\n  // TODO(burdon): Document why threads is included here?\n  threads: Schema.optional(Schema.Array(Type.Ref(Type.Expando /* ThreadType */))),\n}).annotations({\n  // TODO(burdon): Move annotation to property.\n  [LabelAnnotationId]: 'name',\n});\n\nexport const TableType = TableSchema.pipe(\n  Type.def({\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;AAEvB,kBAAqB;AAErB,yBAAkC;AAClC,oBAAyB;AAElB,IAAMA,cAAcC,qBAAOC,OAAO;EACvCC,IAAIC,iBAAKC;EACTC,MAAML,qBAAOM,SAASN,qBAAOO,MAAM;EACnCC,MAAMR,qBAAOM,SAASH,iBAAKM,IAAIC,sBAAAA,CAAAA;;EAE/BC,SAASX,qBAAOM,SAASN,qBAAOY,MAAMT,iBAAKM;IAAIN,iBAAKU;;EAAsB,CAAA,CAAA;AAC5E,CAAA,EAAGC,YAAY;;EAEb,CAACC,oCAAAA,GAAoB;AACvB,CAAA;AAEO,IAAMC,YAAYjB,YAAYkB,KACnCd,iBAAKe,IAAI;EACPC,UAAU;EACVC,SAAS;AACX,CAAA,CAAA;",
-  "names": ["TableSchema", "Schema", "Struct", "id", "Type", "ObjectId", "name", "optional", "String", "view", "Ref", "ViewType", "threads", "Array", "Expando", "annotations", "LabelAnnotationId", "TableType", "pipe", "def", "typename", "version"]
-}

package/dist/lib/node-esm/chunk-N2RRVR7F.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\nimport { Type } from '@dxos/echo';\n// import { ThreadType } from '@dxos/plugin-space/types';\nimport { LabelAnnotationId } from '@dxos/echo-schema';\nimport { ViewType } from '@dxos/schema';\n\nexport const TableSchema = Schema.Struct({\n  id: Type.ObjectId,\n  name: Schema.optional(Schema.String),\n  view: Schema.optional(Type.Ref(ViewType)),\n  // TODO(burdon): Document why threads is included here?\n  threads: Schema.optional(Schema.Array(Type.Ref(Type.Expando /* ThreadType */))),\n}).annotations({\n  // TODO(burdon): Move annotation to property.\n  [LabelAnnotationId]: 'name',\n});\n\nexport const TableType = TableSchema.pipe(\n  Type.def({\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;AAEvB,SAASC,YAAY;AAErB,SAASC,yBAAyB;AAClC,SAASC,gBAAgB;AAElB,IAAMC,cAAcC,OAAOC,OAAO;EACvCC,IAAIC,KAAKC;EACTC,MAAML,OAAOM,SAASN,OAAOO,MAAM;EACnCC,MAAMR,OAAOM,SAASH,KAAKM,IAAIC,QAAAA,CAAAA;;EAE/BC,SAASX,OAAOM,SAASN,OAAOY,MAAMT,KAAKM;IAAIN,KAAKU;;EAAsB,CAAA,CAAA;AAC5E,CAAA,EAAGC,YAAY;;EAEb,CAACC,iBAAAA,GAAoB;AACvB,CAAA;AAEO,IAAMC,YAAYjB,YAAYkB,KACnCd,KAAKe,IAAI;EACPC,UAAU;EACVC,SAAS;AACX,CAAA,CAAA;",
-  "names": ["Schema", "Type", "LabelAnnotationId", "ViewType", "TableSchema", "Schema", "Struct", "id", "Type", "ObjectId", "name", "optional", "String", "view", "Ref", "ViewType", "threads", "Array", "Expando", "annotations", "LabelAnnotationId", "TableType", "pipe", "def", "typename", "version"]
-}