chore: wip

Author: glennmichael123

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

@@ -24,14 +24,18 @@ export class BaseOrm<T, C, J> {
     this.withRelations = []
   }
 
-  select(params: (keyof J)[] | RawBuilder<string> | string): this {
+  applySelect(params: (keyof J)[] | RawBuilder<string> | string): this {
     this.selectFromQuery = this.selectFromQuery.select(params)
 
     this.hasSelect = true
 
     return this
   }
 
+  select(params: (keyof J)[] | RawBuilder<string> | string): this {
+    return this.applySelect(params)
+  }
+
   // The protected helper method that does the actual work
   protected async applyFind(id: number): Promise<T | undefined> {
     const model = await DB.instance.selectFrom(this.tableName)

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

@@ -1067,24 +1067,11 @@ export async function generateModelString(
         wasChanged(column?: keyof ${modelName}JsonResponse): boolean {
           return this.hasSaved && this.isDirty(column)
         }
-  
-        select(params: (keyof ${modelName}JsonResponse)[] | RawBuilder<string> | string): ${modelName}Model {
-          this.selectFromQuery = this.selectFromQuery.select(params)
-
-          this.hasSelect = true
-
-          return this
-        }
 
         static select(params: (keyof ${modelName}JsonResponse)[] | RawBuilder<string> | string): ${modelName}Model {
           const instance = new ${modelName}Model(undefined)
   
-          // Initialize a query with the table name and selected fields
-          instance.selectFromQuery = instance.selectFromQuery.select(params)
-  
-          instance.hasSelect = true
-  
-          return instance
+          return instance.applySelect(params)
         }
         
         // Method to find a ${modelName} by ID

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

@@ -293,23 +293,10 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
     return this.hasSaved && this.isDirty(column)
   }
 
-  select(params: (keyof AccessTokenJsonResponse)[] | RawBuilder<string> | string): AccessTokenModel {
-    this.selectFromQuery = this.selectFromQuery.select(params)
-
-    this.hasSelect = true
-
-    return this
-  }
-
   static select(params: (keyof AccessTokenJsonResponse)[] | RawBuilder<string> | string): AccessTokenModel {
     const instance = new AccessTokenModel(undefined)
 
-    // Initialize a query with the table name and selected fields
-    instance.selectFromQuery = instance.selectFromQuery.select(params)
-
-    instance.hasSelect = true
-
-    return instance
+    return instance.applySelect(params)
   }
 
   // Method to find a AccessToken by ID

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

@@ -333,23 +333,10 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
     return this.hasSaved && this.isDirty(column)
   }
 
-  select(params: (keyof CouponJsonResponse)[] | RawBuilder<string> | string): CouponModel {
-    this.selectFromQuery = this.selectFromQuery.select(params)
-
-    this.hasSelect = true
-
-    return this
-  }
-
   static select(params: (keyof CouponJsonResponse)[] | RawBuilder<string> | string): CouponModel {
     const instance = new CouponModel(undefined)
 
-    // Initialize a query with the table name and selected fields
-    instance.selectFromQuery = instance.selectFromQuery.select(params)
-
-    instance.hasSelect = true
-
-    return instance
+    return instance.applySelect(params)
   }
 
   // Method to find a Coupon by ID

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

@@ -278,23 +278,10 @@ export class CustomerModel extends BaseOrm<CustomerModel, CustomersTable, Custom
     return this.hasSaved && this.isDirty(column)
   }
 
-  select(params: (keyof CustomerJsonResponse)[] | RawBuilder<string> | string): CustomerModel {
-    this.selectFromQuery = this.selectFromQuery.select(params)
-
-    this.hasSelect = true
-
-    return this
-  }
-
   static select(params: (keyof CustomerJsonResponse)[] | RawBuilder<string> | string): CustomerModel {
     const instance = new CustomerModel(undefined)
 
-    // Initialize a query with the table name and selected fields
-    instance.selectFromQuery = instance.selectFromQuery.select(params)
-
-    instance.hasSelect = true
-
-    return instance
+    return instance.applySelect(params)
   }
 
   // Method to find a Customer by ID

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

@@ -263,23 +263,10 @@ export class DeploymentModel extends BaseOrm<DeploymentModel, DeploymentsTable,
     return this.hasSaved && this.isDirty(column)
   }
 
