@opencrvs/toolkit 2.0.0-rc.d87f90c → 2.0.0-rc.d8e90da

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 (122) 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 +3649 -171
  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 +204 -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 +1265 -298
  88. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  89. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  90. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  91. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  92. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  93. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  94. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
  95. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
  96. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
  97. package/dist/migrations/v2.0/index.d.ts +5 -3
  98. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  99. package/dist/migrations/v2.0/index.js +412 -135
  100. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  101. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  102. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  103. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  104. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  105. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  106. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  107. package/dist/notification/index.js +1010 -165
  108. package/dist/scopes/index.d.ts +99 -8
  109. package/dist/scopes/index.js +25 -10
  110. package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
  111. package/dist/templates/charts-values/dependencies/values.yaml +83 -0
  112. package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
  113. package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
  114. package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
  115. package/dist/templates/charts-values/traefik/values.yaml +115 -0
  116. package/dist/templates/inventory/inventory.template.yml +100 -0
  117. package/dist/templates/inventory/production.example.yml +77 -0
  118. package/dist/templates/inventory/qa.example.yml +48 -0
  119. package/opencrvs-toolkit-2.0.0-rc.d8e90da.tgz +0 -0
  120. package/package.json +20 -2
  121. package/tsconfig.tsbuildinfo +1 -1
  122. package/opencrvs-toolkit-2.0.0-rc.d87f90c.tgz +0 -0
@@ -1895,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
1895
1895
  }
1896
1896
  return replacedCount;
1897
1897
  }
1898
- function resolveConfigChain(configObj, path23) {
1898
+ function resolveConfigChain(configObj, path24) {
1899
1899
  let current = configObj;
1900
- for (const key of path23) {
1900
+ for (const key of path24) {
1901
1901
  if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
1902
1902
  const prop = current.getProperty(key);
1903
1903
  if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
@@ -2132,6 +2132,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
2132
2132
  var import_ts_morph11 = require("ts-morph");
2133
2133
  var import_path11 = __toESM(require("path"));
2134
2134
 
2135
+ // ../commons/src/scopes.deprecated.do-not-use.ts
2136
+ var z4 = __toESM(require("zod/v4"));
2137
+ var import_lodash = require("lodash");
2138
+
2135
2139
  // ../commons/src/scopes.ts
2136
2140
  var z3 = __toESM(require("zod/v4"));
2137
2141
  var qs = __toESM(require("qs"));
@@ -2200,11 +2204,13 @@ var scopeOptionsPlaceEvent = z3.object({
2200
2204
  event: scopeByEvent,
2201
2205
  placeOfEvent: JurisdictionFilter.optional()
2202
2206
  }).describe("Options applicable to all record scopes.");
2203
- var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
2207
+ var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
2208
+ notifiedIn: JurisdictionFilter.optional(),
2209
+ notifiedBy: UserFilter.optional(),
2204
2210
  declaredIn: JurisdictionFilter.optional(),
2205
2211
  declaredBy: UserFilter.optional()
2206
2212
  }).describe("Options applicable to actions that may take place after DECLARE");
2207
- var AllRecordScopeOptions = scopeOptionsDeclared.extend({
2213
+ var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
2208
2214
  registeredIn: JurisdictionFilter.optional(),
2209
2215
  registeredBy: UserFilter.optional()
2210
2216
  }).describe(
@@ -2242,6 +2248,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
2242
2248
  "Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
2243
2249
  );
2244
2250
  var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
2251
+ notifiedIn: UUID.nullish(),
2252
+ notifiedBy: z3.string().optional(),
2245
2253
  declaredIn: UUID.nullish(),
2246
2254
  declaredBy: z3.string().optional()
2247
2255
  }).describe(
@@ -2287,7 +2295,7 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
2287
2295
  }),
2288
2296
  z3.object({
2289
2297
  type: ScopesWithDeclaredOptions,
2290
- options: scopeOptionsDeclared.optional()
2298
+ options: scopeOptionsDeclaredOrNotified.optional()
2291
2299
  }),
