chore: wip

glennmichael123 · glennmichael123 · commit 318536d1193c · 2025-02-11T22:55:09.000+09:00
diff --git a/app/Models/User.ts b/app/Models/User.ts
@@ -1,4 +1,4 @@
-import type { Attributes, Model } from '@stacksjs/types'
+import type { AttributesKey, Model } from '@stacksjs/types'
 // soon, these will be auto-imported
 import { faker } from '@stacksjs/faker'
 import { schema } from '@stacksjs/validation'
@@ -107,18 +107,13 @@ export default {
     },
   },
   get: {
-    firstName: (attributes: Attributes) => {
-      const nameParts = attributes.name.split(' ')
-
-      return nameParts[0]
-    },
-    salutationName: (attributes: Attributes) => {
+    salutationName: (attributes: AttributesKey) => {
       return `Mr. ${attributes.name}`
     },
   },
 
   set: {
-    password: (password: string) => Bun.password.hash(password),
+    password: (attributes: AttributesKey) => Bun.password.hash(attributes.password),
   },
   dashboard: {
     highlight: true,
diff --git a/storage/framework/core/orm/src/generate.ts b/storage/framework/core/orm/src/generate.ts
@@ -6,6 +6,10 @@ import type {
 import { camelCase, pascalCase, plural, singular, snakeCase } from '@stacksjs/strings'
 import { fetchOtherModelRelations, getFillableAttributes, getGuardedAttributes, getHiddenAttributes, getRelationCount, getRelations, getRelationType, mapEntity } from './utils'
 
+// const userModel = (await import(path.userModelsPath('User.ts'))).default
+
+// generateCustomAccessors(userModel)
+
 function generateCustomAccessors(model: Model): { output: string, loopString: string } {
   let output = ''
   let loopString = ''
@@ -919,7 +923,7 @@ export async function generateModelString(
             })
           } else {
             const model = data
-          
+
             const customGetter = {
               ${getterOutput.output}
             }
@@ -1956,8 +1960,8 @@ export async function generateModelString(
             .executeTakeFirst()
   
           if (existing${modelName}) {
-            instance.mapCustomGetters(model)
-            await instance.loadRelations(model)
+            instance.mapCustomGetters(existing${modelName})
+            await instance.loadRelations(existing${modelName})
             
             return new ${modelName}Model(existing${modelName} as ${modelName}Type)
           }
diff --git a/storage/framework/orm/src/models/AccessToken.ts b/storage/framework/orm/src/models/AccessToken.ts
@@ -1205,8 +1205,8 @@ export class AccessTokenModel {
       .executeTakeFirst()
 
     if (existingAccessToken) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingAccessToken)
+      await instance.loadRelations(existingAccessToken)
 
       return new AccessTokenModel(existingAccessToken as AccessTokenType)
     }
diff --git a/storage/framework/orm/src/models/Activity.ts b/storage/framework/orm/src/models/Activity.ts
@@ -1255,8 +1255,8 @@ export class ActivityModel {
       .executeTakeFirst()
 
     if (existingActivity) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingActivity)
+      await instance.loadRelations(existingActivity)
 
       return new ActivityModel(existingActivity as ActivityType)
     }
diff --git a/storage/framework/orm/src/models/Deployment.ts b/storage/framework/orm/src/models/Deployment.ts
@@ -1270,8 +1270,8 @@ export class DeploymentModel {
       .executeTakeFirst()
 
     if (existingDeployment) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingDeployment)
+      await instance.loadRelations(existingDeployment)
 
       return new DeploymentModel(existingDeployment as DeploymentType)
     }
diff --git a/storage/framework/orm/src/models/Error.ts b/storage/framework/orm/src/models/Error.ts
@@ -1209,8 +1209,8 @@ export class ErrorModel {
       .executeTakeFirst()
 
     if (existingError) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingError)
+      await instance.loadRelations(existingError)
 
       return new ErrorModel(existingError as ErrorType)
     }
diff --git a/storage/framework/orm/src/models/FailedJob.ts b/storage/framework/orm/src/models/FailedJob.ts
@@ -1209,8 +1209,8 @@ export class FailedJobModel {
       .executeTakeFirst()
 
     if (existingFailedJob) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingFailedJob)
+      await instance.loadRelations(existingFailedJob)
 
       return new FailedJobModel(existingFailedJob as FailedJobType)
     }
diff --git a/storage/framework/orm/src/models/Job.ts b/storage/framework/orm/src/models/Job.ts
@@ -1209,8 +1209,8 @@ export class JobModel {
       .executeTakeFirst()
 
     if (existingJob) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingJob)
+      await instance.loadRelations(existingJob)
 
       return new JobModel(existingJob as JobType)
     }
