fix(fieldsConverter): Now reuse generated types for recursive schemas

nodkz · nodkz · commit 4c198705fc0d · 2017-02-20T13:35:18.000+06:00
eg. User.friends = [User] now works correctly closes: #20
diff --git a/.eslintrc b/.eslintrc
@@ -5,7 +5,14 @@
     "no-underscore-dangle": 0,
     "no-unused-expressions": 0,
     "arrow-body-style": 0,
-    "import/no-extraneous-dependencies": ["error", {"devDependencies": true}]
+    "import/no-extraneous-dependencies": ["error", {"devDependencies": true}],
+    "comma-dangle": ["error", {
+      "arrays": "always-multiline",
+      "objects": "always-multiline",
+      "imports": "always-multiline",
+      "exports": "always-multiline",
+      "functions": "ignore",
+    }]
   },
   "env": {
     "mocha": true
diff --git a/package.json b/package.json
@@ -49,16 +49,16 @@
     "chai-as-promised": "6.0.0",
     "chai-spies": "0.7.1",
     "cz-conventional-changelog": "1.2.0",
-    "eslint": "^3.14.0",
+    "eslint": "^3.14.1",
     "eslint-config-airbnb-base": "^11.0.1",
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-import": "^2.2.0",
     "flow-bin": "^0.38.0",
-    "graphql": "^0.9.0",
-    "graphql-compose": "^1.10.0",
-    "graphql-compose-connection": "^2.1.2",
+    "graphql": "^0.9.1",
+    "graphql-compose": "^1.12.1",
+    "graphql-compose-connection": "^2.1.3",
     "mocha": "^3.2.0",
-    "mongoose": "^4.7.8",
+    "mongoose": "^4.8.4",
     "nyc": "^10.1.2",
     "rimraf": "2.5.4",
     "sane": "^1.5.0",
diff --git a/src/__tests__/composeWithMongoose-test.js b/src/__tests__/composeWithMongoose-test.js
@@ -1,14 +1,16 @@
 /* eslint-disable no-unused-expressions */
 
 import { expect } from 'chai';
-import { UserModel } from '../__mocks__/userModel.js';
-import { composeWithMongoose } from '../composeWithMongoose';
+import mongoose from 'mongoose';
 import { TypeComposer, InputTypeComposer } from 'graphql-compose';
+import { UserModel } from '../__mocks__/userModel';
+import { composeWithMongoose } from '../composeWithMongoose';
 import typeStorage from '../typeStorage';
 
 describe('composeWithMongoose ->', () => {
   beforeEach(() => {
     typeStorage.clear();
+    UserModel.schema._gqcTypeComposer = undefined;
   });
 
   describe('mongooseModelToTypeComposer()', () => {
@@ -21,6 +23,8 @@ describe('composeWithMongoose ->', () => {
       it('should set type name from model or opts.name', () => {
         expect(composeWithMongoose(UserModel).getTypeName())
           .equal(UserModel.modelName);
+
+        UserModel.schema._gqcTypeComposer = undefined;
         expect(composeWithMongoose(UserModel, { name: 'Ok' }).getTypeName())
           .equal('Ok');
       });
@@ -169,5 +173,18 @@ describe('composeWithMongoose ->', () => {
       const inputConposer = new InputTypeComposer(filterArgInFindOne.type);
       expect(inputConposer.isRequired('age')).to.be.true;
     });
+
+    it('should use cached type to avoid maximum call stack size exceeded', () => {
+      const PersonSchema = new mongoose.Schema({
+        name: String,
+      });
+      PersonSchema.add({
+        spouse: PersonSchema,
+        friends: [PersonSchema],
+      });
+      const PersonModel = mongoose.model('Person', PersonSchema);
+      const tc = composeWithMongoose(PersonModel);
+      expect(tc.getFields()).to.contain.keys(['_id', 'name', 'spouse', 'friends']);
+    });
   });
 });
diff --git a/src/fieldsConverter.js b/src/fieldsConverter.js
@@ -148,6 +148,7 @@ export function convertModelToGraphQL(
       })
     )
   );
+  model.schema._gqcTypeComposer = typeComposer; // eslint-disable-line
 
   const mongooseFields = getFieldsFromModel(model, typeName);
   const graphqlFields = {};
diff --git a/yarn.lock b/yarn.lock
@@ -656,14 +656,7 @@ babel-register@^6.22.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@6.11.6:
-  version "6.11.6"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.11.6.tgz#6db707fef2d49c49bfa3cb64efdb436b518b8222"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.9.5"
-
-babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
+babel-runtime@^6.18.0, babel-runtime@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
   dependencies:
@@ -1244,9 +1237,9 @@ eslint-plugin-import@^2.2.0:
     minimatch "^3.0.3"
     pkg-up "^1.0.0"
 
-eslint@^3.14.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.14.0.tgz#2c617e5f782fda5cbee5bc8be7ef5053af8e63a3"
+eslint@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.14.1.tgz#8a62175f2255109494747a1b25128d97b8eb3d97"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
@@ -1653,22 +1646,22 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
-graphql-compose-connection@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/graphql-compose-connection/-/graphql-compose-connection-2.1.2.tgz#dbe8cd2b51755a454d640171883e096daa9d5068"
+graphql-compose-connection@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/graphql-compose-connection/-/graphql-compose-connection-2.1.3.tgz#f9b9e6532e4049a4d2c2d7bf69b67c4d3128eaae"
   dependencies:
