Skip to content

Commit e45fc4f

Browse files
marcoww6meta-codesync[bot]
authored andcommitted
Transform mixed to unknown in xplat/js
Reviewed By: SamChou19815 Differential Revision: D90131601 fbshipit-source-id: 6497ce36dfed3b3ebe2706cf90909447b36e397a
1 parent 996f53e commit e45fc4f

File tree

3 files changed

+49
-42
lines changed

3 files changed

+49
-42
lines changed

packages/relay-runtime/store/__tests__/DataChecker-test.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -724,10 +724,11 @@ describe('check()', () => {
724724

725725
loader = {
726726
get: jest.fn(
727-
// $FlowFixMe[invalid-computed-prop]
728-
(moduleName: mixed) => nodes[String(moduleName).replace(/\$.*/, '')],
727+
(moduleName: unknown) =>
728+
// $FlowFixMe[invalid-computed-prop]
729+
nodes[String(moduleName).replace(/\$.*/, '')],
729730
),
730-
load: jest.fn((moduleName: mixed) =>
731+
load: jest.fn((moduleName: unknown) =>
731732
// $FlowFixMe[invalid-computed-prop]
732733
Promise.resolve(nodes[String(moduleName).replace(/\$.*/, '')]),
733734
),
@@ -1176,10 +1177,11 @@ describe('check()', () => {
11761177

11771178
loader = {
11781179
get: jest.fn(
1179-
// $FlowFixMe[invalid-computed-prop]
1180-
(moduleName: mixed) => nodes[String(moduleName).replace(/\$.*/, '')],
1180+
(moduleName: unknown) =>
1181+
// $FlowFixMe[invalid-computed-prop]
1182+
nodes[String(moduleName).replace(/\$.*/, '')],
11811183
),
1182-
load: jest.fn((moduleName: mixed) =>
1184+
load: jest.fn((moduleName: unknown) =>
11831185
// $FlowFixMe[invalid-computed-prop]
11841186
Promise.resolve(nodes[String(moduleName).replace(/\$.*/, '')]),
11851187
),

packages/relay-runtime/store/__tests__/RelayReferenceMarker-test.js

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,11 @@ describe('RelayReferenceMarker', () => {
502502
`;
503503
loader = {
504504
get: jest.fn(
505-
// $FlowFixMe[invalid-computed-prop]
506-
(moduleName: mixed) => nodes[String(moduleName).replace(/\$.*/, '')],
505+
(moduleName: unknown) =>
506+
// $FlowFixMe[invalid-computed-prop]
507+
nodes[String(moduleName).replace(/\$.*/, '')],
507508
),
508-
load: jest.fn((moduleName: mixed) =>
509+
load: jest.fn((moduleName: unknown) =>
509510
// $FlowFixMe[invalid-computed-prop]
510511
Promise.resolve(nodes[String(moduleName).replace(/\$.*/, '')]),
511512
),
@@ -865,10 +866,11 @@ describe('RelayReferenceMarker', () => {
865866
const references = new Set<DataID>();
866867
const loader = {
867868
get: jest.fn(
868-
// $FlowFixMe[invalid-computed-prop]
869-
(moduleName: mixed) => nodes[String(moduleName).replace(/\$.*/, '')],
869+
(moduleName: unknown) =>
870+
// $FlowFixMe[invalid-computed-prop]
871+
nodes[String(moduleName).replace(/\$.*/, '')],
870872
),
871-
load: jest.fn((moduleName: mixed) =>
873+
load: jest.fn((moduleName: unknown) =>
872874
// $FlowFixMe[invalid-computed-prop]
873875
Promise.resolve(nodes[String(moduleName).replace(/\$.*/, '')]),
874876
),
@@ -918,10 +920,11 @@ describe('RelayReferenceMarker', () => {
918920
const references = new Set<DataID>();
919921
const loader = {
920922
get: jest.fn(
921-
// $FlowFixMe[invalid-computed-prop]
922-
(moduleName: mixed) => nodes[String(moduleName).replace(/\$.*/, '')],
923+
(moduleName: unknown) =>
924+
// $FlowFixMe[invalid-computed-prop]
925+
nodes[String(moduleName).replace(/\$.*/, '')],
923926
),
924-
load: jest.fn((moduleName: mixed) =>
927+
load: jest.fn((moduleName: unknown) =>
925928
// $FlowFixMe[invalid-computed-prop]
926929
Promise.resolve(nodes[String(moduleName).replace(/\$.*/, '')]),
927930
),
@@ -968,10 +971,11 @@ describe('RelayReferenceMarker', () => {
968971
const references = new Set<DataID>();
969972
const loader = {
970973
get: jest.fn(
971-
// $FlowFixMe[invalid-computed-prop]
972-
(moduleName: mixed) => nodes[String(moduleName).replace(/\$.*/, '')],
974+
(moduleName: unknown) =>
975+
// $FlowFixMe[invalid-computed-prop]
976+
nodes[String(moduleName).replace(/\$.*/, '')],
973977
),
974-
load: jest.fn((moduleName: mixed) =>
978+
load: jest.fn((moduleName: unknown) =>
975979
// $FlowFixMe[invalid-computed-prop]
976980
Promise.resolve(nodes[String(moduleName).replace(/\$.*/, '')]),
977981
),
@@ -1062,10 +1066,11 @@ describe('RelayReferenceMarker', () => {
10621066
`;
10631067
loader = {
10641068
get: jest.fn(
1065-
// $FlowFixMe[invalid-computed-prop]
1066-
(moduleName: mixed) => nodes[String(moduleName).replace(/\$.*/, '')],
1069+
(moduleName: unknown) =>
1070+
// $FlowFixMe[invalid-computed-prop]
1071+
nodes[String(moduleName).replace(/\$.*/, '')],
10671072
),
1068-
load: jest.fn((moduleName: mixed) =>
1073+
load: jest.fn((moduleName: unknown) =>
10691074
// $FlowFixMe[invalid-computed-prop]
10701075
Promise.resolve(nodes[String(moduleName).replace(/\$.*/, '')]),
10711076
),

packages/relay-test-utils/RelayMockPayloadGenerator.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,28 @@ type ValueResolver = (
6060
typeName: ?string,
6161
context: MockResolverContext,
6262
plural: ?boolean,
63-
defaultValue?: mixed,
64-
) => mixed;
63+
defaultValue?: unknown,
64+
) => unknown;
6565
type Traversable = {
6666
+selections: $ReadOnlyArray<NormalizationSelection>,
6767
+typeName: ?string,
6868
+isAbstractType: ?boolean,
6969
+name: ?string,
7070
+alias: ?string,
71-
+args: ?{[string]: mixed, ...},
71+
+args: ?{[string]: unknown, ...},
7272
};
73-
type MockData = {[string]: mixed, ...};
73+
type MockData = {[string]: unknown, ...};
7474
export type MockResolverContext = {
7575
+parentType: ?string,
7676
+name: ?string,
7777
+alias: ?string,
7878
+path: ?$ReadOnlyArray<string>,
79-
+args: ?{[string]: mixed, ...},
79+
+args: ?{[string]: unknown, ...},
8080
};
8181
type MockResolver = (
8282
context: MockResolverContext,
8383
generateId: () => number,
84-
) => mixed;
84+
) => unknown;
8585
export type MockResolvers = {+[typeName: string]: MockResolver, ...};
8686

8787
type SelectionMetadata = {
@@ -131,9 +131,9 @@ function valueResolver(
131131
typeName: ?string,
132132
context: MockResolverContext,
133133
plural: ?boolean = false,
134-
defaultValue?: mixed,
135-
): mixed {
136-
const generateValue = (possibleDefaultValue: mixed) => {
134+
defaultValue?: unknown,
135+
): unknown {
136+
const generateValue = (possibleDefaultValue: unknown) => {
137137
let mockValue;
138138
const mockResolver =
139139
typeName != null && mockResolvers != null
@@ -170,8 +170,8 @@ function createValueResolver(mockResolvers: ?MockResolvers): ValueResolver {
170170
}
171171

172172
function generateMockList<T>(
173-
placeholderArray: $ReadOnlyArray<mixed>,
174-
generateListItem: (defaultValue: mixed, index?: number) => T,
173+
placeholderArray: $ReadOnlyArray<unknown>,
174+
generateListItem: (defaultValue: unknown, index?: number) => T,
175175
): $ReadOnlyArray<T> {
176176
return placeholderArray.map((possibleDefaultValue, index) =>
177177
generateListItem(possibleDefaultValue, index),
@@ -607,7 +607,7 @@ class RelayMockPayloadGenerator {
607607
*/
608608
_getCorrectDefaultEnum(
609609
enumValues: $ReadOnlyArray<string>,
610-
value: mixed | Array<mixed>,
610+
value: unknown | Array<unknown>,
611611
path: $ReadOnlyArray<string>,
612612
applicationName: string,
613613
): ?(string | Array<string>) {
@@ -668,13 +668,13 @@ class RelayMockPayloadGenerator {
668668
mockData: ?MockData,
669669
defaultValues: ?MockData,
670670
): MockData {
671-
const data = mockData ?? ({} as {[string]: mixed});
671+
const data = mockData ?? ({} as {[string]: unknown});
672672
const applicationName = field.alias ?? field.name;
673673
if (data.hasOwnProperty(applicationName) && field.name !== TYPENAME_KEY) {
674674
return data;
675675
}
676676

677-
let value: mixed;
677+
let value: unknown;
678678

679679
// For __typename fields we are going to return typeName
680680
if (field.name === TYPENAME_KEY) {
@@ -789,7 +789,7 @@ class RelayMockPayloadGenerator {
789789
field.concreteType == null && typeName === typeFromSelection.type;
790790

791791
const generateDataForField = (
792-
possibleDefaultValue: mixed,
792+
possibleDefaultValue: unknown,
793793
index?: number,
794794
) => {
795795
const fieldPath = field.plural
@@ -839,7 +839,7 @@ class RelayMockPayloadGenerator {
839839
/**
840840
* Get the value for a variable by name
841841
*/
842-
_getVariableValue(name: string): mixed {
842+
_getVariableValue(name: string): unknown {
843843
invariant(
844844
this._variables.hasOwnProperty(name),
845845
'RelayMockPayloadGenerator(): Undefined variable `%s`.',
@@ -858,7 +858,7 @@ class RelayMockPayloadGenerator {
858858
fieldName: ?string,
859859
fieldAlias: ?string,
860860
path: $ReadOnlyArray<string>,
861-
args: ?{[string]: mixed, ...},
861+
args: ?{[string]: unknown, ...},
862862
): ?MockData {
863863
let data;
864864
if (typeName != null && this._mockResolvers[typeName] != null) {
@@ -883,8 +883,8 @@ class RelayMockPayloadGenerator {
883883
/**
884884
* Get object with variables for field
885885
*/
886-
_getFieldArgs(field: NormalizationField): {[string]: mixed, ...} {
887-
const args: {[string]: mixed} = {};
886+
_getFieldArgs(field: NormalizationField): {[string]: unknown, ...} {
887+
const args: {[string]: unknown} = {};
888888
if (field.args != null) {
889889
field.args.forEach(arg => {
890890
args[arg.name] = this._getArgValue(arg);
@@ -893,14 +893,14 @@ class RelayMockPayloadGenerator {
893893
return args;
894894
}
895895

896-
_getArgValue(arg: NormalizationArgument): mixed {
896+
_getArgValue(arg: NormalizationArgument): unknown {
897897
switch (arg.kind) {
898898
case 'Literal':
899899
return arg.value;
900900
case 'Variable':
901901
return this._getVariableValue(arg.variableName);
902902
case 'ObjectValue': {
903-
const value: {[string]: mixed} = {};
903+
const value: {[string]: unknown} = {};
904904
arg.fields.forEach(field => {
905905
value[field.name] = this._getArgValue(field);
906906
});

0 commit comments

Comments
 (0)