chore: wip

Author: glennmichael123

database/migrations/1740753127344-create-personal_access_tokens-table.ts

@@ -15,9 +15,8 @@ export async function up(db: Database<any>) {
     .addColumn('ip_address', 'text')
     .addColumn('device_name', 'text')
     .addColumn('is_single_use', 'integer')
-    .addColumn('team_id', 'integer', (col) =>
-        col.references('teams.id').onDelete('cascade')
-      ) 
+    .addColumn('team_id', 'integer', col =>
+      col.references('teams.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()

database/migrations/1740753127346-create-team_users-table.ts

@@ -1,9 +1,10 @@
 import type { Database } from '@stacksjs/database'
+
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('team_users')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('team_id', 'integer')
     .addColumn('user_id', 'integer')
     .execute()
-    }
+}

database/migrations/1740753127353-create-passkeys-table.ts

@@ -1,5 +1,5 @@
 import type { Database } from '@stacksjs/database'
- import { sql } from '@stacksjs/database'
+import { sql } from '@stacksjs/database'
 
 export async function up(db: Database<any>) {
   await db.schema
@@ -9,4 +9,4 @@ export async function up(db: Database<any>) {
     .addColumn('activity_id', 'integer', col => col.notNull())
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .execute()
-    }
+}

database/migrations/1740753127355-create-subscribers-table.ts

@@ -6,9 +6,8 @@ export async function up(db: Database<any>) {
     .createTable('subscribers')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('subscribed', 'integer')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()

database/migrations/1740753127357-create-deployments-table.ts

@@ -13,9 +13,8 @@ export async function up(db: Database<any>) {
     .addColumn('execution_time', 'numeric')
     .addColumn('deploy_script', 'text')
     .addColumn('terminal_output', 'text')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()

database/migrations/1740753127363-create-passkeys-table.ts

@@ -1,5 +1,5 @@
 import type { Database } from '@stacksjs/database'
- import { sql } from '@stacksjs/database'
+import { sql } from '@stacksjs/database'
 
 export async function up(db: Database<any>) {
   await db.schema
@@ -17,4 +17,4 @@ export async function up(db: Database<any>) {
     .addColumn('last_used_at', 'text')
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .execute()
-    }
+}

database/migrations/1740753127365-create-posts-table.ts

@@ -7,9 +7,8 @@ export async function up(db: Database<any>) {
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('title', 'text')
     .addColumn('body', 'text')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()

database/migrations/1740753127370-create-payment_methods-table.ts

@@ -13,9 +13,8 @@ export async function up(db: Database<any>) {
     .addColumn('exp_year', 'numeric', col => col.notNull())
     .addColumn('is_default', 'integer')
     .addColumn('provider_id', 'text')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()

database/migrations/1740753127374-create-payment_transactions-table.ts

@@ -11,12 +11,10 @@ export async function up(db: Database<any>) {
     .addColumn('amount', 'numeric', col => col.notNull())
     .addColumn('type', 'text', col => col.notNull())
     .addColumn('provider_id', 'text')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
-    .addColumn('payment_method_id', 'integer', (col) =>
-        col.references('payment_methods.id').onDelete('cascade')
-      ) 
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
+    .addColumn('payment_method_id', 'integer', col =>
+      col.references('payment_methods.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()

database/migrations/1740753127379-create-subscriptions-table.ts

@@ -16,9 +16,8 @@ export async function up(db: Database<any>) {
     .addColumn('trial_ends_at', 'text')
     .addColumn('ends_at', 'text')
     .addColumn('last_used_at', 'text')
-    .addColumn('user_id', 'integer', (col) =>
-        col.references('users.id').onDelete('cascade')
-      ) 
+    .addColumn('user_id', 'integer', col =>
+      col.references('users.id').onDelete('cascade'))
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()

resources/emails/WelcomeTest.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        Hello World
+    </div>
+</template>

storage/framework/core/email/src/drivers/base.ts

@@ -61,6 +61,7 @@ export abstract class BaseEmailDriver implements EmailDriver {
    */
   protected async handleError(error: unknown, message: EmailMessage): Promise<EmailResult> {
     const err = error instanceof Error ? error : new Error(String(error))
+
     log.error(`[${this.name}] Email sending failed`, {
       error: err.message,
       stack: err.stack,

storage/framework/core/email/src/drivers/mailtrap.ts

@@ -7,13 +7,17 @@ import { BaseEmailDriver } from './base'
 
 export class MailtrapDriver extends BaseEmailDriver {
   public name = 'mailtrap'
+  private host: string
   private token: string
   private inboxId?: number
 
   constructor() {
     super()
-    this.token = config.services.mailtrap?.token ?? ''
-    this.inboxId = config.services.mailtrap?.inboxId ? Number(config.services.mailtrap.inboxId) : undefined
+    this.host = config.services.mailtrap?.host ?? 'https://sandbox.api.mailtrap.io/api/send'
+    this.token = 'c36253a573dea8edac2c549f349a3cb9'
+    // this.token = config.services.mailtrap?.token ?? ''
+    this.inboxId = 403353
+    // this.inboxId = config.services.mailtrap?.inboxId ? Number(config.services.mailtrap.inboxId) : undefined
   }
 
   public async send(message: EmailMessage, options?: RenderOptions): Promise<EmailResult> {
@@ -96,7 +100,7 @@ export class MailtrapDriver extends BaseEmailDriver {
       throw new Error('Mailtrap inbox ID is required but not provided. Please set MAILTRAP_INBOX_ID in your environment variables.')
     }
 
-    const endpoint = `https://sandbox.api.mailtrap.io/api/send/${this.inboxId}`
+    const endpoint = `${this.host}/${this.inboxId}`
 
     try {
       const response = await fetch(endpoint, {

storage/framework/core/email/src/email.ts

@@ -41,4 +41,4 @@ class Mail {
 }
 
 // Export a singleton instance
-export const mail: Mail = new Mail()
+export const mail: Mail = new Mail({ defaultDriver: 'mailtrap' })

storage/framework/core/email/src/template.ts

@@ -9,12 +9,14 @@ interface HtmlResult {
 }
 
 export async function template(path: string, options?: RenderOptions): Promise<HtmlResult> {
+  const templatePath = path.endsWith('.vue') ? path : `${path}.vue`
+
   const email = config(resourcesPath('emails'), {
     verbose: !!process.env.DEBUG,
     // options: {
     //   baseUrl: 'https://APP_URL/',
     // },
   })
 
-  return await email.render(path, options)
+  return await email.render(templatePath, options)
 }

storage/framework/core/error-handling/src/handler.ts

@@ -116,10 +116,24 @@ export async function writeToLogFile(message: string, options?: WriteOptions): P
   await appendFile(logFile, formattedMessage)
 }
 
-export function handleError(err: string | Error | object | unknown, options?: ErrorOptions): Error {
+export function handleError(
+  err: string | Error | object | unknown,
+  options?: ErrorOptions | Record<string, any>,
+): Error {
   let errorMessage: string
+  let contextData: Record<string, any> | undefined
+
+  // Check if options is a context object (not an ErrorOptions)
+  if (options
+    && typeof options === 'object'
+    && !('shouldExit' in options)
+    && !('silent' in options)
+    && !('message' in options)) {
+    contextData = options as Record<string, any>
+    options = undefined
+  }
 
-  if (options && options.message) {
+  if (options && 'message' in options) {
     // If options is provided with a message, use options.message as error message
     errorMessage = options.message
   }
@@ -138,7 +152,13 @@ export function handleError(err: string | Error | object | unknown, options?: Er
     }
   }
 
-  writeToLogFile(`ERROR: ${stripAnsi(errorMessage)}`)
+  // Build log message with context if available
+  let logMessage = `ERROR: ${stripAnsi(errorMessage)}`
+  if (contextData) {
+    logMessage += `\nContext: ${JSON.stringify(contextData, null, 2)}`
+  }
+
+  writeToLogFile(logMessage)
 
-  return ErrorHandler.handle(err, options)
+  return ErrorHandler.handle(err, options as ErrorOptions)
 }

storage/framework/core/types/src/services.ts

@@ -40,7 +40,8 @@ export interface ServicesOptions {
   }
 
   mailtrap?: {
-    token?: string
+    token: string
+    host: string
     inboxId?: string | number
     maxRetries?: number
     retryTimeout?: number

storage/framework/types/server-auto-imports.d.ts

@@ -147,7 +147,6 @@ declare global {
   const UsersTable: typeof import('./../orm/src/models')['UsersTable']
   const accesstokenRequest: typeof import('./../requests')['accesstokenRequest']
   const activityRequest: typeof import('./../requests')['activityRequest']
-  const default: typeof import('./../orm/src/models')['default']
   const deploymentRequest: typeof import('./../requests')['deploymentRequest']
   const errorRequest: typeof import('./../requests')['errorRequest']
   const failedjobRequest: typeof import('./../requests')['failedjobRequest']