-    babel-runtime "6.11.6"
+    babel-runtime "^6.22.0"
 
-graphql-compose@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-1.10.0.tgz#61b5050b29043c3e714576e85e8fa330b40a769e"
+graphql-compose@^1.12.1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-1.12.1.tgz#af194460b945591afaf70034527daf5e6e854dbc"
   dependencies:
-    babel-runtime "^6.20.0"
+    babel-runtime "^6.22.0"
     object-path "^0.11.3"
 
-graphql@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.9.0.tgz#ff9748a86ae81d4ecd2f2ba27fe5ac7a77734b1d"
+graphql@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.9.1.tgz#f4d154cbec054d4a5d3b1be95f23435c09aa86c8"
   dependencies:
     iterall "1.0.3"
 
@@ -2070,9 +2063,9 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.3.6"
 
-kareem@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/kareem/-/kareem-1.2.0.tgz#59851e833feb1ce6cf60000e0c23acf75c8a3547"
+kareem@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/kareem/-/kareem-1.2.1.tgz#acdb8c8119845834abbfa58ade1cf9dea63dc752"
 
 kind-of@^3.0.2:
   version "3.0.4"
@@ -2355,35 +2348,35 @@ mocha@^3.2.0:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
-mongodb-core@2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.6.tgz#9d179e7487767c58993bb7c8d6685d035c346a42"
+mongodb-core@2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.8.tgz#b33e0370d0a59d97b6cb1ec610527be9e95ca2c0"
   dependencies:
     bson "~1.0.4"
     require_optional "~1.0.0"
 
-mongodb@2.2.21:
-  version "2.2.21"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.21.tgz#f7ee56489600e0ac8024c062c0857ac04ddb5f48"
+mongodb@2.2.24:
+  version "2.2.24"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.24.tgz#80f40d6ec5bdec0ddecf0f9ce0144e794c46449a"
   dependencies:
     es6-promise "3.2.1"
-    mongodb-core "2.1.6"
+    mongodb-core "2.1.8"
     readable-stream "2.1.5"
 
-mongoose@^4.7.8:
-  version "4.7.8"
-  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.7.8.tgz#9e92de54fcb2e62cc41a543f5f810b0dd7c5ff3d"
+mongoose@^4.8.4:
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/mongoose/-/mongoose-4.8.4.tgz#091ca76f404355120a0b497bad6cc2b7d21c83ae"
   dependencies:
     async "2.1.4"
     bson "~1.0.4"
     hooks-fixed "1.2.0"
-    kareem "1.2.0"
-    mongodb "2.2.21"
+    kareem "1.2.1"
+    mongodb "2.2.24"
     mpath "0.2.1"
     mpromise "0.5.5"
-    mquery "2.0.0"
+    mquery "2.2.3"
     ms "0.7.2"
-    muri "1.2.0"
+    muri "1.2.1"
     regexp-clone "0.0.1"
     sliced "1.0.1"
 
@@ -2395,9 +2388,9 @@ mpromise@0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mpromise/-/mpromise-0.5.5.tgz#f5b24259d763acc2257b0a0c8c6d866fd51732e6"
 
-mquery@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mquery/-/mquery-2.0.0.tgz#b5abc850b90dffc3e10ae49b4b6e7a479752df22"
+mquery@2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/mquery/-/mquery-2.2.3.tgz#a4703b64fb6734fce51d784a4df095cabf1a8f57"
   dependencies:
     bluebird "2.10.2"
     debug "2.2.0"
@@ -2412,9 +2405,9 @@ ms@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
 
-muri@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/muri/-/muri-1.2.0.tgz#b86383c902920b09ebe62af0e75c94de5f33cd3d"
+muri@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/muri/-/muri-1.2.1.tgz#ec7ea5ce6ca6a523eb1ab35bacda5fa816c9aa3c"
 
 mute-stream@0.0.5:
   version "0.0.5"
@@ -2819,7 +2812,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@2.1.5, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@~2.1.4:
+readable-stream@2.1.5, readable-stream@~2.1.4:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
   dependencies:
@@ -2831,7 +2824,7 @@ readable-stream@2.1.5, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@~2.0.0, readable-stream@~2.0.5:
+"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@~2.0.0, readable-stream@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
@@ -2880,10 +2873,6 @@ regenerator-runtime@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb"
 
-regenerator-runtime@^0.9.5:
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz#403d6d40a4bdff9c330dd9392dcbb2d9a8bba1fc"
-
 regenerator-transform@0.9.8:
   version "0.9.8"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c"

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ export function convertModelToGraphQL(`
`148`	`148`	`})`
`149`	`149`	`)`
`150`	`150`	`);`
	`151`	`+ model.schema._gqcTypeComposer = typeComposer; // eslint-disable-line`
`151`	`152`
`152`	`153`	`const mongooseFields = getFieldsFromModel(model, typeName);`
`153`	`154`	`const graphqlFields = {};`