chore: wip

Author: glennmichael123

storage/framework/core/actions/src/orm/generate-model.ts

@@ -249,7 +249,7 @@ async function writeModelRequest() {
 
     fileString += `interface CustomAttributes {
       [key: string]: ValidationField
-    }`
+    }\n`
 
     const types = `export interface ${modelName}RequestType extends Request {
       validate(attributes?: CustomAttributes): void
@@ -262,9 +262,13 @@ async function writeModelRequest() {
       ${fieldString}
     }\n`
 
+    fileString += `interface RequestData${modelName} {
+      ${fieldString}
+    }\n`
+
     typeString += types
 
-    fileString += `export class ${modelName}Request extends Request implements ${modelName}RequestType {
+    fileString += `export class ${modelName}Request extends Request<RequestData${modelName}> implements ${modelName}RequestType {
       ${fieldStringInt}
       public async validate(attributes?: CustomAttributes): Promise<void> {
         if (attributes === undefined || attributes === null) {

storage/framework/core/router/src/request.ts

@@ -24,7 +24,7 @@ interface CustomAttributes {
 type RouteParams = { [key: string]: string } | null
 
 export class Request<T extends RequestData = RequestData> implements RequestInstance {
-  public query: T = {} as T;
+  public query: T = {} as T
   public params: RouteParams = null
   public headers: any = {}
 

storage/framework/orm/routes

@@ -0,0 +1,11 @@
+import { route } from '@stacksjs/router'
+
+
+route.get('users', '/Users/glennmichaeltorregosa/Documents/Projects/stacks/storage/framework/actions/src/UserIndexOrmAction.ts')
+
+route.get('users/{id}', '/Users/glennmichaeltorregosa/Documents/Projects/stacks/storage/framework/actions/src/UserShowOrmAction.ts')
+
+route.post('users', '/Users/glennmichaeltorregosa/Documents/Projects/stacks/app/Actions/UserStoreAction.ts')
+
+route.delete('users/{id}', '/Users/glennmichaeltorregosa/Documents/Projects/stacks/storage/framework/actions/src/UserDestroyOrmAction.ts')
+

storage/framework/requests/AccessTokenRequest.ts

@@ -18,7 +18,18 @@ interface ValidationField {
 interface CustomAttributes {
   [key: string]: ValidationField
 }
-export class AccessTokenRequest extends Request implements AccessTokenRequestType {
+interface RequestDataAccessToken {
+  id?: number
+  name: string
+  token: string
+  plainTextToken: string
+  abilities: string[]
+  team_id: number
+  created_at?: string
+  updated_at?: string
+  deleted_at?: string
+}
+export class AccessTokenRequest extends Request<RequestDataAccessToken> implements AccessTokenRequestType {
   public id = 1
   public name = ''
   public token = ''

storage/framework/requests/DeploymentRequest.ts

@@ -18,7 +18,21 @@ interface ValidationField {
 interface CustomAttributes {
   [key: string]: ValidationField
 }
-export class DeploymentRequest extends Request implements DeploymentRequestType {
+interface RequestDataDeployment {
+  id?: number
+  commitSha: string
+  commitMessage: string
+  branch: string
+  status: string
+  executionTime: number
+  deployScript: string
+  terminalOutput: string
+  user_id: number
+  created_at?: string
+  updated_at?: string
+  deleted_at?: string
+}
+export class DeploymentRequest extends Request<RequestDataDeployment> implements DeploymentRequestType {
   public id = 1
   public commitSha = ''
   public commitMessage = ''

storage/framework/requests/PostRequest.ts

@@ -18,7 +18,16 @@ interface ValidationField {
 interface CustomAttributes {
   [key: string]: ValidationField
 }
-export class PostRequest extends Request implements PostRequestType {
+interface RequestDataPost {
+  id?: number
+  title: string
+  body: string
+  user_id: number
+  created_at?: string
+  updated_at?: string
+  deleted_at?: string
+}
+export class PostRequest extends Request<RequestDataPost> implements PostRequestType {
   public id = 1
   public title = ''
   public body = ''

storage/framework/requests/ProjectRequest.ts

@@ -18,7 +18,17 @@ interface ValidationField {
 interface CustomAttributes {
   [key: string]: ValidationField
 }
-export class ProjectRequest extends Request implements ProjectRequestType {
+interface RequestDataProject {
+  id?: number
+  name: string
+  description: string
+  url: string
+  status: string
+  created_at?: string
+  updated_at?: string
+  deleted_at?: string
+}
+export class ProjectRequest extends Request<RequestDataProject> implements ProjectRequestType {
   public id = 1
   public name = ''
   public description = ''

storage/framework/requests/ReleaseRequest.ts

@@ -18,7 +18,14 @@ interface ValidationField {
 interface CustomAttributes {
   [key: string]: ValidationField
 }
-export class ReleaseRequest extends Request implements ReleaseRequestType {
+interface RequestDataRelease {
+  id?: number
+  version: string
+  created_at?: string
+  updated_at?: string
+  deleted_at?: string
+}
+export class ReleaseRequest extends Request<RequestDataRelease> implements ReleaseRequestType {
   public id = 1
   public version = ''
   public created_at = ''

storage/framework/requests/SubscriberEmailRequest.ts

@@ -18,7 +18,14 @@ interface ValidationField {
 interface CustomAttributes {
   [key: string]: ValidationField
 }
-export class SubscriberEmailRequest extends Request implements SubscriberEmailRequestType {
+interface RequestDataSubscriberEmail {
+  id?: number
+  email: string
+  created_at?: string
+  updated_at?: string
+  deleted_at?: string
+}
+export class SubscriberEmailRequest extends Request<RequestDataSubscriberEmail> implements SubscriberEmailRequestType {
   public id = 1
   public email = ''
   public created_at = ''

storage/framework/requests/SubscriberRequest.ts

@@ -18,7 +18,15 @@ interface ValidationField {
 interface CustomAttributes {
   [key: string]: ValidationField
 }
-export class SubscriberRequest extends Request implements SubscriberRequestType {
+interface RequestDataSubscriber {
+  id?: number
+  subscribed: boolean
+  user_id: number
+  created_at?: string
+  updated_at?: string
+  deleted_at?: string
+}
+export class SubscriberRequest extends Request<RequestDataSubscriber> implements SubscriberRequestType {
   public id = 1
   public subscribed = false
   public user_id = 0