@opencrvs/toolkit 2.0.0-rc.da37d4e → 2.0.0-rc.da8cc8f

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/create-countryconfig/index.js +73 -0
  2. package/create-countryconfig/package.json +11 -0
  3. package/dist/application-config/index.js +17 -29
  4. package/dist/cli.js +405 -162
  5. package/dist/commons/api/router.d.ts +2983 -253
  6. package/dist/commons/application-config/index.d.ts +16 -4
  7. package/dist/commons/conditionals/validate.d.ts +1 -0
  8. package/dist/commons/events/ActionInput.d.ts +108 -0
  9. package/dist/commons/events/Draft.d.ts +3 -0
  10. package/dist/commons/events/EventIndex.d.ts +0 -3
  11. package/dist/commons/events/EventMetadata.d.ts +0 -7
  12. package/dist/commons/events/locations.d.ts +21 -0
  13. package/dist/commons/events/mocks.test.utils.d.ts +19 -0
  14. package/dist/commons/events/scopes.d.ts +24 -1
  15. package/dist/commons/events/state/index.d.ts +0 -4
  16. package/dist/commons/events/state/utils.d.ts +0 -2
  17. package/dist/commons/events/utils.d.ts +1 -1
  18. package/dist/events/index.js +84 -55
  19. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
  20. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +60 -35
  21. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  22. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  23. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  24. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  25. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  26. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  27. package/dist/migrations/v2.0/index.d.ts +5 -3
  28. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  29. package/dist/migrations/v2.0/index.js +405 -162
  30. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
  31. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
  32. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  33. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  34. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  35. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  36. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  37. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  38. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  39. package/dist/notification/index.js +16 -25
  40. package/opencrvs-toolkit-2.0.0-rc.da8cc8f.tgz +0 -0
  41. package/package.json +1 -1
  42. package/opencrvs-toolkit-2.0.0-rc.da37d4e.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. Transformed ${totalTransformed} VALIDATE action(s) to CUSTOM with customActionType: '${VALIDATE_DECLARATION_VALUE}'.`
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 FLAGS_PROPERTY_NAME = "flags";
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 VALIDATED_FLAG_VALUE = "validated";
736
+ var VALIDATED_FLAG_VALUE2 = "validated";
676
737
  function addValidatedFlag(clause) {
677
- const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME);
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(`'${VALIDATED_FLAG_VALUE}'`);
746
+ anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE2}'`);
686
747
  }
687
748
  } else {
688
749
  flagsInit.addPropertyAssignment({
689
750
  name: ANY_OF_PROPERTY_NAME,
690
- initializer: `['${VALIDATED_FLAG_VALUE}']`
751
+ initializer: `['${VALIDATED_FLAG_VALUE2}']`
691
752
  });
692
753
  }
693
754
  }
694
755
  } else {
695
756
  clause.addPropertyAssignment({
696
- name: FLAGS_PROPERTY_NAME,
697
- initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE}'] }`
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 FLAGS_PROPERTY_NAME2 = "flags";
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
- var FLAG_DEFINITION_INITIALIZER = `{
933
+ function flagDefinitionInitializer(eventType) {
934
+ return `{
872
935
  id: '${FLAG_ID}',
873
936
  label: {
874
- id: 'event.birth.flag.${FLAG_ID}',
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 isBirthConfig(configArg) {
894
- const typeProperty = configArg.getProperty(TYPE_PROPERTY_NAME6);
895
- if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
896
- const initializer = typeProperty.getInitializer();
897
- if (!initializer) return false;
898
- if (import_ts_morph6.Node.isStringLiteral(initializer)) {
899
- return initializer.getLiteralValue().toLowerCase() === "birth";
900
- }
901
- if (import_ts_morph6.Node.isPropertyAccessExpression(initializer)) {
902
- return initializer.getName().toLowerCase() === "birth";
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 false;
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 flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME2);
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(FLAG_DEFINITION_INITIALIZER);
991
+ flagsInit.addElement(initializer);
925
992
  return true;
926
993
  }
927
994
  return false;
928
995
  }
929
996
  configArg.addPropertyAssignment({
930
- name: FLAGS_PROPERTY_NAME2,
997
+ name: FLAGS_PROPERTY_NAME3,
931
998
  initializer: `[
932
- ${FLAG_DEFINITION_INITIALIZER}
999
+ ${initializer}
933
1000
  ]`
934
1001
  });
935
1002
  return true;
936
1003
  }
937
1004
  function ensureActionOperationFlag(action, operation) {
938
- const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME2);
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: FLAGS_PROPERTY_NAME2,
1017
+ name: FLAGS_PROPERTY_NAME3,
951
1018
  initializer: `[${entry}]`
952
1019
  });
