@opencrvs/toolkit 2.0.0-rc.c0c9888 → 2.0.0-rc.c22cdf5

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 (29) hide show
  1. package/dist/application-config/index.js +5 -3
  2. package/dist/cli.js +302 -125
  3. package/dist/commons/api/router.d.ts +20 -20
  4. package/dist/commons/conditionals/conditionals.d.ts +3 -3
  5. package/dist/commons/events/FieldConfig.d.ts +5 -0
  6. package/dist/conditionals/index.js +5 -3
  7. package/dist/events/index.js +5 -3
  8. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  9. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  10. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  11. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  12. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  13. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  14. package/dist/migrations/v2.0/index.d.ts +5 -3
  15. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  16. package/dist/migrations/v2.0/index.js +302 -125
  17. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  18. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  19. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  20. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  21. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  22. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  23. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  24. package/dist/notification/index.js +5 -3
  25. package/dist/scopes/index.d.ts +6 -1
  26. package/dist/scopes/index.js +5 -3
  27. package/opencrvs-toolkit-2.0.0-rc.c22cdf5.tgz +0 -0
  28. package/package.json +1 -1
  29. package/opencrvs-toolkit-2.0.0-rc.c0c9888.tgz +0 -0
@@ -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"));
@@ -2308,12 +2312,14 @@ var SystemScopeType = z3.enum([
2308
2312
  "organisation.read-locations",
2309
2313
  "user.read",
2310
2314
  "user.create",
2311
- "user.edit"
2315
+ "user.edit",
2316
+ "user.search"
2312
2317
  ]);
2313
2318
  var UserScopeType = SystemScopeType.extract([
2314
2319
  "user.read",
2315
2320
  "user.create",
2316
- "user.edit"
2321
+ "user.edit",
2322
+ "user.search"
2317
2323
  ]);
2318
2324
  var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
2319
2325
  var UserScopeV2 = z3.discriminatedUnion("type", [
@@ -2322,7 +2328,7 @@ var UserScopeV2 = z3.discriminatedUnion("type", [
2322
2328
  options: AllUserScopeOptions.optional()
2323
2329
  }),
2324
2330
  z3.object({
2325
- type: UserScopeType.extract(["user.read"]),
2331
+ type: UserScopeType.extract(["user.read", "user.search"]),
2326
2332
  options: AccessLevelOptions.optional()
2327
2333
  })
2328
2334
  ]);
@@ -2403,7 +2409,6 @@ var DEFAULT_SCOPE_OPTIONS = {
2403
2409
  };
2404
2410
 
2405
2411
  // ../commons/src/scopes.deprecated.do-not-use.ts
2406
- var z4 = __toESM(require("zod/v4"));
2407
2412
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2408
2413
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2409
2414
  var SearchScope = z4.object({
@@ -2637,6 +2642,76 @@ var legacyScopeToV2Scope = (v1Scope) => {
2637
2642
  }
2638
2643
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2639
2644
  };
2645
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2646
+ function isMergeableUserScopeType(type) {
2647
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2648
+ }
2649
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2650
+ const decoded = legacyScopes.map(
2651
+ (legacy) => {
2652
+ const encoded = legacyScopeToV2Scope(legacy);
2653
+ const scope = decodeScope(encoded);
2654
+ if (!scope) {
2655
+ throw new Error(
2656
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2657
+ );
2658
+ }
2659
+ return { legacy, scope };
2660
+ }
2661
+ );
2662
+ const groups = /* @__PURE__ */ new Map();
2663
+ for (const entry of decoded) {
2664
+ const list = groups.get(entry.scope.type) ?? [];
2665
+ list.push(entry);
2666
+ groups.set(entry.scope.type, list);
2667
+ }
2668
+ const result = [];
2669
+ for (const [type, entries] of groups) {
2670
+ const deduped = [];
2671
+ for (const entry of entries) {
2672
+ if (!deduped.some((existing) => (0, import_lodash.isEqual)(existing.scope, entry.scope))) {
2673
+ deduped.push(entry);
2674
+ }
2675
+ }
2676
+ if (deduped.length <= 1) {
2677
+ result.push(...deduped.map((e) => e.scope));
2678
+ continue;
2679
+ }
2680
+ if (!isMergeableUserScopeType(type)) {
2681
+ console.warn(
2682
+ `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.`
2683
+ );
2684
+ result.push(...deduped.map((e) => e.scope));
2685
+ continue;
2686
+ }
2687
+ const mergedOptions = {};
2688
+ const optionSources = /* @__PURE__ */ new Map();
2689
+ for (const entry of deduped) {
2690
+ const opts = "options" in entry.scope && entry.scope.options ? entry.scope.options : {};
2691
+ for (const [key, value] of Object.entries(opts)) {
2692
+ if (value === void 0) continue;
2693
+ if (key in mergedOptions) {
2694
+ const previous = optionSources.get(key) ?? [];
2695
+ const conflicting = [...previous, entry.legacy];
2696
+ throw new Error(
2697
+ `Cannot auto-merge two '${type}' scopes that both define '${key}'. Conflicting legacy scopes: [${conflicting.map((s) => JSON.stringify(s)).join(", ")}]. Resolve manually in roles.ts and re-run.`
2698
+ );
2699
+ }
2700
+ mergedOptions[key] = value;
2701
+ optionSources.set(key, [entry.legacy]);
2702
+ }
2703
+ }
2704
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2705
+ const parsed = Scope2.safeParse(merged);
2706
+ if (!parsed.success) {
2707
+ throw new Error(
2708
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2709
+ );
2710
+ }
2711
+ result.push(parsed.data);
2712
+ }
2713
+ return result;
2714
+ }
2640
2715
 
