sf-plugin-permission-sets 0.0.0-dev.70 → 0.0.0-dev.74
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/README.md +39 -10
- package/lib/adapters/connection-org-client.d.ts +5 -5
- package/lib/adapters/connection-org-client.d.ts.map +1 -1
- package/lib/adapters/connection-org-client.js +29 -20
- package/lib/adapters/connection-org-client.js.map +1 -1
- package/lib/commands/ps/apply.d.ts.map +1 -1
- package/lib/commands/ps/apply.js +7 -6
- package/lib/commands/ps/apply.js.map +1 -1
- package/lib/commands/ps/check.d.ts.map +1 -1
- package/lib/commands/ps/check.js +3 -3
- package/lib/commands/ps/check.js.map +1 -1
- package/lib/commands/ps/export.js +2 -2
- package/lib/commands/ps/export.js.map +1 -1
- package/lib/commands/ps/plan.d.ts +2 -2
- package/lib/commands/ps/plan.d.ts.map +1 -1
- package/lib/commands/ps/plan.js +29 -48
- package/lib/commands/ps/plan.js.map +1 -1
- package/lib/commands/ps/validate.d.ts.map +1 -1
- package/lib/commands/ps/validate.js +3 -3
- package/lib/commands/ps/validate.js.map +1 -1
- package/lib/core/diff.d.ts +37 -1
- package/lib/core/diff.d.ts.map +1 -1
- package/lib/core/diff.js +67 -3
- package/lib/core/diff.js.map +1 -1
- package/lib/core/finding.d.ts +9 -7
- package/lib/core/finding.d.ts.map +1 -1
- package/lib/core/finding.js +7 -7
- package/lib/core/finding.js.map +1 -1
- package/lib/core/index.d.ts +4 -3
- package/lib/core/index.d.ts.map +1 -1
- package/lib/core/index.js +3 -2
- package/lib/core/index.js.map +1 -1
- package/lib/core/load.js +1 -1
- package/lib/core/load.js.map +1 -1
- package/lib/core/model.d.ts +16 -17
- package/lib/core/model.d.ts.map +1 -1
- package/lib/core/normalize.d.ts.map +1 -1
- package/lib/core/normalize.js +7 -5
- package/lib/core/normalize.js.map +1 -1
- package/lib/core/report.d.ts +2 -1
- package/lib/core/report.d.ts.map +1 -1
- package/lib/core/report.js +17 -12
- package/lib/core/report.js.map +1 -1
- package/lib/core/resolve.d.ts +8 -6
- package/lib/core/resolve.d.ts.map +1 -1
- package/lib/core/resolve.js +18 -14
- package/lib/core/resolve.js.map +1 -1
- package/lib/core/serialize.d.ts.map +1 -1
- package/lib/core/serialize.js +29 -15
- package/lib/core/serialize.js.map +1 -1
- package/lib/core/target-name.d.ts +20 -0
- package/lib/core/target-name.d.ts.map +1 -0
- package/lib/core/target-name.js +32 -0
- package/lib/core/target-name.js.map +1 -0
- package/lib/core/username.d.ts +23 -0
- package/lib/core/username.d.ts.map +1 -0
- package/lib/core/username.js +35 -0
- package/lib/core/username.js.map +1 -0
- package/lib/services/adapters/org-client.d.ts +5 -5
- package/lib/services/adapters/org-client.d.ts.map +1 -1
- package/lib/services/apply.d.ts +0 -6
- package/lib/services/apply.d.ts.map +1 -1
- package/lib/services/apply.js +9 -12
- package/lib/services/apply.js.map +1 -1
- package/lib/services/export.d.ts.map +1 -1
- package/lib/services/export.js +3 -2
- package/lib/services/export.js.map +1 -1
- package/lib/services/plan.d.ts +4 -11
- package/lib/services/plan.d.ts.map +1 -1
- package/lib/services/plan.js +9 -16
- package/lib/services/plan.js.map +1 -1
- package/lib/services/resolution.d.ts +17 -10
- package/lib/services/resolution.d.ts.map +1 -1
- package/lib/services/resolution.js +31 -15
- package/lib/services/resolution.js.map +1 -1
- package/lib/services/validate.d.ts +2 -2
- package/lib/services/validate.d.ts.map +1 -1
- package/lib/services/validate.js.map +1 -1
- package/package.json +3 -3
- package/lib/core/mode.d.ts +0 -18
- package/lib/core/mode.d.ts.map +0 -1
- package/lib/core/mode.js +0 -16
- package/lib/core/mode.js.map +0 -1
package/lib/commands/ps/plan.js
CHANGED
|
@@ -33,16 +33,15 @@ export default class Plan extends SfCommand {
|
|
|
33
33
|
const connection = targetOrg.getConnection();
|
|
34
34
|
const orgClient = new ConnectionOrgClient(connection);
|
|
35
35
|
const service = new PlanService(orgClient);
|
|
36
|
-
const result = await service.run(flags.file
|
|
36
|
+
const result = await service.run(flags.file);
|
|
37
37
|
for (const line of formatFindings(result.findings)) {
|
|
38
38
|
this.log(line);
|
|
39
39
|
}
|
|
40
40
|
const diff = result.diff;
|
|
41
|
+
const scoped = diff.scopeTo(mode);
|
|
41
42
|
const orgId = targetOrg.getOrgId();
|
|
42
43
|
const username = targetOrg.getUsername() ?? '';
|
|
43
44
|
const orgName = username || orgId;
|
|
44
|
-
const actionable = this.actionable(diff, mode);
|
|
45
|
-
const usersAffected = new Set(actionable.map((assignment) => assignment.assignee.toLowerCase())).size;
|
|
46
45
|
const summary = {
|
|
47
46
|
org: { username, id: orgId },
|
|
48
47
|
mode,
|
|
@@ -51,9 +50,9 @@ export default class Plan extends SfCommand {
|
|
|
51
50
|
toUpdate: diff.toUpdate.length,
|
|
52
51
|
toRemove: diff.toRemove.length,
|
|
53
52
|
unchanged: diff.unchanged.length,
|
|
54
|
-
usersAffected,
|
|
53
|
+
usersAffected: scoped.usersAffected,
|
|
55
54
|
},
|
|
56
|
-
drift:
|
|
55
|
+
drift: scoped.drift,
|
|
57
56
|
changes: {
|
|
58
57
|
toAdd: diff.toAdd,
|
|
59
58
|
toUpdate: diff.toUpdate,
|
|
@@ -69,23 +68,21 @@ export default class Plan extends SfCommand {
|
|
|
69
68
|
}
|
|
70
69
|
this.logPlan({
|
|
71
70
|
diff,
|
|
71
|
+
scoped,
|
|
72
72
|
mode,
|
|
73
73
|
orgName,
|
|
74
74
|
orgId,
|
|
75
75
|
files: flags.file,
|
|
76
76
|
showUnchanged: flags['show-unchanged'],
|
|
77
|
-
actionable,
|
|
78
|
-
usersAffected,
|
|
79
77
|
});
|
|
80
78
|
return summary;
|
|
81
79
|
}
|
|
82
80
|
/** Render the human-readable plan body once the run is known to be valid. */
|
|
83
81
|
logPlan(args) {
|
|
84
|
-
const { diff, mode, orgName, orgId, files, showUnchanged
|
|
82
|
+
const { diff, scoped, mode, orgName, orgId, files, showUnchanged } = args;
|
|
85
83
|
this.logHeaderTitle();
|
|
86
84
|
this.logHeaderOrg(orgName, orgId, mode);
|
|
87
|
-
|
|
88
|
-
if (totalChanges === 0) {
|
|
85
|
+
if (diff.changeCount === 0) {
|
|
89
86
|
if (showUnchanged && diff.unchanged.length > 0) {
|
|
90
87
|
this.logBody(formatDiff(diff, { mode, showUnchanged: true }));
|
|
91
88
|
}
|
|
@@ -96,33 +93,18 @@ export default class Plan extends SfCommand {
|
|
|
96
93
|
return;
|
|
97
94
|
}
|
|
98
95
|
this.logBody(formatDiff(diff, { mode, showUnchanged }));
|
|
99
|
-
if (
|
|
96
|
+
if (scoped.count === 0) {
|
|
100
97
|
this.logEmptyNothingToApply(mode);
|
|
101
98
|
}
|
|
102
99
|
else {
|
|
103
|
-
this.log(this.countsLine(
|
|
100
|
+
this.log(this.countsLine(scoped, mode));
|
|
104
101
|
}
|
|
105
|
-
this.reportDrift(
|
|
102
|
+
this.reportDrift(scoped.drift);
|
|
106
103
|
this.reportUnchanged(diff.unchanged.length, showUnchanged);
|
|
107
|
-
if (
|
|
104
|
+
if (scoped.count > 0) {
|
|
108
105
|
this.logSummaryNext(this.applyCommand(orgName, files, mode));
|
|
109
106
|
}
|
|
110
107
|
}
|
|
111
|
-
/** The assignments the chosen mode would actually act on. */
|
|
112
|
-
actionable(diff, mode) {
|
|
113
|
-
if (mode === 'destructive')
|
|
114
|
-
return diff.toRemove;
|
|
115
|
-
if (mode === 'additive')
|
|
116
|
-
return [
|
|
117
|
-
...diff.toAdd,
|
|
118
|
-
...diff.toUpdate,
|
|
119
|
-
];
|
|
120
|
-
return [
|
|
121
|
-
...diff.toAdd,
|
|
122
|
-
...diff.toUpdate,
|
|
123
|
-
...diff.toRemove,
|
|
124
|
-
];
|
|
125
|
-
}
|
|
126
108
|
logBody(body) {
|
|
127
109
|
this.log('');
|
|
128
110
|
for (const line of body)
|
|
@@ -130,36 +112,35 @@ export default class Plan extends SfCommand {
|
|
|
130
112
|
if (body.length > 0)
|
|
131
113
|
this.log('');
|
|
132
114
|
}
|
|
133
|
-
|
|
115
|
+
/** The counts line reports what the mode acts on, so it never contradicts the body above it. */
|
|
116
|
+
countsLine(scoped, mode) {
|
|
134
117
|
if (mode === 'destructive') {
|
|
135
118
|
return messages.getMessage('summary.counts.destructive', [
|
|
136
|
-
|
|
137
|
-
usersAffected,
|
|
119
|
+
scoped.removals.length,
|
|
120
|
+
scoped.usersAffected,
|
|
138
121
|
]);
|
|
139
122
|
}
|
|
140
123
|
if (mode === 'additive') {
|
|
141
124
|
return messages.getMessage('summary.counts.additive', [
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
usersAffected,
|
|
125
|
+
scoped.additions.length,
|
|
126
|
+
scoped.updates.length,
|
|
127
|
+
scoped.usersAffected,
|
|
145
128
|
]);
|
|
146
129
|
}
|
|
147
130
|
return messages.getMessage('summary.counts.sync', [
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
usersAffected,
|
|
131
|
+
scoped.additions.length,
|
|
132
|
+
scoped.updates.length,
|
|
133
|
+
scoped.removals.length,
|
|
134
|
+
scoped.usersAffected,
|
|
152
135
|
]);
|
|
153
136
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
this.logDriftDestructive(skipped);
|
|
162
|
-
}
|
|
137
|
+
/** Drift is already mode-scoped: only additive leaves removes, only destructive leaves adds. */
|
|
138
|
+
reportDrift(drift) {
|
|
139
|
+
if (drift.removes > 0)
|
|
140
|
+
this.logDriftAdditive(drift.removes);
|
|
141
|
+
const skipped = drift.adds + drift.updates;
|
|
142
|
+
if (skipped > 0)
|
|
143
|
+
this.logDriftDestructive(skipped);
|
|
163
144
|
}
|
|
164
145
|
reportUnchanged(count, showUnchanged) {
|
|
165
146
|
if (count === 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/commands/ps/plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EACH,UAAU,EACV,cAAc,
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../../src/commands/ps/plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/ps/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAS,MAAM,6BAA6B,CAAC;AAK/D,OAAO,
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/ps/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAS,MAAM,6BAA6B,CAAC;AAK/D,OAAO,EAAqC,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAKjF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,SAAS,CAAC,gBAAgB,CAAC;IAC7D,gBAAuB,OAAO,SAAkC;IAChE,gBAAuB,WAAW,SAAsC;IACxE,gBAAuB,QAAQ,WAAoC;IAEnE,gBAAuB,KAAK;;;MAQ1B;IAEW,GAAG,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAgC7C,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,WAAW;CAGtB"}
|
|
@@ -2,7 +2,7 @@ import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
|
|
|
2
2
|
import { Messages } from '@salesforce/core';
|
|
3
3
|
import { ConnectionOrgClient } from '../../adapters/index.js';
|
|
4
4
|
import { ValidateService } from '../../services/index.js';
|
|
5
|
-
import { formatFindings } from '../../core/index.js';
|
|
5
|
+
import { distinctAssignees, formatFindings } from '../../core/index.js';
|
|
6
6
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
7
7
|
const messages = Messages.loadMessages('sf-plugin-permission-sets', 'ps.validate');
|
|
8
8
|
export default class Validate extends SfCommand {
|
|
@@ -27,7 +27,7 @@ export default class Validate extends SfCommand {
|
|
|
27
27
|
for (const line of formatFindings(result.findings)) {
|
|
28
28
|
this.log(line);
|
|
29
29
|
}
|
|
30
|
-
const assignees =
|
|
30
|
+
const assignees = distinctAssignees(result.assignments);
|
|
31
31
|
this.log('');
|
|
32
32
|
this.logSummaryCounts(result.errors, result.warnings);
|
|
33
33
|
if (result.failed) {
|
|
@@ -38,7 +38,7 @@ export default class Validate extends SfCommand {
|
|
|
38
38
|
}
|
|
39
39
|
return {
|
|
40
40
|
files: result.files.length,
|
|
41
|
-
users: assignees.
|
|
41
|
+
users: assignees.length,
|
|
42
42
|
assignments: result.assignments.length,
|
|
43
43
|
findings: result.findings,
|
|
44
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/commands/ps/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAW,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/commands/ps/validate.ts"],"names":[],"mappings":"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"}
|
package/lib/core/diff.d.ts
CHANGED
|
@@ -1,4 +1,40 @@
|
|
|
1
|
-
import { ActualAssignment, DesiredAssignment,
|
|
1
|
+
import { ActualAssignment, AssignmentUpdate, DesiredAssignment, ReconcileMode } from './model.js';
|
|
2
|
+
/** What a mode deliberately leaves alone, reported beneath a plan as drift. */
|
|
3
|
+
export type Drift = {
|
|
4
|
+
adds: number;
|
|
5
|
+
updates: number;
|
|
6
|
+
removes: number;
|
|
7
|
+
};
|
|
8
|
+
/** A diff narrowed to one mode: what that mode acts on, and the drift it leaves behind. */
|
|
9
|
+
export declare class ScopedChange {
|
|
10
|
+
readonly additions: DesiredAssignment[];
|
|
11
|
+
readonly updates: AssignmentUpdate[];
|
|
12
|
+
readonly removals: ActualAssignment[];
|
|
13
|
+
readonly drift: Drift;
|
|
14
|
+
constructor(additions: DesiredAssignment[], updates: AssignmentUpdate[], removals: ActualAssignment[], drift: Drift);
|
|
15
|
+
/** How many assignments this mode would act on. */
|
|
16
|
+
get count(): number;
|
|
17
|
+
/** How many distinct users this mode would touch. */
|
|
18
|
+
get usersAffected(): number;
|
|
19
|
+
}
|
|
20
|
+
/** The change set between the desired model and the org's current state. */
|
|
21
|
+
export declare class Diff {
|
|
22
|
+
readonly toAdd: DesiredAssignment[];
|
|
23
|
+
readonly toUpdate: AssignmentUpdate[];
|
|
24
|
+
readonly toRemove: ActualAssignment[];
|
|
25
|
+
readonly unchanged: ActualAssignment[];
|
|
26
|
+
constructor(toAdd: DesiredAssignment[], toUpdate: AssignmentUpdate[], toRemove: ActualAssignment[], unchanged: ActualAssignment[]);
|
|
27
|
+
/** The diff of a run that aborted before it ever reached the org. */
|
|
28
|
+
static empty(): Diff;
|
|
29
|
+
/** How many assignments differ, whatever the mode would act on. */
|
|
30
|
+
get changeCount(): number;
|
|
31
|
+
/**
|
|
32
|
+
* Narrow the diff to what the chosen mode acts on: additive skips removals,
|
|
33
|
+
* destructive skips adds and updates, sync acts on all. Whatever the mode skips
|
|
34
|
+
* comes back as drift, so plan and apply report it rather than hiding it.
|
|
35
|
+
*/
|
|
36
|
+
scopeTo(mode: ReconcileMode): ScopedChange;
|
|
37
|
+
}
|
|
2
38
|
/**
|
|
3
39
|
* Compare the desired assignments against the org's current memberships of the
|
|
4
40
|
* managed targets. `actual` must hold only assignments for targets that appear
|
package/lib/core/diff.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/core/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/core/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAQ,aAAa,EAAE,MAAM,YAAY,CAAC;AAIxG,+EAA+E;AAC/E,MAAM,MAAM,KAAK,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,2FAA2F;AAC3F,qBAAa,YAAY;aAED,SAAS,EAAE,iBAAiB,EAAE;aAC9B,OAAO,EAAE,gBAAgB,EAAE;aAC3B,QAAQ,EAAE,gBAAgB,EAAE;aAC5B,KAAK,EAAE,KAAK;gBAHZ,SAAS,EAAE,iBAAiB,EAAE,EAC9B,OAAO,EAAE,gBAAgB,EAAE,EAC3B,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,KAAK,EAAE,KAAK;IAGhC,mDAAmD;IACnD,IAAW,KAAK,IAAI,MAAM,CAEzB;IAED,qDAAqD;IACrD,IAAW,aAAa,IAAI,MAAM,CASjC;CACJ;AAED,4EAA4E;AAC5E,qBAAa,IAAI;aAEO,KAAK,EAAE,iBAAiB,EAAE;aAC1B,QAAQ,EAAE,gBAAgB,EAAE;aAC5B,QAAQ,EAAE,gBAAgB,EAAE;aAC5B,SAAS,EAAE,gBAAgB,EAAE;gBAH7B,KAAK,EAAE,iBAAiB,EAAE,EAC1B,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,SAAS,EAAE,gBAAgB,EAAE;IAGjD,qEAAqE;WACvD,KAAK,IAAI,IAAI;IAI3B,mEAAmE;IACnE,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED;;;;OAIG;IACI,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,YAAY;CAYpD;AAeD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAsC9F"}
|
package/lib/core/diff.js
CHANGED
|
@@ -1,6 +1,70 @@
|
|
|
1
|
-
/**
|
|
1
|
+
/** A diff narrowed to one mode: what that mode acts on, and the drift it leaves behind. */
|
|
2
|
+
export class ScopedChange {
|
|
3
|
+
additions;
|
|
4
|
+
updates;
|
|
5
|
+
removals;
|
|
6
|
+
drift;
|
|
7
|
+
constructor(additions, updates, removals, drift) {
|
|
8
|
+
this.additions = additions;
|
|
9
|
+
this.updates = updates;
|
|
10
|
+
this.removals = removals;
|
|
11
|
+
this.drift = drift;
|
|
12
|
+
}
|
|
13
|
+
/** How many assignments this mode would act on. */
|
|
14
|
+
get count() {
|
|
15
|
+
return this.additions.length + this.updates.length + this.removals.length;
|
|
16
|
+
}
|
|
17
|
+
/** How many distinct users this mode would touch. */
|
|
18
|
+
get usersAffected() {
|
|
19
|
+
const acted = [
|
|
20
|
+
...this.additions,
|
|
21
|
+
...this.updates,
|
|
22
|
+
...this.removals,
|
|
23
|
+
];
|
|
24
|
+
const assignees = new Set(acted.map((assignment) => assignment.assignee.asKey()));
|
|
25
|
+
return assignees.size;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
/** The change set between the desired model and the org's current state. */
|
|
29
|
+
export class Diff {
|
|
30
|
+
toAdd;
|
|
31
|
+
toUpdate;
|
|
32
|
+
toRemove;
|
|
33
|
+
unchanged;
|
|
34
|
+
constructor(toAdd, toUpdate, toRemove, unchanged) {
|
|
35
|
+
this.toAdd = toAdd;
|
|
36
|
+
this.toUpdate = toUpdate;
|
|
37
|
+
this.toRemove = toRemove;
|
|
38
|
+
this.unchanged = unchanged;
|
|
39
|
+
}
|
|
40
|
+
/** The diff of a run that aborted before it ever reached the org. */
|
|
41
|
+
static empty() {
|
|
42
|
+
return new Diff([], [], [], []);
|
|
43
|
+
}
|
|
44
|
+
/** How many assignments differ, whatever the mode would act on. */
|
|
45
|
+
get changeCount() {
|
|
46
|
+
return this.toAdd.length + this.toUpdate.length + this.toRemove.length;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Narrow the diff to what the chosen mode acts on: additive skips removals,
|
|
50
|
+
* destructive skips adds and updates, sync acts on all. Whatever the mode skips
|
|
51
|
+
* comes back as drift, so plan and apply report it rather than hiding it.
|
|
52
|
+
*/
|
|
53
|
+
scopeTo(mode) {
|
|
54
|
+
const additions = mode === 'destructive' ? [] : this.toAdd;
|
|
55
|
+
const updates = mode === 'destructive' ? [] : this.toUpdate;
|
|
56
|
+
const removals = mode === 'additive' ? [] : this.toRemove;
|
|
57
|
+
const drift = {
|
|
58
|
+
adds: mode === 'destructive' ? this.toAdd.length : 0,
|
|
59
|
+
updates: mode === 'destructive' ? this.toUpdate.length : 0,
|
|
60
|
+
removes: mode === 'additive' ? this.toRemove.length : 0,
|
|
61
|
+
};
|
|
62
|
+
return new ScopedChange(additions, updates, removals, drift);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/** Key for an (assignee, kind, target) tuple, off the identifiers' own comparison keys. */
|
|
2
66
|
function assignmentKey(assignee, kind, target) {
|
|
3
|
-
return `${assignee.
|
|
67
|
+
return `${assignee.asKey()} ${kind} ${target.asKey()}`;
|
|
4
68
|
}
|
|
5
69
|
/** Whether two expirations name the same instant. Both absent (null) counts as equal. */
|
|
6
70
|
function sameExpiration(left, right) {
|
|
@@ -49,6 +113,6 @@ export function diffAssignments(desired, actual) {
|
|
|
49
113
|
}
|
|
50
114
|
}
|
|
51
115
|
const toRemove = actual.filter((assignment) => !desiredKeys.has(assignmentKey(assignment.assignee, assignment.kind, assignment.target)));
|
|
52
|
-
return
|
|
116
|
+
return new Diff(toAdd, toUpdate, toRemove, unchanged);
|
|
53
117
|
}
|
|
54
118
|
//# sourceMappingURL=diff.js.map
|
package/lib/core/diff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/core/diff.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/core/diff.ts"],"names":[],"mappings":"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"}
|
package/lib/core/finding.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { TargetName } from './target-name.js';
|
|
2
|
+
import { Username } from './username.js';
|
|
1
3
|
type FindingLevel = 'error' | 'warning';
|
|
2
4
|
/** The closed vocabulary of finding codes. Adding one here is required to emit it. */
|
|
3
5
|
type FindingCode = 'YAML' | 'EMPTY_FILE' | 'SCHEMA' | 'EMPTY_LIST' | 'DUP_TARGET' | 'EMPTY_USER' | 'NO_FILES' | 'USER_NOT_FOUND' | 'USER_INACTIVE' | 'TARGET_NOT_FOUND' | 'TARGET_AMBIGUOUS';
|
|
@@ -15,21 +17,21 @@ export declare function emptyFileWarning(file: string): Finding;
|
|
|
15
17
|
/** The file violates the schema at `path`. */
|
|
16
18
|
export declare function schemaError(path: string, message: string, file: string): Finding;
|
|
17
19
|
/** A scope key is present but its list is empty. */
|
|
18
|
-
export declare function emptyListWarning(username:
|
|
20
|
+
export declare function emptyListWarning(username: Username, scopeKey: string, file: string): Finding;
|
|
19
21
|
/** A target appears more than once under one scope for one user. */
|
|
20
|
-
export declare function dupTargetWarning(username:
|
|
22
|
+
export declare function dupTargetWarning(username: Username, target: TargetName, scopeKey: string, file: string): Finding;
|
|
21
23
|
/** A user declares no scopes at all. */
|
|
22
|
-
export declare function emptyUserWarning(username:
|
|
24
|
+
export declare function emptyUserWarning(username: Username, file: string): Finding;
|
|
23
25
|
/** No file on disk matched the given glob patterns. */
|
|
24
26
|
export declare function noFilesError(patterns: string[]): Finding;
|
|
25
27
|
/** A declared user does not exist in the org. */
|
|
26
|
-
export declare function userNotFoundError(username:
|
|
28
|
+
export declare function userNotFoundError(username: Username): Finding;
|
|
27
29
|
/** A declared user exists but is inactive. */
|
|
28
|
-
export declare function userInactiveError(username:
|
|
30
|
+
export declare function userInactiveError(username: Username): Finding;
|
|
29
31
|
/** A declared target does not exist in the org. `label` is the kind's human name. */
|
|
30
|
-
export declare function targetNotFoundError(target:
|
|
32
|
+
export declare function targetNotFoundError(target: TargetName, label: string): Finding;
|
|
31
33
|
/** A declared target resolves to more than one record in the org. */
|
|
32
|
-
export declare function targetAmbiguousError(target:
|
|
34
|
+
export declare function targetAmbiguousError(target: TargetName, label: string): Finding;
|
|
33
35
|
/** Render findings as human-readable lines. Shared by check, validate, and apply. */
|
|
34
36
|
export declare function formatFindings(findings: Finding[]): string[];
|
|
35
37
|
/** Count findings by level. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finding.d.ts","sourceRoot":"","sources":["../../src/core/finding.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG,OAAO,GAAG,SAAS,CAAC;AAExC,sFAAsF;AACtF,KAAK,WAAW,GACV,MAAM,GACN,YAAY,GACZ,QAAQ,GACR,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,UAAU,GACV,gBAAgB,GAChB,eAAe,GACf,kBAAkB,GAClB,kBAAkB,CAAC;AAEzB,MAAM,MAAM,OAAO,GAAG;IAClB,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAiBF,sDAAsD;AACtD,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAE/E;AAED,sCAAsC;AACtC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED,8CAA8C;AAC9C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEhF;AAED,oDAAoD;AACpD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"finding.d.ts","sourceRoot":"","sources":["../../src/core/finding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,KAAK,YAAY,GAAG,OAAO,GAAG,SAAS,CAAC;AAExC,sFAAsF;AACtF,KAAK,WAAW,GACV,MAAM,GACN,YAAY,GACZ,QAAQ,GACR,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,UAAU,GACV,gBAAgB,GAChB,eAAe,GACf,kBAAkB,GAClB,kBAAkB,CAAC;AAEzB,MAAM,MAAM,OAAO,GAAG;IAClB,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAiBF,sDAAsD;AACtD,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAE/E;AAED,sCAAsC;AACtC,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED,8CAA8C;AAC9C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEhF;AAED,oDAAoD;AACpD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE5F;AAED,oEAAoE;AACpE,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMhH;AAED,wCAAwC;AACxC,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1E;AAED,uDAAuD;AACvD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAExD;AAID,iDAAiD;AACjD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE7D;AAED,8CAA8C;AAC9C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAE7D;AAED,qFAAqF;AACrF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAE9E;AAED,qEAAqE;AACrE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAE/E;AAUD,qFAAqF;AACrF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAM5D;AAED,+BAA+B;AAC/B,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAKvF"}
|
package/lib/core/finding.js
CHANGED
|
@@ -21,15 +21,15 @@ export function schemaError(path, message, file) {
|
|
|
21
21
|
}
|
|
22
22
|
/** A scope key is present but its list is empty. */
|
|
23
23
|
export function emptyListWarning(username, scopeKey, file) {
|
|
24
|
-
return warning('EMPTY_LIST', `${username}: ${scopeKey} is empty`, { file });
|
|
24
|
+
return warning('EMPTY_LIST', `${username.toString()}: ${scopeKey} is empty`, { file });
|
|
25
25
|
}
|
|
26
26
|
/** A target appears more than once under one scope for one user. */
|
|
27
27
|
export function dupTargetWarning(username, target, scopeKey, file) {
|
|
28
|
-
return warning('DUP_TARGET', `${username}: ${target} is listed twice under ${scopeKey}`, { file });
|
|
28
|
+
return warning('DUP_TARGET', `${username.toString()}: ${target.toString()} is listed twice under ${scopeKey}`, { file });
|
|
29
29
|
}
|
|
30
30
|
/** A user declares no scopes at all. */
|
|
31
31
|
export function emptyUserWarning(username, file) {
|
|
32
|
-
return warning('EMPTY_USER', `${username}: no scopes declared`, { file });
|
|
32
|
+
return warning('EMPTY_USER', `${username.toString()}: no scopes declared`, { file });
|
|
33
33
|
}
|
|
34
34
|
/** No file on disk matched the given glob patterns. */
|
|
35
35
|
export function noFilesError(patterns) {
|
|
@@ -38,19 +38,19 @@ export function noFilesError(patterns) {
|
|
|
38
38
|
// Org-side findings, raised while resolving declarations against the org. No file or line.
|
|
39
39
|
/** A declared user does not exist in the org. */
|
|
40
40
|
export function userNotFoundError(username) {
|
|
41
|
-
return error('USER_NOT_FOUND', `${username}: user not found in org`);
|
|
41
|
+
return error('USER_NOT_FOUND', `${username.toString()}: user not found in org`);
|
|
42
42
|
}
|
|
43
43
|
/** A declared user exists but is inactive. */
|
|
44
44
|
export function userInactiveError(username) {
|
|
45
|
-
return error('USER_INACTIVE', `${username}: user is inactive`);
|
|
45
|
+
return error('USER_INACTIVE', `${username.toString()}: user is inactive`);
|
|
46
46
|
}
|
|
47
47
|
/** A declared target does not exist in the org. `label` is the kind's human name. */
|
|
48
48
|
export function targetNotFoundError(target, label) {
|
|
49
|
-
return error('TARGET_NOT_FOUND', `${target}: ${label} not found in org`);
|
|
49
|
+
return error('TARGET_NOT_FOUND', `${target.toString()}: ${label} not found in org`);
|
|
50
50
|
}
|
|
51
51
|
/** A declared target resolves to more than one record in the org. */
|
|
52
52
|
export function targetAmbiguousError(target, label) {
|
|
53
|
-
return error('TARGET_AMBIGUOUS', `${target}: ${label} is not unique in org`);
|
|
53
|
+
return error('TARGET_AMBIGUOUS', `${target.toString()}: ${label} is not unique in org`);
|
|
54
54
|
}
|
|
55
55
|
/** The trailing-space location prefix for a finding: `file:line `, `file `, or empty. */
|
|
56
56
|
function locationPrefix(finding) {
|
package/lib/core/finding.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finding.js","sourceRoot":"","sources":["../../src/core/finding.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"finding.js","sourceRoot":"","sources":["../../src/core/finding.ts"],"names":[],"mappings":"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"}
|
package/lib/core/index.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
export { diffAssignments } from './diff.js';
|
|
1
|
+
export { diffAssignments, Diff, Drift, ScopedChange } from './diff.js';
|
|
2
2
|
export { Finding, formatFindings, countFindings } from './finding.js';
|
|
3
3
|
export { loadFiles } from './load.js';
|
|
4
|
-
export { ActualAssignment, AssignmentFilter, AssignmentOutcome, AssignmentUpdate, DesiredAssignment,
|
|
5
|
-
export { scopeToMode, ScopedChange } from './mode.js';
|
|
4
|
+
export { ActualAssignment, AssignmentFilter, AssignmentOutcome, AssignmentUpdate, DesiredAssignment, Kind, OrgTarget, OrgUser, ReconcileMode, ResolvedAddition, TargetRef, } from './model.js';
|
|
6
5
|
export { kindForScopeKey } from './normalize.js';
|
|
7
6
|
export { formatDiff } from './report.js';
|
|
8
7
|
export { kinds, distinctAssignees, distinctTargets, evaluateUsers, evaluateTargets, indexUsersById, indexTargetsById, } from './resolve.js';
|
|
9
8
|
export { serializeAssignments } from './serialize.js';
|
|
9
|
+
export { TargetName } from './target-name.js';
|
|
10
|
+
export { Username } from './username.js';
|
|
10
11
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/core/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,EACJ,SAAS,EACT,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,SAAS,GACV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,KAAK,EACL,iBAAiB,EACjB,eAAe,EACf,aAAa,EACb,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}
|
package/lib/core/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
export { diffAssignments } from './diff.js';
|
|
1
|
+
export { diffAssignments, Diff, ScopedChange } from './diff.js';
|
|
2
2
|
export { formatFindings, countFindings } from './finding.js';
|
|
3
3
|
export { loadFiles } from './load.js';
|
|
4
|
-
export { scopeToMode } from './mode.js';
|
|
5
4
|
export { kindForScopeKey } from './normalize.js';
|
|
6
5
|
export { formatDiff } from './report.js';
|
|
7
6
|
export { kinds, distinctAssignees, distinctTargets, evaluateUsers, evaluateTargets, indexUsersById, indexTargetsById, } from './resolve.js';
|
|
8
7
|
export { serializeAssignments } from './serialize.js';
|
|
8
|
+
export { TargetName } from './target-name.js';
|
|
9
|
+
export { Username } from './username.js';
|
|
9
10
|
//# sourceMappingURL=index.js.map
|
package/lib/core/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,IAAI,EAAS,YAAY,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAW,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AActC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,KAAK,EACL,iBAAiB,EACjB,eAAe,EACf,aAAa,EACb,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}
|
package/lib/core/load.js
CHANGED
|
@@ -49,7 +49,7 @@ export async function loadFiles(patterns) {
|
|
|
49
49
|
const seen = new Set();
|
|
50
50
|
const assignments = [];
|
|
51
51
|
for (const assignment of collected) {
|
|
52
|
-
const dedupeKey = `${assignment.assignee} ${assignment.kind} ${assignment.target}`;
|
|
52
|
+
const dedupeKey = `${assignment.assignee.asKey()} ${assignment.kind} ${assignment.target.asKey()}`;
|
|
53
53
|
if (seen.has(dedupeKey))
|
|
54
54
|
continue;
|
|
55
55
|
seen.add(dedupeKey);
|
package/lib/core/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/core/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAW,YAAY,EAAE,MAAM,cAAc,CAAC;AAErD,qFAAqF;AACrF,SAAS,YAAY,CAAC,IAAY,EAAE,IAAY;IAC5C,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC1D,CAAC;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAClB,OAAO;YACH,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE;gBACN,GAAG,MAAM,CAAC,QAAQ;gBAClB,GAAG,SAAS,CAAC,QAAQ;aACxB;SACJ,CAAC;IACN,CAAC;IAED,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnD,OAAO;QACH,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,QAAQ,EAAE;YACN,GAAG,MAAM,CAAC,QAAQ;YAClB,GAAG,SAAS,CAAC,QAAQ;YACrB,GAAG,UAAU,CAAC,QAAQ;SACzB;KACJ,CAAC;AACN,CAAC;AAED,oFAAoF;AACpF,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,QAAkB;IAC9C,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO;YACH,KAAK;YACL,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;SACrC,CAAC;IACN,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,OAAO,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CACL,CAAC;IAEF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAEhE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,WAAW,GAAwB,EAAE,CAAC;IAE5C,KAAK,MAAM,UAAU,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/core/load.ts"],"names":[],"mappings":"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"}
|