fiberx-backend-toolkit 0.0.29 → 0.0.31

package/dist/code_templates/sequelize_code_template.js

@@ -7,6 +7,7 @@ import { DataTypes } from "sequelize";
 import { SchemaDefinitionInterface } from "fiberx-backend-toolkit/dist/types/schema_type";
 
 const ${schema_name}: SchemaDefinitionInterface = {
+    connection_name: "default",
     database_name: "public",
     migration_priority: ${migration_priority},
 
@@ -328,14 +329,19 @@ const SEQUELIZE_MODEL_CODE_TEMPLATE = (schema_model_name, schema_file_name, sche
     return `
 import { Model, Sequelize } from "sequelize";
 import ${schema_model_name}Schema from "@/database/schemas/${schema_file_name.replace(".ts", "")}";
+import { SchemaDefinitionInterface } from "fiberx-backend-toolkit";
 
 
 class ${schema_model_name} extends Model {
 ${attributes}
 
+    public static schema_def: SchemaDefinitionInterface = ${schema_model_name}Schema
+
     public static initModel(sequelize: Sequelize): typeof ${schema_model_name} {
-        sequelize: Sequelize
-    ): ${schema_model_name}  {
+        if (!sequelize) {
+            throw new Error("Sequelize instance is required to initialize the ${schema_model_name} model.");
+        }
+
         ${schema_model_name}.init(
             ${schema_model_name}Schema.columns,
             {
@@ -363,28 +369,36 @@ export default ${schema_model_name}
 };
 exports.SEQUELIZE_MODEL_CODE_TEMPLATE = SEQUELIZE_MODEL_CODE_TEMPLATE;
 const SEQUELIZE_MODELS_INDEX_CODE_TEMPLATE = (model_names, imports) => {
-    const exports = model_names.join(",\n    ");
-    return `
-import { Sequelize } from "sequelize";
-${imports}
+    const model_initializers = model_names.map((model_name) => {
+        return `
+export const ${model_name}Model = (): typeof ${model_name} => {
+    const connection_name = ${model_name}.schema_def?.connection_name || "default";
 
-const models = {
-    ${exports}
-};
+    const sequelize = seqelize_connector.getConnection(connection_name);
+
+    if (!sequelize) {
+        throw new Error(
+            "Sequelize connection not available for ${model_name} model."
+        );
+    }
 
-export const initModels = (sequelize: Sequelize) => {
-    Object.values(models).forEach(model => {
-        model.initModel(sequelize);
-    });
+    const initialized = ${model_name}.initModel(sequelize);
 
-    Object.values(models).forEach(model => {
-        model.registerAssociations();
-    });
+    if (${model_name}.registerAssociations) {
+        ${model_name}.registerAssociations();
+    }
 
-    return models;
+    return initialized;
 };
+`;
+    }).join("\n");
+    return `
+import { SequelizeConnector } from "fiberx-backend-toolkit/dist/database/main";
+${imports}
+
+const seqelize_connector = SequelizeConnector.getInstance();
 
-export default models;
+${model_initializers}
 `;
 };
 exports.SEQUELIZE_MODELS_INDEX_CODE_TEMPLATE = SEQUELIZE_MODELS_INDEX_CODE_TEMPLATE;

package/dist/database/schema/schema_normalizer_util.js

@@ -25,6 +25,7 @@ class SchemaNormalizerUtil {
     }
     static normalizeSchema(schema) {
         return {
+            connection_name: schema.connection_name,
             database_name: schema.database_name,
             table_name: schema.table_name,
             model_name: schema.model_name,

package/dist/types/schema_type.d.ts

@@ -36,6 +36,7 @@ export interface IndexFieldOptionsInterface {
     comment?: string;
 }
 export interface SchemaDefinitionInterface {
+    connection_name: string;
     database_name: string;
     migration_priority: number;
     table_name: string;

package/package.json

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