@react-native/codegen 0.72.2 → 0.72.4

package/lib/parsers/typescript/parser.js.flow

@@ -18,18 +18,24 @@ import type {
   NativeModuleParamTypeAnnotation,
   NativeModuleEnumMembers,
   NativeModuleEnumMemberType,
+  NativeModuleAliasMap,
+  NativeModuleEnumMap,
 } from '../../CodegenSchema';
 import type {ParserType} from '../errors';
 import type {Parser} from '../parser';
+import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
+
+const {typeScriptTranslateTypeAnnotation} = require('./modules');
 
 // $FlowFixMe[untyped-import] Use flow-types for @babel/parser
 const babelParser = require('@babel/parser');
 
 const {buildSchema} = require('../parsers-commons');
-const {Visitor} = require('./Visitor');
+const {Visitor} = require('../parsers-primitives');
 const {buildComponentSchema} = require('./components');
-const {wrapComponentSchema} = require('./components/schema');
-const {buildModuleSchema} = require('./modules');
+const {wrapComponentSchema} = require('../schema.js');
+const {buildModuleSchema} = require('../parsers-commons.js');
+const {resolveTypeAnnotation} = require('./utils');
 
 const fs = require('fs');
 
@@ -102,6 +108,8 @@ class TypeScriptParser implements Parser {
       buildModuleSchema,
       Visitor,
       this,
+      resolveTypeAnnotation,
+      typeScriptTranslateTypeAnnotation,
     );
   }
 
@@ -192,7 +200,111 @@ class TypeScriptParser implements Parser {
       value: member.initializer?.value ?? member.id.name,
     }));
   }
+
+  isModuleInterface(node: $FlowFixMe): boolean {
+    return (
+      node.type === 'TSInterfaceDeclaration' &&
+      node.extends?.length === 1 &&
+      node.extends[0].type === 'TSExpressionWithTypeArguments' &&
+      node.extends[0].expression.name === 'TurboModule'
+    );
+  }
+
+  extractAnnotatedElement(
+    typeAnnotation: $FlowFixMe,
+    types: TypeDeclarationMap,
+  ): $FlowFixMe {
+    return types[typeAnnotation.typeParameters.params[0].typeName.name];
+  }
+
+  /**
+   * TODO(T108222691): Use flow-types for @babel/parser
+   */
+  getTypes(ast: $FlowFixMe): TypeDeclarationMap {
+    return ast.body.reduce((types, node) => {
+      switch (node.type) {
+        case 'ExportNamedDeclaration': {
+          if (node.declaration) {
+            switch (node.declaration.type) {
+              case 'TSTypeAliasDeclaration':
+              case 'TSInterfaceDeclaration':
+              case 'TSEnumDeclaration': {
+                types[node.declaration.id.name] = node.declaration;
+                break;
+              }
+            }
+          }
+          break;
+        }
+        case 'TSTypeAliasDeclaration':
+        case 'TSInterfaceDeclaration':
+        case 'TSEnumDeclaration': {
+          types[node.id.name] = node;
+          break;
+        }
+      }
+      return types;
+    }, {});
+  }
+
+  callExpressionTypeParameters(callExpression: $FlowFixMe): $FlowFixMe | null {
+    return callExpression.typeParameters || null;
+  }
+
+  computePartialProperties(
+    properties: Array<$FlowFixMe>,
+    hasteModuleName: string,
+    types: TypeDeclarationMap,
+    aliasMap: {...NativeModuleAliasMap},
+    enumMap: {...NativeModuleEnumMap},
+    tryParse: ParserErrorCapturer,
+    cxxOnly: boolean,
+  ): Array<$FlowFixMe> {
+    return properties.map(prop => {
+      return {
+        name: prop.key.name,
+        optional: true,
+        typeAnnotation: typeScriptTranslateTypeAnnotation(
+          hasteModuleName,
+          prop.typeAnnotation.typeAnnotation,
+          types,
+          aliasMap,
+          enumMap,
+          tryParse,
+          cxxOnly,
+          this,
+        ),
+      };
+    });
+  }
+
+  functionTypeAnnotation(propertyValueType: string): boolean {
+    return (
+      propertyValueType === 'TSFunctionType' ||
+      propertyValueType === 'TSMethodSignature'
+    );
+  }
+
+  getTypeArgumentParamsFromDeclaration(declaration: $FlowFixMe): $FlowFixMe {
+    return declaration.typeParameters.params;
+  }
+
+  // This FlowFixMe is supposed to refer to typeArgumentParams and funcArgumentParams of generated AST.
+  getNativeComponentType(
+    typeArgumentParams: $FlowFixMe,
+    funcArgumentParams: $FlowFixMe,
+  ): {[string]: string} {
+    return {
+      propsTypeName: typeArgumentParams[0].typeName.name,
+      componentName: funcArgumentParams[0].value,
+    };
+  }
+
+  getAnnotatedElementProperties(annotatedElement: $FlowFixMe): $FlowFixMe {
+    return annotatedElement.typeAnnotation.members;
+  }
 }