diff --git a/storage/framework/orm/src/models/PaymentMethod.ts b/storage/framework/orm/src/models/PaymentMethod.ts
@@ -1277,8 +1277,8 @@ export class PaymentMethodModel {
       .executeTakeFirst()
 
     if (existingPaymentMethod) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingPaymentMethod)
+      await instance.loadRelations(existingPaymentMethod)
 
       return new PaymentMethodModel(existingPaymentMethod as PaymentMethodType)
     }
diff --git a/storage/framework/orm/src/models/Post.ts b/storage/framework/orm/src/models/Post.ts
@@ -1171,8 +1171,8 @@ export class PostModel {
       .executeTakeFirst()
 
     if (existingPost) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingPost)
+      await instance.loadRelations(existingPost)
 
       return new PostModel(existingPost as PostType)
     }
diff --git a/storage/framework/orm/src/models/Product.ts b/storage/framework/orm/src/models/Product.ts
@@ -1257,8 +1257,8 @@ export class ProductModel {
       .executeTakeFirst()
 
     if (existingProduct) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingProduct)
+      await instance.loadRelations(existingProduct)
 
       return new ProductModel(existingProduct as ProductType)
     }
diff --git a/storage/framework/orm/src/models/Project.ts b/storage/framework/orm/src/models/Project.ts
@@ -1192,8 +1192,8 @@ export class ProjectModel {
       .executeTakeFirst()
 
     if (existingProject) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingProject)
+      await instance.loadRelations(existingProject)
 
       return new ProjectModel(existingProject as ProjectType)
     }
diff --git a/storage/framework/orm/src/models/Release.ts b/storage/framework/orm/src/models/Release.ts
@@ -1141,8 +1141,8 @@ export class ReleaseModel {
       .executeTakeFirst()
 
     if (existingRelease) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingRelease)
+      await instance.loadRelations(existingRelease)
 
       return new ReleaseModel(existingRelease as ReleaseType)
     }
diff --git a/storage/framework/orm/src/models/Subscriber.ts b/storage/framework/orm/src/models/Subscriber.ts
@@ -1141,8 +1141,8 @@ export class SubscriberModel {
       .executeTakeFirst()
 
     if (existingSubscriber) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingSubscriber)
+      await instance.loadRelations(existingSubscriber)
 
       return new SubscriberModel(existingSubscriber as SubscriberType)
     }
diff --git a/storage/framework/orm/src/models/SubscriberEmail.ts b/storage/framework/orm/src/models/SubscriberEmail.ts
@@ -1170,8 +1170,8 @@ export class SubscriberEmailModel {
       .executeTakeFirst()
 
     if (existingSubscriberEmail) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingSubscriberEmail)
+      await instance.loadRelations(existingSubscriberEmail)
 
       return new SubscriberEmailModel(existingSubscriberEmail as SubscriberEmailType)
     }
diff --git a/storage/framework/orm/src/models/Subscription.ts b/storage/framework/orm/src/models/Subscription.ts
@@ -1321,8 +1321,8 @@ export class SubscriptionModel {
       .executeTakeFirst()
 
     if (existingSubscription) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingSubscription)
+      await instance.loadRelations(existingSubscription)
 
       return new SubscriptionModel(existingSubscription as SubscriptionType)
     }
diff --git a/storage/framework/orm/src/models/Team.ts b/storage/framework/orm/src/models/Team.ts
@@ -1268,8 +1268,8 @@ export class TeamModel {
       .executeTakeFirst()
 
     if (existingTeam) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingTeam)
+      await instance.loadRelations(existingTeam)
 
       return new TeamModel(existingTeam as TeamType)
     }
diff --git a/storage/framework/orm/src/models/Transaction.ts b/storage/framework/orm/src/models/Transaction.ts
@@ -1250,8 +1250,8 @@ export class TransactionModel {
       .executeTakeFirst()
 
     if (existingTransaction) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingTransaction)
+      await instance.loadRelations(existingTransaction)
 
       return new TransactionModel(existingTransaction as TransactionType)
     }
diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
@@ -111,9 +111,6 @@ export class UserModel {
     if (Array.isArray(data)) {
       data.map((model: UserJsonResponse) => {
         const customGetter = {
-          firstName: () => {
-            return model.name.split(' ')[0]
-          },
           salutationName: () => {
             return `Mr. ${model.name}`
           },
@@ -131,9 +128,6 @@ export class UserModel {
       const model = data
 
       const customGetter = {
-        firstName: () => {
-          return model.name.split(' ')[0]
-        },
         salutationName: () => {
           return `Mr. ${model.name}`
         },
@@ -1298,8 +1292,8 @@ export class UserModel {
       .executeTakeFirst()
 
     if (existingUser) {
-      instance.mapCustomGetters(model)
-      await instance.loadRelations(model)
+      instance.mapCustomGetters(existingUser)
+      await instance.loadRelations(existingUser)
 
       return new UserModel(existingUser as UserType)
     }

Original file line number	Diff line number	Diff line change
`@@ -1205,8 +1205,8 @@ export class AccessTokenModel {`
`1205`	`1205`	`.executeTakeFirst()`
`1206`	`1206`
`1207`	`1207`	`if (existingAccessToken) {`
`1208`		`- instance.mapCustomGetters(model)`
`1209`		`- await instance.loadRelations(model)`
	`1208`	`+ instance.mapCustomGetters(existingAccessToken)`
	`1209`	`+ await instance.loadRelations(existingAccessToken)`
`1210`	`1210`
`1211`	`1211`	`return new AccessTokenModel(existingAccessToken as AccessTokenType)`
`1212`	`1212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1255,8 +1255,8 @@ export class ActivityModel {`
`1255`	`1255`	`.executeTakeFirst()`
`1256`	`1256`
`1257`	`1257`	`if (existingActivity) {`
`1258`		`- instance.mapCustomGetters(model)`
`1259`		`- await instance.loadRelations(model)`
	`1258`	`+ instance.mapCustomGetters(existingActivity)`
	`1259`	`+ await instance.loadRelations(existingActivity)`
`1260`	`1260`
`1261`	`1261`	`return new ActivityModel(existingActivity as ActivityType)`
`1262`	`1262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1270,8 +1270,8 @@ export class DeploymentModel {`
`1270`	`1270`	`.executeTakeFirst()`
`1271`	`1271`
`1272`	`1272`	`if (existingDeployment) {`
`1273`		`- instance.mapCustomGetters(model)`
`1274`		`- await instance.loadRelations(model)`
	`1273`	`+ instance.mapCustomGetters(existingDeployment)`
	`1274`	`+ await instance.loadRelations(existingDeployment)`
`1275`	`1275`
`1276`	`1276`	`return new DeploymentModel(existingDeployment as DeploymentType)`
`1277`	`1277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1209,8 +1209,8 @@ export class ErrorModel {`
`1209`	`1209`	`.executeTakeFirst()`
`1210`	`1210`
`1211`	`1211`	`if (existingError) {`
`1212`		`- instance.mapCustomGetters(model)`
`1213`		`- await instance.loadRelations(model)`
	`1212`	`+ instance.mapCustomGetters(existingError)`
	`1213`	`+ await instance.loadRelations(existingError)`
`1214`	`1214`
`1215`	`1215`	`return new ErrorModel(existingError as ErrorType)`
`1216`	`1216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1209,8 +1209,8 @@ export class FailedJobModel {`
`1209`	`1209`	`.executeTakeFirst()`
`1210`	`1210`
`1211`	`1211`	`if (existingFailedJob) {`
`1212`		`- instance.mapCustomGetters(model)`
`1213`		`- await instance.loadRelations(model)`
	`1212`	`+ instance.mapCustomGetters(existingFailedJob)`
	`1213`	`+ await instance.loadRelations(existingFailedJob)`
`1214`	`1214`
`1215`	`1215`	`return new FailedJobModel(existingFailedJob as FailedJobType)`
`1216`	`1216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1209,8 +1209,8 @@ export class JobModel {`
`1209`	`1209`	`.executeTakeFirst()`
`1210`	`1210`
`1211`	`1211`	`if (existingJob) {`
`1212`		`- instance.mapCustomGetters(model)`
`1213`		`- await instance.loadRelations(model)`
	`1212`	`+ instance.mapCustomGetters(existingJob)`
	`1213`	`+ await instance.loadRelations(existingJob)`
`1214`	`1214`
`1215`	`1215`	`return new JobModel(existingJob as JobType)`
`1216`	`1216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1277,8 +1277,8 @@ export class PaymentMethodModel {`
`1277`	`1277`	`.executeTakeFirst()`
`1278`	`1278`
`1279`	`1279`	`if (existingPaymentMethod) {`
`1280`		`- instance.mapCustomGetters(model)`
`1281`		`- await instance.loadRelations(model)`
	`1280`	`+ instance.mapCustomGetters(existingPaymentMethod)`
	`1281`	`+ await instance.loadRelations(existingPaymentMethod)`
`1282`	`1282`
`1283`	`1283`	`return new PaymentMethodModel(existingPaymentMethod as PaymentMethodType)`
`1284`	`1284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1171,8 +1171,8 @@ export class PostModel {`
`1171`	`1171`	`.executeTakeFirst()`
`1172`	`1172`
`1173`	`1173`	`if (existingPost) {`
`1174`		`- instance.mapCustomGetters(model)`
`1175`		`- await instance.loadRelations(model)`
	`1174`	`+ instance.mapCustomGetters(existingPost)`
	`1175`	`+ await instance.loadRelations(existingPost)`
`1176`	`1176`
`1177`	`1177`	`return new PostModel(existingPost as PostType)`
`1178`	`1178`	`}`