beancount 0.2.5 → 0.2.7

package/build/src/classes/Node.mjs

@@ -1,7 +1,7 @@
 import { genericParse } from '../genericParse.mjs';
-import { stringAwareSplitLine } from '../utils/stringAwareSplitLine.mjs';
 import { assignWithTrimmedStrings } from '../utils/assignWithTrimmedStrings.mjs';
 import { defaultFormatOptions } from './ParseResult.mjs';
+import { splitStringIntoSourceFragments } from '../utils/splitStringIntoSourceFragments.js';
 /**
  * Abstract base class for all nodes.
  *
@@ -27,8 +27,11 @@ export class Node {
      * @returns A new instance of the Node subclass
      */
     static fromString(input) {
-        const sourceFragment = stringAwareSplitLine(input);
-        const genericParseResult = genericParse(sourceFragment);
+        const sourceFragment = splitStringIntoSourceFragments(input);
+        if (sourceFragment.length !== 1) {
+            throw new Error('Wrong directive count, expected 1');
+        }
+        const genericParseResult = genericParse(sourceFragment[0]);
         const result = this.fromGenericParseResult(genericParseResult);
         if (result.type !== genericParseResult.type) {
             console.warn('Parse result type is not equal to requested object type, make sure the correct class is initiated');
@@ -70,7 +73,6 @@ export class Node {
      * @param _formatOptions - Formatting options (unused in base implementation)
      * @returns The formatted string representation of this node
      */
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     toFormattedString(_formatOptions = defaultFormatOptions) {
         // eslint-disable-next-line @typescript-eslint/no-base-to-string
         return this.toString();
@@ -103,6 +105,4 @@ export class Node {
  * @param _ctor - The constructor to validate (unused at runtime)
  * @internal
  */
-export function assertNodeConstructor(
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-_ctor) { }
+export function assertNodeConstructor(_ctor) { }

package/build/src/classes/nodes/Blankline.mjs

@@ -13,9 +13,7 @@ export class Blankline extends Node {
      * @param _genericParseResult - Unused, blank lines have no content
      * @returns A new Blankline instance
      */
-    static fromGenericParseResult(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _genericParseResult) {
+    static fromGenericParseResult(_genericParseResult) {
         return new Blankline({});
     }
     /** @inheritdoc */
@@ -27,9 +25,7 @@ export class Blankline extends Node {
      * @param _input - Unused, blank lines have no content
      * @returns A new Blankline instance
      */
-    static fromString(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _input) {
+    static fromString(_input) {
         return this.fromGenericParseResult({});
     }
 }

package/build/src/classes/nodes/Transaction/Posting.mjs

@@ -48,8 +48,8 @@ export class Posting {
         const accountPattern = `([^ ]*)`;
         const amountPattern = `([^A-Z;]*)`;
         const costPattern = `{(.*)}`;
-        const pricePattern = `+(@|@@) +(?:(\\d+\\.?\\d*) ${currencyPattern})`;
-        const amountCurrenyCostPattern = `${amountPattern}(?: +${currencyPattern})?(?: +${costPattern})?(?: ${pricePattern})?`;
+        const pricePattern = ` *(@@|@) *(?:([^A-Z;]+) ${currencyPattern})`;
+        const amountCurrenyCostPattern = `${amountPattern}(?: +${currencyPattern})?(?: +${costPattern})?(?:${pricePattern})?`;
         const commentPattern = `( *;.*)?`;
         const pattern = `^(?:${flagPattern})?${accountPattern}(?: +${amountCurrenyCostPattern})?${commentPattern}$`;
         const matches = RegExp(pattern).exec(unparsedline);

package/build/src/genericParse.d.mts

@@ -1,5 +1,6 @@
 import type { BeancountDirectiveNodeType, SyntheticNodeType } from './nodeTypeToClass.mjs';
 import { type Metadata } from './utils/parseMetadata.mjs';
+import { type SourceFragmentWithLocation } from './utils/SourceLocation.mjs';
 /**
  * The basic result structure from generic parsing of a Beancount directive.
  * Contains the directive type, header line content, and any properties like comments.
@@ -58,7 +59,7 @@ export interface GenericParseResultTransaction extends Omit<GenericParseResultWi
     };
 }
 /**
- * Regex pattern to identify Beancount directives that start with a date.
+ * Regex pattern to identify Beancount directives
  * Generated from {@link NON_DATED_DIRECTIVE_TYPES} and {@link DATED_DIRECTIVE_TYPES} to ensure validation of directive types.
  */
 export declare const beanCountDirectiveRegex: RegExp;
@@ -72,7 +73,7 @@ export declare const beanCountDirectiveRegex: RegExp;
  * - Handles transaction-specific parsing (flags, body lines)
  * - Parses metadata for dated directives
  *
- * @param sourceFragment - Array of strings that should be parsed to a single node
+ * @param sourceFragment - A single source fragment
  * @returns A generic parse result object appropriate for the node type
  */
-export declare const genericParse: (sourceFragment: string[]) => GenericParseResult | GenericParseResultTransaction | GenericParseResultWithDate | GenericParseResultSyntheticNode;
+export declare const genericParse: (sourceFragment: SourceFragmentWithLocation) => GenericParseResult | GenericParseResultTransaction | GenericParseResultWithDate | GenericParseResultSyntheticNode;

package/build/src/genericParse.mjs

@@ -28,13 +28,13 @@ function compileDirectivePattern() {
         'txn',
         '[^ ]' /* flag */,
     ].join('|');
-    const datePattern = `\\d{4}-\\d{2}-\\d{2}`;
-    const datedDirectivesPattern = `${datePattern} +(?:${datedDirectivesTypePattern})`;
-    const pattern = `^(?:${nonDatedDirectivesPattern})|(?:^${datedDirectivesPattern}) `;
+    const datePattern = `(?<date>\\d{4}-\\d{2}-\\d{2})`;
+    const datedDirectivesPattern = `${datePattern} +(?<dated_directive>${datedDirectivesTypePattern})`;
+    const pattern = `^(?<non_dated_directive>${nonDatedDirectivesPattern})|(?:^${datedDirectivesPattern}) `;
     return new RegExp(pattern);
 }
 /**
- * Regex pattern to identify Beancount directives that start with a date.
+ * Regex pattern to identify Beancount directives
  * Generated from {@link NON_DATED_DIRECTIVE_TYPES} and {@link DATED_DIRECTIVE_TYPES} to ensure validation of directive types.
  */
 export const beanCountDirectiveRegex = compileDirectivePattern();
@@ -48,26 +48,27 @@ export const beanCountDirectiveRegex = compileDirectivePattern();
  * - Handles transaction-specific parsing (flags, body lines)
  * - Parses metadata for dated directives
  *
- * @param sourceFragment - Array of strings that should be parsed to a single node
+ * @param sourceFragment - A single source fragment
  * @returns A generic parse result object appropriate for the node type
  */
 export const genericParse = (sourceFragment) => {
-    const [firstLine, ...rest] = sourceFragment;
-    if (firstLine.trim() === '') {
-        return { type: 'blankline', header: '', props: {}, synthetic: true };
-    }
-    if (!beanCountDirectiveRegex.test(firstLine)) {
-        // not a valid beancount directive, return it as a comment
+    const { fragment, directiveInfo } = sourceFragment;
+    const [firstLine, ...rest] = fragment;
+    if (!directiveInfo) {
+        // not a valid beancount directive, return it as a comment or a newline
+        if (firstLine.trim() === '') {
+            return { type: 'blankline', header: '', props: {}, synthetic: true };
+        }
         return {
             type: 'comment',
-            header: sourceFragment.join('\n'),
+            header: fragment.join('\n'),
             props: {},
             synthetic: true,
         };
     }
     const splitFirstLine = firstLine.split(' ');
-    if (/^\d{4}-\d{2}-\d{2}/.exec(splitFirstLine[0].trim())) {
-        let type = splitFirstLine[1];
+    if (directiveInfo.date) {
+        let type = directiveInfo.directive;
         let flag;
         if (type.length === 1) {
             flag = type;
@@ -79,27 +80,25 @@ export const genericParse = (sourceFragment) => {
             type = 'transaction';
         }
         if (type === 'transaction') {
-            const date = splitFirstLine[0].trim();
             const [header, ...comment] = splitFirstLine.slice(2).join(' ').split(';');
             return {
                 type,
                 header: header.trim(),
                 body: rest.map((r) => r.trim()),
                 props: {
-                    date,
+                    date: directiveInfo.date,
                     flag,
                     comment: comment.length > 0 ? comment.join(';').trim() : undefined,
                 },
             };
         }
-        const date = splitFirstLine[0].trim();
         const metadata = parseMetadata(rest);
         const [header, ...comment] = splitFirstLine.slice(2).join(' ').split(';');
         return {
             type,
             header: header.trim(),
             props: {
-                date,
+                date: directiveInfo.date,
                 metadata,
                 comment: comment.length > 0 ? comment.join(';').trim() : undefined,
             },
@@ -107,7 +106,7 @@ export const genericParse = (sourceFragment) => {
     }
     const [header, ...comment] = splitFirstLine.slice(1).join(' ').split(';');
     return {
-        type: splitFirstLine[0].trim(),
+        type: directiveInfo.directive,
         header: header.trim(),
         props: {
             metadata: parseMetadata(rest),

package/build/src/main.d.mts

@@ -27,7 +27,7 @@ export { deserializeNode, deserializeNodeFromString, deserializeNodes, deseriali
 export { parseFile, type ParseFileOptions, type FileSystemHelpers, } from './parseFile.mjs';
 export type { GenericParseResult, GenericParseResultWithDate, GenericParseResultTransaction, } from './genericParse.mjs';
 export type { Metadata } from './utils/parseMetadata.mjs';
-export { BeancountParseError, type SourceLocation, type SourceFragmentWithLocation, } from './utils/SourceLocation.mjs';
+export { BeancountParseError, type DirectiveInfo, type SourceLocation, type SourceFragmentWithLocation, type SourceFragmentWithLocationDirective, type SourceFragmentWithLocationNonDirective, } from './utils/SourceLocation.mjs';
 export { ParseResult, type ParseResultObj, type FormatOptions, type CalculateCurrencyColumnOptions, } from './classes/ParseResult.mjs';
 export { Node, assertNodeConstructor } from './classes/Node.mjs';
 export { DatedNode } from './classes/DatedNode.mjs';

package/build/src/parse.d.mts

@@ -12,7 +12,7 @@ import { type SourceFragmentWithLocation } from './utils/SourceLocation.mjs';
  * @param fragmentWithLocation - Source fragment with location metadata
  * @returns A Node instance
  */
-export declare const parseSourceFragment: (fragmentWithLocation: SourceFragmentWithLocation) => Blankline | Comment | import("./classes/nodes/index.mjs").Transaction | import("./classes/nodes/Balance.mjs").Balance | import("./classes/nodes/Close.mjs").Close | import("./classes/nodes/Commodity.mjs").Commodity | import("./classes/nodes/Custom.mjs").Custom | import("./classes/nodes/Document.mjs").Document | import("./classes/nodes/Event.mjs").Event | import("./classes/nodes/Include.mjs").Include | import("./classes/nodes/Note.mjs").Note | import("./classes/nodes/Open.mjs").Open | import("./classes/nodes/Option.mjs").Option | import("./classes/nodes/Pad.mjs").Pad | import("./classes/nodes/Plugin.mjs").Plugin | import("./classes/nodes/Poptag.mjs").Poptag | import("./classes/nodes/Price.mjs").Price | import("./classes/nodes/Pushtag.mjs").Pushtag | import("./classes/nodes/Query.mjs").Query;
+export declare const parseSourceFragment: (fragmentWithLocation: SourceFragmentWithLocation) => import("./classes/nodes/index.mjs").Transaction | import("./classes/nodes/Balance.mjs").Balance | Blankline | import("./classes/nodes/Close.mjs").Close | Comment | import("./classes/nodes/Commodity.mjs").Commodity | import("./classes/nodes/Custom.mjs").Custom | import("./classes/nodes/Document.mjs").Document | import("./classes/nodes/Event.mjs").Event | import("./classes/nodes/Include.mjs").Include | import("./classes/nodes/Note.mjs").Note | import("./classes/nodes/Open.mjs").Open | import("./classes/nodes/Option.mjs").Option | import("./classes/nodes/Pad.mjs").Pad | import("./classes/nodes/Plugin.mjs").Plugin | import("./classes/nodes/Price.mjs").Price | import("./classes/nodes/Poptag.mjs").Poptag | import("./classes/nodes/Pushtag.mjs").Pushtag | import("./classes/nodes/Query.mjs").Query;
 /**
  * Parses a complete Beancount file string into a ParseResult containing Node objects.
  *

package/build/src/parse.mjs

@@ -19,7 +19,7 @@ export const parseSourceFragment = (fragmentWithLocation) => {
     const { fragment, location } = fragmentWithLocation;
     let nodeType;
     try {
-        const genericParseResult = genericParse(fragment);
+        const genericParseResult = genericParse(fragmentWithLocation);
         const { type } = genericParseResult;
         nodeType = type;
         if (genericParseResult.synthetic) {

package/build/src/utils/SourceLocation.d.mts

@@ -1,3 +1,10 @@
+/**
+ * Information about a parsed directive
+ */
+export interface DirectiveInfo {
+    date?: string;
+    directive: string;
+}
 /**
  * Location information for a fragment of source code
  */
@@ -9,15 +16,30 @@ export interface SourceLocation {
     /** Optional file path */
     filePath?: string;
 }
-/**
- * A source fragment with associated location metadata
- */
-export interface SourceFragmentWithLocation {
+interface SourceFragmentWithLocationBase {
     /** The lines of source code */
     fragment: string[];
     /** Location information */
     location: SourceLocation;
 }
+/**
+ * A source fragment identified as a directive
+ */
+export interface SourceFragmentWithLocationDirective extends SourceFragmentWithLocationBase {
+    isDirective: true;
+    directiveInfo: DirectiveInfo;
+}
+/**
+ * A source fragment that is not a directive (e.g. a comment)
+ */
+export interface SourceFragmentWithLocationNonDirective extends SourceFragmentWithLocationBase {
+    isDirective: false;
+    directiveInfo: undefined;
+}
+/**
+ * A source fragment with associated location metadata
+ */
+export type SourceFragmentWithLocation = SourceFragmentWithLocationDirective | SourceFragmentWithLocationNonDirective;
 /**
  * Custom error class for beancount parsing errors with location context
  */
@@ -70,3 +92,4 @@ export declare class BeancountParseError extends Error {
      */
     toString(): string;
 }
+export {};

package/build/src/utils/splitStringIntoSourceFragments.js

@@ -21,7 +21,6 @@ export const splitStringIntoSourceFragments = (source) => {
     // split up the file into source fragments with line tracking
     let inFragment = false;
     let inString = false;
-    let isDirectiveFragment = false;
     const fragmentsWithLines = lines.reduce((acc, line, index) => {
         const lineNumber = index + 1; // 1-based line numbers
         if (!inString) {
@@ -34,34 +33,55 @@ export const splitStringIntoSourceFragments = (source) => {
                 inFragment = false;
             }
             if (!inFragment) {
-                acc.push({ lines: [], startLine: lineNumber });
                 inFragment = true;
-                isDirectiveFragment = beanCountDirectiveRegex.test(line);
+                const fragmentInfo = beanCountDirectiveRegex.exec(line);
+                if (!fragmentInfo) {
+                    acc.push({
+                        lines: [],
+                        startLine: lineNumber,
+                        isDirective: false,
+                        directiveInfo: undefined,
+                    });
+                }
+                else {
+                    acc.push({
+                        lines: [],
+                        startLine: lineNumber,
+                        isDirective: true,
+                        directiveInfo: {
+                            date: fragmentInfo.groups.date,
+                            directive: fragmentInfo.groups.dated_directive ??
+                                fragmentInfo.groups.non_dated_directive,
+                        },
+                    });
+                }
             }
         }
-        acc[acc.length - 1].lines.push(line);
+        const currentFragment = acc[acc.length - 1];
+        currentFragment.lines.push(line);
         // After a blank line, ensure next line starts a new fragment
         if (!inString && line.trim() === '') {
             inFragment = false;
         }
         // odd number of ", we're in an unclosed string
-        if (isDirectiveFragment && countChar(line, '"') % 2 === 1) {
+        if (currentFragment.isDirective && countChar(line, '"') % 2 === 1) {
             inString = !inString;
         }
         return acc;
     }, []);
-    return fragmentsWithLines.map(({ lines, startLine }) => {
+    return fragmentsWithLines.map(({ lines, startLine, isDirective, directiveInfo }) => {
         const location = {
             startLine,
             endLine: startLine + lines.length - 1,
         };
         // Comment fragments (non-directives) may contain unbalanced quotes,
         // so skip string-aware splitting for them.
-        const firstLine = lines[0] ?? '';
-        if (!beanCountDirectiveRegex.test(firstLine)) {
+        if (!isDirective) {
             return {
                 fragment: lines,
                 location,
+                isDirective: false,
+                directiveInfo: undefined,
             };
         }
         try {
@@ -69,6 +89,8 @@ export const splitStringIntoSourceFragments = (source) => {
             return {
                 fragment: splitLines,
                 location,
+                isDirective: true,
+                directiveInfo,
             };
         }
         catch (error) {