@react-native/codegen 0.74.0-nightly-20231107-bc68794c6 → 0.74.0-nightly-20231108-05d92bf2a

package/lib/parsers/flow/parseFlowAndThrowErrors.js

@@ -0,0 +1,105 @@
+/**
+ * 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);
+}
+const hermesParser = require('hermes-parser');
+function parseFlowAndThrowErrors(code, options = {}) {
+  let ast;
+  try {
+    ast = hermesParser.parse(
+      code,
+      _objectSpread(
+        {
+          // Produce an ESTree-compliant AST
+          babel: false,
+          // Parse Flow without a pragma
+          flow: 'all',
+        },
+        options.filename != null
+          ? {
+              sourceFilename: options.filename,
+            }
+          : {},
+      ),
+    );
+  } catch (e) {
+    if (options.filename != null) {
+      e.message = `Syntax error in ${options.filename}: ${e.message}`;
+    }
+    throw e;
+  }
+  return ast;
+}
+module.exports = {
+  parseFlowAndThrowErrors,
+};

package/lib/parsers/flow/parseFlowAndThrowErrors.js.flow

@@ -0,0 +1,41 @@
+/**
+ * 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 {Program as ESTreeProgram} from 'hermes-estree';
+
+const hermesParser = require('hermes-parser');
+
+function parseFlowAndThrowErrors(
+  code: string,
+  options: $ReadOnly<{filename?: ?string}> = {},
+): ESTreeProgram {
+  let ast;
+  try {
+    ast = hermesParser.parse(code, {
+      // Produce an ESTree-compliant AST
+      babel: false,
+      // Parse Flow without a pragma
+      flow: 'all',
+      ...(options.filename != null ? {sourceFilename: options.filename} : {}),
+    });
+  } catch (e) {
+    if (options.filename != null) {
+      e.message = `Syntax error in ${options.filename}: ${e.message}`;
+    }
+    throw e;
+  }
+  return ast;
+}
+
+module.exports = {
+  parseFlowAndThrowErrors,
+};

package/lib/parsers/flow/parser.js

@@ -58,8 +58,8 @@ const _require6 = require('./components/componentsUtils'),
   getTypeAnnotation = _require6.getTypeAnnotation;
 const _require7 = require('./modules'),
   flowTranslateTypeAnnotation = _require7.flowTranslateTypeAnnotation;
-// $FlowFixMe[untyped-import] there's no flowtype flow-parser
-const flowParser = require('flow-parser');
+const _require8 = require('./parseFlowAndThrowErrors'),
+  parseFlowAndThrowErrors = _require8.parseFlowAndThrowErrors;
 const fs = require('fs');
 const invariant = require('invariant');
 class FlowParser {
@@ -145,9 +145,9 @@ class FlowParser {
     const contents = fs.readFileSync(filename, 'utf8');
     return this.parseString(contents, 'path/NativeSampleTurboModule.js');
   }
-  getAst(contents) {
-    return flowParser.parse(contents, {
-      enums: true,
+  getAst(contents, filename) {
+    return parseFlowAndThrowErrors(contents, {
+      filename,
     });
   }
   getFunctionTypeAnnotationParameters(functionTypeAnnotation) {

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

@@ -55,8 +55,7 @@ const {
   getTypeAnnotation,
 } = require('./components/componentsUtils');
 const {flowTranslateTypeAnnotation} = require('./modules');
-// $FlowFixMe[untyped-import] there's no flowtype flow-parser
-const flowParser = require('flow-parser');
+const {parseFlowAndThrowErrors} = require('./parseFlowAndThrowErrors');
 const fs = require('fs');
 const invariant = require('invariant');
 
@@ -143,10 +142,8 @@ class FlowParser implements Parser {
     return this.parseString(contents, 'path/NativeSampleTurboModule.js');
   }
 
-  getAst(contents: string): $FlowFixMe {
-    return flowParser.parse(contents, {
-      enums: true,
-    });
+  getAst(contents: string, filename?: ?string): $FlowFixMe {
+    return parseFlowAndThrowErrors(contents, {filename});
   }
 
   getFunctionTypeAnnotationParameters(

package/lib/parsers/parser.js.flow

@@ -169,9 +169,11 @@ export interface Parser {
   /**
    * Given the content of a file, it returns an AST.
    * @parameter contents: the content of the file.
+   * @parameter filename: the name of the file, if available.
+   * @throws if there is a syntax error.
    * @returns: the AST of the file.
    */
