graphile-config 0.0.1-beta.9 → 1.0.0-rc.2

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,142 @@
1
1
  # graphile-config
2
2
 
3
+ ## 1.0.0-rc.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#2829](https://github.com/graphile/crystal/pull/2829)
8
+ [`a82e6fa`](https://github.com/graphile/crystal/commit/a82e6fae099f7e9d62fb3fc1ee173368cdabca27)
9
+ Thanks [@benjie](https://github.com/benjie)! - Update dependency ranges.
10
+
11
+ ## 1.0.0-rc.1
12
+
13
+ ### Patch Changes
14
+
15
+ - [`8a5a7c5`](https://github.com/graphile/crystal/commit/8a5a7c536fc4b9b702600c5cc3d413724670c327)
16
+ Thanks [@benjie](https://github.com/benjie)! - Bump to release candidate
17
+
18
+ ## 0.0.1-beta.18
19
+
20
+ ### Patch Changes
21
+
22
+ - [#2697](https://github.com/graphile/crystal/pull/2697)
23
+ [`cfd4c3c`](https://github.com/graphile/crystal/commit/cfd4c3cff0ef40ed87a2c700b7719c1ca0e73588)
24
+ Thanks [@benjie](https://github.com/benjie)! - Be more selective about the
25
+ errors caught whilst loading a config file; a bug/throw in the config file
26
+ should still be raised.
27
+
28
+ - [#2688](https://github.com/graphile/crystal/pull/2688)
29
+ [`e15f886`](https://github.com/graphile/crystal/commit/e15f886cae1041416b44b74b75426f8d43000dcf)
30
+ Thanks [@benjie](https://github.com/benjie)! - Fixes bug where two different
31
+ plugins with the same name would be allowed to exist in the same (resolved)
32
+ preset. Users of dynamically created presets and plugins (e.g.
33
+ `makeV4Preset(...)` in PostGraphile) should be wary not to include two calls
34
+ to the same factory in their preset (directly or indirectly).
35
+
36
+ ## 0.0.1-beta.17
37
+
38
+ ### Patch Changes
39
+
40
+ - [#2577](https://github.com/graphile/crystal/pull/2577)
41
+ [`0c6b1f1`](https://github.com/graphile/crystal/commit/0c6b1f1e188f6e2913832adfed9ca76dfdc25c47)
42
+ Thanks [@benjie](https://github.com/benjie)! - Update dependencies
43
+
44
+ - [#2588](https://github.com/graphile/crystal/pull/2588)
45
+ [`e0cdabe`](https://github.com/graphile/crystal/commit/e0cdabe25c8894da550546c93bc03b895585544c)
46
+ Thanks [@benjie](https://github.com/benjie)! - Add support for
47
+ `--experimental-strip-types` to `graphile-config`'s loading of config files.
48
+ No need for `ts-node`/`tsx` now.
49
+
50
+ ## 0.0.1-beta.16
51
+
52
+ ### Patch Changes
53
+
54
+ - [#2482](https://github.com/graphile/crystal/pull/2482)
55
+ [`459e1869a2ec58925b2bac5458af487c52a8ca37`](https://github.com/graphile/crystal/commit/459e1869a2ec58925b2bac5458af487c52a8ca37)
56
+ Thanks [@benjie](https://github.com/benjie)! - Minimum version of Node.js
57
+ bumped to Node 22 (the latest LTS).
58
+
59
+ ## 0.0.1-beta.15
60
+
61
+ ### Patch Changes
62
+
63
+ - [`00d79e6f5608affc3f36bb0ce4ca2547230174e7`](https://github.com/graphile/crystal/commit/00d79e6f5608affc3f36bb0ce4ca2547230174e7)
64
+ Thanks [@benjie](https://github.com/benjie)! - Rename parameter to
65
+ Middleware.register.
66
+
67
+ ## 0.0.1-beta.14
68
+
69
+ ### Patch Changes
70
+
71
+ - [#2280](https://github.com/graphile/crystal/pull/2280)
72
+ [`83c546509`](https://github.com/graphile/crystal/commit/83c546509d24be2955a56120981363ad3c3a5f3f)
73
+ Thanks [@benjie](https://github.com/benjie)! - Fix TypeScript types of
74
+ MiddlewareNext
75
+
76
+ ## 0.0.1-beta.13
77
+
78
+ ### Patch Changes
79
+
80
+ - [#2270](https://github.com/graphile/crystal/pull/2270)
81
+ [`7580bc16a`](https://github.com/graphile/crystal/commit/7580bc16a050fd8d916c6dabe9d1ded980090349)
82
+ Thanks [@benjie](https://github.com/benjie)! - Check that `process` exists
83
+ before reading from it.
84
+
85
+ ## 0.0.1-beta.12
86
+
87
+ ### Patch Changes
88
+
89
+ - [#2240](https://github.com/graphile/crystal/pull/2240)
90
+ [`d13b76f0f`](https://github.com/graphile/crystal/commit/d13b76f0fef2a58466ecb44880af62d25910e83e)
91
+ Thanks [@benjie](https://github.com/benjie)! - Adds
92
+ `MiddlewareHandlers<TActivities>` type to help with adding middleware to
93
+ configs
94
+
95
+ - [#2253](https://github.com/graphile/crystal/pull/2253)
96
+ [`b167bd849`](https://github.com/graphile/crystal/commit/b167bd8499be5866b71bac6594d55bd768fda1d0)
97
+ Thanks [@benjie](https://github.com/benjie)! - 🚨 `{}` is no longer a valid
98
+ `GraphileConfig.ResolvedPreset`; use `resolvePreset({})`
99
+
100
+ Also: adds `resolvePreset(preset)` and deprecates `resolvePresets(presets)`.
101
+
102
+ - [#2250](https://github.com/graphile/crystal/pull/2250)
103
+ [`6a13ecbd4`](https://github.com/graphile/crystal/commit/6a13ecbd45534c39c846c1d8bc58242108426dd1)
104
+ Thanks [@benjie](https://github.com/benjie)! - Add support for 'preset.lib'
105
+ which can be used to store global module references to help avoid the dual
106
+ package hazard.
107
+
108
+ ## 0.0.1-beta.11
109
+
110
+ ### Patch Changes
111
+
112
+ - [#2224](https://github.com/graphile/crystal/pull/2224)
113
+ [`5626c7d36`](https://github.com/graphile/crystal/commit/5626c7d3649285e11fe9857dfa319d2883d027eb)
114
+ Thanks [@benjie](https://github.com/benjie)! - Remove requirement that plugins
115
+ have a version.
116
+
117
+ ## 0.0.1-beta.10
118
+
119
+ ### Patch Changes
120
+
121
+ - [#2188](https://github.com/graphile/crystal/pull/2188)
122
+ [`cc0941731`](https://github.com/graphile/crystal/commit/cc0941731a1679bc04ce7b7fd4254009bb5f1f62)
123
+ Thanks [@benjie](https://github.com/benjie)! - Overhaul the way in which
124
+ `graphile-config` presets work such that including a preset at two different
125
+ layers shouldn't result in unexpected behavior.
126
+
127
+ - [#2155](https://github.com/graphile/crystal/pull/2155)
128
+ [`8b472cd51`](https://github.com/graphile/crystal/commit/8b472cd51cd66d8227f9f2722d09c0a774792b0f)
129
+ Thanks [@benjie](https://github.com/benjie)! - `disablePlugins` now supports
130
+ TypeScript auto-completion of known plugin names. Other names are still
131
+ accepted without error, so this is just a minor DX improvement rather than
132
+ type safety.
133
+
134
+ - [#2160](https://github.com/graphile/crystal/pull/2160)
135
+ [`9cd9bb522`](https://github.com/graphile/crystal/commit/9cd9bb5222a9f0398ee4b8bfa4f741b6de2a2192)
136
+ Thanks [@benjie](https://github.com/benjie)! - Add support for lists of hook
137
+ objects, so that the same hook can be applied multiple times in the same
138
+ plugin but with different priorities.
139
+
3
140
  ## 0.0.1-beta.9
4
141
 
5
142
  ### Patch Changes
@@ -10,7 +147,6 @@
10
147
  accepts `resolvedPreset` and `requestContext` directly; passing these through
11
148
  additional arguments is now deprecated and support will be removed in a future
12
149
  revision. This affects:
13
-
14
150
  - `grafast()`
15
151
  - `execute()`
16
152
  - `subscribe()`
@@ -56,14 +192,12 @@
56
192
  `plugin.grafserv.hooks.*` are still supported but deprecated; instead use
57
193
  middleware `plugin.grafserv.middleware.*` (note that call signatures have
58
194
  changed slightly, similar to the diff above):
59
-
60
195
  - `hooks.init` -> `middleware.setPreset`
61
196
  - `hooks.processGraphQLRequestBody` -> `middleware.processGraphQLRequestBody`
62
197
  - `hooks.ruruHTMLParts` -> `middleware.ruruHTMLParts`
63
198
 
64
199
  A few TypeScript types related to Hooks have been renamed, but their old names
65
200
  are still available, just deprecated. They will be removed in a future update:
66
-
67
201
  - `HookObject` -> `FunctionalityObject`
68
202
  - `PluginHook` -> `CallbackOrDescriptor`
69
203
  - `PluginHookObject` -> `CallbackDescriptor`
package/README.md CHANGED
@@ -125,12 +125,7 @@ And please give some love to our featured sponsors 🤩:
125
125
 
126
126
  <table><tr>
127
127
  <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>
128
- <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>
129
- <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>
130
- <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>
131
- </tr><tr>
132
128
  <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>
133
- <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>
134
129
  </tr></table>
135
130
 
136
131
  <em>\* Sponsors the entire Graphile suite</em>
package/dist/cli.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getTerminalWidth = exports.runCli = void 0;
3
+ exports.runCli = runCli;
4
+ exports.getTerminalWidth = getTerminalWidth;
4
5
  const tslib_1 = require("tslib");
5
6
  const yargs_1 = tslib_1.__importDefault(require("yargs"));
6
7
  const helpers_1 = require("yargs/helpers");
@@ -17,9 +18,7 @@ Thank you for using our software.`)
17
18
  .wrap(yargs_1.default.terminalWidth()).argv;
18
19
  await run(argv);
19
20
  }
20
- exports.runCli = runCli;
21
21
  function getTerminalWidth() {
22
22
  return yargs_1.default.terminalWidth();
23
23
  }
24
- exports.getTerminalWidth = getTerminalWidth;
25
24
  //# 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":";;;;AACA,0DAA0B;AAC1B,2CAAwC;AAejC,KAAK,UAAU,MAAM,CAC1B,OAA+B,EAC/B,GAAyC;IAEzC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAA,eAAK,EAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;SACrD,MAAM,EAAE;SACR,cAAc,CAAC,KAAK,EAAE,sCAAsC,CAAC;SAC7D,QAAQ,CACP;;;;;kCAK4B,CAC7B;SACA,IAAI,CAAC,eAAK,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC;IACpC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAjBD,wBAiBC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,eAAK,CAAC,aAAa,EAAE,CAAC;AAC/B,CAAC;AAFD,4CAEC"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AAiBA,wBAiBC;AAED,4CAEC;;AArCD,0DAA0B;AAC1B,2CAAwC;AAejC,KAAK,UAAU,MAAM,CAC1B,OAA+B,EAC/B,GAAyC;IAEzC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAA,eAAK,EAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;SACrD,MAAM,EAAE;SACR,cAAc,CAAC,KAAK,EAAE,sCAAsC,CAAC;SAC7D,QAAQ,CACP;;;;;kCAK4B,CAC7B;SACA,IAAI,CAAC,eAAK,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC;IACpC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,eAAK,CAAC,aAAa,EAAE,CAAC;AAC/B,CAAC"}
@@ -1,3 +1,3 @@
1
- import type { CallbackOrDescriptor, FunctionalityObject } from "./interfaces.js";
2
- export declare function orderedApply<TFunctionality extends FunctionalityObject<TFunctionality>>(plugins: readonly GraphileConfig.Plugin[] | undefined, functionalityRetriever: (plugin: GraphileConfig.Plugin) => Partial<TFunctionality> | undefined, applyCallback: <TFunctionalityName extends keyof TFunctionality>(functionalityName: TFunctionalityName, hookFn: TFunctionality[TFunctionalityName] extends CallbackOrDescriptor<infer U> ? U : never, plugin: GraphileConfig.Plugin) => void): void;
1
+ import type { CallbackDescriptor, CallbackOrDescriptor, FunctionalityObject } from "./interfaces.js";
2
+ export declare function orderedApply<TFunctionality extends FunctionalityObject<TFunctionality>>(plugins: readonly GraphileConfig.Plugin[] | undefined, functionalityRetriever: (plugin: GraphileConfig.Plugin) => Partial<TFunctionality> | undefined, applyCallback: <TFunctionalityName extends keyof TFunctionality>(functionalityName: TFunctionalityName, hookFn: TFunctionality[TFunctionalityName] extends CallbackOrDescriptor<infer U> ? U : TFunctionality[TFunctionalityName] extends ReadonlyArray<CallbackDescriptor<infer U>> ? U : never, plugin: GraphileConfig.Plugin) => void): void;
3
3
  //# sourceMappingURL=functionality.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"functionality.d.ts","sourceRoot":"","sources":["../src/functionality.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,oBAAoB,EACpB,mBAAmB,EAEpB,MAAM,iBAAiB,CAAC;AAGzB,wBAAgB,YAAY,CAC1B,cAAc,SAAS,mBAAmB,CAAC,cAAc,CAAC,EAE1D,OAAO,EAAE,SAAS,cAAc,CAAC,MAAM,EAAE,GAAG,SAAS,EACrD,sBAAsB,EAAE,CACtB,MAAM,EAAE,cAAc,CAAC,MAAM,KAC1B,OAAO,CAAC,cAAc,CAAC,GAAG,SAAS,EACxC,aAAa,EAAE,CAAC,kBAAkB,SAAS,MAAM,cAAc,EAC7D,iBAAiB,EAAE,kBAAkB,EACrC,MAAM,EAAE,cAAc,CAAC,kBAAkB,CAAC,SAAS,oBAAoB,CACrE,MAAM,CAAC,CACR,GACG,CAAC,GACD,KAAK,EACT,MAAM,EAAE,cAAc,CAAC,MAAM,KAC1B,IAAI,GACR,IAAI,CAkFN"}
1
+ {"version":3,"file":"functionality.d.ts","sourceRoot":"","sources":["../src/functionality.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EAEpB,MAAM,iBAAiB,CAAC;AAkBzB,wBAAgB,YAAY,CAC1B,cAAc,SAAS,mBAAmB,CAAC,cAAc,CAAC,EAE1D,OAAO,EAAE,SAAS,cAAc,CAAC,MAAM,EAAE,GAAG,SAAS,EACrD,sBAAsB,EAAE,CACtB,MAAM,EAAE,cAAc,CAAC,MAAM,KAC1B,OAAO,CAAC,cAAc,CAAC,GAAG,SAAS,EACxC,aAAa,EAAE,CAAC,kBAAkB,SAAS,MAAM,cAAc,EAC7D,iBAAiB,EAAE,kBAAkB,EACrC,MAAM,EAAE,cAAc,CAAC,kBAAkB,CAAC,SAAS,oBAAoB,CACrE,MAAM,CAAC,CACR,GACG,CAAC,GACD,cAAc,CAAC,kBAAkB,CAAC,SAAS,aAAa,CACpD,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAC5B,GACD,CAAC,GACD,KAAK,EACX,MAAM,EAAE,cAAc,CAAC,MAAM,KAC1B,IAAI,GACR,IAAI,CAgFN"}
@@ -1,9 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.orderedApply = void 0;
3
+ exports.orderedApply = orderedApply;
4
4
  const sort_js_1 = require("./sort.js");
5
+ // TypeScript nonsense
6
+ const isCallbackDescriptor = (v) => typeof v !== "function";
7
+ const isCallback = (v) => typeof v === "function";
8
+ function isArray(arg) {
9
+ return Array.isArray(arg);
10
+ }
5
11
  function orderedApply(plugins, functionalityRetriever, applyCallback) {
6
- // Normalize all the hooks and gather them into collections
12
+ // Normalize all the plugin "functionalities" and gather them into collections
7
13
  const allFunctionalities = Object.create(null);
8
14
  let uid = 0;
9
15
  if (plugins) {
@@ -14,30 +20,30 @@ function orderedApply(plugins, functionalityRetriever, applyCallback) {
14
20
  }
15
21
  const keys = Object.keys(hooks);
16
22
  for (const key of keys) {
17
- const hookSpecRaw = hooks[key];
18
- if (!hookSpecRaw) {
23
+ const value = hooks[key];
24
+ if (!value) {
19
25
  continue;
20
26
  }
21
- // TypeScript nonsense
22
- const isCallbackDescriptor = (v) => typeof v !== "function";
23
- const isCallback = (v) => typeof v === "function";
24
- const callback = (isCallback(hookSpecRaw) ? hookSpecRaw : hookSpecRaw.callback);
25
- const { provides, before, after } = isCallbackDescriptor(hookSpecRaw)
26
- ? hookSpecRaw
27
- : {};
28
- if (!allFunctionalities[key]) {
29
- allFunctionalities[key] = [];
27
+ const hookList = isArray(value) ? value : [value];
28
+ for (const hookSpecRaw of hookList) {
29
+ const callback = (isCallback(hookSpecRaw) ? hookSpecRaw : hookSpecRaw.callback);
30
+ const { provides, before, after } = isCallbackDescriptor(hookSpecRaw)
31
+ ? hookSpecRaw
32
+ : {};
33
+ if (!allFunctionalities[key]) {
34
+ allFunctionalities[key] = [];
35
+ }
36
+ // We need to give each functionality a unique ID
37
+ const id = String(uid++);
38
+ allFunctionalities[key].push({
39
+ id,
40
+ plugin,
41
+ callback,
42
+ provides: [...(provides || []), id, plugin.name],
43
+ before: before || [],
44
+ after: after || [],
45
+ });
30
46
  }
31
- // We need to give each functionality a unique ID
32
- const id = String(uid++);
33
- allFunctionalities[key].push({
34
- id,
35
- plugin,
36
- callback,
37
- provides: [...(provides || []), id, plugin.name],
38
- before: before || [],
39
- after: after || [],
40
- });
41
47
  }
42
48
  }
43
49
  }
@@ -54,5 +60,4 @@ function orderedApply(plugins, functionalityRetriever, applyCallback) {
54
60
  }
55
61
  }
56
62
  }
57
- exports.orderedApply = orderedApply;
58
63
  //# sourceMappingURL=functionality.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"functionality.js","sourceRoot":"","sources":["../src/functionality.ts"],"names":[],"mappings":";;;AAOA,uCAAwD;AAExD,SAAgB,YAAY,CAG1B,OAAqD,EACrD,sBAEwC,EACxC,aAQS;IAUT,2DAA2D;IAC3D,MAAM,kBAAkB,GAEpB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxB,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,OAAO,EAAE;QACX,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,KAAK,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK,EAAE;gBACV,SAAS;aACV;YACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAyC,CAAC;YACxE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACtB,MAAM,WAAW,GAA2C,KAAK,CAAC,GAAG,CAAC,CAAC;gBACvE,IAAI,CAAC,WAAW,EAAE;oBAChB,SAAS;iBACV;gBAED,sBAAsB;gBACtB,MAAM,oBAAoB,GAAG,CAC3B,CAA0B,EACE,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC;gBACzD,MAAM,UAAU,GAAG,CACjB,CAA0B,EAClB,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC;gBAErC,MAAM,QAAQ,GAIF,CACV,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CACtD,CAAC;gBACT,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,WAAW,CAAC;oBACnE,CAAC,CAAC,WAAW;oBACb,CAAC,CAAE,EAA8D,CAAC;gBACpE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE;oBAC5B,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;iBAC9B;gBACD,iDAAiD;gBACjD,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACzB,kBAAkB,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC;oBAC5B,EAAE;oBACF,MAAM;oBACN,QAAQ;oBACR,QAAQ,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC;oBAChD,MAAM,EAAE,MAAM,IAAI,EAAE;oBACpB,KAAK,EAAE,KAAK,IAAI,EAAE;iBACnB,CAAC,CAAC;aACJ;SACF;KACF;IAED,gEAAgE;IAChE,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE;QAClD,MAAM,eAAe,GAAG,kBAAkB,CAAC,iBAAiB,CAE/C,CAAC;QACd,IAAI,CAAC,eAAe,EAAE;YACpB,SAAS;SACV;QAED,MAAM,KAAK,GAAG,IAAA,qCAA2B,EAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAEjE,8CAA8C;QAC9C,KAAK,MAAM,aAAa,IAAI,KAAK,EAAE;YACjC,aAAa,CACX,iBAAiB,EACjB,aAAa,CAAC,QAAQ,EACtB,aAAa,CAAC,MAAM,CACrB,CAAC;SACH;KACF;AACH,CAAC;AAlGD,oCAkGC"}
1
+ {"version":3,"file":"functionality.js","sourceRoot":"","sources":["../src/functionality.ts"],"names":[],"mappings":";;AAwBA,oCAoGC;AArHD,uCAAwD;AAExD,sBAAsB;AACtB,MAAM,oBAAoB,GAAG,CAC3B,CAA0B,EACE,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC;AACzD,MAAM,UAAU,GAAG,CACjB,CAA0B,EAClB,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC;AACrC,SAAS,OAAO,CACd,GAE8C;IAE9C,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,YAAY,CAG1B,OAAqD,EACrD,sBAEwC,EACxC,aAYS;IAUT,8EAA8E;IAC9E,MAAM,kBAAkB,GAEpB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACxB,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,SAAS;YACX,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAyC,CAAC;YACxE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,KAAK,GAGK,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,SAAS;gBACX,CAAC;gBAED,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAClD,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE,CAAC;oBACnC,MAAM,QAAQ,GAIF,CACV,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CACtD,CAAC;oBACT,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,WAAW,CAAC;wBACnE,CAAC,CAAC,WAAW;wBACb,CAAC,CAAE,EAA8D,CAAC;oBACpE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC7B,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;oBAC/B,CAAC;oBACD,iDAAiD;oBACjD,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;oBACzB,kBAAkB,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC;wBAC5B,EAAE;wBACF,MAAM;wBACN,QAAQ;wBACR,QAAQ,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC;wBAChD,MAAM,EAAE,MAAM,IAAI,EAAE;wBACpB,KAAK,EAAE,KAAK,IAAI,EAAE;qBACnB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,gEAAgE;IAChE,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;QACnD,MAAM,eAAe,GAAG,kBAAkB,CAAC,iBAAiB,CAE/C,CAAC;QACd,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,SAAS;QACX,CAAC;QAED,MAAM,KAAK,GAAG,IAAA,qCAA2B,EAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAEjE,8CAA8C;QAC9C,KAAK,MAAM,aAAa,IAAI,KAAK,EAAE,CAAC;YAClC,aAAa,CACX,iBAAiB,EACjB,aAAa,CAAC,QAAQ,EACtB,aAAa,CAAC,MAAM,CACrB,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
package/dist/hooks.d.ts CHANGED
@@ -18,7 +18,7 @@ export declare const applyHooks: typeof orderedApply;
18
18
  /** @deprecated Use CallbackDescriptor */
19
19
  export type PluginHookObject<T extends (...args: any[]) => any> = CallbackDescriptor<T>;
20
20
  /** @deprecated Use CallbackOrDescriptor */
21
- export type PluginHook<T extends (...args: any[]) => PromiseOrDirect<UnwrapCallback<any> | void>> = CallbackOrDescriptor<T>;
21
+ export type PluginHook<T extends (...args: any[]) => PromiseOrDirect<UnwrapCallback<any> | void>> = CallbackOrDescriptor<T> | readonly CallbackDescriptor<T>[];
22
22
  /** @deprecated Use UnwrapCallback */
23
23
  export type PluginHookCallback<T extends CallbackOrDescriptor<(...args: any[]) => any>> = UnwrapCallback<T>;
24
24
  //# sourceMappingURL=hooks.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAIzB,qBAAa,UAAU,CAAC,MAAM,SAAS,mBAAmB,CAAC,MAAM,CAAC;IAChE,SAAS,EAAE;SACR,GAAG,IAAI,MAAM,MAAM,CAAC,CAAC,EAAE,KAAK,CAC3B,MAAM,CAAC,MAAM,MAAM,CAAC,SAAS,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CACvE;KACF,CAAuB;IAExB,IAAI,CAAC,SAAS,SAAS,MAAM,MAAM,EACjC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,SAAS,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,GACtE,IAAI;IAKP;;;OAGG;IACH,OAAO,CAAC,SAAS,SAAS,MAAM,MAAM,EACpC,QAAQ,EAAE,SAAS,EACnB,GAAG,IAAI,EAAE,UAAU,CACjB,MAAM,CAAC,SAAS,CAAC,SAAS,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CACpE,GACA,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BxB;AAID,0CAA0C;AAC1C,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,CAAC;AACnD,qCAAqC;AACrC,eAAO,MAAM,UAAU,qBAAe,CAAC;AACvC,yCAAyC;AACzC,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,IAC5D,kBAAkB,CAAC,CAAC,CAAC,CAAC;AACxB,2CAA2C;AAC3C,MAAM,MAAM,UAAU,CACpB,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,eAAe,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IACvE,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAC5B,qCAAqC;AACrC,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,oBAAoB,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,IACrD,cAAc,CAAC,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAKzB,qBAAa,UAAU,CAAC,MAAM,SAAS,mBAAmB,CAAC,MAAM,CAAC;IAChE,SAAS,EAAE;SACR,GAAG,IAAI,MAAM,MAAM,CAAC,CAAC,EAAE,KAAK,CAC3B,MAAM,CAAC,MAAM,MAAM,CAAC,SAAS,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CACvE;KACF,CAAuB;IAExB,IAAI,CAAC,SAAS,SAAS,MAAM,MAAM,EACjC,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,SAAS,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,GACtE,IAAI;IAKP;;;OAGG;IACH,OAAO,CAAC,SAAS,SAAS,MAAM,MAAM,EACpC,QAAQ,EAAE,SAAS,EACnB,GAAG,IAAI,EAAE,UAAU,CACjB,MAAM,CAAC,SAAS,CAAC,SAAS,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CACpE,GACA,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BxB;AAID,0CAA0C;AAC1C,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,CAAC;AACnD,qCAAqC;AACrC,eAAO,MAAM,UAAU,qBAAe,CAAC;AACvC,yCAAyC;AACzC,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,IAC5D,kBAAkB,CAAC,CAAC,CAAC,CAAC;AACxB,2CAA2C;AAC3C,MAAM,MAAM,UAAU,CACpB,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,eAAe,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IACvE,oBAAoB,CAAC,CAAC,CAAC,GAAG,SAAS,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/D,qCAAqC;AACrC,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,oBAAoB,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,IACrD,cAAc,CAAC,CAAC,CAAC,CAAC"}
package/dist/hooks.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.applyHooks = exports.AsyncHooks = void 0;
4
4
  const functionality_js_1 = require("./functionality.js");
5
- const isDev = process.env.GRAPHILE_ENV === "development";
5
+ const isDev = typeof process !== "undefined" && process.env.GRAPHILE_ENV === "development";
6
6
  class AsyncHooks {
7
7
  constructor() {
8
8
  this.callbacks = Object.create(null);
package/dist/hooks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":";;;AAAA,yDAAkD;AASlD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,aAAa,CAAC;AAEzD,MAAa,UAAU;IAAvB;QACE,cAAS,GAIL,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IA8C1B,CAAC;IA5CC,IAAI,CACF,KAAgB,EAChB,EAAuE;QAEvE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAED;;;OAGG;IACH,OAAO,CACL,QAAmB,EACnB,GAAG,IAEF;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO;SACR;QACD,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;QAC3B,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;aACtD;iBAAM;gBACL,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC1C,IAAI,MAAM,IAAI,IAAI,EAAE;oBAClB,IAAI,KAAK,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE;wBAC9C,MAAM,IAAI,KAAK,CACb,SACE,QACF,oCAAoC,OAAO,MAAM,kDAAkD,CACpG,CAAC;qBACH;oBACD,KAAK,GAAG,MAAM,CAAC;iBAChB;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAnDD,gCAmDC;AAMD,qCAAqC;AACxB,QAAA,UAAU,GAAG,+BAAY,CAAC"}
1
+ {"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":";;;AAAA,yDAAkD;AASlD,MAAM,KAAK,GACT,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,aAAa,CAAC;AAE/E,MAAa,UAAU;IAAvB;QACE,cAAS,GAIL,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IA8C1B,CAAC;IA5CC,IAAI,CACF,KAAgB,EAChB,EAAuE;QAEvE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAED;;;OAGG;IACH,OAAO,CACL,QAAmB,EACnB,GAAG,IAEF;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QACD,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;QAC3B,IAAI,KAAK,GAAG,SAAS,CAAC;QACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC1C,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACnB,IAAI,KAAK,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBAC/C,MAAM,IAAI,KAAK,CACb,SACE,QACF,oCAAoC,OAAO,MAAM,kDAAkD,CACpG,CAAC;oBACJ,CAAC;oBACD,KAAK,GAAG,MAAM,CAAC;gBACjB,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAnDD,gCAmDC;AAMD,qCAAqC;AACxB,QAAA,UAAU,GAAG,+BAAY,CAAC"}
package/dist/index.d.ts CHANGED
@@ -3,20 +3,37 @@ export { GraphileConfig };
3
3
  export { orderedApply } from "./functionality.js";
4
4
  export { applyHooks, AsyncHooks, HookObject, PluginHook, PluginHookObject, } from "./hooks.js";
5
5
  export type { CallbackDescriptor, CallbackOrDescriptor, FunctionalityObject, } from "./interfaces.js";
6
- export type { MiddlewareNext } from "./middleware.js";
6
+ export type { MiddlewareHandlers, MiddlewareNext } from "./middleware.js";
7
7
  export { Middleware } from "./middleware.js";
8
- export { isResolvedPreset, resolvePresets } from "./resolvePresets.js";
8
+ export { isResolvedPreset, resolvePreset, resolvePresets, } from "./resolvePresets.js";
9
9
  export declare function sortedPlugins(plugins: GraphileConfig.Plugin[] | undefined): GraphileConfig.Plugin[];
10
10
  declare global {
11
11
  namespace GraphileConfig {
12
+ interface Lib {
13
+ versions: Record<string, string | undefined>;
14
+ }
15
+ /**
16
+ * Expand this through declaration merging to get TypeScript
17
+ * auto-completion of plugin names in the relevant places.
18
+ */
19
+ interface Plugins {
20
+ [key: string & {}]: true;
21
+ }
22
+ /**
23
+ * Expand this through declaration merging to get TypeScript
24
+ * auto-completion of things that plugins can provide.
25
+ */
26
+ interface Provides {
27
+ [key: string & {}]: true;
28
+ }
12
29
  interface Plugin {
13
- name: string;
14
- version: string;
30
+ name: keyof GraphileConfig.Plugins;
31
+ version?: string;
15
32
  experimental?: boolean;
16
33
  description?: string;
17
- provides?: string[];
18
- after?: string[];
19
- before?: string[];
34
+ provides?: (keyof GraphileConfig.Plugins | keyof GraphileConfig.Provides)[];
35
+ after?: (keyof GraphileConfig.Plugins | keyof GraphileConfig.Provides)[];
36
+ before?: (keyof GraphileConfig.Plugins | keyof GraphileConfig.Provides)[];
20
37
  }
21
38
  /**
22
39
  * A Graphile Config Preset that can be combined with other presets to
@@ -26,15 +43,22 @@ declare global {
26
43
  interface Preset {
27
44
  extends?: ReadonlyArray<Preset>;
28
45
  plugins?: Plugin[];
29
- disablePlugins?: ReadonlyArray<string>;
46
+ disablePlugins?: ReadonlyArray<keyof GraphileConfig.Plugins>;
47
+ lib?: Partial<GraphileConfig.Lib>;
30
48
  appendPlugins?: never;
31
49
  prependPlugins?: never;
32
50
  skipPlugins?: never;
33
51
  }
52
+ /**
53
+ * The result of `resolvePreset(preset)` on a preset - compatible with
54
+ * `Preset` but guaranteed to not extend from other presets (and a few
55
+ * other assertions).
56
+ */
34
57
  interface ResolvedPreset extends Preset {
35
- extends?: ReadonlyArray<never>;
36
- plugins?: Plugin[];
37
- disablePlugins?: ReadonlyArray<string>;
58
+ extends?: never;
59
+ plugins: Plugin[];
60
+ disablePlugins: ReadonlyArray<keyof GraphileConfig.Plugins>;
61
+ lib: GraphileConfig.Lib;
38
62
  }
39
63
  }
40
64
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAIzB,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,UAAU,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,gBAAgB,GACjB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,CAAC,MAAM,EAAE,GAAG,SAAS,GAC3C,cAAc,CAAC,MAAM,EAAE,CAMzB;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,cAAc,CAAC;QACvB,UAAU,MAAM;YACd,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,CAAC;YAChB,YAAY,CAAC,EAAE,OAAO,CAAC;YACvB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;YACpB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;YACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;SACnB;QAED;;;;WAIG;QACH,UAAU,MAAM;YACd,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;YACnB,cAAc,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;YACvC,aAAa,CAAC,EAAE,KAAK,CAAC;YACtB,cAAc,CAAC,EAAE,KAAK,CAAC;YACvB,WAAW,CAAC,EAAE,KAAK,CAAC;SAGrB;QAED,UAAU,cAAe,SAAQ,MAAM;YAErC,OAAO,CAAC,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;YAC/B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;YACnB,cAAc,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;SACxC;KACF;CACF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAIzB,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,UAAU,EACV,UAAU,EACV,UAAU,EACV,UAAU,EACV,gBAAgB,GACjB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,cAAc,GACf,MAAM,qBAAqB,CAAC;AAE7B,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,CAAC,MAAM,EAAE,GAAG,SAAS,GAC3C,cAAc,CAAC,MAAM,EAAE,CAMzB;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,cAAc,CAAC;QACvB,UAAU,GAAG;YACX,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;SAE9C;QAED;;;WAGG;QACH,UAAU,OAAO;YAEf,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC;SAC1B;QAED;;;WAGG;QACH,UAAU,QAAQ;YAEhB,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC;SAC1B;QAED,UAAU,MAAM;YACd,IAAI,EAAE,MAAM,cAAc,CAAC,OAAO,CAAC;YACnC,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,YAAY,CAAC,EAAE,OAAO,CAAC;YACvB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,QAAQ,CAAC,EAAE,CACP,MAAM,cAAc,CAAC,OAAO,GAC5B,MAAM,cAAc,CAAC,QAAQ,CAChC,EAAE,CAAC;YACJ,KAAK,CAAC,EAAE,CAAC,MAAM,cAAc,CAAC,OAAO,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzE,MAAM,CAAC,EAAE,CAAC,MAAM,cAAc,CAAC,OAAO,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;SAC3E;QAED;;;;WAIG;QACH,UAAU,MAAM;YACd,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;YACnB,cAAc,CAAC,EAAE,aAAa,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;YAC7D,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAIlC,aAAa,CAAC,EAAE,KAAK,CAAC;YACtB,cAAc,CAAC,EAAE,KAAK,CAAC;YACvB,WAAW,CAAC,EAAE,KAAK,CAAC;SAGrB;QAED;;;;WAIG;QACH,UAAU,cAAe,SAAQ,MAAM;YAGrC,OAAO,CAAC,EAAE,KAAK,CAAC;YAChB,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,cAAc,EAAE,aAAa,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;YAC5D,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC;SACzB;KACF;CACF"}
package/dist/index.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.sortedPlugins = exports.resolvePresets = exports.isResolvedPreset = exports.Middleware = exports.AsyncHooks = exports.applyHooks = exports.orderedApply = void 0;
3
+ exports.resolvePresets = exports.resolvePreset = exports.isResolvedPreset = exports.Middleware = exports.AsyncHooks = exports.applyHooks = exports.orderedApply = void 0;
4
+ exports.sortedPlugins = sortedPlugins;
4
5
  require("./interfaces.js");
5
6
  const sort_js_1 = require("./sort.js");
6
7
  var functionality_js_1 = require("./functionality.js");
@@ -12,6 +13,7 @@ var middleware_js_1 = require("./middleware.js");
12
13
  Object.defineProperty(exports, "Middleware", { enumerable: true, get: function () { return middleware_js_1.Middleware; } });
13
14
  var resolvePresets_js_1 = require("./resolvePresets.js");
14
15
  Object.defineProperty(exports, "isResolvedPreset", { enumerable: true, get: function () { return resolvePresets_js_1.isResolvedPreset; } });
16
+ Object.defineProperty(exports, "resolvePreset", { enumerable: true, get: function () { return resolvePresets_js_1.resolvePreset; } });
15
17
  Object.defineProperty(exports, "resolvePresets", { enumerable: true, get: function () { return resolvePresets_js_1.resolvePresets; } });
16
18
  function sortedPlugins(plugins) {
17
19
  if (plugins) {
@@ -21,5 +23,4 @@ function sortedPlugins(plugins) {
21
23
  return [];
22
24
  }
23
25
  }
24
- exports.sortedPlugins = sortedPlugins;
25
26
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,2BAAyB;AAEzB,uCAAwD;AAIxD,uDAAkD;AAAzC,gHAAA,YAAY,OAAA;AACrB,uCAMoB;AALlB,sGAAA,UAAU,OAAA;AACV,sGAAA,UAAU,OAAA;AAWZ,iDAA6C;AAApC,2GAAA,UAAU,OAAA;AACnB,yDAAuE;AAA9D,qHAAA,gBAAgB,OAAA;AAAE,mHAAA,cAAc,OAAA;AAEzC,SAAgB,aAAa,CAC3B,OAA4C;IAE5C,IAAI,OAAO,EAAE;QACX,OAAO,IAAA,qCAA2B,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KACrD;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,sCAQC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AA2BA,sCAQC;AAnCD,2BAAyB;AAEzB,uCAAwD;AAIxD,uDAAkD;AAAzC,gHAAA,YAAY,OAAA;AACrB,uCAMoB;AALlB,sGAAA,UAAU,OAAA;AACV,sGAAA,UAAU,OAAA;AAWZ,iDAA6C;AAApC,2GAAA,UAAU,OAAA;AACnB,yDAI6B;AAH3B,qHAAA,gBAAgB,OAAA;AAChB,kHAAA,aAAa,OAAA;AACb,mHAAA,cAAc,OAAA;AAGhB,SAAgB,aAAa,CAC3B,OAA4C;IAE5C,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,IAAA,qCAA2B,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
@@ -1,12 +1,12 @@
1
1
  export type AnyCallback = (...args: any[]) => any;
2
2
  export type CallbackDescriptor<T extends AnyCallback> = {
3
- provides?: string[];
4
- before?: string[];
5
- after?: string[];
3
+ provides?: (keyof GraphileConfig.Plugins | keyof GraphileConfig.Provides)[];
4
+ before?: (keyof GraphileConfig.Plugins | keyof GraphileConfig.Provides)[];
5
+ after?: (keyof GraphileConfig.Plugins | keyof GraphileConfig.Provides)[];
6
6
  callback: T;
7
7
  };
8
8
  export type PromiseOrDirect<T> = T | PromiseLike<T>;
9
9
  export type CallbackOrDescriptor<T extends AnyCallback> = T | CallbackDescriptor<T>;
10
- export type UnwrapCallback<T extends CallbackOrDescriptor<AnyCallback>> = T extends CallbackOrDescriptor<infer U> ? U : never;
11
- export type FunctionalityObject<T> = Record<keyof T, CallbackOrDescriptor<AnyCallback>>;
10
+ export type UnwrapCallback<T extends CallbackOrDescriptor<AnyCallback> | ReadonlyArray<CallbackDescriptor<AnyCallback>>> = T extends CallbackOrDescriptor<infer U> ? U : T extends ReadonlyArray<CallbackDescriptor<infer U>> ? U : never;
11
+ export type FunctionalityObject<T> = Record<keyof T, CallbackOrDescriptor<AnyCallback> | ReadonlyArray<CallbackDescriptor<AnyCallback>>>;
12
12
  //# sourceMappingURL=interfaces.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AAElD,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,WAAW,IAAI;IACtD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,CAAC,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;AAEpD,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,WAAW,IAClD,CAAC,GACD,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAE1B,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,oBAAoB,CAAC,WAAW,CAAC,IACpE,CAAC,SAAS,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEtD,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,MAAM,CACzC,MAAM,CAAC,EACP,oBAAoB,CAAC,WAAW,CAAC,CAClC,CAAC"}
1
+ {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AAElD,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,WAAW,IAAI;IACtD,QAAQ,CAAC,EAAE,CAAC,MAAM,cAAc,CAAC,OAAO,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC5E,MAAM,CAAC,EAAE,CAAC,MAAM,cAAc,CAAC,OAAO,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1E,KAAK,CAAC,EAAE,CAAC,MAAM,cAAc,CAAC,OAAO,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;IACzE,QAAQ,EAAE,CAAC,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;AAEpD,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,WAAW,IAClD,CAAC,GACD,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAE1B,MAAM,MAAM,cAAc,CACxB,CAAC,SACG,oBAAoB,CAAC,WAAW,CAAC,GACjC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,IAElD,CAAC,SAAS,oBAAoB,CAAC,MAAM,CAAC,CAAC,GACnC,CAAC,GACD,CAAC,SAAS,aAAa,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,GAClD,CAAC,GACD,KAAK,CAAC;AAEd,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,MAAM,CACzC,MAAM,CAAC,EACL,oBAAoB,CAAC,WAAW,CAAC,GACjC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CACjD,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"loadConfig.d.ts","sourceRoot":"","sources":["../src/loadConfig.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AA6DzB,wBAAsB,UAAU,CAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,CA2CvC"}
1
+ {"version":3,"file":"loadConfig.d.ts","sourceRoot":"","sources":["../src/loadConfig.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,CAAC;AAiHzB,wBAAsB,UAAU,CAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GACzB,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,CAwDvC"}
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.loadConfig = void 0;
3
+ exports.loadConfig = loadConfig;
4
+ /* eslint-disable @typescript-eslint/no-require-imports */
4
5
  require("./interfaces.js");
5
6
  const promises_1 = require("node:fs/promises");
6
7
  const node_path_1 = require("node:path");
@@ -59,22 +60,85 @@ function fixESMShenanigans(requiredModule) {
59
60
  }
60
61
  return requiredModule;
61
62
  }
63
+ function isESMError(e) {
64
+ return (typeof e === "object" &&
65
+ e != null &&
66
+ "code" in e &&
67
+ (e.code === "ERR_REQUIRE_ESM" || e.code === "ERR_REQUIRE_ASYNC_MODULE"));
68
+ }
69
+ async function loadDefaultExport(resolvedPath, extension) {
70
+ // Attempt to import using native TypeScript support if appropriate
71
+ let originalError;
72
+ if (process.features.typescript && /\.[cm]?tsx?$/.test(extension)) {
73
+ try {
74
+ // Node has `require(esm)` support, but also for a `.cjsx` file it should
75
+ // still use `require()`
76
+ return fixESMShenanigans(require(resolvedPath));
77
+ }
78
+ catch (e) {
79
+ originalError = e;
80
+ if (isESMError(e)) {
81
+ // This is the most likely result, since TypeScript uses ESM syntax.
82
+ try {
83
+ return (await import((0, node_url_1.pathToFileURL)(resolvedPath).href)).default;
84
+ }
85
+ catch {
86
+ // Nevermind; try a loader
87
+ }
88
+ }
89
+ // Nevermind; try a loader
90
+ }
91
+ }
92
+ // No luck? Let's try loading the loaders
93
+ try {
94
+ registerLoader(interpret_1.jsVariants[extension]);
95
+ }
96
+ catch (e) {
97
+ console.error(`No loader could be loaded for ${extension} files: ${e}`);
98
+ throw originalError;
99
+ }
100
+ // And now lets attempt to import
101
+ try {
102
+ return fixESMShenanigans(require(resolvedPath));
103
+ }
104
+ catch (e) {
105
+ if (isESMError(e)) {
106
+ // It's an ESModule, so `require()` won't work. Let's use `import()`!
107
+ return (await import((0, node_url_1.pathToFileURL)(resolvedPath).href)).default;
108
+ }
109
+ else {
110
+ throw e;
111
+ }
112
+ }
113
+ }
62
114
  async function loadConfig(configPath) {
63
115
  if (configPath != null) {
64
116
  // Explicitly load the file the user has indicated
65
117
  const resolvedPath = (0, node_path_1.resolve)(process.cwd(), configPath);
66
- // First try one of the supported loaders
118
+ /**
119
+ * When attempting to load multiple matching extensions, if all fail we
120
+ * want to throw the first non-ESM error raised - it might well be an
121
+ * application error.
122
+ */
123
+ let firstError;
124
+ // First try one of the supported loaders.
67
125
  for (const extension of extensions) {
68
126
  if (resolvedPath.endsWith(extension)) {
69
- registerLoader(interpret_1.jsVariants[extension]);
70
127
  try {
71
- return fixESMShenanigans(require(resolvedPath));
128
+ return await loadDefaultExport(resolvedPath, extension);
72
129
  }
73
- catch {
74
- /* continue to the next one */
130
+ catch (e) {
131
+ if (!isESMError(e)) {
132
+ firstError = e;
133
+ }
134
+ // Multiple extensions might match - e.g. both `.swc.tsx` and `.tsx`;
135
+ // continue to the next one.
75
136
  }
76
137
  }
77
138
  }
139
+ if (firstError) {
140
+ throw firstError;
141
+ }
78
142
  // Fallback to direct import
79
143
  return (await import((0, node_url_1.pathToFileURL)(resolvedPath).href)).default;
80
144
  }
@@ -84,12 +148,13 @@ async function loadConfig(configPath) {
84
148
  for (const extension of extensions) {
85
149
  const resolvedPath = basePath + extension;
86
150
  if (await exists(resolvedPath)) {
87
- registerLoader(interpret_1.jsVariants[extension]);
151
+ // This file exists; whatever happens, we will try this file only.
88
152
  try {
89
- return fixESMShenanigans(require(resolvedPath));
153
+ return await loadDefaultExport(resolvedPath, extension);
90
154
  }
91
155
  catch (e) {
92
- if (e.code === "ERR_REQUIRE_ESM") {
156
+ if (isESMError(e)) {
157
+ // Fallback to direct import
93
158
  return (await import((0, node_url_1.pathToFileURL)(resolvedPath).href)).default;
94
159
  }
95
160
  else {
@@ -102,5 +167,4 @@ async function loadConfig(configPath) {
102
167
  // No config found
103
168
  return null;
104
169
  }
105
- exports.loadConfig = loadConfig;
106
170
  //# sourceMappingURL=loadConfig.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"loadConfig.js","sourceRoot":"","sources":["../src/loadConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loadConfig.js","sourceRoot":"","sources":["../src/loadConfig.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import type { CallbackOrDescriptor, FunctionalityObject } from "./interfaces.js";
2
- export interface MiddlewareNext<TRawResult, TAwaitedResult = Awaited<TRawResult>> {
2
+ export interface MiddlewareNext<TRawResult> {
3
3
  (): TRawResult;
4
- callback(callback: (error: object | null, result: TAwaitedResult) => TRawResult): TRawResult;
4
+ callback(callback: (error: object | null, result: Awaited<TRawResult>) => TRawResult | Awaited<TRawResult>): TRawResult;
5
5
  }
6
6
  type ActivityFn<TActivities extends FunctionalityObject<TActivities>, TActivityName extends keyof TActivities> = TActivities[TActivityName] extends CallbackOrDescriptor<infer UFn> ? UFn : never;
7
7
  type ActivityParameter<TActivities extends FunctionalityObject<TActivities>, TActivityName extends keyof TActivities> = TActivities[TActivityName] extends CallbackOrDescriptor<(arg: infer UArg) => any> ? UArg : never;
@@ -10,9 +10,12 @@ export declare class Middleware<TActivities extends FunctionalityObject<TActivit
10
10
  middleware: {
11
11
  [key in keyof TActivities]?: Array<RealActivityFn<TActivities, key>>;
12
12
  };
13
- register<TActivityName extends keyof TActivities>(event: TActivityName, fn: RealActivityFn<TActivities, TActivityName>): void;
13
+ register<TActivityName extends keyof TActivities>(activityName: TActivityName, fn: RealActivityFn<TActivities, TActivityName>): void;
14
14
  run<TActivityName extends keyof TActivities>(activityName: TActivityName, arg: ActivityParameter<TActivities, TActivityName>, activity: (arg: ActivityParameter<TActivities, TActivityName>) => ReturnType<ActivityFn<TActivities, TActivityName>>): ReturnType<ActivityFn<TActivities, TActivityName>>;
15
15
  runSync<TActivityName extends keyof TActivities>(activityName: TActivityName, arg: ActivityParameter<TActivities, TActivityName>, activity: (arg: ActivityParameter<TActivities, TActivityName>) => ReturnType<ActivityFn<TActivities, TActivityName>>): ReturnType<ActivityFn<TActivities, TActivityName>>;
16
16
  }
17
+ export type MiddlewareHandlers<TActivities extends FunctionalityObject<TActivities>> = {
18
+ [key in keyof TActivities]?: CallbackOrDescriptor<TActivities[key] extends (...args: infer UArgs) => infer UResult ? (next: MiddlewareNext<UResult>, ...args: UArgs) => UResult : never>;
19
+ };
17
20
  export {};
18
21
  //# sourceMappingURL=middleware.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EAEpB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,WAAW,cAAc,CAC7B,UAAU,EACV,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;IAEpC,IAAI,UAAU,CAAC;IACf,QAAQ,CACN,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,cAAc,KAAK,UAAU,GACrE,UAAU,CAAC;CACf;AAED,KAAK,UAAU,CACb,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC,EACpD,aAAa,SAAS,MAAM,WAAW,IACrC,WAAW,CAAC,aAAa,CAAC,SAAS,oBAAoB,CAAC,MAAM,GAAG,CAAC,GAClE,GAAG,GACH,KAAK,CAAC;AACV,KAAK,iBAAiB,CACpB,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC,EACpD,aAAa,SAAS,MAAM,WAAW,IACrC,WAAW,CAAC,aAAa,CAAC,SAAS,oBAAoB,CACzD,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK,GAAG,CACzB,GACG,IAAI,GACJ,KAAK,CAAC;AAEV,KAAK,cAAc,CACjB,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC,EACpD,aAAa,SAAS,MAAM,WAAW,IACrC,WAAW,CAAC,aAAa,CAAC,SAAS,oBAAoB,CACzD,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK,MAAM,OAAO,CACnC,GACG,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,KAAK,OAAO,GACrD,KAAK,CAAC;AAEV,qBAAa,UAAU,CAAC,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC;IAC1E,UAAU,EAAE;SACT,GAAG,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;KACrE,CAAuB;IAExB,QAAQ,CAAC,aAAa,SAAS,MAAM,WAAW,EAC9C,KAAK,EAAE,aAAa,EACpB,EAAE,EAAE,cAAc,CAAC,WAAW,EAAE,aAAa,CAAC,GAC7C,IAAI;IASP,GAAG,CAAC,aAAa,SAAS,MAAM,WAAW,EACzC,YAAY,EAAE,aAAa,EAC3B,GAAG,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,EAClD,QAAQ,EAAE,CACR,GAAG,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,KAC/C,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,GACtD,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAgBrD,OAAO,CAAC,aAAa,SAAS,MAAM,WAAW,EAC7C,YAAY,EAAE,aAAa,EAC3B,GAAG,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,EAClD,QAAQ,EAAE,CACR,GAAG,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,KAC/C,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,GACtD,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;CAgBtD"}
1
+ {"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EAEpB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,WAAW,cAAc,CAAC,UAAU;IACxC,IAAI,UAAU,CAAC;IACf,QAAQ,CACN,QAAQ,EAAE,CACR,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,KACxB,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,GACpC,UAAU,CAAC;CACf;AAED,KAAK,UAAU,CACb,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC,EACpD,aAAa,SAAS,MAAM,WAAW,IAEvC,WAAW,CAAC,aAAa,CAAC,SAAS,oBAAoB,CAAC,MAAM,GAAG,CAAC,GAC9D,GAAG,GACH,KAAK,CAAC;AACZ,KAAK,iBAAiB,CACpB,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC,EACpD,aAAa,SAAS,MAAM,WAAW,IAEvC,WAAW,CAAC,aAAa,CAAC,SAAS,oBAAoB,CACrD,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK,GAAG,CACzB,GACG,IAAI,GACJ,KAAK,CAAC;AAEZ,KAAK,cAAc,CACjB,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC,EACpD,aAAa,SAAS,MAAM,WAAW,IAEvC,WAAW,CAAC,aAAa,CAAC,SAAS,oBAAoB,CACrD,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK,MAAM,OAAO,CACnC,GACG,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,KAAK,OAAO,GACrD,KAAK,CAAC;AAEZ,qBAAa,UAAU,CAAC,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC;IAC1E,UAAU,EAAE;SACT,GAAG,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;KACrE,CAAuB;IAExB,QAAQ,CAAC,aAAa,SAAS,MAAM,WAAW,EAC9C,YAAY,EAAE,aAAa,EAC3B,EAAE,EAAE,cAAc,CAAC,WAAW,EAAE,aAAa,CAAC,GAC7C,IAAI;IASP,GAAG,CAAC,aAAa,SAAS,MAAM,WAAW,EACzC,YAAY,EAAE,aAAa,EAC3B,GAAG,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,EAClD,QAAQ,EAAE,CACR,GAAG,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,KAC/C,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,GACtD,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAgBrD,OAAO,CAAC,aAAa,SAAS,MAAM,WAAW,EAC7C,YAAY,EAAE,aAAa,EAC3B,GAAG,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,EAClD,QAAQ,EAAE,CACR,GAAG,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,KAC/C,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,GACtD,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;CAgBtD;AAsED,MAAM,MAAM,kBAAkB,CAC5B,WAAW,SAAS,mBAAmB,CAAC,WAAW,CAAC,IAClD;KACD,GAAG,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,oBAAoB,CAC/C,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,KAAK,KAAK,MAAM,OAAO,GAC5D,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,KAAK,OAAO,GAC1D,KAAK,CACV;CACF,CAAC"}
@@ -6,13 +6,13 @@ class Middleware {
6
6
  constructor() {
7
7
  this.middleware = Object.create(null);
8
8
  }
9
- register(event, fn) {
10
- const list = this.middleware[event];
9
+ register(activityName, fn) {
10
+ const list = this.middleware[activityName];
11
11
  if (list !== undefined) {
12
12
  list.push(fn);
13
13
  }
14
14
  else {
15
- this.middleware[event] = [fn];
15
+ this.middleware[activityName] = [fn];
16
16
  }
17
17
  }
18
18
  run(activityName, arg, activity) {
@@ -1 +1 @@
1
- {"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,10 @@
1
1
  import "./interfaces.js";
2
2
  export declare function isResolvedPreset(preset: GraphileConfig.Preset): preset is GraphileConfig.ResolvedPreset;
3
+ /** @deprecated Use `resolvePreset({ extends: presets })` instead */
4
+ export declare function resolvePresets(presets: ReadonlyArray<GraphileConfig.Preset>): GraphileConfig.ResolvedPreset;
3
5
  /**
4
- * Given a list of presets, resolves the presets and returns the resulting
5
- * ResolvedPreset (which does not have any `extends`).
6
+ * Given a preset, recursively resolves all the `extends` and returns the
7
+ * resulting ResolvedPreset (which does not have any `extends`).
6
8
  */
7
- export declare function resolvePresets(presets: ReadonlyArray<GraphileConfig.Preset>, withAssertions?: boolean): GraphileConfig.ResolvedPreset;
9
+ export declare function resolvePreset(preset: GraphileConfig.Preset): GraphileConfig.ResolvedPreset;
8
10
  //# sourceMappingURL=resolvePresets.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"resolvePresets.d.ts","sourceRoot":"","sources":["../src/resolvePresets.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAuCzB,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,cAAc,CAAC,MAAM,GAC5B,MAAM,IAAI,cAAc,CAAC,cAAc,CAEzC;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,EAC7C,cAAc,UAAO,GACpB,cAAc,CAAC,cAAc,CAkC/B"}
1
+ {"version":3,"file":"resolvePresets.d.ts","sourceRoot":"","sources":["../src/resolvePresets.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AA0CzB,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,cAAc,CAAC,MAAM,GAC5B,MAAM,IAAI,cAAc,CAAC,cAAc,CAiBzC;AAED,oEAAoE;AACpE,wBAAgB,cAAc,CAC5B,OAAO,EAAE,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,GAC5C,cAAc,CAAC,cAAc,CAM/B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,CAAC,MAAM,GAC5B,cAAc,CAAC,cAAc,CAuB/B"}
@@ -1,10 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.resolvePresets = exports.isResolvedPreset = void 0;
3
+ exports.isResolvedPreset = isResolvedPreset;
4
+ exports.resolvePresets = resolvePresets;
5
+ exports.resolvePreset = resolvePreset;
4
6
  require("./interfaces.js");
5
7
  const sort_js_1 = require("./sort.js");
6
8
  const PROBABLY_A_PLUGIN_NOT_A_PRESET_KEYS = [
7
- "name",
9
+ "name", // If we want to give presets a name, we should use 'id', 'label', 'title' or similar.
8
10
  "experimental",
9
11
  "provides",
10
12
  "before",
@@ -21,6 +23,7 @@ const PROBABLY_A_PRESET_NOT_A_PLUGIN_KEYS = [
21
23
  ];
22
24
  let inspect;
23
25
  try {
26
+ // eslint-disable-next-line @typescript-eslint/no-require-imports
24
27
  inspect = require("util").inspect;
25
28
  if (typeof inspect !== "function") {
26
29
  throw new Error("Failed to load inspect");
@@ -37,39 +40,74 @@ catch {
37
40
  };
38
41
  }
39
42
  function isResolvedPreset(preset) {
40
- return (preset.plugins && preset.extends?.length === 0) || false;
43
+ if (preset.extends != null)
44
+ return false;
45
+ if (!preset.plugins)
46
+ return false;
47
+ if (!preset.disablePlugins)
48
+ return false;
49
+ if (typeof preset.lib !== "object" || preset.lib === null)
50
+ return false;
51
+ const seenPlugins = new Map();
52
+ for (const plugin of preset.plugins) {
53
+ if (preset.disablePlugins.includes(plugin.name))
54
+ return false;
55
+ if (seenPlugins.has(plugin.name)) {
56
+ // Contains duplicate; handle on default path
57
+ return false;
58
+ }
59
+ else {
60
+ seenPlugins.set(plugin.name, plugin);
61
+ }
62
+ }
63
+ return true;
64
+ }
65
+ /** @deprecated Use `resolvePreset({ extends: presets })` instead */
66
+ function resolvePresets(presets) {
67
+ if (presets.length === 1) {
68
+ return resolvePreset(presets[0]);
69
+ }
70
+ else {
71
+ return resolvePreset({ extends: presets });
72
+ }
41
73
  }
42
- exports.isResolvedPreset = isResolvedPreset;
43
74
  /**
44
- * Given a list of presets, resolves the presets and returns the resulting
45
- * ResolvedPreset (which does not have any `extends`).
75
+ * Given a preset, recursively resolves all the `extends` and returns the
76
+ * resulting ResolvedPreset (which does not have any `extends`).
46
77
  */
47
- function resolvePresets(presets, withAssertions = true) {
48
- if (presets.length === 1) {
49
- // Maybe it's already resolved?
50
- const preset = presets[0];
51
- if (preset && isResolvedPreset(preset)) {
52
- return preset;
53
- }
78
+ function resolvePreset(preset) {
79
+ // Maybe it's already resolved?
80
+ if (preset && isResolvedPreset(preset)) {
81
+ return preset;
54
82
  }
83
+ const seenPlugins = new Map();
84
+ const resolvedPreset = resolvePresetsInternal([preset], seenPlugins, 0);
85
+ const disabledButNotSeen = resolvedPreset.disablePlugins?.filter((n) => !seenPlugins.has(n));
86
+ if (disabledButNotSeen?.length) {
87
+ console.warn(`One or more of the plugin(s) entered in your preset's 'disablePlugins' list was never seen - perhaps you have misspelled them?\n${disabledButNotSeen
88
+ .map((p) => ` - ${p}`)
89
+ .join("\n")}\nThe list of know plugins is:\n ${[...seenPlugins.keys()].join(", ") ?? "-"}`);
90
+ }
91
+ return resolvedPreset;
92
+ }
93
+ function resolvePresetsInternal(presets, seenPlugins, depth) {
55
94
  const finalPreset = blankResolvedPreset();
56
95
  for (const preset of presets) {
57
- const resolvedPreset = resolvePreset(preset);
58
- mergePreset(finalPreset, resolvedPreset);
96
+ if (isResolvedPreset(preset) && preset.disablePlugins) {
97
+ for (const p of preset.disablePlugins) {
98
+ if (!seenPlugins.has(p)) {
99
+ seenPlugins.set(p, null);
100
+ }
101
+ }
102
+ }
103
+ const resolvedPreset = resolvePresetInternal(preset, seenPlugins, depth + 1);
104
+ mergePreset(finalPreset, resolvedPreset, seenPlugins, depth);
59
105
  }
60
106
  if (finalPreset.plugins) {
61
107
  finalPreset.plugins = (0, sort_js_1.sortWithBeforeAfterProvides)(finalPreset.plugins, "name");
62
108
  }
63
- if (withAssertions) {
64
- if (finalPreset.disablePlugins && finalPreset.disablePlugins.length > 0) {
65
- console.warn(`One or more of the plugin(s) entered in your preset's 'disablePlugins' list was not found:\n${finalPreset.disablePlugins
66
- .map((p) => ` - ${p}`)
67
- .join("\n")}\nThe list of know plugins is:\n ${finalPreset.plugins?.map((p) => p.name).join(", ") ?? "-"}`);
68
- }
69
- }
70
109
  return finalPreset;
71
110
  }
72
- exports.resolvePresets = resolvePresets;
73
111
  function isGraphileConfigPreset(foo) {
74
112
  if (typeof foo !== "object" || foo === null)
75
113
  return false;
@@ -125,7 +163,7 @@ function isForbiddenPluginKey(key) {
125
163
  *
126
164
  * @internal
127
165
  */
128
- function resolvePreset(preset) {
166
+ function resolvePresetInternal(preset, seenPlugins, depth) {
129
167
  if (!isGraphileConfigPreset(preset)) {
130
168
  throw new Error(`Expected a GraphileConfig preset (a plain JS object), but found '${inspect(preset)}'`);
131
169
  }
@@ -145,27 +183,18 @@ function resolvePreset(preset) {
145
183
  throw new Error(`Preset has '${forbiddenKey}' property which suggests it is a plugin rather than a preset. If it is indeed a plugin you should add it to your preset via 'plugins' rather than 'extends'.`);
146
184
  }
147
185
  }
148
- const { extends: presets = [] } = preset;
149
- const basePreset = resolvePresets(presets, false);
150
- mergePreset(basePreset, preset);
151
- const disabled = basePreset.disablePlugins;
152
- if (disabled) {
153
- const plugins = new Set(basePreset.plugins);
154
- const remaining = new Set(disabled);
155
- for (const plugin of plugins) {
156
- assertPlugin(plugin);
157
- if (remaining.has(plugin.name)) {
158
- remaining.delete(plugin.name);
159
- plugins.delete(plugin);
160
- }
161
- }
162
- basePreset.plugins = [...plugins];
163
- basePreset.disablePlugins = [...remaining];
164
- }
186
+ }
187
+ catch (e) {
188
+ throw new Error(`Error occurred when resolving preset:\n ${String(e).replace(/\n/g, "\n ")}\nPreset: ${inspect(preset)}`);
189
+ }
190
+ const { extends: presets = [], ...rest } = preset;
191
+ const basePreset = resolvePresetsInternal(presets, seenPlugins, depth + 1);
192
+ try {
193
+ mergePreset(basePreset, rest, seenPlugins, depth);
165
194
  return basePreset;
166
195
  }
167
196
  catch (e) {
168
- throw new Error(`Error occurred when resolving preset: ${e}\nPreset: ${inspect(preset)}`);
197
+ throw new Error(`Error occurred when resolving preset:\n ${String(e).replace(/\n/g, "\n ")}\nPreset: ${inspect(preset)}`);
169
198
  }
170
199
  }
171
200
  /**
@@ -176,22 +205,74 @@ function resolvePreset(preset) {
176
205
  *
177
206
  * @internal
178
207
  */
179
- function mergePreset(targetPreset, sourcePreset) {
180
- if (targetPreset.extends != null && targetPreset.extends.length !== 0) {
208
+ function mergePreset(targetPreset, sourcePreset, seenPlugins, _depth) {
209
+ const sourcePluginNames = [];
210
+ if (sourcePreset.plugins) {
211
+ for (const plugin of sourcePreset.plugins) {
212
+ assertPlugin(plugin);
213
+ // Check that we don't have two different plugins with the same name
214
+ const existing = seenPlugins.get(plugin.name);
215
+ if (existing && existing !== plugin) {
216
+ throw new Error(`Two different plugins have been registered with the same name '${existing.name}'; this is likely an issue where you are using the same preset or plugin factory function more than once, though it could also be caused by duplicate dependencies in your 'node_modules' folder.`);
217
+ }
218
+ seenPlugins.set(plugin.name, plugin);
219
+ sourcePluginNames.push(plugin.name);
220
+ }
221
+ }
222
+ if (targetPreset.extends != null) {
181
223
  throw new Error("First argument to mergePreset must be a resolved preset");
182
224
  }
225
+ const addedAndDisabled = sourcePreset.disablePlugins
226
+ ? sourcePluginNames.filter((addedPluginName) => sourcePreset.disablePlugins.includes(addedPluginName))
227
+ : [];
228
+ if (addedAndDisabled.length > 0) {
229
+ throw new Error(`A preset may not both add a plugin and disable that same plugin ('${addedAndDisabled.join("', '")}')`);
230
+ }
231
+ const disablePlugins = [
232
+ ...new Set([
233
+ // Remove the previously disabled plugins where we've explicitly re-added the plugin
234
+ ...(targetPreset.disablePlugins?.filter((pluginName) => !sourcePluginNames.includes(pluginName)) ?? []),
235
+ // Explicitly add our new disablePlugins
236
+ ...(sourcePreset.disablePlugins ?? []),
237
+ ]),
238
+ ];
239
+ targetPreset.disablePlugins = disablePlugins;
183
240
  const plugins = new Set([
184
241
  ...(targetPreset.plugins || []),
185
242
  ...(sourcePreset.plugins || []),
186
243
  ]);
187
- targetPreset.plugins = [...plugins];
188
- if (sourcePreset.disablePlugins) {
189
- targetPreset.disablePlugins = [
190
- ...new Set([
191
- ...(targetPreset.disablePlugins ?? []),
192
- ...(sourcePreset.disablePlugins ?? []),
193
- ]),
194
- ];
244
+ // Copy the unique plugins that are not disabled
245
+ targetPreset.plugins = [...plugins].filter((p) => !disablePlugins.includes(p.name));
246
+ if (sourcePreset.lib) {
247
+ for (const key of Object.keys(sourcePreset.lib)) {
248
+ const sourceValue = sourcePreset.lib[key];
249
+ if (!(key in targetPreset.lib)) {
250
+ targetPreset.lib[key] = sourceValue;
251
+ }
252
+ else if (key === "versions") {
253
+ if (sourceValue) {
254
+ for (const versionKey of Object.keys(sourceValue)) {
255
+ const { versions: targetVersions } = targetPreset.lib;
256
+ const sourceVersion = sourceValue[versionKey];
257
+ if (targetVersions[versionKey] === sourceVersion) {
258
+ // noop
259
+ }
260
+ else if (targetVersions[versionKey]) {
261
+ throw new Error(`Preset attempted to register version '${sourceVersion}' of '${versionKey}', but version '${targetVersions[versionKey]}' is already registered`);
262
+ }
263
+ else {
264
+ targetVersions[versionKey] = sourceVersion;
265
+ }
266
+ }
267
+ }
268
+ }
269
+ else if (targetPreset.lib[key] === sourceValue) {
270
+ // noop
271
+ }
272
+ else {
273
+ throw new Error(`Two different presets defined lib '${key}' but they had different values:\n\n ${inspect(targetPreset.lib[key]).replace(/\n/g, "\n ")}\n\nvs\n\n ${inspect(sourceValue).replace(/\n/g, "\n ")}`);
274
+ }
275
+ }
195
276
  }
196
277
  const targetScopes = Object.keys(targetPreset).filter(isScopeKeyForPreset);
197
278
  const sourceScopes = Object.keys(sourcePreset).filter(isScopeKeyForPreset);
@@ -204,25 +285,23 @@ function mergePreset(targetPreset, sourcePreset) {
204
285
  throw new Error(`${scope} contains an array entry in one preset and a non-array entry in another, this doesn't make sense`);
205
286
  }
206
287
  else if (Array.isArray(sourceScope)) {
207
- targetPreset[scope] =
208
- sourceScope;
288
+ targetPreset[scope] = sourceScope;
209
289
  }
210
290
  else {
211
- targetPreset[scope] =
212
- Object.assign(Object.create(null), targetScope, sourceScope);
291
+ targetPreset[scope] = Object.assign(Object.create(null), targetScope, sourceScope);
213
292
  }
214
293
  }
215
294
  else {
216
295
  targetPreset[scope] =
217
- (targetScope || sourceScope);
296
+ targetScope || sourceScope;
218
297
  }
219
298
  }
220
299
  }
221
300
  function blankResolvedPreset() {
222
301
  return {
223
- extends: [],
224
302
  plugins: [],
225
303
  disablePlugins: [],
304
+ lib: Object.create(null),
226
305
  };
227
306
  }
228
307
  /**
@@ -230,6 +309,9 @@ function blankResolvedPreset() {
230
309
  * Preset type (before declaration merging).
231
310
  */
232
311
  function isScopeKeyForPreset(key) {
233
- return key !== "extends" && key !== "plugins" && key !== "disablePlugins";
312
+ return (key !== "extends" &&
313
+ key !== "plugins" &&
314
+ key !== "disablePlugins" &&
315
+ key !== "lib");
234
316
  }
235
317
  //# sourceMappingURL=resolvePresets.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"resolvePresets.js","sourceRoot":"","sources":["../src/resolvePresets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolvePresets.js","sourceRoot":"","sources":["../src/resolvePresets.ts"],"names":[],"mappings":"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"}
package/dist/sort.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.sortWithBeforeAfterProvides = void 0;
3
+ exports.sortWithBeforeAfterProvides = sortWithBeforeAfterProvides;
4
4
  function sortWithBeforeAfterProvides(rawList, idKey) {
5
5
  const list = rawList.map((thing) => {
6
6
  const before = [...(thing.before ?? [])];
@@ -91,5 +91,4 @@ function sortWithBeforeAfterProvides(rawList, idKey) {
91
91
  }
92
92
  return final;
93
93
  }
94
- exports.sortWithBeforeAfterProvides = sortWithBeforeAfterProvides;
95
94
  //# sourceMappingURL=sort.js.map
package/dist/sort.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sort.js","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sort.js","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"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"}
package/dist/utils.js CHANGED
@@ -1,10 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isPromiseLike = void 0;
3
+ exports.isPromiseLike = isPromiseLike;
4
4
  function isPromiseLike(value) {
5
5
  return (typeof value === "object" &&
6
6
  value !== null &&
7
7
  typeof value.then === "function");
8
8
  }
9
- exports.isPromiseLike = isPromiseLike;
10
9
  //# sourceMappingURL=utils.js.map
package/dist/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,aAAa,CAC3B,KAAyB;IAEzB,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,OAAQ,KAAa,CAAC,IAAI,KAAK,UAAU,CAC1C,CAAC;AACJ,CAAC;AARD,sCAQC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;AAAA,sCAQC;AARD,SAAgB,aAAa,CAC3B,KAAyB;IAEzB,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,OAAQ,KAAa,CAAC,IAAI,KAAK,UAAU,CAC1C,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "graphile-config",
3
- "version": "0.0.1-beta.9",
3
+ "version": "1.0.0-rc.2",
4
4
  "description": "Standard plugin interface and helpers to be used across the Graphile stack.",
5
5
  "type": "commonjs",
6
6
  "main": "./dist/index.js",
@@ -39,14 +39,14 @@
39
39
  },
40
40
  "homepage": "https://graphile.org/graphile-build/",
41
41
  "dependencies": {
42
- "@types/interpret": "^1.1.1",
43
- "@types/node": "^20.5.7",
44
- "@types/semver": "^7.5.1",
42
+ "@types/interpret": "^1.1.4",
43
+ "@types/node": "^22.19.1",
44
+ "@types/semver": "^7.7.1",
45
45
  "chalk": "^4.1.2",
46
- "debug": "^4.3.4",
46
+ "debug": "^4.4.3",
47
47
  "interpret": "^3.1.1",
48
- "semver": "^7.5.4",
49
- "tslib": "^2.6.2",
48
+ "semver": "^7.7.3",
49
+ "tslib": "^2.8.1",
50
50
  "yargs": "^17.7.2"
51
51
  },
52
52
  "engines": {
@@ -56,11 +56,11 @@
56
56
  "dist"
57
57
  ],
58
58
  "devDependencies": {
59
- "@types/debug": "^4.1.8",
60
- "@types/mocha": "^10.0.1",
61
- "chai": "^4.3.8",
62
- "mocha": "^10.2.0",
63
- "ts-node": "^10.9.1",
64
- "typescript": "^5.2.2"
59
+ "@types/debug": "^4.1.12",
60
+ "@types/mocha": "^10.0.10",
61
+ "chai": "^5.3.3",
62
+ "mocha": "^11.7.5",
63
+ "ts-node": "^10.9.2",
64
+ "typescript": "^5.9.3"
65
65
  }
66
66
  }