graphile-config 0.0.1-beta.11 → 0.0.1-beta.12
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 +23 -0
- package/dist/index.d.ts +15 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware.d.ts +3 -0
- package/dist/middleware.d.ts.map +1 -1
- package/dist/resolvePresets.d.ts +5 -3
- package/dist/resolvePresets.d.ts.map +1 -1
- package/dist/resolvePresets.js +65 -25
- package/dist/resolvePresets.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# graphile-config
|
|
2
2
|
|
|
3
|
+
## 0.0.1-beta.12
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2240](https://github.com/graphile/crystal/pull/2240)
|
|
8
|
+
[`d13b76f0f`](https://github.com/graphile/crystal/commit/d13b76f0fef2a58466ecb44880af62d25910e83e)
|
|
9
|
+
Thanks [@benjie](https://github.com/benjie)! - Adds
|
|
10
|
+
`MiddlewareHandlers<TActivities>` type to help with adding middleware to
|
|
11
|
+
configs
|
|
12
|
+
|
|
13
|
+
- [#2253](https://github.com/graphile/crystal/pull/2253)
|
|
14
|
+
[`b167bd849`](https://github.com/graphile/crystal/commit/b167bd8499be5866b71bac6594d55bd768fda1d0)
|
|
15
|
+
Thanks [@benjie](https://github.com/benjie)! - 🚨 `{}` is no longer a valid
|
|
16
|
+
`GraphileConfig.ResolvedPreset`; use `resolvePreset({})`
|
|
17
|
+
|
|
18
|
+
Also: adds `resolvePreset(preset)` and deprecates `resolvePresets(presets)`.
|
|
19
|
+
|
|
20
|
+
- [#2250](https://github.com/graphile/crystal/pull/2250)
|
|
21
|
+
[`6a13ecbd4`](https://github.com/graphile/crystal/commit/6a13ecbd45534c39c846c1d8bc58242108426dd1)
|
|
22
|
+
Thanks [@benjie](https://github.com/benjie)! - Add support for 'preset.lib'
|
|
23
|
+
which can be used to store global module references to help avoid the dual
|
|
24
|
+
package hazard.
|
|
25
|
+
|
|
3
26
|
## 0.0.1-beta.11
|
|
4
27
|
|
|
5
28
|
### Patch Changes
|
package/dist/index.d.ts
CHANGED
|
@@ -3,12 +3,15 @@ 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
|
+
}
|
|
12
15
|
/**
|
|
13
16
|
* Expand this through declaration merging to get TypeScript
|
|
14
17
|
* auto-completion of plugin names in the relevant places.
|
|
@@ -41,14 +44,21 @@ declare global {
|
|
|
41
44
|
extends?: ReadonlyArray<Preset>;
|
|
42
45
|
plugins?: Plugin[];
|
|
43
46
|
disablePlugins?: ReadonlyArray<keyof GraphileConfig.Plugins>;
|
|
47
|
+
lib?: Partial<GraphileConfig.Lib>;
|
|
44
48
|
appendPlugins?: never;
|
|
45
49
|
prependPlugins?: never;
|
|
46
50
|
skipPlugins?: never;
|
|
47
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
|
+
*/
|
|
48
57
|
interface ResolvedPreset extends Preset {
|
|
49
|
-
extends?:
|
|
50
|
-
plugins
|
|
51
|
-
disablePlugins
|
|
58
|
+
extends?: never;
|
|
59
|
+
plugins: Plugin[];
|
|
60
|
+
disablePlugins: ReadonlyArray<keyof GraphileConfig.Plugins>;
|
|
61
|
+
lib: GraphileConfig.Lib;
|
|
52
62
|
}
|
|
53
63
|
}
|
|
54
64
|
}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -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;
|
|
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,6 @@
|
|
|
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.sortedPlugins = exports.resolvePresets = exports.resolvePreset = exports.isResolvedPreset = exports.Middleware = exports.AsyncHooks = exports.applyHooks = exports.orderedApply = void 0;
|
|
4
4
|
require("./interfaces.js");
|
|
5
5
|
const sort_js_1 = require("./sort.js");
|
|
6
6
|
var functionality_js_1 = require("./functionality.js");
|
|
@@ -12,6 +12,7 @@ var middleware_js_1 = require("./middleware.js");
|
|
|
12
12
|
Object.defineProperty(exports, "Middleware", { enumerable: true, get: function () { return middleware_js_1.Middleware; } });
|
|
13
13
|
var resolvePresets_js_1 = require("./resolvePresets.js");
|
|
14
14
|
Object.defineProperty(exports, "isResolvedPreset", { enumerable: true, get: function () { return resolvePresets_js_1.isResolvedPreset; } });
|
|
15
|
+
Object.defineProperty(exports, "resolvePreset", { enumerable: true, get: function () { return resolvePresets_js_1.resolvePreset; } });
|
|
15
16
|
Object.defineProperty(exports, "resolvePresets", { enumerable: true, get: function () { return resolvePresets_js_1.resolvePresets; } });
|
|
16
17
|
function sortedPlugins(plugins) {
|
|
17
18
|
if (plugins) {
|
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,
|
|
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,yDAI6B;AAH3B,qHAAA,gBAAgB,OAAA;AAChB,kHAAA,aAAa,OAAA;AACb,mHAAA,cAAc,OAAA;AAGhB,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"}
|
package/dist/middleware.d.ts
CHANGED
|
@@ -14,5 +14,8 @@ export declare class Middleware<TActivities extends FunctionalityObject<TActivit
|
|
|
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
|
package/dist/middleware.d.ts.map
CHANGED
|
@@ -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,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;AA4ED,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"}
|
package/dist/resolvePresets.d.ts
CHANGED
|
@@ -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
|
|
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
|
|
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,
|
|
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,CAUzC;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"}
|
package/dist/resolvePresets.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolvePresets = exports.isResolvedPreset = void 0;
|
|
3
|
+
exports.resolvePreset = exports.resolvePresets = exports.isResolvedPreset = void 0;
|
|
4
4
|
require("./interfaces.js");
|
|
5
5
|
const sort_js_1 = require("./sort.js");
|
|
6
6
|
const PROBABLY_A_PLUGIN_NOT_A_PRESET_KEYS = [
|
|
@@ -37,28 +37,36 @@ catch {
|
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
function isResolvedPreset(preset) {
|
|
40
|
-
return ((preset.
|
|
41
|
-
preset.
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
40
|
+
return ((preset.extends == null &&
|
|
41
|
+
preset.plugins &&
|
|
42
|
+
preset.disablePlugins &&
|
|
43
|
+
typeof preset.lib === "object" &&
|
|
44
|
+
preset.lib !== null &&
|
|
45
|
+
!preset.plugins.some((p) => preset.disablePlugins.includes(p.name))) ||
|
|
45
46
|
false);
|
|
46
47
|
}
|
|
47
48
|
exports.isResolvedPreset = isResolvedPreset;
|
|
48
|
-
/**
|
|
49
|
-
* Given a list of presets, resolves the presets and returns the resulting
|
|
50
|
-
* ResolvedPreset (which does not have any `extends`).
|
|
51
|
-
*/
|
|
49
|
+
/** @deprecated Use `resolvePreset({ extends: presets })` instead */
|
|
52
50
|
function resolvePresets(presets) {
|
|
53
51
|
if (presets.length === 1) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
52
|
+
return resolvePreset(presets[0]);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
return resolvePreset({ extends: presets });
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
exports.resolvePresets = resolvePresets;
|
|
59
|
+
/**
|
|
60
|
+
* Given a preset, recursively resolves all the `extends` and returns the
|
|
61
|
+
* resulting ResolvedPreset (which does not have any `extends`).
|
|
62
|
+
*/
|
|
63
|
+
function resolvePreset(preset) {
|
|
64
|
+
// Maybe it's already resolved?
|
|
65
|
+
if (preset && isResolvedPreset(preset)) {
|
|
66
|
+
return preset;
|
|
59
67
|
}
|
|
60
68
|
const seenPluginNames = new Set();
|
|
61
|
-
const resolvedPreset = resolvePresetsInternal(
|
|
69
|
+
const resolvedPreset = resolvePresetsInternal([preset], seenPluginNames, 0);
|
|
62
70
|
const disabledButNotSeen = resolvedPreset.disablePlugins?.filter((n) => !seenPluginNames.has(n));
|
|
63
71
|
if (disabledButNotSeen?.length) {
|
|
64
72
|
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
|
|
@@ -67,7 +75,7 @@ function resolvePresets(presets) {
|
|
|
67
75
|
}
|
|
68
76
|
return resolvedPreset;
|
|
69
77
|
}
|
|
70
|
-
exports.
|
|
78
|
+
exports.resolvePreset = resolvePreset;
|
|
71
79
|
function resolvePresetsInternal(presets, seenPluginNames, depth) {
|
|
72
80
|
const finalPreset = blankResolvedPreset();
|
|
73
81
|
for (const preset of presets) {
|
|
@@ -190,7 +198,7 @@ function mergePreset(targetPreset, sourcePreset, seenPluginNames, _depth) {
|
|
|
190
198
|
sourcePluginNames.push(plugin.name);
|
|
191
199
|
}
|
|
192
200
|
}
|
|
193
|
-
if (targetPreset.extends != null
|
|
201
|
+
if (targetPreset.extends != null) {
|
|
194
202
|
throw new Error("First argument to mergePreset must be a resolved preset");
|
|
195
203
|
}
|
|
196
204
|
const addedAndDisabled = sourcePreset.disablePlugins
|
|
@@ -214,6 +222,37 @@ function mergePreset(targetPreset, sourcePreset, seenPluginNames, _depth) {
|
|
|
214
222
|
]);
|
|
215
223
|
// Copy the unique plugins that are not disabled
|
|
216
224
|
targetPreset.plugins = [...plugins].filter((p) => !disablePlugins.includes(p.name));
|
|
225
|
+
if (sourcePreset.lib) {
|
|
226
|
+
for (const key of Object.keys(sourcePreset.lib)) {
|
|
227
|
+
const sourceValue = sourcePreset.lib[key];
|
|
228
|
+
if (!(key in targetPreset.lib)) {
|
|
229
|
+
targetPreset.lib[key] = sourceValue;
|
|
230
|
+
}
|
|
231
|
+
else if (key === "versions") {
|
|
232
|
+
if (sourceValue) {
|
|
233
|
+
for (const versionKey of Object.keys(sourceValue)) {
|
|
234
|
+
const { versions: targetVersions } = targetPreset.lib;
|
|
235
|
+
const sourceVersion = sourceValue[versionKey];
|
|
236
|
+
if (targetVersions[versionKey] === sourceVersion) {
|
|
237
|
+
// noop
|
|
238
|
+
}
|
|
239
|
+
else if (targetVersions[versionKey]) {
|
|
240
|
+
throw new Error(`Preset attempted to register version '${sourceVersion}' of '${versionKey}', but version '${targetVersions[versionKey]}' is already registered`);
|
|
241
|
+
}
|
|
242
|
+
else {
|
|
243
|
+
targetVersions[versionKey] = sourceVersion;
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
else if (targetPreset.lib[key] === sourceValue) {
|
|
249
|
+
// noop
|
|
250
|
+
}
|
|
251
|
+
else {
|
|
252
|
+
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 ")}`);
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
}
|
|
217
256
|
const targetScopes = Object.keys(targetPreset).filter(isScopeKeyForPreset);
|
|
218
257
|
const sourceScopes = Object.keys(sourcePreset).filter(isScopeKeyForPreset);
|
|
219
258
|
const scopes = [...new Set([...targetScopes, ...sourceScopes])];
|
|
@@ -225,25 +264,23 @@ function mergePreset(targetPreset, sourcePreset, seenPluginNames, _depth) {
|
|
|
225
264
|
throw new Error(`${scope} contains an array entry in one preset and a non-array entry in another, this doesn't make sense`);
|
|
226
265
|
}
|
|
227
266
|
else if (Array.isArray(sourceScope)) {
|
|
228
|
-
targetPreset[scope] =
|
|
229
|
-
sourceScope;
|
|
267
|
+
targetPreset[scope] = sourceScope;
|
|
230
268
|
}
|
|
231
269
|
else {
|
|
232
|
-
targetPreset[scope] =
|
|
233
|
-
Object.assign(Object.create(null), targetScope, sourceScope);
|
|
270
|
+
targetPreset[scope] = Object.assign(Object.create(null), targetScope, sourceScope);
|
|
234
271
|
}
|
|
235
272
|
}
|
|
236
273
|
else {
|
|
237
274
|
targetPreset[scope] =
|
|
238
|
-
|
|
275
|
+
targetScope || sourceScope;
|
|
239
276
|
}
|
|
240
277
|
}
|
|
241
278
|
}
|
|
242
279
|
function blankResolvedPreset() {
|
|
243
280
|
return {
|
|
244
|
-
extends: [],
|
|
245
281
|
plugins: [],
|
|
246
282
|
disablePlugins: [],
|
|
283
|
+
lib: Object.create(null),
|
|
247
284
|
};
|
|
248
285
|
}
|
|
249
286
|
/**
|
|
@@ -251,6 +288,9 @@ function blankResolvedPreset() {
|
|
|
251
288
|
* Preset type (before declaration merging).
|
|
252
289
|
*/
|
|
253
290
|
function isScopeKeyForPreset(key) {
|
|
254
|
-
return key !== "extends" &&
|
|
291
|
+
return (key !== "extends" &&
|
|
292
|
+
key !== "plugins" &&
|
|
293
|
+
key !== "disablePlugins" &&
|
|
294
|
+
key !== "lib");
|
|
255
295
|
}
|
|
256
296
|
//# sourceMappingURL=resolvePresets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvePresets.js","sourceRoot":"","sources":["../src/resolvePresets.ts"],"names":[],"mappings":";;;AAAA,2BAAyB;AAEzB,uCAAwD;AAExD,MAAM,mCAAmC,GAAG;IAC1C,MAAM;IACN,cAAc;IACd,UAAU;IACV,QAAQ;IACR,OAAO;IACP,2CAA2C;IAC3C,eAAe;IACf,gBAAgB;IAChB,aAAa;CACd,CAAC;AACF,MAAM,mCAAmC,GAAG;IAC1C,SAAS;IACT,gBAAgB;IAChB,SAAS;CACV,CAAC;AAEF,IAAI,OAA4D,CAAC;AAEjE,IAAI;IACF,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;IAClC,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;CACF;AAAC,MAAM;IACN,OAAO,GAAG,CAAC,GAAG,EAAE,EAAE;QAChB,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;YACvB,CAAC,GAAG;YACJ,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,IAAI;YACnC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,SAAS;YAC/C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;YACrB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC,CAAC;CACH;AAED,SAAgB,gBAAgB,CAC9B,MAA6B;IAE7B,OAAO,CACL,CAAC,MAAM,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"resolvePresets.js","sourceRoot":"","sources":["../src/resolvePresets.ts"],"names":[],"mappings":"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"}
|