Skip to content

Commit 43e681c

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 886b167 commit 43e681c

20 files changed

+17
-184
lines changed

‎storage/framework/actions/src/UserShowOrmAction.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { UserRequestType } from '@stacksjs/orm'
22
import { Action } from '@stacksjs/actions'
3-
import { sql } from '@stacksjs/database'
43
import { response } from '@stacksjs/router'
54
import User from '../../orm/src/models/User'
65

@@ -12,8 +11,6 @@ export default new Action({
1211
// const id = request.getParam('id')
1312

1413
const result = await User
15-
.select(sql.raw(`count(job_title) as job_title_count, job_title`))
16-
.groupBy('job_title')
1714
.get()
1815

1916
return response.json(result)

‎storage/framework/core/orm/src/generate.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ export async function generateModelString(
700700
}
701701
702702
interface ${modelName}Response {
703-
data: ${formattedTableName}
703+
data: ${modelName}JsonResponse[]
704704
paging: {
705705
total_records: number
706706
page: number
@@ -716,10 +716,6 @@ export async function generateModelString(
716716
export type ${modelName}Type = Selectable<${formattedTableName}Table>
717717
export type New${modelName} = Partial<Insertable<${formattedTableName}Table>>
718718
export type ${modelName}Update = Updateable<${formattedTableName}Table>
719-
export type ${formattedTableName} = ${modelName}Type[]
720-
721-
export type ${modelName}Column = ${formattedTableName}
722-
export type ${modelName}Columns = Array<keyof ${formattedTableName}>
723719
724720
type SortDirection = 'asc' | 'desc'
725721
interface SortOptions { column: ${modelName}Type, order: SortDirection }

‎storage/framework/orm/src/models/AccessToken.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export interface PersonalAccessTokensTable {
2222
}
2323

2424
interface AccessTokenResponse {
25-
data: PersonalAccessTokens
25+
data: AccessTokenJsonResponse[]
2626
paging: {
2727
total_records: number
2828
page: number
@@ -38,10 +38,6 @@ export interface AccessTokenJsonResponse extends Omit<PersonalAccessTokensTable,
3838
export type AccessTokenType = Selectable<PersonalAccessTokensTable>
3939
export type NewAccessToken = Partial<Insertable<PersonalAccessTokensTable>>
4040
export type AccessTokenUpdate = Updateable<PersonalAccessTokensTable>
41-
export type PersonalAccessTokens = AccessTokenType[]
42-
43-
export type AccessTokenColumn = PersonalAccessTokens
44-
export type AccessTokenColumns = Array<keyof PersonalAccessTokens>
4541

4642
type SortDirection = 'asc' | 'desc'
4743
interface SortOptions { column: AccessTokenType, order: SortDirection }

‎storage/framework/orm/src/models/Deployment.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export interface DeploymentsTable {
2727
}
2828

2929
interface DeploymentResponse {
30-
data: Deployments
30+
data: DeploymentJsonResponse[]
3131
paging: {
3232
total_records: number
3333
page: number
@@ -43,10 +43,6 @@ export interface DeploymentJsonResponse extends Omit<DeploymentsTable, 'password
4343
export type DeploymentType = Selectable<DeploymentsTable>
4444
export type NewDeployment = Partial<Insertable<DeploymentsTable>>
4545
export type DeploymentUpdate = Updateable<DeploymentsTable>
46-
export type Deployments = DeploymentType[]
47-
48-
export type DeploymentColumn = Deployments
49-
export type DeploymentColumns = Array<keyof Deployments>
5046

5147
type SortDirection = 'asc' | 'desc'
5248
interface SortOptions { column: DeploymentType, order: SortDirection }

‎storage/framework/orm/src/models/Error.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface ErrorsTable {
1818
}
1919

2020
interface ErrorResponse {
21-
data: Errors
21+
data: ErrorJsonResponse[]
2222
paging: {
2323
total_records: number
2424
page: number
@@ -34,10 +34,6 @@ export interface ErrorJsonResponse extends Omit<ErrorsTable, 'password'> {
3434
export type ErrorType = Selectable<ErrorsTable>
3535
export type NewError = Partial<Insertable<ErrorsTable>>
3636
export type ErrorUpdate = Updateable<ErrorsTable>
37-
export type Errors = ErrorType[]
38-
39-
export type ErrorColumn = Errors
40-
export type ErrorColumns = Array<keyof Errors>
4137

4238
type SortDirection = 'asc' | 'desc'
4339
interface SortOptions { column: ErrorType, order: SortDirection }

‎storage/framework/orm/src/models/FailedJob.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface FailedJobsTable {
1818
}
1919

2020
interface FailedJobResponse {
21-
data: FailedJobs
21+
data: FailedJobJsonResponse[]
2222
paging: {
2323
total_records: number
2424
page: number
@@ -34,10 +34,6 @@ export interface FailedJobJsonResponse extends Omit<FailedJobsTable, 'password'>
3434
export type FailedJobType = Selectable<FailedJobsTable>
3535
export type NewFailedJob = Partial<Insertable<FailedJobsTable>>
3636
export type FailedJobUpdate = Updateable<FailedJobsTable>
37-
export type FailedJobs = FailedJobType[]
38-
39-
export type FailedJobColumn = FailedJobs
40-
export type FailedJobColumns = Array<keyof FailedJobs>
4137

4238
type SortDirection = 'asc' | 'desc'
4339
interface SortOptions { column: FailedJobType, order: SortDirection }

‎storage/framework/orm/src/models/Job.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface JobsTable {
1818
}
1919

2020
interface JobResponse {
21-
data: Jobs
21+
data: JobJsonResponse[]
2222
paging: {
2323
total_records: number
2424
page: number
@@ -34,10 +34,6 @@ export interface JobJsonResponse extends Omit<JobsTable, 'password'> {
3434
export type JobType = Selectable<JobsTable>
3535
export type NewJob = Partial<Insertable<JobsTable>>
3636
export type JobUpdate = Updateable<JobsTable>
37-
export type Jobs = JobType[]
38-
39-
export type JobColumn = Jobs
40-
export type JobColumns = Array<keyof Jobs>
4137

4238
type SortDirection = 'asc' | 'desc'
4339
interface SortOptions { column: JobType, order: SortDirection }

‎storage/framework/orm/src/models/PaymentMethod.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export interface PaymentMethodsTable {
3131
}
3232

3333
interface PaymentMethodResponse {
34-
data: PaymentMethods
34+
data: PaymentMethodJsonResponse[]
3535
paging: {
3636
total_records: number
3737
page: number
@@ -47,10 +47,6 @@ export interface PaymentMethodJsonResponse extends Omit<PaymentMethodsTable, 'pa
4747
export type PaymentMethodType = Selectable<PaymentMethodsTable>
4848
export type NewPaymentMethod = Partial<Insertable<PaymentMethodsTable>>
4949
export type PaymentMethodUpdate = Updateable<PaymentMethodsTable>
50-
export type PaymentMethods = PaymentMethodType[]
51-
52-
export type PaymentMethodColumn = PaymentMethods
53-
export type PaymentMethodColumns = Array<keyof PaymentMethods>
5450

5551
type SortDirection = 'asc' | 'desc'
5652
interface SortOptions { column: PaymentMethodType, order: SortDirection }

‎storage/framework/orm/src/models/Post.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface PostsTable {
2020
}
2121

2222
interface PostResponse {
23-
data: Posts
23+
data: PostJsonResponse[]
2424
paging: {
2525
total_records: number
2626
page: number
@@ -36,10 +36,6 @@ export interface PostJsonResponse extends Omit<PostsTable, 'password'> {
3636
export type PostType = Selectable<PostsTable>
3737
export type NewPost = Partial<Insertable<PostsTable>>
3838
export type PostUpdate = Updateable<PostsTable>
39-
export type Posts = PostType[]
40-
41-
export type PostColumn = Posts
42-
export type PostColumns = Array<keyof Posts>
4339

4440
type SortDirection = 'asc' | 'desc'
4541
interface SortOptions { column: PostType, order: SortDirection }

‎storage/framework/orm/src/models/Product.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export interface ProductsTable {
2222
}
2323

2424
interface ProductResponse {
25-
data: Products
25+
data: ProductJsonResponse[]
2626
paging: {
2727
total_records: number
2828
page: number
@@ -38,10 +38,6 @@ export interface ProductJsonResponse extends Omit<ProductsTable, 'password'> {
3838
export type ProductType = Selectable<ProductsTable>
3939
export type NewProduct = Partial<Insertable<ProductsTable>>
4040
export type ProductUpdate = Updateable<ProductsTable>
41-
export type Products = ProductType[]
42-
43-
export type ProductColumn = Products
44-
export type ProductColumns = Array<keyof Products>
4541

4642
type SortDirection = 'asc' | 'desc'
4743
interface SortOptions { column: ProductType, order: SortDirection }

‎storage/framework/orm/src/models/Project.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface ProjectsTable {
1717
}
1818

1919
interface ProjectResponse {
20-
data: Projects
20+
data: ProjectJsonResponse[]
2121
paging: {
2222
total_records: number
2323
page: number
@@ -33,10 +33,6 @@ export interface ProjectJsonResponse extends Omit<ProjectsTable, 'password'> {
3333
export type ProjectType = Selectable<ProjectsTable>
3434
export type NewProject = Partial<Insertable<ProjectsTable>>
3535
export type ProjectUpdate = Updateable<ProjectsTable>
36-
export type Projects = ProjectType[]
37-
38-
export type ProjectColumn = Projects
39-
export type ProjectColumns = Array<keyof Projects>
4036

4137
type SortDirection = 'asc' | 'desc'
4238
interface SortOptions { column: ProjectType, order: SortDirection }

‎storage/framework/orm/src/models/Release.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface ReleasesTable {
1414
}
1515

1616
interface ReleaseResponse {
17-
data: Releases
17+
data: ReleaseJsonResponse[]
1818
paging: {
1919
total_records: number
2020
page: number
@@ -30,10 +30,6 @@ export interface ReleaseJsonResponse extends Omit<ReleasesTable, 'password'> {
3030
export type ReleaseType = Selectable<ReleasesTable>
3131
export type NewRelease = Partial<Insertable<ReleasesTable>>
3232
export type ReleaseUpdate = Updateable<ReleasesTable>
33-
export type Releases = ReleaseType[]
34-
35-
export type ReleaseColumn = Releases
36-
export type ReleaseColumns = Array<keyof Releases>
3733

3834
type SortDirection = 'asc' | 'desc'
3935
interface SortOptions { column: ReleaseType, order: SortDirection }

‎storage/framework/orm/src/models/Subscriber.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface SubscribersTable {
1414
}
1515

1616
interface SubscriberResponse {
17-
data: Subscribers
17+
data: SubscriberJsonResponse[]
1818
paging: {
1919
total_records: number
2020
page: number
@@ -30,10 +30,6 @@ export interface SubscriberJsonResponse extends Omit<SubscribersTable, 'password
3030
export type SubscriberType = Selectable<SubscribersTable>
3131
export type NewSubscriber = Partial<Insertable<SubscribersTable>>
3232
export type SubscriberUpdate = Updateable<SubscribersTable>
33-
export type Subscribers = SubscriberType[]
34-
35-
export type SubscriberColumn = Subscribers
36-
export type SubscriberColumns = Array<keyof Subscribers>
3733

3834
type SortDirection = 'asc' | 'desc'
3935
interface SortOptions { column: SubscriberType, order: SortDirection }

‎storage/framework/orm/src/models/SubscriberEmail.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface SubscriberEmailsTable {
1616
}
1717

1818
interface SubscriberEmailResponse {
19-
data: SubscriberEmails
19+
data: SubscriberEmailJsonResponse[]
2020
paging: {
2121
total_records: number
2222
page: number
@@ -32,10 +32,6 @@ export interface SubscriberEmailJsonResponse extends Omit<SubscriberEmailsTable,
3232
export type SubscriberEmailType = Selectable<SubscriberEmailsTable>
3333
export type NewSubscriberEmail = Partial<Insertable<SubscriberEmailsTable>>
3434
export type SubscriberEmailUpdate = Updateable<SubscriberEmailsTable>
35-
export type SubscriberEmails = SubscriberEmailType[]
36-
37-
export type SubscriberEmailColumn = SubscriberEmails
38-
export type SubscriberEmailColumns = Array<keyof SubscriberEmails>
3935

4036
type SortDirection = 'asc' | 'desc'
4137
interface SortOptions { column: SubscriberEmailType, order: SortDirection }

‎storage/framework/orm/src/models/Subscription.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface SubscriptionsTable {
3030
}
3131

3232
interface SubscriptionResponse {
33-
data: Subscriptions
33+
data: SubscriptionJsonResponse[]
3434
paging: {
3535
total_records: number
3636
page: number
@@ -46,10 +46,6 @@ export interface SubscriptionJsonResponse extends Omit<SubscriptionsTable, 'pass
4646
export type SubscriptionType = Selectable<SubscriptionsTable>
4747
export type NewSubscription = Partial<Insertable<SubscriptionsTable>>
4848
export type SubscriptionUpdate = Updateable<SubscriptionsTable>
49-
export type Subscriptions = SubscriptionType[]
50-
51-
export type SubscriptionColumn = Subscriptions
52-
export type SubscriptionColumns = Array<keyof Subscriptions>
5349

5450
type SortDirection = 'asc' | 'desc'
5551
interface SortOptions { column: SubscriptionType, order: SortDirection }

‎storage/framework/orm/src/models/Team.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export interface TeamsTable {
2727
}
2828

2929
interface TeamResponse {
30-
data: Teams
30+
data: TeamJsonResponse[]
3131
paging: {
3232
total_records: number
3333
page: number
@@ -43,10 +43,6 @@ export interface TeamJsonResponse extends Omit<TeamsTable, 'password'> {
4343
export type TeamType = Selectable<TeamsTable>
4444
export type NewTeam = Partial<Insertable<TeamsTable>>
4545
export type TeamUpdate = Updateable<TeamsTable>
46-
export type Teams = TeamType[]
47-
48-
export type TeamColumn = Teams
49-
export type TeamColumns = Array<keyof Teams>
5046

5147
type SortDirection = 'asc' | 'desc'
5248
interface SortOptions { column: TeamType, order: SortDirection }

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface TransactionsTable {
3030
}
3131

3232
interface TransactionResponse {
33-
data: Transactions
33+
data: TransactionJsonResponse[]
3434
paging: {
3535
total_records: number
3636
page: number
@@ -46,10 +46,6 @@ export interface TransactionJsonResponse extends Omit<TransactionsTable, 'passwo
4646
export type TransactionType = Selectable<TransactionsTable>
4747
export type NewTransaction = Partial<Insertable<TransactionsTable>>
4848
export type TransactionUpdate = Updateable<TransactionsTable>
49-
export type Transactions = TransactionType[]
50-
51-
export type TransactionColumn = Transactions
52-
export type TransactionColumns = Array<keyof Transactions>
5349

5450
type SortDirection = 'asc' | 'desc'
5551
interface SortOptions { column: TransactionType, order: SortDirection }

‎storage/framework/orm/src/models/User.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export interface UsersTable {
4949
}
5050

5151
interface UserResponse {
52-
data: Users
52+
data: UserJsonResponse[]
5353
paging: {
5454
total_records: number
5555
page: number
@@ -65,10 +65,6 @@ export interface UserJsonResponse extends Omit<UsersTable, 'password'> {
6565
export type UserType = Selectable<UsersTable>
6666
export type NewUser = Partial<Insertable<UsersTable>>
6767
export type UserUpdate = Updateable<UsersTable>
68-
export type Users = UserType[]
69-
70-
export type UserColumn = Users
71-
export type UserColumns = Array<keyof Users>
7268

7369
type SortDirection = 'asc' | 'desc'
7470
interface SortOptions { column: UserType, order: SortDirection }

0 commit comments

Comments
 (0)