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.

Sign up for GitHub

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

Jump to bottom

fix(transformer/typescript): enum merging when same name declared in outer scope #8691

Merged
merged 7 commits into from
Jan 26, 2025
Merged

fix(transformer/typescript): enum merging when same name declared in outer scope #8691

merged 7 commits into from
Jan 26, 2025

Conversation

branchseer
Copy link
Member 

var x = 10;
enum Merge { x = Math.random() }
enum Merge {
    y = x // <-- refers to Merge.x
}

This case wasn't covered in #8543 and by the babel test case. To handle it we still have to go through the scope ancestors.

@graphite-app Graphite App
Copy link

graphite-app bot commented Jan 24, 2025

How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • 0-merge - adds this PR to the back of the merge queue
  • hotfix - for urgent hot fixes, skip the queue and merge this PR next

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

@github-actions github-actions bot added A-transformer Area - Transformer / Transpiler C-bug Category - Bug labels Jan 24, 2025
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented Jan 24, 2025 •
edited
Loading

CodSpeed Performance Report

Merging #8691 will not alter performance

Comparing branchseer:enum-merge-fix (9ab2c53) with main (e7ab96c)

Summary

✅ 33 untouched benchmarks

@Dunqing Dunqing self-assigned this Jan 24, 2025
@Dunqing
Copy link
Member

Dunqing commented Jan 25, 2025

I spend a bit of time to figure out what happens here, I think storing scopes of expression and using it would be easier and more efficient because we don't need to go through the whole ancestor scope, and usually it only happens in the enum scope.

@Dunqing
Copy link
Member

Dunqing commented Jan 25, 2025

@branchseer Please review 9729ad2, if you don't think so I am happy you to revert or modify it.

@branchseer
Copy link
Member Author

branchseer commented Jan 25, 2025 •
edited by Dunqing
Loading

@Dunqing LGTM. I agree your approach is more optimal.

In 154d4c5 I took the liberty to add a non-Option version of first() for NonEmptyStack. cc @overlookmotel

@Dunqing
Copy link
Member

Dunqing commented Jan 25, 2025

@Dunqing LGTM. I agree your approach is more optimal.

In 154d4c5 I took the liberty to add a non-Option version of first() for NonEmptyStack. cc @overlookmotel

I am happy you do it! But I think you should create an another PR to do that, don't let it block this PR to merge, and also make it more easy to review.

Dunqing
Dunqing approved these changes Jan 25, 2025
View reviewed changes
Copy link
Member

@Dunqing Dunqing left a comment

Choose a reason for hiding this comment

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

Thanks！

@Boshen Boshen merged commit 3e509e1 into oxc-project:main Jan 26, 2025
27 checks passed
@oxc-bot oxc-bot mentioned this pull request Jan 26, 2025
Merged
Boshen added a commit that referenced this pull request Jan 26, 2025
@oxc-bot @Boshen
release(crates): v0.48.1 (#8738)
2fb08b9 
## [0.48.1] - 2025-01-26

### Features

- b7f13e6 ast: Implement utf8 to utf16 span converter (#8687) (Boshen)
- 6589c3b mangler: Reuse variable names (#8562) (翠 / green)
- 29bd215 minifier: Minimize `Infinity.toString(radix)` to `'Infinity'`
(#8732) (Boshen)
- e0117db minifier: Replace `const` with `let` for non-exported
read-only variables (#8733) (sapphi-red)
- 9e32f55 minifier: Evaluate `Math.sqrt` and `Math.cbrt` (#8731)
(sapphi-red)
- 360d49e minifier: Replace `Math.pow` with `**` (#8730) (sapphi-red)
- 2e9a560 minifier: `NaN.toString(radix)` is always `NaN` (#8727)
(Boshen)
- cbe0e82 minifier: Minimize `foo(...[])` -> `foo()` (#8726) (Boshen)
- e9fb5fe minifier: Dce pure expressions such as `new Map()` (#8725)
(Boshen)

### Bug Fixes

- 0944758 codegen: Remove parens from `new (import(''), function() {})`
(#8707) (Boshen)
- 33de70a mangler: Handle cases where a var is declared in a block scope
(#8706) (翠 / green)
- d982cdb minifier: `Unknown.fromCharCode` should not be treated as
`String.fromCharCode` (#8709) (sapphi-red)
- e7ab96c transformer/jsx: Incorrect `isStaticChildren` argument for
`Fragment` with multiple children (#8713) (Dunqing)
- 3e509e1 transformer/typescript: Enum merging when same name declared
in outer scope (#8691) (branchseer)

### Performance

- dc0b0f2 manger: Remove useless `tmp_bindings` (#8735) (Dunqing)
- e472ced mangler: Optimize handling of collecting lived scope ids
(#8724) (Dunqing)
- 8587965 minifier: Normalize `undefined` to `void 0` before everything
else (#8699) (Boshen)

### Refactor

- 58002e2 ecmascript: Remove the lifetime annotation on
`MayHaveSideEffects` (#8717) (Boshen)
- 10e5920 linter: Move finishing default diagnostic message to
`GraphicalReporter` (#8683) (Sysix)
- 52a37d0 mangler: Simplify initialization of `slots` (#8734) (Dunqing)
- 6bc906c minifier: Allow mutating arguments in methods called from
`try_fold_known_string_methods` (#8729) (sapphi-red)
- bf8be23 minifier: Use `Ctx` (#8716) (Boshen)
- 0af0267 minifier: Side effect detection needs symbols resolution
(#8715) (Boshen)
- 32e0e47 minifier: Clean up `Normalize` (#8700) (Boshen)
- c792068 semantic: Simplify `ScopeTree::iter_bindings` (#8723)
(Dunqing)

### Testing

- 03229c5 minifier: Fix broken tests (#8722) (Boshen)

Co-authored-by: Boshen <1430279+Boshen@users.noreply.github.com>
@overlookmotel overlookmotel mentioned this pull request Feb 5, 2025
Merged
@overlookmotel
Copy link
Contributor

In 154d4c5 I took the liberty to add a non-Option version of first() for NonEmptyStack. cc @overlookmotel

Sorry I was slow to come back on this. Good idea! I've implemented in #8908.

graphite-app bot pushed a commit that referenced this pull request Feb 5, 2025
@overlookmotel
feat(data_structures): add first and first_mut methods to stack t…
0a74cf5 
…ypes (#8908)

Add `first` and `first_mut` methods to `NonEmptyStack` and `SparseStack`.

* For `NonEmptyStack`, these methods for can be infallible, as the stack is guaranteed not to be empty.
* For `SparseStack`, these methods can use the more efficient methods on `NonEmptyStack`.

Originally suggested by @branchseer in #8691.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dunqing Dunqing Dunqing approved these changes

@overlookmotel overlookmotel Awaiting requested review from overlookmotel overlookmotel is a code owner

Assignees

@Dunqing Dunqing

Labels
A-transformer Area - Transformer / Transpiler C-bug Category - Bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@branchseer @Dunqing @overlookmotel @Boshen