bulltrackers-module 1.0.90 → 1.0.92

package/functions/computation-system/utils/utils.js

@@ -1,56 +1,64 @@
 /**
  * @fileoverview Computation system sub-pipes and utils.
  * REFACTORED: Now stateless and receive dependencies where needed.
+ * DYNAMIC: Automatically categorizes meta and historical calcs based on file path.
  */
 
 const { FieldValue, FieldPath } = require('@google-cloud/firestore');
 const { calculations, utils } = require('aiden-shared-calculations-unified');
 const { withRetry } = utils;
 
-// --- Calculation Categorization (Stateless) ---
-const HISTORICAL_CALC_NAMES = new Set([
-    'paper-vs-diamond-hands', 'smart-money-flow', 'profitability-migration',
-    'user-profitability-tracker', 'sector-rotation', 'crowd-conviction-score',
-    'risk-appetite-change', 'drawdown-response', 'gain-response',
-    'tsl-effectiveness', 'position-count-pnl', 'diversification-pnl',
-    
-    'deposit-withdrawal-percentage',
-    'new-allocation-percentage',
-    'reallocation-increase-percentage',
-    'asset-crowd-flow'
-]);
-
-// --- Set for meta calculation names (Generated Dynamically) ---
-const META_CALC_NAMES = new Set(); // This will be populated dynamically
+// --- Dynamic Calculation Categorization ---
 
+// These sets will be populated dynamically by inspecting the file structure
+const HISTORICAL_CALC_NAMES = new Set();
+const META_CALC_NAMES = new Set();
 
 const historicalCalculations = {};
 const dailyCalculations = {};
-const metaCalculations = {}; 
+const metaCalculations = {};
 
 for (const category in calculations) {
-    for (const calcName in calculations[category]) {
-        
-        // --- UPDATED LOGIC ---
-        // 1. Check if it's a 'meta' calculation by its category
-        if (category === 'meta') {
-            if (!metaCalculations[category]) metaCalculations[category] = {};
-            metaCalculations[category][calcName] = calculations[category][calcName];
-            META_CALC_NAMES.add(calcName); // Add to the set for export
-        
-        // 2. Check if it's a historical calculation
-        } else if (HISTORICAL_CALC_NAMES.has(calcName)) {
+    // 1. Check for 'meta' category first (by top-level directory name)
+    if (category === 'meta') {
+        if (!metaCalculations[category]) metaCalculations[category] = {};
+        for (const calcName in calculations[category]) {
+            const CalculationClass = calculations[category][calcName];
+            metaCalculations[category][calcName] = CalculationClass;
+            META_CALC_NAMES.add(calcName);
+        }
+        continue; // Done with this category
+    }
+
+    // 2. Process other categories (e.g., 'pnl', 'capital_flow')
+    for (const subKey in calculations[category]) {
+        const item = calculations[category][subKey];
+
+        // Check if the key is 'historical' and it contains an object of calculations
+        if (subKey === 'historical' && typeof item === 'object' && item !== null && !Array.isArray(item)) {
+            // This is the historical subdirectory, e.g., calculations.capital_flow.historical
+            
             if (!historicalCalculations[category]) historicalCalculations[category] = {};
-            historicalCalculations[category][calcName] = calculations[category][calcName];
-        
-        // 3. Otherwise, it's a standard daily calculation
-        } else {
+            
+            for (const calcName in item) {
+                const CalculationClass = item[calcName];
+                // Add it to the historical list, using the parent 'category'
+                historicalCalculations[category][calcName] = CalculationClass;
+                HISTORICAL_CALC_NAMES.add(calcName);
+            }
+        }
+        // Check if the item is a function (a standard daily calc at the root of the category)
+        else if (typeof item === 'function') {
+            // This is a standard daily calc, e.g., calculations.pnl.average-daily-pnl
+            const calcName = subKey;
+            const CalculationClass = item;
+            
             if (!dailyCalculations[category]) dailyCalculations[category] = {};
-            dailyCalculations[category][calcName] = calculations[category][calcName];
+            dailyCalculations[category][calcName] = CalculationClass;
         }
     }
 }
-// --- End Categorization ---
+// --- End Dynamic Categorization ---
 
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [
@@ -32,7 +32,7 @@
     "@google-cloud/firestore": "^7.11.3",
     "sharedsetup": "latest",
     "require-all": "^3.0.0",
-    "aiden-shared-calculations-unified": "1.0.15",
+    "aiden-shared-calculations-unified": "1.0.16",
     "@google-cloud/pubsub": "latest",
     "express": "^4.19.2",
     "cors": "^2.8.5",