Extracts modules/utils.js files from the flow and typescript folders …

…in parsers-commons (facebook#34898) Summary: This PR is a task from facebook#34872 _Extract the modules/utils.js from the flow and typescript folders in a shared parsers-commons.js file. Then, have the two parsers use the same wrapModuleSchema function for modules._ (`wrapModuleSchema` is a copy-paste mistake, in this case it is `wrapNullable` and `unwrapNullable`) ## Changelog  [Internal] [Changed] - Extracts Codegen's modules/utils.js files from the flow and typescript folders in parsers-commons Pull Request resolved: facebook#34898 Test Plan: I ran `yarn jest react-native-codegen`: <img width="775" alt="Capture d’écran 2022-10-07 à 21 29 48" src="https://user-images.githubusercontent.com/17070498/194639515-a446c2cf-daf3-43a1-9833-cd546ca5865e.png"> Reviewed By: cipolleschi Differential Revision: D40193740 Pulled By: cipolleschi fbshipit-source-id: 02cbacc215fe5dd9bdd0839d8796587ab2821906
cipolleschi · Oct 8, 2022 · 24efebf · 24efebf
1 parent 0d3596a
commit 24efebf
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 103 deletions.
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
@@ -22,7 +22,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
-const {unwrapNullable} = require('../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../parsers/parsers-commons');
 
 type FilesOutput = Map<string, string>;
 

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
@@ -21,7 +21,7 @@ import type {
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
 const {indent} = require('../Utils');
-const {unwrapNullable} = require('../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../parsers/parsers-commons');
 
 type FilesOutput = Map<string, string>;
 

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
@@ -22,7 +22,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
-const {unwrapNullable} = require('../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../parsers/parsers-commons');
 
 type FilesOutput = Map<string, string>;
 

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
@@ -22,7 +22,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
-const {unwrapNullable} = require('../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../parsers/parsers-commons');
 
 type FilesOutput = Map<string, string>;
 

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
@@ -32,7 +32,7 @@ const {capitalize} = require('../../Utils');
 const {
   unwrapNullable,
   wrapNullable,
-} = require('../../../parsers/flow/modules/utils');
+} = require('../../../parsers/parsers-commons');
 
 type StructContext = 'CONSTANTS' | 'REGULAR';
 

diff --git a/...ve-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js b/...ve-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
@@ -17,7 +17,7 @@ import type {Nullable} from '../../../../CodegenSchema';
 import type {StructTypeAnnotation, ConstantsStruct} from '../StructCollector';
 import type {StructSerilizationOutput} from './serializeStruct';
 
-const {unwrapNullable} = require('../../../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../../../parsers/parsers-commons');
 
 const StructTemplate = ({
   hasteModuleName,

diff --git a/...tive-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js b/...tive-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
@@ -17,7 +17,7 @@ import type {Nullable} from '../../../../CodegenSchema';
 import type {StructTypeAnnotation, RegularStruct} from '../StructCollector';
 import type {StructSerilizationOutput} from './serializeStruct';
 
-const {unwrapNullable} = require('../../../../parsers/flow/modules/utils');
+const {unwrapNullable} = require('../../../../parsers/parsers-commons');
 
 const StructTemplate = ({
   hasteModuleName,

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
@@ -27,7 +27,7 @@ const {capitalize} = require('../../Utils');
 const {
   wrapNullable,
   unwrapNullable,
-} = require('../../../parsers/flow/modules/utils');
+} = require('../../../parsers/parsers-commons');
 
 const ProtocolMethodTemplate = ({
   returnObjCType,

diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
@@ -16,7 +16,7 @@ import type {
 } from '../../../../CodegenSchema';
 
 const {parseString} = require('../../index.js');
-const {unwrapNullable} = require('../utils');
+const {unwrapNullable} = require('../../../parsers-commons');
 const {
   UnsupportedFlowGenericParserError,
   UnsupportedFlowTypeAnnotationParserError,

diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -32,7 +32,7 @@ const {
   visit,
   isModuleRegistryCall,
 } = require('../utils.js');
-const {unwrapNullable, wrapNullable} = require('./utils');
+const {unwrapNullable, wrapNullable} = require('../../parsers-commons');
 const {
   IncorrectlyParameterizedFlowGenericParserError,
   MisnamedModuleFlowInterfaceParserError,

diff --git a/packages/react-native-codegen/src/parsers/flow/modules/utils.js b/packages/react-native-codegen/src/parsers/flow/modules/utils.js
diff --git a/packages/react-native-codegen/src/parsers/parsers-commons.js b/packages/react-native-codegen/src/parsers/parsers-commons.js
@@ -10,7 +10,12 @@
 
 'use strict';
 
-import type {SchemaType, NativeModuleSchema} from '../CodegenSchema.js';
+import type {
+  SchemaType,
+  NativeModuleSchema,
+  NativeModuleTypeAnnotation,
+  Nullable,
+} from '../CodegenSchema.js';
 
 function wrapModuleSchema(
   nativeModuleSchema: NativeModuleSchema,
@@ -23,6 +28,32 @@ function wrapModuleSchema(
   };
 }
 
+function unwrapNullable<+T: NativeModuleTypeAnnotation>(
+  x: Nullable<T>,
+): [T, boolean] {
+  if (x.type === 'NullableTypeAnnotation') {
+    return [x.typeAnnotation, true];
+  }
+
+  return [x, false];
+}
+
+function wrapNullable<+T: NativeModuleTypeAnnotation>(
+  nullable: boolean,
+  typeAnnotation: T,
+): Nullable<T> {
+  if (!nullable) {
+    return typeAnnotation;
+  }
+
+  return {
+    type: 'NullableTypeAnnotation',
+    typeAnnotation,
+  };
+}
+
 module.exports = {
   wrapModuleSchema,
+  unwrapNullable,
+  wrapNullable,
 };
diff --git a/...ive-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-e2e-test.js b/...ive-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-e2e-test.js
@@ -16,7 +16,7 @@ import type {
 } from '../../../../CodegenSchema';
 
 const {parseString} = require('../../index.js');
-const {unwrapNullable} = require('../utils');
+const {unwrapNullable} = require('../../../parsers-commons');
 const {
   UnsupportedTypeScriptGenericParserError,
   UnsupportedTypeScriptTypeAnnotationParserError,

diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/index.js b/packages/react-native-codegen/src/parsers/typescript/modules/index.js
@@ -32,7 +32,7 @@ const {
   visit,
   isModuleRegistryCall,
 } = require('../utils.js');
-const {unwrapNullable, wrapNullable} = require('./utils');
+const {unwrapNullable, wrapNullable} = require('../../parsers-commons');
 const {
   IncorrectlyParameterizedTypeScriptGenericParserError,
   MisnamedModuleTypeScriptInterfaceParserError,

diff --git a/packages/react-native-codegen/src/parsers/typescript/modules/utils.js b/packages/react-native-codegen/src/parsers/typescript/modules/utils.js