refactor: remove buildSchema from parseFile params and import it in parsers

MaeIg · MaeIg · commit 40d471af2647 · 2022-11-12T15:30:12.000+01:00
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentDescriptorH-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentDescriptorH-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateComponentDescriptorH');
 const fs = require('fs');
 
@@ -25,7 +24,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GenerateComponentDescriptorH can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentHObjCpp-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateComponentHObjCpp-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateComponentHObjCpp');
 const fs = require('fs');
 
@@ -25,7 +24,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GenerateComponentHObjCpp can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterCpp-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterCpp-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateEventEmitterCpp');
 const fs = require('fs');
 
@@ -25,7 +24,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GenerateEventEmitterCpp can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterH-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateEventEmitterH-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateEventEmitterH');
 const fs = require('fs');
 
@@ -25,7 +24,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GenerateEventEmitterH can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsCpp-test.js b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsCpp-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GeneratePropsCpp');
 const fs = require('fs');
 
@@ -25,7 +24,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GeneratePropsCpp can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsH-test.js b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsH-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GeneratePropsH');
 const fs = require('fs');
 
@@ -25,7 +24,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GeneratePropsH can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaDelegate-test.js b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaDelegate-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GeneratePropsJavaDelegate');
 const fs = require('fs');
 
@@ -25,7 +24,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GeneratePropsJavaDelegate can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaInterface-test.js b/packages/react-native-codegen/e2e/__tests__/components/GeneratePropsJavaInterface-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GeneratePropsJavaInterface');
 const fs = require('fs');
 
@@ -24,7 +23,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GeneratePropsJavaInterface can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema, undefined, false);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeCpp-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeCpp-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateShadowNodeCpp');
 const fs = require('fs');
 
@@ -24,7 +23,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GenerateShadowNodeCpp can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema, undefined, false);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeH-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateShadowNodeH-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateShadowNodeH');
 const fs = require('fs');
 
@@ -24,7 +23,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GenerateShadowNodeH can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema, undefined, false);
     expect(Object.fromEntries(output)).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/components/GenerateViewConfigJs-test.js b/packages/react-native-codegen/e2e/__tests__/components/GenerateViewConfigJs-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/components/GenerateViewConfigJs');
 const fs = require('fs');
 
