postgraphile 5.0.0-beta.25 → 5.0.0-beta.27

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,157 @@
1
1
  # postgraphile
2
2
 
3
+ ## 5.0.0-beta.27
4
+
5
+ ### Patch Changes
6
+
7
+ - [#2129](https://github.com/graphile/crystal/pull/2129)
8
+ [`1f67999eb`](https://github.com/graphile/crystal/commit/1f67999eb11435562ca76e8e7349aaadc28390f6)
9
+ Thanks [@benjie](https://github.com/benjie)! - Fix bug in orderBy planning
10
+ that caused a new plan to be required for every request.
11
+
12
+ - [#2121](https://github.com/graphile/crystal/pull/2121)
13
+ [`8bdc553b7`](https://github.com/graphile/crystal/commit/8bdc553b79aae21a27d22a4e1f1e57ee2e5d1d3f)
14
+ Thanks [@benjie](https://github.com/benjie)! - Add support for accepting
15
+ poolConfig via makePgService
16
+
17
+ - [#2128](https://github.com/graphile/crystal/pull/2128)
18
+ [`4e102b1a1`](https://github.com/graphile/crystal/commit/4e102b1a1cd232e6f6703df0706415f01831dab2)
19
+ Thanks [@adamni21](https://github.com/adamni21)! - Reduce planning cost of
20
+ large input object trees by evaluating keys up front (thanks to @adamni21).
21
+
22
+ - [#1985](https://github.com/graphile/crystal/pull/1985)
23
+ [`d6102714e`](https://github.com/graphile/crystal/commit/d6102714e4fec35952784c988c1617c789eee0cd)
24
+ Thanks [@hannesj](https://github.com/hannesj)! - 🚨 PostgreSQL adaptor is no
25
+ longer loaded via string value; instead you must pass the adaptor instance
26
+ directly. If you have `adaptor: "@dataplan/pg/adaptors/pg"` then replace it
27
+ with `adaptor: await import("@dataplan/pg/adaptors/pg")`. (This shouldn't
28
+ cause you issues because you _should_ be using `makePgService` to construct
29
+ your `pgServices` rather than building raw objects.)
30
+
31
+ 🚨 If you've implemented a custom PgAdaptor, talk to Benjie about how to port
32
+ it. (Should be straightforward, but no point me figuring it out if no-one has
33
+ done it yet 🤷)
34
+
35
+ This change improves bundle-ability by reducing the number of dynamic imports.
36
+
37
+ Also: `PgAdaptorOptions` has been renamed to `PgAdaptorSettings`, so please do
38
+ a global find and replace for that.
39
+
40
+ - [#2094](https://github.com/graphile/crystal/pull/2094)
41
+ [`c0e50a1b4`](https://github.com/graphile/crystal/commit/c0e50a1b4f1c95bfcafb5458dce0d5e56852d7d0)
42
+ Thanks [@benjie](https://github.com/benjie)! - makeWrapPlansPlugin more likely
43
+ to be exportable.
44
+
45
+ - Updated dependencies
46
+ [[`1f67999eb`](https://github.com/graphile/crystal/commit/1f67999eb11435562ca76e8e7349aaadc28390f6),
47
+ [`1bd50b61e`](https://github.com/graphile/crystal/commit/1bd50b61ebb10b7d09b3612c2e2767c41cca3b78),
48
+ [`8bdc553b7`](https://github.com/graphile/crystal/commit/8bdc553b79aae21a27d22a4e1f1e57ee2e5d1d3f),
49
+ [`61f8bbca5`](https://github.com/graphile/crystal/commit/61f8bbca5badda5b27872e0ee01a2d4c1372210d),
50
+ [`4e102b1a1`](https://github.com/graphile/crystal/commit/4e102b1a1cd232e6f6703df0706415f01831dab2),
51
+ [`1cabbd311`](https://github.com/graphile/crystal/commit/1cabbd311bdefd7ce78f8dacbf61a42237a6c73c),
52
+ [`7bb1573ba`](https://github.com/graphile/crystal/commit/7bb1573ba45a4d8b7fa9ad53cdd79686d2641383),
53
+ [`590b6fdf5`](https://github.com/graphile/crystal/commit/590b6fdf5d04a392c4cc9e8bdad83278377c547b),
54
+ [`18addb385`](https://github.com/graphile/crystal/commit/18addb3852525aa91019a36d58fa2fecd8b5b443),
55
+ [`d6102714e`](https://github.com/graphile/crystal/commit/d6102714e4fec35952784c988c1617c789eee0cd),
56
+ [`6ed615e55`](https://github.com/graphile/crystal/commit/6ed615e557b2ab1fb57f1e68c06730a8e3da7175),
57
+ [`b25cc539c`](https://github.com/graphile/crystal/commit/b25cc539c00aeda7a943c37509aaae4dc7812317),
58
+ [`867f33136`](https://github.com/graphile/crystal/commit/867f331365346fc46ed1e0d23c79719846e398f4),
59
+ [`925123497`](https://github.com/graphile/crystal/commit/925123497cf17b5e145ab80f62fa9de768a977ae),
60
+ [`cf535c210`](https://github.com/graphile/crystal/commit/cf535c21078da06c14dd12f30e9b4378da4ded03),
61
+ [`c0e50a1b4`](https://github.com/graphile/crystal/commit/c0e50a1b4f1c95bfcafb5458dce0d5e56852d7d0),
62
+ [`acf99b190`](https://github.com/graphile/crystal/commit/acf99b190954e3c5926e820daed68dfe8eb3ee1f),
63
+ [`4967a197f`](https://github.com/graphile/crystal/commit/4967a197fd2c71ee2a581fe29470ee9f30e74de5),
64
+ [`1908e1ba1`](https://github.com/graphile/crystal/commit/1908e1ba11883a34dac66f985fc20ab160e572b1),
65
+ [`084d80be6`](https://github.com/graphile/crystal/commit/084d80be6e17187c9a9932bcf079e3f460368782),
66
+ [`aa0474755`](https://github.com/graphile/crystal/commit/aa0474755142a758fc58c5c1a30b8c754bc84e7c)]:
67
+ - graphile-build-pg@5.0.0-beta.26
68
+ - grafast@0.1.1-beta.12
69
+ - @dataplan/pg@0.0.1-beta.23
70
+ - grafserv@0.1.1-beta.14
71
+ - graphile-utils@5.0.0-beta.26
72
+ - @dataplan/json@0.0.1-beta.21
73
+ - graphile-build@5.0.0-beta.22
74
+
75
+ ## 5.0.0-beta.26
76
+
77
+ ### Patch Changes
78
+
79
+ - [#2071](https://github.com/graphile/crystal/pull/2071)
80
+ [`582bd768f`](https://github.com/graphile/crystal/commit/582bd768fec403ce3284f293b85b9fd86e4d3f40)
81
+ Thanks [@benjie](https://github.com/benjie)! - `GrafastExecutionArgs` now
82
+ accepts `resolvedPreset` and `requestContext` directly; passing these through
83
+ additional arguments is now deprecated and support will be removed in a future
84
+ revision. This affects:
85
+
86
+ - `grafast()`
87
+ - `execute()`
88
+ - `subscribe()`
89
+ - `hookArgs()`
90
+
91
+ `graphile-config` has gained a middleware system which is more powerful than
92
+ it's AsyncHooks system. Old hooks can be emulated through the middleware
93
+ system safely since middleware is a superset of hooks' capabilities.
94
+ `applyHooks` has been renamed to `orderedApply` (because it applies to more
95
+ than just hooks), calling `applyHooks` will still work but is deprecated.
96
+
97
+ 🚨 `grafast` no longer automatically reads your `graphile.config.ts` or
98
+ similar; you must do that yourself and pass the `resolvedPreset` to grafast
99
+ via the `args`. This is to aid in bundling of grafast since it should not need
100
+ to read from filesystem or dynamically load modules.
101
+
102
+ `grafast` no longer outputs performance warning when you set
103
+ `GRAPHILE_ENV=development`.
104
+
105
+ 🚨 `plugin.grafast.hooks.args` is now `plugin.grafast.middleware.prepareArgs`,
106
+ and the signature has changed - you must be sure to call the `next()` function
107
+ and ctx/resolvedPreset can be extracted directly from `args`:
108
+
109
+ ```diff
110
+ const plugin = {
111
+ grafast: {
112
+ - hooks: {
113
+ + middleware: {
114
+ - args({ args, ctx, resolvedPreset }) {
115
+ + prepareArgs(next, { args }) {
116
+ + const { requestContext: ctx, resolvedPreset } = args;
117
+ // ...
118
+ + return next();
119
+ }
120
+ }
121
+ }
122
+ }
123
+ ```
124
+
125
+ Many more middleware have been added; use TypeScript's autocomplete to see
126
+ what's available until we have proper documentation for them.
127
+
128
+ `plugin.grafserv.hooks.*` are still supported but deprecated; instead use
129
+ middleware `plugin.grafserv.middleware.*` (note that call signatures have
130
+ changed slightly, similar to the diff above):
131
+
132
+ - `hooks.init` -> `middleware.setPreset`
133
+ - `hooks.processGraphQLRequestBody` -> `middleware.processGraphQLRequestBody`
134
+ - `hooks.ruruHTMLParts` -> `middleware.ruruHTMLParts`
135
+
136
+ A few TypeScript types related to Hooks have been renamed, but their old names
137
+ are still available, just deprecated. They will be removed in a future update:
138
+
139
+ - `HookObject` -> `FunctionalityObject`
140
+ - `PluginHook` -> `CallbackOrDescriptor`
141
+ - `PluginHookObject` -> `CallbackDescriptor`
142
+ - `PluginHookCallback` -> `UnwrapCallback`
143
+
144
+ - Updated dependencies
145
+ [[`582bd768f`](https://github.com/graphile/crystal/commit/582bd768fec403ce3284f293b85b9fd86e4d3f40)]:
146
+ - graphile-build@5.0.0-beta.21
147
+ - graphile-config@0.0.1-beta.9
148
+ - @dataplan/pg@0.0.1-beta.22
149
+ - grafserv@0.1.1-beta.13
150
+ - grafast@0.1.1-beta.11
151
+ - graphile-build-pg@5.0.0-beta.25
152
+ - graphile-utils@5.0.0-beta.25
153
+ - @dataplan/json@0.0.1-beta.20
154
+
3
155
  ## 5.0.0-beta.25
4
156
 
5
157
  ### Patch Changes
package/README.md CHANGED
@@ -33,11 +33,8 @@ And please give some love to our featured sponsors 🤩:
33
33
  <table><tr>
34
34
  <td align="center"><a href="https://www.the-guild.dev/"><img src="https://graphile.org/images/sponsors/theguild.png" width="90" height="90" alt="The Guild" /><br />The Guild</a> *</td>
35
35
  <td align="center"><a href="https://dovetailapp.com/"><img src="https://graphile.org/images/sponsors/dovetail.png" width="90" height="90" alt="Dovetail" /><br />Dovetail</a> *</td>
36
- <td align="center"><a href="https://www.netflix.com/"><img src="https://graphile.org/images/sponsors/Netflix.png" width="90" height="90" alt="Netflix" /><br />Netflix</a> *</td>
37
36
  <td align="center"><a href="https://stellate.co/"><img src="https://graphile.org/images/sponsors/Stellate.png" width="90" height="90" alt="Stellate" /><br />Stellate</a> *</td>
38
- </tr><tr>
39
37
  <td align="center"><a href="https://gosteelhead.com/"><img src="https://graphile.org/images/sponsors/steelhead.svg" width="90" height="90" alt="Steelhead" /><br />Steelhead</a> *</td>
40
- <td align="center"><a href="https://www.sylvera.com/"><img src="https://graphile.org/images/sponsors/sylvera.svg" width="90" height="90" alt="Sylvera" /><br />Sylvera</a> *</td>
41
38
  </tr></table>
42
39
 
43
40
  <em>\* Sponsors the entire Graphile suite</em>
package/dist/cli.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAQjE,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI;;;;;;;;;;;;;;;;;;;;GAiElC;AAoED,wBAAsB,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,OAAO,CAAC,iBA8J9D"}
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAQjE,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI;;;;;;;;;;;;;;;;;;;;GAiElC;AAoED,wBAAsB,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,OAAO,CAAC,iBA0J9D"}
package/dist/cli.js CHANGED
@@ -143,19 +143,18 @@ async function run(args) {
143
143
  throw new Error("--superuser-connection must not be specified without --connection");
144
144
  }
145
145
  const schemas = rawSchema?.split(",") ?? ["public"];
146
- const adaptor = preset.pgServices?.[0]?.adaptor ?? "@dataplan/pg/adaptors/pg";
147
- const importSpecifier = adaptor.match(/^([a-z]:|\.\/|\/)/i)
148
- ? (0, node_url_1.pathToFileURL)(adaptor).href
149
- : adaptor;
150
- const mod = await import(importSpecifier);
151
- const makePgService = (mod.makePgService ?? mod.default?.makePgService);
146
+ const svc = preset.pgServices?.[0];
147
+ const adaptor = svc?.adaptor ?? (await loadDefaultAdaptor());
148
+ const makePgService = adaptor.makePgService;
152
149
  if (typeof makePgService !== "function") {
153
150
  throw new Error(`Loaded adaptor '${adaptor}' but it does not export a 'makePgService' helper`);
154
151
  }
155
152
  const newPgServices = [
156
153
  makePgService({
154
+ poolConfig: svc?.adaptorSettings?.poolConfig,
157
155
  connectionString,
158
156
  schemas,
157
+ superuserPoolConfig: svc?.adaptorSettings?.superuserPoolConfig,
159
158
  superuserConnectionString,
160
159
  ...(rawSubscriptions ? { pubsub: true } : null),
161
160
  }),
@@ -244,4 +243,8 @@ async function run(args) {
244
243
  }
245
244
  }
246
245
  exports.run = run;
246
+ async function loadDefaultAdaptor() {
247
+ const mod = await import("@dataplan/pg/adaptors/pg");
248
+ return typeof mod.makePgService === "function" ? mod : mod.default;
249
+ }
247
250
  //# sourceMappingURL=cli.js.map
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":";;;AAAA,yCAAyC;AACzC,uCAAyC;AACzC,yCAAoC;AAGpC,wCAAyC;AACzC,qDAAiD;AAEjD,+CAAkD;AAElD,yCAA0C;AAE1C,0DAA0D;AAC1D,MAAM,kBAAkB,GAAG,qCAAqC,CAAC;AAEjE,SAAgB,OAAO,CAAC,KAAW;IACjC,OAAO,KAAK;SACT,mBAAmB,CAAC;QACnB,yDAAyD;QACzD,2BAA2B,EAAE,KAAK;KACnC,CAAC;SACD,KAAK,CAAC,IAAI,EAAE,gCAAgC,CAAC;SAC7C,OAAO,CACN,kFAAkF,EAClF,+NAA+N,CAChO;SACA,MAAM,CAAC,YAAY,EAAE;QACpB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,gDAAgD;KAC9D,CAAC;SACD,MAAM,CAAC,sBAAsB,EAAE;QAC9B,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,WAAW,EACT,sGAAsG;KACzG,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,WAAW,EACT,iFAAiF;KACpF,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,4CAA4C;KAC1D,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,iDAAiD;KAC/D,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,qCAAqC;KACnD,CAAC;SACD,MAAM,CAAC,eAAe,EAAE;QACvB,IAAI,EAAE,SAAS;QACf,WAAW,EACT,2EAA2E;KAC9E,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,6BAA6B;QAC1C,SAAS,EAAE,IAAI;KAChB,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,gDAAgD;KAC9D,CAAC;SACD,MAAM,CAAC,eAAe,EAAE;QACvB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,SAAS;QACf,WAAW,EACT,mFAAmF;KACtF,CAAC,CAAC;AACP,CAAC;AAjED,0BAiEC;AAED,SAAS,sBAAsB,CAC7B,GAAY,EACZ,CAAC,GAAG,CAAC;IAEL,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC1C,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,EAAE;QACxD,OAAO,KAAK,CAAC;KACd;IACD,IACG,GAAW,CAAC,OAAO;QACpB,CAAC,CAAC,GAAG,CAAC,IAAI,sBAAsB,CAAE,GAAW,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAC9D;QACA,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,WAAmB;IAEnB,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,2FAA2F;QAC3F,IAAI,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,UAAU,KAAK,CAAC,EAAE;YACpB,UAAU,GAAG,CAAC,CAAC,CAAC;SACjB;QACD,MAAM,UAAU,GAAG,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1E,MAAM,UAAU,GAAG,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3E,IAAI,GAAG,CAAC;QACR,IAAI;YACF,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB,EAAE;gBAChC,MAAM,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC;oBAC5D,CAAC,CAAC,IAAA,wBAAa,EAAC,UAAU,CAAC,CAAC,IAAI;oBAChC,CAAC,CAAC,UAAU,CAAC;gBACf,GAAG,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;aACrC;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;QACD,MAAM,cAAc,GAClB,UAAU,KAAK,IAAI;YACjB,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC;YACjB,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC;gBAC7B,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;QAClB,IAAI,sBAAsB,CAAC,cAAc,CAAC,EAAE;YAC1C,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SAC9B;aAAM;YACL,MAAM,IAAI,KAAK,CACb,aAAa,IAAI,SACf,UAAU,CAAC,CAAC,CAAC,QAAQ,UAAU,UAAU,CAAC,CAAC,CAAC,IAC9C,gCAAgC,IAAA,mBAAO,EACrC,cAAc,CACf,qBAAqB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACpD,CAAC;SACH;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAEM,KAAK,UAAU,GAAG,CAAC,IAAqC;IAC7D,MAAM,EACJ,UAAU,EAAE,gBAAgB,EAC5B,mBAAmB,EAAE,yBAAyB,EAC9C,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,kBAAkB,EAC1B,YAAY,EAAE,eAAe,EAC7B,KAAK,EACL,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,gBAAgB,GAChC,GAAG,IAAI,CAAC;IAET,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEnE,0BAA0B;IAC1B,MAAM,UAAU,GAAG,MAAM,IAAA,iBAAU,EAAC,kBAAkB,CAAC,CAAC;IACxD,MAAM,MAAM,GAA0B;QACpC,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC;KAC9D,CAAC;IAEF,IAAI,MAAM,CAAC,OAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,OAAO,CAAC,KAAK,CACX,6HAA6H,kBAAkB,8CAA8C,kBAAkB,GAC7M,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EACpE,EAAE,CACH,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,8BAA8B;IAC9B,IAAI,gBAAgB,IAAI,SAAS,IAAI,yBAAyB,EAAE;QAC9D,IAAI,yBAAyB,IAAI,CAAC,gBAAgB,EAAE;YAClD,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAC;SACH;QACD,MAAM,OAAO,GAAG,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpD,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,GAAG,EAAE,OAAO,IAAI,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC;QAE7D,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,IAAI,OAAO,aAAa,KAAK,UAAU,EAAE;YACvC,MAAM,IAAI,KAAK,CACb,mBAAmB,OAAO,mDAAmD,CAC9E,CAAC;SACH;QAED,MAAM,aAAa,GAAG;YACpB,aAAa,CAAC;gBACZ,UAAU,EAAE,GAAG,EAAE,eAAe,EAAE,UAAU;gBAC5C,gBAAgB;gBAChB,OAAO;gBACP,mBAAmB,EAAE,GAAG,EAAE,eAAe,EAAE,mBAAmB;gBAC9D,yBAAyB;gBACzB,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aAChD,CAAC;SACH,CAAC;QACF,MAAM,CAAC,UAAU,GAAG,aAAa,CAAC;KACnC;IACD,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;IACxC,IAAI,OAAO,IAAI,IAAI,EAAE;QACnB,MAAM,CAAC,QAAS,CAAC,IAAI,GAAG,OAAO,CAAC;KACjC;IACD,IAAI,OAAO,IAAI,IAAI,EAAE;QACnB,MAAM,CAAC,QAAS,CAAC,IAAI,GAAG,OAAO,CAAC;KACjC;IACD,IAAI,gBAAgB,EAAE;QACpB,MAAM,CAAC,QAAS,CAAC,UAAU,GAAG,IAAI,CAAC;KACpC;IACD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,IAAI,eAAe,IAAI,IAAI,EAAE;QAC3B,MAAM,CAAC,OAAQ,CAAC,OAAO,GAAG,eAAe,CAAC;KAC3C;IACD,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,MAAM,CAAC,QAAS,CAAC,KAAK,GAAG,KAAK,CAAC;KAChC;IAED,MAAM,MAAM,GAAG,IAAA,gCAAc,EAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACxC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACvE,iCAAiC;QACjC,OAAO,CAAC,KAAK,CACX,oJACE,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EACpE,2EAA2E,CAC5E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,MAAM,GAAG,GAAG,IAAA,uBAAY,EAAC,MAAM,CAAC,CAAC;IAEjC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,eAAQ,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,IAAA,wBAAY,GAAE,CAAC;IAC9B,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE;QAClB,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC5C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;QAC5B,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACvB,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;SAC/C;aAAM,IAAI,OAAO,EAAE;YAClB,MAAM,IAAI,GACR,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;YACvE,OAAO,CAAC,GAAG,CACT,4BAA4B,OAAO,CAAC,IAAI,cAAc,IAAI,IACxD,OAAO,CAAC,IACV,GAAG,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,UAAU,EAAE,CAChD,CAAC;SACH;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACrD;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC;IAEnC,MAAM,YAAY,GAAG,CAAC,CAAQ,EAAE,EAAE;QAChC,sBAAsB;QACtB,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;IAEF,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC5B,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;KAC/B;SAAM;QACL,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAC5C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;gBAC5B,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACnC,CAAC,CAAC;QACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YAC5B,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;KACrC;AACH,CAAC;AA1JD,kBA0JC;AAED,KAAK,UAAU,kBAAkB;IAG/B,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IACrD,OAAO,OAAO,GAAG,CAAC,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;AACrE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"lazy-jwt.d.ts","sourceRoot":"","sources":["../../src/presets/lazy-jwt.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EACV,oBAAoB,EAEpB,MAAM,EACN,aAAa,EACd,MAAM,cAAc,CAAC;AAKtB,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,cAAc,CAAC;QACvB,UAAU,eAAe;YACvB,WAAW,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAAC;YAC5C,kBAAkB,CAAC,EAAE,aAAa,CAAC;SACpC;KACF;CACF;AAwED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,eAAe,EAAE,cAAc,CAAC,MAE5C,CAAC"}
1
+ {"version":3,"file":"lazy-jwt.d.ts","sourceRoot":"","sources":["../../src/presets/lazy-jwt.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EACV,oBAAoB,EAEpB,MAAM,EACN,aAAa,EACd,MAAM,cAAc,CAAC;AAKtB,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,cAAc,CAAC;QACvB,UAAU,eAAe;YACvB,WAAW,CAAC,EAAE,MAAM,GAAG,oBAAoB,CAAC;YAC5C,kBAAkB,CAAC,EAAE,aAAa,CAAC;SACpC;KACF;CACF;AA4ED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,eAAe,EAAE,cAAc,CAAC,MAE5C,CAAC"}
@@ -9,18 +9,20 @@ const GrafservPgJWTPlugin = {
9
9
  name: "GrafservPgJWTPlugin",
10
10
  version: version_js_1.version,
11
11
  grafast: {
12
- hooks: {
13
- args(event) {
14
- const { args, ctx, resolvedPreset } = event;
15
- const secret = resolvedPreset.grafserv?.pgJwtSecret ??
16
- resolvedPreset.schema?.pgJwtSecret;
17
- const pgJwtVerifyOptions = resolvedPreset.grafserv?.pgJwtVerifyOptions;
12
+ middleware: {
13
+ prepareArgs(next, event) {
14
+ const { args } = event;
15
+ const { resolvedPreset, requestContext: ctx } = args;
16
+ const secret = resolvedPreset?.grafserv?.pgJwtSecret ??
17
+ resolvedPreset?.schema?.pgJwtSecret;
18
+ const pgJwtVerifyOptions = resolvedPreset?.grafserv?.pgJwtVerifyOptions;
18
19
  if (secret) {
19
- const authorization = ctx.node?.req?.headers?.authorization;
20
+ const authorization = ctx?.node?.req?.headers?.authorization;
20
21
  if (typeof authorization === "string") {
21
22
  const [bearer, token] = authorization.split(" ");
22
23
  if (bearer.toLowerCase() === "bearer") {
23
- return Promise.resolve().then(async () => {
24
+ return Promise.resolve()
25
+ .then(async () => {
24
26
  const claims = await new Promise((resolve, reject) => (0, jsonwebtoken_1.verify)(token, secret, {
25
27
  algorithms: ["HS256", "HS384"],
26
28
  audience: "postgraphile",
@@ -54,10 +56,12 @@ const GrafservPgJWTPlugin = {
54
56
  pgSettings[`jwt.claims.${key}`] = String(value);
55
57
  }
56
58
  }
57
- });
59
+ })
60
+ .then(next);
58
61
  }
59
62
  }
60
63
  }
64
+ return next();
61
65
  },
62
66
  },
63
67
  },
@@ -1 +1 @@
1
- {"version":3,"file":"lazy-jwt.js","sourceRoot":"","sources":["../../src/presets/lazy-jwt.ts"],"names":[],"mappings":";;;AAAA,2BAAyB;AAGzB,yDAAgD;AAOhD,+CAAmD;AAEnD,8CAAwC;AAWxC,MAAM,mBAAmB,GAA0B;IACjD,IAAI,EAAE,qBAAqB;IAC3B,OAAO,EAAP,oBAAO;IAEP,OAAO,EAAE;QACP,KAAK,EAAE;YACL,IAAI,CAAC,KAAK;gBACR,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;gBAC5C,MAAM,MAAM,GACV,cAAc,CAAC,QAAQ,EAAE,WAAW;oBACpC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC;gBACrC,MAAM,kBAAkB,GAAG,cAAc,CAAC,QAAQ,EAAE,kBAAkB,CAAC;gBACvE,IAAI,MAAM,EAAE;oBACV,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,CAAC;oBAC5D,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;wBACrC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACjD,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,QAAQ,EAAE;4BACrC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;gCACvC,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAC9B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAClB,IAAA,qBAAS,EACP,KAAK,EACL,MAAM,EACN;oCACE,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;oCAC9B,QAAQ,EAAE,cAAc;oCACxB,GAAG,kBAAkB;oCACrB,QAAQ,EAAE,KAAK;iCAChB,EACD,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;oCACd,IAAI,GAAG,EAAE;wCACN,GAAW,CAAC,UAAU,GAAG,GAAG,CAAC;wCAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;qCACb;yCAAM,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;wCAChD,MAAM,CACJ,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,EAAE;4CAC9C,UAAU,EAAE,GAAG;yCAChB,CAAC,CACH,CAAC;qCACH;yCAAM;wCACL,OAAO,CAAC,MAAM,CAAC,CAAC;qCACjB;gCACH,CAAC,CACF,CACJ,CAAC;gCACF,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE;oCACjC,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;iCACpD;gCACD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,UAAW,CAAC;gCACjD,IAAI,MAAM,CAAC,IAAI,EAAE;oCACf,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;iCAC/B;gCACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oCACjD,IACE,KAAK;wCACL,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC;wCAC/B,GAAG,CAAC,MAAM,IAAI,EAAE,EAChB;wCACA,UAAU,CAAC,cAAc,GAAG,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;qCACjD;iCACF;4BACH,CAAC,CAAC,CAAC;yBACJ;qBACF;iBACF;YACH,CAAC;SACF;KACF;CACF,CAAC;AAEF;;;;;;;;;;GAUG;AACU,QAAA,eAAe,GAA0B;IACpD,OAAO,EAAE,CAAC,+BAAW,EAAE,mBAAmB,CAAC;CAC5C,CAAC"}
1
+ {"version":3,"file":"lazy-jwt.js","sourceRoot":"","sources":["../../src/presets/lazy-jwt.ts"],"names":[],"mappings":"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"}
package/dist/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const version = "5.0.0-beta.25";
1
+ export declare const version = "5.0.0-beta.27";
2
2
  //# sourceMappingURL=version.d.ts.map
package/dist/version.js CHANGED
@@ -2,5 +2,5 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.version = void 0;
4
4
  // This file is autogenerated by /scripts/postversion.mjs
5
- exports.version = "5.0.0-beta.25";
5
+ exports.version = "5.0.0-beta.27";
6
6
  //# sourceMappingURL=version.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "postgraphile",
3
- "version": "5.0.0-beta.25",
3
+ "version": "5.0.0-beta.27",
4
4
  "description": "Automatic, high performance, and highly customizable GraphQL API for PostgreSQL",
5
5
  "type": "commonjs",
6
6
  "main": "./dist/index.js",
@@ -204,18 +204,18 @@
204
204
  },
205
205
  "homepage": "https://graphile.org/graphile-engine/",
206
206
  "dependencies": {
207
- "@dataplan/json": "0.0.1-beta.19",
208
- "@dataplan/pg": "0.0.1-beta.21",
207
+ "@dataplan/json": "0.0.1-beta.21",
208
+ "@dataplan/pg": "0.0.1-beta.23",
209
209
  "@graphile/lru": "^5.0.0-beta.3",
210
210
  "@types/node": "^20.5.7",
211
211
  "@types/pg": "^8.10.2",
212
212
  "debug": "^4.3.4",
213
- "grafast": "^0.1.1-beta.10",
214
- "grafserv": "^0.1.1-beta.12",
215
- "graphile-build": "5.0.0-beta.20",
216
- "graphile-build-pg": "5.0.0-beta.24",
217
- "graphile-config": "^0.0.1-beta.8",
218
- "graphile-utils": "^5.0.0-beta.24",
213
+ "grafast": "^0.1.1-beta.12",
214
+ "grafserv": "^0.1.1-beta.14",
215
+ "graphile-build": "5.0.0-beta.22",
216
+ "graphile-build-pg": "5.0.0-beta.26",
217
+ "graphile-config": "^0.0.1-beta.9",
218
+ "graphile-utils": "^5.0.0-beta.26",
219
219
  "graphql": "^16.1.0-experimental-stream-defer.6",
220
220
  "iterall": "^1.3.0",
221
221
  "jsonwebtoken": "^9.0.2",
@@ -223,17 +223,17 @@
223
223
  "pg-sql2": "^5.0.0-beta.6",
224
224
  "tamedevil": "^0.0.0-beta.7",
225
225
  "tslib": "^2.6.2",
226
- "ws": "^8.13.0"
226
+ "ws": "^8.17.1"
227
227
  },
228
228
  "peerDependencies": {
229
- "@dataplan/json": "0.0.1-beta.19",
230
- "@dataplan/pg": "0.0.1-beta.21",
229
+ "@dataplan/json": "0.0.1-beta.21",
230
+ "@dataplan/pg": "0.0.1-beta.23",
231
231
  "@envelop/core": "^5.0.0",
232
- "grafast": "^0.1.1-beta.10",
233
- "grafserv": "^0.1.1-beta.12",
234
- "graphile-build": "5.0.0-beta.20",
235
- "graphile-build-pg": "5.0.0-beta.24",
236
- "graphile-config": "^0.0.1-beta.8",
232
+ "grafast": "^0.1.1-beta.12",
233
+ "grafserv": "^0.1.1-beta.14",
234
+ "graphile-build": "5.0.0-beta.22",
235
+ "graphile-build-pg": "5.0.0-beta.26",
236
+ "graphile-config": "^0.0.1-beta.9",
237
237
  "graphql": "^16.1.0-experimental-stream-defer.6",
238
238
  "pg": "^8.7.1",
239
239
  "pg-sql2": "^5.0.0-beta.6",
@@ -258,8 +258,8 @@
258
258
  "@types/jest": "^29.5.4",
259
259
  "@types/jsonwebtoken": "^9.0.2",
260
260
  "@types/nodemon": "1.19.2",
261
- "graphile": "^5.0.0-beta.25",
262
- "graphile-export": "^0.0.2-beta.15",
261
+ "graphile": "^5.0.0-beta.27",
262
+ "graphile-export": "^0.0.2-beta.17",
263
263
  "jest": "^29.6.4",
264
264
  "nodemon": "^3.0.1",
265
265
  "ts-node": "^10.9.1",