@opencrvs/toolkit 2.0.0-rc.d451982 → 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.
- package/dist/application-config/index.js +13 -25
- package/dist/cli.js +203 -35
- package/dist/commons/api/router.d.ts +3301 -247
- package/dist/commons/conditionals/validate.d.ts +1 -0
- package/dist/commons/events/ActionInput.d.ts +108 -0
- package/dist/commons/events/Draft.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +0 -3
- package/dist/commons/events/EventMetadata.d.ts +0 -7
- package/dist/commons/events/state/index.d.ts +0 -4
- package/dist/commons/events/state/utils.d.ts +0 -2
- package/dist/commons/events/utils.d.ts +1 -1
- package/dist/events/index.js +29 -55
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +201 -33
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +54 -30
- package/dist/notification/index.js +16 -25
- package/opencrvs-toolkit-2.0.0-rc.d603f53.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.d451982.tgz +0 -0
package/dist/events/index.js
CHANGED
|
@@ -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,
|
|
@@ -1414,28 +1413,20 @@ function schemaPriority(schema) {
|
|
|
1414
1413
|
return idx === -1 ? 9999 : idx;
|
|
1415
1414
|
}
|
|
1416
1415
|
function safeUnion(schemas) {
|
|
1416
|
+
const sortedSchemas = [...schemas].sort(
|
|
1417
|
+
(a, b) => schemaPriority(a) - schemaPriority(b)
|
|
1418
|
+
);
|
|
1417
1419
|
return z12.any().superRefine((val, ctx) => {
|
|
1418
|
-
const
|
|
1419
|
-
|
|
1420
|
-
|
|
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
|
-
});
|
|
1420
|
+
for (const schema of sortedSchemas) {
|
|
1421
|
+
if (schema.safeParse(val).success) {
|
|
1422
|
+
return;
|
|
1423
|
+
}
|
|
1438
1424
|
}
|
|
1425
|
+
ctx.addIssue({
|
|
1426
|
+
code: "invalid_type",
|
|
1427
|
+
expected: "custom",
|
|
1428
|
+
message: "Value does not match any schema"
|
|
1429
|
+
});
|
|
1439
1430
|
}).meta({
|
|
1440
1431
|
description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
|
|
1441
1432
|
});
|
|
@@ -1773,8 +1764,7 @@ var ActionCreationMetadata = z16.object({
|
|
|
1773
1764
|
),
|
|
1774
1765
|
createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
|
|
1775
1766
|
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.")
|
|
1767
|
+
createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
|
|
1778
1768
|
});
|
|
1779
1769
|
var RegistrationCreationMetadata = ActionCreationMetadata.extend({
|
|
1780
1770
|
registrationNumber: z16.string().describe(
|
|
@@ -1802,9 +1792,6 @@ var EventMetadata = z16.object({
|
|
|
1802
1792
|
createdAtLocation: UUID.nullish().describe(
|
|
1803
1793
|
"Location of the user who created the event."
|
|
1804
1794
|
),
|
|
1805
|
-
createdBySignature: DocumentPath.nullish().describe(
|
|
1806
|
-
"Signature of the user who created the event."
|
|
1807
|
-
),
|
|
1808
1795
|
updatedAtLocation: UUID.nullish().describe(
|
|
1809
1796
|
"Location of the user who last changed the status."
|
|
1810
1797
|
),
|
|
@@ -3804,6 +3791,9 @@ function precompileActionSchemas(eventConfigurations) {
|
|
|
3804
3791
|
function isAgeValue(value) {
|
|
3805
3792
|
return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
|
|
3806
3793
|
}
|
|
3794
|
+
function mergeWithBaseFormState(values, context) {
|
|
3795
|
+
return { ...context.baseFormState, ...values };
|
|
3796
|
+
}
|
|
3807
3797
|
function validate(schema, data) {
|
|
3808
3798
|
const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
|
|
3809
3799
|
if ("$form" in data) {
|
|
@@ -3842,7 +3832,7 @@ function isOnline() {
|
|
|
3842
3832
|
}
|
|
3843
3833
|
function isConditionMet(conditional, values, context, eventIndex) {
|
|
3844
3834
|
return validate(conditional, {
|
|
3845
|
-
$form: values,
|
|
3835
|
+
$form: mergeWithBaseFormState(values, context),
|
|
3846
3836
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3847
3837
|
$online: isOnline(),
|
|
3848
3838
|
$user: context.user,
|
|
@@ -3871,7 +3861,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
|
|
|
3871
3861
|
return true;
|
|
3872
3862
|
}
|
|
3873
3863
|
const validConditionals = getConditionalActionsForField(field3, {
|
|
3874
|
-
$form: form,
|
|
3864
|
+
$form: mergeWithBaseFormState(form, context),
|
|
3875
3865
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
3876
3866
|
$online: isOnline(),
|
|
3877
3867
|
$user: context.user,
|
|
@@ -4063,7 +4053,7 @@ function runFieldValidations({
|
|
|
4063
4053
|
return [];
|
|
4064
4054
|
}
|
|
4065
4055
|
const conditionalParameters = {
|
|
4066
|
-
$form: form,
|
|
4056
|
+
$form: mergeWithBaseFormState(form, context),
|
|
4067
4057
|
$now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
|
|
4068
4058
|
/**
|
|
4069
4059
|
* In real use cases, there can be hundreds of thousands of locations.
|
|
@@ -4307,17 +4297,16 @@ function isPageVisible(page, formValues, context) {
|
|
|
4307
4297
|
}
|
|
4308
4298
|
return isConditionMet(page.conditional, formValues, context);
|
|
4309
4299
|
}
|
|
4310
|
-
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false
|
|
4300
|
+
function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
|
|
4311
4301
|
const base = (0, import_lodash.cloneDeep)(formValues);
|
|
4312
4302
|
function fn(prevVisibilityContext) {
|
|
4313
|
-
const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
|
|
4314
4303
|
const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
|
|
4315
4304
|
const fieldConfig = fields.filter((f) => f.id === fieldId);
|
|
4316
4305
|
if (!fieldConfig.length) {
|
|
4317
4306
|
return false;
|
|
4318
4307
|
}
|
|
4319
4308
|
const isHidden = fieldConfig.every(
|
|
4320
|
-
(f) => !isFieldVisible(f,
|
|
4309
|
+
(f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
|
|
4321
4310
|
);
|
|
4322
4311
|
if (!isHidden) {
|
|
4323
4312
|
return false;
|
|
@@ -4335,7 +4324,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
|
|
|
4335
4324
|
const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4336
4325
|
const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
|
|
4337
4326
|
const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
|
|
4338
|
-
return hiddenFields.some((f) => f.id === fieldId);
|
|
4327
|
+
return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
|
|
4339
4328
|
});
|
|
4340
4329
|
return omitHiddenFields(
|
|
4341
4330
|
visibleFields,
|
|
@@ -4382,13 +4371,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
|
|
|
4382
4371
|
}
|
|
4383
4372
|
function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
|
|
4384
4373
|
const annotationFields = getActionAnnotationFields(actionConfig);
|
|
4385
|
-
return omitHiddenFields(
|
|
4386
|
-
|
|
4387
|
-
|
|
4388
|
-
|
|
4389
|
-
false,
|
|
4390
|
-
declaration
|
|
4391
|
-
);
|
|
4374
|
+
return omitHiddenFields(annotationFields, annotation, {
|
|
4375
|
+
...context,
|
|
4376
|
+
baseFormState: declaration
|
|
4377
|
+
});
|
|
4392
4378
|
}
|
|
4393
4379
|
function deepMerge(currentDocument, actionDocument) {
|
|
4394
4380
|
const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
|
|
@@ -5900,6 +5886,9 @@ var BaseActionInput = z38.object({
|
|
|
5900
5886
|
originalActionId: UUID.optional(),
|
|
5901
5887
|
// should not be part of base action.
|
|
5902
5888
|
keepAssignment: z38.boolean().optional(),
|
|
5889
|
+
keepAssignmentIfAccepted: z38.boolean().optional(),
|
|
5890
|
+
keepAssignmentIfRejected: z38.boolean().optional(),
|
|
5891
|
+
waitFor: z38.boolean().optional(),
|
|
5903
5892
|
// For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
|
|
5904
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.
|
|
5905
5894
|
createdAtLocation: UUID.nullish().describe(
|
|
@@ -6153,7 +6142,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
|
|
|
6153
6142
|
createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
|
|
6154
6143
|
acceptedAt: acceptAction.createdAt,
|
|
6155
6144
|
createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
|
|
6156
|
-
createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
|
|
6157
6145
|
registrationNumber
|
|
6158
6146
|
};
|
|
6159
6147
|
}
|
|
@@ -6367,17 +6355,6 @@ function getAssignedUserFromActions(actions) {
|
|
|
6367
6355
|
return user2;
|
|
6368
6356
|
}, null);
|
|
6369
6357
|
}
|
|
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
6358
|
function deepDropNulls(obj) {
|
|
6382
6359
|
if (Array.isArray(obj)) {
|
|
6383
6360
|
return obj.map(deepDropNulls);
|
|
@@ -6473,10 +6450,8 @@ function getCurrentEventState(event2, config) {
|
|
|
6473
6450
|
createdBy: creationAction.createdBy,
|
|
6474
6451
|
createdByUserType: creationAction.createdByUserType,
|
|
6475
6452
|
createdAtLocation: creationAction.createdAtLocation,
|
|
6476
|
-
createdBySignature: creationAction.createdBySignature,
|
|
6477
6453
|
updatedAt: acceptedActionMetadata.createdAt,
|
|
6478
6454
|
assignedTo: getAssignedUserFromActions(acceptedActions),
|
|
6479
|
-
assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
|
|
6480
6455
|
updatedBy: requestActionMetadata.createdBy,
|
|
6481
6456
|
updatedAtLocation: requestActionMetadata.createdAtLocation,
|
|
6482
6457
|
declaration,
|
|
@@ -9735,7 +9710,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
|
|
|
9735
9710
|
createdBy: overrides.createdBy ?? generateUuid(rng),
|
|
9736
9711
|
createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
|
|
9737
9712
|
updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
|
|
9738
|
-
createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
|
|
9739
9713
|
updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
|
|
9740
9714
|
assignedTo: overrides.assignedTo ?? null,
|
|
9741
9715
|
updatedBy: overrides.updatedBy ?? generateUuid(rng),
|
|
@@ -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":"
|
|
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,
|
|
1898
|
+
function resolveConfigChain(configObj, path24) {
|
|
1899
1899
|
let current = configObj;
|
|
1900
|
-
for (const key of
|
|
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)
|
|
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
|
|
2687
|
-
|
|
2688
|
-
|
|
2689
|
-
|
|
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
|
-
` [${
|
|
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
|
-
` [${
|
|
2777
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2703
2778
|
);
|
|
2779
|
+
rawTexts.push(element.getText());
|
|
2704
2780
|
continue;
|
|
2705
2781
|
}
|
|
2706
|
-
|
|
2707
|
-
|
|
2708
|
-
|
|
2709
|
-
|
|
2710
|
-
|
|
2711
|
-
|
|
2712
|
-
|
|
2713
|
-
|
|
2714
|
-
|
|
2715
|
-
|
|
2716
|
-
|
|
2717
|
-
|
|
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 '${
|
|
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,
|
|
4846
|
+
function gitShowBytes(ref, path24) {
|
|
4768
4847
|
try {
|
|
4769
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
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":"
|
|
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"}
|