Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👷 Typescript: Improving typing of asyncStorage (global-store.json) #4369

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

MikesGlitch
Copy link
Contributor

@MikesGlitch MikesGlitch commented Feb 12, 2025

Problem:

Every setting from global-store.json was being treated like a string and then parsed. There are values in the global-store.json that aren't strings. E.g. did-bootstrap

I've added a new type to represent the global-store.json file as it currently stands. The existing GlobalStore represents the values after they have been parsed.

This makes it a lot easier to add more complex types/types that aren't just strings. It also gives us intellisense/type safety on the prefs functions (e.g. multiGet).

This should help me out in #4357 where I want to add a global-store setting like:

syncServerSettings: {
   port: 5007,
   autoStart: true,
   ngrok: {
      token: 'thetoken',
      domain: 'thengrokdomain.com'
   }
}

test

#1483

Copy link

netlify bot commented Feb 12, 2025

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit d2d197e
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/67ad0fa9abc7e10008f4b09d
😎 Deploy Preview https://deploy-preview-4369.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

github-actions bot commented Feb 12, 2025

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
17 6.89 MB → 6.89 MB (+1.78 kB) +0.03%
Changeset
File Δ Size
node_modules/clsx/dist/clsx.js 🆕 +509 B 0 B → 509 B
node_modules/clsx/dist/clsx.js?commonjs-module 🆕 +27 B 0 B → 27 B
locale/fr.json 📈 +1.93 kB (+3.42%) 56.49 kB → 58.42 kB
locale/en-GB.json 📈 +88 B (+0.09%) 99.33 kB → 99.42 kB
node_modules/react-grid-layout/build/ReactGridLayout.js 📉 -1 B (-0.00%) 24.96 kB → 24.96 kB
node_modules/react-grid-layout/build/GridItem.js 📉 -1 B (-0.00%) 21.49 kB → 21.49 kB
node_modules/react-grid-layout/build/components/WidthProvider.js 📉 -1 B (-0.02%) 5.22 kB → 5.22 kB
locale/de.json 📉 -108 B (-0.10%) 110.87 kB → 110.77 kB
node_modules/define-data-property/index.js 📉 -9 B (-0.39%) 2.25 kB → 2.24 kB
node_modules/call-bind/index.js 📉 -9 B (-0.84%) 1.05 kB → 1.04 kB
node_modules/has-property-descriptors/index.js 📉 -9 B (-1.55%) 582 B → 573 B
node_modules/es-define-property/index.js 📉 -210 B (-37.50%) 560 B → 350 B
node_modules/clsx/dist/clsx.mjs 🔥 -368 B (-100%) 368 B → 0 B
node_modules/clsx/dist/clsx.mjs?commonjs-proxy 🔥 -64 B (-100%) 64 B → 0 B
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/fr.js 56.49 kB → 58.42 kB (+1.93 kB) +3.42%
static/js/en-GB.js 99.33 kB → 99.42 kB (+88 B) +0.09%

Smaller

Asset File Size % Changed
static/js/de.js 110.87 kB → 110.77 kB (-108 B) -0.10%
static/js/index.js 4.29 MB → 4.29 MB (-69 B) -0.00%
static/js/ReportRouter.js 1.59 MB → 1.59 MB (-67 B) -0.00%

Unchanged

Asset File Size % Changed
static/js/en.js 99.43 kB 0%
static/js/nl.js 94.83 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/workbox-window.prod.es5.js 5.69 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/uk.js 111.11 kB 0%
static/js/pt-BR.js 106.43 kB 0%
static/js/useAccountPreviewTransactions.js 1.69 kB 0%
static/js/AppliedFilters.js 10.52 kB 0%
static/js/wide.js 102.8 kB 0%
static/js/narrow.js 85.08 kB 0%

Copy link
Contributor

github-actions bot commented Feb 12, 2025

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
1 1.33 MB → 1.33 MB (+3 B) +0.00%
Changeset
File Δ Size
packages/loot-core/src/platform/server/asyncStorage/index.web.ts 📉 -9 B (-0.28%) 3.18 kB → 3.17 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
kcab.worker.js 1.33 MB → 1.33 MB (+3 B) +0.00%

Smaller

No assets were smaller

Unchanged

No assets were unchanged

@MikesGlitch MikesGlitch changed the title 👷 Typescript: Typing GlobalPrefs (global-store.json) 👷 Typescript: Improving typing of prefs functions (global-store.json) Feb 12, 2025
@MikesGlitch MikesGlitch changed the title 👷 Typescript: Improving typing of prefs functions (global-store.json) 👷 Typescript: Improving typing of asyncStorage (global-store.json) Feb 12, 2025
@MikesGlitch MikesGlitch marked this pull request as ready for review February 12, 2025 21:25
Copy link
Contributor

coderabbitai bot commented Feb 12, 2025

Walkthrough

