chore: wip

Author: glennmichael123

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

@@ -6,20 +6,23 @@ import type {
 import { camelCase, pascalCase, plural, singular, snakeCase } from '@stacksjs/strings'
 import { fetchOtherModelRelations, getFillableAttributes, getGuardedAttributes, getHiddenAttributes, getRelationCount, getRelations, getRelationType, mapEntity } from './utils'
 
-function generateCustomAccessors(model: Model): { output: string, getterString: string } {
+function generateCustomAccessors(model: Model): { output: string, loopString: string } {
   let output = ''
-  let getterString = ''
+  let loopString = ''
 
   if (model.get) {
     for (const [methodName, getter] of Object.entries(model.get)) {
       const getterStr = getter.toString()
       output += `${methodName}: ${getterStr}, \n`
-
-      getterString += `${methodName}: customGetter.${methodName}(), \n`
     }
+
+    loopString += `
+      for (const [key, fn] of Object.entries(customGetter)) {
+        model[key] = fn()
+      }`
   }
 
-  return { output, getterString }
+  return { output, loopString }
 }
 
 function removeAttrString(getterFn: string): string {
@@ -900,14 +903,12 @@ export async function generateModelString(
           this.hasSaved = false
         }
 
-        mapCustomGetters(model: ${modelName}JsonResponse): ${modelName}JsonResponse {
+        mapCustomGetters(model: ${modelName}JsonResponse): void {
           const customGetter = {
             ${removeAttrString(getterOutput.output)}
           }
 
-          for (const [key, fn] of Object.entries(customGetter)) {
-            model[key] = fn()
-          }
+          ${getterOutput.loopString}
         }
 
         ${getFields}

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

@@ -86,14 +86,10 @@ export class AccessTokenModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: AccessTokenJsonResponse): AccessTokenJsonResponse {
+  mapCustomGetters(model: AccessTokenJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get team_id(): number | undefined {

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

@@ -85,14 +85,10 @@ export class ActivityModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: ActivityJsonResponse): ActivityJsonResponse {
+  mapCustomGetters(model: ActivityJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get id(): number | undefined {

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

@@ -91,14 +91,10 @@ export class DeploymentModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: DeploymentJsonResponse): DeploymentJsonResponse {
+  mapCustomGetters(model: DeploymentJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get user_id(): number | undefined {

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

@@ -82,14 +82,10 @@ export class ErrorModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: ErrorJsonResponse): ErrorJsonResponse {
+  mapCustomGetters(model: ErrorJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get id(): number | undefined {

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

@@ -82,14 +82,10 @@ export class FailedJobModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: FailedJobJsonResponse): FailedJobJsonResponse {
+  mapCustomGetters(model: FailedJobJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get id(): number | undefined {

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

@@ -82,14 +82,10 @@ export class JobModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: JobJsonResponse): JobJsonResponse {
+  mapCustomGetters(model: JobJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get id(): number | undefined {

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

@@ -94,14 +94,10 @@ export class PaymentMethodModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: PaymentMethodJsonResponse): PaymentMethodJsonResponse {
+  mapCustomGetters(model: PaymentMethodJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get user_id(): number | undefined {

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

@@ -84,14 +84,10 @@ export class PostModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: PostJsonResponse): PostJsonResponse {
+  mapCustomGetters(model: PostJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get user_id(): number | undefined {

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

@@ -86,14 +86,10 @@ export class ProductModel {
     this.hasSaved = false
   }
 
-  mapCustomGetters(model: ProductJsonResponse): ProductJsonResponse {
+  mapCustomGetters(model: ProductJsonResponse): void {
     const customGetter = {
 
     }
-
-    for (const [key, fn] of Object.entries(customGetter)) {
-      model[key] = fn()
-    }
   }
 
   get id(): number | undefined {