@opencrvs/toolkit 2.0.0-rc.c14c17b → 2.0.0-rc.c174741

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 (37) hide show
  1. package/dist/application-config/index.js +17 -23
  2. package/dist/cli.js +394 -130
  3. package/dist/commons/api/router.d.ts +2901 -163
  4. package/dist/commons/conditionals/conditionals.d.ts +3 -3
  5. package/dist/commons/conditionals/validate.d.ts +1 -0
  6. package/dist/commons/events/ActionInput.d.ts +108 -0
  7. package/dist/commons/events/Draft.d.ts +3 -0
  8. package/dist/commons/events/FieldConfig.d.ts +5 -0
  9. package/dist/commons/events/utils.d.ts +1 -1
  10. package/dist/conditionals/index.js +5 -3
  11. package/dist/events/index.js +33 -37
  12. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  13. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  14. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  15. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  16. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  17. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  18. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
  19. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
  20. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
  21. package/dist/migrations/v2.0/index.d.ts +5 -3
  22. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  23. package/dist/migrations/v2.0/index.js +392 -128
  24. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  25. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  26. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  27. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  28. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  29. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  30. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  31. package/dist/notification/index.js +20 -23
  32. package/dist/scopes/index.d.ts +6 -1
  33. package/dist/scopes/index.js +5 -3
  34. package/opencrvs-toolkit-2.0.0-rc.c174741.tgz +0 -0
  35. package/package.json +1 -1
  36. package/tsconfig.tsbuildinfo +1 -1
  37. package/opencrvs-toolkit-2.0.0-rc.c14c17b.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
  ]);
@@ -2391,7 +2397,6 @@ var DEFAULT_SCOPE_OPTIONS = {
2391
2397
  };
2392
2398
 
2393
2399
  // ../commons/src/scopes.deprecated.do-not-use.ts
2394
- var z4 = __toESM(require("zod/v4"));
2395
2400
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2396
2401
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2397
2402
  var SearchScope = z4.object({
@@ -2625,6 +2630,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2625
2630
  }
2626
2631
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2627
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
+ }
2628
2701
 
2629
2702
  // src/migrations/v2.0/migrate-scopes.ts
2630
2703
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2662,57 +2735,65 @@ function resolveLegacyScopeFromElement(element) {
2662
2735
  }
2663
2736
  function migrateScopesArrays(rolesFilePath, project) {
2664
2737
  const sourceFile = project.getSourceFile(rolesFilePath);
2665
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2738
+ if (!sourceFile) {
2739
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2740
+ }
2666
2741
  let migratedCount = 0;
2667
2742
  let removedCount = 0;
2743
+ let mergedCount = 0;
2668
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);
2669
2746
  for (const scopesProp of scopesProperties) {
2670
2747
  const initializer = scopesProp.getInitializer();
2671
2748
  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;
2749
+ const rawTexts = [];
2750
+ const legacyStrings = [];
2751
+ let anyChange = false;
2752
+ for (const element of initializer.getElements()) {
2676
2753
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2677
2754
  if (scopeKey && !(scopeKey in SCOPES)) {
2678
2755
  console.warn(
2679
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2756
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2680
2757
  );
2681
- initializer.removeElement(index);
2682
2758
  removedCount++;
2759
+ anyChange = true;
2683
2760
  continue;
2684
2761
  }
2685
2762
  const legacyScope = resolveLegacyScopeFromElement(element);
2686
2763
  if (!legacyScope) {
2687
2764
  console.warn(
2688
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2765
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2689
2766
  );
2767
+ rawTexts.push(element.getText());
2690
2768
  continue;
2691
2769
  }
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
- }
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
+ );
2708
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(", ")}]`);
2709
2790
  }
2710
2791
  if (removedCount > 0) {
2711
2792
  console.log(
2712
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2793
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2713
2794
  );
2714
2795
  }
2715
- return { migratedCount, removedCount };
2796
+ return { migratedCount, removedCount, mergedCount };
2716
2797
  }
2717
2798
  function ensureScopesHelpersImport(rolesFilePath, project) {
2718
2799
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2847,7 +2928,7 @@ async function main11() {
2847
2928
  return;
2848
2929
  }
2849
2930
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2850
- const { migratedCount, removedCount } = migrateScopesArrays(
2931
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2851
2932
  rolesFilePath,
2852
2933
  project
2853
2934
  );
@@ -2866,7 +2947,7 @@ async function main11() {
2866
2947
  }
2867
2948
  await sourceFile.save();
2868
2949
  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." : "."}`
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." : "."}`
2870
2951
  );
2871
2952
  }
2872
2953
 
@@ -3672,6 +3753,10 @@ var ACTION_PROPERTY_NAME2 = "action";
3672
3753
  var CONDITIONALS_PROPERTY_NAME = "conditionals";
3673
3754
  var TYPE_PROPERTY_NAME7 = "type";