+
 module.exports = {
   TypeScriptParser,
 };

package/lib/parsers/typescript/utils.js

@@ -13,36 +13,6 @@
 const _require = require('./parseTopLevelType'),
   parseTopLevelType = _require.parseTopLevelType;
 
-/**
- * TODO(T108222691): Use flow-types for @babel/parser
- */
-function getTypes(ast) {
-  return ast.body.reduce((types, node) => {
-    switch (node.type) {
-      case 'ExportNamedDeclaration': {
-        if (node.declaration) {
-          switch (node.declaration.type) {
-            case 'TSTypeAliasDeclaration':
-            case 'TSInterfaceDeclaration':
-            case 'TSEnumDeclaration': {
-              types[node.declaration.id.name] = node.declaration;
-              break;
-            }
-          }
-        }
-        break;
-      }
-      case 'TSTypeAliasDeclaration':
-      case 'TSInterfaceDeclaration':
-      case 'TSEnumDeclaration': {
-        types[node.id.name] = node;
-        break;
-      }
-    }
-    return types;
-  }, {});
-}
-
 // $FlowFixMe[unclear-type] Use flow-types for @babel/parser
 
 const invariant = require('invariant');
@@ -117,5 +87,4 @@ function resolveTypeAnnotation(
 }
 module.exports = {
   resolveTypeAnnotation,
-  getTypes,
 };

package/lib/parsers/typescript/utils.js.flow

@@ -14,36 +14,6 @@ import type {TypeResolutionStatus, TypeDeclarationMap} from '../utils';
 
 const {parseTopLevelType} = require('./parseTopLevelType');
 
-/**
- * TODO(T108222691): Use flow-types for @babel/parser
- */
-function getTypes(ast: $FlowFixMe): TypeDeclarationMap {
-  return ast.body.reduce((types, node) => {
-    switch (node.type) {
-      case 'ExportNamedDeclaration': {
-        if (node.declaration) {
-          switch (node.declaration.type) {
-            case 'TSTypeAliasDeclaration':
-            case 'TSInterfaceDeclaration':
-            case 'TSEnumDeclaration': {
-              types[node.declaration.id.name] = node.declaration;
-              break;
-            }
-          }
-        }
-        break;
-      }
-      case 'TSTypeAliasDeclaration':
-      case 'TSInterfaceDeclaration':
-      case 'TSEnumDeclaration': {
-        types[node.id.name] = node;
-        break;
-      }
-    }
-    return types;
-  }, {});
-}
-
 // $FlowFixMe[unclear-type] Use flow-types for @babel/parser
 export type ASTNode = Object;
 