@@ -25,7 +24,7 @@ const parser = new FlowParser();
 fixtures.forEach(fixture => {
   it(`GenerateViewConfigJs can generate for '${fixture}'`, () => {
     const libName = 'RNCodegenModuleFixtures';
-    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`, buildSchema);
+    const schema = parser.parseFile(`${FIXTURE_DIR}/${fixture}`);
     const output = generator.generate(libName, schema);
     expect(output).toMatchSnapshot();
   });
diff --git a/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js b/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../../src/parsers/flow/parser');
-const {buildSchema} = require('../../../src/parsers/flow');
 const generator = require('../../../src/generators/modules/GenerateModuleObjCpp');
 const fs = require('fs');
 
@@ -26,7 +25,7 @@ function getModules(): SchemaType {
   const filenames: Array<string> = fs.readdirSync(FIXTURE_DIR);
   return filenames.reduce<SchemaType>(
     (accumulator, file) => {
-      const schema = parser.parseFile(`${FIXTURE_DIR}/${file}`, buildSchema);
+      const schema = parser.parseFile(`${FIXTURE_DIR}/${file}`);
       return {
         modules: {
           ...accumulator.modules,
diff --git a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema.js b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema.js
@@ -13,10 +13,6 @@ import type {SchemaType} from '../../CodegenSchema.js';
 
 const {FlowParser} = require('../../parsers/flow/parser');
 const {TypeScriptParser} = require('../../parsers/typescript/parser');
-const {buildSchema: buildSchemaForFlow} = require('../../parsers/flow');
-const {
-  buildSchema: buildSchemaForTypescript,
-} = require('../../parsers/typescript');
 const fs = require('fs');
 const path = require('path');
 
@@ -38,10 +34,7 @@ function combineSchemas(files: Array<string>): SchemaType {
 
         const parser = isTypeScript ? typescriptParser : flowParser;
 
-        const schema = parser.parseFile(
-          filename,
-          isTypeScript ? buildSchemaForTypescript : buildSchemaForFlow,
-        );
+        const schema = parser.parseFile(filename);
 
         if (schema && schema.modules) {
           merged.modules = {...merged.modules, ...schema.modules};
diff --git a/packages/react-native-codegen/src/cli/parser/parser.js b/packages/react-native-codegen/src/cli/parser/parser.js
@@ -13,10 +13,6 @@
 const path = require('path');
 const {FlowParser} = require('../../parsers/flow/parser');
 const {TypeScriptParser} = require('../../parsers/typescript/parser');
-const {buildSchema: buildSchemaForFlow} = require('../../parsers/flow');
-const {
-  buildSchema: buildSchemaForTypescript,
-} = require('../../parsers/typescript');
 
 const flowParser = new FlowParser();
 const typescriptParser = new TypeScriptParser();
@@ -28,17 +24,7 @@ function parseFiles(files: Array<string>) {
 
     const parser = isTypeScript ? typescriptParser : flowParser;
 
-    console.log(
-      filename,
-      JSON.stringify(
-        parser.parseFile(
-          filename,
-          isTypeScript ? buildSchemaForTypescript : buildSchemaForFlow,
-        ),
-        null,
-        2,
-      ),
-    );
+    console.log(filename, JSON.stringify(parser.parseFile(filename), null, 2));
   });
 }
 
diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js b/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {FlowParser} = require('../../parser');
-const {buildSchema} = require('../../index.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
 jest.mock('fs', () => ({
@@ -33,7 +32,7 @@ describe('RN Codegen Flow Parser', () => {
     .sort()
     .forEach(fixtureName => {
       it(`can generate fixture ${fixtureName}`, () => {
-        const schema = parser.parseFile(fixtureName, buildSchema);
+        const schema = parser.parseFile(fixtureName);
         const serializedSchema = JSON.stringify(schema, null, 2).replace(
           /"/g,
           "'",
@@ -47,7 +46,7 @@ describe('RN Codegen Flow Parser', () => {
     .forEach(fixtureName => {
       it(`Fails with error message ${fixtureName}`, () => {
         expect(() => {
-          parser.parseFile(fixtureName, buildSchema);
+          parser.parseFile(fixtureName);
         }).toThrowErrorMatchingSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/parsers/flow/parser.js b/packages/react-native-codegen/src/parsers/flow/parser.js
@@ -14,6 +14,8 @@ import type {SchemaType} from '../../CodegenSchema';
 import type {ParserType} from '../errors';
 import type {Parser} from '../parser';
 
+const {buildSchema} = require('.');
+
 const fs = require('fs');
 
 const {
@@ -67,13 +69,10 @@ class FlowParser implements Parser {
     );
   }
 
-  parseFile(
-    filename: string,
-    callback: (contents: string, filename: string) => SchemaType,
-  ): SchemaType {
+  parseFile(filename: string): SchemaType {
     const contents = fs.readFileSync(filename, 'utf8');
 
-    return callback(contents, filename);
+    return buildSchema(contents, filename);
   }
 }
 
diff --git a/packages/react-native-codegen/src/parsers/parser.js b/packages/react-native-codegen/src/parsers/parser.js
@@ -64,8 +64,5 @@ export interface Parser {
    * @parameter contents: the content of the file.
    * @returns: the AST of the file (given in program property for typescript).
    */
-  parseFile(
-    filename: string,
-    callback: (contents: string, filename: string) => SchemaType,
-  ): SchemaType;
+  parseFile(filename: string): SchemaType;
 }
diff --git a/packages/react-native-codegen/src/parsers/parserMock.js b/packages/react-native-codegen/src/parsers/parserMock.js
@@ -60,10 +60,7 @@ export class MockedParser implements Parser {
     return false;
   }
 
-  parseFile(
-    filename: string,
-    callback: (contents: string, filename: string) => SchemaType,
-  ): SchemaType {
+  parseFile(filename: string): SchemaType {
     return {
       modules: {
         StringPropNativeComponentView: {
diff --git a/packages/react-native-codegen/src/parsers/typescript/components/__tests__/typescript-component-parser-test.js b/packages/react-native-codegen/src/parsers/typescript/components/__tests__/typescript-component-parser-test.js
@@ -12,7 +12,6 @@
 'use strict';
 
 const {TypeScriptParser} = require('../../parser');
-const {buildSchema} = require('../../index.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
 jest.mock('fs', () => ({
@@ -33,7 +32,7 @@ describe('RN Codegen TypeScript Parser', () => {
     .sort()
     .forEach(fixtureName => {
       it(`can generate fixture ${fixtureName}`, () => {
-        const schema = parser.parseFile(fixtureName, buildSchema);
+        const schema = parser.parseFile(fixtureName);
         const serializedSchema = JSON.stringify(schema, null, 2).replace(
           /"/g,
           "'",
@@ -47,7 +46,7 @@ describe('RN Codegen TypeScript Parser', () => {
     .forEach(fixtureName => {
       it(`Fails with error message ${fixtureName}`, () => {
         expect(() => {
-          parser.parseFile(fixtureName, buildSchema);
+          parser.parseFile(fixtureName);
         }).toThrowErrorMatchingSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/parsers/typescript/parser.js b/packages/react-native-codegen/src/parsers/typescript/parser.js
@@ -14,6 +14,8 @@ import type {SchemaType} from '../../CodegenSchema';
 import type {ParserType} from '../errors';
 import type {Parser} from '../parser';
 
+const {buildSchema} = require('.');
+
 const fs = require('fs');
 
 const {
@@ -70,13 +72,10 @@ class TypeScriptParser implements Parser {
     );
   }
 
-  parseFile(
-    filename: string,
-    callback: (contents: string, filename: string) => SchemaType,
-  ): SchemaType {
+  parseFile(filename: string): SchemaType {
     const contents = fs.readFileSync(filename, 'utf8');
 
-    return callback(contents, filename);
+    return buildSchema(contents, filename);
   }
 }
 module.exports = {
