korrat/beancount-importers - Change NG5QXPZH5M5EMEQOUSI3VVFB4ORIARTE7WSVEHFG7NJ2S4MTAYFQC

Extract Account into separate crate

Created by korrat on April 1, 2023

NG5QXPZH5M5EMEQOUSI3VVFB4ORIARTE7WSVEHFG7NJ2S4MTAYFQC

Dependencies

In channels

main

Change contents

File addition: beancount (d--x------)
[3.1]
File addition: account (d--x------)
[0.1]
File addition: tests (d--x------)
[0.24]

File addition: basic.rs (---x------)

[0.45]

use core::fmt::Debug;
use core::hash::Hash;
use core::str::FromStr;
use beancount_account::Acc;
use beancount_account::Account;
use static_assertions::assert_impl_all;
use test_case::test_case;
assert_impl_all!(
    Account: Clone,
    Debug,
    FromStr,
    Hash,
    Ord,
    TryFrom<&'static str>
);
#[test_case("Assets"; "only top-level")]
#[test_case("Cash"; "unknown top-level account")]
#[test_case("Equity:OpeningBalances"; "subaccount")]
#[test_case("Expenses:Banking-Fees"; "subaccount with dash")]
#[test_case("Income:Sales:2022"; "subaccount starting with number")]
#[test_case("Liabilities:Credit-Cards:VISA"; "multiple levels")]
fn parse_when_valid(name: &str) {
    let acc = <&Acc>::try_from(name).unwrap();
    let account = Account::try_from(name).unwrap();
    assert_eq!(account, name);
    assert_eq!(acc, name);
}
#[test_case("Assets:Accounts_Receivable"; "invalid characters")]
#[test_case("Assets:-Test"; "subaccount starting with dash")]
#[test_case("Income::Sales"; "empty segment")]
fn do_not_parse_when_invalid(name: &str) {
    <&Acc>::try_from(name).unwrap_err();
}

File addition: src (d--x------)
[0.24]
File move: account.rs → lib.rs
BF:BFD[4.44] → [4.11431:11465]
BF:BF[4.11465] → [4.11466:11466]
[0.1201]
[4.11466]
Insertion in beancount/account/src/lib.rs at line 3 [4.11466]
[5.13676]
[5.13676]
```
use alloc::borrow::Cow;
```
Deletion in beancount/account/src/lib.rs at line 16 [4.11466]
B:BD[5.13938] → [5.13938:13962]
```
use alloc::borrow::Cow;
```
Deletion in beancount/account/src/lib.rs at line 24 [4.11466]
B:BD[4.11550] → [2.9697:9723]
```
pub(crate) mod template;
```

Replacement in beancount/account/src/lib.rs at line 1219 [4.11466]

B:BD[4.25499] → [4.25499:25596]

        r#"^(?:Assets|Equity|Expenses|Income|Liabilities)(?::[\p{Lu}\p{Nd}][-\p{L}\p{Nd}]*)*$"#,

[4.25499]

[4.25596]

        r#"^(?:[\p{Lu}\p{Nd}][-\p{L}\p{Nd}]*)(?::[\p{Lu}\p{Nd}][-\p{L}\p{Nd}]*)*$"#,

File addition: Cargo.toml (---x------)

[0.24]

[package]
name = "beancount-account"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
# Inherited dependencies
delegate.workspace = true
lazy-regex.workspace = true
miette.workspace = true
momo.workspace = true
serde.workspace = true
snafu.workspace = true
[dev-dependencies]
test-case.workspace = true
static_assertions.workspace = true

Deletion in common/beancount-types/tests/snapshots/account_template__parsing_only_base_account_works.snap at line 3 [2.121]
B:BD[2.183] → [2.183:202]
```
assertion_line: 30
```
Replacement in common/beancount-types/tests/snapshots/account_template__parsing_only_base_account_works.snap at line 6 [2.121]
B:BD[2.238] → [2.238:254]
```
    base: Acc {
```
[2.238]
[2.254]
```
    base: Account {
```
Replacement in common/beancount-types/tests/snapshots/account_template__parsing_base_account_and_trailing_selector_works.snap at line 6 [2.3681]
B:BD[2.3779] → [2.3779:3795]
```
    base: Acc {
```
[2.3779]
[2.3795]
```
    base: Account {
```
Replacement in common/beancount-types/tests/snapshots/account_template__parsing_base_account_and_multiple_trailing_selectors_works.snap at line 6 [2.4066]
B:BD[2.4164] → [2.4164:4180]
```
    base: Acc {
```
[2.4164]
[2.4180]
```
    base: Account {
```
Replacement in common/beancount-types/tests/snapshots/account_template__parsing_base_account_and_mixed_trailing_selectors_and_literals_works.snap at line 6 [2.4654]
B:BD[2.4752] → [2.4752:4768]
```
    base: Acc {
```
[2.4752]
[2.4768]
```
    base: Account {
```
Replacement in common/beancount-types/tests/snapshots/account_template__parsing_base_account_and_mixed_trailing_selectors_and_literals_works.snap at line 21 [2.4654]
B:BD[2.5036] → [2.5036:5054]
```
            Seg {
```
[2.5036]
[2.5054]
```
            Segment {
```