@@ -131,5 +101,4 @@ function resolveTypeAnnotation(
 
 module.exports = {
   resolveTypeAnnotation,
-  getTypes,
 };

package/lib/parsers/utils.js

@@ -19,6 +19,7 @@ function extractNativeModuleName(filename) {
   return path.basename(filename).split('.')[0];
 }
 function createParserErrorCapturer() {
+  // $FlowFixMe[missing-empty-array-annot]
   const errors = [];
   function guard(fn) {
     try {
@@ -27,10 +28,13 @@ function createParserErrorCapturer() {
       if (!(error instanceof ParserError)) {
         throw error;
       }
+      // $FlowFixMe[incompatible-call]
       errors.push(error);
       return null;
     }
   }
+
+  // $FlowFixMe[incompatible-return]
   return [errors, guard];
 }
 function verifyPlatforms(hasteModuleName, moduleName) {

package/lib/parsers/utils.js.flow

@@ -38,6 +38,7 @@ function createParserErrorCapturer(): [
   Array<ParserError>,
   ParserErrorCapturer,
 ] {
+  // $FlowFixMe[missing-empty-array-annot]
   const errors = [];
   function guard<T>(fn: () => T): ?T {
     try {
@@ -46,12 +47,14 @@ function createParserErrorCapturer(): [
       if (!(error instanceof ParserError)) {
         throw error;
       }
+      // $FlowFixMe[incompatible-call]
       errors.push(error);
 
       return null;
     }
   }
 
+  // $FlowFixMe[incompatible-return]
   return [errors, guard];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.72.2",
+  "version": "0.72.4",
   "description": "⚛️ Code generation tools for React Native",
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-codegen",
   "repository": {

package/lib/parsers/flow/Visitor.js

@@ -1,37 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- *
- * @format
- */
-
-'use strict';
-
-const _require = require('../utils'),
-  isModuleRegistryCall = _require.isModuleRegistryCall;
-function Visitor(infoMap) {
-  return {
-    CallExpression(node) {
-      if (
-        node.callee.type === 'Identifier' &&
-        node.callee.name === 'codegenNativeComponent'
-      ) {
-        infoMap.isComponent = true;
-      }
-      if (isModuleRegistryCall(node)) {
-        infoMap.isModule = true;
-      }
-    },
-    InterfaceExtends(node) {
-      if (node.id.name === 'TurboModule') {
-        infoMap.isModule = true;
-      }
-    },
-  };
-}
-module.exports = {
-  Visitor,
-};

package/lib/parsers/flow/Visitor.js.flow

@@ -1,41 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-const {isModuleRegistryCall} = require('../utils');
-
-function Visitor(infoMap: {isComponent: boolean, isModule: boolean}): {
-  [type: string]: (node: $FlowFixMe) => void,
-} {
-  return {
-    CallExpression(node: $FlowFixMe) {
-      if (
-        node.callee.type === 'Identifier' &&
-        node.callee.name === 'codegenNativeComponent'
-      ) {
-        infoMap.isComponent = true;
-      }
-
-      if (isModuleRegistryCall(node)) {
-        infoMap.isModule = true;
-      }
-    },
-    InterfaceExtends(node: $FlowFixMe) {
-      if (node.id.name === 'TurboModule') {
-        infoMap.isModule = true;
-      }
-    },
-  };
-}
-
-module.exports = {
-  Visitor,
-};

package/lib/parsers/flow/components/options.js

@@ -1,72 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- *
- * @format
- */
-
-'use strict';
-
-// $FlowFixMe[unclear-type] there's no flowtype for ASTs
-
-function getCommandOptions(commandOptionsExpression) {
-  if (commandOptionsExpression == null) {
-    return null;
-  }
-  let foundOptions;
-  try {
-    foundOptions = commandOptionsExpression.properties.reduce(
-      (options, prop) => {
-        options[prop.key.name] = (
-          (prop && prop.value && prop.value.elements) ||
-          []
-        ).map(element => element && element.value);
-        return options;
-      },
-      {},
-    );
-  } catch (e) {
-    throw new Error(
-      'Failed to parse command options, please check that they are defined correctly',
-    );
-  }
-  return foundOptions;
-}
-function getOptions(optionsExpression) {
-  if (!optionsExpression) {
-    return null;
-  }
-  let foundOptions;
-  try {
-    foundOptions = optionsExpression.properties.reduce((options, prop) => {
-      if (prop.value.type === 'ArrayExpression') {
-        options[prop.key.name] = prop.value.elements.map(
-          element => element.value,
-        );
-      } else {
-        options[prop.key.name] = prop.value.value;
-      }
-      return options;
-    }, {});
-  } catch (e) {
-    throw new Error(
-      'Failed to parse codegen options, please check that they are defined correctly',
-    );
-  }
-  if (
-    foundOptions.paperComponentName &&
-    foundOptions.paperComponentNameDeprecated
-  ) {
-    throw new Error(
-      'Failed to parse codegen options, cannot use both paperComponentName and paperComponentNameDeprecated',
-    );
-  }
-  return foundOptions;
-}
-module.exports = {
-  getCommandOptions,
-  getOptions,
-};

package/lib/parsers/flow/components/options.js.flow

@@ -1,87 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {OptionsShape} from '../../../CodegenSchema.js';
-
-// $FlowFixMe[unclear-type] there's no flowtype for ASTs
-type OptionsAST = Object;
-
-export type CommandOptions = $ReadOnly<{
-  supportedCommands: $ReadOnlyArray<string>,
-}>;
-
-function getCommandOptions(
-  commandOptionsExpression: OptionsAST,
-): ?CommandOptions {
-  if (commandOptionsExpression == null) {
-    return null;
-  }
-
-  let foundOptions;
-  try {
-    foundOptions = commandOptionsExpression.properties.reduce(
-      (options, prop) => {
-        options[prop.key.name] = (
-          (prop && prop.value && prop.value.elements) ||
-          []
-        ).map(element => element && element.value);
-        return options;
-      },
-      {},
-    );
-  } catch (e) {
-    throw new Error(
-      'Failed to parse command options, please check that they are defined correctly',
-    );
-  }
-
-  return foundOptions;
-}
-
-function getOptions(optionsExpression: OptionsAST): ?OptionsShape {
-  if (!optionsExpression) {
-    return null;
-  }
-  let foundOptions;
-  try {
-    foundOptions = optionsExpression.properties.reduce((options, prop) => {
-      if (prop.value.type === 'ArrayExpression') {
-        options[prop.key.name] = prop.value.elements.map(
-          element => element.value,
-        );
-      } else {
-        options[prop.key.name] = prop.value.value;
-      }
-      return options;
-    }, {});
-  } catch (e) {
-    throw new Error(
-      'Failed to parse codegen options, please check that they are defined correctly',
-    );
-  }
-
-  if (
-    foundOptions.paperComponentName &&
-    foundOptions.paperComponentNameDeprecated
-  ) {
-    throw new Error(
-      'Failed to parse codegen options, cannot use both paperComponentName and paperComponentNameDeprecated',
-    );
-  }
-
-  return foundOptions;
-}
-
-module.exports = {
-  getCommandOptions,
-  getOptions,
-};

package/lib/parsers/flow/components/schema.js

@@ -1,106 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- *
- * @format
- */
-
-'use strict';
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly &&
-      (symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      })),
-      keys.push.apply(keys, symbols);
-  }
-  return keys;
-}
-function _objectSpread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2
-      ? ownKeys(Object(source), !0).forEach(function (key) {
-          _defineProperty(target, key, source[key]);
-        })
-      : Object.getOwnPropertyDescriptors
-      ? Object.defineProperties(
-          target,
-          Object.getOwnPropertyDescriptors(source),
-        )
-      : ownKeys(Object(source)).forEach(function (key) {
-          Object.defineProperty(
-            target,
-            key,
-            Object.getOwnPropertyDescriptor(source, key),
-          );
-        });
-  }
-  return target;
-}
-function _defineProperty(obj, key, value) {
-  key = _toPropertyKey(key);
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true,
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, 'string');
-  return typeof key === 'symbol' ? key : String(key);
-}
-function _toPrimitive(input, hint) {
-  if (typeof input !== 'object' || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || 'default');
-    if (typeof res !== 'object') return res;
-    throw new TypeError('@@toPrimitive must return a primitive value.');
-  }
-  return (hint === 'string' ? String : Number)(input);
-}
-function wrapComponentSchema({
-  filename,
-  componentName,
-  extendsProps,
-  events,
-  props,
-  options,
-  commands,
-}) {
-  return {
-    modules: {
-      [filename]: {
-        type: 'Component',
-        components: {
-          [componentName]: _objectSpread(
-            _objectSpread({}, options || {}),
-            {},
-            {
-              extendsProps,
-              events,
-              props,
-              commands,
-            },
-          ),
-        },
-      },
-    },
-  };
-}
-module.exports = {
-  wrapComponentSchema,
-};

package/lib/parsers/flow/components/schema.js.flow

@@ -1,62 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {
-  EventTypeShape,
-  NamedShape,
-  CommandTypeAnnotation,
-  PropTypeAnnotation,
-  ExtendsPropsShape,
-  SchemaType,
-  OptionsShape,
-} from '../../../CodegenSchema.js';
-
-export type ComponentSchemaBuilderConfig = $ReadOnly<{
-  filename: string,
-  componentName: string,
-  extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
-  events: $ReadOnlyArray<EventTypeShape>,
-  props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
-  commands: $ReadOnlyArray<NamedShape<CommandTypeAnnotation>>,
-  options?: ?OptionsShape,
-}>;
-
-function wrapComponentSchema({
-  filename,
-  componentName,
-  extendsProps,
-  events,
-  props,
-  options,
-  commands,
-}: ComponentSchemaBuilderConfig): SchemaType {
-  return {
-    modules: {
-      [filename]: {
-        type: 'Component',
-        components: {
-          [componentName]: {
-            ...(options || {}),
-            extendsProps,
-            events,
-            props,
-            commands,
-          },
-        },
-      },
-    },
-  };
-}
-
-module.exports = {
-  wrapComponentSchema,
-};