feat!: overhaul everything to be Zod-based

ProjectXero · Dec 8, 2022 · d3d2166 · d3d2166
1 parent cf6417c
commit d3d2166
Show file tree

Hide file tree

Showing 27 changed files with 1,824 additions and 905 deletions.
diff --git a/src/datasource/DBDataSource.ts b/src/datasource/DBDataSource.ts
diff --git a/src/datasource/__tests__/DBDataSource.test.ts b/src/datasource/__tests__/DBDataSource.test.ts
@@ -1,21 +1,31 @@
+import { z } from 'zod'
 import { DBDataSource } from '..'
 import { createMockPool } from '../../testing'
 import { LoaderFactory } from '../loaders'
 
-interface DummyRowType {
-  id: number
-  name: string
-  code: string
+const DummyMetadata = {
+  id: {
+    nativeType: 'anything',
+    nativeName: 'id',
+  },
+  name: {
+    nativeType: 'anything',
+    nativeName: 'name',
+  },
+  code: {
+    nativeType: 'anything',
+    nativeName: 'code',
+  },
 }
 
-const columnTypes: Record<keyof DummyRowType, string> = {
-  id: 'anything',
-  name: 'anything',
-  code: 'anything',
-}
+const DummyRowType = z.object({
+  id: z.number(),
+  name: z.string(),
+  code: z.string(),
+})
 
 describe(DBDataSource, () => {
-  const dummyBatchFn = async (): Promise<DummyRowType[]> => {
+  const dummyBatchFn = async (): Promise<z.infer<typeof DummyRowType>[]> => {
     return [
       { id: 1, name: 'aaa', code: 'abc' },
       { id: 2, name: 'bbb', code: 'def' },
@@ -33,17 +43,21 @@ describe(DBDataSource, () => {
     ]
   }
 
-  const factory = new LoaderFactory<DummyRowType>(dummyBatchFn, dummyBatchFn, {
-    columnTypes,
-  })
+  const factory = new LoaderFactory(dummyBatchFn, dummyBatchFn, DummyMetadata)
 
-  class DummyDBDataSource extends DBDataSource<DummyRowType> {
+  class DummyDBDataSource extends DBDataSource<
+    typeof DummyMetadata,
+    typeof DummyRowType,
+    typeof DummyRowType
+  > {
     constructor() {
-      super(createMockPool(), 'any_table', {
-        id: 'any',
-        name: 'any',
-        code: 'any',
-      })
+      super(
+        createMockPool(),
+        'any_table',
+        DummyMetadata,
+        DummyRowType /* select */,
+        DummyRowType /* insert */
+      )
     }
 
     protected get loaders() {
@@ -66,7 +80,7 @@ describe(DBDataSource, () => {
     const dataSource = new TestDataSource()
 
     it('uses the default options', () => {
-      expect(dataSource.testBuilder.select()).toMatchSnapshot()
+      expect(dataSource.testBuilder.select().sql).toMatchSnapshot()
     })
   })
 })
diff --git a/src/datasource/__tests__/__snapshots__/DBDataSource.test.ts.snap b/src/datasource/__tests__/__snapshots__/DBDataSource.test.ts.snap
@@ -1,17 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DBDataSource defaultOptions uses the default options 1`] = `
-{
-  "sql": "
+"
       SELECT *
       FROM "any_table"
       
       
       ORDER BY "any_table"."id"
       
       
-    ",
-  "type": "SLONIK_TOKEN_SQL",
-  "values": [],
-}
+    "
 `;