2292
2300
  z3.object({
2293
2301
  type: ScopesWithFullOptions,
@@ -2308,12 +2316,14 @@ var SystemScopeType = z3.enum([
2308
2316
  "organisation.read-locations",
2309
2317
  "user.read",
2310
2318
  "user.create",
2311
- "user.edit"
2319
+ "user.edit",
2320
+ "user.search"
2312
2321
  ]);
2313
2322
  var UserScopeType = SystemScopeType.extract([
2314
2323
  "user.read",
2315
2324
  "user.create",
2316
- "user.edit"
2325
+ "user.edit",
2326
+ "user.search"
2317
2327
  ]);
2318
2328
  var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
2319
2329
  var UserScopeV2 = z3.discriminatedUnion("type", [
@@ -2322,7 +2332,7 @@ var UserScopeV2 = z3.discriminatedUnion("type", [
2322
2332
  options: AllUserScopeOptions.optional()
2323
2333
  }),
2324
2334
  z3.object({
2325
- type: UserScopeType.extract(["user.read"]),
2335
+ type: UserScopeType.extract(["user.read", "user.search"]),
2326
2336
  options: AccessLevelOptions.optional()
2327
2337
  })
2328
2338
  ]);
@@ -2388,22 +2398,30 @@ var encodeScope = (scope) => {
2388
2398
  encode: false
2389
2399
  });
2390
2400
  };
2391
- var decodeScope = (query) => {
2392
- 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, {
2393
2407
  ignoreQueryPrefix: true,
2394
2408
  comma: true,
2395
2409
  allowDots: true
2396
2410
  });
2397
2411
  const unflattenedScope = unflattenScope(scope);
2398
- return Scope2.safeParse(unflattenedScope)?.data;
2412
+ const result = Scope2.safeParse(unflattenedScope)?.data;
2413
+ decodedScopeCache.set(encodedScope, result);
2414
+ return result;
2399
2415
  };
2400
2416
  var DEFAULT_SCOPE_OPTIONS = {
2401
2417
  placeOfEvent: JurisdictionFilter.enum.all,
2402
- accessLevel: JurisdictionFilter.enum.all
2418
+ accessLevel: JurisdictionFilter.enum.all,
2419
+ notifiedIn: JurisdictionFilter.enum.all,
2420
+ declaredIn: JurisdictionFilter.enum.all,
2421
+ registeredIn: JurisdictionFilter.enum.all
2403
2422
  };
2404
2423
 
2405
2424
  // ../commons/src/scopes.deprecated.do-not-use.ts
2406
- var z4 = __toESM(require("zod/v4"));
2407
2425
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2408
2426
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2409
2427
  var SearchScope = z4.object({
@@ -2637,6 +2655,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2637
2655
  }
2638
2656
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2639
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
+ }
2640
2726
 
2641
2727
  // src/migrations/v2.0/migrate-scopes.ts
2642
2728
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2674,57 +2760,65 @@ function resolveLegacyScopeFromElement(element) {
2674
2760
  }
2675
2761
  function migrateScopesArrays(rolesFilePath, project) {
2676
2762
  const sourceFile = project.getSourceFile(rolesFilePath);
2677
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2763
+ if (!sourceFile) {
2764
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2765
+ }
2678
2766
  let migratedCount = 0;
2679
2767
  let removedCount = 0;
2768
+ let mergedCount = 0;
2680
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);
2681
2771
  for (const scopesProp of scopesProperties) {
2682
2772
  const initializer = scopesProp.getInitializer();
2683
2773
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2684
- const elements = initializer.getElements();
2685
- for (let index = elements.length - 1; index >= 0; index--) {
2686
- const element = elements[index];
2687
- 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()) {
2688
2778
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2689
2779
  if (scopeKey && !(scopeKey in SCOPES)) {
2690
2780
  console.warn(
2691
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2781
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2692
2782
  );
2693
- initializer.removeElement(index);
2694
2783
  removedCount++;
2784
+ anyChange = true;
2695
2785
  continue;
2696
2786
  }
2697
2787
  const legacyScope = resolveLegacyScopeFromElement(element);
2698
2788
  if (!legacyScope) {
2699
2789
  console.warn(
2700
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2790
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2701
2791
  );
2792
+ rawTexts.push(element.getText());
2702
2793
  continue;
2703
2794
  }
2704
- try {
2705
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2706
- const scope = decodeScope(migratedScope);
2707
- if (!scope) {
2708
- console.warn(
2709
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2710
- );
2711
- continue;
2712
- }
2713
- element.replaceWithText(JSON.stringify(scope));
2714
- migratedCount++;
2715
- } catch (error) {
2716
- console.warn(
2717
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2718
- );
2719
- }
2795
+ legacyStrings.push(legacyScope);
2796
+ anyChange = true;
2720
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(", ")}]`);
2721
2815
  }
2722
2816
  if (removedCount > 0) {
2723
2817
  console.log(
2724
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2818
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2725
2819
  );
2726
2820
  }
2727
- return { migratedCount, removedCount };
2821
+ return { migratedCount, removedCount, mergedCount };
2728
2822
  }
2729
2823
  function ensureScopesHelpersImport(rolesFilePath, project) {
2730
2824
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2859,7 +2953,7 @@ async function main11() {
2859
2953
  return;
2860
2954
  }
2861
2955
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2862
- const { migratedCount, removedCount } = migrateScopesArrays(
2956
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2863
2957
  rolesFilePath,
2864
2958
  project
2865
2959
  );
@@ -2878,7 +2972,7 @@ async function main11() {
2878
2972
  }
2879
2973
  await sourceFile.save();
2880
2974
  console.log(
2881
- `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." : "."}`
2882
2976
  );
