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

Redesign discriminated union type parser #2068

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Conversation

benchristel
Copy link
Member

Previously, the discriminatedUnion parser required you to specify the
discriminant via an object parser, which was confusing and verbose. Now you only
have to specify the discriminant key once, and provide the values for each
branch.

Issue: LEMS-2582

Test plan:

yarn test

Copy link
Contributor

github-actions bot commented Jan 3, 2025

npm Snapshot: Published

Good news!! We've packaged up the latest commit from this PR (ccee41e) and published it to npm. You
can install it using the tag PR2068.

Example:

yarn add @khanacademy/perseus@PR2068

If you are working in Khan Academy's webapp, you can run:

./dev/tools/bump_perseus_version.sh -t PR2068

Copy link
Contributor

github-actions bot commented Jan 3, 2025

Size Change: +79 B (+0.01%)

Total Size: 1.28 MB

Filename Size Change
packages/perseus/dist/es/index.js 419 kB +79 B (+0.02%)
ℹ️ View Unchanged
Filename Size
packages/kas/dist/es/index.js 39 kB
packages/keypad-context/dist/es/index.js 760 B
packages/kmath/dist/es/index.js 4.27 kB
packages/math-input/dist/es/index.js 78 kB
packages/math-input/dist/es/strings.js 1.79 kB
packages/perseus-core/dist/es/index.js 1.48 kB
packages/perseus-editor/dist/es/index.js 688 kB
packages/perseus-linter/dist/es/index.js 22.2 kB
packages/perseus/dist/es/strings.js 4.93 kB
packages/pure-markdown/dist/es/index.js 3.67 kB
packages/simple-markdown/dist/es/index.js 12.5 kB

compressed-size-action

Copy link
Collaborator

@jeremywiebe jeremywiebe left a comment

Choose a reason for hiding this comment

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

Nice, thanks for that improvement!

Comment on lines +38 to +40
// Guard against implicit 'any' type
// @ts-expect-error - Type '{ shape: "circle"; radius: number; }' is not assignable to type 'string'.
parser satisfies Parser<string>;
Copy link
Collaborator

Choose a reason for hiding this comment

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

I understand all the tests in the file except this one. Why would this potentially be implicit any? Or what does this test protect against?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sometimes, when you do complicated things with types, TypeScript can't figure out what the type of an expression is so it just infers any 😱 . I was worried that the type of parser would be inferred as any.

parser satisfies Parser<Figure>; asserts that parser is assignable to a variable of type Parser<Figure>;. This assertion will succeed if parser is actually a Parser<Figure>, but it will also succeed if parser has type any.

To guard against that case, I always include a negative assertion in my type tests as well: parser should not be assignable to Parser<string>. If the type is any, it will be assignable, and we'll get an error about the @ts-expect-error being unused.

I wish TypeScript had a way to compare types exactly, so I didn't have to do this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah, ok. I suspected it might be a negative assertion. Thanks for explaining and for adding this protection in.


expect(parse(input, unionParser)).toEqual(
it("fails appropriately given an object with an invalid discriminant", () => {
expect(parse({shape: "squarle"}, parseUnion)).toEqual(
Copy link
Collaborator

@jeremywiebe jeremywiebe Jan 6, 2025

Choose a reason for hiding this comment

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

Ah, my favourite geometric shape, the squarle! 😂 🐿️

@benchristel benchristel merged commit 265a931 into main Jan 7, 2025
8 checks passed
@benchristel benchristel deleted the benc/discriminated-union branch January 7, 2025 00:02
SonicScrewdriver added a commit that referenced this pull request Jan 8, 2025
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @khanacademy/[email protected]

### Patch Changes

- [#2064](#2064)
[`55b4615d3`](55b4615)
Thanks [@nishasy](https://github.com/nishasy)! - Remove the
locked-figures-aria flag


- [#2063](#2063)
[`85a5b5e44`](85a5b5e)
Thanks [@nishasy](https://github.com/nishasy)! - Remove the
interactive-graph-locked-features-labels flag


- [#2078](#2078)
[`781cc7df6`](781cc7d)
Thanks [@SonicScrewdriver](https://github.com/SonicScrewdriver)! -
Temporarily fixing pi-based strings for Numeric Input


- [#2065](#2065)
[`eefcf5c5c`](eefcf5c)
Thanks [@nishasy](https://github.com/nishasy)! - Remove the
locked-[figureName]-labels flags


- [#2068](#2068)
[`265a93104`](265a931)
Thanks [@benchristel](https://github.com/benchristel)! - Internal:
Redesign discriminated union type parser to have a simpler and more
intuitive interface.


- [#2073](#2073)
[`4bf4960d4`](4bf4960)
Thanks [@benchristel](https://github.com/benchristel)! - Internal:
improve Perseus JSON parsers so they can handle all English-language
exercises


- [#2080](#2080)
[`c9a28b34c`](c9a28b3)
Thanks [@mark-fitzgerald](https://github.com/mark-fitzgerald)! -
[Dropdown] Bugfix - Text in dropdown not in correct vertical position


- [#2073](#2073)
[`4bf4960d4`](4bf4960)
Thanks [@benchristel](https://github.com/benchristel)! - Internal:
improve the error messages produced by the versionedWidgetOptions parser

## @khanacademy/[email protected]

### Patch Changes

- [#2064](#2064)
[`55b4615d3`](55b4615)
Thanks [@nishasy](https://github.com/nishasy)! - Remove the
locked-figures-aria flag


- [#2063](#2063)
[`85a5b5e44`](85a5b5e)
Thanks [@nishasy](https://github.com/nishasy)! - Remove the
interactive-graph-locked-features-labels flag


- [#2065](#2065)
[`eefcf5c5c`](eefcf5c)
Thanks [@nishasy](https://github.com/nishasy)! - Remove the
locked-[figureName]-labels flags

- Updated dependencies
\[[`55b4615d3`](55b4615),
[`85a5b5e44`](85a5b5e),
[`781cc7df6`](781cc7d),
[`eefcf5c5c`](eefcf5c),
[`265a93104`](265a931),
[`4bf4960d4`](4bf4960),
[`c9a28b34c`](c9a28b3),
[`4bf4960d4`](4bf4960)]:
    -   @khanacademy/[email protected]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants