move extendsForProp into parsers-commons.js

Author: siddarthkay

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

@@ -12,29 +12,7 @@
 
 import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
 import type {TypeDeclarationMap} from '../../utils';
-
-function extendsForProp(prop: PropsAST, types: TypeDeclarationMap) {
-  if (!prop.argument) {
-    console.log('null', prop);
-  }
-  const name = prop.argument.id.name;
-
-  if (types[name] != null) {
-    // This type is locally defined in the file
-    return null;
-  }
-
-  switch (name) {
-    case 'ViewProps':
-      return {
-        type: 'ReactNativeBuiltInType',
-        knownTypeName: 'ReactNativeCoreViewProps',
-      };
-    default: {
-      throw new Error(`Unable to handle prop spread: ${name}`);
-    }
-  }
-}
+const {extendsForProp} = require('../../parsers-commons');
 
 function removeKnownExtends(
   typeDefinition: $ReadOnlyArray<PropsAST>,
@@ -43,7 +21,7 @@ function removeKnownExtends(
   return typeDefinition.filter(
     prop =>
       prop.type !== 'ObjectTypeSpreadProperty' ||
-      extendsForProp(prop, types) === null,
+      extendsForProp(prop, types, 'argument') === null,
   );
 }
 
@@ -56,7 +34,7 @@ function getExtendsProps(
 ): $ReadOnlyArray<ExtendsPropsShape> {
   return typeDefinition
     .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
-    .map(prop => extendsForProp(prop, types))
+    .map(prop => extendsForProp(prop, types, 'argument'))
     .filter(Boolean);
 }
 

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

@@ -69,6 +69,26 @@ export type CommandOptions = $ReadOnly<{
 // $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
 type OptionsAST = Object;
 
+type Prop = {
+  argument?: {
+    id?: {
+      name: string,
+    },
+    name?: string,
+  },
+  expression?: {
+    id?: {
+      name: string,
+    },
+    name?: string,
+  },
+};
+
+type ExtendedPropResult = {
+  type: TypeDeclarationMap,
+  knownTypeName: 'ReactNativeCoreViewProps',
+} | null;
+
 function wrapModuleSchema(
   nativeModuleSchema: NativeModuleSchema,
   hasteModuleName: string,
@@ -817,6 +837,33 @@ function propertyNames(
     .filter(Boolean);
 }
 
+function extendsForProp(
+  prop: Prop,
+  types: TypeDeclarationMap,
+  propName: 'argument' | 'expression',
+): ExtendedPropResult {
+  if (!prop[propName]) {
+    console.log('null', prop);
+  }
+  const name = prop[propName].id ? prop[propName].id.name : prop[propName].name;
+
+  if (types[name] != null) {
+    // This type is locally defined in the file
+    return null;
+  }
+
+  switch (name) {
+    case 'ViewProps':
+      return {
+        type: 'ReactNativeBuiltInType',
+        knownTypeName: 'ReactNativeCoreViewProps',
+      };
+    default: {
+      throw new Error(`Unable to handle prop spread: ${name}`);
+    }
+  }
+}
+
 module.exports = {
   wrapModuleSchema,
   unwrapNullable,
@@ -836,4 +883,5 @@ module.exports = {
   getCommandOptions,
   getOptions,
   getCommandTypeNameAndOptionsExpression,
+  extendsForProp,
 };

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

@@ -17,6 +17,7 @@ import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
 
 const {flattenProperties} = require('./componentsUtils.js');
 const {parseTopLevelType} = require('../parseTopLevelType');
+const {extendsForProp} = require('../../parsers-commons');
 
 // $FlowFixMe[unclear-type] there's no flowtype for ASTs
 type PropAST = Object;
@@ -59,29 +60,6 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
   return !isStyle;
 }
 
-function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
-  if (!prop.expression) {
-    console.log('null', prop);
-  }
-  const name = prop.expression.name;
-
-  if (types[name] != null) {
-    // This type is locally defined in the file
-    return null;
-  }
-
-  switch (name) {
-    case 'ViewProps':
-      return {
-        type: 'ReactNativeBuiltInType',
-        knownTypeName: 'ReactNativeCoreViewProps',
-      };
-    default: {
-      throw new Error(`Unable to handle prop spread: ${name}`);
-    }
-  }
-}
-
 function getProps(
   typeDefinition: $ReadOnlyArray<PropAST>,
   types: TypeDeclarationMap,
@@ -96,7 +74,7 @@ function getProps(
   for (const prop of typeDefinition) {
     // find extends
     if (prop.type === 'TSExpressionWithTypeArguments') {
-      const extend = extendsForProp(prop, types);
+      const extend = extendsForProp(prop, types, 'expression');
       if (extend) {
         extendsProps.push(extend);
         continue;