Postgraphile v5 Support (#58)

.gitignore

@@ -1,2 +1,3 @@
-node_modules
 dist
+node_modules
+*.tsbuildinfo

.prettierrc.js

@@ -1,3 +1,3 @@
-module.exports = {
+export default {
   trailingComma: "es5"
 }

README.md

@@ -33,7 +33,7 @@ have specific needs please get in touch!
 
 ## Usage
 
-This plugin requires PostGraphile **v4.4.0** or higher to function correctly.
+This plugin requires PostGraphile **v5.0.0-rc.6** or higher to function correctly.
 
 Add PostGIS to your database:
 
@@ -43,8 +43,18 @@ CREATE EXTENSION IF NOT EXISTS postgis WITH SCHEMA public;
 
 Load the plugin:
 
-```
-postgraphile --append-plugins @graphile/postgis
+```ts
+import { PostgisPreset } from "@graphile/postgis";
+
+const preset: GraphileConfig.Preset = {
+  extends: [
+    // ... Amber/V4/etc presets
+    PostgisPreset,
+  ],
+  // ...
+};
+
+export default preset;
 ```
 
 #### Querying and mutating

__tests__/__snapshots__/schema.minimal_dimensional.test.ts.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`prints a schema with this plugin 1`] = `
 """All input for the create \`Foo\` mutation."""
@@ -27,7 +27,7 @@ type CreateFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
@@ -78,7 +78,7 @@ type DeleteFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
@@ -125,7 +125,7 @@ type FoosConnection {
   """
   A list of edges which contains the \`Foo\` and cursor to aid in pagination.
   """
-  edges: [FoosEdge!]!
+  edges: [FoosEdge]!
 
   """A list of \`Foo\` objects."""
   nodes: [Foo]!
@@ -171,59 +171,6 @@ interface GeometryGeometry {
   srid: Int!
 }
 
-type GeometryGeometryCollection implements GeometryGeometry & GeometryInterface {
-  geojson: GeoJSON
-  geometries: [GeometryGeometry]
-  srid: Int!
-}
-
-"""All geometry types implement this interface"""
-interface GeometryInterface {
-  """Converts the object to GeoJSON"""
-  geojson: GeoJSON
-
-  """Spatial reference identifier (SRID)"""
-  srid: Int!
-}
-
-type GeometryLineString implements GeometryGeometry & GeometryInterface {
-  geojson: GeoJSON
-  points: [GeometryPoint]
-  srid: Int!
-}
-
-type GeometryMultiLineString implements GeometryGeometry & GeometryInterface {
-  geojson: GeoJSON
-  lines: [GeometryLineString]
-  srid: Int!
-}
-
-type GeometryMultiPoint implements GeometryGeometry & GeometryInterface {
-  geojson: GeoJSON
-  points: [GeometryPoint]
-  srid: Int!
-}
-
-type GeometryMultiPolygon implements GeometryGeometry & GeometryInterface {
-  geojson: GeoJSON
-  polygons: [GeometryPolygon]
-  srid: Int!
-}
-
-type GeometryPoint implements GeometryGeometry & GeometryInterface {
-  geojson: GeoJSON
-  srid: Int!
-  x: Float!
-  y: Float!
-}
-
-type GeometryPolygon implements GeometryGeometry & GeometryInterface {
-  exterior: GeometryLineString
-  geojson: GeoJSON
-  interiors: [GeometryLineString]
-  srid: Int!
-}
-
 """
 The root mutation type which contains root level fields which mutate data.
 """
@@ -328,6 +275,8 @@ type Query implements Node {
     """The globally unique \`ID\` to be used in selecting a single \`Foo\`."""
     nodeId: ID!
   ): Foo
+
+  """Get a single \`Foo\`."""
   fooById(id: Int!): Foo
 
   """Fetches an object given its globally unique \`ID\`."""
@@ -396,13 +345,12 @@ type UpdateFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
   Our root query field type. Allows us to run any query from our mutation payload.
   """
   query: Query
 }
-
 `;

__tests__/__snapshots__/schema.minimal_type.test.ts.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`prints a schema with this plugin 1`] = `
 """All input for the create \`Foo\` mutation."""
@@ -27,7 +27,7 @@ type CreateFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
@@ -78,7 +78,7 @@ type DeleteFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
@@ -125,7 +125,7 @@ type FoosConnection {
   """
   A list of edges which contains the \`Foo\` and cursor to aid in pagination.
   """
-  edges: [FoosEdge!]!
+  edges: [FoosEdge]!
 
   """A list of \`Foo\` objects."""
   nodes: [Foo]!
@@ -291,6 +291,8 @@ type Query implements Node {
     """The globally unique \`ID\` to be used in selecting a single \`Foo\`."""
     nodeId: ID!
   ): Foo
+
+  """Get a single \`Foo\`."""
   fooById(id: Int!): Foo
 
   """Fetches an object given its globally unique \`ID\`."""
@@ -359,13 +361,12 @@ type UpdateFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
   Our root query field type. Allows us to run any query from our mutation payload.
   """
   query: Query
 }
-
 `;

__tests__/__snapshots__/schema.minimal_type_and_srid.test.ts.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`prints a schema with this plugin 1`] = `
 """All input for the create \`Foo\` mutation."""
@@ -27,7 +27,7 @@ type CreateFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
@@ -78,7 +78,7 @@ type DeleteFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
@@ -125,7 +125,7 @@ type FoosConnection {
   """
   A list of edges which contains the \`Foo\` and cursor to aid in pagination.
   """
-  edges: [FoosEdge!]!
+  edges: [FoosEdge]!
 
   """A list of \`Foo\` objects."""
   nodes: [Foo]!
@@ -291,6 +291,8 @@ type Query implements Node {
     """The globally unique \`ID\` to be used in selecting a single \`Foo\`."""
     nodeId: ID!
   ): Foo
+
+  """Get a single \`Foo\`."""
   fooById(id: Int!): Foo
 
   """Fetches an object given its globally unique \`ID\`."""
@@ -359,13 +361,12 @@ type UpdateFooPayload {
   """An edge for our \`Foo\`. May be used by Relay 1."""
   fooEdge(
     """The method to use when ordering \`Foo\`."""
-    orderBy: [FoosOrderBy!] = [PRIMARY_KEY_ASC]
+    orderBy: [FoosOrderBy!]! = [PRIMARY_KEY_ASC]
   ): FoosEdge
 
   """
   Our root query field type. Allows us to run any query from our mutation payload.
   """
   query: Query
 }
-
 `;