fiberx-backend-toolkit 0.0.64 → 0.0.65

package/dist/code_templates/sequelize_code_template.js

@@ -24,7 +24,7 @@ const serializeSequelizeDataType = (type) => {
     }
     return "undefined";
 };
-const serializeSequelizeColumnDefinition = (column) => {
+const serializeSequelizeColumnDefinition = (column, indent = 4) => {
     const parts = [];
     for (const [key, value] of Object.entries(column)) {
         if (key === "type") {
@@ -44,8 +44,9 @@ const serializeSequelizeColumnDefinition = (column) => {
         }
     }
     return `{
-${indentBlock(parts.join(",\n"), 1)}
-}`;
+${indentBlock(parts.join(",\n"), indent)}
+${indentBlock("}", indent === 1 ? 0 : 3)}
+`;
 };
 const serializeIndexDefinition = (index) => {
     const clone = { ...index };
@@ -60,13 +61,14 @@ const serializeIndexDefinition = (index) => {
 const serializeSequelizeColumnsObject = (columns) => {
     const rendered = Object.entries(columns)
         .map(([col_name, col_def]) => {
-        const col_code = serializeSequelizeColumnDefinition(col_def);
+        const col_code = serializeSequelizeColumnDefinition(col_def, 1);
         return `"${col_name}": ${col_code}`;
     })
         .join(",\n");
     return `{
-${indentBlock(rendered, 1)}
-}`;
+${indentBlock(rendered, 4)}
+${indentBlock("}", 3)}
+`;
 };
 const serializeSequelizeIndexesArray = (indexes) => {
     return indexes.map(index => {
@@ -142,17 +144,16 @@ class Create${schema_model_name}TableMigration {
 
             await queryInterface.createTable(
                 table_name,
-                ${indentBlock(rendered_columns, 4)}
+            ${indentBlock(rendered_columns, 1)}
             );
 
-
             ${schema_definition.indexes?.map(index => `
             await queryInterface.addIndex(
                 table_name,
                 ${JSON.stringify(index.fields)},
                 {
                     name: "${index.name}",
-                ${indentBlock(serializeIndexDefinition(index), 2)}
+                ${indentBlock(serializeIndexDefinition(index), 1)}
                 }
             );
             `).join("")}
@@ -182,7 +183,7 @@ export default Create${schema_model_name}TableMigration;
 exports.SEQUELIZE_CREATE_NEW_SCHEMA_MIGRATION_FILE_CODE_TEMPLATE = SEQUELIZE_CREATE_NEW_SCHEMA_MIGRATION_FILE_CODE_TEMPLATE;
 const SEQUELIZE_UPDATE_EXISTING_SCHEMA_MIGRATION_FILE_CODE_TEMPLATE = (table_name, model_name, diff, current_schema, previous_schema) => {
     return `
-import { QueryInterface, Sequelize } from "sequelize";
+import { QueryInterface, Sequelize, DataTypes } from "sequelize";
 import { LoggerUtil } from "fiberx-backend-toolkit/dist/utils/main";
 
 class Update${model_name}TableMigration {
@@ -208,7 +209,7 @@ class Update${model_name}TableMigration {
             await queryInterface.addColumn(
                 table_name,
                 "${col}",
-                ${indentBlock(serializeSequelizeColumnDefinition(current_schema.columns[col]), 1)}
+            ${indentBlock(serializeSequelizeColumnDefinition(current_schema.columns[col]), 1)}
             );
             `).join("")}
 
@@ -217,7 +218,7 @@ class Update${model_name}TableMigration {
             await queryInterface.changeColumn(
                 table_name,
                 "${col}",
-                ${indentBlock(serializeSequelizeColumnDefinition(current_schema.columns[col]), 1)}
+            ${indentBlock(serializeSequelizeColumnDefinition(current_schema.columns[col]), 1)}
             );
             `).join("")}
 
@@ -239,7 +240,7 @@ class Update${model_name}TableMigration {
                 ${JSON.stringify(idx.fields)},
                 {
                     name: "${idx.name}",
-                ${indentBlock(serializeIndexDefinition(idx).replace(/^{|}$/g, ""), 2)}
+                ${indentBlock(serializeIndexDefinition(idx).replace(/^{|}$/g, ""), 1)}
                 }
             );
                 ` : "";
@@ -257,7 +258,7 @@ class Update${model_name}TableMigration {
                 ${JSON.stringify(idx.fields)},
                 {
                     name: "${idx.name}",
-                ${indentBlock(serializeIndexDefinition(idx).replace(/^{|}$/g, ""), 2)}
+                ${indentBlock(serializeIndexDefinition(idx).replace(/^{|}$/g, ""), 1)}
                 }
             );
                 ` : "";
@@ -296,7 +297,7 @@ class Update${model_name}TableMigration {
                 ${JSON.stringify(idx.fields)},
                 {
                     name: "${idx.name}",
-                ${indentBlock(serializeIndexDefinition(idx).replace(/^{|}$/g, ""), 2)}
+                ${indentBlock(serializeIndexDefinition(idx).replace(/^{|}$/g, ""), 1)}
                 }
             );
                 ` : "";
@@ -311,7 +312,7 @@ class Update${model_name}TableMigration {
                 ${JSON.stringify(idx.fields)},
                 {
                     name: "${idx.name}",
-                ${indentBlock(serializeIndexDefinition(idx).replace(/^{|}$/g, ""), 2)}
+                ${indentBlock(serializeIndexDefinition(idx).replace(/^{|}$/g, ""), 1)}
                 }
             );
                 ` : "";

package/dist/database/schema/schema_diff_util.js

@@ -45,20 +45,20 @@ class SchemaDiffUtil {
         // Indexes
         const prev_indexes = prev?.indexes || [];
         const curr_indexes = curr?.indexes || [];
-        const prev_map = new Map(prev_indexes.map(i => [i.name, i]));
-        const curr_map = new Map(curr_indexes.map(i => [i.name, i]));
-        for (const [name, curr_idx] of curr_map) {
-            const prev_idx = prev_map.get(name);
+        const prev_map = new Map(prev_indexes.map(i => [SchemaDiffUtil.indexKey(i), i]));
+        const curr_map = new Map(curr_indexes.map(i => [SchemaDiffUtil.indexKey(i), i]));
+        for (const [key, curr_idx] of curr_map) {
+            const prev_idx = prev_map.get(key);
             if (!prev_idx) {
-                diff.indexes.added.push(name);
+                diff.indexes.added.push(curr_idx.name);
             }
             else if (!input_validator_util_1.default.isDeepEqual(prev_idx, curr_idx)) {
-                diff.indexes.modified.push(name);
+                diff.indexes.modified.push(curr_idx.name);
             }
         }
-        for (const [name] of prev_map) {
-            if (!curr_map.has(name)) {
-                diff.indexes.removed.push(name);
+        for (const [key, prev_idx] of prev_map) {
+            if (!curr_map.has(key)) {
+                diff.indexes.removed.push(prev_idx.name);
             }
         }
         return diff;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fiberx-backend-toolkit",
-    "version": "0.0.64",
+    "version": "0.0.65",
     "description": "A TypeScript backend toolkit providing shared domain logic, infrastructure helpers, and utilities for FiberX server-side applications and services.",
     "type": "commonjs",
     "main": "./dist/index.js",