3674
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} }`;
3675
3760
  var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
3676
3761
  "READ",
3677
3762
  "DELETE",
@@ -3719,91 +3804,137 @@ function isUnsupportedActionType(action) {
3719
3804
  }
3720
3805
  return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
3721
3806
  }
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;
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
+ }
3730
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) {
3731
3836
  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
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)
3739
3866
  );
3740
- if (conditionalsProperty2) {
3741
- conditionalsProperty2.remove();
3867
+ if (actionCandidates.length === 0) {
3868
+ actionsProperty.remove();
3742
3869
  console.log(
3743
- ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3870
+ ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3744
3871
  );
3745
- }
3746
- if (isUnsupportedActionType(existingActionInitializer)) {
3747
- existingActionProperty.remove();
3748
- console.log(
3749
- ` [${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
3750
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
+ }
3751
3907
  }
3752
3908
  }
3753
3909
  }
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
3910
  }
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
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
3778
3920
  );
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;
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;
3791
3927
  }
3792
- const firstActionText = actionCandidates[0].getText();
3793
- workqueue.addPropertyAssignment({
3794
- name: ACTION_PROPERTY_NAME2,
3795
- initializer: firstActionText
3928
+ sourceFile.addImportDeclaration({
3929
+ moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
3930
+ namedImports: [ACTION_TYPE_IMPORT_NAME]
3796
3931
  });
3797
- actionsProperty.remove();
3798
- console.log(
3799
- ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3800
- );
3801
- return 1;
3802
3932
  }
3803
3933
  function processFile13(filePath, project) {
3804
3934
  const sourceFile = project.getSourceFile(filePath);
3805
3935
  if (!sourceFile) return 0;
3806
3936
  let migratedWorkqueues = 0;
3937
+ let needsActionTypeImport = false;
3807
3938
  const relPath = import_path18.default.relative(process.cwd(), filePath);
3808
3939
  const callExpressions = sourceFile.getDescendantsOfKind(
3809
3940
  import_ts_morph17.SyntaxKind.CallExpression
@@ -3819,9 +3950,14 @@ function processFile13(filePath, project) {
3819
3950
  if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
3820
3951
  for (const element of workqueuesArg.getElements()) {
3821
3952
  if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
3822
- migratedWorkqueues += migrateWorkqueueActions(element, relPath);
3953
+ const result = migrateWorkqueueActions(element, relPath);
3954
+ if (result.changed) migratedWorkqueues++;
3955
+ if (result.usedReadFallback) needsActionTypeImport = true;
3823
3956
  }
3824
3957
  }
3958
+ if (needsActionTypeImport) {
3959
+ ensureActionTypeImport(sourceFile);
3960
+ }
3825
3961
  return migratedWorkqueues;
3826
3962
  }
3827
3963
  async function main18() {
@@ -4156,7 +4292,7 @@ Saved ${handlerRelPath}.`);
4156
4292
  // src/migrations/v2.0/checkout-upstream-files.ts
4157
4293
  var import_child_process = require("child_process");
4158
4294
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4159
- var UPSTREAM_BRANCH = "develop";
4295
+ var UPSTREAM_BRANCH = "release-v2.0.0";
4160
4296
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4161
4297
  var FILES_TO_CHECKOUT = [
4162
4298
  "src/analytics/analytics.ts",
@@ -4695,9 +4831,9 @@ var import_path24 = require("path");
4695
4831
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4696
4832
  var INFRASTRUCTURE_DIR = "infrastructure";
4697
4833
  var BASE_BRANCH = "release-v1.9";
4698
- function gitShowBytes(ref, path23) {
4834
+ function gitShowBytes(ref, path24) {
4699
4835
  try {
4700
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4836
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
4701
4837
  cwd: process.cwd(),
4702
4838
  stdio: ["ignore", "pipe", "pipe"]
4703
4839
  });
@@ -4706,9 +4842,13 @@ function gitShowBytes(ref, path23) {
4706
4842
  return null;
4707
4843
  }
4708
4844
  }
4709
- 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(", ");
4710
4850
  console.log(
4711
- `Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4851
+ `Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4712
4852
  `
4713
4853
  );
4714
4854
  assertIsGitRepo();
@@ -4723,20 +4863,12 @@ async function main25() {
4723
4863
  const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
4724
4864
  const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
4725
4865
  const upstreamFiles = runGit(
4726
- [
4727
- "ls-tree",
4728
- "-r",
4729
- "--name-only",
4730
- "-z",
4731
- ref,
4732
- "--",
4733
- `${INFRASTRUCTURE_DIR}/`
4734
- ],
4866
+ ["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
4735
4867
  { silent: true }
4736
4868
  ).split("\0").filter(Boolean);
4737
4869
  if (upstreamFiles.length === 0) {
4738
4870
  console.log(
4739
- ` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
4871
+ ` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
4740
4872
  );
4741
4873
  return;
4742
4874
  }
@@ -4811,7 +4943,9 @@ async function main25() {
4811
4943
  var import_fs6 = require("fs");
4812
4944
  var import_path25 = require("path");
4813
4945
  var INFRASTRUCTURE_DIR2 = "infrastructure";
4814
- async function main26() {
4946
+ async function main26({
4947
+ keep = []
4948
+ } = {}) {
4815
4949
  const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
4816
4950
  if (!(0, import_fs6.existsSync)(fullPath)) {
4817
4951
  console.log(
@@ -4819,24 +4953,152 @@ async function main26() {
4819
4953
  );
4820
4954
  return;
4821
4955
  }
4822
- console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4823
- `);
4824
4956
  assertIsGitRepo();
4825
- runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4826
- silent: true
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
+ );
5005
+ }
5006
+ console.log(
5007
+ `
5008
+ Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5009
+ );
5010
+ }
5011
+
5012
+ // src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
5013
+ var import_ts_morph22 = require("ts-morph");
5014
+ var import_path26 = __toESM(require("path"));
5015
+ var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
5016
+ var ACTION_PARAMETER_NAME = "action";
5017
+ var OLD_TYPE = "ActionInput";
5018
+ var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
5019
+ function isAcceptRequestedRegistrationParameter(parameter) {
5020
+ const functionDeclaration = parameter.getFirstAncestorByKind(
5021
+ import_ts_morph22.SyntaxKind.FunctionDeclaration
5022
+ );
5023
+ if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
5024
+ return true;
5025
+ }
5026
+ const arrowFunction = parameter.getFirstAncestorByKind(
5027
+ import_ts_morph22.SyntaxKind.ArrowFunction
5028
+ );
5029
+ const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
5030
+ import_ts_morph22.SyntaxKind.VariableDeclaration
5031
+ );
5032
+ return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
5033
+ }
5034
+ function processFile14(filePath, project) {
5035
+ const sourceFile = project.getSourceFile(filePath);
5036
+ if (!sourceFile) return 0;
5037
+ let updatedCount = 0;
5038
+ for (const parameter of sourceFile.getDescendantsOfKind(
5039
+ import_ts_morph22.SyntaxKind.Parameter
5040
+ )) {
5041
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
5042
+ continue;
5043
+ }
5044
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
5045
+ continue;
5046
+ }
5047
+ const typeNode = parameter.getTypeNode();
5048
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
5049
+ continue;
5050
+ }
5051
+ parameter.setType(NEW_TYPE);
5052
+ updatedCount++;
5053
+ console.log(
5054
+ ` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
5055
+ );
5056
+ }
5057
+ return updatedCount;
5058
+ }
5059
+ async function main27() {
5060
+ const srcDir = import_path26.default.join(process.cwd(), "src");
5061
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
5062
+ `);
5063
+ const project = new import_ts_morph22.Project({
5064
+ tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
5065
+ skipAddingFilesFromTsConfig: false
4827
5066
  });
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}/'.`);
5067
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
5068
+ const filePath = sf.getFilePath();
5069
+ return filePath.includes("/src/") && !filePath.includes("/node_modules/");
5070
+ });
5071
+ let totalUpdated = 0;
5072
+ const modifiedFiles = [];
5073
+ for (const sourceFile of sourceFiles) {
5074
+ const filePath = sourceFile.getFilePath();
5075
+ const updated = processFile14(filePath, project);
5076
+ if (updated > 0) {
5077
+ totalUpdated += updated;
5078
+ modifiedFiles.push(filePath);
5079
+ }
5080
+ }
5081
+ if (modifiedFiles.length === 0) {
5082
+ console.log(
5083
+ `No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
5084
+ );
5085
+ return;
5086
+ }
5087
+ console.log(`
5088
+ Saving ${modifiedFiles.length} modified file(s)...`);
5089
+ for (const filePath of modifiedFiles) {
5090
+ const sourceFile = project.getSourceFileOrThrow(filePath);
5091
+ await sourceFile.save();
5092
+ console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
4832
5093
  }
4833
5094
  console.log(
4834
5095
  `
4835
- Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5096
+ Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
4836
5097
  );
4837
5098
  }
