update

f · f · commit 18f246cbf84b · 2018-12-10T17:42:51.000+03:00
diff --git a/example/index.html b/example/index.html
@@ -2,12 +2,12 @@
   <head>
     <script src="../graphql.js"></script>
     <script>
-      var graph = graphql("https://8f0a24.pod-1.api-dev.simprapos.com/admin", {
+      var graph = graphql("https://xxx.pod-1.api-dev.simprapos.com/admin", {
         alwaysAutodeclare: true,
         asJSON: true,
         debug: true,
         headers: {
-          'Auth-Token': 'VXNlcjpmYTc4MDBkNzcyYzUwNGNhN2E4NGFkYzM4N2ZkMzE5Mw=='
+          'Auth-Token': 'xxx'
         },
         fragments: {
           tax: "on Tax { id, name }",
@@ -27,6 +27,14 @@
         }
       `)
 
+      var createTax = graph.mutate(`
+        tax_create(input: $input) {
+          tax {
+            ...tax
+          }
+        }
+      `)
+
       allTaxes.merge('fetchAll').then(function (response) {
         console.log('Taxes', response)
       })
@@ -35,9 +43,28 @@
         console.log('Reasons', response)
       })
 
-      setTimeout(function () {
-        graph.commit('fetchAll')
-      }, 1000)
+      createTax.merge('seed', { 'input!TaxCreateInput': { name: { locale: 'en', text:"18"}, rate: 18 } }).then(function (response) {
+        console.log('CreateTax 1', response)
+      })
+
+      createTax.merge('seed', { 'input!TaxCreateInput': { name: { locale: 'en', text:"8"}, rate: 8 } }).then(function (response) {
+        console.log('CreateTax 2', response)
+      })
+
+      createTax.merge('seed', { 'input!TaxCreateInput': { name: { locale: 'en', text:"12"}, rate: 12 } }).then(function (response) {
+        console.log('CreateTax 3', response)
+      })
+
+      graph.commit('fetchAll').then(function (r) {
+        console.log(r)
+      })
+      graph.commit('seed').then(function (r) {
+        console.log(r)
+      })
+
+      // setTimeout(function () {
+      //   graph.commit('fetchAll')
+      // }, 1000)
 
     </script>
   </head>
diff --git a/graphql.js b/graphql.js
@@ -354,28 +354,28 @@
       mergedQueries[method].push(method + " (@autodeclare) {\n" + subQuery + "\n }")
     })
 
-    Promise.all(Object.keys(mergedQueries).map(function (method) {
+    return Promise.all(Object.keys(mergedQueries).map(function (method) {
       var query = mergedQueries[method].join('\n')
       var variables = mergedVariables[method]
       return that._sender(query, query, null, variables)
     })).then(function (responses) {
+      var newResponses = {}
       responses.forEach(function (response) {
         Object.keys(response).forEach(function (mergeKey) {
           var parsedKey = mergeKey.match(/^(merge\d+)\_(.*)/)
+          var reqId = parsedKey[1]
+          var fieldName = parsedKey[2]
           var newResponse = {}
-          newResponse[parsedKey[2]] = response[mergeKey]
-          resolveMap[parsedKey[1]](newResponse)
+          newResponse[fieldName] = response[mergeKey]
+          newResponses[fieldName] = (newResponses[fieldName] || []).concat([response[mergeKey]])
+          resolveMap[reqId](newResponse)
         })
       })
-    }).finally(function () {
+      return newResponses
+    }).finally(function (responses) {
       that._transaction[mergeName] = { query: [], mutation: [] }
+      return responses
     })
-    // console.log(mergedQueries)
-    // console.log(mergedVariables)
-    // console.log(resolveMap)
-    // return this._sender(mergedQuery, mergedQuery, null, mergedVariables).then(function (response) {
-    //   console.log(response)
-    // })
   }
 
   GraphQLClient.prototype.createHelpers = function (sender) {
