fiberx-backend-toolkit 0.0.41 → 0.0.42

package/dist/code_templates/sequelize_code_template.js

@@ -21,17 +21,20 @@ const ${schema_name}: SchemaDefinitionInterface = {
             primaryKey: true,
             autoIncrement: true,
             allowNull: false,
+            comment: "Primary key for ${table_name} rows"
         },
 
         created_at: {
             type: DataTypes.DATE,
             defaultValue: DataTypes.NOW,
+            comment: "Timestamp when ${model_name} record was created."
         },
 
         updated_at: {
             type: DataTypes.DATE,
             allowNull: true,
             defaultValue: null,
+            comment: "Timestamp when ${model_name} record was last updated."
         },
     },
 
@@ -359,8 +362,14 @@ ${attributes}
     } 
 
     public static registerAssociations(): void {
-        // Example:
-        // User.belongsTo(models.Organization, { foreignKey: "org_id" });
+        try {
+            // Example:
+            // User.belongsTo(models.Organization, { foreignKey: "org_id" });
+        }
+        catch(error: any) {
+            console.warn(\`Failed to fully register model ${schema_model_name} associations\`, { error } );
+        }
+
     }
 }
 
@@ -369,42 +378,65 @@ export default ${schema_model_name}
 };
 exports.SEQUELIZE_MODEL_CODE_TEMPLATE = SEQUELIZE_MODEL_CODE_TEMPLATE;
 const SEQUELIZE_MODELS_INDEX_CODE_TEMPLATE = (model_names, imports) => {
-    const model_initializers = model_names.map((model_name) => {
-        return `
-const initialize${model_name}Model = (): typeof ${model_name} => {
-    const connection_name   = ${model_name}.schema_def?.connection_name || "default";
-    const sequelize         = seqelize_connector.connectNamedSync(connection_name);
+    const model_array = model_names.join(",\n    ");
+    const export_initialized = model_names.map((m) => `    ${m}: ${m}Model`).join(",\n");
+    const export_raw = model_names.join(",\n    ");
+    return `
+import { SequelizeConnector } from "fiberx-backend-toolkit/dist/database/main";
+${imports}
 
-    if (!sequelize) {
-        throw new Error("Sequelize connection not available for ${model_name} model.");
-    }
+const seqelize_connector = SequelizeConnector.getInstance();
 
-    const initialized = ${model_name}.initModel(sequelize);
+// -------------------------
+// Model class list
+// -------------------------
+const modelClasses = [
+    ${model_array}
+];
 
-    if (${model_name}.registerAssociations) { 
-        ${model_name}.registerAssociations();
-    }
+// Store initialized models
+const initializedModels: Record<string, any> = {};
+const associationMethods: (() => void)[] = [];
 
-    return initialized;
-};
+// -------------------------
+// Initialize all models first
+// -------------------------
+for (const ModelClass of modelClasses) {
+    const connection_name = ModelClass.schema_def?.connection_name || "default";
+    const sequelize = seqelize_connector.connectNamedSync(connection_name);
 
-const ${model_name}Model = initialize${model_name}Model();
-`;
-    }).join("\n");
-    const model_exports = model_names.map((model_name) => `    ${model_name},
-    ${model_name}Model`).join(",\n");
-    return `
-import { SequelizeConnector } from "fiberx-backend-toolkit/dist/database/main";
-${imports}
+    if (!sequelize) {
+        throw new Error(\`Sequelize connection not available for \${ModelClass.name} model.\`);
+    }
 
+    const initialized = ModelClass.initModel(sequelize);
+    initializedModels[ModelClass.name] = initialized;
 
-const seqelize_connector = SequelizeConnector.getInstance();
+    // Store association method
+    if (typeof ModelClass.registerAssociations === "function") {
+        associationMethods.push(() => ModelClass.registerAssociations());
+    }
+}
+
+// -------------------------
+// Register associations AFTER all models exist
+// -------------------------
+for (const register of associationMethods) {
+    register();
+}
 
-${model_initializers}
+// -------------------------
+// Create named initialized exports
+// -------------------------
+${model_names.map(m => `const ${m}Model = initializedModels["${m}"];`).join("\n")}
 
+// -------------------------
+// Export raw + initialized
+// -------------------------
 export {
-${model_exports}
-}
+    ${export_raw},
+${model_names.map(m => `    ${m}Model`).join(",\n")}
+};
 `;
 };
 exports.SEQUELIZE_MODELS_INDEX_CODE_TEMPLATE = SEQUELIZE_MODELS_INDEX_CODE_TEMPLATE;

package/package.json

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