@opencrvs/toolkit 2.0.0-rc.f3bc98a → 2.0.0-rc.f45dbb8

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.
Files changed (126) hide show
  1. package/README.md +15 -0
  2. package/build.sh +3 -2
  3. package/create-countryconfig/index.js +103 -0
  4. package/create-countryconfig/package.json +21 -0
  5. package/dist/application-config/index.js +291 -126
  6. package/dist/cli.js +3759 -211
  7. package/dist/commons/api/router.d.ts +3387 -237
  8. package/dist/commons/application-config/index.d.ts +1 -0
  9. package/dist/commons/conditionals/conditionals.d.ts +360 -10
  10. package/dist/commons/conditionals/validate.d.ts +52 -2
  11. package/dist/commons/events/ActionConfig.d.ts +28 -2
  12. package/dist/commons/events/ActionDocument.d.ts +6 -0
  13. package/dist/commons/events/ActionInput.d.ts +114 -0
  14. package/dist/commons/events/AdvancedSearchConfig.d.ts +354 -0
  15. package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
  16. package/dist/commons/events/Draft.d.ts +4 -2
  17. package/dist/commons/events/EventConfig.d.ts +2 -0
  18. package/dist/commons/events/EventDocument.d.ts +3 -0
  19. package/dist/commons/events/EventIndex.d.ts +25 -3
  20. package/dist/commons/events/EventMetadata.d.ts +26 -7
  21. package/dist/commons/events/FieldConfig.d.ts +393 -50
  22. package/dist/commons/events/FieldType.d.ts +1 -0
  23. package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
  24. package/dist/commons/events/FieldValue.d.ts +6 -0
  25. package/dist/commons/events/WorkqueueConfig.d.ts +189 -150
  26. package/dist/commons/events/field.d.ts +53 -1
  27. package/dist/commons/events/index.d.ts +2 -0
  28. package/dist/commons/events/locations.d.ts +22 -0
  29. package/dist/commons/events/mocks.test.utils.d.ts +19 -0
  30. package/dist/commons/events/scopes.d.ts +24 -1
  31. package/dist/commons/events/state/flags.d.ts +16 -0
  32. package/dist/commons/events/state/index.d.ts +8 -4
  33. package/dist/commons/events/state/utils.d.ts +21 -289
  34. package/dist/commons/events/utils.d.ts +13 -2
  35. package/dist/conditionals/index.js +68 -8
  36. package/dist/environment/custom-types.d.ts +33 -0
  37. package/dist/environment/custom-types.d.ts.map +1 -0
  38. package/dist/environment/custom-types.js +12 -0
  39. package/dist/environment/derived-variables.d.ts +134 -0
  40. package/dist/environment/derived-variables.d.ts.map +1 -0
  41. package/dist/environment/derived-variables.js +169 -0
  42. package/dist/environment/editor-questions.d.ts +4 -0
  43. package/dist/environment/editor-questions.d.ts.map +1 -0
  44. package/dist/environment/editor-questions.js +67 -0
  45. package/dist/environment/git.d.ts +5 -0
  46. package/dist/environment/git.d.ts.map +1 -0
  47. package/dist/environment/git.js +38 -0
  48. package/dist/environment/github.d.ts +26 -0
  49. package/dist/environment/github.d.ts.map +1 -0
  50. package/dist/environment/github.js +247 -0
  51. package/dist/environment/index.d.ts +5 -0
  52. package/dist/environment/index.d.ts.map +1 -0
  53. package/dist/environment/index.js +71 -0
  54. package/dist/environment/logger.d.ts +15 -0
  55. package/dist/environment/logger.d.ts.map +1 -0
  56. package/dist/environment/logger.js +25 -0
  57. package/dist/environment/manage-users.d.ts +11 -0
  58. package/dist/environment/manage-users.d.ts.map +1 -0
  59. package/dist/environment/manage-users.js +497 -0
  60. package/dist/environment/questions-helper.d.ts +15 -0
  61. package/dist/environment/questions-helper.d.ts.map +1 -0
  62. package/dist/environment/questions-helper.js +70 -0
  63. package/dist/environment/questions.d.ts +199 -0
  64. package/dist/environment/questions.d.ts.map +1 -0
  65. package/dist/environment/questions.js +412 -0
  66. package/dist/environment/setup-environment.d.ts +2 -0
  67. package/dist/environment/setup-environment.d.ts.map +1 -0
  68. package/dist/environment/setup-environment.js +794 -0
  69. package/dist/environment/ssh-keygen.d.ts +5 -0
  70. package/dist/environment/ssh-keygen.d.ts.map +1 -0
  71. package/dist/environment/ssh-keygen.js +21 -0
  72. package/dist/environment/swarm-to-k8s.d.ts +2 -0
  73. package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
  74. package/dist/environment/swarm-to-k8s.js +173 -0
  75. package/dist/environment/templates.d.ts +27 -0
  76. package/dist/environment/templates.d.ts.map +1 -0
  77. package/dist/environment/templates.js +163 -0
  78. package/dist/environment/update-workflows.d.ts +2 -0
  79. package/dist/environment/update-workflows.d.ts.map +1 -0
  80. package/dist/environment/update-workflows.js +169 -0
  81. package/dist/environment/users.d.ts +2 -0
  82. package/dist/environment/users.d.ts.map +1 -0
  83. package/dist/environment/users.js +112 -0
  84. package/dist/environment/utils.d.ts +18 -0
  85. package/dist/environment/utils.d.ts.map +1 -0
  86. package/dist/environment/utils.js +100 -0
  87. package/dist/events/index.js +1173 -291
  88. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
  89. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +60 -35
  90. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  91. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  92. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  93. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  94. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  95. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  96. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
  97. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
  98. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
  99. package/dist/migrations/v2.0/index.d.ts +5 -3
  100. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  101. package/dist/migrations/v2.0/index.js +522 -175
  102. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
  103. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
  104. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  105. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  106. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  107. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  108. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  109. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  110. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  111. package/dist/notification/index.js +919 -162
  112. package/dist/scopes/index.d.ts +99 -8
  113. package/dist/scopes/index.js +25 -10
  114. package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
  115. package/dist/templates/charts-values/dependencies/values.yaml +83 -0
  116. package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
  117. package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
  118. package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
  119. package/dist/templates/charts-values/traefik/values.yaml +115 -0
  120. package/dist/templates/inventory/inventory.template.yml +100 -0
  121. package/dist/templates/inventory/production.example.yml +77 -0
  122. package/dist/templates/inventory/qa.example.yml +48 -0
  123. package/opencrvs-toolkit-2.0.0-rc.f45dbb8.tgz +0 -0
  124. package/package.json +20 -2
  125. package/tsconfig.tsbuildinfo +1 -1
  126. package/opencrvs-toolkit-2.0.0-rc.f3bc98a.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. Transformed ${totalTransformed} VALIDATE action(s) to CUSTOM with customActionType: '${VALIDATE_DECLARATION_VALUE}'.`
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 FLAGS_PROPERTY_NAME = "flags";
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 VALIDATED_FLAG_VALUE = "validated";
748
+ var VALIDATED_FLAG_VALUE2 = "validated";
688
749
  function addValidatedFlag(clause) {
689
- const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME);
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(`'${VALIDATED_FLAG_VALUE}'`);
758
+ anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE2}'`);
698
759
  }
