chore: wip

glennmichael123 · glennmichael123 · commit 43e681ca7eb1 · 2025-01-24T15:14:13.000+09:00
diff --git a/storage/framework/actions/src/UserShowOrmAction.ts b/storage/framework/actions/src/UserShowOrmAction.ts
@@ -1,6 +1,5 @@
 import type { UserRequestType } from '@stacksjs/orm'
 import { Action } from '@stacksjs/actions'
-import { sql } from '@stacksjs/database'
 import { response } from '@stacksjs/router'
 import User from '../../orm/src/models/User'
 
@@ -12,8 +11,6 @@ export default new Action({
     // const id = request.getParam('id')
 
     const result = await User
-      .select(sql.raw(`count(job_title) as job_title_count, job_title`))
-      .groupBy('job_title')
       .get()
 
     return response.json(result)
diff --git a/storage/framework/core/orm/src/generate.ts b/storage/framework/core/orm/src/generate.ts
@@ -700,7 +700,7 @@ export async function generateModelString(
       }
   
       interface ${modelName}Response {
-        data: ${formattedTableName}
+        data: ${modelName}JsonResponse[]
         paging: {
           total_records: number
           page: number
@@ -716,10 +716,6 @@ export async function generateModelString(
       export type ${modelName}Type = Selectable<${formattedTableName}Table>
       export type New${modelName} = Partial<Insertable<${formattedTableName}Table>>
       export type ${modelName}Update = Updateable<${formattedTableName}Table>
-      export type ${formattedTableName} = ${modelName}Type[]
-  
-      export type ${modelName}Column = ${formattedTableName}
-      export type ${modelName}Columns = Array<keyof ${formattedTableName}>
   
       type SortDirection = 'asc' | 'desc'
       interface SortOptions { column: ${modelName}Type, order: SortDirection }
diff --git a/storage/framework/orm/src/models/AccessToken.ts b/storage/framework/orm/src/models/AccessToken.ts
@@ -22,7 +22,7 @@ export interface PersonalAccessTokensTable {
 }
 
 interface AccessTokenResponse {
-  data: PersonalAccessTokens
+  data: AccessTokenJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -38,10 +38,6 @@ export interface AccessTokenJsonResponse extends Omit<PersonalAccessTokensTable,
 export type AccessTokenType = Selectable<PersonalAccessTokensTable>
 export type NewAccessToken = Partial<Insertable<PersonalAccessTokensTable>>
 export type AccessTokenUpdate = Updateable<PersonalAccessTokensTable>
-export type PersonalAccessTokens = AccessTokenType[]
-
-export type AccessTokenColumn = PersonalAccessTokens
-export type AccessTokenColumns = Array<keyof PersonalAccessTokens>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: AccessTokenType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Deployment.ts b/storage/framework/orm/src/models/Deployment.ts
@@ -27,7 +27,7 @@ export interface DeploymentsTable {
 }
 
 interface DeploymentResponse {
-  data: Deployments
+  data: DeploymentJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -43,10 +43,6 @@ export interface DeploymentJsonResponse extends Omit<DeploymentsTable, 'password
 export type DeploymentType = Selectable<DeploymentsTable>
 export type NewDeployment = Partial<Insertable<DeploymentsTable>>
 export type DeploymentUpdate = Updateable<DeploymentsTable>
-export type Deployments = DeploymentType[]
-
-export type DeploymentColumn = Deployments
-export type DeploymentColumns = Array<keyof Deployments>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: DeploymentType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Error.ts b/storage/framework/orm/src/models/Error.ts
@@ -18,7 +18,7 @@ export interface ErrorsTable {
 }
 
 interface ErrorResponse {
-  data: Errors
+  data: ErrorJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -34,10 +34,6 @@ export interface ErrorJsonResponse extends Omit<ErrorsTable, 'password'> {
 export type ErrorType = Selectable<ErrorsTable>
 export type NewError = Partial<Insertable<ErrorsTable>>
 export type ErrorUpdate = Updateable<ErrorsTable>
-export type Errors = ErrorType[]
-
-export type ErrorColumn = Errors
-export type ErrorColumns = Array<keyof Errors>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: ErrorType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/FailedJob.ts b/storage/framework/orm/src/models/FailedJob.ts
@@ -18,7 +18,7 @@ export interface FailedJobsTable {
 }
 
 interface FailedJobResponse {
-  data: FailedJobs
+  data: FailedJobJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -34,10 +34,6 @@ export interface FailedJobJsonResponse extends Omit<FailedJobsTable, 'password'>
 export type FailedJobType = Selectable<FailedJobsTable>
 export type NewFailedJob = Partial<Insertable<FailedJobsTable>>
 export type FailedJobUpdate = Updateable<FailedJobsTable>
-export type FailedJobs = FailedJobType[]
-
-export type FailedJobColumn = FailedJobs
-export type FailedJobColumns = Array<keyof FailedJobs>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: FailedJobType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Job.ts b/storage/framework/orm/src/models/Job.ts
@@ -18,7 +18,7 @@ export interface JobsTable {
 }
 
 interface JobResponse {
-  data: Jobs
+  data: JobJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -34,10 +34,6 @@ export interface JobJsonResponse extends Omit<JobsTable, 'password'> {
 export type JobType = Selectable<JobsTable>
 export type NewJob = Partial<Insertable<JobsTable>>
 export type JobUpdate = Updateable<JobsTable>
-export type Jobs = JobType[]
-
-export type JobColumn = Jobs
-export type JobColumns = Array<keyof Jobs>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: JobType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/PaymentMethod.ts b/storage/framework/orm/src/models/PaymentMethod.ts
@@ -31,7 +31,7 @@ export interface PaymentMethodsTable {
 }
 
 interface PaymentMethodResponse {
-  data: PaymentMethods
+  data: PaymentMethodJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -47,10 +47,6 @@ export interface PaymentMethodJsonResponse extends Omit<PaymentMethodsTable, 'pa
 export type PaymentMethodType = Selectable<PaymentMethodsTable>
 export type NewPaymentMethod = Partial<Insertable<PaymentMethodsTable>>
 export type PaymentMethodUpdate = Updateable<PaymentMethodsTable>
-export type PaymentMethods = PaymentMethodType[]
-
-export type PaymentMethodColumn = PaymentMethods
-export type PaymentMethodColumns = Array<keyof PaymentMethods>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: PaymentMethodType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Post.ts b/storage/framework/orm/src/models/Post.ts
@@ -20,7 +20,7 @@ export interface PostsTable {
 }
 
 interface PostResponse {
-  data: Posts
+  data: PostJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -36,10 +36,6 @@ export interface PostJsonResponse extends Omit<PostsTable, 'password'> {
 export type PostType = Selectable<PostsTable>
 export type NewPost = Partial<Insertable<PostsTable>>
 export type PostUpdate = Updateable<PostsTable>
-export type Posts = PostType[]
-
-export type PostColumn = Posts
-export type PostColumns = Array<keyof Posts>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: PostType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Product.ts b/storage/framework/orm/src/models/Product.ts
@@ -22,7 +22,7 @@ export interface ProductsTable {
 }
 
 interface ProductResponse {
-  data: Products
+  data: ProductJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -38,10 +38,6 @@ export interface ProductJsonResponse extends Omit<ProductsTable, 'password'> {
 export type ProductType = Selectable<ProductsTable>
 export type NewProduct = Partial<Insertable<ProductsTable>>
 export type ProductUpdate = Updateable<ProductsTable>
-export type Products = ProductType[]
-
-export type ProductColumn = Products
-export type ProductColumns = Array<keyof Products>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: ProductType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Project.ts b/storage/framework/orm/src/models/Project.ts
@@ -17,7 +17,7 @@ export interface ProjectsTable {
 }
 
 interface ProjectResponse {
-  data: Projects
+  data: ProjectJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -33,10 +33,6 @@ export interface ProjectJsonResponse extends Omit<ProjectsTable, 'password'> {
 export type ProjectType = Selectable<ProjectsTable>
 export type NewProject = Partial<Insertable<ProjectsTable>>
 export type ProjectUpdate = Updateable<ProjectsTable>
-export type Projects = ProjectType[]
-
-export type ProjectColumn = Projects
-export type ProjectColumns = Array<keyof Projects>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: ProjectType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Release.ts b/storage/framework/orm/src/models/Release.ts
@@ -14,7 +14,7 @@ export interface ReleasesTable {
 }
 
 interface ReleaseResponse {
-  data: Releases
+  data: ReleaseJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -30,10 +30,6 @@ export interface ReleaseJsonResponse extends Omit<ReleasesTable, 'password'> {
 export type ReleaseType = Selectable<ReleasesTable>
 export type NewRelease = Partial<Insertable<ReleasesTable>>
 export type ReleaseUpdate = Updateable<ReleasesTable>
-export type Releases = ReleaseType[]
-
-export type ReleaseColumn = Releases
-export type ReleaseColumns = Array<keyof Releases>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: ReleaseType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Subscriber.ts b/storage/framework/orm/src/models/Subscriber.ts
@@ -14,7 +14,7 @@ export interface SubscribersTable {
 }
 
 interface SubscriberResponse {
-  data: Subscribers
+  data: SubscriberJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -30,10 +30,6 @@ export interface SubscriberJsonResponse extends Omit<SubscribersTable, 'password
 export type SubscriberType = Selectable<SubscribersTable>
 export type NewSubscriber = Partial<Insertable<SubscribersTable>>
 export type SubscriberUpdate = Updateable<SubscribersTable>
-export type Subscribers = SubscriberType[]
-
-export type SubscriberColumn = Subscribers
-export type SubscriberColumns = Array<keyof Subscribers>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: SubscriberType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/SubscriberEmail.ts b/storage/framework/orm/src/models/SubscriberEmail.ts
@@ -16,7 +16,7 @@ export interface SubscriberEmailsTable {
 }
 
 interface SubscriberEmailResponse {
-  data: SubscriberEmails
+  data: SubscriberEmailJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -32,10 +32,6 @@ export interface SubscriberEmailJsonResponse extends Omit<SubscriberEmailsTable,
 export type SubscriberEmailType = Selectable<SubscriberEmailsTable>
 export type NewSubscriberEmail = Partial<Insertable<SubscriberEmailsTable>>
 export type SubscriberEmailUpdate = Updateable<SubscriberEmailsTable>
-export type SubscriberEmails = SubscriberEmailType[]
-
-export type SubscriberEmailColumn = SubscriberEmails
-export type SubscriberEmailColumns = Array<keyof SubscriberEmails>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: SubscriberEmailType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Subscription.ts b/storage/framework/orm/src/models/Subscription.ts
@@ -30,7 +30,7 @@ export interface SubscriptionsTable {
 }
 
 interface SubscriptionResponse {
-  data: Subscriptions
+  data: SubscriptionJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -46,10 +46,6 @@ export interface SubscriptionJsonResponse extends Omit<SubscriptionsTable, 'pass
 export type SubscriptionType = Selectable<SubscriptionsTable>
 export type NewSubscription = Partial<Insertable<SubscriptionsTable>>
 export type SubscriptionUpdate = Updateable<SubscriptionsTable>
-export type Subscriptions = SubscriptionType[]
-
-export type SubscriptionColumn = Subscriptions
-export type SubscriptionColumns = Array<keyof Subscriptions>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: SubscriptionType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Team.ts b/storage/framework/orm/src/models/Team.ts
@@ -27,7 +27,7 @@ export interface TeamsTable {
 }
 
 interface TeamResponse {
-  data: Teams
+  data: TeamJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -43,10 +43,6 @@ export interface TeamJsonResponse extends Omit<TeamsTable, 'password'> {
 export type TeamType = Selectable<TeamsTable>
 export type NewTeam = Partial<Insertable<TeamsTable>>
 export type TeamUpdate = Updateable<TeamsTable>
-export type Teams = TeamType[]
-
-export type TeamColumn = Teams
-export type TeamColumns = Array<keyof Teams>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: TeamType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/Transaction.ts b/storage/framework/orm/src/models/Transaction.ts
@@ -30,7 +30,7 @@ export interface TransactionsTable {
 }
 
 interface TransactionResponse {
-  data: Transactions
+  data: TransactionJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -46,10 +46,6 @@ export interface TransactionJsonResponse extends Omit<TransactionsTable, 'passwo
 export type TransactionType = Selectable<TransactionsTable>
 export type NewTransaction = Partial<Insertable<TransactionsTable>>
 export type TransactionUpdate = Updateable<TransactionsTable>
-export type Transactions = TransactionType[]
-
-export type TransactionColumn = Transactions
-export type TransactionColumns = Array<keyof Transactions>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: TransactionType, order: SortDirection }
diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
@@ -49,7 +49,7 @@ export interface UsersTable {
 }
 
 interface UserResponse {
-  data: Users
+  data: UserJsonResponse[]
   paging: {
     total_records: number
     page: number
@@ -65,10 +65,6 @@ export interface UserJsonResponse extends Omit<UsersTable, 'password'> {
 export type UserType = Selectable<UsersTable>
 export type NewUser = Partial<Insertable<UsersTable>>
 export type UserUpdate = Updateable<UsersTable>
-export type Users = UserType[]
-
-export type UserColumn = Users
-export type UserColumns = Array<keyof Users>
 
       type SortDirection = 'asc' | 'desc'
 interface SortOptions { column: UserType, order: SortDirection }
diff --git a/storage/framework/server-auto-imports.json b/storage/framework/server-auto-imports.json
diff --git a/storage/framework/types/server-auto-imports.d.ts b/storage/framework/types/server-auto-imports.d.ts
