@opencrvs/toolkit 2.0.0-rc.c6361e3 → 2.0.0-rc.cfbf60d
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/application-config/index.js +5 -3
- package/dist/cli.js +115 -43
- package/dist/commons/api/router.d.ts +23 -38
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- package/dist/commons/events/FieldConfig.d.ts +5 -0
- package/dist/conditionals/index.js +5 -3
- package/dist/events/index.js +5 -3
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +60 -35
- package/dist/migrations/v2.0/index.js +115 -43
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
- package/dist/notification/index.js +5 -3
- package/dist/scopes/index.d.ts +6 -1
- package/dist/scopes/index.js +5 -3
- package/opencrvs-toolkit-2.0.0-rc.cfbf60d.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.c6361e3.tgz +0 -0
|
@@ -1723,6 +1723,7 @@ declare const AdministrativeAreaField: z.ZodObject<{
|
|
|
1723
1723
|
"user.read": "user.read";
|
|
1724
1724
|
"user.create": "user.create";
|
|
1725
1725
|
"user.edit": "user.edit";
|
|
1726
|
+
"user.search": "user.search";
|
|
1726
1727
|
workqueue: "workqueue";
|
|
1727
1728
|
"dashboard.view": "dashboard.view";
|
|
1728
1729
|
}>;
|
|
@@ -1842,6 +1843,7 @@ declare const LocationInput: z.ZodObject<{
|
|
|
1842
1843
|
"user.read": "user.read";
|
|
1843
1844
|
"user.create": "user.create";
|
|
1844
1845
|
"user.edit": "user.edit";
|
|
1846
|
+
"user.search": "user.search";
|
|
1845
1847
|
workqueue: "workqueue";
|
|
1846
1848
|
"dashboard.view": "dashboard.view";
|
|
1847
1849
|
}>;
|
|
@@ -2026,6 +2028,7 @@ declare const Facility: z.ZodObject<{
|
|
|
2026
2028
|
"user.read": "user.read";
|
|
2027
2029
|
"user.create": "user.create";
|
|
2028
2030
|
"user.edit": "user.edit";
|
|
2031
|
+
"user.search": "user.search";
|
|
2029
2032
|
workqueue: "workqueue";
|
|
2030
2033
|
"dashboard.view": "dashboard.view";
|
|
2031
2034
|
}>;
|
|
@@ -2131,6 +2134,7 @@ declare const Office: z.ZodObject<{
|
|
|
2131
2134
|
"user.read": "user.read";
|
|
2132
2135
|
"user.create": "user.create";
|
|
2133
2136
|
"user.edit": "user.edit";
|
|
2137
|
+
"user.search": "user.search";
|
|
2134
2138
|
workqueue: "workqueue";
|
|
2135
2139
|
"dashboard.view": "dashboard.view";
|
|
2136
2140
|
}>;
|
|
@@ -2323,6 +2327,7 @@ declare const Address: z.ZodObject<{
|
|
|
2323
2327
|
"user.read": "user.read";
|
|
2324
2328
|
"user.create": "user.create";
|
|
2325
2329
|
"user.edit": "user.edit";
|
|
2330
|
+
"user.search": "user.search";
|
|
2326
2331
|
workqueue: "workqueue";
|
|
2327
2332
|
"dashboard.view": "dashboard.view";
|
|
2328
2333
|
}>;
|
|
@@ -298,12 +298,14 @@ var SystemScopeType = z6.enum([
|
|
|
298
298
|
"organisation.read-locations",
|
|
299
299
|
"user.read",
|
|
300
300
|
"user.create",
|
|
301
|
-
"user.edit"
|
|
301
|
+
"user.edit",
|
|
302
|
+
"user.search"
|
|
302
303
|
]);
|
|
303
304
|
var UserScopeType = SystemScopeType.extract([
|
|
304
305
|
"user.read",
|
|
305
306
|
"user.create",
|
|
306
|
-
"user.edit"
|
|
307
|
+
"user.edit",
|
|
308
|
+
"user.search"
|
|
307
309
|
]);
|
|
308
310
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
309
311
|
var UserScopeV2 = z6.discriminatedUnion("type", [
|
|
@@ -312,7 +314,7 @@ var UserScopeV2 = z6.discriminatedUnion("type", [
|
|
|
312
314
|
options: AllUserScopeOptions.optional()
|
|
313
315
|
}),
|
|
314
316
|
z6.object({
|
|
315
|
-
type: UserScopeType.extract(["user.read"]),
|
|
317
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
316
318
|
options: AccessLevelOptions.optional()
|
|
317
319
|
})
|
|
318
320
|
]);
|
package/dist/events/index.js
CHANGED
|
@@ -607,12 +607,14 @@ var SystemScopeType = z2.enum([
|
|
|
607
607
|
"organisation.read-locations",
|
|
608
608
|
"user.read",
|
|
609
609
|
"user.create",
|
|
610
|
-
"user.edit"
|
|
610
|
+
"user.edit",
|
|
611
|
+
"user.search"
|
|
611
612
|
]);
|
|
612
613
|
var UserScopeType = SystemScopeType.extract([
|
|
613
614
|
"user.read",
|
|
614
615
|
"user.create",
|
|
615
|
-
"user.edit"
|
|
616
|
+
"user.edit",
|
|
617
|
+
"user.search"
|
|
616
618
|
]);
|
|
617
619
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
618
620
|
var UserScopeV2 = z2.discriminatedUnion("type", [
|
|
@@ -621,7 +623,7 @@ var UserScopeV2 = z2.discriminatedUnion("type", [
|
|
|
621
623
|
options: AllUserScopeOptions.optional()
|
|
622
624
|
}),
|
|
623
625
|
z2.object({
|
|
624
|
-
type: UserScopeType.extract(["user.read"]),
|
|
626
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
625
627
|
options: AccessLevelOptions.optional()
|
|
626
628
|
})
|
|
627
629
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"AAycA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -24,15 +24,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
25
|
exports.main = main;
|
|
26
26
|
/**
|
|
27
|
-
* Codemod: Add `pending-first-certificate-issuance` flag to
|
|
27
|
+
* Codemod: Add `pending-first-certificate-issuance` flag to event configs and workqueues.
|
|
28
28
|
*
|
|
29
29
|
* Usage:
|
|
30
30
|
* ts-node -r tsconfig-paths/register src/migrations/v2.0/add-birth-certificate-issuance-flag.ts
|
|
31
31
|
*
|
|
32
32
|
* What it does:
|
|
33
|
-
* defineConfig (
|
|
33
|
+
* defineConfig (every event type — birth, death, marriage, custom, etc.):
|
|
34
34
|
* - Ensures the top-level `flags` array contains the `pending-first-certificate-issuance`
|
|
35
|
-
* flag definition
|
|
35
|
+
* flag definition. The flag's i18n `label.id` is event-specific, e.g.
|
|
36
|
+
* `event.birth.flag.pending-first-certificate-issuance`,
|
|
37
|
+
* `event.death.flag.pending-first-certificate-issuance`.
|
|
36
38
|
* - Ensures every `REGISTER` action has
|
|
37
39
|
* `flags: [{ id: 'pending-first-certificate-issuance', operation: 'add' }]`
|
|
38
40
|
* - Ensures every `PRINT_CERTIFICATE` action has
|
|
@@ -55,20 +57,27 @@ const ACTION_PROPERTY_NAME = 'action';
|
|
|
55
57
|
const FLAGS_PROPERTY_NAME = 'flags';
|
|
56
58
|
const QUERY_PROPERTY_NAME = 'query';
|
|
57
59
|
const TYPE_PROPERTY_NAME = 'type';
|
|
60
|
+
const ID_PROPERTY_NAME = 'id';
|
|
58
61
|
const CLAUSES_PROPERTY_NAME = 'clauses';
|
|
59
62
|
const ANY_OF_PROPERTY_NAME = 'anyOf';
|
|
60
63
|
const FLAG_ID = 'pending-first-certificate-issuance';
|
|
61
64
|
const REGISTER_TYPE = 'REGISTER';
|
|
62
65
|
const PRINT_CERTIFICATE_TYPE = 'PRINT_CERTIFICATE';
|
|
63
|
-
|
|
66
|
+
/**
|
|
67
|
+
* Builds the flag-definition object literal for a given event type so the i18n
|
|
68
|
+
* `label.id` is namespaced per event (e.g. `event.death.flag.…`).
|
|
69
|
+
*/
|
|
70
|
+
function flagDefinitionInitializer(eventType) {
|
|
71
|
+
return `{
|
|
64
72
|
id: '${FLAG_ID}',
|
|
65
73
|
label: {
|
|
66
|
-
id: 'event.
|
|
74
|
+
id: 'event.${eventType}.flag.${FLAG_ID}',
|
|
67
75
|
defaultMessage: 'Pending first certificate issuance',
|
|
68
76
|
description: 'Flag label for first certificate issuance'
|
|
69
77
|
},
|
|
70
78
|
requiresAction: true
|
|
71
79
|
}`;
|
|
80
|
+
}
|
|
72
81
|
// ─── Generic helpers ──────────────────────────────────────────────────────────
|
|
73
82
|
/**
|
|
74
83
|
* Returns true if the object's `type` property matches the given type name.
|
|
@@ -90,23 +99,36 @@ function isActionOfType(obj, typeName) {
|
|
|
90
99
|
return false;
|
|
91
100
|
}
|
|
92
101
|
/**
|
|
93
|
-
*
|
|
94
|
-
*
|
|
102
|
+
* Extracts the event type from a `defineConfig` root config object, using the
|
|
103
|
+
* (lower-cased) value of either the `type` or `id` property. Property name has
|
|
104
|
+
* shifted across core/country-config versions, so both are tried.
|
|
105
|
+
*
|
|
106
|
+
* Handles all known shapes:
|
|
107
|
+
* - `type: 'birth'` / `id: 'birth'`
|
|
108
|
+
* - `type: EventType.BIRTH` / `id: Event.Birth`
|
|
109
|
+
*
|
|
110
|
+
* For `PropertyAccessExpression` (enum access), the *member name* is returned
|
|
111
|
+
* lower-cased — this works for the conventional `EventType.BIRTH = 'birth'` and
|
|
112
|
+
* `Event.Birth = 'birth'` mappings used in core and country configs.
|
|
113
|
+
*
|
|
114
|
+
* Returns null when no event type can be determined.
|
|
95
115
|
*/
|
|
96
|
-
function
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
116
|
+
function getEventType(configArg) {
|
|
117
|
+
for (const propName of [TYPE_PROPERTY_NAME, ID_PROPERTY_NAME]) {
|
|
118
|
+
const prop = configArg.getProperty(propName);
|
|
119
|
+
if (!prop || !ts_morph_1.Node.isPropertyAssignment(prop))
|
|
120
|
+
continue;
|
|
121
|
+
const initializer = prop.getInitializer();
|
|
122
|
+
if (!initializer)
|
|
123
|
+
continue;
|
|
124
|
+
if (ts_morph_1.Node.isStringLiteral(initializer)) {
|
|
125
|
+
return initializer.getLiteralValue().toLowerCase();
|
|
126
|
+
}
|
|
127
|
+
if (ts_morph_1.Node.isPropertyAccessExpression(initializer)) {
|
|
128
|
+
return initializer.getName().toLowerCase();
|
|
129
|
+
}
|
|
108
130
|
}
|
|
109
|
-
return
|
|
131
|
+
return null;
|
|
110
132
|
}
|
|
111
133
|
/**
|
|
112
134
|
* Returns true if an array literal contains an object literal with `id: <id>`.
|
|
@@ -129,17 +151,19 @@ function hasElementWithId(array, id) {
|
|
|
129
151
|
}
|
|
130
152
|
// ─── defineConfig helpers ─────────────────────────────────────────────────────
|
|
131
153
|
/**
|
|
132
|
-
* Ensures the top-level `flags` array in a
|
|
133
|
-
* `pending-first-certificate-issuance` flag definition.
|
|
154
|
+
* Ensures the top-level `flags` array in a `defineConfig` contains the
|
|
155
|
+
* `pending-first-certificate-issuance` flag definition. The flag's i18n
|
|
156
|
+
* `label.id` is namespaced per event type (e.g. `event.death.flag.…`).
|
|
134
157
|
*/
|
|
135
|
-
function ensureTopLevelFlagDefinition(configArg) {
|
|
158
|
+
function ensureTopLevelFlagDefinition(configArg, eventType) {
|
|
159
|
+
const initializer = flagDefinitionInitializer(eventType);
|
|
136
160
|
const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME);
|
|
137
161
|
if (flagsProp && ts_morph_1.Node.isPropertyAssignment(flagsProp)) {
|
|
138
162
|
const flagsInit = flagsProp.getInitializer();
|
|
139
163
|
if (flagsInit && ts_morph_1.Node.isArrayLiteralExpression(flagsInit)) {
|
|
140
164
|
if (hasElementWithId(flagsInit, FLAG_ID))
|
|
141
165
|
return false;
|
|
142
|
-
flagsInit.addElement(
|
|
166
|
+
flagsInit.addElement(initializer);
|
|
143
167
|
return true;
|
|
144
168
|
}
|
|
145
169
|
return false;
|
|
@@ -147,7 +171,7 @@ function ensureTopLevelFlagDefinition(configArg) {
|
|
|
147
171
|
// No `flags` property at all — create it
|
|
148
172
|
configArg.addPropertyAssignment({
|
|
149
173
|
name: FLAGS_PROPERTY_NAME,
|
|
150
|
-
initializer: `[\n ${
|
|
174
|
+
initializer: `[\n ${initializer}\n]`
|
|
151
175
|
});
|
|
152
176
|
return true;
|
|
153
177
|
}
|
|
@@ -174,15 +198,15 @@ function ensureActionOperationFlag(action, operation) {
|
|
|
174
198
|
return true;
|
|
175
199
|
}
|
|
176
200
|
/**
|
|
177
|
-
* Processes a
|
|
201
|
+
* Processes a `defineConfig` object: ensures top-level flag definition,
|
|
178
202
|
* REGISTER action flags, and PRINT_CERTIFICATE action flags.
|
|
179
203
|
* Returns the number of changes made.
|
|
180
204
|
*/
|
|
181
|
-
function
|
|
205
|
+
function processConfig(configArg, eventType, relPath) {
|
|
182
206
|
let changes = 0;
|
|
183
|
-
if (ensureTopLevelFlagDefinition(configArg)) {
|
|
207
|
+
if (ensureTopLevelFlagDefinition(configArg, eventType)) {
|
|
184
208
|
changes++;
|
|
185
|
-
console.log(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
|
|
209
|
+
console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`);
|
|
186
210
|
}
|
|
187
211
|
const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME);
|
|
188
212
|
if (!actionsProp || !ts_morph_1.Node.isPropertyAssignment(actionsProp))
|
|
@@ -197,13 +221,13 @@ function processBirthConfig(configArg, relPath) {
|
|
|
197
221
|
if (isActionOfType(element, REGISTER_TYPE)) {
|
|
198
222
|
if (ensureActionOperationFlag(element, 'add')) {
|
|
199
223
|
changes++;
|
|
200
|
-
console.log(` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`);
|
|
224
|
+
console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`);
|
|
201
225
|
}
|
|
202
226
|
}
|
|
203
227
|
if (isActionOfType(element, PRINT_CERTIFICATE_TYPE)) {
|
|
204
228
|
if (ensureActionOperationFlag(element, 'remove')) {
|
|
205
229
|
changes++;
|
|
206
|
-
console.log(` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
|
|
230
|
+
console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
|
|
207
231
|
}
|
|
208
232
|
}
|
|
209
233
|
}
|
|
@@ -332,9 +356,10 @@ function processFile(filePath, project) {
|
|
|
332
356
|
const configArg = args[0];
|
|
333
357
|
if (!ts_morph_1.Node.isObjectLiteralExpression(configArg))
|
|
334
358
|
continue;
|
|
335
|
-
|
|
359
|
+
const eventType = getEventType(configArg);
|
|
360
|
+
if (!eventType)
|
|
336
361
|
continue;
|
|
337
|
-
totalChanges +=
|
|
362
|
+
totalChanges += processConfig(configArg, eventType, relPath);
|
|
338
363
|
}
|
|
339
364
|
// ── defineWorkqueues ──────────────────────────────────────────────────────
|
|
340
365
|
if (calleeName === DEFINE_WORKQUEUES_NAME) {
|
|
@@ -369,7 +394,7 @@ function processFile(filePath, project) {
|
|
|
369
394
|
function main() {
|
|
370
395
|
return __awaiter(this, void 0, void 0, function* () {
|
|
371
396
|
const srcDir = path_1.default.join(process.cwd(), 'src');
|
|
372
|
-
console.log(`Scanning for
|
|
397
|
+
console.log(`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
|
|
373
398
|
const project = new ts_morph_1.Project({
|
|
374
399
|
tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
|
|
375
400
|
skipAddingFilesFromTsConfig: false
|
|
@@ -390,7 +415,7 @@ function main() {
|
|
|
390
415
|
}
|
|
391
416
|
}
|
|
392
417
|
if (modifiedFiles.length === 0) {
|
|
393
|
-
console.log('No
|
|
418
|
+
console.log('No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
|
|
394
419
|
return;
|
|
395
420
|
}
|
|
396
421
|
console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
|
|
@@ -190,6 +190,8 @@ function ensureImports(sourceFile) {
|
|
|
190
190
|
var DEFINE_CONFIG_NAME2 = "defineConfig";
|
|
191
191
|
var ACTIONS_PROPERTY_NAME2 = "actions";
|
|
192
192
|
var TYPE_PROPERTY_NAME2 = "type";
|
|
193
|
+
var ID_PROPERTY_NAME = "id";
|
|
194
|
+
var FLAGS_PROPERTY_NAME = "flags";
|
|
193
195
|
var CUSTOM_ACTION_TYPE_PROPERTY_NAME = "customActionType";
|
|
194
196
|
var AUDIT_HISTORY_LABEL_PROPERTY_NAME = "auditHistoryLabel";
|
|
195
197
|
var DEDUPLICATION_PROPERTY_NAME = "deduplication";
|
|
@@ -199,9 +201,12 @@ var FORM_PROPERTY_NAME = "form";
|
|
|
199
201
|
var ACTION_TYPE_ENUM_NAME = "ActionType";
|
|
200
202
|
var VALIDATE_MEMBER_NAME = "VALIDATE";
|
|
201
203
|
var CUSTOM_MEMBER_NAME = "CUSTOM";
|
|
204
|
+
var REGISTER_MEMBER_NAME2 = "REGISTER";
|
|
202
205
|
var VALIDATE_STRING_LITERAL = "VALIDATE";
|
|
203
206
|
var CUSTOM_STRING_LITERAL = "CUSTOM";
|
|
207
|
+
var REGISTER_STRING_LITERAL2 = "REGISTER";
|
|
204
208
|
var VALIDATE_DECLARATION_VALUE = "VALIDATE_DECLARATION";
|
|
209
|
+
var VALIDATED_FLAG_VALUE = "validated";
|
|
205
210
|
function isValidateType(typeInitializer) {
|
|
206
211
|
if (typeInitializer.getKind() === import_ts_morph2.SyntaxKind.PropertyAccessExpression) {
|
|
207
212
|
const propAccess = typeInitializer.asKindOrThrow(
|
|
@@ -325,6 +330,50 @@ function transformValidateActionToCustom(obj, eventType) {
|
|
|
325
330
|
}
|
|
326
331
|
return true;
|
|
327
332
|
}
|
|
333
|
+
function isRegisterAction(action) {
|
|
334
|
+
const typeProperty = action.getProperty(TYPE_PROPERTY_NAME2);
|
|
335
|
+
if (!typeProperty || !import_ts_morph2.Node.isPropertyAssignment(typeProperty)) return false;
|
|
336
|
+
const typeInit = typeProperty.getInitializer();
|
|
337
|
+
if (!typeInit) return false;
|
|
338
|
+
if (import_ts_morph2.Node.isPropertyAccessExpression(typeInit)) {
|
|
339
|
+
const enumExpr = typeInit.getExpression();
|
|
340
|
+
return import_ts_morph2.Node.isIdentifier(enumExpr) && enumExpr.getText() === ACTION_TYPE_ENUM_NAME && typeInit.getName() === REGISTER_MEMBER_NAME2;
|
|
341
|
+
}
|
|
342
|
+
if (import_ts_morph2.Node.isStringLiteral(typeInit)) {
|
|
343
|
+
return typeInit.getLiteralValue() === REGISTER_STRING_LITERAL2;
|
|
344
|
+
}
|
|
345
|
+
return false;
|
|
346
|
+
}
|
|
347
|
+
function arrayHasElementWithId(array3, id) {
|
|
348
|
+
for (const el of array3.getElements()) {
|
|
349
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(el)) continue;
|
|
350
|
+
const idProp = el.getProperty(ID_PROPERTY_NAME);
|
|
351
|
+
if (!idProp || !import_ts_morph2.Node.isPropertyAssignment(idProp)) continue;
|
|
352
|
+
const idInit = idProp.getInitializer();
|
|
353
|
+
if (idInit && import_ts_morph2.Node.isStringLiteral(idInit) && idInit.getLiteralValue() === id) {
|
|
354
|
+
return true;
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
return false;
|
|
358
|
+
}
|
|
359
|
+
function ensureRegisterRemovesValidatedFlag(action) {
|
|
360
|
+
const entry = `{ id: '${VALIDATED_FLAG_VALUE}', operation: 'remove' }`;
|
|
361
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME);
|
|
362
|
+
if (flagsProp && import_ts_morph2.Node.isPropertyAssignment(flagsProp)) {
|
|
363
|
+
const flagsInit = flagsProp.getInitializer();
|
|
364
|
+
if (flagsInit && import_ts_morph2.Node.isArrayLiteralExpression(flagsInit)) {
|
|
365
|
+
if (arrayHasElementWithId(flagsInit, VALIDATED_FLAG_VALUE)) return false;
|
|
366
|
+
flagsInit.addElement(entry);
|
|
367
|
+
return true;
|
|
368
|
+
}
|
|
369
|
+
return false;
|
|
370
|
+
}
|
|
371
|
+
action.addPropertyAssignment({
|
|
372
|
+
name: FLAGS_PROPERTY_NAME,
|
|
373
|
+
initializer: `[${entry}]`
|
|
374
|
+
});
|
|
375
|
+
return true;
|
|
376
|
+
}
|
|
328
377
|
function processFile2(filePath, project) {
|
|
329
378
|
const sourceFile = project.getSourceFile(filePath);
|
|
330
379
|
if (!sourceFile) return 0;
|
|
@@ -390,6 +439,18 @@ function processFile2(filePath, project) {
|
|
|
390
439
|
` [${import_path2.default.relative(process.cwd(), filePath)}] Added top-level 'flags' array to defineConfig`
|
|
391
440
|
);
|
|
392
441
|
}
|
|
442
|
+
if (configHadValidateAction) {
|
|
443
|
+
for (const element of actionsInitializer.getElements()) {
|
|
444
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(element)) continue;
|
|
445
|
+
if (!isRegisterAction(element)) continue;
|
|
446
|
+
if (ensureRegisterRemovesValidatedFlag(element)) {
|
|
447
|
+
transformedCount++;
|
|
448
|
+
console.log(
|
|
449
|
+
` [${import_path2.default.relative(process.cwd(), filePath)}] Added '${VALIDATED_FLAG_VALUE}' remove-flag to REGISTER action`
|
|
450
|
+
);
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
}
|
|
393
454
|
if (fileNeedsImports) {
|
|
394
455
|
ensureImports(sourceFile);
|
|
395
456
|
}
|
|
@@ -436,7 +497,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
436
497
|
}
|
|
437
498
|
console.log(
|
|
438
499
|
`
|
|
439
|
-
Done.
|
|
500
|
+
Done. Applied ${totalTransformed} change(s): VALIDATE \u2192 CUSTOM (${VALIDATE_DECLARATION_VALUE}) and '${VALIDATED_FLAG_VALUE}' remove-flag on matching REGISTER actions.`
|
|
440
501
|
);
|
|
441
502
|
}
|
|
442
503
|
|
|
@@ -679,14 +740,14 @@ var QUERY_PROPERTY_NAME = "query";
|
|
|
679
740
|
var TYPE_PROPERTY_NAME5 = "type";
|
|
680
741
|
var CLAUSES_PROPERTY_NAME = "clauses";
|
|
681
742
|
var STATUS_PROPERTY_NAME = "status";
|
|
682
|
-
var
|
|
743
|
+
var FLAGS_PROPERTY_NAME2 = "flags";
|
|
683
744
|
var TERMS_PROPERTY_NAME = "terms";
|
|
684
745
|
var TERM_PROPERTY_NAME = "term";
|
|
685
746
|
var ANY_OF_PROPERTY_NAME = "anyOf";
|
|
686
747
|
var VALIDATED_STATUS_VALUE = "VALIDATED";
|
|
687
|
-
var
|
|
748
|
+
var VALIDATED_FLAG_VALUE2 = "validated";
|
|
688
749
|
function addValidatedFlag(clause) {
|
|
689
|
-
const flagsProperty = clause.getProperty(
|
|
750
|
+
const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME2);
|
|
690
751
|
if (flagsProperty && import_ts_morph5.Node.isPropertyAssignment(flagsProperty)) {
|
|
691
752
|
const flagsInit = flagsProperty.getInitializer();
|
|
692
753
|
if (flagsInit && import_ts_morph5.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -694,19 +755,19 @@ function addValidatedFlag(clause) {
|
|
|
694
755
|
if (anyOfProperty && import_ts_morph5.Node.isPropertyAssignment(anyOfProperty)) {
|
|
695
756
|
const anyOfInit = anyOfProperty.getInitializer();
|
|
696
757
|
if (anyOfInit && import_ts_morph5.Node.isArrayLiteralExpression(anyOfInit)) {
|
|
697
|
-
anyOfInit.addElement(`'${
|
|
758
|
+
anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE2}'`);
|
|
698
759
|
}
|
|
699
760
|
} else {
|
|
700
761
|
flagsInit.addPropertyAssignment({
|
|
701
762
|
name: ANY_OF_PROPERTY_NAME,
|
|
702
|
-
initializer: `['${
|
|
763
|
+
initializer: `['${VALIDATED_FLAG_VALUE2}']`
|
|
703
764
|
});
|
|
704
765
|
}
|
|
705
766
|
}
|
|
706
767
|
} else {
|
|
707
768
|
clause.addPropertyAssignment({
|
|
708
|
-
name:
|
|
709
|
-
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${
|
|
769
|
+
name: FLAGS_PROPERTY_NAME2,
|
|
770
|
+
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE2}'] }`
|
|
710
771
|
});
|
|
711
772
|
}
|
|
712
773
|
}
|
|
@@ -872,23 +933,26 @@ var DEFINE_CONFIG_NAME4 = "defineConfig";
|
|
|
872
933
|
var DEFINE_WORKQUEUES_NAME2 = "defineWorkqueues";
|
|
873
934
|
var ACTIONS_PROPERTY_NAME4 = "actions";
|
|
874
935
|
var ACTION_PROPERTY_NAME = "action";
|
|
875
|
-
var
|
|
936
|
+
var FLAGS_PROPERTY_NAME3 = "flags";
|
|
876
937
|
var QUERY_PROPERTY_NAME2 = "query";
|
|
877
938
|
var TYPE_PROPERTY_NAME6 = "type";
|
|
939
|
+
var ID_PROPERTY_NAME2 = "id";
|
|
878
940
|
var CLAUSES_PROPERTY_NAME2 = "clauses";
|
|
879
941
|
var ANY_OF_PROPERTY_NAME2 = "anyOf";
|
|
880
942
|
var FLAG_ID = "pending-first-certificate-issuance";
|
|
881
943
|
var REGISTER_TYPE = "REGISTER";
|
|
882
944
|
var PRINT_CERTIFICATE_TYPE = "PRINT_CERTIFICATE";
|
|
883
|
-
|
|
945
|
+
function flagDefinitionInitializer(eventType) {
|
|
946
|
+
return `{
|
|
884
947
|
id: '${FLAG_ID}',
|
|
885
948
|
label: {
|
|
886
|
-
id: 'event.
|
|
949
|
+
id: 'event.${eventType}.flag.${FLAG_ID}',
|
|
887
950
|
defaultMessage: 'Pending first certificate issuance',
|
|
888
951
|
description: 'Flag label for first certificate issuance'
|
|
889
952
|
},
|
|
890
953
|
requiresAction: true
|
|
891
954
|
}`;
|
|
955
|
+
}
|
|
892
956
|
function isActionOfType(obj, typeName) {
|
|
893
957
|
const typeProperty = obj.getProperty(TYPE_PROPERTY_NAME6);
|
|
894
958
|
if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
|
|
@@ -902,18 +966,20 @@ function isActionOfType(obj, typeName) {
|
|
|
902
966
|
}
|
|
903
967
|
return false;
|
|
904
968
|
}
|
|
905
|
-
function
|
|
906
|
-
const
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
910
|
-
|
|
911
|
-
|
|
912
|
-
|
|
913
|
-
|
|
914
|
-
|
|
969
|
+
function getEventType(configArg) {
|
|
970
|
+
for (const propName of [TYPE_PROPERTY_NAME6, ID_PROPERTY_NAME2]) {
|
|
971
|
+
const prop = configArg.getProperty(propName);
|
|
972
|
+
if (!prop || !import_ts_morph6.Node.isPropertyAssignment(prop)) continue;
|
|
973
|
+
const initializer = prop.getInitializer();
|
|
974
|
+
if (!initializer) continue;
|
|
975
|
+
if (import_ts_morph6.Node.isStringLiteral(initializer)) {
|
|
976
|
+
return initializer.getLiteralValue().toLowerCase();
|
|
977
|
+
}
|
|
978
|
+
if (import_ts_morph6.Node.isPropertyAccessExpression(initializer)) {
|
|
979
|
+
return initializer.getName().toLowerCase();
|
|
980
|
+
}
|
|
915
981
|
}
|
|
916
|
-
return
|
|
982
|
+
return null;
|
|
917
983
|
}
|
|
918
984
|
function hasElementWithId(array3, id) {
|
|
919
985
|
for (const el of array3.getElements()) {
|
|
@@ -927,27 +993,28 @@ function hasElementWithId(array3, id) {
|
|
|
927
993
|
}
|
|
928
994
|
return false;
|
|
929
995
|
}
|
|
930
|
-
function ensureTopLevelFlagDefinition(configArg) {
|
|
931
|
-
const
|
|
996
|
+
function ensureTopLevelFlagDefinition(configArg, eventType) {
|
|
997
|
+
const initializer = flagDefinitionInitializer(eventType);
|
|
998
|
+
const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME3);
|
|
932
999
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
933
1000
|
const flagsInit = flagsProp.getInitializer();
|
|
934
1001
|
if (flagsInit && import_ts_morph6.Node.isArrayLiteralExpression(flagsInit)) {
|
|
935
1002
|
if (hasElementWithId(flagsInit, FLAG_ID)) return false;
|
|
936
|
-
flagsInit.addElement(
|
|
1003
|
+
flagsInit.addElement(initializer);
|
|
937
1004
|
return true;
|
|
938
1005
|
}
|
|
939
1006
|
return false;
|
|
940
1007
|
}
|
|
941
1008
|
configArg.addPropertyAssignment({
|
|
942
|
-
name:
|
|
1009
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
943
1010
|
initializer: `[
|
|
944
|
-
${
|
|
1011
|
+
${initializer}
|
|
945
1012
|
]`
|
|
946
1013
|
});
|
|
947
1014
|
return true;
|
|
948
1015
|
}
|
|
949
1016
|
function ensureActionOperationFlag(action, operation) {
|
|
950
|
-
const flagsProp = action.getProperty(
|
|
1017
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME3);
|
|
951
1018
|
const entry = `{ id: '${FLAG_ID}', operation: '${operation}' }`;
|
|
952
1019
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
953
1020
|
const flagsInit = flagsProp.getInitializer();
|
|
@@ -959,16 +1026,18 @@ function ensureActionOperationFlag(action, operation) {
|
|
|
959
1026
|
return false;
|
|
960
1027
|
}
|
|
961
1028
|
action.addPropertyAssignment({
|
|
962
|
-
name:
|
|
1029
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
963
1030
|
initializer: `[${entry}]`
|
|
964
1031
|
});
|
|
965
1032
|
return true;
|
|
966
1033
|
}
|
|
967
|
-
function
|
|
1034
|
+
function processConfig(configArg, eventType, relPath) {
|
|
968
1035
|
let changes = 0;
|
|
969
|
-
if (ensureTopLevelFlagDefinition(configArg)) {
|
|
1036
|
+
if (ensureTopLevelFlagDefinition(configArg, eventType)) {
|
|
970
1037
|
changes++;
|
|
971
|
-
console.log(
|
|
1038
|
+
console.log(
|
|
1039
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`
|
|
1040
|
+
);
|
|
972
1041
|
}
|
|
973
1042
|
const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME4);
|
|
974
1043
|
if (!actionsProp || !import_ts_morph6.Node.isPropertyAssignment(actionsProp)) return changes;
|
|
@@ -982,7 +1051,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
982
1051
|
if (ensureActionOperationFlag(element, "add")) {
|
|
983
1052
|
changes++;
|
|
984
1053
|
console.log(
|
|
985
|
-
` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
1054
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
986
1055
|
);
|
|
987
1056
|
}
|
|
988
1057
|
}
|
|
@@ -990,7 +1059,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
990
1059
|
if (ensureActionOperationFlag(element, "remove")) {
|
|
991
1060
|
changes++;
|
|
992
1061
|
console.log(
|
|
993
|
-
` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
1062
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
994
1063
|
);
|
|
995
1064
|
}
|
|
996
1065
|
}
|
|
@@ -1019,7 +1088,7 @@ function hasPrintCertificateAction(workqueue) {
|
|
|
1019
1088
|
return false;
|
|
1020
1089
|
}
|
|
1021
1090
|
function addFlagToQueryClause(clause) {
|
|
1022
|
-
const flagsProp = clause.getProperty(
|
|
1091
|
+
const flagsProp = clause.getProperty(FLAGS_PROPERTY_NAME3);
|
|
1023
1092
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
1024
1093
|
const flagsInit = flagsProp.getInitializer();
|
|
1025
1094
|
if (flagsInit && import_ts_morph6.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -1044,7 +1113,7 @@ function addFlagToQueryClause(clause) {
|
|
|
1044
1113
|
}
|
|
1045
1114
|
} else {
|
|
1046
1115
|
clause.addPropertyAssignment({
|
|
1047
|
-
name:
|
|
1116
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
1048
1117
|
initializer: `{ ${ANY_OF_PROPERTY_NAME2}: ['${FLAG_ID}'] }`
|
|
1049
1118
|
});
|
|
1050
1119
|
return true;
|
|
@@ -1088,8 +1157,9 @@ function processFile6(filePath, project) {
|
|
|
1088
1157
|
if (args.length === 0) continue;
|
|
1089
1158
|
const configArg = args[0];
|
|
1090
1159
|
if (!import_ts_morph6.Node.isObjectLiteralExpression(configArg)) continue;
|
|
1091
|
-
|
|
1092
|
-
|
|
1160
|
+
const eventType = getEventType(configArg);
|
|
1161
|
+
if (!eventType) continue;
|
|
1162
|
+
totalChanges += processConfig(configArg, eventType, relPath);
|
|
1093
1163
|
}
|
|
1094
1164
|
if (calleeName === DEFINE_WORKQUEUES_NAME2) {
|
|
1095
1165
|
const args = call.getArguments();
|
|
@@ -1118,7 +1188,7 @@ function processFile6(filePath, project) {
|
|
|
1118
1188
|
async function main6() {
|
|
1119
1189
|
const srcDir = import_path6.default.join(process.cwd(), "src");
|
|
1120
1190
|
console.log(
|
|
1121
|
-
`Scanning for
|
|
1191
|
+
`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
|
|
1122
1192
|
`
|
|
1123
1193
|
);
|
|
1124
1194
|
const project = new import_ts_morph6.Project({
|
|
@@ -1143,7 +1213,7 @@ async function main6() {
|
|
|
1143
1213
|
}
|
|
1144
1214
|
if (modifiedFiles.length === 0) {
|
|
1145
1215
|
console.log(
|
|
1146
|
-
"No
|
|
1216
|
+
"No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
|
|
1147
1217
|
);
|
|
1148
1218
|
return;
|
|
1149
1219
|
}
|
|
@@ -2238,12 +2308,14 @@ var SystemScopeType = z3.enum([
|
|
|
2238
2308
|
"organisation.read-locations",
|
|
2239
2309
|
"user.read",
|
|
2240
2310
|
"user.create",
|
|
2241
|
-
"user.edit"
|
|
2311
|
+
"user.edit",
|
|
2312
|
+
"user.search"
|
|
2242
2313
|
]);
|
|
2243
2314
|
var UserScopeType = SystemScopeType.extract([
|
|
2244
2315
|
"user.read",
|
|
2245
2316
|
"user.create",
|
|
2246
|
-
"user.edit"
|
|
2317
|
+
"user.edit",
|
|
2318
|
+
"user.search"
|
|
2247
2319
|
]);
|
|
2248
2320
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
2249
2321
|
var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
@@ -2252,7 +2324,7 @@ var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2252
2324
|
options: AllUserScopeOptions.optional()
|
|
2253
2325
|
}),
|
|
2254
2326
|
z3.object({
|
|
2255
|
-
type: UserScopeType.extract(["user.read"]),
|
|
2327
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
2256
2328
|
options: AccessLevelOptions.optional()
|
|
2257
2329
|
})
|
|
2258
2330
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-built-in-validate-actions-custom.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/make-built-in-validate-actions-custom.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"make-built-in-validate-actions-custom.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/make-built-in-validate-actions-custom.ts"],"names":[],"mappings":"AAodA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|