chore: wip

Author: glennmichael123

app/Actions/SubscriberEmailAction.ts

@@ -1,5 +1,5 @@
 import { Action } from '@stacksjs/actions'
-import { schema } from '@stacksjs/validation'
+// import { schema } from '@stacksjs/validation'
 // import { epmailSubscribeRequest } from '@stacksjs/validation'
 import SubscriberEmail from '../../storage/framework/orm/src/models/SubscriberEmail'
 import type { SubscriberEmailRequestType } from '../../storage/framework/types/requests'
@@ -8,15 +8,15 @@ export default new Action({
   name: 'SubscriberEmailAction',
   description: 'Save emails from subscribe page',
   method: 'POST',
-  validations: {
-    status: {
-      rule: schema.string().minLength(5).maxLength(255),
-      message: {
-        minLength: 'Name must have a minimum of 3 characters',
-        maxLength: 'Name must have a maximum of 255 characters',
-      },
-    },
-  },
+  // validations: {
+  //   status: {
+  //     rule: schema.string().minLength(5).maxLength(255),
+  //     message: {
+  //       minLength: 'Name must have a minimum of 3 characters',
+  //       maxLength: 'Name must have a maximum of 255 characters',
+  //     },
+  //   },
+  // },
   async handle(request: SubscriberEmailRequestType) {
     const email = request.get('email')
 

app/Models/User.ts

@@ -33,10 +33,10 @@ export default {
     useApi: {
       uri: 'users', // your-url.com/api/users
       middleware: ['Api'], // defaults to `[]`
+
       routes: {
         index: 'UserIndexOrmAction',
         show: 'UserShowOrmAction',
-        store: 'UserStoreAction',
         destroy: 'UserDestroyOrmAction',
       },
     },

storage/framework/actions/src/UserDestroyOrmAction.ts

@@ -1,6 +1,6 @@
 import { Action } from '@stacksjs/actions'
+import User from '../../orm/src/models/User'
 import type { UserRequestType } from '../../types/requests'
-import User from '../src/models/User'
 
 export default new Action({
   name: 'User Destroy',

storage/framework/actions/src/UserIndexOrmAction.ts

@@ -1,6 +1,6 @@
 import { Action } from '@stacksjs/actions'
+import User from '../../orm/src/models/User'
 import type { UserRequestType } from '../../types/requests'
-import User from '../src/models/User'
 
 export default new Action({
   name: 'User Index',

storage/framework/actions/src/UserShowOrmAction.ts

@@ -1,6 +1,6 @@
 import { Action } from '@stacksjs/actions'
+import User from '../../orm/src/models/User'
 import type { UserRequestType } from '../../types/requests'
-import User from '../src/models/User'
 
 export default new Action({
   name: 'User Show',

storage/framework/actions/src/UserStoreOrmAction.ts

@@ -1,6 +1,6 @@
 import { Action } from '@stacksjs/actions'
+import User from '../../orm/src/models/User'
 import type { UserRequestType } from '../../types/requests'
-import User from '../src/models/User'
 
 export default new Action({
   name: 'User Store',

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

@@ -58,9 +58,6 @@ async function generateApiRoutes(modelFiles: string[]) {
           const apiRoutes = model.traits.useApi.routes
           for (const apiRoute in apiRoutes) {
             if (Object.prototype.hasOwnProperty.call(apiRoutes, apiRoute)) {
-              // console.log(`Route: ${apiRoute}, Path: ${apiRoutes[apiRoute]}`);
-              // }
-
               let path: string | null = ''
 
               await writeOrmActions(apiRoute as string, modelName)
@@ -101,7 +98,7 @@ async function generateApiRoutes(modelFiles: string[]) {
 }
 
 async function lookupFile(fileName: string): Promise<string | null> {
-  const ormDirectory = path.builtUserActionsPath('src')
+  const ormDirectory = path.builtUserActionsPath('src', { relative: true })
   const filePath = path.join(ormDirectory, fileName)
   const pathExists = await fs.existsSync(filePath)
 
@@ -287,9 +284,10 @@ async function writeModelRequest() {
 
 async function writeOrmActions(apiRoute: string, modelName: String): Promise<void> {
   const formattedApiRoute = apiRoute.charAt(0).toUpperCase() + apiRoute.slice(1)
+
   let method = 'GET'
   let actionString = `import { Action } from '@stacksjs/actions'\n`
-  actionString += `import ${modelName} from '../src/models/${modelName}'\n`
+  actionString += `import ${modelName} from '../../orm/src/models/${modelName}'\n`
 
   let handleString = ``
 

storage/framework/core/path/src/index.ts

@@ -38,12 +38,16 @@ export function relativeActionsPath(path?: string) {
   return relative(projectPath(), actionsPath(path))
 }
 
-export function userActionsPath(path?: string) {
+export function userActionsPath(path?: string, options?: { relative: true }) {
   return appPath(`Actions/${path || ''}`)
 }
 
-export function builtUserActionsPath(path?: string) {
-  return frameworkPath(`actions/${path || ''}`)
+export function builtUserActionsPath(path?: string, options?: { relative: boolean }) {
+  const absolutePath = frameworkPath(`actions/${path || ''}`)
+
+  if (options?.relative) return relative(process.cwd(), absolutePath)
+
+  return absolutePath
 }
 
 export function userComponentsPath(path?: string) {

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

@@ -282,11 +282,11 @@ export class Router implements RouterInterface {
 
     let actionModule = null
 
-    if (modulePath.includes('storage/framework/orm')) actionModule = await import(`${modulePath}.ts`)
-    else if (modulePath.includes('app/Actions')) actionModule = await import(`${modulePath}.ts`)
+    if (modulePath.includes('storage/framework/orm')) actionModule = await import(modulePath)
+    else if (modulePath.includes('app/Actions')) actionModule = await import(modulePath)
     else if (modulePath.includes('OrmAction'))
-      actionModule = await import(importPathFunction(`/framework/orm/${modulePath}.ts`))
-    else actionModule = await import(importPathFunction(`${modulePath}.ts`))
+      actionModule = await import(p.storagePath(`/framework/orm/${modulePath}`))
+    else actionModule = await import(importPathFunction(modulePath))
 
     // Use custom path from action module if available
     const newPath = actionModule.default.path ?? originalPath

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

@@ -92,6 +92,7 @@ export interface ModelOptions extends Base {
     useSearch?: boolean | SearchOptions // defaults to false
     searchable?: boolean | SearchOptions // useSearch alias
     useApi?: ApiOptions | boolean
+    openApi?: boolean
     observe?: string[] | boolean
     useActivityLog?: boolean | ActivityLogOption
   }