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

[Codegen 86] Use buildPropSchema from parser-commons #37043

Closed
wants to merge 3 commits into from

Conversation

ken0nek
Copy link
Contributor

@ken0nek ken0nek commented Apr 21, 2023

Summary:

The buildPropSchema function in parsers/typescript/components/props.js and parsers/flow/components/props.js is the same. move it to parser-commons and use it in the original files.

part of #34872

  • Make the getTypeAnnotation signature from the Flow package to be equal to the typescript one. Specifically, the Typescript one needs an additional parameter withNullDefault that we can safely ignore in the implementation.
  • buildPropSchema signature can be updated to accept those two functions in input as callbacks. Then, the getProps function can feed the right functions based on the language to the shared build prop schema.

ref: #34872 (comment)

Changelog:

[Internal] [Changed] - Use buildPropSchema from parser-commons

Test Plan:

  • yarn jest react-native-codegen pass

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Apr 21, 2023
@ken0nek ken0nek force-pushed the ken0nek/codegen-task-86 branch from dc157a3 to 55e12d6 Compare April 22, 2023 00:02
@analysis-bot
Copy link

analysis-bot commented Apr 22, 2023

Platform Engine Arch Size (bytes) Diff
android hermes arm64-v8a 8,723,630 +2
android hermes armeabi-v7a 8,034,458 -1
android hermes x86 9,210,700 -1
android hermes x86_64 9,065,039 -1
android jsc arm64-v8a 9,288,253 +0
android jsc armeabi-v7a 8,476,516 +0
android jsc x86 9,346,723 +1
android jsc x86_64 9,604,660 +2

Base commit: 33e0521
Branch: main

@ken0nek ken0nek force-pushed the ken0nek/codegen-task-86 branch from 55e12d6 to 04d2dd1 Compare April 22, 2023 00:24
@facebook-github-bot
Copy link
Contributor

@cipolleschi has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@cipolleschi
Copy link
Contributor

For what I can see, you are feeding the callbacks in the right way.

There are some issues with the typings, though, that we have to iron out. If you clic the CircleCI jobs, you can see the errors, like here.

For example:

  1. in parser-commons, you are using ASTNode, which has not been declared in the file.
  2. there are some incompatible return type we need to address. buildPropSchema for Flow returns ?NamedShape<PropTypeAnnotation>, while for typescript it returns NamedShape<PropTypeAnnotation> (non optional)
  3. This error instead is more cryptic... I'll have to investigate it better.

@cipolleschi
Copy link
Contributor

Ok, i figured out what's the problem. We basically have a circular reference that cannot be resolved by Flow.

Specifically:

  1. buildPropSchema requires a function getTypeAnnotation
  2. getTypeAnnotation requires a function buildSchema
  3. when implementing buildPropSchema, we are calling getTypeAnnotation using buildPropSchema as the buildSchema parameter
  4. So we have a cycle buildPropSchema => getTypeAnnotation => buildPropSchema => getTypeAnnotation...

I have to think about how to break that, but I don't think we can go down this path, unfortunately. :(

@cipolleschi
Copy link
Contributor

I found a way to make it work. Basically, we have a problem here:

// in parser-commons.js
function buildPropSchema(
 // params
): ?NamedShape<PropTypeAnnotation> {
  // good lines...

  return {
    name,
    optional,
    typeAnnotation: getTypeAnnotation(
      name,
      typeAnnotation,
      defaultValue,
      withNullDefault,
      types,
      buildPropSchema, // <-- this don't work
    ),
  };
}

Looking better at the problem, the reason why it doesn't work is because getTypeAnnotation takes a parameter whose signature is (property: PropAST, types: TypeDeclarationMap) => $FlowFixMe, while we are trying to pass a parameter where the signature is (property: PropAST, types: TypeDeclarationMap, getSchemaInfo: GetSchemaInfoFN, getTypeAnnotation: getTypeAnnotationFN) => $FlowFixMe.

So, Flow is properly complaining that it is missing a couple of parameters to make it work. 😅

The way to solve this is to provide a function signature which matches. So, we can do something like:

// in parser-commons.js
function buildPropSchema(
  // params
  ) => $FlowFixMe,
): ?NamedShape<PropTypeAnnotation> {
  // good lines...
  
  const wrappedBuildSchema = (passedProps: PropAST, passedTypes: TypeDeclarationMap): $FlowFixMe => {
    buildPropSchema(passedProps, passedTypes, getSchemaInfo, getTypeAnnotation);
  }

  return {
    name,
    optional,
    typeAnnotation: getTypeAnnotation(
      name,
      typeAnnotation,
      defaultValue,
      withNullDefault,
      types,
      wrappedBuildSchema, // <-- this is different: it calls the function above, with all the params
    ),
  };
}

