chore: wip

database/migrations/1738813437275-create-passkeys-table.ts → database/migrations/1738814774514-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/1738813437269-create-personal_access_tokens-table.ts → database/migrations/1738814779615-create-personal_access_tokens-table.ts

@@ -9,9 +9,8 @@ export async function up(db: Database<any>) {
     .addColumn('token', 'varchar(512)', col => col.unique())
     .addColumn('plain_text_token', 'varchar(512)')
     .addColumn('abilities', 'text')
-    .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/1738813437292-create-payment_methods-table.ts → database/migrations/1738814780678-create-payment_methods-table.ts

@@ -13,9 +13,8 @@ export async function up(db: Database<any>) {
     .addColumn('exp_year', 'integer', col => col.notNull())
     .addColumn('is_default', 'boolean')
     .addColumn('provider_id', 'varchar(255)')
-    .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/1738813437271-create-team_users-table.ts → database/migrations/1738814780682-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/1738813437278-create-subscribers-table.ts → database/migrations/1738814782690-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', 'boolean')
-    .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/1738813437294-create-transactions-table.ts → database/migrations/1738814783684-create-transactions-table.ts

@@ -11,12 +11,10 @@ export async function up(db: Database<any>) {
     .addColumn('amount', 'integer', col => col.notNull())
     .addColumn('type', 'varchar(50)', col => col.notNull())
     .addColumn('provider_id', 'varchar(255)')
-    .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('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/1738813437300-create-subscriptions-table.ts → database/migrations/1738814785749-create-subscriptions-table.ts

@@ -16,9 +16,8 @@ export async function up(db: Database<any>) {
     .addColumn('trial_ends_at', 'varchar(255)')
     .addColumn('ends_at', 'varchar(255)')
     .addColumn('last_used_at', 'varchar(255)')
-    .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/1738813437282-create-deployments-table.ts → database/migrations/1738814786761-create-deployments-table.ts

@@ -13,9 +13,8 @@ export async function up(db: Database<any>) {
     .addColumn('execution_time', 'integer')
     .addColumn('deploy_script', 'varchar(255)')
     .addColumn('terminal_output', 'varchar(255)')
-    .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/1738813437304-create-passkeys-table.ts → database/migrations/1738814789792-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/1738813437286-create-posts-table.ts → database/migrations/1738814790800-create-posts-table.ts

@@ -7,9 +7,8 @@ export async function up(db: Database<any>) {
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('title', 'varchar(255)')
     .addColumn('body', 'varchar(255)')
-    .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()

storage/framework/core/orm/src/utils.ts

@@ -67,19 +67,26 @@ export async function getRelations(model: Model, modelName: string): Promise<Rel
       for (const relationInstance of model[relation as keyof Model] as BaseRelation) {
         let relationModel = relationInstance.model
         let modelRelation: Model
+        let modelPath: string
         if (isString(relationInstance)) {
           relationModel = relationInstance
         }
 
         const modelRelationPath = path.userModelsPath(`${relationModel}.ts`)
-        const modelPath = path.userModelsPath(`${modelName}.ts`)
+        const userModelPath = path.userModelsPath(`${modelName}.ts`)
+        const coreModelPath = path.storagePath(`framework/defaults/models/${modelName}.ts`)
         const coreModelRelationPath = path.storagePath(`framework/defaults/models/${relationModel}.ts`)
 
         if (fs.existsSync(modelRelationPath))
           modelRelation = (await import(modelRelationPath)).default as Model
         else
           modelRelation = (await import(coreModelRelationPath)).default as Model
 
+        if (fs.existsSync(userModelPath))
+          modelPath = userModelPath
+        else
+          modelPath = coreModelPath
+
         const modelRelationTable = getTableName(modelRelation, modelRelationPath)
         const table = getTableName(model, modelPath)
         const modelRelationName = snakeCase(getModelName(modelRelation, modelRelationPath))
@@ -309,8 +316,6 @@ export async function writeModelNames(): Promise<void> {
     }
   }
 
-  fileString += ' | '
-
   // Ensure the directory exists
   const typesDir = path.dirname(path.typesPath(`src/model-names.ts`))
   await fs.promises.mkdir(typesDir, { recursive: true })
@@ -949,16 +954,6 @@ export async function generateKyselyTypes(): Promise<void> {
     text += `  ${tableName}: ${formattedTableName}\n`
   }
 
-  for (const coreModelFile of coreModelFiles) {
-    const model = (await import(coreModelFile)).default as Model
-    const tableName = getTableName(model, coreModelFile)
-
-    const words = tableName.split('_')
-    const formattedTableName = `${words.map(word => word.charAt(0).toUpperCase() + word.slice(1)).join('')}Table`
-
-    text += `  ${tableName}: ${formattedTableName}\n`
-  }
-
   text += 'passkeys: PasskeysTable\n'
   text += 'migrations: MigrationsTable\n'
 

storage/framework/core/payments/src/billable/charge.ts

@@ -50,7 +50,6 @@ export const manageCharge: ManageCharge = (() => {
     }
     catch (error) {
       log.error('Error creating refund:', error)
-      throw error
     }
   }
 

storage/framework/core/types/src/model-names.ts

@@ -1 +1 @@
-export type ModelNames = 'Project' | 'SubscriberEmail' | 'AccessToken' | 'Team' | 'Activity' | 'Subscriber' | 'Deployment' | 'Release' | 'User' | 'Post' | 'FailedJob' | 'Product' | 'PaymentMethod' | 'Transaction' | 'Job' | 'Subscription' | 'Error'
+export type ModelNames = 'Activity' | 'Project' | 'FailedJob' | 'SubscriberEmail' | 'Product' | 'AccessToken' | 'PaymentMethod' | 'Team' | 'Subscriber' | 'Transaction' | 'Job' | 'Subscription' | 'Deployment' | 'Error' | 'Release' | 'User' | 'Post'

storage/framework/core/types/src/table-names.ts

@@ -1 +1 @@
-export type TableNames = 'projects' | 'subscriber_emails' | 'personal_access_tokens' | 'team_users' | 'teams' | 'activities' | 'subscribers' | 'deployments' | 'releases' | 'team_users' | 'users' | 'posts' | 'failed_jobs' | 'products' | 'payment_methods' | 'transactions' | 'jobs' | 'subscriptions' | 'errors'
+export type TableNames = 'activities' | 'projects' | 'failed_jobs' | 'subscriber_emails' | 'products' | 'personal_access_tokens' | 'payment_methods' | 'team_users' | 'teams' | 'subscribers' | 'transactions' | 'jobs' | 'subscriptions' | 'deployments' | 'errors' | 'releases' | 'team_users' | 'users' | 'posts'

storage/framework/orm/routes.ts

@@ -1,17 +1,17 @@
 import { route } from '@stacksjs/router'
 
-route.get('activities', 'storage/framework/actions/src/ActivityIndexOrmAction.ts')
 
-route.get('activities/{id}', 'storage/framework/actions/src/ActivityShowOrmAction.ts')
+route.get('users', 'UserIndexOrmAction')
+
+route.post('users', 'UserStoreOrmAction')
+
+route.get('users/{id}', 'UserShowOrmAction')
+
+/actions/src/ActivityShowOrmAction.ts')
 
 route.post('activities', 'storage/framework/actions/src/ActivityStoreOrmAction.ts')
 
 route.patch('activities/{id}', 'storage/framework/actions/src/ActivityUpdateOrmAction.ts')
 
 route.delete('activities/{id}', 'storage/framework/actions/src/ActivityDestroyOrmAction.ts')
 
-route.get('users', 'UserIndexOrmAction')
-
-route.post('users', 'UserStoreOrmAction')
-
-route.get('users/{id}', 'UserShowOrmAction')

storage/framework/orm/src/models/Transaction.ts

@@ -62,7 +62,7 @@ interface QueryOptions {
 
 export class TransactionModel {
   private readonly hidden: Array<keyof TransactionJsonResponse> = []
-  private readonly fillable: Array<keyof TransactionJsonResponse> = ['name', 'description', 'amount', 'type', 'provider_id', 'uuid', 'user_id', 'payment_method_id']
+  private readonly fillable: Array<keyof TransactionJsonResponse> = ['name', 'description', 'amount', 'type', 'provider_id', 'uuid', 'payment_method_id', 'user_id']
   private readonly guarded: Array<keyof TransactionJsonResponse> = []
   protected attributes: Partial<TransactionType> = {}
   protected originalAttributes: Partial<TransactionType> = {}

storage/framework/orm/src/types.ts

@@ -48,24 +48,24 @@ export interface PasskeysTable {
 }
 
 export interface Database {
+  activities: ActivitiesTable
   projects: ProjectsTable
+  failed_jobs: FailedJobsTable
   subscriber_emails: SubscriberEmailsTable
+  products: ProductsTable
   personal_access_tokens: PersonalAccessTokensTable
+  payment_methods: PaymentMethodsTable
   team_users: TeamUsersTable
   teams: TeamsTable
-  activities: ActivitiesTable
   subscribers: SubscribersTable
-  deployments: DeploymentsTable
-  releases: ReleasesTable
-  users: UsersTable
-  posts: PostsTable
-  failed_jobs: FailedJobsTable
-  products: ProductsTable
-  payment_methods: PaymentMethodsTable
   transactions: TransactionsTable
   jobs: JobsTable
   subscriptions: SubscriptionsTable
+  deployments: DeploymentsTable
   errors: ErrorsTable
+  releases: ReleasesTable
+  users: UsersTable
+  posts: PostsTable
   passkeys: PasskeysTable
   migrations: MigrationsTable
 }

storage/framework/requests/TransactionRequest.ts

@@ -17,8 +17,8 @@ interface RequestDataTransaction {
   amount: number
   type: string
   provider_id: string
-  user_id: number
   payment_method_id: number
+  user_id: number
   created_at?: Date
   updated_at?: Date
 }
@@ -29,8 +29,8 @@ export class TransactionRequest extends Request<RequestDataTransaction> implemen
   public amount = 0
   public type = ''
   public provider_id = ''
-  public user_id = 0
   public payment_method_id = 0
+  public user_id = 0
   public created_at = new Date()
   public updated_at = new Date()
   public uuid = ''

storage/framework/server-auto-imports.json

@@ -155,4 +155,4 @@
     "transactionRequest": true,
     "userRequest": true
   }
-}
+}