From 4645888162a9998b2107f2a4f04760029d7f6b8c Mon Sep 17 00:00:00 2001 From: Jan Kassens Date: Wed, 7 Apr 2021 08:44:41 -0700 Subject: [PATCH] remove mapObject Reviewed By: josephsavona Differential Revision: D27620782 fbshipit-source-id: 05001b0bf972481e3c8ad8c0ca1c5dc4b70702d1 --- flow-typed/fbjs.js.flow | 4 ---- packages/react-relay/buildReactRelayContainer.js | 6 ++++-- .../react-relay/relay-hooks/FragmentResource.js | 16 ++++++++-------- scripts/getBabelOptions.js | 1 - 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/flow-typed/fbjs.js.flow b/flow-typed/fbjs.js.flow index 1a75b896fb749..d67ff8399a977 100644 --- a/flow-typed/fbjs.js.flow +++ b/flow-typed/fbjs.js.flow @@ -7,10 +7,6 @@ * @format */ -declare module 'mapObject' { - declare module.exports: any; -} - declare module 'ErrorUtils' { declare module.exports: any; } diff --git a/packages/react-relay/buildReactRelayContainer.js b/packages/react-relay/buildReactRelayContainer.js index 874cf7eadaf89..b7cfb12e238cc 100644 --- a/packages/react-relay/buildReactRelayContainer.js +++ b/packages/react-relay/buildReactRelayContainer.js @@ -18,7 +18,6 @@ const ReactRelayQueryRendererContext = require('./ReactRelayQueryRendererContext const assertFragmentMap = require('./assertFragmentMap'); const invariant = require('invariant'); -const mapObject = require('mapObject'); const readContext = require('./readContext'); const { @@ -48,7 +47,10 @@ function buildReactRelayContainer>( const containerName = getContainerName(ComponentClass); assertFragmentMap(getComponentName(ComponentClass), fragmentSpec); - const fragments = mapObject(fragmentSpec, getFragment); + const fragments = {}; + for (const key in fragmentSpec) { + fragments[key] = getFragment(fragmentSpec[key]); + } const Container = createContainerWithFragments(ComponentClass, fragments); Container.displayName = containerName; diff --git a/packages/react-relay/relay-hooks/FragmentResource.js b/packages/react-relay/relay-hooks/FragmentResource.js index acf87c8b8a30a..df2cb95a8916f 100644 --- a/packages/react-relay/relay-hooks/FragmentResource.js +++ b/packages/react-relay/relay-hooks/FragmentResource.js @@ -16,7 +16,6 @@ const LRUCache = require('./LRUCache'); const invariant = require('invariant'); -const mapObject = require('mapObject'); const { __internal: {getPromiseForActiveRequest}, @@ -256,15 +255,16 @@ class FragmentResourceImpl { fragmentRefs: {[string]: mixed, ...}, componentDisplayName: string, ): {[string]: FragmentResult, ...} { - return mapObject(fragmentNodes, (fragmentNode, fragmentKey) => { - const fragmentRef = fragmentRefs[fragmentKey]; - return this.read( - fragmentNode, - fragmentRef, + const result = {}; + for (const key in fragmentNodes) { + result[key] = this.read( + fragmentNodes[key], + fragmentRefs[key], componentDisplayName, - fragmentKey, + key, ); - }); + } + return result; } subscribe(fragmentResult: FragmentResult, callback: () => void): Disposable { diff --git a/scripts/getBabelOptions.js b/scripts/getBabelOptions.js index f96d38635edbb..c2c58cd60bc44 100644 --- a/scripts/getBabelOptions.js +++ b/scripts/getBabelOptions.js @@ -34,7 +34,6 @@ module.exports = function(options) { Promise: 'promise-polyfill', areEqual: 'fbjs/lib/areEqual', invariant: 'fbjs/lib/invariant', - mapObject: 'fbjs/lib/mapObject', warning: 'fbjs/lib/warning', }, },