@fuzzle/opencode-accountant 0.13.13-next.1 → 0.13.14-next.1

package/dist/index.js

@@ -25652,36 +25652,6 @@ function processNonMergerAction(action, inventory, entries, logger) {
     }
   }
 }
-function processCorporateActions(actions, inventory, lotInventoryPath, projectDir, logger) {
-  const entries = [];
-  actions.sort((a, b) => formatDate(a.date).localeCompare(formatDate(b.date)));
-  const mergerActions = [];
-  const otherActions = [];
-  for (const action of actions) {
-    if (MERGER_LIKE_TYPES.has(action.type)) {
-      mergerActions.push(action);
-    } else {
-      otherActions.push(action);
-    }
-  }
-  const mergerGroups = groupMergerActions(mergerActions);
-  mergerGroups.sort((a, b) => formatDate(a.date).localeCompare(formatDate(b.date)));
-  let mi = 0;
-  let oi = 0;
-  while (mi < mergerGroups.length || oi < otherActions.length) {
-    const mergerDate = mi < mergerGroups.length ? formatDate(mergerGroups[mi].date) : "\uFFFF";
-    const otherDate = oi < otherActions.length ? formatDate(otherActions[oi].date) : "\uFFFF";
-    if (mergerDate <= otherDate) {
-      const groupEntries = processMultiWayMerger(mergerGroups[mi], inventory, lotInventoryPath, projectDir, logger);
-      entries.push(...groupEntries);
-      mi++;
-    } else {
-      processNonMergerAction(otherActions[oi], inventory, entries, logger);
-      oi++;
-    }
-  }
-  return entries;
-}
 function groupMergerActions(actions) {
   const groupMap = new Map;
   for (const action of actions) {
@@ -26013,57 +25983,86 @@ async function preprocessSwissquote(csvPath, projectDir, currency, year, lotInve
   logger?.logStep("route", "success", `Simple: ${stats.simpleTransactions}, Trades: ${stats.trades}, Dividends: ${stats.dividends}, Corporate: ${stats.corporateActions}, Forex: ${stats.forexTransactions}, Skipped: ${stats.skipped}`);
   logger?.endSection();
   const journalEntries = [];
-  if (trades.length > 0) {
-    logger?.startSection("Trade Processing", 2);
-    trades.sort((a, b) => formatDate(a.date).localeCompare(formatDate(b.date)));
-    for (const trade of trades) {
-      try {
-        if (trade.type === "Buy") {
-          const tradeInfo = {
-            date: formatDate(trade.date),
-            orderNum: trade.orderNum,
-            symbol: trade.symbol,
-            isin: trade.isin,
-            quantity: trade.quantity,
-            unitPrice: trade.unitPrice,
-            currency: trade.currency
-          };
-          addLot(inventory, tradeInfo, logger);
-          const entry = generateBuyEntry(trade, logger);
-          journalEntries.push(entry);
-          logger?.logStep("trade-buy", "success", `Buy ${trade.quantity} ${trade.symbol} @ ${trade.unitPrice} ${trade.currency}`);
-        } else if (trade.type === "Sell") {
-          const consumed = consumeLotsFIFO(inventory, trade.symbol, trade.quantity, logger);
-          const entry = generateSellEntry(trade, consumed, logger);
+  const timeline = [];
+  for (const trade of trades) {
+    timeline.push({ kind: "trade", sortDate: formatDate(trade.date), trade });
+  }
+  for (const dividend of dividends) {
+    timeline.push({ kind: "dividend", sortDate: formatDate(dividend.date), dividend });
+  }
+  const mergerActions = [];
+  const otherCorpActions = [];
+  for (const action of corporateActions) {
+    if (MERGER_LIKE_TYPES.has(action.type)) {
+      mergerActions.push(action);
+    } else {
+      otherCorpActions.push(action);
+    }
+  }
+  const mergerGroups = groupMergerActions(mergerActions);
+  for (const group of mergerGroups) {
+    timeline.push({ kind: "mergerGroup", sortDate: formatDate(group.date), group });
+  }
+  for (const action of otherCorpActions) {
+    timeline.push({ kind: "corpAction", sortDate: formatDate(action.date), action });
+  }
+  timeline.sort((a, b) => a.sortDate.localeCompare(b.sortDate));
+  if (timeline.length > 0) {
+    logger?.startSection("Chronological Event Processing", 2);
+    for (const event of timeline) {
+      switch (event.kind) {
+        case "trade": {
+          const trade = event.trade;
+          try {
+            if (trade.type === "Buy") {
+              const tradeInfo = {
+                date: formatDate(trade.date),
+                orderNum: trade.orderNum,
+                symbol: trade.symbol,
+                isin: trade.isin,
+                quantity: trade.quantity,
+                unitPrice: trade.unitPrice,
+                currency: trade.currency
+              };
+              addLot(inventory, tradeInfo, logger);
+              const entry = generateBuyEntry(trade, logger);
+              journalEntries.push(entry);
+              logger?.logStep("trade-buy", "success", `Buy ${trade.quantity} ${trade.symbol} @ ${trade.unitPrice} ${trade.currency}`);
+            } else if (trade.type === "Sell") {
+              const consumed = consumeLotsFIFO(inventory, trade.symbol, trade.quantity, logger);
+              const entry = generateSellEntry(trade, consumed, logger);
+              journalEntries.push(entry);
+              const totalCost = consumed.reduce((sum, c) => sum + c.totalCost, 0);
+              const gain = trade.quantity * trade.unitPrice - totalCost;
+              logger?.logStep("trade-sell", "success", `Sell ${trade.quantity} ${trade.symbol} @ ${trade.unitPrice} ${trade.currency}, gain: ${gain.toFixed(2)}`);
+            }
+          } catch (error45) {
+            const message = error45 instanceof Error ? error45.message : String(error45);
+            logger?.logStep("trade", "error", `Failed to process trade: ${message}`);
+            logger?.error(`Trade processing error for ${trade.symbol}`, error45 instanceof Error ? error45 : undefined);
+          }
+          break;
+        }
+        case "dividend": {
+          const dividend = event.dividend;
+          const entry = generateDividendEntry(dividend, logger);
           journalEntries.push(entry);
-          const totalCost = consumed.reduce((sum, c) => sum + c.totalCost, 0);
-          const gain = trade.quantity * trade.unitPrice - totalCost;
-          logger?.logStep("trade-sell", "success", `Sell ${trade.quantity} ${trade.symbol} @ ${trade.unitPrice} ${trade.currency}, gain: ${gain.toFixed(2)}`);
+          logger?.logStep("dividend", "success", `Dividend ${dividend.symbol}: ${dividend.netAmount} ${dividend.currency} (tax: ${dividend.withholdingTax})`);
+          break;
+        }
+        case "mergerGroup": {
+          const groupEntries = processMultiWayMerger(event.group, inventory, lotInventoryPath, projectDir, logger);
+          journalEntries.push(...groupEntries);
+          break;
+        }
+        case "corpAction": {
+          processNonMergerAction(event.action, inventory, journalEntries, logger);
+          break;
         }
-      } catch (error45) {
-        const message = error45 instanceof Error ? error45.message : String(error45);
-        logger?.logStep("trade", "error", `Failed to process trade: ${message}`);
-        logger?.error(`Trade processing error for ${trade.symbol}`, error45 instanceof Error ? error45 : undefined);
       }
     }
     logger?.endSection();
   }
-  if (dividends.length > 0) {
-    logger?.startSection("Dividend Processing", 2);
-    for (const dividend of dividends) {
-      const entry = generateDividendEntry(dividend, logger);
-      journalEntries.push(entry);
-      logger?.logStep("dividend", "success", `Dividend ${dividend.symbol}: ${dividend.netAmount} ${dividend.currency} (tax: ${dividend.withholdingTax})`);
-    }
-    logger?.endSection();
-  }
-  if (corporateActions.length > 0) {
-    logger?.startSection("Corporate Actions Processing", 2);
-    const corpEntries = processCorporateActions(corporateActions, inventory, lotInventoryPath, projectDir, logger);
-    journalEntries.push(...corpEntries);
-    logger?.logStep("corporate", "success", `Processed ${corporateActions.length} corporate actions`);
-    logger?.endSection();
-  }
   logger?.logStep("save-inventory", "start", "Saving lot inventory");
   saveLotInventory(projectDir, lotInventoryPath, inventory, logger);
   logger?.logStep("save-inventory", "success", "Lot inventory saved");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fuzzle/opencode-accountant",
-  "version": "0.13.13-next.1",
+  "version": "0.13.14-next.1",
   "description": "An OpenCode accounting agent, specialized in double-entry-bookkepping with hledger",
   "author": {
     "name": "ali bengali",