@dxos/react-ui-form 0.8.2-main.2f9c567 → 0.8.2-main.36232bc

package/src/components/Form/ArrayField.tsx

@@ -2,10 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { SchemaAST, pipe } from 'effect';
+import { pipe } from 'effect';
 import { capitalize } from 'effect/String';
 import React, { useCallback, useMemo } from 'react';
 
+import { AST } from '@dxos/echo-schema';
 import { findNode, getDiscriminatedType, isDiscriminatedUnion, SimpleType } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
 import { IconButton, useTranslation } from '@dxos/react-ui';
@@ -38,12 +39,12 @@ export const ArrayField = ({ property, readonly, path, inputProps, Custom, looku
   invariant(Array.isArray(values), `Values at path ${path?.join('.')} must be an array.`);
   const label = title ?? pipe(name, capitalize);
 
-  const tupleType = findNode(ast, SchemaAST.isTupleType);
-  const elementType = (tupleType as SchemaAST.TupleType | undefined)?.rest[0]?.type;
+  const tupleType = findNode(ast, AST.isTupleType);
+  const elementType = (tupleType as AST.TupleType | undefined)?.rest[0]?.type;
 
-  const getDefaultObjectValue = (typeNode: SchemaAST.AST): any => {
+  const getDefaultObjectValue = (typeNode: AST.AST): any => {
     const baseNode = findNode(typeNode, isDiscriminatedUnion);
-    const typeLiteral = baseNode ? getDiscriminatedType(baseNode, {}) : findNode(typeNode, SchemaAST.isTypeLiteral);
+    const typeLiteral = baseNode ? getDiscriminatedType(baseNode, {}) : findNode(typeNode, AST.isTypeLiteral);
     if (!typeLiteral) {
       return {};
     }

package/src/components/Form/Defaults.tsx

@@ -107,9 +107,6 @@ export const SelectInput = ({
 }: SelectInputOptions) => {
   const { status, error } = getStatus();
 
-  const value = getValue() as string | undefined;
-  const handleValueChange = useCallback((value: string | number) => onValueChange(type, value), [type, onValueChange]);
-
   return (
     <Input.Root validationValence={status}>
       {!inputOnly && (
@@ -117,7 +114,7 @@ export const SelectInput = ({
           <Input.Label>{label}</Input.Label>
         </InputHeader>
       )}
-      <Select.Root value={value} onValueChange={handleValueChange}>
+      <Select.Root value={getValue()} onValueChange={(value) => onValueChange(type, value)}>
         {/* TODO(burdon): Placeholder not working? */}
         <Select.TriggerButton classNames='is-full' disabled={disabled} placeholder={placeholder} />
         <Select.Portal>

package/src/components/Form/Form.stories.tsx

@@ -5,12 +5,9 @@
 import '@dxos-theme';
 
 import { type Meta, type StoryObj } from '@storybook/react';
-import { Schema, SchemaAST } from 'effect';
 import React, { useCallback, useState } from 'react';
 
-import { ContactType } from '@dxos/client/testing';
-import { type BaseObject, Expando, Format, getDXN, Ref, type TypeAnnotation } from '@dxos/echo-schema';
-import { live } from '@dxos/live-object';
+import { AST, type BaseObject, Format, S } from '@dxos/echo-schema';
 import { Testing } from '@dxos/schema/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
@@ -19,27 +16,25 @@ import { Form, type FormProps } from './Form';
 import translations from '../../translations';
 import { TestLayout, TestPanel } from '../testing';
 
-const AddressSchema = Schema.Struct({
-  street: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Street' })),
-  city: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'City' })),
-  zip: Schema.optional(
-    Schema.String.pipe(Schema.pattern(/^\d{5}(-\d{4})?$/)).annotations({ [SchemaAST.TitleAnnotationId]: 'ZIP' }),
-  ),
-  location: Schema.optional(Format.GeoPoint.annotations({ [SchemaAST.TitleAnnotationId]: 'Location' })),
-}).annotations({ [SchemaAST.TitleAnnotationId]: 'Address' });
+const AddressSchema = S.Struct({
+  street: S.optional(S.String.annotations({ [AST.TitleAnnotationId]: 'Street' })),
+  city: S.optional(S.String.annotations({ [AST.TitleAnnotationId]: 'City' })),
+  zip: S.optional(S.String.pipe(S.pattern(/^\d{5}(-\d{4})?$/)).annotations({ [AST.TitleAnnotationId]: 'ZIP' })),
+  location: S.optional(Format.GeoPoint.annotations({ [AST.TitleAnnotationId]: 'Location' })),
+}).annotations({ [AST.TitleAnnotationId]: 'Address' });
 
 // TODO(burdon): Translations?
-const TestSchema = Schema.Struct({
-  name: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Name' })),
-  active: Schema.optional(Schema.Boolean.annotations({ [SchemaAST.TitleAnnotationId]: 'Active' })),
-  rank: Schema.optional(Schema.Number.annotations({ [SchemaAST.TitleAnnotationId]: 'Rank' })),
-  website: Schema.optional(Format.URL.annotations({ [SchemaAST.TitleAnnotationId]: 'Website' })),
-  address: Schema.optional(AddressSchema),
-}).pipe(Schema.mutable);
+const TestSchema = S.Struct({
+  name: S.optional(S.String.annotations({ [AST.TitleAnnotationId]: 'Name' })),
+  active: S.optional(S.Boolean.annotations({ [AST.TitleAnnotationId]: 'Active' })),
+  rank: S.optional(S.Number.annotations({ [AST.TitleAnnotationId]: 'Rank' })),
+  website: S.optional(Format.URL.annotations({ [AST.TitleAnnotationId]: 'Website' })),
+  address: S.optional(AddressSchema),
+}).pipe(S.mutable);
 
-type TestType = Schema.Schema.Type<typeof TestSchema>;
+type TestType = S.Schema.Type<typeof TestSchema>;
 
-type StoryProps<T extends BaseObject> = { schema: Schema.Schema<T> } & FormProps<T>;
+type StoryProps<T extends BaseObject> = { schema: S.Schema<T> } & FormProps<T>;
 
 const DefaultStory = <T extends BaseObject>({ schema, values: initialValues, ...props }: StoryProps<T>) => {
   const [values, setValues] = useState(initialValues);
@@ -120,24 +115,22 @@ export const OrganizationAutoSave: Story<Testing.Organization> = {
 // TODO(burdon): Move into separate storybook and use test types.
 //
 
-const ShapeSchema = Schema.Struct({
-  shape: Schema.optional(
-    Schema.Union(
-      Schema.Struct({
-        type: Schema.Literal('circle').annotations({ [SchemaAST.TitleAnnotationId]: 'Type' }),
-        radius: Schema.optional(Schema.Number.annotations({ [SchemaAST.TitleAnnotationId]: 'Radius' })),
+const ShapeSchema = S.Struct({
+  shape: S.optional(
+    S.Union(
+      S.Struct({
+        type: S.Literal('circle').annotations({ [AST.TitleAnnotationId]: 'Type' }),
+        radius: S.optional(S.Number.annotations({ [AST.TitleAnnotationId]: 'Radius' })),
       }),
-      Schema.Struct({
-        type: Schema.Literal('square').annotations({ [SchemaAST.TitleAnnotationId]: 'Type' }),
-        size: Schema.optional(
-          Schema.Number.pipe(Schema.nonNegative()).annotations({ [SchemaAST.TitleAnnotationId]: 'Size' }),
-        ),
+      S.Struct({
+        type: S.Literal('square').annotations({ [AST.TitleAnnotationId]: 'Type' }),
+        size: S.optional(S.Number.pipe(S.nonNegative()).annotations({ [AST.TitleAnnotationId]: 'Size' })),
       }),
-    ).annotations({ [SchemaAST.TitleAnnotationId]: 'Shape' }),
+    ).annotations({ [AST.TitleAnnotationId]: 'Shape' }),
   ),
-}).pipe(Schema.mutable);
+}).pipe(S.mutable);
 
-type ShapeType = Schema.Schema.Type<typeof ShapeSchema>;
+type ShapeType = S.Schema.Type<typeof ShapeSchema>;
 
 type DiscriminatedUnionStoryProps = FormProps<ShapeType>;
 
@@ -183,12 +176,12 @@ export const DiscriminatedShape: StoryObj<DiscriminatedUnionStoryProps> = {
   },
 };
 
-const ArraysSchema = Schema.Struct({
-  names: Schema.Array(Schema.String.pipe(Schema.nonEmptyString())),
-  addresses: Schema.Array(AddressSchema),
-}).pipe(Schema.mutable);
+const ArraysSchema = S.Struct({
+  names: S.Array(S.String.pipe(S.nonEmptyString())),
+  addresses: S.Array(AddressSchema),
+}).pipe(S.mutable);
 
-type ArraysType = Schema.Schema.Type<typeof ArraysSchema>;
+type ArraysType = S.Schema.Type<typeof ArraysSchema>;
 
 const ArraysStory = ({ values: initialValues }: FormProps<ArraysType>) => {
   const [values, setValues] = useState(initialValues);
@@ -215,13 +208,13 @@ export const Arrays: StoryObj<FormProps<ArraysType>> = {
   },
 };
 
-const ColorSchema = Schema.Struct({
-  color: Schema.Union(Schema.Literal('red'), Schema.Literal('green'), Schema.Literal('blue')).annotations({
-    [SchemaAST.TitleAnnotationId]: 'Color',
+const ColorSchema = S.Struct({
+  color: S.Union(S.Literal('red'), S.Literal('green'), S.Literal('blue')).annotations({
+    [AST.TitleAnnotationId]: 'Color',
   }),
-}).pipe(Schema.mutable);
+}).pipe(S.mutable);
 
-type ColorType = Schema.Schema.Type<typeof ColorSchema>;
+type ColorType = S.Schema.Type<typeof ColorSchema>;
 
 const EnumStory = ({ values: initialValues }: FormProps<ColorType>) => {
   const [values, setValues] = useState(initialValues);
@@ -246,44 +239,3 @@ export const Enum: StoryObj<FormProps<ColorType>> = {
     },
   },
 };
-
-const RefSchema = Schema.Struct({
-  contact: Ref(ContactType).annotations({ title: 'Contact Reference' }),
-  optionalContact: Schema.optional(Ref(ContactType).annotations({ title: 'Optional Contact Reference' })),
-  unknownExpando: Schema.optional(Ref(Expando).annotations({ title: 'Optional Ref to an Expando (DXN Input)' })),
-});
-
-const RefStory = ({ values: initialValues }: FormProps<any>) => {
-  const [values, setValues] = useState(initialValues);
-  const handleSave = useCallback<NonNullable<FormProps<any>['onSave']>>((values) => {
-    setValues(values);
-  }, []);
-
-  const contact1 = live(ContactType, { identifiers: [] });
-  const contact2 = live(ContactType, { identifiers: [] });
-
-  const onQueryRefOptions = useCallback((typeInfo: TypeAnnotation) => {
-    switch (typeInfo.typename) {
-      case ContactType.typename:
-        return [
-          { dxn: getDXN(contact1)!, label: 'John Coltraine' },
-          { dxn: getDXN(contact2)!, label: 'Erykah Badu' },
-        ];
-      default:
-        return [];
-    }
-  }, []);
-
-  return (
-    <TestLayout json={{ values, schema: RefSchema.ast.toJSON() }}>
-      <TestPanel>
-        <Form schema={RefSchema} values={values} onSave={handleSave} onQueryRefOptions={onQueryRefOptions} />
-      </TestPanel>
-    </TestLayout>
-  );
-};
-
-export const Refs: StoryObj<FormProps<ContactType>> = {
-  render: RefStory,
-  args: { values: {} },
-};

package/src/components/Form/Form.tsx

@@ -2,10 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Schema } from 'effect';
 import React, { type ReactElement, useEffect, useMemo, useRef } from 'react';
 
-import { type BaseObject, type PropertyKey } from '@dxos/echo-schema';
+import { type BaseObject, type S, type PropertyKey } from '@dxos/echo-schema';
 import { type ThemedClassName } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 import { type SchemaProperty } from '@dxos/schema';
@@ -14,14 +13,13 @@ import { FormActions } from './FormActions';
 import { FormFields } from './FormContent';
 import { FormProvider } from './FormContext';
 import { type InputProps, type InputComponent } from './Input';
-import { type QueryRefOptions } from './RefField';
 import { type FormOptions } from '../../hooks';
 
 export type PropsFilter<T extends BaseObject> = (props: SchemaProperty<T>[]) => SchemaProperty<T>[];
 
 export type ComponentLookup = (args: {
   prop: string;
-  schema: Schema.Schema<any>;
+  schema: S.Schema<any>;
   inputProps: InputProps;
 }) => ReactElement | undefined;
 
@@ -43,7 +41,6 @@ export type FormProps<T extends BaseObject> = ThemedClassName<
     autoSave?: boolean;
     testId?: string;
     onCancel?: () => void;
-    onQueryRefOptions?: QueryRefOptions;
     lookupComponent?: ComponentLookup;
     /**
      * Map of custom renderers for specific properties.
@@ -68,7 +65,6 @@ export const Form = <T extends BaseObject>({
   onValidate,
   onSave,
   onCancel,
-  onQueryRefOptions,
   lookupComponent,
   Custom,
 }: FormProps<T>) => {
@@ -104,7 +100,6 @@ export const Form = <T extends BaseObject>({
           readonly={readonly}
           filter={filter}
           sort={sort}
-          onQueryRefOptions={onQueryRefOptions}
           lookupComponent={lookupComponent}
           Custom={Custom}
         />

package/src/components/Form/FormContent.tsx

@@ -1,11 +1,12 @@
 //
-// Copyright 2025 DXOS.org
+// Copyright 2024 DXOS.org
 //
 
-import { Schema, SchemaAST, pipe } from 'effect';
+import { pipe } from 'effect';
 import { capitalize } from 'effect/String';
 import React, { useMemo } from 'react';
 
+import { AST, S } from '@dxos/echo-schema';
 import { createJsonPath, findNode, getDiscriminatedType, isDiscriminatedUnion } from '@dxos/effect';
 import { mx } from '@dxos/react-ui-theme';
 import { getSchemaProperties, type SchemaProperty } from '@dxos/schema';
@@ -16,29 +17,29 @@ import { SelectInput } from './Defaults';
 import { type ComponentLookup } from './Form';
 import { useInputProps, useFormValues } from './FormContext';
 import { type InputComponent } from './Input';
-import { RefField, type QueryRefOptions } from './RefField';
 import { getInputComponent } from './factory';
 
+export type FormContentProps = {
+  schema: S.Schema.All;
+  path?: (string | number)[];
+  filter?: (props: SchemaProperty<any>[]) => SchemaProperty<any>[];
+  sort?: string[];
+  readonly?: boolean;
+  lookupComponent?: ComponentLookup;
+  Custom?: Partial<Record<string, InputComponent>>;
+};
+
 export type FormFieldProps = {
   property: SchemaProperty<any>;
   path?: (string | number)[];
   readonly?: boolean;
   /** Used to indicate if input should be presented inline (e.g. for array items). */
   inline?: boolean;
-  onQueryRefOptions?: QueryRefOptions;
   lookupComponent?: ComponentLookup;
   Custom?: Partial<Record<string, InputComponent>>;
 };
 
-export const FormField = ({
-  property,
-  path,
-  readonly,
-  inline,
-  onQueryRefOptions,
-  lookupComponent,
-  Custom,
-}: FormFieldProps) => {
+export const FormField = ({ property, path, readonly, inline, lookupComponent, Custom }: FormFieldProps) => {
   const inputProps = useInputProps(path);
   const { ast, name, type, format, title, description, options, examples, array } = property;
 
@@ -50,7 +51,7 @@ export const FormField = ({
 
   const FoundComponent = lookupComponent?.({
     prop: name,
-    schema: Schema.make(ast),
+    schema: S.make(ast),
     inputProps: {
       type,
       format,
@@ -119,40 +120,17 @@ export const FormField = ({
     );
   }
 
-  // TODO(ZaymonFC): Extract this to it's own component.
-  if (format === 'ref') {
-    return (
-      <RefField
-        ast={ast}
-        type={type}
-        label={label}
-        readonly={readonly}
-        placeholder={placeholder}
-        inline={inline}
-        onQueryRefOptions={onQueryRefOptions}
-        inputProps={inputProps}
-      />
-    );
-  }
-
   if (type === 'object') {
     const baseNode = findNode(ast, isDiscriminatedUnion);
     const typeLiteral = baseNode
       ? getDiscriminatedType(baseNode, inputProps.getValue() as any)
-      : findNode(ast, SchemaAST.isTypeLiteral);
+      : findNode(ast, AST.isTypeLiteral);
 
     if (typeLiteral) {
       return (
         <div role='none'>
-          {!inline && <h3 className='text-lg mbs-2 mbe-1'>{label}</h3>}
-          <FormFields
-            schema={Schema.make(typeLiteral)}
-            path={path}
-            readonly={readonly}
-            onQueryRefOptions={onQueryRefOptions}
-            Custom={Custom}
-            lookupComponent={lookupComponent}
-          />
+          {!inline && <div>{label}</div>}
+          <FormFields schema={S.make(typeLiteral)} path={path} readonly={readonly} Custom={Custom} />
         </div>
       );
     }
@@ -161,27 +139,7 @@ export const FormField = ({
   return null;
 };
 
-export type FormContentProps = {
-  schema: Schema.Schema.All;
-  path?: (string | number)[];
-  filter?: (props: SchemaProperty<any>[]) => SchemaProperty<any>[];
-  sort?: string[];
-  readonly?: boolean;
-  onQueryRefOptions?: QueryRefOptions;
-  lookupComponent?: ComponentLookup;
-  Custom?: Partial<Record<string, InputComponent>>;
-};
-
-export const FormFields = ({
-  schema,
-  path,
-  filter,
-  sort,
-  readonly,
-  onQueryRefOptions,
-  lookupComponent,
-  Custom,
-}: FormContentProps) => {
+export const FormFields = ({ schema, path, filter, sort, readonly, lookupComponent, Custom }: FormContentProps) => {
   const values = useFormValues(path);
 
   const properties = useMemo(() => {
@@ -201,7 +159,6 @@ export const FormFields = ({
               property={property}
               path={[...(path ?? []), property.name]}
               readonly={readonly}
-              onQueryRefOptions={onQueryRefOptions}
               lookupComponent={lookupComponent}
               Custom={Custom}
             />

package/src/components/Form/custom/SelectOptionsInput.stories.tsx

@@ -5,10 +5,9 @@
 import '@dxos-theme';
 
 import { type Meta, type StoryObj } from '@storybook/react';
-import { Schema } from 'effect';
 import React, { useState } from 'react';
 
-import { SelectOptionSchema, type SelectOption } from '@dxos/echo-schema';
+import { S, SelectOptionSchema, type SelectOption } from '@dxos/echo-schema';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { SelectOptionInput } from './SelectOptionsInput';
@@ -16,9 +15,9 @@ import translations from '../../../translations';
 import { TestLayout, TestPanel } from '../../testing';
 import { Form } from '../Form';
 
-const schema = Schema.Struct({
-  options: Schema.Array(SelectOptionSchema).pipe(Schema.mutable),
-}).pipe(Schema.mutable);
+const schema = S.Struct({
+  options: S.Array(SelectOptionSchema).pipe(S.mutable),
+}).pipe(S.mutable);
 
 const DefaultStory = () => {
   const [values, setValues] = useState<{ options: SelectOption[] }>({

package/src/components/Form/index.ts

@@ -3,8 +3,8 @@
 //
 
 export * from './custom';
+
 export * from './Defaults';
 export * from './Form';
 export * from './FormContext';
 export * from './Input';
-export { type QueryRefOptions } from './RefField';

package/src/components/ViewEditor/ViewEditor.stories.tsx

@@ -5,10 +5,9 @@
 import '@dxos-theme';
 
 import { type Meta, type StoryObj } from '@storybook/react';
-import { Schema } from 'effect';
 import React, { useCallback, useMemo, useState } from 'react';
 
-import { Format, type EchoSchema, toJsonSchema, TypedObject } from '@dxos/echo-schema';
+import { Format, type EchoSchema, S, toJsonSchema, TypedObject } from '@dxos/echo-schema';
 import { Filter, useQuery, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { useAsyncEffect } from '@dxos/react-ui';
@@ -27,7 +26,7 @@ const DefaultStory = () => {
   useAsyncEffect(async () => {
     if (space) {
       class TestSchema extends TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
-        name: Schema.String,
+        name: S.String,
         email: Format.Email,
         salary: Format.Currency(),
       }) {}

package/src/components/ViewEditor/ViewEditor.tsx

@@ -2,11 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema, SchemaAST } from 'effect';
 import React, { useCallback, useMemo, useState } from 'react';
 
 import { type SchemaRegistry } from '@dxos/echo-db';
-import { Format, type BaseSchema, type JsonProp } from '@dxos/echo-schema';
+import { AST, Format, type BaseSchema, S, type JsonProp } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { IconButton, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { List } from '@dxos/react-ui-list';
@@ -19,16 +18,16 @@ import { Form } from '../Form';
 
 const grid = 'grid grid-cols-[32px_1fr_32px] min-bs-[2.5rem]';
 
-const ViewMetaSchema = Schema.Struct({
-  name: Schema.String.annotations({
-    [SchemaAST.TitleAnnotationId]: 'View',
+const ViewMetaSchema = S.Struct({
+  name: S.String.annotations({
+    [AST.TitleAnnotationId]: 'View',
   }),
   typename: Format.URL.annotations({
-    [SchemaAST.TitleAnnotationId]: 'Typename',
+    [AST.TitleAnnotationId]: 'Typename',
   }),
-}).pipe(Schema.mutable);
+}).pipe(S.mutable);
 
-type ViewMetaType = Schema.Schema.Type<typeof ViewMetaSchema>;
+type ViewMetaType = S.Schema.Type<typeof ViewMetaSchema>;
 
 export type ViewEditorProps = ThemedClassName<{
   schema: BaseSchema;
@@ -140,16 +139,15 @@ export const ViewEditor = ({
   );
 
   return (
-    <div role='none' className={mx('grid grid-rows-[1fr_1fr] min-bs-0', classNames)}>
+    <div role='none' className={mx('flex flex-col w-full divide-y divide-separator', classNames)}>
       <Form<ViewMetaType>
         autoSave
         schema={ViewMetaSchema}
         values={viewValues}
         onSave={schema.readonly ? undefined : handleUpdate}
-        classNames='min-bs-0 overflow-y-auto'
       />
 
-      <div role='none' className='border-bs border-separator min-bs-0 overflow-y-auto'>
+      <div>
         {/* TODO(burdon): Clean up common form ux. */}
         <div role='none' className='p-2'>
           <label className={mx(inputTextLabel)}>{t('fields label')}</label>
@@ -157,7 +155,7 @@ export const ViewEditor = ({
 
         <List.Root<FieldType>
           items={view.fields}
-          isItem={Schema.is(FieldSchema)}
+          isItem={S.is(FieldSchema)}
           getId={(field) => field.id}
           onMove={schema.readonly ? undefined : handleMove}
         >

package/src/components/deprecated/Form.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { SchemaAST, type Schema, Option, pipe } from 'effect';
+import { SchemaAST as AST, type Schema as S, Option, pipe } from 'effect';
 import React, { useState } from 'react';
 
 import { findProperty } from '@dxos/effect';
@@ -13,7 +13,7 @@ import { type ViewType, getFieldValue, setFieldValue } from '@dxos/schema';
 export type DeprecatedFormProps<T extends {} = {}> = ThemedClassName<{
   view: ViewType;
   object: T;
-  schema?: Schema.Schema<T>;
+  schema?: S.Schema<T>;
   readonly?: boolean;
 }>;
 
@@ -31,16 +31,16 @@ export const DeprecatedForm = <T extends {} = {}>({
     <div role='none' className={mx('flex flex-col w-full gap-2 p-2', classNames)}>
       {view.fields.map((field) => {
         const prop = schema && findProperty(schema, field.path);
-        const title = (prop && pipe(SchemaAST.getTitleAnnotation(prop), Option.getOrUndefined)) ?? '';
-        const description = (prop && pipe(SchemaAST.getDescriptionAnnotation(prop), Option.getOrUndefined)) ?? title;
+        const title = (prop && pipe(AST.getTitleAnnotation(prop), Option.getOrUndefined)) ?? '';
+        const description = (prop && pipe(AST.getDescriptionAnnotation(prop), Option.getOrUndefined)) ?? title;
         // const format =
-        //   (prop && (getPatternAnnotation(prop) ?? (SchemaAST.isNumberKeyword(prop) && RealNumberFormat))) || undefined;
+        //   (prop && (getPatternAnnotation(prop) ?? (AST.isNumberKeyword(prop) && RealNumberFormat))) || undefined;
 
         //
         // Boolean
         //
 
-        if (prop && SchemaAST.isBooleanKeyword(prop)) {
+        if (prop && AST.isBooleanKeyword(prop)) {
           const value = object && getFieldValue(object, field);
           const onChange = (checked: boolean) => {
             setFieldValue(object, field, checked);

package/src/hooks/index.ts

@@ -3,4 +3,3 @@
 //
 
 export * from './useForm';
-export * from './useRefQueryLookupHandler';

package/src/hooks/useForm.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { SchemaAST, type Schema } from 'effect';
+import { SchemaAST as AST, type Schema as S } from 'effect';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { type BaseObject, getValue, setValue } from '@dxos/echo-schema';
@@ -45,7 +45,7 @@ export interface FormOptions<T extends BaseObject> {
   /**
    * Effect schema (Type literal).
    */
-  schema: Schema.Schema<T, any>;
+  schema: S.Schema<T>;
 
   /**
    * Initial values (which may not pass validation).
@@ -90,7 +90,7 @@ export const useForm = <T extends BaseObject>({
   onValid,
   onSave,
 }: FormOptions<T>): FormHandler<T> => {
-  invariant(SchemaAST.isTypeLiteral(schema.ast));
+  invariant(AST.isTypeLiteral(schema.ast));
 
   const [values, setValues] = useState<Partial<T>>(initialValues);
   useEffect(() => {

package/dist/types/src/components/Form/RefField.d.ts

@@ -1,24 +0,0 @@
-import { type SchemaAST } from 'effect';
-import React from 'react';
-import { type TypeAnnotation } from '@dxos/echo-schema';
-import { type SimpleType } from '@dxos/effect';
-import { DXN } from '@dxos/keys';
-import { type MaybePromise } from '@dxos/util';
-import { type FormInputStateProps } from './FormContext';
-export type QueryRefOptions = (type: TypeAnnotation) => MaybePromise<{
-    dxn: DXN;
-    label?: string;
-}[]>;
-type RefFieldProps = {
-    ast: SchemaAST.AST;
-    type: SimpleType;
-    label: string;
-    readonly?: boolean;
-    placeholder?: string;
-    inline?: boolean;
-    onQueryRefOptions?: QueryRefOptions;
-    inputProps: FormInputStateProps;
-};
-export declare const RefField: ({ ast, type, label, readonly, placeholder, inline, onQueryRefOptions, inputProps, }: RefFieldProps) => React.JSX.Element | null;
-export {};
-//# sourceMappingURL=RefField.d.ts.map

package/dist/types/src/components/Form/RefField.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RefField.d.ts","sourceRoot":"","sources":["../../../../../src/components/Form/RefField.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EAML,KAAK,cAAc,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAGjC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,cAAc,KAAK,YAAY,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CAAC;AAErG,KAAK,aAAa,GAAG;IACnB,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iBAAiB,CAAC,EAAE,eAAe,CAAC;IACpC,UAAU,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF,eAAO,MAAM,QAAQ,wFASlB,aAAa,6BAyGf,CAAC"}

package/dist/types/src/hooks/useRefQueryLookupHandler.d.ts

@@ -1,8 +0,0 @@
-import { type Space } from '@dxos/react-client/echo';
-import { type QueryRefOptions } from '../components';
-type UseRefQueryLookupProps = {
-    space?: Space;
-};
-export declare const useRefQueryLookupHandler: ({ space }: UseRefQueryLookupProps) => QueryRefOptions;
-export {};
-//# sourceMappingURL=useRefQueryLookupHandler.d.ts.map

package/dist/types/src/hooks/useRefQueryLookupHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useRefQueryLookupHandler.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useRefQueryLookupHandler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAU,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,KAAK,sBAAsB,GAAG;IAC5B,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,wBAAwB,cAAe,sBAAsB,KAAG,eA0B5E,CAAC"}