@dxos/react-ui-table 0.6.12-staging.e11e696 → 0.6.13-main.09887cd

package/src/components/Table/TableContext.tsx

@@ -3,26 +3,32 @@
 //
 
 import { type RowData } from '@tanstack/react-table';
-import React, { useContext, createContext, type JSX, type ReactNode, type FC, type Context } from 'react';
+import React, {
+  useContext,
+  createContext,
+  type Context,
+  type JSX,
+  type PropsWithChildren,
+  type ReactNode,
+} from 'react';
+
+import { raise } from '@dxos/debug';
 
 import { type TableContextValue } from './props';
 
 export const TABLE_NAME = 'Table';
 
-// Create the context without a default value.
-// The expectation is that the provider will always supply a value, so no need to define a default here.
-const TableContext = createContext<TableContextValue<RowData>>({} as TableContextValue<RowData>);
+const TableContext = createContext<TableContextValue<RowData> | undefined>(undefined);
 
 export type TypedTableProvider<TData extends RowData> = {
   (props: TableContextValue<TData> & { children: ReactNode }): JSX.Element;
   displayName: string;
 };
 
-export const TableProvider: FC<TableContextValue<RowData> & { children: ReactNode }> = ({ children, ...value }) => {
+export const TableProvider = ({ children, ...value }: PropsWithChildren<TableContextValue<RowData>>) => {
   return <TableContext.Provider value={value}>{children}</TableContext.Provider>;
 };
 
-// Create a custom hook to consume the context.
 export const useTableContext = <TData extends RowData>(): TableContextValue<TData> => {
-  return useContext(TableContext as Context<TableContextValue<TData>>);
+  return useContext(TableContext as Context<TableContextValue<TData>>) ?? raise(new Error('Missing TableContext'));
 };

package/src/components/Table/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './Table';
 export * from './props';
+export * from './Table';
+export * from './TableContext';
 export * from './TableRootContext';

package/src/components/Table/props.ts

@@ -25,7 +25,7 @@ export type TableFlags = Partial<{
  * This is ‘current’ in the `aria-current` sense.
  */
 export type TableCurrent<TData extends RowData> = Partial<{
-  // App state
+  // App state.
   currentDatum: TData;
   onDatumClick: (datum: TData) => void;
 }>;
@@ -39,13 +39,13 @@ export type TableProps<TData extends RowData> = TableFlags &
     onColumnResize: (state: Record<string, number>) => void;
     onColumnReorder: (columnId: string, direction: 'left' | 'right') => void;
     columnVisibility: VisibilityState;
-    // Controllable row selection
+    // Controllable row selection.
     rowSelection: RowSelectionState;
     defaultRowSelection: RowSelectionState;
     onRowSelectionChange: (rowSelection: RowSelectionState) => void;
-    // Derived from row selection
+    // Derived from row selection.
     onDataSelectionChange: (dataSelection: TData[]) => void;
-    // `table` element props
+    // `table` element props.
     classNames: ClassNameValue;
     pinLastRow: boolean;
   }>;

package/src/helpers.tsx

@@ -21,8 +21,7 @@ import { log } from '@dxos/log';
 import { type ClassNameValue, Input, Tooltip } from '@dxos/react-ui';
 import { getSize, mx } from '@dxos/react-ui-theme';
 
-import { CellCombobox } from './components';
-import { useTableContext } from './components/Table/TableContext';
+import { CellCombobox, useTableContext } from './components';
 import { textPadding } from './theme';
 
 export type ValueUpdater<TData extends RowData, TValue> = (row: TData, id: string, value: TValue) => void;
@@ -470,7 +469,7 @@ export class ColumnBuilder<TData extends RowData> {
       size: 50,
       minSize: 50,
       header: (column) => label ?? column.header.id,
-      // TODO(zan): Implement sort algorithm
+      // TODO(zan): Implement sort algorithm.
       enableSorting: true,
       cell: SwitchBuilderCell,
       ...props,
@@ -486,7 +485,7 @@ export class ColumnBuilder<TData extends RowData> {
     const IconOff = off?.Icon ?? X;
     return {
       size: size ?? 32,
-      // TODO(zan): Implement sort algorithm
+      // TODO(zan): Implement sort algorithm.
       enableSorting: false,
       header: (column) => <div className={'justify-center'}>{label ?? column.header.id}</div>,
       cell: (cell) => {
@@ -506,14 +505,13 @@ export class ColumnBuilder<TData extends RowData> {
   /**
    * This display column type is for nested/unhandled data to appear as JSON.
    */
-  display({ label, classNames, ...props }: KeyColumnOptions<TData> = {}): Partial<ColumnDef<TData, PublicKey>> {
+  json({ label, classNames, ...props }: KeyColumnOptions<TData> = {}): Partial<ColumnDef<TData, PublicKey>> {
     return {
       size: 120,
       minSize: 120,
       header: (cell) => label ?? cell.header.id,
       cell: (cell) => {
         const value = cell.getValue();
-
         return (
           <div className='overflow-scroll'>
             <code className='text-xs'>{JSON.stringify(value)}</code>

package/src/schema/{SchemaToTable.stories.tsx → Schema.stories.tsx}

@@ -9,26 +9,17 @@ import * as fc from 'fast-check';
 import React from 'react';
 
 import { S } from '@dxos/echo-schema';
-import { DensityProvider } from '@dxos/react-ui';
-import { withTheme } from '@dxos/storybook-utils';
+import { withTheme, withLayout } from '@dxos/storybook-utils';
 
-import { schemaToColumnDefs } from './schemaToColumns';
+import { schemaToColumnDefs } from './column-utils';
 import { Table } from '../components';
 
 export default {
-  title: 'react-ui-table/SchemaTable',
-  args: {},
-  decorators: [
-    withTheme,
-    (Story: any) => (
-      <DensityProvider density='fine'>
-        <Story />
-      </DensityProvider>
-    ),
-  ],
+  title: 'react-ui-table/Schema',
+  decorators: [withTheme, withLayout()],
 };
 
-const exampleSchema = S.Struct({
+const TestSchema = S.Struct({
   field1: S.String,
   field2: S.Number,
   field3: S.Date,
@@ -41,20 +32,17 @@ const exampleSchema = S.Struct({
   ),
 });
 
-type ExampleSchema = S.Schema.Type<typeof exampleSchema>;
+type TestType = S.Schema.Type<typeof TestSchema>;
 
-const columns = schemaToColumnDefs(exampleSchema);
+const columns = schemaToColumnDefs(TestSchema);
+const items = fc.sample(Arbitrary.make(TestSchema), 10);
 
-const exampleSchemaArbitrary = Arbitrary.make(exampleSchema);
-
-const items = fc.sample(exampleSchemaArbitrary, 10);
-
-export const SchemaTable = {
+export const Default = {
   render: () => {
     return (
       <Table.Root>
         <Table.Viewport classNames='fixed inset-0'>
-          <Table.Main<ExampleSchema>
+          <Table.Main<TestType>
             role='grid'
             rowsSelectable='multi'
             keyAccessor={(row) => JSON.stringify(row)}

package/src/schema/{schemaToColumns.ts → column-utils.ts}

@@ -5,37 +5,37 @@
 import { type ColumnDef } from '@tanstack/react-table';
 
 import { type S } from '@dxos/echo-schema';
+import { FieldValueType, mapSchemaToFields } from '@dxos/schema';
 
-import { classifySchemaProperties } from './schema';
 import { createColumnBuilder } from '../helpers';
 
 export const schemaToColumnDefs = <T>(schema: S.Schema<T, any>): ColumnDef<T, any>[] => {
   const { helper, builder } = createColumnBuilder<T>();
 
-  const classified = classifySchemaProperties(schema);
+  const classified = mapSchemaToFields(schema);
   return classified.map(([name, type]) => {
     const propertyKey = name.toString();
 
     let column: Partial<ColumnDef<any, any>> | undefined;
     switch (type) {
-      case 'string': {
+      case FieldValueType.String: {
         column = builder.string({ label: propertyKey });
         break;
       }
-      case 'number': {
+      case FieldValueType.Number: {
         column = builder.number({ label: propertyKey });
         break;
       }
-      case 'boolean': {
+      case FieldValueType.Boolean: {
         column = builder.switch({ label: propertyKey });
         break;
       }
-      case 'date': {
+      case FieldValueType.Date: {
         column = builder.date({ label: propertyKey });
         break;
       }
-      case 'display': {
-        column = builder.display({ label: propertyKey, id: propertyKey });
+      case FieldValueType.JSON: {
+        column = builder.json({ label: propertyKey, id: propertyKey });
         break;
       }
       default: {

package/src/schema/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './schemaToColumns';
+export * from './column-utils';
 export * from './types';

package/src/schema/types.ts

@@ -2,18 +2,26 @@
 // Copyright 2023 DXOS.org
 //
 
+import { type FieldValueType } from '@dxos/schema';
+
+/**
+ * @deprecated
+ */
+// TODO(burdon): Reconcile with @dxos/schema/View.
 export type TableDef = {
   id: string;
-  name?: string; // TODO(burdon): Required?
-  columns: ColumnProps[];
+  name?: string;
+  columns: ColumnDef[];
 };
 
-export type ColumnType = 'number' | 'boolean' | 'date' | 'string' | 'ref';
-
-export type ColumnProps = {
+/**
+ * @deprecated
+ */
+// TODO(burdon): Reconcile with @dxos/schema/Field.
+export type ColumnDef = {
   id: string;
   prop: string;
-  type: ColumnType;
+  type: FieldValueType;
   size?: number;
   label?: string;
 

package/src/translations.ts

@@ -10,7 +10,7 @@ export default [
       [translationKey]: {
         'no selection label': ' ',
         'number column type label': 'Number',
-        'boolean column type label': 'Toggle',
+        'boolean column type label': 'Boolean',
         'date column type label': 'Date',
         'string column type label': 'Text',
         'ref column type label': 'Reference',

package/dist/types/src/components/ColumnMenu/ColumnSettingsForm.d.ts

@@ -1,12 +0,0 @@
-import React from 'react';
-import { type TableDef, type ColumnProps } from '../../schema';
-export type ColumnSettingsFormProps = {
-    column: ColumnProps;
-    tableDef: TableDef;
-    tablesToReference: TableDef[];
-    onUpdate?: ((id: string, column: ColumnProps) => void) | undefined;
-    onDelete?: ((id: string) => void) | undefined;
-    onClose?: () => void;
-};
-export declare const ColumnSettingsForm: ({ column, tableDef, tablesToReference, onUpdate, onDelete, onClose, }: ColumnSettingsFormProps) => React.JSX.Element;
-//# sourceMappingURL=ColumnSettingsForm.d.ts.map

package/dist/types/src/components/ColumnMenu/ColumnSettingsForm.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ColumnSettingsForm.d.ts","sourceRoot":"","sources":["../../../../../src/components/ColumnMenu/ColumnSettingsForm.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAKhD,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAmB,MAAM,cAAc,CAAC;AAGhF,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;IACnB,iBAAiB,EAAE,QAAQ,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACnE,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC9C,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,kBAAkB,0EAO5B,uBAAuB,sBAkLzB,CAAC"}

package/dist/types/src/components/ColumnMenu/ColumnSettingsForm.stories.d.ts

@@ -1,63 +0,0 @@
-import '@dxos-theme';
-import React from 'react';
-import { type ColumnSettingsFormProps } from './ColumnSettingsForm';
-import { type TableDef } from '../../schema';
-declare const _default: {
-    title: string;
-    component: ({ column, tableDef, tablesToReference, onUpdate, onDelete, onClose, }: ColumnSettingsFormProps) => React.JSX.Element;
-    decorators: import("@storybook/react/*").Decorator[];
-};
-export default _default;
-export declare const Default: {
-    args: ColumnSettingsFormProps;
-};
-export declare const NumberColumn: {
-    args: {
-        column: {
-            id: string;
-            prop: string;
-            type: string;
-            label: string;
-            digits: number;
-        };
-        tableDef: TableDef;
-        tablesToReference: TableDef[];
-        onUpdate?: ((id: string, column: import("../../schema").ColumnProps) => void) | undefined;
-        onDelete?: ((id: string) => void) | undefined;
-        onClose?: () => void;
-    };
-};
-export declare const ReferenceColumn: {
-    args: {
-        column: {
-            id: string;
-            prop: string;
-            type: string;
-            label: string;
-            refTable: string;
-            refProp: string;
-        };
-        tableDef: TableDef;
-        tablesToReference: TableDef[];
-        onUpdate?: ((id: string, column: import("../../schema").ColumnProps) => void) | undefined;
-        onDelete?: ((id: string) => void) | undefined;
-        onClose?: () => void;
-    };
-};
-export declare const NewColumn: {
-    args: {
-        column: {
-            id: string;
-            prop: string;
-            type: string;
-            label: string;
-        };
-        tableDef: TableDef;
-        tablesToReference: TableDef[];
-        onUpdate?: ((id: string, column: import("../../schema").ColumnProps) => void) | undefined;
-        onDelete?: ((id: string) => void) | undefined;
-        onClose?: () => void;
-    };
-};
-export declare const Interactive: (args: ColumnSettingsFormProps) => React.JSX.Element;
-//# sourceMappingURL=ColumnSettingsForm.stories.d.ts.map

package/dist/types/src/components/ColumnMenu/ColumnSettingsForm.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ColumnSettingsForm.stories.d.ts","sourceRoot":"","sources":["../../../../../src/components/ColumnMenu/ColumnSettingsForm.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AACrB,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAsB,KAAK,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;;;;;;AAE7C,wBAIE;AAqCF,eAAO,MAAM,OAAO;;CAEnB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAWxB,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;CAY3B,CAAC;AAEF,eAAO,MAAM,SAAS;;;;;;;;;;;;;;CAUrB,CAAC;AAQF,eAAO,MAAM,WAAW,SANA,uBAAuB,sBAMH,CAAC"}

package/dist/types/src/schema/SchemaToTable.stories.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaToTable.stories.d.ts","sourceRoot":"","sources":["../../../../src/schema/SchemaToTable.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAIrB,OAAO,KAAK,MAAM,OAAO,CAAC;;;;;;AAS1B,wBAWE;AAuBF,eAAO,MAAM,WAAW;;CAmBvB,CAAC"}

package/dist/types/src/schema/schema.d.ts

@@ -1,5 +0,0 @@
-import { type S } from '@dxos/echo-schema';
-import { type ColumnType } from './types';
-export type ClassifiedColumnType = ColumnType | 'display';
-export declare const classifySchemaProperties: (schema: S.Schema<any, any>) => [string, ClassifiedColumnType][];
-//# sourceMappingURL=schema.d.ts.map

package/dist/types/src/schema/schema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/schema/schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAO,KAAK,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAG1C,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG,SAAS,CAAC;AAG1D,eAAO,MAAM,wBAAwB,WAAY,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,KAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAwBnG,CAAC"}

package/dist/types/src/schema/schema.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=schema.test.d.ts.map

package/dist/types/src/schema/schema.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"schema.test.d.ts","sourceRoot":"","sources":["../../../../src/schema/schema.test.ts"],"names":[],"mappings":""}

package/dist/types/src/schema/schemaToColumns.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"schemaToColumns.d.ts","sourceRoot":"","sources":["../../../../src/schema/schemaToColumns.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAK3C,eAAO,MAAM,kBAAkB,GAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,KAAG,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAoCjF,CAAC"}

package/src/schema/schema.test.ts

@@ -1,146 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { Schema as S } from '@effect/schema';
-import { describe, expect, test } from 'vitest';
-
-import { classifySchemaProperties } from './schema';
-
-describe('schema->column-type', () => {
-  test('basic', () => {
-    const simpleSchema = S.Struct({
-      field1: S.String,
-      field2: S.Number,
-    });
-
-    const columns = classifySchemaProperties(simpleSchema);
-
-    expect(columns).to.deep.equal([
-      ['field1', 'string'],
-      ['field2', 'number'],
-    ]);
-  });
-
-  test('optional properties', () => {
-    const simpleSchema = S.Struct({
-      field1: S.optional(S.String),
-      field2: S.optional(S.Number),
-    });
-
-    const columns = classifySchemaProperties(simpleSchema);
-
-    expect(columns).to.deep.equal([
-      ['field1', 'string'],
-      ['field2', 'number'],
-    ]);
-  });
-
-  test('dates', () => {
-    const simpleSchema = S.Struct({
-      field1: S.Date,
-      field2: S.optional(S.Date),
-    });
-
-    const columns = classifySchemaProperties(simpleSchema);
-
-    expect(columns).to.deep.equal([
-      ['field1', 'date'],
-      ['field2', 'date'],
-    ]);
-  });
-
-  test('Piped validators', () => {
-    const simpleSchema = S.Struct({
-      name: S.optional(S.String.pipe(S.nonEmpty(), S.maxLength(10))),
-      age: S.Number.pipe(S.negative()),
-    });
-
-    const columns = classifySchemaProperties(simpleSchema);
-
-    expect(columns).to.deep.equal([
-      ['name', 'string'],
-      ['age', 'number'],
-    ]);
-  });
-
-  test('nested schema', () => {
-    const simpleSchema = S.Struct({
-      name: S.String,
-      nested: S.Struct({
-        age: S.Number,
-      }),
-      someUnion: S.Union(S.String, S.Number),
-    });
-
-    const columns = classifySchemaProperties(simpleSchema);
-
-    expect(columns).to.deep.equal([
-      ['name', 'string'],
-      ['nested.age', 'number'],
-      ['someUnion', 'display'],
-    ]);
-  });
-
-  test('deeply nested schema', () => {
-    const simpleSchema = S.Struct({
-      name: S.String,
-      nested: S.Struct({
-        age: S.Number,
-        deeplyNested: S.Struct({
-          height: S.Number,
-        }),
-      }),
-    });
-
-    const columns = classifySchemaProperties(simpleSchema);
-
-    expect(columns).to.deep.equal([
-      ['name', 'string'],
-      ['nested.age', 'number'],
-      ['nested.deeplyNested.height', 'number'],
-    ]);
-  });
-
-  test('even more deeply nested schema with optionals', () => {
-    const simpleSchema = S.Struct({
-      name: S.String,
-      nested: S.Struct({
-        age: S.Number,
-        deeplyNested: S.optional(
-          S.Struct({
-            height: S.optional(S.Number),
-          }),
-        ),
-      }),
-    });
-
-    const columns = classifySchemaProperties(simpleSchema);
-
-    expect(columns).to.deep.equal([
-      ['name', 'string'],
-      ['nested.age', 'number'],
-      ['nested.deeplyNested.height', 'number'],
-    ]);
-  });
-
-  test('multiple-nested schemata as sibblings', () => {
-    const simpleSchema = S.Struct({
-      name: S.String,
-      nested: S.Struct({
-        age: S.Number,
-      }),
-      nested2: S.Struct({
-        height: S.Number,
-      }),
-    });
-
-    const columns = classifySchemaProperties(simpleSchema);
-
-    expect(columns).to.deep.equal([
-      ['name', 'string'],
-      ['nested.age', 'number'],
-      ['nested2.height', 'number'],
-    ]);
-  });
-});

package/src/schema/schema.ts

@@ -1,92 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { AST, type S } from '@dxos/echo-schema';
-
-import { type ColumnType } from './types';
-
-// TODO(burdon): Reconcile with react-ui-table.
-export type ClassifiedColumnType = ColumnType | 'display';
-
-// TODO(burdon): Rename getX? and return typed array?
-export const classifySchemaProperties = (schema: S.Schema<any, any>): [string, ClassifiedColumnType][] => {
-  const recurse = (node: AST.AST, path: string[], acc: [string, ClassifiedColumnType][]) => {
-    const properties = AST.getPropertySignatures(node);
-    properties.forEach((prop) => {
-      const propName = prop.name.toString();
-
-      if (prop.isOptional) {
-        const unwrappedAst = unwrapOptionProperty(prop);
-        if (isStruct(unwrappedAst)) {
-          return recurse(unwrappedAst, [...path, propName], acc);
-        }
-      }
-
-      if (isStruct(prop.type)) {
-        recurse(prop.type, [...path, propName], acc);
-      } else {
-        acc.push([path.concat(propName).join('.'), propertyToColumn(prop)]);
-      }
-    });
-
-    return acc;
-  };
-
-  return recurse(schema.ast, [], []);
-};
-
-const isStruct = (node: AST.AST) => AST.isTypeLiteral(node);
-
-const isOptionalUnion = (prop: AST.PropertySignature) => AST.isUnion(prop.type) && prop.isOptional;
-
-const unwrapOptionProperty = (prop: AST.PropertySignature) => {
-  if (!isOptionalUnion(prop)) {
-    throw new Error(`Not an optional property: ${String(prop.name)}`);
-  }
-
-  if (!AST.isUnion(prop.type)) {
-    throw new Error(`Not a union type: ${String(prop.name)}`);
-  }
-
-  const [type, _undefinedCase] = prop.type.types;
-  return type;
-};
-
-const typeToColumn = (type: AST.AST): ClassifiedColumnType => {
-  if (AST.isStringKeyword(type)) {
-    return 'string';
-  } else if (AST.isNumberKeyword(type)) {
-    return 'number';
-  } else if (AST.isBooleanKeyword(type)) {
-    return 'boolean';
-  }
-
-  if (AST.isRefinement(type)) {
-    return typeToColumn(type.from);
-  }
-
-  // TODO(zan): How should we be thinking about transformations?
-  // - Which of these are we storing in the database?
-  // - For types that aren't the 'DateFromString' transformation, should we be using the 'from' or 'to' type?
-
-  if (AST.isTransformation(type)) {
-    const identifier = AST.getIdentifierAnnotation(type);
-    if (identifier._tag === 'Some') {
-      if (identifier.value === 'DateFromString') {
-        return 'date';
-      }
-    }
-  }
-
-  return 'display';
-};
-
-const propertyToColumn = (prop: AST.PropertySignature): ClassifiedColumnType => {
-  let type = prop.type;
-  if (prop.isOptional) {
-    type = unwrapOptionProperty(prop);
-  }
-
-  return typeToColumn(type);
-};