the execution of getTypeAnnotation will take care of passing the right PropAST and TypeDeclarationMap parameters to wrapped build schema, while the wrappedBuildSchema is capturing the two functions getSchemaInfo and getTypeAnnotation.

If why this is happening is not clear, I'll be happy to try and explain it better or in a different way! 😄

@ken0nek ken0nek force-pushed the ken0nek/codegen-task-86 branch from f959485 to b0912dd Compare April 24, 2023 17:53
@ken0nek
Copy link
Contributor Author

ken0nek commented Apr 24, 2023

Thank you for the investigation and the suggestion!

Now, it is time to resolve the test failures... 💪


yarn jest react-native-codegen
Snapshot Summary
 › 13 snapshots failed from 4 test suites. Inspect your code changes or re-run jest with `-u` to update them.

Test Suites: 4 failed, 50 passed, 54 total
Tests:       13 failed, 2540 passed, 2553 total
Snapshots:   13 failed, 828 passed, 841 total
Time:        3.192 s

@ken0nek ken0nek force-pushed the ken0nek/codegen-task-86 branch from b0912dd to 7707017 Compare April 24, 2023 18:23
types: TypeDeclarationMap,
buildSchema: (property: PropAST, types: TypeDeclarationMap) => $FlowFixMe,
) => $FlowFixMe,
): ?NamedShape<PropTypeAnnotation> {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Error ----------------------------------- packages/react-native-codegen/src/parsers/typescript/components/props.js:112:7

Cannot return object literal because null or undefined [1] is incompatible with `NamedShape` [2] in array element of
property `props`. [incompatible-return]

   packages/react-native-codegen/src/parsers/typescript/components/props.js:112:7
   112|       buildPropSchema(property, types, getSchemaInfo, getTypeAnnotation),
              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

References:
   packages/react-native-codegen/src/parsers/parsers-commons.js:845:4
   845| ): ?NamedShape<PropTypeAnnotation> {
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [1]
   packages/react-native-codegen/src/parsers/typescript/components/props.js:74:25
    74|   props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [2]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ken0nek ken0nek force-pushed the ken0nek/codegen-task-86 branch from 7707017 to 5ef4d30 Compare April 24, 2023 18:37
@Pranav-yadav Pranav-yadav added the Tech: Codegen Related to react-native-codegen label Apr 24, 2023
@cipolleschi
Copy link
Contributor

Hi @ken0nek, could you please:

  • rebase on top of main
  • resolve the merge conflicts
  • and have a look at the other errors in CI?

Thank you so much!

@ken0nek ken0nek force-pushed the ken0nek/codegen-task-86 branch from 5ef4d30 to 4eed951 Compare April 26, 2023 19:17
@ken0nek
Copy link
Contributor Author

ken0nek commented Apr 26, 2023

Hi @ken0nek, could you please:

  • rebase on top of main
  • resolve the merge conflicts
  • and have a look at the other errors in CI?

Thank you so much!

Sure!

Finished rebasing and resolving conflicts. Will look into the errors on CI.

buildSchema: (property: PropAST, types: TypeDeclarationMap) => $FlowFixMe,
) => $FlowFixMe,
): ?NamedShape<PropTypeAnnotation> {
const info = getSchemaInfo(property, types);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Have to handle the nullability of getSchemaInfo

@cipolleschi
Copy link
Contributor

@ken0nek gentle ping on this. Do you think you might be able to address these issues by the end of this week?

@ken0nek
Copy link
Contributor Author

ken0nek commented May 10, 2023

@ken0nek gentle ping on this. Do you think you might be able to address these issues by the end of this week?

Thank you for checking in.

Sorry to say but that might be difficult...

I don't want to block other codegen tasks, please take this task if possible 🙏

I wish I could contribute to the repository quickly and effectively...

@cipolleschi
Copy link
Contributor

cipolleschi commented May 10, 2023

Given you make most of the work, I can import it and finish up the work myself. It won't take much. Is that ok for you? If yes, could you just set the PR as Ready For Review? 🙏
In that way, the commit would get attributed to you anyway. 😉

@ken0nek
Copy link
Contributor Author

ken0nek commented May 10, 2023

Is that ok for you?

Sure, thank you for your help and support!

@ken0nek ken0nek marked this pull request as ready for review May 10, 2023 11:58
@facebook-github-bot
Copy link
Contributor

@cipolleschi has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
Copy link
Contributor

@cipolleschi has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot facebook-github-bot added the Merged This PR has been merged. label May 11, 2023
@facebook-github-bot
Copy link
Contributor

@cipolleschi merged this pull request in 0212179.

@ken0nek
Copy link
Contributor Author

ken0nek commented May 15, 2023

Thank you for handling this pull request! Learned a lot by reading 0212179

@ken0nek ken0nek deleted the ken0nek/codegen-task-86 branch May 15, 2023 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. Merged This PR has been merged. Tech: Codegen Related to react-native-codegen
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants