Skip to content

Commit

Permalink
rename module exports as "aliases" to "aliasMap"
Browse files Browse the repository at this point in the history
Summary: Changelog: [Internal] rename module exports as "aliases" to "aliasMap"

Differential Revision: https://www.internalfb.com/diff/D42888752?entry_point=27

fbshipit-source-id: cf0ba61d4e7574beec641039808341c8fc16f418
  • Loading branch information
Vitali Zaidman authored and facebook-github-bot committed Feb 2, 2023
1 parent 147a1f6 commit 36b047d
Show file tree
Hide file tree
Showing 15 changed files with 90 additions and 90 deletions.
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/CodegenSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export type NullableTypeAnnotation<+T: NativeModuleTypeAnnotation> = $ReadOnly<{

export type NativeModuleSchema = $ReadOnly<{
type: 'NativeModule',
aliases: NativeModuleAliasMap,
aliasMap: NativeModuleAliasMap,
spec: NativeModuleSpec,
moduleName: string,
// Use for modules that are not used on other platforms.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const SCHEMA_WITH_TM_AND_FC: SchemaType = {
},
NativeCalculator: {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {
properties: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,11 @@ module.exports = {
.map((hasteModuleName: string) => {
const nativeModule = nativeModules[hasteModuleName];
const {
aliases,
aliasMap,
spec: {properties},
moduleName,
} = nativeModule;
const resolveAlias = createAliasResolver(aliases);
const resolveAlias = createAliasResolver(aliasMap);
const hostFunctions = properties.map(property =>
serializePropertyIntoHostFunction(
hasteModuleName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,12 +341,12 @@ module.exports = {

const modules = Object.keys(nativeModules).flatMap(hasteModuleName => {
const {
aliases,
aliasMap,
spec: {properties},
moduleName,
} = nativeModules[hasteModuleName];
const resolveAlias = createAliasResolver(aliases);
const structs = createStructs(moduleName, aliases, resolveAlias);
const resolveAlias = createAliasResolver(aliasMap);
const structs = createStructs(moduleName, aliasMap, resolveAlias);

return [
ModuleClassDeclarationTemplate({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -447,15 +447,15 @@ module.exports = {
Object.keys(nativeModules).forEach(hasteModuleName => {
const {
aliases,
aliasMap,
excludedPlatforms,
moduleName,
spec: {properties},
} = nativeModules[hasteModuleName];
if (excludedPlatforms != null && excludedPlatforms.includes('android')) {
return;
}
const resolveAlias = createAliasResolver(aliases);
const resolveAlias = createAliasResolver(aliasMap);
const className = `${hasteModuleName}Spec`;
const imports: Set<string> = new Set([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -438,10 +438,10 @@ module.exports = {
.sort()
.map(hasteModuleName => {
const {
aliases,
aliasMap,
spec: {properties},
} = nativeModules[hasteModuleName];
const resolveAlias = createAliasResolver(aliases);
const resolveAlias = createAliasResolver(aliasMap);

const translatedMethods = properties
.map(property =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ module.exports = {
const hasteModuleNames: Array<string> = Object.keys(nativeModules).sort();
for (const hasteModuleName of hasteModuleNames) {
const {
aliases,
aliasMap,
excludedPlatforms,
spec: {properties},
} = nativeModules[hasteModuleName];
if (excludedPlatforms != null && excludedPlatforms.includes('iOS')) {
continue;
}
const resolveAlias = createAliasResolver(aliases);
const resolveAlias = createAliasResolver(aliasMap);
const structCollector = new StructCollector();

const methodSerializations: Array<MethodSerializationOutput> = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const EMPTY_NATIVE_MODULES: SchemaType = {
modules: {
NativeSampleTurboModule: {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {
properties: [],
},
Expand All @@ -29,7 +29,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
modules: {
NativeSampleTurboModule: {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {
properties: [
{
Expand Down Expand Up @@ -341,7 +341,7 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
modules: {
NativeSampleTurboModule: {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {
properties: [
{
Expand All @@ -361,7 +361,7 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
},
NativeSampleTurboModule2: {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {
properties: [
{
Expand Down Expand Up @@ -398,7 +398,7 @@ const COMPLEX_OBJECTS: SchemaType = {
modules: {
NativeSampleTurboModule: {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {
properties: [
{
Expand Down Expand Up @@ -764,7 +764,7 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
modules: {
AliasTurboModule: {
type: 'NativeModule',
aliases: {
aliasMap: {
Options: {
type: 'ObjectTypeAnnotation',
properties: [
Expand Down Expand Up @@ -899,7 +899,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
modules: {
NativeCameraRollManager: {
type: 'NativeModule',
aliases: {
aliasMap: {
PhotoIdentifierImage: {
type: 'ObjectTypeAnnotation',
properties: [
Expand Down Expand Up @@ -1226,7 +1226,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
},
NativeExceptionsManager: {
type: 'NativeModule',
aliases: {
aliasMap: {
StackFrame: {
properties: [
{
Expand Down Expand Up @@ -1494,7 +1494,7 @@ const CXX_ONLY_NATIVE_MODULES: SchemaType = {
modules: {
NativeSampleTurboModule: {
type: 'NativeModule',
aliases: {
aliasMap: {
ObjectAlias: {
type: 'ObjectTypeAnnotation',
properties: [
Expand Down Expand Up @@ -1648,7 +1648,7 @@ const SAMPLE_WITH_UPPERCASE_NAME: SchemaType = {
modules: {
NativeSampleTurboModule: {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {
properties: [],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ describe('buildSchemaFromConfigType', () => {

const moduleSchemaMock = {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {properties: []},
moduleName: '',
};
Expand Down Expand Up @@ -657,13 +657,13 @@ describe('buildSchema', () => {
const contents = `
import type {ViewProps} from 'ViewPropTypes';
import type {HostComponent} from 'react-native';
const codegenNativeComponent = require('codegenNativeComponent');
export type ModuleProps = $ReadOnly<{|
...ViewProps,
|}>;
export default (codegenNativeComponent<ModuleProps>(
'Module',
): HostComponent<ModuleProps>);
Expand Down Expand Up @@ -712,11 +712,11 @@ describe('buildSchema', () => {
const contents = `
import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
export interface Spec extends TurboModule {
+getArray: (a: Array<any>) => Array<string>;
}
export default (TurboModuleRegistry.getEnforcing<Spec>(
'SampleTurboModule',
): Spec);
Expand All @@ -742,7 +742,7 @@ describe('buildSchema', () => {
modules: {
fileName: {
type: 'NativeModule',
aliases: {},
aliasMap: {},
spec: {
properties: [
{
Expand Down
Loading

0 comments on commit 36b047d

Please sign in to comment.