postgraphile 5.0.0-beta.33 → 5.0.0-beta.35

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,109 @@
1
1
  # postgraphile
2
2
 
3
+ ## 5.0.0-beta.35
4
+
5
+ ### Patch Changes
6
+
7
+ - [#2269](https://github.com/graphile/crystal/pull/2269)
8
+ [`bee1db4f4`](https://github.com/graphile/crystal/commit/bee1db4f442502b62cb05cd0f7092990328497b8)
9
+ Thanks [@benjie](https://github.com/benjie)! - Hotfix to inflection changes in
10
+ beta.34 - fixes behavior of `orderByAttributeEnum` and removes V4 override of
11
+ `_joinAttributeNames` which shouldn't be necessary (and seems to do more harm
12
+ than good).
13
+ - Updated dependencies
14
+ [[`bee1db4f4`](https://github.com/graphile/crystal/commit/bee1db4f442502b62cb05cd0f7092990328497b8)]:
15
+ - graphile-build-pg@5.0.0-beta.34
16
+ - graphile-utils@5.0.0-beta.34
17
+
18
+ ## 5.0.0-beta.34
19
+
20
+ ### Patch Changes
21
+
22
+ - [#2251](https://github.com/graphile/crystal/pull/2251)
23
+ [`555d65cce`](https://github.com/graphile/crystal/commit/555d65ccecb875f1e34cb40108176f0ddc11df64)
24
+ Thanks [@benjie](https://github.com/benjie)! - We now enforce GraphQL name
25
+ checks earlier and supply more information to better reveal where any invalid
26
+ names are originating.
27
+
28
+ - [#2251](https://github.com/graphile/crystal/pull/2251)
29
+ [`efa25d97d`](https://github.com/graphile/crystal/commit/efa25d97df2e00f13bc29806d396a8366a121031)
30
+ Thanks [@benjie](https://github.com/benjie)! - 🚨 **Inflection changes!** V4
31
+ preset should be (mostly) unaffected, but Amber preset will likely have
32
+ changes between `ID` and `ROW_ID` in various places, plus missing underscores
33
+ may reappear/etc. Be sure to diff your schema before/after this update (as you
34
+ should with every update... and to be honest, with everything else that
35
+ changes your schema).
36
+
37
+ Normally `camelCase`/`upperCamelCase`/`constantCase`/etc are the final step
38
+ before we name a field/type/enumValue/etc; however it turns out that some
39
+ inflectors were using the camel-cased output as input to their own
40
+ inflection - for example, when calculating the name of a relation it would
41
+ take the column names _camel-cased_ and then combine them into a string which
42
+ was then camel-cased again. Even worse, when these values are then used in an
43
+ enum, it would then be _constant-cased_, so you end up with string 👉
44
+ camel-case 👉 concatenate 👉 camel-case 👉 concatenate 👉 constant-case. This
45
+ lead to certain edge cases where fields with numbers or underscores may come
46
+ out in unexpected ways.
47
+
48
+ This release creates "raw" backing inflectors for a few things that remove the
49
+ final step (camel-casing) so that later usage may choose to use the raw value
50
+ rather than the camel-cased value. And due to this, we've also moved the `id`
51
+ 👉 `rowId` tweaks from the `attribute()` inflector into the `_attributeName()`
52
+ inflector - which is where most of the changes have come from. We've undone
53
+ this change in the V4 preset, so if you don't use the V5 preset but need to
54
+ undo this change, please check out the V4 overrides of:
55
+
56
+ - [`_attributeName`](https://github.com/graphile/crystal/blob/ca9c872ff6c95915bd9e2f33c1370d86742ce815/postgraphile/postgraphile/src/presets/v4.ts#L135-L145)
57
+ - [`_joinAttributeNames`](https://github.com/graphile/crystal/blob/ca9c872ff6c95915bd9e2f33c1370d86742ce815/postgraphile/postgraphile/src/plugins/PgV4InflectionPlugin.ts#L131-L138)
58
+ - [`attribute`](https://github.com/graphile/crystal/blob/ca9c872ff6c95915bd9e2f33c1370d86742ce815/postgraphile/postgraphile/src/presets/v4.ts#L158-L169)
59
+
60
+ Note: the V4 preset is fairly stable, but the Amber preset is being constantly
61
+ iterated to improve the OOTB V5 experience - it will only be stable once
62
+ V5.0.0 is released.
63
+
64
+ - [#2252](https://github.com/graphile/crystal/pull/2252)
65
+ [`d88b69d05`](https://github.com/graphile/crystal/commit/d88b69d0591601fb44b3e6e71b137b8235e70157)
66
+ Thanks [@benjie](https://github.com/benjie)! - V4 preset now supports
67
+ extendedErrors, showErrorStack and bodySizeLimit options.
68
+
69
+ - [#2257](https://github.com/graphile/crystal/pull/2257)
70
+ [`2a37fb99a`](https://github.com/graphile/crystal/commit/2a37fb99a04784647dff6ab8c5bfffb072cc6e8a)
71
+ Thanks [@benjie](https://github.com/benjie)! - Overhaul how PostgreSQL arrays
72
+ are handled, and fix the "empty arrays become null" bug caused by using
73
+ `array_agg()`.
74
+
75
+ - [#2265](https://github.com/graphile/crystal/pull/2265)
76
+ [`5d9f2de85`](https://github.com/graphile/crystal/commit/5d9f2de8519b216732b17464d0b326ec8d7c58de)
77
+ Thanks [@benjie](https://github.com/benjie)! - Prevents inlining (via joins)
78
+ child PgSelect queries into parents when the parent is relying on implicit
79
+ ordering coming from a function or suitably flagged subquery.
80
+ - Updated dependencies
81
+ [[`555d65cce`](https://github.com/graphile/crystal/commit/555d65ccecb875f1e34cb40108176f0ddc11df64),
82
+ [`866673e14`](https://github.com/graphile/crystal/commit/866673e14f7ad76b6f6d83d1b4e3a4eff8fdba37),
83
+ [`69ab227b5`](https://github.com/graphile/crystal/commit/69ab227b5e1c057a6fc8ebba87bde80d5aa7f3c8),
84
+ [`efa25d97d`](https://github.com/graphile/crystal/commit/efa25d97df2e00f13bc29806d396a8366a121031),
85
+ [`9a0f9e78c`](https://github.com/graphile/crystal/commit/9a0f9e78c4ee46f50f49bb068baddef7e1de4119),
86
+ [`d13b76f0f`](https://github.com/graphile/crystal/commit/d13b76f0fef2a58466ecb44880af62d25910e83e),
87
+ [`b167bd849`](https://github.com/graphile/crystal/commit/b167bd8499be5866b71bac6594d55bd768fda1d0),
88
+ [`a202145c5`](https://github.com/graphile/crystal/commit/a202145c5af3e5467424e6772d532c2db1eb67c6),
89
+ [`7bf045282`](https://github.com/graphile/crystal/commit/7bf04528264c3b9c509f148253fed96d3394141d),
90
+ [`2a37fb99a`](https://github.com/graphile/crystal/commit/2a37fb99a04784647dff6ab8c5bfffb072cc6e8a),
91
+ [`5d9f2de85`](https://github.com/graphile/crystal/commit/5d9f2de8519b216732b17464d0b326ec8d7c58de),
92
+ [`6a13ecbd4`](https://github.com/graphile/crystal/commit/6a13ecbd45534c39c846c1d8bc58242108426dd1),
93
+ [`84f07626d`](https://github.com/graphile/crystal/commit/84f07626d9dd9e22f6ae6a1045053df046fbc4ea),
94
+ [`86e228299`](https://github.com/graphile/crystal/commit/86e22829996a745dc1f8cbaf32e709b1bd346e79),
95
+ [`933786868`](https://github.com/graphile/crystal/commit/9337868689f4f05ab5faf2d4bb18a8ad8e23e189),
96
+ [`cba6ee06d`](https://github.com/graphile/crystal/commit/cba6ee06d38ec5ae4ef4dafa58569fad61f239ac)]:
97
+ - graphile-build-pg@5.0.0-beta.33
98
+ - graphile-build@5.0.0-beta.29
99
+ - grafserv@0.1.1-beta.19
100
+ - grafast@0.1.1-beta.17
101
+ - graphile-config@0.0.1-beta.12
102
+ - pg-sql2@5.0.0-beta.7
103
+ - @dataplan/pg@0.0.1-beta.28
104
+ - graphile-utils@5.0.0-beta.33
105
+ - @dataplan/json@0.0.1-beta.26
106
+
3
107
  ## 5.0.0-beta.33
4
108
 
5
109
  ### Patch Changes
package/dist/cli.js CHANGED
@@ -178,7 +178,7 @@ async function run(args) {
178
178
  if (watch != null) {
179
179
  preset.grafserv.watch = watch;
180
180
  }
181
- const config = (0, graphile_config_1.resolvePresets)([preset]);
181
+ const config = (0, graphile_config_1.resolvePreset)(preset);
182
182
  if (!Array.isArray(config.pgServices) || config.pgServices.length === 0) {
183
183
  // ENHANCE: respect envvars here?
184
184
  console.error(`ERROR: Please specify \`--connection\` so we know which database to connect to (or add details to your \`graphile.config.js\`):\n\n postgraphile${process.argv.length > 2 ? ` ${process.argv.slice(2).join(" ")}` : ""} --connection postgres://user:password@server:port/database_name?ssl=true`);
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.js CHANGED
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "watchSchema", { enumerable: true, get: function
10
10
  const graphile_config_1 = require("graphile-config");
11
11
  function noop() { }
12
12
  function postgraphile(preset) {
13
- const resolvedPreset = (0, graphile_config_1.resolvePresets)([preset]);
13
+ const resolvedPreset = (0, graphile_config_1.resolvePreset)(preset);
14
14
  let schemaResult;
15
15
  let stopWatchingPromise = null;
16
16
  let released = false;
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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"}
@@ -1 +1 @@
1
- {"version":3,"file":"PgV4InflectionPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/PgV4InflectionPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AACzB,OAAO,mBAAmB,CAAC;AAE3B,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,cAAc,CAAC;QACvB,UAAU,OAAO;YACf,oBAAoB,EAAE,IAAI,CAAC;SAC5B;QACD,UAAU,aAAa;YACrB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;SACtC;KACF;CACF;AAED,eAAO,MAAM,oBAAoB,EAAE,cAAc,CAAC,MAqHjD,CAAC"}
1
+ {"version":3,"file":"PgV4InflectionPlugin.d.ts","sourceRoot":"","sources":["../../src/plugins/PgV4InflectionPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AACzB,OAAO,mBAAmB,CAAC;AAE3B,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,cAAc,CAAC;QACvB,UAAU,OAAO;YACf,oBAAoB,EAAE,IAAI,CAAC;SAC5B;QACD,UAAU,aAAa;YACrB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;SACtC;KACF;CACF;AAED,eAAO,MAAM,oBAAoB,EAAE,cAAc,CAAC,MAqIjD,CAAC"}
@@ -110,6 +110,17 @@ exports.PgV4InflectionPlugin = {
110
110
  return this.upperCamelCase(`${tableName}-${pgAttribute.attname}`);
111
111
  }
112
112
  },
113
+ // V4 had a bug where even though `id` was renamed to `rowId`, we'd still
114
+ // use `ID_ASC`/`ID_DESC` when generating ordering - so we have to enable
115
+ // skipRowId.
116
+ orderByAttributeEnum(_previous, options, { codec, attributeName, variant }) {
117
+ const fieldName = this._attributeName({
118
+ attributeName,
119
+ codec,
120
+ skipRowId: true,
121
+ });
122
+ return this.constantCase(`${fieldName}-${variant}`);
123
+ },
113
124
  },
114
125
  },
115
126
  };
@@ -1 +1 @@
1
- {"version":3,"file":"PgV4InflectionPlugin.js","sourceRoot":"","sources":["../../src/plugins/PgV4InflectionPlugin.ts"],"names":[],"mappings":";;;AAAA,2BAAyB;AACzB,6BAA2B;AAad,QAAA,oBAAoB,GAA0B;IACzD,IAAI,EAAE,sBAAsB;IAC5B,WAAW,EACT,uGAAuG;IACzG,OAAO,EAAE,OAAO;IAEhB,UAAU,EAAE;QACV,wBAAwB,EAAE,CAAC,eAAe,CAAC;QAC3C,OAAO,EAAE;YACP,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE;gBAC9C,MAAM,cAAc,GAAG,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,CAAC;gBACvE,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,OAAO,GAAG,cAAc,GAAG,YAAY,EAAE,CAAC;YAC5C,CAAC;YACD,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK;gBACvC,MAAM,QAAQ,GAAG,QAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBACzC,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/D,CAAC;YACD,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO;gBACvC,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;gBACzC,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;gBAClD,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,IAAI,KAAK,CACb,kCAAkC,aAAa,eAC7C,KAAK,CAAC,IACR,4DAA4D,MAAM,CAAC,IAAI,CACrE,KAAK,CAAC,UAAU,CACjB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAChB,CAAC;iBACH;gBACD,IACE,SAAS,CAAC,UAAU,EAAE,QAAQ,IAAI,IAAI;oBACtC,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,EAC7B;oBACA,OAAO,MAAM,SAAS,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;iBAClD;gBACD,OAAO,QAAS,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;YACD,+BAA+B,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO;gBACxD,MAAM,EAAE,QAAQ,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;gBACpD,IAAI,QAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,eAAe,EAAE;oBAC9C,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC;iBACjD;gBACD,IAAI,IAAI,CAAC;gBACT,IAAI,QAAQ,CAAC,UAAU,EAAE,yBAAyB,EAAE;oBAClD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;iBACtE;qBAAM,IAAI,qBAAqB,KAAK,KAAK,EAAE;oBAC1C,IAAI,GAAG,SAAS,CAAC;iBAClB;qBAAM,IAAI,qBAAqB,KAAK,OAAO,EAAE;oBAC5C,IAAI,GAAG,OAAO,CAAC;iBAChB;qBAAM,IAAI,qBAAqB,KAAK,SAAS,EAAE;oBAC9C,IAAI,GAAG,SAAS,CAAC;iBAClB;qBAAM,IAAI,qBAAqB,KAAK,QAAQ,EAAE;oBAC7C,IAAI,GAAG,QAAQ,CAAC;iBACjB;qBAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE;oBACrC,wBAAwB;oBACxB,IAAI,GAAG,QAAQ,CAAC;iBACjB;qBAAM;oBACL,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;iBAC9C;gBACD,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC;gBACnE,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC9C,CAAC;YACD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE;gBAC3C,oBAAoB;gBACpB,OAAO,IAAI,CAAC,SAAS,CACnB,WAAW,IAAI,CAAC,WAAW,CACzB,QAAQ,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAC9D,KAAK,CACP,CAAC;YACJ,CAAC;YACD,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBACrC,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACrE,CAAC;YACD,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK;gBAC1C,IAAI,KAAK,CAAC,WAAW,EAAE;oBACrB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;iBACnD;qBAAM;oBACL,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBACnE;YACH,CAAC;YACD,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK;gBACrC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACzD,CAAC;YACD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK;gBACpC,IAAI,KAAK,CAAC,WAAW,EAAE;oBACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC7C;qBAAM;oBACL,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAC7D;YACH,CAAC;YAED,2BAA2B;YAC3B,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE;gBAC7D,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAG,CAAC;gBACzC,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;gBAC9C,IAAI,OAAO,cAAc,CAAC,QAAQ,KAAK,QAAQ,EAAE;oBAC/C,OAAO,cAAc,CAAC,QAAQ,CAAC;iBAChC;gBACD,IAAI,YAAY,CAAC,OAAO,KAAK,GAAG,EAAE;oBAChC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;oBACpC,IAAI,OAAO,SAAS,CAAC,QAAQ,KAAK,QAAQ,EAAE;wBAC1C,OAAO,SAAS,CAAC,QAAQ,CAAC;qBAC3B;oBACD,OAAO,IAAI,CAAC,cAAc,CACxB,IAAI,CAAC,iBAAiB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACjD,CAAC;iBACH;qBAAM;oBACL,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;oBACnE,MAAM,WAAW,GAAG,OAAO;yBACxB,aAAa,EAAG;yBAChB,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,YAAY,CAAC,MAAO,CAAC,CAAC,CAAC,CAAE,CAAC;oBAC1D,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,SAAS,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;iBACnE;YACH,CAAC;SACF;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"PgV4InflectionPlugin.js","sourceRoot":"","sources":["../../src/plugins/PgV4InflectionPlugin.ts"],"names":[],"mappings":"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"}
@@ -22,10 +22,10 @@ exports.PgRelayPlugin = {
22
22
  nodeIdFieldName() {
23
23
  return "id";
24
24
  },
25
- attribute(previous, options, details) {
25
+ _attributeName(previous, options, details) {
26
26
  const name = previous(details);
27
- if (name === "id")
28
- return "rowId";
27
+ if (!details.skipRowId && name === "id")
28
+ return "row_id";
29
29
  return name;
30
30
  },
31
31
  },
@@ -1 +1 @@
1
- {"version":3,"file":"relay.js","sourceRoot":"","sources":["../../src/presets/relay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"relay.js","sourceRoot":"","sources":["../../src/presets/relay.ts"],"names":[],"mappings":"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"}
@@ -14,7 +14,12 @@ export interface V4GraphileBuildOptions {
14
14
  pgStrictFunctions?: boolean;
15
15
  orderByNullsLast?: boolean;
16
16
  }
17
- export interface V4Options<Request extends IncomingMessage = IncomingMessage, Response extends ServerResponse = ServerResponse> extends GraphileBuild.SchemaOptions {
17
+ export interface V4ErrorOutputOptions {
18
+ handleErrors?: (error: readonly GraphQLError[]) => readonly GraphQLError[];
19
+ extendedErrors?: string[];
20
+ showErrorStack?: boolean | "json";
21
+ }
22
+ export interface V4Options<Request extends IncomingMessage = IncomingMessage, Response extends ServerResponse = ServerResponse> extends GraphileBuild.SchemaOptions, V4ErrorOutputOptions {
18
23
  /**
19
24
  * - 'only': connections will be avoided, preferring lists
20
25
  * - 'omit': lists will be avoided, preferring connections
@@ -44,10 +49,14 @@ export interface V4Options<Request extends IncomingMessage = IncomingMessage, Re
44
49
  graphiqlRoute?: string;
45
50
  eventStreamRoute?: string;
46
51
  graphiql?: boolean;
52
+ /**
53
+ * preset.grafserv.maxRequestLength: the length, in bytes, for the largest
54
+ * request body that grafserv will accept. String values no longer supported.
55
+ */
56
+ bodySizeLimit?: number;
47
57
  /** Always ignored, ruru is always enhanced. */
48
58
  enhanceGraphiql?: boolean;
49
59
  allowExplain?: boolean;
50
- handleErrors?: (error: readonly GraphQLError[]) => readonly GraphQLError[];
51
60
  /**
52
61
  * As of PostGraphile v5, query batching is no longer supported. Query batching
53
62
  * has not been standardized as part of the GraphQL-over-HTTP specification
@@ -67,6 +76,20 @@ export interface V4Options<Request extends IncomingMessage = IncomingMessage, Re
67
76
  defaultRole?: never;
68
77
  simpleSubscriptions?: boolean;
69
78
  }
79
+ export type GraphQLErrorExtended = GraphQLError & {
80
+ extensions: {
81
+ exception: {
82
+ hint?: string;
83
+ detail?: string;
84
+ code: string;
85
+ };
86
+ };
87
+ };
88
+ export declare function makeV4ErrorOutputPreset(options: V4ErrorOutputOptions): {
89
+ grafserv: {
90
+ maskError?: GraphileConfig.GrafservOptions["maskError"];
91
+ };
92
+ };
70
93
  export declare const makeV4Preset: (options?: V4Options) => GraphileConfig.Preset;
71
94
  export declare const V4Preset: GraphileConfig.Preset;
72
95
  export default V4Preset;
@@ -1 +1 @@
1
- {"version":3,"file":"v4.d.ts","sourceRoot":"","sources":["../../src/presets/v4.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"v4.d.ts","sourceRoot":"","sources":["../../src/presets/v4.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.V4Preset = exports.makeV4Preset = exports.PgV4SmartTagsPlugin = exports.PgV4SimpleSubscriptionsPlugin = exports.PgV4InflectionPlugin = exports.PgV4BehaviorPlugin = void 0;
3
+ exports.V4Preset = exports.makeV4Preset = exports.makeV4ErrorOutputPreset = exports.PgV4SmartTagsPlugin = exports.PgV4SimpleSubscriptionsPlugin = exports.PgV4InflectionPlugin = exports.PgV4BehaviorPlugin = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  require("graphile-config");
6
+ const graphql_1 = require("grafast/graphql");
6
7
  const grafserv_1 = require("grafserv");
7
8
  const PgV4BehaviorPlugin_js_1 = require("../plugins/PgV4BehaviorPlugin.js");
8
9
  Object.defineProperty(exports, "PgV4BehaviorPlugin", { enumerable: true, get: function () { return PgV4BehaviorPlugin_js_1.PgV4BehaviorPlugin; } });
@@ -44,6 +45,23 @@ const makeV4Plugin = (options) => {
44
45
  inflection: {
45
46
  ignoreReplaceIfNotExists: ["nodeIdFieldName"],
46
47
  replace: {
48
+ ...(classicIds
49
+ ? null
50
+ : {
51
+ // Undo rename of 'id' to 'rowId'
52
+ _attributeName(previous, options, details) {
53
+ const name = previous(details);
54
+ if (!details.skipRowId && name === "row_id") {
55
+ const { codec, attributeName } = details;
56
+ const attribute = codec.attributes[attributeName];
57
+ const baseName = attribute.extensions?.tags?.name || attributeName;
58
+ if (baseName === "id" && !codec.isAnonymous) {
59
+ return "id";
60
+ }
61
+ }
62
+ return name;
63
+ },
64
+ }),
47
65
  ...(classicIds ||
48
66
  options.skipPlugins?.some((p) => p.name === "NodePlugin")
49
67
  ? null
@@ -54,15 +72,6 @@ const makeV4Plugin = (options) => {
54
72
  return "nodeId";
55
73
  },
56
74
  }),
57
- ...(classicIds
58
- ? null
59
- : {
60
- // Don't rename 'id' to 'rowId'
61
- attribute(previous, options, details) {
62
- const attributeFieldName = this.camelCase(this._attributeName(details));
63
- return attributeFieldName;
64
- },
65
- }),
66
75
  },
67
76
  },
68
77
  schema: {
@@ -101,6 +110,112 @@ const makeV4Plugin = (options) => {
101
110
  },
102
111
  };
103
112
  };
113
+ /** bodySizeLimit to maxRequestLength */
114
+ function bsl2mrl(bsl) {
115
+ if (typeof bsl !== "number") {
116
+ throw new Error(`bodySizeLimit must now be a number of bytes, string formats are no longer supported`);
117
+ }
118
+ else {
119
+ return bsl;
120
+ }
121
+ }
122
+ /**
123
+ * Extracts the requested fields from a pg error object, handling 'code' to
124
+ * 'errcode' mapping.
125
+ */
126
+ function pickPgError(err, inFields) {
127
+ const result = Object.create(null);
128
+ let fields;
129
+ if (Array.isArray(inFields)) {
130
+ fields = inFields;
131
+ }
132
+ else if (typeof inFields === "string") {
133
+ fields = inFields.split(",");
134
+ }
135
+ else {
136
+ throw new Error("Invalid argument to extendedErrors - expected array of strings");
137
+ }
138
+ if (err && typeof err === "object") {
139
+ fields.forEach((field) => {
140
+ // pg places 'errcode' on the 'code' property
141
+ if (typeof field !== "string") {
142
+ throw new Error("Invalid argument to extendedErrors - expected array of strings");
143
+ }
144
+ const errField = field === "errcode" ? "code" : field;
145
+ result[field] =
146
+ err[errField] != null
147
+ ? String(err[errField])
148
+ : err[errField];
149
+ });
150
+ }
151
+ return result;
152
+ }
153
+ /**
154
+ * Given a GraphQLError, format it according to the rules described by the
155
+ * Response Format, Errors section of the GraphQL Specification, plus it can
156
+ * extract additional error codes from the postgres error, such as 'hint',
157
+ * 'detail', 'errcode', 'where', etc. - see `extendedErrors` option.
158
+ */
159
+ function extendedFormatError(error, fields) {
160
+ if (!error) {
161
+ throw new Error("Received null or undefined error.");
162
+ }
163
+ const originalError = error.originalError;
164
+ const exceptionDetails = originalError && fields ? pickPgError(originalError, fields) : undefined;
165
+ return {
166
+ message: error.message,
167
+ locations: error.locations,
168
+ path: error.path,
169
+ ...(exceptionDetails
170
+ ? {
171
+ // Reference: https://facebook.github.io/graphql/draft/#sec-Errors
172
+ extensions: {
173
+ ...originalError?.extensions,
174
+ exception: exceptionDetails,
175
+ },
176
+ }
177
+ : null),
178
+ };
179
+ }
180
+ function makeV4ErrorOutputPreset(options) {
181
+ const { extendedErrors, showErrorStack, handleErrors } = options;
182
+ if (handleErrors) {
183
+ if (extendedErrors || showErrorStack) {
184
+ throw new Error(`handleErrors cannot be combined with extendedErrors / showErrorStack`);
185
+ }
186
+ return {
187
+ grafserv: {
188
+ maskError(error) {
189
+ return handleErrors([error])[0];
190
+ },
191
+ },
192
+ };
193
+ }
194
+ else if (extendedErrors || showErrorStack) {
195
+ return {
196
+ grafserv: {
197
+ maskError(error) {
198
+ const formattedError = extendedErrors && extendedErrors.length
199
+ ? extendedFormatError(error, extendedErrors)
200
+ : (0, graphql_1.formatError)(error);
201
+ // If the user wants to see the error’s stack, let’s add it to the
202
+ // formatted error.
203
+ if (showErrorStack) {
204
+ formattedError["stack"] =
205
+ error.stack != null && showErrorStack === "json"
206
+ ? error.stack.split("\n")
207
+ : error.stack;
208
+ }
209
+ return formattedError;
210
+ },
211
+ },
212
+ };
213
+ }
214
+ else {
215
+ return { grafserv: {} };
216
+ }
217
+ }
218
+ exports.makeV4ErrorOutputPreset = makeV4ErrorOutputPreset;
104
219
  const makeV4Preset = (options = {}) => {
105
220
  const { pgUseCustomNetworkScalars, pgStrictFunctions, orderByNullsLast, ...otherGraphileBuildOptions } = options.graphileBuildOptions ?? {};
106
221
  if (options.enableQueryBatching) {
@@ -109,8 +224,9 @@ const makeV4Preset = (options = {}) => {
109
224
  const graphqlPath = options.graphqlRoute ?? "/graphql";
110
225
  const graphiqlPath = options.graphiqlRoute ?? "/graphiql";
111
226
  const eventStreamPath = options.eventStreamRoute ?? `${graphqlPath}/stream`;
227
+ const bodySizeLimit = options.bodySizeLimit;
112
228
  return {
113
- extends: [amber_js_1.default],
229
+ extends: [amber_js_1.default, makeV4ErrorOutputPreset(options)],
114
230
  plugins: [
115
231
  PgV4InflectionPlugin_js_1.PgV4InflectionPlugin,
116
232
  PgV4SmartTagsPlugin_js_1.PgV4SmartTagsPlugin,
@@ -197,19 +313,15 @@ const makeV4Preset = (options = {}) => {
197
313
  graphiqlPath,
198
314
  eventStreamPath,
199
315
  graphiql: options.graphiql ?? false,
200
- ...(options.handleErrors
201
- ? {
202
- maskError(error) {
203
- return options.handleErrors([error])[0];
204
- },
205
- }
206
- : null),
207
316
  watch: options.watchPg,
208
317
  websockets: options.subscriptions,
209
318
  allowedRequestContentTypes: [
210
319
  ...grafserv_1.DEFAULT_ALLOWED_REQUEST_CONTENT_TYPES,
211
320
  "application/x-www-form-urlencoded",
212
321
  ],
322
+ ...(bodySizeLimit != null
323
+ ? { maxRequestLength: bsl2mrl(bodySizeLimit) }
324
+ : null),
213
325
  },
214
326
  };
215
327
  };
@@ -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/dist/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const version = "5.0.0-beta.33";
1
+ export declare const version = "5.0.0-beta.35";
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.33";
5
+ exports.version = "5.0.0-beta.35";
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.33",
3
+ "version": "5.0.0-beta.35",
4
4
  "description": "Automatic, high performance, and highly customizable GraphQL API for PostgreSQL",
5
5
  "type": "commonjs",
6
6
  "main": "./dist/index.js",
@@ -202,39 +202,39 @@
202
202
  },
203
203
  "homepage": "https://graphile.org/graphile-engine/",
204
204
  "dependencies": {
205
- "@dataplan/json": "0.0.1-beta.25",
206
- "@dataplan/pg": "0.0.1-beta.27",
205
+ "@dataplan/json": "0.0.1-beta.26",
206
+ "@dataplan/pg": "0.0.1-beta.28",
207
207
  "@graphile/lru": "^5.0.0-beta.3",
208
208
  "@types/node": "^20.5.7",
209
209
  "@types/pg": "^8.10.2",
210
210
  "debug": "^4.3.4",
211
- "grafast": "^0.1.1-beta.16",
212
- "grafserv": "^0.1.1-beta.18",
213
- "graphile-build": "5.0.0-beta.28",
214
- "graphile-build-pg": "5.0.0-beta.32",
215
- "graphile-config": "^0.0.1-beta.11",
216
- "graphile-utils": "^5.0.0-beta.32",
211
+ "grafast": "^0.1.1-beta.17",
212
+ "grafserv": "^0.1.1-beta.19",
213
+ "graphile-build": "5.0.0-beta.29",
214
+ "graphile-build-pg": "5.0.0-beta.34",
215
+ "graphile-config": "^0.0.1-beta.12",
216
+ "graphile-utils": "^5.0.0-beta.34",
217
217
  "graphql": "^16.1.0-experimental-stream-defer.6",
218
218
  "iterall": "^1.3.0",
219
219
  "jsonwebtoken": "^9.0.2",
220
220
  "pg": "^8.11.3",
221
- "pg-sql2": "^5.0.0-beta.6",
221
+ "pg-sql2": "^5.0.0-beta.7",
222
222
  "tamedevil": "^0.0.0-beta.7",
223
223
  "tslib": "^2.6.2",
224
224
  "ws": "^8.17.1"
225
225
  },
226
226
  "peerDependencies": {
227
- "@dataplan/json": "0.0.1-beta.25",
228
- "@dataplan/pg": "0.0.1-beta.27",
227
+ "@dataplan/json": "0.0.1-beta.26",
228
+ "@dataplan/pg": "0.0.1-beta.28",
229
229
  "@envelop/core": "^5.0.0",
230
- "grafast": "^0.1.1-beta.16",
231
- "grafserv": "^0.1.1-beta.18",
232
- "graphile-build": "5.0.0-beta.28",
233
- "graphile-build-pg": "5.0.0-beta.32",
234
- "graphile-config": "^0.0.1-beta.11",
230
+ "grafast": "^0.1.1-beta.17",
231
+ "grafserv": "^0.1.1-beta.19",
232
+ "graphile-build": "5.0.0-beta.29",
233
+ "graphile-build-pg": "5.0.0-beta.34",
234
+ "graphile-config": "^0.0.1-beta.12",
235
235
  "graphql": "^16.1.0-experimental-stream-defer.6",
236
236
  "pg": "^8.7.1",
237
- "pg-sql2": "^5.0.0-beta.6",
237
+ "pg-sql2": "^5.0.0-beta.7",
238
238
  "tamedevil": "^0.0.0-beta.7"
239
239
  },
240
240
  "peerDependenciesMeta": {
@@ -256,8 +256,8 @@
256
256
  "@types/jest": "^29.5.4",
257
257
  "@types/jsonwebtoken": "^9.0.2",
258
258
  "@types/nodemon": "1.19.2",
259
- "graphile": "^5.0.0-beta.33",
260
- "graphile-export": "^0.0.2-beta.21",
259
+ "graphile": "^5.0.0-beta.35",
260
+ "graphile-export": "^0.0.2-beta.22",
261
261
  "jest": "^29.6.4",
262
262
  "nodemon": "^3.0.1",
263
263
  "ts-node": "^10.9.1",