953
1020
  return true;
954
1021
  }
955
- function processBirthConfig(configArg, relPath) {
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(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
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(FLAGS_PROPERTY_NAME2);
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: FLAGS_PROPERTY_NAME2,
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
- if (!isBirthConfig(configArg)) continue;
1080
- totalChanges += processBirthConfig(configArg, relPath);
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 birth defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
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 birth configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
1204
+ "No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
1135
1205
  );
1136
1206
  return;
1137
1207
  }
@@ -2050,6 +2120,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
2050
2120
  var import_ts_morph11 = require("ts-morph");
2051
2121
  var import_path11 = __toESM(require("path"));
2052
2122
 
2123
+ // ../commons/src/scopes.deprecated.do-not-use.ts
2124
+ var z4 = __toESM(require("zod/v4"));
2125
+ var import_lodash = require("lodash");
2126
+
2053
2127
  // ../commons/src/scopes.ts
2054
2128
  var z3 = __toESM(require("zod/v4"));
2055
2129
  var qs = __toESM(require("qs"));
@@ -2323,7 +2397,6 @@ var DEFAULT_SCOPE_OPTIONS = {
2323
2397
  };
2324
2398
 
2325
2399
  // ../commons/src/scopes.deprecated.do-not-use.ts
2326
- var z4 = __toESM(require("zod/v4"));
2327
2400
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2328
2401
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2329
2402
  var SearchScope = z4.object({
@@ -2557,6 +2630,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2557
2630
  }
2558
2631
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2559
2632
  };
2633
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2634
+ function isMergeableUserScopeType(type) {
2635
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2636
+ }
2637
+ function decodeLegacyScope(legacy) {
2638
+ const encoded = legacyScopeToV2Scope(legacy);
2639
+ const scope = decodeScope(encoded);
2640
+ if (!scope) {
2641
+ throw new Error(
2642
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2643
+ );
2644
+ }
2645
+ return { legacy, scope };
2646
+ }
2647
+ function groupByType(entries) {
2648
+ return entries.reduce(
2649
+ (groups, entry) => ({
2650
+ ...groups,
2651
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2652
+ }),
2653
+ {}
2654
+ );
2655
+ }
2656
+ function deduplicateEntries(entries) {
2657
+ return entries.filter(
2658
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2659
+ );
2660
+ }
2661
+ function mergeEntries(type, entries) {
2662
+ const optionsList = entries.map(
2663
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2664
+ );
2665
+ const allKeys = optionsList.flatMap(
2666
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2667
+ );
2668
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2669
+ if (conflictKey) {
2670
+ const conflicting = entries.filter(
2671
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2672
+ ).map((e) => JSON.stringify(e.legacy));
2673
+ throw new Error(
2674
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2675
+ );
2676
+ }
2677
+ const mergedOptions = Object.assign({}, ...optionsList);
2678
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2679
+ const parsed = Scope2.safeParse(merged);
2680
+ if (!parsed.success) {
2681
+ throw new Error(
2682
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2683
+ );
2684
+ }
2685
+ return parsed.data;
2686
+ }
2687
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2688
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2689
+ return Object.entries(groups).flatMap(([type, entries]) => {
2690
+ const deduped = deduplicateEntries(entries);
2691
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2692
+ if (!isMergeableUserScopeType(type)) {
2693
+ console.warn(
2694
+ `Multiple non-mergeable '${type}' scopes detected after dedup \u2014 kept all as-is. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}]. Review whether the duplication is intentional.`
2695
+ );
2696
+ return deduped.map((e) => e.scope);
2697
+ }
2698
+ return [mergeEntries(type, deduped)];
2699
+ });
2700
+ }
2560
2701
 
2561
2702
  // src/migrations/v2.0/migrate-scopes.ts
2562
2703
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2594,57 +2735,65 @@ function resolveLegacyScopeFromElement(element) {
2594
2735
  }