699
760
  } else {
700
761
  flagsInit.addPropertyAssignment({
701
762
  name: ANY_OF_PROPERTY_NAME,
702
- initializer: `['${VALIDATED_FLAG_VALUE}']`
763
+ initializer: `['${VALIDATED_FLAG_VALUE2}']`
703
764
  });
704
765
  }
705
766
  }
706
767
  } else {
707
768
  clause.addPropertyAssignment({
708
- name: FLAGS_PROPERTY_NAME,
709
- initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE}'] }`
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 FLAGS_PROPERTY_NAME2 = "flags";
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
- var FLAG_DEFINITION_INITIALIZER = `{
945
+ function flagDefinitionInitializer(eventType) {
946
+ return `{
884
947
  id: '${FLAG_ID}',
885
948
  label: {
886
- id: 'event.birth.flag.${FLAG_ID}',
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 isBirthConfig(configArg) {
906
- const typeProperty = configArg.getProperty(TYPE_PROPERTY_NAME6);
907
- if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
908
- const initializer = typeProperty.getInitializer();
909
- if (!initializer) return false;
910
- if (import_ts_morph6.Node.isStringLiteral(initializer)) {
911
- return initializer.getLiteralValue().toLowerCase() === "birth";
912
- }
913
- if (import_ts_morph6.Node.isPropertyAccessExpression(initializer)) {
914
- return initializer.getName().toLowerCase() === "birth";
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 false;
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 flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME2);
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(FLAG_DEFINITION_INITIALIZER);
1003
+ flagsInit.addElement(initializer);
937
1004
  return true;
938
1005
  }
939
1006
  return false;
940
1007
  }
941
1008
  configArg.addPropertyAssignment({
942
- name: FLAGS_PROPERTY_NAME2,
1009
+ name: FLAGS_PROPERTY_NAME3,
943
1010
  initializer: `[
944
- ${FLAG_DEFINITION_INITIALIZER}
1011
+ ${initializer}
945
1012
  ]`
946
1013
  });
947
1014
  return true;
948
1015
  }
949
1016
  function ensureActionOperationFlag(action, operation) {
950
- const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME2);
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: FLAGS_PROPERTY_NAME2,
1029
+ name: FLAGS_PROPERTY_NAME3,
963
1030
  initializer: `[${entry}]`
964
1031
  });
