Revert "fix: get it mostly working again with new datasource"

This reverts commit 70e56d1.

Author: acao

.flowconfig

@@ -4,8 +4,6 @@
 .*/node_modules/flow-bin/.*
 .*/node_modules/fbjs/.*
 
-.*/node_modules/graphql/subscription/mapAsyncIterator.js.flow
-
 [include]
 
 [libs]

package.json

@@ -73,7 +73,7 @@
     "eslint": "^5.16.0",
     "eslint-plugin-babel": "5.3.0",
     "eslint-plugin-prettier": "^3.1.0",
-    "flow-bin": "0.121.0",
+    "flow-bin": "^0.69.0",
     "isomorphic-fetch": "2.2.1",
     "isparta": "^4.1.1",
     "mocha": "^6.1.4",

scripts/download.js

@@ -1,10 +1,9 @@
 /**
- * Copyright (c) 2020, GraphQL Contributors
+ * Copyright (c) 2015-present, Facebook, Inc.
  * All rights reserved.
  *
  * This source code is licensed under the license found in the
  * LICENSE-examples file in the root directory of this source tree.
- *
  */
 
 import { URL } from 'url';

src/schema/apiHelper.js

@@ -20,7 +20,7 @@ const localUrlLoader = new DataLoader(urls =>
  * Objects returned from SWAPI don't have an ID field, so add one.
  */
 function objectWithId(obj: Object): Object {
-  obj.id = obj.pk;
+  obj.id = parseInt(obj.url.split('/')[5], 10);
   return obj;
 }
 
@@ -52,21 +52,18 @@ type ObjectsByType = {
  */
 export async function getObjectsByType(type: string): Promise<ObjectsByType> {
   let objects = [];
-  let nextUrl = `https://raw.githubusercontent.com/johnlindquist/swapi-json-server/master/${type}.json`;
+  let nextUrl = `https://swapi.co/api/${type}/`;
   while (nextUrl) {
     // eslint-disable-next-line no-await-in-loop
     const pageData = await localUrlLoader.load(nextUrl);
-
-    objects = objects.concat(pageData.map(objectWithId).map(d => d.fields));
-
+    objects = objects.concat(pageData.results.map(objectWithId));
     nextUrl = pageData.next;
   }
   objects = sortObjectsById(objects);
   return { objects, totalCount: objects.length };
 }
 
 export async function getObjectsFromUrls(urls: string[]): Promise<Object[]> {
-  console.log({ urls });
   const array = await Promise.all(urls.map(getObjectFromUrl));
   return sortObjectsById(array);
 }

src/schema/index.js

@@ -65,7 +65,7 @@ function rootFieldByID(idName, swapiType) {
  * Creates a connection that will return all objects of the given
  * `swapiType`; the connection will be named using `name`.
  */
-function rootConnection(name: string, swapiType: string) {
+function rootConnection(name, swapiType) {
   const graphqlType = swapiTypeToGraphQLType(swapiType);
   const { connectionType } = connectionDefinitions({
     name,
@@ -79,7 +79,6 @@ This allows a client to fetch the first five objects by passing "5" as the
 argument to "first", then fetch the total count so it could display "5 of 83",
 for example.`,
       },
-      // $FlowFixMe
       [swapiType]: {
         type: new GraphQLList(graphqlType),
         resolve: conn => conn.edges.map(edge => edge.node),

src/schema/relayNode.js

@@ -43,7 +43,6 @@ export function swapiTypeToGraphQLType(swapiType: string): GraphQLObjectType {
   }
 }
 
-// $FlowFixMe
 const { nodeInterface, nodeField } = nodeDefinitions(
   globalId => {
     const { type, id } = fromGlobalId(globalId);

src/schema/types/person.js

@@ -89,7 +89,6 @@ person does not have hair.`,
     species: {
       type: SpeciesType,
       resolve: person => {
-        console.log(person);
         if (!person.species || person.species.length === 0) {
           return null;
         }

yarn.lock

@@ -2995,10 +2995,10 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
   integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
 
-flow-bin@0.121.0:
-  version "0.121.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.121.0.tgz#e206bdc3d510277f9a847920540f72c49e87c130"
-  integrity sha512-QYRMs+AoMLj/OTaSo9+8c3kzM/u8YgvfrInp0qzhtzC02Sc2jb3BV/QZWZGjPo+XK3twyyqXrcI3s8MuL1UQRg==
+flow-bin@^0.69.0:
+  version "0.69.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.69.0.tgz#053159a684a6051fcbf0b71a2eb19a9679082da6"
+  integrity sha512-SC5kiOiMk+8o1N2ZQ1mBfi0qBDYM+r6ZFQS7s+zXtyKrkbtCP+6JRTVvO3KXOnv568SK1G+Kg8/LlJwgyR+8Ug==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"
@@ -3239,7 +3239,7 @@ [email protected]:
 
 [email protected]:
   version "14.5.8"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.5.8.tgz#504f3d3114cb9a0a3f359bbbcf38d9e5bf6a6b3c"
+  resolved "https://registry.npmjs.org/graphql/-/graphql-14.5.8.tgz#504f3d3114cb9a0a3f359bbbcf38d9e5bf6a6b3c"
   integrity sha512-MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg==
   dependencies:
     iterall "^1.2.2"
@@ -3786,9 +3786,9 @@ [email protected]:
     wordwrap "^1.0.0"
 
 iterall@^1.2.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
-  integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
+  integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
 js-levenshtein@^1.1.3:
   version "1.1.6"