@sidekick-coder/zenith-kit 0.4.2 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sidekick-coder/zenith-kit",
-    "version": "0.4.2",
+    "version": "0.4.3",
     "license": "MIT",
     "description": "Package to use with zenith framework",
     "author": "Henrique Oliveira <henriqueoliwork@gmail.com>",

package/src/server/index.ts

@@ -177,7 +177,6 @@ export * from './queries/destroy.ts'
 export * from './queries/exists.ts'
 export * from './queries/findOne.ts'
 export * from './queries/firstOrCreate.ts'
-export * from './queries/incremental.ts'
 export * from './queries/index.ts'
 export * from './queries/list.ts'
 export * from './queries/paginate.ts'
@@ -205,6 +204,9 @@ export * from './middlewares/AuthSilenceMiddleware.ts'
 export { default as AuthSilenceMiddleware } from './middlewares/AuthSilenceMiddleware.ts'
 export * from './middlewares/AuthorizationMiddleware.ts'
 export { default as AuthorizationMiddleware } from './middlewares/AuthorizationMiddleware.ts'
+export * from './utils/addIdColumn.ts'
+export * from './utils/addSoftDeleteColumn.ts'
+export * from './utils/addTimestampColumns.ts'
 export * from './utils/basePath.ts'
 export * from './utils/createLoaderFactory.ts'
 export * from './utils/cuid.ts'

package/src/server/queries/index.ts

@@ -11,4 +11,3 @@ export * from './softDelete.ts'
 export * from './timestamp.ts'
 export * from './update.ts'
 export * from './updateOrCreate.ts'
-export * from './incremental.ts'

package/src/server/queries/softDelete.ts

@@ -1,5 +1,5 @@
 import { CreateTableBuilder  } from 'kysely'
-import type { ColumnType, ExpressionBuilder } from 'kysely'
+import type { ExpressionBuilder } from 'kysely'
 import type { Selectable } from 'kysely'
 import { now } from './common.ts'
 import type { DatabaseContract as Database } from '#server/contracts/DatabaseContract.ts'
@@ -20,9 +20,6 @@ export type SoftDeleteResult<T extends keyof Database, O extends SoftDeleteOptio
     O extends undefined ? Selectable<Database[T]>[] :
     O extends { serialize: (row: Selectable<Database[T]>) => infer R } ? R[] : Selectable<Database[T]>[]
 
-export interface SoftDeleteTable {
-  deleted_at: ColumnType<Date | null, never | null | ReturnType<typeof now>, string | null | ReturnType<typeof now>>
-}
 
 export function whereNotDeleted<QB extends WhereCapable<QB>>(qb: QB): QB {
     return qb.where('deleted_at', 'is', null)
@@ -64,15 +61,3 @@ export async function softDelete<T extends keyof Database, O extends SoftDeleteO
 
     return rows as SoftDeleteResult<T, O>
 }
-
-declare module 'kysely' {
-  interface CreateTableBuilder<TB extends string, C extends string = never> {
-    addSoftDeleteColumn(): CreateTableBuilder<TB, C | 'deleted_at'>
-  }
-}
-
-CreateTableBuilder.prototype.addSoftDeleteColumn = function (
-    this: CreateTableBuilder<any, any>,
-) {
-    return this.addColumn('deleted_at', 'timestamp')
-}

package/src/server/queries/timestamp.ts

@@ -1,12 +1,6 @@
 import { CreateTableBuilder  } from 'kysely'
-import type { ColumnType } from 'kysely'
 import { now } from './common.ts'
 
