@stacksjs/database 0.64.5 → 0.65.0

package/src/drivers/mysql.ts

@@ -1,37 +1,36 @@
+import type { Attribute, Attributes, Model } from '@stacksjs/types'
 import { italic, log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
-import { ok } from '@stacksjs/error-handling'
-import { getModelName, getTableName } from '@stacksjs/orm'
+import { type Ok, ok } from '@stacksjs/error-handling'
+import { fetchOtherModelRelations, getModelName, getPivotTables, getTableName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
-import { fs, glob } from '@stacksjs/storage'
+
+import { fs, globSync } from '@stacksjs/storage'
 import { snakeCase } from '@stacksjs/strings'
-import type { Attribute, Attributes, Model } from '@stacksjs/types'
 import {
   arrangeColumns,
   checkPivotMigration,
-  fetchOtherModelRelations,
-  findCharacterLength,
+  fetchTables,
   findDifferingKeys,
   getLastMigrationFields,
-  getPivotTables,
   hasTableBeenMigrated,
   isArrayEqual,
   mapFieldTypeToColumnType,
   pluckChanges,
 } from '.'
 
-export async function resetMysqlDatabase() {
-  const tables = await fetchMysqlTables()
+export async function resetMysqlDatabase(): Promise<Ok<string, never>> {
+  const tables = await fetchTables()
 
   for (const table of tables) await db.schema.dropTable(table).ifExists().execute()
 
   await db.schema.dropTable('migrations').ifExists().execute()
   await db.schema.dropTable('migration_locks').ifExists().execute()
+  await db.schema.dropTable('migrations').ifExists().execute()
 
   const files = await fs.readdir(path.userMigrationsPath())
   const modelFiles = await fs.readdir(path.frameworkPath('database/models'))
-
-  const userModelFiles = glob.sync(path.userModelsPath('*.ts'))
+  const userModelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
 
   for (const userModel of userModelFiles) {
     const model = (await import(userModel)).default as Model
@@ -45,7 +44,8 @@ export async function resetMysqlDatabase() {
       if (modelFile.endsWith('.ts')) {
         const modelPath = path.frameworkPath(`database/models/${modelFile}`)
 
-        if (fs.existsSync(modelPath)) await Bun.$`rm ${modelPath}`
+        if (fs.existsSync(modelPath))
+          await Bun.$`rm ${modelPath}`
       }
     }
   }
@@ -55,7 +55,8 @@ export async function resetMysqlDatabase() {
       if (file.endsWith('.ts')) {
         const migrationPath = path.userMigrationsPath(`${file}`)
 
-        if (fs.existsSync(migrationPath)) await Bun.$`rm ${migrationPath}`
+        if (fs.existsSync(migrationPath))
+          await Bun.$`rm ${migrationPath}`
       }
     }
   }
@@ -63,9 +64,9 @@ export async function resetMysqlDatabase() {
   return ok('All tables dropped successfully!')
 }
 
-export async function generateMysqlMigration(modelPath: string) {
+export async function generateMysqlMigration(modelPath: string): Promise<void> {
   // check if any files are in the database folder
-  const files = await fs.readdir(path.userMigrationsPath())
+  // const files = await fs.readdir(path.userMigrationsPath())
 
   // if (files.length === 0) {
   //   log.debug('No migrations found in the database folder, deleting all framework/database/*.json files...')
@@ -84,7 +85,7 @@ export async function generateMysqlMigration(modelPath: string) {
 
   const model = (await import(modelPath)).default as Model
   const fileName = path.basename(modelPath)
-  const tableName = await getTableName(model, modelPath)
+  const tableName = getTableName(model, modelPath)
 
   const fieldsString = JSON.stringify(model.attributes, null, 2) // Pretty print the JSON
   const copiedModelPath = path.frameworkPath(`database/models/${fileName}`)
@@ -105,7 +106,8 @@ export async function generateMysqlMigration(modelPath: string) {
 
     haveFieldsChanged = true
     log.debug(`Fields have changed for ${tableName}`)
-  } else {
+  }
+  else {
     log.debug(`Fields have not been generated for ${tableName}`)
   }
 
@@ -120,17 +122,19 @@ export async function generateMysqlMigration(modelPath: string) {
 
   log.debug(`Has ${tableName} been migrated? ${hasBeenMigrated}`)
 
-  if (haveFieldsChanged) await createAlterTableMigration(modelPath)
+  if (haveFieldsChanged)
+    await createAlterTableMigration(modelPath)
   else await createTableMigration(modelPath)
 }
 
-async function createTableMigration(modelPath: string) {
+async function createTableMigration(modelPath: string): Promise<void> {
   log.debug('createTableMigration modelPath:', modelPath)
 
   const model = (await import(modelPath)).default as Model
-  const tableName = await getTableName(model, modelPath)
+  const tableName = getTableName(model, modelPath)
 
-  const twoFactorEnabled = model.traits?.useAuth?.useTwoFactor
+  const twoFactorEnabled
+    = model.traits?.useAuth && typeof model.traits.useAuth !== 'boolean' ? model.traits.useAuth.useTwoFactor : false
 
   await createPivotTableMigration(model, modelPath)
   const otherModelRelations = await fetchOtherModelRelations(model, modelPath)
@@ -138,6 +142,11 @@ async function createTableMigration(modelPath: string) {
   const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable ?? true
   const useSoftDeletes = model?.traits?.useSoftDeletes ?? model?.traits?.softDeletable ?? false
 
+  const usePasskey = (typeof model.traits?.useAuth === 'object' && model.traits.useAuth.usePasskey) ?? false
+
+  if (usePasskey)
+    await createPasskeyMigration()
+
   let migrationContent = `import type { Database } from '@stacksjs/database'\n`
   migrationContent += `import { sql } from '@stacksjs/database'\n\n`
   migrationContent += `export async function up(db: Database<any>) {\n`
@@ -154,15 +163,17 @@ async function createTableMigration(modelPath: string) {
     // Check if there are configurations that require the lambda function
     if (fieldOptions.unique || fieldOptions?.required) {
       migrationContent += `, col => col`
-      if (fieldOptions.unique) migrationContent += `.unique()`
-      if (fieldOptions?.required) migrationContent += `.notNull()`
+      if (fieldOptions.unique)
+        migrationContent += `.unique()`
+      if (fieldOptions?.required)
+        migrationContent += `.notNull()`
       migrationContent += ``
     }
 
     migrationContent += `)\n`
   }
 
-  if (false !== twoFactorEnabled && twoFactorEnabled) {
+  if (twoFactorEnabled !== false && twoFactorEnabled) {
     migrationContent += `    .addColumn('two_factor_secret', 'varchar(255)')\n`
   }
 
@@ -174,14 +185,18 @@ async function createTableMigration(modelPath: string) {
     }
   }
 
+  if (usePasskey)
+    migrationContent += `    .addColumn('public_passkey', 'text')\n`
+
   // Append created_at and updated_at columns if useTimestamps is true
   if (useTimestamps) {
     migrationContent += `    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))\n`
-    migrationContent += `    .addColumn('updated_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))\n`
+    migrationContent += `    .addColumn('updated_at', 'timestamp')\n`
   }
 
   // Append deleted_at column if useSoftDeletes is true
-  if (useSoftDeletes) migrationContent += `    .addColumn('deleted_at', 'timestamp')\n`
+  if (useSoftDeletes)
+    migrationContent += `    .addColumn('deleted_at', 'timestamp')\n`
 
   migrationContent += `    .execute()\n`
   migrationContent += `}\n`
@@ -190,20 +205,59 @@ async function createTableMigration(modelPath: string) {
   const migrationFileName = `${timestamp}-create-${tableName}-table.ts`
   const migrationFilePath = path.userMigrationsPath(migrationFileName)
 
+  // eslint-disable-next-line no-console
+  console.log(migrationFilePath)
+
   Bun.write(migrationFilePath, migrationContent)
 
   log.success(`Created migration: ${italic(migrationFileName)}`)
 }
 
-async function createPivotTableMigration(model: Model, modelPath: string) {
+async function createPasskeyMigration() {
+  const hasBeenMigrated = await hasTableBeenMigrated('users')
+
+  if (hasBeenMigrated)
+    return
+
+  let migrationContent = `import type { Database } from '@stacksjs/database'\n`
+  migrationContent += `export async function up(db: Database<any>) {\n`
+  migrationContent += `  await db.schema\n`
+  migrationContent += `    .createTable('passkeys')\n`
+  migrationContent += `    .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())\n`
+  migrationContent += `    .addColumn('cred_public_key', 'text')\n`
+  migrationContent += `    .addColumn('user_id', 'integer')\n`
+  migrationContent += `    .addColumn('webauthn_user_id', 'varchar(255)')\n`
+  migrationContent += `    .addColumn('counter', 'integer')\n`
+  migrationContent += `    .addColumn('device_type', 'varchar(255)')\n`
+  migrationContent += `    .addColumn('backup_eligible', 'boolean')\n`
+  migrationContent += `    .addColumn('backup_status', 'boolean')\n`
+  migrationContent += `    .addColumn('transports', 'varchar(255)')\n`
+  migrationContent += `    .addColumn('last_used_at', 'text')\n`
+  migrationContent += `    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))\n`
+  migrationContent += `    .execute()\n`
+  migrationContent += `    }\n`
+
+  const timestamp = new Date().getTime().toString()
+  const migrationFileName = `${timestamp}-create-passkeys-table.ts`
+
+  const migrationFilePath = path.userMigrationsPath(migrationFileName)
+
+  Bun.write(migrationFilePath, migrationContent)
+
+  log.success(`Created pivot migration: ${migrationFileName}`)
+}
+
+async function createPivotTableMigration(model: Model, modelPath: string): Promise<void> {
   const pivotTables = await getPivotTables(model, modelPath)
 
-  if (!pivotTables.length) return
+  if (!pivotTables.length)
+    return
 
   for (const pivotTable of pivotTables) {
     const hasBeenMigrated = await checkPivotMigration(pivotTable.table)
 
-    if (hasBeenMigrated) return
+    if (hasBeenMigrated)
+      return
 
     let migrationContent = `import type { Database } from '@stacksjs/database'\n`
     migrationContent += `export async function up(db: Database<any>) {\n`
@@ -217,6 +271,7 @@ async function createPivotTableMigration(model: Model, modelPath: string) {
 
     const timestamp = new Date().getTime().toString()
     const migrationFileName = `${timestamp}-create-${pivotTable.table}-table.ts`
+
     const migrationFilePath = path.userMigrationsPath(migrationFileName)
 
     Bun.write(migrationFilePath, migrationContent)
@@ -225,12 +280,10 @@ async function createPivotTableMigration(model: Model, modelPath: string) {
   }
 }
 
-export async function createAlterTableMigration(modelPath: string) {
-  console.log('createAlterTableMigration')
-
+export async function createAlterTableMigration(modelPath: string): Promise<void> {
   const model = (await import(modelPath)).default as Model
   const modelName = getModelName(model, modelPath)
-  const tableName = await getTableName(model, modelPath)
+  const tableName = getTableName(model, modelPath)
   let hasChanged = false
 
   // Assuming you have a function to get the fields from the last migration
@@ -257,7 +310,6 @@ export async function createAlterTableMigration(modelPath: string) {
   }
 
   const fieldValidations = findDifferingKeys(lastFields, currentFields)
-
   for (const fieldValidation of fieldValidations) {
     hasChanged = true
     const fieldNameFormatted = snakeCase(fieldValidation.key)
@@ -278,8 +330,10 @@ export async function createAlterTableMigration(modelPath: string) {
     // Check if there are configurations that require the lambda function
     if (options.unique || options?.required) {
       migrationContent += `, col => col`
-      if (options.unique) migrationContent += `.unique()`
-      if (options?.required) migrationContent += `.notNull()`
+      if (options.unique)
+        migrationContent += `.unique()`
+      if (options?.required)
+        migrationContent += `.notNull()`
       migrationContent += ``
     }
 
@@ -289,10 +343,11 @@ export async function createAlterTableMigration(modelPath: string) {
   // Remove fields that no longer exist
   for (const fieldName of fieldsToRemove) migrationContent += `    .dropColumn('${fieldName}')\n`
 
-  if (fieldsToAdd.length || fieldsToRemove.length) migrationContent += `    .execute();\n`
+  if (fieldsToAdd.length || fieldsToRemove.length)
+    migrationContent += `    .execute();\n`
 
-  const lastFieldOrder = Object.values(lastFields).map((attr) => attr.order)
-  const currentFieldOrder = Object.values(currentFields).map((attr) => attr.order)
+  const lastFieldOrder = Object.values(lastFields).map(attr => attr.order)
+  const currentFieldOrder = Object.values(currentFields).map(attr => attr.order)
 
   if (!isArrayEqual(lastFieldOrder, currentFieldOrder)) {
     hasChanged = true
@@ -317,7 +372,7 @@ function reArrangeColumns(attributes: Attributes | undefined, tableName: string)
   let migrationContent = ''
 
   let previousField = ''
-  for (const [fieldName, options] of fields) {
+  for (const [fieldName] of fields) {
     const fieldNameFormatted = snakeCase(fieldName)
 
     if (previousField) {
@@ -332,17 +387,3 @@ function reArrangeColumns(attributes: Attributes | undefined, tableName: string)
 
   return migrationContent
 }
-
-export async function fetchMysqlTables(): Promise<string[]> {
-  const modelFiles = glob.sync(path.userModelsPath('*.ts'))
-  const tables: string[] = []
-
-  for (const modelPath of modelFiles) {
-    const model = (await import(modelPath)).default as Model
-    const tableName = await getTableName(model, modelPath)
-
-    tables.push(tableName)
-  }
-
-  return tables
-}

package/src/drivers/postgres.ts

@@ -1,24 +1,22 @@
+import type { Attribute, Attributes, Model } from '@stacksjs/types'
 import { italic, log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
 import { ok } from '@stacksjs/error-handling'
-import { getTableName } from '@stacksjs/orm'
+import { fetchOtherModelRelations, getPivotTables, getTableName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
-import { fs, glob } from '@stacksjs/storage'
+import { fs, globSync } from '@stacksjs/storage'
 import { snakeCase } from '@stacksjs/strings'
-import type { Attribute, Attributes, Model } from '@stacksjs/types'
 import {
   arrangeColumns,
   checkPivotMigration,
-  fetchOtherModelRelations,
   getLastMigrationFields,
-  getPivotTables,
   hasTableBeenMigrated,
   mapFieldTypeToColumnType,
   pluckChanges,
 } from '.'
 
 export async function resetPostgresDatabase() {
-  const tables = await fetchMysqlTables()
+  const tables = await fetchPostgresTables()
 
   for (const table of tables) await db.schema.dropTable(table).ifExists().execute()
 
@@ -28,7 +26,7 @@ export async function resetPostgresDatabase() {
   const files = await fs.readdir(path.userMigrationsPath())
   const modelFiles = await fs.readdir(path.frameworkPath('database/models'))
 
-  const userModelFiles = glob.sync(path.userModelsPath('*.ts'))
+  const userModelFiles = globSync([path.userModelsPath('*.ts')], { absolute: true })
 
   for (const userModel of userModelFiles) {
     const userModelPath = (await import(userModel)).default
@@ -43,7 +41,8 @@ export async function resetPostgresDatabase() {
       if (modelFile.endsWith('.ts')) {
         const modelPath = path.frameworkPath(`database/models/${modelFile}`)
 
-        if (fs.existsSync(modelPath)) await Bun.$`rm ${modelPath}`
+        if (fs.existsSync(modelPath))
+          await Bun.$`rm ${modelPath}`
       }
     }
   }
@@ -53,7 +52,8 @@ export async function resetPostgresDatabase() {
       if (file.endsWith('.ts')) {
         const migrationPath = path.userMigrationsPath(`${file}`)
 
-        if (fs.existsSync(migrationPath)) await Bun.$`rm ${migrationPath}`
+        if (fs.existsSync(migrationPath))
+          await Bun.$`rm ${migrationPath}`
       }
     }
   }
@@ -61,7 +61,7 @@ export async function resetPostgresDatabase() {
   return ok('All tables dropped successfully!')
 }
 
-export async function generatePostgresMigration(modelPath: string) {
+export async function generatePostgresMigration(modelPath: string): Promise<void> {
   // check if any files are in the database folder
   const files = await fs.readdir(path.userMigrationsPath())
 
@@ -75,7 +75,8 @@ export async function generatePostgresMigration(modelPath: string) {
       log.debug('No existing model files in framework path...')
 
       for (const file of modelFiles) {
-        if (file.endsWith('.ts')) await fs.unlink(path.frameworkPath(`database/models/${file}`))
+        if (file.endsWith('.ts'))
+          await fs.unlink(path.frameworkPath(`database/models/${file}`))
       }
     }
   }
@@ -103,7 +104,8 @@ export async function generatePostgresMigration(modelPath: string) {
 
     haveFieldsChanged = true
     log.debug(`Fields have changed for ${tableName}`)
-  } else {
+  }
+  else {
     log.debug(`Fields have not been generated for ${tableName}`)
   }
 
@@ -118,7 +120,8 @@ export async function generatePostgresMigration(modelPath: string) {
 
   log.debug(`Has ${tableName} been migrated? ${hasBeenMigrated}`)
 
-  if (haveFieldsChanged) await createAlterTableMigration(modelPath)
+  if (haveFieldsChanged)
+    await createAlterTableMigration(modelPath)
   else await createTableMigration(modelPath)
 }
 
@@ -144,14 +147,16 @@ async function createTableMigration(modelPath: string) {
   for (const [fieldName, options] of arrangeColumns(model.attributes)) {
     const fieldOptions = options as Attribute
     const fieldNameFormatted = snakeCase(fieldName)
-    const columnType = mapFieldTypeToColumnType(fieldOptions.validations?.rule)
+    const columnType = mapFieldTypeToColumnType(fieldOptions.validation?.rule)
     migrationContent += `    .addColumn('${fieldNameFormatted}', '${columnType}'`
 
     // Check if there are configurations that require the lambda function
-    if (fieldOptions.unique || fieldOptions.validations?.rule?.required) {
+    if (fieldOptions.unique || fieldOptions.validation?.rule?.required) {
       migrationContent += `, col => col`
-      if (fieldOptions.unique) migrationContent += `.unique()`
-      if (fieldOptions.validations?.rule?.required) migrationContent += `.notNull()`
+      if (fieldOptions.unique)
+        migrationContent += `.unique()`
+      if (fieldOptions.validation?.rule?.required)
+        migrationContent += `.notNull()`
       migrationContent += ``
     }
 
@@ -173,7 +178,8 @@ async function createTableMigration(modelPath: string) {
   }
 
   // Append deleted_at column if useSoftDeletes is true
-  if (useSoftDeletes) migrationContent += `    .addColumn('deleted_at', 'timestamp')\n`
+  if (useSoftDeletes)
+    migrationContent += `    .addColumn('deleted_at', 'timestamp')\n`
 
   migrationContent += `    .execute()\n`
   migrationContent += `}\n`
@@ -191,11 +197,13 @@ async function createTableMigration(modelPath: string) {
 async function createPivotTableMigration(model: Model, modelPath: string) {
   const pivotTables = await getPivotTables(model, modelPath)
 
-  if (!pivotTables.length) return
+  if (!pivotTables.length)
+    return
   for (const pivotTable of pivotTables) {
     const hasBeenMigrated = await checkPivotMigration(pivotTable.table)
 
-    if (hasBeenMigrated) return
+    if (hasBeenMigrated)
+      return
 
     let migrationContent = `import type { Database } from '@stacksjs/database'\n`
     migrationContent += `import { sql } from '@stacksjs/database'\n\n`
@@ -219,23 +227,18 @@ async function createPivotTableMigration(model: Model, modelPath: string) {
   }
 }
 
-export async function createAlterTableMigration(modelPath: string) {
-  console.log('createAlterTableMigration')
-
+async function createAlterTableMigration(modelPath: string) {
   const model = (await import(modelPath)).default as Model
   const modelName = path.basename(modelPath)
-  const tableName = await getTableName(model, modelPath)
+  const tableName = getTableName(model, modelPath)
 
   // Assuming you have a function to get the fields from the last migration
   // For simplicity, this is not implemented here
   const lastMigrationFields = await getLastMigrationFields(modelName)
   const lastFields = lastMigrationFields ?? {}
   const currentFields = model.attributes as Attributes
-
   const changes = pluckChanges(Object.keys(lastFields), Object.keys(currentFields))
-
   const fieldsToAdd = changes?.added || []
-
   const fieldsToRemove = changes?.removed || []
 
   let migrationContent = `import type { Database } from '@stacksjs/database'\n`
@@ -246,7 +249,7 @@ export async function createAlterTableMigration(modelPath: string) {
   // Add new fields
   for (const fieldName of fieldsToAdd) {
     const options = currentFields[fieldName] as Attribute
-    const columnType = mapFieldTypeToColumnType(options.validations?.rule)
+    const columnType = mapFieldTypeToColumnType(options.validation?.rule)
     migrationContent += `    .addColumn('${fieldName}', '${columnType}')\n`
   }
 
@@ -266,14 +269,13 @@ export async function createAlterTableMigration(modelPath: string) {
   log.success(`Created migration: ${italic(migrationFileName)}`)
 }
 
-export async function fetchMysqlTables(): Promise<string[]> {
-  const modelFiles = glob.sync(path.userModelsPath('*.ts'))
+export async function fetchPostgresTables(): Promise<string[]> {
+  const modelFiles = globSync([path.userModelsPath('*.ts')])
   const tables: string[] = []
 
   for (const modelPath of modelFiles) {
     const model = (await import(modelPath)).default
-
-    const tableName = await getTableName(model, modelPath)
+    const tableName = getTableName(model, modelPath)
 
     tables.push(tableName)
   }