address feedback

Author: siddarthkay

packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js

@@ -13,7 +13,7 @@
 import type {ASTNode} from '../utils';
 import type {NamedShape} from '../../../CodegenSchema.js';
 const {getValueFromTypes} = require('../utils.js');
-import type {TypeDeclarationMap} from '../../utils';
+import type {TypeDeclarationMap, PropAST} from '../../utils';
 
 function getProperties(
   typeName: string,
@@ -499,9 +499,6 @@ function getSchemaInfo(
   };
 }
 
-// $FlowFixMe[unclear-type] there's no flowtype for ASTs
-type PropAST = Object;
-
 module.exports = {
   getProperties,
   getSchemaInfo,

packages/react-native-codegen/src/parsers/flow/components/extends.js

@@ -12,16 +12,18 @@
 
 import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
 import type {TypeDeclarationMap} from '../../utils';
+import type {Parser} from '../../parser';
 const {extendsForProp} = require('../../parsers-commons');
 
 function removeKnownExtends(
   typeDefinition: $ReadOnlyArray<PropsAST>,
   types: TypeDeclarationMap,
+  parser: Parser,
 ): $ReadOnlyArray<PropsAST> {
   return typeDefinition.filter(
     prop =>
       prop.type !== 'ObjectTypeSpreadProperty' ||
-      extendsForProp(prop, types, 'argument') === null,
+      extendsForProp(prop, types, parser) === null,
   );
 }
 
@@ -31,10 +33,11 @@ type PropsAST = Object;
 function getExtendsProps(
   typeDefinition: $ReadOnlyArray<PropsAST>,
   types: TypeDeclarationMap,
+  parser: Parser,
 ): $ReadOnlyArray<ExtendsPropsShape> {
   return typeDefinition
     .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
-    .map(prop => extendsForProp(prop, types, 'argument'))
+    .map(prop => extendsForProp(prop, types, parser))
     .filter(Boolean);
 }
 

packages/react-native-codegen/src/parsers/flow/components/index.js

@@ -129,10 +129,10 @@ function buildComponentSchema(
 
   const commandProperties = getCommandProperties(ast, parser);
 
-  const extendsProps = getExtendsProps(propProperties, types);
+  const extendsProps = getExtendsProps(propProperties, types, parser);
   const options = getOptions(optionsExpression);
 
-  const nonExtendsProps = removeKnownExtends(propProperties, types);
+  const nonExtendsProps = removeKnownExtends(propProperties, types, parser);
   const props = getProps(nonExtendsProps, types);
   const events = getEvents(propProperties, types);
   const commands = getCommands(commandProperties, types);

packages/react-native-codegen/src/parsers/flow/components/props.js

@@ -17,10 +17,7 @@ const {
 } = require('./componentsUtils.js');
 
 import type {NamedShape, PropTypeAnnotation} from '../../../CodegenSchema.js';
-import type {TypeDeclarationMap} from '../../utils';
-
-// $FlowFixMe[unclear-type] there's no flowtype for ASTs
-type PropAST = Object;
+import type {TypeDeclarationMap, PropAST} from '../../utils';
 
 function buildPropSchema(
   property: PropAST,

packages/react-native-codegen/src/parsers/flow/parser.js

@@ -23,7 +23,7 @@ import type {
 } from '../../CodegenSchema';
 import type {ParserType} from '../errors';
 import type {Parser} from '../parser';
-import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
+import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';
 
 const {flowTranslateTypeAnnotation} = require('./modules');
 
@@ -329,6 +329,14 @@ class FlowParser implements Parser {
   convertKeywordToTypeAnnotation(keyword: string): string {
     return keyword;
   }
+
+  argumentForProp(prop: PropAST): $FlowFixMe {
+    return prop.argument;
+  }
+
+  nameForArgument(prop: PropAST): $FlowFixMe {
+    return prop.argument.id.name;
+  }
 }
 
 module.exports = {

packages/react-native-codegen/src/parsers/parser.js

@@ -24,6 +24,9 @@ import type {
 import type {ParserType} from './errors';
 import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
 
+// $FlowFixMe[unclear-type] there's no flowtype for ASTs
+type PropAST = Object;
+
 /**
  * This is the main interface for Parsers of various languages.
  * It exposes all the methods that contain language-specific logic.
@@ -255,4 +258,18 @@ export interface Parser {
    * @returns: converted TypeAnnotation to Keywords
    */
   convertKeywordToTypeAnnotation(keyword: string): string;
+
+  /**
+   * Given a prop return its arguments.
+   * @parameter prop
+   * @returns: Arguments of the prop
+   */
+  argumentForProp(prop: PropAST): $FlowFixMe;
+
+  /**
+   * Given a prop return its name.
+   * @parameter prop
+   * @returns: name property
+   */
+  nameForArgument(prop: PropAST): $FlowFixMe;
 }

packages/react-native-codegen/src/parsers/parserMock.js

@@ -23,7 +23,7 @@ import type {
   NativeModuleAliasMap,
   NativeModuleEnumMap,
 } from '../CodegenSchema';
-import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
+import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';
 
 // $FlowFixMe[untyped-import] there's no flowtype flow-parser
 const flowParser = require('flow-parser');
@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
   convertKeywordToTypeAnnotation(keyword: string): string {
     return keyword;
   }
+
+  argumentForProp(prop: PropAST): $FlowFixMe {
+    return prop.expression;
+  }
+
+  nameForArgument(prop: PropAST): $FlowFixMe {
+    return prop.expression.name;
+  }
 }

packages/react-native-codegen/src/parsers/parsers-commons.js

@@ -828,15 +828,15 @@ function propertyNames(
 function extendsForProp(
   prop: PropAST,
   types: TypeDeclarationMap,
-  propName: 'argument' | 'expression',
+  parser: Parser,
 ): ExtendedPropResult {
-  if (!prop[propName]) {
+  const argument = parser.argumentForProp(prop);
+
+  if (!argument) {
     console.log('null', prop);
   }
 
-  const name = prop[propName]?.id
-    ? prop[propName].id.name
-    : prop[propName]?.name;
+  const name = parser.nameForArgument(prop);
 
   if (types[name] != null) {
     // This type is locally defined in the file

packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js

@@ -15,7 +15,7 @@ const {
   parseTopLevelType,
   flattenIntersectionType,
 } = require('../parseTopLevelType');
-import type {TypeDeclarationMap} from '../../utils';
+import type {TypeDeclarationMap, PropAST} from '../../utils';
 
 function getProperties(
   typeName: string,
@@ -463,9 +463,6 @@ function getSchemaInfo(
   };
 }
 
-// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
-type PropAST = Object;
-
 function verifyPropNotAlreadyDefined(
   props: $ReadOnlyArray<PropAST>,
   needleProp: PropAST,

packages/react-native-codegen/src/parsers/typescript/components/index.js

@@ -135,7 +135,7 @@ function buildComponentSchema(
 
   const componentEventAsts: Array<PropsAST> = [];
   categorizeProps(propProperties, types, componentEventAsts);
-  const {props, extendsProps} = getProps(propProperties, types);
+  const {props, extendsProps} = getProps(propProperties, types, parser);
   const events = getEvents(componentEventAsts, types);
   const commands = getCommands(commandProperties, types);