Merge pull request #191 from AthennaIO/develop

chore(npm): update dependencies
AthennaIO · Feb 9, 2025 · 9495c89 · 9495c89
2 parents 59d40f2 + acd46b9
commit 9495c89
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/database",
-  "version": "5.12.0",
+  "version": "5.13.0",
   "description": "The Athenna database handler for SQL/NoSQL.",
   "license": "MIT",
   "author": "João Lenon <[email protected]>",

diff --git a/src/models/BaseModel.ts b/src/models/BaseModel.ts
@@ -452,7 +452,7 @@ export class BaseModel {
           return
         }
 
-        json[key] = this[key].toJSON ? this[key].toJSON() : this[key]
+        json[key] = this[key]?.toJSON ? this[key].toJSON() : this[key]
 
         return
       }

diff --git a/src/models/annotations/BelongsTo.ts b/src/models/annotations/BelongsTo.ts
@@ -27,7 +27,7 @@ export function BelongsTo<T extends BaseModel = any, R extends BaseModel = any>(
 
     options = Options.create(options, {
       isIncluded: false,
-      // Default will be set later as: RelationModel.schema().getMainPrimaryKeyName()
+      // Default will be set later as: RelationModel.schema().getMainPrimaryKeyProperty()
       primaryKey: undefined,
       // Default will be set later as: `${String.toCamelCase(RelationModel.name)}Id`
       foreignKey: undefined

diff --git a/src/models/annotations/HasMany.ts b/src/models/annotations/HasMany.ts
@@ -27,7 +27,7 @@ export function HasMany<T extends BaseModel = any, R extends BaseModel = any>(
 
     options = Options.create(options, {
       isIncluded: false,
-      primaryKey: Target.schema().getMainPrimaryKeyName(),
+      primaryKey: Target.schema().getMainPrimaryKeyProperty(),
       foreignKey: `${String.toCamelCase(Target.name)}Id`
     })
 

diff --git a/src/models/annotations/HasOne.ts b/src/models/annotations/HasOne.ts
@@ -27,7 +27,7 @@ export function HasOne<T extends BaseModel = any, R extends BaseModel = any>(
 
     options = Options.create(options, {
       isIncluded: false,
-      primaryKey: Target.schema().getMainPrimaryKeyName() as any,
+      primaryKey: Target.schema().getMainPrimaryKeyProperty() as any,
       foreignKey: `${String.toCamelCase(Target.name)}Id` as any
     })
 

diff --git a/src/models/relations/BelongsTo/BelongsToRelation.ts b/src/models/relations/BelongsTo/BelongsToRelation.ts
@@ -19,7 +19,7 @@ export class BelongsToRelation {
     const RelationModel = relation.model()
 
     relation.primaryKey =
-      relation.primaryKey || RelationModel.schema().getMainPrimaryKeyName()
+      relation.primaryKey || RelationModel.schema().getMainPrimaryKeyProperty()
     relation.foreignKey =
       relation.foreignKey || `${String.toCamelCase(RelationModel.name)}Id`
 

diff --git a/src/models/relations/BelongsToMany/BelongsToManyRelation.ts b/src/models/relations/BelongsToMany/BelongsToManyRelation.ts
@@ -20,7 +20,8 @@ export class BelongsToManyRelation {
     const PivotModel = relation.pivotModel()
 
     relation.pivotTable = relation.pivotTable || PivotModel.table()
-    relation.relationPrimaryKey = RelationModel.schema().getMainPrimaryKeyName()
+    relation.relationPrimaryKey =
+      RelationModel.schema().getMainPrimaryKeyProperty()
     relation.relationForeignKey = `${String.toCamelCase(RelationModel.name)}Id`
 
     return relation
-Original file line number
+Diff line change
@@ Expand Up / @@ -452,7 +452,7 @@ export class BaseModel { @@
               return
             }
-            json[key] = this[key].toJSON ? this[key].toJSON() : this[key]
+            json[key] = this[key]?.toJSON ? this[key].toJSON() : this[key]
             return
           }
@@ Expand Down @@