@opencrvs/toolkit 2.0.0-rc.f606fc8 → 2.0.0-rc.f6aaa31

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 (47) 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 +212 -84
  4. package/dist/cli.js +397 -131
  5. package/dist/commons/api/router.d.ts +3322 -268
  6. package/dist/commons/conditionals/conditionals.d.ts +3 -3
  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/FieldConfig.d.ts +5 -0
  13. package/dist/commons/events/WorkqueueConfig.d.ts +150 -150
  14. package/dist/commons/events/locations.d.ts +21 -0
  15. package/dist/commons/events/mocks.test.utils.d.ts +19 -0
  16. package/dist/commons/events/scopes.d.ts +24 -1
  17. package/dist/commons/events/state/index.d.ts +0 -4
  18. package/dist/commons/events/state/utils.d.ts +0 -2
  19. package/dist/commons/events/utils.d.ts +1 -1
  20. package/dist/conditionals/index.js +8 -4
  21. package/dist/events/index.js +294 -132
  22. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  23. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  24. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  25. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  26. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  27. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  28. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
  29. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
  30. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
  31. package/dist/migrations/v2.0/index.d.ts +5 -3
  32. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  33. package/dist/migrations/v2.0/index.js +395 -129
  34. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  35. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  36. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  37. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  38. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  39. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  40. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  41. package/dist/notification/index.js +226 -102
  42. package/dist/scopes/index.d.ts +6 -1
  43. package/dist/scopes/index.js +8 -4
  44. package/opencrvs-toolkit-2.0.0-rc.f6aaa31.tgz +0 -0
  45. package/package.json +1 -1
  46. package/tsconfig.tsbuildinfo +1 -1
  47. package/opencrvs-toolkit-2.0.0-rc.f606fc8.tgz +0 -0
package/dist/cli.js CHANGED
@@ -1883,9 +1883,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
1883
1883
  }
1884
1884
  return replacedCount;
1885
1885
  }
