Merge branch 'master' into feature/nonnull-list-elements

Author: cysp

demo/demo-data.json

@@ -82,7 +82,7 @@
         {
           "id": "author",
           "type": "Array<Link<Entry>>",
-          "linkedCt": "1kUEViTN4EmGiEaaeC6ouY"
+          "linkedCts": ["1kUEViTN4EmGiEaaeC6ouY"]
         },
         {
           "id": "body",
@@ -91,7 +91,7 @@
         {
           "id": "category",
           "type": "Array<Link<Entry>>",
-          "linkedCt": "5KMiN6YPvi42icqAUQMCQe"
+          "linkedCts": ["5KMiN6YPvi42icqAUQMCQe"]
         },
         {
           "id": "tags",

demo/package.json

@@ -23,7 +23,7 @@
     ]
   },
   "dependencies": {
-    "cf-graphql": "^0.4.3",
+    "cf-graphql": "^0.5.0",
     "cors": "^2.8.3",
     "express": "^4.15.3",
     "express-graphql": "^0.6.6",

package.json

@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "dataloader": "^1.3.0",
-    "graphql": "^0.11.7",
+    "https-proxy-agent": "^2.1.1",
     "lodash.camelcase": "^4.3.0",
     "lodash.chunk": "^4.2.0",
     "lodash.get": "^4.4.2",
@@ -65,6 +65,7 @@
     "express": "^4.15.4",
     "express-graphql": "^0.6.7",
     "fetch-graphql-schema": "^0.2.1",
+    "graphql": "^0.13.0",
     "graphqlviz": "^2.0.1",
     "istanbul": "^0.4.5",
     "just-extend": "1.1.22",
@@ -73,5 +74,8 @@
     "proxyquire": "^1.8.0",
     "sinon": "^4.0.1",
     "tape": "^4.8.0"
+  },
+  "peerDependencies": {
+    "graphql": "^0.11.7 || ^0.13.0"
   }
 }

src/backref-types.js

@@ -1,11 +1,7 @@
 'use strict';
 
 const _get = require('lodash.get');
-const {
-  GraphQLNonNull,
-  GraphQLObjectType,
-  GraphQLList
-} = require('graphql');
+const {GraphQLNonNull, GraphQLString, GraphQLInt, GraphQLObjectType, GraphQLList} = require('graphql');
 
 module.exports = createBackrefsType;
 