-  select(params: (keyof DeploymentJsonResponse)[] | RawBuilder<string> | string): DeploymentModel {
-    this.selectFromQuery = this.selectFromQuery.select(params)
-
-    this.hasSelect = true
-
-    return this
-  }
-
   static select(params: (keyof DeploymentJsonResponse)[] | RawBuilder<string> | string): DeploymentModel {
     const instance = new DeploymentModel(undefined)
 
-    // Initialize a query with the table name and selected fields
-    instance.selectFromQuery = instance.selectFromQuery.select(params)
-
-    instance.hasSelect = true
-
-    return instance
+    return instance.applySelect(params)
   }
 
   // Method to find a Deployment by ID

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

@@ -223,23 +223,10 @@ export class ErrorModel extends BaseOrm<ErrorModel, ErrorsTable, ErrorJsonRespon
     return this.hasSaved && this.isDirty(column)
   }
 
-  select(params: (keyof ErrorJsonResponse)[] | RawBuilder<string> | string): ErrorModel {
-    this.selectFromQuery = this.selectFromQuery.select(params)
-
-    this.hasSelect = true
-
-    return this
-  }
-
   static select(params: (keyof ErrorJsonResponse)[] | RawBuilder<string> | string): ErrorModel {
     const instance = new ErrorModel(undefined)
 
-    // Initialize a query with the table name and selected fields
-    instance.selectFromQuery = instance.selectFromQuery.select(params)
-
-    instance.hasSelect = true
-
-    return instance
+    return instance.applySelect(params)
   }
 
   // Method to find a Error by ID

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

@@ -223,23 +223,10 @@ export class FailedJobModel extends BaseOrm<FailedJobModel, FailedJobsTable, Fai
     return this.hasSaved && this.isDirty(column)
   }
 
-  select(params: (keyof FailedJobJsonResponse)[] | RawBuilder<string> | string): FailedJobModel {
-    this.selectFromQuery = this.selectFromQuery.select(params)
-
-    this.hasSelect = true
-
-    return this
-  }
-
   static select(params: (keyof FailedJobJsonResponse)[] | RawBuilder<string> | string): FailedJobModel {
     const instance = new FailedJobModel(undefined)
 
-    // Initialize a query with the table name and selected fields
-    instance.selectFromQuery = instance.selectFromQuery.select(params)
-
-    instance.hasSelect = true
-
-    return instance
+    return instance.applySelect(params)
   }
 
   // Method to find a FailedJob by ID

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

@@ -342,23 +342,10 @@ export class GiftCardModel extends BaseOrm<GiftCardModel, GiftCardsTable, GiftCa
     return this.hasSaved && this.isDirty(column)
   }
 
-  select(params: (keyof GiftCardJsonResponse)[] | RawBuilder<string> | string): GiftCardModel {
-    this.selectFromQuery = this.selectFromQuery.select(params)
-
-    this.hasSelect = true
-
-    return this
-  }
-
   static select(params: (keyof GiftCardJsonResponse)[] | RawBuilder<string> | string): GiftCardModel {
     const instance = new GiftCardModel(undefined)
 
-    // Initialize a query with the table name and selected fields
-    instance.selectFromQuery = instance.selectFromQuery.select(params)
-
-    instance.hasSelect = true
-
-    return instance
+    return instance.applySelect(params)
   }
 
   // Method to find a GiftCard by ID

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

@@ -223,23 +223,10 @@ export class JobModel extends BaseOrm<JobModel, JobsTable, JobJsonResponse> {
     return this.hasSaved && this.isDirty(column)
   }
 
-  select(params: (keyof JobJsonResponse)[] | RawBuilder<string> | string): JobModel {
-    this.selectFromQuery = this.selectFromQuery.select(params)
-
-    this.hasSelect = true
-
-    return this
-  }
-
   static select(params: (keyof JobJsonResponse)[] | RawBuilder<string> | string): JobModel {
     const instance = new JobModel(undefined)
 
-    // Initialize a query with the table name and selected fields
-    instance.selectFromQuery = instance.selectFromQuery.select(params)
-
-    instance.hasSelect = true
-
-    return instance
+    return instance.applySelect(params)
   }
 
   // Method to find a Job by ID