chore: wip

glennmichael123 · glennmichael123 · commit 26cb140d9352 · 2025-03-07T19:32:55.000+08:00
diff --git a/storage/framework/core/orm/src/generate.ts b/storage/framework/core/orm/src/generate.ts
@@ -905,7 +905,7 @@ export async function generateModelString(
       ${relationImports}
   
       export interface ${formattedTableName}Table {
-        id: number
+        id: Generated<number>
        ${fieldString}
       }
   
diff --git a/storage/framework/orm/src/models/AccessToken.ts b/storage/framework/orm/src/models/AccessToken.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { TeamModel } from './Team'
 import type { UserModel } from './User'
@@ -13,7 +13,7 @@ import Team from './Team'
 import User from './User'
 
 export interface PersonalAccessTokensTable {
-  id: number
+  id: Generated<number>
   team_id: number
   team?: TeamModel
   user_id: number
diff --git a/storage/framework/orm/src/models/Coupon.ts b/storage/framework/orm/src/models/Coupon.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { OrderModel } from './Order'
 import type { ProductModel } from './Product'
@@ -13,7 +13,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import Product from './Product'
 
 export interface CouponsTable {
-  id: number
+  id: Generated<number>
   orders: OrderModel[] | []
   product_id: number
   product?: ProductModel
diff --git a/storage/framework/orm/src/models/Customer.ts b/storage/framework/orm/src/models/Customer.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { OrderModel } from './Order'
 import type { UserModel } from './User'
@@ -13,7 +13,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import User from './User'
 
 export interface CustomersTable {
-  id: number
+  id: Generated<number>
   orders: OrderModel[] | []
   user_id: number
   user?: UserModel
diff --git a/storage/framework/orm/src/models/Deployment.ts b/storage/framework/orm/src/models/Deployment.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { UserModel } from './User'
 import { randomUUIDv7 } from 'bun'
@@ -10,7 +10,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import User from './User'
 
 export interface DeploymentsTable {
-  id: number
+  id: Generated<number>
   user_id: number
   user?: UserModel
   commit_sha: string
diff --git a/storage/framework/orm/src/models/Error.ts b/storage/framework/orm/src/models/Error.ts
@@ -1,12 +1,12 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
 import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface ErrorsTable {
-  id: number
+  id: Generated<number>
   type: string
   message: string
   stack?: string
diff --git a/storage/framework/orm/src/models/FailedJob.ts b/storage/framework/orm/src/models/FailedJob.ts
@@ -1,12 +1,12 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
 import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface FailedJobsTable {
-  id: number
+  id: Generated<number>
   connection: string
   queue: string
   payload: string
diff --git a/storage/framework/orm/src/models/GiftCard.ts b/storage/framework/orm/src/models/GiftCard.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { OrderModel } from './Order'
 import type { UserModel } from './User'
@@ -13,7 +13,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import User from './User'
 
 export interface GiftCardsTable {
-  id: number
+  id: Generated<number>
   orders: OrderModel[] | []
   user_id: number
   user?: UserModel
diff --git a/storage/framework/orm/src/models/Job.ts b/storage/framework/orm/src/models/Job.ts
@@ -1,12 +1,12 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
 import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface JobsTable {
-  id: number
+  id: Generated<number>
   queue: string
   payload: string
   attempts?: number
diff --git a/storage/framework/orm/src/models/LoyaltyPoint.ts b/storage/framework/orm/src/models/LoyaltyPoint.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { randomUUIDv7 } from 'bun'
 import { cache } from '@stacksjs/cache'
@@ -8,7 +8,7 @@ import { dispatch } from '@stacksjs/events'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface LoyaltyPointsTable {
-  id: number
+  id: Generated<number>
   wallet_id: string
   points: number
   source: string
diff --git a/storage/framework/orm/src/models/LoyaltyReward.ts b/storage/framework/orm/src/models/LoyaltyReward.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { ProductModel } from './Product'
 import { randomUUIDv7 } from 'bun'
@@ -11,7 +11,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import Product from './Product'
 
 export interface LoyaltyRewardsTable {
-  id: number
+  id: Generated<number>
   product_id: number
   product?: ProductModel
   name: string
diff --git a/storage/framework/orm/src/models/Order.ts b/storage/framework/orm/src/models/Order.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { CouponModel } from './Coupon'
 import type { CustomerModel } from './Customer'
@@ -17,7 +17,7 @@ import Coupon from './Coupon'
 import Customer from './Customer'
 
 export interface OrdersTable {
-  id: number
+  id: Generated<number>
   order_items: OrderItemModel[] | []
   customer_id: number
   customer?: CustomerModel
diff --git a/storage/framework/orm/src/models/OrderItem.ts b/storage/framework/orm/src/models/OrderItem.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { OrderModel } from './Order'
 import type { ProductModel } from './Product'
@@ -13,7 +13,7 @@ import Order from './Order'
 import Product from './Product'
 
 export interface OrderItemsTable {
-  id: number
+  id: Generated<number>
   order_id: number
   order?: OrderModel
   product_id: number
diff --git a/storage/framework/orm/src/models/PaymentMethod.ts b/storage/framework/orm/src/models/PaymentMethod.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { PaymentTransactionModel } from './PaymentTransaction'
 import type { UserModel } from './User'
@@ -12,7 +12,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import User from './User'
 
 export interface PaymentMethodsTable {
-  id: number
+  id: Generated<number>
   payment_transactions: PaymentTransactionModel[] | []
   user_id: number
   user?: UserModel
diff --git a/storage/framework/orm/src/models/PaymentProduct.ts b/storage/framework/orm/src/models/PaymentProduct.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { randomUUIDv7 } from 'bun'
 import { cache } from '@stacksjs/cache'
@@ -7,7 +7,7 @@ import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface PaymentProductsTable {
-  id: number
+  id: Generated<number>
   name: string
   description?: number
   key: number
diff --git a/storage/framework/orm/src/models/PaymentTransaction.ts b/storage/framework/orm/src/models/PaymentTransaction.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { PaymentMethodModel } from './PaymentMethod'
 import type { UserModel } from './User'
@@ -14,7 +14,7 @@ import PaymentMethod from './PaymentMethod'
 import User from './User'
 
 export interface PaymentTransactionsTable {
-  id: number
+  id: Generated<number>
   user_id: number
   user?: UserModel
   payment_method_id: number
diff --git a/storage/framework/orm/src/models/Post.ts b/storage/framework/orm/src/models/Post.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { UserModel } from './User'
 import { cache } from '@stacksjs/cache'
@@ -9,7 +9,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import User from './User'
 
 export interface PostsTable {
-  id: number
+  id: Generated<number>
   user_id: number
   user?: UserModel
   title: string
diff --git a/storage/framework/orm/src/models/Product.ts b/storage/framework/orm/src/models/Product.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { ProductCategoryModel } from './ProductCategory'
 import { randomUUIDv7 } from 'bun'
@@ -11,7 +11,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import ProductCategory from './ProductCategory'
 
 export interface ProductsTable {
-  id: number
+  id: Generated<number>
   product_category_id: number
   product_category?: ProductCategoryModel
   name: string
diff --git a/storage/framework/orm/src/models/ProductCategory.ts b/storage/framework/orm/src/models/ProductCategory.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { ProductModel } from './Product'
 import { randomUUIDv7 } from 'bun'
@@ -9,7 +9,7 @@ import { dispatch } from '@stacksjs/events'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface ProductCategoriesTable {
-  id: number
+  id: Generated<number>
   products: ProductModel[] | []
   name: string
   description?: string
diff --git a/storage/framework/orm/src/models/Project.ts b/storage/framework/orm/src/models/Project.ts
@@ -1,12 +1,12 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
 import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface ProjectsTable {
-  id: number
+  id: Generated<number>
   name: string
   description: string
   url: string
diff --git a/storage/framework/orm/src/models/Release.ts b/storage/framework/orm/src/models/Release.ts
@@ -1,12 +1,12 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
 import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface ReleasesTable {
-  id: number
+  id: Generated<number>
   name: string
   version: string
 
diff --git a/storage/framework/orm/src/models/Request.ts b/storage/framework/orm/src/models/Request.ts
@@ -1,12 +1,12 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
 import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface RequestsTable {
-  id: number
+  id: Generated<number>
   method?: string | string[]
   path?: string
   status_code?: number
diff --git a/storage/framework/orm/src/models/Subscriber.ts b/storage/framework/orm/src/models/Subscriber.ts
@@ -1,12 +1,12 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
 import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface SubscribersTable {
-  id: number
+  id: Generated<number>
   subscribed: boolean
 
   created_at?: Date
diff --git a/storage/framework/orm/src/models/SubscriberEmail.ts b/storage/framework/orm/src/models/SubscriberEmail.ts
@@ -1,12 +1,12 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import { cache } from '@stacksjs/cache'
 import { sql } from '@stacksjs/database'
 import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
 import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 export interface SubscriberEmailsTable {
-  id: number
+  id: Generated<number>
   email: string
 
   created_at?: Date
diff --git a/storage/framework/orm/src/models/Subscription.ts b/storage/framework/orm/src/models/Subscription.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { UserModel } from './User'
 import { randomUUIDv7 } from 'bun'
@@ -10,7 +10,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import User from './User'
 
 export interface SubscriptionsTable {
-  id: number
+  id: Generated<number>
   user_id: number
   user?: UserModel
   type: string
diff --git a/storage/framework/orm/src/models/Team.ts b/storage/framework/orm/src/models/Team.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { AccessTokenModel } from './AccessToken'
 import { cache } from '@stacksjs/cache'
@@ -9,7 +9,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import User from './User'
 
 export interface TeamsTable {
-  id: number
+  id: Generated<number>
   personal_access_tokens: AccessTokenModel[] | []
   name: string
   company_name: string
diff --git a/storage/framework/orm/src/models/Transaction.ts b/storage/framework/orm/src/models/Transaction.ts
@@ -1,4 +1,4 @@
-import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
+import type { Generated, Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { OrderModel } from './Order'
 import { randomUUIDv7 } from 'bun'
@@ -11,7 +11,7 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 import Order from './Order'
 
 export interface TransactionsTable {
-  id: number
+  id: Generated<number>
   order_id: number
   order?: OrderModel
   amount: number
diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts

Original file line number	Diff line number	Diff line change
`@@ -905,7 +905,7 @@ export async function generateModelString(`
`905`	`905`	`${relationImports}`
`906`	`906`
`907`	`907`	`export interface ${formattedTableName}Table {`
`908`		`- id: number`
	`908`	`+ id: Generated<number>`
`909`	`909`	`${fieldString}`
`910`	`910`	`}`
`911`	`911`