2641
2716
  // src/migrations/v2.0/migrate-scopes.ts
2642
2717
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2674,57 +2749,65 @@ function resolveLegacyScopeFromElement(element) {
2674
2749
  }
2675
2750
  function migrateScopesArrays(rolesFilePath, project) {
2676
2751
  const sourceFile = project.getSourceFile(rolesFilePath);
2677
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2752
+ if (!sourceFile) {
2753
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2754
+ }
2678
2755
  let migratedCount = 0;
2679
2756
  let removedCount = 0;
2757
+ let mergedCount = 0;
2680
2758
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2759
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2681
2760
  for (const scopesProp of scopesProperties) {
2682
2761
  const initializer = scopesProp.getInitializer();
2683
2762
  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;
2763
+ const rawTexts = [];
2764
+ const legacyStrings = [];
2765
+ let anyChange = false;
2766
+ for (const element of initializer.getElements()) {
2688
2767
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2689
2768
  if (scopeKey && !(scopeKey in SCOPES)) {
2690
2769
  console.warn(
2691
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2770
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2692
2771
  );
2693
- initializer.removeElement(index);
2694
2772
  removedCount++;
2773
+ anyChange = true;
2695
2774
  continue;
2696
2775
  }
2697
2776
  const legacyScope = resolveLegacyScopeFromElement(element);
2698
2777
  if (!legacyScope) {
2699
2778
  console.warn(
2700
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2779
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2701
2780
  );
2781
+ rawTexts.push(element.getText());
2702
2782
  continue;
2703
2783
  }
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
- }
2784
+ legacyStrings.push(legacyScope);
2785
+ anyChange = true;
2786
+ }
2787
+ if (!anyChange) continue;
2788
+ let mergedScopes;
2789
+ try {
2790
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2791
+ } catch (error) {
2792
+ throw new Error(
2793
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2794
+ { cause: error }
2795
+ );
2720
2796
  }
2797
+ migratedCount += legacyStrings.length;
2798
+ mergedCount += legacyStrings.length - mergedScopes.length;
2799
+ const outputElements = [
2800
+ ...rawTexts,
2801
+ ...mergedScopes.map((s) => JSON.stringify(s))
2802
+ ];
2803
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2721
2804
  }
2722
2805
  if (removedCount > 0) {
2723
2806
  console.log(
2724
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2807
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2725
2808
  );
2726
2809
  }
2727
- return { migratedCount, removedCount };
2810
+ return { migratedCount, removedCount, mergedCount };
2728
2811
  }