Deletion in common/beancount-types/src/that.rs at line 1 [4.2458]

B:BD[4.2458] → [4.2459:2535]

B:BD[4.2535] → [5.3839:3919]

∅:D[5.3919] → [4.2535:2579]

B:BD[4.2535] → [4.2535:2579]

B:BD[4.2656] → [4.2656:3694]

mod account {
    use crate::account::Acc;
    use crate::account::Account;
    use core::fmt::Debug;
    use core::hash::Hash;
    use core::str::FromStr;
    use static_assertions::assert_impl_all;
    use test_case::test_case;
    assert_impl_all!(
        Account: Clone,
        Debug,
        FromStr,
        Hash,
        Ord,
        TryFrom<&'static str>
    );
    #[test_case("Assets"; "only top-level")]
    #[test_case("Equity:OpeningBalances"; "subaccount")]
    #[test_case("Expenses:Banking-Fees"; "subaccount with dash")]
    #[test_case("Income:Sales:2022"; "subaccount starting with number")]
    #[test_case("Liabilities:Credit-Cards:VISA"; "multiple levels")]
    fn parse_when_valid(name: &str) {
        let acc = <&Acc>::try_from(name).unwrap();
        let account = Account::try_from(name).unwrap();
        assert_eq!(account, name);
        assert_eq!(acc, name);
    }
    #[test_case("Cash"; "invalid account type")]
    #[test_case("Assets:Accounts_Receivable"; "invalid characters")]
    #[test_case("Assets:-Test"; "subaccount starting with dash")]
    #[test_case("Income::Sales"; "empty segment")]
    fn do_not_parse_when_invalid(name: &str) {
        <&Acc>::try_from(name).unwrap_err();
    }
}

Insertion in common/beancount-types/src/lib.rs at line 5 [4.5874]

[2.9633]

pub use beancount_account::Acc;
pub use beancount_account::Account;
pub use beancount_account::Seg;
pub use beancount_account::Segment;

Deletion in common/beancount-types/src/lib.rs at line 11 [4.5874]
∅:D[6.20] → [5.4030:4092]
∅:D[2.9696] → [5.4030:4092]
B:BD[4.5874] → [5.4030:4092]
B:BD[5.4092] → [6.21:83]
```
pub use crate::account::Acc;
pub use crate::account::Account;
pub use crate::account::Seg;
pub use crate::account::Segment;
```
File addition: account.rs (---x------)
[4.44]
```
pub(crate) mod template;
```
Insertion in common/beancount-types/src/account/template.rs at line 5 [2.9781]
[2.9827]
[2.9827]
```
use beancount_account::AccountError;
use beancount_account::SegmentError;
```
Deletion in common/beancount-types/src/account/template.rs at line 13 [2.9781]
B:BD[2.9921] → [2.9921:9989]
```
use crate::account::AccountError;
use crate::account::SegmentError;
```
Insertion in common/beancount-types/Cargo.toml at line 25 [4.25786]
[4.26128]
[4.26128]
```
# Workspace dependencies
beancount-account.path = "../../beancount/account"
```

Extract Account into separate crate

Dependencies

In channels

Change contents

File addition: beancount (d--x------)

File addition: account (d--x------)

File addition: tests (d--x------)

File addition: basic.rs (---x------)

File addition: src (d--x------)

File move: account.rs → lib.rs

Insertion in beancount/account/src/lib.rs at line 3 [4.11466]

Deletion in beancount/account/src/lib.rs at line 16 [4.11466]

Deletion in beancount/account/src/lib.rs at line 24 [4.11466]

Replacement in beancount/account/src/lib.rs at line 1219 [4.11466]

File addition: Cargo.toml (---x------)

Deletion in common/beancount-types/tests/snapshots/account_template__parsing_only_base_account_works.snap at line 3 [2.121]

Replacement in common/beancount-types/tests/snapshots/account_template__parsing_only_base_account_works.snap at line 6 [2.121]

Replacement in common/beancount-types/tests/snapshots/account_template__parsing_base_account_and_trailing_selector_works.snap at line 6 [2.3681]

Replacement in common/beancount-types/tests/snapshots/account_template__parsing_base_account_and_multiple_trailing_selectors_works.snap at line 6 [2.4066]

Replacement in common/beancount-types/tests/snapshots/account_template__parsing_base_account_and_mixed_trailing_selectors_and_literals_works.snap at line 6 [2.4654]

Replacement in common/beancount-types/tests/snapshots/account_template__parsing_base_account_and_mixed_trailing_selectors_and_literals_works.snap at line 21 [2.4654]

Deletion in common/beancount-types/src/that.rs at line 1 [4.2458]

Insertion in common/beancount-types/src/lib.rs at line 5 [4.5874]

Deletion in common/beancount-types/src/lib.rs at line 11 [4.5874]

File addition: account.rs (---x------)

Insertion in common/beancount-types/src/account/template.rs at line 5 [2.9781]

Deletion in common/beancount-types/src/account/template.rs at line 13 [2.9781]

Insertion in common/beancount-types/Cargo.toml at line 25 [4.25786]