fiberx-backend-toolkit 0.0.62 → 0.0.63

package/dist/code_templates/sequelize_code_template.js

@@ -1,18 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SEQUELIZE_MODELS_INDEX_CODE_TEMPLATE = exports.SEQUELIZE_MODEL_CODE_TEMPLATE = exports.SEQUELIZE_UPDATE_EXISTING_SCHEMA_MIGRATION_FILE_CODE_TEMPLATE = exports.SEQUELIZE_CREATE_NEW_SCHEMA_MIGRATION_FILE_CODE_TEMPLATE = exports.SEQUELIZE_SEEDER_TEMPLATE = exports.SEQUELIZE_SCHEMA_CODE_TEMPLATE = void 0;
+const INDENT = " ".repeat(4);
+const indentBlock = (code, level) => {
+    const indentation = INDENT.repeat(level);
+    return code
+        .split("\n")
+        .map(line => line.trim().length ? indentation + line : line)
+        .join("\n");
+};
 const serializeSequelizeDataType = (type) => {
     if (!type)
         return "undefined";
     if (type.key) {
         const key = type.key;
         if (type.options?.length)
-            return `Sequelize.${key}(${type.options.length})`;
+            return `DataTypes.${key}(${type.options.length})`;
         if (type.options?.values)
-            return `Sequelize.${key}(${JSON.stringify(type.options.values)})`;
+            return `DataTypes.${key}(${JSON.stringify(type.options.values)})`;
         if (type.options?.precision && type.options?.scale)
-            return `Sequelize.${key}(${type.options.precision}, ${type.options.scale})`;
-        return `Sequelize.${key}`;
+            return `DataTypes.${key}(${type.options.precision}, ${type.options.scale})`;
+        return `DataTypes.${key}`;
     }
     return "undefined";
 };
@@ -36,23 +44,29 @@ const serializeSequelizeColumnDefinition = (column) => {
         }
     }
     return `{
-        ${parts.join(",\n        ")}
-    }`;
+${indentBlock(parts.join(",\n"), 1)}
+}`;
 };
 const serializeIndexDefinition = (index) => {
     const clone = { ...index };
     delete clone.name;
-    return JSON.stringify(clone, null, 4);
+    delete clone.fields;
+    delete clone.comment;
+    const entries = Object.entries(clone)
+        .map(([key, value]) => `${key}: ${JSON.stringify(value)}`)
+        .join(",\n");
+    return entries;
 };
 const serializeSequelizeColumnsObject = (columns) => {
     const rendered = Object.entries(columns)
-        .map(([col_name, col_Def]) => {
-        return `"${col_name}": ${serializeSequelizeColumnDefinition(col_Def)}`;
+        .map(([col_name, col_def]) => {
+        const colCode = serializeSequelizeColumnDefinition(col_def);
+        return `"${col_name}": ${colCode}`;
     })
-        .join(",\n        ");
+        .join(",\n");
     return `{
-        ${rendered}
-    }`;
+${indentBlock(rendered, 1)}
+}`;
 };
 const serializeSequelizeIndexesArray = (indexes) => {
     return indexes.map(index => {
@@ -113,7 +127,7 @@ const SEQUELIZE_CREATE_NEW_SCHEMA_MIGRATION_FILE_CODE_TEMPLATE = (schema_table_n
     const rendered_columns = serializeSequelizeColumnsObject(schema_definition.columns);
     const rendered_indexes = serializeSequelizeIndexesArray(schema_definition.indexes || []);
     return `
-import { QueryInterface, Sequelize } from "sequelize";
+import { QueryInterface, Sequelize, DataTypes } from "sequelize";
 import { LoggerUtil } from "fiberx-backend-toolkit/dist/utils/main";
 
 class Create${schema_model_name}TableMigration {
@@ -128,19 +142,22 @@ class Create${schema_model_name}TableMigration {
 
             await queryInterface.createTable(
                 table_name,
-                ${rendered_columns}
+                ${indentBlock(rendered_columns, 4)}
             );
 
-            ${schema_definition.indexes?.map(index => `
+            ${schema_definition.indexes?.map(index => {
+        const indexCode = `
             await queryInterface.addIndex(
                 table_name,
                 ${JSON.stringify(index.fields)},
                 {
                     name: "${index.name}",
-                    ${serializeIndexDefinition(index).replace(/^{|}$/g, "")}
+            ${indentBlock(serializeIndexDefinition(index), 2)}
                 }
             );
-            `).join("") || ""}
+            `;
+        return indentBlock(indexCode.trim(), 3);
+    }).join("\n\n") || ""}
 
             this.logger.success(\`✅ Table "\${table_name}" created successfully.\`);
         } 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "fiberx-backend-toolkit",
-    "version": "0.0.62",
+    "version": "0.0.63",
     "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",