Correct the merge/commit handling to generate correct jquery queries. (…

…#62)
f · Dec 16, 2021 · bc5947b · bc5947b
1 parent 4d3c2eb
commit bc5947b
Show file tree

Hide file tree

Showing 6 changed files with 2,754 additions and 98 deletions.
diff --git a/Makefile b/Makefile
diff --git a/graphql.js b/graphql.js
@@ -398,9 +398,12 @@
           mergedVariables[method][variable] = merge.variables[matchingKey]
           return '$' + variable.split('!')[0]
         })
+        // remove the wrapping {}
+        query = query.replace(/^\{|\}\s*$/g, '').trim()
+
         var alias = query.trim().match(/^[^\(]+\:/)
         if (!alias) {
-          alias = query.replace(/^\{|\}$/gm, '').trim().match(/^[^\(\{]+/)[0] + ':'
+          alias = query.match(/^[^\(\{]+/)[0] + ':'
         } else {
           query = query.replace(/^[^\(]+\:/, '')
         }

diff --git a/graphql.min.js b/graphql.min.js
diff --git a/package.json b/package.json
@@ -12,13 +12,18 @@
     "graphql.min.js"
   ],
   "scripts": {
-    "test": "make test",
-    "build": "make build"
+    "test": "jest --coverage",
+    "build": "uglifyjs graphql.js -o graphql.min.js"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/f/graphql-client.git"
   },
+  "devDependencies": {
+    "jest": "^27.4.5",
+    "jest-mock-random": "^1.1.1",
+    "uglify-js": "^3.14.5"
+  },
   "keywords": [
     "graphql",
     "graphql-client",