Skip to content

Commit 8dc1704

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 0956da4 commit 8dc1704

26 files changed

+104
-110
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,7 @@ export async function generateModelString(
18801880
return instance
18811881
}
18821882
1883-
applyWhereBetween(column: string, range: [any, any]): ${modelName}Model {
1883+
applyWhereBetween(column: keyof ${formattedTableName}Table, range: [any, any]): ${modelName}Model {
18841884
if (range.length !== 2) {
18851885
throw new HttpError(500, 'Range must have exactly two values: [min, max]')
18861886
}
@@ -1894,11 +1894,11 @@ export async function generateModelString(
18941894
return this
18951895
}
18961896
1897-
whereBetween(column: keyof ${modelName}Type, range: [any, any]): ${modelName}Model {
1897+
whereBetween(column: keyof ${formattedTableName}Table, range: [any, any]): ${modelName}Model {
18981898
return this.applyWhereBetween(column, range)
18991899
}
19001900
1901-
static whereBetween(column: keyof ${modelName}Type, range: [any, any]): ${modelName}Model {
1901+
static whereBetween(column: keyof ${formattedTableName}Table, range: [any, any]): ${modelName}Model {
19021902
const instance = new ${modelName}Model(null)
19031903
19041904
return instance.applyWhereBetween(column, range)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export type ModelNames = 'Project' | 'SubscriberEmail' | 'AccessToken' | 'Team' | 'Request' | 'Activity' | 'Subscriber' | 'Deployment' | 'Release' | 'User' | 'Post' | 'FailedJob' | 'Product' | 'PaymentMethod' | 'Transaction' | 'Job' | 'Subscription' | 'Error'
1+
export type ModelNames = 'Project' | 'SubscriberEmail' | 'AccessToken' | 'Team' | 'Activity' | 'Subscriber' | 'Deployment' | 'Release' | 'User' | 'Post' | 'FailedJob' | 'Product' | 'PaymentMethod' | 'Request' | 'Transaction' | 'Job' | 'Subscription' | 'Error'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export type TableNames = 'projects' | 'subscriber_emails' | 'personal_access_tokens' | 'team_users' | 'teams' | 'requests' | 'activities' | 'subscribers' | 'deployments' | 'releases' | 'team_users' | 'users' | 'posts' | 'failed_jobs' | 'products' | 'payment_methods' | 'transactions' | 'jobs' | 'subscriptions' | 'errors'
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' | 'requests' | 'transactions' | 'jobs' | 'subscriptions' | 'errors'

‎app/Models/Request.ts renamed to ‎storage/framework/defaults/models/Request.ts

File renamed without changes.

‎storage/framework/orm/routes.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { route } from '@stacksjs/router'
22

3+
34
route.get('requests', 'storage/framework/actions/src/RequestIndexOrmAction.ts')
45

56
route.get('requests/{id}', 'storage/framework/actions/src/RequestShowOrmAction.ts')
@@ -10,18 +11,11 @@ route.patch('requests/{id}', 'storage/framework/actions/src/RequestUpdateOrmActi
1011

1112
route.delete('requests/{id}', 'storage/framework/actions/src/RequestDestroyOrmAction.ts')
1213

13-
route.get('activities', 'storage/framework/actions/src/ActivityIndexOrmAction.ts')
14-
15-
route.get('activities/{id}', 'storage/framework/actions/src/ActivityShowOrmAction.ts')
16-
17-
route.post('activities', 'storage/framework/actions/src/ActivityStoreOrmAction.ts')
18-
19-
route.patch('activities/{id}', 'storage/framework/actions/src/ActivityUpdateOrmAction.ts')
20-
21-
route.delete('activities/{id}', 'storage/framework/actions/src/ActivityDestroyOrmAction.ts')
14+
rmAction.ts')
2215

2316
route.get('users', 'UserIndexOrmAction')
2417

2518
route.post('users', 'UserStoreOrmAction')
2619

2720
route.get('users/{id}', 'UserShowOrmAction')
21+

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ export class AccessTokenModel {
11141114
return instance
11151115
}
11161116

1117-
applyWhereBetween(column: string, range: [any, any]): AccessTokenModel {
1117+
applyWhereBetween(column: keyof PersonalAccessTokensTable, range: [any, any]): AccessTokenModel {
11181118
if (range.length !== 2) {
11191119
throw new HttpError(500, 'Range must have exactly two values: [min, max]')
11201120
}
@@ -1128,11 +1128,11 @@ export class AccessTokenModel {
11281128
return this
11291129
}
11301130

1131-
whereBetween(column: keyof AccessTokenType, range: [any, any]): AccessTokenModel {
1131+
whereBetween(column: keyof PersonalAccessTokensTable, range: [any, any]): AccessTokenModel {
11321132
return this.applyWhereBetween(column, range)
11331133
}
11341134

1135-
static whereBetween(column: keyof AccessTokenType, range: [any, any]): AccessTokenModel {
1135+
static whereBetween(column: keyof PersonalAccessTokensTable, range: [any, any]): AccessTokenModel {
11361136
const instance = new AccessTokenModel(null)
11371137

11381138
return instance.applyWhereBetween(column, range)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ export class ActivityModel {
11641164
return instance
11651165
}
11661166

1167-
applyWhereBetween(column: string, range: [any, any]): ActivityModel {
1167+
applyWhereBetween(column: keyof ActivitiesTable, range: [any, any]): ActivityModel {
11681168
if (range.length !== 2) {
11691169
throw new HttpError(500, 'Range must have exactly two values: [min, max]')
11701170
}
@@ -1178,11 +1178,11 @@ export class ActivityModel {
11781178
return this
11791179
}
11801180

1181-
whereBetween(column: keyof ActivityType, range: [any, any]): ActivityModel {
1181+
whereBetween(column: keyof ActivitiesTable, range: [any, any]): ActivityModel {
11821182
return this.applyWhereBetween(column, range)
11831183
}
11841184

1185-
static whereBetween(column: keyof ActivityType, range: [any, any]): ActivityModel {
1185+
static whereBetween(column: keyof ActivitiesTable, range: [any, any]): ActivityModel {
11861186
const instance = new ActivityModel(null)
11871187

11881188
return instance.applyWhereBetween(column, range)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ export class DeploymentModel {
11791179
return instance
11801180
}
11811181

1182-
applyWhereBetween(column: string, range: [any, any]): DeploymentModel {
1182+
applyWhereBetween(column: keyof DeploymentsTable, range: [any, any]): DeploymentModel {
11831183
if (range.length !== 2) {
11841184
throw new HttpError(500, 'Range must have exactly two values: [min, max]')
11851185
}
@@ -1193,11 +1193,11 @@ export class DeploymentModel {
11931193
return this
11941194
}
11951195

1196-
whereBetween(column: keyof DeploymentType, range: [any, any]): DeploymentModel {
1196+
whereBetween(column: keyof DeploymentsTable, range: [any, any]): DeploymentModel {
11971197
return this.applyWhereBetween(column, range)
11981198
}
11991199

1200-
static whereBetween(column: keyof DeploymentType, range: [any, any]): DeploymentModel {
1200+
static whereBetween(column: keyof DeploymentsTable, range: [any, any]): DeploymentModel {
12011201
const instance = new DeploymentModel(null)
12021202

12031203
return instance.applyWhereBetween(column, range)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ export class ErrorModel {
11181118
return instance
11191119
}
11201120

1121-
applyWhereBetween(column: string, range: [any, any]): ErrorModel {
1121+
applyWhereBetween(column: keyof ErrorsTable, range: [any, any]): ErrorModel {
11221122
if (range.length !== 2) {
11231123
throw new HttpError(500, 'Range must have exactly two values: [min, max]')
11241124
}
@@ -1132,11 +1132,11 @@ export class ErrorModel {
11321132
return this
11331133
}
11341134

1135-
whereBetween(column: keyof ErrorType, range: [any, any]): ErrorModel {
1135+
whereBetween(column: keyof ErrorsTable, range: [any, any]): ErrorModel {
11361136
return this.applyWhereBetween(column, range)
11371137
}
11381138

1139-
static whereBetween(column: keyof ErrorType, range: [any, any]): ErrorModel {
1139+
static whereBetween(column: keyof ErrorsTable, range: [any, any]): ErrorModel {
11401140
const instance = new ErrorModel(null)
11411141

11421142
return instance.applyWhereBetween(column, range)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ export class FailedJobModel {
11181118
return instance
11191119
}
11201120

1121-
applyWhereBetween(column: string, range: [any, any]): FailedJobModel {
1121+
applyWhereBetween(column: keyof FailedJobsTable, range: [any, any]): FailedJobModel {
11221122
if (range.length !== 2) {
11231123
throw new HttpError(500, 'Range must have exactly two values: [min, max]')
11241124
}
@@ -1132,11 +1132,11 @@ export class FailedJobModel {
11321132
return this
11331133
}
11341134

1135-
whereBetween(column: keyof FailedJobType, range: [any, any]): FailedJobModel {
1135+
whereBetween(column: keyof FailedJobsTable, range: [any, any]): FailedJobModel {
11361136
return this.applyWhereBetween(column, range)
11371137
}
11381138

1139-
static whereBetween(column: keyof FailedJobType, range: [any, any]): FailedJobModel {
1139+
static whereBetween(column: keyof FailedJobsTable, range: [any, any]): FailedJobModel {
11401140
const instance = new FailedJobModel(null)
11411141

11421142
return instance.applyWhereBetween(column, range)

0 commit comments

Comments
 (0)