Merge pull request #10 from Nickolasmv/patch-1

Update schemas.js

.gitignore

@@ -82,3 +82,4 @@ typings/
 
 # DynamoDB Local files
 .dynamodb/
+database.sqlite

lib/resolvers.js

@@ -133,6 +133,9 @@ function resolvers(sequelize, pubsub) {
     modelName = getModelName(model);
     var singular = modelName;
     var singularUF = (0, _lodash.default)(singular);
+
+    var plural = _sequelize.default.Utils.pluralize(modelName).toLowerCase();
+
     if (model.gqCreate !== false) acc['create' + singularUF] = model.options.gqMiddleware.create(
     /*#__PURE__*/
     function () {
@@ -203,7 +206,7 @@ function resolvers(sequelize, pubsub) {
                   });
                 }
 
-                return _context2.abrupt("return", result);
+                return _context2.abrupt("return", instances);
 
               case 11:
               case "end":
@@ -246,7 +249,7 @@ function resolvers(sequelize, pubsub) {
                   });
                 }
 
-                return _context3.abrupt("return", result);
+                return _context3.abrupt("return", instances);
 
               case 9:
               case "end":

lib/schemas.js

@@ -287,13 +287,13 @@ function generateMutations(sequelize) {
     acc[operation] = {
       name: operation,
       arguments: "where: _inputWhere".concat(name, ", input: _inputUpdate").concat(name),
-      type: "Int!"
+      type: "[".concat(name, "]")
     };
     operation = "delete".concat(name);
     acc[operation] = {
       name: operation,
       arguments: "where: _inputWhere".concat(name),
-      type: "Int!"
+      type: "[".concat(name, "]")
     };
     return acc;
   }, {});

package.json

@@ -3,6 +3,9 @@
   "description": "Generate DataTypes and Resolvers from your ORM Sequilize models",
   "version": "0.3.5",
   "main": "./lib/index.js",
+  "engines": {
+    "node": "10.x"
+  },
   "keywords": [
     "sequelizejs",
     "sequelize",

src/resolvers.js

@@ -151,6 +151,7 @@ export function resolvers(
 
       const singular = modelName;
       const singularUF = upperFirst(singular);
+      const plural = Sequelize.Utils.pluralize(modelName).toLowerCase();
 
       if (model.gqCreate !== false)
         acc['create' + singularUF] = model.options.gqMiddleware.create(
@@ -189,7 +190,7 @@ export function resolvers(
                 })
               );
             }
-            return result;
+            return instances;
           }
         );
 
@@ -206,7 +207,7 @@ export function resolvers(
                 })
               );
             }
-            return result;
+            return instances;
           }
         );
 

src/schemas.js

@@ -8,6 +8,10 @@ function assertNotEmpty(obj, msg) {
     throw Error(msg || 'Object should be not a undefined or null');
 }
 
+function getTypeFromAttribute(attribute){
+  return attribute.type.key.split(' ')[0]; // TODO: use common approach
+}
+
 /*
 Create your dataTypes from your models
 */
@@ -47,7 +51,7 @@ function generateInputOperators(sequelize) {
     Object.values(model.rawAttributes).forEach(attribute => {
       if (attribute.gqIgnore) return acc;
 
-      let type = attribute.type.key;
+      let type = getTypeFromAttribute(attribute)
       if (attribute.primaryKey) {
         type = 'ID';
       }
@@ -98,7 +102,7 @@ function generateInputWhere(sequelize) {
       if (attribute.gqIgnore) return;
       if (attribute.type instanceof Sequelize.VIRTUAL) return;
 
-      let type = upperFirst(mapTypes(attribute.type.key));
+      let type = upperFirst(mapTypes(getTypeFromAttribute(attribute)));
       if (attribute.primaryKey) {
         type = 'ID';
       }
@@ -142,7 +146,7 @@ function generateInputCreate(sequelize) {
         return;
       }
 
-      let type = upperFirst(mapTypes(attribute.type.key));
+      let type = upperFirst(mapTypes(getTypeFromAttribute(attribute)));
 
       if (
         attribute.references &&
@@ -218,7 +222,7 @@ function generateInputUpdate(sequelize) {
       if (attribute.primaryKey && !model.options.gqInputUpdateWithPrimaryKeys) {
         return;
       }
-      let type = upperFirst(mapTypes(attribute.type.key));
+      let type = upperFirst(mapTypes(getTypeFromAttribute(attribute)));
       if (attribute.primaryKey) {
         type = 'ID';
       }
@@ -249,7 +253,7 @@ function generateTypeModels(sequelize) {
     Object.values(model.rawAttributes).forEach(attribute => {
       if (attribute.gqIgnore === true) return;
 
-      let type = upperFirst(mapTypes(attribute.type.key));
+      let type = upperFirst(mapTypes(getTypeFromAttribute(attribute)));
       if (attribute.primaryKey) {
         type = 'ID';
       }
@@ -376,13 +380,13 @@ function generateMutations(sequelize) {
     acc[operation] = {
       name: operation,
       arguments: `where: _inputWhere${name}, input: _inputUpdate${name}`,
-      type: `Int!`,
+      type: `[${name}]`,
     };
     operation = `delete${name}`;
     acc[operation] = {
       name: operation,
       arguments: `where: _inputWhere${name}`,
-      type: `Int!`,
+      type: `[${name}]`,
     };
 
     return acc;