hledger-lsp 0.2.11 → 0.2.13

package/out/utils/runningBalanceCalculator.js

@@ -4,109 +4,68 @@
  *
  * Calculates running balances for all accounts across all transactions,
  * taking into account:
- * - Chronological ordering (by date)
+ * - Chronological ordering (by effective date, respecting posting dates)
  * - Multiple commodities per account
  * - Explicit and inferred amounts
  * - Transactions from multiple files (via includes)
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateRunningBalances = calculateRunningBalances;
-exports.calculateAccountBalances = calculateAccountBalances;
+const index_1 = require("./index");
 /**
  * Calculate running balances for all transactions in a parsed document
  *
  * This function:
- * 1. Sorts transactions chronologically by date
- * 2. Processes each posting to update account balances
- * 3. Returns a map of balances after each posting
+ * 1. Extracts all postings with their effective dates (respecting posting dates)
+ * 2. Sorts postings chronologically by effective date
+ * 3. Processes each posting to update account balances
+ * 4. Returns a map of balances after each posting
  *
  * @param parsed The parsed document containing all transactions
  * @returns A map of transaction index -> posting index -> commodity -> balance
  */
 function calculateRunningBalances(parsed) {
     const result = new Map();
-    // Track global account balances across all transactions
     const accountBalances = new Map();
-    // Sort transactions by date to calculate balances in chronological order
-    // This is critical when transactions come from multiple files via includes
-    const sortedTransactions = [...parsed.transactions].sort((a, b) => {
-        return a.date.localeCompare(b.date);
+    const allPostings = [];
+    parsed.transactions.forEach((tx, txIdx) => {
+        tx.postings.forEach((posting, postingIdx) => {
+            allPostings.push({
+                transaction: tx,
+                posting,
+                effectiveDate: (0, index_1.getEffectiveDate)(posting, tx),
+                txIndex: txIdx,
+                postingIndex: postingIdx
+            });
+        });
     });
-    // Create a map from sorted index to original index
-    const sortedToOriginalIndex = new Map();
-    sortedTransactions.forEach((tx, sortedIdx) => {
-        const originalIdx = parsed.transactions.indexOf(tx);
-        sortedToOriginalIndex.set(sortedIdx, originalIdx);
-    });
-    for (let sortedIdx = 0; sortedIdx < sortedTransactions.length; sortedIdx++) {
-        const transaction = sortedTransactions[sortedIdx];
-        const txIndex = sortedToOriginalIndex.get(sortedIdx);
-        const postingBalances = new Map();
-        for (let postingIndex = 0; postingIndex < transaction.postings.length; postingIndex++) {
-            const posting = transaction.postings[postingIndex];
-            const account = posting.account;
-            // Get amount (either explicit or inferred)
-            let amountMap;
-            if (posting.amount) {
-                // Explicit amount
-                const commodity = posting.amount.commodity || '';
-                amountMap = new Map([[commodity, posting.amount.quantity]]);
+    // Sort by effective date for chronological processing
+    allPostings.sort((a, b) => a.effectiveDate.localeCompare(b.effectiveDate));
+    // Process postings in chronological order
+    for (const { posting, txIndex, postingIndex } of allPostings) {
+        const account = posting.account;
+        // Get amount (explicit only - ignore inferred amounts)
+        if (posting.amount) {
+            const commodity = posting.amount.commodity || '';
+            // Initialize account balance map if needed
+            if (!accountBalances.has(account)) {
+                accountBalances.set(account, new Map());
             }
-            if (amountMap) {
-                // Update balance for each commodity in this posting
-                for (const [commodity, quantity] of amountMap.entries()) {
-                    // Get or create account balance map
-                    if (!accountBalances.has(account)) {
-                        accountBalances.set(account, new Map());
-                    }
-                    const commodityBalances = accountBalances.get(account);
-                    // Update balance
-                    const currentBalance = commodityBalances.get(commodity) || 0;
-                    const newBalance = currentBalance + quantity;
-                    commodityBalances.set(commodity, newBalance);
-                    // Store this posting's resulting balance
-                    if (!postingBalances.has(postingIndex)) {
-                        postingBalances.set(postingIndex, new Map());
-                    }
-                    postingBalances.get(postingIndex).set(commodity, newBalance);
-                }
+            const commodityBalances = accountBalances.get(account);
+            // Update balance
+            const currentBalance = commodityBalances.get(commodity) || 0;
+            const newBalance = currentBalance + posting.amount.quantity;
+            commodityBalances.set(commodity, newBalance);
+            // Store this posting's resulting balance in result map
+            if (!result.has(txIndex)) {
+                result.set(txIndex, new Map());
             }
-        }
-        result.set(txIndex, postingBalances);
-    }
-    return result;
-}
-/**
- * Calculate running balances for balance assertion validation
- *
- * This is a simplified version that only tracks account balances,
- * suitable for validating balance assertions.
- *
- * @param transactions List of transactions (will be sorted by date internally)
- * @returns A map of account name -> commodity -> balance
- */
-function calculateAccountBalances(transactions) {
-    const balances = new Map();
-    // Sort transactions by date to calculate balances in chronological order
-    const sortedTransactions = [...transactions].sort((a, b) => {
-        return a.date.localeCompare(b.date);
-    });
-    for (const transaction of sortedTransactions) {
-        for (const posting of transaction.postings) {
-            // Update running balance
-            // Note: Balance assertions check the ORIGINAL commodity (amount.commodity),
-            // not the cost commodity. So we always update balance in the amount's commodity.
-            if (posting.amount) {
-                const accountBalances = balances.get(posting.account) || new Map();
-                const commodity = posting.amount.commodity || '';
-                const currentBalance = accountBalances.get(commodity) || 0;
-                // Always use the original amount quantity for balance tracking,
-                // regardless of whether there's a cost notation
-                accountBalances.set(commodity, currentBalance + posting.amount.quantity);
-                balances.set(posting.account, accountBalances);
+            if (!result.get(txIndex).has(postingIndex)) {
+                result.get(txIndex).set(postingIndex, new Map());
             }
+            result.get(txIndex).get(postingIndex).set(commodity, newBalance);
         }
     }
-    return balances;
+    return result;
 }
 //# sourceMappingURL=runningBalanceCalculator.js.map

package/out/utils/runningBalanceCalculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"runningBalanceCalculator.js","sourceRoot":"","sources":["../../src/utils/runningBalanceCalculator.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;AA2BH,4DAgEC;AAWD,4DA0BC;AAhHD;;;;;;;;;;GAUG;AACH,SAAgB,wBAAwB,CAAC,MAAsB;IAC7D,MAAM,MAAM,GAAsB,IAAI,GAAG,EAAE,CAAC;IAE5C,wDAAwD;IACxD,MAAM,eAAe,GAAsB,IAAI,GAAG,EAAE,CAAC;IAErD,yEAAyE;IACzE,2EAA2E;IAC3E,MAAM,kBAAkB,GAAG,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAChE,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,mDAAmD;IACnD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxD,kBAAkB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE;QAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACpD,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC;QAC3E,MAAM,WAAW,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;QACtD,MAAM,eAAe,GAAG,IAAI,GAAG,EAA+B,CAAC;QAE/D,KAAK,IAAI,YAAY,GAAG,CAAC,EAAE,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC;YACtF,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACnD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAEhC,2CAA2C;YAC3C,IAAI,SAA0C,CAAC;YAE/C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,kBAAkB;gBAClB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;gBACjD,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC9D,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,oDAAoD;gBACpD,KAAK,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;oBACxD,oCAAoC;oBACpC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;wBAClC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,GAAG,EAAkB,CAAC,CAAC;oBAC1D,CAAC;oBACD,MAAM,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;oBAExD,iBAAiB;oBACjB,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBAC7D,MAAM,UAAU,GAAG,cAAc,GAAG,QAAQ,CAAC;oBAC7C,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBAE7C,yCAAyC;oBACzC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;wBACvC,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;oBAC/C,CAAC;oBACD,eAAe,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,wBAAwB,CAAC,YAA2B;IAClE,MAAM,QAAQ,GAAsB,IAAI,GAAG,EAAE,CAAC;IAE9C,yEAAyE;IACzE,MAAM,kBAAkB,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACzD,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE,CAAC;QAC7C,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC3C,yBAAyB;YACzB,4EAA4E;YAC5E,iFAAiF;YACjF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,EAAkB,CAAC;gBACnF,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;gBACjD,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC3D,gEAAgE;gBAChE,gDAAgD;gBAChD,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACzE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"runningBalanceCalculator.js","sourceRoot":"","sources":["../../src/utils/runningBalanceCalculator.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;AA6BH,4DA6DC;AAvFD,mCAA2C;AAc3C;;;;;;;;;;;GAWG;AACH,SAAgB,wBAAwB,CAAC,MAAsB;IAC7D,MAAM,MAAM,GAAsB,IAAI,GAAG,EAAE,CAAC;IAC5C,MAAM,eAAe,GAAsB,IAAI,GAAG,EAAE,CAAC;IAWrD,MAAM,WAAW,GAAyB,EAAE,CAAC;IAE7C,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;QACxC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE;YAC1C,WAAW,CAAC,IAAI,CAAC;gBACf,WAAW,EAAE,EAAE;gBACf,OAAO;gBACP,aAAa,EAAE,IAAA,wBAAgB,EAAC,OAAO,EAAE,EAAE,CAAC;gBAC5C,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,UAAU;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,sDAAsD;IACtD,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IAE3E,0CAA0C;IAC1C,KAAK,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,WAAW,EAAE,CAAC;QAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,uDAAuD;QACvD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;YAEjD,2CAA2C;YAC3C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,GAAG,EAAkB,CAAC,CAAC;YAC1D,CAAC;YACD,MAAM,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;YAExD,iBAAiB;YACjB,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC7D,MAAM,UAAU,GAAG,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC5D,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAE7C,uDAAuD;YACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC5C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;YACpD,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hledger-lsp",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "Language Server Protocol implementation for hledger plain text accounting",
   "main": "./out/server.js",
   "bin": {

package/out/extension.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=extension.d.ts.map

package/out/extension.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":""}

package/out/extension.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=extension.js.map

package/out/extension.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":""}