-  getAst(contents: string): $FlowFixMe;
+  getAst(contents: string, filename?: ?string): $FlowFixMe;
 
   /**
    * Given a FunctionTypeAnnotation, it returns an array of its parameters.

package/lib/parsers/parserMock.js

@@ -42,12 +42,12 @@ import invariant from 'invariant';
 const _require = require('./errors'),
   UnsupportedObjectPropertyTypeAnnotationParserError =
     _require.UnsupportedObjectPropertyTypeAnnotationParserError;
-const _require2 = require('./parsers-commons'),
-  buildPropSchema = _require2.buildPropSchema;
-const _require3 = require('./typescript/components/componentsUtils'),
-  flattenProperties = _require3.flattenProperties;
-// $FlowFixMe[untyped-import] there's no flowtype flow-parser
-const flowParser = require('flow-parser');
+const _require2 = require('./flow/parseFlowAndThrowErrors'),
+  parseFlowAndThrowErrors = _require2.parseFlowAndThrowErrors;
+const _require3 = require('./parsers-commons'),
+  buildPropSchema = _require3.buildPropSchema;
+const _require4 = require('./typescript/components/componentsUtils'),
+  flattenProperties = _require4.flattenProperties;
 const schemaMock = {
   modules: {
     StringPropNativeComponentView: {
@@ -125,9 +125,9 @@ export class MockedParser {
   parseModuleFixture(filename) {
     return schemaMock;
   }
-  getAst(contents) {
-    return flowParser.parse(contents, {
-      enums: true,
+  getAst(contents, filename) {
+    return parseFlowAndThrowErrors(contents, {
+      filename,
     });
   }
   getFunctionTypeAnnotationParameters(functionTypeAnnotation) {

package/lib/parsers/parserMock.js.flow

@@ -42,10 +42,9 @@ import invariant from 'invariant';
 const {
   UnsupportedObjectPropertyTypeAnnotationParserError,
 } = require('./errors');
+const {parseFlowAndThrowErrors} = require('./flow/parseFlowAndThrowErrors');
 const {buildPropSchema} = require('./parsers-commons');
 const {flattenProperties} = require('./typescript/components/componentsUtils');
-// $FlowFixMe[untyped-import] there's no flowtype flow-parser
-const flowParser = require('flow-parser');
 
 type ExtendsForProp = null | {
   type: 'ReactNativeBuiltInType',
@@ -122,10 +121,8 @@ export class MockedParser implements Parser {
     return schemaMock;
   }
 
-  getAst(contents: string): $FlowFixMe {
-    return flowParser.parse(contents, {
-      enums: true,
-    });
+  getAst(contents: string, filename?: ?string): $FlowFixMe {
+    return parseFlowAndThrowErrors(contents, {filename});
   }
 
   getFunctionTypeAnnotationParameters(

package/lib/parsers/parsers-commons.js

@@ -521,7 +521,7 @@ function buildSchema(
       modules: {},
     };
   }
-  const ast = parser.getAst(contents);
+  const ast = parser.getAst(contents, filename);
   const configType = getConfigType(ast, Visitor);
   return buildSchemaFromConfigType(
     configType,

package/lib/parsers/parsers-commons.js.flow

@@ -480,7 +480,7 @@ function buildSchema(
     return {modules: {}};
   }
 
-  const ast = parser.getAst(contents);
+  const ast = parser.getAst(contents, filename);
   const configType = getConfigType(ast, Visitor);
 
   return buildSchemaFromConfigType(

package/lib/parsers/typescript/parser.js

@@ -147,7 +147,7 @@ class TypeScriptParser {
     const contents = fs.readFileSync(filename, 'utf8');
     return this.parseString(contents, 'path/NativeSampleTurboModule.ts');
   }
-  getAst(contents) {
+  getAst(contents, filename) {
     return babelParser.parse(contents, {
       sourceType: 'module',
       plugins: ['typescript'],

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

@@ -142,7 +142,7 @@ class TypeScriptParser implements Parser {
     return this.parseString(contents, 'path/NativeSampleTurboModule.ts');
   }
 
-  getAst(contents: string): $FlowFixMe {
+  getAst(contents: string, filename?: ?string): $FlowFixMe {
     return babelParser.parse(contents, {
       sourceType: 'module',
       plugins: ['typescript'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.74.0-nightly-20231107-bc68794c6",
+  "version": "0.74.0-nightly-20231108-05d92bf2a",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "@babel/parser": "^7.20.0",
-    "flow-parser": "^0.206.0",
+    "hermes-parser": "0.17.1",
     "jscodeshift": "^0.14.0",
     "nullthrows": "^1.1.1"
   },
@@ -47,6 +47,7 @@
     "@babel/preset-env": "^7.20.0",
     "chalk": "^4.0.0",
     "glob": "^7.1.1",
+    "hermes-estree": "0.17.1",
     "invariant": "^2.2.4",
     "micromatch": "^4.0.4",
     "mkdirp": "^0.5.1",