Fix typing on query

src/lib/mergeQueryFunctions.test.ts → src/lib/checkNamingCollisions.test.ts

@@ -1,9 +1,9 @@
-import { mergeQueryFunctions } from "./mergeQueryFunctions"
+import { checkNamingCollisions } from "./checkNamingCollisions"
 
 test("faunadb functions should exists on query", () => {
     const faunaFuncs = { Map: () => {} }
     const fqlLibFuncs = { Map: () => {} }
     expect(() => {
-        mergeQueryFunctions(faunaFuncs, fqlLibFuncs)
+        checkNamingCollisions(faunaFuncs, fqlLibFuncs)
     }).toThrow()
 })

src/lib/mergeQueryFunctions.ts → src/lib/checkNamingCollisions.ts

@@ -1,7 +1,7 @@
-export const mergeQueryFunctions = (
+export const checkNamingCollisions = (
     faunaFunctions: object,
     fqlLibFunctions: object
-): object => {
+) => {
     Object.keys(fqlLibFunctions).forEach(key => {
         if (faunaFunctions[key])
             throw new Error(

src/query.ts

@@ -1,7 +1,12 @@
 import { query as faunaFunctions } from "faunadb"
 import * as fqlLibFunctions from "./fql-lib"
-import { mergeQueryFunctions } from "./lib/mergeQueryFunctions"
+import { checkNamingCollisions } from "./lib/checkNamingCollisions"
 
-const query = mergeQueryFunctions(faunaFunctions, fqlLibFunctions)
+checkNamingCollisions(faunaFunctions, fqlLibFunctions)
+
+const query = {
+    ...faunaFunctions,
+    ...fqlLibFunctions,
+}
 
 export { query }