chore: wip

Author: glennmichael123

app/Actions/UserStoreAction.ts

@@ -1,4 +1,5 @@
 import { Action } from '@stacksjs/actions'
+import User from '../../storage/framework/orm/src/models/User.ts'
 import type { UserRequestType } from '../../storage/framework/types/requests'
 
 export default new Action({
@@ -7,7 +8,6 @@ export default new Action({
   method: 'POST',
   requestFile: 'UserRequest',
   async handle(request: UserRequestType) {
-    console.log(request)
     await request.validate()
 
     const model = await User.create(request.all())

app/Models/User.ts

@@ -54,7 +54,7 @@ export default {
     name: {
       required: true,
       order: 3,
-
+      fillable: true,
       validation: {
         rule: schema.string().minLength(3).maxLength(88),
         message: {
@@ -70,6 +70,7 @@ export default {
       unique: true,
       required: true,
       order: 1,
+      fillable: true,
       validation: {
         rule: schema.string().email(),
         message: {
@@ -83,6 +84,7 @@ export default {
     jobTitle: {
       required: true,
       order: 5,
+      fillable: true,
       validation: {
         rule: schema.string().minLength(3).maxLength(255),
         message: {
@@ -97,6 +99,7 @@ export default {
       required: true,
       order: 2,
       hidden: true,
+      fillable: true,
       validation: {
         rule: schema.string().minLength(6).maxLength(255),
         message: {

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

@@ -391,6 +391,7 @@ async function initiateModelGeneration(modelStringFile?: string): Promise<void>
   await deleteExistingOrmActions(modelStringFile)
   await deleteExistingModelNameTypes()
   await deleteExistingModelRequest(modelStringFile)
+  await deleteExistingOrmRoute()
 
   await writeModelNames()
   await writeModelRequest()
@@ -540,6 +541,12 @@ async function deleteExistingModelRequest(modelStringFile?: string) {
   }
 }
 
+async function deleteExistingOrmRoute() {
+  const ormRoute = path.projectStoragePath('framework/orm/routes.ts')
+
+  if (fs.existsSync(ormRoute)) await Bun.$`rm ${ormRoute}`
+}
+
 async function setKyselyTypes() {
   let text = ``
   const modelFiles = glob.sync(path.userModelsPath('*.ts'))
@@ -766,11 +773,13 @@ function getHiddenAttributes(attributes: Attributes | undefined): string[] {
 function getFillableAttributes(attributes: Attributes | undefined): string[] {
   if (attributes === undefined) return []
 
-  return Object.keys(attributes).filter((key) => {
-    if (attributes === undefined) return false
+  return Object.keys(attributes)
+    .filter((key) => {
+      if (attributes === undefined) return false
 
-    return attributes[key]?.fillable === true
-  })
+      return attributes[key]?.fillable === true
+    })
+    .map((attribute) => snakeCase(attribute))
 }
 
 async function generateModelString(

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

@@ -306,7 +306,6 @@ async function addRouteQuery(url: URL) {
   for (const modelFile of modelFiles) {
     const model = (await import(modelFile)).default
     const modelName = getModelName(model, modelFile)
-    const modelNameLower = `${camelCase(modelName)}Request`
     const requestPath = path.projectStoragePath(`framework/requests/${modelName}Request.ts`)
     const requestImport = await import(requestPath)
     const requestInstance = requestImport.request
@@ -325,7 +324,6 @@ async function addBody(params: any) {
   for (const modelFile of modelFiles) {
     const model = (await import(modelFile)).default
     const modelName = getModelName(model, modelFile)
-    const modelNameLower = `${camelCase(modelName)}Request`
     const requestPath = path.projectStoragePath(`framework/requests/${modelName}Request.ts`)
     const requestImport = await import(requestPath)
     const requestInstance = requestImport.request
@@ -362,10 +360,9 @@ async function addHeaders(headers: Headers): Promise<void> {
   for (const modelFile of modelFiles) {
     const model = (await import(modelFile)).default as Model
     const modelName = getModelName(model, modelFile)
-    const modelNameLower = `${lowercase(modelName)}Request`
     const requestPath = path.projectStoragePath(`framework/requests/${modelName}Request.ts`)
     const requestImport = await import(requestPath)
-    const requestInstance = requestImport[modelNameLower]
+    const requestInstance = requestImport.request
 
     if (requestInstance) {
       requestInstance.addHeaders(headers)

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

@@ -82,7 +82,6 @@ export async function findRequestInstance(requestInstance: string) {
 
   const filePath = path.join(frameworkDirectory, `${requestInstance}.ts`)
 
-
   const pathExists = await existsSync(filePath)
 
   // Check if the directory exists
@@ -106,8 +105,8 @@ export async function findRequestInstance(requestInstance: string) {
 }
 
 export async function extractDefaultRequest(action: string) {
-    const requestPath = path.projectStoragePath(`framework/core/router/src/request.ts`)
-    const requestInstance = await import(requestPath)
+  const requestPath = path.projectStoragePath(`framework/core/router/src/request.ts`)
+  const requestInstance = await import(requestPath)
 
-    return requestInstance.request
+  return requestInstance.request
 }

storage/framework/core/validation/src/validator.ts

@@ -1,4 +1,5 @@
 import { path } from '@stacksjs/path'
+import { snakeCase } from '@stacksjs/strings'
 import type { Model } from '@stacksjs/types'
 import type { VineType } from '@stacksjs/types'
 import type { SchemaTypes } from '@vinejs/vine/types'
@@ -31,7 +32,7 @@ export async function validateField(modelFile: string, params: RequestData): Pro
 
   for (const key in attributes) {
     if (Object.prototype.hasOwnProperty.call(attributes, key)) {
-      ruleObject[key] = attributes[key]?.validation?.rule
+      ruleObject[snakeCase(key)] = attributes[key]?.validation?.rule
       const validatorMessages = attributes[key]?.validation?.message
 
       for (const validatorMessageKey in validatorMessages) {

storage/framework/orm/src/models/User.ts

@@ -67,7 +67,7 @@ interface QueryOptions {
 
 export class UserModel {
   private hidden = ['password']
-  private fillable = []
+  private fillable = ['name', 'email', 'job_title', 'password']
   protected query: any
   protected hasSelect: boolean
   public id: number | undefined