Skip to content

Commit e04d92b

Browse files
committed
definition: replace object spread with explicit assignments
In preparation for #1527
1 parent b113ef7 commit e04d92b

File tree

2 files changed

+48
-6
lines changed

2 files changed

+48
-6
lines changed

src/type/__tests__/definition-test.js

+34-3
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,10 @@ describe('Type System: Objects', () => {
192192
isDeprecated: true,
193193
name: 'bar',
194194
args: [],
195+
astNode: undefined,
196+
resolve: undefined,
197+
subscribe: undefined,
198+
description: undefined,
195199
});
196200
});
197201

@@ -203,7 +207,17 @@ describe('Type System: Objects', () => {
203207
}),
204208
});
205209
expect(objType.getFields()).to.deep.equal({
206-
f: { name: 'f', type: ScalarType, args: [], isDeprecated: false },
210+
f: {
211+
name: 'f',
212+
type: ScalarType,
213+
args: [],
214+
isDeprecated: false,
215+
deprecationReason: undefined,
216+
astNode: undefined,
217+
resolve: undefined,
218+
subscribe: undefined,
219+
description: undefined,
220+
},
207221
});
208222
});
209223

@@ -233,6 +247,11 @@ describe('Type System: Objects', () => {
233247
},
234248
],
235249
isDeprecated: false,
250+
deprecationReason: undefined,
251+
astNode: undefined,
252+
resolve: undefined,
253+
subscribe: undefined,
254+
description: undefined,
236255
},
237256
});
238257
});
@@ -625,7 +644,13 @@ describe('Type System: Input Objects', () => {
625644
},
626645
});
627646
expect(inputObjType.getFields()).to.deep.equal({
628-
f: { name: 'f', type: ScalarType },
647+
f: {
648+
name: 'f',
649+
description: undefined,
650+
type: ScalarType,
651+
defaultValue: undefined,
652+
astNode: undefined,
653+
},
629654
});
630655
});
631656

@@ -637,7 +662,13 @@ describe('Type System: Input Objects', () => {
637662
}),
638663
});
639664
expect(inputObjType.getFields()).to.deep.equal({
640-
f: { name: 'f', type: ScalarType },
665+
f: {
666+
name: 'f',
667+
description: undefined,
668+
type: ScalarType,
669+
defaultValue: undefined,
670+
astNode: undefined,
671+
},
641672
});
642673
});
643674

src/type/definition.js

+14-3
Original file line numberDiff line numberDiff line change
@@ -778,10 +778,15 @@ function defineFieldMap<TSource, TContext>(
778778
}));
779779

780780
return {
781-
...fieldConfig,
782-
isDeprecated: Boolean(fieldConfig.deprecationReason),
783781
name: fieldName,
782+
description: fieldConfig.description,
783+
type: fieldConfig.type,
784784
args,
785+
resolve: fieldConfig.resolve,
786+
subscribe: fieldConfig.subscribe,
787+
isDeprecated: Boolean(fieldConfig.deprecationReason),
788+
deprecationReason: fieldConfig.deprecationReason,
789+
astNode: fieldConfig.astNode,
785790
};
786791
});
787792
}
@@ -1368,7 +1373,13 @@ function defineInputFieldMap(
13681373
`${config.name}.${fieldName} field has a resolve property, but Input Types cannot define resolvers.`,
13691374
);
13701375

1371-
return { ...fieldConfig, name: fieldName };
1376+
return {
1377+
name: fieldName,
1378+
type: fieldConfig.type,
1379+
defaultValue: fieldConfig.defaultValue,
1380+
description: fieldConfig.description,
1381+
astNode: fieldConfig.astNode,
1382+
};
13721383
});
13731384
}
13741385

0 commit comments

Comments
 (0)