1886
- function resolveConfigChain(configObj, path23) {
1886
+ function resolveConfigChain(configObj, path24) {
1887
1887
  let current = configObj;
1888
- for (const key of path23) {
1888
+ for (const key of path24) {
1889
1889
  if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
1890
1890
  const prop = current.getProperty(key);
1891
1891
  if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
@@ -2120,6 +2120,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
2120
2120
  var import_ts_morph11 = require("ts-morph");
2121
2121
  var import_path11 = __toESM(require("path"));
2122
2122
 
2123
+ // ../commons/src/scopes.deprecated.do-not-use.ts
2124
+ var z4 = __toESM(require("zod/v4"));
2125
+ var import_lodash = require("lodash");
2126
+
2123
2127
  // ../commons/src/scopes.ts
2124
2128
  var z3 = __toESM(require("zod/v4"));
2125
2129
  var qs = __toESM(require("qs"));
@@ -2296,12 +2300,14 @@ var SystemScopeType = z3.enum([
2296
2300
  "organisation.read-locations",
2297
2301
  "user.read",
2298
2302
  "user.create",
2299
- "user.edit"
2303
+ "user.edit",
2304
+ "user.search"
2300
2305
  ]);
2301
2306
  var UserScopeType = SystemScopeType.extract([
2302
2307
  "user.read",
2303
2308
  "user.create",
2304
- "user.edit"
2309
+ "user.edit",
2310
+ "user.search"
2305
2311
  ]);
2306
2312
  var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
2307
2313
  var UserScopeV2 = z3.discriminatedUnion("type", [
@@ -2310,7 +2316,7 @@ var UserScopeV2 = z3.discriminatedUnion("type", [
2310
2316
  options: AllUserScopeOptions.optional()
2311
2317
  }),
2312
2318
  z3.object({
2313
- type: UserScopeType.extract(["user.read"]),
2319
+ type: UserScopeType.extract(["user.read", "user.search"]),
2314
2320
  options: AccessLevelOptions.optional()
2315
2321
  })
2316
2322
  ]);
@@ -2387,11 +2393,12 @@ var decodeScope = (query) => {
2387
2393
  };
2388
2394
  var DEFAULT_SCOPE_OPTIONS = {
2389
2395
  placeOfEvent: JurisdictionFilter.enum.all,
2390
- accessLevel: JurisdictionFilter.enum.all
2396
+ accessLevel: JurisdictionFilter.enum.all,
2397
+ registeredIn: JurisdictionFilter.enum.all,
2398
+ declaredIn: JurisdictionFilter.enum.all
2391
2399
  };
2392
2400
 
2393
2401
  // ../commons/src/scopes.deprecated.do-not-use.ts
2394
- var z4 = __toESM(require("zod/v4"));
2395
2402
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2396
2403
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2397
2404
  var SearchScope = z4.object({
@@ -2625,6 +2632,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2625
2632
  }
2626
2633
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2627
2634
  };
2635
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2636
+ function isMergeableUserScopeType(type) {
2637
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2638
+ }
2639
+ function decodeLegacyScope(legacy) {
2640
+ const encoded = legacyScopeToV2Scope(legacy);
2641
+ const scope = decodeScope(encoded);
2642
+ if (!scope) {
2643
+ throw new Error(
2644
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2645
+ );
2646
+ }
2647
+ return { legacy, scope };
2648
+ }
2649
+ function groupByType(entries) {
2650
+ return entries.reduce(
2651
+ (groups, entry) => ({
2652
+ ...groups,
2653
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2654
+ }),
2655
+ {}
2656
+ );
2657
+ }
2658
+ function deduplicateEntries(entries) {
2659
+ return entries.filter(
2660
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2661
+ );
2662
+ }
2663
+ function mergeEntries(type, entries) {
2664
+ const optionsList = entries.map(
2665
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2666
+ );
2667
+ const allKeys = optionsList.flatMap(
2668
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2669
+ );
2670
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2671
+ if (conflictKey) {
2672
+ const conflicting = entries.filter(
2673
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2674
+ ).map((e) => JSON.stringify(e.legacy));
2675
+ throw new Error(
2676
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2677
+ );
2678
+ }
2679
+ const mergedOptions = Object.assign({}, ...optionsList);
2680
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2681
+ const parsed = Scope2.safeParse(merged);
2682
+ if (!parsed.success) {
2683
+ throw new Error(
2684
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2685
+ );
2686
+ }
2687
+ return parsed.data;
2688
+ }
2689
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2690
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2691
+ return Object.entries(groups).flatMap(([type, entries]) => {
2692
+ const deduped = deduplicateEntries(entries);
2693
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2694
+ if (!isMergeableUserScopeType(type)) {
2695
+ console.warn(
2696
+ `Multiple non-mergeable '${type}' scopes detected after dedup \u2014 kept all as-is. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}]. Review whether the duplication is intentional.`
2697
+ );
2698
+ return deduped.map((e) => e.scope);
2699
+ }
2700
+ return [mergeEntries(type, deduped)];
2701
+ });
2702
+ }
2628
2703
 
2629
2704
  // src/migrations/v2.0/migrate-scopes.ts
2630
2705
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2662,57 +2737,65 @@ function resolveLegacyScopeFromElement(element) {
2662
2737
  }
2663
2738
  function migrateScopesArrays(rolesFilePath, project) {
2664
2739
  const sourceFile = project.getSourceFile(rolesFilePath);
2665
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2740
+ if (!sourceFile) {
2741
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2742
+ }
2666
2743
  let migratedCount = 0;
2667
2744
  let removedCount = 0;
2745
+ let mergedCount = 0;
2668
2746
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2747
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2669
2748
  for (const scopesProp of scopesProperties) {
2670
2749
  const initializer = scopesProp.getInitializer();
2671
2750
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2672
- const elements = initializer.getElements();
2673
- for (let index = elements.length - 1; index >= 0; index--) {
2674
- const element = elements[index];
2675
- if (!import_ts_morph11.Node.isExpression(element)) continue;
2751
+ const rawTexts = [];
2752
+ const legacyStrings = [];
2753
+ let anyChange = false;
2754
+ for (const element of initializer.getElements()) {
2676
2755
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2677
2756
  if (scopeKey && !(scopeKey in SCOPES)) {
2678
2757
  console.warn(
2679
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2758
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2680
2759
  );
2681
- initializer.removeElement(index);
2682
2760
  removedCount++;
2761
+ anyChange = true;
2683
2762
  continue;
2684
2763
  }
2685
2764
  const legacyScope = resolveLegacyScopeFromElement(element);
2686
2765
  if (!legacyScope) {
2687
2766
  console.warn(
2688
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2767
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2689
2768
  );
2769
+ rawTexts.push(element.getText());
2690
2770
  continue;
2691
2771
  }
2692
- try {
2693
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2694
- const scope = decodeScope(migratedScope);
2695
- if (!scope) {
2696
- console.warn(
2697
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2698
- );
2699
- continue;
2700
- }
2701
- element.replaceWithText(JSON.stringify(scope));
2702
- migratedCount++;
2703
- } catch (error) {
2704
- console.warn(
2705
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2706
- );
2707
- }
2772
+ legacyStrings.push(legacyScope);
2773
+ anyChange = true;
2774
+ }
2775
+ if (!anyChange) continue;
2776
+ let mergedScopes;
2777
+ try {
2778
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2779
+ } catch (error) {
2780
+ throw new Error(
2781
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2782
+ { cause: error }
2783
+ );
2708
2784
  }
2785
+ migratedCount += legacyStrings.length;
2786
+ mergedCount += legacyStrings.length - mergedScopes.length;
2787
+ const outputElements = [
2788
+ ...rawTexts,
2789
+ ...mergedScopes.map((s) => JSON.stringify(s))
2790
+ ];
2791
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2709
2792
  }
2710
2793
  if (removedCount > 0) {
2711
2794
  console.log(
2712
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2795
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2713
2796
  );
2714
2797
  }
2715
- return { migratedCount, removedCount };
2798
+ return { migratedCount, removedCount, mergedCount };
2716
2799
  }
2717
2800
  function ensureScopesHelpersImport(rolesFilePath, project) {
2718
2801
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2847,7 +2930,7 @@ async function main11() {
2847
2930
  return;
2848
2931
  }
2849
2932
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2850
- const { migratedCount, removedCount } = migrateScopesArrays(
2933
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2851
2934
  rolesFilePath,
2852
2935
  project
2853
2936
  );
@@ -2866,7 +2949,7 @@ async function main11() {
2866
2949
  }
2867
2950
  await sourceFile.save();
2868
2951
  console.log(
2869
- `Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2952
+ `Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
2870
2953
  );
2871
2954
  }
2872
2955
 
@@ -3672,6 +3755,10 @@ var ACTION_PROPERTY_NAME2 = "action";
3672
3755
  var CONDITIONALS_PROPERTY_NAME = "conditionals";
3673
3756
  var TYPE_PROPERTY_NAME7 = "type";
3674
3757
  var SLUG_PROPERTY_NAME = "slug";
3758
+ var READ_ACTION_TYPE = "READ";
3759
+ var ACTION_TYPE_IMPORT_NAME = "ActionType";
3760
+ var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
3761
+ var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
3675
3762
  var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
3676
3763
  "READ",
3677
3764
  "DELETE",
@@ -3719,91 +3806,137 @@ function isUnsupportedActionType(action) {
3719
3806
  }
3720
3807
  return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
3721
3808
  }
3722
- function migrateWorkqueueActions(workqueue, relPath) {
3723
- const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
3724
- if (!actionsProperty || !import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
3725
- return 0;
3726
- }
3727
- const actionsInitializer = actionsProperty.getInitializer();
3728
- if (!actionsInitializer || !import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
3729
- return 0;
3809
+ function ensureValidAction(workqueue, relPath) {
3810
+ const workqueueLabel = getWorkqueueLabel(workqueue);
3811
+ const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3812
+ if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
3813
+ const initializer = actionProperty.getInitializer();
3814
+ if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
3815
+ if (!isUnsupportedActionType(initializer)) {
3816
+ return { changed: false, usedReadFallback: false };
3817
+ }
3818
+ actionProperty.set({
3819
+ name: ACTION_PROPERTY_NAME2,
3820
+ initializer: READ_ACTION_FALLBACK_INITIALIZER
3821
+ });
3822
+ console.log(
3823
+ ` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
3824
+ );
3825
+ return { changed: true, usedReadFallback: true };
3826
+ }
3730
3827
  }
3828
+ workqueue.addPropertyAssignment({
3829
+ name: ACTION_PROPERTY_NAME2,
3830
+ initializer: READ_ACTION_FALLBACK_INITIALIZER
3831
+ });
3832
+ console.log(
3833
+ ` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
3834
+ );
3835
+ return { changed: true, usedReadFallback: true };
3836
+ }
3837
+ function migrateWorkqueueActions(workqueue, relPath) {
3731
3838
  const workqueueLabel = getWorkqueueLabel(workqueue);
3732
- const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3733
- if (existingActionProperty) {
3734
- if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
3735
- const existingActionInitializer = existingActionProperty.getInitializer();
3736
- if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
3737
- const conditionalsProperty2 = existingActionInitializer.getProperty(
3738
- CONDITIONALS_PROPERTY_NAME
3839
+ const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
3840
+ let actionsArrayMigrated = false;
3841
+ if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
3842
+ const actionsInitializer = actionsProperty.getInitializer();
3843
+ if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
3844
+ const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3845
+ if (existingActionProperty) {
3846
+ if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
3847
+ const existingActionInitializer = existingActionProperty.getInitializer();
3848
+ if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
3849
+ const conditionalsProperty = existingActionInitializer.getProperty(
3850
+ CONDITIONALS_PROPERTY_NAME
3851
+ );
3852
+ if (conditionalsProperty) {
3853
+ conditionalsProperty.remove();
3854
+ console.log(
3855
+ ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3856
+ );
3857
+ }
3858
+ }
3859
+ }
3860
+ actionsProperty.remove();
3861
+ console.log(
3862
+ ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3863
+ );
3864
+ actionsArrayMigrated = true;
3865
+ } else {
3866
+ const actionCandidates = actionsInitializer.getElements().filter(
3867
+ (element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
3739
3868
  );
3740
- if (conditionalsProperty2) {
3741
- conditionalsProperty2.remove();
3869
+ if (actionCandidates.length === 0) {
3870
+ actionsProperty.remove();
3742
3871
  console.log(
3743
- ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3872
+ ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3744
3873
  );
3745
- }
3746
- if (isUnsupportedActionType(existingActionInitializer)) {
3747
- existingActionProperty.remove();
3748
- console.log(
3749
- ` [${relPath}] Removed unsupported 'action' type on workqueue '${workqueueLabel}'`
3874
+ actionsArrayMigrated = true;
3875
+ } else {
3876
+ if (actionCandidates.length > 1) {
3877
+ const droppedCount = actionCandidates.length - 1;
3878
+ console.warn(
3879
+ ` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
3880
+ );
3881
+ }
3882
+ const conditionalsProperty = actionCandidates[0].getProperty(
3883
+ CONDITIONALS_PROPERTY_NAME
3750
3884
  );
3885
+ if (conditionalsProperty) {
3886
+ conditionalsProperty.remove();
3887
+ console.log(
3888
+ ` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
3889
+ );
3890
+ }
3891
+ if (isUnsupportedActionType(actionCandidates[0])) {
3892
+ actionsProperty.remove();
3893
+ console.log(
3894
+ ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
3895
+ );
3896
+ actionsArrayMigrated = true;
3897
+ } else {
3898
+ const firstActionText = actionCandidates[0].getText();
3899
+ workqueue.addPropertyAssignment({
3900
+ name: ACTION_PROPERTY_NAME2,
3901
+ initializer: firstActionText
3902
+ });
3903
+ actionsProperty.remove();
3904
+ console.log(
3905
+ ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3906
+ );
3907
+ actionsArrayMigrated = true;
3908
+ }
3751
3909
  }
3752
3910
  }
3753
3911
  }
3754
- actionsProperty.remove();
3755
- console.log(
3756
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3757
- );
3758
- return 1;
3759
- }
3760
- const actionCandidates = actionsInitializer.getElements().filter(
3761
- (element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
3762
- );
3763
- if (actionCandidates.length === 0) {
3764
- actionsProperty.remove();
3765
- console.log(
3766
- ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3767
- );
3768
- return 1;
3769
3912
  }
3770
- if (actionCandidates.length > 1) {
3771
- const droppedCount = actionCandidates.length - 1;
3772
- console.warn(
3773
- ` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
3774
- );
3775
- }
3776
- const conditionalsProperty = actionCandidates[0].getProperty(
3777
- CONDITIONALS_PROPERTY_NAME
3913
+ const fallback = ensureValidAction(workqueue, relPath);
3914
+ return {
3915
+ changed: actionsArrayMigrated || fallback.changed,
3916
+ usedReadFallback: fallback.usedReadFallback
3917
+ };
3918
+ }
3919
+ function ensureActionTypeImport(sourceFile) {
3920
+ const existingImport = sourceFile.getImportDeclaration(
3921
+ (decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
3778
3922
  );
3779
- if (conditionalsProperty) {
3780
- conditionalsProperty.remove();
3781
- console.log(
3782
- ` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
3783
- );
3784
- }
3785
- if (isUnsupportedActionType(actionCandidates[0])) {
3786
- actionsProperty.remove();
3787
- console.log(
3788
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
3789
- );
3790
- return 1;
3923
+ if (existingImport) {
3924
+ const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
3925
+ if (!alreadyImported) {
3926
+ existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
3927
+ }
3928
+ return;
3791
3929
  }
3792
- const firstActionText = actionCandidates[0].getText();
3793
- workqueue.addPropertyAssignment({
3794
- name: ACTION_PROPERTY_NAME2,
3795
- initializer: firstActionText
3930
+ sourceFile.addImportDeclaration({
3931
+ moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
3932
+ namedImports: [ACTION_TYPE_IMPORT_NAME]
3796
3933
  });
3797
- actionsProperty.remove();
3798
- console.log(
3799
- ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3800
- );
3801
- return 1;
3802
3934
  }
3803
3935
  function processFile13(filePath, project) {
3804
3936
  const sourceFile = project.getSourceFile(filePath);
3805
3937
  if (!sourceFile) return 0;
3806
3938
  let migratedWorkqueues = 0;
3939
+ let needsActionTypeImport = false;
3807
3940
  const relPath = import_path18.default.relative(process.cwd(), filePath);
3808
3941
  const callExpressions = sourceFile.getDescendantsOfKind(
3809
3942
  import_ts_morph17.SyntaxKind.CallExpression
@@ -3819,9 +3952,14 @@ function processFile13(filePath, project) {
3819
3952
  if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
3820
3953
  for (const element of workqueuesArg.getElements()) {
3821
3954
  if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
3822
- migratedWorkqueues += migrateWorkqueueActions(element, relPath);
3955
+ const result = migrateWorkqueueActions(element, relPath);
3956
+ if (result.changed) migratedWorkqueues++;
3957
+ if (result.usedReadFallback) needsActionTypeImport = true;
3823
3958
  }
3824
3959
  }
3960
+ if (needsActionTypeImport) {
3961
+ ensureActionTypeImport(sourceFile);
3962
+ }
3825
3963
  return migratedWorkqueues;
3826
3964
  }
3827
3965
  async function main18() {
@@ -4156,7 +4294,7 @@ Saved ${handlerRelPath}.`);
4156
4294
  // src/migrations/v2.0/checkout-upstream-files.ts
4157
4295
  var import_child_process = require("child_process");
4158
4296
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4159
- var UPSTREAM_BRANCH = "develop";
4297
+ var UPSTREAM_BRANCH = "release-v2.0.0";
4160
4298
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4161
4299
  var FILES_TO_CHECKOUT = [
4162
4300
  "src/analytics/analytics.ts",
@@ -4695,9 +4833,9 @@ var import_path24 = require("path");
4695
4833
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4696
4834
  var INFRASTRUCTURE_DIR = "infrastructure";
4697
4835
  var BASE_BRANCH = "release-v1.9";
4698
- function gitShowBytes(ref, path23) {
4836
+ function gitShowBytes(ref, path24) {
4699
4837
  try {
4700
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4838
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
4701
4839
  cwd: process.cwd(),
4702
4840
  stdio: ["ignore", "pipe", "pipe"]
4703
4841
  });
@@ -4706,9 +4844,13 @@ function gitShowBytes(ref, path23) {
4706
4844
  return null;
4707
4845
  }
4708
4846
  }
4709
- async function main25() {
4847
+ async function main25({
4848
+ subdirs = []
4849
+ } = {}) {
4850
+ const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
4851
+ const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
4710
4852
  console.log(
4711
- `Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4853
+ `Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4712
4854
  `
4713
4855
  );
4714
4856
  assertIsGitRepo();
@@ -4723,20 +4865,12 @@ async function main25() {
4723
4865
  const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
4724
4866
  const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
4725
4867
  const upstreamFiles = runGit(
4726
- [
4727
- "ls-tree",
4728
- "-r",
4729
- "--name-only",
4730
- "-z",
4731
- ref,
4732
- "--",
4733
- `${INFRASTRUCTURE_DIR}/`
4734
- ],
4868
+ ["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
4735
4869
  { silent: true }
4736
4870
  ).split("\0").filter(Boolean);
4737
4871
  if (upstreamFiles.length === 0) {
4738
4872
  console.log(
4739
- ` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
4873
+ ` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
4740
4874
  );
4741
4875
  return;
4742
4876
  }
@@ -4811,7 +4945,9 @@ async function main25() {
4811
4945
  var import_fs6 = require("fs");
4812
4946
  var import_path25 = require("path");
4813
4947
  var INFRASTRUCTURE_DIR2 = "infrastructure";
4814
- async function main26() {
4948
+ async function main26({
4949
+ keep = []
4950
+ } = {}) {
4815
4951
  const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
4816
4952
  if (!(0, import_fs6.existsSync)(fullPath)) {
4817
4953
  console.log(
@@ -4819,24 +4955,152 @@ async function main26() {
4819
4955
  );
4820
4956
  return;
4821
4957
  }
4822
- console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4823
- `);
4824
4958
  assertIsGitRepo();
4825
- runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4826
- silent: true
4959
+ if (keep.length === 0) {
4960
+ console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4961
+ `);
4962
+ runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4963
+ silent: true
4964
+ });
4965
+ console.log(
4966
+ ` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
4967
+ );
4968
+ if ((0, import_fs6.existsSync)(fullPath)) {
4969
+ (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4970
+ console.log(
4971
+ ` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
4972
+ );
4973
+ }
4974
+ console.log(
4975
+ `
4976
+ Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
4977
+ );
4978
+ return;
4979
+ }
4980
+ const keepSet = new Set(keep);
4981
+ console.log(
4982
+ `Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
4983
+ `
4984
+ );
4985
+ const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
4986
+ let deleted = 0;
4987
+ for (const entry of topLevelEntries) {
4988
+ if (keepSet.has(entry.name)) {
4989
+ console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
4990
+ continue;
4991
+ }
4992
+ const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
4993
+ runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
4994
+ const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
4995
+ if ((0, import_fs6.existsSync)(fullEntryPath)) {
4996
+ (0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
4997
+ }
4998
+ console.log(` Deleted '${relPath}'.`);
4999
+ deleted++;
5000
+ }
5001
+ const presentNames = new Set(topLevelEntries.map((e) => e.name));
5002
+ const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
5003
+ if (missingKeeps.length > 0) {
5004
+ console.warn(
5005
+ ` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
5006
+ );
5007
+ }
5008
+ console.log(
5009
+ `
5010
+ Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5011
+ );
5012
+ }
5013
+
5014
+ // src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
5015
+ var import_ts_morph22 = require("ts-morph");
5016
+ var import_path26 = __toESM(require("path"));
5017
+ var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
5018
+ var ACTION_PARAMETER_NAME = "action";
5019
+ var OLD_TYPE = "ActionInput";
5020
+ var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
5021
+ function isAcceptRequestedRegistrationParameter(parameter) {
5022
+ const functionDeclaration = parameter.getFirstAncestorByKind(
5023
+ import_ts_morph22.SyntaxKind.FunctionDeclaration
5024
+ );
5025
+ if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
5026
+ return true;
5027
+ }
5028
+ const arrowFunction = parameter.getFirstAncestorByKind(
5029
+ import_ts_morph22.SyntaxKind.ArrowFunction
5030
+ );
5031
+ const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
5032
+ import_ts_morph22.SyntaxKind.VariableDeclaration
5033
+ );
5034
+ return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
5035
+ }
5036
+ function processFile14(filePath, project) {
5037
+ const sourceFile = project.getSourceFile(filePath);
5038
+ if (!sourceFile) return 0;
5039
+ let updatedCount = 0;
5040
+ for (const parameter of sourceFile.getDescendantsOfKind(
5041
+ import_ts_morph22.SyntaxKind.Parameter
5042
+ )) {
5043
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
5044
+ continue;
5045
+ }
5046
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
5047
+ continue;
5048
+ }
5049
+ const typeNode = parameter.getTypeNode();
5050
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
5051
+ continue;
5052
+ }
5053
+ parameter.setType(NEW_TYPE);
5054
+ updatedCount++;
5055
+ console.log(
5056
+ ` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
5057
+ );
5058
+ }
5059
+ return updatedCount;
5060
+ }
5061
+ async function main27() {
5062
+ const srcDir = import_path26.default.join(process.cwd(), "src");
5063
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
5064
+ `);
5065
+ const project = new import_ts_morph22.Project({
5066
+ tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
5067
+ skipAddingFilesFromTsConfig: false
4827
5068
  });
4828
- console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`);
4829
- if ((0, import_fs6.existsSync)(fullPath)) {
4830
- (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4831
- console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`);
5069
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
5070
+ const filePath = sf.getFilePath();
5071
+ return filePath.includes("/src/") && !filePath.includes("/node_modules/");
5072
+ });
5073
+ let totalUpdated = 0;
5074
+ const modifiedFiles = [];
5075
+ for (const sourceFile of sourceFiles) {
5076
+ const filePath = sourceFile.getFilePath();
5077
+ const updated = processFile14(filePath, project);
5078
+ if (updated > 0) {
5079
+ totalUpdated += updated;
5080
+ modifiedFiles.push(filePath);
5081
+ }
5082
+ }
5083
+ if (modifiedFiles.length === 0) {
5084
+ console.log(
5085
+ `No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
5086
+ );
5087
+ return;
5088
+ }
5089
+ console.log(`
5090
+ Saving ${modifiedFiles.length} modified file(s)...`);
5091
+ for (const filePath of modifiedFiles) {
5092
+ const sourceFile = project.getSourceFileOrThrow(filePath);
5093
+ await sourceFile.save();
5094
+ console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
4832
5095
  }
4833
5096
  console.log(
4834
5097
  `
4835
- Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5098
+ Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
4836
5099
  );
4837
5100
  }
4838
5101
 
4839
5102
  // src/migrations/v2.0/index.ts
5103
+ var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4840
5104
  async function runUpgrade(dockerSwarm) {
4841
5105
  await main18();
4842
5106
  await main();
@@ -4861,11 +5125,13 @@ async function runUpgrade(dockerSwarm) {
4861
5125
  await main22();
4862
5126
  await main23();
4863
5127
  await main24();
5128
+ await main27();
4864
5129
  await main17();
4865
5130
  if (dockerSwarm) {
4866
5131
  await main25();
4867
5132
  } else {
4868
- await main26();
5133
+ await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
5134
+ await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
4869
5135
  }
4870
5136
  }
4871
5137
 
@@ -4894,7 +5160,7 @@ Options:
4894
5160
  'infrastructure/' directory is deleted (default).
4895
5161
  -h, --help Show this message.
4896
5162
  `.trim();
4897
- function main27() {
5163
+ function main28() {
4898
5164
  const command = args[0];
4899
5165
  if (!command || command === "--help" || command === "-h") {
4900
5166
  console.log(USAGE);
@@ -4969,4 +5235,4 @@ function handleCheckTranslations() {
4969
5235
  console.warn("This command is not implemented yet!");
4970
5236
  process.exit(1);
4971
5237
  }
4972
- main27();
5238
+ main28();