@opencrvs/toolkit 2.0.0-rc.3855fe8 → 2.0.0-rc.39d824e
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 +73 -0
- package/create-countryconfig/package.json +11 -0
- package/dist/application-config/index.js +15 -14
- package/dist/cli.js +1645 -333
- package/dist/commons/api/router.d.ts +55 -54
- package/dist/commons/application-config/index.d.ts +16 -4
- package/dist/commons/conditionals/conditionals.d.ts +6 -6
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/locations.d.ts +21 -0
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/conditionals/index.js +11 -10
- package/dist/events/index.js +66 -10
- 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 -13
- 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 +3 -0
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -0
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +77 -0
- package/dist/migrations/v2.0/index.d.ts +8 -4
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +1472 -189
- 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 +3 -0
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -0
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +221 -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 +6 -7
- 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 +3 -4
- 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 +11 -10
- package/dist/scopes/index.d.ts +8 -1
- package/dist/scopes/index.js +11 -10
- package/opencrvs-toolkit-2.0.0-rc.39d824e.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.3855fe8.tgz +0 -0
|
@@ -31,7 +31,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
31
31
|
// src/migrations/v2.0/index.ts
|
|
32
32
|
var v2_exports = {};
|
|
33
33
|
__export(v2_exports, {
|
|
34
|
-
getCwd: () => getCwd,
|
|
35
34
|
runUpgrade: () => runUpgrade
|
|
36
35
|
});
|
|
37
36
|
module.exports = __toCommonJS(v2_exports);
|
|
@@ -104,7 +103,7 @@ function processFile(filePath, project) {
|
|
|
104
103
|
if (wasRemoved) {
|
|
105
104
|
removedCount++;
|
|
106
105
|
console.log(
|
|
107
|
-
` [${import_path.default.relative(
|
|
106
|
+
` [${import_path.default.relative(process.cwd(), filePath)}] Removed 'review' from REGISTER action`
|
|
108
107
|
);
|
|
109
108
|
}
|
|
110
109
|
}
|
|
@@ -112,7 +111,7 @@ function processFile(filePath, project) {
|
|
|
112
111
|
return removedCount;
|
|
113
112
|
}
|
|
114
113
|
async function main() {
|
|
115
|
-
const srcDir = import_path.default.join(
|
|
114
|
+
const srcDir = import_path.default.join(process.cwd(), "src");
|
|
116
115
|
console.log(`Scanning for defineConfig calls in: ${srcDir}
|
|
117
116
|
`);
|
|
118
117
|
const project = new import_ts_morph.Project({
|
|
@@ -148,7 +147,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
148
147
|
for (const filePath of modifiedFiles) {
|
|
149
148
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
150
149
|
await sourceFile.save();
|
|
151
|
-
console.log(` Saved: ${import_path.default.relative(
|
|
150
|
+
console.log(` Saved: ${import_path.default.relative(process.cwd(), filePath)}`);
|
|
152
151
|
}
|
|
153
152
|
console.log(
|
|
154
153
|
`
|
|
@@ -191,6 +190,8 @@ function ensureImports(sourceFile) {
|
|
|
191
190
|
var DEFINE_CONFIG_NAME2 = "defineConfig";
|
|
192
191
|
var ACTIONS_PROPERTY_NAME2 = "actions";
|
|
193
192
|
var TYPE_PROPERTY_NAME2 = "type";
|
|
193
|
+
var ID_PROPERTY_NAME = "id";
|
|
194
|
+
var FLAGS_PROPERTY_NAME = "flags";
|
|
194
195
|
var CUSTOM_ACTION_TYPE_PROPERTY_NAME = "customActionType";
|
|
195
196
|
var AUDIT_HISTORY_LABEL_PROPERTY_NAME = "auditHistoryLabel";
|
|
196
197
|
var DEDUPLICATION_PROPERTY_NAME = "deduplication";
|
|
@@ -200,9 +201,12 @@ var FORM_PROPERTY_NAME = "form";
|
|
|
200
201
|
var ACTION_TYPE_ENUM_NAME = "ActionType";
|
|
201
202
|
var VALIDATE_MEMBER_NAME = "VALIDATE";
|
|
202
203
|
var CUSTOM_MEMBER_NAME = "CUSTOM";
|
|
204
|
+
var REGISTER_MEMBER_NAME2 = "REGISTER";
|
|
203
205
|
var VALIDATE_STRING_LITERAL = "VALIDATE";
|
|
204
206
|
var CUSTOM_STRING_LITERAL = "CUSTOM";
|
|
207
|
+
var REGISTER_STRING_LITERAL2 = "REGISTER";
|
|
205
208
|
var VALIDATE_DECLARATION_VALUE = "VALIDATE_DECLARATION";
|
|
209
|
+
var VALIDATED_FLAG_VALUE = "validated";
|
|
206
210
|
function isValidateType(typeInitializer) {
|
|
207
211
|
if (typeInitializer.getKind() === import_ts_morph2.SyntaxKind.PropertyAccessExpression) {
|
|
208
212
|
const propAccess = typeInitializer.asKindOrThrow(
|
|
@@ -326,6 +330,50 @@ function transformValidateActionToCustom(obj, eventType) {
|
|
|
326
330
|
}
|
|
327
331
|
return true;
|
|
328
332
|
}
|
|
333
|
+
function isRegisterAction(action) {
|
|
334
|
+
const typeProperty = action.getProperty(TYPE_PROPERTY_NAME2);
|
|
335
|
+
if (!typeProperty || !import_ts_morph2.Node.isPropertyAssignment(typeProperty)) return false;
|
|
336
|
+
const typeInit = typeProperty.getInitializer();
|
|
337
|
+
if (!typeInit) return false;
|
|
338
|
+
if (import_ts_morph2.Node.isPropertyAccessExpression(typeInit)) {
|
|
339
|
+
const enumExpr = typeInit.getExpression();
|
|
340
|
+
return import_ts_morph2.Node.isIdentifier(enumExpr) && enumExpr.getText() === ACTION_TYPE_ENUM_NAME && typeInit.getName() === REGISTER_MEMBER_NAME2;
|
|
341
|
+
}
|
|
342
|
+
if (import_ts_morph2.Node.isStringLiteral(typeInit)) {
|
|
343
|
+
return typeInit.getLiteralValue() === REGISTER_STRING_LITERAL2;
|
|
344
|
+
}
|
|
345
|
+
return false;
|
|
346
|
+
}
|
|
347
|
+
function arrayHasElementWithId(array3, id) {
|
|
348
|
+
for (const el of array3.getElements()) {
|
|
349
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(el)) continue;
|
|
350
|
+
const idProp = el.getProperty(ID_PROPERTY_NAME);
|
|
351
|
+
if (!idProp || !import_ts_morph2.Node.isPropertyAssignment(idProp)) continue;
|
|
352
|
+
const idInit = idProp.getInitializer();
|
|
353
|
+
if (idInit && import_ts_morph2.Node.isStringLiteral(idInit) && idInit.getLiteralValue() === id) {
|
|
354
|
+
return true;
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
return false;
|
|
358
|
+
}
|
|
359
|
+
function ensureRegisterRemovesValidatedFlag(action) {
|
|
360
|
+
const entry = `{ id: '${VALIDATED_FLAG_VALUE}', operation: 'remove' }`;
|
|
361
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME);
|
|
362
|
+
if (flagsProp && import_ts_morph2.Node.isPropertyAssignment(flagsProp)) {
|
|
363
|
+
const flagsInit = flagsProp.getInitializer();
|
|
364
|
+
if (flagsInit && import_ts_morph2.Node.isArrayLiteralExpression(flagsInit)) {
|
|
365
|
+
if (arrayHasElementWithId(flagsInit, VALIDATED_FLAG_VALUE)) return false;
|
|
366
|
+
flagsInit.addElement(entry);
|
|
367
|
+
return true;
|
|
368
|
+
}
|
|
369
|
+
return false;
|
|
370
|
+
}
|
|
371
|
+
action.addPropertyAssignment({
|
|
372
|
+
name: FLAGS_PROPERTY_NAME,
|
|
373
|
+
initializer: `[${entry}]`
|
|
374
|
+
});
|
|
375
|
+
return true;
|
|
376
|
+
}
|
|
329
377
|
function processFile2(filePath, project) {
|
|
330
378
|
const sourceFile = project.getSourceFile(filePath);
|
|
331
379
|
if (!sourceFile) return 0;
|
|
@@ -351,7 +399,7 @@ function processFile2(filePath, project) {
|
|
|
351
399
|
const eventType = resolveEventType(configArg);
|
|
352
400
|
if (!eventType) {
|
|
353
401
|
console.warn(
|
|
354
|
-
` [${import_path2.default.relative(
|
|
402
|
+
` [${import_path2.default.relative(process.cwd(), configArg.getSourceFile().getFilePath())}] Could not resolve root 'type' from defineConfig \u2014 skipping auditHistoryLabel id generation`
|
|
355
403
|
);
|
|
356
404
|
}
|
|
357
405
|
let fileNeedsImports = false;
|
|
@@ -367,7 +415,7 @@ function processFile2(filePath, project) {
|
|
|
367
415
|
fileNeedsImports = true;
|
|
368
416
|
configHadValidateAction = true;
|
|
369
417
|
console.log(
|
|
370
|
-
` [${import_path2.default.relative(
|
|
418
|
+
` [${import_path2.default.relative(process.cwd(), filePath)}] Transformed VALIDATE action to CUSTOM with customActionType: '${VALIDATE_DECLARATION_VALUE}'`
|
|
371
419
|
);
|
|
372
420
|
}
|
|
373
421
|
}
|
|
@@ -388,9 +436,21 @@ function processFile2(filePath, project) {
|
|
|
388
436
|
]`
|
|
389
437
|
});
|
|
390
438
|
console.log(
|
|
391
|
-
` [${import_path2.default.relative(
|
|
439
|
+
` [${import_path2.default.relative(process.cwd(), filePath)}] Added top-level 'flags' array to defineConfig`
|
|
392
440
|
);
|
|
393
441
|
}
|
|
442
|
+
if (configHadValidateAction) {
|
|
443
|
+
for (const element of actionsInitializer.getElements()) {
|
|
444
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(element)) continue;
|
|
445
|
+
if (!isRegisterAction(element)) continue;
|
|
446
|
+
if (ensureRegisterRemovesValidatedFlag(element)) {
|
|
447
|
+
transformedCount++;
|
|
448
|
+
console.log(
|
|
449
|
+
` [${import_path2.default.relative(process.cwd(), filePath)}] Added '${VALIDATED_FLAG_VALUE}' remove-flag to REGISTER action`
|
|
450
|
+
);
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
}
|
|
394
454
|
if (fileNeedsImports) {
|
|
395
455
|
ensureImports(sourceFile);
|
|
396
456
|
}
|
|
@@ -398,7 +458,7 @@ function processFile2(filePath, project) {
|
|
|
398
458
|
return transformedCount;
|
|
399
459
|
}
|
|
400
460
|
async function main2() {
|
|
401
|
-
const srcDir = import_path2.default.join(
|
|
461
|
+
const srcDir = import_path2.default.join(process.cwd(), "src");
|
|
402
462
|
console.log(`Scanning for defineConfig calls in: ${srcDir}
|
|
403
463
|
`);
|
|
404
464
|
const project = new import_ts_morph2.Project({
|
|
@@ -433,11 +493,11 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
433
493
|
for (const filePath of modifiedFiles) {
|
|
434
494
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
435
495
|
await sourceFile.save();
|
|
436
|
-
console.log(` Saved: ${import_path2.default.relative(
|
|
496
|
+
console.log(` Saved: ${import_path2.default.relative(process.cwd(), filePath)}`);
|
|
437
497
|
}
|
|
438
498
|
console.log(
|
|
439
499
|
`
|
|
440
|
-
Done.
|
|
500
|
+
Done. Applied ${totalTransformed} change(s): VALIDATE \u2192 CUSTOM (${VALIDATE_DECLARATION_VALUE}) and '${VALIDATED_FLAG_VALUE}' remove-flag on matching REGISTER actions.`
|
|
441
501
|
);
|
|
442
502
|
}
|
|
443
503
|
|
|
@@ -504,14 +564,14 @@ function processFile3(filePath, project) {
|
|
|
504
564
|
actionsInitializer.removeElement(index);
|
|
505
565
|
removedCount++;
|
|
506
566
|
console.log(
|
|
507
|
-
` [${import_path3.default.relative(
|
|
567
|
+
` [${import_path3.default.relative(process.cwd(), filePath)}] Removed DELETE action at index ${index}`
|
|
508
568
|
);
|
|
509
569
|
}
|
|
510
570
|
}
|
|
511
571
|
return removedCount;
|
|
512
572
|
}
|
|
513
573
|
async function main3() {
|
|
514
|
-
const srcDir = import_path3.default.join(
|
|
574
|
+
const srcDir = import_path3.default.join(process.cwd(), "src");
|
|
515
575
|
console.log(`Scanning for defineConfig calls in: ${srcDir}
|
|
516
576
|
`);
|
|
517
577
|
const project = new import_ts_morph3.Project({
|
|
@@ -546,7 +606,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
546
606
|
for (const filePath of modifiedFiles) {
|
|
547
607
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
548
608
|
await sourceFile.save();
|
|
549
|
-
console.log(` Saved: ${import_path3.default.relative(
|
|
609
|
+
console.log(` Saved: ${import_path3.default.relative(process.cwd(), filePath)}`);
|
|
550
610
|
}
|
|
551
611
|
console.log(
|
|
552
612
|
`
|
|
@@ -620,19 +680,19 @@ function processFile4(filePath, project) {
|
|
|
620
680
|
if (result === "converted-to-heading") {
|
|
621
681
|
changedCount++;
|
|
622
682
|
console.log(
|
|
623
|
-
` [${import_path4.default.relative(
|
|
683
|
+
` [${import_path4.default.relative(process.cwd(), filePath)}] Converted PARAGRAPH with heading fontVariant to HEADING`
|
|
624
684
|
);
|
|
625
685
|
} else if (result === "removed-font-variant") {
|
|
626
686
|
changedCount++;
|
|
627
687
|
console.log(
|
|
628
|
-
` [${import_path4.default.relative(
|
|
688
|
+
` [${import_path4.default.relative(process.cwd(), filePath)}] Removed non-heading fontVariant from PARAGRAPH`
|
|
629
689
|
);
|
|
630
690
|
}
|
|
631
691
|
}
|
|
632
692
|
return changedCount;
|
|
633
693
|
}
|
|
634
694
|
async function main4() {
|
|
635
|
-
const srcDir = import_path4.default.join(
|
|
695
|
+
const srcDir = import_path4.default.join(process.cwd(), "src");
|
|
636
696
|
console.log(`Scanning for FieldType.PARAGRAPH fields in: ${srcDir}
|
|
637
697
|
`);
|
|
638
698
|
const project = new import_ts_morph4.Project({
|
|
@@ -666,7 +726,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
666
726
|
for (const filePath of modifiedFiles) {
|
|
667
727
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
668
728
|
await sourceFile.save();
|
|
669
|
-
console.log(` Saved: ${import_path4.default.relative(
|
|
729
|
+
console.log(` Saved: ${import_path4.default.relative(process.cwd(), filePath)}`);
|
|
670
730
|
}
|
|
671
731
|
console.log(`
|
|
672
732
|
Done. Processed ${totalChanged} FieldType.PARAGRAPH field(s).`);
|
|
@@ -680,14 +740,14 @@ var QUERY_PROPERTY_NAME = "query";
|
|
|
680
740
|
var TYPE_PROPERTY_NAME5 = "type";
|
|
681
741
|
var CLAUSES_PROPERTY_NAME = "clauses";
|
|
682
742
|
var STATUS_PROPERTY_NAME = "status";
|
|
683
|
-
var
|
|
743
|
+
var FLAGS_PROPERTY_NAME2 = "flags";
|
|
684
744
|
var TERMS_PROPERTY_NAME = "terms";
|
|
685
745
|
var TERM_PROPERTY_NAME = "term";
|
|
686
746
|
var ANY_OF_PROPERTY_NAME = "anyOf";
|
|
687
747
|
var VALIDATED_STATUS_VALUE = "VALIDATED";
|
|
688
|
-
var
|
|
748
|
+
var VALIDATED_FLAG_VALUE2 = "validated";
|
|
689
749
|
function addValidatedFlag(clause) {
|
|
690
|
-
const flagsProperty = clause.getProperty(
|
|
750
|
+
const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME2);
|
|
691
751
|
if (flagsProperty && import_ts_morph5.Node.isPropertyAssignment(flagsProperty)) {
|
|
692
752
|
const flagsInit = flagsProperty.getInitializer();
|
|
693
753
|
if (flagsInit && import_ts_morph5.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -695,19 +755,19 @@ function addValidatedFlag(clause) {
|
|
|
695
755
|
if (anyOfProperty && import_ts_morph5.Node.isPropertyAssignment(anyOfProperty)) {
|
|
696
756
|
const anyOfInit = anyOfProperty.getInitializer();
|
|
697
757
|
if (anyOfInit && import_ts_morph5.Node.isArrayLiteralExpression(anyOfInit)) {
|
|
698
|
-
anyOfInit.addElement(`'${
|
|
758
|
+
anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE2}'`);
|
|
699
759
|
}
|
|
700
760
|
} else {
|
|
701
761
|
flagsInit.addPropertyAssignment({
|
|
702
762
|
name: ANY_OF_PROPERTY_NAME,
|
|
703
|
-
initializer: `['${
|
|
763
|
+
initializer: `['${VALIDATED_FLAG_VALUE2}']`
|
|
704
764
|
});
|
|
705
765
|
}
|
|
706
766
|
}
|
|
707
767
|
} else {
|
|
708
768
|
clause.addPropertyAssignment({
|
|
709
|
-
name:
|
|
710
|
-
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${
|
|
769
|
+
name: FLAGS_PROPERTY_NAME2,
|
|
770
|
+
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE2}'] }`
|
|
711
771
|
});
|
|
712
772
|
}
|
|
713
773
|
}
|
|
@@ -816,7 +876,7 @@ function processFile5(filePath, project) {
|
|
|
816
876
|
if (changed > 0) {
|
|
817
877
|
migratedCount += changed;
|
|
818
878
|
console.log(
|
|
819
|
-
` [${import_path5.default.relative(
|
|
879
|
+
` [${import_path5.default.relative(process.cwd(), filePath)}] Migrated ${changed} clause(s): VALIDATED status \u2192 flags.anyOf`
|
|
820
880
|
);
|
|
821
881
|
}
|
|
822
882
|
}
|
|
@@ -824,7 +884,7 @@ function processFile5(filePath, project) {
|
|
|
824
884
|
return migratedCount;
|
|
825
885
|
}
|
|
826
886
|
async function main5() {
|
|
827
|
-
const srcDir = import_path5.default.join(
|
|
887
|
+
const srcDir = import_path5.default.join(process.cwd(), "src");
|
|
828
888
|
console.log(`Scanning for defineWorkqueues calls in: ${srcDir}
|
|
829
889
|
`);
|
|
830
890
|
const project = new import_ts_morph5.Project({
|
|
@@ -858,7 +918,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
858
918
|
for (const filePath of modifiedFiles) {
|
|
859
919
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
860
920
|
await sourceFile.save();
|
|
861
|
-
console.log(` Saved: ${import_path5.default.relative(
|
|
921
|
+
console.log(` Saved: ${import_path5.default.relative(process.cwd(), filePath)}`);
|
|
862
922
|
}
|
|
863
923
|
console.log(
|
|
864
924
|
`
|
|
@@ -873,23 +933,26 @@ var DEFINE_CONFIG_NAME4 = "defineConfig";
|
|
|
873
933
|
var DEFINE_WORKQUEUES_NAME2 = "defineWorkqueues";
|
|
874
934
|
var ACTIONS_PROPERTY_NAME4 = "actions";
|
|
875
935
|
var ACTION_PROPERTY_NAME = "action";
|
|
876
|
-
var
|
|
936
|
+
var FLAGS_PROPERTY_NAME3 = "flags";
|
|
877
937
|
var QUERY_PROPERTY_NAME2 = "query";
|
|
878
938
|
var TYPE_PROPERTY_NAME6 = "type";
|
|
939
|
+
var ID_PROPERTY_NAME2 = "id";
|
|
879
940
|
var CLAUSES_PROPERTY_NAME2 = "clauses";
|
|
880
941
|
var ANY_OF_PROPERTY_NAME2 = "anyOf";
|
|
881
942
|
var FLAG_ID = "pending-first-certificate-issuance";
|
|
882
943
|
var REGISTER_TYPE = "REGISTER";
|
|
883
944
|
var PRINT_CERTIFICATE_TYPE = "PRINT_CERTIFICATE";
|
|
884
|
-
|
|
945
|
+
function flagDefinitionInitializer(eventType) {
|
|
946
|
+
return `{
|
|
885
947
|
id: '${FLAG_ID}',
|
|
886
948
|
label: {
|
|
887
|
-
id: 'event.
|
|
949
|
+
id: 'event.${eventType}.flag.${FLAG_ID}',
|
|
888
950
|
defaultMessage: 'Pending first certificate issuance',
|
|
889
951
|
description: 'Flag label for first certificate issuance'
|
|
890
952
|
},
|
|
891
953
|
requiresAction: true
|
|
892
954
|
}`;
|
|
955
|
+
}
|
|
893
956
|
function isActionOfType(obj, typeName) {
|
|
894
957
|
const typeProperty = obj.getProperty(TYPE_PROPERTY_NAME6);
|
|
895
958
|
if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
|
|
@@ -903,18 +966,20 @@ function isActionOfType(obj, typeName) {
|
|
|
903
966
|
}
|
|
904
967
|
return false;
|
|
905
968
|
}
|
|
906
|
-
function
|
|
907
|
-
const
|
|
908
|
-
|
|
909
|
-
|
|
910
|
-
|
|
911
|
-
|
|
912
|
-
|
|
913
|
-
|
|
914
|
-
|
|
915
|
-
|
|
969
|
+
function getEventType(configArg) {
|
|
970
|
+
for (const propName of [TYPE_PROPERTY_NAME6, ID_PROPERTY_NAME2]) {
|
|
971
|
+
const prop = configArg.getProperty(propName);
|
|
972
|
+
if (!prop || !import_ts_morph6.Node.isPropertyAssignment(prop)) continue;
|
|
973
|
+
const initializer = prop.getInitializer();
|
|
974
|
+
if (!initializer) continue;
|
|
975
|
+
if (import_ts_morph6.Node.isStringLiteral(initializer)) {
|
|
976
|
+
return initializer.getLiteralValue().toLowerCase();
|
|
977
|
+
}
|
|
978
|
+
if (import_ts_morph6.Node.isPropertyAccessExpression(initializer)) {
|
|
979
|
+
return initializer.getName().toLowerCase();
|
|
980
|
+
}
|
|
916
981
|
}
|
|
917
|
-
return
|
|
982
|
+
return null;
|
|
918
983
|
}
|
|
919
984
|
function hasElementWithId(array3, id) {
|
|
920
985
|
for (const el of array3.getElements()) {
|
|
@@ -928,27 +993,28 @@ function hasElementWithId(array3, id) {
|
|
|
928
993
|
}
|
|
929
994
|
return false;
|
|
930
995
|
}
|
|
931
|
-
function ensureTopLevelFlagDefinition(configArg) {
|
|
932
|
-
const
|
|
996
|
+
function ensureTopLevelFlagDefinition(configArg, eventType) {
|
|
997
|
+
const initializer = flagDefinitionInitializer(eventType);
|
|
998
|
+
const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME3);
|
|
933
999
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
934
1000
|
const flagsInit = flagsProp.getInitializer();
|
|
935
1001
|
if (flagsInit && import_ts_morph6.Node.isArrayLiteralExpression(flagsInit)) {
|
|
936
1002
|
if (hasElementWithId(flagsInit, FLAG_ID)) return false;
|
|
937
|
-
flagsInit.addElement(
|
|
1003
|
+
flagsInit.addElement(initializer);
|
|
938
1004
|
return true;
|
|
939
1005
|
}
|
|
940
1006
|
return false;
|
|
941
1007
|
}
|
|
942
1008
|
configArg.addPropertyAssignment({
|
|
943
|
-
name:
|
|
1009
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
944
1010
|
initializer: `[
|
|
945
|
-
${
|
|
1011
|
+
${initializer}
|
|
946
1012
|
]`
|
|
947
1013
|
});
|
|
948
1014
|
return true;
|
|
949
1015
|
}
|
|
950
1016
|
function ensureActionOperationFlag(action, operation) {
|
|
951
|
-
const flagsProp = action.getProperty(
|
|
1017
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME3);
|
|
952
1018
|
const entry = `{ id: '${FLAG_ID}', operation: '${operation}' }`;
|
|
953
1019
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
954
1020
|
const flagsInit = flagsProp.getInitializer();
|
|
@@ -960,16 +1026,18 @@ function ensureActionOperationFlag(action, operation) {
|
|
|
960
1026
|
return false;
|
|
961
1027
|
}
|
|
962
1028
|
action.addPropertyAssignment({
|
|
963
|
-
name:
|
|
1029
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
964
1030
|
initializer: `[${entry}]`
|
|
965
1031
|
});
|
|
966
1032
|
return true;
|
|
967
1033
|
}
|
|
968
|
-
function
|
|
1034
|
+
function processConfig(configArg, eventType, relPath) {
|
|
969
1035
|
let changes = 0;
|
|
970
|
-
if (ensureTopLevelFlagDefinition(configArg)) {
|
|
1036
|
+
if (ensureTopLevelFlagDefinition(configArg, eventType)) {
|
|
971
1037
|
changes++;
|
|
972
|
-
console.log(
|
|
1038
|
+
console.log(
|
|
1039
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`
|
|
1040
|
+
);
|
|
973
1041
|
}
|
|
974
1042
|
const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME4);
|
|
975
1043
|
if (!actionsProp || !import_ts_morph6.Node.isPropertyAssignment(actionsProp)) return changes;
|
|
@@ -983,7 +1051,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
983
1051
|
if (ensureActionOperationFlag(element, "add")) {
|
|
984
1052
|
changes++;
|
|
985
1053
|
console.log(
|
|
986
|
-
` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
1054
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
987
1055
|
);
|
|
988
1056
|
}
|
|
989
1057
|
}
|
|
@@ -991,7 +1059,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
991
1059
|
if (ensureActionOperationFlag(element, "remove")) {
|
|
992
1060
|
changes++;
|
|
993
1061
|
console.log(
|
|
994
|
-
` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
1062
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
995
1063
|
);
|
|
996
1064
|
}
|
|
997
1065
|
}
|
|
@@ -1020,7 +1088,7 @@ function hasPrintCertificateAction(workqueue) {
|
|
|
1020
1088
|
return false;
|
|
1021
1089
|
}
|
|
1022
1090
|
function addFlagToQueryClause(clause) {
|
|
1023
|
-
const flagsProp = clause.getProperty(
|
|
1091
|
+
const flagsProp = clause.getProperty(FLAGS_PROPERTY_NAME3);
|
|
1024
1092
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
1025
1093
|
const flagsInit = flagsProp.getInitializer();
|
|
1026
1094
|
if (flagsInit && import_ts_morph6.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -1045,7 +1113,7 @@ function addFlagToQueryClause(clause) {
|
|
|
1045
1113
|
}
|
|
1046
1114
|
} else {
|
|
1047
1115
|
clause.addPropertyAssignment({
|
|
1048
|
-
name:
|
|
1116
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
1049
1117
|
initializer: `{ ${ANY_OF_PROPERTY_NAME2}: ['${FLAG_ID}'] }`
|
|
1050
1118
|
});
|
|
1051
1119
|
return true;
|
|
@@ -1076,7 +1144,7 @@ function processFile6(filePath, project) {
|
|
|
1076
1144
|
const sourceFile = project.getSourceFile(filePath);
|
|
1077
1145
|
if (!sourceFile) return 0;
|
|
1078
1146
|
let totalChanges = 0;
|
|
1079
|
-
const relPath = import_path6.default.relative(
|
|
1147
|
+
const relPath = import_path6.default.relative(process.cwd(), filePath);
|
|
1080
1148
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
1081
1149
|
import_ts_morph6.SyntaxKind.CallExpression
|
|
1082
1150
|
);
|
|
@@ -1089,8 +1157,9 @@ function processFile6(filePath, project) {
|
|
|
1089
1157
|
if (args.length === 0) continue;
|
|
1090
1158
|
const configArg = args[0];
|
|
1091
1159
|
if (!import_ts_morph6.Node.isObjectLiteralExpression(configArg)) continue;
|
|
1092
|
-
|
|
1093
|
-
|
|
1160
|
+
const eventType = getEventType(configArg);
|
|
1161
|
+
if (!eventType) continue;
|
|
1162
|
+
totalChanges += processConfig(configArg, eventType, relPath);
|
|
1094
1163
|
}
|
|
1095
1164
|
if (calleeName === DEFINE_WORKQUEUES_NAME2) {
|
|
1096
1165
|
const args = call.getArguments();
|
|
@@ -1117,9 +1186,9 @@ function processFile6(filePath, project) {
|
|
|
1117
1186
|
return totalChanges;
|
|
1118
1187
|
}
|
|
1119
1188
|
async function main6() {
|
|
1120
|
-
const srcDir = import_path6.default.join(
|
|
1189
|
+
const srcDir = import_path6.default.join(process.cwd(), "src");
|
|
1121
1190
|
console.log(
|
|
1122
|
-
`Scanning for
|
|
1191
|
+
`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
|
|
1123
1192
|
`
|
|
1124
1193
|
);
|
|
1125
1194
|
const project = new import_ts_morph6.Project({
|
|
@@ -1144,7 +1213,7 @@ async function main6() {
|
|
|
1144
1213
|
}
|
|
1145
1214
|
if (modifiedFiles.length === 0) {
|
|
1146
1215
|
console.log(
|
|
1147
|
-
"No
|
|
1216
|
+
"No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
|
|
1148
1217
|
);
|
|
1149
1218
|
return;
|
|
1150
1219
|
}
|
|
@@ -1153,7 +1222,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
1153
1222
|
for (const filePath of modifiedFiles) {
|
|
1154
1223
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
1155
1224
|
await sourceFile.save();
|
|
1156
|
-
console.log(` Saved: ${import_path6.default.relative(
|
|
1225
|
+
console.log(` Saved: ${import_path6.default.relative(process.cwd(), filePath)}`);
|
|
1157
1226
|
}
|
|
1158
1227
|
console.log(
|
|
1159
1228
|
`
|
|
@@ -1190,14 +1259,14 @@ function processFile7(filePath, project) {
|
|
|
1190
1259
|
array3.removeElement(index);
|
|
1191
1260
|
removedCount++;
|
|
1192
1261
|
console.log(
|
|
1193
|
-
` [${import_path7.default.relative(
|
|
1262
|
+
` [${import_path7.default.relative(process.cwd(), filePath)}] Removed InherentFlags.PENDING_CERTIFICATION from array`
|
|
1194
1263
|
);
|
|
1195
1264
|
}
|
|
1196
1265
|
}
|
|
1197
1266
|
return removedCount;
|
|
1198
1267
|
}
|
|
1199
1268
|
async function main7() {
|
|
1200
|
-
const srcDir = import_path7.default.join(
|
|
1269
|
+
const srcDir = import_path7.default.join(process.cwd(), "src");
|
|
1201
1270
|
console.log(
|
|
1202
1271
|
`Scanning for InherentFlags.PENDING_CERTIFICATION array elements in: ${srcDir}
|
|
1203
1272
|
`
|
|
@@ -1233,7 +1302,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
1233
1302
|
for (const filePath of modifiedFiles) {
|
|
1234
1303
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
1235
1304
|
await sourceFile.save();
|
|
1236
|
-
console.log(` Saved: ${import_path7.default.relative(
|
|
1305
|
+
console.log(` Saved: ${import_path7.default.relative(process.cwd(), filePath)}`);
|
|
1237
1306
|
}
|
|
1238
1307
|
console.log(
|
|
1239
1308
|
`
|
|
@@ -1291,13 +1360,13 @@ function processFile8(filePath, project) {
|
|
|
1291
1360
|
propAccess.getNameNode().replaceWithText(NEW_PROPERTY_NAME);
|
|
1292
1361
|
renamedCount++;
|
|
1293
1362
|
console.log(
|
|
1294
|
-
` [${import_path8.default.relative(
|
|
1363
|
+
` [${import_path8.default.relative(process.cwd(), filePath)}] Renamed Location.${OLD_PROPERTY_NAME} \u2192 Location.${NEW_PROPERTY_NAME}`
|
|
1295
1364
|
);
|
|
1296
1365
|
}
|
|
1297
1366
|
return renamedCount;
|
|
1298
1367
|
}
|
|
1299
1368
|
async function main8() {
|
|
1300
|
-
const srcDir = import_path8.default.join(
|
|
1369
|
+
const srcDir = import_path8.default.join(process.cwd(), "src");
|
|
1301
1370
|
console.log(
|
|
1302
1371
|
`Scanning for Location.${OLD_PROPERTY_NAME} references in: ${srcDir}
|
|
1303
1372
|
`
|
|
@@ -1333,7 +1402,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
1333
1402
|
for (const filePath of modifiedFiles) {
|
|
1334
1403
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
1335
1404
|
await sourceFile.save();
|
|
1336
|
-
console.log(` Saved: ${import_path8.default.relative(
|
|
1405
|
+
console.log(` Saved: ${import_path8.default.relative(process.cwd(), filePath)}`);
|
|
1337
1406
|
}
|
|
1338
1407
|
console.log(
|
|
1339
1408
|
`
|
|
@@ -1400,7 +1469,7 @@ function processFile9(filePath, project) {
|
|
|
1400
1469
|
const sourceFile = project.getSourceFile(filePath);
|
|
1401
1470
|
if (!sourceFile) return 0;
|
|
1402
1471
|
let renamedCount = 0;
|
|
1403
|
-
const relPath = import_path9.default.relative(
|
|
1472
|
+
const relPath = import_path9.default.relative(process.cwd(), filePath);
|
|
1404
1473
|
const candidates = sourceFile.getDescendantsOfKind(
|
|
1405
1474
|
import_ts_morph9.SyntaxKind.ObjectLiteralExpression
|
|
1406
1475
|
);
|
|
@@ -1415,7 +1484,7 @@ function processFile9(filePath, project) {
|
|
|
1415
1484
|
return renamedCount;
|
|
1416
1485
|
}
|
|
1417
1486
|
async function main9() {
|
|
1418
|
-
const srcDir = import_path9.default.join(
|
|
1487
|
+
const srcDir = import_path9.default.join(process.cwd(), "src");
|
|
1419
1488
|
console.log(`Scanning for Hapi route configs in: ${srcDir}
|
|
1420
1489
|
`);
|
|
1421
1490
|
console.log("Active path renames:");
|
|
@@ -1452,7 +1521,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
1452
1521
|
for (const filePath of modifiedFiles) {
|
|
1453
1522
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
1454
1523
|
await sourceFile.save();
|
|
1455
|
-
console.log(` Saved: ${import_path9.default.relative(
|
|
1524
|
+
console.log(` Saved: ${import_path9.default.relative(process.cwd(), filePath)}`);
|
|
1456
1525
|
}
|
|
1457
1526
|
console.log(`
|
|
1458
1527
|
Done. Renamed ${totalRenamed} route path(s).`);
|
|
@@ -1826,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
|
|
|
1826
1895
|
}
|
|
1827
1896
|
return replacedCount;
|
|
1828
1897
|
}
|
|
1829
|
-
function resolveConfigChain(configObj,
|
|
1898
|
+
function resolveConfigChain(configObj, path23) {
|
|
1830
1899
|
let current = configObj;
|
|
1831
|
-
for (const key of
|
|
1900
|
+
for (const key of path23) {
|
|
1832
1901
|
if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
|
|
1833
1902
|
const prop = current.getProperty(key);
|
|
1834
1903
|
if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
|
|
@@ -1873,8 +1942,8 @@ function ensureJoinImport(sf) {
|
|
|
1873
1942
|
});
|
|
1874
1943
|
}
|
|
1875
1944
|
async function main10() {
|
|
1876
|
-
const srcDir = import_path10.default.join(
|
|
1877
|
-
const relCwd = (fp) => import_path10.default.relative(
|
|
1945
|
+
const srcDir = import_path10.default.join(process.cwd(), "src");
|
|
1946
|
+
const relCwd = (fp) => import_path10.default.relative(process.cwd(), fp);
|
|
1878
1947
|
console.log("Phase 1: Converting JS config files to TypeScript...\n");
|
|
1879
1948
|
let convertedCount = 0;
|
|
1880
1949
|
for (const group of CONFIG_GROUPS) {
|
|
@@ -1962,7 +2031,7 @@ async function main10() {
|
|
|
1962
2031
|
ensureJoinImport(sf);
|
|
1963
2032
|
}
|
|
1964
2033
|
console.log(
|
|
1965
|
-
` Inlined applicationConfig.${accessPath.join(".")} \u2192 ${adjustedValue} in ${import_path10.default.relative(
|
|
2034
|
+
` Inlined applicationConfig.${accessPath.join(".")} \u2192 ${adjustedValue} in ${import_path10.default.relative(process.cwd(), sf.getFilePath())}`
|
|
1966
2035
|
);
|
|
1967
2036
|
filesToSaveAfterInlining.add(sf);
|
|
1968
2037
|
madeReplacement = true;
|
|
@@ -1974,7 +2043,7 @@ async function main10() {
|
|
|
1974
2043
|
for (const sf of Array.from(filesToSaveAfterInlining)) {
|
|
1975
2044
|
await sf.save();
|
|
1976
2045
|
console.log(
|
|
1977
|
-
` Saved (inlined): ${import_path10.default.relative(
|
|
2046
|
+
` Saved (inlined): ${import_path10.default.relative(process.cwd(), sf.getFilePath())}`
|
|
1978
2047
|
);
|
|
1979
2048
|
}
|
|
1980
2049
|
for (const prop of [...propsToRemove].reverse()) {
|
|
@@ -2150,6 +2219,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
|
|
|
2150
2219
|
var AccessLevelOptions = z3.object({
|
|
2151
2220
|
accessLevel: JurisdictionFilter.optional()
|
|
2152
2221
|
});
|
|
2222
|
+
var AllUserScopeOptions = AccessLevelOptions.extend({
|
|
2223
|
+
role: userRole.optional()
|
|
2224
|
+
});
|
|
2153
2225
|
var WorkqueueOrDashboardOptions = z3.object({
|
|
2154
2226
|
ids: z3.preprocess(
|
|
2155
2227
|
(val) => val === void 0 ? void 0 : [val].flat(),
|
|
@@ -2159,6 +2231,7 @@ var WorkqueueOrDashboardOptions = z3.object({
|
|
|
2159
2231
|
var AllScopeOptions = z3.object({
|
|
2160
2232
|
...AllRecordScopeOptions.shape,
|
|
2161
2233
|
...AccessLevelOptions.shape,
|
|
2234
|
+
...AllUserScopeOptions.shape,
|
|
2162
2235
|
...WorkqueueOrDashboardOptions.shape
|
|
2163
2236
|
});
|
|
2164
2237
|
var ScopeOptionKey = AllScopeOptions.keyof();
|
|
@@ -2235,27 +2308,24 @@ var SystemScopeType = z3.enum([
|
|
|
2235
2308
|
"organisation.read-locations",
|
|
2236
2309
|
"user.read",
|
|
2237
2310
|
"user.create",
|
|
2238
|
-
"user.edit"
|
|
2311
|
+
"user.edit",
|
|
2312
|
+
"user.search"
|
|
2239
2313
|
]);
|
|
2240
2314
|
var UserScopeType = SystemScopeType.extract([
|
|
2241
2315
|
"user.read",
|
|
2242
2316
|
"user.create",
|
|
2243
|
-
"user.edit"
|
|
2317
|
+
"user.edit",
|
|
2318
|
+
"user.search"
|
|
2244
2319
|
]);
|
|
2245
2320
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
2246
2321
|
var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
2247
2322
|
z3.object({
|
|
2248
2323
|
type: ScopesWithRoleOption,
|
|
2249
|
-
options:
|
|
2250
|
-
accessLevel: JurisdictionFilter.optional(),
|
|
2251
|
-
role: userRole.optional()
|
|
2252
|
-
}).optional()
|
|
2324
|
+
options: AllUserScopeOptions.optional()
|
|
2253
2325
|
}),
|
|
2254
2326
|
z3.object({
|
|
2255
|
-
type: UserScopeType.extract(["user.read"]),
|
|
2256
|
-
options:
|
|
2257
|
-
accessLevel: JurisdictionFilter.optional()
|
|
2258
|
-
}).optional()
|
|
2327
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
2328
|
+
options: AccessLevelOptions.optional()
|
|
2259
2329
|
})
|
|
2260
2330
|
]);
|
|
2261
2331
|
var ResolvedRecordScopeV2 = z3.discriminatedUnion("type", [
|
|
@@ -2620,7 +2690,7 @@ function migrateScopesArrays(rolesFilePath, project) {
|
|
|
2620
2690
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2621
2691
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2622
2692
|
console.warn(
|
|
2623
|
-
` [${import_path11.default.relative(
|
|
2693
|
+
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2624
2694
|
);
|
|
2625
2695
|
initializer.removeElement(index);
|
|
2626
2696
|
removedCount++;
|
|
@@ -2629,7 +2699,7 @@ function migrateScopesArrays(rolesFilePath, project) {
|
|
|
2629
2699
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2630
2700
|
if (!legacyScope) {
|
|
2631
2701
|
console.warn(
|
|
2632
|
-
` [${import_path11.default.relative(
|
|
2702
|
+
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
|
|
2633
2703
|
);
|
|
2634
2704
|
continue;
|
|
2635
2705
|
}
|
|
@@ -2638,7 +2708,7 @@ function migrateScopesArrays(rolesFilePath, project) {
|
|
|
2638
2708
|
const scope = decodeScope(migratedScope);
|
|
2639
2709
|
if (!scope) {
|
|
2640
2710
|
console.warn(
|
|
2641
|
-
` [${import_path11.default.relative(
|
|
2711
|
+
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
|
|
2642
2712
|
);
|
|
2643
2713
|
continue;
|
|
2644
2714
|
}
|
|
@@ -2646,14 +2716,14 @@ function migrateScopesArrays(rolesFilePath, project) {
|
|
|
2646
2716
|
migratedCount++;
|
|
2647
2717
|
} catch (error) {
|
|
2648
2718
|
console.warn(
|
|
2649
|
-
` [${import_path11.default.relative(
|
|
2719
|
+
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2650
2720
|
);
|
|
2651
2721
|
}
|
|
2652
2722
|
}
|
|
2653
2723
|
}
|
|
2654
2724
|
if (removedCount > 0) {
|
|
2655
2725
|
console.log(
|
|
2656
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(
|
|
2726
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
|
|
2657
2727
|
);
|
|
2658
2728
|
}
|
|
2659
2729
|
return { migratedCount, removedCount };
|
|
@@ -2775,9 +2845,9 @@ function removeRoleTypeDefinitionAndUnusedImports(rolesFilePath, project) {
|
|
|
2775
2845
|
return removed;
|
|
2776
2846
|
}
|
|
2777
2847
|
async function main11() {
|
|
2778
|
-
const
|
|
2779
|
-
const srcDir = import_path11.default.join(
|
|
2780
|
-
const rolesFilePath = import_path11.default.join(
|
|
2848
|
+
const cwd = process.cwd();
|
|
2849
|
+
const srcDir = import_path11.default.join(cwd, "src");
|
|
2850
|
+
const rolesFilePath = import_path11.default.join(cwd, ROLES_FILE_RELATIVE_PATH);
|
|
2781
2851
|
console.log(`Scanning roles scopes in: ${rolesFilePath}`);
|
|
2782
2852
|
const project = new import_ts_morph11.Project({
|
|
2783
2853
|
tsConfigFilePath: import_path11.default.resolve(srcDir, "../tsconfig.json"),
|
|
@@ -2841,13 +2911,13 @@ function processFile10(filePath, project) {
|
|
|
2841
2911
|
decl.remove();
|
|
2842
2912
|
}
|
|
2843
2913
|
console.log(
|
|
2844
|
-
` [${import_path12.default.relative(
|
|
2914
|
+
` [${import_path12.default.relative(process.cwd(), filePath)}] Removed ${matchingNamedImports.length} deprecated '${DEPRECATED_IMPORT}' import(s) from '${decl.getModuleSpecifierValue()}'`
|
|
2845
2915
|
);
|
|
2846
2916
|
}
|
|
2847
2917
|
return removedCount;
|
|
2848
2918
|
}
|
|
2849
2919
|
async function main12() {
|
|
2850
|
-
const srcDir = import_path12.default.join(
|
|
2920
|
+
const srcDir = import_path12.default.join(process.cwd(), "src");
|
|
2851
2921
|
console.log(`Scanning for deprecated imports in: ${srcDir}
|
|
2852
2922
|
`);
|
|
2853
2923
|
const project = new import_ts_morph12.Project({
|
|
@@ -2878,15 +2948,738 @@ async function main12() {
|
|
|
2878
2948
|
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
2879
2949
|
for (const filePath of modifiedFiles) {
|
|
2880
2950
|
await project.getSourceFileOrThrow(filePath).save();
|
|
2881
|
-
console.log(` Saved: ${import_path12.default.relative(
|
|
2951
|
+
console.log(` Saved: ${import_path12.default.relative(process.cwd(), filePath)}`);
|
|
2882
2952
|
}
|
|
2883
2953
|
console.log(`
|
|
2884
2954
|
Done. Removed ${totalRemoved} deprecated import(s).`);
|
|
2885
2955
|
}
|
|
2886
2956
|
|
|
2887
|
-
// src/migrations/v2.0/
|
|
2888
|
-
var import_ts_morph13 = require("ts-morph");
|
|
2957
|
+
// src/migrations/v2.0/remove-unused-environment-variables.ts
|
|
2889
2958
|
var import_path13 = __toESM(require("path"));
|
|
2959
|
+
var import_ts_morph13 = require("ts-morph");
|
|
2960
|
+
var UNUSED_ENV_VARS = /* @__PURE__ */ new Set([
|
|
2961
|
+
"APPLICATION_CONFIG_URL",
|
|
2962
|
+
"FHIR_URL",
|
|
2963
|
+
"CONFIRM_REGISTRATION_URL"
|
|
2964
|
+
]);
|
|
2965
|
+
var ENVIRONMENT_FILE_RELATIVE = "src/environment.ts";
|
|
2966
|
+
var CONSTANTS_FILE_RELATIVE = "src/constants.ts";
|
|
2967
|
+
function cleanEnvironmentFile(project, filePath) {
|
|
2968
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
2969
|
+
if (!sourceFile) return [];
|
|
2970
|
+
const removed = [];
|
|
2971
|
+
const cleanEnvCall = sourceFile.getDescendantsOfKind(import_ts_morph13.SyntaxKind.CallExpression).find((call) => {
|
|
2972
|
+
const expr = call.getExpression();
|
|
2973
|
+
return import_ts_morph13.Node.isIdentifier(expr) && expr.getText() === "cleanEnv";
|
|
2974
|
+
});
|
|
2975
|
+
if (!cleanEnvCall) return removed;
|
|
2976
|
+
const schemaArg = cleanEnvCall.getArguments()[1]?.asKind(import_ts_morph13.SyntaxKind.ObjectLiteralExpression);
|
|
2977
|
+
if (!schemaArg) return removed;
|
|
2978
|
+
for (const name of UNUSED_ENV_VARS) {
|
|
2979
|
+
const prop = schemaArg.getProperty(name);
|
|
2980
|
+
if (!prop) continue;
|
|
2981
|
+
if (prop.isKind(import_ts_morph13.SyntaxKind.PropertyAssignment) || prop.isKind(import_ts_morph13.SyntaxKind.ShorthandPropertyAssignment)) {
|
|
2982
|
+
prop.remove();
|
|
2983
|
+
removed.push(name);
|
|
2984
|
+
}
|
|
2985
|
+
}
|
|
2986
|
+
return removed;
|
|
2987
|
+
}
|
|
2988
|
+
function extractEnvAccess(initText) {
|
|
2989
|
+
if (!initText) return null;
|
|
2990
|
+
const match = /\benv\.([A-Z][A-Z0-9_]*)\b/.exec(initText);
|
|
2991
|
+
return match ? match[1] : null;
|
|
2992
|
+
}
|
|
2993
|
+
function cleanConstantsFile(project, filePath) {
|
|
2994
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
2995
|
+
if (!sourceFile) return [];
|
|
2996
|
+
const removed = [];
|
|
2997
|
+
for (const stmt of [...sourceFile.getVariableStatements()]) {
|
|
2998
|
+
const declarations = [...stmt.getDeclarations()];
|
|
2999
|
+
const declarationsToRemove = declarations.filter((decl) => {
|
|
3000
|
+
const name = decl.getName();
|
|
3001
|
+
const accessedEnvVar = extractEnvAccess(decl.getInitializer()?.getText());
|
|
3002
|
+
return UNUSED_ENV_VARS.has(name) || accessedEnvVar !== null && UNUSED_ENV_VARS.has(accessedEnvVar);
|
|
3003
|
+
});
|
|
3004
|
+
if (declarationsToRemove.length === 0) continue;
|
|
3005
|
+
const namesToRemove = declarationsToRemove.map((decl) => decl.getName());
|
|
3006
|
+
removed.push(...namesToRemove);
|
|
3007
|
+
if (declarationsToRemove.length === declarations.length) {
|
|
3008
|
+
stmt.remove();
|
|
3009
|
+
} else {
|
|
3010
|
+
for (const decl of declarationsToRemove) {
|
|
3011
|
+
decl.remove();
|
|
3012
|
+
}
|
|
3013
|
+
}
|
|
3014
|
+
}
|
|
3015
|
+
return removed;
|
|
3016
|
+
}
|
|
3017
|
+
async function main13() {
|
|
3018
|
+
const project = new import_ts_morph13.Project({
|
|
3019
|
+
tsConfigFilePath: import_path13.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3020
|
+
skipAddingFilesFromTsConfig: false
|
|
3021
|
+
});
|
|
3022
|
+
console.log(
|
|
3023
|
+
`Removing unused environment variable(s) (${[...UNUSED_ENV_VARS].join(", ")})...
|
|
3024
|
+
`
|
|
3025
|
+
);
|
|
3026
|
+
const envFilePath = import_path13.default.join(process.cwd(), ENVIRONMENT_FILE_RELATIVE);
|
|
3027
|
+
const constsFilePath = import_path13.default.join(process.cwd(), CONSTANTS_FILE_RELATIVE);
|
|
3028
|
+
const envRemoved = cleanEnvironmentFile(project, envFilePath);
|
|
3029
|
+
if (envRemoved.length > 0) {
|
|
3030
|
+
await project.getSourceFileOrThrow(envFilePath).save();
|
|
3031
|
+
console.log(
|
|
3032
|
+
` [${ENVIRONMENT_FILE_RELATIVE}] Removed schema entr${envRemoved.length === 1 ? "y" : "ies"}: ${envRemoved.join(", ")}`
|
|
3033
|
+
);
|
|
3034
|
+
} else if (project.getSourceFile(envFilePath)) {
|
|
3035
|
+
console.log(
|
|
3036
|
+
` [${ENVIRONMENT_FILE_RELATIVE}] No matching schema entries \u2014 nothing to remove.`
|
|
3037
|
+
);
|
|
3038
|
+
} else {
|
|
3039
|
+
console.log(
|
|
3040
|
+
` [${ENVIRONMENT_FILE_RELATIVE}] File not found \u2014 skipping.`
|
|
3041
|
+
);
|
|
3042
|
+
}
|
|
3043
|
+
const constsRemoved = cleanConstantsFile(project, constsFilePath);
|
|
3044
|
+
if (constsRemoved.length > 0) {
|
|
3045
|
+
await project.getSourceFileOrThrow(constsFilePath).save();
|
|
3046
|
+
console.log(
|
|
3047
|
+
` [${CONSTANTS_FILE_RELATIVE}] Removed declaration(s): ${constsRemoved.join(", ")}`
|
|
3048
|
+
);
|
|
3049
|
+
} else if (project.getSourceFile(constsFilePath)) {
|
|
3050
|
+
console.log(
|
|
3051
|
+
` [${CONSTANTS_FILE_RELATIVE}] No matching declarations \u2014 nothing to remove.`
|
|
3052
|
+
);
|
|
3053
|
+
} else {
|
|
3054
|
+
console.log(` [${CONSTANTS_FILE_RELATIVE}] File not found \u2014 skipping.`);
|
|
3055
|
+
}
|
|
3056
|
+
if (envRemoved.length === 0 && constsRemoved.length === 0) {
|
|
3057
|
+
console.log("\nNothing to do.");
|
|
3058
|
+
return;
|
|
3059
|
+
}
|
|
3060
|
+
console.log(
|
|
3061
|
+
`
|
|
3062
|
+
Done. NOTE: usages of these constants elsewhere in 'src/' may now produce TypeScript errors and need manual review.`
|
|
3063
|
+
);
|
|
3064
|
+
}
|
|
3065
|
+
|
|
3066
|
+
// src/migrations/v2.0/remove-fhir-url-helpers.ts
|
|
3067
|
+
var import_path14 = __toESM(require("path"));
|
|
3068
|
+
var import_ts_morph14 = require("ts-morph");
|
|
3069
|
+
var FHIR_IMPORT = "FHIR_URL";
|
|
3070
|
+
var HELPER_NAMES = /* @__PURE__ */ new Set([
|
|
3071
|
+
"getFromFhir",
|
|
3072
|
+
"updateResourceFromHearth",
|
|
3073
|
+
"updateResourceInHearth"
|
|
3074
|
+
]);
|
|
3075
|
+
function removeHelpers(sourceFilePath, project) {
|
|
3076
|
+
const sourceFile = project.getSourceFile(sourceFilePath);
|
|
3077
|
+
if (!sourceFile) {
|
|
3078
|
+
return {
|
|
3079
|
+
removedHelpers: [],
|
|
3080
|
+
removedImportCount: 0,
|
|
3081
|
+
remainingFhirReferences: 0
|
|
3082
|
+
};
|
|
3083
|
+
}
|
|
3084
|
+
const removedHelpers = [];
|
|
3085
|
+
let removedImportCount = 0;
|
|
3086
|
+
for (const fn of sourceFile.getFunctions()) {
|
|
3087
|
+
const name = fn.getName();
|
|
3088
|
+
if (!name || !HELPER_NAMES.has(name)) continue;
|
|
3089
|
+
removedHelpers.push(name);
|
|
3090
|
+
fn.remove();
|
|
3091
|
+
}
|
|
3092
|
+
for (const stmt of [...sourceFile.getVariableStatements()]) {
|
|
3093
|
+
const declarations = [...stmt.getDeclarations()];
|
|
3094
|
+
const toRemove = declarations.filter((decl) => HELPER_NAMES.has(decl.getName()));
|
|
3095
|
+
if (toRemove.length === 0) continue;
|
|
3096
|
+
removedHelpers.push(...toRemove.map((decl) => decl.getName()));
|
|
3097
|
+
if (toRemove.length === declarations.length) {
|
|
3098
|
+
stmt.remove();
|
|
3099
|
+
} else {
|
|
3100
|
+
for (const decl of toRemove) decl.remove();
|
|
3101
|
+
}
|
|
3102
|
+
}
|
|
3103
|
+
for (const decl of sourceFile.getImportDeclarations()) {
|
|
3104
|
+
const matches = decl.getNamedImports().filter((ni) => ni.getName() === FHIR_IMPORT);
|
|
3105
|
+
if (matches.length === 0) continue;
|
|
3106
|
+
for (const named of matches) {
|
|
3107
|
+
named.remove();
|
|
3108
|
+
removedImportCount++;
|
|
3109
|
+
}
|
|
3110
|
+
const hasAnyNamedImportsLeft = decl.getNamedImports().length > 0;
|
|
3111
|
+
const hasDefaultImport = !!decl.getDefaultImport();
|
|
3112
|
+
const hasNamespaceImport = !!decl.getNamespaceImport();
|
|
3113
|
+
if (!hasAnyNamedImportsLeft && !hasDefaultImport && !hasNamespaceImport) {
|
|
3114
|
+
decl.remove();
|
|
3115
|
+
}
|
|
3116
|
+
}
|
|
3117
|
+
const remainingFhirReferences = sourceFile.getDescendantsOfKind(import_ts_morph14.SyntaxKind.Identifier).filter((id) => id.getText() === FHIR_IMPORT).filter((id) => !id.getFirstAncestorByKind(import_ts_morph14.SyntaxKind.ImportDeclaration)).length;
|
|
3118
|
+
return { removedHelpers, removedImportCount, remainingFhirReferences };
|
|
3119
|
+
}
|
|
3120
|
+
async function main14() {
|
|
3121
|
+
const project = new import_ts_morph14.Project({
|
|
3122
|
+
tsConfigFilePath: import_path14.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3123
|
+
skipAddingFilesFromTsConfig: false
|
|
3124
|
+
});
|
|
3125
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
3126
|
+
const fp = sf.getFilePath();
|
|
3127
|
+
return fp.includes("/src/") && !fp.includes("/node_modules/");
|
|
3128
|
+
});
|
|
3129
|
+
console.log(`Removing legacy FHIR_URL helpers in ${sourceFiles.length} source file(s)...
|
|
3130
|
+
`);
|
|
3131
|
+
let totalRemovedImports = 0;
|
|
3132
|
+
let totalRemovedHelpers = 0;
|
|
3133
|
+
const modifiedFiles = [];
|
|
3134
|
+
const warnings = [];
|
|
3135
|
+
for (const sourceFile of sourceFiles) {
|
|
3136
|
+
const filePath = sourceFile.getFilePath();
|
|
3137
|
+
const rel = import_path14.default.relative(process.cwd(), filePath);
|
|
3138
|
+
const result = removeHelpers(filePath, project);
|
|
3139
|
+
const changed = result.removedImportCount > 0 || result.removedHelpers.length > 0;
|
|
3140
|
+
if (changed) {
|
|
3141
|
+
modifiedFiles.push(filePath);
|
|
3142
|
+
totalRemovedImports += result.removedImportCount;
|
|
3143
|
+
totalRemovedHelpers += result.removedHelpers.length;
|
|
3144
|
+
if (result.removedHelpers.length > 0) {
|
|
3145
|
+
console.log(
|
|
3146
|
+
` [${rel}] Removed helper(s): ${result.removedHelpers.join(", ")}`
|
|
3147
|
+
);
|
|
3148
|
+
}
|
|
3149
|
+
if (result.removedImportCount > 0) {
|
|
3150
|
+
console.log(
|
|
3151
|
+
` [${rel}] Removed ${result.removedImportCount} '${FHIR_IMPORT}' import(s)`
|
|
3152
|
+
);
|
|
3153
|
+
}
|
|
3154
|
+
}
|
|
3155
|
+
if (result.remainingFhirReferences > 0) {
|
|
3156
|
+
warnings.push(
|
|
3157
|
+
`${rel}: ${result.remainingFhirReferences} remaining '${FHIR_IMPORT}' reference(s)`
|
|
3158
|
+
);
|
|
3159
|
+
}
|
|
3160
|
+
}
|
|
3161
|
+
if (modifiedFiles.length === 0 && warnings.length === 0) {
|
|
3162
|
+
console.log("No FHIR_URL imports/helpers found. Nothing to do.");
|
|
3163
|
+
return;
|
|
3164
|
+
}
|
|
3165
|
+
if (modifiedFiles.length > 0) {
|
|
3166
|
+
console.log(`
|
|
3167
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
3168
|
+
for (const filePath of modifiedFiles) {
|
|
3169
|
+
await project.getSourceFileOrThrow(filePath).save();
|
|
3170
|
+
console.log(` Saved: ${import_path14.default.relative(process.cwd(), filePath)}`);
|
|
3171
|
+
}
|
|
3172
|
+
}
|
|
3173
|
+
if (warnings.length > 0) {
|
|
3174
|
+
console.warn(
|
|
3175
|
+
`
|
|
3176
|
+
WARNING: Some '${FHIR_IMPORT}' usages remain and need manual cleanup:
|
|
3177
|
+
` + warnings.map((line) => ` - ${line}`).join("\n")
|
|
3178
|
+
);
|
|
3179
|
+
}
|
|
3180
|
+
console.log(
|
|
3181
|
+
`
|
|
3182
|
+
Done. Removed ${totalRemovedHelpers} helper declaration(s) and ${totalRemovedImports} '${FHIR_IMPORT}' import(s).`
|
|
3183
|
+
);
|
|
3184
|
+
}
|
|
3185
|
+
|
|
3186
|
+
// src/migrations/v2.0/migrate-application-config-url.ts
|
|
3187
|
+
var import_path15 = __toESM(require("path"));
|
|
3188
|
+
var import_ts_morph15 = require("ts-morph");
|
|
3189
|
+
var TARGET_IDENTIFIER = "APPLICATION_CONFIG_URL";
|
|
3190
|
+
var REPLACEMENT_IDENTIFIER = "applicationConfig";
|
|
3191
|
+
var REPLACEMENT_MODULE = "@countryconfig/api/application/application-config";
|
|
3192
|
+
var FUNCTION_LIKE_KINDS = [
|
|
3193
|
+
import_ts_morph15.SyntaxKind.FunctionDeclaration,
|
|
3194
|
+
import_ts_morph15.SyntaxKind.FunctionExpression,
|
|
3195
|
+
import_ts_morph15.SyntaxKind.ArrowFunction,
|
|
3196
|
+
import_ts_morph15.SyntaxKind.MethodDeclaration
|
|
3197
|
+
];
|
|
3198
|
+
function describeFunction(node) {
|
|
3199
|
+
if (import_ts_morph15.Node.isFunctionDeclaration(node) || import_ts_morph15.Node.isMethodDeclaration(node)) {
|
|
3200
|
+
return node.getName() ?? "<anonymous>";
|
|
3201
|
+
}
|
|
3202
|
+
const parent = node.getParent();
|
|
3203
|
+
if (parent && import_ts_morph15.Node.isVariableDeclaration(parent)) {
|
|
3204
|
+
return parent.getName();
|
|
3205
|
+
}
|
|
3206
|
+
if (parent && import_ts_morph15.Node.isPropertyAssignment(parent)) {
|
|
3207
|
+
return parent.getName();
|
|
3208
|
+
}
|
|
3209
|
+
if (import_ts_morph15.Node.isFunctionExpression(node) && node.getNameNode() !== void 0) {
|
|
3210
|
+
return node.getNameNode()?.getText() ?? "<anonymous>";
|
|
3211
|
+
}
|
|
3212
|
+
return "<anonymous>";
|
|
3213
|
+
}
|
|
3214
|
+
function hasBlockBody(node) {
|
|
3215
|
+
if (import_ts_morph15.Node.isFunctionDeclaration(node) || import_ts_morph15.Node.isFunctionExpression(node) || import_ts_morph15.Node.isMethodDeclaration(node)) {
|
|
3216
|
+
return node.getBody() !== void 0;
|
|
3217
|
+
}
|
|
3218
|
+
if (import_ts_morph15.Node.isArrowFunction(node)) {
|
|
3219
|
+
return node.getBody().getKind() === import_ts_morph15.SyntaxKind.Block;
|
|
3220
|
+
}
|
|
3221
|
+
return false;
|
|
3222
|
+
}
|
|
3223
|
+
function isConfigFetcher(node) {
|
|
3224
|
+
let referencesTarget = false;
|
|
3225
|
+
let callsFetch = false;
|
|
3226
|
+
for (const id of node.getDescendantsOfKind(import_ts_morph15.SyntaxKind.Identifier)) {
|
|
3227
|
+
const text = id.getText();
|
|
3228
|
+
if (!referencesTarget && text === TARGET_IDENTIFIER) referencesTarget = true;
|
|
3229
|
+
if (!callsFetch && text === "fetch") {
|
|
3230
|
+
const parent = id.getParent();
|
|
3231
|
+
if (import_ts_morph15.Node.isCallExpression(parent) && parent.getExpression() === id) {
|
|
3232
|
+
callsFetch = true;
|
|
3233
|
+
}
|
|
3234
|
+
}
|
|
3235
|
+
if (referencesTarget && callsFetch) return true;
|
|
3236
|
+
}
|
|
3237
|
+
return false;
|
|
3238
|
+
}
|
|
3239
|
+
function processFile11(sourceFile) {
|
|
3240
|
+
const importsWithTarget = sourceFile.getImportDeclarations().filter(
|
|
3241
|
+
(decl) => decl.getNamedImports().some((ni) => ni.getName() === TARGET_IDENTIFIER)
|
|
3242
|
+
);
|
|
3243
|
+
if (importsWithTarget.length === 0) {
|
|
3244
|
+
return { changed: false, rewrittenFunctions: [], renamedReferences: 0 };
|
|
3245
|
+
}
|
|
3246
|
+
const collidingLocals = sourceFile.getDescendantsOfKind(import_ts_morph15.SyntaxKind.Identifier).filter((id) => id.getText() === REPLACEMENT_IDENTIFIER).filter((id) => {
|
|
3247
|
+
const parent = id.getParent();
|
|
3248
|
+
const kind = parent.getKind();
|
|
3249
|
+
return kind === import_ts_morph15.SyntaxKind.VariableDeclaration || kind === import_ts_morph15.SyntaxKind.FunctionDeclaration || kind === import_ts_morph15.SyntaxKind.ClassDeclaration || kind === import_ts_morph15.SyntaxKind.Parameter;
|
|
3250
|
+
});
|
|
3251
|
+
if (collidingLocals.length > 0) {
|
|
3252
|
+
return {
|
|
3253
|
+
changed: false,
|
|
3254
|
+
rewrittenFunctions: [],
|
|
3255
|
+
renamedReferences: 0,
|
|
3256
|
+
skippedReason: `local declaration named '${REPLACEMENT_IDENTIFIER}' would collide`
|
|
3257
|
+
};
|
|
3258
|
+
}
|
|
3259
|
+
const candidateFunctions = FUNCTION_LIKE_KINDS.flatMap(
|
|
3260
|
+
(kind) => sourceFile.getDescendantsOfKind(kind)
|
|
3261
|
+
);
|
|
3262
|
+
candidateFunctions.sort((a, b) => a.getStart() - b.getStart());
|
|
3263
|
+
const rewrittenFunctions = [];
|
|
3264
|
+
const rewrittenSet = /* @__PURE__ */ new Set();
|
|
3265
|
+
for (const fn of candidateFunctions) {
|
|
3266
|
+
if (!hasBlockBody(fn)) continue;
|
|
3267
|
+
if (!isConfigFetcher(fn)) continue;
|
|
3268
|
+
let inRewrittenAncestor = false;
|
|
3269
|
+
let cursor = fn.getParent();
|
|
3270
|
+
while (cursor) {
|
|
3271
|
+
if (rewrittenSet.has(cursor)) {
|
|
3272
|
+
inRewrittenAncestor = true;
|
|
3273
|
+
break;
|
|
3274
|
+
}
|
|
3275
|
+
cursor = cursor.getParent();
|
|
3276
|
+
}
|
|
3277
|
+
if (inRewrittenAncestor) continue;
|
|
3278
|
+
const start = fn.getStart();
|
|
3279
|
+
const line = sourceFile.getLineAndColumnAtPos(start).line;
|
|
3280
|
+
const name = describeFunction(fn);
|
|
3281
|
+
if (import_ts_morph15.Node.isFunctionDeclaration(fn) || import_ts_morph15.Node.isFunctionExpression(fn) || import_ts_morph15.Node.isMethodDeclaration(fn) || import_ts_morph15.Node.isArrowFunction(fn)) {
|
|
3282
|
+
fn.setBodyText(`return ${REPLACEMENT_IDENTIFIER}`);
|
|
3283
|
+
}
|
|
3284
|
+
rewrittenFunctions.push({ name, line });
|
|
3285
|
+
rewrittenSet.add(fn);
|
|
3286
|
+
}
|
|
3287
|
+
for (const decl of importsWithTarget) {
|
|
3288
|
+
const targetNamed = decl.getNamedImports().find((ni) => ni.getName() === TARGET_IDENTIFIER);
|
|
3289
|
+
targetNamed?.remove();
|
|
3290
|
+
const isNowEmpty = decl.getNamedImports().length === 0 && !decl.getDefaultImport() && !decl.getNamespaceImport();
|
|
3291
|
+
if (isNowEmpty) decl.remove();
|
|
3292
|
+
}
|
|
3293
|
+
const existing = sourceFile.getImportDeclaration(
|
|
3294
|
+
(decl) => decl.getModuleSpecifierValue() === REPLACEMENT_MODULE
|
|
3295
|
+
);
|
|
3296
|
+
if (existing) {
|
|
3297
|
+
const alreadyImported = existing.getNamedImports().some((ni) => ni.getName() === REPLACEMENT_IDENTIFIER);
|
|
3298
|
+
if (!alreadyImported) existing.addNamedImport(REPLACEMENT_IDENTIFIER);
|
|
3299
|
+
} else {
|
|
3300
|
+
sourceFile.addImportDeclaration({
|
|
3301
|
+
moduleSpecifier: REPLACEMENT_MODULE,
|
|
3302
|
+
namedImports: [REPLACEMENT_IDENTIFIER]
|
|
3303
|
+
});
|
|
3304
|
+
}
|
|
3305
|
+
const renameTargets = sourceFile.getDescendantsOfKind(import_ts_morph15.SyntaxKind.Identifier).filter((id) => id.getText() === TARGET_IDENTIFIER).filter((id) => !id.getFirstAncestorByKind(import_ts_morph15.SyntaxKind.ImportDeclaration)).filter((id) => {
|
|
3306
|
+
const parent = id.getParent();
|
|
3307
|
+
const parentKind = parent.getKind();
|
|
3308
|
+
if (parentKind === import_ts_morph15.SyntaxKind.PropertyAccessExpression) {
|
|
3309
|
+
const pae = parent.asKind(import_ts_morph15.SyntaxKind.PropertyAccessExpression);
|
|
3310
|
+
if (pae.getNameNode() === id) return false;
|
|
3311
|
+
}
|
|
3312
|
+
if (parentKind === import_ts_morph15.SyntaxKind.PropertyAssignment) {
|
|
3313
|
+
const pa = parent.asKind(import_ts_morph15.SyntaxKind.PropertyAssignment);
|
|
3314
|
+
if (pa.getNameNode() === id) return false;
|
|
3315
|
+
}
|
|
3316
|
+
if (parentKind === import_ts_morph15.SyntaxKind.ShorthandPropertyAssignment) {
|
|
3317
|
+
return false;
|
|
3318
|
+
}
|
|
3319
|
+
return true;
|
|
3320
|
+
}).sort((a, b) => b.getPos() - a.getPos());
|
|
3321
|
+
for (const id of renameTargets) {
|
|
3322
|
+
id.replaceWithText(REPLACEMENT_IDENTIFIER);
|
|
3323
|
+
}
|
|
3324
|
+
return {
|
|
3325
|
+
changed: true,
|
|
3326
|
+
rewrittenFunctions,
|
|
3327
|
+
renamedReferences: renameTargets.length
|
|
3328
|
+
};
|
|
3329
|
+
}
|
|
3330
|
+
async function main15() {
|
|
3331
|
+
const project = new import_ts_morph15.Project({
|
|
3332
|
+
tsConfigFilePath: import_path15.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3333
|
+
skipAddingFilesFromTsConfig: false
|
|
3334
|
+
});
|
|
3335
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
3336
|
+
const fp = sf.getFilePath();
|
|
3337
|
+
return fp.includes("/src/") && !fp.includes("/node_modules/");
|
|
3338
|
+
});
|
|
3339
|
+
console.log(
|
|
3340
|
+
`Migrating '${TARGET_IDENTIFIER}' \u2192 '${REPLACEMENT_IDENTIFIER}' across ${sourceFiles.length} source file(s)...
|
|
3341
|
+
`
|
|
3342
|
+
);
|
|
3343
|
+
let changedFiles = 0;
|
|
3344
|
+
let totalRewrittenFunctions = 0;
|
|
3345
|
+
let totalRenamedReferences = 0;
|
|
3346
|
+
const skipped = [];
|
|
3347
|
+
for (const sourceFile of sourceFiles) {
|
|
3348
|
+
const filePath = sourceFile.getFilePath();
|
|
3349
|
+
const rel = import_path15.default.relative(process.cwd(), filePath);
|
|
3350
|
+
const result = processFile11(sourceFile);
|
|
3351
|
+
if (result.skippedReason) {
|
|
3352
|
+
skipped.push(`${rel} (${result.skippedReason})`);
|
|
3353
|
+
continue;
|
|
3354
|
+
}
|
|
3355
|
+
if (!result.changed) continue;
|
|
3356
|
+
await sourceFile.save();
|
|
3357
|
+
changedFiles++;
|
|
3358
|
+
totalRewrittenFunctions += result.rewrittenFunctions.length;
|
|
3359
|
+
totalRenamedReferences += result.renamedReferences;
|
|
3360
|
+
for (const fn of result.rewrittenFunctions) {
|
|
3361
|
+
console.log(
|
|
3362
|
+
` [${rel}:${fn.line}] Rewrote '${fn.name}' body \u2192 'return ${REPLACEMENT_IDENTIFIER}' (config fetch eliminated)`
|
|
3363
|
+
);
|
|
3364
|
+
}
|
|
3365
|
+
if (result.renamedReferences > 0) {
|
|
3366
|
+
console.log(
|
|
3367
|
+
` [${rel}] Renamed ${result.renamedReferences} stray reference(s) ${TARGET_IDENTIFIER} \u2192 ${REPLACEMENT_IDENTIFIER}`
|
|
3368
|
+
);
|
|
3369
|
+
}
|
|
3370
|
+
}
|
|
3371
|
+
if (skipped.length > 0) {
|
|
3372
|
+
console.warn(
|
|
3373
|
+
`
|
|
3374
|
+
${skipped.length} file(s) skipped:
|
|
3375
|
+
` + skipped.map((s) => ` - ${s}`).join("\n")
|
|
3376
|
+
);
|
|
3377
|
+
}
|
|
3378
|
+
if (changedFiles === 0) {
|
|
3379
|
+
console.log(`
|
|
3380
|
+
No files reference '${TARGET_IDENTIFIER}'. Nothing to do.`);
|
|
3381
|
+
return;
|
|
3382
|
+
}
|
|
3383
|
+
console.log(
|
|
3384
|
+
`
|
|
3385
|
+
Done. Updated ${changedFiles} file(s): ${totalRewrittenFunctions} fetch function(s) rewritten, ${totalRenamedReferences} bare reference(s) renamed.`
|
|
3386
|
+
);
|
|
3387
|
+
if (totalRewrittenFunctions > 0) {
|
|
3388
|
+
console.log(
|
|
3389
|
+
`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}'.`
|
|
3390
|
+
);
|
|
3391
|
+
}
|
|
3392
|
+
}
|
|
3393
|
+
|
|
3394
|
+
// src/migrations/v2.0/remove-old-statistics-service.ts
|
|
3395
|
+
var import_path16 = __toESM(require("path"));
|
|
3396
|
+
var import_ts_morph16 = require("ts-morph");
|
|
3397
|
+
var ROUTE_PATH = "/statistics";
|
|
3398
|
+
var HANDLER_NAME = "statisticsHandler";
|
|
3399
|
+
function isStatisticsRouteObject(obj) {
|
|
3400
|
+
const pathProp = obj.getProperty("path");
|
|
3401
|
+
if (!pathProp || !import_ts_morph16.Node.isPropertyAssignment(pathProp)) return false;
|
|
3402
|
+
const init = pathProp.getInitializer();
|
|
3403
|
+
if (!init) return false;
|
|
3404
|
+
if (import_ts_morph16.Node.isStringLiteral(init) || import_ts_morph16.Node.isNoSubstitutionTemplateLiteral(init)) {
|
|
3405
|
+
return init.getLiteralValue() === ROUTE_PATH;
|
|
3406
|
+
}
|
|
3407
|
+
return false;
|
|
3408
|
+
}
|
|
3409
|
+
function removeStatisticsRoutes(sourceFile) {
|
|
3410
|
+
let removed = 0;
|
|
3411
|
+
const callExpressions = [
|
|
3412
|
+
...sourceFile.getDescendantsOfKind(import_ts_morph16.SyntaxKind.CallExpression)
|
|
3413
|
+
];
|
|
3414
|
+
for (const call of callExpressions) {
|
|
3415
|
+
if (call.wasForgotten()) continue;
|
|
3416
|
+
const expr = call.getExpression();
|
|
3417
|
+
if (!import_ts_morph16.Node.isPropertyAccessExpression(expr)) continue;
|
|
3418
|
+
if (expr.getName() !== "route") continue;
|
|
3419
|
+
const args = call.getArguments();
|
|
3420
|
+
if (args.length === 0) continue;
|
|
3421
|
+
const firstArg = args[0];
|
|
3422
|
+
if (import_ts_morph16.Node.isObjectLiteralExpression(firstArg)) {
|
|
3423
|
+
if (!isStatisticsRouteObject(firstArg)) continue;
|
|
3424
|
+
const stmt = call.getFirstAncestorByKind(import_ts_morph16.SyntaxKind.ExpressionStatement);
|
|
3425
|
+
if (stmt) {
|
|
3426
|
+
stmt.remove();
|
|
3427
|
+
removed++;
|
|
3428
|
+
} else {
|
|
3429
|
+
call.replaceWithText("");
|
|
3430
|
+
removed++;
|
|
3431
|
+
}
|
|
3432
|
+
continue;
|
|
3433
|
+
}
|
|
3434
|
+
if (import_ts_morph16.Node.isArrayLiteralExpression(firstArg)) {
|
|
3435
|
+
const matchingIndexes = firstArg.getElements().map((el, idx) => ({ el, idx })).filter(
|
|
3436
|
+
({ el }) => import_ts_morph16.Node.isObjectLiteralExpression(el) && isStatisticsRouteObject(el)
|
|
3437
|
+
).map(({ idx }) => idx);
|
|
3438
|
+
matchingIndexes.sort((a, b) => b - a).forEach((idx) => {
|
|
3439
|
+
firstArg.removeElement(idx);
|
|
3440
|
+
removed++;
|
|
3441
|
+
});
|
|
3442
|
+
}
|
|
3443
|
+
}
|
|
3444
|
+
return removed;
|
|
3445
|
+
}
|
|
3446
|
+
function removeStatisticsHandlerImports(sourceFile) {
|
|
3447
|
+
let changed = false;
|
|
3448
|
+
for (const decl of sourceFile.getImportDeclarations()) {
|
|
3449
|
+
const targetNamed = decl.getNamedImports().find((ni) => ni.getName() === HANDLER_NAME);
|
|
3450
|
+
if (!targetNamed) continue;
|
|
3451
|
+
targetNamed.remove();
|
|
3452
|
+
changed = true;
|
|
3453
|
+
const isNowEmpty = decl.getNamedImports().length === 0 && !decl.getDefaultImport() && !decl.getNamespaceImport();
|
|
3454
|
+
if (isNowEmpty) decl.remove();
|
|
3455
|
+
}
|
|
3456
|
+
return changed;
|
|
3457
|
+
}
|
|
3458
|
+
function processFile12(sourceFile) {
|
|
3459
|
+
const routesRemoved = removeStatisticsRoutes(sourceFile);
|
|
3460
|
+
const importsCleaned = removeStatisticsHandlerImports(sourceFile);
|
|
3461
|
+
return { routesRemoved, importsCleaned };
|
|
3462
|
+
}
|
|
3463
|
+
function collectLocalImportsInSubtree(sourceFile, subtreeRoot) {
|
|
3464
|
+
const result = [];
|
|
3465
|
+
for (const decl of sourceFile.getImportDeclarations()) {
|
|
3466
|
+
const moduleSf = decl.getModuleSpecifierSourceFile();
|
|
3467
|
+
if (!moduleSf) continue;
|
|
3468
|
+
const fp = moduleSf.getFilePath();
|
|
3469
|
+
if (!fp.startsWith(subtreeRoot)) continue;
|
|
3470
|
+
result.push(fp);
|
|
3471
|
+
}
|
|
3472
|
+
return result;
|
|
3473
|
+
}
|
|
3474
|
+
function deleteOrphanedDescendants(project, startingFile, subtreeRoot) {
|
|
3475
|
+
const initialCandidates = collectLocalImportsInSubtree(
|
|
3476
|
+
startingFile,
|
|
3477
|
+
subtreeRoot
|
|
3478
|
+
);
|
|
3479
|
+
const startingPath = startingFile.getFilePath();
|
|
3480
|
+
const deleted = /* @__PURE__ */ new Set([startingPath]);
|
|
3481
|
+
const seen = /* @__PURE__ */ new Set();
|
|
3482
|
+
const worklist = [...initialCandidates];
|
|
3483
|
+
const orphans = [];
|
|
3484
|
+
while (worklist.length > 0) {
|
|
3485
|
+
const candidate = worklist.shift();
|
|
3486
|
+
if (seen.has(candidate)) continue;
|
|
3487
|
+
seen.add(candidate);
|
|
3488
|
+
if (deleted.has(candidate)) continue;
|
|
3489
|
+
if (!candidate.startsWith(subtreeRoot)) continue;
|
|
3490
|
+
const candidateSf = project.getSourceFile(candidate);
|
|
3491
|
+
if (!candidateSf) continue;
|
|
3492
|
+
const stillImported = project.getSourceFiles().some((sf) => {
|
|
3493
|
+
const sfPath = sf.getFilePath();
|
|
3494
|
+
if (deleted.has(sfPath)) return false;
|
|
3495
|
+
if (sfPath === candidate) return false;
|
|
3496
|
+
return sf.getImportDeclarations().some(
|
|
3497
|
+
(decl) => decl.getModuleSpecifierSourceFile()?.getFilePath() === candidate
|
|
3498
|
+
);
|
|
3499
|
+
});
|
|
3500
|
+
if (stillImported) continue;
|
|
3501
|
+
const next = collectLocalImportsInSubtree(candidateSf, subtreeRoot);
|
|
3502
|
+
worklist.push(...next);
|
|
3503
|
+
candidateSf.delete();
|
|
3504
|
+
deleted.add(candidate);
|
|
3505
|
+
orphans.push(candidate);
|
|
3506
|
+
}
|
|
3507
|
+
return orphans;
|
|
3508
|
+
}
|
|
3509
|
+
function processHandlerFile(project) {
|
|
3510
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
3511
|
+
const fp = sf.getFilePath();
|
|
3512
|
+
return fp.includes("/src/") && !fp.includes("/node_modules/");
|
|
3513
|
+
});
|
|
3514
|
+
for (const sf of sourceFiles) {
|
|
3515
|
+
const fn = sf.getFunction(HANDLER_NAME);
|
|
3516
|
+
if (!fn) continue;
|
|
3517
|
+
const filePath = sf.getFilePath();
|
|
3518
|
+
const exportsByName = [...sf.getExportedDeclarations().keys()];
|
|
3519
|
+
const otherExports = exportsByName.filter((name) => name !== HANDLER_NAME);
|
|
3520
|
+
if (otherExports.length === 0) {
|
|
3521
|
+
const subtreeRoot = import_path16.default.dirname(filePath) + import_path16.default.sep;
|
|
3522
|
+
const orphansDeleted = deleteOrphanedDescendants(
|
|
3523
|
+
project,
|
|
3524
|
+
sf,
|
|
3525
|
+
subtreeRoot
|
|
3526
|
+
);
|
|
3527
|
+
sf.delete();
|
|
3528
|
+
return { filePath, action: "deleted", orphansDeleted };
|
|
3529
|
+
}
|
|
3530
|
+
fn.remove();
|
|
3531
|
+
return {
|
|
3532
|
+
filePath,
|
|
3533
|
+
action: "function-removed",
|
|
3534
|
+
remainingExports: otherExports,
|
|
3535
|
+
orphansDeleted: []
|
|
3536
|
+
};
|
|
3537
|
+
}
|
|
3538
|
+
return { filePath: "", action: "not-found", orphansDeleted: [] };
|
|
3539
|
+
}
|
|
3540
|
+
async function main16() {
|
|
3541
|
+
const project = new import_ts_morph16.Project({
|
|
3542
|
+
tsConfigFilePath: import_path16.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3543
|
+
skipAddingFilesFromTsConfig: false
|
|
3544
|
+
});
|
|
3545
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
3546
|
+
const fp = sf.getFilePath();
|
|
3547
|
+
return fp.includes("/src/") && !fp.includes("/node_modules/");
|
|
3548
|
+
});
|
|
3549
|
+
console.log(
|
|
3550
|
+
`Removing legacy 'GET ${ROUTE_PATH}' route and '${HANDLER_NAME}' across ${sourceFiles.length} source file(s)...
|
|
3551
|
+
`
|
|
3552
|
+
);
|
|
3553
|
+
let totalRoutesRemoved = 0;
|
|
3554
|
+
let totalFilesWithImportsCleaned = 0;
|
|
3555
|
+
let totalFilesWithRoutesRemoved = 0;
|
|
3556
|
+
for (const sourceFile of sourceFiles) {
|
|
3557
|
+
const filePath = sourceFile.getFilePath();
|
|
3558
|
+
const rel = import_path16.default.relative(process.cwd(), filePath);
|
|
3559
|
+
const result = processFile12(sourceFile);
|
|
3560
|
+
if (result.routesRemoved > 0) {
|
|
3561
|
+
console.log(
|
|
3562
|
+
` [${rel}] Removed ${result.routesRemoved} '${ROUTE_PATH}' route(s)`
|
|
3563
|
+
);
|
|
3564
|
+
totalRoutesRemoved += result.routesRemoved;
|
|
3565
|
+
totalFilesWithRoutesRemoved++;
|
|
3566
|
+
}
|
|
3567
|
+
if (result.importsCleaned) {
|
|
3568
|
+
console.log(` [${rel}] Cleaned up '${HANDLER_NAME}' import`);
|
|
3569
|
+
totalFilesWithImportsCleaned++;
|
|
3570
|
+
}
|
|
3571
|
+
if (result.routesRemoved > 0 || result.importsCleaned) {
|
|
3572
|
+
await sourceFile.save();
|
|
3573
|
+
}
|
|
3574
|
+
}
|
|
3575
|
+
const handlerResult = processHandlerFile(project);
|
|
3576
|
+
switch (handlerResult.action) {
|
|
3577
|
+
case "deleted": {
|
|
3578
|
+
const rel = import_path16.default.relative(process.cwd(), handlerResult.filePath);
|
|
3579
|
+
console.log(
|
|
3580
|
+
` [${rel}] Deleted handler file ('${HANDLER_NAME}' was the sole export).`
|
|
3581
|
+
);
|
|
3582
|
+
for (const orphanPath of handlerResult.orphansDeleted) {
|
|
3583
|
+
const orphanRel = import_path16.default.relative(process.cwd(), orphanPath);
|
|
3584
|
+
console.log(
|
|
3585
|
+
` [${orphanRel}] Deleted (no remaining importers in the project after handler removal).`
|
|
3586
|
+
);
|
|
3587
|
+
}
|
|
3588
|
+
await project.save();
|
|
3589
|
+
break;
|
|
3590
|
+
}
|
|
3591
|
+
case "function-removed": {
|
|
3592
|
+
const rel = import_path16.default.relative(process.cwd(), handlerResult.filePath);
|
|
3593
|
+
console.warn(
|
|
3594
|
+
` [${rel}] Removed '${HANDLER_NAME}' function but kept the file (other exports remain: ${handlerResult.remainingExports?.join(", ")}). Review whether the file is still needed.`
|
|
3595
|
+
);
|
|
3596
|
+
const sf = project.getSourceFile(handlerResult.filePath);
|
|
3597
|
+
if (sf) await sf.save();
|
|
3598
|
+
break;
|
|
3599
|
+
}
|
|
3600
|
+
case "not-found":
|
|
3601
|
+
break;
|
|
3602
|
+
}
|
|
3603
|
+
if (totalRoutesRemoved === 0 && totalFilesWithImportsCleaned === 0 && handlerResult.action === "not-found") {
|
|
3604
|
+
console.log(`
|
|
3605
|
+
No legacy '${ROUTE_PATH}' route or handler found. Nothing to do.`);
|
|
3606
|
+
return;
|
|
3607
|
+
}
|
|
3608
|
+
const orphansSummary = handlerResult.orphansDeleted.length > 0 ? ` and ${handlerResult.orphansDeleted.length} orphaned helper file(s)` : "";
|
|
3609
|
+
console.log(
|
|
3610
|
+
`
|
|
3611
|
+
Done. Removed ${totalRoutesRemoved} route(s) across ${totalFilesWithRoutesRemoved} file(s); cleaned ${HANDLER_NAME} import in ${totalFilesWithImportsCleaned} file(s)${orphansSummary}.`
|
|
3612
|
+
);
|
|
3613
|
+
}
|
|
3614
|
+
|
|
3615
|
+
// src/migrations/v2.0/update-package-json.ts
|
|
3616
|
+
var import_fs = require("fs");
|
|
3617
|
+
var import_path17 = __toESM(require("path"));
|
|
3618
|
+
var PACKAGE_JSON_RELATIVE = "package.json";
|
|
3619
|
+
var TARGET_VERSION = "2.0.0";
|
|
3620
|
+
var TARGET_ZOD_RANGE = "^4.2.1";
|
|
3621
|
+
async function main17() {
|
|
3622
|
+
const packageJsonPath = import_path17.default.join(process.cwd(), PACKAGE_JSON_RELATIVE);
|
|
3623
|
+
if (!(0, import_fs.existsSync)(packageJsonPath)) {
|
|
3624
|
+
console.log(`'${PACKAGE_JSON_RELATIVE}' not found in ${process.cwd()} \u2014 skipping.`);
|
|
3625
|
+
return;
|
|
3626
|
+
}
|
|
3627
|
+
const raw = (0, import_fs.readFileSync)(packageJsonPath, "utf8");
|
|
3628
|
+
let parsed;
|
|
3629
|
+
try {
|
|
3630
|
+
parsed = JSON.parse(raw);
|
|
3631
|
+
} catch (error) {
|
|
3632
|
+
console.warn(
|
|
3633
|
+
` [${PACKAGE_JSON_RELATIVE}] Failed to parse JSON \u2014 skipping update. ${error.message}`
|
|
3634
|
+
);
|
|
3635
|
+
return;
|
|
3636
|
+
}
|
|
3637
|
+
console.log(`Updating '${PACKAGE_JSON_RELATIVE}'...`);
|
|
3638
|
+
const previousVersion = parsed.version;
|
|
3639
|
+
const versionChanged = previousVersion !== TARGET_VERSION;
|
|
3640
|
+
parsed.version = TARGET_VERSION;
|
|
3641
|
+
if (versionChanged) {
|
|
3642
|
+
console.log(
|
|
3643
|
+
` Set version: ${previousVersion ?? "<unset>"} \u2192 ${TARGET_VERSION}`
|
|
3644
|
+
);
|
|
3645
|
+
} else {
|
|
3646
|
+
console.log(` Version already ${TARGET_VERSION} \u2014 no change.`);
|
|
3647
|
+
}
|
|
3648
|
+
let zodBucket = "dependencies";
|
|
3649
|
+
if (parsed.devDependencies && "zod" in parsed.devDependencies) {
|
|
3650
|
+
zodBucket = "devDependencies";
|
|
3651
|
+
}
|
|
3652
|
+
if (!parsed[zodBucket]) {
|
|
3653
|
+
parsed[zodBucket] = {};
|
|
3654
|
+
}
|
|
3655
|
+
const bucket = parsed[zodBucket];
|
|
3656
|
+
const previousZod = bucket.zod;
|
|
3657
|
+
const zodChanged = previousZod !== TARGET_ZOD_RANGE;
|
|
3658
|
+
bucket.zod = TARGET_ZOD_RANGE;
|
|
3659
|
+
if (zodChanged) {
|
|
3660
|
+
console.log(
|
|
3661
|
+
` Set ${zodBucket}.zod: ${previousZod ?? "<absent>"} \u2192 ${TARGET_ZOD_RANGE}`
|
|
3662
|
+
);
|
|
3663
|
+
} else {
|
|
3664
|
+
console.log(` ${zodBucket}.zod already ${TARGET_ZOD_RANGE} \u2014 no change.`);
|
|
3665
|
+
}
|
|
3666
|
+
const trailingNewline = raw.endsWith("\n") ? "\n" : "";
|
|
3667
|
+
const next = JSON.stringify(parsed, null, 2) + trailingNewline;
|
|
3668
|
+
if (next === raw) {
|
|
3669
|
+
console.log("\n No changes to write.");
|
|
3670
|
+
return;
|
|
3671
|
+
}
|
|
3672
|
+
(0, import_fs.writeFileSync)(packageJsonPath, next, "utf8");
|
|
3673
|
+
console.log(`
|
|
3674
|
+
Saved '${PACKAGE_JSON_RELATIVE}'.`);
|
|
3675
|
+
console.log(
|
|
3676
|
+
` NOTE: run \`yarn install\` (or your package manager equivalent) to install the updated dependency versions.`
|
|
3677
|
+
);
|
|
3678
|
+
}
|
|
3679
|
+
|
|
3680
|
+
// src/migrations/v2.0/migrate-workqueue-configs.ts
|
|
3681
|
+
var import_ts_morph17 = require("ts-morph");
|
|
3682
|
+
var import_path18 = __toESM(require("path"));
|
|
2890
3683
|
var DEFINE_WORKQUEUES_NAME3 = "defineWorkqueues";
|
|
2891
3684
|
var ACTIONS_PROPERTY_NAME5 = "actions";
|
|
2892
3685
|
var ACTION_PROPERTY_NAME2 = "action";
|
|
@@ -2907,28 +3700,28 @@ var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
|
2907
3700
|
]);
|
|
2908
3701
|
function getWorkqueueLabel(workqueue) {
|
|
2909
3702
|
const slugProperty = workqueue.getProperty(SLUG_PROPERTY_NAME);
|
|
2910
|
-
if (!slugProperty || !
|
|
3703
|
+
if (!slugProperty || !import_ts_morph17.Node.isPropertyAssignment(slugProperty)) {
|
|
2911
3704
|
return "(unknown slug)";
|
|
2912
3705
|
}
|
|
2913
3706
|
const slugInitializer = slugProperty.getInitializer();
|
|
2914
|
-
if (!slugInitializer || !
|
|
3707
|
+
if (!slugInitializer || !import_ts_morph17.Node.isStringLiteral(slugInitializer)) {
|
|
2915
3708
|
return "(unknown slug)";
|
|
2916
3709
|
}
|
|
2917
3710
|
return slugInitializer.getLiteralValue();
|
|
2918
3711
|
}
|
|
2919
3712
|
function getActionTypeName(action) {
|
|
2920
3713
|
const typeProperty = action.getProperty(TYPE_PROPERTY_NAME7);
|
|
2921
|
-
if (!typeProperty || !
|
|
3714
|
+
if (!typeProperty || !import_ts_morph17.Node.isPropertyAssignment(typeProperty)) {
|
|
2922
3715
|
return null;
|
|
2923
3716
|
}
|
|
2924
3717
|
const typeInitializer = typeProperty.getInitializer();
|
|
2925
3718
|
if (!typeInitializer) {
|
|
2926
3719
|
return null;
|
|
2927
3720
|
}
|
|
2928
|
-
if (
|
|
3721
|
+
if (import_ts_morph17.Node.isStringLiteral(typeInitializer)) {
|
|
2929
3722
|
return typeInitializer.getLiteralValue();
|
|
2930
3723
|
}
|
|
2931
|
-
if (
|
|
3724
|
+
if (import_ts_morph17.Node.isPropertyAccessExpression(typeInitializer)) {
|
|
2932
3725
|
return typeInitializer.getName();
|
|
2933
3726
|
}
|
|
2934
3727
|
return null;
|
|
@@ -2942,19 +3735,19 @@ function isUnsupportedActionType(action) {
|
|
|
2942
3735
|
}
|
|
2943
3736
|
function migrateWorkqueueActions(workqueue, relPath) {
|
|
2944
3737
|
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
2945
|
-
if (!actionsProperty || !
|
|
3738
|
+
if (!actionsProperty || !import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
2946
3739
|
return 0;
|
|
2947
3740
|
}
|
|
2948
3741
|
const actionsInitializer = actionsProperty.getInitializer();
|
|
2949
|
-
if (!actionsInitializer || !
|
|
3742
|
+
if (!actionsInitializer || !import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
2950
3743
|
return 0;
|
|
2951
3744
|
}
|
|
2952
3745
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
2953
3746
|
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
2954
3747
|
if (existingActionProperty) {
|
|
2955
|
-
if (
|
|
3748
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
2956
3749
|
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
2957
|
-
if (existingActionInitializer &&
|
|
3750
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
2958
3751
|
const conditionalsProperty2 = existingActionInitializer.getProperty(
|
|
2959
3752
|
CONDITIONALS_PROPERTY_NAME
|
|
2960
3753
|
);
|
|
@@ -2979,7 +3772,7 @@ function migrateWorkqueueActions(workqueue, relPath) {
|
|
|
2979
3772
|
return 1;
|
|
2980
3773
|
}
|
|
2981
3774
|
const actionCandidates = actionsInitializer.getElements().filter(
|
|
2982
|
-
(element) =>
|
|
3775
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
2983
3776
|
);
|
|
2984
3777
|
if (actionCandidates.length === 0) {
|
|
2985
3778
|
actionsProperty.remove();
|
|
@@ -3021,36 +3814,36 @@ function migrateWorkqueueActions(workqueue, relPath) {
|
|
|
3021
3814
|
);
|
|
3022
3815
|
return 1;
|
|
3023
3816
|
}
|
|
3024
|
-
function
|
|
3817
|
+
function processFile13(filePath, project) {
|
|
3025
3818
|
const sourceFile = project.getSourceFile(filePath);
|
|
3026
3819
|
if (!sourceFile) return 0;
|
|
3027
3820
|
let migratedWorkqueues = 0;
|
|
3028
|
-
const relPath =
|
|
3821
|
+
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3029
3822
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3030
|
-
|
|
3823
|
+
import_ts_morph17.SyntaxKind.CallExpression
|
|
3031
3824
|
);
|
|
3032
3825
|
for (const call of callExpressions) {
|
|
3033
3826
|
const expression = call.getExpression();
|
|
3034
|
-
if (!
|
|
3827
|
+
if (!import_ts_morph17.Node.isIdentifier(expression) || expression.getText() !== DEFINE_WORKQUEUES_NAME3) {
|
|
3035
3828
|
continue;
|
|
3036
3829
|
}
|
|
3037
3830
|
const args = call.getArguments();
|
|
3038
3831
|
if (args.length === 0) continue;
|
|
3039
3832
|
const workqueuesArg = args[0];
|
|
3040
|
-
if (!
|
|
3833
|
+
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3041
3834
|
for (const element of workqueuesArg.getElements()) {
|
|
3042
|
-
if (!
|
|
3835
|
+
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3043
3836
|
migratedWorkqueues += migrateWorkqueueActions(element, relPath);
|
|
3044
3837
|
}
|
|
3045
3838
|
}
|
|
3046
3839
|
return migratedWorkqueues;
|
|
3047
3840
|
}
|
|
3048
|
-
async function
|
|
3049
|
-
const srcDir =
|
|
3841
|
+
async function main18() {
|
|
3842
|
+
const srcDir = import_path18.default.join(process.cwd(), "src");
|
|
3050
3843
|
console.log(`Scanning for defineWorkqueues calls in: ${srcDir}
|
|
3051
3844
|
`);
|
|
3052
|
-
const project = new
|
|
3053
|
-
tsConfigFilePath:
|
|
3845
|
+
const project = new import_ts_morph17.Project({
|
|
3846
|
+
tsConfigFilePath: import_path18.default.resolve(srcDir, "../tsconfig.json"),
|
|
3054
3847
|
skipAddingFilesFromTsConfig: false
|
|
3055
3848
|
});
|
|
3056
3849
|
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
@@ -3063,7 +3856,7 @@ async function main13() {
|
|
|
3063
3856
|
const modifiedFiles = [];
|
|
3064
3857
|
for (const sourceFile of sourceFiles) {
|
|
3065
3858
|
const filePath = sourceFile.getFilePath();
|
|
3066
|
-
const migrated =
|
|
3859
|
+
const migrated = processFile13(filePath, project);
|
|
3067
3860
|
if (migrated > 0) {
|
|
3068
3861
|
totalMigrated += migrated;
|
|
3069
3862
|
modifiedFiles.push(filePath);
|
|
@@ -3080,7 +3873,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
3080
3873
|
for (const filePath of modifiedFiles) {
|
|
3081
3874
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
3082
3875
|
await sourceFile.save();
|
|
3083
|
-
console.log(` Saved: ${
|
|
3876
|
+
console.log(` Saved: ${import_path18.default.relative(process.cwd(), filePath)}`);
|
|
3084
3877
|
}
|
|
3085
3878
|
console.log(
|
|
3086
3879
|
`
|
|
@@ -3089,13 +3882,13 @@ Done. Migrated ${totalMigrated} deprecated workqueue 'actions' definition(s) to
|
|
|
3089
3882
|
}
|
|
3090
3883
|
|
|
3091
3884
|
// src/migrations/v2.0/remove-demo-scope.ts
|
|
3092
|
-
var
|
|
3093
|
-
var
|
|
3885
|
+
var import_path19 = __toESM(require("path"));
|
|
3886
|
+
var import_ts_morph18 = require("ts-morph");
|
|
3094
3887
|
var ROLES_HANDLER_RELATIVE_PATH = "src/data-seeding/roles/handler.ts";
|
|
3095
|
-
async function
|
|
3096
|
-
const rolesHandlerPath =
|
|
3097
|
-
const project = new
|
|
3098
|
-
tsConfigFilePath:
|
|
3888
|
+
async function main19() {
|
|
3889
|
+
const rolesHandlerPath = import_path19.default.join(process.cwd(), ROLES_HANDLER_RELATIVE_PATH);
|
|
3890
|
+
const project = new import_ts_morph18.Project({
|
|
3891
|
+
tsConfigFilePath: import_path19.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3099
3892
|
skipAddingFilesFromTsConfig: false
|
|
3100
3893
|
});
|
|
3101
3894
|
const sourceFile = project.getSourceFile(rolesHandlerPath);
|
|
@@ -3144,7 +3937,7 @@ async function main14() {
|
|
|
3144
3937
|
|
|
3145
3938
|
// src/migrations/v2.0/remove-hearth-migrations.ts
|
|
3146
3939
|
var fs2 = __toESM(require("fs"));
|
|
3147
|
-
var
|
|
3940
|
+
var import_path20 = __toESM(require("path"));
|
|
3148
3941
|
var PATHS_TO_REMOVE = [
|
|
3149
3942
|
{
|
|
3150
3943
|
relativePath: "src/migrations/hearth",
|
|
@@ -3156,9 +3949,9 @@ var PATHS_TO_REMOVE = [
|
|
|
3156
3949
|
},
|
|
3157
3950
|
{ relativePath: "src/utils/hearth-helpers.ts", label: "Hearth helpers file" }
|
|
3158
3951
|
];
|
|
3159
|
-
async function
|
|
3952
|
+
async function main20() {
|
|
3160
3953
|
for (const { relativePath, label } of PATHS_TO_REMOVE) {
|
|
3161
|
-
const absolutePath =
|
|
3954
|
+
const absolutePath = import_path20.default.join(process.cwd(), relativePath);
|
|
3162
3955
|
if (fs2.existsSync(absolutePath)) {
|
|
3163
3956
|
fs2.rmSync(absolutePath, { recursive: true, force: true });
|
|
3164
3957
|
console.log(`Removed ${label} '${relativePath}'.`);
|
|
@@ -3169,9 +3962,9 @@ async function main15() {
|
|
|
3169
3962
|
}
|
|
3170
3963
|
|
|
3171
3964
|
// src/migrations/v2.0/create-events-index.ts
|
|
3172
|
-
var
|
|
3173
|
-
var
|
|
3174
|
-
var
|
|
3965
|
+
var import_ts_morph19 = require("ts-morph");
|
|
3966
|
+
var import_fs2 = __toESM(require("fs"));
|
|
3967
|
+
var import_path21 = __toESM(require("path"));
|
|
3175
3968
|
var DEFINE_CONFIG_NAME5 = "defineConfig";
|
|
3176
3969
|
var HANDLER_FUNCTION_NAMES = /* @__PURE__ */ new Set([
|
|
3177
3970
|
"getCustomEventsHandler",
|
|
@@ -3193,7 +3986,7 @@ var LICENSE_HEADER = `/*
|
|
|
3193
3986
|
`;
|
|
3194
3987
|
function findEventConfigExports(project, srcDir) {
|
|
3195
3988
|
const found = [];
|
|
3196
|
-
const eventsIndexAbs =
|
|
3989
|
+
const eventsIndexAbs = import_path21.default.join(srcDir, "events", "index.ts");
|
|
3197
3990
|
for (const sourceFile of project.getSourceFiles()) {
|
|
3198
3991
|
const filePath = sourceFile.getFilePath();
|
|
3199
3992
|
if (!filePath.startsWith(srcDir) || filePath.includes("/node_modules/")) {
|
|
@@ -3205,10 +3998,10 @@ function findEventConfigExports(project, srcDir) {
|
|
|
3205
3998
|
for (const decl of statement.getDeclarations()) {
|
|
3206
3999
|
const initializer = decl.getInitializer();
|
|
3207
4000
|
if (!initializer) continue;
|
|
3208
|
-
const unwrapped =
|
|
3209
|
-
if (!
|
|
4001
|
+
const unwrapped = import_ts_morph19.Node.isAsExpression(initializer) ? initializer.getExpression() : initializer;
|
|
4002
|
+
if (!import_ts_morph19.Node.isCallExpression(unwrapped)) continue;
|
|
3210
4003
|
const callee = unwrapped.getExpression();
|
|
3211
|
-
if (!
|
|
4004
|
+
if (!import_ts_morph19.Node.isIdentifier(callee)) continue;
|
|
3212
4005
|
if (callee.getText() !== DEFINE_CONFIG_NAME5) continue;
|
|
3213
4006
|
found.push({ name: decl.getName(), filePath });
|
|
3214
4007
|
}
|
|
@@ -3217,8 +4010,8 @@ function findEventConfigExports(project, srcDir) {
|
|
|
3217
4010
|
return found;
|
|
3218
4011
|
}
|
|
3219
4012
|
function buildIndexImportSpecifier(eventConfigFilePath, srcDir) {
|
|
3220
|
-
const eventsIndexDir =
|
|
3221
|
-
let rel =
|
|
4013
|
+
const eventsIndexDir = import_path21.default.join(srcDir, "events");
|
|
4014
|
+
let rel = import_path21.default.relative(eventsIndexDir, eventConfigFilePath).split(import_path21.default.sep).join("/");
|
|
3222
4015
|
if (rel.endsWith(".ts")) rel = rel.slice(0, -".ts".length);
|
|
3223
4016
|
if (rel.endsWith("/index")) rel = rel.slice(0, -"/index".length);
|
|
3224
4017
|
if (!rel.startsWith(".")) rel = "./" + rel;
|
|
@@ -3295,17 +4088,17 @@ function modifyHandler(sourceFile, exportNames) {
|
|
|
3295
4088
|
);
|
|
3296
4089
|
}
|
|
3297
4090
|
for (const call of sourceFile.getDescendantsOfKind(
|
|
3298
|
-
|
|
4091
|
+
import_ts_morph19.SyntaxKind.CallExpression
|
|
3299
4092
|
)) {
|
|
3300
4093
|
const callee = call.getExpression();
|
|
3301
|
-
if (!
|
|
4094
|
+
if (!import_ts_morph19.Node.isPropertyAccessExpression(callee)) continue;
|
|
3302
4095
|
if (callee.getName() !== RESPONSE_METHOD_NAME) continue;
|
|
3303
4096
|
const args = call.getArguments();
|
|
3304
4097
|
if (args.length !== 1) continue;
|
|
3305
4098
|
const [arg] = args;
|
|
3306
|
-
if (!
|
|
4099
|
+
if (!import_ts_morph19.Node.isArrayLiteralExpression(arg)) continue;
|
|
3307
4100
|
if (arg.getElements().length === 0) continue;
|
|
3308
|
-
if (!arg.getElements().every((el) =>
|
|
4101
|
+
if (!arg.getElements().every((el) => import_ts_morph19.Node.isIdentifier(el))) continue;
|
|
3309
4102
|
arg.replaceWithText(EVENT_CONFIGS_IDENTIFIER);
|
|
3310
4103
|
changes.push(
|
|
3311
4104
|
`rewrote h.response([...]) \u2192 h.response(${EVENT_CONFIGS_IDENTIFIER})`
|
|
@@ -3313,13 +4106,13 @@ function modifyHandler(sourceFile, exportNames) {
|
|
|
3313
4106
|
}
|
|
3314
4107
|
return changes;
|
|
3315
4108
|
}
|
|
3316
|
-
async function
|
|
3317
|
-
const
|
|
3318
|
-
const srcDir =
|
|
4109
|
+
async function main21() {
|
|
4110
|
+
const cwd = process.cwd();
|
|
4111
|
+
const srcDir = import_path21.default.join(cwd, "src");
|
|
3319
4112
|
console.log(`Scanning for defineConfig event exports in: ${srcDir}
|
|
3320
4113
|
`);
|
|
3321
|
-
const project = new
|
|
3322
|
-
tsConfigFilePath:
|
|
4114
|
+
const project = new import_ts_morph19.Project({
|
|
4115
|
+
tsConfigFilePath: import_path21.default.resolve(srcDir, "../tsconfig.json"),
|
|
3323
4116
|
skipAddingFilesFromTsConfig: false
|
|
3324
4117
|
});
|
|
3325
4118
|
const eventConfigExports = findEventConfigExports(project, srcDir);
|
|
@@ -3331,15 +4124,15 @@ async function main16() {
|
|
|
3331
4124
|
}
|
|
3332
4125
|
console.log(`Found ${eventConfigExports.length} event config export(s):`);
|
|
3333
4126
|
for (const e of eventConfigExports) {
|
|
3334
|
-
console.log(` ${e.name} \u2190 ${
|
|
4127
|
+
console.log(` ${e.name} \u2190 ${import_path21.default.relative(cwd, e.filePath)}`);
|
|
3335
4128
|
}
|
|
3336
|
-
const eventsIndexAbs =
|
|
3337
|
-
const eventsIndexRel =
|
|
3338
|
-
if (
|
|
4129
|
+
const eventsIndexAbs = import_path21.default.join(srcDir, "events", "index.ts");
|
|
4130
|
+
const eventsIndexRel = import_path21.default.relative(cwd, eventsIndexAbs);
|
|
4131
|
+
if (import_fs2.default.existsSync(eventsIndexAbs)) {
|
|
3339
4132
|
console.log(`
|
|
3340
4133
|
[${eventsIndexRel}] already exists \u2014 leaving untouched.`);
|
|
3341
4134
|
} else {
|
|
3342
|
-
|
|
4135
|
+
import_fs2.default.mkdirSync(import_path21.default.dirname(eventsIndexAbs), { recursive: true });
|
|
3343
4136
|
const source = buildEventsIndexSource(eventConfigExports, srcDir);
|
|
3344
4137
|
const eventsIndexFile = project.createSourceFile(eventsIndexAbs, source, {
|
|
3345
4138
|
overwrite: false
|
|
@@ -3360,7 +4153,7 @@ No event-config handler file found (looked for exported function(s): ${Array.fro
|
|
|
3360
4153
|
);
|
|
3361
4154
|
return;
|
|
3362
4155
|
}
|
|
3363
|
-
const handlerRelPath =
|
|
4156
|
+
const handlerRelPath = import_path21.default.relative(cwd, handler.getFilePath());
|
|
3364
4157
|
const exportNameSet = new Set(eventConfigExports.map((e) => e.name));
|
|
3365
4158
|
const changes = modifyHandler(handler, exportNameSet);
|
|
3366
4159
|
if (changes.length === 0) {
|
|
@@ -3380,12 +4173,13 @@ var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
|
3380
4173
|
var UPSTREAM_BRANCH = "develop";
|
|
3381
4174
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
3382
4175
|
var FILES_TO_CHECKOUT = [
|
|
3383
|
-
"
|
|
3384
|
-
"
|
|
4176
|
+
"src/analytics/analytics.ts",
|
|
4177
|
+
"Dockerfile",
|
|
4178
|
+
"Dockerfile.assets"
|
|
3385
4179
|
];
|
|
3386
4180
|
function runGit(args, { silent = false } = {}) {
|
|
3387
4181
|
return (0, import_child_process.execFileSync)("git", args, {
|
|
3388
|
-
cwd:
|
|
4182
|
+
cwd: process.cwd(),
|
|
3389
4183
|
encoding: "utf8",
|
|
3390
4184
|
stdio: silent ? ["ignore", "pipe", "pipe"] : ["ignore", "pipe", "inherit"]
|
|
3391
4185
|
});
|
|
@@ -3401,11 +4195,11 @@ function tryGit(args) {
|
|
|
3401
4195
|
function assertIsGitRepo() {
|
|
3402
4196
|
if (!tryGit(["rev-parse", "--is-inside-work-tree"])) {
|
|
3403
4197
|
throw new Error(
|
|
3404
|
-
|
|
4198
|
+
`${process.cwd()} is not a git repository. Initialise git (or run the upgrade inside a git checkout) before re-running.`
|
|
3405
4199
|
);
|
|
3406
4200
|
}
|
|
3407
4201
|
}
|
|
3408
|
-
async function
|
|
4202
|
+
async function main22() {
|
|
3409
4203
|
console.log(
|
|
3410
4204
|
`Checking out ${FILES_TO_CHECKOUT.length} file(s) from ${UPSTREAM_URL}@${UPSTREAM_BRANCH}...
|
|
3411
4205
|
`
|
|
@@ -3453,10 +4247,356 @@ async function main17() {
|
|
|
3453
4247
|
}
|
|
3454
4248
|
}
|
|
3455
4249
|
|
|
4250
|
+
// src/migrations/v2.0/add-resend-invite-notification.ts
|
|
4251
|
+
var import_fs3 = require("fs");
|
|
4252
|
+
var import_path22 = __toESM(require("path"));
|
|
4253
|
+
var import_ts_morph20 = require("ts-morph");
|
|
4254
|
+
var TS_MORPH_PROJECT_OPTIONS = {
|
|
4255
|
+
skipAddingFilesFromTsConfig: true,
|
|
4256
|
+
manipulationSettings: {
|
|
4257
|
+
indentationText: import_ts_morph20.IndentationText.TwoSpaces
|
|
4258
|
+
}
|
|
4259
|
+
};
|
|
4260
|
+
var EMAIL_TEMPLATES_INDEX = "src/api/notification/email-templates/index.ts";
|
|
4261
|
+
var NOTIFICATION_HANDLER = "src/api/notification/handler.ts";
|
|
4262
|
+
var USER_NOTIFICATION_ROUTES = "src/config/routes/userNotificationRoutes.ts";
|
|
4263
|
+
var SMS_SERVICE = "src/api/notification/sms-service.ts";
|
|
4264
|
+
var NOTIFICATION_CSV = "src/translations/notification.csv";
|
|
4265
|
+
var RESEND_INVITE_HTML = "src/api/notification/email-templates/other/resend-invite.html";
|
|
4266
|
+
var RESEND_INVITE_HTML_CONTENT = `<!doctype html>
|
|
4267
|
+
<html>
|
|
4268
|
+
<head>
|
|
4269
|
+
<link
|
|
4270
|
+
href="https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;700&display=swap"
|
|
4271
|
+
rel="stylesheet"
|
|
4272
|
+
/>
|
|
4273
|
+
<style type="text/css">
|
|
4274
|
+
body {
|
|
4275
|
+
font-family: 'Noto Sans', sans-serif;
|
|
4276
|
+
color: #222;
|
|
4277
|
+
padding: 16px 24px;
|
|
4278
|
+
}
|
|
4279
|
+
|
|
4280
|
+
h1 {
|
|
4281
|
+
font-size: 21px;
|
|
4282
|
+
margin-top: 32px;
|
|
4283
|
+
margin-bottom: 36px;
|
|
4284
|
+
font-weight: 700;
|
|
4285
|
+
}
|
|
4286
|
+
|
|
4287
|
+
p {
|
|
4288
|
+
font-weight: 400;
|
|
4289
|
+
font-size: 16px;
|
|
4290
|
+
line-height: 1.8;
|
|
4291
|
+
margin-bottom: 24px;
|
|
4292
|
+
}
|
|
4293
|
+
|
|
4294
|
+
i {
|
|
4295
|
+
color: #666;
|
|
4296
|
+
font-weight: 400;
|
|
4297
|
+
font-size: 16px;
|
|
4298
|
+
}
|
|
4299
|
+
</style>
|
|
4300
|
+
</head>
|
|
4301
|
+
|
|
4302
|
+
<body>
|
|
4303
|
+
<img
|
|
4304
|
+
src="{{countryLogo}}"
|
|
4305
|
+
alt="country_logo"
|
|
4306
|
+
style="max-height: 88px; max-width: 100%"
|
|
4307
|
+
/>
|
|
4308
|
+
<h1>Your {{applicationName}} account invitation</h1>
|
|
4309
|
+
<p>Hello {{firstname}},</p>
|
|
4310
|
+
<p>Your account invitation has been resent. Please use the following credentials to access your account:</p>
|
|
4311
|
+
<p>
|
|
4312
|
+
Username: <strong>{{username}}</strong><br />
|
|
4313
|
+
Password: <strong>{{temporaryPassword}}</strong>
|
|
4314
|
+
</p>
|
|
4315
|
+
<p>
|
|
4316
|
+
Please click the link below to complete your account setup and start using
|
|
4317
|
+
{{applicationName}}.
|
|
4318
|
+
</p>
|
|
4319
|
+
|
|
4320
|
+
<div style="margin-top: 32px; margin-bottom: 32px">
|
|
4321
|
+
<a href="{{loginURL}}">Complete setup</a>
|
|
4322
|
+
</div>
|
|
4323
|
+
<br />
|
|
4324
|
+
<p>
|
|
4325
|
+
Best regards, <br />
|
|
4326
|
+
{{applicationName}} Team
|
|
4327
|
+
</p>
|
|
4328
|
+
</body>
|
|
4329
|
+
</html>
|
|
4330
|
+
`;
|
|
4331
|
+
var CSV_ROW = "resendInviteNotification,The SMS message that is sent when a user invitation is resent,Your OpenCRVS account invitation was resent. Please login with your username: {{username}} and temporary password: {{temporaryPassword}},Votre invitation de compte OpenCRVS a \xE9t\xE9 renvoy\xE9e. Veuillez vous connecter avec votre nom d'utilisateur : {{username}} et votre mot de passe temporaire : {{temporaryPassword}}.\n";
|
|
4332
|
+
function getObjectLiteralFromConst(declaration) {
|
|
4333
|
+
if (!declaration) {
|
|
4334
|
+
return;
|
|
4335
|
+
}
|
|
4336
|
+
const initializer = declaration.getInitializer();
|
|
4337
|
+
if (!initializer) {
|
|
4338
|
+
return;
|
|
4339
|
+
}
|
|
4340
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(initializer)) {
|
|
4341
|
+
return initializer;
|
|
4342
|
+
}
|
|
4343
|
+
if (import_ts_morph20.Node.isAsExpression(initializer)) {
|
|
4344
|
+
const expression = initializer.getExpression();
|
|
4345
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(expression)) {
|
|
4346
|
+
return expression;
|
|
4347
|
+
}
|
|
4348
|
+
}
|
|
4349
|
+
if (import_ts_morph20.Node.isSatisfiesExpression(initializer)) {
|
|
4350
|
+
const expression = initializer.getExpression();
|
|
4351
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(expression)) {
|
|
4352
|
+
return expression;
|
|
4353
|
+
}
|
|
4354
|
+
}
|
|
4355
|
+
}
|
|
4356
|
+
function patchEmailTemplatesIndex() {
|
|
4357
|
+
const full = import_path22.default.join(process.cwd(), EMAIL_TEMPLATES_INDEX);
|
|
4358
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4359
|
+
console.log(` '${EMAIL_TEMPLATES_INDEX}' missing \u2014 skipping.`);
|
|
4360
|
+
return false;
|
|
4361
|
+
}
|
|
4362
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4363
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4364
|
+
let changed = false;
|
|
4365
|
+
const triggerVariableObject = getObjectLiteralFromConst(
|
|
4366
|
+
sourceFile.getVariableDeclaration("TriggerVariable")
|
|
4367
|
+
);
|
|
4368
|
+
if (triggerVariableObject) {
|
|
4369
|
+
const hasResendInviteVariable = triggerVariableObject.getProperties().some((prop) => prop.getText().includes("[TriggerEvent.RESEND_INVITE]"));
|
|
4370
|
+
if (!hasResendInviteVariable) {
|
|
4371
|
+
const properties = triggerVariableObject.getProperties();
|
|
4372
|
+
const lastProperty = properties[properties.length - 1];
|
|
4373
|
+
if (lastProperty) {
|
|
4374
|
+
sourceFile.insertText(
|
|
4375
|
+
lastProperty.getEnd(),
|
|
4376
|
+
`,
|
|
4377
|
+
[TriggerEvent.RESEND_INVITE]: z.object({
|
|
4378
|
+
firstname: z.string(),
|
|
4379
|
+
username: z.string(),
|
|
4380
|
+
temporaryPassword: z.string(),
|
|
4381
|
+
completeSetupUrl: z.string(),
|
|
4382
|
+
loginURL: z.string()
|
|
4383
|
+
})`
|
|
4384
|
+
);
|
|
4385
|
+
changed = true;
|
|
4386
|
+
}
|
|
4387
|
+
}
|
|
4388
|
+
}
|
|
4389
|
+
const templatesObject = getObjectLiteralFromConst(
|
|
4390
|
+
sourceFile.getVariableDeclaration("templates")
|
|
4391
|
+
);
|
|
4392
|
+
if (templatesObject) {
|
|
4393
|
+
const hasResendInviteTemplate = templatesObject.getProperties().some(
|
|
4394
|
+
(prop) => prop.getText().includes("readOtherTemplate<TriggerVariable['resend-invite']>")
|
|
4395
|
+
);
|
|
4396
|
+
if (!hasResendInviteTemplate) {
|
|
4397
|
+
const userCreatedProp = templatesObject.getProperties().find((prop) => prop.getText().includes("[TriggerEvent.USER_CREATED]"));
|
|
4398
|
+
const anchor = userCreatedProp ?? templatesObject.getProperties()[templatesObject.getProperties().length - 1];
|
|
4399
|
+
if (anchor) {
|
|
4400
|
+
sourceFile.insertText(
|
|
4401
|
+
anchor.getEnd(),
|
|
4402
|
+
`,
|
|
4403
|
+
[TriggerEvent.RESEND_INVITE]: {
|
|
4404
|
+
type: 'resend-invite',
|
|
4405
|
+
subject: 'Your OpenCRVS account invitation',
|
|
4406
|
+
template:
|
|
4407
|
+
readOtherTemplate<TriggerVariable['resend-invite']>('resend-invite')
|
|
4408
|
+
}`
|
|
4409
|
+
);
|
|
4410
|
+
changed = true;
|
|
4411
|
+
}
|
|
4412
|
+
}
|
|
4413
|
+
}
|
|
4414
|
+
if (changed) {
|
|
4415
|
+
sourceFile.saveSync();
|
|
4416
|
+
}
|
|
4417
|
+
return changed;
|
|
4418
|
+
}
|
|
4419
|
+
function patchNotificationHandler() {
|
|
4420
|
+
const full = import_path22.default.join(process.cwd(), NOTIFICATION_HANDLER);
|
|
4421
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4422
|
+
return false;
|
|
4423
|
+
}
|
|
4424
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4425
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4426
|
+
const convertFn = sourceFile.getFunction("convertPayloadToVariable");
|
|
4427
|
+
if (!convertFn) {
|
|
4428
|
+
return false;
|
|
4429
|
+
}
|
|
4430
|
+
const switchStmt = convertFn.getFirstDescendantByKind(
|
|
4431
|
+
import_ts_morph20.SyntaxKind.SwitchStatement
|
|
4432
|
+
);
|
|
4433
|
+
if (!switchStmt) {
|
|
4434
|
+
return false;
|
|
4435
|
+
}
|
|
4436
|
+
const clauses = switchStmt.getCaseBlock().getClauses();
|
|
4437
|
+
const hasResendInvite = clauses.some(
|
|
4438
|
+
(clause) => import_ts_morph20.Node.isCaseClause(clause) && clause.getExpression().getText() === "TriggerEvent.RESEND_INVITE"
|
|
4439
|
+
);
|
|
4440
|
+
if (hasResendInvite) {
|
|
4441
|
+
return false;
|
|
4442
|
+
}
|
|
4443
|
+
const userCreatedClauseIndex = clauses.findIndex(
|
|
4444
|
+
(clause) => import_ts_morph20.Node.isCaseClause(clause) && clause.getExpression().getText() === "TriggerEvent.USER_CREATED"
|
|
4445
|
+
);
|
|
4446
|
+
if (userCreatedClauseIndex < 0) {
|
|
4447
|
+
return false;
|
|
4448
|
+
}
|
|
4449
|
+
const userCreatedClause = clauses[userCreatedClauseIndex];
|
|
4450
|
+
sourceFile.insertText(
|
|
4451
|
+
userCreatedClause.getEnd(),
|
|
4452
|
+
`
|
|
4453
|
+
|
|
4454
|
+
case TriggerEvent.RESEND_INVITE:
|
|
4455
|
+
return {
|
|
4456
|
+
firstname,
|
|
4457
|
+
username: payload.username,
|
|
4458
|
+
temporaryPassword: payload.temporaryPassword,
|
|
4459
|
+
completeSetupUrl: LOGIN_URL,
|
|
4460
|
+
loginURL: LOGIN_URL
|
|
4461
|
+
}`
|
|
4462
|
+
);
|
|
4463
|
+
sourceFile.saveSync();
|
|
4464
|
+
return true;
|
|
4465
|
+
}
|
|
4466
|
+
function getReturnedArrayLiteral(functionFilePath, fnName) {
|
|
4467
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4468
|
+
const sourceFile = project.addSourceFileAtPath(functionFilePath);
|
|
4469
|
+
const fn = sourceFile.getFunction(fnName);
|
|
4470
|
+
const returnStmt = fn?.getFirstDescendantByKind(import_ts_morph20.SyntaxKind.ReturnStatement);
|
|
4471
|
+
const expr = returnStmt?.getExpression();
|
|
4472
|
+
if (!expr || !import_ts_morph20.Node.isArrayLiteralExpression(expr)) {
|
|
4473
|
+
return { sourceFile, arrayLiteral: void 0 };
|
|
4474
|
+
}
|
|
4475
|
+
return { sourceFile, arrayLiteral: expr };
|
|
4476
|
+
}
|
|
4477
|
+
function patchUserNotificationRoutes() {
|
|
4478
|
+
const full = import_path22.default.join(process.cwd(), USER_NOTIFICATION_ROUTES);
|
|
4479
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4480
|
+
return false;
|
|
4481
|
+
}
|
|
4482
|
+
const { sourceFile, arrayLiteral } = getReturnedArrayLiteral(
|
|
4483
|
+
full,
|
|
4484
|
+
"getUserNotificationRoutes"
|
|
4485
|
+
);
|
|
4486
|
+
if (!arrayLiteral) {
|
|
4487
|
+
return false;
|
|
4488
|
+
}
|
|
4489
|
+
const elements = arrayLiteral.getElements();
|
|
4490
|
+
const routeExists = elements.some(
|
|
4491
|
+
(element) => element.getText().includes(`path: '/triggers/user/resend-invite'`)
|
|
4492
|
+
);
|
|
4493
|
+
if (routeExists) {
|
|
4494
|
+
return false;
|
|
4495
|
+
}
|
|
4496
|
+
const anchor = elements.find(
|
|
4497
|
+
(element) => element.getText().includes(`path: '/triggers/user/user-created'`)
|
|
4498
|
+
) ?? elements[elements.length - 1];
|
|
4499
|
+
if (!anchor) {
|
|
4500
|
+
return false;
|
|
4501
|
+
}
|
|
4502
|
+
sourceFile.insertText(
|
|
4503
|
+
anchor.getEnd(),
|
|
4504
|
+
`,
|
|
4505
|
+
{
|
|
4506
|
+
method: 'POST',
|
|
4507
|
+
path: '/triggers/user/resend-invite',
|
|
4508
|
+
handler: makeNotificationHandler('resend-invite'),
|
|
4509
|
+
options: {
|
|
4510
|
+
auth: false,
|
|
4511
|
+
tags: ['api'],
|
|
4512
|
+
description: 'Handles notification for resent user invite'
|
|
4513
|
+
}
|
|
4514
|
+
}`
|
|
4515
|
+
);
|
|
4516
|
+
sourceFile.saveSync();
|
|
4517
|
+
return true;
|
|
4518
|
+
}
|
|
4519
|
+
function patchSmsService() {
|
|
4520
|
+
const full = import_path22.default.join(process.cwd(), SMS_SERVICE);
|
|
4521
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4522
|
+
return false;
|
|
4523
|
+
}
|
|
4524
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4525
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4526
|
+
let changed = false;
|
|
4527
|
+
const otherTemplatesObject = getObjectLiteralFromConst(
|
|
4528
|
+
sourceFile.getVariableDeclaration("otherTemplates")
|
|
4529
|
+
);
|
|
4530
|
+
if (otherTemplatesObject) {
|
|
4531
|
+
const hasResendTemplate = otherTemplatesObject.getProperties().some((prop) => prop.getText().includes("resendInviteNotification"));
|
|
4532
|
+
if (!hasResendTemplate) {
|
|
4533
|
+
const userCredentialsIndex = otherTemplatesObject.getProperties().findIndex((prop) => prop.getText().includes("userCredentialsNotification"));
|
|
4534
|
+
otherTemplatesObject.insertPropertyAssignment(
|
|
4535
|
+
userCredentialsIndex >= 0 ? userCredentialsIndex + 1 : otherTemplatesObject.getProperties().length,
|
|
4536
|
+
{
|
|
4537
|
+
name: "resendInviteNotification",
|
|
4538
|
+
initializer: `'resendInviteNotification'`
|
|
4539
|
+
}
|
|
4540
|
+
);
|
|
4541
|
+
changed = true;
|
|
4542
|
+
}
|
|
4543
|
+
}
|
|
4544
|
+
const triggerToSmsTemplateObject = getObjectLiteralFromConst(
|
|
4545
|
+
sourceFile.getVariableDeclaration("TriggerToSMSTemplate")
|
|
4546
|
+
);
|
|
4547
|
+
if (triggerToSmsTemplateObject) {
|
|
4548
|
+
const hasResendInviteMap = triggerToSmsTemplateObject.getProperties().some((prop) => prop.getText().includes(`['resend-invite']`));
|
|
4549
|
+
if (!hasResendInviteMap) {
|
|
4550
|
+
const userCreatedIndex = triggerToSmsTemplateObject.getProperties().findIndex((prop) => prop.getText().includes(`['user-created']`));
|
|
4551
|
+
triggerToSmsTemplateObject.insertPropertyAssignment(
|
|
4552
|
+
userCreatedIndex >= 0 ? userCreatedIndex + 1 : triggerToSmsTemplateObject.getProperties().length,
|
|
4553
|
+
{
|
|
4554
|
+
name: `['resend-invite']`,
|
|
4555
|
+
initializer: `'resendInviteNotification'`
|
|
4556
|
+
}
|
|
4557
|
+
);
|
|
4558
|
+
changed = true;
|
|
4559
|
+
}
|
|
4560
|
+
}
|
|
4561
|
+
if (changed) {
|
|
4562
|
+
sourceFile.saveSync();
|
|
4563
|
+
}
|
|
4564
|
+
return changed;
|
|
4565
|
+
}
|
|
4566
|
+
async function main23() {
|
|
4567
|
+
console.log("Adding RESEND_INVITE notification wiring\u2026");
|
|
4568
|
+
const touched = [];
|
|
4569
|
+
if (patchEmailTemplatesIndex()) touched.push(EMAIL_TEMPLATES_INDEX);
|
|
4570
|
+
if (patchNotificationHandler()) touched.push(NOTIFICATION_HANDLER);
|
|
4571
|
+
if (patchUserNotificationRoutes()) touched.push(USER_NOTIFICATION_ROUTES);
|
|
4572
|
+
if (patchSmsService()) touched.push(SMS_SERVICE);
|
|
4573
|
+
const csvPath = import_path22.default.join(process.cwd(), NOTIFICATION_CSV);
|
|
4574
|
+
if ((0, import_fs3.existsSync)(csvPath)) {
|
|
4575
|
+
let t = (0, import_fs3.readFileSync)(csvPath, "utf8");
|
|
4576
|
+
if (!/^resendInviteNotification,/m.test(t)) {
|
|
4577
|
+
if (!t.endsWith("\n")) t += "\n";
|
|
4578
|
+
(0, import_fs3.writeFileSync)(csvPath, t + CSV_ROW);
|
|
4579
|
+
touched.push(NOTIFICATION_CSV);
|
|
4580
|
+
}
|
|
4581
|
+
}
|
|
4582
|
+
const htmlPath = import_path22.default.join(process.cwd(), RESEND_INVITE_HTML);
|
|
4583
|
+
(0, import_fs3.mkdirSync)(import_path22.default.dirname(htmlPath), { recursive: true });
|
|
4584
|
+
if (!(0, import_fs3.existsSync)(htmlPath)) {
|
|
4585
|
+
(0, import_fs3.writeFileSync)(htmlPath, RESEND_INVITE_HTML_CONTENT);
|
|
4586
|
+
touched.push(RESEND_INVITE_HTML);
|
|
4587
|
+
}
|
|
4588
|
+
if (touched.length === 0) {
|
|
4589
|
+
console.log(" Nothing to update (already present or anchors not found).");
|
|
4590
|
+
return;
|
|
4591
|
+
}
|
|
4592
|
+
console.log(` Updated:
|
|
4593
|
+
${touched.map((f) => ` - ${f}`).join("\n")}`);
|
|
4594
|
+
}
|
|
4595
|
+
|
|
3456
4596
|
// src/migrations/v2.0/simplify-analytics-precalculations.ts
|
|
3457
|
-
var
|
|
3458
|
-
var
|
|
3459
|
-
var
|
|
4597
|
+
var import_ts_morph21 = require("ts-morph");
|
|
4598
|
+
var import_fs4 = __toESM(require("fs"));
|
|
4599
|
+
var import_path23 = __toESM(require("path"));
|
|
3460
4600
|
var ANALYTICS_FILE_REL = "src/analytics/analytics.ts";
|
|
3461
4601
|
var FUNCTION_NAME = "precalculateAdditionalAnalytics";
|
|
3462
4602
|
var IMPORT_NAMES_TO_REMOVE = /* @__PURE__ */ new Set(["Event", "precalculateBirthEvent"]);
|
|
@@ -3492,10 +4632,10 @@ function findPrecalculateFunction(sourceFile) {
|
|
|
3492
4632
|
return void 0;
|
|
3493
4633
|
}
|
|
3494
4634
|
function getFunctionBodyBlock(fn) {
|
|
3495
|
-
if (
|
|
4635
|
+
if (import_ts_morph21.Node.isFunctionDeclaration(fn)) return fn.getBody();
|
|
3496
4636
|
const initializer = fn.getInitializer();
|
|
3497
4637
|
if (!initializer) return void 0;
|
|
3498
|
-
if (!
|
|
4638
|
+
if (!import_ts_morph21.Node.isArrowFunction(initializer) && !import_ts_morph21.Node.isFunctionExpression(initializer)) {
|
|
3499
4639
|
return void 0;
|
|
3500
4640
|
}
|
|
3501
4641
|
return initializer.getBody();
|
|
@@ -3505,9 +4645,9 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
3505
4645
|
const fn = findPrecalculateFunction(sourceFile);
|
|
3506
4646
|
if (!fn) return log;
|
|
3507
4647
|
const body = getFunctionBodyBlock(fn);
|
|
3508
|
-
if (!body || !
|
|
4648
|
+
if (!body || !import_ts_morph21.Node.isBlock(body)) return log;
|
|
3509
4649
|
for (const statement of [...body.getStatements()]) {
|
|
3510
|
-
const references = statement.getDescendantsOfKind(
|
|
4650
|
+
const references = statement.getDescendantsOfKind(import_ts_morph21.SyntaxKind.Identifier).some((id) => IMPORT_NAMES_TO_REMOVE.has(id.getText()));
|
|
3511
4651
|
if (references) {
|
|
3512
4652
|
statement.remove();
|
|
3513
4653
|
log.push(`removed statement in ${FUNCTION_NAME} referencing removed imports`);
|
|
@@ -3515,7 +4655,7 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
3515
4655
|
}
|
|
3516
4656
|
const remaining = body.getStatements();
|
|
3517
4657
|
const last = remaining[remaining.length - 1];
|
|
3518
|
-
const alreadyCorrect = last &&
|
|
4658
|
+
const alreadyCorrect = last && import_ts_morph21.Node.isReturnStatement(last) && last.getExpression()?.getText() === RETURN_EXPRESSION_TEXT;
|
|
3519
4659
|
if (!alreadyCorrect) {
|
|
3520
4660
|
body.addStatements(`return ${RETURN_EXPRESSION_TEXT}`);
|
|
3521
4661
|
log.push(
|
|
@@ -3524,17 +4664,17 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
3524
4664
|
}
|
|
3525
4665
|
return log;
|
|
3526
4666
|
}
|
|
3527
|
-
async function
|
|
3528
|
-
const
|
|
3529
|
-
const absPath =
|
|
3530
|
-
if (!
|
|
4667
|
+
async function main24() {
|
|
4668
|
+
const cwd = process.cwd();
|
|
4669
|
+
const absPath = import_path23.default.join(cwd, ANALYTICS_FILE_REL);
|
|
4670
|
+
if (!import_fs4.default.existsSync(absPath)) {
|
|
3531
4671
|
console.log(
|
|
3532
4672
|
`[${ANALYTICS_FILE_REL}] does not exist \u2014 nothing to clean up.`
|
|
3533
4673
|
);
|
|
3534
4674
|
return;
|
|
3535
4675
|
}
|
|
3536
|
-
const project = new
|
|
3537
|
-
tsConfigFilePath:
|
|
4676
|
+
const project = new import_ts_morph21.Project({
|
|
4677
|
+
tsConfigFilePath: import_path23.default.resolve(cwd, "tsconfig.json"),
|
|
3538
4678
|
skipAddingFilesFromTsConfig: false
|
|
3539
4679
|
});
|
|
3540
4680
|
const sourceFile = project.getSourceFile(absPath);
|
|
@@ -3561,26 +4701,158 @@ async function main18() {
|
|
|
3561
4701
|
Saved ${ANALYTICS_FILE_REL}.`);
|
|
3562
4702
|
}
|
|
3563
4703
|
|
|
3564
|
-
// src/migrations/v2.0/
|
|
3565
|
-
var
|
|
3566
|
-
|
|
3567
|
-
|
|
3568
|
-
|
|
4704
|
+
// src/migrations/v2.0/merge-infrastructure-directory.ts
|
|
4705
|
+
var import_child_process2 = require("child_process");
|
|
4706
|
+
var import_fs5 = require("fs");
|
|
4707
|
+
var import_os = require("os");
|
|
4708
|
+
var import_path24 = require("path");
|
|
4709
|
+
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4710
|
+
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4711
|
+
var BASE_BRANCH = "release-v1.9";
|
|
4712
|
+
function gitShowBytes(ref, path23) {
|
|
4713
|
+
try {
|
|
4714
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
|
|
4715
|
+
cwd: process.cwd(),
|
|
4716
|
+
stdio: ["ignore", "pipe", "pipe"]
|
|
4717
|
+
});
|
|
4718
|
+
return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
|
|
4719
|
+
} catch {
|
|
4720
|
+
return null;
|
|
3569
4721
|
}
|
|
3570
|
-
return cwd;
|
|
3571
4722
|
}
|
|
3572
|
-
async function
|
|
3573
|
-
|
|
3574
|
-
|
|
3575
|
-
|
|
4723
|
+
async function main25() {
|
|
4724
|
+
console.log(
|
|
4725
|
+
`Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4726
|
+
`
|
|
4727
|
+
);
|
|
4728
|
+
assertIsGitRepo();
|
|
4729
|
+
tryGit(["remote", "remove", TEMP_REMOTE2]);
|
|
4730
|
+
try {
|
|
4731
|
+
console.log(` Adding temporary remote '${TEMP_REMOTE2}' \u2192 ${UPSTREAM_URL}`);
|
|
4732
|
+
runGit(["remote", "add", TEMP_REMOTE2, UPSTREAM_URL], { silent: true });
|
|
4733
|
+
console.log(
|
|
4734
|
+
` Fetching ${TEMP_REMOTE2}/{${UPSTREAM_BRANCH},${BASE_BRANCH}} (depth 1)...`
|
|
4735
|
+
);
|
|
4736
|
+
runGit(["fetch", "--depth=1", TEMP_REMOTE2, UPSTREAM_BRANCH, BASE_BRANCH]);
|
|
4737
|
+
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4738
|
+
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4739
|
+
const upstreamFiles = runGit(
|
|
4740
|
+
[
|
|
4741
|
+
"ls-tree",
|
|
4742
|
+
"-r",
|
|
4743
|
+
"--name-only",
|
|
4744
|
+
"-z",
|
|
4745
|
+
ref,
|
|
4746
|
+
"--",
|
|
4747
|
+
`${INFRASTRUCTURE_DIR}/`
|
|
4748
|
+
],
|
|
4749
|
+
{ silent: true }
|
|
4750
|
+
).split("\0").filter(Boolean);
|
|
4751
|
+
if (upstreamFiles.length === 0) {
|
|
4752
|
+
console.log(
|
|
4753
|
+
` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
|
|
4754
|
+
);
|
|
4755
|
+
return;
|
|
4756
|
+
}
|
|
4757
|
+
const tmpDir = (0, import_fs5.mkdtempSync)((0, import_path24.join)((0, import_os.tmpdir)(), "opencrvs-merge-infra-"));
|
|
4758
|
+
const baseTmp = (0, import_path24.join)(tmpDir, "base");
|
|
4759
|
+
const theirsTmp = (0, import_path24.join)(tmpDir, "theirs");
|
|
4760
|
+
let added = 0;
|
|
4761
|
+
let merged = 0;
|
|
4762
|
+
const conflictedFiles = [];
|
|
4763
|
+
for (const file of upstreamFiles) {
|
|
4764
|
+
const fullPath = (0, import_path24.join)(process.cwd(), file);
|
|
4765
|
+
if (!(0, import_fs5.existsSync)(fullPath)) {
|
|
4766
|
+
if (tryGit(["checkout", ref, "--", file])) {
|
|
4767
|
+
console.log(` + ${file} (new from upstream)`);
|
|
4768
|
+
added++;
|
|
4769
|
+
} else {
|
|
4770
|
+
console.warn(` [warn] failed to add new file ${file}`);
|
|
4771
|
+
}
|
|
4772
|
+
continue;
|
|
4773
|
+
}
|
|
4774
|
+
const theirContents = gitShowBytes(ref, file);
|
|
4775
|
+
if (theirContents === null) {
|
|
4776
|
+
console.warn(` [warn] could not read ${file} from ${ref} \u2014 skipping.`);
|
|
4777
|
+
continue;
|
|
4778
|
+
}
|
|
4779
|
+
(0, import_fs5.writeFileSync)(theirsTmp, theirContents);
|
|
4780
|
+
const baseContents = gitShowBytes(baseRef, file);
|
|
4781
|
+
(0, import_fs5.writeFileSync)(baseTmp, baseContents ?? new Uint8Array(0));
|
|
4782
|
+
try {
|
|
4783
|
+
(0, import_child_process2.execFileSync)("git", ["merge-file", fullPath, baseTmp, theirsTmp], {
|
|
4784
|
+
cwd: process.cwd(),
|
|
4785
|
+
stdio: ["ignore", "pipe", "pipe"]
|
|
4786
|
+
});
|
|
4787
|
+
runGit(["add", "--", file], { silent: true });
|
|
4788
|
+
merged++;
|
|
4789
|
+
} catch (err) {
|
|
4790
|
+
const status = err.status;
|
|
4791
|
+
if (typeof status === "number" && status > 0) {
|
|
4792
|
+
conflictedFiles.push(file);
|
|
4793
|
+
console.warn(
|
|
4794
|
+
` ! ${file} (${status} conflict${status > 1 ? "s" : ""})`
|
|
4795
|
+
);
|
|
4796
|
+
} else {
|
|
4797
|
+
conflictedFiles.push(file);
|
|
4798
|
+
console.warn(
|
|
4799
|
+
` [warn] merge failed for ${file} (likely binary or unreadable) \u2014 left untouched.`
|
|
4800
|
+
);
|
|
4801
|
+
}
|
|
4802
|
+
}
|
|
4803
|
+
}
|
|
4804
|
+
console.log(
|
|
4805
|
+
`
|
|
4806
|
+
Done. ${added} added, ${merged} merged cleanly, ${conflictedFiles.length} with conflicts.`
|
|
4807
|
+
);
|
|
4808
|
+
if (conflictedFiles.length > 0) {
|
|
4809
|
+
console.warn(
|
|
4810
|
+
`
|
|
4811
|
+
NOTE: ${conflictedFiles.length} file(s) under '${INFRASTRUCTURE_DIR}/' have merge conflicts that you must resolve manually.
|
|
4812
|
+
Look for the standard conflict markers (<<<<<<<, =======, >>>>>>>) in:
|
|
4813
|
+
` + conflictedFiles.map((f) => ` - ${f}`).join("\n") + `
|
|
4814
|
+
After resolving, stage the fixes with: git add ${INFRASTRUCTURE_DIR}/`
|
|
4815
|
+
);
|
|
4816
|
+
}
|
|
4817
|
+
} finally {
|
|
4818
|
+
if (tryGit(["remote", "remove", TEMP_REMOTE2])) {
|
|
4819
|
+
console.log(` Removed temporary remote '${TEMP_REMOTE2}'.`);
|
|
4820
|
+
}
|
|
3576
4821
|
}
|
|
3577
|
-
|
|
4822
|
+
}
|
|
4823
|
+
|
|
4824
|
+
// src/migrations/v2.0/delete-infrastructure-directory.ts
|
|
4825
|
+
var import_fs6 = require("fs");
|
|
4826
|
+
var import_path25 = require("path");
|
|
4827
|
+
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4828
|
+
async function main26() {
|
|
4829
|
+
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4830
|
+
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
3578
4831
|
console.log(
|
|
3579
|
-
|
|
4832
|
+
`'${INFRASTRUCTURE_DIR2}/' not found in ${process.cwd()} \u2014 nothing to delete.`
|
|
3580
4833
|
);
|
|
3581
|
-
|
|
4834
|
+
return;
|
|
3582
4835
|
}
|
|
3583
|
-
|
|
4836
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4837
|
+
`);
|
|
4838
|
+
assertIsGitRepo();
|
|
4839
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4840
|
+
silent: true
|
|
4841
|
+
});
|
|
4842
|
+
console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`);
|
|
4843
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4844
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4845
|
+
console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`);
|
|
4846
|
+
}
|
|
4847
|
+
console.log(
|
|
4848
|
+
`
|
|
4849
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4850
|
+
);
|
|
4851
|
+
}
|
|
4852
|
+
|
|
4853
|
+
// src/migrations/v2.0/index.ts
|
|
4854
|
+
async function runUpgrade(dockerSwarm) {
|
|
4855
|
+
await main18();
|
|
3584
4856
|
await main();
|
|
3585
4857
|
await main2();
|
|
3586
4858
|
await main3();
|
|
@@ -3593,9 +4865,20 @@ async function runUpgrade(ccwd) {
|
|
|
3593
4865
|
await main10();
|
|
3594
4866
|
await main11();
|
|
3595
4867
|
await main12();
|
|
4868
|
+
await main13();
|
|
3596
4869
|
await main14();
|
|
3597
4870
|
await main15();
|
|
3598
4871
|
await main16();
|
|
4872
|
+
await main19();
|
|
4873
|
+
await main20();
|
|
4874
|
+
await main21();
|
|
4875
|
+
await main22();
|
|
4876
|
+
await main23();
|
|
4877
|
+
await main24();
|
|
3599
4878
|
await main17();
|
|
3600
|
-
|
|
4879
|
+
if (dockerSwarm) {
|
|
4880
|
+
await main25();
|
|
4881
|
+
} else {
|
|
4882
|
+
await main26();
|
|
4883
|
+
}
|
|
3601
4884
|
}
|