@opencrvs/toolkit 2.0.0-rc.f281551 → 2.0.0-rc.f35a4ee
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/create-countryconfig/index.js +103 -0
- package/create-countryconfig/package.json +21 -0
- package/dist/application-config/index.js +259 -96
- package/dist/cli.js +1952 -347
- package/dist/commons/api/router.d.ts +3345 -272
- package/dist/commons/application-config/index.d.ts +16 -4
- package/dist/commons/conditionals/conditionals.d.ts +12 -6
- 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 +4 -2
- package/dist/commons/events/EventIndex.d.ts +0 -3
- package/dist/commons/events/EventMetadata.d.ts +0 -7
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/WorkqueueConfig.d.ts +150 -150
- package/dist/commons/events/index.d.ts +2 -0
- package/dist/commons/events/locations.d.ts +38 -1
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/commons/events/state/flags.d.ts +16 -0
- 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/conditionals/index.js +44 -8
- package/dist/events/index.js +862 -179
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +63 -39
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts +3 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.d.ts.map +1 -0
- package/dist/migrations/v2.0/add-resend-invite-notification.js +373 -0
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +19 -0
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +17 -14
- package/dist/migrations/v2.0/convert-config-files-to-ts.d.ts.map +1 -1
- package/dist/migrations/v2.0/convert-config-files-to-ts.js +4 -5
- package/dist/migrations/v2.0/convert-paragraph-to-heading.d.ts.map +1 -1
- package/dist/migrations/v2.0/convert-paragraph-to-heading.js +4 -5
- package/dist/migrations/v2.0/create-events-index.d.ts.map +1 -1
- package/dist/migrations/v2.0/create-events-index.js +1 -2
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +11 -0
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -0
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +123 -0
- 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 +10 -4
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +1920 -344
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
- package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +95 -7
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +13 -0
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -0
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +222 -0
- package/dist/migrations/v2.0/migrate-application-config-url.d.ts +3 -0
- package/dist/migrations/v2.0/migrate-application-config-url.d.ts.map +1 -0
- package/dist/migrations/v2.0/migrate-application-config-url.js +342 -0
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +55 -32
- package/dist/migrations/v2.0/migrate-validated-workqueue-status-to-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-validated-workqueue-status-to-flag.js +3 -4
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +143 -63
- package/dist/migrations/v2.0/remove-delete-actions.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-delete-actions.js +3 -4
- package/dist/migrations/v2.0/remove-demo-scope.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-demo-scope.js +2 -3
- package/dist/migrations/v2.0/remove-deprecated-imports.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-deprecated-imports.js +3 -4
- package/dist/migrations/v2.0/remove-fhir-url-helpers.d.ts +3 -0
- package/dist/migrations/v2.0/remove-fhir-url-helpers.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-fhir-url-helpers.js +163 -0
- package/dist/migrations/v2.0/remove-hearth-migrations.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-hearth-migrations.js +1 -2
- package/dist/migrations/v2.0/remove-old-statistics-service.d.ts +3 -0
- package/dist/migrations/v2.0/remove-old-statistics-service.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-old-statistics-service.js +356 -0
- package/dist/migrations/v2.0/remove-pending-certification-flag.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-pending-certification-flag.js +3 -4
- package/dist/migrations/v2.0/remove-review-from-register-action.d.ts.map +1 -1
- package/dist/migrations/v2.0/remove-review-from-register-action.js +3 -4
- package/dist/migrations/v2.0/remove-unused-environment-variables.d.ts +3 -0
- package/dist/migrations/v2.0/remove-unused-environment-variables.d.ts.map +1 -0
- package/dist/migrations/v2.0/remove-unused-environment-variables.js +186 -0
- package/dist/migrations/v2.0/rename-api-paths.d.ts.map +1 -1
- package/dist/migrations/v2.0/rename-api-paths.js +3 -4
- package/dist/migrations/v2.0/rename-location-parent-id.d.ts.map +1 -1
- package/dist/migrations/v2.0/rename-location-parent-id.js +3 -4
- package/dist/migrations/v2.0/simplify-analytics-precalculations.d.ts.map +1 -1
- package/dist/migrations/v2.0/simplify-analytics-precalculations.js +1 -2
- package/dist/migrations/v2.0/update-package-json.d.ts +3 -0
- package/dist/migrations/v2.0/update-package-json.d.ts.map +1 -0
- package/dist/migrations/v2.0/update-package-json.js +105 -0
- package/dist/notification/index.js +689 -124
- package/dist/scopes/index.d.ts +87 -10
- package/dist/scopes/index.js +46 -9
- package/opencrvs-toolkit-2.0.0-rc.f35a4ee.tgz +0 -0
- package/package.json +6 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.f281551.tgz +0 -0
|
@@ -0,0 +1,342 @@
|
|
|
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: Replace usages of the legacy `APPLICATION_CONFIG_URL` env-derived
|
|
28
|
+
* constant with direct usage of the v2.0 `applicationConfig` object.
|
|
29
|
+
*
|
|
30
|
+
* Background:
|
|
31
|
+
* In v1.9 country configs read application configuration over HTTP from
|
|
32
|
+
* the config service via `APPLICATION_CONFIG_URL`. In v2.0 the config is
|
|
33
|
+
* defined statically in `src/api/application/application-config.ts` (as
|
|
34
|
+
* `applicationConfig`) and consumed by import.
|
|
35
|
+
*
|
|
36
|
+
* What it does (per source file under `src/`):
|
|
37
|
+
* 1. If the file imports `APPLICATION_CONFIG_URL` (from any module), the
|
|
38
|
+
* named import is removed; if that leaves the import declaration empty,
|
|
39
|
+
* the whole declaration is removed.
|
|
40
|
+
* 2. An import of `applicationConfig` from
|
|
41
|
+
* `@countryconfig/api/application/application-config` is added
|
|
42
|
+
* (idempotent — re-uses an existing import declaration if one exists).
|
|
43
|
+
* 3. Block-bodied functions whose body references *both*
|
|
44
|
+
* `APPLICATION_CONFIG_URL` *and* a `fetch(...)` call are recognised
|
|
45
|
+
* as "config-fetcher" functions. Their entire body is replaced with
|
|
46
|
+
* `return applicationConfig` — eliminating the URL construction,
|
|
47
|
+
* `fetch`, JSON parsing, and unwrapping of `.config`. Callers
|
|
48
|
+
* (`await getApplicationConfig()` etc.) keep working because async
|
|
49
|
+
* functions still wrap the return value in a `Promise`.
|
|
50
|
+
* 4. Any remaining bare identifier references to `APPLICATION_CONFIG_URL`
|
|
51
|
+
* are renamed to `applicationConfig`. Property names (e.g.
|
|
52
|
+
* `obj.APPLICATION_CONFIG_URL` or `{ APPLICATION_CONFIG_URL: x }`)
|
|
53
|
+
* are left alone.
|
|
54
|
+
*
|
|
55
|
+
* Caveats:
|
|
56
|
+
* - Wholesale body replacement of config-fetcher functions destroys any
|
|
57
|
+
* custom logic the country had inlined there (error handling, derived
|
|
58
|
+
* fields, etc.). Each rewrite is logged so the developer can review
|
|
59
|
+
* the diff and re-apply customisations on top of `applicationConfig`.
|
|
60
|
+
* - The shape of v2.0 `applicationConfig` is not identical to the v1.9
|
|
61
|
+
* `IApplicationConfigResponse.config` — callers that destructured
|
|
62
|
+
* v1.9-only fields will produce TypeScript errors and need manual
|
|
63
|
+
* review.
|
|
64
|
+
* - Files that have a local declaration named `applicationConfig` are
|
|
65
|
+
* skipped to avoid a name collision; a warning is logged so the
|
|
66
|
+
* developer can resolve it manually.
|
|
67
|
+
* - Files that reference `APPLICATION_CONFIG_URL` *without* importing it
|
|
68
|
+
* (e.g. as a local variable) are skipped — we only rewrite imported
|
|
69
|
+
* usages.
|
|
70
|
+
* - Concise-body arrow functions (`() => fetch(...)`) are not
|
|
71
|
+
* body-rewritten — only their identifier is renamed in step 4. If a
|
|
72
|
+
* country happens to inline the fetch in concise form, the result
|
|
73
|
+
* will need manual cleanup.
|
|
74
|
+
*/
|
|
75
|
+
const path_1 = __importDefault(require("path"));
|
|
76
|
+
const ts_morph_1 = require("ts-morph");
|
|
77
|
+
const TARGET_IDENTIFIER = 'APPLICATION_CONFIG_URL';
|
|
78
|
+
const REPLACEMENT_IDENTIFIER = 'applicationConfig';
|
|
79
|
+
const REPLACEMENT_MODULE = '@countryconfig/api/application/application-config';
|
|
80
|
+
/**
|
|
81
|
+
* Function-like syntax kinds whose `body` we know how to replace via
|
|
82
|
+
* `setBodyText` (i.e. block-bodied callables).
|
|
83
|
+
*/
|
|
84
|
+
const FUNCTION_LIKE_KINDS = [
|
|
85
|
+
ts_morph_1.SyntaxKind.FunctionDeclaration,
|
|
86
|
+
ts_morph_1.SyntaxKind.FunctionExpression,
|
|
87
|
+
ts_morph_1.SyntaxKind.ArrowFunction,
|
|
88
|
+
ts_morph_1.SyntaxKind.MethodDeclaration
|
|
89
|
+
];
|
|
90
|
+
/**
|
|
91
|
+
* Returns the name of the function-like node for logging purposes.
|
|
92
|
+
* Falls back to `<anonymous>` when nothing useful can be derived.
|
|
93
|
+
*/
|
|
94
|
+
function describeFunction(node) {
|
|
95
|
+
var _a, _b, _c;
|
|
96
|
+
if (ts_morph_1.Node.isFunctionDeclaration(node) || ts_morph_1.Node.isMethodDeclaration(node)) {
|
|
97
|
+
return (_a = node.getName()) !== null && _a !== void 0 ? _a : '<anonymous>';
|
|
98
|
+
}
|
|
99
|
+
// FunctionExpression / ArrowFunction: try to pick up the assignment target.
|
|
100
|
+
const parent = node.getParent();
|
|
101
|
+
if (parent && ts_morph_1.Node.isVariableDeclaration(parent)) {
|
|
102
|
+
return parent.getName();
|
|
103
|
+
}
|
|
104
|
+
if (parent && ts_morph_1.Node.isPropertyAssignment(parent)) {
|
|
105
|
+
return parent.getName();
|
|
106
|
+
}
|
|
107
|
+
if (ts_morph_1.Node.isFunctionExpression(node) &&
|
|
108
|
+
node.getNameNode() !== undefined) {
|
|
109
|
+
return (_c = (_b = node.getNameNode()) === null || _b === void 0 ? void 0 : _b.getText()) !== null && _c !== void 0 ? _c : '<anonymous>';
|
|
110
|
+
}
|
|
111
|
+
return '<anonymous>';
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* True when the node has a block body that we can safely replace via
|
|
115
|
+
* `setBodyText` (excludes concise-body arrow functions like `() => 1`).
|
|
116
|
+
*/
|
|
117
|
+
function hasBlockBody(node) {
|
|
118
|
+
if (ts_morph_1.Node.isFunctionDeclaration(node) ||
|
|
119
|
+
ts_morph_1.Node.isFunctionExpression(node) ||
|
|
120
|
+
ts_morph_1.Node.isMethodDeclaration(node)) {
|
|
121
|
+
return node.getBody() !== undefined;
|
|
122
|
+
}
|
|
123
|
+
if (ts_morph_1.Node.isArrowFunction(node)) {
|
|
124
|
+
return node.getBody().getKind() === ts_morph_1.SyntaxKind.Block;
|
|
125
|
+
}
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* True when the node's body references `APPLICATION_CONFIG_URL` AND
|
|
130
|
+
* contains at least one `fetch(...)` call — the "config-fetcher" signature.
|
|
131
|
+
*/
|
|
132
|
+
function isConfigFetcher(node) {
|
|
133
|
+
let referencesTarget = false;
|
|
134
|
+
let callsFetch = false;
|
|
135
|
+
for (const id of node.getDescendantsOfKind(ts_morph_1.SyntaxKind.Identifier)) {
|
|
136
|
+
const text = id.getText();
|
|
137
|
+
if (!referencesTarget && text === TARGET_IDENTIFIER)
|
|
138
|
+
referencesTarget = true;
|
|
139
|
+
if (!callsFetch && text === 'fetch') {
|
|
140
|
+
// Only count `fetch(` calls, not bare references like
|
|
141
|
+
// `const f = fetch` (rare, but pedantic).
|
|
142
|
+
const parent = id.getParent();
|
|
143
|
+
if (ts_morph_1.Node.isCallExpression(parent) &&
|
|
144
|
+
parent.getExpression() === id) {
|
|
145
|
+
callsFetch = true;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
if (referencesTarget && callsFetch)
|
|
149
|
+
return true;
|
|
150
|
+
}
|
|
151
|
+
return false;
|
|
152
|
+
}
|
|
153
|
+
function processFile(sourceFile) {
|
|
154
|
+
const importsWithTarget = sourceFile
|
|
155
|
+
.getImportDeclarations()
|
|
156
|
+
.filter((decl) => decl.getNamedImports().some((ni) => ni.getName() === TARGET_IDENTIFIER));
|
|
157
|
+
if (importsWithTarget.length === 0) {
|
|
158
|
+
return { changed: false, rewrittenFunctions: [], renamedReferences: 0 };
|
|
159
|
+
}
|
|
160
|
+
// Bail out if a same-named local would collide with the new identifier.
|
|
161
|
+
// Imported `applicationConfig` doesn't count as a local declaration.
|
|
162
|
+
const collidingLocals = sourceFile
|
|
163
|
+
.getDescendantsOfKind(ts_morph_1.SyntaxKind.Identifier)
|
|
164
|
+
.filter((id) => id.getText() === REPLACEMENT_IDENTIFIER)
|
|
165
|
+
.filter((id) => {
|
|
166
|
+
const parent = id.getParent();
|
|
167
|
+
const kind = parent.getKind();
|
|
168
|
+
return (kind === ts_morph_1.SyntaxKind.VariableDeclaration ||
|
|
169
|
+
kind === ts_morph_1.SyntaxKind.FunctionDeclaration ||
|
|
170
|
+
kind === ts_morph_1.SyntaxKind.ClassDeclaration ||
|
|
171
|
+
kind === ts_morph_1.SyntaxKind.Parameter);
|
|
172
|
+
});
|
|
173
|
+
if (collidingLocals.length > 0) {
|
|
174
|
+
return {
|
|
175
|
+
changed: false,
|
|
176
|
+
rewrittenFunctions: [],
|
|
177
|
+
renamedReferences: 0,
|
|
178
|
+
skippedReason: `local declaration named '${REPLACEMENT_IDENTIFIER}' would collide`
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
// ─── 1. Rewrite "config-fetcher" function bodies ───────────────────────
|
|
182
|
+
// We only replace block-bodied functions that reference both
|
|
183
|
+
// APPLICATION_CONFIG_URL and `fetch(...)`. The bodies are replaced with
|
|
184
|
+
// `return applicationConfig`, which works for both sync and async
|
|
185
|
+
// functions (the latter automatically wraps the value in a Promise).
|
|
186
|
+
const candidateFunctions = FUNCTION_LIKE_KINDS.flatMap((kind) => sourceFile.getDescendantsOfKind(kind));
|
|
187
|
+
// Outermost-first: when functions are nested, rewriting the outer one
|
|
188
|
+
// also discards the inner one, so we shouldn't try to rewrite the inner
|
|
189
|
+
// afterwards. Sorting by start position handles this; we additionally
|
|
190
|
+
// filter out any candidate whose ancestor we already rewrote.
|
|
191
|
+
candidateFunctions.sort((a, b) => a.getStart() - b.getStart());
|
|
192
|
+
const rewrittenFunctions = [];
|
|
193
|
+
const rewrittenSet = new Set();
|
|
194
|
+
for (const fn of candidateFunctions) {
|
|
195
|
+
if (!hasBlockBody(fn))
|
|
196
|
+
continue;
|
|
197
|
+
if (!isConfigFetcher(fn))
|
|
198
|
+
continue;
|
|
199
|
+
// Skip if any ancestor was already rewritten (its descendants are now
|
|
200
|
+
// detached from the source file).
|
|
201
|
+
let inRewrittenAncestor = false;
|
|
202
|
+
let cursor = fn.getParent();
|
|
203
|
+
while (cursor) {
|
|
204
|
+
if (rewrittenSet.has(cursor)) {
|
|
205
|
+
inRewrittenAncestor = true;
|
|
206
|
+
break;
|
|
207
|
+
}
|
|
208
|
+
cursor = cursor.getParent();
|
|
209
|
+
}
|
|
210
|
+
if (inRewrittenAncestor)
|
|
211
|
+
continue;
|
|
212
|
+
const start = fn.getStart();
|
|
213
|
+
const line = sourceFile.getLineAndColumnAtPos(start).line;
|
|
214
|
+
const name = describeFunction(fn);
|
|
215
|
+
if (ts_morph_1.Node.isFunctionDeclaration(fn) ||
|
|
216
|
+
ts_morph_1.Node.isFunctionExpression(fn) ||
|
|
217
|
+
ts_morph_1.Node.isMethodDeclaration(fn) ||
|
|
218
|
+
ts_morph_1.Node.isArrowFunction(fn)) {
|
|
219
|
+
fn.setBodyText(`return ${REPLACEMENT_IDENTIFIER}`);
|
|
220
|
+
}
|
|
221
|
+
rewrittenFunctions.push({ name, line });
|
|
222
|
+
rewrittenSet.add(fn);
|
|
223
|
+
}
|
|
224
|
+
// ─── 2. Remove the `APPLICATION_CONFIG_URL` import ─────────────────────
|
|
225
|
+
for (const decl of importsWithTarget) {
|
|
226
|
+
const targetNamed = decl
|
|
227
|
+
.getNamedImports()
|
|
228
|
+
.find((ni) => ni.getName() === TARGET_IDENTIFIER);
|
|
229
|
+
targetNamed === null || targetNamed === void 0 ? void 0 : targetNamed.remove();
|
|
230
|
+
const isNowEmpty = decl.getNamedImports().length === 0 &&
|
|
231
|
+
!decl.getDefaultImport() &&
|
|
232
|
+
!decl.getNamespaceImport();
|
|
233
|
+
if (isNowEmpty)
|
|
234
|
+
decl.remove();
|
|
235
|
+
}
|
|
236
|
+
// ─── 3. Add the new `applicationConfig` import ─────────────────────────
|
|
237
|
+
const existing = sourceFile.getImportDeclaration((decl) => decl.getModuleSpecifierValue() === REPLACEMENT_MODULE);
|
|
238
|
+
if (existing) {
|
|
239
|
+
const alreadyImported = existing
|
|
240
|
+
.getNamedImports()
|
|
241
|
+
.some((ni) => ni.getName() === REPLACEMENT_IDENTIFIER);
|
|
242
|
+
if (!alreadyImported)
|
|
243
|
+
existing.addNamedImport(REPLACEMENT_IDENTIFIER);
|
|
244
|
+
}
|
|
245
|
+
else {
|
|
246
|
+
sourceFile.addImportDeclaration({
|
|
247
|
+
moduleSpecifier: REPLACEMENT_MODULE,
|
|
248
|
+
namedImports: [REPLACEMENT_IDENTIFIER]
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
// ─── 4. Rename remaining identifier references ─────────────────────────
|
|
252
|
+
// Anything still named APPLICATION_CONFIG_URL after the function-body
|
|
253
|
+
// rewrites and import cleanup is a stray reference; rename it. Iterate
|
|
254
|
+
// from highest position to lowest so `replaceWithText` doesn't shift
|
|
255
|
+
// offsets for nodes we haven't visited yet.
|
|
256
|
+
const renameTargets = sourceFile
|
|
257
|
+
.getDescendantsOfKind(ts_morph_1.SyntaxKind.Identifier)
|
|
258
|
+
.filter((id) => id.getText() === TARGET_IDENTIFIER)
|
|
259
|
+
.filter((id) => !id.getFirstAncestorByKind(ts_morph_1.SyntaxKind.ImportDeclaration))
|
|
260
|
+
.filter((id) => {
|
|
261
|
+
const parent = id.getParent();
|
|
262
|
+
const parentKind = parent.getKind();
|
|
263
|
+
if (parentKind === ts_morph_1.SyntaxKind.PropertyAccessExpression) {
|
|
264
|
+
const pae = parent.asKind(ts_morph_1.SyntaxKind.PropertyAccessExpression);
|
|
265
|
+
// Right-hand side of `x.APPLICATION_CONFIG_URL` — leave alone.
|
|
266
|
+
if (pae.getNameNode() === id)
|
|
267
|
+
return false;
|
|
268
|
+
}
|
|
269
|
+
if (parentKind === ts_morph_1.SyntaxKind.PropertyAssignment) {
|
|
270
|
+
const pa = parent.asKind(ts_morph_1.SyntaxKind.PropertyAssignment);
|
|
271
|
+
// `{ APPLICATION_CONFIG_URL: ... }` — leave the key alone.
|
|
272
|
+
if (pa.getNameNode() === id)
|
|
273
|
+
return false;
|
|
274
|
+
}
|
|
275
|
+
if (parentKind === ts_morph_1.SyntaxKind.ShorthandPropertyAssignment) {
|
|
276
|
+
// `{ APPLICATION_CONFIG_URL }` shorthand — both binding name AND
|
|
277
|
+
// referenced symbol. Leave alone here; if the user wants to rename
|
|
278
|
+
// the referenced value they should expand it manually first.
|
|
279
|
+
return false;
|
|
280
|
+
}
|
|
281
|
+
return true;
|
|
282
|
+
})
|
|
283
|
+
.sort((a, b) => b.getPos() - a.getPos());
|
|
284
|
+
for (const id of renameTargets) {
|
|
285
|
+
id.replaceWithText(REPLACEMENT_IDENTIFIER);
|
|
286
|
+
}
|
|
287
|
+
return {
|
|
288
|
+
changed: true,
|
|
289
|
+
rewrittenFunctions,
|
|
290
|
+
renamedReferences: renameTargets.length
|
|
291
|
+
};
|
|
292
|
+
}
|
|
293
|
+
function main() {
|
|
294
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
295
|
+
const project = new ts_morph_1.Project({
|
|
296
|
+
tsConfigFilePath: path_1.default.resolve(process.cwd(), 'tsconfig.json'),
|
|
297
|
+
skipAddingFilesFromTsConfig: false
|
|
298
|
+
});
|
|
299
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
300
|
+
const fp = sf.getFilePath();
|
|
301
|
+
return fp.includes('/src/') && !fp.includes('/node_modules/');
|
|
302
|
+
});
|
|
303
|
+
console.log(`Migrating '${TARGET_IDENTIFIER}' → '${REPLACEMENT_IDENTIFIER}' across ${sourceFiles.length} source file(s)...\n`);
|
|
304
|
+
let changedFiles = 0;
|
|
305
|
+
let totalRewrittenFunctions = 0;
|
|
306
|
+
let totalRenamedReferences = 0;
|
|
307
|
+
const skipped = [];
|
|
308
|
+
for (const sourceFile of sourceFiles) {
|
|
309
|
+
const filePath = sourceFile.getFilePath();
|
|
310
|
+
const rel = path_1.default.relative(process.cwd(), filePath);
|
|
311
|
+
const result = processFile(sourceFile);
|
|
312
|
+
if (result.skippedReason) {
|
|
313
|
+
skipped.push(`${rel} (${result.skippedReason})`);
|
|
314
|
+
continue;
|
|
315
|
+
}
|
|
316
|
+
if (!result.changed)
|
|
317
|
+
continue;
|
|
318
|
+
yield sourceFile.save();
|
|
319
|
+
changedFiles++;
|
|
320
|
+
totalRewrittenFunctions += result.rewrittenFunctions.length;
|
|
321
|
+
totalRenamedReferences += result.renamedReferences;
|
|
322
|
+
for (const fn of result.rewrittenFunctions) {
|
|
323
|
+
console.log(` [${rel}:${fn.line}] Rewrote '${fn.name}' body → 'return ${REPLACEMENT_IDENTIFIER}' (config fetch eliminated)`);
|
|
324
|
+
}
|
|
325
|
+
if (result.renamedReferences > 0) {
|
|
326
|
+
console.log(` [${rel}] Renamed ${result.renamedReferences} stray reference(s) ${TARGET_IDENTIFIER} → ${REPLACEMENT_IDENTIFIER}`);
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
if (skipped.length > 0) {
|
|
330
|
+
console.warn(`\n ${skipped.length} file(s) skipped:\n` +
|
|
331
|
+
skipped.map((s) => ` - ${s}`).join('\n'));
|
|
332
|
+
}
|
|
333
|
+
if (changedFiles === 0) {
|
|
334
|
+
console.log(`\nNo files reference '${TARGET_IDENTIFIER}'. Nothing to do.`);
|
|
335
|
+
return;
|
|
336
|
+
}
|
|
337
|
+
console.log(`\nDone. Updated ${changedFiles} file(s): ${totalRewrittenFunctions} fetch function(s) rewritten, ${totalRenamedReferences} bare reference(s) renamed.`);
|
|
338
|
+
if (totalRewrittenFunctions > 0) {
|
|
339
|
+
console.log(`NOTE: rewriting fetch functions discards any custom logic that lived inside them. Review the diff and re-apply any country-specific adjustments on top of '${REPLACEMENT_IDENTIFIER}'.`);
|
|
340
|
+
}
|
|
341
|
+
});
|
|
342
|
+
}
|
|
@@ -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"}
|
|
@@ -25,9 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
25
25
|
exports.main = main;
|
|
26
26
|
const ts_morph_1 = require("ts-morph");
|
|
27
27
|
const path_1 = __importDefault(require("path"));
|
|
28
|
-
const scopes_1 = require("../commons/scopes");
|
|
29
28
|
const scopes_deprecated_do_not_use_1 = require("../commons/scopes.deprecated.do-not-use");
|
|
30
|
-
const _1 = require(".");
|
|
31
29
|
const ROLES_FILE_RELATIVE_PATH = 'src/data-seeding/roles/roles.ts';
|
|
32
30
|
const SCOPES_PROPERTY_NAME = 'scopes';
|
|
33
31
|
const TOOLKIT_SCOPES_MODULE = '@opencrvs/toolkit/scopes';
|
|
@@ -66,60 +64,85 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
66
64
|
}
|
|
67
65
|
return null;
|
|
68
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* Walks each `scopes: [...]` array in the roles file, classifies elements,
|
|
69
|
+
* and rewrites the whole array using `migrateLegacyScopesArrayToV2Scopes`
|
|
70
|
+
* (which preserves v1.9 AND semantics by merging pairs of legacy scopes
|
|
71
|
+
* that targeted the same v2 type). See issue #12489.
|
|
72
|
+
*
|
|
73
|
+
* Elements are partitioned into three kinds:
|
|
74
|
+
* - drop: `SCOPES.X` references where X is not in the SCOPES map (warned
|
|
75
|
+
* and removed, matching pre-refactor behavior).
|
|
76
|
+
* - raw: non-literal expressions we cannot statically resolve (e.g.
|
|
77
|
+
* `...sharedScopes` spreads). Preserved verbatim in output so authoring
|
|
78
|
+
* intent isn't lost.
|
|
79
|
+
* - legacy: literal strings or resolvable `SCOPES.X` references.
|
|
80
|
+
* Collected and passed as a batch to the merge function.
|
|
81
|
+
*
|
|
82
|
+
* The output array text is `[...rawTexts, ...mergedScopesAsJson]`. Order of
|
|
83
|
+
* legacy entries relative to raw expressions is not preserved — scopes in a
|
|
84
|
+
* v2 array compose with OR, so position is semantically irrelevant.
|
|
85
|
+
*/
|
|
69
86
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
70
87
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
71
|
-
if (!sourceFile)
|
|
72
|
-
return { migratedCount: 0, removedCount: 0 };
|
|
88
|
+
if (!sourceFile) {
|
|
89
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
90
|
+
}
|
|
73
91
|
let migratedCount = 0;
|
|
74
92
|
let removedCount = 0;
|
|
93
|
+
let mergedCount = 0;
|
|
75
94
|
const scopesProperties = sourceFile
|
|
76
95
|
.getDescendantsOfKind(ts_morph_1.SyntaxKind.PropertyAssignment)
|
|
77
96
|
.filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
97
|
+
const relPath = path_1.default.relative(process.cwd(), rolesFilePath);
|
|
78
98
|
for (const scopesProp of scopesProperties) {
|
|
79
99
|
const initializer = scopesProp.getInitializer();
|
|
80
100
|
if (!initializer || !ts_morph_1.Node.isArrayLiteralExpression(initializer))
|
|
81
101
|
continue;
|
|
82
|
-
const
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
continue;
|
|
102
|
+
const rawTexts = [];
|
|
103
|
+
const legacyStrings = [];
|
|
104
|
+
let anyChange = false;
|
|
105
|
+
for (const element of initializer.getElements()) {
|
|
87
106
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
88
107
|
if (scopeKey && !(scopeKey in scopes_deprecated_do_not_use_1.SCOPES)) {
|
|
89
108
|
// eslint-disable-next-line no-console
|
|
90
|
-
console.warn(` [${
|
|
91
|
-
initializer.removeElement(index);
|
|
109
|
+
console.warn(` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`);
|
|
92
110
|
removedCount++;
|
|
111
|
+
anyChange = true;
|
|
93
112
|
continue;
|
|
94
113
|
}
|
|
95
114
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
96
115
|
if (!legacyScope) {
|
|
97
116
|
// eslint-disable-next-line no-console
|
|
98
|
-
console.warn(` [${
|
|
117
|
+
console.warn(` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`);
|
|
118
|
+
rawTexts.push(element.getText());
|
|
99
119
|
continue;
|
|
100
120
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}
|
|
112
|
-
catch (error) {
|
|
113
|
-
// eslint-disable-next-line no-console
|
|
114
|
-
console.warn(` [${path_1.default.relative((0, _1.getCwd)(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`);
|
|
115
|
-
}
|
|
121
|
+
legacyStrings.push(legacyScope);
|
|
122
|
+
anyChange = true;
|
|
123
|
+
}
|
|
124
|
+
if (!anyChange)
|
|
125
|
+
continue;
|
|
126
|
+
let mergedScopes;
|
|
127
|
+
try {
|
|
128
|
+
mergedScopes = (0, scopes_deprecated_do_not_use_1.migrateLegacyScopesArrayToV2Scopes)(legacyStrings);
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
throw new Error(`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
|
|
116
132
|
}
|
|
133
|
+
migratedCount += legacyStrings.length;
|
|
134
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
135
|
+
const outputElements = [
|
|
136
|
+
...rawTexts,
|
|
137
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
138
|
+
];
|
|
139
|
+
scopesProp.setInitializer(`[${outputElements.join(', ')}]`);
|
|
117
140
|
}
|
|
118
141
|
if (removedCount > 0) {
|
|
119
142
|
// eslint-disable-next-line no-console
|
|
120
|
-
console.log(` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
143
|
+
console.log(` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`);
|
|
121
144
|
}
|
|
122
|
-
return { migratedCount, removedCount };
|
|
145
|
+
return { migratedCount, removedCount, mergedCount };
|
|
123
146
|
}
|
|
124
147
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
125
148
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -249,7 +272,7 @@ function removeRoleTypeDefinitionAndUnusedImports(rolesFilePath, project) {
|
|
|
249
272
|
}
|
|
250
273
|
function main() {
|
|
251
274
|
return __awaiter(this, void 0, void 0, function* () {
|
|
252
|
-
const cwd =
|
|
275
|
+
const cwd = process.cwd();
|
|
253
276
|
const srcDir = path_1.default.join(cwd, 'src');
|
|
254
277
|
const rolesFilePath = path_1.default.join(cwd, ROLES_FILE_RELATIVE_PATH);
|
|
255
278
|
console.log(`Scanning roles scopes in: ${rolesFilePath}`);
|
|
@@ -263,7 +286,7 @@ function main() {
|
|
|
263
286
|
return;
|
|
264
287
|
}
|
|
265
288
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
266
|
-
const { migratedCount, removedCount } = migrateScopesArrays(rolesFilePath, project);
|
|
289
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(rolesFilePath, project);
|
|
267
290
|
const wrappedScopesCount = wrapScopesArraysWithDefineScopes(rolesFilePath, project);
|
|
268
291
|
const wrappedRoles = wrapRolesWithDefineRoles(rolesFilePath, project);
|
|
269
292
|
const removedRoleType = removeRoleTypeDefinitionAndUnusedImports(rolesFilePath, project);
|
|
@@ -277,6 +300,6 @@ function main() {
|
|
|
277
300
|
return;
|
|
278
301
|
}
|
|
279
302
|
yield sourceFile.save();
|
|
280
|
-
console.log(`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.' : '.'}`);
|
|
303
|
+
console.log(`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.' : '.'}`);
|
|
281
304
|
});
|
|
282
305
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-validated-workqueue-status-to-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-validated-workqueue-status-to-flag.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrate-validated-workqueue-status-to-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-validated-workqueue-status-to-flag.ts"],"names":[],"mappings":"AAyQA,iBAAe,IAAI,kBA+ClB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -45,7 +45,6 @@ exports.main = main;
|
|
|
45
45
|
*/
|
|
46
46
|
const ts_morph_1 = require("ts-morph");
|
|
47
47
|
const path_1 = __importDefault(require("path"));
|
|
48
|
-
const _1 = require(".");
|
|
49
48
|
const DEFINE_WORKQUEUES_NAME = 'defineWorkqueues';
|
|
50
49
|
const QUERY_PROPERTY_NAME = 'query';
|
|
51
50
|
const TYPE_PROPERTY_NAME = 'type';
|
|
@@ -223,7 +222,7 @@ function processFile(filePath, project) {
|
|
|
223
222
|
const changed = walkQuery(queryInit);
|
|
224
223
|
if (changed > 0) {
|
|
225
224
|
migratedCount += changed;
|
|
226
|
-
console.log(` [${path_1.default.relative(
|
|
225
|
+
console.log(` [${path_1.default.relative(process.cwd(), filePath)}] Migrated ${changed} clause(s): VALIDATED status → flags.anyOf`);
|
|
227
226
|
}
|
|
228
227
|
}
|
|
229
228
|
}
|
|
@@ -232,7 +231,7 @@ function processFile(filePath, project) {
|
|
|
232
231
|
// ─── Entry point ─────────────────────────────────────────────────────────────
|
|
233
232
|
function main() {
|
|
234
233
|
return __awaiter(this, void 0, void 0, function* () {
|
|
235
|
-
const srcDir = path_1.default.join(
|
|
234
|
+
const srcDir = path_1.default.join(process.cwd(), 'src');
|
|
236
235
|
console.log(`Scanning for defineWorkqueues calls in: ${srcDir}\n`);
|
|
237
236
|
const project = new ts_morph_1.Project({
|
|
238
237
|
tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
|
|
@@ -261,7 +260,7 @@ function main() {
|
|
|
261
260
|
for (const filePath of modifiedFiles) {
|
|
262
261
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
263
262
|
yield sourceFile.save();
|
|
264
|
-
console.log(` Saved: ${path_1.default.relative(
|
|
263
|
+
console.log(` Saved: ${path_1.default.relative(process.cwd(), filePath)}`);
|
|
265
264
|
}
|
|
266
265
|
console.log(`\nDone. Migrated ${totalMigrated} clause(s) from VALIDATED status to flags.anyOf['validated'].`);
|
|
267
266
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-workqueue-configs.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-workqueue-configs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrate-workqueue-configs.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/migrate-workqueue-configs.ts"],"names":[],"mappings":"AAgVA,iBAAe,IAAI,kBAqDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|