@opencrvs/toolkit 2.0.0-rc.c2c75ca → 2.0.0-rc.c3d327f
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/create-countryconfig/index.js +73 -0
- package/create-countryconfig/package.json +11 -0
- package/dist/application-config/index.js +54 -36
- package/dist/cli.js +442 -169
- package/dist/commons/api/router.d.ts +3015 -298
- package/dist/commons/application-config/index.d.ts +16 -4
- package/dist/commons/conditionals/conditionals.d.ts +6 -6
- package/dist/commons/conditionals/validate.d.ts +1 -0
- package/dist/commons/events/ActionInput.d.ts +108 -0
- package/dist/commons/events/Draft.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +0 -3
- package/dist/commons/events/EventMetadata.d.ts +0 -7
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/locations.d.ts +38 -1
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/commons/events/state/index.d.ts +0 -4
- package/dist/commons/events/state/utils.d.ts +0 -2
- package/dist/commons/events/utils.d.ts +1 -1
- package/dist/conditionals/index.js +37 -7
- package/dist/events/index.js +159 -62
- 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/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
- package/dist/migrations/v2.0/index.d.ts +5 -3
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +442 -169
- 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/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +54 -30
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
- package/dist/notification/index.js +53 -32
- package/dist/scopes/index.d.ts +87 -10
- package/dist/scopes/index.js +43 -8
- package/opencrvs-toolkit-2.0.0-rc.c3d327f.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.c2c75ca.tgz +0 -0
package/dist/cli.js
CHANGED
|
@@ -178,6 +178,8 @@ function ensureImports(sourceFile) {
|
|
|
178
178
|
var DEFINE_CONFIG_NAME2 = "defineConfig";
|
|
179
179
|
var ACTIONS_PROPERTY_NAME2 = "actions";
|
|
180
180
|
var TYPE_PROPERTY_NAME2 = "type";
|
|
181
|
+
var ID_PROPERTY_NAME = "id";
|
|
182
|
+
var FLAGS_PROPERTY_NAME = "flags";
|
|
181
183
|
var CUSTOM_ACTION_TYPE_PROPERTY_NAME = "customActionType";
|
|
182
184
|
var AUDIT_HISTORY_LABEL_PROPERTY_NAME = "auditHistoryLabel";
|
|
183
185
|
var DEDUPLICATION_PROPERTY_NAME = "deduplication";
|
|
@@ -187,9 +189,12 @@ var FORM_PROPERTY_NAME = "form";
|
|
|
187
189
|
var ACTION_TYPE_ENUM_NAME = "ActionType";
|
|
188
190
|
var VALIDATE_MEMBER_NAME = "VALIDATE";
|
|
189
191
|
var CUSTOM_MEMBER_NAME = "CUSTOM";
|
|
192
|
+
var REGISTER_MEMBER_NAME2 = "REGISTER";
|
|
190
193
|
var VALIDATE_STRING_LITERAL = "VALIDATE";
|
|
191
194
|
var CUSTOM_STRING_LITERAL = "CUSTOM";
|
|
195
|
+
var REGISTER_STRING_LITERAL2 = "REGISTER";
|
|
192
196
|
var VALIDATE_DECLARATION_VALUE = "VALIDATE_DECLARATION";
|
|
197
|
+
var VALIDATED_FLAG_VALUE = "validated";
|
|
193
198
|
function isValidateType(typeInitializer) {
|
|
194
199
|
if (typeInitializer.getKind() === import_ts_morph2.SyntaxKind.PropertyAccessExpression) {
|
|
195
200
|
const propAccess = typeInitializer.asKindOrThrow(
|
|
@@ -313,6 +318,50 @@ function transformValidateActionToCustom(obj, eventType) {
|
|
|
313
318
|
}
|
|
314
319
|
return true;
|
|
315
320
|
}
|
|
321
|
+
function isRegisterAction(action) {
|
|
322
|
+
const typeProperty = action.getProperty(TYPE_PROPERTY_NAME2);
|
|
323
|
+
if (!typeProperty || !import_ts_morph2.Node.isPropertyAssignment(typeProperty)) return false;
|
|
324
|
+
const typeInit = typeProperty.getInitializer();
|
|
325
|
+
if (!typeInit) return false;
|
|
326
|
+
if (import_ts_morph2.Node.isPropertyAccessExpression(typeInit)) {
|
|
327
|
+
const enumExpr = typeInit.getExpression();
|
|
328
|
+
return import_ts_morph2.Node.isIdentifier(enumExpr) && enumExpr.getText() === ACTION_TYPE_ENUM_NAME && typeInit.getName() === REGISTER_MEMBER_NAME2;
|
|
329
|
+
}
|
|
330
|
+
if (import_ts_morph2.Node.isStringLiteral(typeInit)) {
|
|
331
|
+
return typeInit.getLiteralValue() === REGISTER_STRING_LITERAL2;
|
|
332
|
+
}
|
|
333
|
+
return false;
|
|
334
|
+
}
|
|
335
|
+
function arrayHasElementWithId(array3, id) {
|
|
336
|
+
for (const el of array3.getElements()) {
|
|
337
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(el)) continue;
|
|
338
|
+
const idProp = el.getProperty(ID_PROPERTY_NAME);
|
|
339
|
+
if (!idProp || !import_ts_morph2.Node.isPropertyAssignment(idProp)) continue;
|
|
340
|
+
const idInit = idProp.getInitializer();
|
|
341
|
+
if (idInit && import_ts_morph2.Node.isStringLiteral(idInit) && idInit.getLiteralValue() === id) {
|
|
342
|
+
return true;
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
return false;
|
|
346
|
+
}
|
|
347
|
+
function ensureRegisterRemovesValidatedFlag(action) {
|
|
348
|
+
const entry = `{ id: '${VALIDATED_FLAG_VALUE}', operation: 'remove' }`;
|
|
349
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME);
|
|
350
|
+
if (flagsProp && import_ts_morph2.Node.isPropertyAssignment(flagsProp)) {
|
|
351
|
+
const flagsInit = flagsProp.getInitializer();
|
|
352
|
+
if (flagsInit && import_ts_morph2.Node.isArrayLiteralExpression(flagsInit)) {
|
|
353
|
+
if (arrayHasElementWithId(flagsInit, VALIDATED_FLAG_VALUE)) return false;
|
|
354
|
+
flagsInit.addElement(entry);
|
|
355
|
+
return true;
|
|
356
|
+
}
|
|
357
|
+
return false;
|
|
358
|
+
}
|
|
359
|
+
action.addPropertyAssignment({
|
|
360
|
+
name: FLAGS_PROPERTY_NAME,
|
|
361
|
+
initializer: `[${entry}]`
|
|
362
|
+
});
|
|
363
|
+
return true;
|
|
364
|
+
}
|
|
316
365
|
function processFile2(filePath, project) {
|
|
317
366
|
const sourceFile = project.getSourceFile(filePath);
|
|
318
367
|
if (!sourceFile) return 0;
|
|
@@ -378,6 +427,18 @@ function processFile2(filePath, project) {
|
|
|
378
427
|
` [${import_path2.default.relative(process.cwd(), filePath)}] Added top-level 'flags' array to defineConfig`
|
|
379
428
|
);
|
|
380
429
|
}
|
|
430
|
+
if (configHadValidateAction) {
|
|
431
|
+
for (const element of actionsInitializer.getElements()) {
|
|
432
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(element)) continue;
|
|
433
|
+
if (!isRegisterAction(element)) continue;
|
|
434
|
+
if (ensureRegisterRemovesValidatedFlag(element)) {
|
|
435
|
+
transformedCount++;
|
|
436
|
+
console.log(
|
|
437
|
+
` [${import_path2.default.relative(process.cwd(), filePath)}] Added '${VALIDATED_FLAG_VALUE}' remove-flag to REGISTER action`
|
|
438
|
+
);
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
}
|
|
381
442
|
if (fileNeedsImports) {
|
|
382
443
|
ensureImports(sourceFile);
|
|
383
444
|
}
|
|
@@ -424,7 +485,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
424
485
|
}
|
|
425
486
|
console.log(
|
|
426
487
|
`
|
|
427
|
-
Done.
|
|
488
|
+
Done. Applied ${totalTransformed} change(s): VALIDATE \u2192 CUSTOM (${VALIDATE_DECLARATION_VALUE}) and '${VALIDATED_FLAG_VALUE}' remove-flag on matching REGISTER actions.`
|
|
428
489
|
);
|
|
429
490
|
}
|
|
430
491
|
|
|
@@ -667,14 +728,14 @@ var QUERY_PROPERTY_NAME = "query";
|
|
|
667
728
|
var TYPE_PROPERTY_NAME5 = "type";
|
|
668
729
|
var CLAUSES_PROPERTY_NAME = "clauses";
|
|
669
730
|
var STATUS_PROPERTY_NAME = "status";
|
|
670
|
-
var
|
|
731
|
+
var FLAGS_PROPERTY_NAME2 = "flags";
|
|
671
732
|
var TERMS_PROPERTY_NAME = "terms";
|
|
672
733
|
var TERM_PROPERTY_NAME = "term";
|
|
673
734
|
var ANY_OF_PROPERTY_NAME = "anyOf";
|
|
674
735
|
var VALIDATED_STATUS_VALUE = "VALIDATED";
|
|
675
|
-
var
|
|
736
|
+
var VALIDATED_FLAG_VALUE2 = "validated";
|
|
676
737
|
function addValidatedFlag(clause) {
|
|
677
|
-
const flagsProperty = clause.getProperty(
|
|
738
|
+
const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME2);
|
|
678
739
|
if (flagsProperty && import_ts_morph5.Node.isPropertyAssignment(flagsProperty)) {
|
|
679
740
|
const flagsInit = flagsProperty.getInitializer();
|
|
680
741
|
if (flagsInit && import_ts_morph5.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -682,19 +743,19 @@ function addValidatedFlag(clause) {
|
|
|
682
743
|
if (anyOfProperty && import_ts_morph5.Node.isPropertyAssignment(anyOfProperty)) {
|
|
683
744
|
const anyOfInit = anyOfProperty.getInitializer();
|
|
684
745
|
if (anyOfInit && import_ts_morph5.Node.isArrayLiteralExpression(anyOfInit)) {
|
|
685
|
-
anyOfInit.addElement(`'${
|
|
746
|
+
anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE2}'`);
|
|
686
747
|
}
|
|
687
748
|
} else {
|
|
688
749
|
flagsInit.addPropertyAssignment({
|
|
689
750
|
name: ANY_OF_PROPERTY_NAME,
|
|
690
|
-
initializer: `['${
|
|
751
|
+
initializer: `['${VALIDATED_FLAG_VALUE2}']`
|
|
691
752
|
});
|
|
692
753
|
}
|
|
693
754
|
}
|
|
694
755
|
} else {
|
|
695
756
|
clause.addPropertyAssignment({
|
|
696
|
-
name:
|
|
697
|
-
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${
|
|
757
|
+
name: FLAGS_PROPERTY_NAME2,
|
|
758
|
+
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE2}'] }`
|
|
698
759
|
});
|
|
699
760
|
}
|
|
700
761
|
}
|
|
@@ -860,23 +921,26 @@ var DEFINE_CONFIG_NAME4 = "defineConfig";
|
|
|
860
921
|
var DEFINE_WORKQUEUES_NAME2 = "defineWorkqueues";
|
|
861
922
|
var ACTIONS_PROPERTY_NAME4 = "actions";
|
|
862
923
|
var ACTION_PROPERTY_NAME = "action";
|
|
863
|
-
var
|
|
924
|
+
var FLAGS_PROPERTY_NAME3 = "flags";
|
|
864
925
|
var QUERY_PROPERTY_NAME2 = "query";
|
|
865
926
|
var TYPE_PROPERTY_NAME6 = "type";
|
|
927
|
+
var ID_PROPERTY_NAME2 = "id";
|
|
866
928
|
var CLAUSES_PROPERTY_NAME2 = "clauses";
|
|
867
929
|
var ANY_OF_PROPERTY_NAME2 = "anyOf";
|
|
868
930
|
var FLAG_ID = "pending-first-certificate-issuance";
|
|
869
931
|
var REGISTER_TYPE = "REGISTER";
|
|
870
932
|
var PRINT_CERTIFICATE_TYPE = "PRINT_CERTIFICATE";
|
|
871
|
-
|
|
933
|
+
function flagDefinitionInitializer(eventType) {
|
|
934
|
+
return `{
|
|
872
935
|
id: '${FLAG_ID}',
|
|
873
936
|
label: {
|
|
874
|
-
id: 'event.
|
|
937
|
+
id: 'event.${eventType}.flag.${FLAG_ID}',
|
|
875
938
|
defaultMessage: 'Pending first certificate issuance',
|
|
876
939
|
description: 'Flag label for first certificate issuance'
|
|
877
940
|
},
|
|
878
941
|
requiresAction: true
|
|
879
942
|
}`;
|
|
943
|
+
}
|
|
880
944
|
function isActionOfType(obj, typeName) {
|
|
881
945
|
const typeProperty = obj.getProperty(TYPE_PROPERTY_NAME6);
|
|
882
946
|
if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
|
|
@@ -890,18 +954,20 @@ function isActionOfType(obj, typeName) {
|
|
|
890
954
|
}
|
|
891
955
|
return false;
|
|
892
956
|
}
|
|
893
|
-
function
|
|
894
|
-
const
|
|
895
|
-
|
|
896
|
-
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
|
|
957
|
+
function getEventType(configArg) {
|
|
958
|
+
for (const propName of [TYPE_PROPERTY_NAME6, ID_PROPERTY_NAME2]) {
|
|
959
|
+
const prop = configArg.getProperty(propName);
|
|
960
|
+
if (!prop || !import_ts_morph6.Node.isPropertyAssignment(prop)) continue;
|
|
961
|
+
const initializer = prop.getInitializer();
|
|
962
|
+
if (!initializer) continue;
|
|
963
|
+
if (import_ts_morph6.Node.isStringLiteral(initializer)) {
|
|
964
|
+
return initializer.getLiteralValue().toLowerCase();
|
|
965
|
+
}
|
|
966
|
+
if (import_ts_morph6.Node.isPropertyAccessExpression(initializer)) {
|
|
967
|
+
return initializer.getName().toLowerCase();
|
|
968
|
+
}
|
|
903
969
|
}
|
|
904
|
-
return
|
|
970
|
+
return null;
|
|
905
971
|
}
|
|
906
972
|
function hasElementWithId(array3, id) {
|
|
907
973
|
for (const el of array3.getElements()) {
|
|
@@ -915,27 +981,28 @@ function hasElementWithId(array3, id) {
|
|
|
915
981
|
}
|
|
916
982
|
return false;
|
|
917
983
|
}
|
|
918
|
-
function ensureTopLevelFlagDefinition(configArg) {
|
|
919
|
-
const
|
|
984
|
+
function ensureTopLevelFlagDefinition(configArg, eventType) {
|
|
985
|
+
const initializer = flagDefinitionInitializer(eventType);
|
|
986
|
+
const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME3);
|
|
920
987
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
921
988
|
const flagsInit = flagsProp.getInitializer();
|
|
922
989
|
if (flagsInit && import_ts_morph6.Node.isArrayLiteralExpression(flagsInit)) {
|
|
923
990
|
if (hasElementWithId(flagsInit, FLAG_ID)) return false;
|
|
924
|
-
flagsInit.addElement(
|
|
991
|
+
flagsInit.addElement(initializer);
|
|
925
992
|
return true;
|
|
926
993
|
}
|
|
927
994
|
return false;
|
|
928
995
|
}
|
|
929
996
|
configArg.addPropertyAssignment({
|
|
930
|
-
name:
|
|
997
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
931
998
|
initializer: `[
|
|
932
|
-
${
|
|
999
|
+
${initializer}
|
|
933
1000
|
]`
|
|
934
1001
|
});
|
|
935
1002
|
return true;
|
|
936
1003
|
}
|
|
937
1004
|
function ensureActionOperationFlag(action, operation) {
|
|
938
|
-
const flagsProp = action.getProperty(
|
|
1005
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME3);
|
|
939
1006
|
const entry = `{ id: '${FLAG_ID}', operation: '${operation}' }`;
|
|
940
1007
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
941
1008
|
const flagsInit = flagsProp.getInitializer();
|
|
@@ -947,16 +1014,18 @@ function ensureActionOperationFlag(action, operation) {
|
|
|
947
1014
|
return false;
|
|
948
1015
|
}
|
|
949
1016
|
action.addPropertyAssignment({
|
|
950
|
-
name:
|
|
1017
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
951
1018
|
initializer: `[${entry}]`
|
|
952
1019
|
});
|
|
953
1020
|
return true;
|
|
954
1021
|
}
|
|
955
|
-
function
|
|
1022
|
+
function processConfig(configArg, eventType, relPath) {
|
|
956
1023
|
let changes = 0;
|
|
957
|
-
if (ensureTopLevelFlagDefinition(configArg)) {
|
|
1024
|
+
if (ensureTopLevelFlagDefinition(configArg, eventType)) {
|
|
958
1025
|
changes++;
|
|
959
|
-
console.log(
|
|
1026
|
+
console.log(
|
|
1027
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`
|
|
1028
|
+
);
|
|
960
1029
|
}
|
|
961
1030
|
const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME4);
|
|
962
1031
|
if (!actionsProp || !import_ts_morph6.Node.isPropertyAssignment(actionsProp)) return changes;
|
|
@@ -970,7 +1039,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
970
1039
|
if (ensureActionOperationFlag(element, "add")) {
|
|
971
1040
|
changes++;
|
|
972
1041
|
console.log(
|
|
973
|
-
` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
1042
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
974
1043
|
);
|
|
975
1044
|
}
|
|
976
1045
|
}
|
|
@@ -978,7 +1047,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
978
1047
|
if (ensureActionOperationFlag(element, "remove")) {
|
|
979
1048
|
changes++;
|
|
980
1049
|
console.log(
|
|
981
|
-
` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
1050
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
982
1051
|
);
|
|
983
1052
|
}
|
|
984
1053
|
}
|
|
@@ -1007,7 +1076,7 @@ function hasPrintCertificateAction(workqueue) {
|
|
|
1007
1076
|
return false;
|
|
1008
1077
|
}
|
|
1009
1078
|
function addFlagToQueryClause(clause) {
|
|
1010
|
-
const flagsProp = clause.getProperty(
|
|
1079
|
+
const flagsProp = clause.getProperty(FLAGS_PROPERTY_NAME3);
|
|
1011
1080
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
1012
1081
|
const flagsInit = flagsProp.getInitializer();
|
|
1013
1082
|
if (flagsInit && import_ts_morph6.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -1032,7 +1101,7 @@ function addFlagToQueryClause(clause) {
|
|
|
1032
1101
|
}
|
|
1033
1102
|
} else {
|
|
1034
1103
|
clause.addPropertyAssignment({
|
|
1035
|
-
name:
|
|
1104
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
1036
1105
|
initializer: `{ ${ANY_OF_PROPERTY_NAME2}: ['${FLAG_ID}'] }`
|
|
1037
1106
|
});
|
|
1038
1107
|
return true;
|
|
@@ -1076,8 +1145,9 @@ function processFile6(filePath, project) {
|
|
|
1076
1145
|
if (args2.length === 0) continue;
|
|
1077
1146
|
const configArg = args2[0];
|
|
1078
1147
|
if (!import_ts_morph6.Node.isObjectLiteralExpression(configArg)) continue;
|
|
1079
|
-
|
|
1080
|
-
|
|
1148
|
+
const eventType = getEventType(configArg);
|
|
1149
|
+
if (!eventType) continue;
|
|
1150
|
+
totalChanges += processConfig(configArg, eventType, relPath);
|
|
1081
1151
|
}
|
|
1082
1152
|
if (calleeName === DEFINE_WORKQUEUES_NAME2) {
|
|
1083
1153
|
const args2 = call.getArguments();
|
|
@@ -1106,7 +1176,7 @@ function processFile6(filePath, project) {
|
|
|
1106
1176
|
async function main6() {
|
|
1107
1177
|
const srcDir = import_path6.default.join(process.cwd(), "src");
|
|
1108
1178
|
console.log(
|
|
1109
|
-
`Scanning for
|
|
1179
|
+
`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
|
|
1110
1180
|
`
|
|
1111
1181
|
);
|
|
1112
1182
|
const project = new import_ts_morph6.Project({
|
|
@@ -1131,7 +1201,7 @@ async function main6() {
|
|
|
1131
1201
|
}
|
|
1132
1202
|
if (modifiedFiles.length === 0) {
|
|
1133
1203
|
console.log(
|
|
1134
|
-
"No
|
|
1204
|
+
"No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
|
|
1135
1205
|
);
|
|
1136
1206
|
return;
|
|
1137
1207
|
}
|
|
@@ -2050,6 +2120,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
|
|
|
2050
2120
|
var import_ts_morph11 = require("ts-morph");
|
|
2051
2121
|
var import_path11 = __toESM(require("path"));
|
|
2052
2122
|
|
|
2123
|
+
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2124
|
+
var z4 = __toESM(require("zod/v4"));
|
|
2125
|
+
var import_lodash = require("lodash");
|
|
2126
|
+
|
|
2053
2127
|
// ../commons/src/scopes.ts
|
|
2054
2128
|
var z3 = __toESM(require("zod/v4"));
|
|
2055
2129
|
var qs = __toESM(require("qs"));
|
|
@@ -2110,6 +2184,10 @@ var scopeByEvent = z3.preprocess(
|
|
|
2110
2184
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
2111
2185
|
z3.array(z3.string()).optional()
|
|
2112
2186
|
).describe("Event type, e.g. birth, death");
|
|
2187
|
+
var userRole = z3.preprocess(
|
|
2188
|
+
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
2189
|
+
z3.array(z3.string()).optional()
|
|
2190
|
+
).describe("User role, e.g. admin, field agent");
|
|
2113
2191
|
var scopeOptionsPlaceEvent = z3.object({
|
|
2114
2192
|
event: scopeByEvent,
|
|
2115
2193
|
placeOfEvent: JurisdictionFilter.optional()
|
|
@@ -2133,6 +2211,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
|
|
|
2133
2211
|
var AccessLevelOptions = z3.object({
|
|
2134
2212
|
accessLevel: JurisdictionFilter.optional()
|
|
2135
2213
|
});
|
|
2214
|
+
var AllUserScopeOptions = AccessLevelOptions.extend({
|
|
2215
|
+
role: userRole.optional()
|
|
2216
|
+
});
|
|
2136
2217
|
var WorkqueueOrDashboardOptions = z3.object({
|
|
2137
2218
|
ids: z3.preprocess(
|
|
2138
2219
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
@@ -2142,6 +2223,7 @@ var WorkqueueOrDashboardOptions = z3.object({
|
|
|
2142
2223
|
var AllScopeOptions = z3.object({
|
|
2143
2224
|
...AllRecordScopeOptions.shape,
|
|
2144
2225
|
...AccessLevelOptions.shape,
|
|
2226
|
+
...AllUserScopeOptions.shape,
|
|
2145
2227
|
...WorkqueueOrDashboardOptions.shape
|
|
2146
2228
|
});
|
|
2147
2229
|
var ScopeOptionKey = AllScopeOptions.keyof();
|
|
@@ -2214,6 +2296,30 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2214
2296
|
]).describe(
|
|
2215
2297
|
"Scopes used to check user's permission to perform actions on a record."
|
|
2216
2298
|
);
|
|
2299
|
+
var SystemScopeType = z3.enum([
|
|
2300
|
+
"organisation.read-locations",
|
|
2301
|
+
"user.read",
|
|
2302
|
+
"user.create",
|
|
2303
|
+
"user.edit",
|
|
2304
|
+
"user.search"
|
|
2305
|
+
]);
|
|
2306
|
+
var UserScopeType = SystemScopeType.extract([
|
|
2307
|
+
"user.read",
|
|
2308
|
+
"user.create",
|
|
2309
|
+
"user.edit",
|
|
2310
|
+
"user.search"
|
|
2311
|
+
]);
|
|
2312
|
+
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
2313
|
+
var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
2314
|
+
z3.object({
|
|
2315
|
+
type: ScopesWithRoleOption,
|
|
2316
|
+
options: AllUserScopeOptions.optional()
|
|
2317
|
+
}),
|
|
2318
|
+
z3.object({
|
|
2319
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
2320
|
+
options: AccessLevelOptions.optional()
|
|
2321
|
+
})
|
|
2322
|
+
]);
|
|
2217
2323
|
var ResolvedRecordScopeV2 = z3.discriminatedUnion("type", [
|
|
2218
2324
|
z3.object({
|
|
2219
2325
|
type: ScopesWithPlaceEventOptions,
|
|
@@ -2234,16 +2340,14 @@ var ResolvedRecordScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2234
2340
|
}).optional()
|
|
2235
2341
|
})
|
|
2236
2342
|
]).describe("Resolved scope with location/user IDs instead of filters.");
|
|
2237
|
-
var SystemScopeType = z3.enum([
|
|
2238
|
-
"organisation.read-locations",
|
|
2239
|
-
"user.read",
|
|
2240
|
-
"user.create",
|
|
2241
|
-
"user.edit"
|
|
2242
|
-
]);
|
|
2243
2343
|
var Scope2 = z3.discriminatedUnion("type", [
|
|
2244
2344
|
z3.object({ type: PlainScopeType }),
|
|
2245
2345
|
...RecordScopeV2.options,
|
|
2246
|
-
|
|
2346
|
+
...UserScopeV2.options,
|
|
2347
|
+
z3.object({
|
|
2348
|
+
type: z3.literal("organisation.read-locations"),
|
|
2349
|
+
options: AccessLevelOptions.optional()
|
|
2350
|
+
}),
|
|
2247
2351
|
z3.object({
|
|
2248
2352
|
type: z3.literal("workqueue"),
|
|
2249
2353
|
options: WorkqueueOrDashboardOptions
|
|
@@ -2293,7 +2397,6 @@ var DEFAULT_SCOPE_OPTIONS = {
|
|
|
2293
2397
|
};
|
|
2294
2398
|
|
|
2295
2399
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2296
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2297
2400
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2298
2401
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2299
2402
|
var SearchScope = z4.object({
|
|
@@ -2527,6 +2630,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2527
2630
|
}
|
|
2528
2631
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2529
2632
|
};
|
|
2633
|
+
var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
|
|
2634
|
+
function isMergeableUserScopeType(type) {
|
|
2635
|
+
return MERGEABLE_USER_SCOPE_TYPES.includes(type);
|
|
2636
|
+
}
|
|
2637
|
+
function decodeLegacyScope(legacy) {
|
|
2638
|
+
const encoded = legacyScopeToV2Scope(legacy);
|
|
2639
|
+
const scope = decodeScope(encoded);
|
|
2640
|
+
if (!scope) {
|
|
2641
|
+
throw new Error(
|
|
2642
|
+
`Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
|
|
2643
|
+
);
|
|
2644
|
+
}
|
|
2645
|
+
return { legacy, scope };
|
|
2646
|
+
}
|
|
2647
|
+
function groupByType(entries) {
|
|
2648
|
+
return entries.reduce(
|
|
2649
|
+
(groups, entry) => ({
|
|
2650
|
+
...groups,
|
|
2651
|
+
[entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
|
|
2652
|
+
}),
|
|
2653
|
+
{}
|
|
2654
|
+
);
|
|
2655
|
+
}
|
|
2656
|
+
function deduplicateEntries(entries) {
|
|
2657
|
+
return entries.filter(
|
|
2658
|
+
(entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
|
|
2659
|
+
);
|
|
2660
|
+
}
|
|
2661
|
+
function mergeEntries(type, entries) {
|
|
2662
|
+
const optionsList = entries.map(
|
|
2663
|
+
(e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
|
|
2664
|
+
);
|
|
2665
|
+
const allKeys = optionsList.flatMap(
|
|
2666
|
+
(opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
|
|
2667
|
+
);
|
|
2668
|
+
const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
|
|
2669
|
+
if (conflictKey) {
|
|
2670
|
+
const conflicting = entries.filter(
|
|
2671
|
+
(e) => conflictKey in ("options" in e.scope && e.scope.options || {})
|
|
2672
|
+
).map((e) => JSON.stringify(e.legacy));
|
|
2673
|
+
throw new Error(
|
|
2674
|
+
`Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
|
|
2675
|
+
);
|
|
2676
|
+
}
|
|
2677
|
+
const mergedOptions = Object.assign({}, ...optionsList);
|
|
2678
|
+
const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
|
|
2679
|
+
const parsed = Scope2.safeParse(merged);
|
|
2680
|
+
if (!parsed.success) {
|
|
2681
|
+
throw new Error(
|
|
2682
|
+
`Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
|
|
2683
|
+
);
|
|
2684
|
+
}
|
|
2685
|
+
return parsed.data;
|
|
2686
|
+
}
|
|
2687
|
+
function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
|
|
2688
|
+
const groups = groupByType(legacyScopes.map(decodeLegacyScope));
|
|
2689
|
+
return Object.entries(groups).flatMap(([type, entries]) => {
|
|
2690
|
+
const deduped = deduplicateEntries(entries);
|
|
2691
|
+
if (deduped.length <= 1) return deduped.map((e) => e.scope);
|
|
2692
|
+
if (!isMergeableUserScopeType(type)) {
|
|
2693
|
+
console.warn(
|
|
2694
|
+
`Multiple non-mergeable '${type}' scopes detected after dedup \u2014 kept all as-is. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}]. Review whether the duplication is intentional.`
|
|
2695
|
+
);
|
|
2696
|
+
return deduped.map((e) => e.scope);
|
|
2697
|
+
}
|
|
2698
|
+
return [mergeEntries(type, deduped)];
|
|
2699
|
+
});
|
|
2700
|
+
}
|
|
2530
2701
|
|
|
2531
2702
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2532
2703
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2564,57 +2735,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2564
2735
|
}
|
|
2565
2736
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2566
2737
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2567
|
-
if (!sourceFile)
|
|
2738
|
+
if (!sourceFile) {
|
|
2739
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2740
|
+
}
|
|
2568
2741
|
let migratedCount = 0;
|
|
2569
2742
|
let removedCount = 0;
|
|
2743
|
+
let mergedCount = 0;
|
|
2570
2744
|
const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
2745
|
+
const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
|
|
2571
2746
|
for (const scopesProp of scopesProperties) {
|
|
2572
2747
|
const initializer = scopesProp.getInitializer();
|
|
2573
2748
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2574
|
-
const
|
|
2575
|
-
|
|
2576
|
-
|
|
2577
|
-
|
|
2749
|
+
const rawTexts = [];
|
|
2750
|
+
const legacyStrings = [];
|
|
2751
|
+
let anyChange = false;
|
|
2752
|
+
for (const element of initializer.getElements()) {
|
|
2578
2753
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2579
2754
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2580
2755
|
console.warn(
|
|
2581
|
-
` [${
|
|
2756
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2582
2757
|
);
|
|
2583
|
-
initializer.removeElement(index);
|
|
2584
2758
|
removedCount++;
|
|
2759
|
+
anyChange = true;
|
|
2585
2760
|
continue;
|
|
2586
2761
|
}
|
|
2587
2762
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2588
2763
|
if (!legacyScope) {
|
|
2589
2764
|
console.warn(
|
|
2590
|
-
` [${
|
|
2765
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2591
2766
|
);
|
|
2767
|
+
rawTexts.push(element.getText());
|
|
2592
2768
|
continue;
|
|
2593
2769
|
}
|
|
2594
|
-
|
|
2595
|
-
|
|
2596
|
-
|
|
2597
|
-
|
|
2598
|
-
|
|
2599
|
-
|
|
2600
|
-
|
|
2601
|
-
|
|
2602
|
-
|
|
2603
|
-
|
|
2604
|
-
|
|
2605
|
-
|
|
2606
|
-
console.warn(
|
|
2607
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2608
|
-
);
|
|
2609
|
-
}
|
|
2770
|
+
legacyStrings.push(legacyScope);
|
|
2771
|
+
anyChange = true;
|
|
2772
|
+
}
|
|
2773
|
+
if (!anyChange) continue;
|
|
2774
|
+
let mergedScopes;
|
|
2775
|
+
try {
|
|
2776
|
+
mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
|
|
2777
|
+
} catch (error) {
|
|
2778
|
+
throw new Error(
|
|
2779
|
+
`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
|
|
2780
|
+
{ cause: error }
|
|
2781
|
+
);
|
|
2610
2782
|
}
|
|
2783
|
+
migratedCount += legacyStrings.length;
|
|
2784
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
2785
|
+
const outputElements = [
|
|
2786
|
+
...rawTexts,
|
|
2787
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
2788
|
+
];
|
|
2789
|
+
scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
|
|
2611
2790
|
}
|
|
2612
2791
|
if (removedCount > 0) {
|
|
2613
2792
|
console.log(
|
|
2614
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2793
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2615
2794
|
);
|
|
2616
2795
|
}
|
|
2617
|
-
return { migratedCount, removedCount };
|
|
2796
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2618
2797
|
}
|
|
2619
2798
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2620
2799
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2749,7 +2928,7 @@ async function main11() {
|
|
|
2749
2928
|
return;
|
|
2750
2929
|
}
|
|
2751
2930
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2752
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2931
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2753
2932
|
rolesFilePath,
|
|
2754
2933
|
project
|
|
2755
2934
|
);
|
|
@@ -2768,7 +2947,7 @@ async function main11() {
|
|
|
2768
2947
|
}
|
|
2769
2948
|
await sourceFile.save();
|
|
2770
2949
|
console.log(
|
|
2771
|
-
`Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
|
|
2950
|
+
`Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
|
|
2772
2951
|
);
|
|
2773
2952
|
}
|
|
2774
2953
|
|
|
@@ -3574,6 +3753,10 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3574
3753
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3575
3754
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3576
3755
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3756
|
+
var READ_ACTION_TYPE = "READ";
|
|
3757
|
+
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3758
|
+
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3759
|
+
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3577
3760
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3578
3761
|
"READ",
|
|
3579
3762
|
"DELETE",
|
|
@@ -3621,91 +3804,137 @@ function isUnsupportedActionType(action) {
|
|
|
3621
3804
|
}
|
|
3622
3805
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3623
3806
|
}
|
|
3624
|
-
function
|
|
3625
|
-
const
|
|
3626
|
-
|
|
3627
|
-
|
|
3628
|
-
|
|
3629
|
-
|
|
3630
|
-
|
|
3631
|
-
|
|
3807
|
+
function ensureValidAction(workqueue, relPath) {
|
|
3808
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3809
|
+
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3810
|
+
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3811
|
+
const initializer = actionProperty.getInitializer();
|
|
3812
|
+
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3813
|
+
if (!isUnsupportedActionType(initializer)) {
|
|
3814
|
+
return { changed: false, usedReadFallback: false };
|
|
3815
|
+
}
|
|
3816
|
+
actionProperty.set({
|
|
3817
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3818
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3819
|
+
});
|
|
3820
|
+
console.log(
|
|
3821
|
+
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3822
|
+
);
|
|
3823
|
+
return { changed: true, usedReadFallback: true };
|
|
3824
|
+
}
|
|
3632
3825
|
}
|
|
3826
|
+
workqueue.addPropertyAssignment({
|
|
3827
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3828
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3829
|
+
});
|
|
3830
|
+
console.log(
|
|
3831
|
+
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3832
|
+
);
|
|
3833
|
+
return { changed: true, usedReadFallback: true };
|
|
3834
|
+
}
|
|
3835
|
+
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3633
3836
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3634
|
-
const
|
|
3635
|
-
|
|
3636
|
-
|
|
3637
|
-
|
|
3638
|
-
|
|
3639
|
-
|
|
3640
|
-
|
|
3837
|
+
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3838
|
+
let actionsArrayMigrated = false;
|
|
3839
|
+
if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3840
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3841
|
+
if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3842
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3843
|
+
if (existingActionProperty) {
|
|
3844
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3845
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3846
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3847
|
+
const conditionalsProperty = existingActionInitializer.getProperty(
|
|
3848
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3849
|
+
);
|
|
3850
|
+
if (conditionalsProperty) {
|
|
3851
|
+
conditionalsProperty.remove();
|
|
3852
|
+
console.log(
|
|
3853
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3854
|
+
);
|
|
3855
|
+
}
|
|
3856
|
+
}
|
|
3857
|
+
}
|
|
3858
|
+
actionsProperty.remove();
|
|
3859
|
+
console.log(
|
|
3860
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3861
|
+
);
|
|
3862
|
+
actionsArrayMigrated = true;
|
|
3863
|
+
} else {
|
|
3864
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3865
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3641
3866
|
);
|
|
3642
|
-
if (
|
|
3643
|
-
|
|
3867
|
+
if (actionCandidates.length === 0) {
|
|
3868
|
+
actionsProperty.remove();
|
|
3644
3869
|
console.log(
|
|
3645
|
-
` [${relPath}] Removed
|
|
3870
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3646
3871
|
);
|
|
3647
|
-
|
|
3648
|
-
|
|
3649
|
-
|
|
3650
|
-
|
|
3651
|
-
|
|
3872
|
+
actionsArrayMigrated = true;
|
|
3873
|
+
} else {
|
|
3874
|
+
if (actionCandidates.length > 1) {
|
|
3875
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3876
|
+
console.warn(
|
|
3877
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3878
|
+
);
|
|
3879
|
+
}
|
|
3880
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3881
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3652
3882
|
);
|
|
3883
|
+
if (conditionalsProperty) {
|
|
3884
|
+
conditionalsProperty.remove();
|
|
3885
|
+
console.log(
|
|
3886
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3887
|
+
);
|
|
3888
|
+
}
|
|
3889
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3890
|
+
actionsProperty.remove();
|
|
3891
|
+
console.log(
|
|
3892
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3893
|
+
);
|
|
3894
|
+
actionsArrayMigrated = true;
|
|
3895
|
+
} else {
|
|
3896
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3897
|
+
workqueue.addPropertyAssignment({
|
|
3898
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3899
|
+
initializer: firstActionText
|
|
3900
|
+
});
|
|
3901
|
+
actionsProperty.remove();
|
|
3902
|
+
console.log(
|
|
3903
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3904
|
+
);
|
|
3905
|
+
actionsArrayMigrated = true;
|
|
3906
|
+
}
|
|
3653
3907
|
}
|
|
3654
3908
|
}
|
|
3655
3909
|
}
|
|
3656
|
-
actionsProperty.remove();
|
|
3657
|
-
console.log(
|
|
3658
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3659
|
-
);
|
|
3660
|
-
return 1;
|
|
3661
|
-
}
|
|
3662
|
-
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3663
|
-
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3664
|
-
);
|
|
3665
|
-
if (actionCandidates.length === 0) {
|
|
3666
|
-
actionsProperty.remove();
|
|
3667
|
-
console.log(
|
|
3668
|
-
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3669
|
-
);
|
|
3670
|
-
return 1;
|
|
3671
|
-
}
|
|
3672
|
-
if (actionCandidates.length > 1) {
|
|
3673
|
-
const droppedCount = actionCandidates.length - 1;
|
|
3674
|
-
console.warn(
|
|
3675
|
-
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3676
|
-
);
|
|
3677
3910
|
}
|
|
3678
|
-
const
|
|
3679
|
-
|
|
3911
|
+
const fallback = ensureValidAction(workqueue, relPath);
|
|
3912
|
+
return {
|
|
3913
|
+
changed: actionsArrayMigrated || fallback.changed,
|
|
3914
|
+
usedReadFallback: fallback.usedReadFallback
|
|
3915
|
+
};
|
|
3916
|
+
}
|
|
3917
|
+
function ensureActionTypeImport(sourceFile) {
|
|
3918
|
+
const existingImport = sourceFile.getImportDeclaration(
|
|
3919
|
+
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3680
3920
|
);
|
|
3681
|
-
if (
|
|
3682
|
-
|
|
3683
|
-
|
|
3684
|
-
|
|
3685
|
-
|
|
3686
|
-
|
|
3687
|
-
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3688
|
-
actionsProperty.remove();
|
|
3689
|
-
console.log(
|
|
3690
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3691
|
-
);
|
|
3692
|
-
return 1;
|
|
3921
|
+
if (existingImport) {
|
|
3922
|
+
const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
|
|
3923
|
+
if (!alreadyImported) {
|
|
3924
|
+
existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
|
|
3925
|
+
}
|
|
3926
|
+
return;
|
|
3693
3927
|
}
|
|
3694
|
-
|
|
3695
|
-
|
|
3696
|
-
|
|
3697
|
-
initializer: firstActionText
|
|
3928
|
+
sourceFile.addImportDeclaration({
|
|
3929
|
+
moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
|
|
3930
|
+
namedImports: [ACTION_TYPE_IMPORT_NAME]
|
|
3698
3931
|
});
|
|
3699
|
-
actionsProperty.remove();
|
|
3700
|
-
console.log(
|
|
3701
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3702
|
-
);
|
|
3703
|
-
return 1;
|
|
3704
3932
|
}
|
|
3705
3933
|
function processFile13(filePath, project) {
|
|
3706
3934
|
const sourceFile = project.getSourceFile(filePath);
|
|
3707
3935
|
if (!sourceFile) return 0;
|
|
3708
3936
|
let migratedWorkqueues = 0;
|
|
3937
|
+
let needsActionTypeImport = false;
|
|
3709
3938
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3710
3939
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3711
3940
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3721,9 +3950,14 @@ function processFile13(filePath, project) {
|
|
|
3721
3950
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3722
3951
|
for (const element of workqueuesArg.getElements()) {
|
|
3723
3952
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3724
|
-
|
|
3953
|
+
const result = migrateWorkqueueActions(element, relPath);
|
|
3954
|
+
if (result.changed) migratedWorkqueues++;
|
|
3955
|
+
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3725
3956
|
}
|
|
3726
3957
|
}
|
|
3958
|
+
if (needsActionTypeImport) {
|
|
3959
|
+
ensureActionTypeImport(sourceFile);
|
|
3960
|
+
}
|
|
3727
3961
|
return migratedWorkqueues;
|
|
3728
3962
|
}
|
|
3729
3963
|
async function main18() {
|
|
@@ -4058,7 +4292,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4058
4292
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4059
4293
|
var import_child_process = require("child_process");
|
|
4060
4294
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4061
|
-
var UPSTREAM_BRANCH = "
|
|
4295
|
+
var UPSTREAM_BRANCH = "release-v2.0.0";
|
|
4062
4296
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4063
4297
|
var FILES_TO_CHECKOUT = [
|
|
4064
4298
|
"src/analytics/analytics.ts",
|
|
@@ -4608,9 +4842,13 @@ function gitShowBytes(ref, path23) {
|
|
|
4608
4842
|
return null;
|
|
4609
4843
|
}
|
|
4610
4844
|
}
|
|
4611
|
-
async function main25(
|
|
4845
|
+
async function main25({
|
|
4846
|
+
subdirs = []
|
|
4847
|
+
} = {}) {
|
|
4848
|
+
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4849
|
+
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4612
4850
|
console.log(
|
|
4613
|
-
`Merging
|
|
4851
|
+
`Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4614
4852
|
`
|
|
4615
4853
|
);
|
|
4616
4854
|
assertIsGitRepo();
|
|
@@ -4625,20 +4863,12 @@ async function main25() {
|
|
|
4625
4863
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4626
4864
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4627
4865
|
const upstreamFiles = runGit(
|
|
4628
|
-
[
|
|
4629
|
-
"ls-tree",
|
|
4630
|
-
"-r",
|
|
4631
|
-
"--name-only",
|
|
4632
|
-
"-z",
|
|
4633
|
-
ref,
|
|
4634
|
-
"--",
|
|
4635
|
-
`${INFRASTRUCTURE_DIR}/`
|
|
4636
|
-
],
|
|
4866
|
+
["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
|
|
4637
4867
|
{ silent: true }
|
|
4638
4868
|
).split("\0").filter(Boolean);
|
|
4639
4869
|
if (upstreamFiles.length === 0) {
|
|
4640
4870
|
console.log(
|
|
4641
|
-
` No files found under
|
|
4871
|
+
` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
|
|
4642
4872
|
);
|
|
4643
4873
|
return;
|
|
4644
4874
|
}
|
|
@@ -4713,7 +4943,9 @@ async function main25() {
|
|
|
4713
4943
|
var import_fs6 = require("fs");
|
|
4714
4944
|
var import_path25 = require("path");
|
|
4715
4945
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4716
|
-
async function main26(
|
|
4946
|
+
async function main26({
|
|
4947
|
+
keep = []
|
|
4948
|
+
} = {}) {
|
|
4717
4949
|
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4718
4950
|
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4719
4951
|
console.log(
|
|
@@ -4721,24 +4953,64 @@ async function main26() {
|
|
|
4721
4953
|
);
|
|
4722
4954
|
return;
|
|
4723
4955
|
}
|
|
4724
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4725
|
-
`);
|
|
4726
4956
|
assertIsGitRepo();
|
|
4727
|
-
|
|
4728
|
-
|
|
4729
|
-
|
|
4730
|
-
|
|
4731
|
-
|
|
4732
|
-
|
|
4733
|
-
console.log(
|
|
4957
|
+
if (keep.length === 0) {
|
|
4958
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4959
|
+
`);
|
|
4960
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4961
|
+
silent: true
|
|
4962
|
+
});
|
|
4963
|
+
console.log(
|
|
4964
|
+
` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4965
|
+
);
|
|
4966
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4967
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4968
|
+
console.log(
|
|
4969
|
+
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4970
|
+
);
|
|
4971
|
+
}
|
|
4972
|
+
console.log(
|
|
4973
|
+
`
|
|
4974
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4975
|
+
);
|
|
4976
|
+
return;
|
|
4977
|
+
}
|
|
4978
|
+
const keepSet = new Set(keep);
|
|
4979
|
+
console.log(
|
|
4980
|
+
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
4981
|
+
`
|
|
4982
|
+
);
|
|
4983
|
+
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
4984
|
+
let deleted = 0;
|
|
4985
|
+
for (const entry of topLevelEntries) {
|
|
4986
|
+
if (keepSet.has(entry.name)) {
|
|
4987
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
4988
|
+
continue;
|
|
4989
|
+
}
|
|
4990
|
+
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
4991
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
4992
|
+
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
4993
|
+
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
4994
|
+
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
4995
|
+
}
|
|
4996
|
+
console.log(` Deleted '${relPath}'.`);
|
|
4997
|
+
deleted++;
|
|
4998
|
+
}
|
|
4999
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
5000
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
5001
|
+
if (missingKeeps.length > 0) {
|
|
5002
|
+
console.warn(
|
|
5003
|
+
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
5004
|
+
);
|
|
4734
5005
|
}
|
|
4735
5006
|
console.log(
|
|
4736
5007
|
`
|
|
4737
|
-
Done. Review the staged
|
|
5008
|
+
Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4738
5009
|
);
|
|
4739
5010
|
}
|
|
4740
5011
|
|
|
4741
5012
|
// src/migrations/v2.0/index.ts
|
|
5013
|
+
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4742
5014
|
async function runUpgrade(dockerSwarm) {
|
|
4743
5015
|
await main18();
|
|
4744
5016
|
await main();
|
|
@@ -4767,7 +5039,8 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4767
5039
|
if (dockerSwarm) {
|
|
4768
5040
|
await main25();
|
|
4769
5041
|
} else {
|
|
4770
|
-
await main26();
|
|
5042
|
+
await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
|
|
5043
|
+
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4771
5044
|
}
|
|
4772
5045
|
}
|
|
4773
5046
|
|