chore: wip

Author: glennmichael123

app/Actions/SubscriberEmailAction.ts

@@ -1,7 +1,7 @@
 import { Action } from '@stacksjs/actions'
 // import { epmailSubscribeRequest } from '@stacksjs/validation'
 import SubscriberEmail from '../../storage/framework/orm/src/models/SubscriberEmail'
-import { SubscriberEmailRequestType } from '../../storage/framework/requests/SubscriberEmailRequest'
+import { SubscriberEmailRequestType } from '../../storage/framework/types/requests'
 
 export default new Action({
   name: 'SubscriberEmailAction',

storage/framework/core/actions/src/action.ts

@@ -1,18 +1,13 @@
 import type { JobOptions, Nullable } from '@stacksjs/types'
 import type { ValidationBoolean, ValidationNumber, ValidationString } from '@stacksjs/validation'
+import type { ModelRequests } from '../../../types/requests'
 
 type ValidationKey = string
 interface ValidationValue {
   rule: ValidationString | ValidationNumber | ValidationBoolean | Date | Nullable<any>
   message: string
 }
 
-// TODO: this is temporary and will get auto generated based on ./app/Actions/*
-interface Request {
-  message: string
-  level: 'info' | 'warn' | 'error'
-}
-
 interface ActionOptions {
   name?: string
   description?: string
@@ -24,7 +19,7 @@ interface ActionOptions {
   tries?: JobOptions['tries']
   backoff?: JobOptions['backoff']
   enabled?: JobOptions['enabled']
-  handle: (request?: Request) => Promise<any> | object | string
+  handle: (request?: ModelRequests) => Promise<any> | object | string
 }
 
 export class Action {
@@ -37,7 +32,7 @@ export class Action {
   path?: ActionOptions['path']
   method?: ActionOptions['method']
   validations?: Record<ValidationKey, ValidationValue>
-  handle: (request?: Request) => Promise<any> | object | string
+  handle: (request?: ModelRequests) => Promise<any> | object | string
 
   constructor({ name, description, validations, handle, rate, tries, backoff, enabled, path, method }: ActionOptions) {
     // log.debug(`Action ${name} created`) // TODO: this does not yet work because the cloud does not yet have proper file system (efs) access

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

@@ -105,6 +105,10 @@ async function writeModelNames() {
 
 async function writeModelRequests() {
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
+
+  const requestD = Bun.file(path.frameworkPath('types/requests.d.ts'))
+  let importTypes = ``
+  let importTypesString = ``
   let typeString = ``
   for (let i = 0; i < modelFiles.length; i++) {
 
@@ -159,13 +163,17 @@ async function writeModelRequests() {
 
     const requestFile = Bun.file(path.projectStoragePath(`framework/requests/${modelName}Request.ts`))
 
-    const requestD = Bun.file(path.frameworkPath('types/requests.d.ts'))
+    importTypes = `${modelName}RequestType`
+    importTypesString += `${importTypes}`
+
+    if (i < modelFiles.length - 1)
+      importTypesString += ` | `
 
-    fileString += `import { ${modelName}RequestType } from '../types/requests'\n\n`
+    fileString += `import { ${importTypes} } from '../types/requests'\n\n`
 
     const types = `export interface ${modelName}RequestType extends RequestInstance {
       validate(): void
-      getParam(key: ${fieldStringType}): number | string | null
+      get(key: ${fieldStringType}): string | number | undefined;
       ${fieldString}
     }\n\n`
 
@@ -180,14 +188,17 @@ async function writeModelRequests() {
     
     export const ${modelLowerCase}Request = new ${modelName}Request()
     `
-    const requestWrite = requestD.writer()
 
     const writer = requestFile.writer()
 
     writer.write(fileString)
-    
-    requestWrite.write(typeString)
   }
+
+  typeString += `export type ModelRequests = ${importTypesString}`
+
+  const requestWrite = requestD.writer()
+
+  requestWrite.write(typeString)
 }
 
 async function writeOrmActions(apiRoute: string, modelName: String): Promise<void> {

storage/framework/types/requests.d.ts

@@ -1,6 +1,6 @@
 export interface ProjectRequestType extends RequestInstance {
       validate(): void
-      getParam(key: 'id' |'name' |'description' |'url' |'status'): number | string | null
+      get(key: 'id' |'name' |'description' |'url' |'status'): string | number | undefined;
        id: number
  name: string
       description: string
@@ -13,7 +13,7 @@ export interface ProjectRequestType extends RequestInstance {
 
 export interface SubscriberEmailRequestType extends RequestInstance {
       validate(): void
-      getParam(key: 'id' |'email'): number | string | null
+      get(key: 'id' |'email'): string | number | undefined;
        id: number
  email: string
      created_at: Date
@@ -23,7 +23,7 @@ export interface SubscriberEmailRequestType extends RequestInstance {
 
 export interface AccessTokenRequestType extends RequestInstance {
       validate(): void
-      getParam(key: 'id' |'name' |'token' |'plainTextToken' |'abilities'): number | string | null
+      get(key: 'id' |'name' |'token' |'plainTextToken' |'abilities'): string | number | undefined;
        id: number
  name: string
       token: string
@@ -36,7 +36,7 @@ export interface AccessTokenRequestType extends RequestInstance {
 
 export interface TeamRequestType extends RequestInstance {
       validate(): void
-      getParam(key: 'id' |'name' |'companyName' |'email' |'billingEmail' |'status' |'description' |'path' |'isPersonal'): number | string | null
+      get(key: 'id' |'name' |'companyName' |'email' |'billingEmail' |'status' |'description' |'path' |'isPersonal'): string | number | undefined;
        id: number
  name: string
       companyName: string
@@ -53,7 +53,7 @@ export interface TeamRequestType extends RequestInstance {
 
 export interface SubscriberRequestType extends RequestInstance {
       validate(): void
-      getParam(key: 'id' |'subscribed'): number | string | null
+      get(key: 'id' |'subscribed'): string | number | undefined;
        id: number
  subscribed: boolean
      created_at: Date
@@ -63,7 +63,7 @@ export interface SubscriberRequestType extends RequestInstance {
 
 export interface DeploymentRequestType extends RequestInstance {
       validate(): void
-      getParam(key: 'id' |'commitSha' |'commitMessage' |'branch' |'status' |'executionTime' |'deployScript' |'terminalOutput'): number | string | null
+      get(key: 'id' |'commitSha' |'commitMessage' |'branch' |'status' |'executionTime' |'deployScript' |'terminalOutput'): string | number | undefined;
        id: number
  commitSha: string
       commitMessage: string
@@ -79,7 +79,7 @@ export interface DeploymentRequestType extends RequestInstance {
 
 export interface UserRequestType extends RequestInstance {
       validate(): void
-      getParam(key: 'id' |'name' |'email' |'jobTitle' |'password'): number | string | null
+      get(key: 'id' |'name' |'email' |'jobTitle' |'password'): string | number | undefined;
        id: number
  name: string
       email: string
@@ -92,7 +92,7 @@ export interface UserRequestType extends RequestInstance {
 
 export interface PostRequestType extends RequestInstance {
       validate(): void
-      getParam(key: 'id' |'title' |'body'): number | string | null
+      get(key: 'id' |'title' |'body'): string | number | undefined;
        id: number
  title: string
       body: string
@@ -101,3 +101,4 @@ export interface PostRequestType extends RequestInstance {
       deleted_at: Date
     }
 
+export type ModelRequests = ProjectRequestType | SubscriberEmailRequestType | AccessTokenRequestType | TeamRequestType | SubscriberRequestType | DeploymentRequestType | UserRequestType | PostRequestTypequestType | UserRequestType | PostRequestType