@opencrvs/toolkit 1.9.12-rc.f8f1dc7 → 1.9.12-rc.f94f0c1
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/cli.js +298 -75
- package/dist/commons/events/EventConfig.d.ts +3 -2
- package/dist/events/index.js +2 -2
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
- package/dist/migrations/v2.0/create-events-index.d.ts +3 -0
- package/dist/migrations/v2.0/create-events-index.d.ts.map +1 -0
- package/dist/migrations/v2.0/create-events-index.js +326 -0
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +296 -73
- package/dist/migrations/v2.0/simplify-analytics-precalculations.d.ts +3 -0
- package/dist/migrations/v2.0/simplify-analytics-precalculations.d.ts.map +1 -0
- package/dist/migrations/v2.0/simplify-analytics-precalculations.js +196 -0
- package/dist/notification/index.js +2 -2
- package/opencrvs-toolkit-1.9.12-rc.f94f0c1.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/migrations/v2.0/add-analytics-option-to-event-configs.d.ts +0 -3
- package/dist/migrations/v2.0/add-analytics-option-to-event-configs.d.ts.map +0 -1
- package/dist/migrations/v2.0/add-analytics-option-to-event-configs.js +0 -139
- package/opencrvs-toolkit-1.9.12-rc.f8f1dc7.tgz +0 -0
package/dist/cli.js
CHANGED
|
@@ -1813,9 +1813,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
|
|
|
1813
1813
|
}
|
|
1814
1814
|
return replacedCount;
|
|
1815
1815
|
}
|
|
1816
|
-
function resolveConfigChain(configObj,
|
|
1816
|
+
function resolveConfigChain(configObj, path17) {
|
|
1817
1817
|
let current = configObj;
|
|
1818
|
-
for (const key of
|
|
1818
|
+
for (const key of path17) {
|
|
1819
1819
|
if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
|
|
1820
1820
|
const prop = current.getProperty(key);
|
|
1821
1821
|
if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
|
|
@@ -3126,102 +3126,216 @@ async function main15() {
|
|
|
3126
3126
|
}
|
|
3127
3127
|
}
|
|
3128
3128
|
|
|
3129
|
-
// src/migrations/v2.0/
|
|
3129
|
+
// src/migrations/v2.0/create-events-index.ts
|
|
3130
3130
|
var import_ts_morph15 = require("ts-morph");
|
|
3131
|
+
var import_fs = __toESM(require("fs"));
|
|
3131
3132
|
var import_path16 = __toESM(require("path"));
|
|
3132
3133
|
var DEFINE_CONFIG_NAME5 = "defineConfig";
|
|
3133
|
-
var
|
|
3134
|
-
|
|
3135
|
-
|
|
3136
|
-
|
|
3137
|
-
|
|
3138
|
-
|
|
3139
|
-
|
|
3140
|
-
|
|
3141
|
-
|
|
3142
|
-
|
|
3143
|
-
|
|
3144
|
-
|
|
3145
|
-
|
|
3146
|
-
|
|
3147
|
-
|
|
3148
|
-
|
|
3149
|
-
|
|
3150
|
-
|
|
3151
|
-
|
|
3152
|
-
|
|
3153
|
-
const
|
|
3154
|
-
|
|
3134
|
+
var HANDLER_FUNCTION_NAMES = /* @__PURE__ */ new Set([
|
|
3135
|
+
"getCustomEventsHandler",
|
|
3136
|
+
"getEventsHandler"
|
|
3137
|
+
]);
|
|
3138
|
+
var EVENT_CONFIGS_IDENTIFIER = "eventConfigs";
|
|
3139
|
+
var EVENTS_INDEX_IMPORT_PATH = "@countryconfig/events";
|
|
3140
|
+
var RESPONSE_METHOD_NAME = "response";
|
|
3141
|
+
var LICENSE_HEADER = `/*
|
|
3142
|
+
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
3143
|
+
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
3144
|
+
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
3145
|
+
*
|
|
3146
|
+
* OpenCRVS is also distributed under the terms of the Civil Registration
|
|
3147
|
+
* & Healthcare Disclaimer located at http://opencrvs.org/license.
|
|
3148
|
+
*
|
|
3149
|
+
* Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
|
|
3150
|
+
*/
|
|
3151
|
+
`;
|
|
3152
|
+
function findEventConfigExports(project, srcDir) {
|
|
3153
|
+
const found = [];
|
|
3154
|
+
const eventsIndexAbs = import_path16.default.join(srcDir, "events", "index.ts");
|
|
3155
|
+
for (const sourceFile of project.getSourceFiles()) {
|
|
3156
|
+
const filePath = sourceFile.getFilePath();
|
|
3157
|
+
if (!filePath.startsWith(srcDir) || filePath.includes("/node_modules/")) {
|
|
3158
|
+
continue;
|
|
3159
|
+
}
|
|
3160
|
+
if (filePath === eventsIndexAbs) continue;
|
|
3161
|
+
for (const statement of sourceFile.getVariableStatements()) {
|
|
3162
|
+
if (!statement.hasExportKeyword()) continue;
|
|
3163
|
+
for (const decl of statement.getDeclarations()) {
|
|
3164
|
+
const initializer = decl.getInitializer();
|
|
3165
|
+
if (!initializer) continue;
|
|
3166
|
+
const unwrapped = import_ts_morph15.Node.isAsExpression(initializer) ? initializer.getExpression() : initializer;
|
|
3167
|
+
if (!import_ts_morph15.Node.isCallExpression(unwrapped)) continue;
|
|
3168
|
+
const callee = unwrapped.getExpression();
|
|
3169
|
+
if (!import_ts_morph15.Node.isIdentifier(callee)) continue;
|
|
3170
|
+
if (callee.getText() !== DEFINE_CONFIG_NAME5) continue;
|
|
3171
|
+
found.push({ name: decl.getName(), filePath });
|
|
3172
|
+
}
|
|
3173
|
+
}
|
|
3174
|
+
}
|
|
3175
|
+
return found;
|
|
3176
|
+
}
|
|
3177
|
+
function buildIndexImportSpecifier(eventConfigFilePath, srcDir) {
|
|
3178
|
+
const eventsIndexDir = import_path16.default.join(srcDir, "events");
|
|
3179
|
+
let rel = import_path16.default.relative(eventsIndexDir, eventConfigFilePath).split(import_path16.default.sep).join("/");
|
|
3180
|
+
if (rel.endsWith(".ts")) rel = rel.slice(0, -".ts".length);
|
|
3181
|
+
if (rel.endsWith("/index")) rel = rel.slice(0, -"/index".length);
|
|
3182
|
+
if (!rel.startsWith(".")) rel = "./" + rel;
|
|
3183
|
+
return rel;
|
|
3184
|
+
}
|
|
3185
|
+
function buildEventsIndexSource(exports, srcDir) {
|
|
3186
|
+
const imports = exports.map(
|
|
3187
|
+
(e) => `import { ${e.name} } from '${buildIndexImportSpecifier(
|
|
3188
|
+
e.filePath,
|
|
3189
|
+
srcDir
|
|
3190
|
+
)}'`
|
|
3191
|
+
).join("\n");
|
|
3192
|
+
const array3 = `export const ${EVENT_CONFIGS_IDENTIFIER} = [${exports.map((e) => e.name).join(", ")}]`;
|
|
3193
|
+
return `${LICENSE_HEADER}${imports}
|
|
3194
|
+
|
|
3195
|
+
${array3}
|
|
3196
|
+
`;
|
|
3197
|
+
}
|
|
3198
|
+
function findHandlerSourceFile(project, srcDir) {
|
|
3199
|
+
for (const sf of project.getSourceFiles()) {
|
|
3200
|
+
const fp = sf.getFilePath();
|
|
3201
|
+
if (!fp.startsWith(srcDir) || fp.includes("/node_modules/")) continue;
|
|
3202
|
+
for (const fn of sf.getFunctions()) {
|
|
3203
|
+
const name = fn.getName();
|
|
3204
|
+
if (name && HANDLER_FUNCTION_NAMES.has(name)) return sf;
|
|
3205
|
+
}
|
|
3206
|
+
for (const statement of sf.getVariableStatements()) {
|
|
3207
|
+
for (const decl of statement.getDeclarations()) {
|
|
3208
|
+
if (HANDLER_FUNCTION_NAMES.has(decl.getName())) return sf;
|
|
3209
|
+
}
|
|
3210
|
+
}
|
|
3211
|
+
}
|
|
3212
|
+
return void 0;
|
|
3213
|
+
}
|
|
3214
|
+
function modifyHandler(sourceFile, exportNames) {
|
|
3215
|
+
const changes = [];
|
|
3216
|
+
for (const importDecl of [...sourceFile.getImportDeclarations()]) {
|
|
3217
|
+
const namedImports = importDecl.getNamedImports();
|
|
3218
|
+
if (namedImports.length === 0) continue;
|
|
3219
|
+
const matched = namedImports.filter((ni) => exportNames.has(ni.getName()));
|
|
3220
|
+
if (matched.length === 0) continue;
|
|
3221
|
+
const removedNames = matched.map((ni) => ni.getName());
|
|
3222
|
+
for (const ni of matched) ni.remove();
|
|
3223
|
+
changes.push(`removed direct imports: ${removedNames.join(", ")}`);
|
|
3224
|
+
const stillUsed = importDecl.getNamedImports().length > 0 || importDecl.getDefaultImport() || importDecl.getNamespaceImport();
|
|
3225
|
+
if (!stillUsed) importDecl.remove();
|
|
3226
|
+
}
|
|
3227
|
+
for (const statement of [...sourceFile.getVariableStatements()]) {
|
|
3228
|
+
if (!statement.hasExportKeyword()) continue;
|
|
3229
|
+
const hasEventConfigs = statement.getDeclarations().some((d) => d.getName() === EVENT_CONFIGS_IDENTIFIER);
|
|
3230
|
+
if (hasEventConfigs) {
|
|
3231
|
+
statement.remove();
|
|
3232
|
+
changes.push(`removed inline 'export const ${EVENT_CONFIGS_IDENTIFIER}'`);
|
|
3233
|
+
}
|
|
3234
|
+
}
|
|
3235
|
+
const existing = sourceFile.getImportDeclaration(
|
|
3236
|
+
(imp) => imp.getModuleSpecifierValue() === EVENTS_INDEX_IMPORT_PATH
|
|
3155
3237
|
);
|
|
3156
|
-
|
|
3157
|
-
const
|
|
3158
|
-
if (!
|
|
3159
|
-
|
|
3160
|
-
|
|
3161
|
-
|
|
3162
|
-
const configArg = args2[0];
|
|
3163
|
-
if (!import_ts_morph15.Node.isObjectLiteralExpression(configArg)) continue;
|
|
3164
|
-
const eventLabel = getEventLabel(configArg);
|
|
3165
|
-
if (hasAnalyticsProperty(configArg)) {
|
|
3166
|
-
console.log(
|
|
3167
|
-
` [${relPath}] Skipped '${eventLabel}' \u2014 'analytics' already declared.`
|
|
3238
|
+
if (existing) {
|
|
3239
|
+
const already = existing.getNamedImports().some((ni) => ni.getName() === EVENT_CONFIGS_IDENTIFIER);
|
|
3240
|
+
if (!already) {
|
|
3241
|
+
existing.addNamedImport(EVENT_CONFIGS_IDENTIFIER);
|
|
3242
|
+
changes.push(
|
|
3243
|
+
`added '${EVENT_CONFIGS_IDENTIFIER}' to existing import from '${EVENTS_INDEX_IMPORT_PATH}'`
|
|
3168
3244
|
);
|
|
3169
|
-
continue;
|
|
3170
3245
|
}
|
|
3171
|
-
|
|
3172
|
-
|
|
3173
|
-
|
|
3246
|
+
} else {
|
|
3247
|
+
sourceFile.addImportDeclaration({
|
|
3248
|
+
moduleSpecifier: EVENTS_INDEX_IMPORT_PATH,
|
|
3249
|
+
namedImports: [EVENT_CONFIGS_IDENTIFIER]
|
|
3174
3250
|
});
|
|
3175
|
-
|
|
3176
|
-
|
|
3251
|
+
changes.push(
|
|
3252
|
+
`added import { ${EVENT_CONFIGS_IDENTIFIER} } from '${EVENTS_INDEX_IMPORT_PATH}'`
|
|
3253
|
+
);
|
|
3254
|
+
}
|
|
3255
|
+
for (const call of sourceFile.getDescendantsOfKind(
|
|
3256
|
+
import_ts_morph15.SyntaxKind.CallExpression
|
|
3257
|
+
)) {
|
|
3258
|
+
const callee = call.getExpression();
|
|
3259
|
+
if (!import_ts_morph15.Node.isPropertyAccessExpression(callee)) continue;
|
|
3260
|
+
if (callee.getName() !== RESPONSE_METHOD_NAME) continue;
|
|
3261
|
+
const args2 = call.getArguments();
|
|
3262
|
+
if (args2.length !== 1) continue;
|
|
3263
|
+
const [arg] = args2;
|
|
3264
|
+
if (!import_ts_morph15.Node.isArrayLiteralExpression(arg)) continue;
|
|
3265
|
+
if (arg.getElements().length === 0) continue;
|
|
3266
|
+
if (!arg.getElements().every((el) => import_ts_morph15.Node.isIdentifier(el))) continue;
|
|
3267
|
+
arg.replaceWithText(EVENT_CONFIGS_IDENTIFIER);
|
|
3268
|
+
changes.push(
|
|
3269
|
+
`rewrote h.response([...]) \u2192 h.response(${EVENT_CONFIGS_IDENTIFIER})`
|
|
3270
|
+
);
|
|
3177
3271
|
}
|
|
3178
3272
|
return changes;
|
|
3179
3273
|
}
|
|
3180
3274
|
async function main16() {
|
|
3181
|
-
const
|
|
3182
|
-
|
|
3275
|
+
const cwd2 = getCwd();
|
|
3276
|
+
const srcDir = import_path16.default.join(cwd2, "src");
|
|
3277
|
+
console.log(`Scanning for defineConfig event exports in: ${srcDir}
|
|
3183
3278
|
`);
|
|
3184
3279
|
const project = new import_ts_morph15.Project({
|
|
3185
3280
|
tsConfigFilePath: import_path16.default.resolve(srcDir, "../tsconfig.json"),
|
|
3186
3281
|
skipAddingFilesFromTsConfig: false
|
|
3187
3282
|
});
|
|
3188
|
-
const
|
|
3189
|
-
|
|
3190
|
-
|
|
3191
|
-
|
|
3192
|
-
|
|
3193
|
-
|
|
3194
|
-
let totalChanges = 0;
|
|
3195
|
-
const modifiedFiles = [];
|
|
3196
|
-
for (const sourceFile of sourceFiles) {
|
|
3197
|
-
const filePath = sourceFile.getFilePath();
|
|
3198
|
-
const changes = processFile12(filePath, project);
|
|
3199
|
-
if (changes > 0) {
|
|
3200
|
-
totalChanges += changes;
|
|
3201
|
-
modifiedFiles.push(filePath);
|
|
3202
|
-
}
|
|
3283
|
+
const eventConfigExports = findEventConfigExports(project, srcDir);
|
|
3284
|
+
if (eventConfigExports.length === 0) {
|
|
3285
|
+
console.log(
|
|
3286
|
+
"No top-level `export const X = defineConfig(...)` declarations found. Nothing to do."
|
|
3287
|
+
);
|
|
3288
|
+
return;
|
|
3203
3289
|
}
|
|
3204
|
-
|
|
3205
|
-
|
|
3290
|
+
console.log(`Found ${eventConfigExports.length} event config export(s):`);
|
|
3291
|
+
for (const e of eventConfigExports) {
|
|
3292
|
+
console.log(` ${e.name} \u2190 ${import_path16.default.relative(cwd2, e.filePath)}`);
|
|
3293
|
+
}
|
|
3294
|
+
const eventsIndexAbs = import_path16.default.join(srcDir, "events", "index.ts");
|
|
3295
|
+
const eventsIndexRel = import_path16.default.relative(cwd2, eventsIndexAbs);
|
|
3296
|
+
if (import_fs.default.existsSync(eventsIndexAbs)) {
|
|
3297
|
+
console.log(`
|
|
3298
|
+
[${eventsIndexRel}] already exists \u2014 leaving untouched.`);
|
|
3299
|
+
} else {
|
|
3300
|
+
import_fs.default.mkdirSync(import_path16.default.dirname(eventsIndexAbs), { recursive: true });
|
|
3301
|
+
const source = buildEventsIndexSource(eventConfigExports, srcDir);
|
|
3302
|
+
const eventsIndexFile = project.createSourceFile(eventsIndexAbs, source, {
|
|
3303
|
+
overwrite: false
|
|
3304
|
+
});
|
|
3305
|
+
await eventsIndexFile.save();
|
|
3306
|
+
console.log(
|
|
3307
|
+
`
|
|
3308
|
+
[${eventsIndexRel}] created with ${EVENT_CONFIGS_IDENTIFIER} of ${eventConfigExports.length} event(s).`
|
|
3309
|
+
);
|
|
3310
|
+
}
|
|
3311
|
+
const handler = findHandlerSourceFile(project, srcDir);
|
|
3312
|
+
if (!handler) {
|
|
3313
|
+
console.log(
|
|
3314
|
+
`
|
|
3315
|
+
No event-config handler file found (looked for exported function(s): ${Array.from(
|
|
3316
|
+
HANDLER_FUNCTION_NAMES
|
|
3317
|
+
).join(", ")}). Skipping handler rewrite.`
|
|
3318
|
+
);
|
|
3206
3319
|
return;
|
|
3207
3320
|
}
|
|
3208
|
-
|
|
3209
|
-
|
|
3210
|
-
|
|
3211
|
-
|
|
3212
|
-
|
|
3213
|
-
|
|
3321
|
+
const handlerRelPath = import_path16.default.relative(cwd2, handler.getFilePath());
|
|
3322
|
+
const exportNameSet = new Set(eventConfigExports.map((e) => e.name));
|
|
3323
|
+
const changes = modifyHandler(handler, exportNameSet);
|
|
3324
|
+
if (changes.length === 0) {
|
|
3325
|
+
console.log(`
|
|
3326
|
+
[${handlerRelPath}] already wired to ${EVENTS_INDEX_IMPORT_PATH} \u2014 no changes.`);
|
|
3327
|
+
return;
|
|
3214
3328
|
}
|
|
3215
|
-
console.log(
|
|
3216
|
-
|
|
3217
|
-
|
|
3218
|
-
|
|
3329
|
+
for (const c of changes) console.log(` [${handlerRelPath}] ${c}`);
|
|
3330
|
+
await handler.save();
|
|
3331
|
+
console.log(`
|
|
3332
|
+
Saved ${handlerRelPath}.`);
|
|
3219
3333
|
}
|
|
3220
3334
|
|
|
3221
3335
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
3222
3336
|
var import_child_process = require("child_process");
|
|
3223
3337
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
3224
|
-
var UPSTREAM_BRANCH = "
|
|
3338
|
+
var UPSTREAM_BRANCH = "develop";
|
|
3225
3339
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
3226
3340
|
var FILES_TO_CHECKOUT = [
|
|
3227
3341
|
"infrastructure/postgres/setup-analytics.sh",
|
|
@@ -3297,6 +3411,114 @@ async function main17() {
|
|
|
3297
3411
|
}
|
|
3298
3412
|
}
|
|
3299
3413
|
|
|
3414
|
+
// src/migrations/v2.0/simplify-analytics-precalculations.ts
|
|
3415
|
+
var import_ts_morph16 = require("ts-morph");
|
|
3416
|
+
var import_fs2 = __toESM(require("fs"));
|
|
3417
|
+
var import_path17 = __toESM(require("path"));
|
|
3418
|
+
var ANALYTICS_FILE_REL = "src/analytics/analytics.ts";
|
|
3419
|
+
var FUNCTION_NAME = "precalculateAdditionalAnalytics";
|
|
3420
|
+
var IMPORT_NAMES_TO_REMOVE = /* @__PURE__ */ new Set(["Event", "precalculateBirthEvent"]);
|
|
3421
|
+
var RETURN_EXPRESSION_TEXT = "declaration";
|
|
3422
|
+
function removeTargetedNamedImports(sourceFile) {
|
|
3423
|
+
const log = [];
|
|
3424
|
+
for (const importDecl of [...sourceFile.getImportDeclarations()]) {
|
|
3425
|
+
const namedImports = importDecl.getNamedImports();
|
|
3426
|
+
if (namedImports.length === 0) continue;
|
|
3427
|
+
const matched = namedImports.filter(
|
|
3428
|
+
(ni) => IMPORT_NAMES_TO_REMOVE.has(ni.getName())
|
|
3429
|
+
);
|
|
3430
|
+
if (matched.length === 0) continue;
|
|
3431
|
+
const removedNames = matched.map((ni) => ni.getName());
|
|
3432
|
+
for (const ni of matched) ni.remove();
|
|
3433
|
+
log.push(
|
|
3434
|
+
`removed import(s) ${removedNames.join(", ")} from '${importDecl.getModuleSpecifierValue()}'`
|
|
3435
|
+
);
|
|
3436
|
+
const stillUsed = importDecl.getNamedImports().length > 0 || importDecl.getDefaultImport() || importDecl.getNamespaceImport();
|
|
3437
|
+
if (!stillUsed) importDecl.remove();
|
|
3438
|
+
}
|
|
3439
|
+
return log;
|
|
3440
|
+
}
|
|
3441
|
+
function findPrecalculateFunction(sourceFile) {
|
|
3442
|
+
for (const fn of sourceFile.getFunctions()) {
|
|
3443
|
+
if (fn.getName() === FUNCTION_NAME) return fn;
|
|
3444
|
+
}
|
|
3445
|
+
for (const statement of sourceFile.getVariableStatements()) {
|
|
3446
|
+
for (const decl of statement.getDeclarations()) {
|
|
3447
|
+
if (decl.getName() === FUNCTION_NAME) return decl;
|
|
3448
|
+
}
|
|
3449
|
+
}
|
|
3450
|
+
return void 0;
|
|
3451
|
+
}
|
|
3452
|
+
function getFunctionBodyBlock(fn) {
|
|
3453
|
+
if (import_ts_morph16.Node.isFunctionDeclaration(fn)) return fn.getBody();
|
|
3454
|
+
const initializer = fn.getInitializer();
|
|
3455
|
+
if (!initializer) return void 0;
|
|
3456
|
+
if (!import_ts_morph16.Node.isArrowFunction(initializer) && !import_ts_morph16.Node.isFunctionExpression(initializer)) {
|
|
3457
|
+
return void 0;
|
|
3458
|
+
}
|
|
3459
|
+
return initializer.getBody();
|
|
3460
|
+
}
|
|
3461
|
+
function simplifyPrecalculateFunction(sourceFile) {
|
|
3462
|
+
const log = [];
|
|
3463
|
+
const fn = findPrecalculateFunction(sourceFile);
|
|
3464
|
+
if (!fn) return log;
|
|
3465
|
+
const body = getFunctionBodyBlock(fn);
|
|
3466
|
+
if (!body || !import_ts_morph16.Node.isBlock(body)) return log;
|
|
3467
|
+
for (const statement of [...body.getStatements()]) {
|
|
3468
|
+
const references = statement.getDescendantsOfKind(import_ts_morph16.SyntaxKind.Identifier).some((id) => IMPORT_NAMES_TO_REMOVE.has(id.getText()));
|
|
3469
|
+
if (references) {
|
|
3470
|
+
statement.remove();
|
|
3471
|
+
log.push(`removed statement in ${FUNCTION_NAME} referencing removed imports`);
|
|
3472
|
+
}
|
|
3473
|
+
}
|
|
3474
|
+
const remaining = body.getStatements();
|
|
3475
|
+
const last = remaining[remaining.length - 1];
|
|
3476
|
+
const alreadyCorrect = last && import_ts_morph16.Node.isReturnStatement(last) && last.getExpression()?.getText() === RETURN_EXPRESSION_TEXT;
|
|
3477
|
+
if (!alreadyCorrect) {
|
|
3478
|
+
body.addStatements(`return ${RETURN_EXPRESSION_TEXT}`);
|
|
3479
|
+
log.push(
|
|
3480
|
+
`ensured '${FUNCTION_NAME}' ends with 'return ${RETURN_EXPRESSION_TEXT}'`
|
|
3481
|
+
);
|
|
3482
|
+
}
|
|
3483
|
+
return log;
|
|
3484
|
+
}
|
|
3485
|
+
async function main18() {
|
|
3486
|
+
const cwd2 = getCwd();
|
|
3487
|
+
const absPath = import_path17.default.join(cwd2, ANALYTICS_FILE_REL);
|
|
3488
|
+
if (!import_fs2.default.existsSync(absPath)) {
|
|
3489
|
+
console.log(
|
|
3490
|
+
`[${ANALYTICS_FILE_REL}] does not exist \u2014 nothing to clean up.`
|
|
3491
|
+
);
|
|
3492
|
+
return;
|
|
3493
|
+
}
|
|
3494
|
+
const project = new import_ts_morph16.Project({
|
|
3495
|
+
tsConfigFilePath: import_path17.default.resolve(cwd2, "tsconfig.json"),
|
|
3496
|
+
skipAddingFilesFromTsConfig: false
|
|
3497
|
+
});
|
|
3498
|
+
const sourceFile = project.getSourceFile(absPath);
|
|
3499
|
+
if (!sourceFile) {
|
|
3500
|
+
console.log(
|
|
3501
|
+
`[${ANALYTICS_FILE_REL}] is not part of the tsconfig project. Skipping.`
|
|
3502
|
+
);
|
|
3503
|
+
return;
|
|
3504
|
+
}
|
|
3505
|
+
console.log(`Cleaning up ${ANALYTICS_FILE_REL}...
|
|
3506
|
+
`);
|
|
3507
|
+
const importLogs = removeTargetedNamedImports(sourceFile);
|
|
3508
|
+
const fnLogs = simplifyPrecalculateFunction(sourceFile);
|
|
3509
|
+
const allLogs = [...importLogs, ...fnLogs];
|
|
3510
|
+
if (allLogs.length === 0) {
|
|
3511
|
+
console.log(`[${ANALYTICS_FILE_REL}] already clean \u2014 nothing to do.`);
|
|
3512
|
+
return;
|
|
3513
|
+
}
|
|
3514
|
+
for (const log of allLogs) {
|
|
3515
|
+
console.log(` [${ANALYTICS_FILE_REL}] ${log}`);
|
|
3516
|
+
}
|
|
3517
|
+
await sourceFile.save();
|
|
3518
|
+
console.log(`
|
|
3519
|
+
Saved ${ANALYTICS_FILE_REL}.`);
|
|
3520
|
+
}
|
|
3521
|
+
|
|
3300
3522
|
// src/migrations/v2.0/index.ts
|
|
3301
3523
|
var cwd;
|
|
3302
3524
|
function getCwd() {
|
|
@@ -3333,6 +3555,7 @@ async function runUpgrade(ccwd) {
|
|
|
3333
3555
|
await main15();
|
|
3334
3556
|
await main16();
|
|
3335
3557
|
await main17();
|
|
3558
|
+
await main18();
|
|
3336
3559
|
}
|
|
3337
3560
|
|
|
3338
3561
|
// src/cli.ts
|
|
@@ -3347,7 +3570,7 @@ Commands:
|
|
|
3347
3570
|
|
|
3348
3571
|
Run 'opencrvs <command> --help' for more information on a command.
|
|
3349
3572
|
`.trim();
|
|
3350
|
-
function
|
|
3573
|
+
function main19() {
|
|
3351
3574
|
const command = args[0];
|
|
3352
3575
|
if (!command || command === "--help" || command === "-h") {
|
|
3353
3576
|
console.log(USAGE);
|
|
@@ -3407,4 +3630,4 @@ function handleCheckTranslations() {
|
|
|
3407
3630
|
console.warn("This command is not implemented yet!");
|
|
3408
3631
|
process.exit(1);
|
|
3409
3632
|
}
|
|
3410
|
-
|
|
3633
|
+
main19();
|
|
@@ -29,15 +29,16 @@ export type EventConfig = {
|
|
|
29
29
|
declaration: DeclarationFormConfig;
|
|
30
30
|
advancedSearch: AdvancedSearchConfig[];
|
|
31
31
|
flags: FlagConfig[];
|
|
32
|
-
analytics
|
|
32
|
+
analytics: boolean;
|
|
33
33
|
};
|
|
34
|
-
export type EventConfigInput = Omit<EventConfig, 'advancedSearch' | 'flags' | 'declaration' | 'actions' | 'dateOfEvent' | 'placeOfEvent'> & {
|
|
34
|
+
export type EventConfigInput = Omit<EventConfig, 'advancedSearch' | 'flags' | 'declaration' | 'actions' | 'dateOfEvent' | 'placeOfEvent' | 'analytics'> & {
|
|
35
35
|
dateOfEvent?: z.input<typeof FieldReference> | z.infer<typeof EventFieldReference>;
|
|
36
36
|
placeOfEvent?: z.input<typeof FieldReference>;
|
|
37
37
|
advancedSearch?: AdvancedSearchConfig[];
|
|
38
38
|
flags?: FlagConfig[];
|
|
39
39
|
declaration: DeclarationFormConfigInput;
|
|
40
40
|
actions: z.input<typeof ActionConfig>[];
|
|
41
|
+
analytics?: boolean;
|
|
41
42
|
};
|
|
42
43
|
export declare const EventConfig: z.ZodType<EventConfig, EventConfigInput>;
|
|
43
44
|
//# sourceMappingURL=EventConfig.d.ts.map
|
package/dist/events/index.js
CHANGED
|
@@ -5343,8 +5343,8 @@ var _EventConfigBase = z33.object({
|
|
|
5343
5343
|
flags: z33.array(FlagConfig).optional().default([]).describe(
|
|
5344
5344
|
"Configuration of flags associated with the actions of this event type."
|
|
5345
5345
|
),
|
|
5346
|
-
analytics: z33.boolean().optional().default(
|
|
5347
|
-
"Indicates whether the
|
|
5346
|
+
analytics: z33.boolean().optional().default(true).describe(
|
|
5347
|
+
"Indicates whether the records of this event type are included in analytics"
|
|
5348
5348
|
)
|
|
5349
5349
|
});
|
|
5350
5350
|
var EventConfig = _EventConfigBase.superRefine((event2, ctx) => {
|
|
@@ -57,7 +57,7 @@ const child_process_1 = require("child_process");
|
|
|
57
57
|
const _1 = require(".");
|
|
58
58
|
const UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
|
|
59
59
|
// @TODO: This needs to be changed to 'release-v2.0.0' once the branch is created
|
|
60
|
-
const UPSTREAM_BRANCH = '
|
|
60
|
+
const UPSTREAM_BRANCH = 'develop';
|
|
61
61
|
// Remote name used only for the duration of this codemod. Prefixed to avoid
|
|
62
62
|
// clashing with remotes the user may have (origin, upstream, etc.).
|
|
63
63
|
const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-events-index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/create-events-index.ts"],"names":[],"mappings":"AAqTA,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAmEnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|