2883
2977
  }
2884
2978
 
@@ -3684,6 +3778,10 @@ var ACTION_PROPERTY_NAME2 = "action";
3684
3778
  var CONDITIONALS_PROPERTY_NAME = "conditionals";
3685
3779
  var TYPE_PROPERTY_NAME7 = "type";
3686
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} }`;
3687
3785
  var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
3688
3786
  "READ",
3689
3787
  "DELETE",
@@ -3731,91 +3829,137 @@ function isUnsupportedActionType(action) {
3731
3829
  }
3732
3830
  return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
3733
3831
  }
3734
- function migrateWorkqueueActions(workqueue, relPath) {
3735
- const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
3736
- if (!actionsProperty || !import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
3737
- return 0;
3738
- }
3739
- const actionsInitializer = actionsProperty.getInitializer();
3740
- if (!actionsInitializer || !import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
3741
- 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
+ }
3742
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) {
3743
3861
  const workqueueLabel = getWorkqueueLabel(workqueue);
3744
- const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3745
- if (existingActionProperty) {
3746
- if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
3747
- const existingActionInitializer = existingActionProperty.getInitializer();
3748
- if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
3749
- const conditionalsProperty2 = existingActionInitializer.getProperty(
3750
- 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)
3751
3891
  );
3752
- if (conditionalsProperty2) {
3753
- conditionalsProperty2.remove();
3892
+ if (actionCandidates.length === 0) {
3893
+ actionsProperty.remove();
3754
3894
  console.log(
3755
- ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3895
+ ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3756
3896
  );
3757
- }
3758
- if (isUnsupportedActionType(existingActionInitializer)) {
3759
- existingActionProperty.remove();
3760
- console.log(
3761
- ` [${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
3762
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
+ }
3763
3932
  }
3764
3933
  }
3765
3934
  }
3766
- actionsProperty.remove();
3767
- console.log(
3768
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3769
- );
3770
- return 1;
3771
3935
  }