-export interface TimestampTable {
-  created_at: ColumnType<Date, string | undefined, never>
-  updated_at: ColumnType<Date, string | undefined, Date | string | ReturnType<typeof now>>
-}
-
 export const addCreatedColumn = (ctb: CreateTableBuilder<any, any>) => {
     return ctb
         .addColumn('created_at', 'timestamp', (col) =>  col.defaultTo(now()).notNull())
@@ -22,33 +16,3 @@ export const addTimestampColumns = (ctb: CreateTableBuilder<any, any>) => {
         .addColumn('created_at', 'timestamp', (col) =>  col.defaultTo(now()).notNull())
         .addColumn('updated_at', 'timestamp', (col) =>  col.defaultTo(now()).notNull())
 }
-
-declare module 'kysely' {
-  interface CreateTableBuilder<TB extends string, C extends string = never> {
-    addTimestampColumns(): CreateTableBuilder<TB, C | 'created_at' | 'updated_at'>
-    addCreatedColumn(): CreateTableBuilder<TB, C | 'created_at'>
-    addUpdatedColumn(): CreateTableBuilder<TB, C | 'updated_at'>
-  }
-}
-
-CreateTableBuilder.prototype.addTimestampColumns = function (
-    this: CreateTableBuilder<any, any>,
-) {
-    return this
-        .addColumn('created_at', 'timestamp', (col) =>  col.defaultTo(now()).notNull())
-        .addColumn('updated_at', 'timestamp', (col) =>  col.defaultTo(now()).notNull())
-}
-
-CreateTableBuilder.prototype.addCreatedColumn = function (
-    this: CreateTableBuilder<any, any>,
-) {
-    return this
-        .addColumn('created_at', 'timestamp', (col) =>  col.defaultTo(now()).notNull())
-}
-
-CreateTableBuilder.prototype.addUpdatedColumn = function (
-    this: CreateTableBuilder<any, any>,
-) {
-    return this
-        .addColumn('updated_at', 'timestamp', (col) =>  col.defaultTo(now()).notNull())
-}

package/src/server/utils/addSoftDeleteColumn.ts

@@ -0,0 +1,17 @@
+import { CreateTableBuilder, type ColumnType } from 'kysely'
+
+export interface SoftDeleteTable {
+  deleted_at: ColumnType<Date | null, never | null | string | null>
+}
+
+declare module 'kysely' {
+    interface CreateTableBuilder<TB extends string, C extends string = never> {
+        addSoftDeleteColumn(): CreateTableBuilder<TB, C | 'deleted_at'>
+    }
+}
+
+CreateTableBuilder.prototype.addSoftDeleteColumn = function(
+    this: CreateTableBuilder<any, any>,
+) {
+    return this.addColumn('deleted_at', 'timestamp')
+}

package/src/server/utils/addTimestampColumns.ts

@@ -0,0 +1,39 @@
+import { CreateTableBuilder, sql } from 'kysely'
+import type { ColumnType } from 'kysely'
+
+export interface TimestampTable {
+    created_at: ColumnType<Date, string | undefined, never>
+    updated_at: ColumnType<Date, string | undefined, Date | string | ReturnType<typeof now>>
+}
+
+declare module 'kysely' {
+    interface CreateTableBuilder<TB extends string, C extends string = never> {
+        addTimestampColumns(): CreateTableBuilder<TB, C | 'created_at' | 'updated_at'>
+        addCreatedColumn(): CreateTableBuilder<TB, C | 'created_at'>
+        addUpdatedColumn(): CreateTableBuilder<TB, C | 'updated_at'>
+    }
+}
+
+const now = () => sql<string>`CURRENT_TIMESTAMP`
+
+CreateTableBuilder.prototype.addTimestampColumns = function(
+    this: CreateTableBuilder<any, any>,
+) {
+    return this
+        .addColumn('created_at', 'timestamp', (col) => col.defaultTo(now()).notNull())
+        .addColumn('updated_at', 'timestamp', (col) => col.defaultTo(now()).notNull())
+}
+
+CreateTableBuilder.prototype.addCreatedColumn = function(
+    this: CreateTableBuilder<any, any>,
+) {
+    return this
+        .addColumn('created_at', 'timestamp', (col) => col.defaultTo(now()).notNull())
+}
+
+CreateTableBuilder.prototype.addUpdatedColumn = function(
+    this: CreateTableBuilder<any, any>,
+) {
+    return this
+        .addColumn('updated_at', 'timestamp', (col) => col.defaultTo(now()).notNull())
+}