chore: wip

Author: glennmichael123

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

@@ -2,7 +2,7 @@ import { log } from '@stacksjs/logging'
 import { modelTableName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
 import { fs, glob } from '@stacksjs/storage'
-import { pascalCase } from '@stacksjs/strings'
+import { camelCase, pascalCase } from '@stacksjs/strings'
 import type { Model, RelationConfig } from '@stacksjs/types'
 import { isString } from '@stacksjs/validation'
 
@@ -29,29 +29,30 @@ async function generateApiRoutes(modelFiles: string[]) {
 
   for (const modelFile of modelFiles) {
     log.debug(`Processing model file: ${modelFile}`)
-
+    let middlewareString = ''
     const model = (await import(modelFile)).default as Model
 
     if (model.traits?.useApi) {
       const apiRoutes = model.traits?.useApi?.routes
       const middlewares = model.traits.useApi?.middleware
-      let middlewareString = `.middleware([`
-
-      if (middlewares.length) {
-        for (let i = 0; i < middlewares.length; i++) {
-          middlewareString += `'${middlewares[i]}'`
-
-          if (i < middlewares.length - 1) {
-            middlewareString += ','
+      if (middlewares) {
+        middlewareString = `.middleware([`
+        if (middlewares.length) {
+          for (let i = 0; i < middlewares.length; i++) {
+            middlewareString += `'${middlewares[i]}'`
+  
+            if (i < middlewares.length - 1) {
+              middlewareString += ','
+            }
           }
         }
-      }
 
-      middlewareString += `])`
+        middlewareString += `])`
+      }
 
       if (apiRoutes?.length) {
         for (const apiRoute of apiRoutes) {
-          await writeOrmActions(apiRoute, model)
+          await writeOrmActions(apiRoute as string, model)
 
           if (apiRoute === 'index')
             routeString += `await route.get('${model.table}', 'Actions/${model.name}IndexOrmAction')${middlewareString}\n\n`
@@ -109,19 +110,25 @@ async function writeModelRequests() {
     const modeFileElement = modelFiles[i] as string
 
     const model = (await import(modeFileElement)).default as Model
+    const modelName = model.name as string
 
-    const requestFile = Bun.file(path.projectStoragePath(`framework/requests/${model.name}Request.ts`))
+    const modelLowerCase = camelCase(modelName)
 
-    fileString += `export interface ${model.name}RequestType extends RequestInstance{
+    const requestFile = Bun.file(path.projectStoragePath(`framework/requests/${modelName}Request.ts`))
+
+    fileString += `export interface ${modelName}RequestType extends RequestInstance{
       validate(params: any): void
     }\n\n`
 
-    fileString += `export class ${model.name}Request extends Request implements ${model.name}RequestType  {
+    fileString += `export class ${modelName}Request extends Request implements ${modelName}RequestType  {
       
       public validate(params: any): void {
-        validateField('${model.name}', this.all())
+        validateField('${modelName}', this.all())
       }
-    }`
+    }
+    
+    export const ${modelLowerCase}Request = new ${modelName}Request()
+    `
 
     const writer = requestFile.writer()
 
@@ -208,27 +215,6 @@ async function writeOrmActions(apiRoute: string, model: Model): Promise<void> {
   writer.write(actionString)
 }
 
-async function writeApiRoutes(apiRoute: string, model: Model): Promise<string> {
-  let routeString = ``
-  const tableName = await modelTableName(model)
-  const modelName = model.name
-
-  if (apiRoute === 'index') routeString += `await route.get('${tableName}', 'Actions/${modelName}IndexOrmAction')\n\n`
-
-  if (apiRoute === 'store') routeString += `await route.post('${tableName}', 'Actions/${modelName}StoreOrmAction')\n\n`
-
-  if (apiRoute === 'update')
-    routeString += `await route.patch('${tableName}/{id}', 'Actions/${modelName}UpdateOrmAction')\n\n`
-
-  if (apiRoute === 'show')
-    routeString += `await route.get('${tableName}/{id}', 'Actions/${modelName}ShowOrmAction')\n\n`
-
-  if (apiRoute === 'destroy')
-    routeString += `await route.delete('${tableName}/{id}', 'Actions/${modelName}DestroyOrmAction')\n\n`
-
-  return routeString
-}
-
 async function initiateModelGeneration(): Promise<void> {
   await deleteExistingModels()
   await deleteExistingOrmActions()

storage/framework/core/strings/src/case.ts

@@ -10,6 +10,10 @@ export function capitalize(str: string): string {
   return str[0] ? str[0].toUpperCase() + str.slice(1).toLowerCase() : ''
 }
 
+export function lowercase(str: string): string {
+  return str.toLowerCase()
+}
+
 export {
   camelCase,
   capitalCase,

storage/framework/requests/AccessTokenRequest.ts

@@ -11,4 +11,7 @@ export class AccessTokenRequest extends Request implements AccessTokenRequestTyp
       public validate(params: any): void {
         validateField('AccessToken', this.all())
       }
-    }
+    }
+    
+    export const accessTokenRequest = new AccessTokenRequest()
+     

storage/framework/requests/DeploymentRequest.ts

@@ -11,4 +11,7 @@ export class DeploymentRequest extends Request implements DeploymentRequestType
       public validate(params: any): void {
         validateField('Deployment', this.all())
       }
-    }
+    }
+    
+    export const deploymentRequest = new DeploymentRequest()
+    

storage/framework/requests/PostRequest.ts

@@ -11,4 +11,7 @@ export class PostRequest extends Request implements PostRequestType  {
       public validate(params: any): void {
         validateField('Post', this.all())
       }
-    }
+    }
+    
+    export const postRequest = new PostRequest()
+    

storage/framework/requests/ProjectRequest.ts

@@ -11,4 +11,7 @@ export class ProjectRequest extends Request implements ProjectRequestType  {
       public validate(params: any): void {
         validateField('Project', this.all())
       }
-    }
+    }
+    
+    export const projectRequest = new ProjectRequest()
+    

storage/framework/requests/SubscriberEmailRequest.ts

@@ -11,4 +11,7 @@ export class SubscriberEmailRequest extends Request implements SubscriberEmailRe
       public validate(params: any): void {
         validateField('SubscriberEmail', this.all())
       }
-    }
+    }
+    
+    export const subscriberEmailRequest = new SubscriberEmailRequest()
+     

storage/framework/requests/SubscriberRequest.ts

@@ -11,4 +11,7 @@ export class SubscriberRequest extends Request implements SubscriberRequestType
       public validate(params: any): void {
         validateField('Subscriber', this.all())
       }
-    }
+    }
+    
+    export const subscriberRequest = new SubscriberRequest()
+    

storage/framework/requests/TeamRequest.ts

@@ -11,4 +11,7 @@ export class TeamRequest extends Request implements TeamRequestType  {
       public validate(params: any): void {
         validateField('Team', this.all())
       }
-    }
+    }
+    
+    export const teamRequest = new TeamRequest()
+    

storage/framework/requests/UserRequest.ts

@@ -11,4 +11,7 @@ export class UserRequest extends Request implements UserRequestType  {
       public validate(params: any): void {
         validateField('User', this.all())
       }
-    }
+    }
+    
+    export const userRequest = new UserRequest()
+