@stacksjs/router 0.61.24 → 0.63.0

package/src/utils.ts

@@ -1,8 +1,8 @@
 import { ok } from '@stacksjs/error-handling'
-import { route } from './router'
 import { path } from '@stacksjs/path'
-
-import { lowercase } from '@stacksjs/strings'
+import { existsSync } from '@stacksjs/storage'
+import { camelCase } from '@stacksjs/strings'
+import { route } from './router'
 
 export async function listRoutes() {
   const routeLists = await route.getRoutes()
@@ -15,48 +15,98 @@ export async function listRoutes() {
 export function extractModelFromAction(action: string): string {
   let model = ''
 
-  if (action.includes("StoreOrmAction")) {
-    const match = action.match(/\/([A-Z][a-z]+)StoreOrmAction/);
+  if (action.includes('IndexOrmAction')) {
+    const match = action.match(/\/([A-Z][a-z]+)IndexOrmAction/)
+
+    const modelString = match ? match[1] : ''
+
+    model = modelString as string
+  }
+
+  if (action.includes('StoreOrmAction')) {
+    const match = action.match(/\/([A-Z][a-z]+)StoreOrmAction/)
+
+    const modelString = match ? match[1] : ''
 
-    const modelString = match ? match[1] : '';
-  
     model = modelString as string
   }
 
-  if (action.includes("ShowOrmAction")) {
-    const match = action.match(/\/([A-Z][a-z]+)ShowOrmAction/);
-    const modelString = match ? match[1] : '';
-  
+  if (action.includes('ShowOrmAction')) {
+    const match = action.match(/\/([A-Z][a-z]+)ShowOrmAction/)
+    const modelString = match ? match[1] : ''
+
     model = modelString as string
   }
 
-  if (action.includes("UpdateOrmAction")) {
-    const match = action.match(/\/([A-Z][a-z]+)UpdateOrmAction/);
-    const modelString = match ? match[1] : '';
-  
+  if (action.includes('UpdateOrmAction')) {
+    const match = action.match(/\/([A-Z][a-z]+)UpdateOrmAction/)
+    const modelString = match ? match[1] : ''
+
     model = modelString as string
   }
 
-  if (action.includes("DestroyOrmAction")) {
-    const match = action.match(/\/([A-Z][a-z]+)DestroyOrmAction/);
-    const modelString = match ? match[1] : '';
-  
+  if (action.includes('DestroyOrmAction')) {
+    const match = action.match(/\/([A-Z][a-z]+)DestroyOrmAction/)
+    const modelString = match ? match[1] : ''
+
     model = modelString as string
   }
 
   return model
 }
 
+export function extractDynamicAction(action: string): string | undefined {
+  const regex = /Actions\/(.*?)Action/
+
+  const match = action.match(regex)
+
+  return match ? match[1] : ''
+}
+
 export async function extractModelRequest(action: string) {
   const extractedModel = extractModelFromAction(action)
 
-  const lowerCaseModel = lowercase(extractedModel)
+  const lowerCaseModel = camelCase(extractedModel)
 
-  const requestPath = path.projectStoragePath(`framework/requests/${extractedModel}Request.ts`)
+  const requestPath = path.frameworkPath(`requests/${extractedModel}Request.ts`)
 
   const requestInstance = await import(requestPath)
 
   const requestIndex = `${lowerCaseModel}Request`
-  
+
   return requestInstance[requestIndex]
-}
+}
+
+export async function findRequestInstance(requestInstance: string) {
+  const frameworkDirectory = path.projectStoragePath('framework/requests')
+
+  const filePath = path.join(frameworkDirectory, `${requestInstance}.ts`)
+
+  const pathExists = await existsSync(filePath)
+
+  // Check if the directory exists
+  if (pathExists) {
+    const requestInstance = await import(filePath)
+
+    return requestInstance.request
+  }
+
+  const defaultRequestPath = path.projectStoragePath('framework/core/router/src/request.ts')
+
+  const fileExists = await existsSync(defaultRequestPath)
+
+  if (fileExists) {
+    const requestInstance = await import(defaultRequestPath)
+
+    return requestInstance.request
+  }
+
+  return null
+}
+
+export async function extractDefaultRequest(action: string) {
+  const requestPath = path.frameworkPath(`core/router/src/request.ts`)
+  const requestInstance = await import(requestPath)
+
+  return requestInstance.request
+}