feat: add support for Sequelize v7 (#124)

* Add support for Sequelize v7 * Add v7 support for properties --------- Co-authored-by: Sascha Depold <[email protected]>
SoftwareBrothers · Dec 4, 2023 · dcddbd6 · dcddbd6
1 parent 061c6f0
commit dcddbd6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/property.ts b/src/property.ts
@@ -73,6 +73,11 @@ class Property extends BaseProperty {
     if (this.sequelizePath.references === 'string') {
       return this.sequelizePath.references as string;
     } if (this.sequelizePath.references && typeof this.sequelizePath.references !== 'string') {
+      // Sequelize v7
+      if ((this.sequelizePath.references as any).table?.tableName) {
+        return (this.sequelizePath.references as any).table?.tableName as string;
+      }
+      // Sequelize v4+
       if (this.sequelizePath.references.model && typeof this.sequelizePath.references.model !== 'string') {
         return (this.sequelizePath.references?.model as any)?.tableName as string;
       }

diff --git a/src/resource.ts b/src/resource.ts
@@ -37,9 +37,11 @@ class Resource extends BaseResource {
 
   rawAttributes(): Record<string, ModelAttributeColumnOptions> {
     // different sequelize versions stores attributes in different places
+    // .modelDefinition.attributes => sequelize ^7.0.0
     // .rawAttributes => sequelize ^5.0.0
     // .attributes => sequelize ^4.0.0
     return ((this.SequelizeModel as any).attributes
+      || ((this.SequelizeModel as any).modelDefinition?.attributes && Object.fromEntries((this.SequelizeModel as any).modelDefinition?.attributes))
       || (this.SequelizeModel as any).rawAttributes) as Record<string, ModelAttributeColumnOptions>;
   }
 
@@ -54,11 +56,17 @@ class Resource extends BaseResource {
   }
 
   name(): string {
-    return this.SequelizeModel.tableName;
+    // different sequelize versions stores attributes in different places
+    // .modelDefinition.table => sequelize ^7.0.0
+    // .tableName => sequelize ^4.0.0
+    return (
+      (this.SequelizeModel as any).modelDefinition?.table?.tableName
+      || this.SequelizeModel.tableName
+    );
   }
 
   id(): string {
-    return this.SequelizeModel.tableName;
+    return this.name();
   }
 
   properties(): Array<BaseProperty> {