2729
2812
  function ensureScopesHelpersImport(rolesFilePath, project) {
2730
2813
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2859,7 +2942,7 @@ async function main11() {
2859
2942
  return;
2860
2943
  }
2861
2944
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2862
- const { migratedCount, removedCount } = migrateScopesArrays(
2945
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2863
2946
  rolesFilePath,
2864
2947
  project
2865
2948
  );
@@ -2878,7 +2961,7 @@ async function main11() {
2878
2961
  }
2879
2962
  await sourceFile.save();
2880
2963
  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." : "."}`
2964
+ `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
2965
  );
2883
2966
  }
2884
2967
 
@@ -3684,6 +3767,10 @@ var ACTION_PROPERTY_NAME2 = "action";
3684
3767
  var CONDITIONALS_PROPERTY_NAME = "conditionals";
3685
3768
  var TYPE_PROPERTY_NAME7 = "type";
3686
3769
  var SLUG_PROPERTY_NAME = "slug";
3770
+ var READ_ACTION_TYPE = "READ";
3771
+ var ACTION_TYPE_IMPORT_NAME = "ActionType";
3772
+ var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
3773
+ var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
3687
3774
  var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
3688
3775
  "READ",
3689
3776
  "DELETE",
@@ -3731,91 +3818,137 @@ function isUnsupportedActionType(action) {
3731
3818
  }
3732
3819
  return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
3733
3820
  }
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;
3821
+ function ensureValidAction(workqueue, relPath) {
3822
+ const workqueueLabel = getWorkqueueLabel(workqueue);
3823
+ const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3824
+ if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
3825
+ const initializer = actionProperty.getInitializer();
3826
+ if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
3827
+ if (!isUnsupportedActionType(initializer)) {
3828
+ return { changed: false, usedReadFallback: false };
3829
+ }
3830
+ actionProperty.set({
3831
+ name: ACTION_PROPERTY_NAME2,
3832
+ initializer: READ_ACTION_FALLBACK_INITIALIZER
3833
+ });
3834
+ console.log(
3835
+ ` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
3836
+ );
3837
+ return { changed: true, usedReadFallback: true };
3838
+ }
3742
3839
  }
3840
+ workqueue.addPropertyAssignment({
3841
+ name: ACTION_PROPERTY_NAME2,
3842
+ initializer: READ_ACTION_FALLBACK_INITIALIZER
3843
+ });
3844
+ console.log(
3845
+ ` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
3846
+ );
3847
+ return { changed: true, usedReadFallback: true };
3848
+ }
3849
+ function migrateWorkqueueActions(workqueue, relPath) {
3743
3850
  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
3851
+ const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
3852
+ let actionsArrayMigrated = false;
3853
+ if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
3854
+ const actionsInitializer = actionsProperty.getInitializer();
3855
+ if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
3856
+ const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
3857
+ if (existingActionProperty) {
3858
+ if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
3859
+ const existingActionInitializer = existingActionProperty.getInitializer();
3860
+ if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
3861
+ const conditionalsProperty = existingActionInitializer.getProperty(
3862
+ CONDITIONALS_PROPERTY_NAME
3863
+ );
3864
+ if (conditionalsProperty) {
3865
+ conditionalsProperty.remove();
3866
+ console.log(
3867
+ ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3868
+ );
3869
+ }
3870
+ }
3871
+ }
3872
+ actionsProperty.remove();
3873
+ console.log(
3874
+ ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3875
+ );
3876
+ actionsArrayMigrated = true;
3877
+ } else {
3878
+ const actionCandidates = actionsInitializer.getElements().filter(
3879
+ (element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
3751
3880
  );
3752
- if (conditionalsProperty2) {
3753
- conditionalsProperty2.remove();
3881
+ if (actionCandidates.length === 0) {
3882
+ actionsProperty.remove();
3754
3883
  console.log(
3755
- ` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
3884
+ ` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
3756
3885
  );
3757
- }
3758
- if (isUnsupportedActionType(existingActionInitializer)) {
3759
- existingActionProperty.remove();
3760
- console.log(
3761
- ` [${relPath}] Removed unsupported 'action' type on workqueue '${workqueueLabel}'`
3886
+ actionsArrayMigrated = true;
3887
+ } else {
3888
+ if (actionCandidates.length > 1) {
3889
+ const droppedCount = actionCandidates.length - 1;
3890
+ console.warn(
3891
+ ` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
3892
+ );
3893
+ }
3894
+ const conditionalsProperty = actionCandidates[0].getProperty(
3895
+ CONDITIONALS_PROPERTY_NAME
3762
3896
  );
