diff --git a/packages/react-native-compatibility-check/src/ComparisonResult.js b/packages/react-native-compatibility-check/src/ComparisonResult.js index 24b9df031e3..40b4d934395 100644 --- a/packages/react-native-compatibility-check/src/ComparisonResult.js +++ b/packages/react-native-compatibility-check/src/ComparisonResult.js @@ -101,7 +101,8 @@ export type PropertiesComparisonResult = { nestedPropertyChanges?: Array<[string, ComparisonResult]>, ... }; -export type MembersComparisonResult = { +export type EnumMembersComparisonResult = { + memberKind: 'enum', addedMembers?: Array, missingMembers?: Array, errorMembers?: Array<{ @@ -110,6 +111,7 @@ export type MembersComparisonResult = { }>, }; export type UnionMembersComparisonResult = { + memberKind: 'union', addedMembers?: Array, missingMembers?: Array, errorMembers?: Array<{ @@ -117,6 +119,9 @@ export type UnionMembersComparisonResult = { fault?: TypeComparisonError, }>, }; +export type MembersComparisonResult = + | EnumMembersComparisonResult + | UnionMembersComparisonResult; export type NullableComparisonResult = { /* Four possible cases of change: void goes to T? :: typeRefined !optionsReduced @@ -150,11 +155,6 @@ export type ComparisonResult = memberLog: MembersComparisonResult, errorLog?: TypeComparisonError, } - | { - status: 'unionMembers', - memberLog: UnionMembersComparisonResult, - errorLog?: TypeComparisonError, - } | { status: 'functionChange', functionChangeLog: FunctionComparisonResult, @@ -184,12 +184,6 @@ export function isMemberLogEmpty(result: MembersComparisonResult): boolean { return !(result.addedMembers || result.missingMembers || result.errorMembers); } -export function isUnionMemberLogEmpty( - result: UnionMembersComparisonResult, -): boolean { - return !(result.addedMembers || result.missingMembers || result.errorMembers); -} - export function isFunctionLogEmpty(result: FunctionComparisonResult): boolean { return !(result.returnType || result.parameterTypes); } diff --git a/packages/react-native-compatibility-check/src/DiffResults.js b/packages/react-native-compatibility-check/src/DiffResults.js index 33eac9b980c..22f75d196cd 100644 --- a/packages/react-native-compatibility-check/src/DiffResults.js +++ b/packages/react-native-compatibility-check/src/DiffResults.js @@ -23,10 +23,8 @@ export type ErrorCode = | 'optionalProps' | 'nonNullableOfNull' | 'nullableOfNonNull' - | 'removedUnionCases' - | 'addedUnionCases' - | 'addedEnumCases' - | 'removedEnumCases' + | 'removedMemberCases' + | 'addedMemberCases' | 'removedIntersectCases' | 'addedIntersectCases' | 'removedModule' diff --git a/packages/react-native-compatibility-check/src/TypeDiffing.js b/packages/react-native-compatibility-check/src/TypeDiffing.js index 6d02574f5b8..8822c70e1b5 100644 --- a/packages/react-native-compatibility-check/src/TypeDiffing.js +++ b/packages/react-native-compatibility-check/src/TypeDiffing.js @@ -10,6 +10,7 @@ import type { ComparisonResult, + EnumMembersComparisonResult, FunctionComparisonResult, MembersComparisonResult, PositionalComparisonResult, @@ -45,7 +46,6 @@ import { isFunctionLogEmpty, isMemberLogEmpty, isPropertyLogEmpty, - isUnionMemberLogEmpty, makeError, memberComparisonError, propertyComparisonError, @@ -325,33 +325,7 @@ function updatePropertyError( }; } -function updateUnionMemberError( - name: CompleteTypeAnnotation, - newType: CompleteTypeAnnotation, - oldType: CompleteTypeAnnotation, - result: UnionMembersComparisonResult, -) { - return (oldError: TypeComparisonError) => { - const comparisonError = typeAnnotationComparisonError( - 'has conflicting changes', - newType, - oldType, - oldError, - ); - const memberLabel = getTypeAnnotationLabel(name); - const newFault: {fault?: TypeComparisonError, member: string} = { - member: memberLabel, - fault: comparisonError, - }; - if (result.errorMembers) { - result.errorMembers.push(newFault); - } else { - result.errorMembers = [newFault]; - } - }; -} - -function updateEnumMemberError( +function updateMemberError( name: string, newType: CompleteTypeAnnotation, oldType: CompleteTypeAnnotation, @@ -501,7 +475,6 @@ function comparePropertyArrays( result, ); case 'members': - case 'unionMembers': case 'properties': case 'functionChange': case 'positionalTypeChange': @@ -675,13 +648,13 @@ export function compareEnumDeclarations( export function compareEnumDeclarationMemberArrays( newer: Array, older: Array, -): MembersComparisonResult { +): EnumMembersComparisonResult { if (newer.length === 0 && older.length === 0) { - return {}; + return {memberKind: 'enum'}; } else if (newer.length === 0) { - return {missingMembers: [...older]}; + return {memberKind: 'enum', missingMembers: [...older]}; } else if (older.length === 0) { - return {addedMembers: [...newer]}; + return {memberKind: 'enum', addedMembers: [...newer]}; } const newerHead = newer.pop(); @@ -702,7 +675,7 @@ export function compareEnumDeclarationMemberArrays( case 'matching': return result; case 'error': - updateEnumMemberError( + updateMemberError( newerName, newerHead.value, olderHead.value, @@ -718,7 +691,6 @@ export function compareEnumDeclarationMemberArrays( case 'functionChange': case 'positionalTypeChange': case 'members': - case 'unionMembers': break; default: // Flow exhaustiveness check @@ -753,11 +725,11 @@ export function compareUnionMemberArrays( older: Array, ): UnionMembersComparisonResult { if (newer.length === 0 && older.length === 0) { - return {}; + return {memberKind: 'union'}; } else if (newer.length === 0) { - return {missingMembers: [...older]}; + return {memberKind: 'union', missingMembers: [...older]}; } else if (older.length === 0) { - return {addedMembers: [...newer]}; + return {memberKind: 'union', addedMembers: [...newer]}; } const newerHead = newer.pop(); @@ -777,8 +749,8 @@ export function compareUnionMemberArrays( case 'matching': return restComparison; case 'error': - updateUnionMemberError( - newerHead, + updateMemberError( + getTypeAnnotationLabel(newerHead), newerHead, olderHead, restComparison, @@ -799,7 +771,6 @@ export function compareUnionMemberArrays( case 'functionChange': case 'positionalTypeChange': case 'members': - case 'unionMembers': break; default: // Flow exhaustiveness check @@ -984,7 +955,7 @@ export function compareUnionTypes( sortedOlderTypes.map(([_, type]) => type), ); - if (isUnionMemberLogEmpty(result)) { + if (isMemberLogEmpty(result)) { return {status: 'matching'}; } else if (result.errorMembers) { return makeError( @@ -1018,7 +989,7 @@ export function compareUnionTypes( } return { - status: 'unionMembers', + status: 'members', memberLog: result, errorLog: typeAnnotationComparisonError( 'Union has member changes', @@ -1212,7 +1183,6 @@ export function compareFunctionTypes( if ( returnTypeResult.status === 'properties' || returnTypeResult.status === 'members' || - returnTypeResult.status === 'unionMembers' || returnTypeResult.status === 'functionChange' || returnTypeResult.status === 'positionalTypeChange' || returnTypeResult.status === 'nullableChange' @@ -1315,7 +1285,6 @@ function compareArrayOfTypes( if ( result.status === 'properties' || result.status === 'members' || - result.status === 'unionMembers' || result.status === 'functionChange' || result.status === 'positionalTypeChange' || result.status === 'nullableChange' diff --git a/packages/react-native-compatibility-check/src/VersionDiffing.js b/packages/react-native-compatibility-check/src/VersionDiffing.js index e7f3ad43cfb..44ab82504c7 100644 --- a/packages/react-native-compatibility-check/src/VersionDiffing.js +++ b/packages/react-native-compatibility-check/src/VersionDiffing.js @@ -16,7 +16,6 @@ import type { PositionalComparisonResult, PropertiesComparisonResult, TypeComparisonError, - UnionMembersComparisonResult, } from './ComparisonResult'; import type { DiffSet, @@ -53,7 +52,6 @@ type checkerType = ( positionalChange: ?PositionalComparisonResult, nullableChange: ?NullableComparisonResult, memberChange: ?MembersComparisonResult, - unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ) => Array; @@ -112,7 +110,6 @@ function nestedPropertiesCheck( null, null, null, - null, typeName, pathContext ?? null, ); @@ -170,9 +167,7 @@ function nestedPropertiesCheck( } return finalResult; case 'members': - return check(null, null, null, result.memberLog, null, typeName, null); - case 'unionMembers': - return check(null, null, null, null, result.memberLog, typeName, null); + return check(null, null, null, result.memberLog, typeName, null); case 'functionChange': let returnTypeResult: Array = []; if (result.functionChangeLog.returnType) { @@ -216,7 +211,6 @@ function nestedPropertiesCheck( changeLog, null, null, - null, typeName, null, ); @@ -245,7 +239,6 @@ function nestedPropertiesCheck( null, result.nullableLog, null, - null, typeName, null, ); @@ -316,7 +309,6 @@ function checkForUnsafeRemovedProperties( _postionalChange: ?PositionalComparisonResult, _nullableChange: ?NullableComparisonResult, _memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { @@ -339,7 +331,6 @@ function checkForUnsafeAddedProperties( _positionalChange: ?PositionalComparisonResult, _nullableChange: ?NullableComparisonResult, _memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { @@ -362,7 +353,6 @@ function checkForUnSafeMadeStrictProperties( _positionalChange: ?PositionalComparisonResult, _nullableChange: ?NullableComparisonResult, _memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { @@ -396,7 +386,6 @@ function checkForUnSafeMadeOptionalProperties( _positionalChange: ?PositionalComparisonResult, _nullableChange: ?NullableComparisonResult, _memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { @@ -425,29 +414,55 @@ function checkForUnSafeMadeOptionalProperties( export const removedEnumMessage = 'Enum removed items, but native may still provide them'; -function checkForUnsafeRemovedEnumItems( +export const removedUnionMessage = + 'Union removed items, but native may still provide them'; +function checkForUnsafeRemovedMemberItems( _propertyChange: ?PropertiesComparisonResult, _positionalChange: ?PositionalComparisonResult, _nullableChange: ?NullableComparisonResult, memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { - if (memberChange?.missingMembers && memberChange?.missingMembers.length > 0) { - return [ - { - typeName, - errorCode: 'removedEnumCases', - errorInformation: memberComparisonError( - removedEnumMessage, - memberChange.missingMembers.map(member => ({ - member: member.name, - })), - pathContext ?? undefined, - ), - }, - ]; + if (memberChange == null) { + return []; + } + + // Check memberKind first to narrow the type, then access members + if (memberChange.memberKind === 'enum') { + const missingMembers = memberChange.missingMembers; + if (missingMembers && missingMembers.length > 0) { + return [ + { + typeName, + errorCode: 'removedMemberCases', + errorInformation: memberComparisonError( + removedEnumMessage, + missingMembers.map(member => ({ + member: member.name, + })), + pathContext ?? undefined, + ), + }, + ]; + } + } else { + const missingMembers = memberChange.missingMembers; + if (missingMembers && missingMembers.length > 0) { + return [ + { + typeName, + errorCode: 'removedMemberCases', + errorInformation: memberComparisonError( + removedUnionMessage, + missingMembers.map(member => ({ + member: getTypeAnnotationLabel(member), + })), + pathContext ?? undefined, + ), + }, + ]; + } } return []; @@ -455,52 +470,60 @@ function checkForUnsafeRemovedEnumItems( export const addedEnumMessage = 'Enum added items, but native will not expect/support them'; -function checkForUnsafeAddedEnumItems( +export const addedUnionMessage = + 'Union added items, but native will not expect/support them'; +function checkForUnsafeAddedMemberItems( _propertyChange: ?PropertiesComparisonResult, _positionalChange: ?PositionalComparisonResult, _nullableChange: ?NullableComparisonResult, memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { - if (memberChange?.addedMembers && memberChange?.addedMembers.length > 0) { - return [ - { - typeName, - errorCode: 'addedEnumCases', - errorInformation: memberComparisonError( - addedEnumMessage, - memberChange.addedMembers.map(member => ({ - member: member.name, - })), - pathContext ?? undefined, - ), - }, - ]; + if (memberChange == null) { + return []; + } + + // Check memberKind first to narrow the type, then access members + if (memberChange.memberKind === 'enum') { + const addedMembers = memberChange.addedMembers; + if (addedMembers && addedMembers.length > 0) { + return [ + { + typeName, + errorCode: 'addedMemberCases', + errorInformation: memberComparisonError( + addedEnumMessage, + addedMembers.map(member => ({ + member: member.name, + })), + pathContext ?? undefined, + ), + }, + ]; + } + } else { + const addedMembers = memberChange.addedMembers; + if (addedMembers && addedMembers.length > 0) { + return [ + { + typeName, + errorCode: 'addedMemberCases', + errorInformation: memberComparisonError( + addedUnionMessage, + addedMembers.map(member => ({ + member: getTypeAnnotationLabel(member), + })), + pathContext ?? undefined, + ), + }, + ]; + } } return []; } -// Helper function to get a label for a member (either enum member or union type annotation) -function getMemberLabel(member: CompleteTypeAnnotation): string { - // Check if it's an enum member by checking if it has both 'name' and 'value' properties - // (NativeModuleEnumMember has { name: string, value: TypeAnnotation }) - if ( - typeof member === 'object' && - member != null && - 'name' in member && - 'value' in member && - typeof member.name === 'string' - ) { - return member.name; - } - // Otherwise it's a CompleteTypeAnnotation (union member) - // Generate a descriptive label based on the type value - return getTypeAnnotationLabel(member); -} - // Helper function to get a descriptive label for a CompleteTypeAnnotation function getTypeAnnotationLabel(type: CompleteTypeAnnotation): string { if (type.type === 'StringLiteralTypeAnnotation') { @@ -516,72 +539,6 @@ function getTypeAnnotationLabel(type: CompleteTypeAnnotation): string { } } -export const removedUnionMemberMessage = - 'Union removed items, but native may still provide them'; -function checkForUnsafeRemovedUnionItems( - _propertyChange: ?PropertiesComparisonResult, - _positionalChange: ?PositionalComparisonResult, - _nullableChange: ?NullableComparisonResult, - memberChange: ?MembersComparisonResult, - unionMemberChange: ?UnionMembersComparisonResult, - typeName: string, - pathContext: ?TypeComparisonError, -): Array { - if ( - unionMemberChange?.missingMembers && - unionMemberChange?.missingMembers.length > 0 - ) { - return [ - { - typeName, - errorCode: 'removedUnionCases', - errorInformation: memberComparisonError( - removedUnionMemberMessage, - unionMemberChange.missingMembers.map(member => ({ - member: getMemberLabel(member), - })), - pathContext ?? undefined, - ), - }, - ]; - } - - return []; -} - -export const addedUnionMemberMessage = - 'Union added items, but native will not expect/support them'; -function checkForUnsafeAddedUnionItems( - _propertyChange: ?PropertiesComparisonResult, - _positionalChange: ?PositionalComparisonResult, - _nullableChange: ?NullableComparisonResult, - memberChange: ?MembersComparisonResult, - unionMemberChange: ?UnionMembersComparisonResult, - typeName: string, - pathContext: ?TypeComparisonError, -): Array { - if ( - unionMemberChange?.addedMembers && - unionMemberChange?.addedMembers.length > 0 - ) { - return [ - { - typeName, - errorCode: 'addedUnionCases', - errorInformation: memberComparisonError( - addedUnionMemberMessage, - unionMemberChange.addedMembers.map(member => ({ - member: getMemberLabel(member), - })), - pathContext ?? undefined, - ), - }, - ]; - } - - return []; -} - export const removedIntersectionMessage = 'Intersection removed items, but native may still require properties contained in them'; function checkForUnsafeRemovedIntersectionItems( @@ -589,7 +546,6 @@ function checkForUnsafeRemovedIntersectionItems( positionalChange: ?PositionalComparisonResult, _nullableChange: ?NullableComparisonResult, _memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { @@ -621,7 +577,6 @@ function checkForUnsafeAddedIntersectionItems( positionalChange: ?PositionalComparisonResult, _nullableChange: ?NullableComparisonResult, _memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { @@ -655,7 +610,6 @@ function checkForUnsafeNullableToNativeChange( _positionalChange: ?PositionalComparisonResult, nullableChange: ?NullableComparisonResult, _memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { @@ -692,7 +646,6 @@ function checkForUnsafeNullableFromNativeChange( _positionalChange: ?PositionalComparisonResult, nullableChange: ?NullableComparisonResult, _memberChange: ?MembersComparisonResult, - _unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ): Array { @@ -726,7 +679,6 @@ function chainPropertiesChecks(checks: Array): checkerType { positionalChange: ?PositionalComparisonResult, nullableChange: ?NullableComparisonResult, memberChange: ?MembersComparisonResult, - unionMemberChange: ?UnionMembersComparisonResult, typeName: string, pathContext: ?TypeComparisonError, ) => @@ -738,7 +690,6 @@ function chainPropertiesChecks(checks: Array): checkerType { positionalChange, nullableChange, memberChange, - unionMemberChange, typeName, pathContext, ), @@ -799,8 +750,7 @@ function compareFunctionTypesInContext( const checksForTypesFlowingToNative: checkerType = chainPropertiesChecks([ checkForUnsafeRemovedProperties, checkForUnSafeMadeOptionalProperties, - checkForUnsafeAddedUnionItems, - checkForUnsafeAddedEnumItems, + checkForUnsafeAddedMemberItems, checkForUnsafeRemovedIntersectionItems, checkForUnsafeNullableToNativeChange, ]); @@ -811,8 +761,7 @@ const checksForTypesFlowingToNative: checkerType = chainPropertiesChecks([ const checksForTypesFlowingFromNative: checkerType = chainPropertiesChecks([ checkForUnsafeAddedProperties, checkForUnSafeMadeStrictProperties, - checkForUnsafeRemovedUnionItems, - checkForUnsafeRemovedEnumItems, + checkForUnsafeRemovedMemberItems, checkForUnsafeAddedIntersectionItems, checkForUnsafeNullableFromNativeChange, ]); @@ -861,59 +810,11 @@ export function assessComparisonResult( null, null, memberChange, - null, typeName, difference.errorLog, ); const fromNativeErrorResult = checksForTypesFlowingFromNative( - null, - null, - null, - memberChange, - null, - typeName, - difference.errorLog, - ); - - switch (oldDirection) { - case 'toNative': - toNativeErrorResult.forEach(error => - incompatibleChanges.add(error), - ); - break; - case 'fromNative': - fromNativeErrorResult.forEach(error => - incompatibleChanges.add(error), - ); - break; - case 'both': - toNativeErrorResult.forEach(error => - incompatibleChanges.add(error), - ); - fromNativeErrorResult.forEach(error => - incompatibleChanges.add(error), - ); - break; - } - } - break; - case 'unionMembers': - { - const memberChange = difference.memberLog; - - const toNativeErrorResult = checksForTypesFlowingToNative( - null, - null, - null, - null, - memberChange, - typeName, - difference.errorLog, - ); - - const fromNativeErrorResult = checksForTypesFlowingFromNative( - null, null, null, null, @@ -1056,7 +957,6 @@ export function assessComparisonResult( changeLog, null, null, - null, typeName, null, ); @@ -1083,7 +983,6 @@ export function assessComparisonResult( changeLog, null, null, - null, typeName, null, ); @@ -1134,7 +1033,6 @@ export function assessComparisonResult( null, difference.nullableLog, null, - null, typeName, difference.errorLog, ).forEach(error => incompatibleChanges.add(error)); @@ -1145,7 +1043,6 @@ export function assessComparisonResult( null, difference.nullableLog, null, - null, typeName, difference.errorLog, ).forEach(error => incompatibleChanges.add(error)); diff --git a/packages/react-native-compatibility-check/src/__tests__/TypeDiffing-test.js b/packages/react-native-compatibility-check/src/__tests__/TypeDiffing-test.js index 0dbda9c3d50..d4118c9666a 100644 --- a/packages/react-native-compatibility-check/src/__tests__/TypeDiffing-test.js +++ b/packages/react-native-compatibility-check/src/__tests__/TypeDiffing-test.js @@ -244,8 +244,9 @@ describe('components', () => { ), ).toEqual( expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: { + memberKind: 'union', addedMembers: [ { type: 'StringLiteralTypeAnnotation', @@ -1044,8 +1045,9 @@ describe('compareTypes unions', () => { ).functionChangeLog.parameterTypes.nestedChanges[0][2], ).toEqual( expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: expect.objectContaining({ + memberKind: 'union', missingMembers: expect.any(Array), }), errorLog: expect.objectContaining({ @@ -1237,8 +1239,9 @@ describe('compareTypes on string literal unions', () => { ), ).toEqual( expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: { + memberKind: 'union', missingMembers: [ { type: 'StringLiteralTypeAnnotation', @@ -1263,8 +1266,9 @@ describe('compareTypes on string literal unions', () => { ), ).toEqual( expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: { + memberKind: 'union', addedMembers: [ { type: 'StringLiteralTypeAnnotation', @@ -1438,6 +1442,7 @@ describe('compareTypes on enums', () => { expect.objectContaining({ status: 'members', memberLog: expect.objectContaining({ + memberKind: 'enum', missingMembers: expect.arrayContaining([ expect.objectContaining({ name: 'D', @@ -1468,6 +1473,7 @@ describe('compareTypes on enums', () => { expect.objectContaining({ status: 'members', memberLog: expect.objectContaining({ + memberKind: 'enum', addedMembers: expect.arrayContaining([ expect.objectContaining({ name: 'D', diff --git a/packages/react-native-compatibility-check/src/__tests__/VersionDiffing-test.js b/packages/react-native-compatibility-check/src/__tests__/VersionDiffing-test.js index 37988dd1e03..1db30cddcf5 100644 --- a/packages/react-native-compatibility-check/src/__tests__/VersionDiffing-test.js +++ b/packages/react-native-compatibility-check/src/__tests__/VersionDiffing-test.js @@ -491,7 +491,7 @@ describe('buildSchemaDiff', () => { changeInformation: expect.objectContaining({ incompatibleChanges: expect.arrayContaining([ expect.objectContaining({ - errorCode: 'addedEnumCases', + errorCode: 'addedMemberCases', errorInformation: expect.objectContaining({ mismatchedProperties: expect.arrayContaining([ expect.objectContaining({ @@ -629,7 +629,7 @@ describe('buildSchemaDiff', () => { changeInformation: expect.objectContaining({ incompatibleChanges: expect.arrayContaining([ expect.objectContaining({ - errorCode: 'removedEnumCases', + errorCode: 'removedMemberCases', errorInformation: expect.objectContaining({ mismatchedProperties: expect.arrayContaining([ expect.objectContaining({ @@ -975,8 +975,9 @@ describe('buildSchemaDiff', () => { 0, 0, expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: expect.objectContaining({ + memberKind: 'union', addedMembers: expect.arrayContaining([ expect.objectContaining({ type: 'StringLiteralTypeAnnotation', @@ -1030,8 +1031,9 @@ describe('buildSchemaDiff', () => { 0, 0, expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: expect.objectContaining({ + memberKind: 'union', missingMembers: expect.arrayContaining([ expect.objectContaining({ type: 'StringLiteralTypeAnnotation', @@ -1092,8 +1094,9 @@ describe('buildSchemaDiff', () => { [ 'exampleConstant', expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: expect.objectContaining({ + memberKind: 'union', addedMembers: expect.arrayContaining([ expect.objectContaining({ @@ -1157,8 +1160,9 @@ describe('buildSchemaDiff', () => { [ 'exampleConstant', expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: expect.objectContaining({ + memberKind: 'union', missingMembers: expect.arrayContaining([ expect.objectContaining({ @@ -1536,8 +1540,9 @@ describe('buildSchemaDiff', () => { [ 'size', expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: expect.objectContaining({ + memberKind: 'union', addedMembers: expect.arrayContaining([ expect.objectContaining({ type: 'StringLiteralTypeAnnotation', @@ -1595,8 +1600,9 @@ describe('buildSchemaDiff', () => { [ 'sizes', expect.objectContaining({ - status: 'unionMembers', + status: 'members', memberLog: expect.objectContaining({ + memberKind: 'union', addedMembers: expect.arrayContaining([ expect.objectContaining({ type: 'StringLiteralTypeAnnotation', diff --git a/packages/react-native-compatibility-check/src/__tests__/__snapshots__/ErrorFormatting-test.js.snap b/packages/react-native-compatibility-check/src/__tests__/__snapshots__/ErrorFormatting-test.js.snap index 4d753124705..756dea2572a 100644 --- a/packages/react-native-compatibility-check/src/__tests__/__snapshots__/ErrorFormatting-test.js.snap +++ b/packages/react-native-compatibility-check/src/__tests__/__snapshots__/ErrorFormatting-test.js.snap @@ -194,7 +194,7 @@ Object { "framework": "ReactNative", "incompatibleSpecs": Array [ Object { - "errorCode": "addedUnionCases", + "errorCode": "addedMemberCases", "message": "NativeComponent: Object contained a property with a type mismatch -- sizes: has conflicting type changes --new: (small | large | huge) @@ -239,7 +239,7 @@ Object { "framework": "ReactNative", "incompatibleSpecs": Array [ Object { - "errorCode": "addedUnionCases", + "errorCode": "addedMemberCases", "message": "NativeComponent: Object contained a property with a type mismatch -- size: has conflicting type changes --new: (small | huge | large) @@ -516,7 +516,7 @@ Object { "framework": "ReactNative", "incompatibleSpecs": Array [ Object { - "errorCode": "addedEnumCases", + "errorCode": "addedMemberCases", "message": "NativeModuleTest: Object contained a property with a type mismatch -- exampleFunction: has conflicting type changes --new: (a: Enum, b: number)=>void @@ -541,7 +541,7 @@ Object { "framework": "ReactNative", "incompatibleSpecs": Array [ Object { - "errorCode": "removedEnumCases", + "errorCode": "removedMemberCases", "message": "NativeModuleTest: Object contained a property with a type mismatch -- getConstants: has conflicting type changes --new: ()=>{exampleConstant: Enum} @@ -769,7 +769,7 @@ Object { "framework": "ReactNative", "incompatibleSpecs": Array [ Object { - "errorCode": "addedUnionCases", + "errorCode": "addedMemberCases", "message": "NativeModuleTest: Object contained a property with a type mismatch -- exampleFunction: has conflicting type changes --new: (a: (a | b | c | d), b: number)=>void @@ -820,7 +820,7 @@ Object { "framework": "ReactNative", "incompatibleSpecs": Array [ Object { - "errorCode": "addedUnionCases", + "errorCode": "addedMemberCases", "message": "NativeModuleTest: Object contained a property with a type mismatch -- exampleFunction: has conflicting type changes --new: (a: (a | b | c), b: number)=>void @@ -846,7 +846,7 @@ Object { "framework": "ReactNative", "incompatibleSpecs": Array [ Object { - "errorCode": "removedUnionCases", + "errorCode": "removedMemberCases", "message": "NativeModuleTest: Object contained a property with a type mismatch -- getConstants: has conflicting type changes --new: ()=>{exampleConstant: (a | b | c)} @@ -898,7 +898,7 @@ Object { "framework": "ReactNative", "incompatibleSpecs": Array [ Object { - "errorCode": "addedUnionCases", + "errorCode": "addedMemberCases", "message": "NativeModuleTest: Object contained a property with a type mismatch -- exampleFunction: has conflicting type changes --new: (a: Union, b: number)=>void