fix(macro): Trans inside Plural has leading whitespace

[Martin005]

Description

Fixes #1292

PR for updates in SWC plugin: lingui/swc-plugin#17

Types of changes

• Bugfix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• Documentation update

Checklist

• I have read the CONTRIBUTING and CODE_OF_CONDUCT docs
• I have added tests that prove my fix is effective or that my feature works
• I have added necessary documentation (if appropriate)

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated
js-lingui	✅ Ready (Inspect)	Visit Preview	💬 Add your feedback	Feb 15, 2023 at 9:26AM (UTC)

[github-actions]

size-limit report 📦

Path	Size
./packages/core/build/esm/index.js	1.76 KB (0%)
./packages/detect-locale/build/esm/index.js	812 B (0%)
./packages/react/build/esm/index.js	1.79 KB (0%)
./packages/remote-loader/build/esm/index.js	7.29 KB (0%)

[codecov]

Codecov Report

Base: 70.92% // Head: 70.92% // No change to project coverage 👍

Coverage data is based on head (1f95bab) compared to base (77d1c08).
Patch has no changes to coverable lines.

Additional details and impacted files

@@           Coverage Diff           @@
##             next    #1437   +/-   ##
=======================================
  Coverage   70.92%   70.92%           
=======================================
  Files          75       75           
  Lines        1940     1940           
  Branches      525      525           
=======================================
  Hits         1376     1376           
  Misses        452      452           
  Partials      112      112           

Impacted Files	Coverage Δ
packages/macro/src/macroJsx.ts	91.60% <ø> (ø)
packages/macro/test/jsx-plural.ts	100.00% <ø> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

[timofei-iatsenko]

@Martin005 please, to next branch. We agreed on codefreeze on a main branch.

It also should be ported to the SWC plugin, otherwise would be id mismatch with messages in catalog.
Extractor uses results from the js macro, so any changes to the extraction results would affect SWC plugin.

[Martin005]

@thekip There are already a few commits to the main branch: next vs main and if we want to release some 3.x version with these bugfixes, this is the better way to go.
As for the SWC plugin, I am already looking into it and will create a PR in a moment.

[andrii-bodnar]

Yes, it's a small fix that can be easily merged and released within a 3.x version

[timofei-iatsenko]

This small fix will also break existing catalogs with translations because of different whitespaces.

Also SWC plugin version should be fixed with extractor version otherwise - id mismatch.

[timofei-iatsenko]

@Martin005 could you add a unit test into packages/macro/src/macroJsx.test.ts "jsx macro" -> "normalizeWhitespace" suite

[Martin005]

@thekip

This small fix will also break existing catalogs with translations because of different whitespaces.

Yeah, I keep forgetting that... I will change the base branch to next.

Also SWC plugin version should be fixed with extractor version otherwise - id mismatch.

Here is the PR for SWC plugin: lingui/swc-plugin#17

[Martin005]

@thekip

could you add a unit test into packages/macro/src/macroJsx.test.ts "jsx macro" -> "normalizeWhitespace" suite

Added in this commit

[timofei-iatsenko]

In the meantime, we can think about how make generating id's from original message less fragile and depend on the spaces. I have been thinking about that and don't see a clear and easy solution.

Removing all whitespaces from the message before generating the hash?

Not an option because: <Trans>Hello{' '}</Trans> and <Trans>Hello</Trans> would collide.

[andrii-bodnar]

@thekip you're right, any message modification before generating hash can have unexpected downsides, so maybe it would be better not to do this