@opencrvs/toolkit 2.0.0-rc.e36afe6 → 2.0.0-rc.e405951

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 (40) hide show
  1. package/create-countryconfig/index.js +50 -20
  2. package/create-countryconfig/package.json +12 -2
  3. package/dist/application-config/index.js +253 -99
  4. package/dist/cli.js +215 -39
  5. package/dist/commons/api/router.d.ts +3358 -234
  6. package/dist/commons/application-config/index.d.ts +1 -0
  7. package/dist/commons/conditionals/conditionals.d.ts +354 -4
  8. package/dist/commons/conditionals/validate.d.ts +52 -2
  9. package/dist/commons/events/ActionDocument.d.ts +6 -0
  10. package/dist/commons/events/ActionInput.d.ts +114 -36
  11. package/dist/commons/events/AdvancedSearchConfig.d.ts +342 -0
  12. package/dist/commons/events/Draft.d.ts +4 -3
  13. package/dist/commons/events/EventDocument.d.ts +3 -0
  14. package/dist/commons/events/EventIndex.d.ts +0 -3
  15. package/dist/commons/events/EventMetadata.d.ts +0 -7
  16. package/dist/commons/events/FieldConfig.d.ts +377 -50
  17. package/dist/commons/events/FieldValue.d.ts +6 -0
  18. package/dist/commons/events/WorkqueueConfig.d.ts +150 -150
  19. package/dist/commons/events/field.d.ts +53 -1
  20. package/dist/commons/events/index.d.ts +2 -0
  21. package/dist/commons/events/state/flags.d.ts +16 -0
  22. package/dist/commons/events/state/index.d.ts +0 -4
  23. package/dist/commons/events/state/utils.d.ts +12 -289
  24. package/dist/commons/events/utils.d.ts +13 -2
  25. package/dist/conditionals/index.js +55 -2
  26. package/dist/events/index.js +943 -236
  27. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
  28. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
  29. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
  30. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  31. package/dist/migrations/v2.0/index.js +213 -37
  32. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  33. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  34. package/dist/notification/index.js +793 -135
  35. package/dist/scopes/index.d.ts +4 -6
  36. package/dist/scopes/index.js +12 -4
  37. package/opencrvs-toolkit-2.0.0-rc.e405951.tgz +0 -0
  38. package/package.json +6 -2
  39. package/tsconfig.tsbuildinfo +1 -1
  40. package/opencrvs-toolkit-2.0.0-rc.e36afe6.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"));
@@ -2378,22 +2382,29 @@ var encodeScope = (scope) => {
2378
2382
  encode: false
2379
2383
  });
2380
2384
  };