965
1032
  return true;
966
1033
  }
967
- function processBirthConfig(configArg, relPath) {
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(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
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(FLAGS_PROPERTY_NAME2);
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: FLAGS_PROPERTY_NAME2,
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
- if (!isBirthConfig(configArg)) continue;
1092
- totalChanges += processBirthConfig(configArg, relPath);
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 birth defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
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 birth configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
1216
+ "No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
1147
1217
  );
1148
1218
  return;
1149
1219
  }
@@ -1825,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
1825
1895
  }
1826
1896
  return replacedCount;
1827
1897
  }
1828
- function resolveConfigChain(configObj, path23) {
1898
+ function resolveConfigChain(configObj, path24) {
1829
1899
  let current = configObj;
1830
- for (const key of path23) {
1900
+ for (const key of path24) {
1831
1901
  if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
1832
1902
  const prop = current.getProperty(key);
1833
1903
  if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
@@ -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"));
@@ -2130,11 +2204,13 @@ var scopeOptionsPlaceEvent = z3.object({
2130
2204
  event: scopeByEvent,
2131
2205
  placeOfEvent: JurisdictionFilter.optional()
2132
2206
  }).describe("Options applicable to all record scopes.");
2133
- var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
2207
+ var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
2208
+ notifiedIn: JurisdictionFilter.optional(),
2209
+ notifiedBy: UserFilter.optional(),
2134
2210
  declaredIn: JurisdictionFilter.optional(),
2135
2211
  declaredBy: UserFilter.optional()
2136
2212
  }).describe("Options applicable to actions that may take place after DECLARE");
2137
- var AllRecordScopeOptions = scopeOptionsDeclared.extend({
2213
+ var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
2138
2214
  registeredIn: JurisdictionFilter.optional(),
2139
2215
  registeredBy: UserFilter.optional()
2140
2216
  }).describe(
@@ -2172,6 +2248,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
2172
2248
  "Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
2173
2249
  );
2174
2250
  var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
2251
+ notifiedIn: UUID.nullish(),
2252
+ notifiedBy: z3.string().optional(),
2175
2253
  declaredIn: UUID.nullish(),
2176
2254
  declaredBy: z3.string().optional()
2177
2255
  }).describe(
@@ -2217,7 +2295,7 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
2217
2295
  }),
2218
2296
  z3.object({
2219
2297
  type: ScopesWithDeclaredOptions,
2220
- options: scopeOptionsDeclared.optional()
2298
+ options: scopeOptionsDeclaredOrNotified.optional()
2221
2299
  }),
2222
2300
  z3.object({
2223
2301
  type: ScopesWithFullOptions,
@@ -2238,12 +2316,14 @@ var SystemScopeType = z3.enum([
2238
2316
  "organisation.read-locations",
2239
2317
  "user.read",
2240
2318
  "user.create",
2241
- "user.edit"
2319
+ "user.edit",
2320
+ "user.search"
2242
2321
  ]);
2243
2322
  var UserScopeType = SystemScopeType.extract([
2244
2323
  "user.read",
2245
2324
  "user.create",
2246
- "user.edit"
2325
+ "user.edit",
2326
+ "user.search"
2247
2327
  ]);
2248
2328
  var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
2249
2329
  var UserScopeV2 = z3.discriminatedUnion("type", [
@@ -2252,7 +2332,7 @@ var UserScopeV2 = z3.discriminatedUnion("type", [
2252
2332
  options: AllUserScopeOptions.optional()
2253
2333
  }),
2254
2334
  z3.object({
2255
- type: UserScopeType.extract(["user.read"]),
2335
+ type: UserScopeType.extract(["user.read", "user.search"]),
2256
2336
  options: AccessLevelOptions.optional()
2257
2337
  })
2258
2338
  ]);
@@ -2318,22 +2398,30 @@ var encodeScope = (scope) => {
2318
2398
  encode: false
2319
2399
  });
2320
2400
  };
