directus-deploy-cli 0.13.3 → 0.14.0
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/dist/diff.js +42 -12
- package/dist/diff.js.map +1 -1
- package/dist/reconcilers/collections.js +9 -3
- package/dist/reconcilers/collections.js.map +1 -1
- package/dist/reconcilers/fields.js +21 -13
- package/dist/reconcilers/fields.js.map +1 -1
- package/dist/reconcilers/flows.js +4 -3
- package/dist/reconcilers/flows.js.map +1 -1
- package/dist/reconcilers/operations.js +9 -3
- package/dist/reconcilers/operations.js.map +1 -1
- package/dist/reconcilers/permissions.js +27 -19
- package/dist/reconcilers/permissions.js.map +1 -1
- package/dist/reconcilers/policies.js +4 -3
- package/dist/reconcilers/policies.js.map +1 -1
- package/dist/reconcilers/relations.js +30 -22
- package/dist/reconcilers/relations.js.map +1 -1
- package/dist/reconcilers/roles.js +17 -14
- package/dist/reconcilers/roles.js.map +1 -1
- package/dist/reconcilers/seeds.js +4 -3
- package/dist/reconcilers/seeds.js.map +1 -1
- package/package.json +1 -1
package/dist/diff.js
CHANGED
|
@@ -1,31 +1,61 @@
|
|
|
1
|
-
//
|
|
2
|
-
// missing in) actual
|
|
3
|
-
// we don't manage (id, timestamps); we ignore those by asymmetric
|
|
1
|
+
// diffSubset — reports the first key/value where `desired` differs from (or
|
|
2
|
+
// is missing in) `actual`. The live Directus row usually carries server-only
|
|
3
|
+
// keys we don't manage (id, timestamps); we ignore those by asymmetric
|
|
4
|
+
// compare.
|
|
5
|
+
//
|
|
6
|
+
// Returns null when no diff. Returns a DiffPath breadcrumb otherwise, so
|
|
7
|
+
// callers can render "meta.hidden: false → true" instead of a nameless
|
|
8
|
+
// UPDATED line. Path is built by prepending keys as recursion unwinds.
|
|
4
9
|
export function diffSubset(desired, actual) {
|
|
5
10
|
if (desired === null || desired === undefined) {
|
|
6
11
|
// A null/undefined desired doesn't force a diff — the caller should
|
|
7
12
|
// only pass in the block they intend to reconcile.
|
|
8
|
-
return
|
|
13
|
+
return null;
|
|
9
14
|
}
|
|
10
15
|
if (typeof desired !== "object") {
|
|
11
|
-
return desired
|
|
16
|
+
return desired === actual ? null : { path: [], desired, actual };
|
|
12
17
|
}
|
|
13
18
|
if (Array.isArray(desired)) {
|
|
14
19
|
if (!Array.isArray(actual))
|
|
15
|
-
return
|
|
20
|
+
return { path: [], desired, actual };
|
|
16
21
|
if (desired.length !== actual.length)
|
|
17
|
-
return
|
|
18
|
-
|
|
22
|
+
return { path: [], desired, actual };
|
|
23
|
+
for (let i = 0; i < desired.length; i++) {
|
|
24
|
+
const child = diffSubset(desired[i], actual[i]);
|
|
25
|
+
if (child)
|
|
26
|
+
return { ...child, path: [String(i), ...child.path] };
|
|
27
|
+
}
|
|
28
|
+
return null;
|
|
19
29
|
}
|
|
20
30
|
if (actual === null || actual === undefined || typeof actual !== "object" || Array.isArray(actual)) {
|
|
21
|
-
return
|
|
31
|
+
return { path: [], desired, actual };
|
|
22
32
|
}
|
|
23
33
|
const dObj = desired;
|
|
24
34
|
const aObj = actual;
|
|
25
35
|
for (const [k, v] of Object.entries(dObj)) {
|
|
26
|
-
|
|
27
|
-
|
|
36
|
+
const child = diffSubset(v, aObj[k]);
|
|
37
|
+
if (child)
|
|
38
|
+
return { ...child, path: [k, ...child.path] };
|
|
28
39
|
}
|
|
29
|
-
return
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
42
|
+
// Render a DiffPath as a single line: "meta.hidden: false → true". Complex
|
|
43
|
+
// nested objects/arrays get JSON-stringified and truncated so the reason
|
|
44
|
+
// line stays readable in a terminal.
|
|
45
|
+
export function formatDiffPath(dp) {
|
|
46
|
+
const key = dp.path.length > 0 ? dp.path.join(".") : "(root)";
|
|
47
|
+
return `${key}: ${renderValue(dp.actual)} → ${renderValue(dp.desired)}`;
|
|
48
|
+
}
|
|
49
|
+
function renderValue(v) {
|
|
50
|
+
if (v === undefined)
|
|
51
|
+
return "<missing>";
|
|
52
|
+
if (v === null)
|
|
53
|
+
return "null";
|
|
54
|
+
if (typeof v === "string")
|
|
55
|
+
return JSON.stringify(v);
|
|
56
|
+
if (typeof v === "number" || typeof v === "boolean")
|
|
57
|
+
return String(v);
|
|
58
|
+
const s = JSON.stringify(v);
|
|
59
|
+
return s.length > 60 ? s.slice(0, 57) + "..." : s;
|
|
30
60
|
}
|
|
31
61
|
//# sourceMappingURL=diff.js.map
|
package/dist/diff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../src/diff.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,6EAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../src/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diffSubset } from "../diff.js";
|
|
1
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
2
2
|
import { sanitizeForWrite } from "../sanitize.js";
|
|
3
3
|
export async function reconcileCollections(input) {
|
|
4
4
|
const results = [];
|
|
@@ -71,7 +71,8 @@ export async function reconcileCollections(input) {
|
|
|
71
71
|
}
|
|
72
72
|
const desiredMeta = payload.meta ?? {};
|
|
73
73
|
const existingMeta = existing.meta ?? {};
|
|
74
|
-
|
|
74
|
+
const dp = diffSubset(desiredMeta, existingMeta);
|
|
75
|
+
if (dp) {
|
|
75
76
|
if (!input.opts.dryRun) {
|
|
76
77
|
try {
|
|
77
78
|
await input.client.patch(`/collections/${name}`, { meta: desiredMeta });
|
|
@@ -86,7 +87,12 @@ export async function reconcileCollections(input) {
|
|
|
86
87
|
continue;
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
|
-
results.push({
|
|
90
|
+
results.push({
|
|
91
|
+
kind: "collections",
|
|
92
|
+
label,
|
|
93
|
+
action: "updated",
|
|
94
|
+
reason: `meta.${formatDiffPath(dp)}`,
|
|
95
|
+
});
|
|
90
96
|
}
|
|
91
97
|
else {
|
|
92
98
|
results.push({ kind: "collections", label, action: "unchanged" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/reconcilers/collections.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/reconcilers/collections.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAgBlD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,KAA+B;IAE/B,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,CAAE,OAAoC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,IAAI;YAAE,SAAS;QACpB,IAAI,KAAK,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QAClF,MAAM,KAAK,GAAG,eAAe,IAAI,EAAE,CAAC;QAEpC,yEAAyE;QACzE,qEAAqE;QACrE,aAAa;QACb,IAAI,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,aAAa;gBACnB,KAAK;gBACL,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,qDAAqD;aAC9D,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,QAAwC,CAAC;QAC7C,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;YAC3D,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,aAAa;gBACnB,KAAK;gBACL,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAG,CAAW,CAAC,OAAO;aAC7B,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAkC,CAAC,CAAC;QAErE,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,uEAAuE;YACvE,gEAAgE;YAChE,uEAAuE;YACvE,uEAAuE;YACvE,qEAAqE;YACrE,+DAA+D;YAC/D,0DAA0D;YAC1D,MAAM,cAAc,GAAG,KAAK,CAAC,kBAAkB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAC3D,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChD,OAAO,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3C,MAAM,OAAO,GAAG,gBAAgB,CAAC,CAA4B,CAAC,CAAC;oBAC/D,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;oBAC7B,OAAO,OAAO,CAAC;gBACjB,CAAC,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBACnD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,aAAa;wBACnB,KAAK;wBACL,MAAM,EAAE,QAAQ;wBAChB,MAAM,EAAG,CAAW,CAAC,OAAO;qBAC7B,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAChE,SAAS;QACX,CAAC;QAED,MAAM,WAAW,GAAI,OAAO,CAAC,IAA4C,IAAI,EAAE,CAAC;QAChF,MAAM,YAAY,GAAI,QAAQ,CAAC,IAA4C,IAAI,EAAE,CAAC;QAClF,MAAM,EAAE,GAAG,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QACjD,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC1E,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,aAAa;wBACnB,KAAK;wBACL,MAAM,EAAE,QAAQ;wBAChB,MAAM,EAAG,CAAW,CAAC,OAAO;qBAC7B,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,aAAa;gBACnB,KAAK;gBACL,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,QAAQ,cAAc,CAAC,EAAE,CAAC,EAAE;aACrC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diffSubset } from "../diff.js";
|
|
1
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
2
2
|
import { sanitizeForWrite } from "../sanitize.js";
|
|
3
3
|
const FK_SCHEMA_KEYS = new Set([
|
|
4
4
|
"foreign_key_column",
|
|
@@ -91,20 +91,28 @@ export async function reconcileFields(input) {
|
|
|
91
91
|
}
|
|
92
92
|
results.push({ kind: "fields", label, action: "created" });
|
|
93
93
|
}
|
|
94
|
-
else
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
94
|
+
else {
|
|
95
|
+
const dp = diffSubset(desiredShape, existing);
|
|
96
|
+
if (dp) {
|
|
97
|
+
if (!input.opts.dryRun) {
|
|
98
|
+
try {
|
|
99
|
+
await input.client.patch(`/fields/${collection}/${field}`, desiredShape);
|
|
100
|
+
}
|
|
101
|
+
catch (e) {
|
|
102
|
+
results.push({ kind: "fields", label, action: "failed", reason: e.message });
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
102
105
|
}
|
|
106
|
+
results.push({
|
|
107
|
+
kind: "fields",
|
|
108
|
+
label,
|
|
109
|
+
action: "updated",
|
|
110
|
+
reason: formatDiffPath(dp),
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
results.push({ kind: "fields", label, action: "unchanged" });
|
|
103
115
|
}
|
|
104
|
-
results.push({ kind: "fields", label, action: "updated" });
|
|
105
|
-
}
|
|
106
|
-
else {
|
|
107
|
-
results.push({ kind: "fields", label, action: "unchanged" });
|
|
108
116
|
}
|
|
109
117
|
}
|
|
110
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../src/reconcilers/fields.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../src/reconcilers/fields.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diffSubset } from "../diff.js";
|
|
1
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
2
2
|
import { sanitizeForWrite } from "../sanitize.js";
|
|
3
3
|
import { resolveOpSyncIdToServerId } from "../identity.js";
|
|
4
4
|
async function listServerFlows(client) {
|
|
@@ -55,7 +55,8 @@ export async function reconcileFlowsPass1(input) {
|
|
|
55
55
|
// Skip `operation` in this pass — it's handled by Pass 2.
|
|
56
56
|
const { operation: _do, ...desiredForDiff } = payload;
|
|
57
57
|
const { operation: _eo, ...existingForDiff } = existingStripped;
|
|
58
|
-
|
|
58
|
+
const dp = diffSubset(desiredForDiff, existingForDiff);
|
|
59
|
+
if (dp) {
|
|
59
60
|
const id = String(existing.id ?? "");
|
|
60
61
|
if (!input.opts.dryRun) {
|
|
61
62
|
try {
|
|
@@ -66,7 +67,7 @@ export async function reconcileFlowsPass1(input) {
|
|
|
66
67
|
continue;
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
|
-
results.push({ kind: "flows", label, action: "updated" });
|
|
70
|
+
results.push({ kind: "flows", label, action: "updated", reason: formatDiffPath(dp) });
|
|
70
71
|
}
|
|
71
72
|
else {
|
|
72
73
|
results.push({ kind: "flows", label, action: "unchanged" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flows.js","sourceRoot":"","sources":["../../src/reconcilers/flows.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"flows.js","sourceRoot":"","sources":["../../src/reconcilers/flows.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diffSubset } from "../diff.js";
|
|
1
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
2
2
|
import { sanitizeForWrite } from "../sanitize.js";
|
|
3
3
|
import { resolveFlowSyncIdToServerId, resolveOpSyncIdToServerId, } from "../identity.js";
|
|
4
4
|
async function listServerOps(client) {
|
|
@@ -68,7 +68,8 @@ export async function reconcileOperationsPass1(input) {
|
|
|
68
68
|
// Skip resolve/reject in diff — Pass 2 handles those.
|
|
69
69
|
const { resolve: _dr, reject: _dj, ...desiredForDiff } = payload;
|
|
70
70
|
const { resolve: _er, reject: _ej, ...existingForDiff } = existing;
|
|
71
|
-
|
|
71
|
+
const dp = diffSubset(desiredForDiff, existingForDiff);
|
|
72
|
+
if (dp) {
|
|
72
73
|
const id = String(existing.id ?? "");
|
|
73
74
|
if (!input.opts.dryRun) {
|
|
74
75
|
try {
|
|
@@ -84,7 +85,12 @@ export async function reconcileOperationsPass1(input) {
|
|
|
84
85
|
continue;
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
|
-
results.push({
|
|
88
|
+
results.push({
|
|
89
|
+
kind: "operations",
|
|
90
|
+
label,
|
|
91
|
+
action: "updated",
|
|
92
|
+
reason: formatDiffPath(dp),
|
|
93
|
+
});
|
|
88
94
|
}
|
|
89
95
|
else {
|
|
90
96
|
results.push({ kind: "operations", label, action: "unchanged" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/reconcilers/operations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"operations.js","sourceRoot":"","sources":["../../src/reconcilers/operations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,gBAAgB,CAAC;AAiBxB,KAAK,UAAU,aAAa,CAAC,MAAsB;IACjD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACrD,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,GAAgC,CAAC;IAChE,MAAM,IAAI,GAAI,GAA0B,CAAC,IAAI,CAAC;IAC9C,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,IAAkC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxE,CAAC;AAED,SAAS,iBAAiB,CACxB,IAA+B;IAE/B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAmC,CAAC;IACvD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,GAAG,MAAM,CAAE,CAAwB,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,CAAE,CAAuB,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QACvD,IAAI,IAAI,IAAI,GAAG;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,KAA8B;IAE9B,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,MAAM,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAElF,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAE,OAA6B,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,MAAM,CAAE,OAA8B,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,IAAI,CAAC,UAAU;YAAE,SAAS;QACpC,MAAM,KAAK,GAAG,cAAc,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QAE/D,MAAM,YAAY,GAAG,2BAA2B,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7E,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,YAAY;gBAClB,KAAK;gBACL,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,4BAA4B,UAAU,uBAAuB;aACtE,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAA4B;YACvC,GAAG,gBAAgB,CAAC,OAAO,CAAC;YAC5B,IAAI,EAAE,YAAY;YAClB,oEAAoE;YACpE,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;SACb,CAAC;QAEF,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,GAAG,YAAY,KAAK,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC;QAE/E,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBAClD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,YAAY;wBAClB,KAAK;wBACL,MAAM,EAAE,QAAQ;wBAChB,MAAM,EAAG,CAAW,CAAC,OAAO;qBAC7B,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAC/D,SAAS;QACX,CAAC;QAED,sDAAsD;QACtD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC;QACjE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,QAAQ,CAAC;QACnE,MAAM,EAAE,GAAG,UAAU,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QACvD,IAAI,EAAE,EAAE,CAAC;YACP,MAAM,EAAE,GAAG,MAAM,CAAE,QAA6B,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;gBAChE,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,YAAY;wBAClB,KAAK;wBACL,MAAM,EAAE,QAAQ;wBAChB,MAAM,EAAG,CAAW,CAAC,OAAO;qBAC7B,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;YACH,CAAC;YACD,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,YAAY;gBAClB,KAAK;gBACL,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,cAAc,CAAC,EAAE,CAAC;aAC3B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,KAA8B;IAE9B,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,MAAM,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAElF,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAE,OAA6B,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,MAAM,CAAE,OAA8B,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,IAAI,CAAC,UAAU;YAAE,SAAS;QAEpC,MAAM,WAAW,GAAI,OAAiC,CAAC,OAAO,CAAC;QAC/D,MAAM,UAAU,GAAI,OAAgC,CAAC,MAAM,CAAC;QAC5D,IAAI,WAAW,IAAI,IAAI,IAAI,UAAU,IAAI,IAAI;YAAE,SAAS,CAAC,kBAAkB;QAE3E,MAAM,KAAK,GAAG,cAAc,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,cAAc,CAAC;QAC3E,MAAM,YAAY,GAAG,2BAA2B,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7E,IAAI,CAAC,YAAY;YAAE,SAAS,CAAC,8BAA8B;QAE3D,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,GAAG,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,QAAQ;YAAE,SAAS,CAAC,yBAAyB;QAElD,MAAM,aAAa,GAAG,WAAW;YAC/B,CAAC,CAAC,yBAAyB,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC;YAChE,CAAC,CAAC,IAAI,CAAC;QACT,MAAM,YAAY,GAAG,UAAU;YAC7B,CAAC,CAAC,yBAAyB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC;YAC/D,CAAC,CAAC,IAAI,CAAC;QAET,IAAI,WAAW,IAAI,CAAC,aAAa,EAAE,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,YAAY;gBAClB,KAAK;gBACL,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,+BAA+B,WAAW,GAAG;aACtD,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,IAAI,UAAU,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,YAAY;gBAClB,KAAK;gBACL,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,8BAA8B,UAAU,GAAG;aACpD,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,MAAM,cAAc,GAAI,QAAkC,CAAC,OAAO,IAAI,IAAI,CAAC;QAC3E,MAAM,aAAa,GAAI,QAAiC,CAAC,MAAM,IAAI,IAAI,CAAC;QACxE,IAAI,cAAc,KAAK,aAAa,IAAI,aAAa,KAAK,YAAY;YAAE,SAAS;QAEjF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,EAAE,GAAG,MAAM,CAAE,QAA6B,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC;gBACH,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,EAAE;oBAC5C,OAAO,EAAE,aAAa;oBACtB,MAAM,EAAE,YAAY;iBACrB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,YAAY;oBAClB,KAAK;oBACL,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAG,CAAW,CAAC,OAAO;iBAC7B,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;QACH,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diffSubset } from "../diff.js";
|
|
1
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
2
2
|
import { sanitizeForWrite } from "../sanitize.js";
|
|
3
3
|
import { resolvePolicySyncIdToServerId } from "../identity.js";
|
|
4
4
|
async function listServerPermissions(client) {
|
|
@@ -60,26 +60,34 @@ export async function reconcilePermissions(input) {
|
|
|
60
60
|
}
|
|
61
61
|
results.push({ kind: "permissions", label, action: "created" });
|
|
62
62
|
}
|
|
63
|
-
else
|
|
64
|
-
const
|
|
65
|
-
if (
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
63
|
+
else {
|
|
64
|
+
const dp = diffSubset(payload, existing);
|
|
65
|
+
if (dp) {
|
|
66
|
+
const id = String(existing.id ?? "");
|
|
67
|
+
if (!input.opts.dryRun) {
|
|
68
|
+
try {
|
|
69
|
+
await input.client.patch(`/permissions/${id}`, payload);
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
results.push({
|
|
73
|
+
kind: "permissions",
|
|
74
|
+
label,
|
|
75
|
+
action: "failed",
|
|
76
|
+
reason: e.message,
|
|
77
|
+
});
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
77
80
|
}
|
|
81
|
+
results.push({
|
|
82
|
+
kind: "permissions",
|
|
83
|
+
label,
|
|
84
|
+
action: "updated",
|
|
85
|
+
reason: formatDiffPath(dp),
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
results.push({ kind: "permissions", label, action: "unchanged" });
|
|
78
90
|
}
|
|
79
|
-
results.push({ kind: "permissions", label, action: "updated" });
|
|
80
|
-
}
|
|
81
|
-
else {
|
|
82
|
-
results.push({ kind: "permissions", label, action: "unchanged" });
|
|
83
91
|
}
|
|
84
92
|
}
|
|
85
93
|
return results;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/reconcilers/permissions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/reconcilers/permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diffSubset } from "../diff.js";
|
|
1
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
2
2
|
import { sanitizeForWrite } from "../sanitize.js";
|
|
3
3
|
import { resolveRoleSyncIdToServerId } from "../identity.js";
|
|
4
4
|
async function listServerPolicies(client) {
|
|
@@ -83,7 +83,8 @@ export async function reconcilePolicies(input) {
|
|
|
83
83
|
};
|
|
84
84
|
const desiredCmp = stripRoles(payload);
|
|
85
85
|
const existingCmp = stripRoles(existing);
|
|
86
|
-
|
|
86
|
+
const dp = diffSubset(desiredCmp, existingCmp);
|
|
87
|
+
if (dp) {
|
|
87
88
|
const id = String(existing.id ?? "");
|
|
88
89
|
if (!input.opts.dryRun) {
|
|
89
90
|
try {
|
|
@@ -94,7 +95,7 @@ export async function reconcilePolicies(input) {
|
|
|
94
95
|
continue;
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
|
-
results.push({ kind: "policies", label, action: "updated" });
|
|
98
|
+
results.push({ kind: "policies", label, action: "updated", reason: formatDiffPath(dp) });
|
|
98
99
|
}
|
|
99
100
|
else {
|
|
100
101
|
results.push({ kind: "policies", label, action: "unchanged" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policies.js","sourceRoot":"","sources":["../../src/reconcilers/policies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"policies.js","sourceRoot":"","sources":["../../src/reconcilers/policies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diffSubset } from "../diff.js";
|
|
1
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
2
2
|
import { sanitizeForWrite } from "../sanitize.js";
|
|
3
3
|
// Identifier whitelist for building raw ALTER TABLE ADD CONSTRAINT SQL. Every
|
|
4
4
|
// value we splice in comes from a snapshot JSON file in-repo (never user
|
|
@@ -268,29 +268,37 @@ export async function reconcileRelations(input) {
|
|
|
268
268
|
reason: "FK constraint missing in Postgres — recreated via ALTER TABLE ADD CONSTRAINT",
|
|
269
269
|
});
|
|
270
270
|
}
|
|
271
|
-
else
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
271
|
+
else {
|
|
272
|
+
const dp = diffSubset(desiredMeta, existingMeta);
|
|
273
|
+
if (dp) {
|
|
274
|
+
if (!input.opts.dryRun) {
|
|
275
|
+
try {
|
|
276
|
+
// Adopt-schema-only-FK case: when existing.meta is null (relation
|
|
277
|
+
// exists as a Postgres FK constraint but has no directus_relations
|
|
278
|
+
// row), Directus's PATCH endpoint attempts to INSERT the row. It
|
|
279
|
+
// needs the top-level `.collection`/`.field` in the body to derive
|
|
280
|
+
// `directus_relations.many_collection`. Sending only `{meta: ...}`
|
|
281
|
+
// hits NOT_NULL_VIOLATION on many_collection.
|
|
282
|
+
const patchBody = existingMeta && Object.keys(existingMeta).length > 0
|
|
283
|
+
? { meta: desiredMeta }
|
|
284
|
+
: payload;
|
|
285
|
+
await input.client.patch(`/relations/${collection}/${field}`, patchBody);
|
|
286
|
+
}
|
|
287
|
+
catch (e) {
|
|
288
|
+
results.push({ kind: "relations", label, action: "failed", reason: e.message });
|
|
289
|
+
continue;
|
|
290
|
+
}
|
|
288
291
|
}
|
|
292
|
+
results.push({
|
|
293
|
+
kind: "relations",
|
|
294
|
+
label,
|
|
295
|
+
action: "updated",
|
|
296
|
+
reason: `meta.${formatDiffPath(dp)}`,
|
|
297
|
+
});
|
|
298
|
+
}
|
|
299
|
+
else {
|
|
300
|
+
results.push({ kind: "relations", label, action: "unchanged" });
|
|
289
301
|
}
|
|
290
|
-
results.push({ kind: "relations", label, action: "updated" });
|
|
291
|
-
}
|
|
292
|
-
else {
|
|
293
|
-
results.push({ kind: "relations", label, action: "unchanged" });
|
|
294
302
|
}
|
|
295
303
|
}
|
|
296
304
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relations.js","sourceRoot":"","sources":["../../src/reconcilers/relations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"relations.js","sourceRoot":"","sources":["../../src/reconcilers/relations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,8EAA8E;AAC9E,yEAAyE;AACzE,6EAA6E;AAC7E,8EAA8E;AAC9E,wEAAwE;AACxE,MAAM,QAAQ,GAAG,0BAA0B,CAAC;AAE5C,SAAS,WAAW,CAAC,IAAY,EAAE,IAAY;IAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,mCAAmC,IAAI,GAAG,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAQD,uEAAuE;AACvE,uEAAuE;AACvE,2EAA2E;AAC3E,wEAAwE;AACxE,0EAA0E;AAC1E,6CAA6C;AAC7C,KAAK,UAAU,iBAAiB,CAC9B,MAAsB,EACtB,MAAwB;IAExB,wEAAwE;IACxE,0EAA0E;IAC1E,2DAA2D;IAC3D,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrD,sEAAsE;IACtE,wEAAwE;IACxE,4DAA4D;IAC5D,MAAM,KAAK,GACT,6DAA6D;QAC7D,2EAA2E;QAC3E,+CAA+C;QAC/C,+CAA+C;QAC/C,qFAAqF;QACrF,sDAAsD;QACtD,qFAAqF;QACrF,2CAA2C;QAC3C,iCAAiC;QACjC,yBAAyB,QAAQ,GAAG,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,CAAC,CAG/D,CAAC;QACF,MAAM,KAAK,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,CAAC,EAAE,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO;YAAE,OAAO,IAAI,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAgC,CAAC;QACpD,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;YACnC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACnC,MAAM,EAAE,GAAG,GAA8B,CAAC;gBAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;gBAC5C,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM;oBAAE,SAAS;gBAChC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC;oBAAE,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBAC/C,GAAG,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,GAAG,CAAC,MAAM,EAAE;oBAC1B,gBAAgB,EAAE,MAAM,CAAC,EAAE,CAAC,gBAAgB,IAAI,EAAE,CAAC;oBACnD,iBAAiB,EAAE,MAAM,CAAC,EAAE,CAAC,iBAAiB,IAAI,EAAE,CAAC;oBACrD,eAAe,EAAE,MAAM,CAAC,EAAE,CAAC,eAAe,IAAI,EAAE,CAAC;iBAClD,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAQD,2EAA2E;AAC3E,+EAA+E;AAC/E,8DAA8D;AAC9D,6EAA6E;AAC7E,0EAA0E;AAC1E,mDAAmD;AACnD,2EAA2E;AAC3E,2EAA2E;AAC3E,yDAAyD;AACzD,SAAS,qBAAqB,CAAC,KAAqB;IAClD,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC/D,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;IACvB,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAC;IACpF,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,IAAI,IAAI,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACzF,MAAM,cAAc,GAAG,WAAW,CAChC,MAAM,CAAC,CAAC,CAAC,eAAe,IAAI,GAAG,UAAU,IAAI,KAAK,UAAU,CAAC,EAC7D,iBAAiB,CAClB,CAAC;IACF,kFAAkF;IAClF,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;IACjG,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC;IAClE,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC;IAClE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,GAAG,CAAC,CAAC;IACxF,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,GAAG,CAAC,CAAC;IACxF,OAAO,CACL,gBAAgB,UAAU,qBAAqB,cAAc,IAAI;QACjE,iBAAiB,KAAK,kBAAkB,OAAO,MAAM,QAAQ,KAAK;QAClE,aAAa,QAAQ,cAAc,QAAQ,EAAE,CAC9C,CAAC;AACJ,CAAC;AAED,0EAA0E;AAC1E,uEAAuE;AACvE,yEAAyE;AACzE,sEAAsE;AACtE,oEAAoE;AACpE,oCAAoC;AACpC,KAAK,UAAU,gBAAgB,CAC7B,MAAsB,EACtB,UAAkB,EAClB,KAAa,EACb,OAAe,EACf,QAAgB;IAEhB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IACrE,MAAM,KAAK,GACT,mCAAmC,UAAU,MAAM;QACnD,cAAc,OAAO,aAAa,KAAK,UAAU,QAAQ,IAAI;QAC7D,YAAY,KAAK,wBAAwB,QAAQ,WAAW,CAAC;IAC/D,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,CAAC,CAG/D,CAAC;QACF,MAAM,KAAK,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,CAAC,EAAE,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO;YAAE,OAAO,IAAI,CAAC;QAChD,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QACxB,OAAO,oBAAoB,CAAC,qBAAqB,UAAU,IAAI,KAAK,cAAc,OAAO,IAAI,QAAQ,mBAAmB,CAAC;IAC3H,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAA6B;IAE7B,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,uEAAuE;IACvE,wEAAwE;IACxE,iEAAiE;IACjE,sEAAsE;IACtE,kEAAkE;IAClE,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,KAAK,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAClE,IAAI,KAAK,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,SAAS;QACxF,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAI,CAA0C,CAAC,MAAM,CAAC;YAClE,IAAI,MAAM,EAAE,iBAAiB,KAAK,SAAS;gBAAE,SAAS;YACtD,sEAAsE;YACtE,oBAAoB;YACpB,MAAM,QAAQ,GAAG,MAAM,CAAC,kBAAkB,CAAC;YAC3C,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACjF,iBAAiB,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,MAAM,CAAE,CAAyB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACpF,SAAS;YACX,CAAC;YACD,eAAe,EAAE,CAAC;YAClB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAAE,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACnE,2EAA2E;IAC3E,0EAA0E;IAC1E,sBAAsB;IACtB,IAAI,KAAK,KAAK,IAAI,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;QAC1C,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,kEAAkE;YAChE,iEAAiE;YACjE,GAAG,eAAe,gBAAgB,CACrC,CAAC;IACJ,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,aAAa,KAAK,EAAE;YAC3B,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,8DAA8D;SACvE,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;QAClE,IAAI,KAAK,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,SAAS;QACxF,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,MAAM,CAAE,OAA+B,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YACnE,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrB,MAAM,KAAK,GAAG,aAAa,UAAU,IAAI,KAAK,EAAE,CAAC;YACjD,wEAAwE;YACxE,gDAAgD;YAChD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,KAAK,EAAE,CAAC;gBAAE,SAAS;YAEnE,IAAI,QAAwC,CAAC;YAC7C,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,UAAU,IAAI,KAAK,EAAE,CAAC,CAAC;gBACxE,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;YAC7C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAG,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC3F,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAkC,CAAC,CAAC;YACrE,MAAM,WAAW,GAAI,OAAO,CAAC,IAA4C,IAAI,EAAE,CAAC;YAChF,MAAM,YAAY,GAAI,QAAQ,EAAE,IAA4C,IAAI,EAAE,CAAC;YACnF,MAAM,aAAa,GAAG,OAAO,CAAC,MAA6C,CAAC;YAE5E,sEAAsE;YACtE,mEAAmE;YACnE,sEAAsE;YACtE,qBAAqB;YACrB,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,IAAI,eAAmC,CAAC;YACxC,IAAI,QAAQ,KAAK,IAAI,IAAI,KAAK,IAAI,aAAa,EAAE,iBAAiB,EAAE,CAAC;gBACnE,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;gBAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC,kBAAkB,IAAI,IAAI,CAAC,CAAC;gBACxE,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;gBACjD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO,GAAG,IAAI,CAAC;gBACjB,CAAC;qBAAM,IACL,MAAM,CAAC,gBAAgB,KAAK,aAAa;oBACzC,MAAM,CAAC,iBAAiB,KAAK,cAAc,EAC3C,CAAC;oBACD,iEAAiE;oBACjE,kEAAkE;oBAClE,kDAAkD;oBAClD,OAAO,GAAG,KAAK,CAAC;oBAChB,eAAe,GAAG,SAAS,UAAU,IAAI,KAAK,cAAc,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,iBAAiB,sBAAsB,aAAa,IAAI,cAAc,8BAA8B,CAAC;gBACrM,CAAC;YACH,CAAC;YAED,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACvB,IAAI,CAAC;wBACH,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBACjD,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAG,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;wBAC3F,SAAS;oBACX,CAAC;gBACH,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAChE,CAAC;iBAAM,IAAI,eAAe,EAAE,CAAC;gBAC3B,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;YACxF,CAAC;iBAAM,IAAI,OAAO,EAAE,CAAC;gBACnB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACvB,IAAI,CAAC;wBACH,MAAM,GAAG,GAAG,qBAAqB,CAAC;4BAChC,UAAU;4BACV,KAAK;4BACL,MAAM,EAAE,aAAwC;yBACjD,CAAC,CAAC;wBACH,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAG1E,CAAC;wBACF,MAAM,KAAK,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;wBAC9B,IAAI,CAAC,CAAC,EAAE,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;4BACnC,MAAM,UAAU,GAAG,KAAK,EAAE,KAAK,IAAI,gCAAgC,CAAC;4BACpE,8DAA8D;4BAC9D,8DAA8D;4BAC9D,6CAA6C;4BAC7C,MAAM,UAAU,GAAG,MAAM,gBAAgB,CACvC,KAAK,CAAC,MAAM,EACZ,UAAU,EACV,KAAK,EACL,MAAM,CAAC,aAAc,CAAC,iBAAiB,CAAC,EACxC,MAAM,CAAC,aAAc,CAAC,kBAAkB,IAAI,IAAI,CAAC,CAClD,CAAC;4BACF,OAAO,CAAC,IAAI,CAAC;gCACX,IAAI,EAAE,WAAW;gCACjB,KAAK;gCACL,MAAM,EAAE,QAAQ;gCAChB,MAAM,EAAE,GAAG,UAAU,GAAG,UAAU,IAAI,EAAE,EAAE;6BAC3C,CAAC,CAAC;4BACH,SAAS;wBACX,CAAC;oBACH,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAG,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;wBAC3F,SAAS;oBACX,CAAC;gBACH,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,WAAW;oBACjB,KAAK;oBACL,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,8EAA8E;iBACvF,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,GAAG,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;gBACjD,IAAI,EAAE,EAAE,CAAC;oBACP,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;wBACvB,IAAI,CAAC;4BACH,kEAAkE;4BAClE,mEAAmE;4BACnE,iEAAiE;4BACjE,mEAAmE;4BACnE,mEAAmE;4BACnE,8CAA8C;4BAC9C,MAAM,SAAS,GAAG,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC;gCACpE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE;gCACvB,CAAC,CAAC,OAAO,CAAC;4BACZ,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,UAAU,IAAI,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;wBAC3E,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAG,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;4BAC3F,SAAS;wBACX,CAAC;oBACH,CAAC;oBACD,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,WAAW;wBACjB,KAAK;wBACL,MAAM,EAAE,SAAS;wBACjB,MAAM,EAAE,QAAQ,cAAc,CAAC,EAAE,CAAC,EAAE;qBACrC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;gBAClE,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diffSubset } from "../diff.js";
|
|
1
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
2
2
|
import { sanitizeForWrite } from "../sanitize.js";
|
|
3
3
|
async function listServerRoles(client) {
|
|
4
4
|
const raw = await client.get("/roles?limit=-1");
|
|
@@ -49,21 +49,24 @@ export async function reconcileRoles(input) {
|
|
|
49
49
|
}
|
|
50
50
|
results.push({ kind: "roles", label, action: "created" });
|
|
51
51
|
}
|
|
52
|
-
else
|
|
53
|
-
const
|
|
54
|
-
if (
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
52
|
+
else {
|
|
53
|
+
const dp = diffSubset(payload, existing);
|
|
54
|
+
if (dp) {
|
|
55
|
+
const id = String(existing.id ?? "");
|
|
56
|
+
if (!input.opts.dryRun) {
|
|
57
|
+
try {
|
|
58
|
+
await input.client.patch(`/roles/${id}`, payload);
|
|
59
|
+
}
|
|
60
|
+
catch (e) {
|
|
61
|
+
results.push({ kind: "roles", label, action: "failed", reason: e.message });
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
61
64
|
}
|
|
65
|
+
results.push({ kind: "roles", label, action: "updated", reason: formatDiffPath(dp) });
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
results.push({ kind: "roles", label, action: "unchanged" });
|
|
62
69
|
}
|
|
63
|
-
results.push({ kind: "roles", label, action: "updated" });
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
results.push({ kind: "roles", label, action: "unchanged" });
|
|
67
70
|
}
|
|
68
71
|
}
|
|
69
72
|
return results;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/reconcilers/roles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/reconcilers/roles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { readdir, readFile } from "node:fs/promises";
|
|
2
2
|
import { join } from "node:path";
|
|
3
|
-
import { diffSubset } from "../diff.js";
|
|
3
|
+
import { diffSubset, formatDiffPath } from "../diff.js";
|
|
4
4
|
// Seed data reconciler for the LOLA convention (Tractr-style seed files under
|
|
5
5
|
// directus_config/seed/*.json). Each file shape:
|
|
6
6
|
//
|
|
@@ -135,7 +135,8 @@ export async function reconcileSeeds(input) {
|
|
|
135
135
|
results.push({ kind: "seeds", label, action: "unchanged" });
|
|
136
136
|
continue;
|
|
137
137
|
}
|
|
138
|
-
|
|
138
|
+
const dp = diffSubset(payload, existing);
|
|
139
|
+
if (dp) {
|
|
139
140
|
if (!input.opts.dryRun) {
|
|
140
141
|
try {
|
|
141
142
|
await input.client.patch(`/items/${collection}/${encodeURIComponent(String(id))}`, payload);
|
|
@@ -150,7 +151,7 @@ export async function reconcileSeeds(input) {
|
|
|
150
151
|
continue;
|
|
151
152
|
}
|
|
152
153
|
}
|
|
153
|
-
results.push({ kind: "seeds", label, action: "updated" });
|
|
154
|
+
results.push({ kind: "seeds", label, action: "updated", reason: formatDiffPath(dp) });
|
|
154
155
|
}
|
|
155
156
|
else {
|
|
156
157
|
results.push({ kind: "seeds", label, action: "unchanged" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seeds.js","sourceRoot":"","sources":["../../src/reconcilers/seeds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"seeds.js","sourceRoot":"","sources":["../../src/reconcilers/seeds.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAExD,8EAA8E;AAC9E,iDAAiD;AACjD,EAAE;AACF,MAAM;AACN,2CAA2C;AAC3C,0DAA0D;AAC1D,kEAAkE;AAClE,uDAAuD;AACvD,MAAM;AACN,EAAE;AACF,6EAA6E;AAC7E,8EAA8E;AAC9E,yEAAyE;AACzE,2EAA2E;AAC3E,8DAA8D;AAE9D,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC;IACpC,UAAU;IACV,cAAc;IACd,cAAc;IACd,cAAc;IACd,cAAc;CACf,CAAC,CAAC;AAkBH,KAAK,UAAU,aAAa,CAAC,GAAW;IACtC,IAAI,OAAiB,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAChE,MAAM,GAAG,GAAe,EAAE,CAAC;IAC3B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAa,CAAC;YAC5E,IAAI,MAAM,EAAE,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzE,CAAC;QAAC,MAAM,CAAC;YACP,sDAAsD;QACxD,CAAC;IACH,CAAC;IACD,mEAAmE;IACnE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9E,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,eAAe,CAAC,GAA4B;IACnD,MAAM,GAAG,GAA4B,EAAE,CAAC;IACxC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACzC,IAAI,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,SAAS;QAC3C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,MAAsB,EACtB,UAAkB;IAElB,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,UAAU,UAAU,WAAW,CAAC,CAAC;IAC9D,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,GAAgC,CAAC;IAChE,MAAM,IAAI,GAAI,GAA0B,CAAC,IAAI,CAAC;IAC9C,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,IAAkC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxE,CAAC;AAED,SAAS,SAAS,CAChB,IAA+B;IAE/B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAmC,CAAC;IACvD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,EAAE,GAAI,CAAsB,CAAC,EAAE,CAAC;QACtC,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,IAAI;YAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAAyB;IAC5D,MAAM,OAAO,GAAmB,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IAEvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC;QAE3C,IAAI,MAAiC,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,SAAS,UAAU,EAAE;gBAC5B,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAG,CAAW,CAAC,OAAO;aAC7B,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QAE/B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;YACrC,MAAM,EAAE,GAAI,MAA2B,CAAC,EAAE,CAAC;YAC3C,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,IAAI;gBAAE,SAAS;YAC9C,MAAM,KAAK,GAAG,SAAS,UAAU,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC;YACnD,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;YAEtC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO,CAAC,IAAI,CAAC;wBACX,IAAI,EAAE,OAAO;wBACb,KAAK;wBACL,MAAM,EAAE,SAAS;wBACjB,MAAM,EAAE,mBAAmB;qBAC5B,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACvB,IAAI,CAAC;wBACH,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,UAAU,EAAE,EAAE,OAAO,CAAC,CAAC;oBAC3D,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,CAAC,IAAI,CAAC;4BACX,IAAI,EAAE,OAAO;4BACb,KAAK;4BACL,MAAM,EAAE,QAAQ;4BAChB,MAAM,EAAG,CAAW,CAAC,OAAO;yBAC7B,CAAC,CAAC;wBACH,SAAS;oBACX,CAAC;gBACH,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAC1D,SAAS;YACX,CAAC;YAED,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC5D,SAAS;YACX,CAAC;YAED,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACzC,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACvB,IAAI,CAAC;wBACH,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,UAAU,IAAI,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;oBAC9F,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,OAAO,CAAC,IAAI,CAAC;4BACX,IAAI,EAAE,OAAO;4BACb,KAAK;4BACL,MAAM,EAAE,QAAQ;4BAChB,MAAM,EAAG,CAAW,CAAC,OAAO;yBAC7B,CAAC,CAAC;wBACH,SAAS;oBACX,CAAC;gBACH,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACxF,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "directus-deploy-cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.0",
|
|
4
4
|
"description": "Per-entity, non-atomic Directus deployment tool. Reconciles collections/fields/relations/roles/policies/permissions/flows/operations/migrations/seeds from git to any environment.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|