graphile-config 0.0.1-beta.5 → 0.0.1-beta.6
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 +11 -0
- package/dist/sort.d.ts.map +1 -1
- package/dist/sort.js +33 -15
- package/dist/sort.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
# graphile-config
|
|
2
2
|
|
|
3
|
+
## 0.0.1-beta.6
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#1892](https://github.com/graphile/crystal/pull/1892)
|
|
8
|
+
[`0df5511ac`](https://github.com/graphile/crystal/commit/0df5511ac8b79ea34f8d12ebf8feeb421f8fe971)
|
|
9
|
+
Thanks [@benjie](https://github.com/benjie)! - Fix plugin ordering bug that
|
|
10
|
+
ignored before/after when there was no provider; this now means
|
|
11
|
+
PgSmartTagsPlugin is correctly loaded before PgFakeConstraintPlugin, fixing
|
|
12
|
+
the `postgraphile.tags.json5` file.
|
|
13
|
+
|
|
3
14
|
## 0.0.1-beta.5
|
|
4
15
|
|
|
5
16
|
### Patch Changes
|
package/dist/sort.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"AAAA,wBAAgB,2BAA2B,CACzC,MAAM,SAAS,MAAM,EACrB,SAAS,SAAS;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,GAAG;KACD,EAAE,IAAI,MAAM,GAAG,MAAM;CACvB,EACD,OAAO,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"AAAA,wBAAgB,2BAA2B,CACzC,MAAM,SAAS,MAAM,EACrB,SAAS,SAAS;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,GAAG;KACD,EAAE,IAAI,MAAM,GAAG,MAAM;CACvB,EACD,OAAO,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,CA+HlD"}
|
package/dist/sort.js
CHANGED
|
@@ -11,9 +11,34 @@ function sortWithBeforeAfterProvides(rawList, idKey) {
|
|
|
11
11
|
}
|
|
12
12
|
return { thing, before, after, provides };
|
|
13
13
|
});
|
|
14
|
+
// Figure out all the possible provides values:
|
|
15
|
+
const validProvides = new Set();
|
|
16
|
+
for (const { provides } of list) {
|
|
17
|
+
for (const provide of provides) {
|
|
18
|
+
validProvides.add(provide);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
// And create fake providers for any values that don't already have one, to
|
|
22
|
+
// ensure correct ordering
|
|
23
|
+
for (const { after, before } of list) {
|
|
24
|
+
for (const val of [...after, ...before]) {
|
|
25
|
+
if (!validProvides.has(val)) {
|
|
26
|
+
list.push({
|
|
27
|
+
thing: Symbol(val),
|
|
28
|
+
before: [],
|
|
29
|
+
after: [],
|
|
30
|
+
provides: [val],
|
|
31
|
+
});
|
|
32
|
+
validProvides.add(val);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
14
36
|
// "before" and "after" are very similar, lets simplify them into one
|
|
15
37
|
// concept by converting all the "befores" into "afters" on their targets.
|
|
16
38
|
for (const { thing, before } of list) {
|
|
39
|
+
if (typeof thing === "symbol") {
|
|
40
|
+
continue;
|
|
41
|
+
}
|
|
17
42
|
const { [idKey]: id } = thing;
|
|
18
43
|
if (before.length) {
|
|
19
44
|
const previousBefore = before.splice(0, before.length);
|
|
@@ -25,17 +50,6 @@ function sortWithBeforeAfterProvides(rawList, idKey) {
|
|
|
25
50
|
}
|
|
26
51
|
}
|
|
27
52
|
}
|
|
28
|
-
// Now lets figure out all the possible provides values:
|
|
29
|
-
const validProvides = new Set();
|
|
30
|
-
for (const { provides } of list) {
|
|
31
|
-
for (const provide of provides) {
|
|
32
|
-
validProvides.add(provide);
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
// And ignore any "afters" with no providers:
|
|
36
|
-
for (const { after } of list) {
|
|
37
|
-
after.splice(0, after.length, ...after.filter((afterValue) => validProvides.has(afterValue)));
|
|
38
|
-
}
|
|
39
53
|
const final = [];
|
|
40
54
|
const remaining = [...list];
|
|
41
55
|
// Now we can iteratively add items following the rule that there must be
|
|
@@ -58,18 +72,22 @@ function sortWithBeforeAfterProvides(rawList, idKey) {
|
|
|
58
72
|
if (!dependsOnRemaining) {
|
|
59
73
|
changes++;
|
|
60
74
|
remaining.splice(i, 1);
|
|
61
|
-
|
|
75
|
+
if (typeof thing !== "symbol") {
|
|
76
|
+
final.push(thing);
|
|
77
|
+
}
|
|
62
78
|
i--;
|
|
63
79
|
}
|
|
64
80
|
}
|
|
65
81
|
if (changes === 0) {
|
|
66
82
|
throw new Error(`Infinite loop in dependencies detected; remaining items:\n ${remaining
|
|
67
|
-
.map((r) => `${r.thing
|
|
83
|
+
.map((r) => `${typeof r.thing === "symbol"
|
|
84
|
+
? `FakeProvider<${r.thing.description}>`
|
|
85
|
+
: r.thing[idKey]} (after: ${r.after}; provides: ${r.provides})`)
|
|
68
86
|
.join("\n ")}`);
|
|
69
87
|
}
|
|
70
88
|
}
|
|
71
|
-
if (final.length !==
|
|
72
|
-
throw new Error(`Expected the same number of list entries after sorting (${final.length} != ${
|
|
89
|
+
if (final.length !== rawList.length) {
|
|
90
|
+
throw new Error(`Expected the same number of list entries after sorting (${final.length} != ${rawList.length})`);
|
|
73
91
|
}
|
|
74
92
|
return final;
|
|
75
93
|
}
|
package/dist/sort.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort.js","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":";;;AAAA,SAAgB,2BAA2B,CASzC,OAAoB,EAAE,KAAa;IACnC,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"sort.js","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"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"}
|