2595
2736
  function migrateScopesArrays(rolesFilePath, project) {
2596
2737
  const sourceFile = project.getSourceFile(rolesFilePath);
2597
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2738
+ if (!sourceFile) {
2739
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2740
+ }
2598
2741
  let migratedCount = 0;
2599
2742
  let removedCount = 0;
2743
+ let mergedCount = 0;
2600
2744
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2745
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2601
2746
  for (const scopesProp of scopesProperties) {
2602
2747
  const initializer = scopesProp.getInitializer();
2603
2748
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2604
- const elements = initializer.getElements();
2605
- for (let index = elements.length - 1; index >= 0; index--) {
2606
- const element = elements[index];
2607
- if (!import_ts_morph11.Node.isExpression(element)) continue;
2749
+ const rawTexts = [];
2750
+ const legacyStrings = [];
2751
+ let anyChange = false;
2752
+ for (const element of initializer.getElements()) {
2608
2753
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2609
2754
  if (scopeKey && !(scopeKey in SCOPES)) {
2610
2755
  console.warn(
2611
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2756
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2612
2757
  );
2613
- initializer.removeElement(index);
2614
2758
  removedCount++;
2759
+ anyChange = true;
2615
2760
  continue;
2616
2761
  }
2617
2762
  const legacyScope = resolveLegacyScopeFromElement(element);
2618
2763
  if (!legacyScope) {
2619
2764
  console.warn(
2620
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2765
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2621
2766
  );
2767
+ rawTexts.push(element.getText());
2622
2768
  continue;
2623
2769
  }
2624
- try {
2625
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2626
- const scope = decodeScope(migratedScope);
2627
- if (!scope) {
2628
- console.warn(
2629
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2630
- );
2631
- continue;
2632
- }
2633
- element.replaceWithText(JSON.stringify(scope));
2634
- migratedCount++;
2635
- } catch (error) {
2636
- console.warn(
2637
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2638
- );
2639
- }
2770
+ legacyStrings.push(legacyScope);
2771
+ anyChange = true;
2772
+ }
2773
+ if (!anyChange) continue;
2774
+ let mergedScopes;
2775
+ try {
2776
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2777
+ } catch (error) {
2778
+ throw new Error(
2779
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2780
+ { cause: error }
2781
+ );
2640
2782
  }
2783
+ migratedCount += legacyStrings.length;
2784
+ mergedCount += legacyStrings.length - mergedScopes.length;
2785
+ const outputElements = [
2786
+ ...rawTexts,
2787
+ ...mergedScopes.map((s) => JSON.stringify(s))
2788
+ ];
2789
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2641
2790
  }
2642
2791
  if (removedCount > 0) {
2643
2792
  console.log(
2644
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2793
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2645
2794
  );
2646
2795
  }
2647
- return { migratedCount, removedCount };
2796
+ return { migratedCount, removedCount, mergedCount };
2648
2797
  }
2649
2798
  function ensureScopesHelpersImport(rolesFilePath, project) {
2650
2799
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2779,7 +2928,7 @@ async function main11() {
2779
2928
  return;
2780
2929
  }
2781
2930
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2782
- const { migratedCount, removedCount } = migrateScopesArrays(
2931
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2783
2932
  rolesFilePath,
2784
2933
  project
2785
2934
  );
@@ -2798,7 +2947,7 @@ async function main11() {
2798
2947
  }
2799
2948
  await sourceFile.save();
2800
2949
  console.log(
2801
- `Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2950
+ `Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2802
2951
  );
2803
2952
  }
2804
2953
 
@@ -3604,6 +3753,10 @@ var ACTION_PROPERTY_NAME2 = "action";
3604
3753
  var CONDITIONALS_PROPERTY_NAME = "conditionals";
3605
3754
  var TYPE_PROPERTY_NAME7 = "type";
3606
3755
  var SLUG_PROPERTY_NAME = "slug";
3756
+ var READ_ACTION_TYPE = "READ";
3757
+ var ACTION_TYPE_IMPORT_NAME = "ActionType";
3758
+ var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
3759
+ var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
3607
3760
  var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
3608
3761
  "READ",
3609
3762
  "DELETE",
@@ -3651,91 +3804,137 @@ function isUnsupportedActionType(action) {
3651
3804
  }
3652
3805
  return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
3653
3806
  }