@@ -29,9 +25,20 @@ function prepareBackrefsFields (ct, ctIdToType) {
 function createBackrefFieldConfig (backref, Type) {
   return {
     type: new GraphQLList(new GraphQLNonNull(Type)),
-    resolve: (entryId, _, ctx) => {
-      return ctx.entryLoader.queryAll(backref.ctId)
-      .then(entries => filterEntries(entries, backref.fieldId, entryId));
+    args: {
+      q: {type: GraphQLString},
+      skip: {type: GraphQLInt},
+      limit: {type: GraphQLInt},
+    },
+    resolve: (entryId, args, ctx) => {
+      let q = `fields.${backref.fieldId}.sys.id[in]=${entryId}`;
+      if (args.q) q = q + `&${args.q}`;
+
+      return ctx.entryLoader.query(backref.ctId, {
+        q,
+        skip: args.skip,
+        limit: args.limit,
+      })
     }
   };
 }

src/field-config.js

@@ -76,7 +76,7 @@ function createEntryFieldConfig (field, ctIdToType) {
   return createFieldConfig(typeFor(field, ctIdToType), field, (link, ctx) => {
     const linkedId = getLinkedId(link);
     if (isString(linkedId)) {
-      return ctx.entryLoader.get(linkedId, field.linkedCt);
+      return ctx.entryLoader.get(linkedId, field.linkedCts && field.linkedCts[0]);
     }
   });
 }
@@ -96,9 +96,9 @@ function getLinkedId (link) {
   return _get(link, ['sys', 'id']);
 }
 
-function typeFor ({linkedCt}, ctIdToType = {}) {
-  if (linkedCt) {
-    return ctIdToType[linkedCt] || EntryType;
+function typeFor ({linkedCts}, ctIdToType = {}) {
+  if (linkedCts && linkedCts[0]) {
+    return ctIdToType[linkedCts[0]] || EntryType;
   } else {
     return EntryType;
   }

src/http-client.js

@@ -4,6 +4,7 @@ const os = require('os');
 const qs = require('querystring');
 const fetch = require('node-fetch');
 const _get = require('lodash.get');
+const HttpProxyAgent = require('https-proxy-agent')
 
 module.exports = createClient;
 
@@ -39,9 +40,13 @@ function get (url, params, opts) {
   const httpCall = {url, start: Date.now()};
   timeline.push(httpCall);
 
+  const agent = process.env.http_proxy
+    ? new HttpProxyAgent(process.env.http_proxy)
+    : null
+
   cache[url] = fetch(
     base + url,
-    {headers: Object.assign({}, getUserAgent(), headers)}
+    {headers: Object.assign({}, getUserAgent(), headers), agent}
   )
   .then(checkStatus)
   .then(res => {

src/prepare-space-graph.js

@@ -82,7 +82,7 @@ function field (f) {
   return {
     id: f.id,
     type: type(f),
-    linkedCt: linkedCt(f)
+    linkedCts: linkedCts(f)
   };
 }
 
@@ -117,15 +117,15 @@ function isEntityType (x) {
   return ENTITY_TYPES.indexOf(x) > -1;
 }
 
-function linkedCt (f) {
+function linkedCts (f) {
   const prop = 'linkContentType';
   const validation = getValidations(f).find(v => {
-    return Array.isArray(v[prop]) && v[prop].length === 1;
+    return Array.isArray(v[prop]);
   });
-  const linkedCt = validation && validation[prop][0];
+  const linkedCts = validation && validation[prop];
 
-  if (linkedCt) {
-    return linkedCt;
+  if (linkedCts) {
+    return linkedCts;
   }
 }
 
@@ -144,15 +144,16 @@ function addBackrefs (spaceGraph) {
   }, {});
 
   spaceGraph.forEach(ct => ct.fields.forEach(field => {
-    if (field.linkedCt && byId[field.linkedCt]) {
-      const linked = byId[field.linkedCt];
+    if (field.linkedCts) field.linkedCts.forEach(linkedCt => {
+      const linked = byId[linkedCt];
+      if (!linked) return;
       linked.backrefs = linked.backrefs || [];
       linked.backrefs.push({
         ctId: ct.id,
         fieldId: field.id,
-        backrefFieldName: `${ct.names.collectionField}__via__${field.id}`
+        backrefFieldName: `${ct.names.collectionField}__via__${field.id}`,
       });
-    }
+    });
   }));
 
   return spaceGraph;

test/backref-types.test.js

@@ -83,16 +83,23 @@ test('backref-types: creating backrefers type', function (t) {
     }
   ];
 
-  const ctx = {entryLoader: {queryAll: () => Promise.resolve(posts)}};
+  const ctx = {entryLoader: {query: (ctId, {q}) => {
+    const field = q.match(/^fields\.([^\.]*)\.sys\.id/)[1]
+    const id = q.match(/=(.*)$/)[1]
+    return Promise.resolve(posts.filter(post => {
+      const f = post.fields[field]
+      return f != null && (Array.isArray(f) ? f : [f]).find(item => item.sys.id === id)
+    }));
+  }}};
 
   graphql(
     schema,
     '{ test { posts__via__category { title } posts__via__category2 { title } } }',
     null,
     ctx
   ).then(res => {
+    t.equal(res.errors, undefined);
     t.deepEqual(res.data.test.posts__via__category, [{title: 'p1t'}]);
     t.deepEqual(res.data.test.posts__via__category2, [{title: 'p3t'}]);
-    t.equal(res.errors, undefined);
   });
 });

test/field-config.test.js

@@ -127,12 +127,12 @@ test('field-config: type for linked entry', function (t) {
   const types = {ct1: {}, ct2: {}};
   const tests = [
     [{}, undefined, EntryType],
-    [{linkedCt: 'ct1'}, undefined, EntryType],
-    [{linkedCt: 'ct2'}, {ct1: types.ct1, ct2: types.ct2}, types.ct2],
-    [{linkedCt: 'ct3'}, {ct1: types.ct1, ct2: types.ct2}, EntryType]
+    [{linkedCts: ['ct1']}, undefined, EntryType],
+    [{linkedCts: ['ct2']}, {ct1: types.ct1, ct2: types.ct2}, types.ct2],
+    [{linkedCts: ['ct3']}, {ct1: types.ct1, ct2: types.ct2}, EntryType]
   ];
 
-  tests.forEach(([field, ctIdToType, Type]) => {
+  tests.forEach(([field, ctIdToType, Type], i) => {
     const config = map['Link<Entry>'](field, ctIdToType);
     t.equal(config.type, Type);
   });

test/prepare-space-graph.test.js

@@ -2,6 +2,7 @@
 
 const test = require('tape');
 
+const flatmap = require('lodash/flatmap');
 const prepareSpaceGraph = require('../src/prepare-space-graph.js');
 
 const testCt = fields => ({sys: {id: 'ctid'}, name: 'test', fields});
@@ -155,9 +156,9 @@ test('prepare-space-graph: finding linked content types', function (t) {
   }, []);
 
   const [p] = prepareSpaceGraph([testCt(fields)]);
-  const linkedCts = p.fields.map(f => f.linkedCt).filter(id => typeof id === 'string');
+  const linkedCts = flatmap(p.fields, f => f.linkedCts).filter(id => typeof id === 'string');
 
-  t.deepEqual(linkedCts, ['baz', 'baz']);
+  t.deepEqual(linkedCts, ['foo', 'bar', 'foo', 'bar', 'baz', 'baz']);
 
   t.end();
 });
@@ -167,7 +168,7 @@ test('prepare-space-graph: mixing field and items validations', function (t) {
   const fields = [{id: 'fid', type: 'Array', validations: [], items}];
   const [p] = prepareSpaceGraph([testCt(fields)]);
 
-  t.equal(p.fields[0].linkedCt, 'ctid');
+  t.equal(p.fields[0].linkedCts[0], 'ctid');
 
   t.end();
 });