@react-native/codegen 0.72.1 → 0.72.3

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

@@ -10,41 +10,10 @@
 
 'use strict';
 
-import type {TypeAliasResolutionStatus, TypeDeclarationMap} from '../utils';
+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;
 
@@ -57,7 +26,7 @@ function resolveTypeAnnotation(
 ): {
   nullable: boolean,
   typeAnnotation: $FlowFixMe,
-  typeAliasResolutionStatus: TypeAliasResolutionStatus,
+  typeResolutionStatus: TypeResolutionStatus,
 } {
   invariant(
     typeAnnotation != null,
@@ -69,7 +38,7 @@ function resolveTypeAnnotation(
       ? typeAnnotation.typeAnnotation
       : typeAnnotation;
   let nullable = false;
-  let typeAliasResolutionStatus: TypeAliasResolutionStatus = {
+  let typeResolutionStatus: TypeResolutionStatus = {
     successful: false,
   };
 
@@ -78,38 +47,58 @@ function resolveTypeAnnotation(
     nullable = nullable || topLevelType.optional;
     node = topLevelType.type;
 
-    if (node.type === 'TSTypeReference') {
-      typeAliasResolutionStatus = {
-        successful: true,
-        aliasName: node.typeName.name,
-      };
-      const resolvedTypeAnnotation = types[node.typeName.name];
-      if (
-        resolvedTypeAnnotation == null ||
-        resolvedTypeAnnotation.type === 'TSEnumDeclaration'
-      ) {
-        break;
-      }
-
-      invariant(
-        resolvedTypeAnnotation.type === 'TSTypeAliasDeclaration',
-        `GenericTypeAnnotation '${node.typeName.name}' must resolve to a TSTypeAliasDeclaration. Instead, it resolved to a '${resolvedTypeAnnotation.type}'`,
-      );
+    if (node.type !== 'TSTypeReference') {
+      break;
+    }
 
-      node = resolvedTypeAnnotation.typeAnnotation;
-    } else {
+    const resolvedTypeAnnotation = types[node.typeName.name];
+    if (resolvedTypeAnnotation == null) {
       break;
     }
+
+    switch (resolvedTypeAnnotation.type) {
+      case 'TSTypeAliasDeclaration': {
+        typeResolutionStatus = {
+          successful: true,
+          type: 'alias',
+          name: node.typeName.name,
+        };
+        node = resolvedTypeAnnotation.typeAnnotation;
+        break;
+      }
+      case 'TSInterfaceDeclaration': {
+        typeResolutionStatus = {
+          successful: true,
+          type: 'alias',
+          name: node.typeName.name,
+        };
+        node = resolvedTypeAnnotation;
+        break;
+      }
+      case 'TSEnumDeclaration': {
+        typeResolutionStatus = {
+          successful: true,
+          type: 'enum',
+          name: node.typeName.name,
+        };
+        node = resolvedTypeAnnotation;
+        break;
+      }
+      default: {
+        throw new TypeError(
+          `A non GenericTypeAnnotation must be a type declaration ('TSTypeAliasDeclaration'), an interface ('TSInterfaceDeclaration'), or enum ('TSEnumDeclaration'). Instead, got the unsupported ${resolvedTypeAnnotation.type}.`,
+        );
+      }
+    }
   }
 
   return {
     nullable: nullable,
     typeAnnotation: node,
-    typeAliasResolutionStatus,
+    typeResolutionStatus,
   };
 }
 
 module.exports = {
   resolveTypeAnnotation,
-  getTypes,
 };

package/lib/parsers/utils.js

@@ -10,81 +10,9 @@
 
 'use strict';
 
-function _slicedToArray(arr, i) {
-  return (
-    _arrayWithHoles(arr) ||
-    _iterableToArrayLimit(arr, i) ||
-    _unsupportedIterableToArray(arr, i) ||
-    _nonIterableRest()
-  );
-}
-function _nonIterableRest() {
-  throw new TypeError(
-    'Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.',
-  );
-}
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === 'string') return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === 'Object' && o.constructor) n = o.constructor.name;
-  if (n === 'Map' || n === 'Set') return Array.from(o);
-  if (n === 'Arguments' || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
-    return _arrayLikeToArray(o, minLen);
-}
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _iterableToArrayLimit(arr, i) {
-  var _i =
-    null == arr
-      ? null
-      : ('undefined' != typeof Symbol && arr[Symbol.iterator]) ||
-        arr['@@iterator'];
-  if (null != _i) {
-    var _s,
-      _e,
-      _x,
-      _r,
-      _arr = [],
-      _n = !0,
-      _d = !1;
-    try {
-      if (((_x = (_i = _i.call(arr)).next), 0 === i)) {
-        if (Object(_i) !== _i) return;
-        _n = !1;
-      } else
-        for (
-          ;
-          !(_n = (_s = _x.call(_i)).done) &&
-          (_arr.push(_s.value), _arr.length !== i);
-          _n = !0
-        );
-    } catch (err) {
-      (_d = !0), (_e = err);
-    } finally {
-      try {
-        if (!_n && null != _i.return && ((_r = _i.return()), Object(_r) !== _r))
-          return;
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-    return _arr;
-  }
-}
-function _arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
 const _require = require('./errors'),
   ParserError = _require.ParserError;
-const _require2 = require('./parsers-commons'),
-  wrapModuleSchema = _require2.wrapModuleSchema;
-const fs = require('fs');
 const path = require('path');
-const invariant = require('invariant');
 function extractNativeModuleName(filename) {
   // this should drop everything after the file name. For Example it will drop:
   // .android.js, .android.ts, .android.tsx, .ios.js, .ios.ts, .ios.tsx, .js, .ts, .tsx
@@ -130,10 +58,6 @@ function verifyPlatforms(hasteModuleName, moduleName) {
     excludedPlatforms: Array.from(excludedPlatforms),
   };
 }
-function parseFile(filename, callback) {
-  const contents = fs.readFileSync(filename, 'utf8');
-  return callback(contents, filename);
-}
 
 // TODO(T108222691): Use flow-types for @babel/parser
 function visit(astNode, visitor) {
@@ -156,53 +80,6 @@ function visit(astNode, visitor) {
     }
   }
 }
-function buildSchemaFromConfigType(
-  configType,
-  filename,
-  ast,
-  wrapComponentSchema,
-  buildComponentSchema,
-  buildModuleSchema,
-) {
-  switch (configType) {
-    case 'component': {
-      return wrapComponentSchema(buildComponentSchema(ast));
-    }
-    case 'module': {
-      if (filename === undefined || filename === null) {
-        throw new Error('Filepath expected while parasing a module');
-      }
-      const nativeModuleName = extractNativeModuleName(filename);
-      const _createParserErrorCap = createParserErrorCapturer(),
-        _createParserErrorCap2 = _slicedToArray(_createParserErrorCap, 2),
-        parsingErrors = _createParserErrorCap2[0],
-        tryParse = _createParserErrorCap2[1];
-      const schema = tryParse(() =>
-        buildModuleSchema(nativeModuleName, ast, tryParse),
-      );
-      if (parsingErrors.length > 0) {
-        /**
-         * TODO(T77968131): We have two options:
-         *  - Throw the first error, but indicate there are more then one errors.
-         *  - Display all errors, nicely formatted.
-         *
-         * For the time being, we're just throw the first error.
-         **/
-
-        throw parsingErrors[0];
-      }
-      invariant(
-        schema != null,
-        'When there are no parsing errors, the schema should not be null',
-      );
-      return wrapModuleSchema(schema, nativeModuleName);
-    }
-    default:
-      return {
-        modules: {},
-      };
-  }
-}
 function getConfigType(
   // TODO(T71778680): Flow-type this node.
   ast,
@@ -266,8 +143,6 @@ module.exports = {
   extractNativeModuleName,
   createParserErrorCapturer,
   verifyPlatforms,
-  parseFile,
   visit,
-  buildSchemaFromConfigType,
   isModuleRegistryCall,
 };

package/lib/parsers/utils.js.flow

@@ -10,21 +10,17 @@
 
 'use strict';
 
-import type {ComponentSchemaBuilderConfig} from './flow/components/schema';
-import type {NativeModuleSchema, SchemaType} from '../CodegenSchema';
 const {ParserError} = require('./errors');
-const {wrapModuleSchema} = require('./parsers-commons');
 
-const fs = require('fs');
 const path = require('path');
-const invariant = require('invariant');
 
 export type TypeDeclarationMap = {[declarationName: string]: $FlowFixMe};
 
-export type TypeAliasResolutionStatus =
+export type TypeResolutionStatus =
   | $ReadOnly<{
+      type: 'alias' | 'enum',
       successful: true,
-      aliasName: string,
+      name: string,
     }>
   | $ReadOnly<{
       successful: false,
@@ -95,15 +91,6 @@ function verifyPlatforms(
   };
 }
 
-function parseFile(
-  filename: string,
-  callback: (contents: string, filename: string) => SchemaType,
-): SchemaType {
-  const contents = fs.readFileSync(filename, 'utf8');
-
-  return callback(contents, filename);
-}
-
 // TODO(T108222691): Use flow-types for @babel/parser
 function visit(
   astNode: $FlowFixMe,
@@ -133,58 +120,6 @@ function visit(
   }
 }
 
-function buildSchemaFromConfigType(
-  configType: 'module' | 'component' | 'none',
-  filename: ?string,
-  ast: $FlowFixMe,
-  wrapComponentSchema: (config: ComponentSchemaBuilderConfig) => SchemaType,
-  buildComponentSchema: (ast: $FlowFixMe) => ComponentSchemaBuilderConfig,
-  buildModuleSchema: (
-    hasteModuleName: string,
-    ast: $FlowFixMe,
-    tryParse: ParserErrorCapturer,
-  ) => NativeModuleSchema,
-): SchemaType {
-  switch (configType) {
-    case 'component': {
-      return wrapComponentSchema(buildComponentSchema(ast));
-    }
-    case 'module': {
-      if (filename === undefined || filename === null) {
-        throw new Error('Filepath expected while parasing a module');
-      }
-      const nativeModuleName = extractNativeModuleName(filename);
-
-      const [parsingErrors, tryParse] = createParserErrorCapturer();
-
-      const schema = tryParse(() =>
-        buildModuleSchema(nativeModuleName, ast, tryParse),
-      );
-
-      if (parsingErrors.length > 0) {
-        /**
-         * TODO(T77968131): We have two options:
-         *  - Throw the first error, but indicate there are more then one errors.
-         *  - Display all errors, nicely formatted.
-         *
-         * For the time being, we're just throw the first error.
-         **/
-
-        throw parsingErrors[0];
-      }
-
-      invariant(
-        schema != null,
-        'When there are no parsing errors, the schema should not be null',
-      );
-
-      return wrapModuleSchema(schema, nativeModuleName);
-    }
-    default:
-      return {modules: {}};
-  }
-}
-
 function getConfigType(
   // TODO(T71778680): Flow-type this node.
   ast: $FlowFixMe,
@@ -259,8 +194,6 @@ module.exports = {
   extractNativeModuleName,
   createParserErrorCapturer,
   verifyPlatforms,
-  parseFile,
   visit,
-  buildSchemaFromConfigType,
   isModuleRegistryCall,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.72.1",
+  "version": "0.72.3",
   "description": "⚛️ Code generation tools for React Native",
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-codegen",
   "repository": {
@@ -41,5 +41,8 @@
     "mkdirp": "^0.5.1",
     "prettier": "^2.4.1",
     "rimraf": "^3.0.2"
+  },
+  "peerDependencies": {
+    "@babel/preset-env": "^7.1.6"
   }
 }

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,
-};

package/lib/parsers/flow/index.js

@@ -1,80 +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[untyped-import] there's no flowtype flow-parser
-const flowParser = require('flow-parser');
-const fs = require('fs');
-const _require = require('../utils'),
-  buildSchemaFromConfigType = _require.buildSchemaFromConfigType,
-  getConfigType = _require.getConfigType,
-  isModuleRegistryCall = _require.isModuleRegistryCall;
-const _require2 = require('./components'),
-  buildComponentSchema = _require2.buildComponentSchema;
-const _require3 = require('./components/schema'),
-  wrapComponentSchema = _require3.wrapComponentSchema;
-const _require4 = require('./modules'),
-  buildModuleSchema = _require4.buildModuleSchema;
-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;
-      }
-    },
-  };
-}
-function buildSchema(contents, filename) {
-  // Early return for non-Spec JavaScript files
-  if (
-    !contents.includes('codegenNativeComponent') &&
-    !contents.includes('TurboModule')
-  ) {
-    return {
-      modules: {},
-    };
-  }
-  const ast = flowParser.parse(contents, {
-    enums: true,
-  });
-  const configType = getConfigType(ast, Visitor);
-  return buildSchemaFromConfigType(
-    configType,
-    filename,
-    ast,
-    wrapComponentSchema,
-    buildComponentSchema,
-    buildModuleSchema,
-  );
-}
-function parseModuleFixture(filename) {
-  const contents = fs.readFileSync(filename, 'utf8');
-  return buildSchema(contents, 'path/NativeSampleTurboModule.js');
-}
-function parseString(contents, filename) {
-  return buildSchema(contents, filename);
-}
-module.exports = {
-  buildSchema,
-  parseModuleFixture,
-  parseString,
-};