@opencrvs/toolkit 2.0.0-rc.da37d4e → 2.0.0-rc.da8cc8f
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 +17 -29
- package/dist/cli.js +405 -162
- package/dist/commons/api/router.d.ts +2983 -253
- package/dist/commons/application-config/index.d.ts +16 -4
- 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/locations.d.ts +21 -0
- 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/events/index.js +84 -55
- 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 +405 -162
- 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 +16 -25
- package/opencrvs-toolkit-2.0.0-rc.da8cc8f.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.0-rc.da37d4e.tgz +0 -0
|
@@ -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
|
}
|
|
@@ -2062,6 +2132,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
|
|
|
2062
2132
|
var import_ts_morph11 = require("ts-morph");
|
|
2063
2133
|
var import_path11 = __toESM(require("path"));
|
|
2064
2134
|
|
|
2135
|
+
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2136
|
+
var z4 = __toESM(require("zod/v4"));
|
|
2137
|
+
var import_lodash = require("lodash");
|
|
2138
|
+
|
|
2065
2139
|
// ../commons/src/scopes.ts
|
|
2066
2140
|
var z3 = __toESM(require("zod/v4"));
|
|
2067
2141
|
var qs = __toESM(require("qs"));
|
|
@@ -2335,7 +2409,6 @@ var DEFAULT_SCOPE_OPTIONS = {
|
|
|
2335
2409
|
};
|
|
2336
2410
|
|
|
2337
2411
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2338
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2339
2412
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2340
2413
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2341
2414
|
var SearchScope = z4.object({
|
|
@@ -2569,6 +2642,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2569
2642
|
}
|
|
2570
2643
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2571
2644
|
};
|
|
2645
|
+
var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
|
|
2646
|
+
function isMergeableUserScopeType(type) {
|
|
2647
|
+
return MERGEABLE_USER_SCOPE_TYPES.includes(type);
|
|
2648
|
+
}
|
|
2649
|
+
function decodeLegacyScope(legacy) {
|
|
2650
|
+
const encoded = legacyScopeToV2Scope(legacy);
|
|
2651
|
+
const scope = decodeScope(encoded);
|
|
2652
|
+
if (!scope) {
|
|
2653
|
+
throw new Error(
|
|
2654
|
+
`Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
|
|
2655
|
+
);
|
|
2656
|
+
}
|
|
2657
|
+
return { legacy, scope };
|
|
2658
|
+
}
|
|
2659
|
+
function groupByType(entries) {
|
|
2660
|
+
return entries.reduce(
|
|
2661
|
+
(groups, entry) => ({
|
|
2662
|
+
...groups,
|
|
2663
|
+
[entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
|
|
2664
|
+
}),
|
|
2665
|
+
{}
|
|
2666
|
+
);
|
|
2667
|
+
}
|
|
2668
|
+
function deduplicateEntries(entries) {
|
|
2669
|
+
return entries.filter(
|
|
2670
|
+
(entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
|
|
2671
|
+
);
|
|
2672
|
+
}
|
|
2673
|
+
function mergeEntries(type, entries) {
|
|
2674
|
+
const optionsList = entries.map(
|
|
2675
|
+
(e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
|
|
2676
|
+
);
|
|
2677
|
+
const allKeys = optionsList.flatMap(
|
|
2678
|
+
(opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
|
|
2679
|
+
);
|
|
2680
|
+
const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
|
|
2681
|
+
if (conflictKey) {
|
|
2682
|
+
const conflicting = entries.filter(
|
|
2683
|
+
(e) => conflictKey in ("options" in e.scope && e.scope.options || {})
|
|
2684
|
+
).map((e) => JSON.stringify(e.legacy));
|
|
2685
|
+
throw new Error(
|
|
2686
|
+
`Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
|
|
2687
|
+
);
|
|
2688
|
+
}
|
|
2689
|
+
const mergedOptions = Object.assign({}, ...optionsList);
|
|
2690
|
+
const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
|
|
2691
|
+
const parsed = Scope2.safeParse(merged);
|
|
2692
|
+
if (!parsed.success) {
|
|
2693
|
+
throw new Error(
|
|
2694
|
+
`Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
|
|
2695
|
+
);
|
|
2696
|
+
}
|
|
2697
|
+
return parsed.data;
|
|
2698
|
+
}
|
|
2699
|
+
function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
|
|
2700
|
+
const groups = groupByType(legacyScopes.map(decodeLegacyScope));
|
|
2701
|
+
return Object.entries(groups).flatMap(([type, entries]) => {
|
|
2702
|
+
const deduped = deduplicateEntries(entries);
|
|
2703
|
+
if (deduped.length <= 1) return deduped.map((e) => e.scope);
|
|
2704
|
+
if (!isMergeableUserScopeType(type)) {
|
|
2705
|
+
console.warn(
|
|
2706
|
+
`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.`
|
|
2707
|
+
);
|
|
2708
|
+
return deduped.map((e) => e.scope);
|
|
2709
|
+
}
|
|
2710
|
+
return [mergeEntries(type, deduped)];
|
|
2711
|
+
});
|
|
2712
|
+
}
|
|
2572
2713
|
|
|
2573
2714
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2574
2715
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2606,57 +2747,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2606
2747
|
}
|
|
2607
2748
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2608
2749
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2609
|
-
if (!sourceFile)
|
|
2750
|
+
if (!sourceFile) {
|
|
2751
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2752
|
+
}
|
|
2610
2753
|
let migratedCount = 0;
|
|
2611
2754
|
let removedCount = 0;
|
|
2755
|
+
let mergedCount = 0;
|
|
2612
2756
|
const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
2757
|
+
const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
|
|
2613
2758
|
for (const scopesProp of scopesProperties) {
|
|
2614
2759
|
const initializer = scopesProp.getInitializer();
|
|
2615
2760
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2616
|
-
const
|
|
2617
|
-
|
|
2618
|
-
|
|
2619
|
-
|
|
2761
|
+
const rawTexts = [];
|
|
2762
|
+
const legacyStrings = [];
|
|
2763
|
+
let anyChange = false;
|
|
2764
|
+
for (const element of initializer.getElements()) {
|
|
2620
2765
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2621
2766
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2622
2767
|
console.warn(
|
|
2623
|
-
` [${
|
|
2768
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2624
2769
|
);
|
|
2625
|
-
initializer.removeElement(index);
|
|
2626
2770
|
removedCount++;
|
|
2771
|
+
anyChange = true;
|
|
2627
2772
|
continue;
|
|
2628
2773
|
}
|
|
2629
2774
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2630
2775
|
if (!legacyScope) {
|
|
2631
2776
|
console.warn(
|
|
2632
|
-
` [${
|
|
2777
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2633
2778
|
);
|
|
2779
|
+
rawTexts.push(element.getText());
|
|
2634
2780
|
continue;
|
|
2635
2781
|
}
|
|
2636
|
-
|
|
2637
|
-
|
|
2638
|
-
|
|
2639
|
-
|
|
2640
|
-
|
|
2641
|
-
|
|
2642
|
-
|
|
2643
|
-
|
|
2644
|
-
|
|
2645
|
-
|
|
2646
|
-
|
|
2647
|
-
|
|
2648
|
-
console.warn(
|
|
2649
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2650
|
-
);
|
|
2651
|
-
}
|
|
2782
|
+
legacyStrings.push(legacyScope);
|
|
2783
|
+
anyChange = true;
|
|
2784
|
+
}
|
|
2785
|
+
if (!anyChange) continue;
|
|
2786
|
+
let mergedScopes;
|
|
2787
|
+
try {
|
|
2788
|
+
mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
|
|
2789
|
+
} catch (error) {
|
|
2790
|
+
throw new Error(
|
|
2791
|
+
`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
|
|
2792
|
+
{ cause: error }
|
|
2793
|
+
);
|
|
2652
2794
|
}
|
|
2795
|
+
migratedCount += legacyStrings.length;
|
|
2796
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
2797
|
+
const outputElements = [
|
|
2798
|
+
...rawTexts,
|
|
2799
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
2800
|
+
];
|
|
2801
|
+
scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
|
|
2653
2802
|
}
|
|
2654
2803
|
if (removedCount > 0) {
|
|
2655
2804
|
console.log(
|
|
2656
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2805
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2657
2806
|
);
|
|
2658
2807
|
}
|
|
2659
|
-
return { migratedCount, removedCount };
|
|
2808
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2660
2809
|
}
|
|
2661
2810
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2662
2811
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2791,7 +2940,7 @@ async function main11() {
|
|
|
2791
2940
|
return;
|
|
2792
2941
|
}
|
|
2793
2942
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2794
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2943
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2795
2944
|
rolesFilePath,
|
|
2796
2945
|
project
|
|
2797
2946
|
);
|
|
@@ -2810,7 +2959,7 @@ async function main11() {
|
|
|
2810
2959
|
}
|
|
2811
2960
|
await sourceFile.save();
|
|
2812
2961
|
console.log(
|
|
2813
|
-
`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." : "."}`
|
|
2962
|
+
`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." : "."}`
|
|
2814
2963
|
);
|
|
2815
2964
|
}
|
|
2816
2965
|
|
|
@@ -3616,6 +3765,10 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3616
3765
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3617
3766
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3618
3767
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3768
|
+
var READ_ACTION_TYPE = "READ";
|
|
3769
|
+
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3770
|
+
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3771
|
+
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3619
3772
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3620
3773
|
"READ",
|
|
3621
3774
|
"DELETE",
|
|
@@ -3663,91 +3816,137 @@ function isUnsupportedActionType(action) {
|
|
|
3663
3816
|
}
|
|
3664
3817
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3665
3818
|
}
|
|
3666
|
-
function
|
|
3667
|
-
const
|
|
3668
|
-
|
|
3669
|
-
|
|
3670
|
-
|
|
3671
|
-
|
|
3672
|
-
|
|
3673
|
-
|
|
3819
|
+
function ensureValidAction(workqueue, relPath) {
|
|
3820
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3821
|
+
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3822
|
+
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3823
|
+
const initializer = actionProperty.getInitializer();
|
|
3824
|
+
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3825
|
+
if (!isUnsupportedActionType(initializer)) {
|
|
3826
|
+
return { changed: false, usedReadFallback: false };
|
|
3827
|
+
}
|
|
3828
|
+
actionProperty.set({
|
|
3829
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3830
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3831
|
+
});
|
|
3832
|
+
console.log(
|
|
3833
|
+
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3834
|
+
);
|
|
3835
|
+
return { changed: true, usedReadFallback: true };
|
|
3836
|
+
}
|
|
3674
3837
|
}
|
|
3838
|
+
workqueue.addPropertyAssignment({
|
|
3839
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3840
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3841
|
+
});
|
|
3842
|
+
console.log(
|
|
3843
|
+
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3844
|
+
);
|
|
3845
|
+
return { changed: true, usedReadFallback: true };
|
|
3846
|
+
}
|
|
3847
|
+
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3675
3848
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3676
|
-
const
|
|
3677
|
-
|
|
3678
|
-
|
|
3679
|
-
|
|
3680
|
-
|
|
3681
|
-
|
|
3682
|
-
|
|
3849
|
+
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3850
|
+
let actionsArrayMigrated = false;
|
|
3851
|
+
if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3852
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3853
|
+
if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3854
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3855
|
+
if (existingActionProperty) {
|
|
3856
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3857
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3858
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3859
|
+
const conditionalsProperty = existingActionInitializer.getProperty(
|
|
3860
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3861
|
+
);
|
|
3862
|
+
if (conditionalsProperty) {
|
|
3863
|
+
conditionalsProperty.remove();
|
|
3864
|
+
console.log(
|
|
3865
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3866
|
+
);
|
|
3867
|
+
}
|
|
3868
|
+
}
|
|
3869
|
+
}
|
|
3870
|
+
actionsProperty.remove();
|
|
3871
|
+
console.log(
|
|
3872
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3873
|
+
);
|
|
3874
|
+
actionsArrayMigrated = true;
|
|
3875
|
+
} else {
|
|
3876
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3877
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3683
3878
|
);
|
|
3684
|
-
if (
|
|
3685
|
-
|
|
3879
|
+
if (actionCandidates.length === 0) {
|
|
3880
|
+
actionsProperty.remove();
|
|
3686
3881
|
console.log(
|
|
3687
|
-
` [${relPath}] Removed
|
|
3882
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3688
3883
|
);
|
|
3689
|
-
|
|
3690
|
-
|
|
3691
|
-
|
|
3692
|
-
|
|
3693
|
-
|
|
3884
|
+
actionsArrayMigrated = true;
|
|
3885
|
+
} else {
|
|
3886
|
+
if (actionCandidates.length > 1) {
|
|
3887
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3888
|
+
console.warn(
|
|
3889
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3890
|
+
);
|
|
3891
|
+
}
|
|
3892
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3893
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3694
3894
|
);
|
|
3895
|
+
if (conditionalsProperty) {
|
|
3896
|
+
conditionalsProperty.remove();
|
|
3897
|
+
console.log(
|
|
3898
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3899
|
+
);
|
|
3900
|
+
}
|
|
3901
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3902
|
+
actionsProperty.remove();
|
|
3903
|
+
console.log(
|
|
3904
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3905
|
+
);
|
|
3906
|
+
actionsArrayMigrated = true;
|
|
3907
|
+
} else {
|
|
3908
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3909
|
+
workqueue.addPropertyAssignment({
|
|
3910
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3911
|
+
initializer: firstActionText
|
|
3912
|
+
});
|
|
3913
|
+
actionsProperty.remove();
|
|
3914
|
+
console.log(
|
|
3915
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3916
|
+
);
|
|
3917
|
+
actionsArrayMigrated = true;
|
|
3918
|
+
}
|
|
3695
3919
|
}
|
|
3696
3920
|
}
|
|
3697
3921
|
}
|
|
3698
|
-
actionsProperty.remove();
|
|
3699
|
-
console.log(
|
|
3700
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3701
|
-
);
|
|
3702
|
-
return 1;
|
|
3703
|
-
}
|
|
3704
|
-
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3705
|
-
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3706
|
-
);
|
|
3707
|
-
if (actionCandidates.length === 0) {
|
|
3708
|
-
actionsProperty.remove();
|
|
3709
|
-
console.log(
|
|
3710
|
-
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3711
|
-
);
|
|
3712
|
-
return 1;
|
|
3713
3922
|
}
|
|
3714
|
-
|
|
3715
|
-
|
|
3716
|
-
|
|
3717
|
-
|
|
3718
|
-
|
|
3719
|
-
|
|
3720
|
-
|
|
3721
|
-
|
|
3923
|
+
const fallback = ensureValidAction(workqueue, relPath);
|
|
3924
|
+
return {
|
|
3925
|
+
changed: actionsArrayMigrated || fallback.changed,
|
|
3926
|
+
usedReadFallback: fallback.usedReadFallback
|
|
3927
|
+
};
|
|
3928
|
+
}
|
|
3929
|
+
function ensureActionTypeImport(sourceFile) {
|
|
3930
|
+
const existingImport = sourceFile.getImportDeclaration(
|
|
3931
|
+
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3722
3932
|
);
|
|
3723
|
-
if (
|
|
3724
|
-
|
|
3725
|
-
|
|
3726
|
-
|
|
3727
|
-
|
|
3728
|
-
|
|
3729
|
-
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3730
|
-
actionsProperty.remove();
|
|
3731
|
-
console.log(
|
|
3732
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3733
|
-
);
|
|
3734
|
-
return 1;
|
|
3933
|
+
if (existingImport) {
|
|
3934
|
+
const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
|
|
3935
|
+
if (!alreadyImported) {
|
|
3936
|
+
existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
|
|
3937
|
+
}
|
|
3938
|
+
return;
|
|
3735
3939
|
}
|
|
3736
|
-
|
|
3737
|
-
|
|
3738
|
-
|
|
3739
|
-
initializer: firstActionText
|
|
3940
|
+
sourceFile.addImportDeclaration({
|
|
3941
|
+
moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
|
|
3942
|
+
namedImports: [ACTION_TYPE_IMPORT_NAME]
|
|
3740
3943
|
});
|
|
3741
|
-
actionsProperty.remove();
|
|
3742
|
-
console.log(
|
|
3743
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3744
|
-
);
|
|
3745
|
-
return 1;
|
|
3746
3944
|
}
|
|
3747
3945
|
function processFile13(filePath, project) {
|
|
3748
3946
|
const sourceFile = project.getSourceFile(filePath);
|
|
3749
3947
|
if (!sourceFile) return 0;
|
|
3750
3948
|
let migratedWorkqueues = 0;
|
|
3949
|
+
let needsActionTypeImport = false;
|
|
3751
3950
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3752
3951
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3753
3952
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3763,9 +3962,14 @@ function processFile13(filePath, project) {
|
|
|
3763
3962
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3764
3963
|
for (const element of workqueuesArg.getElements()) {
|
|
3765
3964
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3766
|
-
|
|
3965
|
+
const result = migrateWorkqueueActions(element, relPath);
|
|
3966
|
+
if (result.changed) migratedWorkqueues++;
|
|
3967
|
+
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3767
3968
|
}
|
|
3768
3969
|
}
|
|
3970
|
+
if (needsActionTypeImport) {
|
|
3971
|
+
ensureActionTypeImport(sourceFile);
|
|
3972
|
+
}
|
|
3769
3973
|
return migratedWorkqueues;
|
|
3770
3974
|
}
|
|
3771
3975
|
async function main18() {
|
|
@@ -4100,7 +4304,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4100
4304
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4101
4305
|
var import_child_process = require("child_process");
|
|
4102
4306
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4103
|
-
var UPSTREAM_BRANCH = "
|
|
4307
|
+
var UPSTREAM_BRANCH = "release-v2.0.0";
|
|
4104
4308
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4105
4309
|
var FILES_TO_CHECKOUT = [
|
|
4106
4310
|
"src/analytics/analytics.ts",
|
|
@@ -4650,9 +4854,13 @@ function gitShowBytes(ref, path23) {
|
|
|
4650
4854
|
return null;
|
|
4651
4855
|
}
|
|
4652
4856
|
}
|
|
4653
|
-
async function main25(
|
|
4857
|
+
async function main25({
|
|
4858
|
+
subdirs = []
|
|
4859
|
+
} = {}) {
|
|
4860
|
+
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4861
|
+
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4654
4862
|
console.log(
|
|
4655
|
-
`Merging
|
|
4863
|
+
`Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4656
4864
|
`
|
|
4657
4865
|
);
|
|
4658
4866
|
assertIsGitRepo();
|
|
@@ -4667,20 +4875,12 @@ async function main25() {
|
|
|
4667
4875
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4668
4876
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4669
4877
|
const upstreamFiles = runGit(
|
|
4670
|
-
[
|
|
4671
|
-
"ls-tree",
|
|
4672
|
-
"-r",
|
|
4673
|
-
"--name-only",
|
|
4674
|
-
"-z",
|
|
4675
|
-
ref,
|
|
4676
|
-
"--",
|
|
4677
|
-
`${INFRASTRUCTURE_DIR}/`
|
|
4678
|
-
],
|
|
4878
|
+
["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
|
|
4679
4879
|
{ silent: true }
|
|
4680
4880
|
).split("\0").filter(Boolean);
|
|
4681
4881
|
if (upstreamFiles.length === 0) {
|
|
4682
4882
|
console.log(
|
|
4683
|
-
` No files found under
|
|
4883
|
+
` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
|
|
4684
4884
|
);
|
|
4685
4885
|
return;
|
|
4686
4886
|
}
|
|
@@ -4755,7 +4955,9 @@ async function main25() {
|
|
|
4755
4955
|
var import_fs6 = require("fs");
|
|
4756
4956
|
var import_path25 = require("path");
|
|
4757
4957
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4758
|
-
async function main26(
|
|
4958
|
+
async function main26({
|
|
4959
|
+
keep = []
|
|
4960
|
+
} = {}) {
|
|
4759
4961
|
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4760
4962
|
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4761
4963
|
console.log(
|
|
@@ -4763,24 +4965,64 @@ async function main26() {
|
|
|
4763
4965
|
);
|
|
4764
4966
|
return;
|
|
4765
4967
|
}
|
|
4766
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4767
|
-
`);
|
|
4768
4968
|
assertIsGitRepo();
|
|
4769
|
-
|
|
4770
|
-
|
|
4771
|
-
|
|
4772
|
-
|
|
4773
|
-
|
|
4774
|
-
|
|
4775
|
-
console.log(
|
|
4969
|
+
if (keep.length === 0) {
|
|
4970
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4971
|
+
`);
|
|
4972
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4973
|
+
silent: true
|
|
4974
|
+
});
|
|
4975
|
+
console.log(
|
|
4976
|
+
` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4977
|
+
);
|
|
4978
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4979
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4980
|
+
console.log(
|
|
4981
|
+
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4982
|
+
);
|
|
4983
|
+
}
|
|
4984
|
+
console.log(
|
|
4985
|
+
`
|
|
4986
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4987
|
+
);
|
|
4988
|
+
return;
|
|
4989
|
+
}
|
|
4990
|
+
const keepSet = new Set(keep);
|
|
4991
|
+
console.log(
|
|
4992
|
+
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
4993
|
+
`
|
|
4994
|
+
);
|
|
4995
|
+
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
4996
|
+
let deleted = 0;
|
|
4997
|
+
for (const entry of topLevelEntries) {
|
|
4998
|
+
if (keepSet.has(entry.name)) {
|
|
4999
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
5000
|
+
continue;
|
|
5001
|
+
}
|
|
5002
|
+
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
5003
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
5004
|
+
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
5005
|
+
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
5006
|
+
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
5007
|
+
}
|
|
5008
|
+
console.log(` Deleted '${relPath}'.`);
|
|
5009
|
+
deleted++;
|
|
5010
|
+
}
|
|
5011
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
5012
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
5013
|
+
if (missingKeeps.length > 0) {
|
|
5014
|
+
console.warn(
|
|
5015
|
+
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
5016
|
+
);
|
|
4776
5017
|
}
|
|
4777
5018
|
console.log(
|
|
4778
5019
|
`
|
|
4779
|
-
Done. Review the staged
|
|
5020
|
+
Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4780
5021
|
);
|
|
4781
5022
|
}
|
|
4782
5023
|
|
|
4783
5024
|
// src/migrations/v2.0/index.ts
|
|
5025
|
+
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4784
5026
|
async function runUpgrade(dockerSwarm) {
|
|
4785
5027
|
await main18();
|
|
4786
5028
|
await main();
|
|
@@ -4809,6 +5051,7 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4809
5051
|
if (dockerSwarm) {
|
|
4810
5052
|
await main25();
|
|
4811
5053
|
} else {
|
|
4812
|
-
await main26();
|
|
5054
|
+
await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
|
|
5055
|
+
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4813
5056
|
}
|
|
4814
5057
|
}
|