2381
- var decodeScope = (query) => {
2382
- const scope = qs.parse(query, {
2385
+ var decodedScopeCache = /* @__PURE__ */ new Map();
2386
+ var decodeScope = (encodedScope) => {
2387
+ if (decodedScopeCache.has(encodedScope)) {
2388
+ return decodedScopeCache.get(encodedScope);
2389
+ }
2390
+ const scope = qs.parse(encodedScope, {
2383
2391
  ignoreQueryPrefix: true,
2384
2392
  comma: true,
2385
2393
  allowDots: true
2386
2394
  });
2387
2395
  const unflattenedScope = unflattenScope(scope);
2388
- return Scope2.safeParse(unflattenedScope)?.data;
2396
+ const result = Scope2.safeParse(unflattenedScope)?.data;
2397
+ decodedScopeCache.set(encodedScope, result);
2398
+ return result;
2389
2399
  };
2390
2400
  var DEFAULT_SCOPE_OPTIONS = {
2391
2401
  placeOfEvent: JurisdictionFilter.enum.all,
2392
- accessLevel: JurisdictionFilter.enum.all
2402
+ accessLevel: JurisdictionFilter.enum.all,
2403
+ registeredIn: JurisdictionFilter.enum.all,
2404
+ declaredIn: JurisdictionFilter.enum.all
2393
2405
  };
2394
2406
 
2395
2407
  // ../commons/src/scopes.deprecated.do-not-use.ts
2396
- var z4 = __toESM(require("zod/v4"));
2397
2408
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2398
2409
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2399
2410
  var SearchScope = z4.object({
@@ -2627,6 +2638,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2627
2638
  }
2628
2639
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2629
2640
  };
2641
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2642
+ function isMergeableUserScopeType(type) {
2643
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2644
+ }
2645
+ function decodeLegacyScope(legacy) {
2646
+ const encoded = legacyScopeToV2Scope(legacy);
2647
+ const scope = decodeScope(encoded);
2648
+ if (!scope) {
2649
+ throw new Error(
2650
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2651
+ );
2652
+ }
2653
+ return { legacy, scope };
2654
+ }
2655
+ function groupByType(entries) {
2656
+ return entries.reduce(
2657
+ (groups, entry) => ({
2658
+ ...groups,
2659
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2660
+ }),
2661
+ {}
2662
+ );
2663
+ }
2664
+ function deduplicateEntries(entries) {
2665
+ return entries.filter(
2666
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2667
+ );
2668
+ }
2669
+ function mergeEntries(type, entries) {
2670
+ const optionsList = entries.map(
2671
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2672
+ );
2673
+ const allKeys = optionsList.flatMap(
2674
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2675
+ );
2676
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2677
+ if (conflictKey) {
2678
+ const conflicting = entries.filter(
2679
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2680
+ ).map((e) => JSON.stringify(e.legacy));
2681
+ throw new Error(
2682
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2683
+ );
2684
+ }
2685
+ const mergedOptions = Object.assign({}, ...optionsList);
2686
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2687
+ const parsed = Scope2.safeParse(merged);
2688
+ if (!parsed.success) {
2689
+ throw new Error(
2690
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2691
+ );
2692
+ }
2693
+ return parsed.data;
2694
+ }
2695
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2696
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2697
+ return Object.entries(groups).flatMap(([type, entries]) => {
2698
+ const deduped = deduplicateEntries(entries);
2699
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2700
+ if (!isMergeableUserScopeType(type)) {
2701
+ console.warn(
2702
+ `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.`
2703
+ );
2704
+ return deduped.map((e) => e.scope);
2705
+ }
2706
+ return [mergeEntries(type, deduped)];
2707
+ });
2708
+ }
2630
2709
 
2631
2710
  // src/migrations/v2.0/migrate-scopes.ts
2632
2711
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2664,57 +2743,65 @@ function resolveLegacyScopeFromElement(element) {
2664
2743
  }
2665
2744
  function migrateScopesArrays(rolesFilePath, project) {
2666
2745
  const sourceFile = project.getSourceFile(rolesFilePath);
2667
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2746
+ if (!sourceFile) {
2747
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2748
+ }
2668
2749
  let migratedCount = 0;
2669
2750
  let removedCount = 0;
2751
+ let mergedCount = 0;
2670
2752
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2753
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2671
2754
  for (const scopesProp of scopesProperties) {
2672
2755
  const initializer = scopesProp.getInitializer();
2673
2756
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2674
- const elements = initializer.getElements();
2675
- for (let index = elements.length - 1; index >= 0; index--) {
2676
- const element = elements[index];
2677
- if (!import_ts_morph11.Node.isExpression(element)) continue;
2757
+ const rawTexts = [];
2758
+ const legacyStrings = [];
2759
+ let anyChange = false;
2760
+ for (const element of initializer.getElements()) {
2678
2761
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2679
2762
  if (scopeKey && !(scopeKey in SCOPES)) {
2680
2763
  console.warn(
2681
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2764
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2682
2765
  );
2683
- initializer.removeElement(index);
2684
2766
  removedCount++;
2767
+ anyChange = true;
2685
2768
  continue;
2686
2769
  }
2687
2770
  const legacyScope = resolveLegacyScopeFromElement(element);
2688
2771
  if (!legacyScope) {
2689
2772
  console.warn(
2690
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2773
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2691
2774
  );
2775
+ rawTexts.push(element.getText());
2692
2776
  continue;
2693
2777
  }
2694
- try {
2695
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2696
- const scope = decodeScope(migratedScope);
2697
- if (!scope) {
2698
- console.warn(
2699
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2700
- );
2701
- continue;
2702
- }
2703
- element.replaceWithText(JSON.stringify(scope));
2704
- migratedCount++;
2705
- } catch (error) {
2706
- console.warn(
2707
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2708
- );
2709
- }
2778
+ legacyStrings.push(legacyScope);
2779
+ anyChange = true;
2780
+ }
2781
+ if (!anyChange) continue;
2782
+ let mergedScopes;
2783
+ try {
2784
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2785
+ } catch (error) {
2786
+ throw new Error(
2787
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2788
+ { cause: error }
2789
+ );
2710
2790
  }
2791
+ migratedCount += legacyStrings.length;
2792
+ mergedCount += legacyStrings.length - mergedScopes.length;
2793
+ const outputElements = [
2794
+ ...rawTexts,
2795
+ ...mergedScopes.map((s) => JSON.stringify(s))
2796
+ ];
2797
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2711
2798
  }
2712
2799
  if (removedCount > 0) {
2713
2800
  console.log(
2714
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2801
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2715
2802
  );
2716
2803
  }
2717
- return { migratedCount, removedCount };
2804
+ return { migratedCount, removedCount, mergedCount };
2718
2805
  }
2719
2806
  function ensureScopesHelpersImport(rolesFilePath, project) {
2720
2807
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2849,7 +2936,7 @@ async function main11() {
2849
2936
  return;
2850
2937
  }
2851
2938
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2852
- const { migratedCount, removedCount } = migrateScopesArrays(
2939
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2853
2940
  rolesFilePath,
2854
2941
  project
2855
2942
  );
@@ -2868,7 +2955,7 @@ async function main11() {
2868
2955
  }
2869
2956
  await sourceFile.save();
2870
2957
  console.log(
2871
- `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." : "."}`
2958
+ `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." : "."}`
2872
2959
  );
2873
2960
  }
2874
2961
 
@@ -4752,9 +4839,9 @@ var import_path24 = require("path");
4752
4839
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4753
4840
  var INFRASTRUCTURE_DIR = "infrastructure";
4754
4841
  var BASE_BRANCH = "release-v1.9";
4755
- function gitShowBytes(ref, path23) {
4842
+ function gitShowBytes(ref, path24) {
4756
4843
  try {
4757
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4844
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
4758
4845
  cwd: process.cwd(),
4759
4846
  stdio: ["ignore", "pipe", "pipe"]
4760
4847
  });
@@ -4930,6 +5017,94 @@ async function main26({
4930
5017
  );
4931
5018
  }
4932
5019
 
5020
+ // src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
5021
+ var import_ts_morph22 = require("ts-morph");
5022
+ var import_path26 = __toESM(require("path"));
5023
+ var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
5024
+ var ACTION_PARAMETER_NAME = "action";
5025
+ var OLD_TYPE = "ActionInput";
5026
+ var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
5027
+ function isAcceptRequestedRegistrationParameter(parameter) {
5028
+ const functionDeclaration = parameter.getFirstAncestorByKind(
5029
+ import_ts_morph22.SyntaxKind.FunctionDeclaration
5030
+ );
5031
+ if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
5032
+ return true;
5033
+ }
5034
+ const arrowFunction = parameter.getFirstAncestorByKind(
5035
+ import_ts_morph22.SyntaxKind.ArrowFunction
5036
+ );
5037
+ const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
5038
+ import_ts_morph22.SyntaxKind.VariableDeclaration
5039
+ );
5040
+ return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
5041
+ }
5042
+ function processFile14(filePath, project) {
5043
+ const sourceFile = project.getSourceFile(filePath);
5044
+ if (!sourceFile) return 0;
5045
+ let updatedCount = 0;
5046
+ for (const parameter of sourceFile.getDescendantsOfKind(
5047
+ import_ts_morph22.SyntaxKind.Parameter
5048
+ )) {
5049
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
5050
+ continue;
5051
+ }
5052
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
5053
+ continue;
5054
+ }
5055
+ const typeNode = parameter.getTypeNode();
5056
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
5057
+ continue;
5058
+ }
5059
+ parameter.setType(NEW_TYPE);
5060
+ updatedCount++;
5061
+ console.log(
5062
+ ` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
5063
+ );
5064
+ }
5065
+ return updatedCount;
5066
+ }
5067
+ async function main27() {
5068
+ const srcDir = import_path26.default.join(process.cwd(), "src");
5069
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
5070
+ `);
5071
+ const project = new import_ts_morph22.Project({
5072
+ tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
5073
+ skipAddingFilesFromTsConfig: false
5074
+ });
5075
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
5076
+ const filePath = sf.getFilePath();
5077
+ return filePath.includes("/src/") && !filePath.includes("/node_modules/");
5078
+ });
5079
+ let totalUpdated = 0;
5080
+ const modifiedFiles = [];
5081
+ for (const sourceFile of sourceFiles) {
5082
+ const filePath = sourceFile.getFilePath();
5083
+ const updated = processFile14(filePath, project);
5084
+ if (updated > 0) {
5085
+ totalUpdated += updated;
5086
+ modifiedFiles.push(filePath);
5087
+ }
5088
+ }
5089
+ if (modifiedFiles.length === 0) {
5090
+ console.log(
5091
+ `No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
5092
+ );
5093
+ return;
5094
+ }
5095
+ console.log(`
5096
+ Saving ${modifiedFiles.length} modified file(s)...`);
5097
+ for (const filePath of modifiedFiles) {
5098
+ const sourceFile = project.getSourceFileOrThrow(filePath);
5099
+ await sourceFile.save();
5100
+ console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
5101
+ }
5102
+ console.log(
5103
+ `
5104
+ Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
5105
+ );
5106
+ }
5107
+
4933
5108
  // src/migrations/v2.0/index.ts
4934
5109
  var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4935
5110
  async function runUpgrade(dockerSwarm) {
@@ -4956,6 +5131,7 @@ async function runUpgrade(dockerSwarm) {
4956
5131
  await main22();
4957
5132
  await main23();
4958
5133
  await main24();
5134
+ await main27();
4959
5135
  await main17();
4960
5136
  if (dockerSwarm) {
4961
5137
  await main25();
@@ -4990,7 +5166,7 @@ Options:
4990
5166
  'infrastructure/' directory is deleted (default).
4991
5167
  -h, --help Show this message.
4992
5168
  `.trim();
4993
- function main27() {
5169
+ function main28() {
4994
5170
  const command = args[0];
4995
5171
  if (!command || command === "--help" || command === "-h") {
4996
5172
  console.log(USAGE);
@@ -5065,4 +5241,4 @@ function handleCheckTranslations() {
5065
5241
  console.warn("This command is not implemented yet!");
5066
5242
  process.exit(1);
5067
5243
  }
5068
- main27();
5244
+ main28();