chore: wip

Author: glennmichael123

storage/framework/core/orm/src/generate.ts

@@ -10,7 +10,7 @@ import { fetchOtherModelRelations, getFillableAttributes, getGuardedAttributes,
 
 // generateCustomAccessors(userModel)
 
-function generateCustomAccessors(model: Model): { output: string } {
+function generateCustomAccessors(model: Model): string {
   let output = ''
   if (model.get) {
     for (const [methodName, getter] of Object.entries(model.get)) {
@@ -19,32 +19,20 @@ function generateCustomAccessors(model: Model): { output: string } {
     }
   }
 
-  return { output }
+  return output
 }
 
-function generateCustomSetters(model: Model): { customSetterVar: string, loopString: string } {
+function generateCustomSetters(model: Model): string {
   let output = ''
-  let loopString = ''
-  let customSetterVar = ''
 
   if (model.set) {
-    customSetterVar += ` const customSetter = { \n`
     for (const [methodName, getter] of Object.entries(model.set)) {
       const getterStr = getter.toString()
       output += removeAttrString(`${methodName}: ${getterStr}, \n`)
-
-      customSetterVar += output
     }
-
-    customSetterVar += '}'
-
-    loopString += `
-      for (const [key, fn] of Object.entries(customSetter)) {
-        model[key] = await fn()
-      }`
   }
 
-  return { customSetterVar, loopString }
+  return output
 }
 
 function removeAttrString(getterFn: string): string {
@@ -936,7 +924,7 @@ export async function generateModelString(
                 default: () => {
                 },
 
-                ${getterOutput.output}
+                ${getterOutput}
               }
 
               for (const [key, fn] of Object.entries(customGetter)) {
@@ -952,7 +940,7 @@ export async function generateModelString(
               default: () => {
               },
 
-              ${getterOutput.output}
+              ${getterOutput}
             }
 
             for (const [key, fn] of Object.entries(customGetter)) {
@@ -962,9 +950,16 @@ export async function generateModelString(
         }
 
         async mapCustomSetters(model: ${modelName}JsonResponse): Promise<void> {
-          ${setterOutput.customSetterVar}
+          const customSetter = {
+            default: () => {
+            },
+
+            ${setterOutput}
+          }
 
-          ${setterOutput.loopString}
+          for (const [key, fn] of Object.entries(customSetter)) {
+              model[key] = await fn()
+          }
         }
 
         ${getFields}

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

@@ -120,7 +120,15 @@ export class AccessTokenModel {
   }
 
   async mapCustomSetters(model: AccessTokenJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get team_id(): number | undefined {

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

@@ -119,7 +119,15 @@ export class ActivityModel {
   }
 
   async mapCustomSetters(model: ActivityJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get id(): number | undefined {

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

@@ -125,7 +125,15 @@ export class DeploymentModel {
   }
 
   async mapCustomSetters(model: DeploymentJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get user_id(): number | undefined {

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

@@ -116,7 +116,15 @@ export class ErrorModel {
   }
 
   async mapCustomSetters(model: ErrorJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get id(): number | undefined {

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

@@ -116,7 +116,15 @@ export class FailedJobModel {
   }
 
   async mapCustomSetters(model: FailedJobJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get id(): number | undefined {

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

@@ -116,7 +116,15 @@ export class JobModel {
   }
 
   async mapCustomSetters(model: JobJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get id(): number | undefined {

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

@@ -128,7 +128,15 @@ export class PaymentMethodModel {
   }
 
   async mapCustomSetters(model: PaymentMethodJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get user_id(): number | undefined {

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

@@ -118,7 +118,15 @@ export class PostModel {
   }
 
   async mapCustomSetters(model: PostJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get user_id(): number | undefined {

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

@@ -120,7 +120,15 @@ export class ProductModel {
   }
 
   async mapCustomSetters(model: ProductJsonResponse): Promise<void> {
+    const customSetter = {
+      default: () => {
+      },
+
+    }
 
+    for (const [key, fn] of Object.entries(customSetter)) {
+      model[key] = await fn()
+    }
   }
 
   get id(): number | undefined {