@opencrvs/toolkit 2.0.0-rc.d13cd56 → 2.0.0-rc.d1ea58b

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.
@@ -306,7 +306,6 @@ __export(events_exports, {
306
306
  getAllUniqueFields: () => getAllUniqueFields,
307
307
  getAnnotationFromDrafts: () => getAnnotationFromDrafts,
308
308
  getAssignedUserFromActions: () => getAssignedUserFromActions,
309
- getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
310
309
  getAssignmentStatus: () => getAssignmentStatus,
311
310
  getAvailableActionsForEvent: () => getAvailableActionsForEvent,
312
311
  getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
@@ -705,7 +704,9 @@ var decodeScope = (query) => {
705
704
  };
706
705
  var DEFAULT_SCOPE_OPTIONS = {
707
706
  placeOfEvent: JurisdictionFilter.enum.all,
708
- accessLevel: JurisdictionFilter.enum.all
707
+ accessLevel: JurisdictionFilter.enum.all,
708
+ registeredIn: JurisdictionFilter.enum.all,
709
+ declaredIn: JurisdictionFilter.enum.all
709
710
  };
710
711
  function getAcceptedScopesByType({
711
712
  acceptedScopes,
@@ -1414,28 +1415,20 @@ function schemaPriority(schema) {
1414
1415
  return idx === -1 ? 9999 : idx;
1415
1416
  }
1416
1417
  function safeUnion(schemas) {
1418
+ const sortedSchemas = [...schemas].sort(
1419
+ (a, b) => schemaPriority(a) - schemaPriority(b)
1420
+ );
1417
1421
  return z12.any().superRefine((val, ctx) => {
1418
- const successful = schemas.filter((s) => s.safeParse(val).success);
1419
- if (successful.length === 1) {
1420
- return;
1421
- }
1422
- if (successful.length === 0) {
1423
- ctx.addIssue({
1424
- code: "invalid_type",
1425
- expected: "custom",
1426
- message: "Value does not match any schema"
1427
- });
1428
- return;
1429
- }
1430
- successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
1431
- const best = successful[0];
1432
- if (!best.safeParse(val).success) {
1433
- ctx.addIssue({
1434
- expected: "custom",
1435
- code: "invalid_type",
1436
- message: "Value did not match the best schema"
1437
- });
1422
+ for (const schema of sortedSchemas) {
1423
+ if (schema.safeParse(val).success) {
1424
+ return;
1425
+ }
1438
1426
  }
1427
+ ctx.addIssue({
1428
+ code: "invalid_type",
1429
+ expected: "custom",
1430
+ message: "Value does not match any schema"
1431
+ });
1439
1432
  }).meta({
1440
1433
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1441
1434
  });
@@ -1773,8 +1766,7 @@ var ActionCreationMetadata = z16.object({
1773
1766
  ),
1774
1767
  createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
1775
1768
  acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
1776
- createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation."),
1777
- createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
1769
+ createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
1778
1770
  });
1779
1771
  var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1780
1772
  registrationNumber: z16.string().describe(
@@ -1802,9 +1794,6 @@ var EventMetadata = z16.object({
1802
1794
  createdAtLocation: UUID.nullish().describe(
1803
1795
  "Location of the user who created the event."
1804
1796
  ),
1805
- createdBySignature: DocumentPath.nullish().describe(
1806
- "Signature of the user who created the event."
1807
- ),
1808
1797
  updatedAtLocation: UUID.nullish().describe(
1809
1798
  "Location of the user who last changed the status."
1810
1799
  ),
@@ -3804,6 +3793,9 @@ function precompileActionSchemas(eventConfigurations) {
3804
3793
  function isAgeValue(value) {
3805
3794
  return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
3806
3795
  }
3796
+ function mergeWithBaseFormState(values, context) {
3797
+ return { ...context.baseFormState, ...values };
3798
+ }
3807
3799
  function validate(schema, data) {
3808
3800
  const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
3809
3801
  if ("$form" in data) {
@@ -3842,7 +3834,7 @@ function isOnline() {
3842
3834
  }
3843
3835
  function isConditionMet(conditional, values, context, eventIndex) {
3844
3836
  return validate(conditional, {
3845
- $form: values,
3837
+ $form: mergeWithBaseFormState(values, context),
3846
3838
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3847
3839
  $online: isOnline(),
3848
3840
  $user: context.user,
@@ -3871,7 +3863,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
3871
3863
  return true;
3872
3864
  }
3873
3865
  const validConditionals = getConditionalActionsForField(field3, {
3874
- $form: form,
3866
+ $form: mergeWithBaseFormState(form, context),
3875
3867
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3876
3868
  $online: isOnline(),
3877
3869
  $user: context.user,
@@ -4063,7 +4055,7 @@ function runFieldValidations({
4063
4055
  return [];
4064
4056
  }
4065
4057
  const conditionalParameters = {
4066
- $form: form,
4058
+ $form: mergeWithBaseFormState(form, context),
4067
4059
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
4068
4060
  /**
4069
4061
  * In real use cases, there can be hundreds of thousands of locations.
@@ -4307,17 +4299,16 @@ function isPageVisible(page, formValues, context) {
4307
4299
  }
4308
4300
  return isConditionMet(page.conditional, formValues, context);
4309
4301
  }
4310
- function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false, declarationContext) {
4302
+ function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
4311
4303
  const base = (0, import_lodash.cloneDeep)(formValues);
4312
4304
  function fn(prevVisibilityContext) {
4313
- const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
4314
4305
  const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
4315
4306
  const fieldConfig = fields.filter((f) => f.id === fieldId);
4316
4307
  if (!fieldConfig.length) {
4317
4308
  return false;
4318
4309
  }
4319
4310
  const isHidden = fieldConfig.every(
4320
- (f) => !isFieldVisible(f, visibilityForm, validatorContext)
4311
+ (f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
4321
4312
  );
4322
4313
  if (!isHidden) {
4323
4314
  return false;
@@ -4335,7 +4326,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
4335
4326
  const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4336
4327
  const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4337
4328
  const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
4338
- return hiddenFields.some((f) => f.id === fieldId);
4329
+ return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
4339
4330
  });
4340
4331
  return omitHiddenFields(
4341
4332
  visibleFields,
@@ -4382,13 +4373,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
4382
4373
  }
4383
4374
  function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
4384
4375
  const annotationFields = getActionAnnotationFields(actionConfig);
4385
- return omitHiddenFields(
4386
- annotationFields,
4387
- annotation,
4388
- context,
4389
- false,
4390
- declaration
4391
- );
4376
+ return omitHiddenFields(annotationFields, annotation, {
4377
+ ...context,
4378
+ baseFormState: declaration
4379
+ });
4392
4380
  }
4393
4381
  function deepMerge(currentDocument, actionDocument) {
4394
4382
  const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
@@ -5900,6 +5888,9 @@ var BaseActionInput = z38.object({
5900
5888
  originalActionId: UUID.optional(),
5901
5889
  // should not be part of base action.
5902
5890
  keepAssignment: z38.boolean().optional(),
5891
+ keepAssignmentIfAccepted: z38.boolean().optional(),
5892
+ keepAssignmentIfRejected: z38.boolean().optional(),
5893
+ waitFor: z38.boolean().optional(),
5903
5894
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5904
5895
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
5905
5896
  createdAtLocation: UUID.nullish().describe(
@@ -6153,7 +6144,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
6153
6144
  createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
6154
6145
  acceptedAt: acceptAction.createdAt,
6155
6146
  createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
6156
- createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
6157
6147
  registrationNumber
6158
6148
  };
6159
6149
  }
@@ -6367,17 +6357,6 @@ function getAssignedUserFromActions(actions) {
6367
6357
  return user2;
6368
6358
  }, null);
6369
6359
  }
6370
- function getAssignedUserSignatureFromActions(actions) {
6371
- return actions.reduce((signature, action) => {
6372
- if (action.type === ActionType.ASSIGN) {
6373
- return action.createdBySignature || null;
6374
- }
6375
- if (action.type === ActionType.UNASSIGN) {
6376
- return null;
6377
- }
6378
- return signature;
6379
- }, null);
6380
- }
6381
6360
  function deepDropNulls(obj) {
6382
6361
  if (Array.isArray(obj)) {
6383
6362
  return obj.map(deepDropNulls);
@@ -6473,10 +6452,8 @@ function getCurrentEventState(event2, config) {
6473
6452
  createdBy: creationAction.createdBy,
6474
6453
  createdByUserType: creationAction.createdByUserType,
6475
6454
  createdAtLocation: creationAction.createdAtLocation,
6476
- createdBySignature: creationAction.createdBySignature,
6477
6455
  updatedAt: acceptedActionMetadata.createdAt,
6478
6456
  assignedTo: getAssignedUserFromActions(acceptedActions),
6479
- assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
6480
6457
  updatedBy: requestActionMetadata.createdBy,
6481
6458
  updatedAtLocation: requestActionMetadata.createdAtLocation,
6482
6459
  declaration,
@@ -9735,7 +9712,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
9735
9712
  createdBy: overrides.createdBy ?? generateUuid(rng),
9736
9713
  createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
9737
9714
  updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
9738
- createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
9739
9715
  updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
9740
9716
  assignedTo: overrides.assignedTo ?? null,
9741
9717
  updatedBy: overrides.updatedBy ?? generateUuid(rng),
@@ -0,0 +1,3 @@
1
+ declare function main(): Promise<void>;
2
+ export { main };
3
+ //# sourceMappingURL=fix-accept-requested-registration-function-type.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fix-accept-requested-registration-function-type.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/fix-accept-requested-registration-function-type.ts"],"names":[],"mappings":"AAuFA,iBAAe,IAAI,kBA6ClB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
@@ -0,0 +1,110 @@
1
+ "use strict";
2
+ /*
3
+ * This Source Code Form is subject to the terms of the Mozilla Public
4
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
5
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
+ *
7
+ * OpenCRVS is also distributed under the terms of the Civil Registration
8
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
9
+ *
10
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
11
+ */
12
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
13
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
14
+ return new (P || (P = Promise))(function (resolve, reject) {
15
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
16
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
17
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
18
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
19
+ });
20
+ };
21
+ var __importDefault = (this && this.__importDefault) || function (mod) {
22
+ return (mod && mod.__esModule) ? mod : { "default": mod };
23
+ };
24
+ Object.defineProperty(exports, "__esModule", { value: true });
25
+ exports.main = main;
26
+ /**
27
+ * Codemod: In `acceptRequestedRegistration`, update the `action` parameter type from:
28
+ * action: ActionInput
29
+ * to:
30
+ * action: Extract<ActionInput, { type?: 'REGISTER' }>
31
+ *
32
+ * What it does:
33
+ * - Scans all TypeScript files under `src/`
34
+ * - Finds `acceptRequestedRegistration` (function declaration or const assignment)
35
+ * - Rewrites only the `action` parameter when its type is exactly `ActionInput`
36
+ * - Saves modified files in-place
37
+ */
38
+ /* eslint-disable no-console */
39
+ const ts_morph_1 = require("ts-morph");
40
+ const path_1 = __importDefault(require("path"));
41
+ const TARGET_FUNCTION_NAME = 'acceptRequestedRegistration';
42
+ const ACTION_PARAMETER_NAME = 'action';
43
+ const OLD_TYPE = 'ActionInput';
44
+ const NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
45
+ function isAcceptRequestedRegistrationParameter(parameter) {
46
+ const functionDeclaration = parameter.getFirstAncestorByKind(ts_morph_1.SyntaxKind.FunctionDeclaration);
47
+ if ((functionDeclaration === null || functionDeclaration === void 0 ? void 0 : functionDeclaration.getName()) === TARGET_FUNCTION_NAME) {
48
+ return true;
49
+ }
50
+ const arrowFunction = parameter.getFirstAncestorByKind(ts_morph_1.SyntaxKind.ArrowFunction);
51
+ const variableDeclaration = arrowFunction === null || arrowFunction === void 0 ? void 0 : arrowFunction.getFirstAncestorByKind(ts_morph_1.SyntaxKind.VariableDeclaration);
52
+ return (variableDeclaration === null || variableDeclaration === void 0 ? void 0 : variableDeclaration.getName()) === TARGET_FUNCTION_NAME;
53
+ }
54
+ function processFile(filePath, project) {
55
+ const sourceFile = project.getSourceFile(filePath);
56
+ if (!sourceFile)
57
+ return 0;
58
+ let updatedCount = 0;
59
+ for (const parameter of sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.Parameter)) {
60
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
61
+ continue;
62
+ }
63
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
64
+ continue;
65
+ }
66
+ const typeNode = parameter.getTypeNode();
67
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
68
+ continue;
69
+ }
70
+ parameter.setType(NEW_TYPE);
71
+ updatedCount++;
72
+ console.log(` [${path_1.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`);
73
+ }
74
+ return updatedCount;
75
+ }
76
+ function main() {
77
+ return __awaiter(this, void 0, void 0, function* () {
78
+ const srcDir = path_1.default.join(process.cwd(), 'src');
79
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}\n`);
80
+ const project = new ts_morph_1.Project({
81
+ tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
82
+ skipAddingFilesFromTsConfig: false
83
+ });
84
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
85
+ const filePath = sf.getFilePath();
86
+ return filePath.includes('/src/') && !filePath.includes('/node_modules/');
87
+ });
88
+ let totalUpdated = 0;
89
+ const modifiedFiles = [];
90
+ for (const sourceFile of sourceFiles) {
91
+ const filePath = sourceFile.getFilePath();
92
+ const updated = processFile(filePath, project);
93
+ if (updated > 0) {
94
+ totalUpdated += updated;
95
+ modifiedFiles.push(filePath);
96
+ }
97
+ }
98
+ if (modifiedFiles.length === 0) {
99
+ console.log(`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`);
100
+ return;
101
+ }
102
+ console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
103
+ for (const filePath of modifiedFiles) {
104
+ const sourceFile = project.getSourceFileOrThrow(filePath);
105
+ yield sourceFile.save();
106
+ console.log(` Saved: ${path_1.default.relative(process.cwd(), filePath)}`);
107
+ }
108
+ console.log(`\nDone. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`);
109
+ });
110
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"AA6CA;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBAgCpD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"AA8CA;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBAiCpD"}
@@ -1895,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
1895
1895
  }
1896
1896
  return replacedCount;
1897
1897
  }
1898
- function resolveConfigChain(configObj, path23) {
1898
+ function resolveConfigChain(configObj, path24) {
1899
1899
  let current = configObj;
1900
- for (const key of path23) {
1900
+ for (const key of path24) {
1901
1901
  if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
1902
1902
  const prop = current.getProperty(key);
1903
1903
  if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
@@ -2132,6 +2132,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
2132
2132
  var import_ts_morph11 = require("ts-morph");
2133
2133
  var import_path11 = __toESM(require("path"));
2134
2134
 
2135
+ // ../commons/src/scopes.deprecated.do-not-use.ts
2136
+ var z4 = __toESM(require("zod/v4"));
2137
+ var import_lodash = require("lodash");
2138
+
2135
2139
  // ../commons/src/scopes.ts
2136
2140
  var z3 = __toESM(require("zod/v4"));
2137
2141
  var qs = __toESM(require("qs"));
@@ -2401,11 +2405,12 @@ var decodeScope = (query) => {
2401
2405
  };
2402
2406
  var DEFAULT_SCOPE_OPTIONS = {
2403
2407
  placeOfEvent: JurisdictionFilter.enum.all,
2404
- accessLevel: JurisdictionFilter.enum.all
2408
+ accessLevel: JurisdictionFilter.enum.all,
2409
+ registeredIn: JurisdictionFilter.enum.all,
2410
+ declaredIn: JurisdictionFilter.enum.all
2405
2411
  };
2406
2412
 
2407
2413
  // ../commons/src/scopes.deprecated.do-not-use.ts
2408
- var z4 = __toESM(require("zod/v4"));
2409
2414
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2410
2415
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2411
2416
  var SearchScope = z4.object({
@@ -2639,6 +2644,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2639
2644
  }
2640
2645
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2641
2646
  };
2647
+ var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
2648
+ function isMergeableUserScopeType(type) {
2649
+ return MERGEABLE_USER_SCOPE_TYPES.includes(type);
2650
+ }
2651
+ function decodeLegacyScope(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
+ function groupByType(entries) {
2662
+ return entries.reduce(
2663
+ (groups, entry) => ({
2664
+ ...groups,
2665
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2666
+ }),
2667
+ {}
2668
+ );
2669
+ }
2670
+ function deduplicateEntries(entries) {
2671
+ return entries.filter(
2672
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2673
+ );
2674
+ }
2675
+ function mergeEntries(type, entries) {
2676
+ const optionsList = entries.map(
2677
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2678
+ );
2679
+ const allKeys = optionsList.flatMap(
2680
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2681
+ );
2682
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2683
+ if (conflictKey) {
2684
+ const conflicting = entries.filter(
2685
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2686
+ ).map((e) => JSON.stringify(e.legacy));
2687
+ throw new Error(
2688
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2689
+ );
2690
+ }
2691
+ const mergedOptions = Object.assign({}, ...optionsList);
2692
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2693
+ const parsed = Scope2.safeParse(merged);
2694
+ if (!parsed.success) {
2695
+ throw new Error(
2696
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2697
+ );
2698
+ }
2699
+ return parsed.data;
2700
+ }
2701
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2702
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2703
+ return Object.entries(groups).flatMap(([type, entries]) => {
2704
+ const deduped = deduplicateEntries(entries);
2705
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2706
+ if (!isMergeableUserScopeType(type)) {
2707
+ console.warn(
2708
+ `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.`
2709
+ );
2710
+ return deduped.map((e) => e.scope);
2711
+ }
2712
+ return [mergeEntries(type, deduped)];
2713
+ });
2714
+ }
2642
2715
 
2643
2716
  // src/migrations/v2.0/migrate-scopes.ts
2644
2717
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2676,57 +2749,65 @@ function resolveLegacyScopeFromElement(element) {
2676
2749
  }
2677
2750
  function migrateScopesArrays(rolesFilePath, project) {
2678
2751
  const sourceFile = project.getSourceFile(rolesFilePath);
2679
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2752
+ if (!sourceFile) {
2753
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2754
+ }
2680
2755
  let migratedCount = 0;
2681
2756
  let removedCount = 0;
2757
+ let mergedCount = 0;
2682
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);
2683
2760
  for (const scopesProp of scopesProperties) {
2684
2761
  const initializer = scopesProp.getInitializer();
2685
2762
  if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
2686
- const elements = initializer.getElements();
2687
- for (let index = elements.length - 1; index >= 0; index--) {
2688
- const element = elements[index];
2689
- 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()) {
2690
2767
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2691
2768
  if (scopeKey && !(scopeKey in SCOPES)) {
2692
2769
  console.warn(
2693
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2770
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2694
2771
  );
2695
- initializer.removeElement(index);
2696
2772
  removedCount++;
2773
+ anyChange = true;
2697
2774
  continue;
2698
2775
  }
2699
2776
  const legacyScope = resolveLegacyScopeFromElement(element);
2700
2777
  if (!legacyScope) {
2701
2778
  console.warn(
2702
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2779
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2703
2780
  );
2781
+ rawTexts.push(element.getText());
2704
2782
  continue;
2705
2783
  }
2706
- try {
2707
- const migratedScope = legacyScopeToV2Scope(legacyScope);
2708
- const scope = decodeScope(migratedScope);
2709
- if (!scope) {
2710
- console.warn(
2711
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
2712
- );
2713
- continue;
2714
- }
2715
- element.replaceWithText(JSON.stringify(scope));
2716
- migratedCount++;
2717
- } catch (error) {
2718
- console.warn(
2719
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
2720
- );
2721
- }
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
+ );
2722
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(", ")}]`);
2723
2804
  }
2724
2805
  if (removedCount > 0) {
2725
2806
  console.log(
2726
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2807
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2727
2808
  );
2728
2809
  }
2729
- return { migratedCount, removedCount };
2810
+ return { migratedCount, removedCount, mergedCount };
2730
2811
  }
2731
2812
  function ensureScopesHelpersImport(rolesFilePath, project) {
2732
2813
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2861,7 +2942,7 @@ async function main11() {
2861
2942
  return;
2862
2943
  }
2863
2944
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2864
- const { migratedCount, removedCount } = migrateScopesArrays(
2945
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2865
2946
  rolesFilePath,
2866
2947
  project
2867
2948
  );
@@ -2880,7 +2961,7 @@ async function main11() {
2880
2961
  }
2881
2962
  await sourceFile.save();
2882
2963
  console.log(
2883
- `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." : "."}`
2884
2965
  );
2885
2966
  }
2886
2967
 
@@ -4764,9 +4845,9 @@ var import_path24 = require("path");
4764
4845
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4765
4846
  var INFRASTRUCTURE_DIR = "infrastructure";
4766
4847
  var BASE_BRANCH = "release-v1.9";
4767
- function gitShowBytes(ref, path23) {
4848
+ function gitShowBytes(ref, path24) {
4768
4849
  try {
4769
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4850
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
4770
4851
  cwd: process.cwd(),
4771
4852
  stdio: ["ignore", "pipe", "pipe"]
4772
4853
  });
@@ -4942,6 +5023,94 @@ async function main26({
4942
5023
  );
4943
5024
  }
4944
5025
 
5026
+ // src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
5027
+ var import_ts_morph22 = require("ts-morph");
5028
+ var import_path26 = __toESM(require("path"));
5029
+ var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
5030
+ var ACTION_PARAMETER_NAME = "action";
5031
+ var OLD_TYPE = "ActionInput";
5032
+ var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
5033
+ function isAcceptRequestedRegistrationParameter(parameter) {
5034
+ const functionDeclaration = parameter.getFirstAncestorByKind(
5035
+ import_ts_morph22.SyntaxKind.FunctionDeclaration
5036
+ );
5037
+ if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
5038
+ return true;
5039
+ }
5040
+ const arrowFunction = parameter.getFirstAncestorByKind(
5041
+ import_ts_morph22.SyntaxKind.ArrowFunction
5042
+ );
5043
+ const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
5044
+ import_ts_morph22.SyntaxKind.VariableDeclaration
5045
+ );
5046
+ return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
5047
+ }
5048
+ function processFile14(filePath, project) {
5049
+ const sourceFile = project.getSourceFile(filePath);
5050
+ if (!sourceFile) return 0;
5051
+ let updatedCount = 0;
5052
+ for (const parameter of sourceFile.getDescendantsOfKind(
5053
+ import_ts_morph22.SyntaxKind.Parameter
5054
+ )) {
5055
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
5056
+ continue;
5057
+ }
5058
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
5059
+ continue;
5060
+ }
5061
+ const typeNode = parameter.getTypeNode();
5062
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
5063
+ continue;
5064
+ }
5065
+ parameter.setType(NEW_TYPE);
5066
+ updatedCount++;
5067
+ console.log(
5068
+ ` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
5069
+ );
5070
+ }
5071
+ return updatedCount;
5072
+ }
5073
+ async function main27() {
5074
+ const srcDir = import_path26.default.join(process.cwd(), "src");
5075
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
5076
+ `);
5077
+ const project = new import_ts_morph22.Project({
5078
+ tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
5079
+ skipAddingFilesFromTsConfig: false
5080
+ });
5081
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
5082
+ const filePath = sf.getFilePath();
5083
+ return filePath.includes("/src/") && !filePath.includes("/node_modules/");
5084
+ });
5085
+ let totalUpdated = 0;
5086
+ const modifiedFiles = [];
5087
+ for (const sourceFile of sourceFiles) {
5088
+ const filePath = sourceFile.getFilePath();
5089
+ const updated = processFile14(filePath, project);
5090
+ if (updated > 0) {
5091
+ totalUpdated += updated;
5092
+ modifiedFiles.push(filePath);
5093
+ }
5094
+ }
5095
+ if (modifiedFiles.length === 0) {
5096
+ console.log(
5097
+ `No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
5098
+ );
5099
+ return;
5100
+ }
5101
+ console.log(`
5102
+ Saving ${modifiedFiles.length} modified file(s)...`);
5103
+ for (const filePath of modifiedFiles) {
5104
+ const sourceFile = project.getSourceFileOrThrow(filePath);
5105
+ await sourceFile.save();
5106
+ console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
5107
+ }
5108
+ console.log(
5109
+ `
5110
+ Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
5111
+ );
5112
+ }
5113
+
4945
5114
  // src/migrations/v2.0/index.ts
4946
5115
  var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4947
5116
  async function runUpgrade(dockerSwarm) {
@@ -4968,6 +5137,7 @@ async function runUpgrade(dockerSwarm) {
4968
5137
  await main22();
4969
5138
  await main23();
4970
5139
  await main24();
5140
+ await main27();
4971
5141
  await main17();
4972
5142
  if (dockerSwarm) {
4973
5143
  await main25();