fix: wildcard for type checking (#45)

Co-authored-by: shaddollxz <[email protected]>
Byzanteam · Aug 15, 2024 · db3a2fe · db3a2fe
1 parent 355e61e
commit db3a2fe
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,4 +28,4 @@ jobs:
         run: deno lint
 
       - name: Type check
-        run: deno check **/**/*.ts
+        run: deno check **/*.ts
diff --git a/examples/delete_movie.ts b/examples/delete_movie.ts
@@ -1,3 +1,4 @@
+import { LogicalFilterOperator } from '../types/mod.ts'
 import type { DeleteAction } from '../types/persistence_schema/mod.ts'
 import moviesSchema from './schemas/movies.ts'
 
@@ -10,7 +11,7 @@ const deleteMovieAction: DeleteAction = {
     },
   },
   filter: {
-    operator: 'eq',
+    operator: LogicalFilterOperator.EQ,
     operands: [
       { type: 'schema', value: '/id' },
       { type: 'data', value: '/id' },

diff --git a/examples/delete_movies.ts b/examples/delete_movies.ts
@@ -1,3 +1,7 @@
+import {
+  ConditionalFilterOperator,
+  LogicalFilterOperator,
+} from '../types/mod.ts'
 import type { BulkDeleteAction } from '../types/persistence_schema/mod.ts'
 import moviesSchema from './schemas/movies.ts'
 
@@ -10,17 +14,17 @@ const deleteMovieAction: BulkDeleteAction = {
     },
   },
   filter: {
-    operator: 'and',
+    operator: ConditionalFilterOperator.AND,
     operands: [
       {
-        operator: 'lt',
+        operator: LogicalFilterOperator.LT,
         operands: [
           { type: 'schema', value: '/release_date' },
           { type: 'data', value: '/release_date' },
         ],
       },
       {
-        operator: 'is_null',
+        operator: LogicalFilterOperator.IS_NULL,
         operands: [{ type: 'schema', value: '/likes' }],
       },
     ],

diff --git a/examples/update_movie.ts b/examples/update_movie.ts
@@ -1,3 +1,4 @@
+import { LogicalFilterOperator } from '../types/mod.ts'
 import type { UpdateAction } from '../types/persistence_schema/mod.ts'
 import moviesSchema from './schemas/movies.ts'
 
@@ -13,7 +14,7 @@ const updateMovieAction: UpdateAction = {
     required: ['id'],
   },
   filter: {
-    operator: 'eq',
+    operator: LogicalFilterOperator.EQ,
     operands: [
       { type: 'schema', value: '/id' },
       { type: 'data', value: '/id' },

diff --git a/examples/update_movie_with_characters.ts b/examples/update_movie_with_characters.ts
@@ -1,3 +1,4 @@
+import { LogicalFilterOperator } from '../types/mod.ts'
 import type { UpdateAction } from '../types/persistence_schema/mod.ts'
 import moviesSchema from './schemas/movies.ts'
 
@@ -26,7 +27,7 @@ const updateMovieWithCharactersAction: UpdateAction = {
     required: ['id'],
   },
   filter: {
-    operator: 'eq',
+    operator: LogicalFilterOperator.EQ,
     operands: [
       { type: 'schema', value: '/id' },
       { type: 'data', value: '/id' },

diff --git a/examples/update_movies.ts b/examples/update_movies.ts
@@ -1,3 +1,7 @@
+import {
+  ConditionalFilterOperator,
+  LogicalFilterOperator,
+} from '../types/mod.ts'
 import type { BulkUpdateAction } from '../types/persistence_schema/mod.ts'
 import moviesSchema from './schemas/movies.ts'
 
@@ -10,24 +14,24 @@ const updateMoviesAction: BulkUpdateAction = {
     },
   },
   filter: {
-    operator: 'and',
+    operator: ConditionalFilterOperator.AND,
     operands: [
       {
-        operator: 'eq',
+        operator: LogicalFilterOperator.EQ,
         operands: [
           { type: 'schema', value: '/created_at' },
           { type: 'schema', value: '/updated_at' },
         ],
       },
       {
-        operator: 'or',
+        operator: ConditionalFilterOperator.OR,
         operands: [
           {
-            operator: 'is_null',
+            operator: LogicalFilterOperator.IS_NULL,
             operands: [{ type: 'schema', value: '/likes' }],
           },
           {
-            operator: 'is_null',
+            operator: LogicalFilterOperator.IS_NULL,
             operands: [{ type: 'schema', value: '/release_date' }],
           },
         ],

diff --git a/types/ui_schema/form/example/association.ts b/types/ui_schema/form/example/association.ts
@@ -1,6 +1,6 @@
-import type { UISchema } from '../mod.ts'
+import type { FormUISchema } from '../mod.ts'
 
-const MovieFormUISchema: UISchema<
+const MovieFormUISchema: FormUISchema<
   {
     name: string
     director?: {

diff --git a/types/ui_schema/form/example/field_layout.ts b/types/ui_schema/form/example/field_layout.ts
@@ -1,6 +1,6 @@
-import type { UISchema } from '../mod.ts'
+import type { FormUISchema } from '../mod.ts'
 
-const RegisterFormUISchema: UISchema<{
+const RegisterFormUISchema: FormUISchema<{
   name: string
   password: string
   profile: {

diff --git a/types/ui_schema/form/example/layout.ts b/types/ui_schema/form/example/layout.ts
@@ -1,6 +1,6 @@
-import type { UISchema } from '../mod.ts'
+import type { FormUISchema } from '../mod.ts'
 
-const LayoutedFormUISchema: UISchema<{
+const LayoutedFormFormUISchema: FormUISchema<{
   name: string
   signature: string
   birthday: string
@@ -167,4 +167,4 @@ const LayoutedFormUISchema: UISchema<{
   },
 }
 
-export default LayoutedFormUISchema
+export default LayoutedFormFormUISchema
diff --git a/types/ui_schema/form/example/simple.ts b/types/ui_schema/form/example/simple.ts
@@ -1,6 +1,6 @@
-import type { UISchema } from '../mod.ts'
+import type { FormUISchema } from '../mod.ts'
 
-const PersonFormUISchema: UISchema<{
+const PersonFormUISchema: FormUISchema<{
   name: string
   gender: string
   birthday: string

diff --git a/types/ui_schema/table/example/simple.ts b/types/ui_schema/table/example/simple.ts
@@ -26,7 +26,6 @@ const moviesTableSchema: TableSchema<
     }
   }
 > = {
-  id: 'movie_list_schema',
   columns: {
     releaseYear: {
       fieldType: 'NumericField',