chore: wip

Author: glennmichael123

app/Models/Subscriber.ts

@@ -14,6 +14,12 @@ export default {
       // defaults to a count of 10
       count: 10,
     },
+
+    useApi: {
+      uri: 'subscribers', // your-url.com/api/users
+      middleware: ['auth'], // defaults to `[]`
+      routes: ['index', 'update', 'store', 'destroy', 'show'],
+    },
   },
 
   attributes: {

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

@@ -22,23 +22,57 @@ export interface ModelElement {
 await initiateModelGeneration()
 await setKyselyTypes()
 
-async function generateApiRoutes(model: Model) {
-  if (model.traits?.useApi) {
-    let routeString = `import { route } from '@stacksjs/router'\n\n\n`
-    const apiRoutes = model.traits?.useApi?.routes
-
-    if (apiRoutes?.length) {
-      for (const apiRoute of apiRoutes) {
-        await writeOrmActions(apiRoute, model)
-        routeString += await writeApiRoutes(apiRoute, model)
+async function generateApiRoutes(modelFiles: string[]) {
+  const file = Bun.file(path.projectStoragePath(`framework/orm/routes.ts`))
+  const writer = file.writer()
+  let routeString = `import { route } from '@stacksjs/router'\n\n\n`
+
+  for (const modelFile of modelFiles) {
+    log.debug(`Processing model file: ${modelFile}`)
+
+    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 += ','
+          }
+        }
+         
+      }
+       
+      middlewareString += `])`
+
+      if (apiRoutes?.length) {
+        for (const apiRoute of apiRoutes) {
+          await writeOrmActions(apiRoute, model)
+  
+          if (apiRoute === 'index') routeString += `await route.get('${model.table}', 'Actions/${model.name}IndexOrmAction')${middlewareString}\n\n`
+  
+          if (apiRoute === 'store') routeString += `await route.post('${model.table}', 'Actions/${model.name}StoreOrmAction')${middlewareString}\n\n`
+        
+          if (apiRoute === 'update')
+            routeString += `await route.patch('${model.table}/{id}', 'Actions/${model.name}UpdateOrmAction')${middlewareString}\n\n`
+        
+          if (apiRoute === 'show')
+            routeString += `await route.get('${model.table}/{id}', 'Actions/${model.name}ShowOrmAction')${middlewareString}\n\n`
+        
+          if (apiRoute === 'destroy')
+            routeString += `await route.delete('${model.table}/{id}', 'Actions/${model.name}DestroyOrmAction')${middlewareString}\n\n`
+        }
       }
     }
-
-    const file = Bun.file(path.projectStoragePath(`framework/orm/routes.ts`))
-    const writer = file.writer()
-    writer.write(routeString)
-    await writer.end()
   }
+
+  writer.write(routeString)
+  await writer.end()
 }
 
 async function writeModelNames() {
@@ -173,15 +207,15 @@ async function initiateModelGeneration(): Promise<void> {
 
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
 
+  await generateApiRoutes(modelFiles)
+
   for (const modelFile of modelFiles) {
     log.debug(`Processing model file: ${modelFile}`)
 
     const model = (await import(modelFile)).default as Model
     const tableName = await modelTableName(model)
     const modelName = path.basename(modelFile, '.ts')
 
-    await generateApiRoutes(model)
-
     const file = Bun.file(path.projectStoragePath(`framework/orm/src/models/${modelName}.ts`))
     const fields = await extractFields(model, modelFile)
     const classString = await generateModelString(tableName, model, fields)
@@ -247,10 +281,13 @@ async function deleteExistingModels() {
 
 async function deleteExistingOrmActions() {
   const ormPaths = glob.sync(path.projectStoragePath(`framework/orm/Actions/*.ts`))
+  const routes = path.projectStoragePath(`framework/orm/routes`)
 
   for (const ormPath of ormPaths) {
     if (fs.existsSync(ormPath)) await Bun.$`rm ${ormPath}`
   }
+
+  if (fs.existsSync(routes)) await Bun.$`rm ${routes}`
 }
 
 async function deleteExistingModelNameTypes() {

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

@@ -52,12 +52,10 @@ export class Router implements RouterInterface {
     return this
   }
 
-  public async get(path: Route['url'], callback: Route['callback']): Promise<this> {
+  public get(path: Route['url'], callback: Route['callback']): this {
     this.path = this.normalizePath(path)
     log.debug(`Normalized Path: ${this.path}`)
 
-    // callback = await this.resolveCallback(callback)
-
     const uri = this.prepareUri(this.path)
     log.debug(`Prepared URI: ${uri}`)
 
@@ -123,11 +121,19 @@ export class Router implements RouterInterface {
   }
 
   public post(path: Route['url'], callback: Route['callback']): this {
-    return this.addRoute('POST', this.prepareUri(path), callback, 201)
+    this.path = this.normalizePath(path)
+
+    const uri = this.prepareUri(this.path)
+
+    return this.addRoute('POST', uri, callback, 201)
   }
 
   public view(path: Route['url'], callback: Route['callback']): this {
-    return this.addRoute('GET', path, callback, 200)
+    this.path = this.normalizePath(path)
+
+    const uri = this.prepareUri(this.path)
+
+    return this.addRoute('GET', uri, callback, 200)
   }
 
   public redirect(path: Route['url'], callback: Route['callback'], _status?: RedirectCode): this {
@@ -139,11 +145,21 @@ export class Router implements RouterInterface {
   }
 
   public patch(path: Route['url'], callback: Route['callback']): this {
-    return this.addRoute('PATCH', this.prepareUri(path), callback, 202)
+    this.path = this.normalizePath(path)
+    log.debug(`Normalized Path: ${this.path}`)
+
+    const uri = this.prepareUri(this.path)
+    log.debug(`Prepared URI: ${uri}`)
+
+    return this.addRoute('PATCH', uri, callback, 202)
   }
 
   public put(path: Route['url'], callback: Route['callback']): this {
-    return this.addRoute('PUT', this.prepareUri(path), callback, 202)
+    this.path = this.normalizePath(path)
+
+    const uri = this.prepareUri(this.path)
+
+    return this.addRoute('PUT', uri, callback, 202)
   }
 
   public group(options: string | RouteGroupOptions, callback?: () => void): this {

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

@@ -49,7 +49,7 @@ export interface RouteGroupOptions {
 type Prefix = string
 
 export interface RouterInterface {
-  get: (url: Route['url'], callback: Route['callback']) => Promise<this>
+  get: (url: Route['url'], callback: Route['callback']) => this
   post: (url: Route['url'], callback: Route['callback']) => this
   view: (url: Route['url'], callback: Route['callback']) => this
   redirect: (url: Route['url'], callback: Route['callback'], status?: RedirectCode) => this

storage/framework/orm/Actions/SubscriberDestroyOrmAction.ts

@@ -0,0 +1,20 @@
+import { Action } from '@stacksjs/actions'
+import Subscriber from '../src/models/Subscriber'
+
+import { request } from '@stacksjs/router'
+
+export default new Action({
+      name: 'Subscriber Destroy',
+      description: 'Subscriber Destroy ORM Action',
+      method: 'DELETE',
+      async handle() {
+        const id = request.getParam('id')
+
+        const model = await Subscriber.findOrFail(Number(id))
+
+        model.delete()
+
+        return 'Model deleted!'
+      },
+    })
+  

storage/framework/orm/Actions/SubscriberIndexOrmAction.ts

@@ -0,0 +1,14 @@
+import { Action } from '@stacksjs/actions'
+import Subscriber from '../src/models/Subscriber'
+
+import { request } from '@stacksjs/router'
+
+export default new Action({
+      name: 'Subscriber Index',
+      description: 'Subscriber Index ORM Action',
+      method: 'GET',
+      async handle() {
+        return await Subscriber.all()
+      },
+    })
+  

storage/framework/orm/Actions/SubscriberShowOrmAction.ts

@@ -0,0 +1,16 @@
+import { Action } from '@stacksjs/actions'
+import Subscriber from '../src/models/Subscriber'
+
+import { request } from '@stacksjs/router'
+
+export default new Action({
+      name: 'Subscriber Show',
+      description: 'Subscriber Show ORM Action',
+      method: 'GET',
+      async handle() {
+        const id = await request.getParam('id')
+
+        return Subscriber.findOrFail(Number(id))
+      },
+    })
+  

storage/framework/orm/Actions/SubscriberStoreOrmAction.ts

@@ -0,0 +1,16 @@
+import { Action } from '@stacksjs/actions'
+import Subscriber from '../src/models/Subscriber'
+
+import { request } from '@stacksjs/router'
+
+export default new Action({
+      name: 'Subscriber Store',
+      description: 'Subscriber Store ORM Action',
+      method: 'POST',
+      async handle() {
+        const model = await Subscriber.create(request.all())
+
+        return model
+      },
+    })
+  

storage/framework/orm/Actions/SubscriberUpdateOrmAction.ts

@@ -0,0 +1,18 @@
+import { Action } from '@stacksjs/actions'
+import Subscriber from '../src/models/Subscriber'
+
+import { request } from '@stacksjs/router'
+
+export default new Action({
+      name: 'Subscriber Update',
+      description: 'Subscriber Update ORM Action',
+      method: 'PATCH',
+      async handle() {
+        const id = request.getParam('id')
+
+        const model = await Subscriber.findOrFail(Number(id))
+
+        return model.update(request.all())
+      },
+    })
+  

storage/framework/orm/routes.ts

@@ -1,13 +1,25 @@
 import { route } from '@stacksjs/router'
 
 
-await route.get('users', 'Actions/UserIndexOrmAction')
+await route.get('subscribers', 'Actions/SubscriberIndexOrmAction').middleware(['auth'])
 
-await route.patch('users/{id}', 'Actions/UserUpdateOrmAction')
+await route.patch('subscribers/{id}', 'Actions/SubscriberUpdateOrmAction').middleware(['auth'])
 
-await route.post('users', 'Actions/UserStoreOrmAction')
+await route.post('subscribers', 'Actions/SubscriberStoreOrmAction').middleware(['auth'])
 
-await route.delete('users/{id}', 'Actions/UserDestroyOrmAction')
+await route.delete('subscribers/{id}', 'Actions/SubscriberDestroyOrmAction').middleware(['auth'])
 
-await route.get('users/{id}', 'Actions/UserShowOrmAction')
+await route.get('subscribers/{id}', 'Actions/SubscriberShowOrmAction').middleware(['auth'])
+
+await route.get('users', 'Actions/UserIndexOrmAction').middleware(['auth'])
+
+await route.patch('users/{id}', 'Actions/UserUpdateOrmAction').middleware(['auth'])
+
+await route.post('users', 'Actions/UserStoreOrmAction').middleware(['auth'])
+
+await route.delete('users/{id}', 'Actions/UserDestroyOrmAction').middleware(['auth'])
+
+await route.get('users/{id}', 'Actions/UserShowOrmAction').middleware(['auth'])
+
+erShowOrmAction').middleware(['auth'])