chore: wip

Author: glennmichael123

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

@@ -100,9 +100,6 @@ export class BaseOrm<T, C, J> {
     query = query.selectAll()
 
     // TODO: Properly implement soft deletes
-    // if (this.childClass.hasSelect) {
-    //   query = query.where('deleted_at', 'is', null)
-    // }
 
     const models = await query.execute()
 

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

@@ -120,10 +120,8 @@ export async function generateModelString(
 
   const relations = await getRelations(model, modelName)
 
-  for (const relationInstance of relations) {
-    relationImports += `import ${relationInstance.model} from './${relationInstance.model}'\n\n`
+  for (const relationInstance of relations)
     relationImports += `import type {${relationInstance.model}Model} from './${relationInstance.model}'\n\n`
-  }
 
   const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable ?? true
   const useSoftDeletes = model?.traits?.useSoftDeletes ?? model?.traits?.softDeletable ?? false
@@ -905,10 +903,9 @@ export async function generateModelString(
   return `import type { Generated, Insertable, RawBuilder, Selectable, Updateable, Sql} from '@stacksjs/database'
       import { manageCharge, manageCheckout, manageCustomer, manageInvoice, managePaymentMethod, manageSubscription, manageTransaction, managePrice, manageSetupIntent, type Stripe } from '@stacksjs/payments'
       import { sql } from '@stacksjs/database'
-      import { DB, BaseOrm, SubqueryBuilder } from '@stacksjs/orm'
-      import type { Operator } from '@stacksjs/orm'
+      import { DB, BaseOrm } from '@stacksjs/orm'
       import type { CheckoutLineItem, CheckoutOptions, StripeCustomerOptions } from '@stacksjs/types'
-      import { HttpError, ModelNotFoundException } from '@stacksjs/error-handling'
+      import { HttpError } from '@stacksjs/error-handling'
       import { dispatch } from '@stacksjs/events'
       import { generateTwoFactorSecret } from '@stacksjs/auth'
       import { verifyTwoFactorCode } from '@stacksjs/auth'
@@ -1116,7 +1113,7 @@ export async function generateModelString(
           return data
         }
   
-        static async findOrFail(id: number): Promise<${modelName}Model> {
+        static async findOrFail(id: number): Promise<${modelName}Model | undefined> {
           const instance = new ${modelName}Model(undefined)
           
           return await instance.applyFindOrFail(id)
@@ -1130,12 +1127,6 @@ export async function generateModelString(
           return models.map((modelItem: UserJsonResponse) => instance.parseResult(new ${modelName}Model(modelItem)))
         }
 
-        async findMany(ids: number[]): Promise<${modelName}Model[]> {
-          const models = await this.applyFindMany(ids)
-
-          return models.map((modelItem: UserJsonResponse) => this.parseResult(new ${modelName}Model(modelItem)))
-        }
-
         static skip(count: number): ${modelName}Model {
           const instance = new ${modelName}Model(undefined)
 

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

@@ -6,10 +6,6 @@ import { HttpError } from '@stacksjs/error-handling'
 
 import { BaseOrm, DB } from '@stacksjs/orm'
 
-import Team from './Team'
-
-import User from './User'
-
 export interface PersonalAccessTokensTable {
   id: Generated<number>
   team_id: number
@@ -332,7 +328,7 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
     return data
   }
 
-  static async findOrFail(id: number): Promise<AccessTokenModel> {
+  static async findOrFail(id: number): Promise<AccessTokenModel | undefined> {
     const instance = new AccessTokenModel(undefined)
 
     return await instance.applyFindOrFail(id)
@@ -346,12 +342,6 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
     return models.map((modelItem: UserJsonResponse) => instance.parseResult(new AccessTokenModel(modelItem)))
   }
 
-  async findMany(ids: number[]): Promise<AccessTokenModel[]> {
-    const models = await this.applyFindMany(ids)
-
-    return models.map((modelItem: UserJsonResponse) => this.parseResult(new AccessTokenModel(modelItem)))
-  }
-
   static skip(count: number): AccessTokenModel {
     const instance = new AccessTokenModel(undefined)
 

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

@@ -8,8 +8,6 @@ import { dispatch } from '@stacksjs/events'
 
 import { BaseOrm, DB } from '@stacksjs/orm'
 
-import Product from './Product'
-
 export interface CouponsTable {
   id: Generated<number>
   product_id: number
@@ -372,7 +370,7 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
     return data
   }
 
-  static async findOrFail(id: number): Promise<CouponModel> {
+  static async findOrFail(id: number): Promise<CouponModel | undefined> {
     const instance = new CouponModel(undefined)
 
     return await instance.applyFindOrFail(id)
@@ -386,12 +384,6 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
     return models.map((modelItem: UserJsonResponse) => instance.parseResult(new CouponModel(modelItem)))
   }
 
-  async findMany(ids: number[]): Promise<CouponModel[]> {
-    const models = await this.applyFindMany(ids)
-
-    return models.map((modelItem: UserJsonResponse) => this.parseResult(new CouponModel(modelItem)))
-  }
-
   static skip(count: number): CouponModel {
     const instance = new CouponModel(undefined)
 

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

@@ -8,8 +8,6 @@ import { dispatch } from '@stacksjs/events'
 
 import { BaseOrm, DB } from '@stacksjs/orm'
 
-import User from './User'
-
 export interface CustomersTable {
   id: Generated<number>
   user_id: number
@@ -317,7 +315,7 @@ export class CustomerModel extends BaseOrm<CustomerModel, CustomersTable, Custom
     return data
   }
 
-  static async findOrFail(id: number): Promise<CustomerModel> {
+  static async findOrFail(id: number): Promise<CustomerModel | undefined> {
     const instance = new CustomerModel(undefined)
 
     return await instance.applyFindOrFail(id)
@@ -331,12 +329,6 @@ export class CustomerModel extends BaseOrm<CustomerModel, CustomersTable, Custom
     return models.map((modelItem: UserJsonResponse) => instance.parseResult(new CustomerModel(modelItem)))
   }
 
-  async findMany(ids: number[]): Promise<CustomerModel[]> {
-    const models = await this.applyFindMany(ids)
-
-    return models.map((modelItem: UserJsonResponse) => this.parseResult(new CustomerModel(modelItem)))
-  }
-
   static skip(count: number): CustomerModel {
     const instance = new CustomerModel(undefined)
 

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

@@ -5,8 +5,6 @@ import { sql } from '@stacksjs/database'
 import { HttpError } from '@stacksjs/error-handling'
 import { BaseOrm, DB } from '@stacksjs/orm'
 
-import User from './User'
-
 export interface DeploymentsTable {
   id: Generated<number>
   user_id: number
@@ -302,7 +300,7 @@ export class DeploymentModel extends BaseOrm<DeploymentModel, DeploymentsTable,
     return data
   }
 
-  static async findOrFail(id: number): Promise<DeploymentModel> {
+  static async findOrFail(id: number): Promise<DeploymentModel | undefined> {
     const instance = new DeploymentModel(undefined)
 
     return await instance.applyFindOrFail(id)
@@ -316,12 +314,6 @@ export class DeploymentModel extends BaseOrm<DeploymentModel, DeploymentsTable,
     return models.map((modelItem: UserJsonResponse) => instance.parseResult(new DeploymentModel(modelItem)))
   }
 
-  async findMany(ids: number[]): Promise<DeploymentModel[]> {
-    const models = await this.applyFindMany(ids)
-
-    return models.map((modelItem: UserJsonResponse) => this.parseResult(new DeploymentModel(modelItem)))
-  }
-
   static skip(count: number): DeploymentModel {
     const instance = new DeploymentModel(undefined)
 

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

@@ -261,7 +261,7 @@ export class ErrorModel extends BaseOrm<ErrorModel, ErrorsTable, ErrorJsonRespon
     return data
   }
 
-  static async findOrFail(id: number): Promise<ErrorModel> {
+  static async findOrFail(id: number): Promise<ErrorModel | undefined> {
     const instance = new ErrorModel(undefined)
 
     return await instance.applyFindOrFail(id)
@@ -275,12 +275,6 @@ export class ErrorModel extends BaseOrm<ErrorModel, ErrorsTable, ErrorJsonRespon
     return models.map((modelItem: UserJsonResponse) => instance.parseResult(new ErrorModel(modelItem)))
   }
 
-  async findMany(ids: number[]): Promise<ErrorModel[]> {
-    const models = await this.applyFindMany(ids)
-
-    return models.map((modelItem: UserJsonResponse) => this.parseResult(new ErrorModel(modelItem)))
-  }
-
   static skip(count: number): ErrorModel {
     const instance = new ErrorModel(undefined)
 

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

@@ -261,7 +261,7 @@ export class FailedJobModel extends BaseOrm<FailedJobModel, FailedJobsTable, Fai
     return data
   }
 
-  static async findOrFail(id: number): Promise<FailedJobModel> {
+  static async findOrFail(id: number): Promise<FailedJobModel | undefined> {
     const instance = new FailedJobModel(undefined)
 
     return await instance.applyFindOrFail(id)
@@ -275,12 +275,6 @@ export class FailedJobModel extends BaseOrm<FailedJobModel, FailedJobsTable, Fai
     return models.map((modelItem: UserJsonResponse) => instance.parseResult(new FailedJobModel(modelItem)))
   }
 
-  async findMany(ids: number[]): Promise<FailedJobModel[]> {
-    const models = await this.applyFindMany(ids)
-
-    return models.map((modelItem: UserJsonResponse) => this.parseResult(new FailedJobModel(modelItem)))
-  }
-
   static skip(count: number): FailedJobModel {
     const instance = new FailedJobModel(undefined)
 

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

@@ -8,8 +8,6 @@ import { dispatch } from '@stacksjs/events'
 
 import { BaseOrm, DB } from '@stacksjs/orm'
 
-import Customer from './Customer'
-
 export interface GiftCardsTable {
   id: Generated<number>
   customer_id: number
@@ -381,7 +379,7 @@ export class GiftCardModel extends BaseOrm<GiftCardModel, GiftCardsTable, GiftCa
     return data
   }
 
-  static async findOrFail(id: number): Promise<GiftCardModel> {
+  static async findOrFail(id: number): Promise<GiftCardModel | undefined> {
     const instance = new GiftCardModel(undefined)
 
     return await instance.applyFindOrFail(id)
@@ -395,12 +393,6 @@ export class GiftCardModel extends BaseOrm<GiftCardModel, GiftCardsTable, GiftCa
     return models.map((modelItem: UserJsonResponse) => instance.parseResult(new GiftCardModel(modelItem)))
   }
 
-  async findMany(ids: number[]): Promise<GiftCardModel[]> {
-    const models = await this.applyFindMany(ids)
-
-    return models.map((modelItem: UserJsonResponse) => this.parseResult(new GiftCardModel(modelItem)))
-  }
-
   static skip(count: number): GiftCardModel {
     const instance = new GiftCardModel(undefined)
 

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

@@ -261,7 +261,7 @@ export class JobModel extends BaseOrm<JobModel, JobsTable, JobJsonResponse> {
     return data
   }
 
-  static async findOrFail(id: number): Promise<JobModel> {
+  static async findOrFail(id: number): Promise<JobModel | undefined> {
     const instance = new JobModel(undefined)
 
     return await instance.applyFindOrFail(id)
@@ -275,12 +275,6 @@ export class JobModel extends BaseOrm<JobModel, JobsTable, JobJsonResponse> {
     return models.map((modelItem: UserJsonResponse) => instance.parseResult(new JobModel(modelItem)))
   }
 
-  async findMany(ids: number[]): Promise<JobModel[]> {
-    const models = await this.applyFindMany(ids)
-
-    return models.map((modelItem: UserJsonResponse) => this.parseResult(new JobModel(modelItem)))
-  }
-
   static skip(count: number): JobModel {
     const instance = new JobModel(undefined)