@opencrvs/toolkit 2.0.0-rc.d7cb6e7 → 2.0.0-rc.d87f90c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/application-config/index.js +4 -4
- package/dist/cli.js +1638 -327
- package/dist/commons/api/router.d.ts +55 -54
- package/dist/commons/application-config/index.d.ts +16 -4
- 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 +1461 -179
- 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/opencrvs-toolkit-2.0.0-rc.d87f90c.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.d7cb6e7.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()) {
|
|
@@ -2619,7 +2688,7 @@ function migrateScopesArrays(rolesFilePath, project) {
|
|
|
2619
2688
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2620
2689
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2621
2690
|
console.warn(
|
|
2622
|
-
` [${import_path11.default.relative(
|
|
2691
|
+
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2623
2692
|
);
|
|
2624
2693
|
initializer.removeElement(index);
|
|
2625
2694
|
removedCount++;
|
|
@@ -2628,7 +2697,7 @@ function migrateScopesArrays(rolesFilePath, project) {
|
|
|
2628
2697
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2629
2698
|
if (!legacyScope) {
|
|
2630
2699
|
console.warn(
|
|
2631
|
-
` [${import_path11.default.relative(
|
|
2700
|
+
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Skipping non-literal scope expression: ${element.getText()}`
|
|
2632
2701
|
);
|
|
2633
2702
|
continue;
|
|
2634
2703
|
}
|
|
@@ -2637,7 +2706,7 @@ function migrateScopesArrays(rolesFilePath, project) {
|
|
|
2637
2706
|
const scope = decodeScope(migratedScope);
|
|
2638
2707
|
if (!scope) {
|
|
2639
2708
|
console.warn(
|
|
2640
|
-
` [${import_path11.default.relative(
|
|
2709
|
+
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
|
|
2641
2710
|
);
|
|
2642
2711
|
continue;
|
|
2643
2712
|
}
|
|
@@ -2645,14 +2714,14 @@ function migrateScopesArrays(rolesFilePath, project) {
|
|
|
2645
2714
|
migratedCount++;
|
|
2646
2715
|
} catch (error) {
|
|
2647
2716
|
console.warn(
|
|
2648
|
-
` [${import_path11.default.relative(
|
|
2717
|
+
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2649
2718
|
);
|
|
2650
2719
|
}
|
|
2651
2720
|
}
|
|
2652
2721
|
}
|
|
2653
2722
|
if (removedCount > 0) {
|
|
2654
2723
|
console.log(
|
|
2655
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(
|
|
2724
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${import_path11.default.relative(process.cwd(), rolesFilePath)}'.`
|
|
2656
2725
|
);
|
|
2657
2726
|
}
|
|
2658
2727
|
return { migratedCount, removedCount };
|
|
@@ -2774,9 +2843,9 @@ function removeRoleTypeDefinitionAndUnusedImports(rolesFilePath, project) {
|
|
|
2774
2843
|
return removed;
|
|
2775
2844
|
}
|
|
2776
2845
|
async function main11() {
|
|
2777
|
-
const
|
|
2778
|
-
const srcDir = import_path11.default.join(
|
|
2779
|
-
const rolesFilePath = import_path11.default.join(
|
|
2846
|
+
const cwd = process.cwd();
|
|
2847
|
+
const srcDir = import_path11.default.join(cwd, "src");
|
|
2848
|
+
const rolesFilePath = import_path11.default.join(cwd, ROLES_FILE_RELATIVE_PATH);
|
|
2780
2849
|
console.log(`Scanning roles scopes in: ${rolesFilePath}`);
|
|
2781
2850
|
const project = new import_ts_morph11.Project({
|
|
2782
2851
|
tsConfigFilePath: import_path11.default.resolve(srcDir, "../tsconfig.json"),
|
|
@@ -2840,13 +2909,13 @@ function processFile10(filePath, project) {
|
|
|
2840
2909
|
decl.remove();
|
|
2841
2910
|
}
|
|
2842
2911
|
console.log(
|
|
2843
|
-
` [${import_path12.default.relative(
|
|
2912
|
+
` [${import_path12.default.relative(process.cwd(), filePath)}] Removed ${matchingNamedImports.length} deprecated '${DEPRECATED_IMPORT}' import(s) from '${decl.getModuleSpecifierValue()}'`
|
|
2844
2913
|
);
|
|
2845
2914
|
}
|
|
2846
2915
|
return removedCount;
|
|
2847
2916
|
}
|
|
2848
2917
|
async function main12() {
|
|
2849
|
-
const srcDir = import_path12.default.join(
|
|
2918
|
+
const srcDir = import_path12.default.join(process.cwd(), "src");
|
|
2850
2919
|
console.log(`Scanning for deprecated imports in: ${srcDir}
|
|
2851
2920
|
`);
|
|
2852
2921
|
const project = new import_ts_morph12.Project({
|
|
@@ -2877,15 +2946,738 @@ async function main12() {
|
|
|
2877
2946
|
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
2878
2947
|
for (const filePath of modifiedFiles) {
|
|
2879
2948
|
await project.getSourceFileOrThrow(filePath).save();
|
|
2880
|
-
console.log(` Saved: ${import_path12.default.relative(
|
|
2949
|
+
console.log(` Saved: ${import_path12.default.relative(process.cwd(), filePath)}`);
|
|
2881
2950
|
}
|
|
2882
2951
|
console.log(`
|
|
2883
2952
|
Done. Removed ${totalRemoved} deprecated import(s).`);
|
|
2884
2953
|
}
|
|
2885
2954
|
|
|
2886
|
-
// src/migrations/v2.0/
|
|
2887
|
-
var import_ts_morph13 = require("ts-morph");
|
|
2955
|
+
// src/migrations/v2.0/remove-unused-environment-variables.ts
|
|
2888
2956
|
var import_path13 = __toESM(require("path"));
|
|
2957
|
+
var import_ts_morph13 = require("ts-morph");
|
|
2958
|
+
var UNUSED_ENV_VARS = /* @__PURE__ */ new Set([
|
|
2959
|
+
"APPLICATION_CONFIG_URL",
|
|
2960
|
+
"FHIR_URL",
|
|
2961
|
+
"CONFIRM_REGISTRATION_URL"
|
|
2962
|
+
]);
|
|
2963
|
+
var ENVIRONMENT_FILE_RELATIVE = "src/environment.ts";
|
|
2964
|
+
var CONSTANTS_FILE_RELATIVE = "src/constants.ts";
|
|
2965
|
+
function cleanEnvironmentFile(project, filePath) {
|
|
2966
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
2967
|
+
if (!sourceFile) return [];
|
|
2968
|
+
const removed = [];
|
|
2969
|
+
const cleanEnvCall = sourceFile.getDescendantsOfKind(import_ts_morph13.SyntaxKind.CallExpression).find((call) => {
|
|
2970
|
+
const expr = call.getExpression();
|
|
2971
|
+
return import_ts_morph13.Node.isIdentifier(expr) && expr.getText() === "cleanEnv";
|
|
2972
|
+
});
|
|
2973
|
+
if (!cleanEnvCall) return removed;
|
|
2974
|
+
const schemaArg = cleanEnvCall.getArguments()[1]?.asKind(import_ts_morph13.SyntaxKind.ObjectLiteralExpression);
|
|
2975
|
+
if (!schemaArg) return removed;
|
|
2976
|
+
for (const name of UNUSED_ENV_VARS) {
|
|
2977
|
+
const prop = schemaArg.getProperty(name);
|
|
2978
|
+
if (!prop) continue;
|
|
2979
|
+
if (prop.isKind(import_ts_morph13.SyntaxKind.PropertyAssignment) || prop.isKind(import_ts_morph13.SyntaxKind.ShorthandPropertyAssignment)) {
|
|
2980
|
+
prop.remove();
|
|
2981
|
+
removed.push(name);
|
|
2982
|
+
}
|
|
2983
|
+
}
|
|
2984
|
+
return removed;
|
|
2985
|
+
}
|
|
2986
|
+
function extractEnvAccess(initText) {
|
|
2987
|
+
if (!initText) return null;
|
|
2988
|
+
const match = /\benv\.([A-Z][A-Z0-9_]*)\b/.exec(initText);
|
|
2989
|
+
return match ? match[1] : null;
|
|
2990
|
+
}
|
|
2991
|
+
function cleanConstantsFile(project, filePath) {
|
|
2992
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
2993
|
+
if (!sourceFile) return [];
|
|
2994
|
+
const removed = [];
|
|
2995
|
+
for (const stmt of [...sourceFile.getVariableStatements()]) {
|
|
2996
|
+
const declarations = [...stmt.getDeclarations()];
|
|
2997
|
+
const declarationsToRemove = declarations.filter((decl) => {
|
|
2998
|
+
const name = decl.getName();
|
|
2999
|
+
const accessedEnvVar = extractEnvAccess(decl.getInitializer()?.getText());
|
|
3000
|
+
return UNUSED_ENV_VARS.has(name) || accessedEnvVar !== null && UNUSED_ENV_VARS.has(accessedEnvVar);
|
|
3001
|
+
});
|
|
3002
|
+
if (declarationsToRemove.length === 0) continue;
|
|
3003
|
+
const namesToRemove = declarationsToRemove.map((decl) => decl.getName());
|
|
3004
|
+
removed.push(...namesToRemove);
|
|
3005
|
+
if (declarationsToRemove.length === declarations.length) {
|
|
3006
|
+
stmt.remove();
|
|
3007
|
+
} else {
|
|
3008
|
+
for (const decl of declarationsToRemove) {
|
|
3009
|
+
decl.remove();
|
|
3010
|
+
}
|
|
3011
|
+
}
|
|
3012
|
+
}
|
|
3013
|
+
return removed;
|
|
3014
|
+
}
|
|
3015
|
+
async function main13() {
|
|
3016
|
+
const project = new import_ts_morph13.Project({
|
|
3017
|
+
tsConfigFilePath: import_path13.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3018
|
+
skipAddingFilesFromTsConfig: false
|
|
3019
|
+
});
|
|
3020
|
+
console.log(
|
|
3021
|
+
`Removing unused environment variable(s) (${[...UNUSED_ENV_VARS].join(", ")})...
|
|
3022
|
+
`
|
|
3023
|
+
);
|
|
3024
|
+
const envFilePath = import_path13.default.join(process.cwd(), ENVIRONMENT_FILE_RELATIVE);
|
|
3025
|
+
const constsFilePath = import_path13.default.join(process.cwd(), CONSTANTS_FILE_RELATIVE);
|
|
3026
|
+
const envRemoved = cleanEnvironmentFile(project, envFilePath);
|
|
3027
|
+
if (envRemoved.length > 0) {
|
|
3028
|
+
await project.getSourceFileOrThrow(envFilePath).save();
|
|
3029
|
+
console.log(
|
|
3030
|
+
` [${ENVIRONMENT_FILE_RELATIVE}] Removed schema entr${envRemoved.length === 1 ? "y" : "ies"}: ${envRemoved.join(", ")}`
|
|
3031
|
+
);
|
|
3032
|
+
} else if (project.getSourceFile(envFilePath)) {
|
|
3033
|
+
console.log(
|
|
3034
|
+
` [${ENVIRONMENT_FILE_RELATIVE}] No matching schema entries \u2014 nothing to remove.`
|
|
3035
|
+
);
|
|
3036
|
+
} else {
|
|
3037
|
+
console.log(
|
|
3038
|
+
` [${ENVIRONMENT_FILE_RELATIVE}] File not found \u2014 skipping.`
|
|
3039
|
+
);
|
|
3040
|
+
}
|
|
3041
|
+
const constsRemoved = cleanConstantsFile(project, constsFilePath);
|
|
3042
|
+
if (constsRemoved.length > 0) {
|
|
3043
|
+
await project.getSourceFileOrThrow(constsFilePath).save();
|
|
3044
|
+
console.log(
|
|
3045
|
+
` [${CONSTANTS_FILE_RELATIVE}] Removed declaration(s): ${constsRemoved.join(", ")}`
|
|
3046
|
+
);
|
|
3047
|
+
} else if (project.getSourceFile(constsFilePath)) {
|
|
3048
|
+
console.log(
|
|
3049
|
+
` [${CONSTANTS_FILE_RELATIVE}] No matching declarations \u2014 nothing to remove.`
|
|
3050
|
+
);
|
|
3051
|
+
} else {
|
|
3052
|
+
console.log(` [${CONSTANTS_FILE_RELATIVE}] File not found \u2014 skipping.`);
|
|
3053
|
+
}
|
|
3054
|
+
if (envRemoved.length === 0 && constsRemoved.length === 0) {
|
|
3055
|
+
console.log("\nNothing to do.");
|
|
3056
|
+
return;
|
|
3057
|
+
}
|
|
3058
|
+
console.log(
|
|
3059
|
+
`
|
|
3060
|
+
Done. NOTE: usages of these constants elsewhere in 'src/' may now produce TypeScript errors and need manual review.`
|
|
3061
|
+
);
|
|
3062
|
+
}
|
|
3063
|
+
|
|
3064
|
+
// src/migrations/v2.0/remove-fhir-url-helpers.ts
|
|
3065
|
+
var import_path14 = __toESM(require("path"));
|
|
3066
|
+
var import_ts_morph14 = require("ts-morph");
|
|
3067
|
+
var FHIR_IMPORT = "FHIR_URL";
|
|
3068
|
+
var HELPER_NAMES = /* @__PURE__ */ new Set([
|
|
3069
|
+
"getFromFhir",
|
|
3070
|
+
"updateResourceFromHearth",
|
|
3071
|
+
"updateResourceInHearth"
|
|
3072
|
+
]);
|
|
3073
|
+
function removeHelpers(sourceFilePath, project) {
|
|
3074
|
+
const sourceFile = project.getSourceFile(sourceFilePath);
|
|
3075
|
+
if (!sourceFile) {
|
|
3076
|
+
return {
|
|
3077
|
+
removedHelpers: [],
|
|
3078
|
+
removedImportCount: 0,
|
|
3079
|
+
remainingFhirReferences: 0
|
|
3080
|
+
};
|
|
3081
|
+
}
|
|
3082
|
+
const removedHelpers = [];
|
|
3083
|
+
let removedImportCount = 0;
|
|
3084
|
+
for (const fn of sourceFile.getFunctions()) {
|
|
3085
|
+
const name = fn.getName();
|
|
3086
|
+
if (!name || !HELPER_NAMES.has(name)) continue;
|
|
3087
|
+
removedHelpers.push(name);
|
|
3088
|
+
fn.remove();
|
|
3089
|
+
}
|
|
3090
|
+
for (const stmt of [...sourceFile.getVariableStatements()]) {
|
|
3091
|
+
const declarations = [...stmt.getDeclarations()];
|
|
3092
|
+
const toRemove = declarations.filter((decl) => HELPER_NAMES.has(decl.getName()));
|
|
3093
|
+
if (toRemove.length === 0) continue;
|
|
3094
|
+
removedHelpers.push(...toRemove.map((decl) => decl.getName()));
|
|
3095
|
+
if (toRemove.length === declarations.length) {
|
|
3096
|
+
stmt.remove();
|
|
3097
|
+
} else {
|
|
3098
|
+
for (const decl of toRemove) decl.remove();
|
|
3099
|
+
}
|
|
3100
|
+
}
|
|
3101
|
+
for (const decl of sourceFile.getImportDeclarations()) {
|
|
3102
|
+
const matches = decl.getNamedImports().filter((ni) => ni.getName() === FHIR_IMPORT);
|
|
3103
|
+
if (matches.length === 0) continue;
|
|
3104
|
+
for (const named of matches) {
|
|
3105
|
+
named.remove();
|
|
3106
|
+
removedImportCount++;
|
|
3107
|
+
}
|
|
3108
|
+
const hasAnyNamedImportsLeft = decl.getNamedImports().length > 0;
|
|
3109
|
+
const hasDefaultImport = !!decl.getDefaultImport();
|
|
3110
|
+
const hasNamespaceImport = !!decl.getNamespaceImport();
|
|
3111
|
+
if (!hasAnyNamedImportsLeft && !hasDefaultImport && !hasNamespaceImport) {
|
|
3112
|
+
decl.remove();
|
|
3113
|
+
}
|
|
3114
|
+
}
|
|
3115
|
+
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;
|
|
3116
|
+
return { removedHelpers, removedImportCount, remainingFhirReferences };
|
|
3117
|
+
}
|
|
3118
|
+
async function main14() {
|
|
3119
|
+
const project = new import_ts_morph14.Project({
|
|
3120
|
+
tsConfigFilePath: import_path14.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3121
|
+
skipAddingFilesFromTsConfig: false
|
|
3122
|
+
});
|
|
3123
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
3124
|
+
const fp = sf.getFilePath();
|
|
3125
|
+
return fp.includes("/src/") && !fp.includes("/node_modules/");
|
|
3126
|
+
});
|
|
3127
|
+
console.log(`Removing legacy FHIR_URL helpers in ${sourceFiles.length} source file(s)...
|
|
3128
|
+
`);
|
|
3129
|
+
let totalRemovedImports = 0;
|
|
3130
|
+
let totalRemovedHelpers = 0;
|
|
3131
|
+
const modifiedFiles = [];
|
|
3132
|
+
const warnings = [];
|
|
3133
|
+
for (const sourceFile of sourceFiles) {
|
|
3134
|
+
const filePath = sourceFile.getFilePath();
|
|
3135
|
+
const rel = import_path14.default.relative(process.cwd(), filePath);
|
|
3136
|
+
const result = removeHelpers(filePath, project);
|
|
3137
|
+
const changed = result.removedImportCount > 0 || result.removedHelpers.length > 0;
|
|
3138
|
+
if (changed) {
|
|
3139
|
+
modifiedFiles.push(filePath);
|
|
3140
|
+
totalRemovedImports += result.removedImportCount;
|
|
3141
|
+
totalRemovedHelpers += result.removedHelpers.length;
|
|
3142
|
+
if (result.removedHelpers.length > 0) {
|
|
3143
|
+
console.log(
|
|
3144
|
+
` [${rel}] Removed helper(s): ${result.removedHelpers.join(", ")}`
|
|
3145
|
+
);
|
|
3146
|
+
}
|
|
3147
|
+
if (result.removedImportCount > 0) {
|
|
3148
|
+
console.log(
|
|
3149
|
+
` [${rel}] Removed ${result.removedImportCount} '${FHIR_IMPORT}' import(s)`
|
|
3150
|
+
);
|
|
3151
|
+
}
|
|
3152
|
+
}
|
|
3153
|
+
if (result.remainingFhirReferences > 0) {
|
|
3154
|
+
warnings.push(
|
|
3155
|
+
`${rel}: ${result.remainingFhirReferences} remaining '${FHIR_IMPORT}' reference(s)`
|
|
3156
|
+
);
|
|
3157
|
+
}
|
|
3158
|
+
}
|
|
3159
|
+
if (modifiedFiles.length === 0 && warnings.length === 0) {
|
|
3160
|
+
console.log("No FHIR_URL imports/helpers found. Nothing to do.");
|
|
3161
|
+
return;
|
|
3162
|
+
}
|
|
3163
|
+
if (modifiedFiles.length > 0) {
|
|
3164
|
+
console.log(`
|
|
3165
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
3166
|
+
for (const filePath of modifiedFiles) {
|
|
3167
|
+
await project.getSourceFileOrThrow(filePath).save();
|
|
3168
|
+
console.log(` Saved: ${import_path14.default.relative(process.cwd(), filePath)}`);
|
|
3169
|
+
}
|
|
3170
|
+
}
|
|
3171
|
+
if (warnings.length > 0) {
|
|
3172
|
+
console.warn(
|
|
3173
|
+
`
|
|
3174
|
+
WARNING: Some '${FHIR_IMPORT}' usages remain and need manual cleanup:
|
|
3175
|
+
` + warnings.map((line) => ` - ${line}`).join("\n")
|
|
3176
|
+
);
|
|
3177
|
+
}
|
|
3178
|
+
console.log(
|
|
3179
|
+
`
|
|
3180
|
+
Done. Removed ${totalRemovedHelpers} helper declaration(s) and ${totalRemovedImports} '${FHIR_IMPORT}' import(s).`
|
|
3181
|
+
);
|
|
3182
|
+
}
|
|
3183
|
+
|
|
3184
|
+
// src/migrations/v2.0/migrate-application-config-url.ts
|
|
3185
|
+
var import_path15 = __toESM(require("path"));
|
|
3186
|
+
var import_ts_morph15 = require("ts-morph");
|
|
3187
|
+
var TARGET_IDENTIFIER = "APPLICATION_CONFIG_URL";
|
|
3188
|
+
var REPLACEMENT_IDENTIFIER = "applicationConfig";
|
|
3189
|
+
var REPLACEMENT_MODULE = "@countryconfig/api/application/application-config";
|
|
3190
|
+
var FUNCTION_LIKE_KINDS = [
|
|
3191
|
+
import_ts_morph15.SyntaxKind.FunctionDeclaration,
|
|
3192
|
+
import_ts_morph15.SyntaxKind.FunctionExpression,
|
|
3193
|
+
import_ts_morph15.SyntaxKind.ArrowFunction,
|
|
3194
|
+
import_ts_morph15.SyntaxKind.MethodDeclaration
|
|
3195
|
+
];
|
|
3196
|
+
function describeFunction(node) {
|
|
3197
|
+
if (import_ts_morph15.Node.isFunctionDeclaration(node) || import_ts_morph15.Node.isMethodDeclaration(node)) {
|
|
3198
|
+
return node.getName() ?? "<anonymous>";
|
|
3199
|
+
}
|
|
3200
|
+
const parent = node.getParent();
|
|
3201
|
+
if (parent && import_ts_morph15.Node.isVariableDeclaration(parent)) {
|
|
3202
|
+
return parent.getName();
|
|
3203
|
+
}
|
|
3204
|
+
if (parent && import_ts_morph15.Node.isPropertyAssignment(parent)) {
|
|
3205
|
+
return parent.getName();
|
|
3206
|
+
}
|
|
3207
|
+
if (import_ts_morph15.Node.isFunctionExpression(node) && node.getNameNode() !== void 0) {
|
|
3208
|
+
return node.getNameNode()?.getText() ?? "<anonymous>";
|
|
3209
|
+
}
|
|
3210
|
+
return "<anonymous>";
|
|
3211
|
+
}
|
|
3212
|
+
function hasBlockBody(node) {
|
|
3213
|
+
if (import_ts_morph15.Node.isFunctionDeclaration(node) || import_ts_morph15.Node.isFunctionExpression(node) || import_ts_morph15.Node.isMethodDeclaration(node)) {
|
|
3214
|
+
return node.getBody() !== void 0;
|
|
3215
|
+
}
|
|
3216
|
+
if (import_ts_morph15.Node.isArrowFunction(node)) {
|
|
3217
|
+
return node.getBody().getKind() === import_ts_morph15.SyntaxKind.Block;
|
|
3218
|
+
}
|
|
3219
|
+
return false;
|
|
3220
|
+
}
|
|
3221
|
+
function isConfigFetcher(node) {
|
|
3222
|
+
let referencesTarget = false;
|
|
3223
|
+
let callsFetch = false;
|
|
3224
|
+
for (const id of node.getDescendantsOfKind(import_ts_morph15.SyntaxKind.Identifier)) {
|
|
3225
|
+
const text = id.getText();
|
|
3226
|
+
if (!referencesTarget && text === TARGET_IDENTIFIER) referencesTarget = true;
|
|
3227
|
+
if (!callsFetch && text === "fetch") {
|
|
3228
|
+
const parent = id.getParent();
|
|
3229
|
+
if (import_ts_morph15.Node.isCallExpression(parent) && parent.getExpression() === id) {
|
|
3230
|
+
callsFetch = true;
|
|
3231
|
+
}
|
|
3232
|
+
}
|
|
3233
|
+
if (referencesTarget && callsFetch) return true;
|
|
3234
|
+
}
|
|
3235
|
+
return false;
|
|
3236
|
+
}
|
|
3237
|
+
function processFile11(sourceFile) {
|
|
3238
|
+
const importsWithTarget = sourceFile.getImportDeclarations().filter(
|
|
3239
|
+
(decl) => decl.getNamedImports().some((ni) => ni.getName() === TARGET_IDENTIFIER)
|
|
3240
|
+
);
|
|
3241
|
+
if (importsWithTarget.length === 0) {
|
|
3242
|
+
return { changed: false, rewrittenFunctions: [], renamedReferences: 0 };
|
|
3243
|
+
}
|
|
3244
|
+
const collidingLocals = sourceFile.getDescendantsOfKind(import_ts_morph15.SyntaxKind.Identifier).filter((id) => id.getText() === REPLACEMENT_IDENTIFIER).filter((id) => {
|
|
3245
|
+
const parent = id.getParent();
|
|
3246
|
+
const kind = parent.getKind();
|
|
3247
|
+
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;
|
|
3248
|
+
});
|
|
3249
|
+
if (collidingLocals.length > 0) {
|
|
3250
|
+
return {
|
|
3251
|
+
changed: false,
|
|
3252
|
+
rewrittenFunctions: [],
|
|
3253
|
+
renamedReferences: 0,
|
|
3254
|
+
skippedReason: `local declaration named '${REPLACEMENT_IDENTIFIER}' would collide`
|
|
3255
|
+
};
|
|
3256
|
+
}
|
|
3257
|
+
const candidateFunctions = FUNCTION_LIKE_KINDS.flatMap(
|
|
3258
|
+
(kind) => sourceFile.getDescendantsOfKind(kind)
|
|
3259
|
+
);
|
|
3260
|
+
candidateFunctions.sort((a, b) => a.getStart() - b.getStart());
|
|
3261
|
+
const rewrittenFunctions = [];
|
|
3262
|
+
const rewrittenSet = /* @__PURE__ */ new Set();
|
|
3263
|
+
for (const fn of candidateFunctions) {
|
|
3264
|
+
if (!hasBlockBody(fn)) continue;
|
|
3265
|
+
if (!isConfigFetcher(fn)) continue;
|
|
3266
|
+
let inRewrittenAncestor = false;
|
|
3267
|
+
let cursor = fn.getParent();
|
|
3268
|
+
while (cursor) {
|
|
3269
|
+
if (rewrittenSet.has(cursor)) {
|
|
3270
|
+
inRewrittenAncestor = true;
|
|
3271
|
+
break;
|
|
3272
|
+
}
|
|
3273
|
+
cursor = cursor.getParent();
|
|
3274
|
+
}
|
|
3275
|
+
if (inRewrittenAncestor) continue;
|
|
3276
|
+
const start = fn.getStart();
|
|
3277
|
+
const line = sourceFile.getLineAndColumnAtPos(start).line;
|
|
3278
|
+
const name = describeFunction(fn);
|
|
3279
|
+
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)) {
|
|
3280
|
+
fn.setBodyText(`return ${REPLACEMENT_IDENTIFIER}`);
|
|
3281
|
+
}
|
|
3282
|
+
rewrittenFunctions.push({ name, line });
|
|
3283
|
+
rewrittenSet.add(fn);
|
|
3284
|
+
}
|
|
3285
|
+
for (const decl of importsWithTarget) {
|
|
3286
|
+
const targetNamed = decl.getNamedImports().find((ni) => ni.getName() === TARGET_IDENTIFIER);
|
|
3287
|
+
targetNamed?.remove();
|
|
3288
|
+
const isNowEmpty = decl.getNamedImports().length === 0 && !decl.getDefaultImport() && !decl.getNamespaceImport();
|
|
3289
|
+
if (isNowEmpty) decl.remove();
|
|
3290
|
+
}
|
|
3291
|
+
const existing = sourceFile.getImportDeclaration(
|
|
3292
|
+
(decl) => decl.getModuleSpecifierValue() === REPLACEMENT_MODULE
|
|
3293
|
+
);
|
|
3294
|
+
if (existing) {
|
|
3295
|
+
const alreadyImported = existing.getNamedImports().some((ni) => ni.getName() === REPLACEMENT_IDENTIFIER);
|
|
3296
|
+
if (!alreadyImported) existing.addNamedImport(REPLACEMENT_IDENTIFIER);
|
|
3297
|
+
} else {
|
|
3298
|
+
sourceFile.addImportDeclaration({
|
|
3299
|
+
moduleSpecifier: REPLACEMENT_MODULE,
|
|
3300
|
+
namedImports: [REPLACEMENT_IDENTIFIER]
|
|
3301
|
+
});
|
|
3302
|
+
}
|
|
3303
|
+
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) => {
|
|
3304
|
+
const parent = id.getParent();
|
|
3305
|
+
const parentKind = parent.getKind();
|
|
3306
|
+
if (parentKind === import_ts_morph15.SyntaxKind.PropertyAccessExpression) {
|
|
3307
|
+
const pae = parent.asKind(import_ts_morph15.SyntaxKind.PropertyAccessExpression);
|
|
3308
|
+
if (pae.getNameNode() === id) return false;
|
|
3309
|
+
}
|
|
3310
|
+
if (parentKind === import_ts_morph15.SyntaxKind.PropertyAssignment) {
|
|
3311
|
+
const pa = parent.asKind(import_ts_morph15.SyntaxKind.PropertyAssignment);
|
|
3312
|
+
if (pa.getNameNode() === id) return false;
|
|
3313
|
+
}
|
|
3314
|
+
if (parentKind === import_ts_morph15.SyntaxKind.ShorthandPropertyAssignment) {
|
|
3315
|
+
return false;
|
|
3316
|
+
}
|
|
3317
|
+
return true;
|
|
3318
|
+
}).sort((a, b) => b.getPos() - a.getPos());
|
|
3319
|
+
for (const id of renameTargets) {
|
|
3320
|
+
id.replaceWithText(REPLACEMENT_IDENTIFIER);
|
|
3321
|
+
}
|
|
3322
|
+
return {
|
|
3323
|
+
changed: true,
|
|
3324
|
+
rewrittenFunctions,
|
|
3325
|
+
renamedReferences: renameTargets.length
|
|
3326
|
+
};
|
|
3327
|
+
}
|
|
3328
|
+
async function main15() {
|
|
3329
|
+
const project = new import_ts_morph15.Project({
|
|
3330
|
+
tsConfigFilePath: import_path15.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3331
|
+
skipAddingFilesFromTsConfig: false
|
|
3332
|
+
});
|
|
3333
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
3334
|
+
const fp = sf.getFilePath();
|
|
3335
|
+
return fp.includes("/src/") && !fp.includes("/node_modules/");
|
|
3336
|
+
});
|
|
3337
|
+
console.log(
|
|
3338
|
+
`Migrating '${TARGET_IDENTIFIER}' \u2192 '${REPLACEMENT_IDENTIFIER}' across ${sourceFiles.length} source file(s)...
|
|
3339
|
+
`
|
|
3340
|
+
);
|
|
3341
|
+
let changedFiles = 0;
|
|
3342
|
+
let totalRewrittenFunctions = 0;
|
|
3343
|
+
let totalRenamedReferences = 0;
|
|
3344
|
+
const skipped = [];
|
|
3345
|
+
for (const sourceFile of sourceFiles) {
|
|
3346
|
+
const filePath = sourceFile.getFilePath();
|
|
3347
|
+
const rel = import_path15.default.relative(process.cwd(), filePath);
|
|
3348
|
+
const result = processFile11(sourceFile);
|
|
3349
|
+
if (result.skippedReason) {
|
|
3350
|
+
skipped.push(`${rel} (${result.skippedReason})`);
|
|
3351
|
+
continue;
|
|
3352
|
+
}
|
|
3353
|
+
if (!result.changed) continue;
|
|
3354
|
+
await sourceFile.save();
|
|
3355
|
+
changedFiles++;
|
|
3356
|
+
totalRewrittenFunctions += result.rewrittenFunctions.length;
|
|
3357
|
+
totalRenamedReferences += result.renamedReferences;
|
|
3358
|
+
for (const fn of result.rewrittenFunctions) {
|
|
3359
|
+
console.log(
|
|
3360
|
+
` [${rel}:${fn.line}] Rewrote '${fn.name}' body \u2192 'return ${REPLACEMENT_IDENTIFIER}' (config fetch eliminated)`
|
|
3361
|
+
);
|
|
3362
|
+
}
|
|
3363
|
+
if (result.renamedReferences > 0) {
|
|
3364
|
+
console.log(
|
|
3365
|
+
` [${rel}] Renamed ${result.renamedReferences} stray reference(s) ${TARGET_IDENTIFIER} \u2192 ${REPLACEMENT_IDENTIFIER}`
|
|
3366
|
+
);
|
|
3367
|
+
}
|
|
3368
|
+
}
|
|
3369
|
+
if (skipped.length > 0) {
|
|
3370
|
+
console.warn(
|
|
3371
|
+
`
|
|
3372
|
+
${skipped.length} file(s) skipped:
|
|
3373
|
+
` + skipped.map((s) => ` - ${s}`).join("\n")
|
|
3374
|
+
);
|
|
3375
|
+
}
|
|
3376
|
+
if (changedFiles === 0) {
|
|
3377
|
+
console.log(`
|
|
3378
|
+
No files reference '${TARGET_IDENTIFIER}'. Nothing to do.`);
|
|
3379
|
+
return;
|
|
3380
|
+
}
|
|
3381
|
+
console.log(
|
|
3382
|
+
`
|
|
3383
|
+
Done. Updated ${changedFiles} file(s): ${totalRewrittenFunctions} fetch function(s) rewritten, ${totalRenamedReferences} bare reference(s) renamed.`
|
|
3384
|
+
);
|
|
3385
|
+
if (totalRewrittenFunctions > 0) {
|
|
3386
|
+
console.log(
|
|
3387
|
+
`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}'.`
|
|
3388
|
+
);
|
|
3389
|
+
}
|
|
3390
|
+
}
|
|
3391
|
+
|
|
3392
|
+
// src/migrations/v2.0/remove-old-statistics-service.ts
|
|
3393
|
+
var import_path16 = __toESM(require("path"));
|
|
3394
|
+
var import_ts_morph16 = require("ts-morph");
|
|
3395
|
+
var ROUTE_PATH = "/statistics";
|
|
3396
|
+
var HANDLER_NAME = "statisticsHandler";
|
|
3397
|
+
function isStatisticsRouteObject(obj) {
|
|
3398
|
+
const pathProp = obj.getProperty("path");
|
|
3399
|
+
if (!pathProp || !import_ts_morph16.Node.isPropertyAssignment(pathProp)) return false;
|
|
3400
|
+
const init = pathProp.getInitializer();
|
|
3401
|
+
if (!init) return false;
|
|
3402
|
+
if (import_ts_morph16.Node.isStringLiteral(init) || import_ts_morph16.Node.isNoSubstitutionTemplateLiteral(init)) {
|
|
3403
|
+
return init.getLiteralValue() === ROUTE_PATH;
|
|
3404
|
+
}
|
|
3405
|
+
return false;
|
|
3406
|
+
}
|
|
3407
|
+
function removeStatisticsRoutes(sourceFile) {
|
|
3408
|
+
let removed = 0;
|
|
3409
|
+
const callExpressions = [
|
|
3410
|
+
...sourceFile.getDescendantsOfKind(import_ts_morph16.SyntaxKind.CallExpression)
|
|
3411
|
+
];
|
|
3412
|
+
for (const call of callExpressions) {
|
|
3413
|
+
if (call.wasForgotten()) continue;
|
|
3414
|
+
const expr = call.getExpression();
|
|
3415
|
+
if (!import_ts_morph16.Node.isPropertyAccessExpression(expr)) continue;
|
|
3416
|
+
if (expr.getName() !== "route") continue;
|
|
3417
|
+
const args = call.getArguments();
|
|
3418
|
+
if (args.length === 0) continue;
|
|
3419
|
+
const firstArg = args[0];
|
|
3420
|
+
if (import_ts_morph16.Node.isObjectLiteralExpression(firstArg)) {
|
|
3421
|
+
if (!isStatisticsRouteObject(firstArg)) continue;
|
|
3422
|
+
const stmt = call.getFirstAncestorByKind(import_ts_morph16.SyntaxKind.ExpressionStatement);
|
|
3423
|
+
if (stmt) {
|
|
3424
|
+
stmt.remove();
|
|
3425
|
+
removed++;
|
|
3426
|
+
} else {
|
|
3427
|
+
call.replaceWithText("");
|
|
3428
|
+
removed++;
|
|
3429
|
+
}
|
|
3430
|
+
continue;
|
|
3431
|
+
}
|
|
3432
|
+
if (import_ts_morph16.Node.isArrayLiteralExpression(firstArg)) {
|
|
3433
|
+
const matchingIndexes = firstArg.getElements().map((el, idx) => ({ el, idx })).filter(
|
|
3434
|
+
({ el }) => import_ts_morph16.Node.isObjectLiteralExpression(el) && isStatisticsRouteObject(el)
|
|
3435
|
+
).map(({ idx }) => idx);
|
|
3436
|
+
matchingIndexes.sort((a, b) => b - a).forEach((idx) => {
|
|
3437
|
+
firstArg.removeElement(idx);
|
|
3438
|
+
removed++;
|
|
3439
|
+
});
|
|
3440
|
+
}
|
|
3441
|
+
}
|
|
3442
|
+
return removed;
|
|
3443
|
+
}
|
|
3444
|
+
function removeStatisticsHandlerImports(sourceFile) {
|
|
3445
|
+
let changed = false;
|
|
3446
|
+
for (const decl of sourceFile.getImportDeclarations()) {
|
|
3447
|
+
const targetNamed = decl.getNamedImports().find((ni) => ni.getName() === HANDLER_NAME);
|
|
3448
|
+
if (!targetNamed) continue;
|
|
3449
|
+
targetNamed.remove();
|
|
3450
|
+
changed = true;
|
|
3451
|
+
const isNowEmpty = decl.getNamedImports().length === 0 && !decl.getDefaultImport() && !decl.getNamespaceImport();
|
|
3452
|
+
if (isNowEmpty) decl.remove();
|
|
3453
|
+
}
|
|
3454
|
+
return changed;
|
|
3455
|
+
}
|
|
3456
|
+
function processFile12(sourceFile) {
|
|
3457
|
+
const routesRemoved = removeStatisticsRoutes(sourceFile);
|
|
3458
|
+
const importsCleaned = removeStatisticsHandlerImports(sourceFile);
|
|
3459
|
+
return { routesRemoved, importsCleaned };
|
|
3460
|
+
}
|
|
3461
|
+
function collectLocalImportsInSubtree(sourceFile, subtreeRoot) {
|
|
3462
|
+
const result = [];
|
|
3463
|
+
for (const decl of sourceFile.getImportDeclarations()) {
|
|
3464
|
+
const moduleSf = decl.getModuleSpecifierSourceFile();
|
|
3465
|
+
if (!moduleSf) continue;
|
|
3466
|
+
const fp = moduleSf.getFilePath();
|
|
3467
|
+
if (!fp.startsWith(subtreeRoot)) continue;
|
|
3468
|
+
result.push(fp);
|
|
3469
|
+
}
|
|
3470
|
+
return result;
|
|
3471
|
+
}
|
|
3472
|
+
function deleteOrphanedDescendants(project, startingFile, subtreeRoot) {
|
|
3473
|
+
const initialCandidates = collectLocalImportsInSubtree(
|
|
3474
|
+
startingFile,
|
|
3475
|
+
subtreeRoot
|
|
3476
|
+
);
|
|
3477
|
+
const startingPath = startingFile.getFilePath();
|
|
3478
|
+
const deleted = /* @__PURE__ */ new Set([startingPath]);
|
|
3479
|
+
const seen = /* @__PURE__ */ new Set();
|
|
3480
|
+
const worklist = [...initialCandidates];
|
|
3481
|
+
const orphans = [];
|
|
3482
|
+
while (worklist.length > 0) {
|
|
3483
|
+
const candidate = worklist.shift();
|
|
3484
|
+
if (seen.has(candidate)) continue;
|
|
3485
|
+
seen.add(candidate);
|
|
3486
|
+
if (deleted.has(candidate)) continue;
|
|
3487
|
+
if (!candidate.startsWith(subtreeRoot)) continue;
|
|
3488
|
+
const candidateSf = project.getSourceFile(candidate);
|
|
3489
|
+
if (!candidateSf) continue;
|
|
3490
|
+
const stillImported = project.getSourceFiles().some((sf) => {
|
|
3491
|
+
const sfPath = sf.getFilePath();
|
|
3492
|
+
if (deleted.has(sfPath)) return false;
|
|
3493
|
+
if (sfPath === candidate) return false;
|
|
3494
|
+
return sf.getImportDeclarations().some(
|
|
3495
|
+
(decl) => decl.getModuleSpecifierSourceFile()?.getFilePath() === candidate
|
|
3496
|
+
);
|
|
3497
|
+
});
|
|
3498
|
+
if (stillImported) continue;
|
|
3499
|
+
const next = collectLocalImportsInSubtree(candidateSf, subtreeRoot);
|
|
3500
|
+
worklist.push(...next);
|
|
3501
|
+
candidateSf.delete();
|
|
3502
|
+
deleted.add(candidate);
|
|
3503
|
+
orphans.push(candidate);
|
|
3504
|
+
}
|
|
3505
|
+
return orphans;
|
|
3506
|
+
}
|
|
3507
|
+
function processHandlerFile(project) {
|
|
3508
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
3509
|
+
const fp = sf.getFilePath();
|
|
3510
|
+
return fp.includes("/src/") && !fp.includes("/node_modules/");
|
|
3511
|
+
});
|
|
3512
|
+
for (const sf of sourceFiles) {
|
|
3513
|
+
const fn = sf.getFunction(HANDLER_NAME);
|
|
3514
|
+
if (!fn) continue;
|
|
3515
|
+
const filePath = sf.getFilePath();
|
|
3516
|
+
const exportsByName = [...sf.getExportedDeclarations().keys()];
|
|
3517
|
+
const otherExports = exportsByName.filter((name) => name !== HANDLER_NAME);
|
|
3518
|
+
if (otherExports.length === 0) {
|
|
3519
|
+
const subtreeRoot = import_path16.default.dirname(filePath) + import_path16.default.sep;
|
|
3520
|
+
const orphansDeleted = deleteOrphanedDescendants(
|
|
3521
|
+
project,
|
|
3522
|
+
sf,
|
|
3523
|
+
subtreeRoot
|
|
3524
|
+
);
|
|
3525
|
+
sf.delete();
|
|
3526
|
+
return { filePath, action: "deleted", orphansDeleted };
|
|
3527
|
+
}
|
|
3528
|
+
fn.remove();
|
|
3529
|
+
return {
|
|
3530
|
+
filePath,
|
|
3531
|
+
action: "function-removed",
|
|
3532
|
+
remainingExports: otherExports,
|
|
3533
|
+
orphansDeleted: []
|
|
3534
|
+
};
|
|
3535
|
+
}
|
|
3536
|
+
return { filePath: "", action: "not-found", orphansDeleted: [] };
|
|
3537
|
+
}
|
|
3538
|
+
async function main16() {
|
|
3539
|
+
const project = new import_ts_morph16.Project({
|
|
3540
|
+
tsConfigFilePath: import_path16.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3541
|
+
skipAddingFilesFromTsConfig: false
|
|
3542
|
+
});
|
|
3543
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
3544
|
+
const fp = sf.getFilePath();
|
|
3545
|
+
return fp.includes("/src/") && !fp.includes("/node_modules/");
|
|
3546
|
+
});
|
|
3547
|
+
console.log(
|
|
3548
|
+
`Removing legacy 'GET ${ROUTE_PATH}' route and '${HANDLER_NAME}' across ${sourceFiles.length} source file(s)...
|
|
3549
|
+
`
|
|
3550
|
+
);
|
|
3551
|
+
let totalRoutesRemoved = 0;
|
|
3552
|
+
let totalFilesWithImportsCleaned = 0;
|
|
3553
|
+
let totalFilesWithRoutesRemoved = 0;
|
|
3554
|
+
for (const sourceFile of sourceFiles) {
|
|
3555
|
+
const filePath = sourceFile.getFilePath();
|
|
3556
|
+
const rel = import_path16.default.relative(process.cwd(), filePath);
|
|
3557
|
+
const result = processFile12(sourceFile);
|
|
3558
|
+
if (result.routesRemoved > 0) {
|
|
3559
|
+
console.log(
|
|
3560
|
+
` [${rel}] Removed ${result.routesRemoved} '${ROUTE_PATH}' route(s)`
|
|
3561
|
+
);
|
|
3562
|
+
totalRoutesRemoved += result.routesRemoved;
|
|
3563
|
+
totalFilesWithRoutesRemoved++;
|
|
3564
|
+
}
|
|
3565
|
+
if (result.importsCleaned) {
|
|
3566
|
+
console.log(` [${rel}] Cleaned up '${HANDLER_NAME}' import`);
|
|
3567
|
+
totalFilesWithImportsCleaned++;
|
|
3568
|
+
}
|
|
3569
|
+
if (result.routesRemoved > 0 || result.importsCleaned) {
|
|
3570
|
+
await sourceFile.save();
|
|
3571
|
+
}
|
|
3572
|
+
}
|
|
3573
|
+
const handlerResult = processHandlerFile(project);
|
|
3574
|
+
switch (handlerResult.action) {
|
|
3575
|
+
case "deleted": {
|
|
3576
|
+
const rel = import_path16.default.relative(process.cwd(), handlerResult.filePath);
|
|
3577
|
+
console.log(
|
|
3578
|
+
` [${rel}] Deleted handler file ('${HANDLER_NAME}' was the sole export).`
|
|
3579
|
+
);
|
|
3580
|
+
for (const orphanPath of handlerResult.orphansDeleted) {
|
|
3581
|
+
const orphanRel = import_path16.default.relative(process.cwd(), orphanPath);
|
|
3582
|
+
console.log(
|
|
3583
|
+
` [${orphanRel}] Deleted (no remaining importers in the project after handler removal).`
|
|
3584
|
+
);
|
|
3585
|
+
}
|
|
3586
|
+
await project.save();
|
|
3587
|
+
break;
|
|
3588
|
+
}
|
|
3589
|
+
case "function-removed": {
|
|
3590
|
+
const rel = import_path16.default.relative(process.cwd(), handlerResult.filePath);
|
|
3591
|
+
console.warn(
|
|
3592
|
+
` [${rel}] Removed '${HANDLER_NAME}' function but kept the file (other exports remain: ${handlerResult.remainingExports?.join(", ")}). Review whether the file is still needed.`
|
|
3593
|
+
);
|
|
3594
|
+
const sf = project.getSourceFile(handlerResult.filePath);
|
|
3595
|
+
if (sf) await sf.save();
|
|
3596
|
+
break;
|
|
3597
|
+
}
|
|
3598
|
+
case "not-found":
|
|
3599
|
+
break;
|
|
3600
|
+
}
|
|
3601
|
+
if (totalRoutesRemoved === 0 && totalFilesWithImportsCleaned === 0 && handlerResult.action === "not-found") {
|
|
3602
|
+
console.log(`
|
|
3603
|
+
No legacy '${ROUTE_PATH}' route or handler found. Nothing to do.`);
|
|
3604
|
+
return;
|
|
3605
|
+
}
|
|
3606
|
+
const orphansSummary = handlerResult.orphansDeleted.length > 0 ? ` and ${handlerResult.orphansDeleted.length} orphaned helper file(s)` : "";
|
|
3607
|
+
console.log(
|
|
3608
|
+
`
|
|
3609
|
+
Done. Removed ${totalRoutesRemoved} route(s) across ${totalFilesWithRoutesRemoved} file(s); cleaned ${HANDLER_NAME} import in ${totalFilesWithImportsCleaned} file(s)${orphansSummary}.`
|
|
3610
|
+
);
|
|
3611
|
+
}
|
|
3612
|
+
|
|
3613
|
+
// src/migrations/v2.0/update-package-json.ts
|
|
3614
|
+
var import_fs = require("fs");
|
|
3615
|
+
var import_path17 = __toESM(require("path"));
|
|
3616
|
+
var PACKAGE_JSON_RELATIVE = "package.json";
|
|
3617
|
+
var TARGET_VERSION = "2.0.0";
|
|
3618
|
+
var TARGET_ZOD_RANGE = "^4.2.1";
|
|
3619
|
+
async function main17() {
|
|
3620
|
+
const packageJsonPath = import_path17.default.join(process.cwd(), PACKAGE_JSON_RELATIVE);
|
|
3621
|
+
if (!(0, import_fs.existsSync)(packageJsonPath)) {
|
|
3622
|
+
console.log(`'${PACKAGE_JSON_RELATIVE}' not found in ${process.cwd()} \u2014 skipping.`);
|
|
3623
|
+
return;
|
|
3624
|
+
}
|
|
3625
|
+
const raw = (0, import_fs.readFileSync)(packageJsonPath, "utf8");
|
|
3626
|
+
let parsed;
|
|
3627
|
+
try {
|
|
3628
|
+
parsed = JSON.parse(raw);
|
|
3629
|
+
} catch (error) {
|
|
3630
|
+
console.warn(
|
|
3631
|
+
` [${PACKAGE_JSON_RELATIVE}] Failed to parse JSON \u2014 skipping update. ${error.message}`
|
|
3632
|
+
);
|
|
3633
|
+
return;
|
|
3634
|
+
}
|
|
3635
|
+
console.log(`Updating '${PACKAGE_JSON_RELATIVE}'...`);
|
|
3636
|
+
const previousVersion = parsed.version;
|
|
3637
|
+
const versionChanged = previousVersion !== TARGET_VERSION;
|
|
3638
|
+
parsed.version = TARGET_VERSION;
|
|
3639
|
+
if (versionChanged) {
|
|
3640
|
+
console.log(
|
|
3641
|
+
` Set version: ${previousVersion ?? "<unset>"} \u2192 ${TARGET_VERSION}`
|
|
3642
|
+
);
|
|
3643
|
+
} else {
|
|
3644
|
+
console.log(` Version already ${TARGET_VERSION} \u2014 no change.`);
|
|
3645
|
+
}
|
|
3646
|
+
let zodBucket = "dependencies";
|
|
3647
|
+
if (parsed.devDependencies && "zod" in parsed.devDependencies) {
|
|
3648
|
+
zodBucket = "devDependencies";
|
|
3649
|
+
}
|
|
3650
|
+
if (!parsed[zodBucket]) {
|
|
3651
|
+
parsed[zodBucket] = {};
|
|
3652
|
+
}
|
|
3653
|
+
const bucket = parsed[zodBucket];
|
|
3654
|
+
const previousZod = bucket.zod;
|
|
3655
|
+
const zodChanged = previousZod !== TARGET_ZOD_RANGE;
|
|
3656
|
+
bucket.zod = TARGET_ZOD_RANGE;
|
|
3657
|
+
if (zodChanged) {
|
|
3658
|
+
console.log(
|
|
3659
|
+
` Set ${zodBucket}.zod: ${previousZod ?? "<absent>"} \u2192 ${TARGET_ZOD_RANGE}`
|
|
3660
|
+
);
|
|
3661
|
+
} else {
|
|
3662
|
+
console.log(` ${zodBucket}.zod already ${TARGET_ZOD_RANGE} \u2014 no change.`);
|
|
3663
|
+
}
|
|
3664
|
+
const trailingNewline = raw.endsWith("\n") ? "\n" : "";
|
|
3665
|
+
const next = JSON.stringify(parsed, null, 2) + trailingNewline;
|
|
3666
|
+
if (next === raw) {
|
|
3667
|
+
console.log("\n No changes to write.");
|
|
3668
|
+
return;
|
|
3669
|
+
}
|
|
3670
|
+
(0, import_fs.writeFileSync)(packageJsonPath, next, "utf8");
|
|
3671
|
+
console.log(`
|
|
3672
|
+
Saved '${PACKAGE_JSON_RELATIVE}'.`);
|
|
3673
|
+
console.log(
|
|
3674
|
+
` NOTE: run \`yarn install\` (or your package manager equivalent) to install the updated dependency versions.`
|
|
3675
|
+
);
|
|
3676
|
+
}
|
|
3677
|
+
|
|
3678
|
+
// src/migrations/v2.0/migrate-workqueue-configs.ts
|
|
3679
|
+
var import_ts_morph17 = require("ts-morph");
|
|
3680
|
+
var import_path18 = __toESM(require("path"));
|
|
2889
3681
|
var DEFINE_WORKQUEUES_NAME3 = "defineWorkqueues";
|
|
2890
3682
|
var ACTIONS_PROPERTY_NAME5 = "actions";
|
|
2891
3683
|
var ACTION_PROPERTY_NAME2 = "action";
|
|
@@ -2906,28 +3698,28 @@ var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
|
2906
3698
|
]);
|
|
2907
3699
|
function getWorkqueueLabel(workqueue) {
|
|
2908
3700
|
const slugProperty = workqueue.getProperty(SLUG_PROPERTY_NAME);
|
|
2909
|
-
if (!slugProperty || !
|
|
3701
|
+
if (!slugProperty || !import_ts_morph17.Node.isPropertyAssignment(slugProperty)) {
|
|
2910
3702
|
return "(unknown slug)";
|
|
2911
3703
|
}
|
|
2912
3704
|
const slugInitializer = slugProperty.getInitializer();
|
|
2913
|
-
if (!slugInitializer || !
|
|
3705
|
+
if (!slugInitializer || !import_ts_morph17.Node.isStringLiteral(slugInitializer)) {
|
|
2914
3706
|
return "(unknown slug)";
|
|
2915
3707
|
}
|
|
2916
3708
|
return slugInitializer.getLiteralValue();
|
|
2917
3709
|
}
|
|
2918
3710
|
function getActionTypeName(action) {
|
|
2919
3711
|
const typeProperty = action.getProperty(TYPE_PROPERTY_NAME7);
|
|
2920
|
-
if (!typeProperty || !
|
|
3712
|
+
if (!typeProperty || !import_ts_morph17.Node.isPropertyAssignment(typeProperty)) {
|
|
2921
3713
|
return null;
|
|
2922
3714
|
}
|
|
2923
3715
|
const typeInitializer = typeProperty.getInitializer();
|
|
2924
3716
|
if (!typeInitializer) {
|
|
2925
3717
|
return null;
|
|
2926
3718
|
}
|
|
2927
|
-
if (
|
|
3719
|
+
if (import_ts_morph17.Node.isStringLiteral(typeInitializer)) {
|
|
2928
3720
|
return typeInitializer.getLiteralValue();
|
|
2929
3721
|
}
|
|
2930
|
-
if (
|
|
3722
|
+
if (import_ts_morph17.Node.isPropertyAccessExpression(typeInitializer)) {
|
|
2931
3723
|
return typeInitializer.getName();
|
|
2932
3724
|
}
|
|
2933
3725
|
return null;
|
|
@@ -2941,19 +3733,19 @@ function isUnsupportedActionType(action) {
|
|
|
2941
3733
|
}
|
|
2942
3734
|
function migrateWorkqueueActions(workqueue, relPath) {
|
|
2943
3735
|
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
2944
|
-
if (!actionsProperty || !
|
|
3736
|
+
if (!actionsProperty || !import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
2945
3737
|
return 0;
|
|
2946
3738
|
}
|
|
2947
3739
|
const actionsInitializer = actionsProperty.getInitializer();
|
|
2948
|
-
if (!actionsInitializer || !
|
|
3740
|
+
if (!actionsInitializer || !import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
2949
3741
|
return 0;
|
|
2950
3742
|
}
|
|
2951
3743
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
2952
3744
|
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
2953
3745
|
if (existingActionProperty) {
|
|
2954
|
-
if (
|
|
3746
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
2955
3747
|
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
2956
|
-
if (existingActionInitializer &&
|
|
3748
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
2957
3749
|
const conditionalsProperty2 = existingActionInitializer.getProperty(
|
|
2958
3750
|
CONDITIONALS_PROPERTY_NAME
|
|
2959
3751
|
);
|
|
@@ -2978,7 +3770,7 @@ function migrateWorkqueueActions(workqueue, relPath) {
|
|
|
2978
3770
|
return 1;
|
|
2979
3771
|
}
|
|
2980
3772
|
const actionCandidates = actionsInitializer.getElements().filter(
|
|
2981
|
-
(element) =>
|
|
3773
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
2982
3774
|
);
|
|
2983
3775
|
if (actionCandidates.length === 0) {
|
|
2984
3776
|
actionsProperty.remove();
|
|
@@ -3020,36 +3812,36 @@ function migrateWorkqueueActions(workqueue, relPath) {
|
|
|
3020
3812
|
);
|
|
3021
3813
|
return 1;
|
|
3022
3814
|
}
|
|
3023
|
-
function
|
|
3815
|
+
function processFile13(filePath, project) {
|
|
3024
3816
|
const sourceFile = project.getSourceFile(filePath);
|
|
3025
3817
|
if (!sourceFile) return 0;
|
|
3026
3818
|
let migratedWorkqueues = 0;
|
|
3027
|
-
const relPath =
|
|
3819
|
+
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3028
3820
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3029
|
-
|
|
3821
|
+
import_ts_morph17.SyntaxKind.CallExpression
|
|
3030
3822
|
);
|
|
3031
3823
|
for (const call of callExpressions) {
|
|
3032
3824
|
const expression = call.getExpression();
|
|
3033
|
-
if (!
|
|
3825
|
+
if (!import_ts_morph17.Node.isIdentifier(expression) || expression.getText() !== DEFINE_WORKQUEUES_NAME3) {
|
|
3034
3826
|
continue;
|
|
3035
3827
|
}
|
|
3036
3828
|
const args = call.getArguments();
|
|
3037
3829
|
if (args.length === 0) continue;
|
|
3038
3830
|
const workqueuesArg = args[0];
|
|
3039
|
-
if (!
|
|
3831
|
+
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3040
3832
|
for (const element of workqueuesArg.getElements()) {
|
|
3041
|
-
if (!
|
|
3833
|
+
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3042
3834
|
migratedWorkqueues += migrateWorkqueueActions(element, relPath);
|
|
3043
3835
|
}
|
|
3044
3836
|
}
|
|
3045
3837
|
return migratedWorkqueues;
|
|
3046
3838
|
}
|
|
3047
|
-
async function
|
|
3048
|
-
const srcDir =
|
|
3839
|
+
async function main18() {
|
|
3840
|
+
const srcDir = import_path18.default.join(process.cwd(), "src");
|
|
3049
3841
|
console.log(`Scanning for defineWorkqueues calls in: ${srcDir}
|
|
3050
3842
|
`);
|
|
3051
|
-
const project = new
|
|
3052
|
-
tsConfigFilePath:
|
|
3843
|
+
const project = new import_ts_morph17.Project({
|
|
3844
|
+
tsConfigFilePath: import_path18.default.resolve(srcDir, "../tsconfig.json"),
|
|
3053
3845
|
skipAddingFilesFromTsConfig: false
|
|
3054
3846
|
});
|
|
3055
3847
|
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
@@ -3062,7 +3854,7 @@ async function main13() {
|
|
|
3062
3854
|
const modifiedFiles = [];
|
|
3063
3855
|
for (const sourceFile of sourceFiles) {
|
|
3064
3856
|
const filePath = sourceFile.getFilePath();
|
|
3065
|
-
const migrated =
|
|
3857
|
+
const migrated = processFile13(filePath, project);
|
|
3066
3858
|
if (migrated > 0) {
|
|
3067
3859
|
totalMigrated += migrated;
|
|
3068
3860
|
modifiedFiles.push(filePath);
|
|
@@ -3079,7 +3871,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
3079
3871
|
for (const filePath of modifiedFiles) {
|
|
3080
3872
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
3081
3873
|
await sourceFile.save();
|
|
3082
|
-
console.log(` Saved: ${
|
|
3874
|
+
console.log(` Saved: ${import_path18.default.relative(process.cwd(), filePath)}`);
|
|
3083
3875
|
}
|
|
3084
3876
|
console.log(
|
|
3085
3877
|
`
|
|
@@ -3088,13 +3880,13 @@ Done. Migrated ${totalMigrated} deprecated workqueue 'actions' definition(s) to
|
|
|
3088
3880
|
}
|
|
3089
3881
|
|
|
3090
3882
|
// src/migrations/v2.0/remove-demo-scope.ts
|
|
3091
|
-
var
|
|
3092
|
-
var
|
|
3883
|
+
var import_path19 = __toESM(require("path"));
|
|
3884
|
+
var import_ts_morph18 = require("ts-morph");
|
|
3093
3885
|
var ROLES_HANDLER_RELATIVE_PATH = "src/data-seeding/roles/handler.ts";
|
|
3094
|
-
async function
|
|
3095
|
-
const rolesHandlerPath =
|
|
3096
|
-
const project = new
|
|
3097
|
-
tsConfigFilePath:
|
|
3886
|
+
async function main19() {
|
|
3887
|
+
const rolesHandlerPath = import_path19.default.join(process.cwd(), ROLES_HANDLER_RELATIVE_PATH);
|
|
3888
|
+
const project = new import_ts_morph18.Project({
|
|
3889
|
+
tsConfigFilePath: import_path19.default.resolve(process.cwd(), "tsconfig.json"),
|
|
3098
3890
|
skipAddingFilesFromTsConfig: false
|
|
3099
3891
|
});
|
|
3100
3892
|
const sourceFile = project.getSourceFile(rolesHandlerPath);
|
|
@@ -3143,7 +3935,7 @@ async function main14() {
|
|
|
3143
3935
|
|
|
3144
3936
|
// src/migrations/v2.0/remove-hearth-migrations.ts
|
|
3145
3937
|
var fs2 = __toESM(require("fs"));
|
|
3146
|
-
var
|
|
3938
|
+
var import_path20 = __toESM(require("path"));
|
|
3147
3939
|
var PATHS_TO_REMOVE = [
|
|
3148
3940
|
{
|
|
3149
3941
|
relativePath: "src/migrations/hearth",
|
|
@@ -3155,9 +3947,9 @@ var PATHS_TO_REMOVE = [
|
|
|
3155
3947
|
},
|
|
3156
3948
|
{ relativePath: "src/utils/hearth-helpers.ts", label: "Hearth helpers file" }
|
|
3157
3949
|
];
|
|
3158
|
-
async function
|
|
3950
|
+
async function main20() {
|
|
3159
3951
|
for (const { relativePath, label } of PATHS_TO_REMOVE) {
|
|
3160
|
-
const absolutePath =
|
|
3952
|
+
const absolutePath = import_path20.default.join(process.cwd(), relativePath);
|
|
3161
3953
|
if (fs2.existsSync(absolutePath)) {
|
|
3162
3954
|
fs2.rmSync(absolutePath, { recursive: true, force: true });
|
|
3163
3955
|
console.log(`Removed ${label} '${relativePath}'.`);
|
|
@@ -3168,9 +3960,9 @@ async function main15() {
|
|
|
3168
3960
|
}
|
|
3169
3961
|
|
|
3170
3962
|
// src/migrations/v2.0/create-events-index.ts
|
|
3171
|
-
var
|
|
3172
|
-
var
|
|
3173
|
-
var
|
|
3963
|
+
var import_ts_morph19 = require("ts-morph");
|
|
3964
|
+
var import_fs2 = __toESM(require("fs"));
|
|
3965
|
+
var import_path21 = __toESM(require("path"));
|
|
3174
3966
|
var DEFINE_CONFIG_NAME5 = "defineConfig";
|
|
3175
3967
|
var HANDLER_FUNCTION_NAMES = /* @__PURE__ */ new Set([
|
|
3176
3968
|
"getCustomEventsHandler",
|
|
@@ -3192,7 +3984,7 @@ var LICENSE_HEADER = `/*
|
|
|
3192
3984
|
`;
|
|
3193
3985
|
function findEventConfigExports(project, srcDir) {
|
|
3194
3986
|
const found = [];
|
|
3195
|
-
const eventsIndexAbs =
|
|
3987
|
+
const eventsIndexAbs = import_path21.default.join(srcDir, "events", "index.ts");
|
|
3196
3988
|
for (const sourceFile of project.getSourceFiles()) {
|
|
3197
3989
|
const filePath = sourceFile.getFilePath();
|
|
3198
3990
|
if (!filePath.startsWith(srcDir) || filePath.includes("/node_modules/")) {
|
|
@@ -3204,10 +3996,10 @@ function findEventConfigExports(project, srcDir) {
|
|
|
3204
3996
|
for (const decl of statement.getDeclarations()) {
|
|
3205
3997
|
const initializer = decl.getInitializer();
|
|
3206
3998
|
if (!initializer) continue;
|
|
3207
|
-
const unwrapped =
|
|
3208
|
-
if (!
|
|
3999
|
+
const unwrapped = import_ts_morph19.Node.isAsExpression(initializer) ? initializer.getExpression() : initializer;
|
|
4000
|
+
if (!import_ts_morph19.Node.isCallExpression(unwrapped)) continue;
|
|
3209
4001
|
const callee = unwrapped.getExpression();
|
|
3210
|
-
if (!
|
|
4002
|
+
if (!import_ts_morph19.Node.isIdentifier(callee)) continue;
|
|
3211
4003
|
if (callee.getText() !== DEFINE_CONFIG_NAME5) continue;
|
|
3212
4004
|
found.push({ name: decl.getName(), filePath });
|
|
3213
4005
|
}
|
|
@@ -3216,8 +4008,8 @@ function findEventConfigExports(project, srcDir) {
|
|
|
3216
4008
|
return found;
|
|
3217
4009
|
}
|
|
3218
4010
|
function buildIndexImportSpecifier(eventConfigFilePath, srcDir) {
|
|
3219
|
-
const eventsIndexDir =
|
|
3220
|
-
let rel =
|
|
4011
|
+
const eventsIndexDir = import_path21.default.join(srcDir, "events");
|
|
4012
|
+
let rel = import_path21.default.relative(eventsIndexDir, eventConfigFilePath).split(import_path21.default.sep).join("/");
|
|
3221
4013
|
if (rel.endsWith(".ts")) rel = rel.slice(0, -".ts".length);
|
|
3222
4014
|
if (rel.endsWith("/index")) rel = rel.slice(0, -"/index".length);
|
|
3223
4015
|
if (!rel.startsWith(".")) rel = "./" + rel;
|
|
@@ -3294,17 +4086,17 @@ function modifyHandler(sourceFile, exportNames) {
|
|
|
3294
4086
|
);
|
|
3295
4087
|
}
|
|
3296
4088
|
for (const call of sourceFile.getDescendantsOfKind(
|
|
3297
|
-
|
|
4089
|
+
import_ts_morph19.SyntaxKind.CallExpression
|
|
3298
4090
|
)) {
|
|
3299
4091
|
const callee = call.getExpression();
|
|
3300
|
-
if (!
|
|
4092
|
+
if (!import_ts_morph19.Node.isPropertyAccessExpression(callee)) continue;
|
|
3301
4093
|
if (callee.getName() !== RESPONSE_METHOD_NAME) continue;
|
|
3302
4094
|
const args = call.getArguments();
|
|
3303
4095
|
if (args.length !== 1) continue;
|
|
3304
4096
|
const [arg] = args;
|
|
3305
|
-
if (!
|
|
4097
|
+
if (!import_ts_morph19.Node.isArrayLiteralExpression(arg)) continue;
|
|
3306
4098
|
if (arg.getElements().length === 0) continue;
|
|
3307
|
-
if (!arg.getElements().every((el) =>
|
|
4099
|
+
if (!arg.getElements().every((el) => import_ts_morph19.Node.isIdentifier(el))) continue;
|
|
3308
4100
|
arg.replaceWithText(EVENT_CONFIGS_IDENTIFIER);
|
|
3309
4101
|
changes.push(
|
|
3310
4102
|
`rewrote h.response([...]) \u2192 h.response(${EVENT_CONFIGS_IDENTIFIER})`
|
|
@@ -3312,13 +4104,13 @@ function modifyHandler(sourceFile, exportNames) {
|
|
|
3312
4104
|
}
|
|
3313
4105
|
return changes;
|
|
3314
4106
|
}
|
|
3315
|
-
async function
|
|
3316
|
-
const
|
|
3317
|
-
const srcDir =
|
|
4107
|
+
async function main21() {
|
|
4108
|
+
const cwd = process.cwd();
|
|
4109
|
+
const srcDir = import_path21.default.join(cwd, "src");
|
|
3318
4110
|
console.log(`Scanning for defineConfig event exports in: ${srcDir}
|
|
3319
4111
|
`);
|
|
3320
|
-
const project = new
|
|
3321
|
-
tsConfigFilePath:
|
|
4112
|
+
const project = new import_ts_morph19.Project({
|
|
4113
|
+
tsConfigFilePath: import_path21.default.resolve(srcDir, "../tsconfig.json"),
|
|
3322
4114
|
skipAddingFilesFromTsConfig: false
|
|
3323
4115
|
});
|
|
3324
4116
|
const eventConfigExports = findEventConfigExports(project, srcDir);
|
|
@@ -3330,15 +4122,15 @@ async function main16() {
|
|
|
3330
4122
|
}
|
|
3331
4123
|
console.log(`Found ${eventConfigExports.length} event config export(s):`);
|
|
3332
4124
|
for (const e of eventConfigExports) {
|
|
3333
|
-
console.log(` ${e.name} \u2190 ${
|
|
4125
|
+
console.log(` ${e.name} \u2190 ${import_path21.default.relative(cwd, e.filePath)}`);
|
|
3334
4126
|
}
|
|
3335
|
-
const eventsIndexAbs =
|
|
3336
|
-
const eventsIndexRel =
|
|
3337
|
-
if (
|
|
4127
|
+
const eventsIndexAbs = import_path21.default.join(srcDir, "events", "index.ts");
|
|
4128
|
+
const eventsIndexRel = import_path21.default.relative(cwd, eventsIndexAbs);
|
|
4129
|
+
if (import_fs2.default.existsSync(eventsIndexAbs)) {
|
|
3338
4130
|
console.log(`
|
|
3339
4131
|
[${eventsIndexRel}] already exists \u2014 leaving untouched.`);
|
|
3340
4132
|
} else {
|
|
3341
|
-
|
|
4133
|
+
import_fs2.default.mkdirSync(import_path21.default.dirname(eventsIndexAbs), { recursive: true });
|
|
3342
4134
|
const source = buildEventsIndexSource(eventConfigExports, srcDir);
|
|
3343
4135
|
const eventsIndexFile = project.createSourceFile(eventsIndexAbs, source, {
|
|
3344
4136
|
overwrite: false
|
|
@@ -3359,7 +4151,7 @@ No event-config handler file found (looked for exported function(s): ${Array.fro
|
|
|
3359
4151
|
);
|
|
3360
4152
|
return;
|
|
3361
4153
|
}
|
|
3362
|
-
const handlerRelPath =
|
|
4154
|
+
const handlerRelPath = import_path21.default.relative(cwd, handler.getFilePath());
|
|
3363
4155
|
const exportNameSet = new Set(eventConfigExports.map((e) => e.name));
|
|
3364
4156
|
const changes = modifyHandler(handler, exportNameSet);
|
|
3365
4157
|
if (changes.length === 0) {
|
|
@@ -3379,12 +4171,13 @@ var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
|
3379
4171
|
var UPSTREAM_BRANCH = "develop";
|
|
3380
4172
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
3381
4173
|
var FILES_TO_CHECKOUT = [
|
|
3382
|
-
"
|
|
3383
|
-
"
|
|
4174
|
+
"src/analytics/analytics.ts",
|
|
4175
|
+
"Dockerfile",
|
|
4176
|
+
"Dockerfile.assets"
|
|
3384
4177
|
];
|
|
3385
4178
|
function runGit(args, { silent = false } = {}) {
|
|
3386
4179
|
return (0, import_child_process.execFileSync)("git", args, {
|
|
3387
|
-
cwd:
|
|
4180
|
+
cwd: process.cwd(),
|
|
3388
4181
|
encoding: "utf8",
|
|
3389
4182
|
stdio: silent ? ["ignore", "pipe", "pipe"] : ["ignore", "pipe", "inherit"]
|
|
3390
4183
|
});
|
|
@@ -3400,11 +4193,11 @@ function tryGit(args) {
|
|
|
3400
4193
|
function assertIsGitRepo() {
|
|
3401
4194
|
if (!tryGit(["rev-parse", "--is-inside-work-tree"])) {
|
|
3402
4195
|
throw new Error(
|
|
3403
|
-
|
|
4196
|
+
`${process.cwd()} is not a git repository. Initialise git (or run the upgrade inside a git checkout) before re-running.`
|
|
3404
4197
|
);
|
|
3405
4198
|
}
|
|
3406
4199
|
}
|
|
3407
|
-
async function
|
|
4200
|
+
async function main22() {
|
|
3408
4201
|
console.log(
|
|
3409
4202
|
`Checking out ${FILES_TO_CHECKOUT.length} file(s) from ${UPSTREAM_URL}@${UPSTREAM_BRANCH}...
|
|
3410
4203
|
`
|
|
@@ -3452,10 +4245,356 @@ async function main17() {
|
|
|
3452
4245
|
}
|
|
3453
4246
|
}
|
|
3454
4247
|
|
|
4248
|
+
// src/migrations/v2.0/add-resend-invite-notification.ts
|
|
4249
|
+
var import_fs3 = require("fs");
|
|
4250
|
+
var import_path22 = __toESM(require("path"));
|
|
4251
|
+
var import_ts_morph20 = require("ts-morph");
|
|
4252
|
+
var TS_MORPH_PROJECT_OPTIONS = {
|
|
4253
|
+
skipAddingFilesFromTsConfig: true,
|
|
4254
|
+
manipulationSettings: {
|
|
4255
|
+
indentationText: import_ts_morph20.IndentationText.TwoSpaces
|
|
4256
|
+
}
|
|
4257
|
+
};
|
|
4258
|
+
var EMAIL_TEMPLATES_INDEX = "src/api/notification/email-templates/index.ts";
|
|
4259
|
+
var NOTIFICATION_HANDLER = "src/api/notification/handler.ts";
|
|
4260
|
+
var USER_NOTIFICATION_ROUTES = "src/config/routes/userNotificationRoutes.ts";
|
|
4261
|
+
var SMS_SERVICE = "src/api/notification/sms-service.ts";
|
|
4262
|
+
var NOTIFICATION_CSV = "src/translations/notification.csv";
|
|
4263
|
+
var RESEND_INVITE_HTML = "src/api/notification/email-templates/other/resend-invite.html";
|
|
4264
|
+
var RESEND_INVITE_HTML_CONTENT = `<!doctype html>
|
|
4265
|
+
<html>
|
|
4266
|
+
<head>
|
|
4267
|
+
<link
|
|
4268
|
+
href="https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;700&display=swap"
|
|
4269
|
+
rel="stylesheet"
|
|
4270
|
+
/>
|
|
4271
|
+
<style type="text/css">
|
|
4272
|
+
body {
|
|
4273
|
+
font-family: 'Noto Sans', sans-serif;
|
|
4274
|
+
color: #222;
|
|
4275
|
+
padding: 16px 24px;
|
|
4276
|
+
}
|
|
4277
|
+
|
|
4278
|
+
h1 {
|
|
4279
|
+
font-size: 21px;
|
|
4280
|
+
margin-top: 32px;
|
|
4281
|
+
margin-bottom: 36px;
|
|
4282
|
+
font-weight: 700;
|
|
4283
|
+
}
|
|
4284
|
+
|
|
4285
|
+
p {
|
|
4286
|
+
font-weight: 400;
|
|
4287
|
+
font-size: 16px;
|
|
4288
|
+
line-height: 1.8;
|
|
4289
|
+
margin-bottom: 24px;
|
|
4290
|
+
}
|
|
4291
|
+
|
|
4292
|
+
i {
|
|
4293
|
+
color: #666;
|
|
4294
|
+
font-weight: 400;
|
|
4295
|
+
font-size: 16px;
|
|
4296
|
+
}
|
|
4297
|
+
</style>
|
|
4298
|
+
</head>
|
|
4299
|
+
|
|
4300
|
+
<body>
|
|
4301
|
+
<img
|
|
4302
|
+
src="{{countryLogo}}"
|
|
4303
|
+
alt="country_logo"
|
|
4304
|
+
style="max-height: 88px; max-width: 100%"
|
|
4305
|
+
/>
|
|
4306
|
+
<h1>Your {{applicationName}} account invitation</h1>
|
|
4307
|
+
<p>Hello {{firstname}},</p>
|
|
4308
|
+
<p>Your account invitation has been resent. Please use the following credentials to access your account:</p>
|
|
4309
|
+
<p>
|
|
4310
|
+
Username: <strong>{{username}}</strong><br />
|
|
4311
|
+
Password: <strong>{{temporaryPassword}}</strong>
|
|
4312
|
+
</p>
|
|
4313
|
+
<p>
|
|
4314
|
+
Please click the link below to complete your account setup and start using
|
|
4315
|
+
{{applicationName}}.
|
|
4316
|
+
</p>
|
|
4317
|
+
|
|
4318
|
+
<div style="margin-top: 32px; margin-bottom: 32px">
|
|
4319
|
+
<a href="{{loginURL}}">Complete setup</a>
|
|
4320
|
+
</div>
|
|
4321
|
+
<br />
|
|
4322
|
+
<p>
|
|
4323
|
+
Best regards, <br />
|
|
4324
|
+
{{applicationName}} Team
|
|
4325
|
+
</p>
|
|
4326
|
+
</body>
|
|
4327
|
+
</html>
|
|
4328
|
+
`;
|
|
4329
|
+
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";
|
|
4330
|
+
function getObjectLiteralFromConst(declaration) {
|
|
4331
|
+
if (!declaration) {
|
|
4332
|
+
return;
|
|
4333
|
+
}
|
|
4334
|
+
const initializer = declaration.getInitializer();
|
|
4335
|
+
if (!initializer) {
|
|
4336
|
+
return;
|
|
4337
|
+
}
|
|
4338
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(initializer)) {
|
|
4339
|
+
return initializer;
|
|
4340
|
+
}
|
|
4341
|
+
if (import_ts_morph20.Node.isAsExpression(initializer)) {
|
|
4342
|
+
const expression = initializer.getExpression();
|
|
4343
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(expression)) {
|
|
4344
|
+
return expression;
|
|
4345
|
+
}
|
|
4346
|
+
}
|
|
4347
|
+
if (import_ts_morph20.Node.isSatisfiesExpression(initializer)) {
|
|
4348
|
+
const expression = initializer.getExpression();
|
|
4349
|
+
if (import_ts_morph20.Node.isObjectLiteralExpression(expression)) {
|
|
4350
|
+
return expression;
|
|
4351
|
+
}
|
|
4352
|
+
}
|
|
4353
|
+
}
|
|
4354
|
+
function patchEmailTemplatesIndex() {
|
|
4355
|
+
const full = import_path22.default.join(process.cwd(), EMAIL_TEMPLATES_INDEX);
|
|
4356
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4357
|
+
console.log(` '${EMAIL_TEMPLATES_INDEX}' missing \u2014 skipping.`);
|
|
4358
|
+
return false;
|
|
4359
|
+
}
|
|
4360
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4361
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4362
|
+
let changed = false;
|
|
4363
|
+
const triggerVariableObject = getObjectLiteralFromConst(
|
|
4364
|
+
sourceFile.getVariableDeclaration("TriggerVariable")
|
|
4365
|
+
);
|
|
4366
|
+
if (triggerVariableObject) {
|
|
4367
|
+
const hasResendInviteVariable = triggerVariableObject.getProperties().some((prop) => prop.getText().includes("[TriggerEvent.RESEND_INVITE]"));
|
|
4368
|
+
if (!hasResendInviteVariable) {
|
|
4369
|
+
const properties = triggerVariableObject.getProperties();
|
|
4370
|
+
const lastProperty = properties[properties.length - 1];
|
|
4371
|
+
if (lastProperty) {
|
|
4372
|
+
sourceFile.insertText(
|
|
4373
|
+
lastProperty.getEnd(),
|
|
4374
|
+
`,
|
|
4375
|
+
[TriggerEvent.RESEND_INVITE]: z.object({
|
|
4376
|
+
firstname: z.string(),
|
|
4377
|
+
username: z.string(),
|
|
4378
|
+
temporaryPassword: z.string(),
|
|
4379
|
+
completeSetupUrl: z.string(),
|
|
4380
|
+
loginURL: z.string()
|
|
4381
|
+
})`
|
|
4382
|
+
);
|
|
4383
|
+
changed = true;
|
|
4384
|
+
}
|
|
4385
|
+
}
|
|
4386
|
+
}
|
|
4387
|
+
const templatesObject = getObjectLiteralFromConst(
|
|
4388
|
+
sourceFile.getVariableDeclaration("templates")
|
|
4389
|
+
);
|
|
4390
|
+
if (templatesObject) {
|
|
4391
|
+
const hasResendInviteTemplate = templatesObject.getProperties().some(
|
|
4392
|
+
(prop) => prop.getText().includes("readOtherTemplate<TriggerVariable['resend-invite']>")
|
|
4393
|
+
);
|
|
4394
|
+
if (!hasResendInviteTemplate) {
|
|
4395
|
+
const userCreatedProp = templatesObject.getProperties().find((prop) => prop.getText().includes("[TriggerEvent.USER_CREATED]"));
|
|
4396
|
+
const anchor = userCreatedProp ?? templatesObject.getProperties()[templatesObject.getProperties().length - 1];
|
|
4397
|
+
if (anchor) {
|
|
4398
|
+
sourceFile.insertText(
|
|
4399
|
+
anchor.getEnd(),
|
|
4400
|
+
`,
|
|
4401
|
+
[TriggerEvent.RESEND_INVITE]: {
|
|
4402
|
+
type: 'resend-invite',
|
|
4403
|
+
subject: 'Your OpenCRVS account invitation',
|
|
4404
|
+
template:
|
|
4405
|
+
readOtherTemplate<TriggerVariable['resend-invite']>('resend-invite')
|
|
4406
|
+
}`
|
|
4407
|
+
);
|
|
4408
|
+
changed = true;
|
|
4409
|
+
}
|
|
4410
|
+
}
|
|
4411
|
+
}
|
|
4412
|
+
if (changed) {
|
|
4413
|
+
sourceFile.saveSync();
|
|
4414
|
+
}
|
|
4415
|
+
return changed;
|
|
4416
|
+
}
|
|
4417
|
+
function patchNotificationHandler() {
|
|
4418
|
+
const full = import_path22.default.join(process.cwd(), NOTIFICATION_HANDLER);
|
|
4419
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4420
|
+
return false;
|
|
4421
|
+
}
|
|
4422
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4423
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4424
|
+
const convertFn = sourceFile.getFunction("convertPayloadToVariable");
|
|
4425
|
+
if (!convertFn) {
|
|
4426
|
+
return false;
|
|
4427
|
+
}
|
|
4428
|
+
const switchStmt = convertFn.getFirstDescendantByKind(
|
|
4429
|
+
import_ts_morph20.SyntaxKind.SwitchStatement
|
|
4430
|
+
);
|
|
4431
|
+
if (!switchStmt) {
|
|
4432
|
+
return false;
|
|
4433
|
+
}
|
|
4434
|
+
const clauses = switchStmt.getCaseBlock().getClauses();
|
|
4435
|
+
const hasResendInvite = clauses.some(
|
|
4436
|
+
(clause) => import_ts_morph20.Node.isCaseClause(clause) && clause.getExpression().getText() === "TriggerEvent.RESEND_INVITE"
|
|
4437
|
+
);
|
|
4438
|
+
if (hasResendInvite) {
|
|
4439
|
+
return false;
|
|
4440
|
+
}
|
|
4441
|
+
const userCreatedClauseIndex = clauses.findIndex(
|
|
4442
|
+
(clause) => import_ts_morph20.Node.isCaseClause(clause) && clause.getExpression().getText() === "TriggerEvent.USER_CREATED"
|
|
4443
|
+
);
|
|
4444
|
+
if (userCreatedClauseIndex < 0) {
|
|
4445
|
+
return false;
|
|
4446
|
+
}
|
|
4447
|
+
const userCreatedClause = clauses[userCreatedClauseIndex];
|
|
4448
|
+
sourceFile.insertText(
|
|
4449
|
+
userCreatedClause.getEnd(),
|
|
4450
|
+
`
|
|
4451
|
+
|
|
4452
|
+
case TriggerEvent.RESEND_INVITE:
|
|
4453
|
+
return {
|
|
4454
|
+
firstname,
|
|
4455
|
+
username: payload.username,
|
|
4456
|
+
temporaryPassword: payload.temporaryPassword,
|
|
4457
|
+
completeSetupUrl: LOGIN_URL,
|
|
4458
|
+
loginURL: LOGIN_URL
|
|
4459
|
+
}`
|
|
4460
|
+
);
|
|
4461
|
+
sourceFile.saveSync();
|
|
4462
|
+
return true;
|
|
4463
|
+
}
|
|
4464
|
+
function getReturnedArrayLiteral(functionFilePath, fnName) {
|
|
4465
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4466
|
+
const sourceFile = project.addSourceFileAtPath(functionFilePath);
|
|
4467
|
+
const fn = sourceFile.getFunction(fnName);
|
|
4468
|
+
const returnStmt = fn?.getFirstDescendantByKind(import_ts_morph20.SyntaxKind.ReturnStatement);
|
|
4469
|
+
const expr = returnStmt?.getExpression();
|
|
4470
|
+
if (!expr || !import_ts_morph20.Node.isArrayLiteralExpression(expr)) {
|
|
4471
|
+
return { sourceFile, arrayLiteral: void 0 };
|
|
4472
|
+
}
|
|
4473
|
+
return { sourceFile, arrayLiteral: expr };
|
|
4474
|
+
}
|
|
4475
|
+
function patchUserNotificationRoutes() {
|
|
4476
|
+
const full = import_path22.default.join(process.cwd(), USER_NOTIFICATION_ROUTES);
|
|
4477
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4478
|
+
return false;
|
|
4479
|
+
}
|
|
4480
|
+
const { sourceFile, arrayLiteral } = getReturnedArrayLiteral(
|
|
4481
|
+
full,
|
|
4482
|
+
"getUserNotificationRoutes"
|
|
4483
|
+
);
|
|
4484
|
+
if (!arrayLiteral) {
|
|
4485
|
+
return false;
|
|
4486
|
+
}
|
|
4487
|
+
const elements = arrayLiteral.getElements();
|
|
4488
|
+
const routeExists = elements.some(
|
|
4489
|
+
(element) => element.getText().includes(`path: '/triggers/user/resend-invite'`)
|
|
4490
|
+
);
|
|
4491
|
+
if (routeExists) {
|
|
4492
|
+
return false;
|
|
4493
|
+
}
|
|
4494
|
+
const anchor = elements.find(
|
|
4495
|
+
(element) => element.getText().includes(`path: '/triggers/user/user-created'`)
|
|
4496
|
+
) ?? elements[elements.length - 1];
|
|
4497
|
+
if (!anchor) {
|
|
4498
|
+
return false;
|
|
4499
|
+
}
|
|
4500
|
+
sourceFile.insertText(
|
|
4501
|
+
anchor.getEnd(),
|
|
4502
|
+
`,
|
|
4503
|
+
{
|
|
4504
|
+
method: 'POST',
|
|
4505
|
+
path: '/triggers/user/resend-invite',
|
|
4506
|
+
handler: makeNotificationHandler('resend-invite'),
|
|
4507
|
+
options: {
|
|
4508
|
+
auth: false,
|
|
4509
|
+
tags: ['api'],
|
|
4510
|
+
description: 'Handles notification for resent user invite'
|
|
4511
|
+
}
|
|
4512
|
+
}`
|
|
4513
|
+
);
|
|
4514
|
+
sourceFile.saveSync();
|
|
4515
|
+
return true;
|
|
4516
|
+
}
|
|
4517
|
+
function patchSmsService() {
|
|
4518
|
+
const full = import_path22.default.join(process.cwd(), SMS_SERVICE);
|
|
4519
|
+
if (!(0, import_fs3.existsSync)(full)) {
|
|
4520
|
+
return false;
|
|
4521
|
+
}
|
|
4522
|
+
const project = new import_ts_morph20.Project(TS_MORPH_PROJECT_OPTIONS);
|
|
4523
|
+
const sourceFile = project.addSourceFileAtPath(full);
|
|
4524
|
+
let changed = false;
|
|
4525
|
+
const otherTemplatesObject = getObjectLiteralFromConst(
|
|
4526
|
+
sourceFile.getVariableDeclaration("otherTemplates")
|
|
4527
|
+
);
|
|
4528
|
+
if (otherTemplatesObject) {
|
|
4529
|
+
const hasResendTemplate = otherTemplatesObject.getProperties().some((prop) => prop.getText().includes("resendInviteNotification"));
|
|
4530
|
+
if (!hasResendTemplate) {
|
|
4531
|
+
const userCredentialsIndex = otherTemplatesObject.getProperties().findIndex((prop) => prop.getText().includes("userCredentialsNotification"));
|
|
4532
|
+
otherTemplatesObject.insertPropertyAssignment(
|
|
4533
|
+
userCredentialsIndex >= 0 ? userCredentialsIndex + 1 : otherTemplatesObject.getProperties().length,
|
|
4534
|
+
{
|
|
4535
|
+
name: "resendInviteNotification",
|
|
4536
|
+
initializer: `'resendInviteNotification'`
|
|
4537
|
+
}
|
|
4538
|
+
);
|
|
4539
|
+
changed = true;
|
|
4540
|
+
}
|
|
4541
|
+
}
|
|
4542
|
+
const triggerToSmsTemplateObject = getObjectLiteralFromConst(
|
|
4543
|
+
sourceFile.getVariableDeclaration("TriggerToSMSTemplate")
|
|
4544
|
+
);
|
|
4545
|
+
if (triggerToSmsTemplateObject) {
|
|
4546
|
+
const hasResendInviteMap = triggerToSmsTemplateObject.getProperties().some((prop) => prop.getText().includes(`['resend-invite']`));
|
|
4547
|
+
if (!hasResendInviteMap) {
|
|
4548
|
+
const userCreatedIndex = triggerToSmsTemplateObject.getProperties().findIndex((prop) => prop.getText().includes(`['user-created']`));
|
|
4549
|
+
triggerToSmsTemplateObject.insertPropertyAssignment(
|
|
4550
|
+
userCreatedIndex >= 0 ? userCreatedIndex + 1 : triggerToSmsTemplateObject.getProperties().length,
|
|
4551
|
+
{
|
|
4552
|
+
name: `['resend-invite']`,
|
|
4553
|
+
initializer: `'resendInviteNotification'`
|
|
4554
|
+
}
|
|
4555
|
+
);
|
|
4556
|
+
changed = true;
|
|
4557
|
+
}
|
|
4558
|
+
}
|
|
4559
|
+
if (changed) {
|
|
4560
|
+
sourceFile.saveSync();
|
|
4561
|
+
}
|
|
4562
|
+
return changed;
|
|
4563
|
+
}
|
|
4564
|
+
async function main23() {
|
|
4565
|
+
console.log("Adding RESEND_INVITE notification wiring\u2026");
|
|
4566
|
+
const touched = [];
|
|
4567
|
+
if (patchEmailTemplatesIndex()) touched.push(EMAIL_TEMPLATES_INDEX);
|
|
4568
|
+
if (patchNotificationHandler()) touched.push(NOTIFICATION_HANDLER);
|
|
4569
|
+
if (patchUserNotificationRoutes()) touched.push(USER_NOTIFICATION_ROUTES);
|
|
4570
|
+
if (patchSmsService()) touched.push(SMS_SERVICE);
|
|
4571
|
+
const csvPath = import_path22.default.join(process.cwd(), NOTIFICATION_CSV);
|
|
4572
|
+
if ((0, import_fs3.existsSync)(csvPath)) {
|
|
4573
|
+
let t = (0, import_fs3.readFileSync)(csvPath, "utf8");
|
|
4574
|
+
if (!/^resendInviteNotification,/m.test(t)) {
|
|
4575
|
+
if (!t.endsWith("\n")) t += "\n";
|
|
4576
|
+
(0, import_fs3.writeFileSync)(csvPath, t + CSV_ROW);
|
|
4577
|
+
touched.push(NOTIFICATION_CSV);
|
|
4578
|
+
}
|
|
4579
|
+
}
|
|
4580
|
+
const htmlPath = import_path22.default.join(process.cwd(), RESEND_INVITE_HTML);
|
|
4581
|
+
(0, import_fs3.mkdirSync)(import_path22.default.dirname(htmlPath), { recursive: true });
|
|
4582
|
+
if (!(0, import_fs3.existsSync)(htmlPath)) {
|
|
4583
|
+
(0, import_fs3.writeFileSync)(htmlPath, RESEND_INVITE_HTML_CONTENT);
|
|
4584
|
+
touched.push(RESEND_INVITE_HTML);
|
|
4585
|
+
}
|
|
4586
|
+
if (touched.length === 0) {
|
|
4587
|
+
console.log(" Nothing to update (already present or anchors not found).");
|
|
4588
|
+
return;
|
|
4589
|
+
}
|
|
4590
|
+
console.log(` Updated:
|
|
4591
|
+
${touched.map((f) => ` - ${f}`).join("\n")}`);
|
|
4592
|
+
}
|
|
4593
|
+
|
|
3455
4594
|
// src/migrations/v2.0/simplify-analytics-precalculations.ts
|
|
3456
|
-
var
|
|
3457
|
-
var
|
|
3458
|
-
var
|
|
4595
|
+
var import_ts_morph21 = require("ts-morph");
|
|
4596
|
+
var import_fs4 = __toESM(require("fs"));
|
|
4597
|
+
var import_path23 = __toESM(require("path"));
|
|
3459
4598
|
var ANALYTICS_FILE_REL = "src/analytics/analytics.ts";
|
|
3460
4599
|
var FUNCTION_NAME = "precalculateAdditionalAnalytics";
|
|
3461
4600
|
var IMPORT_NAMES_TO_REMOVE = /* @__PURE__ */ new Set(["Event", "precalculateBirthEvent"]);
|
|
@@ -3491,10 +4630,10 @@ function findPrecalculateFunction(sourceFile) {
|
|
|
3491
4630
|
return void 0;
|
|
3492
4631
|
}
|
|
3493
4632
|
function getFunctionBodyBlock(fn) {
|
|
3494
|
-
if (
|
|
4633
|
+
if (import_ts_morph21.Node.isFunctionDeclaration(fn)) return fn.getBody();
|
|
3495
4634
|
const initializer = fn.getInitializer();
|
|
3496
4635
|
if (!initializer) return void 0;
|
|
3497
|
-
if (!
|
|
4636
|
+
if (!import_ts_morph21.Node.isArrowFunction(initializer) && !import_ts_morph21.Node.isFunctionExpression(initializer)) {
|
|
3498
4637
|
return void 0;
|
|
3499
4638
|
}
|
|
3500
4639
|
return initializer.getBody();
|
|
@@ -3504,9 +4643,9 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
3504
4643
|
const fn = findPrecalculateFunction(sourceFile);
|
|
3505
4644
|
if (!fn) return log;
|
|
3506
4645
|
const body = getFunctionBodyBlock(fn);
|
|
3507
|
-
if (!body || !
|
|
4646
|
+
if (!body || !import_ts_morph21.Node.isBlock(body)) return log;
|
|
3508
4647
|
for (const statement of [...body.getStatements()]) {
|
|
3509
|
-
const references = statement.getDescendantsOfKind(
|
|
4648
|
+
const references = statement.getDescendantsOfKind(import_ts_morph21.SyntaxKind.Identifier).some((id) => IMPORT_NAMES_TO_REMOVE.has(id.getText()));
|
|
3510
4649
|
if (references) {
|
|
3511
4650
|
statement.remove();
|
|
3512
4651
|
log.push(`removed statement in ${FUNCTION_NAME} referencing removed imports`);
|
|
@@ -3514,7 +4653,7 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
3514
4653
|
}
|
|
3515
4654
|
const remaining = body.getStatements();
|
|
3516
4655
|
const last = remaining[remaining.length - 1];
|
|
3517
|
-
const alreadyCorrect = last &&
|
|
4656
|
+
const alreadyCorrect = last && import_ts_morph21.Node.isReturnStatement(last) && last.getExpression()?.getText() === RETURN_EXPRESSION_TEXT;
|
|
3518
4657
|
if (!alreadyCorrect) {
|
|
3519
4658
|
body.addStatements(`return ${RETURN_EXPRESSION_TEXT}`);
|
|
3520
4659
|
log.push(
|
|
@@ -3523,17 +4662,17 @@ function simplifyPrecalculateFunction(sourceFile) {
|
|
|
3523
4662
|
}
|
|
3524
4663
|
return log;
|
|
3525
4664
|
}
|
|
3526
|
-
async function
|
|
3527
|
-
const
|
|
3528
|
-
const absPath =
|
|
3529
|
-
if (!
|
|
4665
|
+
async function main24() {
|
|
4666
|
+
const cwd = process.cwd();
|
|
4667
|
+
const absPath = import_path23.default.join(cwd, ANALYTICS_FILE_REL);
|
|
4668
|
+
if (!import_fs4.default.existsSync(absPath)) {
|
|
3530
4669
|
console.log(
|
|
3531
4670
|
`[${ANALYTICS_FILE_REL}] does not exist \u2014 nothing to clean up.`
|
|
3532
4671
|
);
|
|
3533
4672
|
return;
|
|
3534
4673
|
}
|
|
3535
|
-
const project = new
|
|
3536
|
-
tsConfigFilePath:
|
|
4674
|
+
const project = new import_ts_morph21.Project({
|
|
4675
|
+
tsConfigFilePath: import_path23.default.resolve(cwd, "tsconfig.json"),
|
|
3537
4676
|
skipAddingFilesFromTsConfig: false
|
|
3538
4677
|
});
|
|
3539
4678
|
const sourceFile = project.getSourceFile(absPath);
|
|
@@ -3560,26 +4699,158 @@ async function main18() {
|
|
|
3560
4699
|
Saved ${ANALYTICS_FILE_REL}.`);
|
|
3561
4700
|
}
|
|
3562
4701
|
|
|
3563
|
-
// src/migrations/v2.0/
|
|
3564
|
-
var
|
|
3565
|
-
|
|
3566
|
-
|
|
3567
|
-
|
|
4702
|
+
// src/migrations/v2.0/merge-infrastructure-directory.ts
|
|
4703
|
+
var import_child_process2 = require("child_process");
|
|
4704
|
+
var import_fs5 = require("fs");
|
|
4705
|
+
var import_os = require("os");
|
|
4706
|
+
var import_path24 = require("path");
|
|
4707
|
+
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4708
|
+
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4709
|
+
var BASE_BRANCH = "release-v1.9";
|
|
4710
|
+
function gitShowBytes(ref, path23) {
|
|
4711
|
+
try {
|
|
4712
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
|
|
4713
|
+
cwd: process.cwd(),
|
|
4714
|
+
stdio: ["ignore", "pipe", "pipe"]
|
|
4715
|
+
});
|
|
4716
|
+
return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
|
|
4717
|
+
} catch {
|
|
4718
|
+
return null;
|
|
3568
4719
|
}
|
|
3569
|
-
return cwd;
|
|
3570
4720
|
}
|
|
3571
|
-
async function
|
|
3572
|
-
|
|
3573
|
-
|
|
3574
|
-
|
|
4721
|
+
async function main25() {
|
|
4722
|
+
console.log(
|
|
4723
|
+
`Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4724
|
+
`
|
|
4725
|
+
);
|
|
4726
|
+
assertIsGitRepo();
|
|
4727
|
+
tryGit(["remote", "remove", TEMP_REMOTE2]);
|
|
4728
|
+
try {
|
|
4729
|
+
console.log(` Adding temporary remote '${TEMP_REMOTE2}' \u2192 ${UPSTREAM_URL}`);
|
|
4730
|
+
runGit(["remote", "add", TEMP_REMOTE2, UPSTREAM_URL], { silent: true });
|
|
4731
|
+
console.log(
|
|
4732
|
+
` Fetching ${TEMP_REMOTE2}/{${UPSTREAM_BRANCH},${BASE_BRANCH}} (depth 1)...`
|
|
4733
|
+
);
|
|
4734
|
+
runGit(["fetch", "--depth=1", TEMP_REMOTE2, UPSTREAM_BRANCH, BASE_BRANCH]);
|
|
4735
|
+
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4736
|
+
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4737
|
+
const upstreamFiles = runGit(
|
|
4738
|
+
[
|
|
4739
|
+
"ls-tree",
|
|
4740
|
+
"-r",
|
|
4741
|
+
"--name-only",
|
|
4742
|
+
"-z",
|
|
4743
|
+
ref,
|
|
4744
|
+
"--",
|
|
4745
|
+
`${INFRASTRUCTURE_DIR}/`
|
|
4746
|
+
],
|
|
4747
|
+
{ silent: true }
|
|
4748
|
+
).split("\0").filter(Boolean);
|
|
4749
|
+
if (upstreamFiles.length === 0) {
|
|
4750
|
+
console.log(
|
|
4751
|
+
` No files found under '${INFRASTRUCTURE_DIR}/' on ${ref}. Nothing to merge.`
|
|
4752
|
+
);
|
|
4753
|
+
return;
|
|
4754
|
+
}
|
|
4755
|
+
const tmpDir = (0, import_fs5.mkdtempSync)((0, import_path24.join)((0, import_os.tmpdir)(), "opencrvs-merge-infra-"));
|
|
4756
|
+
const baseTmp = (0, import_path24.join)(tmpDir, "base");
|
|
4757
|
+
const theirsTmp = (0, import_path24.join)(tmpDir, "theirs");
|
|
4758
|
+
let added = 0;
|
|
4759
|
+
let merged = 0;
|
|
4760
|
+
const conflictedFiles = [];
|
|
4761
|
+
for (const file of upstreamFiles) {
|
|
4762
|
+
const fullPath = (0, import_path24.join)(process.cwd(), file);
|
|
4763
|
+
if (!(0, import_fs5.existsSync)(fullPath)) {
|
|
4764
|
+
if (tryGit(["checkout", ref, "--", file])) {
|
|
4765
|
+
console.log(` + ${file} (new from upstream)`);
|
|
4766
|
+
added++;
|
|
4767
|
+
} else {
|
|
4768
|
+
console.warn(` [warn] failed to add new file ${file}`);
|
|
4769
|
+
}
|
|
4770
|
+
continue;
|
|
4771
|
+
}
|
|
4772
|
+
const theirContents = gitShowBytes(ref, file);
|
|
4773
|
+
if (theirContents === null) {
|
|
4774
|
+
console.warn(` [warn] could not read ${file} from ${ref} \u2014 skipping.`);
|
|
4775
|
+
continue;
|
|
4776
|
+
}
|
|
4777
|
+
(0, import_fs5.writeFileSync)(theirsTmp, theirContents);
|
|
4778
|
+
const baseContents = gitShowBytes(baseRef, file);
|
|
4779
|
+
(0, import_fs5.writeFileSync)(baseTmp, baseContents ?? new Uint8Array(0));
|
|
4780
|
+
try {
|
|
4781
|
+
(0, import_child_process2.execFileSync)("git", ["merge-file", fullPath, baseTmp, theirsTmp], {
|
|
4782
|
+
cwd: process.cwd(),
|
|
4783
|
+
stdio: ["ignore", "pipe", "pipe"]
|
|
4784
|
+
});
|
|
4785
|
+
runGit(["add", "--", file], { silent: true });
|
|
4786
|
+
merged++;
|
|
4787
|
+
} catch (err) {
|
|
4788
|
+
const status = err.status;
|
|
4789
|
+
if (typeof status === "number" && status > 0) {
|
|
4790
|
+
conflictedFiles.push(file);
|
|
4791
|
+
console.warn(
|
|
4792
|
+
` ! ${file} (${status} conflict${status > 1 ? "s" : ""})`
|
|
4793
|
+
);
|
|
4794
|
+
} else {
|
|
4795
|
+
conflictedFiles.push(file);
|
|
4796
|
+
console.warn(
|
|
4797
|
+
` [warn] merge failed for ${file} (likely binary or unreadable) \u2014 left untouched.`
|
|
4798
|
+
);
|
|
4799
|
+
}
|
|
4800
|
+
}
|
|
4801
|
+
}
|
|
4802
|
+
console.log(
|
|
4803
|
+
`
|
|
4804
|
+
Done. ${added} added, ${merged} merged cleanly, ${conflictedFiles.length} with conflicts.`
|
|
4805
|
+
);
|
|
4806
|
+
if (conflictedFiles.length > 0) {
|
|
4807
|
+
console.warn(
|
|
4808
|
+
`
|
|
4809
|
+
NOTE: ${conflictedFiles.length} file(s) under '${INFRASTRUCTURE_DIR}/' have merge conflicts that you must resolve manually.
|
|
4810
|
+
Look for the standard conflict markers (<<<<<<<, =======, >>>>>>>) in:
|
|
4811
|
+
` + conflictedFiles.map((f) => ` - ${f}`).join("\n") + `
|
|
4812
|
+
After resolving, stage the fixes with: git add ${INFRASTRUCTURE_DIR}/`
|
|
4813
|
+
);
|
|
4814
|
+
}
|
|
4815
|
+
} finally {
|
|
4816
|
+
if (tryGit(["remote", "remove", TEMP_REMOTE2])) {
|
|
4817
|
+
console.log(` Removed temporary remote '${TEMP_REMOTE2}'.`);
|
|
4818
|
+
}
|
|
3575
4819
|
}
|
|
3576
|
-
|
|
4820
|
+
}
|
|
4821
|
+
|
|
4822
|
+
// src/migrations/v2.0/delete-infrastructure-directory.ts
|
|
4823
|
+
var import_fs6 = require("fs");
|
|
4824
|
+
var import_path25 = require("path");
|
|
4825
|
+
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4826
|
+
async function main26() {
|
|
4827
|
+
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4828
|
+
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
3577
4829
|
console.log(
|
|
3578
|
-
|
|
4830
|
+
`'${INFRASTRUCTURE_DIR2}/' not found in ${process.cwd()} \u2014 nothing to delete.`
|
|
3579
4831
|
);
|
|
3580
|
-
|
|
4832
|
+
return;
|
|
3581
4833
|
}
|
|
3582
|
-
|
|
4834
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4835
|
+
`);
|
|
4836
|
+
assertIsGitRepo();
|
|
4837
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4838
|
+
silent: true
|
|
4839
|
+
});
|
|
4840
|
+
console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`);
|
|
4841
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4842
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4843
|
+
console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`);
|
|
4844
|
+
}
|
|
4845
|
+
console.log(
|
|
4846
|
+
`
|
|
4847
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4848
|
+
);
|
|
4849
|
+
}
|
|
4850
|
+
|
|
4851
|
+
// src/migrations/v2.0/index.ts
|
|
4852
|
+
async function runUpgrade(dockerSwarm) {
|
|
4853
|
+
await main18();
|
|
3583
4854
|
await main();
|
|
3584
4855
|
await main2();
|
|
3585
4856
|
await main3();
|
|
@@ -3592,9 +4863,20 @@ async function runUpgrade(ccwd) {
|
|
|
3592
4863
|
await main10();
|
|
3593
4864
|
await main11();
|
|
3594
4865
|
await main12();
|
|
4866
|
+
await main13();
|
|
3595
4867
|
await main14();
|
|
3596
4868
|
await main15();
|
|
3597
4869
|
await main16();
|
|
4870
|
+
await main19();
|
|
4871
|
+
await main20();
|
|
4872
|
+
await main21();
|
|
4873
|
+
await main22();
|
|
4874
|
+
await main23();
|
|
4875
|
+
await main24();
|
|
3598
4876
|
await main17();
|
|
3599
|
-
|
|
4877
|
+
if (dockerSwarm) {
|
|
4878
|
+
await main25();
|
|
4879
|
+
} else {
|
|
4880
|
+
await main26();
|
|
4881
|
+
}
|
|
3600
4882
|
}
|