2321
- var decodeScope = (query) => {
2322
- const scope = qs.parse(query, {
2401
+ var decodedScopeCache = /* @__PURE__ */ new Map();
2402
+ var decodeScope = (encodedScope) => {
2403
+ if (decodedScopeCache.has(encodedScope)) {
2404
+ return decodedScopeCache.get(encodedScope);
2405
+ }
2406
+ const scope = qs.parse(encodedScope, {
2323
2407
  ignoreQueryPrefix: true,
2324
2408
  comma: true,
2325
2409
  allowDots: true
2326
2410
  });
2327
2411
  const unflattenedScope = unflattenScope(scope);
2328
- return Scope2.safeParse(unflattenedScope)?.data;
2412
+ const result = Scope2.safeParse(unflattenedScope)?.data;
2413
+ decodedScopeCache.set(encodedScope, result);
2414
+ return result;
2329
2415
  };
2330
2416
  var DEFAULT_SCOPE_OPTIONS = {
2331
2417
  placeOfEvent: JurisdictionFilter.enum.all,
2332
- accessLevel: JurisdictionFilter.enum.all
2418
+ accessLevel: JurisdictionFilter.enum.all,
2419
+ notifiedIn: JurisdictionFilter.enum.all,
2420
+ declaredIn: JurisdictionFilter.enum.all,
2421
+ registeredIn: JurisdictionFilter.enum.all
2333
2422
  };
2334
2423
 
2335
2424
  // ../commons/src/scopes.deprecated.do-not-use.ts
2336
- var z4 = __toESM(require("zod/v4"));
2337
2425
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2338
2426
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2339
2427
  var SearchScope = z4.object({
@@ -2567,6 +2655,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2567
2655
  }
2568
2656
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2569
2657
  };
2658
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2659
+ function isMergeableUserScopeType(type) {
2660
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2661
+ }
2662
+ function decodeLegacyScope(legacy) {
2663
+ const encoded = legacyScopeToV2Scope(legacy);
2664
+ const scope = decodeScope(encoded);
2665
+ if (!scope) {
2666
+ throw new Error(
2667
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2668
+ );
2669
+ }
2670
+ return { legacy, scope };
2671
+ }
2672
+ function groupByType(entries) {
2673
+ return entries.reduce(
2674
+ (groups, entry) => ({
2675
+ ...groups,
2676
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2677
+ }),
2678
+ {}
2679
+ );
2680
+ }
2681
+ function deduplicateEntries(entries) {
2682
+ return entries.filter(
2683
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2684
+ );
2685
+ }
2686
+ function mergeEntries(type, entries) {
2687
+ const optionsList = entries.map(
2688
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2689
+ );
2690
+ const allKeys = optionsList.flatMap(
2691
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2692
+ );
2693
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2694
+ if (conflictKey) {
2695
+ const conflicting = entries.filter(
2696
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2697
+ ).map((e) => JSON.stringify(e.legacy));
2698
+ throw new Error(
2699
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2700
+ );
2701
+ }
2702
+ const mergedOptions = Object.assign({}, ...optionsList);
2703
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2704
+ const parsed = Scope2.safeParse(merged);
2705
+ if (!parsed.success) {
2706
+ throw new Error(
2707
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2708
+ );
2709
+ }
2710
+ return parsed.data;
2711
+ }
2712
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2713
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2714
+ return Object.entries(groups).flatMap(([type, entries]) => {
2715
+ const deduped = deduplicateEntries(entries);
2716
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2717
+ if (!isMergeableUserScopeType(type)) {
2718
+ console.warn(
2719
+ `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.`
2720
+ );
2721
+ return deduped.map((e) => e.scope);
2722
+ }
2723
+ return [mergeEntries(type, deduped)];
2724
+ });
2725
+ }
2570
2726
 
2571
2727
  // src/migrations/v2.0/migrate-scopes.ts
2572
2728
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2604,57 +2760,65 @@ function resolveLegacyScopeFromElement(element) {
2604
2760
  }
2605
2761
  function migrateScopesArrays(rolesFilePath, project) {
2606
2762
  const sourceFile = project.getSourceFile(rolesFilePath);
2607
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2763
+ if (!sourceFile) {
2764
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2765
+ }
2608
2766
  let migratedCount = 0;
2609
2767
  let removedCount = 0;
2768
+ let mergedCount = 0;
2610
2769
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2770
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2611
2771
  for (const scopesProp of scopesProperties) {
2612
2772
  const initializer = scopesProp.getInitializer();
2613
2773
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2614
- const elements = initializer.getElements();
2615
- for (let index = elements.length - 1; index >= 0; index--) {
2616
- const element = elements[index];
2617
- if (!import_ts_morph11.Node.isExpression(element)) continue;
2774
+ const rawTexts = [];
2775
+ const legacyStrings = [];
2776
+ let anyChange = false;
2777
+ for (const element of initializer.getElements()) {
2618
2778
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2619
2779
  if (scopeKey && !(scopeKey in SCOPES)) {
2620
2780
  console.warn(
2621
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2781
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2622
2782
  );
2623
- initializer.removeElement(index);
2624
2783
  removedCount++;
2784
+ anyChange = true;
2625
2785
  continue;
2626
2786
  }
2627
2787
  const legacyScope = resolveLegacyScopeFromElement(element);
2628
2788
  if (!legacyScope) {
2629
2789
  console.warn(
2630
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2790
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2631
2791
  );
2792
+ rawTexts.push(element.getText());
2632
2793
  continue;
2633
2794
  }
2634
- try {
2635
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2636
- const scope = decodeScope(migratedScope);
2637
- if (!scope) {
2638
- console.warn(
2639
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2640
- );
2641
- continue;
2642
- }
2643
- element.replaceWithText(JSON.stringify(scope));
2644
- migratedCount++;
2645
- } catch (error) {
2646
- console.warn(
2647
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2648
- );
2649
- }
2795
+ legacyStrings.push(legacyScope);
2796
+ anyChange = true;
2650
2797
  }
2798
+ if (!anyChange) continue;
2799
+ let mergedScopes;
2800
+ try {
2801
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2802
+ } catch (error) {
2803
+ throw new Error(
2804
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2805
+ { cause: error }
2806
+ );
2807
+ }
2808
+ migratedCount += legacyStrings.length;
2809
+ mergedCount += legacyStrings.length - mergedScopes.length;
2810
+ const outputElements = [
2811
+ ...rawTexts,
2812
+ ...mergedScopes.map((s) => JSON.stringify(s))
2813
+ ];
2814
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2651
2815
  }
2652
2816
  if (removedCount > 0) {
2653
2817
  console.log(
2654
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2818
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2655
2819
  );
2656
2820
  }
2657
- return { migratedCount, removedCount };
2821
+ return { migratedCount, removedCount, mergedCount };
2658
2822
  }
2659
2823
  function ensureScopesHelpersImport(rolesFilePath, project) {
2660
2824
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2789,7 +2953,7 @@ async function main11() {
2789
2953
  return;
2790
2954
  }
2791
2955
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2792
- const { migratedCount, removedCount } = migrateScopesArrays(
2956
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2793
2957
  rolesFilePath,
2794
2958
  project
2795
2959
  );
@@ -2808,7 +2972,7 @@ async function main11() {
2808
2972
  }
2809
2973
  await sourceFile.save();
2810
2974
  console.log(
2811
- `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." : "."}`
2975
+ `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." : "."}`
2812
2976
  );
2813
2977
  }
2814
2978
 
@@ -3614,6 +3778,10 @@ var ACTION_PROPERTY_NAME2 = "action";
3614
3778
  var CONDITIONALS_PROPERTY_NAME = "conditionals";
3615
3779
  var TYPE_PROPERTY_NAME7 = "type";
3616
3780
  var SLUG_PROPERTY_NAME = "slug";
3781
+ var READ_ACTION_TYPE = "READ";
3782
+ var ACTION_TYPE_IMPORT_NAME = "ActionType";
3783
+ var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
3784
+ var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
3617
3785
  var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
3618
3786
  "READ",
3619
3787
  "DELETE",
@@ -3661,91 +3829,137 @@ function isUnsupportedActionType(action) {
3661
3829
  }
3662
3830
  return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
3663
3831
  }
3664
- function migrateWorkqueueActions(workqueue, relPath) {
3665
- const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
3666
- if (!actionsProperty || !import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
3667
- return 0;
3668
- }
3669
- const actionsInitializer = actionsProperty.getInitializer();
3670
- if (!actionsInitializer || !import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
3671
- return 0;
3832
+ function ensureValidAction(workqueue, relPath) {
3833
+ const workqueueLabel = getWorkqueueLabel(workqueue);
3834
+ const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3835
+ if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
3836
+ const initializer = actionProperty.getInitializer();
3837
+ if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
3838
+ if (!isUnsupportedActionType(initializer)) {
3839
+ return { changed: false, usedReadFallback: false };
3840
+ }
3841
+ actionProperty.set({
3842
+ name: ACTION_PROPERTY_NAME2,
3843
+ initializer: READ_ACTION_FALLBACK_INITIALIZER
3844
+ });
3845
+ console.log(
3846
+ ` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
3847
+ );
3848
+ return { changed: true, usedReadFallback: true };
3849
+ }
3672
3850
  }
3851
+ workqueue.addPropertyAssignment({
3852
+ name: ACTION_PROPERTY_NAME2,
3853
+ initializer: READ_ACTION_FALLBACK_INITIALIZER
3854
+ });
3855
+ console.log(
3856
+ ` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
3857
+ );
3858
+ return { changed: true, usedReadFallback: true };
3859
+ }
3860
+ function migrateWorkqueueActions(workqueue, relPath) {
3673
3861
  const workqueueLabel = getWorkqueueLabel(workqueue);
3674
- const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3675
- if (existingActionProperty) {
3676
- if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
3677
- const existingActionInitializer = existingActionProperty.getInitializer();
3678
- if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
3679
- const conditionalsProperty2 = existingActionInitializer.getProperty(
3680
- CONDITIONALS_PROPERTY_NAME
3862
+ const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
3863
+ let actionsArrayMigrated = false;
3864
+ if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
3865
+ const actionsInitializer = actionsProperty.getInitializer();
3866
+ if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
3867
+ const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3868
+ if (existingActionProperty) {
3869
+ if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
3870
+ const existingActionInitializer = existingActionProperty.getInitializer();
3871
+ if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
3872
+ const conditionalsProperty = existingActionInitializer.getProperty(
3873
+ CONDITIONALS_PROPERTY_NAME
3874
+ );
3875
+ if (conditionalsProperty) {
3876
+ conditionalsProperty.remove();
3877
+ console.log(
3878
+ ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3879
+ );
3880
+ }
3881
+ }
3882
+ }
3883
+ actionsProperty.remove();
3884
+ console.log(
3885
+ ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3886
+ );
3887
+ actionsArrayMigrated = true;
3888
+ } else {
3889
+ const actionCandidates = actionsInitializer.getElements().filter(
3890
+ (element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
3681
3891
  );
3682
- if (conditionalsProperty2) {
3683
- conditionalsProperty2.remove();
3892
+ if (actionCandidates.length === 0) {
3893
+ actionsProperty.remove();
3684
3894
  console.log(
3685
- ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3895
+ ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3686
3896
  );
3687
- }
3688
- if (isUnsupportedActionType(existingActionInitializer)) {
3689
- existingActionProperty.remove();
3690
- console.log(
3691
- ` [${relPath}] Removed unsupported 'action' type on workqueue '${workqueueLabel}'`
3897
+ actionsArrayMigrated = true;
3898
+ } else {
3899
+ if (actionCandidates.length > 1) {
3900
+ const droppedCount = actionCandidates.length - 1;
3901
+ console.warn(
3902
+ ` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
3903
+ );
3904
+ }
3905
+ const conditionalsProperty = actionCandidates[0].getProperty(
3906
+ CONDITIONALS_PROPERTY_NAME
3692
3907
  );
3908
+ if (conditionalsProperty) {
3909
+ conditionalsProperty.remove();
3910
+ console.log(
3911
+ ` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
3912
+ );
3913
+ }
3914
+ if (isUnsupportedActionType(actionCandidates[0])) {
3915
+ actionsProperty.remove();
3916
+ console.log(
3917
+ ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
3918
+ );
3919
+ actionsArrayMigrated = true;
3920
+ } else {
3921
+ const firstActionText = actionCandidates[0].getText();
3922
+ workqueue.addPropertyAssignment({
3923
+ name: ACTION_PROPERTY_NAME2,
3924
+ initializer: firstActionText
3925
+ });
3926
+ actionsProperty.remove();
3927
+ console.log(
3928
+ ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3929
+ );
3930
+ actionsArrayMigrated = true;
3931
+ }
3693
3932
  }
3694
3933
  }
3695
3934
  }
3696
- actionsProperty.remove();
3697
- console.log(
3698
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3699
- );
3700
- return 1;
3701
3935
  }
3702
- const actionCandidates = actionsInitializer.getElements().filter(
3703
- (element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
3704
- );
3705
- if (actionCandidates.length === 0) {
3706
- actionsProperty.remove();
3707
- console.log(
3708
- ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3709
- );
3710
- return 1;
3711
- }
3712
- if (actionCandidates.length > 1) {
3713
- const droppedCount = actionCandidates.length - 1;
3714
- console.warn(
3715
- ` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
3716
- );
3717
- }
3718
- const conditionalsProperty = actionCandidates[0].getProperty(
3719
- CONDITIONALS_PROPERTY_NAME
3936
+ const fallback = ensureValidAction(workqueue, relPath);
3937
+ return {
3938
+ changed: actionsArrayMigrated || fallback.changed,
3939
+ usedReadFallback: fallback.usedReadFallback
3940
+ };
3941
+ }
3942
+ function ensureActionTypeImport(sourceFile) {
3943
+ const existingImport = sourceFile.getImportDeclaration(
3944
+ (decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
3720
3945
  );
3721
- if (conditionalsProperty) {
3722
- conditionalsProperty.remove();
3723
- console.log(
3724
- ` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
3725
- );
3726
- }
3727
- if (isUnsupportedActionType(actionCandidates[0])) {
3728
- actionsProperty.remove();
3729
- console.log(
3730
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
3731
- );
3732
- return 1;
3946
+ if (existingImport) {
3947
+ const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
3948
+ if (!alreadyImported) {
3949
+ existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
3950
+ }
3951
+ return;
3733
3952
  }
3734
- const firstActionText = actionCandidates[0].getText();
3735
- workqueue.addPropertyAssignment({
3736
- name: ACTION_PROPERTY_NAME2,
3737
- initializer: firstActionText
3953
+ sourceFile.addImportDeclaration({
3954
+ moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
3955
+ namedImports: [ACTION_TYPE_IMPORT_NAME]
3738
3956
  });
3739
- actionsProperty.remove();
3740
- console.log(
3741
- ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3742
- );
3743
- return 1;
3744
3957
  }
3745
3958
  function processFile13(filePath, project) {
3746
3959
  const sourceFile = project.getSourceFile(filePath);
3747
3960
  if (!sourceFile) return 0;
3748
3961
  let migratedWorkqueues = 0;
3962
+ let needsActionTypeImport = false;
3749
3963
  const relPath = import_path18.default.relative(process.cwd(), filePath);
3750
3964
  const callExpressions = sourceFile.getDescendantsOfKind(
3751
3965
  import_ts_morph17.SyntaxKind.CallExpression
@@ -3761,9 +3975,14 @@ function processFile13(filePath, project) {
3761
3975
  if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
3762
3976
  for (const element of workqueuesArg.getElements()) {
3763
3977
  if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
3764
- migratedWorkqueues += migrateWorkqueueActions(element, relPath);
3978
+ const result = migrateWorkqueueActions(element, relPath);
3979
+ if (result.changed) migratedWorkqueues++;
3980
+ if (result.usedReadFallback) needsActionTypeImport = true;
3765
3981
  }
3766
3982
  }
3983
+ if (needsActionTypeImport) {
3984
+ ensureActionTypeImport(sourceFile);
3985
+ }
3767
3986
  return migratedWorkqueues;
3768
3987
  }
3769
3988
  async function main18() {
@@ -4098,7 +4317,7 @@ Saved ${handlerRelPath}.`);
4098
4317
  // src/migrations/v2.0/checkout-upstream-files.ts
4099
4318
  var import_child_process = require("child_process");
4100
4319
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4101
- var UPSTREAM_BRANCH = "develop";
4320
+ var UPSTREAM_BRANCH = "release/2.0.0";
4102
4321
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4103
4322
  var FILES_TO_CHECKOUT = [
4104
4323
  "src/analytics/analytics.ts",
@@ -4637,9 +4856,9 @@ var import_path24 = require("path");
4637
4856
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4638
4857
  var INFRASTRUCTURE_DIR = "infrastructure";
4639
4858
  var BASE_BRANCH = "release-v1.9";
4640
- function gitShowBytes(ref, path23) {
4859
+ function gitShowBytes(ref, path24) {
4641
4860
  try {
4642
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4861
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
4643
4862
  cwd: process.cwd(),
4644
4863
  stdio: ["ignore", "pipe", "pipe"]
4645
4864
  });
@@ -4648,9 +4867,13 @@ function gitShowBytes(ref, path23) {
4648
4867
  return null;
4649
4868
  }
4650
4869
  }
4651
- async function main25() {
4870
+ async function main25({
4871
+ subdirs = []
4872
+ } = {}) {
4873
+ const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
4874
+ const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
4652
4875
  console.log(
4653
- `Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4876
+ `Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4654
4877
  `
4655
4878
  );
4656
4879
  assertIsGitRepo();
@@ -4665,20 +4888,12 @@ async function main25() {
4665
4888
  const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
4666
4889
  const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
4667
4890
  const upstreamFiles = runGit(
4668
- [
4669
- "ls-tree",
4670
- "-r",
4671
- "--name-only",
4672
- "-z",
4673
- ref,
4674
- "--",
4675
- `${INFRASTRUCTURE_DIR}/`
4676
- ],
4891
+ ["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
4677
4892
  { silent: true }
4678
4893
  ).split("\0").filter(Boolean);
4679
4894
  if (upstreamFiles.length === 0) {
4680
4895
  console.log(
4681
- ` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
4896
+ ` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
4682
4897
  );
4683
4898
  return;
4684
4899
  }
@@ -4753,7 +4968,9 @@ async function main25() {
4753
4968
  var import_fs6 = require("fs");
4754
4969
  var import_path25 = require("path");
4755
4970
  var INFRASTRUCTURE_DIR2 = "infrastructure";
4756
- async function main26() {
4971
+ async function main26({
4972
+ keep = []
4973
+ } = {}) {
4757
4974
  const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
4758
4975
  if (!(0, import_fs6.existsSync)(fullPath)) {
4759
4976
  console.log(
@@ -4761,24 +4978,152 @@ async function main26() {
4761
4978
  );
4762
4979
  return;
4763
4980
  }
4764
- console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4765
- `);
4766
4981
  assertIsGitRepo();
4767
- runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4768
- silent: true
4982
+ if (keep.length === 0) {
4983
+ console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4984
+ `);
4985
+ runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4986
+ silent: true
4987
+ });
4988
+ console.log(
4989
+ ` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
4990
+ );
4991
+ if ((0, import_fs6.existsSync)(fullPath)) {
4992
+ (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4993
+ console.log(
4994
+ ` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
4995
+ );
4996
+ }
4997
+ console.log(
4998
+ `
4999
+ Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5000
+ );
5001
+ return;
5002
+ }
5003
+ const keepSet = new Set(keep);
5004
+ console.log(
5005
+ `Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
5006
+ `
5007
+ );
5008
+ const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
5009
+ let deleted = 0;
5010
+ for (const entry of topLevelEntries) {
5011
+ if (keepSet.has(entry.name)) {
5012
+ console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
5013
+ continue;
5014
+ }
5015
+ const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
5016
+ runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
5017
+ const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
5018
+ if ((0, import_fs6.existsSync)(fullEntryPath)) {
5019
+ (0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
5020
+ }
5021
+ console.log(` Deleted '${relPath}'.`);
5022
+ deleted++;
5023
+ }
5024
+ const presentNames = new Set(topLevelEntries.map((e) => e.name));
5025
+ const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
5026
+ if (missingKeeps.length > 0) {
5027
+ console.warn(
5028
+ ` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
5029
+ );
5030
+ }
5031
+ console.log(
5032
+ `
5033
+ Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5034
+ );
5035
+ }
5036
+
5037
+ // src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
5038
+ var import_ts_morph22 = require("ts-morph");
5039
+ var import_path26 = __toESM(require("path"));
5040
+ var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
5041
+ var ACTION_PARAMETER_NAME = "action";
5042
+ var OLD_TYPE = "ActionInput";
5043
+ var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
5044
+ function isAcceptRequestedRegistrationParameter(parameter) {
5045
+ const functionDeclaration = parameter.getFirstAncestorByKind(
5046
+ import_ts_morph22.SyntaxKind.FunctionDeclaration
5047
+ );
5048
+ if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
5049
+ return true;
5050
+ }
5051
+ const arrowFunction = parameter.getFirstAncestorByKind(
5052
+ import_ts_morph22.SyntaxKind.ArrowFunction
5053
+ );
5054
+ const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
5055
+ import_ts_morph22.SyntaxKind.VariableDeclaration
5056
+ );
5057
+ return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
5058
+ }
5059
+ function processFile14(filePath, project) {
5060
+ const sourceFile = project.getSourceFile(filePath);
5061
+ if (!sourceFile) return 0;
5062
+ let updatedCount = 0;
5063
+ for (const parameter of sourceFile.getDescendantsOfKind(
5064
+ import_ts_morph22.SyntaxKind.Parameter
5065
+ )) {
5066
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
5067
+ continue;
5068
+ }
5069
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
5070
+ continue;
5071
+ }
5072
+ const typeNode = parameter.getTypeNode();
5073
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
5074
+ continue;
5075
+ }
5076
+ parameter.setType(NEW_TYPE);
5077
+ updatedCount++;
5078
+ console.log(
5079
+ ` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
5080
+ );
5081
+ }
5082
+ return updatedCount;
5083
+ }
5084
+ async function main27() {
5085
+ const srcDir = import_path26.default.join(process.cwd(), "src");
5086
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
5087
+ `);
5088
+ const project = new import_ts_morph22.Project({
5089
+ tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
5090
+ skipAddingFilesFromTsConfig: false
4769
5091
  });
4770
- console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`);
4771
- if ((0, import_fs6.existsSync)(fullPath)) {
4772
- (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4773
- console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`);
5092
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
5093
+ const filePath = sf.getFilePath();
5094
+ return filePath.includes("/src/") && !filePath.includes("/node_modules/");
5095
+ });
5096
+ let totalUpdated = 0;
5097
+ const modifiedFiles = [];
5098
+ for (const sourceFile of sourceFiles) {
5099
+ const filePath = sourceFile.getFilePath();
5100
+ const updated = processFile14(filePath, project);
5101
+ if (updated > 0) {
5102
+ totalUpdated += updated;
5103
+ modifiedFiles.push(filePath);
5104
+ }
5105
+ }
5106
+ if (modifiedFiles.length === 0) {
5107
+ console.log(
5108
+ `No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
5109
+ );
5110
+ return;
5111
+ }
5112
+ console.log(`
5113
+ Saving ${modifiedFiles.length} modified file(s)...`);
5114
+ for (const filePath of modifiedFiles) {
5115
+ const sourceFile = project.getSourceFileOrThrow(filePath);
5116
+ await sourceFile.save();
5117
+ console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
4774
5118
  }
4775
5119
  console.log(
4776
5120
  `
4777
- Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5121
+ Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
4778
5122
  );
4779
5123
  }
4780
5124
 
4781
5125
  // src/migrations/v2.0/index.ts
5126
+ var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4782
5127
  async function runUpgrade(dockerSwarm) {
4783
5128
  await main18();
4784
5129
  await main();
@@ -4803,10 +5148,12 @@ async function runUpgrade(dockerSwarm) {
4803
5148
  await main22();
4804
5149
  await main23();
4805
5150
  await main24();
5151
+ await main27();
4806
5152
  await main17();
4807
5153
  if (dockerSwarm) {
4808
5154
  await main25();
4809
5155
  } else {
4810
- await main26();
5156
+ await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
5157
+ await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
4811
5158
  }
4812
5159
  }