3772
- const actionCandidates = actionsInitializer.getElements().filter(
3773
- (element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
3774
- );
3775
- if (actionCandidates.length === 0) {
3776
- actionsProperty.remove();
3777
- console.log(
3778
- ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3779
- );
3780
- return 1;
3781
- }
3782
- if (actionCandidates.length > 1) {
3783
- const droppedCount = actionCandidates.length - 1;
3784
- console.warn(
3785
- ` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
3786
- );
3787
- }
3788
- const conditionalsProperty = actionCandidates[0].getProperty(
3789
- 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
3790
3945
  );
3791
- if (conditionalsProperty) {
3792
- conditionalsProperty.remove();
3793
- console.log(
3794
- ` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
3795
- );
3796
- }
3797
- if (isUnsupportedActionType(actionCandidates[0])) {
3798
- actionsProperty.remove();
3799
- console.log(
3800
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
3801
- );
3802
- 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;
3803
3952
  }
3804
- const firstActionText = actionCandidates[0].getText();
3805
- workqueue.addPropertyAssignment({
3806
- name: ACTION_PROPERTY_NAME2,
3807
- initializer: firstActionText
3953
+ sourceFile.addImportDeclaration({
3954
+ moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
3955
+ namedImports: [ACTION_TYPE_IMPORT_NAME]
3808
3956
  });
3809
- actionsProperty.remove();
3810
- console.log(
3811
- ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3812
- );
3813
- return 1;
3814
3957
  }
3815
3958
  function processFile13(filePath, project) {
3816
3959
  const sourceFile = project.getSourceFile(filePath);
3817
3960
  if (!sourceFile) return 0;
3818
3961
  let migratedWorkqueues = 0;
3962
+ let needsActionTypeImport = false;
3819
3963
  const relPath = import_path18.default.relative(process.cwd(), filePath);
3820
3964
  const callExpressions = sourceFile.getDescendantsOfKind(
3821
3965
  import_ts_morph17.SyntaxKind.CallExpression
@@ -3831,9 +3975,14 @@ function processFile13(filePath, project) {
3831
3975
  if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
3832
3976
  for (const element of workqueuesArg.getElements()) {
3833
3977
  if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
3834
- migratedWorkqueues += migrateWorkqueueActions(element, relPath);
3978
+ const result = migrateWorkqueueActions(element, relPath);
3979
+ if (result.changed) migratedWorkqueues++;
3980
+ if (result.usedReadFallback) needsActionTypeImport = true;
3835
3981
  }
3836
3982
  }
3983
+ if (needsActionTypeImport) {
3984
+ ensureActionTypeImport(sourceFile);
3985
+ }
3837
3986
  return migratedWorkqueues;
3838
3987
  }
3839
3988
  async function main18() {
@@ -4168,7 +4317,7 @@ Saved ${handlerRelPath}.`);
4168
4317
  // src/migrations/v2.0/checkout-upstream-files.ts
4169
4318
  var import_child_process = require("child_process");
4170
4319
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4171
- var UPSTREAM_BRANCH = "develop";
4320
+ var UPSTREAM_BRANCH = "release/2.0.0";
4172
4321
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4173
4322
  var FILES_TO_CHECKOUT = [
4174
4323
  "src/analytics/analytics.ts",
@@ -4707,9 +4856,9 @@ var import_path24 = require("path");
4707
4856
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4708
4857
  var INFRASTRUCTURE_DIR = "infrastructure";
4709
4858
  var BASE_BRANCH = "release-v1.9";
4710
- function gitShowBytes(ref, path23) {
4859
+ function gitShowBytes(ref, path24) {
4711
4860
  try {
4712
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4861
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
4713
4862
  cwd: process.cwd(),
4714
4863
  stdio: ["ignore", "pipe", "pipe"]
4715
4864
  });
@@ -4718,9 +4867,13 @@ function gitShowBytes(ref, path23) {
4718
4867
  return null;
4719
4868
  }
4720
4869
  }
4721
- 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(", ");
4722
4875
  console.log(
4723
- `Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4876
+ `Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4724
4877
  `
4725
4878
  );
4726
4879
  assertIsGitRepo();
@@ -4735,20 +4888,12 @@ async function main25() {
4735
4888
  const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
4736
4889
  const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
4737
4890
  const upstreamFiles = runGit(
4738
- [
4739
- "ls-tree",
4740
- "-r",
4741
- "--name-only",
4742
- "-z",
4743
- ref,
4744
- "--",
4745
- `${INFRASTRUCTURE_DIR}/`
4746
- ],
4891
+ ["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
4747
4892
  { silent: true }
4748
4893
  ).split("\0").filter(Boolean);
4749
4894
  if (upstreamFiles.length === 0) {
4750
4895
  console.log(
4751
- ` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
4896
+ ` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
4752
4897
  );
4753
4898
  return;
4754
4899
  }
@@ -4823,7 +4968,9 @@ async function main25() {
4823
4968
  var import_fs6 = require("fs");
4824
4969
  var import_path25 = require("path");
4825
4970
  var INFRASTRUCTURE_DIR2 = "infrastructure";
4826
- async function main26() {
4971
+ async function main26({
4972
+ keep = []
4973
+ } = {}) {
4827
4974
  const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
4828
4975
  if (!(0, import_fs6.existsSync)(fullPath)) {
4829
4976
  console.log(
@@ -4831,24 +4978,152 @@ async function main26() {
4831
4978
  );
4832
4979
  return;
4833
4980
  }
4834
- console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4835
- `);
4836
4981
  assertIsGitRepo();
4837
- runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4838
- 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
5091
+ });
5092
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
5093
+ const filePath = sf.getFilePath();
5094
+ return filePath.includes("/src/") && !filePath.includes("/node_modules/");
4839
5095
  });
4840
- console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`);
4841
- if ((0, import_fs6.existsSync)(fullPath)) {
4842
- (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4843
- console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`);
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)}`);
4844
5118
  }
4845
5119
  console.log(
4846
5120
  `
4847
- Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5121
+ Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
4848
5122
  );
4849
5123
  }
4850
5124
 
4851
5125
  // src/migrations/v2.0/index.ts
5126
+ var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4852
5127
  async function runUpgrade(dockerSwarm) {
4853
5128
  await main18();
4854
5129
  await main();
@@ -4873,10 +5148,12 @@ async function runUpgrade(dockerSwarm) {
4873
5148
  await main22();
4874
5149
  await main23();
4875
5150
  await main24();
5151
+ await main27();
4876
5152
  await main17();
4877
5153
  if (dockerSwarm) {
4878
5154
  await main25();
4879
5155
  } else {
4880
- await main26();
5156
+ await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
5157
+ await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
4881
5158
  }
4882
5159
  }