@opencrvs/toolkit 2.0.0-rc.c0924af → 2.0.0-rc.c0a396f
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/README.md +15 -0
- package/build.sh +3 -2
- package/create-countryconfig/index.js +50 -20
- package/create-countryconfig/package.json +12 -2
- package/dist/application-config/index.js +274 -103
- package/dist/cli.js +3459 -77
- package/dist/commons/api/router.d.ts +3377 -234
- package/dist/commons/application-config/index.d.ts +1 -0
- package/dist/commons/conditionals/conditionals.d.ts +357 -7
- package/dist/commons/conditionals/validate.d.ts +52 -2
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/ActionDocument.d.ts +6 -0
- package/dist/commons/events/ActionInput.d.ts +114 -36
- package/dist/commons/events/AdvancedSearchConfig.d.ts +354 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/Draft.d.ts +4 -3
- package/dist/commons/events/EventConfig.d.ts +2 -0
- package/dist/commons/events/EventDocument.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +25 -3
- package/dist/commons/events/EventMetadata.d.ts +26 -7
- package/dist/commons/events/FieldConfig.d.ts +388 -50
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/FieldValue.d.ts +6 -0
- package/dist/commons/events/WorkqueueConfig.d.ts +189 -150
- package/dist/commons/events/field.d.ts +53 -1
- package/dist/commons/events/index.d.ts +2 -0
- package/dist/commons/events/locations.d.ts +1 -0
- package/dist/commons/events/state/flags.d.ts +16 -0
- package/dist/commons/events/state/index.d.ts +8 -4
- package/dist/commons/events/state/utils.d.ts +21 -289
- package/dist/commons/events/utils.d.ts +13 -2
- package/dist/conditionals/index.js +63 -5
- package/dist/environment/custom-types.d.ts +33 -0
- package/dist/environment/custom-types.d.ts.map +1 -0
- package/dist/environment/custom-types.js +12 -0
- package/dist/environment/derived-variables.d.ts +134 -0
- package/dist/environment/derived-variables.d.ts.map +1 -0
- package/dist/environment/derived-variables.js +169 -0
- package/dist/environment/editor-questions.d.ts +4 -0
- package/dist/environment/editor-questions.d.ts.map +1 -0
- package/dist/environment/editor-questions.js +67 -0
- package/dist/environment/git.d.ts +5 -0
- package/dist/environment/git.d.ts.map +1 -0
- package/dist/environment/git.js +38 -0
- package/dist/environment/github.d.ts +26 -0
- package/dist/environment/github.d.ts.map +1 -0
- package/dist/environment/github.js +247 -0
- package/dist/environment/index.d.ts +5 -0
- package/dist/environment/index.d.ts.map +1 -0
- package/dist/environment/index.js +71 -0
- package/dist/environment/logger.d.ts +15 -0
- package/dist/environment/logger.d.ts.map +1 -0
- package/dist/environment/logger.js +25 -0
- package/dist/environment/manage-users.d.ts +11 -0
- package/dist/environment/manage-users.d.ts.map +1 -0
- package/dist/environment/manage-users.js +497 -0
- package/dist/environment/questions-helper.d.ts +15 -0
- package/dist/environment/questions-helper.d.ts.map +1 -0
- package/dist/environment/questions-helper.js +70 -0
- package/dist/environment/questions.d.ts +199 -0
- package/dist/environment/questions.d.ts.map +1 -0
- package/dist/environment/questions.js +412 -0
- package/dist/environment/setup-environment.d.ts +2 -0
- package/dist/environment/setup-environment.d.ts.map +1 -0
- package/dist/environment/setup-environment.js +794 -0
- package/dist/environment/ssh-keygen.d.ts +5 -0
- package/dist/environment/ssh-keygen.d.ts.map +1 -0
- package/dist/environment/ssh-keygen.js +21 -0
- package/dist/environment/swarm-to-k8s.d.ts +2 -0
- package/dist/environment/swarm-to-k8s.d.ts.map +1 -0
- package/dist/environment/swarm-to-k8s.js +173 -0
- package/dist/environment/templates.d.ts +27 -0
- package/dist/environment/templates.d.ts.map +1 -0
- package/dist/environment/templates.js +163 -0
- package/dist/environment/update-workflows.d.ts +2 -0
- package/dist/environment/update-workflows.d.ts.map +1 -0
- package/dist/environment/update-workflows.js +169 -0
- package/dist/environment/users.d.ts +2 -0
- package/dist/environment/users.d.ts.map +1 -0
- package/dist/environment/users.js +112 -0
- package/dist/environment/utils.d.ts +18 -0
- package/dist/environment/utils.d.ts.map +1 -0
- package/dist/environment/utils.js +100 -0
- package/dist/events/index.js +1101 -269
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
- 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 +222 -41
- 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 +902 -140
- package/dist/scopes/index.d.ts +93 -7
- package/dist/scopes/index.js +20 -7
- package/dist/templates/charts-values/dependencies/values.override.yaml +4 -0
- package/dist/templates/charts-values/dependencies/values.yaml +83 -0
- package/dist/templates/charts-values/opencrvs-services/values.override.yaml +4 -0
- package/dist/templates/charts-values/opencrvs-services/values.yaml +81 -0
- package/dist/templates/charts-values/traefik/values.override.yaml +4 -0
- package/dist/templates/charts-values/traefik/values.yaml +115 -0
- package/dist/templates/inventory/inventory.template.yml +100 -0
- package/dist/templates/inventory/production.example.yml +77 -0
- package/dist/templates/inventory/qa.example.yml +48 -0
- package/opencrvs-toolkit-2.0.0-rc.c0a396f.tgz +0 -0
- package/package.json +20 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.c0924af.tgz +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
2
|
-
export declare const UPSTREAM_BRANCH = "release
|
|
2
|
+
export declare const UPSTREAM_BRANCH = "release/2.0.0";
|
|
3
3
|
/**
|
|
4
4
|
* Runs a git command in the country config working directory.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,kBAAkB,CAAA;AAc9C;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,MAAc,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAO9C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAMtC;AAID,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -59,7 +59,7 @@ exports.main = main;
|
|
|
59
59
|
*/
|
|
60
60
|
const child_process_1 = require("child_process");
|
|
61
61
|
exports.UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
|
|
62
|
-
exports.UPSTREAM_BRANCH = 'release
|
|
62
|
+
exports.UPSTREAM_BRANCH = 'release/2.0.0';
|
|
63
63
|
// Remote name used only for the duration of this codemod. Prefixed to avoid
|
|
64
64
|
// clashing with remotes the user may have (origin, upstream, etc.).
|
|
65
65
|
const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
|
|
@@ -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"));
|
|
@@ -2200,11 +2204,13 @@ var scopeOptionsPlaceEvent = z3.object({
|
|
|
2200
2204
|
event: scopeByEvent,
|
|
2201
2205
|
placeOfEvent: JurisdictionFilter.optional()
|
|
2202
2206
|
}).describe("Options applicable to all record scopes.");
|
|
2203
|
-
var
|
|
2207
|
+
var scopeOptionsDeclaredOrNotified = scopeOptionsPlaceEvent.extend({
|
|
2208
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
2209
|
+
notifiedBy: UserFilter.optional(),
|
|
2204
2210
|
declaredIn: JurisdictionFilter.optional(),
|
|
2205
2211
|
declaredBy: UserFilter.optional()
|
|
2206
2212
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
2207
|
-
var AllRecordScopeOptions =
|
|
2213
|
+
var AllRecordScopeOptions = scopeOptionsDeclaredOrNotified.extend({
|
|
2208
2214
|
registeredIn: JurisdictionFilter.optional(),
|
|
2209
2215
|
registeredBy: UserFilter.optional()
|
|
2210
2216
|
}).describe(
|
|
@@ -2242,6 +2248,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
|
|
|
2242
2248
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
2243
2249
|
);
|
|
2244
2250
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
2251
|
+
notifiedIn: UUID.nullish(),
|
|
2252
|
+
notifiedBy: z3.string().optional(),
|
|
2245
2253
|
declaredIn: UUID.nullish(),
|
|
2246
2254
|
declaredBy: z3.string().optional()
|
|
2247
2255
|
}).describe(
|
|
@@ -2287,7 +2295,7 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2287
2295
|
}),
|
|
2288
2296
|
z3.object({
|
|
2289
2297
|
type: ScopesWithDeclaredOptions,
|
|
2290
|
-
options:
|
|
2298
|
+
options: scopeOptionsDeclaredOrNotified.optional()
|
|
2291
2299
|
}),
|
|
2292
2300
|
z3.object({
|
|
2293
2301
|
type: ScopesWithFullOptions,
|
|
@@ -2390,22 +2398,30 @@ var encodeScope = (scope) => {
|
|
|
2390
2398
|
encode: false
|
|
2391
2399
|
});
|
|
2392
2400
|
};
|
|
2393
|
-
var
|
|
2394
|
-
|
|
2401
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
2402
|
+
var decodeScope = (encodedScope) => {
|
|
2403
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
2404
|
+
return decodedScopeCache.get(encodedScope);
|
|
2405
|
+
}
|
|
2406
|
+
const scope = qs.parse(encodedScope, {
|
|
2395
2407
|
ignoreQueryPrefix: true,
|
|
2396
2408
|
comma: true,
|
|
2397
2409
|
allowDots: true
|
|
2398
2410
|
});
|
|
2399
2411
|
const unflattenedScope = unflattenScope(scope);
|
|
2400
|
-
|
|
2412
|
+
const result = Scope2.safeParse(unflattenedScope)?.data;
|
|
2413
|
+
decodedScopeCache.set(encodedScope, result);
|
|
2414
|
+
return result;
|
|
2401
2415
|
};
|
|
2402
2416
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2403
2417
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2404
|
-
accessLevel: JurisdictionFilter.enum.all
|
|
2418
|
+
accessLevel: JurisdictionFilter.enum.all,
|
|
2419
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
2420
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
2421
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
2405
2422
|
};
|
|
2406
2423
|
|
|
2407
2424
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2408
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2409
2425
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2410
2426
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2411
2427
|
var SearchScope = z4.object({
|
|
@@ -2639,6 +2655,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2639
2655
|
}
|
|
2640
2656
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2641
2657
|
};
|
|
2658
|
+
var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
|
|
2659
|
+
function isMergeableUserScopeType(type) {
|
|
2660
|
+
return MERGEABLE_USER_SCOPE_TYPES.includes(type);
|
|
2661
|
+
}
|
|
2662
|
+
function decodeLegacyScope(legacy) {
|
|
2663
|
+
const encoded = legacyScopeToV2Scope(legacy);
|
|
2664
|
+
const scope = decodeScope(encoded);
|
|
2665
|
+
if (!scope) {
|
|
2666
|
+
throw new Error(
|
|
2667
|
+
`Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
|
|
2668
|
+
);
|
|
2669
|
+
}
|
|
2670
|
+
return { legacy, scope };
|
|
2671
|
+
}
|
|
2672
|
+
function groupByType(entries) {
|
|
2673
|
+
return entries.reduce(
|
|
2674
|
+
(groups, entry) => ({
|
|
2675
|
+
...groups,
|
|
2676
|
+
[entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
|
|
2677
|
+
}),
|
|
2678
|
+
{}
|
|
2679
|
+
);
|
|
2680
|
+
}
|
|
2681
|
+
function deduplicateEntries(entries) {
|
|
2682
|
+
return entries.filter(
|
|
2683
|
+
(entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
|
|
2684
|
+
);
|
|
2685
|
+
}
|
|
2686
|
+
function mergeEntries(type, entries) {
|
|
2687
|
+
const optionsList = entries.map(
|
|
2688
|
+
(e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
|
|
2689
|
+
);
|
|
2690
|
+
const allKeys = optionsList.flatMap(
|
|
2691
|
+
(opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
|
|
2692
|
+
);
|
|
2693
|
+
const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
|
|
2694
|
+
if (conflictKey) {
|
|
2695
|
+
const conflicting = entries.filter(
|
|
2696
|
+
(e) => conflictKey in ("options" in e.scope && e.scope.options || {})
|
|
2697
|
+
).map((e) => JSON.stringify(e.legacy));
|
|
2698
|
+
throw new Error(
|
|
2699
|
+
`Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
|
|
2700
|
+
);
|
|
2701
|
+
}
|
|
2702
|
+
const mergedOptions = Object.assign({}, ...optionsList);
|
|
2703
|
+
const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
|
|
2704
|
+
const parsed = Scope2.safeParse(merged);
|
|
2705
|
+
if (!parsed.success) {
|
|
2706
|
+
throw new Error(
|
|
2707
|
+
`Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
|
|
2708
|
+
);
|
|
2709
|
+
}
|
|
2710
|
+
return parsed.data;
|
|
2711
|
+
}
|
|
2712
|
+
function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
|
|
2713
|
+
const groups = groupByType(legacyScopes.map(decodeLegacyScope));
|
|
2714
|
+
return Object.entries(groups).flatMap(([type, entries]) => {
|
|
2715
|
+
const deduped = deduplicateEntries(entries);
|
|
2716
|
+
if (deduped.length <= 1) return deduped.map((e) => e.scope);
|
|
2717
|
+
if (!isMergeableUserScopeType(type)) {
|
|
2718
|
+
console.warn(
|
|
2719
|
+
`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.`
|
|
2720
|
+
);
|
|
2721
|
+
return deduped.map((e) => e.scope);
|
|
2722
|
+
}
|
|
2723
|
+
return [mergeEntries(type, deduped)];
|
|
2724
|
+
});
|
|
2725
|
+
}
|
|
2642
2726
|
|
|
2643
2727
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2644
2728
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2676,57 +2760,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2676
2760
|
}
|
|
2677
2761
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2678
2762
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2679
|
-
if (!sourceFile)
|
|
2763
|
+
if (!sourceFile) {
|
|
2764
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2765
|
+
}
|
|
2680
2766
|
let migratedCount = 0;
|
|
2681
2767
|
let removedCount = 0;
|
|
2768
|
+
let mergedCount = 0;
|
|
2682
2769
|
const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
2770
|
+
const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
|
|
2683
2771
|
for (const scopesProp of scopesProperties) {
|
|
2684
2772
|
const initializer = scopesProp.getInitializer();
|
|
2685
2773
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2686
|
-
const
|
|
2687
|
-
|
|
2688
|
-
|
|
2689
|
-
|
|
2774
|
+
const rawTexts = [];
|
|
2775
|
+
const legacyStrings = [];
|
|
2776
|
+
let anyChange = false;
|
|
2777
|
+
for (const element of initializer.getElements()) {
|
|
2690
2778
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2691
2779
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2692
2780
|
console.warn(
|
|
2693
|
-
` [${
|
|
2781
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2694
2782
|
);
|
|
2695
|
-
initializer.removeElement(index);
|
|
2696
2783
|
removedCount++;
|
|
2784
|
+
anyChange = true;
|
|
2697
2785
|
continue;
|
|
2698
2786
|
}
|
|
2699
2787
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2700
2788
|
if (!legacyScope) {
|
|
2701
2789
|
console.warn(
|
|
2702
|
-
` [${
|
|
2790
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2703
2791
|
);
|
|
2792
|
+
rawTexts.push(element.getText());
|
|
2704
2793
|
continue;
|
|
2705
2794
|
}
|
|
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
|
-
}
|
|
2795
|
+
legacyStrings.push(legacyScope);
|
|
2796
|
+
anyChange = true;
|
|
2797
|
+
}
|
|
2798
|
+
if (!anyChange) continue;
|
|
2799
|
+
let mergedScopes;
|
|
2800
|
+
try {
|
|
2801
|
+
mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
|
|
2802
|
+
} catch (error) {
|
|
2803
|
+
throw new Error(
|
|
2804
|
+
`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
|
|
2805
|
+
{ cause: error }
|
|
2806
|
+
);
|
|
2722
2807
|
}
|
|
2808
|
+
migratedCount += legacyStrings.length;
|
|
2809
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
2810
|
+
const outputElements = [
|
|
2811
|
+
...rawTexts,
|
|
2812
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
2813
|
+
];
|
|
2814
|
+
scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
|
|
2723
2815
|
}
|
|
2724
2816
|
if (removedCount > 0) {
|
|
2725
2817
|
console.log(
|
|
2726
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2818
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2727
2819
|
);
|
|
2728
2820
|
}
|
|
2729
|
-
return { migratedCount, removedCount };
|
|
2821
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2730
2822
|
}
|
|
2731
2823
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2732
2824
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2861,7 +2953,7 @@ async function main11() {
|
|
|
2861
2953
|
return;
|
|
2862
2954
|
}
|
|
2863
2955
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2864
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2956
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2865
2957
|
rolesFilePath,
|
|
2866
2958
|
project
|
|
2867
2959
|
);
|
|
@@ -2880,7 +2972,7 @@ async function main11() {
|
|
|
2880
2972
|
}
|
|
2881
2973
|
await sourceFile.save();
|
|
2882
2974
|
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." : "."}`
|
|
2975
|
+
`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
2976
|
);
|
|
2885
2977
|
}
|
|
2886
2978
|
|
|
@@ -4225,7 +4317,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4225
4317
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4226
4318
|
var import_child_process = require("child_process");
|
|
4227
4319
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4228
|
-
var UPSTREAM_BRANCH = "release
|
|
4320
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4229
4321
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4230
4322
|
var FILES_TO_CHECKOUT = [
|
|
4231
4323
|
"src/analytics/analytics.ts",
|
|
@@ -4764,9 +4856,9 @@ var import_path24 = require("path");
|
|
|
4764
4856
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4765
4857
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4766
4858
|
var BASE_BRANCH = "release-v1.9";
|
|
4767
|
-
function gitShowBytes(ref,
|
|
4859
|
+
function gitShowBytes(ref, path24) {
|
|
4768
4860
|
try {
|
|
4769
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
4861
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
4770
4862
|
cwd: process.cwd(),
|
|
4771
4863
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4772
4864
|
});
|
|
@@ -4942,6 +5034,94 @@ async function main26({
|
|
|
4942
5034
|
);
|
|
4943
5035
|
}
|
|
4944
5036
|
|
|
5037
|
+
// src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
|
|
5038
|
+
var import_ts_morph22 = require("ts-morph");
|
|
5039
|
+
var import_path26 = __toESM(require("path"));
|
|
5040
|
+
var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
|
|
5041
|
+
var ACTION_PARAMETER_NAME = "action";
|
|
5042
|
+
var OLD_TYPE = "ActionInput";
|
|
5043
|
+
var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
|
|
5044
|
+
function isAcceptRequestedRegistrationParameter(parameter) {
|
|
5045
|
+
const functionDeclaration = parameter.getFirstAncestorByKind(
|
|
5046
|
+
import_ts_morph22.SyntaxKind.FunctionDeclaration
|
|
5047
|
+
);
|
|
5048
|
+
if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
|
|
5049
|
+
return true;
|
|
5050
|
+
}
|
|
5051
|
+
const arrowFunction = parameter.getFirstAncestorByKind(
|
|
5052
|
+
import_ts_morph22.SyntaxKind.ArrowFunction
|
|
5053
|
+
);
|
|
5054
|
+
const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
|
|
5055
|
+
import_ts_morph22.SyntaxKind.VariableDeclaration
|
|
5056
|
+
);
|
|
5057
|
+
return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
|
|
5058
|
+
}
|
|
5059
|
+
function processFile14(filePath, project) {
|
|
5060
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
5061
|
+
if (!sourceFile) return 0;
|
|
5062
|
+
let updatedCount = 0;
|
|
5063
|
+
for (const parameter of sourceFile.getDescendantsOfKind(
|
|
5064
|
+
import_ts_morph22.SyntaxKind.Parameter
|
|
5065
|
+
)) {
|
|
5066
|
+
if (parameter.getName() !== ACTION_PARAMETER_NAME) {
|
|
5067
|
+
continue;
|
|
5068
|
+
}
|
|
5069
|
+
if (!isAcceptRequestedRegistrationParameter(parameter)) {
|
|
5070
|
+
continue;
|
|
5071
|
+
}
|
|
5072
|
+
const typeNode = parameter.getTypeNode();
|
|
5073
|
+
if (!typeNode || typeNode.getText() !== OLD_TYPE) {
|
|
5074
|
+
continue;
|
|
5075
|
+
}
|
|
5076
|
+
parameter.setType(NEW_TYPE);
|
|
5077
|
+
updatedCount++;
|
|
5078
|
+
console.log(
|
|
5079
|
+
` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
|
|
5080
|
+
);
|
|
5081
|
+
}
|
|
5082
|
+
return updatedCount;
|
|
5083
|
+
}
|
|
5084
|
+
async function main27() {
|
|
5085
|
+
const srcDir = import_path26.default.join(process.cwd(), "src");
|
|
5086
|
+
console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
|
|
5087
|
+
`);
|
|
5088
|
+
const project = new import_ts_morph22.Project({
|
|
5089
|
+
tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
|
|
5090
|
+
skipAddingFilesFromTsConfig: false
|
|
5091
|
+
});
|
|
5092
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
5093
|
+
const filePath = sf.getFilePath();
|
|
5094
|
+
return filePath.includes("/src/") && !filePath.includes("/node_modules/");
|
|
5095
|
+
});
|
|
5096
|
+
let totalUpdated = 0;
|
|
5097
|
+
const modifiedFiles = [];
|
|
5098
|
+
for (const sourceFile of sourceFiles) {
|
|
5099
|
+
const filePath = sourceFile.getFilePath();
|
|
5100
|
+
const updated = processFile14(filePath, project);
|
|
5101
|
+
if (updated > 0) {
|
|
5102
|
+
totalUpdated += updated;
|
|
5103
|
+
modifiedFiles.push(filePath);
|
|
5104
|
+
}
|
|
5105
|
+
}
|
|
5106
|
+
if (modifiedFiles.length === 0) {
|
|
5107
|
+
console.log(
|
|
5108
|
+
`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
|
|
5109
|
+
);
|
|
5110
|
+
return;
|
|
5111
|
+
}
|
|
5112
|
+
console.log(`
|
|
5113
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
5114
|
+
for (const filePath of modifiedFiles) {
|
|
5115
|
+
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
5116
|
+
await sourceFile.save();
|
|
5117
|
+
console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
|
|
5118
|
+
}
|
|
5119
|
+
console.log(
|
|
5120
|
+
`
|
|
5121
|
+
Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
|
|
5122
|
+
);
|
|
5123
|
+
}
|
|
5124
|
+
|
|
4945
5125
|
// src/migrations/v2.0/index.ts
|
|
4946
5126
|
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4947
5127
|
async function runUpgrade(dockerSwarm) {
|
|
@@ -4968,6 +5148,7 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4968
5148
|
await main22();
|
|
4969
5149
|
await main23();
|
|
4970
5150
|
await main24();
|
|
5151
|
+
await main27();
|
|
4971
5152
|
await main17();
|
|
4972
5153
|
if (dockerSwarm) {
|
|
4973
5154
|
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"}
|