The pull request updates the asynchronous storage functions across various modules to improve type safety through the use of TypeScript generics based on the GlobalPrefsJson type. The signatures for functions such as getItem, setItem, removeItem, multiGet, multiSet, and multiRemove have been modified to enforce type constraints on keys and values. In addition, the changes include adjustments to variable declarations in Electron and testing environments, converting regular functions into asynchronous ones with explicit promise return types as needed. The main server handlers are updated with TypeScript assertions to ensure correctly inferred types during asynchronous operations. New type definitions, namely GlobalPrefs and GlobalPrefsJson, have also been added to clearly define the structure of global preferences.

Suggested labels

:sparkles: Merged

Suggested reviewers

  • joel-jeremy
  • matt-fidd
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (3)
packages/loot-core/src/types/prefs.d.ts (1)

89-107: Consider using string literal types for boolean values.

For properties that represent boolean values as strings, consider using string literal types to prevent invalid values.

Apply this diff to improve type safety:

-  'floating-sidebar'?: string; // "true" or "false"
+  'floating-sidebar'?: 'true' | 'false';
-  'did-bootstrap'?: boolean;
+  'did-bootstrap'?: 'true' | 'false';
packages/loot-core/src/platform/server/asyncStorage/index.electron.ts (1)

14-26: Consider adding error type information.

The error handling in init could benefit from type information for better error handling.

Apply this diff to improve error handling:

 export const init: T.Init = function ({ persist = true } = {}) {
   if (persist) {
     try {
       store = JSON.parse(fs.readFileSync(getStorePath(), 'utf8'));
-    } catch (e) {
+    } catch (e: unknown) {
+      if (e instanceof Error) {
+        console.warn(`Failed to load global store: ${e.message}`);
+      }
       store = {};
     }
   } else {
     store = {};
   }
packages/loot-core/src/platform/server/asyncStorage/index.web.ts (1)

57-77: LGTM! Consider adding an explicit return type.

The function signature change improves type safety by constraining the keys to be valid keys from GlobalPrefsJson. However, consider adding an explicit return type for better type safety and documentation.

-export async function multiGet<K extends readonly (keyof GlobalPrefsJson)[]>(
-  keys: K,
-) {
+export async function multiGet<K extends readonly (keyof GlobalPrefsJson)[]>(
+  keys: K,
+): Promise<[K[number], GlobalPrefsJson[K[number]]][]> {
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 524707c and d2d197e.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/4369.md is excluded by !**/*.md
📒 Files selected for processing (6)
  • packages/loot-core/src/platform/server/asyncStorage/index.d.ts (1 hunks)
  • packages/loot-core/src/platform/server/asyncStorage/index.electron.ts (2 hunks)
  • packages/loot-core/src/platform/server/asyncStorage/index.testing.ts (2 hunks)
  • packages/loot-core/src/platform/server/asyncStorage/index.web.ts (3 hunks)
  • packages/loot-core/src/server/main.ts (2 hunks)
  • packages/loot-core/src/types/prefs.d.ts (2 hunks)
🧰 Additional context used
🧠 Learnings (1)
packages/loot-core/src/types/prefs.d.ts (1)
Learnt from: MatissJanis
PR: actualbudget/actual#3458
File: packages/loot-core/src/client/state-types/prefs.d.ts:5-5
Timestamp: 2024-11-10T16:45:25.627Z
Learning: In future reviews, ensure that changes related to `PrefsState` in `prefs.d.ts` do not incorrectly assume necessary updates in other parts of the codebase. Verify the impact thoroughly before making suggestions.
🪛 Biome (1.9.4)
packages/loot-core/src/platform/server/asyncStorage/index.d.ts

[error] 22-22: 'async' modifier cannot be used in an ambient context.

(parse)

🔇 Additional comments (6)
packages/loot-core/src/types/prefs.d.ts (1)

77-87: LGTM! Well-structured type definition for parsed global preferences.

The GlobalPrefs type accurately represents the parsed values with appropriate types for each property.

packages/loot-core/src/platform/server/asyncStorage/index.d.ts (1)

6-6: LGTM! Well-designed type definitions with proper generic constraints.

The type definitions ensure type safety by:

  • Using generics to maintain type relationships
  • Properly constraining keys to GlobalPrefsJson
  • Ensuring value types match their corresponding keys

Also applies to: 8-34

packages/loot-core/src/platform/server/asyncStorage/index.testing.ts (1)

1-46: LGTM! Clean and type-safe testing implementation.

The testing implementation provides a simple in-memory store with proper type safety.

packages/loot-core/src/platform/server/asyncStorage/index.web.ts (1)

2-2: LGTM!

The import of GlobalPrefsJson type is correctly added to support the type-safe implementation of the multiGet function.

packages/loot-core/src/server/main.ts (2)

1096-1099: LGTM!

The as const type assertion correctly ensures that the array of keys is treated as a readonly tuple of literal types, which is required for the type-safe implementation of multiGet.


1374-1393: LGTM!

The as const type assertion correctly ensures that the array of keys is treated as a readonly tuple of literal types, which is required for the type-safe implementation of multiGet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant