postgraphile 5.0.0-0.23 → 5.0.0-0.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,44 @@
1
1
  # postgraphile
2
2
 
3
+ ## 5.0.0-0.25
4
+
5
+ ### Patch Changes
6
+
7
+ - [`9a6b18fd9`](undefined) - Give postgraphile() a named return type and export
8
+ the V4 plugins from the V4 preset.
9
+
10
+ ## 5.0.0-0.24
11
+
12
+ ### Patch Changes
13
+
14
+ - [#207](https://github.com/benjie/postgraphile-private/pull/207)
15
+ [`c850dd4ec`](https://github.com/benjie/postgraphile-private/commit/c850dd4ec0e42e37122f5bca55a079b53bfd895e)
16
+ Thanks [@benjie](https://github.com/benjie)! - Rename 'preset.server' to
17
+ 'preset.grafserv'.
18
+
19
+ - [#207](https://github.com/benjie/postgraphile-private/pull/207)
20
+ [`afa0ea5f6`](https://github.com/benjie/postgraphile-private/commit/afa0ea5f6c508d9a0ba5946ab153b13ddbd274a0)
21
+ Thanks [@benjie](https://github.com/benjie)! - Fix bug in subscriptions where
22
+ termination of underlying stream wouldn't terminate the subscription.
23
+
24
+ - [#206](https://github.com/benjie/postgraphile-private/pull/206)
25
+ [`851b78ef2`](https://github.com/benjie/postgraphile-private/commit/851b78ef20d430164507ec9b3f41a5a0b8a18ed7)
26
+ Thanks [@benjie](https://github.com/benjie)! - Grafserv now masks untrusted
27
+ errors by default; trusted errors are constructed via GraphQL's GraphQLError
28
+ or Grafast's SafeError.
29
+ - Updated dependencies
30
+ [[`d76043453`](https://github.com/benjie/postgraphile-private/commit/d7604345362c58bf7eb43ef1ac1795a2ac22ae79),
31
+ [`c850dd4ec`](https://github.com/benjie/postgraphile-private/commit/c850dd4ec0e42e37122f5bca55a079b53bfd895e),
32
+ [`afa0ea5f6`](https://github.com/benjie/postgraphile-private/commit/afa0ea5f6c508d9a0ba5946ab153b13ddbd274a0),
33
+ [`92c2378f2`](https://github.com/benjie/postgraphile-private/commit/92c2378f297cc917f542b126e1cdddf58e1f0fc3),
34
+ [`851b78ef2`](https://github.com/benjie/postgraphile-private/commit/851b78ef20d430164507ec9b3f41a5a0b8a18ed7),
35
+ [`384b3594f`](https://github.com/benjie/postgraphile-private/commit/384b3594f543d113650c1b6b02b276360dd2d15f)]:
36
+ - grafast@0.0.1-0.14
37
+ - grafserv@0.0.1-0.16
38
+ - @dataplan/pg@0.0.1-0.19
39
+ - graphile-build@5.0.0-0.19
40
+ - graphile-build-pg@5.0.0-0.22
41
+
3
42
  ## 5.0.0-0.23
4
43
 
5
44
  ### Patch Changes
package/dist/cli.js CHANGED
@@ -151,22 +151,22 @@ async function run(args) {
151
151
  ];
152
152
  preset.pgConfigs = newPgConfigs;
153
153
  }
154
- preset.server = preset.server || {};
154
+ preset.grafserv = preset.grafserv || {};
155
155
  if (rawPort != null) {
156
- preset.server.port = rawPort;
156
+ preset.grafserv.port = rawPort;
157
157
  }
158
158
  if (rawHost != null) {
159
- preset.server.host = rawHost;
159
+ preset.grafserv.host = rawHost;
160
160
  }
161
161
  if (rawSubscriptions) {
162
- preset.server.websockets = true;
162
+ preset.grafserv.websockets = true;
163
163
  }
164
164
  preset.grafast = preset.grafast || {};
165
165
  if (rawAllowExplain != null) {
166
166
  preset.grafast.explain = rawAllowExplain;
167
167
  }
168
168
  if (watch != null) {
169
- preset.server.watch = watch;
169
+ preset.grafserv.watch = watch;
170
170
  }
171
171
  const config = (0, graphile_config_1.resolvePresets)([preset]);
172
172
  if (!Array.isArray(config.pgConfigs) || config.pgConfigs.length === 0) {
@@ -192,14 +192,14 @@ async function run(args) {
192
192
  }
193
193
  else if (address) {
194
194
  const host = address.family === "IPv6" ? `[${address.address}]` : address.address;
195
- console.log(`Server listening on port ${address.port} at http://${host}:${address.port}${config.server?.graphqlPath ?? "/graphql"}`);
195
+ console.log(`Server listening on port ${address.port} at http://${host}:${address.port}${config.grafserv?.graphqlPath ?? "/graphql"}`);
196
196
  }
197
197
  else {
198
198
  console.error(`Could not determine server address`);
199
199
  }
200
200
  });
201
- const port = config.server?.port;
202
- const host = config.server?.host;
201
+ const port = config.grafserv?.port;
202
+ const host = config.grafserv?.host;
203
203
  const listenFailed = (e) => {
204
204
  // Listen failed; exit
205
205
  console.error("Failed to listen", e);
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,16 +1,18 @@
1
1
  import "graphile-build";
2
2
  import "graphile-build-pg";
3
+ import type { PromiseOrDirect } from "grafast";
3
4
  import type { GrafservBase, GrafservConfig } from "grafserv";
4
5
  import type { GraphQLSchema } from "graphql";
5
6
  import type { ServerParams } from "./interfaces.js";
6
7
  export { makeSchema } from "./schema.js";
7
8
  export { GraphileBuild, GraphileConfig };
8
- export declare function postgraphile(preset: GraphileConfig.Preset): {
9
+ export interface PostGraphileInstance {
9
10
  createServ<TGrafserv extends GrafservBase>(grafserv: (config: GrafservConfig) => TGrafserv): TGrafserv;
10
- getServerParams(): Promise<ServerParams>;
11
- getSchema(): Promise<GraphQLSchema>;
11
+ getServerParams(): PromiseOrDirect<ServerParams>;
12
+ getSchema(): PromiseOrDirect<GraphQLSchema>;
12
13
  getResolvedPreset(): GraphileConfig.ResolvedPreset;
13
- release(): Promise<void>;
14
- };
14
+ release(): PromiseOrDirect<void>;
15
+ }
16
+ export declare function postgraphile(preset: GraphileConfig.Preset): PostGraphileInstance;
15
17
  export default postgraphile;
16
18
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,CAAC;AACxB,OAAO,mBAAmB,CAAC;AAI3B,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC;AAEzC,wBAAgB,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,GAAG;IAC3D,UAAU,CAAC,SAAS,SAAS,YAAY,EACvC,QAAQ,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,SAAS,GAC9C,SAAS,CAAC;IACb,eAAe,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IACzC,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IACpC,iBAAiB,IAAI,cAAc,CAAC,cAAc,CAAC;IACnD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B,CA4FA;AAED,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,CAAC;AACxB,OAAO,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,SAAS,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC;AAEzC,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,SAAS,SAAS,YAAY,EACvC,QAAQ,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,SAAS,GAC9C,SAAS,CAAC;IACb,eAAe,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC;IACjD,SAAS,IAAI,eAAe,CAAC,aAAa,CAAC,CAAC;IAC5C,iBAAiB,IAAI,cAAc,CAAC,cAAc,CAAC;IACnD,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,cAAc,CAAC,MAAM,GAC5B,oBAAoB,CA4FtB;AAED,eAAe,YAAY,CAAC"}
package/dist/index.js CHANGED
@@ -13,7 +13,7 @@ function postgraphile(preset) {
13
13
  const resolvedPreset = (0, graphile_config_1.resolvePresets)([preset]);
14
14
  let serverParams;
15
15
  let stopWatchingPromise = null;
16
- if (resolvedPreset.server?.watch) {
16
+ if (resolvedPreset.grafserv?.watch) {
17
17
  serverParams = (0, grafast_1.defer)();
18
18
  stopWatchingPromise = (0, schema_js_1.watchSchema)(preset, (error, newParams) => {
19
19
  if (error || !newParams) {
@@ -47,7 +47,7 @@ function postgraphile(preset) {
47
47
  createServ(grafserv) {
48
48
  assertAlive();
49
49
  if (server) {
50
- throw new Error(`createGrafserv is currently only allowed to be called once; if you'd like to call it multiple times please file an issue with your use case and we can discuss implementing that.`);
50
+ throw new Error(`createServ is currently only allowed to be called once; if you'd like to call it multiple times please file an issue with your use case and we can discuss implementing that.`);
51
51
  }
52
52
  const schema = (0, grafast_1.isPromiseLike)(serverParams)
53
53
  ? serverParams.then((p) => p.schema)
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export declare const PgV4NoIgnoreIndexesPlugin: GraphileConfig.Plugin;
2
+ //# sourceMappingURL=PgV4NoIgnoreIndexesPlugin.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PgV4NoIgnoreIndexesPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/PgV4NoIgnoreIndexesPlugin.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB,EAAE,cAAc,CAAC,MA6EtD,CAAC"}
@@ -0,0 +1,72 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.PgV4NoIgnoreIndexesPlugin = void 0;
4
+ const graphile_build_pg_1 = require("graphile-build-pg");
5
+ exports.PgV4NoIgnoreIndexesPlugin = {
6
+ name: "PgV4NoIgnoreIndexesPlugin",
7
+ version: "0.0.0",
8
+ gather: {
9
+ hooks: {
10
+ pgRelations_relation(info, event) {
11
+ const { relation, pgConstraint } = event;
12
+ if (pgConstraint._id.startsWith("FAKE_")) {
13
+ // Pretend fake constraints are indexed.
14
+ return;
15
+ }
16
+ // If it's not indexed, remove the list/connection behaviors
17
+ if (relation.isReferencee) {
18
+ const referencedColumns = pgConstraint
19
+ .getAttributes()
20
+ .map((att) => att.attname);
21
+ const remoteIndexes = pgConstraint
22
+ .getClass()
23
+ .getIndexes()
24
+ .filter((idx) => !idx.indpred);
25
+ const isIndexed = remoteIndexes.some((idx) => {
26
+ const cols = idx.getKeys();
27
+ if (cols.length < referencedColumns.length) {
28
+ return false;
29
+ }
30
+ const firstColNames = cols
31
+ .slice(0, referencedColumns.length)
32
+ .map((k) => k?.attname);
33
+ return referencedColumns.every((key) => firstColNames.includes(key));
34
+ });
35
+ if (!isIndexed) {
36
+ if (!relation.extensions) {
37
+ relation.extensions = { tags: Object.create(null) };
38
+ }
39
+ if (!relation.extensions.tags) {
40
+ relation.extensions.tags = Object.create(null);
41
+ }
42
+ (0, graphile_build_pg_1.addBehaviorToTags)(relation.extensions.tags, "-list -connection -single -manyToMany");
43
+ }
44
+ }
45
+ },
46
+ pgCodecs_column(info, event) {
47
+ const { column, pgAttribute } = event;
48
+ // If this column isn't indexed, remove the filter and order behaviors
49
+ const isIndexed = pgAttribute
50
+ .getClass()
51
+ .getIndexes()
52
+ .some((idx) => {
53
+ if (idx.indpred) {
54
+ return false;
55
+ }
56
+ const keys = idx.getKeys();
57
+ return keys[0]?.attname === pgAttribute.attname;
58
+ });
59
+ if (!isIndexed) {
60
+ if (!column.extensions) {
61
+ column.extensions = Object.create(null);
62
+ }
63
+ if (!column.extensions.tags) {
64
+ column.extensions.tags = Object.create(null);
65
+ }
66
+ (0, graphile_build_pg_1.addBehaviorToTags)(column.extensions.tags, "-filterBy -orderBy");
67
+ }
68
+ },
69
+ },
70
+ },
71
+ };
72
+ //# sourceMappingURL=PgV4NoIgnoreIndexesPlugin.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PgV4NoIgnoreIndexesPlugin.js","sourceRoot":"","sources":["../../src/plugins/PgV4NoIgnoreIndexesPlugin.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,16 @@
1
1
  /// <reference types="node" />
2
2
  import "graphile-config";
3
3
  import type { IncomingMessage, ServerResponse } from "http";
4
+ import { PgV4BehaviorPlugin } from "../plugins/PgV4BehaviorPlugin.js";
5
+ import { PgV4InflectionPlugin } from "../plugins/PgV4InflectionPlugin.js";
6
+ import { PgV4NoIgnoreIndexesPlugin } from "../plugins/PgV4NoIgnoreIndexesPlugin.js";
7
+ import { PgV4SmartTagsPlugin } from "../plugins/PgV4SmartTagsPlugin.js";
8
+ export { PgV4BehaviorPlugin, PgV4InflectionPlugin, PgV4NoIgnoreIndexesPlugin, PgV4SmartTagsPlugin, };
4
9
  type PromiseOrDirect<T> = T | Promise<T>;
5
10
  type DirectOrCallback<Request, T> = T | ((req: Request) => PromiseOrDirect<T>);
6
11
  export interface V4GraphileBuildOptions {
7
12
  pgUseCustomNetworkScalars?: boolean;
13
+ pgStrictFunctions?: boolean;
8
14
  }
9
15
  export interface V4Options<Request extends IncomingMessage = IncomingMessage, Response extends ServerResponse = ServerResponse> {
10
16
  simpleCollections?: "both" | "only" | "omit";
@@ -1 +1 @@
1
- {"version":3,"file":"v4.d.ts","sourceRoot":"","sources":["../../src/presets/v4.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAO5D,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACzC,KAAK,gBAAgB,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/E,MAAM,WAAW,sBAAsB;IACrC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,SAAS,CACxB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,QAAQ,SAAS,cAAc,GAAG,cAAc;IAEhD,iBAAiB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC;IACxC,WAAW,CAAC,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC;IAEtC,sEAAsE;IACtE,UAAU,CAAC,EAAE,gBAAgB,CAC3B,OAAO,GAAG,SAAS,EACnB;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CACtC,CAAC;IAEF,8DAA8D;IAC9D,mCAAmC,CAAC,EAAE,CACpC,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,QAAQ,GAAG,SAAS,KACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAElC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,oBAAoB,CAAC,EAAE,sBAAsB,CAAC;CAC/C;AAmFD,eAAO,MAAM,YAAY,aACd,SAAS,KACjB,eAAe,MAmEjB,CAAC;AAEF,eAAO,MAAM,QAAQ,uBAAiB,CAAC;AACvC,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"v4.d.ts","sourceRoot":"","sources":["../../src/presets/v4.ts"],"names":[],"mappings":";AAAA,OAAO,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,yBAAyB,EACzB,mBAAmB,GACpB,CAAC;AAEF,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACzC,KAAK,gBAAgB,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/E,MAAM,WAAW,sBAAsB;IACrC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,SAAS,CACxB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,QAAQ,SAAS,cAAc,GAAG,cAAc;IAEhD,iBAAiB,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC;IACxC,WAAW,CAAC,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC;IAEtC,sEAAsE;IACtE,UAAU,CAAC,EAAE,gBAAgB,CAC3B,OAAO,GAAG,SAAS,EACnB;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;KAAE,CACtC,CAAC;IAEF,8DAA8D;IAC9D,mCAAmC,CAAC,EAAE,CACpC,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,QAAQ,GAAG,SAAS,KACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAElC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,oBAAoB,CAAC,EAAE,sBAAsB,CAAC;CAC/C;AAmFD,eAAO,MAAM,YAAY,aACd,SAAS,KACjB,eAAe,MAuEjB,CAAC;AAEF,eAAO,MAAM,QAAQ,uBAAiB,CAAC;AACvC,eAAe,QAAQ,CAAC"}
@@ -1,12 +1,16 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.V4Preset = exports.makeV4Preset = void 0;
3
+ exports.V4Preset = exports.makeV4Preset = exports.PgV4SmartTagsPlugin = exports.PgV4NoIgnoreIndexesPlugin = exports.PgV4InflectionPlugin = exports.PgV4BehaviorPlugin = void 0;
4
4
  require("graphile-config");
5
5
  const graphile_build_pg_1 = require("graphile-build-pg");
6
6
  const PgV4BehaviorPlugin_js_1 = require("../plugins/PgV4BehaviorPlugin.js");
7
+ Object.defineProperty(exports, "PgV4BehaviorPlugin", { enumerable: true, get: function () { return PgV4BehaviorPlugin_js_1.PgV4BehaviorPlugin; } });
7
8
  const PgV4InflectionPlugin_js_1 = require("../plugins/PgV4InflectionPlugin.js");
8
- const PgV4NoIgnoreIndexes_js_1 = require("../plugins/PgV4NoIgnoreIndexes.js");
9
+ Object.defineProperty(exports, "PgV4InflectionPlugin", { enumerable: true, get: function () { return PgV4InflectionPlugin_js_1.PgV4InflectionPlugin; } });
10
+ const PgV4NoIgnoreIndexesPlugin_js_1 = require("../plugins/PgV4NoIgnoreIndexesPlugin.js");
11
+ Object.defineProperty(exports, "PgV4NoIgnoreIndexesPlugin", { enumerable: true, get: function () { return PgV4NoIgnoreIndexesPlugin_js_1.PgV4NoIgnoreIndexesPlugin; } });
9
12
  const PgV4SmartTagsPlugin_js_1 = require("../plugins/PgV4SmartTagsPlugin.js");
13
+ Object.defineProperty(exports, "PgV4SmartTagsPlugin", { enumerable: true, get: function () { return PgV4SmartTagsPlugin_js_1.PgV4SmartTagsPlugin; } });
10
14
  function isNotNullish(arg) {
11
15
  return arg != null;
12
16
  }
@@ -79,14 +83,14 @@ function parseJWTType(type) {
79
83
  });
80
84
  }
81
85
  const makeV4Preset = (options = {}) => {
82
- const { pgUseCustomNetworkScalars, ...otherGraphileBuildOptions } = options.graphileBuildOptions ?? {};
86
+ const { pgUseCustomNetworkScalars, pgStrictFunctions, ...otherGraphileBuildOptions } = options.graphileBuildOptions ?? {};
83
87
  return {
84
88
  plugins: [
85
89
  ...(options.ignoreRBAC === false ? [graphile_build_pg_1.PgRBACPlugin] : []),
86
90
  PgV4InflectionPlugin_js_1.PgV4InflectionPlugin,
87
91
  PgV4SmartTagsPlugin_js_1.PgV4SmartTagsPlugin,
88
92
  PgV4BehaviorPlugin_js_1.PgV4BehaviorPlugin,
89
- ...(options.ignoreIndexes === false ? [PgV4NoIgnoreIndexes_js_1.PgV4NoIgnoreIndexesPlugin] : []),
93
+ ...(options.ignoreIndexes === false ? [PgV4NoIgnoreIndexesPlugin_js_1.PgV4NoIgnoreIndexesPlugin] : []),
90
94
  makeV4Plugin(options),
91
95
  ...(options.appendPlugins ? options.appendPlugins : []),
92
96
  ].filter(isNotNullish),
@@ -109,6 +113,7 @@ const makeV4Preset = (options = {}) => {
109
113
  : null),
110
114
  },
111
115
  gather: {
116
+ pgStrictFunctions,
112
117
  ...(options.jwtPgTypeIdentifier
113
118
  ? {
114
119
  pgJwtType: parseJWTType(options.jwtPgTypeIdentifier),
@@ -1 +1 @@
1
- {"version":3,"file":"v4.js","sourceRoot":"","sources":["../../src/presets/v4.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"v4.js","sourceRoot":"","sources":["../../src/presets/v4.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "postgraphile",
3
- "version": "5.0.0-0.23",
3
+ "version": "5.0.0-0.25",
4
4
  "description": "Automatic, high performance, and highly customizable GraphQL API for PostgreSQL",
5
5
  "type": "commonjs",
6
6
  "main": "./dist/index.js",
@@ -56,15 +56,15 @@
56
56
  },
57
57
  "homepage": "https://graphile.org/graphile-engine/",
58
58
  "dependencies": {
59
- "@dataplan/pg": "0.0.1-0.18",
59
+ "@dataplan/pg": "0.0.1-0.19",
60
60
  "@graphile/lru": "^5.0.0-0.1",
61
61
  "@types/node": "^16.11.15",
62
62
  "@types/pg": "^8.6.2",
63
63
  "debug": "^4.3.3",
64
- "grafast": "^0.0.1-0.13",
65
- "grafserv": "^0.0.1-0.15",
66
- "graphile-build": "5.0.0-0.18",
67
- "graphile-build-pg": "5.0.0-0.21",
64
+ "grafast": "^0.0.1-0.14",
65
+ "grafserv": "^0.0.1-0.16",
66
+ "graphile-build": "5.0.0-0.19",
67
+ "graphile-build-pg": "5.0.0-0.22",
68
68
  "graphile-config": "^0.0.1-0.5",
69
69
  "graphile-export": "^0.0.2-0.4",
70
70
  "graphql": "16.1.0-experimental-stream-defer.6",