Skip to content

[Codegen] Extracts modules/utils.js files from the flow and typescript folders in parsers-commons #34898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[Codegen] Extracts modules/utils.js files from the flow and typescript folders in parsers-commons #34898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf1262b
:recycle: (react-native-codegen) add wrapNullable and unwrapNullable …
Oct 7, 2022
f68c9de
:recycle: (react-native-codegen) update import of wrapNullable and un…
Oct 7, 2022
39d55a0
:fire: (react-native-codegen) remove unused modules/utils files
Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const {capitalize} = require('../../Utils');
const {
unwrapNullable,
wrapNullable,
} = require('../../../parsers/flow/modules/utils');
} = require('../../../parsers/parsers-commons');

type StructContext = 'CONSTANTS' | 'REGULAR';

Expand Down
2 changes: 1 addition & 1 deletion ...ve-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ...tive-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const {capitalize} = require('../../Utils');
const {
wrapNullable,
unwrapNullable,
} = require('../../../parsers/flow/modules/utils');
} = require('../../../parsers/parsers-commons');

const ProtocolMethodTemplate = ({
returnObjCType,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/modules/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const {
visit,
isModuleRegistryCall,
} = require('../utils.js');
const {unwrapNullable, wrapNullable} = require('./utils');
const {unwrapNullable, wrapNullable} = require('../../parsers-commons');
const {
IncorrectlyParameterizedFlowGenericParserError,
MisnamedModuleFlowInterfaceParserError,
Expand Down
45 changes: 0 additions & 45 deletions packages/react-native-codegen/src/parsers/flow/modules/utils.js
View file
Open in desktop

This file was deleted.

33 changes: 32 additions & 1 deletion packages/react-native-codegen/src/parsers/parsers-commons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
};
2 changes: 1 addition & 1 deletion ...ive-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-e2e-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/modules/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const {
visit,
isModuleRegistryCall,
} = require('../utils.js');
const {unwrapNullable, wrapNullable} = require('./utils');
const {unwrapNullable, wrapNullable} = require('../../parsers-commons');
const {
IncorrectlyParameterizedTypeScriptGenericParserError,
MisnamedModuleTypeScriptInterfaceParserError,
Expand Down
45 changes: 0 additions & 45 deletions packages/react-native-codegen/src/parsers/typescript/modules/utils.js
View file
Open in desktop

This file was deleted.