github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-03-11 04:32:39 -05:00
Code Issues 250 Packages Projects Releases 53 Wiki Activity

[PR #1076] [MERGED] chore: add types to crdt package #3504

New Issue
Closed
opened 2026-02-28 20:42:36 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-02-28 20:42:36 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/1076
Author: @TomAFrench
Created: 5/30/2023
Status: ✅ Merged
Merged: 7/4/2023
Merged by: @j-f1

Base: master ← Head: add-merkle-types

📝 Commits (10+)

  • a9edf1e chore: add types to crdt directory
  • 479f272 chore: add changelog entry
  • 03f8e7a fix: revert to || from ??
  • 1d80d85 chore: update PR number
  • 86851f2 chore: use qualified form of merkle.emptyTrie
  • 673b991 fix: correct type issue in sync/repair.ts
  • dc8a0cf chore: add closing backtick in jsdoc
  • ac33312 chore: add return type for diff
  • 740e959 chore: revert change to Message type
  • 6ccfd38 Merge branch 'master' into add-merkle-types

📊 Changes

18 files changed (+341 additions, -302 deletions)

View changed files

📝 packages/crdt/src/crdt/index.ts (+1 -0)
📝 packages/crdt/src/crdt/merkle.test.ts (+8 -8)
📝 packages/crdt/src/crdt/merkle.ts (+36 -13)
📝 packages/crdt/src/crdt/timestamp.test.ts (+5 -5)
📝 packages/crdt/src/crdt/timestamp.ts (+200 -202)
📝 packages/crdt/src/main.ts (+1 -0)
📝 packages/loot-core/src/server/main.ts (+0 -2)
📝 packages/loot-core/src/server/migrate/migrations.ts (+22 -9)
📝 packages/loot-core/src/server/sync/encoder.ts (+5 -5)
📝 packages/loot-core/src/server/sync/index.ts (+5 -22)
📝 packages/loot-core/src/server/sync/migrate.test.ts (+3 -1)
📝 packages/loot-core/src/server/sync/migrate.ts (+2 -2)
📝 packages/loot-core/src/server/sync/repair.ts (+11 -4)
📝 packages/loot-core/src/server/sync/sync.property.test.ts (+2 -2)
📝 packages/loot-core/src/server/sync/sync.test.ts (+13 -18)
📝 packages/loot-core/src/server/tests/mockSyncServer.ts (+19 -7)
📝 packages/loot-core/src/server/undo.ts (+2 -2)
➕ upcoming-release-notes/1076.md (+6 -0)

📄 Description

This PR adds types to the crdt directory to make the structure of the merkle tree (really a merkle radix trie) clearer.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/1076 **Author:** [@TomAFrench](https://github.com/TomAFrench) **Created:** 5/30/2023 **Status:** ✅ Merged **Merged:** 7/4/2023 **Merged by:** [@j-f1](https://github.com/j-f1) **Base:** `master` ← **Head:** `add-merkle-types` --- ### 📝 Commits (10+) - [`a9edf1e`](https://github.com/actualbudget/actual/commit/a9edf1e5feb78f46c225540806d47cddaadaad10) chore: add types to `crdt` directory - [`479f272`](https://github.com/actualbudget/actual/commit/479f2721c6fb39557e95948237bd6b2754c49f7b) chore: add changelog entry - [`03f8e7a`](https://github.com/actualbudget/actual/commit/03f8e7a466f8af42a112249876b4fd67b4f0e7cf) fix: revert to `||` from `??` - [`1d80d85`](https://github.com/actualbudget/actual/commit/1d80d85eb3f6035470a9985d2c8f8993bf32fbea) chore: update PR number - [`86851f2`](https://github.com/actualbudget/actual/commit/86851f21f84fe16ee3c1d28ff8d9e54dda281d10) chore: use qualified form of `merkle.emptyTrie` - [`673b991`](https://github.com/actualbudget/actual/commit/673b9919ebc8050c2faa707d1e9edbd0e463d949) fix: correct type issue in `sync/repair.ts` - [`dc8a0cf`](https://github.com/actualbudget/actual/commit/dc8a0cf7a030eb60784cf91f5918f9a29bf7dc09) chore: add closing backtick in jsdoc - [`ac33312`](https://github.com/actualbudget/actual/commit/ac333126295f1a1c9e6940b89379f5171862a634) chore: add return type for `diff` - [`740e959`](https://github.com/actualbudget/actual/commit/740e9597abc71c1344e064f59cf9ecda8b29de4d) chore: revert change to `Message` type - [`6ccfd38`](https://github.com/actualbudget/actual/commit/6ccfd385f8155d024021aaafa28b3aff07a60fbf) Merge branch 'master' into add-merkle-types ### 📊 Changes **18 files changed** (+341 additions, -302 deletions) <details> <summary>View changed files</summary> 📝 `packages/crdt/src/crdt/index.ts` (+1 -0) 📝 `packages/crdt/src/crdt/merkle.test.ts` (+8 -8) 📝 `packages/crdt/src/crdt/merkle.ts` (+36 -13) 📝 `packages/crdt/src/crdt/timestamp.test.ts` (+5 -5) 📝 `packages/crdt/src/crdt/timestamp.ts` (+200 -202) 📝 `packages/crdt/src/main.ts` (+1 -0) 📝 `packages/loot-core/src/server/main.ts` (+0 -2) 📝 `packages/loot-core/src/server/migrate/migrations.ts` (+22 -9) 📝 `packages/loot-core/src/server/sync/encoder.ts` (+5 -5) 📝 `packages/loot-core/src/server/sync/index.ts` (+5 -22) 📝 `packages/loot-core/src/server/sync/migrate.test.ts` (+3 -1) 📝 `packages/loot-core/src/server/sync/migrate.ts` (+2 -2) 📝 `packages/loot-core/src/server/sync/repair.ts` (+11 -4) 📝 `packages/loot-core/src/server/sync/sync.property.test.ts` (+2 -2) 📝 `packages/loot-core/src/server/sync/sync.test.ts` (+13 -18) 📝 `packages/loot-core/src/server/tests/mockSyncServer.ts` (+19 -7) 📝 `packages/loot-core/src/server/undo.ts` (+2 -2) ➕ `upcoming-release-notes/1076.md` (+6 -0) </details> ### 📄 Description This PR adds types to the `crdt` directory to make the structure of the merkle tree (really a merkle radix trie) clearer. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-02-28 20:42:36 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
AI generated
API
bank sync
budgeting
bug
can’t replicate
dependencies
docker
documentation
electron
experimental feature
feature
feedback
goal templates
good first issue
help wanted
importers
maintenance
needs info
needs testing
needs triage
needs votes
openid
payees
pull-request
Mirrored from GitHub Pull Request
 regression
reports
responsive
rules
schedules
server
✨ merged
split transactions
tech debt
theme
transaction import
transaction reconciliation
transactions
translations
upstream
user interface
✅ approved
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#3504
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?