@opencrvs/toolkit 2.0.0-rc.153df7b → 2.0.0-rc.15aed36
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 +103 -0
- package/create-countryconfig/package.json +21 -0
- package/dist/application-config/index.js +259 -96
- package/dist/cli.js +913 -202
- package/dist/commons/api/router.d.ts +3366 -300
- package/dist/commons/application-config/index.d.ts +16 -4
- package/dist/commons/conditionals/conditionals.d.ts +12 -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 +4 -2
- 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/WorkqueueConfig.d.ts +150 -150
- package/dist/commons/events/index.d.ts +2 -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/flags.d.ts +16 -0
- 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 +44 -8
- package/dist/events/index.js +862 -179
- 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/add-resend-invite-notification.d.ts +3 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts.map +1 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.js +373 -0
- 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/fix-accept-requested-registration-function-type.d.ts +3 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
- 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 +911 -200
- 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 +689 -124
- package/dist/scopes/index.d.ts +87 -10
- package/dist/scopes/index.js +46 -9
- package/opencrvs-toolkit-2.0.0-rc.15aed36.tgz +0 -0
- package/package.json +6 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.153df7b.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
|
}
|
|
@@ -1813,9 +1883,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
|
|
|
1813
1883
|
}
|
|
1814
1884
|
return replacedCount;
|
|
1815
1885
|
}
|
|
1816
|
-
function resolveConfigChain(configObj,
|
|
1886
|
+
function resolveConfigChain(configObj, path24) {
|
|
1817
1887
|
let current = configObj;
|
|
1818
|
-
for (const key of
|
|
1888
|
+
for (const key of path24) {
|
|
1819
1889
|
if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
|
|
1820
1890
|
const prop = current.getProperty(key);
|
|
1821
1891
|
if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
|
|
@@ -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
|
|
@@ -2289,11 +2393,12 @@ var decodeScope = (query) => {
|
|
|
2289
2393
|
};
|
|
2290
2394
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2291
2395
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2292
|
-
accessLevel: JurisdictionFilter.enum.all
|
|
2396
|
+
accessLevel: JurisdictionFilter.enum.all,
|
|
2397
|
+
registeredIn: JurisdictionFilter.enum.all,
|
|
2398
|
+
declaredIn: JurisdictionFilter.enum.all
|
|
2293
2399
|
};
|
|
2294
2400
|
|
|
2295
2401
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2296
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2297
2402
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2298
2403
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2299
2404
|
var SearchScope = z4.object({
|
|
@@ -2527,6 +2632,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2527
2632
|
}
|
|
2528
2633
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2529
2634
|
};
|
|
2635
|
+
var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
|
|
2636
|
+
function isMergeableUserScopeType(type) {
|
|
2637
|
+
return MERGEABLE_USER_SCOPE_TYPES.includes(type);
|
|
2638
|
+
}
|
|
2639
|
+
function decodeLegacyScope(legacy) {
|
|
2640
|
+
const encoded = legacyScopeToV2Scope(legacy);
|
|
2641
|
+
const scope = decodeScope(encoded);
|
|
2642
|
+
if (!scope) {
|
|
2643
|
+
throw new Error(
|
|
2644
|
+
`Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
|
|
2645
|
+
);
|
|
2646
|
+
}
|
|
2647
|
+
return { legacy, scope };
|
|
2648
|
+
}
|
|
2649
|
+
function groupByType(entries) {
|
|
2650
|
+
return entries.reduce(
|
|
2651
|
+
(groups, entry) => ({
|
|
2652
|
+
...groups,
|
|
2653
|
+
[entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
|
|
2654
|
+
}),
|
|
2655
|
+
{}
|
|
2656
|
+
);
|
|
2657
|
+
}
|
|
2658
|
+
function deduplicateEntries(entries) {
|
|
2659
|
+
return entries.filter(
|
|
2660
|
+
(entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
|
|
2661
|
+
);
|
|
2662
|
+
}
|
|
2663
|
+
function mergeEntries(type, entries) {
|
|
2664
|
+
const optionsList = entries.map(
|
|
2665
|
+
(e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
|
|
2666
|
+
);
|
|
2667
|
+
const allKeys = optionsList.flatMap(
|
|
2668
|
+
(opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
|
|
2669
|
+
);
|
|
2670
|
+
const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
|
|
2671
|
+
if (conflictKey) {
|
|
2672
|
+
const conflicting = entries.filter(
|
|
2673
|
+
(e) => conflictKey in ("options" in e.scope && e.scope.options || {})
|
|
2674
|
+
).map((e) => JSON.stringify(e.legacy));
|
|
2675
|
+
throw new Error(
|
|
2676
|
+
`Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
|
|
2677
|
+
);
|
|
2678
|
+
}
|
|
2679
|
+
const mergedOptions = Object.assign({}, ...optionsList);
|
|
2680
|
+
const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
|
|
2681
|
+
const parsed = Scope2.safeParse(merged);
|
|
2682
|
+
if (!parsed.success) {
|
|
2683
|
+
throw new Error(
|
|
2684
|
+
`Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
|
|
2685
|
+
);
|
|
2686
|
+
}
|
|
2687
|
+
return parsed.data;
|
|
2688
|
+
}
|
|
2689
|
+
function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
|
|
2690
|
+
const groups = groupByType(legacyScopes.map(decodeLegacyScope));
|
|
2691
|
+
return Object.entries(groups).flatMap(([type, entries]) => {
|
|
2692
|
+
const deduped = deduplicateEntries(entries);
|
|
2693
|
+
if (deduped.length <= 1) return deduped.map((e) => e.scope);
|
|
2694
|
+
if (!isMergeableUserScopeType(type)) {
|
|
2695
|
+
console.warn(
|
|
2696
|
+
`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.`
|
|
2697
|
+
);
|
|
2698
|
+
return deduped.map((e) => e.scope);
|
|
2699
|
+
}
|
|
2700
|
+
return [mergeEntries(type, deduped)];
|
|
2701
|
+
});
|
|
2702
|
+
}
|
|
2530
2703
|
|
|
2531
2704
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2532
2705
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2564,57 +2737,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2564
2737
|
}
|
|
2565
2738
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2566
2739
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2567
|
-
if (!sourceFile)
|
|
2740
|
+
if (!sourceFile) {
|
|
2741
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2742
|
+
}
|
|
2568
2743
|
let migratedCount = 0;
|
|
2569
2744
|
let removedCount = 0;
|
|
2745
|
+
let mergedCount = 0;
|
|
2570
2746
|
const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
2747
|
+
const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
|
|
2571
2748
|
for (const scopesProp of scopesProperties) {
|
|
2572
2749
|
const initializer = scopesProp.getInitializer();
|
|
2573
2750
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2574
|
-
const
|
|
2575
|
-
|
|
2576
|
-
|
|
2577
|
-
|
|
2751
|
+
const rawTexts = [];
|
|
2752
|
+
const legacyStrings = [];
|
|
2753
|
+
let anyChange = false;
|
|
2754
|
+
for (const element of initializer.getElements()) {
|
|
2578
2755
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2579
2756
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2580
2757
|
console.warn(
|
|
2581
|
-
` [${
|
|
2758
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2582
2759
|
);
|
|
2583
|
-
initializer.removeElement(index);
|
|
2584
2760
|
removedCount++;
|
|
2761
|
+
anyChange = true;
|
|
2585
2762
|
continue;
|
|
2586
2763
|
}
|
|
2587
2764
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2588
2765
|
if (!legacyScope) {
|
|
2589
2766
|
console.warn(
|
|
2590
|
-
` [${
|
|
2767
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2591
2768
|
);
|
|
2769
|
+
rawTexts.push(element.getText());
|
|
2592
2770
|
continue;
|
|
2593
2771
|
}
|
|
2594
|
-
|
|
2595
|
-
|
|
2596
|
-
const scope = decodeScope(migratedScope);
|
|
2597
|
-
if (!scope) {
|
|
2598
|
-
console.warn(
|
|
2599
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
|
|
2600
|
-
);
|
|
2601
|
-
continue;
|
|
2602
|
-
}
|
|
2603
|
-
element.replaceWithText(JSON.stringify(scope));
|
|
2604
|
-
migratedCount++;
|
|
2605
|
-
} catch (error) {
|
|
2606
|
-
console.warn(
|
|
2607
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2608
|
-
);
|
|
2609
|
-
}
|
|
2772
|
+
legacyStrings.push(legacyScope);
|
|
2773
|
+
anyChange = true;
|
|
2610
2774
|
}
|
|
2775
|
+
if (!anyChange) continue;
|
|
2776
|
+
let mergedScopes;
|
|
2777
|
+
try {
|
|
2778
|
+
mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
|
|
2779
|
+
} catch (error) {
|
|
2780
|
+
throw new Error(
|
|
2781
|
+
`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
|
|
2782
|
+
{ cause: error }
|
|
2783
|
+
);
|
|
2784
|
+
}
|
|
2785
|
+
migratedCount += legacyStrings.length;
|
|
2786
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
2787
|
+
const outputElements = [
|
|
2788
|
+
...rawTexts,
|
|
2789
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
2790
|
+
];
|
|
2791
|
+
scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
|
|
2611
2792
|
}
|
|
2612
2793
|
if (removedCount > 0) {
|
|
2613
2794
|
console.log(
|
|
2614
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2795
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2615
2796
|
);
|
|
2616
2797
|
}
|
|
2617
|
-
return { migratedCount, removedCount };
|
|
2798
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2618
2799
|
}
|
|
2619
2800
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2620
2801
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2749,7 +2930,7 @@ async function main11() {
|
|
|
2749
2930
|
return;
|
|
2750
2931
|
}
|
|
2751
2932
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2752
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2933
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2753
2934
|
rolesFilePath,
|
|
2754
2935
|
project
|
|
2755
2936
|
);
|
|
@@ -2768,7 +2949,7 @@ async function main11() {
|
|
|
2768
2949
|
}
|
|
2769
2950
|
await sourceFile.save();
|
|
2770
2951
|
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." : "."}`
|
|
2952
|
+
`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
2953
|
);
|
|
2773
2954
|
}
|
|
2774
2955
|
|
|
@@ -3574,6 +3755,10 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3574
3755
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3575
3756
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3576
3757
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3758
|
+
var READ_ACTION_TYPE = "READ";
|
|
3759
|
+
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3760
|
+
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3761
|
+
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3577
3762
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3578
3763
|
"READ",
|
|
3579
3764
|
"DELETE",
|
|
@@ -3621,91 +3806,137 @@ function isUnsupportedActionType(action) {
|
|
|
3621
3806
|
}
|
|
3622
3807
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3623
3808
|
}
|
|
3624
|
-
function
|
|
3625
|
-
const
|
|
3626
|
-
|
|
3627
|
-
|
|
3628
|
-
|
|
3629
|
-
|
|
3630
|
-
|
|
3631
|
-
|
|
3809
|
+
function ensureValidAction(workqueue, relPath) {
|
|
3810
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3811
|
+
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3812
|
+
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3813
|
+
const initializer = actionProperty.getInitializer();
|
|
3814
|
+
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3815
|
+
if (!isUnsupportedActionType(initializer)) {
|
|
3816
|
+
return { changed: false, usedReadFallback: false };
|
|
3817
|
+
}
|
|
3818
|
+
actionProperty.set({
|
|
3819
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3820
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3821
|
+
});
|
|
3822
|
+
console.log(
|
|
3823
|
+
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3824
|
+
);
|
|
3825
|
+
return { changed: true, usedReadFallback: true };
|
|
3826
|
+
}
|
|
3632
3827
|
}
|
|
3828
|
+
workqueue.addPropertyAssignment({
|
|
3829
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3830
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3831
|
+
});
|
|
3832
|
+
console.log(
|
|
3833
|
+
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3834
|
+
);
|
|
3835
|
+
return { changed: true, usedReadFallback: true };
|
|
3836
|
+
}
|
|
3837
|
+
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3633
3838
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3634
|
-
const
|
|
3635
|
-
|
|
3636
|
-
|
|
3637
|
-
|
|
3638
|
-
|
|
3639
|
-
|
|
3640
|
-
|
|
3839
|
+
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3840
|
+
let actionsArrayMigrated = false;
|
|
3841
|
+
if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3842
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3843
|
+
if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3844
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3845
|
+
if (existingActionProperty) {
|
|
3846
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3847
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3848
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3849
|
+
const conditionalsProperty = existingActionInitializer.getProperty(
|
|
3850
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3851
|
+
);
|
|
3852
|
+
if (conditionalsProperty) {
|
|
3853
|
+
conditionalsProperty.remove();
|
|
3854
|
+
console.log(
|
|
3855
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3856
|
+
);
|
|
3857
|
+
}
|
|
3858
|
+
}
|
|
3859
|
+
}
|
|
3860
|
+
actionsProperty.remove();
|
|
3861
|
+
console.log(
|
|
3862
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3863
|
+
);
|
|
3864
|
+
actionsArrayMigrated = true;
|
|
3865
|
+
} else {
|
|
3866
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3867
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3641
3868
|
);
|
|
3642
|
-
if (
|
|
3643
|
-
|
|
3869
|
+
if (actionCandidates.length === 0) {
|
|
3870
|
+
actionsProperty.remove();
|
|
3644
3871
|
console.log(
|
|
3645
|
-
` [${relPath}] Removed
|
|
3872
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3646
3873
|
);
|
|
3647
|
-
|
|
3648
|
-
|
|
3649
|
-
|
|
3650
|
-
|
|
3651
|
-
|
|
3874
|
+
actionsArrayMigrated = true;
|
|
3875
|
+
} else {
|
|
3876
|
+
if (actionCandidates.length > 1) {
|
|
3877
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3878
|
+
console.warn(
|
|
3879
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3880
|
+
);
|
|
3881
|
+
}
|
|
3882
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3883
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3652
3884
|
);
|
|
3885
|
+
if (conditionalsProperty) {
|
|
3886
|
+
conditionalsProperty.remove();
|
|
3887
|
+
console.log(
|
|
3888
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3889
|
+
);
|
|
3890
|
+
}
|
|
3891
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3892
|
+
actionsProperty.remove();
|
|
3893
|
+
console.log(
|
|
3894
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3895
|
+
);
|
|
3896
|
+
actionsArrayMigrated = true;
|
|
3897
|
+
} else {
|
|
3898
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3899
|
+
workqueue.addPropertyAssignment({
|
|
3900
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3901
|
+
initializer: firstActionText
|
|
3902
|
+
});
|
|
3903
|
+
actionsProperty.remove();
|
|
3904
|
+
console.log(
|
|
3905
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3906
|
+
);
|
|
3907
|
+
actionsArrayMigrated = true;
|
|
3908
|
+
}
|
|
3653
3909
|
}
|
|
3654
3910
|
}
|
|
3655
3911
|
}
|
|
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
3912
|
}
|
|
3678
|
-
const
|
|
3679
|
-
|
|
3913
|
+
const fallback = ensureValidAction(workqueue, relPath);
|
|
3914
|
+
return {
|
|
3915
|
+
changed: actionsArrayMigrated || fallback.changed,
|
|
3916
|
+
usedReadFallback: fallback.usedReadFallback
|
|
3917
|
+
};
|
|
3918
|
+
}
|
|
3919
|
+
function ensureActionTypeImport(sourceFile) {
|
|
3920
|
+
const existingImport = sourceFile.getImportDeclaration(
|
|
3921
|
+
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3680
3922
|
);
|
|
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;
|
|
3923
|
+
if (existingImport) {
|
|
3924
|
+
const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
|
|
3925
|
+
if (!alreadyImported) {
|
|
3926
|
+
existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
|
|
3927
|
+
}
|
|
3928
|
+
return;
|
|
3693
3929
|
}
|
|
3694
|
-
|
|
3695
|
-
|
|
3696
|
-
|
|
3697
|
-
initializer: firstActionText
|
|
3930
|
+
sourceFile.addImportDeclaration({
|
|
3931
|
+
moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
|
|
3932
|
+
namedImports: [ACTION_TYPE_IMPORT_NAME]
|
|
3698
3933
|
});
|
|
3699
|
-
actionsProperty.remove();
|
|
3700
|
-
console.log(
|
|
3701
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3702
|
-
);
|
|
3703
|
-
return 1;
|
|
3704
3934
|
}
|
|
3705
3935
|
function processFile13(filePath, project) {
|
|
3706
3936
|
const sourceFile = project.getSourceFile(filePath);
|
|
3707
3937
|
if (!sourceFile) return 0;
|
|
3708
3938
|
let migratedWorkqueues = 0;
|
|
3939
|
+
let needsActionTypeImport = false;
|
|
3709
3940
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3710
3941
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3711
3942
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3721,9 +3952,14 @@ function processFile13(filePath, project) {
|
|
|
3721
3952
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3722
3953
|
for (const element of workqueuesArg.getElements()) {
|
|
3723
3954
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3724
|
-
|
|
3955
|
+
const result = migrateWorkqueueActions(element, relPath);
|
|
3956
|
+
if (result.changed) migratedWorkqueues++;
|
|
3957
|
+
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3725
3958
|
}
|
|
3726
3959
|
}
|
|
3960
|
+
if (needsActionTypeImport) {
|
|
3961
|
+
ensureActionTypeImport(sourceFile);
|
|
3962
|
+
}
|
|
3727
3963
|
return migratedWorkqueues;
|
|
3728
3964
|
}
|
|
3729
3965
|
async function main18() {
|
|
@@ -4058,7 +4294,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4058
4294
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4059
4295
|
var import_child_process = require("child_process");
|
|
4060
4296
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4061
|
-
var UPSTREAM_BRANCH = "
|
|
4297
|
+
var UPSTREAM_BRANCH = "release-v2.0.0";
|
|
4062
4298
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4063
4299
|
var FILES_TO_CHECKOUT = [
|
|
4064
4300
|
"src/analytics/analytics.ts",
|
|
@@ -4135,10 +4371,356 @@ async function main22() {
|
|
|
4135
4371
|
}
|
|
4136
4372
|
}
|
|
4137
4373
|
|
|
4138
|
-
// src/migrations/v2.0/
|
|
4139
|
-
var
|
|
4140
|
-
var import_fs3 = __toESM(require("fs"));
|
|
4374
|
+
// src/migrations/v2.0/add-resend-invite-notification.ts
|
|
4375
|
+
var import_fs3 = require("fs");
|
|
4141
4376
|
var import_path22 = __toESM(require("path"));
|
|
4377
|
+
var import_ts_morph20 = require("ts-morph");
|
|
4378
|
+
var TS_MORPH_PROJECT_OPTIONS = {
|
|
4379
|
+
skipAddingFilesFromTsConfig: true,
|
|
4380
|
+
manipulationSettings: {
|
|
4381
|
+
indentationText: import_ts_morph20.IndentationText.TwoSpaces
|
|
4382
|
+
}
|
|
4383
|
+
};
|
|
4384
|
+
var EMAIL_TEMPLATES_INDEX = "src/api/notification/email-templates/index.ts";
|
|
4385
|
+
var NOTIFICATION_HANDLER = "src/api/notification/handler.ts";
|
|
4386
|
+
var USER_NOTIFICATION_ROUTES = "src/config/routes/userNotificationRoutes.ts";
|
|
4387
|
+
var SMS_SERVICE = "src/api/notification/sms-service.ts";
|
|
4388
|
+
var NOTIFICATION_CSV = "src/translations/notification.csv";
|
|
4389
|
+
var RESEND_INVITE_HTML = "src/api/notification/email-templates/other/resend-invite.html";
|
|
4390
|
+
var RESEND_INVITE_HTML_CONTENT = `<!doctype html>
|
|
4391
|
+
<html>
|
|
4392
|
+
<head>
|
|
4393
|
+
<link
|
|
4394
|
+
href="https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;700&display=swap"
|
|
4395
|
+
rel="stylesheet"
|
|
4396
|
+
/>
|
|
4397
|
+
<style type="text/css">
|
|
4398
|
+
body {
|
|
4399
|
+
font-family: 'Noto Sans', sans-serif;
|
|
4400
|
+
color: #222;
|
|
4401
|
+
padding: 16px 24px;
|
|
4402
|
+
}
|
|
4403
|
+
|
|
4404
|
+
h1 {
|
|
4405
|
+
font-size: 21px;
|
|
4406
|
+
margin-top: 32px;
|
|
4407
|
+
margin-bottom: 36px;
|
|
4408
|
+
font-weight: 700;
|
|
4409
|
+
}
|
|
4410
|
+
|
|
4411
|
+
p {
|
|
4412
|
+
font-weight: 400;
|
|
4413
|
+
font-size: 16px;
|
|
4414
|
+
line-height: 1.8;
|
|
4415
|
+
margin-bottom: 24px;
|
|
4416
|
+
}
|
|
4417
|
+
|
|
4418
|
+
i {
|
|
4419
|
+
color: #666;
|
|
4420
|
+
font-weight: 400;
|
|
4421
|
+
font-size: 16px;
|
|
4422
|
+
}
|
|
4423
|
+
</style>
|
|
4424
|
+
</head>
|
|
4425
|
+
|
|
4426
|
+
<body>
|
|
4427
|
+
<img
|
|
4428
|
+
src="{{countryLogo}}"
|
|
4429
|
+
alt="country_logo"
|
|
4430
|
+
style="max-height: 88px; max-width: 100%"
|
|
4431
|
+
/>
|
|
4432
|
+
<h1>Your {{applicationName}} account invitation</h1>
|
|
4433
|
+
<p>Hello {{firstname}},</p>
|
|
4434
|
+
<p>Your account invitation has been resent. Please use the following credentials to access your account:</p>
|
|
4435
|
+
<p>
|
|
4436
|
+
Username: <strong>{{username}}</strong><br />
|
|
4437
|
+
Password: <strong>{{temporaryPassword}}</strong>
|
|
4438
|
+
</p>
|
|
4439
|
+
<p>
|
|
4440
|
+
Please click the link below to complete your account setup and start using
|
|
4441
|
+
{{applicationName}}.
|
|
4442
|
+
</p>
|
|
4443
|
+
|
|
4444
|
+
<div style="margin-top: 32px; margin-bottom: 32px">
|
|
4445
|
+
<a href="{{loginURL}}">Complete setup</a>
|
|
4446
|
+
</div>
|
|
4447
|
+
<br />
|
|
4448
|
+
<p>
|
|
4449
|
+
Best regards, <br />
|
|
4450
|
+
{{applicationName}} Team
|
|
4451
|
+
</p>
|
|
4452
|
+
</body>
|
|
4453
|
+
</html>
|
|
4454
|
+
`;
|
|
4455
|
+
var CSV_ROW = "resendInviteNotification,The SMS message that is sent when a user invitation is resent,Your OpenCRVS account invitation was resent. Please login with your username: {{username}} and temporary password: {{temporaryPassword}},Votre invitation de compte OpenCRVS a \xE9t\xE9 renvoy\xE9e. Veuillez vous connecter avec votre nom d'utilisateur : {{username}} et votre mot de passe temporaire : {{temporaryPassword}}.\n";
|
|
4456
|
+
function getObjectLiteralFromConst(declaration) {
|
|
4457
|
+
if (!declaration) {
|
|
4458
|
+
return;
|
|
4459
|
+
}
|
|
4460
|
+
const initializer = declaration.getInitializer();
|
|
4461
|
+
if (!initializer) {
|
|
4462
|
+
return;
|
|
4463
|
+
}
|
|
4464
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(initializer)) {
|
|
4465
|
+
return initializer;
|
|
4466
|
+
}
|
|
4467
|
+
if (import_ts_morph20.Node.isAsExpression(initializer)) {
|
|
4468
|
+
const expression = initializer.getExpression();
|
|
4469
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(expression)) {
|
|
4470
|
+
return expression;
|
|
4471
|
+
}
|
|
4472
|
+
}
|
|
4473
|
+
if (import_ts_morph20.Node.isSatisfiesExpression(initializer)) {
|
|
4474
|
+
const expression = initializer.getExpression();
|
|
4475
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(expression)) {
|
|
4476
|
+
return expression;
|
|
4477
|
+
}
|
|
4478
|
+
}
|
|
4479
|
+
}
|
|
4480
|
+
function patchEmailTemplatesIndex() {
|
|
4481
|
+
const full = import_path22.default.join(process.cwd(), EMAIL_TEMPLATES_INDEX);
|
|
4482
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4483
|
+
console.log(` '${EMAIL_TEMPLATES_INDEX}' missing \u2014 skipping.`);
|
|
4484
|
+
return false;
|
|
4485
|
+
}
|
|
4486
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4487
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4488
|
+
let changed = false;
|
|
4489
|
+
const triggerVariableObject = getObjectLiteralFromConst(
|
|
4490
|
+
sourceFile.getVariableDeclaration("TriggerVariable")
|
|
4491
|
+
);
|
|
4492
|
+
if (triggerVariableObject) {
|
|
4493
|
+
const hasResendInviteVariable = triggerVariableObject.getProperties().some((prop) => prop.getText().includes("[TriggerEvent.RESEND_INVITE]"));
|
|
4494
|
+
if (!hasResendInviteVariable) {
|
|
4495
|
+
const properties = triggerVariableObject.getProperties();
|
|
4496
|
+
const lastProperty = properties[properties.length - 1];
|
|
4497
|
+
if (lastProperty) {
|
|
4498
|
+
sourceFile.insertText(
|
|
4499
|
+
lastProperty.getEnd(),
|
|
4500
|
+
`,
|
|
4501
|
+
[TriggerEvent.RESEND_INVITE]: z.object({
|
|
4502
|
+
firstname: z.string(),
|
|
4503
|
+
username: z.string(),
|
|
4504
|
+
temporaryPassword: z.string(),
|
|
4505
|
+
completeSetupUrl: z.string(),
|
|
4506
|
+
loginURL: z.string()
|
|
4507
|
+
})`
|
|
4508
|
+
);
|
|
4509
|
+
changed = true;
|
|
4510
|
+
}
|
|
4511
|
+
}
|
|
4512
|
+
}
|
|
4513
|
+
const templatesObject = getObjectLiteralFromConst(
|
|
4514
|
+
sourceFile.getVariableDeclaration("templates")
|
|
4515
|
+
);
|
|
4516
|
+
if (templatesObject) {
|
|
4517
|
+
const hasResendInviteTemplate = templatesObject.getProperties().some(
|
|
4518
|
+
(prop) => prop.getText().includes("readOtherTemplate<TriggerVariable['resend-invite']>")
|
|
4519
|
+
);
|
|
4520
|
+
if (!hasResendInviteTemplate) {
|
|
4521
|
+
const userCreatedProp = templatesObject.getProperties().find((prop) => prop.getText().includes("[TriggerEvent.USER_CREATED]"));
|
|
4522
|
+
const anchor = userCreatedProp ?? templatesObject.getProperties()[templatesObject.getProperties().length - 1];
|
|
4523
|
+
if (anchor) {
|
|
4524
|
+
sourceFile.insertText(
|
|
4525
|
+
anchor.getEnd(),
|
|
4526
|
+
`,
|
|
4527
|
+
[TriggerEvent.RESEND_INVITE]: {
|
|
4528
|
+
type: 'resend-invite',
|
|
4529
|
+
subject: 'Your OpenCRVS account invitation',
|
|
4530
|
+
template:
|
|
4531
|
+
readOtherTemplate<TriggerVariable['resend-invite']>('resend-invite')
|
|
4532
|
+
}`
|
|
4533
|
+
);
|
|
4534
|
+
changed = true;
|
|
4535
|
+
}
|
|
4536
|
+
}
|
|
4537
|
+
}
|
|
4538
|
+
if (changed) {
|
|
4539
|
+
sourceFile.saveSync();
|
|
4540
|
+
}
|
|
4541
|
+
return changed;
|
|
4542
|
+
}
|
|
4543
|
+
function patchNotificationHandler() {
|
|
4544
|
+
const full = import_path22.default.join(process.cwd(), NOTIFICATION_HANDLER);
|
|
4545
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4546
|
+
return false;
|
|
4547
|
+
}
|
|
4548
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4549
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4550
|
+
const convertFn = sourceFile.getFunction("convertPayloadToVariable");
|
|
4551
|
+
if (!convertFn) {
|
|
4552
|
+
return false;
|
|
4553
|
+
}
|
|
4554
|
+
const switchStmt = convertFn.getFirstDescendantByKind(
|
|
4555
|
+
import_ts_morph20.SyntaxKind.SwitchStatement
|
|
4556
|
+
);
|
|
4557
|
+
if (!switchStmt) {
|
|
4558
|
+
return false;
|
|
4559
|
+
}
|
|
4560
|
+
const clauses = switchStmt.getCaseBlock().getClauses();
|
|
4561
|
+
const hasResendInvite = clauses.some(
|
|
4562
|
+
(clause) => import_ts_morph20.Node.isCaseClause(clause) && clause.getExpression().getText() === "TriggerEvent.RESEND_INVITE"
|
|
4563
|
+
);
|
|
4564
|
+
if (hasResendInvite) {
|
|
4565
|
+
return false;
|
|
4566
|
+
}
|
|
4567
|
+
const userCreatedClauseIndex = clauses.findIndex(
|
|
4568
|
+
(clause) => import_ts_morph20.Node.isCaseClause(clause) && clause.getExpression().getText() === "TriggerEvent.USER_CREATED"
|
|
4569
|
+
);
|
|
4570
|
+
if (userCreatedClauseIndex < 0) {
|
|
4571
|
+
return false;
|
|
4572
|
+
}
|
|
4573
|
+
const userCreatedClause = clauses[userCreatedClauseIndex];
|
|
4574
|
+
sourceFile.insertText(
|
|
4575
|
+
userCreatedClause.getEnd(),
|
|
4576
|
+
`
|
|
4577
|
+
|
|
4578
|
+
case TriggerEvent.RESEND_INVITE:
|
|
4579
|
+
return {
|
|
4580
|
+
firstname,
|
|
4581
|
+
username: payload.username,
|
|
4582
|
+
temporaryPassword: payload.temporaryPassword,
|
|
4583
|
+
completeSetupUrl: LOGIN_URL,
|
|
4584
|
+
loginURL: LOGIN_URL
|
|
4585
|
+
}`
|
|
4586
|
+
);
|
|
4587
|
+
sourceFile.saveSync();
|
|
4588
|
+
return true;
|
|
4589
|
+
}
|
|
4590
|
+
function getReturnedArrayLiteral(functionFilePath, fnName) {
|
|
4591
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4592
|
+
const sourceFile = project.addSourceFileAtPath(functionFilePath);
|
|
4593
|
+
const fn = sourceFile.getFunction(fnName);
|
|
4594
|
+
const returnStmt = fn?.getFirstDescendantByKind(import_ts_morph20.SyntaxKind.ReturnStatement);
|
|
4595
|
+
const expr = returnStmt?.getExpression();
|
|
4596
|
+
if (!expr || !import_ts_morph20.Node.isArrayLiteralExpression(expr)) {
|
|
4597
|
+
return { sourceFile, arrayLiteral: void 0 };
|
|
4598
|
+
}
|
|
4599
|
+
return { sourceFile, arrayLiteral: expr };
|
|
4600
|
+
}
|
|
4601
|
+
function patchUserNotificationRoutes() {
|
|
4602
|
+
const full = import_path22.default.join(process.cwd(), USER_NOTIFICATION_ROUTES);
|
|
4603
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4604
|
+
return false;
|
|
4605
|
+
}
|
|
4606
|
+
const { sourceFile, arrayLiteral } = getReturnedArrayLiteral(
|
|
4607
|
+
full,
|
|
4608
|
+
"getUserNotificationRoutes"
|
|
4609
|
+
);
|
|
4610
|
+
if (!arrayLiteral) {
|
|
4611
|
+
return false;
|
|
4612
|
+
}
|
|
4613
|
+
const elements = arrayLiteral.getElements();
|
|
4614
|
+
const routeExists = elements.some(
|
|
4615
|
+
(element) => element.getText().includes(`path: '/triggers/user/resend-invite'`)
|
|
4616
|
+
);
|
|
4617
|
+
if (routeExists) {
|
|
4618
|
+
return false;
|
|
4619
|
+
}
|
|
4620
|
+
const anchor = elements.find(
|
|
4621
|
+
(element) => element.getText().includes(`path: '/triggers/user/user-created'`)
|
|
4622
|
+
) ?? elements[elements.length - 1];
|
|
4623
|
+
if (!anchor) {
|
|
4624
|
+
return false;
|
|
4625
|
+
}
|
|
4626
|
+
sourceFile.insertText(
|
|
4627
|
+
anchor.getEnd(),
|
|
4628
|
+
`,
|
|
4629
|
+
{
|
|
4630
|
+
method: 'POST',
|
|
4631
|
+
path: '/triggers/user/resend-invite',
|
|
4632
|
+
handler: makeNotificationHandler('resend-invite'),
|
|
4633
|
+
options: {
|
|
4634
|
+
auth: false,
|
|
4635
|
+
tags: ['api'],
|
|
4636
|
+
description: 'Handles notification for resent user invite'
|
|
4637
|
+
}
|
|
4638
|
+
}`
|
|
4639
|
+
);
|
|
4640
|
+
sourceFile.saveSync();
|
|
4641
|
+
return true;
|
|
4642
|
+
}
|
|
4643
|
+
function patchSmsService() {
|
|
4644
|
+
const full = import_path22.default.join(process.cwd(), SMS_SERVICE);
|
|
4645
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4646
|
+
return false;
|
|
4647
|
+
}
|
|
4648
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4649
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4650
|
+
let changed = false;
|
|
4651
|
+
const otherTemplatesObject = getObjectLiteralFromConst(
|
|
4652
|
+
sourceFile.getVariableDeclaration("otherTemplates")
|
|
4653
|
+
);
|
|
4654
|
+
if (otherTemplatesObject) {
|
|
4655
|
+
const hasResendTemplate = otherTemplatesObject.getProperties().some((prop) => prop.getText().includes("resendInviteNotification"));
|
|
4656
|
+
if (!hasResendTemplate) {
|
|
4657
|
+
const userCredentialsIndex = otherTemplatesObject.getProperties().findIndex((prop) => prop.getText().includes("userCredentialsNotification"));
|
|
4658
|
+
otherTemplatesObject.insertPropertyAssignment(
|
|
4659
|
+
userCredentialsIndex >= 0 ? userCredentialsIndex + 1 : otherTemplatesObject.getProperties().length,
|
|
4660
|
+
{
|
|
4661
|
+
name: "resendInviteNotification",
|
|
4662
|
+
initializer: `'resendInviteNotification'`
|
|
4663
|
+
}
|
|
4664
|
+
);
|
|
4665
|
+
changed = true;
|
|
4666
|
+
}
|
|
4667
|
+
}
|
|
4668
|
+
const triggerToSmsTemplateObject = getObjectLiteralFromConst(
|
|
4669
|
+
sourceFile.getVariableDeclaration("TriggerToSMSTemplate")
|
|
4670
|
+
);
|
|
4671
|
+
if (triggerToSmsTemplateObject) {
|
|
4672
|
+
const hasResendInviteMap = triggerToSmsTemplateObject.getProperties().some((prop) => prop.getText().includes(`['resend-invite']`));
|
|
4673
|
+
if (!hasResendInviteMap) {
|
|
4674
|
+
const userCreatedIndex = triggerToSmsTemplateObject.getProperties().findIndex((prop) => prop.getText().includes(`['user-created']`));
|
|
4675
|
+
triggerToSmsTemplateObject.insertPropertyAssignment(
|
|
4676
|
+
userCreatedIndex >= 0 ? userCreatedIndex + 1 : triggerToSmsTemplateObject.getProperties().length,
|
|
4677
|
+
{
|
|
4678
|
+
name: `['resend-invite']`,
|
|
4679
|
+
initializer: `'resendInviteNotification'`
|
|
4680
|
+
}
|
|
4681
|
+
);
|
|
4682
|
+
changed = true;
|
|
4683
|
+
}
|
|
4684
|
+
}
|
|
4685
|
+
if (changed) {
|
|
4686
|
+
sourceFile.saveSync();
|
|
4687
|
+
}
|
|
4688
|
+
return changed;
|
|
4689
|
+
}
|
|
4690
|
+
async function main23() {
|
|
4691
|
+
console.log("Adding RESEND_INVITE notification wiring\u2026");
|
|
4692
|
+
const touched = [];
|
|
4693
|
+
if (patchEmailTemplatesIndex()) touched.push(EMAIL_TEMPLATES_INDEX);
|
|
4694
|
+
if (patchNotificationHandler()) touched.push(NOTIFICATION_HANDLER);
|
|
4695
|
+
if (patchUserNotificationRoutes()) touched.push(USER_NOTIFICATION_ROUTES);
|
|
4696
|
+
if (patchSmsService()) touched.push(SMS_SERVICE);
|
|
4697
|
+
const csvPath = import_path22.default.join(process.cwd(), NOTIFICATION_CSV);
|
|
4698
|
+
if ((0, import_fs3.existsSync)(csvPath)) {
|
|
4699
|
+
let t = (0, import_fs3.readFileSync)(csvPath, "utf8");
|
|
4700
|
+
if (!/^resendInviteNotification,/m.test(t)) {
|
|
4701
|
+
if (!t.endsWith("\n")) t += "\n";
|
|
4702
|
+
(0, import_fs3.writeFileSync)(csvPath, t + CSV_ROW);
|
|
4703
|
+
touched.push(NOTIFICATION_CSV);
|
|
4704
|
+
}
|
|
4705
|
+
}
|
|
4706
|
+
const htmlPath = import_path22.default.join(process.cwd(), RESEND_INVITE_HTML);
|
|
4707
|
+
(0, import_fs3.mkdirSync)(import_path22.default.dirname(htmlPath), { recursive: true });
|
|
4708
|
+
if (!(0, import_fs3.existsSync)(htmlPath)) {
|
|
4709
|
+
(0, import_fs3.writeFileSync)(htmlPath, RESEND_INVITE_HTML_CONTENT);
|
|
4710
|
+
touched.push(RESEND_INVITE_HTML);
|
|
4711
|
+
}
|
|
4712
|
+
if (touched.length === 0) {
|
|
4713
|
+
console.log(" Nothing to update (already present or anchors not found).");
|
|
4714
|
+
return;
|
|
4715
|
+
}
|
|
4716
|
+
console.log(` Updated:
|
|
4717
|
+
${touched.map((f) => ` - ${f}`).join("\n")}`);
|
|
4718
|
+
}
|
|
4719
|
+
|
|
4720
|
+
// src/migrations/v2.0/simplify-analytics-precalculations.ts
|
|
4721
|
+
var import_ts_morph21 = require("ts-morph");
|
|
4722
|
+
var import_fs4 = __toESM(require("fs"));
|
|
4723
|
+
var import_path23 = __toESM(require("path"));
|
|
4142
4724
|
var ANALYTICS_FILE_REL = "src/analytics/analytics.ts";
|
|
4143
4725
|
var FUNCTION_NAME = "precalculateAdditionalAnalytics";
|
|
4144
4726
|
var IMPORT_NAMES_TO_REMOVE = /* @__PURE__ */ new Set(["Event", "precalculateBirthEvent"]);
|
|
@@ -4174,10 +4756,10 @@ function findPrecalculateFunction(sourceFile) {
|
|
|
4174
4756
|
return void 0;
|
|
4175
4757
|
}
|
|
4176
4758
|
function getFunctionBodyBlock(fn) {
|
|
4177
|
-
if (
|
|
4759
|
+
if (import_ts_morph21.Node.isFunctionDeclaration(fn)) return fn.getBody();
|
|
4178
4760
|
const initializer = fn.getInitializer();
|
|
4179
4761
|
if (!initializer) return void 0;
|
|
4180
|
-
if (!
|
|
4762
|
+
if (!import_ts_morph21.Node.isArrowFunction(initializer) && !import_ts_morph21.Node.isFunctionExpression(initializer)) {
|
|
4181
4763
|
return void 0;
|
|
4182
4764
|
}
|
|
4183
4765
|
return initializer.getBody();
|
|
@@ -4187,9 +4769,9 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
4187
4769
|
const fn = findPrecalculateFunction(sourceFile);
|
|
4188
4770
|
if (!fn) return log;
|
|
4189
4771
|
const body = getFunctionBodyBlock(fn);
|
|
4190
|
-
if (!body || !
|
|
4772
|
+
if (!body || !import_ts_morph21.Node.isBlock(body)) return log;
|
|
4191
4773
|
for (const statement of [...body.getStatements()]) {
|
|
4192
|
-
const references = statement.getDescendantsOfKind(
|
|
4774
|
+
const references = statement.getDescendantsOfKind(import_ts_morph21.SyntaxKind.Identifier).some((id) => IMPORT_NAMES_TO_REMOVE.has(id.getText()));
|
|
4193
4775
|
if (references) {
|
|
4194
4776
|
statement.remove();
|
|
4195
4777
|
log.push(`removed statement in ${FUNCTION_NAME} referencing removed imports`);
|
|
@@ -4197,7 +4779,7 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
4197
4779
|
}
|
|
4198
4780
|
const remaining = body.getStatements();
|
|
4199
4781
|
const last = remaining[remaining.length - 1];
|
|
4200
|
-
const alreadyCorrect = last &&
|
|
4782
|
+
const alreadyCorrect = last && import_ts_morph21.Node.isReturnStatement(last) && last.getExpression()?.getText() === RETURN_EXPRESSION_TEXT;
|
|
4201
4783
|
if (!alreadyCorrect) {
|
|
4202
4784
|
body.addStatements(`return ${RETURN_EXPRESSION_TEXT}`);
|
|
4203
4785
|
log.push(
|
|
@@ -4206,17 +4788,17 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
4206
4788
|
}
|
|
4207
4789
|
return log;
|
|
4208
4790
|
}
|
|
4209
|
-
async function
|
|
4791
|
+
async function main24() {
|
|
4210
4792
|
const cwd = process.cwd();
|
|
4211
|
-
const absPath =
|
|
4212
|
-
if (!
|
|
4793
|
+
const absPath = import_path23.default.join(cwd, ANALYTICS_FILE_REL);
|
|
4794
|
+
if (!import_fs4.default.existsSync(absPath)) {
|
|
4213
4795
|
console.log(
|
|
4214
4796
|
`[${ANALYTICS_FILE_REL}] does not exist \u2014 nothing to clean up.`
|
|
4215
4797
|
);
|
|
4216
4798
|
return;
|
|
4217
4799
|
}
|
|
4218
|
-
const project = new
|
|
4219
|
-
tsConfigFilePath:
|
|
4800
|
+
const project = new import_ts_morph21.Project({
|
|
4801
|
+
tsConfigFilePath: import_path23.default.resolve(cwd, "tsconfig.json"),
|
|
4220
4802
|
skipAddingFilesFromTsConfig: false
|
|
4221
4803
|
});
|
|
4222
4804
|
const sourceFile = project.getSourceFile(absPath);
|
|
@@ -4245,15 +4827,15 @@ Saved ${ANALYTICS_FILE_REL}.`);
|
|
|
4245
4827
|
|
|
4246
4828
|
// src/migrations/v2.0/merge-infrastructure-directory.ts
|
|
4247
4829
|
var import_child_process2 = require("child_process");
|
|
4248
|
-
var
|
|
4830
|
+
var import_fs5 = require("fs");
|
|
4249
4831
|
var import_os = require("os");
|
|
4250
|
-
var
|
|
4832
|
+
var import_path24 = require("path");
|
|
4251
4833
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4252
4834
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4253
4835
|
var BASE_BRANCH = "release-v1.9";
|
|
4254
|
-
function gitShowBytes(ref,
|
|
4836
|
+
function gitShowBytes(ref, path24) {
|
|
4255
4837
|
try {
|
|
4256
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
4838
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
4257
4839
|
cwd: process.cwd(),
|
|
4258
4840
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4259
4841
|
});
|
|
@@ -4262,9 +4844,13 @@ function gitShowBytes(ref, path22) {
|
|
|
4262
4844
|
return null;
|
|
4263
4845
|
}
|
|
4264
4846
|
}
|
|
4265
|
-
async function
|
|
4847
|
+
async function main25({
|
|
4848
|
+
subdirs = []
|
|
4849
|
+
} = {}) {
|
|
4850
|
+
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4851
|
+
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4266
4852
|
console.log(
|
|
4267
|
-
`Merging
|
|
4853
|
+
`Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4268
4854
|
`
|
|
4269
4855
|
);
|
|
4270
4856
|
assertIsGitRepo();
|
|
@@ -4279,32 +4865,24 @@ async function main24() {
|
|
|
4279
4865
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4280
4866
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4281
4867
|
const upstreamFiles = runGit(
|
|
4282
|
-
[
|
|
4283
|
-
"ls-tree",
|
|
4284
|
-
"-r",
|
|
4285
|
-
"--name-only",
|
|
4286
|
-
"-z",
|
|
4287
|
-
ref,
|
|
4288
|
-
"--",
|
|
4289
|
-
`${INFRASTRUCTURE_DIR}/`
|
|
4290
|
-
],
|
|
4868
|
+
["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
|
|
4291
4869
|
{ silent: true }
|
|
4292
4870
|
).split("\0").filter(Boolean);
|
|
4293
4871
|
if (upstreamFiles.length === 0) {
|
|
4294
4872
|
console.log(
|
|
4295
|
-
` No files found under
|
|
4873
|
+
` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
|
|
4296
4874
|
);
|
|
4297
4875
|
return;
|
|
4298
4876
|
}
|
|
4299
|
-
const tmpDir = (0,
|
|
4300
|
-
const baseTmp = (0,
|
|
4301
|
-
const theirsTmp = (0,
|
|
4877
|
+
const tmpDir = (0, import_fs5.mkdtempSync)((0, import_path24.join)((0, import_os.tmpdir)(), "opencrvs-merge-infra-"));
|
|
4878
|
+
const baseTmp = (0, import_path24.join)(tmpDir, "base");
|
|
4879
|
+
const theirsTmp = (0, import_path24.join)(tmpDir, "theirs");
|
|
4302
4880
|
let added = 0;
|
|
4303
4881
|
let merged = 0;
|
|
4304
4882
|
const conflictedFiles = [];
|
|
4305
4883
|
for (const file of upstreamFiles) {
|
|
4306
|
-
const fullPath = (0,
|
|
4307
|
-
if (!(0,
|
|
4884
|
+
const fullPath = (0, import_path24.join)(process.cwd(), file);
|
|
4885
|
+
if (!(0, import_fs5.existsSync)(fullPath)) {
|
|
4308
4886
|
if (tryGit(["checkout", ref, "--", file])) {
|
|
4309
4887
|
console.log(` + ${file} (new from upstream)`);
|
|
4310
4888
|
added++;
|
|
@@ -4318,9 +4896,9 @@ async function main24() {
|
|
|
4318
4896
|
console.warn(` [warn] could not read ${file} from ${ref} \u2014 skipping.`);
|
|
4319
4897
|
continue;
|
|
4320
4898
|
}
|
|
4321
|
-
(0,
|
|
4899
|
+
(0, import_fs5.writeFileSync)(theirsTmp, theirContents);
|
|
4322
4900
|
const baseContents = gitShowBytes(baseRef, file);
|
|
4323
|
-
(0,
|
|
4901
|
+
(0, import_fs5.writeFileSync)(baseTmp, baseContents ?? new Uint8Array(0));
|
|
4324
4902
|
try {
|
|
4325
4903
|
(0, import_child_process2.execFileSync)("git", ["merge-file", fullPath, baseTmp, theirsTmp], {
|
|
4326
4904
|
cwd: process.cwd(),
|
|
@@ -4364,35 +4942,165 @@ async function main24() {
|
|
|
4364
4942
|
}
|
|
4365
4943
|
|
|
4366
4944
|
// src/migrations/v2.0/delete-infrastructure-directory.ts
|
|
4367
|
-
var
|
|
4368
|
-
var
|
|
4945
|
+
var import_fs6 = require("fs");
|
|
4946
|
+
var import_path25 = require("path");
|
|
4369
4947
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4370
|
-
async function
|
|
4371
|
-
|
|
4372
|
-
|
|
4948
|
+
async function main26({
|
|
4949
|
+
keep = []
|
|
4950
|
+
} = {}) {
|
|
4951
|
+
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4952
|
+
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4373
4953
|
console.log(
|
|
4374
4954
|
`'${INFRASTRUCTURE_DIR2}/' not found in ${process.cwd()} \u2014 nothing to delete.`
|
|
4375
4955
|
);
|
|
4376
4956
|
return;
|
|
4377
4957
|
}
|
|
4378
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4379
|
-
`);
|
|
4380
4958
|
assertIsGitRepo();
|
|
4381
|
-
|
|
4382
|
-
|
|
4959
|
+
if (keep.length === 0) {
|
|
4960
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4961
|
+
`);
|
|
4962
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4963
|
+
silent: true
|
|
4964
|
+
});
|
|
4965
|
+
console.log(
|
|
4966
|
+
` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4967
|
+
);
|
|
4968
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4969
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4970
|
+
console.log(
|
|
4971
|
+
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4972
|
+
);
|
|
4973
|
+
}
|
|
4974
|
+
console.log(
|
|
4975
|
+
`
|
|
4976
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4977
|
+
);
|
|
4978
|
+
return;
|
|
4979
|
+
}
|
|
4980
|
+
const keepSet = new Set(keep);
|
|
4981
|
+
console.log(
|
|
4982
|
+
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
4983
|
+
`
|
|
4984
|
+
);
|
|
4985
|
+
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
4986
|
+
let deleted = 0;
|
|
4987
|
+
for (const entry of topLevelEntries) {
|
|
4988
|
+
if (keepSet.has(entry.name)) {
|
|
4989
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
4990
|
+
continue;
|
|
4991
|
+
}
|
|
4992
|
+
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
4993
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
4994
|
+
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
4995
|
+
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
4996
|
+
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
4997
|
+
}
|
|
4998
|
+
console.log(` Deleted '${relPath}'.`);
|
|
4999
|
+
deleted++;
|
|
5000
|
+
}
|
|
5001
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
5002
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
5003
|
+
if (missingKeeps.length > 0) {
|
|
5004
|
+
console.warn(
|
|
5005
|
+
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
5006
|
+
);
|
|
5007
|
+
}
|
|
5008
|
+
console.log(
|
|
5009
|
+
`
|
|
5010
|
+
Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
5011
|
+
);
|
|
5012
|
+
}
|
|
5013
|
+
|
|
5014
|
+
// src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
|
|
5015
|
+
var import_ts_morph22 = require("ts-morph");
|
|
5016
|
+
var import_path26 = __toESM(require("path"));
|
|
5017
|
+
var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
|
|
5018
|
+
var ACTION_PARAMETER_NAME = "action";
|
|
5019
|
+
var OLD_TYPE = "ActionInput";
|
|
5020
|
+
var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
|
|
5021
|
+
function isAcceptRequestedRegistrationParameter(parameter) {
|
|
5022
|
+
const functionDeclaration = parameter.getFirstAncestorByKind(
|
|
5023
|
+
import_ts_morph22.SyntaxKind.FunctionDeclaration
|
|
5024
|
+
);
|
|
5025
|
+
if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
|
|
5026
|
+
return true;
|
|
5027
|
+
}
|
|
5028
|
+
const arrowFunction = parameter.getFirstAncestorByKind(
|
|
5029
|
+
import_ts_morph22.SyntaxKind.ArrowFunction
|
|
5030
|
+
);
|
|
5031
|
+
const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
|
|
5032
|
+
import_ts_morph22.SyntaxKind.VariableDeclaration
|
|
5033
|
+
);
|
|
5034
|
+
return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
|
|
5035
|
+
}
|
|
5036
|
+
function processFile14(filePath, project) {
|
|
5037
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
5038
|
+
if (!sourceFile) return 0;
|
|
5039
|
+
let updatedCount = 0;
|
|
5040
|
+
for (const parameter of sourceFile.getDescendantsOfKind(
|
|
5041
|
+
import_ts_morph22.SyntaxKind.Parameter
|
|
5042
|
+
)) {
|
|
5043
|
+
if (parameter.getName() !== ACTION_PARAMETER_NAME) {
|
|
5044
|
+
continue;
|
|
5045
|
+
}
|
|
5046
|
+
if (!isAcceptRequestedRegistrationParameter(parameter)) {
|
|
5047
|
+
continue;
|
|
5048
|
+
}
|
|
5049
|
+
const typeNode = parameter.getTypeNode();
|
|
5050
|
+
if (!typeNode || typeNode.getText() !== OLD_TYPE) {
|
|
5051
|
+
continue;
|
|
5052
|
+
}
|
|
5053
|
+
parameter.setType(NEW_TYPE);
|
|
5054
|
+
updatedCount++;
|
|
5055
|
+
console.log(
|
|
5056
|
+
` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
|
|
5057
|
+
);
|
|
5058
|
+
}
|
|
5059
|
+
return updatedCount;
|
|
5060
|
+
}
|
|
5061
|
+
async function main27() {
|
|
5062
|
+
const srcDir = import_path26.default.join(process.cwd(), "src");
|
|
5063
|
+
console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
|
|
5064
|
+
`);
|
|
5065
|
+
const project = new import_ts_morph22.Project({
|
|
5066
|
+
tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
|
|
5067
|
+
skipAddingFilesFromTsConfig: false
|
|
4383
5068
|
});
|
|
4384
|
-
|
|
4385
|
-
|
|
4386
|
-
|
|
4387
|
-
|
|
5069
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
5070
|
+
const filePath = sf.getFilePath();
|
|
5071
|
+
return filePath.includes("/src/") && !filePath.includes("/node_modules/");
|
|
5072
|
+
});
|
|
5073
|
+
let totalUpdated = 0;
|
|
5074
|
+
const modifiedFiles = [];
|
|
5075
|
+
for (const sourceFile of sourceFiles) {
|
|
5076
|
+
const filePath = sourceFile.getFilePath();
|
|
5077
|
+
const updated = processFile14(filePath, project);
|
|
5078
|
+
if (updated > 0) {
|
|
5079
|
+
totalUpdated += updated;
|
|
5080
|
+
modifiedFiles.push(filePath);
|
|
5081
|
+
}
|
|
5082
|
+
}
|
|
5083
|
+
if (modifiedFiles.length === 0) {
|
|
5084
|
+
console.log(
|
|
5085
|
+
`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
|
|
5086
|
+
);
|
|
5087
|
+
return;
|
|
5088
|
+
}
|
|
5089
|
+
console.log(`
|
|
5090
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
5091
|
+
for (const filePath of modifiedFiles) {
|
|
5092
|
+
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
5093
|
+
await sourceFile.save();
|
|
5094
|
+
console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
|
|
4388
5095
|
}
|
|
4389
5096
|
console.log(
|
|
4390
5097
|
`
|
|
4391
|
-
|
|
5098
|
+
Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
|
|
4392
5099
|
);
|
|
4393
5100
|
}
|
|
4394
5101
|
|
|
4395
5102
|
// src/migrations/v2.0/index.ts
|
|
5103
|
+
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4396
5104
|
async function runUpgrade(dockerSwarm) {
|
|
4397
5105
|
await main18();
|
|
4398
5106
|
await main();
|
|
@@ -4416,11 +5124,14 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4416
5124
|
await main21();
|
|
4417
5125
|
await main22();
|
|
4418
5126
|
await main23();
|
|
5127
|
+
await main24();
|
|
5128
|
+
await main27();
|
|
4419
5129
|
await main17();
|
|
4420
5130
|
if (dockerSwarm) {
|
|
4421
|
-
await main24();
|
|
4422
|
-
} else {
|
|
4423
5131
|
await main25();
|
|
5132
|
+
} else {
|
|
5133
|
+
await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
|
|
5134
|
+
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4424
5135
|
}
|
|
4425
5136
|
}
|
|
4426
5137
|
|
|
@@ -4449,7 +5160,7 @@ Options:
|
|
|
4449
5160
|
'infrastructure/' directory is deleted (default).
|
|
4450
5161
|
-h, --help Show this message.
|
|
4451
5162
|
`.trim();
|
|
4452
|
-
function
|
|
5163
|
+
function main28() {
|
|
4453
5164
|
const command = args[0];
|
|
4454
5165
|
if (!command || command === "--help" || command === "-h") {
|
|
4455
5166
|
console.log(USAGE);
|
|
@@ -4524,4 +5235,4 @@ function handleCheckTranslations() {
|
|
|
4524
5235
|
console.warn("This command is not implemented yet!");
|
|
4525
5236
|
process.exit(1);
|
|
4526
5237
|
}
|
|
4527
|
-
|
|
5238
|
+
main28();
|