@opencrvs/toolkit 2.0.0-rc.d451f09 → 2.0.0-rc.d603f53

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,
@@ -1765,8 +1764,7 @@ var ActionCreationMetadata = z16.object({
1765
1764
  ),
1766
1765
  createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
1767
1766
  acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
1768
- createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation."),
1769
- createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
1767
+ createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
1770
1768
  });
1771
1769
  var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1772
1770
  registrationNumber: z16.string().describe(
@@ -1794,9 +1792,6 @@ var EventMetadata = z16.object({
1794
1792
  createdAtLocation: UUID.nullish().describe(
1795
1793
  "Location of the user who created the event."
1796
1794
  ),
1797
- createdBySignature: DocumentPath.nullish().describe(
1798
- "Signature of the user who created the event."
1799
- ),
1800
1795
  updatedAtLocation: UUID.nullish().describe(
1801
1796
  "Location of the user who last changed the status."
1802
1797
  ),
@@ -3796,6 +3791,9 @@ function precompileActionSchemas(eventConfigurations) {
3796
3791
  function isAgeValue(value) {
3797
3792
  return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
3798
3793
  }
3794
+ function mergeWithBaseFormState(values, context) {
3795
+ return { ...context.baseFormState, ...values };
3796
+ }
3799
3797
  function validate(schema, data) {
3800
3798
  const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
3801
3799
  if ("$form" in data) {
@@ -3834,7 +3832,7 @@ function isOnline() {
3834
3832
  }
3835
3833
  function isConditionMet(conditional, values, context, eventIndex) {
3836
3834
  return validate(conditional, {
3837
- $form: values,
3835
+ $form: mergeWithBaseFormState(values, context),
3838
3836
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3839
3837
  $online: isOnline(),
3840
3838
  $user: context.user,
@@ -3863,7 +3861,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
3863
3861
  return true;
3864
3862
  }
3865
3863
  const validConditionals = getConditionalActionsForField(field3, {
3866
- $form: form,
3864
+ $form: mergeWithBaseFormState(form, context),
3867
3865
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3868
3866
  $online: isOnline(),
3869
3867
  $user: context.user,
@@ -4055,7 +4053,7 @@ function runFieldValidations({
4055
4053
  return [];
4056
4054
  }
4057
4055
  const conditionalParameters = {
4058
- $form: form,
4056
+ $form: mergeWithBaseFormState(form, context),
4059
4057
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
4060
4058
  /**
4061
4059
  * In real use cases, there can be hundreds of thousands of locations.
@@ -4299,17 +4297,16 @@ function isPageVisible(page, formValues, context) {
4299
4297
  }
4300
4298
  return isConditionMet(page.conditional, formValues, context);
4301
4299
  }
4302
- function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false, declarationContext) {
4300
+ function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
4303
4301
  const base = (0, import_lodash.cloneDeep)(formValues);
4304
4302
  function fn(prevVisibilityContext) {
4305
- const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
4306
4303
  const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
4307
4304
  const fieldConfig = fields.filter((f) => f.id === fieldId);
4308
4305
  if (!fieldConfig.length) {
4309
4306
  return false;
4310
4307
  }
4311
4308
  const isHidden = fieldConfig.every(
4312
- (f) => !isFieldVisible(f, visibilityForm, validatorContext)
4309
+ (f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
4313
4310
  );
4314
4311
  if (!isHidden) {
4315
4312
  return false;
@@ -4327,7 +4324,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
4327
4324
  const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4328
4325
  const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4329
4326
  const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
4330
- return hiddenFields.some((f) => f.id === fieldId);
4327
+ return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
4331
4328
  });
4332
4329
  return omitHiddenFields(
4333
4330
  visibleFields,
@@ -4374,13 +4371,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
4374
4371
  }
4375
4372
  function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
4376
4373
  const annotationFields = getActionAnnotationFields(actionConfig);
4377
- return omitHiddenFields(
4378
- annotationFields,
4379
- annotation,
4380
- context,
4381
- false,
4382
- declaration
4383
- );
4374
+ return omitHiddenFields(annotationFields, annotation, {
4375
+ ...context,
4376
+ baseFormState: declaration
4377
+ });
4384
4378
  }
4385
4379
  function deepMerge(currentDocument, actionDocument) {
4386
4380
  const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
@@ -5892,6 +5886,8 @@ var BaseActionInput = z38.object({
5892
5886
  originalActionId: UUID.optional(),
5893
5887
  // should not be part of base action.
5894
5888
  keepAssignment: z38.boolean().optional(),
5889
+ keepAssignmentIfAccepted: z38.boolean().optional(),
5890
+ keepAssignmentIfRejected: z38.boolean().optional(),
5895
5891
  waitFor: z38.boolean().optional(),
5896
5892
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5897
5893
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
@@ -6146,7 +6142,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
6146
6142
  createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
6147
6143
  acceptedAt: acceptAction.createdAt,
6148
6144
  createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
6149
- createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
6150
6145
  registrationNumber
6151
6146
  };
6152
6147
  }
@@ -6360,17 +6355,6 @@ function getAssignedUserFromActions(actions) {
6360
6355
  return user2;
6361
6356
  }, null);
6362
6357
  }
6363
- function getAssignedUserSignatureFromActions(actions) {
6364
- return actions.reduce((signature, action) => {
6365
- if (action.type === ActionType.ASSIGN) {
6366
- return action.createdBySignature || null;
6367
- }
6368
- if (action.type === ActionType.UNASSIGN) {
6369
- return null;
6370
- }
6371
- return signature;
6372
- }, null);
6373
- }
6374
6358
  function deepDropNulls(obj) {
6375
6359
  if (Array.isArray(obj)) {
6376
6360
  return obj.map(deepDropNulls);
@@ -6466,10 +6450,8 @@ function getCurrentEventState(event2, config) {
6466
6450
  createdBy: creationAction.createdBy,
6467
6451
  createdByUserType: creationAction.createdByUserType,
6468
6452
  createdAtLocation: creationAction.createdAtLocation,
6469
- createdBySignature: creationAction.createdBySignature,
6470
6453
  updatedAt: acceptedActionMetadata.createdAt,
6471
6454
  assignedTo: getAssignedUserFromActions(acceptedActions),
6472
- assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
6473
6455
  updatedBy: requestActionMetadata.createdBy,
6474
6456
  updatedAtLocation: requestActionMetadata.createdAtLocation,
6475
6457
  declaration,
@@ -9728,7 +9710,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
9728
9710
  createdBy: overrides.createdBy ?? generateUuid(rng),
9729
9711
  createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
9730
9712
  updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
9731
- createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
9732
9713
  updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
9733
9714
  assignedTo: overrides.assignedTo ?? null,
9734
9715
  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"));
@@ -2405,7 +2409,6 @@ var DEFAULT_SCOPE_OPTIONS = {
2405
2409
  };
2406
2410
 
2407
2411
  // ../commons/src/scopes.deprecated.do-not-use.ts
2408
- var z4 = __toESM(require("zod/v4"));
2409
2412
  var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
2410
2413
  var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
2411
2414
  var SearchScope = z4.object({
@@ -2639,6 +2642,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
2639
2642
  }
2640
2643
  throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
2641
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 decodeLegacyScope(legacy) {
2650
+ const encoded = legacyScopeToV2Scope(legacy);
2651
+ const scope = decodeScope(encoded);
2652
+ if (!scope) {
2653
+ throw new Error(
2654
+ `Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
2655
+ );
2656
+ }
2657
+ return { legacy, scope };
2658
+ }
2659
+ function groupByType(entries) {
2660
+ return entries.reduce(
2661
+ (groups, entry) => ({
2662
+ ...groups,
2663
+ [entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
2664
+ }),
2665
+ {}
2666
+ );
2667
+ }
2668
+ function deduplicateEntries(entries) {
2669
+ return entries.filter(
2670
+ (entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
2671
+ );
2672
+ }
2673
+ function mergeEntries(type, entries) {
2674
+ const optionsList = entries.map(
2675
+ (e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
2676
+ );
2677
+ const allKeys = optionsList.flatMap(
2678
+ (opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
2679
+ );
2680
+ const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
2681
+ if (conflictKey) {
2682
+ const conflicting = entries.filter(
2683
+ (e) => conflictKey in ("options" in e.scope && e.scope.options || {})
2684
+ ).map((e) => JSON.stringify(e.legacy));
2685
+ throw new Error(
2686
+ `Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
2687
+ );
2688
+ }
2689
+ const mergedOptions = Object.assign({}, ...optionsList);
2690
+ const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
2691
+ const parsed = Scope2.safeParse(merged);
2692
+ if (!parsed.success) {
2693
+ throw new Error(
2694
+ `Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
2695
+ );
2696
+ }
2697
+ return parsed.data;
2698
+ }
2699
+ function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
2700
+ const groups = groupByType(legacyScopes.map(decodeLegacyScope));
2701
+ return Object.entries(groups).flatMap(([type, entries]) => {
2702
+ const deduped = deduplicateEntries(entries);
2703
+ if (deduped.length <= 1) return deduped.map((e) => e.scope);
2704
+ if (!isMergeableUserScopeType(type)) {
2705
+ console.warn(
2706
+ `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.`
2707
+ );
2708
+ return deduped.map((e) => e.scope);
2709
+ }
2710
+ return [mergeEntries(type, deduped)];
2711
+ });
2712
+ }
2642
2713
 
2643
2714
  // src/migrations/v2.0/migrate-scopes.ts
2644
2715
  var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
@@ -2676,57 +2747,65 @@ function resolveLegacyScopeFromElement(element) {
2676
2747
  }
2677
2748
  function migrateScopesArrays(rolesFilePath, project) {
2678
2749
  const sourceFile = project.getSourceFile(rolesFilePath);
2679
- if (!sourceFile) return { migratedCount: 0, removedCount: 0 };
2750
+ if (!sourceFile) {
2751
+ return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
2752
+ }
2680
2753
  let migratedCount = 0;
2681
2754
  let removedCount = 0;
2755
+ let mergedCount = 0;
2682
2756
  const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
2757
+ const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
2683
2758
  for (const scopesProp of scopesProperties) {
2684
2759
  const initializer = scopesProp.getInitializer();
2685
2760
  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;
2761
+ const rawTexts = [];
2762
+ const legacyStrings = [];
2763
+ let anyChange = false;
2764
+ for (const element of initializer.getElements()) {
2690
2765
  const scopeKey = resolveScopeKeyFromElementAccess(element);
2691
2766
  if (scopeKey && !(scopeKey in SCOPES)) {
2692
2767
  console.warn(
2693
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
2768
+ ` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
2694
2769
  );
2695
- initializer.removeElement(index);
2696
2770
  removedCount++;
2771
+ anyChange = true;
2697
2772
  continue;
2698
2773
  }
2699
2774
  const legacyScope = resolveLegacyScopeFromElement(element);
2700
2775
  if (!legacyScope) {
2701
2776
  console.warn(
2702
- ` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
2777
+ ` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
2703
2778
  );
2779
+ rawTexts.push(element.getText());
2704
2780
  continue;
2705
2781
  }
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
- }
2782
+ legacyStrings.push(legacyScope);
2783
+ anyChange = true;
2784
+ }
2785
+ if (!anyChange) continue;
2786
+ let mergedScopes;
2787
+ try {
2788
+ mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
2789
+ } catch (error) {
2790
+ throw new Error(
2791
+ `[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
2792
+ { cause: error }
2793
+ );
2722
2794
  }
2795
+ migratedCount += legacyStrings.length;
2796
+ mergedCount += legacyStrings.length - mergedScopes.length;
2797
+ const outputElements = [
2798
+ ...rawTexts,
2799
+ ...mergedScopes.map((s) => JSON.stringify(s))
2800
+ ];
2801
+ scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
2723
2802
  }
2724
2803
  if (removedCount > 0) {
2725
2804
  console.log(
2726
- ` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
2805
+ ` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
2727
2806
  );
2728
2807
  }
2729
- return { migratedCount, removedCount };
2808
+ return { migratedCount, removedCount, mergedCount };
2730
2809
  }
2731
2810
  function ensureScopesHelpersImport(rolesFilePath, project) {
2732
2811
  const sourceFile = project.getSourceFile(rolesFilePath);
@@ -2861,7 +2940,7 @@ async function main11() {
2861
2940
  return;
2862
2941
  }
2863
2942
  const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
2864
- const { migratedCount, removedCount } = migrateScopesArrays(
2943
+ const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
2865
2944
  rolesFilePath,
2866
2945
  project
2867
2946
  );
@@ -2880,7 +2959,7 @@ async function main11() {
2880
2959
  }
2881
2960
  await sourceFile.save();
2882
2961
  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." : "."}`
2962
+ `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
2963
  );
2885
2964
  }
2886
2965
 
@@ -4764,9 +4843,9 @@ var import_path24 = require("path");
4764
4843
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4765
4844
  var INFRASTRUCTURE_DIR = "infrastructure";
4766
4845
  var BASE_BRANCH = "release-v1.9";
4767
- function gitShowBytes(ref, path23) {
4846
+ function gitShowBytes(ref, path24) {
4768
4847
  try {
4769
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4848
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
4770
4849
  cwd: process.cwd(),
4771
4850
  stdio: ["ignore", "pipe", "pipe"]
4772
4851
  });
@@ -4942,6 +5021,94 @@ async function main26({
4942
5021
  );
4943
5022
  }
4944
5023
 
5024
+ // src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
5025
+ var import_ts_morph22 = require("ts-morph");
5026
+ var import_path26 = __toESM(require("path"));
5027
+ var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
5028
+ var ACTION_PARAMETER_NAME = "action";
5029
+ var OLD_TYPE = "ActionInput";
5030
+ var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
5031
+ function isAcceptRequestedRegistrationParameter(parameter) {
5032
+ const functionDeclaration = parameter.getFirstAncestorByKind(
5033
+ import_ts_morph22.SyntaxKind.FunctionDeclaration
5034
+ );
5035
+ if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
5036
+ return true;
5037
+ }
5038
+ const arrowFunction = parameter.getFirstAncestorByKind(
5039
+ import_ts_morph22.SyntaxKind.ArrowFunction
5040
+ );
5041
+ const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
5042
+ import_ts_morph22.SyntaxKind.VariableDeclaration
5043
+ );
5044
+ return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
5045
+ }
5046
+ function processFile14(filePath, project) {
5047
+ const sourceFile = project.getSourceFile(filePath);
5048
+ if (!sourceFile) return 0;
5049
+ let updatedCount = 0;
5050
+ for (const parameter of sourceFile.getDescendantsOfKind(
5051
+ import_ts_morph22.SyntaxKind.Parameter
5052
+ )) {
5053
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
5054
+ continue;
5055
+ }
5056
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
5057
+ continue;
5058
+ }
5059
+ const typeNode = parameter.getTypeNode();
5060
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
5061
+ continue;
5062
+ }
5063
+ parameter.setType(NEW_TYPE);
5064
+ updatedCount++;
5065
+ console.log(
5066
+ ` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
5067
+ );
5068
+ }
5069
+ return updatedCount;
5070
+ }
5071
+ async function main27() {
5072
+ const srcDir = import_path26.default.join(process.cwd(), "src");
5073
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
5074
+ `);
5075
+ const project = new import_ts_morph22.Project({
5076
+ tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
5077
+ skipAddingFilesFromTsConfig: false
5078
+ });
5079
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
5080
+ const filePath = sf.getFilePath();
5081
+ return filePath.includes("/src/") && !filePath.includes("/node_modules/");
5082
+ });
5083
+ let totalUpdated = 0;
5084
+ const modifiedFiles = [];
5085
+ for (const sourceFile of sourceFiles) {
5086
+ const filePath = sourceFile.getFilePath();
5087
+ const updated = processFile14(filePath, project);
5088
+ if (updated > 0) {
5089
+ totalUpdated += updated;
5090
+ modifiedFiles.push(filePath);
5091
+ }
5092
+ }
5093
+ if (modifiedFiles.length === 0) {
5094
+ console.log(
5095
+ `No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
5096
+ );
5097
+ return;
5098
+ }
5099
+ console.log(`
5100
+ Saving ${modifiedFiles.length} modified file(s)...`);
5101
+ for (const filePath of modifiedFiles) {
5102
+ const sourceFile = project.getSourceFileOrThrow(filePath);
5103
+ await sourceFile.save();
5104
+ console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
5105
+ }
5106
+ console.log(
5107
+ `
5108
+ Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
5109
+ );
5110
+ }
5111
+
4945
5112
  // src/migrations/v2.0/index.ts
4946
5113
  var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
4947
5114
  async function runUpgrade(dockerSwarm) {
@@ -4968,6 +5135,7 @@ async function runUpgrade(dockerSwarm) {
4968
5135
  await main22();
4969
5136
  await main23();
4970
5137
  await main24();
5138
+ await main27();
4971
5139
  await main17();
4972
5140
  if (dockerSwarm) {
4973
5141
  await main25();
@@ -1 +1 @@
1
- {"version":3,"file":"migrate-scopes.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-scopes.ts"],"names":[],"mappings":"AAyVA,iBAAe,IAAI,kBAmDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"migrate-scopes.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-scopes.ts"],"names":[],"mappings":"AAoXA,iBAAe,IAAI,kBAmDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}