3654
- function migrateWorkqueueActions(workqueue, relPath) {
3655
- const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
3656
- if (!actionsProperty || !import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
3657
- return 0;
3658
- }
3659
- const actionsInitializer = actionsProperty.getInitializer();
3660
- if (!actionsInitializer || !import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
3661
- return 0;
3807
+ function ensureValidAction(workqueue, relPath) {
3808
+ const workqueueLabel = getWorkqueueLabel(workqueue);
3809
+ const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3810
+ if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
3811
+ const initializer = actionProperty.getInitializer();
3812
+ if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
3813
+ if (!isUnsupportedActionType(initializer)) {
3814
+ return { changed: false, usedReadFallback: false };
3815
+ }
3816
+ actionProperty.set({
3817
+ name: ACTION_PROPERTY_NAME2,
3818
+ initializer: READ_ACTION_FALLBACK_INITIALIZER
3819
+ });
3820
+ console.log(
3821
+ ` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
3822
+ );
3823
+ return { changed: true, usedReadFallback: true };
3824
+ }
3662
3825
  }
3826
+ workqueue.addPropertyAssignment({
3827
+ name: ACTION_PROPERTY_NAME2,
3828
+ initializer: READ_ACTION_FALLBACK_INITIALIZER
3829
+ });
3830
+ console.log(
3831
+ ` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
3832
+ );
3833
+ return { changed: true, usedReadFallback: true };
3834
+ }
3835
+ function migrateWorkqueueActions(workqueue, relPath) {
3663
3836
  const workqueueLabel = getWorkqueueLabel(workqueue);
3664
- const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3665
- if (existingActionProperty) {
3666
- if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
3667
- const existingActionInitializer = existingActionProperty.getInitializer();
3668
- if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
3669
- const conditionalsProperty2 = existingActionInitializer.getProperty(
3670
- CONDITIONALS_PROPERTY_NAME
3837
+ const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
3838
+ let actionsArrayMigrated = false;
3839
+ if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
3840
+ const actionsInitializer = actionsProperty.getInitializer();
3841
+ if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
3842
+ const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3843
+ if (existingActionProperty) {
3844
+ if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
3845
+ const existingActionInitializer = existingActionProperty.getInitializer();
3846
+ if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
3847
+ const conditionalsProperty = existingActionInitializer.getProperty(
3848
+ CONDITIONALS_PROPERTY_NAME
3849
+ );
3850
+ if (conditionalsProperty) {
3851
+ conditionalsProperty.remove();
3852
+ console.log(
3853
+ ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3854
+ );
3855
+ }
3856
+ }
3857
+ }
3858
+ actionsProperty.remove();
3859
+ console.log(
3860
+ ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3861
+ );
3862
+ actionsArrayMigrated = true;
3863
+ } else {
3864
+ const actionCandidates = actionsInitializer.getElements().filter(
3865
+ (element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
3671
3866
  );
3672
- if (conditionalsProperty2) {
3673
- conditionalsProperty2.remove();
3867
+ if (actionCandidates.length === 0) {
3868
+ actionsProperty.remove();
3674
3869
  console.log(
3675
- ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3870
+ ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3676
3871
  );
3677
- }
3678
- if (isUnsupportedActionType(existingActionInitializer)) {
3679
- existingActionProperty.remove();
3680
- console.log(
3681
- ` [${relPath}] Removed unsupported 'action' type on workqueue '${workqueueLabel}'`
3872
+ actionsArrayMigrated = true;
3873
+ } else {
3874
+ if (actionCandidates.length > 1) {
3875
+ const droppedCount = actionCandidates.length - 1;
3876
+ console.warn(
3877
+ ` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
3878
+ );
3879
+ }
3880
+ const conditionalsProperty = actionCandidates[0].getProperty(
3881
+ CONDITIONALS_PROPERTY_NAME
3682
3882
  );
3883
+ if (conditionalsProperty) {
3884
+ conditionalsProperty.remove();
3885
+ console.log(
3886
+ ` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
3887
+ );
3888
+ }
3889
+ if (isUnsupportedActionType(actionCandidates[0])) {
3890
+ actionsProperty.remove();
3891
+ console.log(
3892
+ ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
3893
+ );
3894
+ actionsArrayMigrated = true;
3895
+ } else {
3896
+ const firstActionText = actionCandidates[0].getText();
3897
+ workqueue.addPropertyAssignment({
3898
+ name: ACTION_PROPERTY_NAME2,
3899
+ initializer: firstActionText
3900
+ });
3901
+ actionsProperty.remove();
3902
+ console.log(
3903
+ ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3904
+ );
3905
+ actionsArrayMigrated = true;
3906
+ }
3683
3907
  }
3684
3908
  }
3685
3909
  }
3686
- actionsProperty.remove();
3687
- console.log(
3688
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3689
- );
3690
- return 1;
3691
- }
3692
- const actionCandidates = actionsInitializer.getElements().filter(
3693
- (element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
3694
- );
3695
- if (actionCandidates.length === 0) {
3696
- actionsProperty.remove();
3697
- console.log(
3698
- ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3699
- );
3700
- return 1;
3701
3910
  }
3702
- if (actionCandidates.length > 1) {
3703
- const droppedCount = actionCandidates.length - 1;
3704
- console.warn(
3705
- ` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
3706
- );
3707
- }
3708
- const conditionalsProperty = actionCandidates[0].getProperty(
3709
- CONDITIONALS_PROPERTY_NAME
3911
+ const fallback = ensureValidAction(workqueue, relPath);
3912
+ return {
3913
+ changed: actionsArrayMigrated || fallback.changed,
3914
+ usedReadFallback: fallback.usedReadFallback
3915
+ };
3916
+ }
3917
+ function ensureActionTypeImport(sourceFile) {
3918
+ const existingImport = sourceFile.getImportDeclaration(
3919
+ (decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
3710
3920
  );
3711
- if (conditionalsProperty) {
3712
- conditionalsProperty.remove();
3713
- console.log(
3714
- ` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
3715
- );
3716
- }
3717
- if (isUnsupportedActionType(actionCandidates[0])) {
3718
- actionsProperty.remove();
3719
- console.log(
3720
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
3721
- );
3722
- return 1;
3921
+ if (existingImport) {
3922
+ const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
3923
+ if (!alreadyImported) {
3924
+ existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
3925
+ }
3926
+ return;
3723
3927
  }
3724
- const firstActionText = actionCandidates[0].getText();
3725
- workqueue.addPropertyAssignment({
3726
- name: ACTION_PROPERTY_NAME2,
3727
- initializer: firstActionText
3928
+ sourceFile.addImportDeclaration({
3929
+ moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
3930
+ namedImports: [ACTION_TYPE_IMPORT_NAME]
3728
3931
  });
3729
- actionsProperty.remove();
3730
- console.log(
3731
- ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3732
- );
3733
- return 1;
3734
3932
  }
3735
3933
  function processFile13(filePath, project) {
3736
3934
  const sourceFile = project.getSourceFile(filePath);
3737
3935
  if (!sourceFile) return 0;
3738
3936
  let migratedWorkqueues = 0;
3937
+ let needsActionTypeImport = false;
3739
3938
  const relPath = import_path18.default.relative(process.cwd(), filePath);
3740
3939
  const callExpressions = sourceFile.getDescendantsOfKind(
3741
3940
  import_ts_morph17.SyntaxKind.CallExpression
@@ -3751,9 +3950,14 @@ function processFile13(filePath, project) {
3751
3950
  if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
3752
3951
  for (const element of workqueuesArg.getElements()) {
3753
3952
  if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
3754
- migratedWorkqueues += migrateWorkqueueActions(element, relPath);
3953
+ const result = migrateWorkqueueActions(element, relPath);
3954
+ if (result.changed) migratedWorkqueues++;
3955
+ if (result.usedReadFallback) needsActionTypeImport = true;
3755
3956
  }
3756
3957
  }
3958
+ if (needsActionTypeImport) {
3959
+ ensureActionTypeImport(sourceFile);
3960
+ }
3757
3961
  return migratedWorkqueues;
3758
3962
  }
3759
3963
  async function main18() {
@@ -4088,7 +4292,7 @@ Saved ${handlerRelPath}.`);
4088
4292
  // src/migrations/v2.0/checkout-upstream-files.ts
4089
4293
  var import_child_process = require("child_process");
4090
4294
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4091
- var UPSTREAM_BRANCH = "develop";
4295
+ var UPSTREAM_BRANCH = "release-v2.0.0";
4092
4296
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4093
4297
  var FILES_TO_CHECKOUT = [
4094
4298
  "src/analytics/analytics.ts",
@@ -4638,9 +4842,13 @@ function gitShowBytes(ref, path23) {
4638
4842
  return null;
4639
4843
  }
4640
4844
  }
4641
- async function main25() {
4845
+ async function main25({
4846
+ subdirs = []
4847
+ } = {}) {
4848
+ const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
4849
+ const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
4642
4850
  console.log(
4643
- `Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4851
+ `Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4644
4852
  `
4645
4853
  );
4646
4854
  assertIsGitRepo();
@@ -4655,20 +4863,12 @@ async function main25() {
4655
4863
  const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
4656
4864
  const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
4657
4865
  const upstreamFiles = runGit(
4658
- [
4659
- "ls-tree",
4660
- "-r",
4661
- "--name-only",
4662
- "-z",
4663
- ref,
4664
- "--",
4665
- `${INFRASTRUCTURE_DIR}/`
4666
- ],
4866
+ ["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
4667
4867
  { silent: true }
4668
4868
  ).split("\0").filter(Boolean);
4669
4869
  if (upstreamFiles.length === 0) {
4670
4870
  console.log(
4671
- ` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
4871
+ ` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
4672
4872
  );
4673
4873
  return;
4674
4874
  }
@@ -4743,7 +4943,9 @@ async function main25() {
4743
4943
  var import_fs6 = require("fs");
4744
4944
  var import_path25 = require("path");
4745
4945
  var INFRASTRUCTURE_DIR2 = "infrastructure";
4746
- async function main26() {
4946
+ async function main26({
4947
+ keep = []
4948
+ } = {}) {
4747
4949
  const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
4748
4950
  if (!(0, import_fs6.existsSync)(fullPath)) {
4749
4951
  console.log(
@@ -4751,24 +4953,64 @@ async function main26() {
4751
4953
  );
4752
4954
  return;
4753
4955
  }
4754
- console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4755
- `);
4756
4956
  assertIsGitRepo();
4757
- runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4758
- silent: true
4759
- });
4760
- console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`);
4761
- if ((0, import_fs6.existsSync)(fullPath)) {
4762
- (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4763
- console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`);
4957
+ if (keep.length === 0) {
4958
+ console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4959
+ `);
4960
+ runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4961
+ silent: true
4962
+ });
4963
+ console.log(
4964
+ ` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
4965
+ );
4966
+ if ((0, import_fs6.existsSync)(fullPath)) {
4967
+ (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4968
+ console.log(
4969
+ ` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
4970
+ );
4971
+ }
4972
+ console.log(
4973
+ `
4974
+ Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
4975
+ );
4976
+ return;
4977
+ }
4978
+ const keepSet = new Set(keep);
4979
+ console.log(
4980
+ `Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
4981
+ `
4982
+ );
4983
+ const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
4984
+ let deleted = 0;
4985
+ for (const entry of topLevelEntries) {
4986
+ if (keepSet.has(entry.name)) {
4987
+ console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
4988
+ continue;
4989
+ }
4990
+ const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
4991
+ runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
4992
+ const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
4993
+ if ((0, import_fs6.existsSync)(fullEntryPath)) {
4994
+ (0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
4995
+ }
4996
+ console.log(` Deleted '${relPath}'.`);
4997
+ deleted++;
4998
+ }
4999
+ const presentNames = new Set(topLevelEntries.map((e) => e.name));
5000
+ const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
5001
+ if (missingKeeps.length > 0) {
5002
+ console.warn(
5003
+ ` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
5004
+ );
4764
5005
  }
4765
5006
  console.log(
4766
5007
  `
4767
- Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5008
+ Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
4768
5009
  );
4769
5010
  }
4770
5011
 
4771
5012
  // src/migrations/v2.0/index.ts
5013
+ var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4772
5014
  async function runUpgrade(dockerSwarm) {
4773
5015
  await main18();
4774
5016
  await main();
@@ -4797,7 +5039,8 @@ async function runUpgrade(dockerSwarm) {
4797
5039
  if (dockerSwarm) {
4798
5040
  await main25();
4799
5041
  } else {
4800
- await main26();
5042
+ await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
5043
+ await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
4801
5044
  }
4802
5045
  }
4803
5046