refactor(parsers): remove parserOptions param to pass it directly in …

…parser implementation
facebook · Nov 10, 2022 · 656b486 · 656b486
1 parent 93e3a03
commit 656b486
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 34 deletions.
diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -52,9 +52,6 @@ function parseModuleFixture(filename: string): SchemaType {
     contents,
     'path/NativeSampleTurboModule.js',
     flowParser,
-    {
-      enums: true,
-    },
     Visitor,
     wrapComponentSchema,
     buildComponentSchema,
@@ -67,9 +64,6 @@ function parseString(contents: string, filename: ?string): SchemaType {
     contents,
     filename,
     flowParser,
-    {
-      enums: true,
-    },
     Visitor,
     wrapComponentSchema,
     buildComponentSchema,

diff --git a/packages/react-native-codegen/src/parsers/flow/parser.js b/packages/react-native-codegen/src/parsers/flow/parser.js
@@ -13,7 +13,7 @@
 // $FlowFixMe[untyped-import] there's no flowtype flow-parser
 const flowParser = require('flow-parser');
 import type {ParserType} from '../errors';
-import type {Parser, ParserOptions} from '../parser';
+import type {Parser} from '../parser';
 
 class FlowParser implements Parser {
   typeParameterInstantiation: string = 'TypeParameterInstantiation';
@@ -36,8 +36,10 @@ class FlowParser implements Parser {
     return typeAnnotation.id.name;
   }
 
-  parse(contents: string, parserOptions: ParserOptions): $FlowFixMe {
-    return flowParser.parse(contents, parserOptions);
+  parse(contents: string): $FlowFixMe {
+    return flowParser.parse(contents, {
+      enums: true,
+    });
   }
 }
 

diff --git a/packages/react-native-codegen/src/parsers/parser.js b/packages/react-native-codegen/src/parsers/parser.js
@@ -12,12 +12,6 @@
 
 import type {ParserType} from './errors';
 
-export interface ParserOptions {
-  enums?: boolean;
-  sourceType?: string;
-  plugins?: Array<string>;
-}
-
 /**
  * This is the main interface for Parsers of various languages.
  * It exposes all the methods that contain language-specific logic.
@@ -53,11 +47,7 @@ export interface Parser {
   /**
    * Given the content of a file and options, it returns an AST.
    * @parameter contents: the content of the file.
-   * @parameter parserOptions: the options given to the parser.
    * @returns: the AST of the file (given in program property for typescript).
    */
-  parse(
-    contents: string,
-    parserOptions: ParserOptions,
-  ): $FlowFixMe | {program: $FlowFixMe};
+  parse(contents: string): $FlowFixMe | {program: $FlowFixMe};
 }
diff --git a/packages/react-native-codegen/src/parsers/parsers-commons.js b/packages/react-native-codegen/src/parsers/parsers-commons.js
@@ -25,7 +25,7 @@ import type {
 import type {ParserType} from './errors';
 import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
 import type {ComponentSchemaBuilderConfig} from './flow/components/schema';
-import type {Parser, ParserOptions} from './parser';
+import type {Parser} from './parser';
 
 const {
   MissingTypeParameterGenericParserError,
@@ -111,7 +111,6 @@ function buildSchema(
   contents: string,
   filename: ?string,
   parser: Parser,
-  parserOptions: ParserOptions,
   Visitor: ({isComponent: boolean, isModule: boolean}) => {
     [type: string]: (node: $FlowFixMe) => void,
   },
@@ -131,7 +130,7 @@ function buildSchema(
     return {modules: {}};
   }
 
-  const result = parser.parse(contents, parserOptions);
+  const result = parser.parse(contents);
   const ast = parser.language() === 'Flow' ? result : result.program;
   const configType = getConfigType(ast, Visitor);
 

diff --git a/packages/react-native-codegen/src/parsers/typescript/index.js b/packages/react-native-codegen/src/parsers/typescript/index.js
@@ -58,10 +58,6 @@ function parseModuleFixture(filename: string): SchemaType {
     contents,
     'path/NativeSampleTurboModule.ts',
     typescriptParser,
-    {
-      sourceType: 'module',
-      plugins: ['typescript'],
-    },
     Visitor,
     wrapComponentSchema,
     buildComponentSchema,
@@ -74,10 +70,6 @@ function parseString(contents: string, filename: ?string): SchemaType {
     contents,
     filename,
     typescriptParser,
-    {
-      sourceType: 'module',
-      plugins: ['typescript'],
-    },
     Visitor,
     wrapComponentSchema,
     buildComponentSchema,

diff --git a/packages/react-native-codegen/src/parsers/typescript/parser.js b/packages/react-native-codegen/src/parsers/typescript/parser.js
@@ -14,7 +14,7 @@
 const babelParser = require('@babel/parser');
 
 import type {ParserType} from '../errors';
-import type {Parser, ParserOptions} from '../parser';
+import type {Parser} from '../parser';
 
 class TypeScriptParser implements Parser {
   typeParameterInstantiation: string = 'TSTypeParameterInstantiation';
@@ -41,8 +41,11 @@ class TypeScriptParser implements Parser {
     return typeAnnotation.typeName.name;
   }
 
-  parse(contents: string, parserOptions: ParserOptions): {program: $FlowFixMe} {
-    return babelParser.parse(contents, parserOptions);
+  parse(contents: string): {program: $FlowFixMe} {
+    return babelParser.parse(contents, {
+      sourceType: 'module',
+      plugins: ['typescript'],
+    });
   }
 }
 module.exports = {