3897
+ if (conditionalsProperty) {
3898
+ conditionalsProperty.remove();
3899
+ console.log(
3900
+ ` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
3901
+ );
3902
+ }
3903
+ if (isUnsupportedActionType(actionCandidates[0])) {
3904
+ actionsProperty.remove();
3905
+ console.log(
3906
+ ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
3907
+ );
3908
+ actionsArrayMigrated = true;
3909
+ } else {
3910
+ const firstActionText = actionCandidates[0].getText();
3911
+ workqueue.addPropertyAssignment({
3912
+ name: ACTION_PROPERTY_NAME2,
3913
+ initializer: firstActionText
3914
+ });
3915
+ actionsProperty.remove();
3916
+ console.log(
3917
+ ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3918
+ );
3919
+ actionsArrayMigrated = true;
3920
+ }
3763
3921
  }
3764
3922
  }
3765
3923
  }
3766
- actionsProperty.remove();
3767
- console.log(
3768
- ` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
3769
- );
3770
- return 1;
3771
- }
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
3924
  }
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
3925
+ const fallback = ensureValidAction(workqueue, relPath);
3926
+ return {
3927
+ changed: actionsArrayMigrated || fallback.changed,
3928
+ usedReadFallback: fallback.usedReadFallback
3929
+ };
3930
+ }
3931
+ function ensureActionTypeImport(sourceFile) {
3932
+ const existingImport = sourceFile.getImportDeclaration(
3933
+ (decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
3790
3934
  );
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;
3935
+ if (existingImport) {
3936
+ const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
3937
+ if (!alreadyImported) {
3938
+ existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
3939
+ }
3940
+ return;
3803
3941
  }
3804
- const firstActionText = actionCandidates[0].getText();
3805
- workqueue.addPropertyAssignment({
3806
- name: ACTION_PROPERTY_NAME2,
3807
- initializer: firstActionText
3942
+ sourceFile.addImportDeclaration({
3943
+ moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
3944
+ namedImports: [ACTION_TYPE_IMPORT_NAME]
3808
3945
  });
3809
- actionsProperty.remove();
3810
- console.log(
3811
- ` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
3812
- );
3813
- return 1;
3814
3946
  }
3815
3947
  function processFile13(filePath, project) {
3816
3948
  const sourceFile = project.getSourceFile(filePath);
3817
3949
  if (!sourceFile) return 0;
3818
3950
  let migratedWorkqueues = 0;
3951
+ let needsActionTypeImport = false;
3819
3952
  const relPath = import_path18.default.relative(process.cwd(), filePath);
3820
3953
  const callExpressions = sourceFile.getDescendantsOfKind(
3821
3954
  import_ts_morph17.SyntaxKind.CallExpression
@@ -3831,9 +3964,14 @@ function processFile13(filePath, project) {
3831
3964
  if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
3832
3965
  for (const element of workqueuesArg.getElements()) {
3833
3966
  if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
3834
- migratedWorkqueues += migrateWorkqueueActions(element, relPath);
3967
+ const result = migrateWorkqueueActions(element, relPath);
3968
+ if (result.changed) migratedWorkqueues++;
3969
+ if (result.usedReadFallback) needsActionTypeImport = true;
3835
3970
  }
3836
3971
  }
3972
+ if (needsActionTypeImport) {
3973
+ ensureActionTypeImport(sourceFile);
3974
+ }
3837
3975
  return migratedWorkqueues;
3838
3976
  }
3839
3977
  async function main18() {
@@ -4168,7 +4306,7 @@ Saved ${handlerRelPath}.`);
4168
4306
  // src/migrations/v2.0/checkout-upstream-files.ts
4169
4307
  var import_child_process = require("child_process");
4170
4308
  var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
4171
- var UPSTREAM_BRANCH = "develop";
4309
+ var UPSTREAM_BRANCH = "release-v2.0.0";
4172
4310
  var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
4173
4311
  var FILES_TO_CHECKOUT = [
4174
4312
  "src/analytics/analytics.ts",
@@ -4718,9 +4856,13 @@ function gitShowBytes(ref, path23) {
4718
4856
  return null;
4719
4857
  }
4720
4858
  }
4721
- async function main25() {
4859
+ async function main25({
4860
+ subdirs = []
4861
+ } = {}) {
4862
+ const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
4863
+ const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
4722
4864
  console.log(
4723
- `Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4865
+ `Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4724
4866
  `
4725
4867
  );
4726
4868
  assertIsGitRepo();
@@ -4735,20 +4877,12 @@ async function main25() {
4735
4877
  const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
4736
4878
  const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
4737
4879
  const upstreamFiles = runGit(
4738
- [
4739
- "ls-tree",
4740
- "-r",
4741
- "--name-only",
4742
- "-z",
4743
- ref,
4744
- "--",
4745
- `${INFRASTRUCTURE_DIR}/`
4746
- ],
4880
+ ["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
4747
4881
  { silent: true }
4748
4882
  ).split("\0").filter(Boolean);
4749
4883
  if (upstreamFiles.length === 0) {
4750
4884
  console.log(
4751
- ` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
4885
+ ` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
4752
4886
  );
4753
4887
  return;
4754
4888
  }
@@ -4823,7 +4957,9 @@ async function main25() {
4823
4957
  var import_fs6 = require("fs");
4824
4958
  var import_path25 = require("path");
4825
4959
  var INFRASTRUCTURE_DIR2 = "infrastructure";
4826
- async function main26() {
4960
+ async function main26({
4961
+ keep = []
4962
+ } = {}) {
4827
4963
  const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
4828
4964
  if (!(0, import_fs6.existsSync)(fullPath)) {
4829
4965
  console.log(
@@ -4831,24 +4967,64 @@ async function main26() {
4831
4967
  );
4832
4968
  return;
4833
4969
  }
4834
- console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4835
- `);
4836
4970
  assertIsGitRepo();
4837
- runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4838
- silent: true
4839
- });
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}/'.`);
4971
+ if (keep.length === 0) {
4972
+ console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
4973
+ `);
4974
+ runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
4975
+ silent: true
4976
+ });
4977
+ console.log(
4978
+ ` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
4979
+ );
4980
+ if ((0, import_fs6.existsSync)(fullPath)) {
4981
+ (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4982
+ console.log(
4983
+ ` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
4984
+ );
4985
+ }
4986
+ console.log(
4987
+ `
4988
+ Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
4989
+ );
4990
+ return;
4991
+ }
4992
+ const keepSet = new Set(keep);
4993
+ console.log(
4994
+ `Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
4995
+ `
4996
+ );
4997
+ const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
4998
+ let deleted = 0;
4999
+ for (const entry of topLevelEntries) {
5000
+ if (keepSet.has(entry.name)) {
5001
+ console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
5002
+ continue;
5003
+ }
5004
+ const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
5005
+ runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
5006
+ const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
5007
+ if ((0, import_fs6.existsSync)(fullEntryPath)) {
5008
+ (0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
5009
+ }
5010
+ console.log(` Deleted '${relPath}'.`);
5011
+ deleted++;
5012
+ }
5013
+ const presentNames = new Set(topLevelEntries.map((e) => e.name));
5014
+ const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
5015
+ if (missingKeeps.length > 0) {
5016
+ console.warn(
5017
+ ` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
5018
+ );
4844
5019
  }
4845
5020
  console.log(
4846
5021
  `
4847
- Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
5022
+ Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
4848
5023
  );
4849
5024
  }
4850
5025
 
4851
5026
  // src/migrations/v2.0/index.ts
5027
+ var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4852
5028
  async function runUpgrade(dockerSwarm) {
4853
5029
  await main18();
4854
5030
  await main();
@@ -4877,6 +5053,7 @@ async function runUpgrade(dockerSwarm) {
4877
5053
  if (dockerSwarm) {
4878
5054
  await main25();
4879
5055
  } else {
4880
- await main26();
5056
+ await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
5057
+ await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
4881
5058
  }
4882
5059
  }
@@ -1,3 +1,13 @@
1
- declare function main(): Promise<void>;
1
+ interface MergeInfrastructureOptions {
2
+ /**
3
+ * Top-level subdirectories of `infrastructure/` to scope the merge to.
4
+ * When omitted or empty, the entire `infrastructure/` tree is merged
5
+ * (legacy behavior). Each name is relative to `infrastructure/` —
6
+ * e.g. `['postgres', 'metabase']` merges only
7
+ * `infrastructure/postgres/` and `infrastructure/metabase/`.
8
+ */
9
+ subdirs?: string[];
10
+ }
11
+ declare function main({ subdirs }?: MergeInfrastructureOptions): Promise<void>;
2
12
  export { main };
3
13
  //# sourceMappingURL=merge-infrastructure-directory.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge-infrastructure-directory.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/merge-infrastructure-directory.ts"],"names":[],"mappings":"AAsHA,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAkInC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"merge-infrastructure-directory.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/merge-infrastructure-directory.ts"],"names":[],"mappings":"AAsHA,UAAU,0BAA0B;IAClC;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAID,iBAAe,IAAI,CAAC,EAClB,OAAY,EACb,GAAE,0BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CAoIjD;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}