chore: wip

Author: glennmichael123

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

@@ -1006,17 +1006,18 @@ export async function generateModelString(
   let uuidQueryMany = ''
   let whereStatements = ''
   let whereFunctionStatements = ''
-  let relationMethods = ``
-  let relationImports = ``
-  let paymentImports = ``
+  let relationMethods = ''
+  let relationImports = ''
+  let paymentImports = ''
   let twoFactorStatements = ''
   let billableStatements = ''
   let displayableStatements = ''
-  let mittCreateStatement = ``
-  let mittUpdateStatement = ``
-  let mittDeleteStatement = ``
-  let mittDeleteStaticFindStatement = ``
-  let mittDeleteFindStatement = ``
+  let removeInstanceStatment = ''
+  let mittCreateStatement = ''
+  let mittUpdateStatement = ''
+  let mittDeleteStatement = ''
+  let mittDeleteStaticFindStatement = ''
+  let mittDeleteFindStatement = ''
 
   const relations = await getRelations(model, modelName)
 
@@ -1077,6 +1078,7 @@ export async function generateModelString(
 
   if (typeof observer === 'boolean') {
     if (observer) {
+      removeInstanceStatment += `const instance = new ${modelName}Model(null)`
       mittCreateStatement += `if (model)\n dispatch('${formattedModelName}:created', model)`
       mittUpdateStatement += `if (model)\n dispatch('${formattedModelName}:updated', model)`
       mittDeleteStatement += `if (model)\n dispatch('${formattedModelName}:deleted', model)`
@@ -1087,6 +1089,7 @@ export async function generateModelString(
   }
 
   if (Array.isArray(observer)) {
+    removeInstanceStatment += `const instance = new ${modelName}Model(null)`
     // Iterate through the array and append statements based on its contents
     if (observer.includes('create')) {
       mittCreateStatement += `if (model)\n dispatch('${formattedModelName}:created', model);`
@@ -1960,8 +1963,8 @@ export async function generateModelString(
 
       // Method to remove a ${modelName}
       static async remove(id: number): Promise<any> {
-       const instance = new ${modelName}Model(null)
-       
+        ${removeInstanceStatment}
+
         ${mittDeleteStaticFindStatement}
 
         ${instanceSoftDeleteStatementsUpdateFrom}
@@ -2168,6 +2171,14 @@ export async function generateModelString(
         return this
       }
 
+      static with(relations: string[]): ${modelName}Model {
+       const instance = new ${modelName}Model(null)
+
+        instance.withRelations = relations
+        
+        return instance
+      }
+
       async last(): Promise<${modelName}Type | undefined> {
         return await db.selectFrom('${tableName}')
           .selectAll()

storage/framework/core/payments/src/billable/transaction.ts

@@ -4,7 +4,7 @@ import { Transaction, type TransactionModel } from '../../../../orm/src/models/T
 
 export interface ManageTransaction {
   store: (user: UserModel, productId: number) => Promise<TransactionModel>
-  list: (user: UserModel) => Promise<TransactionModel[]> 
+  list: (user: UserModel) => Promise<TransactionModel[]>
 }
 
 export const manageTransaction: ManageTransaction = (() => {

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

@@ -273,8 +273,6 @@ export class AccessTokenModel {
 
   // Method to remove a AccessToken
   static async remove(id: number): Promise<any> {
-    const instance = new AccessTokenModel(null)
-
     return await db.deleteFrom('personal_access_tokens')
       .where('id', '=', id)
       .execute()
@@ -502,6 +500,14 @@ export class AccessTokenModel {
     return this
   }
 
+  static with(relations: string[]): AccessTokenModel {
+    const instance = new AccessTokenModel(null)
+
+    instance.withRelations = relations
+
+    return instance
+  }
+
   async last(): Promise<AccessTokenType | undefined> {
     return await db.selectFrom('personal_access_tokens')
       .selectAll()

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

@@ -317,8 +317,6 @@ export class DeploymentModel {
 
   // Method to remove a Deployment
   static async remove(id: number): Promise<any> {
-    const instance = new DeploymentModel(null)
-
     return await db.deleteFrom('deployments')
       .where('id', '=', id)
       .execute()
@@ -576,6 +574,14 @@ export class DeploymentModel {
     return this
   }
 
+  static with(relations: string[]): DeploymentModel {
+    const instance = new DeploymentModel(null)
+
+    instance.withRelations = relations
+
+    return instance
+  }
+
   async last(): Promise<DeploymentType | undefined> {
     return await db.selectFrom('deployments')
       .selectAll()

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

@@ -277,8 +277,6 @@ export class ErrorModel {
 
   // Method to remove a Error
   static async remove(id: number): Promise<any> {
-    const instance = new ErrorModel(null)
-
     return await db.deleteFrom('errors')
       .where('id', '=', id)
       .execute()
@@ -522,6 +520,14 @@ export class ErrorModel {
     return this
   }
 
+  static with(relations: string[]): ErrorModel {
+    const instance = new ErrorModel(null)
+
+    instance.withRelations = relations
+
+    return instance
+  }
+
   async last(): Promise<ErrorType | undefined> {
     return await db.selectFrom('errors')
       .selectAll()

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

@@ -333,8 +333,6 @@ export class PaymentMethodModel {
 
   // Method to remove a PaymentMethod
   static async remove(id: number): Promise<any> {
-    const instance = new PaymentMethodModel(null)
-
     return await db.deleteFrom('payment_methods')
       .where('id', '=', id)
       .execute()
@@ -596,6 +594,14 @@ export class PaymentMethodModel {
     return this
   }
 
+  static with(relations: string[]): PaymentMethodModel {
+    const instance = new PaymentMethodModel(null)
+
+    instance.withRelations = relations
+
+    return instance
+  }
+
   async last(): Promise<PaymentMethodType | undefined> {
     return await db.selectFrom('payment_methods')
       .selectAll()

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

@@ -292,8 +292,6 @@ export class PostModel {
 
   // Method to remove a Post
   static async remove(id: number): Promise<any> {
-    const instance = new PostModel(null)
-
     return await db.deleteFrom('posts')
       .where('id', '=', id)
       .execute()
@@ -511,6 +509,14 @@ export class PostModel {
     return this
   }
 
+  static with(relations: string[]): PostModel {
+    const instance = new PostModel(null)
+
+    instance.withRelations = relations
+
+    return instance
+  }
+
   async last(): Promise<PostType | undefined> {
     return await db.selectFrom('posts')
       .selectAll()

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

@@ -290,8 +290,6 @@ export class ProductModel {
 
   // Method to remove a Product
   static async remove(id: number): Promise<any> {
-    const instance = new ProductModel(null)
-
     return await db.deleteFrom('products')
       .where('id', '=', id)
       .execute()
@@ -543,6 +541,14 @@ export class ProductModel {
     return this
   }
 
+  static with(relations: string[]): ProductModel {
+    const instance = new ProductModel(null)
+
+    instance.withRelations = relations
+
+    return instance
+  }
+
   async last(): Promise<ProductType | undefined> {
     return await db.selectFrom('products')
       .selectAll()

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

@@ -271,8 +271,6 @@ export class ProjectModel {
 
   // Method to remove a Project
   static async remove(id: number): Promise<any> {
-    const instance = new ProjectModel(null)
-
     return await db.deleteFrom('projects')
       .where('id', '=', id)
       .execute()
@@ -500,6 +498,14 @@ export class ProjectModel {
     return this
   }
 
+  static with(relations: string[]): ProjectModel {
+    const instance = new ProjectModel(null)
+
+    instance.withRelations = relations
+
+    return instance
+  }
+
   async last(): Promise<ProjectType | undefined> {
     return await db.selectFrom('projects')
       .selectAll()

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

@@ -262,8 +262,6 @@ export class ReleaseModel {
 
   // Method to remove a Release
   static async remove(id: number): Promise<any> {
-    const instance = new ReleaseModel(null)
-
     return await db.deleteFrom('releases')
       .where('id', '=', id)
       .execute()
@@ -467,6 +465,14 @@ export class ReleaseModel {
     return this
   }
 
+  static with(relations: string[]): ReleaseModel {
+    const instance = new ReleaseModel(null)
+
+    instance.withRelations = relations
+
+    return instance
+  }
+
   async last(): Promise<ReleaseType | undefined> {
     return await db.selectFrom('releases')
       .selectAll()