4838
5099
 
4839
5100
  // src/migrations/v2.0/index.ts
5101
+ var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4840
5102
  async function runUpgrade(dockerSwarm) {
4841
5103
  await main18();
4842
5104
  await main();
@@ -4861,11 +5123,13 @@ async function runUpgrade(dockerSwarm) {
4861
5123
  await main22();
4862
5124
  await main23();
4863
5125
  await main24();
5126
+ await main27();
4864
5127
  await main17();
4865
5128
  if (dockerSwarm) {
4866
5129
  await main25();
4867
5130
  } else {
4868
- await main26();
5131
+ await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
5132
+ await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
4869
5133
  }
4870
5134
  }
4871
5135
 
@@ -4894,7 +5158,7 @@ Options:
4894
5158
  'infrastructure/' directory is deleted (default).
4895
5159
  -h, --help Show this message.
4896
5160
  `.trim();
4897
- function main27() {
5161
+ function main28() {
4898
5162
  const command = args[0];
4899
5163
  if (!command || command === "--help" || command === "-h") {
4900
5164
  console.log(USAGE);
@@ -4969,4 +5233,4 @@ function handleCheckTranslations() {
4969
5233
  console.warn("This command is not implemented yet!");
4970
5234
  process.exit(1);
4971
5235
  }
4972
- main27();
5236
+ main28();