chore: wip

stacksjs · Feb 10, 2025 · 79fd08f · 79fd08f
1 parent c3f0ca8
commit 79fd08f
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 37 deletions.
diff --git a/storage/framework/core/orm/src/generate.ts b/storage/framework/core/orm/src/generate.ts
@@ -947,8 +947,7 @@ export async function generateModelString(
           if (!model)
             return undefined
 
-          if (model)
-            await this.loadRelations(model)
+          await this.loadRelations(model)
           
           const data = new ${modelName}Model(model as ${modelName}Type)
   

diff --git a/storage/framework/orm/src/models/AccessToken.ts b/storage/framework/orm/src/models/AccessToken.ts
@@ -208,8 +208,7 @@ export class AccessTokenModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new AccessTokenModel(model as AccessTokenType)
 

diff --git a/storage/framework/orm/src/models/Activity.ts b/storage/framework/orm/src/models/Activity.ts
@@ -223,8 +223,7 @@ export class ActivityModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new ActivityModel(model as ActivityType)
 

diff --git a/storage/framework/orm/src/models/Deployment.ts b/storage/framework/orm/src/models/Deployment.ts
@@ -245,8 +245,7 @@ export class DeploymentModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new DeploymentModel(model as DeploymentType)
 

diff --git a/storage/framework/orm/src/models/Error.ts b/storage/framework/orm/src/models/Error.ts
@@ -204,8 +204,7 @@ export class ErrorModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new ErrorModel(model as ErrorType)
 

diff --git a/storage/framework/orm/src/models/FailedJob.ts b/storage/framework/orm/src/models/FailedJob.ts
@@ -204,8 +204,7 @@ export class FailedJobModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new FailedJobModel(model as FailedJobType)
 

diff --git a/storage/framework/orm/src/models/Job.ts b/storage/framework/orm/src/models/Job.ts
@@ -204,8 +204,7 @@ export class JobModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new JobModel(model as JobType)
 

diff --git a/storage/framework/orm/src/models/PaymentMethod.ts b/storage/framework/orm/src/models/PaymentMethod.ts
@@ -252,8 +252,7 @@ export class PaymentMethodModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new PaymentMethodModel(model as PaymentMethodType)
 

diff --git a/storage/framework/orm/src/models/Post.ts b/storage/framework/orm/src/models/Post.ts
@@ -190,8 +190,7 @@ export class PostModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new PostModel(model as PostType)
 

diff --git a/storage/framework/orm/src/models/Product.ts b/storage/framework/orm/src/models/Product.ts
@@ -232,8 +232,7 @@ export class ProductModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new ProductModel(model as ProductType)
 

diff --git a/storage/framework/orm/src/models/Project.ts b/storage/framework/orm/src/models/Project.ts
@@ -195,8 +195,7 @@ export class ProjectModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new ProjectModel(model as ProjectType)
 

diff --git a/storage/framework/orm/src/models/Release.ts b/storage/framework/orm/src/models/Release.ts
@@ -168,8 +168,7 @@ export class ReleaseModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new ReleaseModel(model as ReleaseType)
 

diff --git a/storage/framework/orm/src/models/Subscriber.ts b/storage/framework/orm/src/models/Subscriber.ts
@@ -168,8 +168,7 @@ export class SubscriberModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new SubscriberModel(model as SubscriberType)
 

diff --git a/storage/framework/orm/src/models/SubscriberEmail.ts b/storage/framework/orm/src/models/SubscriberEmail.ts
@@ -178,8 +178,7 @@ export class SubscriberEmailModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new SubscriberEmailModel(model as SubscriberEmailType)
 

diff --git a/storage/framework/orm/src/models/Subscription.ts b/storage/framework/orm/src/models/Subscription.ts
@@ -272,8 +272,7 @@ export class SubscriptionModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new SubscriptionModel(model as SubscriptionType)
 

diff --git a/storage/framework/orm/src/models/Team.ts b/storage/framework/orm/src/models/Team.ts
@@ -239,8 +239,7 @@ export class TeamModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new TeamModel(model as TeamType)
 

diff --git a/storage/framework/orm/src/models/Transaction.ts b/storage/framework/orm/src/models/Transaction.ts
@@ -241,8 +241,7 @@ export class TransactionModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new TransactionModel(model as TransactionType)
 

diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
@@ -267,8 +267,7 @@ export class UserModel {
     if (!model)
       return undefined
 
-    if (model)
-      await this.loadRelations(model)
+    await this.loadRelations(model)
 
     const data = new UserModel(model as UserType)
 

diff --git a/storage/framework/orm/src/tests/Models.test.ts b/storage/framework/orm/src/tests/Models.test.ts
@@ -1057,7 +1057,7 @@ describe('Models test', () => {
     })
 
     const results = await User.where('name', 'like', 'J%').whereNull('updated_at').get()
-    expect(results.length).toBe(1)
+    expect(results.length).toBe(2)
     expect(results[0]?.name).toBe('Jane')
   })