fix(dynamicJson): fix handling of JSON array input (#93)

Author: mattbretl

__tests__/fixtures/queries/dynamicJson.graphql

@@ -0,0 +1,21 @@
+query dynamicJsonFalse(
+  $withArrayV2: JSON = "[{\"key2\":2},{\"key3\":3}]"
+  $withObjectV2: JSON = "{\"key2\":2}"
+) {
+  withArray: allJsonbTests(
+    filter: { jsonbWithArray: { equalTo: $withArrayV2 } }
+  ) {
+    ...nodes
+  }
+  withObject: allJsonbTests(
+    filter: { jsonbWithObject: { equalTo: $withObjectV2 } }
+  ) {
+    ...nodes
+  }
+}
+
+fragment nodes on JsonbTestsConnection {
+  nodes {
+    id
+  }
+}

__tests__/fixtures/queries/dynamicJsonFalse.graphql

@@ -0,0 +1,39 @@
+query dynamicJsonTrue(
+  $varInt: Int = 2
+  $varJSON: JSON = { key2: 2 }
+  $varJSONFilter: JSONFilter = { contains: { key2: 2 } }
+  $withArrayV2: JSON = [{ key2: 2 }, { key3: 3 }]
+  $withObjectV2: JSON = { key2: 2 }
+) {
+  # The first four (a, b, c, d) should result in the same value
+  a: allJsonbTests(filter: { jsonbWithObject: { contains: { key2: 2 } } }) {
+    ...nodes
+  }
+  b: allJsonbTests(
+    filter: { jsonbWithObject: { contains: { key2: $varInt } } }
+  ) {
+    ...nodes
+  }
+  c: allJsonbTests(filter: { jsonbWithObject: { contains: $varJSON } }) {
+    ...nodes
+  }
+  d: allJsonbTests(filter: { jsonbWithObject: $varJSONFilter }) {
+    ...nodes
+  }
+  withArray: allJsonbTests(
+    filter: { jsonbWithArray: { equalTo: $withArrayV2 } }
+  ) {
+    ...nodes
+  }
+  withObject: allJsonbTests(
+    filter: { jsonbWithObject: { equalTo: $withObjectV2 } }
+  ) {
+    ...nodes
+  }
+}
+
+fragment nodes on JsonbTestsConnection {
+  nodes {
+    id
+  }
+}

__tests__/fixtures/queries/dynamicJsonTrue.graphql

@@ -4939,7 +4939,28 @@ Object {
 }
 `;
 
-exports[`dynamicJson.graphql 1`] = `
+exports[`dynamicJsonFalse.graphql 1`] = `
+Object {
+  "data": Object {
+    "withArray": Object {
+      "nodes": Array [
+        Object {
+          "id": 2,
+        },
+      ],
+    },
+    "withObject": Object {
+      "nodes": Array [
+        Object {
+          "id": 2,
+        },
+      ],
+    },
+  },
+}
+`;
+
+exports[`dynamicJsonTrue.graphql 1`] = `
 Object {
   "data": Object {
     "a": Object {
@@ -4970,6 +4991,20 @@ Object {
         },
       ],
     },
+    "withArray": Object {
+      "nodes": Array [
+        Object {
+          "id": 2,
+        },
+      ],
+    },
+    "withObject": Object {
+      "nodes": Array [
+        Object {
+          "id": 2,
+        },
+      ],
+    },
   },
 }
 `;

__tests__/integration/__snapshots__/queries.test.js.snap

@@ -98,7 +98,7 @@ beforeAll(() => {
           // some specific fixtures against a schema configured slightly
           // differently.
           const schemas = {
-            "dynamicJson.graphql": gqlSchemas.dynamicJson,
+            "dynamicJsonTrue.graphql": gqlSchemas.dynamicJson,
             "relations.graphql": gqlSchemas.relations,
             "simpleCollections.graphql": gqlSchemas.simpleCollections,
             "nullAndEmptyAllowed.graphql": gqlSchemas.nullAndEmptyAllowed,

__tests__/integration/queries.test.js

@@ -1537,6 +1537,73 @@ A JavaScript object encoded in the JSON format as specified by [ECMA-404](http:/
 \\"\\"\\"
 scalar JSON
 
+type JsonbTest implements Node {
+  id: Int!
+  jsonbWithArray: JSON
+  jsonbWithObject: JSON
+
+  \\"\\"\\"
+  A globally unique identifier. Can be used in various places throughout the system to identify this single value.
+  \\"\\"\\"
+  nodeId: ID!
+}
+
+\\"\\"\\"
+A filter to be used against \`JsonbTest\` object types. All fields are combined with a logical ‘and.’
+\\"\\"\\"
+input JsonbTestFilter {
+  \\"\\"\\"Checks for all expressions in this list.\\"\\"\\"
+  and: [JsonbTestFilter!]
+
+  \\"\\"\\"Filter by the object’s \`id\` field.\\"\\"\\"
+  id: IntFilter
+
+  \\"\\"\\"Negates the expression.\\"\\"\\"
+  not: JsonbTestFilter
+
+  \\"\\"\\"Checks for any expressions in this list.\\"\\"\\"
+  or: [JsonbTestFilter!]
+}
+
+\\"\\"\\"A connection to a list of \`JsonbTest\` values.\\"\\"\\"
+type JsonbTestsConnection {
+  \\"\\"\\"
+  A list of edges which contains the \`JsonbTest\` and cursor to aid in pagination.
+  \\"\\"\\"
+  edges: [JsonbTestsEdge!]!
+
+  \\"\\"\\"A list of \`JsonbTest\` objects.\\"\\"\\"
+  nodes: [JsonbTest]!
+
+  \\"\\"\\"Information to aid in pagination.\\"\\"\\"
+  pageInfo: PageInfo!
+
+  \\"\\"\\"The count of *all* \`JsonbTest\` you could get from the connection.\\"\\"\\"
+  totalCount: Int
+}
+
+\\"\\"\\"A \`JsonbTest\` edge in the connection.\\"\\"\\"
+type JsonbTestsEdge {
+  \\"\\"\\"A cursor for use in pagination.\\"\\"\\"
+  cursor: Cursor
+
+  \\"\\"\\"The \`JsonbTest\` at the end of the edge.\\"\\"\\"
+  node: JsonbTest
+}
+
+\\"\\"\\"Methods to use when ordering \`JsonbTest\`.\\"\\"\\"
+enum JsonbTestsOrderBy {
+  ID_ASC
+  ID_DESC
+  JSONB_WITH_ARRAY_ASC
+  JSONB_WITH_ARRAY_DESC
+  JSONB_WITH_OBJECT_ASC
+  JSONB_WITH_OBJECT_DESC
+  NATURAL
+  PRIMARY_KEY_ASC
+  PRIMARY_KEY_DESC
+}
+
 type Junction implements Node {
   \\"\\"\\"
   A globally unique identifier. Can be used in various places throughout the system to identify this single value.
@@ -2054,6 +2121,35 @@ type Query implements Node {
     orderBy: [FullyOmittedsOrderBy!] = [PRIMARY_KEY_ASC]
   ): FullyOmittedsConnection
 
+  \\"\\"\\"Reads and enables pagination through a set of \`JsonbTest\`.\\"\\"\\"
+  allJsonbTests(
+    \\"\\"\\"Read all values in the set after (below) this cursor.\\"\\"\\"
+    after: Cursor
+
+    \\"\\"\\"Read all values in the set before (above) this cursor.\\"\\"\\"
+    before: Cursor
+
+    \\"\\"\\"
+    A filter to be used in determining which values should be returned by the collection.
+    \\"\\"\\"
+    filter: JsonbTestFilter
+
+    \\"\\"\\"Only read the first \`n\` values of the set.\\"\\"\\"
+    first: Int
+
+    \\"\\"\\"Only read the last \`n\` values of the set.\\"\\"\\"
+    last: Int
+
+    \\"\\"\\"
+    Skip the first \`n\` values from our \`after\` cursor, an alternative to cursor
+    based pagination. May not be used with \`last\`.
+    \\"\\"\\"
+    offset: Int
+
+    \\"\\"\\"The method to use when ordering \`JsonbTest\`.\\"\\"\\"
+    orderBy: [JsonbTestsOrderBy!] = [PRIMARY_KEY_ASC]
+  ): JsonbTestsConnection
+
   \\"\\"\\"Reads and enables pagination through a set of \`Junction\`.\\"\\"\\"
   allJunctions(
     \\"\\"\\"Read all values in the set after (below) this cursor.\\"\\"\\"
@@ -2447,6 +2543,15 @@ type Query implements Node {
     offset: Int
   ): FuncTaggedFilterableReturnsTableMultiColConnection!
 
+  \\"\\"\\"Reads a single \`JsonbTest\` using its globally unique \`ID\`.\\"\\"\\"
+  jsonbTest(
+    \\"\\"\\"
+    The globally unique \`ID\` to be used in selecting a single \`JsonbTest\`.
+    \\"\\"\\"
+    nodeId: ID!
+  ): JsonbTest
+  jsonbTestById(id: Int!): JsonbTest
+
   \\"\\"\\"Reads a single \`Junction\` using its globally unique \`ID\`.\\"\\"\\"
   junction(
     \\"\\"\\"The globally unique \`ID\` to be used in selecting a single \`Junction\`.\\"\\"\\"