refactor: export enum (#41)

deno.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://deno.land/x/deno/cli/schemas/config-file.v1.json",
   "name": "@byzanteam/taihaku-schemas",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "exports": "./types/mod.ts",
   "compilerOptions": {
     "strict": true,

types/persistence_schema/filter.ts

@@ -1,25 +1,42 @@
 import type { DataPointer, SchemaPointer, ValuePointer } from './types.ts'
 export type Filter = ConditionalFilter | LogicalFilter
 
+export enum ConditionalFilterOperator {
+  AND = 'and',
+  OR = 'or',
+}
+
+export enum LogicalFilterOperator {
+  CO = 'co',
+  EQ = 'eq',
+  LT = 'lt',
+  IS_NULL = 'is_null',
+}
+
 export interface ConditionalFilter {
-  operator: 'and' | 'or'
+  operator: ConditionalFilterOperator
   operands: Array<ConditionalFilter | LogicalFilter>
 }
 
-export type LogicalFilter = EQFilter | LTFilter | IsNullFilter
+export type LogicalFilter = COFilter | EQFilter | LTFilter | IsNullFilter
+
+export interface COFilter {
+  operator: LogicalFilterOperator.CO
+  operands: [Operand, Operand]
+}
 
 export interface EQFilter {
-  operator: 'eq'
+  operator: LogicalFilterOperator.EQ
   operands: [Operand, Operand]
 }
 
 export interface LTFilter {
-  operator: 'lt'
+  operator: LogicalFilterOperator.LT
   operands: [Operand, Operand]
 }
 
 export interface IsNullFilter {
-  operator: 'is_null'
+  operator: LogicalFilterOperator.IS_NULL
   operands: [Operand]
 }
 

types/persistence_schema/mod.ts

@@ -11,7 +11,7 @@ import type { Fetching } from './fetching.ts'
 import type { Filter } from './filter.ts'
 import type { OffsetPagination } from './pagination.ts'
 import type { ObjectReturning } from './returning.ts'
-import type { Order } from './sorting.ts'
+import type { Order, Sorters } from './sorting.ts'
 import type { ColumnType } from './types.ts'
 
 export interface ColumnDef {
@@ -93,7 +93,7 @@ export interface ListAction {
   schema: Schema
   paramsSchema: JSONSchema
   filter: Filter
-  sorting?: Array<Order>
+  sorting?: Sorters
   pagination: OffsetPagination
   fetchingSchema: Array<Fetching>
   returningSchema: Array<ObjectReturning>
@@ -123,6 +123,6 @@ export interface NextjsResult {
 
 export type { InternalError, JSONSchemaError, ValidationError }
 export type { FormatedJSONSchemaError, FormatedValidationError }
-export type { Filter, Order }
+export type { Filter, Order, Sorters }
 export type { ConditionalFilter, LogicalFilter } from './filter.ts'
 export * from './types.ts'

types/persistence_schema/sorting.ts

@@ -1,4 +1,11 @@
+export enum OrderDirection {
+  ASC = 'asc',
+  DESC = 'desc',
+}
+
 export interface Order {
   field: string
-  direction: 'asc' | 'desc'
+  direction: OrderDirection
 }
+
+export type Sorters = Array<Order>

types/ui_schema/form/mod.ts

@@ -3,9 +3,9 @@ import type { FieldType } from '../field.ts'
 import type { ObjectData } from '../types.ts'
 import type { ObjectLayout } from './layout.ts'
 import type {
-  AppearanceValue,
   CommonCustomFieldUIOptions,
   CustomFieldUIOptionsMap,
+  FormAppearance,
 } from './ui_options.ts'
 
 /**
@@ -54,7 +54,7 @@ type BasicUIOptions = {
 }
 
 type GlobalUIOptions = {
-  'ui:x-appearance'?: AppearanceValue
+  'ui:x-appearance'?: FormAppearance
   disabled?: boolean
   readonly?: boolean
 }
@@ -128,7 +128,7 @@ export type {
   ObjectFieldUIOptions,
 }
 
-export { AppearanceValue, type OptionColumns } from './ui_options.ts'
+export { type OptionColumns } from './ui_options.ts'
 
 export type FormSchema<
   TData extends ObjectData = ObjectData,

types/ui_schema/form/ui_options.ts

@@ -1,13 +1,10 @@
 import type { FieldType } from '../field.ts'
 import type { FieldTemplate } from './layout.ts'
 
-export enum AppearanceValue {
-  Input = 'input',
-  Presentation = 'presentation',
-}
+export type FormAppearance = 'input' | 'presentation'
 
 export interface CommonCustomFieldUIOptions {
-  'ui:x-appearance'?: AppearanceValue
+  'ui:x-appearance'?: FormAppearance
   'ui:x-blankslate'?: string
   'ui:x-field-template'?: FieldTemplate | Array<FieldTemplate>
 }

types/ui_schema/table/mod.ts

@@ -1,6 +1,6 @@
 import type { FieldType, GenericField } from '../field.ts'
 import type { ObjectData } from '../types.ts'
-import type { CustomColumnUIOptionsMap } from './ui_options.ts'
+import type { CustomColumnUIOptionsMap, TableAppearance } from './ui_options.ts'
 
 type BasicUIOptions = {
   /**
@@ -76,7 +76,7 @@ interface TableOptions<TData extends ObjectData = ObjectData> {
   /**
    * global appearance setting of table cells
    */
-  'ui:x-appearance': 'input' | 'presentation'
+  'ui:x-appearance': TableAppearance
 }
 
 export type TableUISchema<

types/ui_schema/table/ui_options.ts

@@ -1,7 +1,9 @@
 import type { FieldType } from '../field.ts'
 
+export type TableAppearance = 'input' | 'presentation'
+
 interface CommonCustomFieldUIOptions {
-  'ui:x-appearance'?: 'input' | 'presentation'
+  'ui:x-appearance'?: TableAppearance
   'ui:x-blankslate'?: string
 }