@opencrvs/toolkit 2.0.0-rc.086745c → 2.0.0-rc.0896b42
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/create-countryconfig/index.js +103 -0
- package/create-countryconfig/package.json +21 -0
- package/dist/application-config/index.js +288 -123
- package/dist/cli.js +521 -174
- package/dist/commons/api/router.d.ts +3387 -237
- package/dist/commons/application-config/index.d.ts +1 -0
- package/dist/commons/conditionals/conditionals.d.ts +360 -10
- package/dist/commons/conditionals/validate.d.ts +52 -2
- package/dist/commons/events/ActionConfig.d.ts +28 -2
- package/dist/commons/events/ActionDocument.d.ts +6 -0
- package/dist/commons/events/ActionInput.d.ts +114 -0
- package/dist/commons/events/AdvancedSearchConfig.d.ts +354 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +42 -0
- package/dist/commons/events/Draft.d.ts +4 -2
- package/dist/commons/events/EventConfig.d.ts +2 -0
- package/dist/commons/events/EventDocument.d.ts +3 -0
- package/dist/commons/events/EventIndex.d.ts +25 -3
- package/dist/commons/events/EventMetadata.d.ts +26 -7
- package/dist/commons/events/FieldConfig.d.ts +393 -50
- package/dist/commons/events/FieldType.d.ts +1 -0
- package/dist/commons/events/FieldTypeMapping.d.ts +1 -1
- package/dist/commons/events/FieldValue.d.ts +6 -0
- package/dist/commons/events/WorkqueueConfig.d.ts +189 -150
- package/dist/commons/events/field.d.ts +53 -1
- package/dist/commons/events/index.d.ts +2 -0
- package/dist/commons/events/locations.d.ts +22 -0
- package/dist/commons/events/mocks.test.utils.d.ts +19 -0
- package/dist/commons/events/scopes.d.ts +24 -1
- package/dist/commons/events/state/flags.d.ts +16 -0
- package/dist/commons/events/state/index.d.ts +8 -4
- package/dist/commons/events/state/utils.d.ts +21 -289
- package/dist/commons/events/utils.d.ts +13 -2
- package/dist/conditionals/index.js +65 -5
- package/dist/events/index.js +1170 -288
- 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 +60 -35
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
- package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
- package/dist/migrations/v2.0/index.d.ts +5 -3
- package/dist/migrations/v2.0/index.d.ts.map +1 -1
- package/dist/migrations/v2.0/index.js +519 -172
- 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 +90 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
- package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-scopes.js +54 -30
- package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
- package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
- package/dist/notification/index.js +916 -159
- package/dist/scopes/index.d.ts +98 -7
- package/dist/scopes/index.js +22 -7
- package/opencrvs-toolkit-2.0.0-rc.0896b42.tgz +0 -0
- package/package.json +6 -2
- package/tsconfig.tsbuildinfo +1 -1
- package/opencrvs-toolkit-2.0.0-rc.086745c.tgz +0 -0
package/dist/cli.js
CHANGED
|
@@ -178,6 +178,8 @@ function ensureImports(sourceFile) {
|
|
|
178
178
|
var DEFINE_CONFIG_NAME2 = "defineConfig";
|
|
179
179
|
var ACTIONS_PROPERTY_NAME2 = "actions";
|
|
180
180
|
var TYPE_PROPERTY_NAME2 = "type";
|
|
181
|
+
var ID_PROPERTY_NAME = "id";
|
|
182
|
+
var FLAGS_PROPERTY_NAME = "flags";
|
|
181
183
|
var CUSTOM_ACTION_TYPE_PROPERTY_NAME = "customActionType";
|
|
182
184
|
var AUDIT_HISTORY_LABEL_PROPERTY_NAME = "auditHistoryLabel";
|
|
183
185
|
var DEDUPLICATION_PROPERTY_NAME = "deduplication";
|
|
@@ -187,9 +189,12 @@ var FORM_PROPERTY_NAME = "form";
|
|
|
187
189
|
var ACTION_TYPE_ENUM_NAME = "ActionType";
|
|
188
190
|
var VALIDATE_MEMBER_NAME = "VALIDATE";
|
|
189
191
|
var CUSTOM_MEMBER_NAME = "CUSTOM";
|
|
192
|
+
var REGISTER_MEMBER_NAME2 = "REGISTER";
|
|
190
193
|
var VALIDATE_STRING_LITERAL = "VALIDATE";
|
|
191
194
|
var CUSTOM_STRING_LITERAL = "CUSTOM";
|
|
195
|
+
var REGISTER_STRING_LITERAL2 = "REGISTER";
|
|
192
196
|
var VALIDATE_DECLARATION_VALUE = "VALIDATE_DECLARATION";
|
|
197
|
+
var VALIDATED_FLAG_VALUE = "validated";
|
|
193
198
|
function isValidateType(typeInitializer) {
|
|
194
199
|
if (typeInitializer.getKind() === import_ts_morph2.SyntaxKind.PropertyAccessExpression) {
|
|
195
200
|
const propAccess = typeInitializer.asKindOrThrow(
|
|
@@ -313,6 +318,50 @@ function transformValidateActionToCustom(obj, eventType) {
|
|
|
313
318
|
}
|
|
314
319
|
return true;
|
|
315
320
|
}
|
|
321
|
+
function isRegisterAction(action) {
|
|
322
|
+
const typeProperty = action.getProperty(TYPE_PROPERTY_NAME2);
|
|
323
|
+
if (!typeProperty || !import_ts_morph2.Node.isPropertyAssignment(typeProperty)) return false;
|
|
324
|
+
const typeInit = typeProperty.getInitializer();
|
|
325
|
+
if (!typeInit) return false;
|
|
326
|
+
if (import_ts_morph2.Node.isPropertyAccessExpression(typeInit)) {
|
|
327
|
+
const enumExpr = typeInit.getExpression();
|
|
328
|
+
return import_ts_morph2.Node.isIdentifier(enumExpr) && enumExpr.getText() === ACTION_TYPE_ENUM_NAME && typeInit.getName() === REGISTER_MEMBER_NAME2;
|
|
329
|
+
}
|
|
330
|
+
if (import_ts_morph2.Node.isStringLiteral(typeInit)) {
|
|
331
|
+
return typeInit.getLiteralValue() === REGISTER_STRING_LITERAL2;
|
|
332
|
+
}
|
|
333
|
+
return false;
|
|
334
|
+
}
|
|
335
|
+
function arrayHasElementWithId(array3, id) {
|
|
336
|
+
for (const el of array3.getElements()) {
|
|
337
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(el)) continue;
|
|
338
|
+
const idProp = el.getProperty(ID_PROPERTY_NAME);
|
|
339
|
+
if (!idProp || !import_ts_morph2.Node.isPropertyAssignment(idProp)) continue;
|
|
340
|
+
const idInit = idProp.getInitializer();
|
|
341
|
+
if (idInit && import_ts_morph2.Node.isStringLiteral(idInit) && idInit.getLiteralValue() === id) {
|
|
342
|
+
return true;
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
return false;
|
|
346
|
+
}
|
|
347
|
+
function ensureRegisterRemovesValidatedFlag(action) {
|
|
348
|
+
const entry = `{ id: '${VALIDATED_FLAG_VALUE}', operation: 'remove' }`;
|
|
349
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME);
|
|
350
|
+
if (flagsProp && import_ts_morph2.Node.isPropertyAssignment(flagsProp)) {
|
|
351
|
+
const flagsInit = flagsProp.getInitializer();
|
|
352
|
+
if (flagsInit && import_ts_morph2.Node.isArrayLiteralExpression(flagsInit)) {
|
|
353
|
+
if (arrayHasElementWithId(flagsInit, VALIDATED_FLAG_VALUE)) return false;
|
|
354
|
+
flagsInit.addElement(entry);
|
|
355
|
+
return true;
|
|
356
|
+
}
|
|
357
|
+
return false;
|
|
358
|
+
}
|
|
359
|
+
action.addPropertyAssignment({
|
|
360
|
+
name: FLAGS_PROPERTY_NAME,
|
|
361
|
+
initializer: `[${entry}]`
|
|
362
|
+
});
|
|
363
|
+
return true;
|
|
364
|
+
}
|
|
316
365
|
function processFile2(filePath, project) {
|
|
317
366
|
const sourceFile = project.getSourceFile(filePath);
|
|
318
367
|
if (!sourceFile) return 0;
|
|
@@ -378,6 +427,18 @@ function processFile2(filePath, project) {
|
|
|
378
427
|
` [${import_path2.default.relative(process.cwd(), filePath)}] Added top-level 'flags' array to defineConfig`
|
|
379
428
|
);
|
|
380
429
|
}
|
|
430
|
+
if (configHadValidateAction) {
|
|
431
|
+
for (const element of actionsInitializer.getElements()) {
|
|
432
|
+
if (!import_ts_morph2.Node.isObjectLiteralExpression(element)) continue;
|
|
433
|
+
if (!isRegisterAction(element)) continue;
|
|
434
|
+
if (ensureRegisterRemovesValidatedFlag(element)) {
|
|
435
|
+
transformedCount++;
|
|
436
|
+
console.log(
|
|
437
|
+
` [${import_path2.default.relative(process.cwd(), filePath)}] Added '${VALIDATED_FLAG_VALUE}' remove-flag to REGISTER action`
|
|
438
|
+
);
|
|
439
|
+
}
|
|
440
|
+
}
|
|
441
|
+
}
|
|
381
442
|
if (fileNeedsImports) {
|
|
382
443
|
ensureImports(sourceFile);
|
|
383
444
|
}
|
|
@@ -424,7 +485,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
|
|
|
424
485
|
}
|
|
425
486
|
console.log(
|
|
426
487
|
`
|
|
427
|
-
Done.
|
|
488
|
+
Done. Applied ${totalTransformed} change(s): VALIDATE \u2192 CUSTOM (${VALIDATE_DECLARATION_VALUE}) and '${VALIDATED_FLAG_VALUE}' remove-flag on matching REGISTER actions.`
|
|
428
489
|
);
|
|
429
490
|
}
|
|
430
491
|
|
|
@@ -667,14 +728,14 @@ var QUERY_PROPERTY_NAME = "query";
|
|
|
667
728
|
var TYPE_PROPERTY_NAME5 = "type";
|
|
668
729
|
var CLAUSES_PROPERTY_NAME = "clauses";
|
|
669
730
|
var STATUS_PROPERTY_NAME = "status";
|
|
670
|
-
var
|
|
731
|
+
var FLAGS_PROPERTY_NAME2 = "flags";
|
|
671
732
|
var TERMS_PROPERTY_NAME = "terms";
|
|
672
733
|
var TERM_PROPERTY_NAME = "term";
|
|
673
734
|
var ANY_OF_PROPERTY_NAME = "anyOf";
|
|
674
735
|
var VALIDATED_STATUS_VALUE = "VALIDATED";
|
|
675
|
-
var
|
|
736
|
+
var VALIDATED_FLAG_VALUE2 = "validated";
|
|
676
737
|
function addValidatedFlag(clause) {
|
|
677
|
-
const flagsProperty = clause.getProperty(
|
|
738
|
+
const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME2);
|
|
678
739
|
if (flagsProperty && import_ts_morph5.Node.isPropertyAssignment(flagsProperty)) {
|
|
679
740
|
const flagsInit = flagsProperty.getInitializer();
|
|
680
741
|
if (flagsInit && import_ts_morph5.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -682,19 +743,19 @@ function addValidatedFlag(clause) {
|
|
|
682
743
|
if (anyOfProperty && import_ts_morph5.Node.isPropertyAssignment(anyOfProperty)) {
|
|
683
744
|
const anyOfInit = anyOfProperty.getInitializer();
|
|
684
745
|
if (anyOfInit && import_ts_morph5.Node.isArrayLiteralExpression(anyOfInit)) {
|
|
685
|
-
anyOfInit.addElement(`'${
|
|
746
|
+
anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE2}'`);
|
|
686
747
|
}
|
|
687
748
|
} else {
|
|
688
749
|
flagsInit.addPropertyAssignment({
|
|
689
750
|
name: ANY_OF_PROPERTY_NAME,
|
|
690
|
-
initializer: `['${
|
|
751
|
+
initializer: `['${VALIDATED_FLAG_VALUE2}']`
|
|
691
752
|
});
|
|
692
753
|
}
|
|
693
754
|
}
|
|
694
755
|
} else {
|
|
695
756
|
clause.addPropertyAssignment({
|
|
696
|
-
name:
|
|
697
|
-
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${
|
|
757
|
+
name: FLAGS_PROPERTY_NAME2,
|
|
758
|
+
initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE2}'] }`
|
|
698
759
|
});
|
|
699
760
|
}
|
|
700
761
|
}
|
|
@@ -860,23 +921,26 @@ var DEFINE_CONFIG_NAME4 = "defineConfig";
|
|
|
860
921
|
var DEFINE_WORKQUEUES_NAME2 = "defineWorkqueues";
|
|
861
922
|
var ACTIONS_PROPERTY_NAME4 = "actions";
|
|
862
923
|
var ACTION_PROPERTY_NAME = "action";
|
|
863
|
-
var
|
|
924
|
+
var FLAGS_PROPERTY_NAME3 = "flags";
|
|
864
925
|
var QUERY_PROPERTY_NAME2 = "query";
|
|
865
926
|
var TYPE_PROPERTY_NAME6 = "type";
|
|
927
|
+
var ID_PROPERTY_NAME2 = "id";
|
|
866
928
|
var CLAUSES_PROPERTY_NAME2 = "clauses";
|
|
867
929
|
var ANY_OF_PROPERTY_NAME2 = "anyOf";
|
|
868
930
|
var FLAG_ID = "pending-first-certificate-issuance";
|
|
869
931
|
var REGISTER_TYPE = "REGISTER";
|
|
870
932
|
var PRINT_CERTIFICATE_TYPE = "PRINT_CERTIFICATE";
|
|
871
|
-
|
|
933
|
+
function flagDefinitionInitializer(eventType) {
|
|
934
|
+
return `{
|
|
872
935
|
id: '${FLAG_ID}',
|
|
873
936
|
label: {
|
|
874
|
-
id: 'event.
|
|
937
|
+
id: 'event.${eventType}.flag.${FLAG_ID}',
|
|
875
938
|
defaultMessage: 'Pending first certificate issuance',
|
|
876
939
|
description: 'Flag label for first certificate issuance'
|
|
877
940
|
},
|
|
878
941
|
requiresAction: true
|
|
879
942
|
}`;
|
|
943
|
+
}
|
|
880
944
|
function isActionOfType(obj, typeName) {
|
|
881
945
|
const typeProperty = obj.getProperty(TYPE_PROPERTY_NAME6);
|
|
882
946
|
if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
|
|
@@ -890,18 +954,20 @@ function isActionOfType(obj, typeName) {
|
|
|
890
954
|
}
|
|
891
955
|
return false;
|
|
892
956
|
}
|
|
893
|
-
function
|
|
894
|
-
const
|
|
895
|
-
|
|
896
|
-
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
|
|
957
|
+
function getEventType(configArg) {
|
|
958
|
+
for (const propName of [TYPE_PROPERTY_NAME6, ID_PROPERTY_NAME2]) {
|
|
959
|
+
const prop = configArg.getProperty(propName);
|
|
960
|
+
if (!prop || !import_ts_morph6.Node.isPropertyAssignment(prop)) continue;
|
|
961
|
+
const initializer = prop.getInitializer();
|
|
962
|
+
if (!initializer) continue;
|
|
963
|
+
if (import_ts_morph6.Node.isStringLiteral(initializer)) {
|
|
964
|
+
return initializer.getLiteralValue().toLowerCase();
|
|
965
|
+
}
|
|
966
|
+
if (import_ts_morph6.Node.isPropertyAccessExpression(initializer)) {
|
|
967
|
+
return initializer.getName().toLowerCase();
|
|
968
|
+
}
|
|
903
969
|
}
|
|
904
|
-
return
|
|
970
|
+
return null;
|
|
905
971
|
}
|
|
906
972
|
function hasElementWithId(array3, id) {
|
|
907
973
|
for (const el of array3.getElements()) {
|
|
@@ -915,27 +981,28 @@ function hasElementWithId(array3, id) {
|
|
|
915
981
|
}
|
|
916
982
|
return false;
|
|
917
983
|
}
|
|
918
|
-
function ensureTopLevelFlagDefinition(configArg) {
|
|
919
|
-
const
|
|
984
|
+
function ensureTopLevelFlagDefinition(configArg, eventType) {
|
|
985
|
+
const initializer = flagDefinitionInitializer(eventType);
|
|
986
|
+
const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME3);
|
|
920
987
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
921
988
|
const flagsInit = flagsProp.getInitializer();
|
|
922
989
|
if (flagsInit && import_ts_morph6.Node.isArrayLiteralExpression(flagsInit)) {
|
|
923
990
|
if (hasElementWithId(flagsInit, FLAG_ID)) return false;
|
|
924
|
-
flagsInit.addElement(
|
|
991
|
+
flagsInit.addElement(initializer);
|
|
925
992
|
return true;
|
|
926
993
|
}
|
|
927
994
|
return false;
|
|
928
995
|
}
|
|
929
996
|
configArg.addPropertyAssignment({
|
|
930
|
-
name:
|
|
997
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
931
998
|
initializer: `[
|
|
932
|
-
${
|
|
999
|
+
${initializer}
|
|
933
1000
|
]`
|
|
934
1001
|
});
|
|
935
1002
|
return true;
|
|
936
1003
|
}
|
|
937
1004
|
function ensureActionOperationFlag(action, operation) {
|
|
938
|
-
const flagsProp = action.getProperty(
|
|
1005
|
+
const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME3);
|
|
939
1006
|
const entry = `{ id: '${FLAG_ID}', operation: '${operation}' }`;
|
|
940
1007
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
941
1008
|
const flagsInit = flagsProp.getInitializer();
|
|
@@ -947,16 +1014,18 @@ function ensureActionOperationFlag(action, operation) {
|
|
|
947
1014
|
return false;
|
|
948
1015
|
}
|
|
949
1016
|
action.addPropertyAssignment({
|
|
950
|
-
name:
|
|
1017
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
951
1018
|
initializer: `[${entry}]`
|
|
952
1019
|
});
|
|
953
1020
|
return true;
|
|
954
1021
|
}
|
|
955
|
-
function
|
|
1022
|
+
function processConfig(configArg, eventType, relPath) {
|
|
956
1023
|
let changes = 0;
|
|
957
|
-
if (ensureTopLevelFlagDefinition(configArg)) {
|
|
1024
|
+
if (ensureTopLevelFlagDefinition(configArg, eventType)) {
|
|
958
1025
|
changes++;
|
|
959
|
-
console.log(
|
|
1026
|
+
console.log(
|
|
1027
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`
|
|
1028
|
+
);
|
|
960
1029
|
}
|
|
961
1030
|
const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME4);
|
|
962
1031
|
if (!actionsProp || !import_ts_morph6.Node.isPropertyAssignment(actionsProp)) return changes;
|
|
@@ -970,7 +1039,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
970
1039
|
if (ensureActionOperationFlag(element, "add")) {
|
|
971
1040
|
changes++;
|
|
972
1041
|
console.log(
|
|
973
|
-
` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
1042
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`
|
|
974
1043
|
);
|
|
975
1044
|
}
|
|
976
1045
|
}
|
|
@@ -978,7 +1047,7 @@ function processBirthConfig(configArg, relPath) {
|
|
|
978
1047
|
if (ensureActionOperationFlag(element, "remove")) {
|
|
979
1048
|
changes++;
|
|
980
1049
|
console.log(
|
|
981
|
-
` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
1050
|
+
` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
|
|
982
1051
|
);
|
|
983
1052
|
}
|
|
984
1053
|
}
|
|
@@ -1007,7 +1076,7 @@ function hasPrintCertificateAction(workqueue) {
|
|
|
1007
1076
|
return false;
|
|
1008
1077
|
}
|
|
1009
1078
|
function addFlagToQueryClause(clause) {
|
|
1010
|
-
const flagsProp = clause.getProperty(
|
|
1079
|
+
const flagsProp = clause.getProperty(FLAGS_PROPERTY_NAME3);
|
|
1011
1080
|
if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
|
|
1012
1081
|
const flagsInit = flagsProp.getInitializer();
|
|
1013
1082
|
if (flagsInit && import_ts_morph6.Node.isObjectLiteralExpression(flagsInit)) {
|
|
@@ -1032,7 +1101,7 @@ function addFlagToQueryClause(clause) {
|
|
|
1032
1101
|
}
|
|
1033
1102
|
} else {
|
|
1034
1103
|
clause.addPropertyAssignment({
|
|
1035
|
-
name:
|
|
1104
|
+
name: FLAGS_PROPERTY_NAME3,
|
|
1036
1105
|
initializer: `{ ${ANY_OF_PROPERTY_NAME2}: ['${FLAG_ID}'] }`
|
|
1037
1106
|
});
|
|
1038
1107
|
return true;
|
|
@@ -1076,8 +1145,9 @@ function processFile6(filePath, project) {
|
|
|
1076
1145
|
if (args2.length === 0) continue;
|
|
1077
1146
|
const configArg = args2[0];
|
|
1078
1147
|
if (!import_ts_morph6.Node.isObjectLiteralExpression(configArg)) continue;
|
|
1079
|
-
|
|
1080
|
-
|
|
1148
|
+
const eventType = getEventType(configArg);
|
|
1149
|
+
if (!eventType) continue;
|
|
1150
|
+
totalChanges += processConfig(configArg, eventType, relPath);
|
|
1081
1151
|
}
|
|
1082
1152
|
if (calleeName === DEFINE_WORKQUEUES_NAME2) {
|
|
1083
1153
|
const args2 = call.getArguments();
|
|
@@ -1106,7 +1176,7 @@ function processFile6(filePath, project) {
|
|
|
1106
1176
|
async function main6() {
|
|
1107
1177
|
const srcDir = import_path6.default.join(process.cwd(), "src");
|
|
1108
1178
|
console.log(
|
|
1109
|
-
`Scanning for
|
|
1179
|
+
`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
|
|
1110
1180
|
`
|
|
1111
1181
|
);
|
|
1112
1182
|
const project = new import_ts_morph6.Project({
|
|
@@ -1131,7 +1201,7 @@ async function main6() {
|
|
|
1131
1201
|
}
|
|
1132
1202
|
if (modifiedFiles.length === 0) {
|
|
1133
1203
|
console.log(
|
|
1134
|
-
"No
|
|
1204
|
+
"No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
|
|
1135
1205
|
);
|
|
1136
1206
|
return;
|
|
1137
1207
|
}
|
|
@@ -1813,9 +1883,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
|
|
|
1813
1883
|
}
|
|
1814
1884
|
return replacedCount;
|
|
1815
1885
|
}
|
|
1816
|
-
function resolveConfigChain(configObj,
|
|
1886
|
+
function resolveConfigChain(configObj, path24) {
|
|
1817
1887
|
let current = configObj;
|
|
1818
|
-
for (const key of
|
|
1888
|
+
for (const key of path24) {
|
|
1819
1889
|
if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
|
|
1820
1890
|
const prop = current.getProperty(key);
|
|
1821
1891
|
if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
|
|
@@ -2050,6 +2120,10 @@ Done. Converted ${convertedCount} config file(s), replaced ${totalReplaced} rout
|
|
|
2050
2120
|
var import_ts_morph11 = require("ts-morph");
|
|
2051
2121
|
var import_path11 = __toESM(require("path"));
|
|
2052
2122
|
|
|
2123
|
+
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2124
|
+
var z4 = __toESM(require("zod/v4"));
|
|
2125
|
+
var import_lodash = require("lodash");
|
|
2126
|
+
|
|
2053
2127
|
// ../commons/src/scopes.ts
|
|
2054
2128
|
var z3 = __toESM(require("zod/v4"));
|
|
2055
2129
|
var qs = __toESM(require("qs"));
|
|
@@ -2119,6 +2193,8 @@ var scopeOptionsPlaceEvent = z3.object({
|
|
|
2119
2193
|
placeOfEvent: JurisdictionFilter.optional()
|
|
2120
2194
|
}).describe("Options applicable to all record scopes.");
|
|
2121
2195
|
var scopeOptionsDeclared = scopeOptionsPlaceEvent.extend({
|
|
2196
|
+
notifiedIn: JurisdictionFilter.optional(),
|
|
2197
|
+
notifiedBy: UserFilter.optional(),
|
|
2122
2198
|
declaredIn: JurisdictionFilter.optional(),
|
|
2123
2199
|
declaredBy: UserFilter.optional()
|
|
2124
2200
|
}).describe("Options applicable to actions that may take place after DECLARE");
|
|
@@ -2160,6 +2236,8 @@ var ResolvedScopeOptionsPlaceEvent = z3.object({
|
|
|
2160
2236
|
"Resolved options applicable to all record scopes, with location ID instead of jurisdiction filter."
|
|
2161
2237
|
);
|
|
2162
2238
|
var ResolvedScopeOptionsDeclared = ResolvedScopeOptionsPlaceEvent.extend({
|
|
2239
|
+
notifiedIn: UUID.nullish(),
|
|
2240
|
+
notifiedBy: z3.string().optional(),
|
|
2163
2241
|
declaredIn: UUID.nullish(),
|
|
2164
2242
|
declaredBy: z3.string().optional()
|
|
2165
2243
|
}).describe(
|
|
@@ -2226,12 +2304,14 @@ var SystemScopeType = z3.enum([
|
|
|
2226
2304
|
"organisation.read-locations",
|
|
2227
2305
|
"user.read",
|
|
2228
2306
|
"user.create",
|
|
2229
|
-
"user.edit"
|
|
2307
|
+
"user.edit",
|
|
2308
|
+
"user.search"
|
|
2230
2309
|
]);
|
|
2231
2310
|
var UserScopeType = SystemScopeType.extract([
|
|
2232
2311
|
"user.read",
|
|
2233
2312
|
"user.create",
|
|
2234
|
-
"user.edit"
|
|
2313
|
+
"user.edit",
|
|
2314
|
+
"user.search"
|
|
2235
2315
|
]);
|
|
2236
2316
|
var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
|
|
2237
2317
|
var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
@@ -2240,7 +2320,7 @@ var UserScopeV2 = z3.discriminatedUnion("type", [
|
|
|
2240
2320
|
options: AllUserScopeOptions.optional()
|
|
2241
2321
|
}),
|
|
2242
2322
|
z3.object({
|
|
2243
|
-
type: UserScopeType.extract(["user.read"]),
|
|
2323
|
+
type: UserScopeType.extract(["user.read", "user.search"]),
|
|
2244
2324
|
options: AccessLevelOptions.optional()
|
|
2245
2325
|
})
|
|
2246
2326
|
]);
|
|
@@ -2306,22 +2386,30 @@ var encodeScope = (scope) => {
|
|
|
2306
2386
|
encode: false
|
|
2307
2387
|
});
|
|
2308
2388
|
};
|
|
2309
|
-
var
|
|
2310
|
-
|
|
2389
|
+
var decodedScopeCache = /* @__PURE__ */ new Map();
|
|
2390
|
+
var decodeScope = (encodedScope) => {
|
|
2391
|
+
if (decodedScopeCache.has(encodedScope)) {
|
|
2392
|
+
return decodedScopeCache.get(encodedScope);
|
|
2393
|
+
}
|
|
2394
|
+
const scope = qs.parse(encodedScope, {
|
|
2311
2395
|
ignoreQueryPrefix: true,
|
|
2312
2396
|
comma: true,
|
|
2313
2397
|
allowDots: true
|
|
2314
2398
|
});
|
|
2315
2399
|
const unflattenedScope = unflattenScope(scope);
|
|
2316
|
-
|
|
2400
|
+
const result = Scope2.safeParse(unflattenedScope)?.data;
|
|
2401
|
+
decodedScopeCache.set(encodedScope, result);
|
|
2402
|
+
return result;
|
|
2317
2403
|
};
|
|
2318
2404
|
var DEFAULT_SCOPE_OPTIONS = {
|
|
2319
2405
|
placeOfEvent: JurisdictionFilter.enum.all,
|
|
2320
|
-
accessLevel: JurisdictionFilter.enum.all
|
|
2406
|
+
accessLevel: JurisdictionFilter.enum.all,
|
|
2407
|
+
notifiedIn: JurisdictionFilter.enum.all,
|
|
2408
|
+
declaredIn: JurisdictionFilter.enum.all,
|
|
2409
|
+
registeredIn: JurisdictionFilter.enum.all
|
|
2321
2410
|
};
|
|
2322
2411
|
|
|
2323
2412
|
// ../commons/src/scopes.deprecated.do-not-use.ts
|
|
2324
|
-
var z4 = __toESM(require("zod/v4"));
|
|
2325
2413
|
var rawConfigurableScopeRegex = /^([a-zA-Z][a-zA-Z0-9.-]*(?:\.[a-zA-Z0-9.-]+)*)\[((?:\w+=[\w.-]+(?:\|[\w.-]+)*)(?:,[\w]+=[\w.-]+(?:\|[\w.-]+)*)*)\]$/;
|
|
2326
2414
|
var rawConfigurableScope = z4.string().regex(rawConfigurableScopeRegex);
|
|
2327
2415
|
var SearchScope = z4.object({
|
|
@@ -2555,6 +2643,74 @@ var legacyScopeToV2Scope = (v1Scope) => {
|
|
|
2555
2643
|
}
|
|
2556
2644
|
throw new Error(`Unsupported V1 scope type: ${v1Scope}`);
|
|
2557
2645
|
};
|
|
2646
|
+
var MERGEABLE_USER_SCOPE_TYPES = ["user.create", "user.edit"];
|
|
2647
|
+
function isMergeableUserScopeType(type) {
|
|
2648
|
+
return MERGEABLE_USER_SCOPE_TYPES.includes(type);
|
|
2649
|
+
}
|
|
2650
|
+
function decodeLegacyScope(legacy) {
|
|
2651
|
+
const encoded = legacyScopeToV2Scope(legacy);
|
|
2652
|
+
const scope = decodeScope(encoded);
|
|
2653
|
+
if (!scope) {
|
|
2654
|
+
throw new Error(
|
|
2655
|
+
`Could not decode migrated scope from legacy '${legacy}' (encoded: '${encoded}').`
|
|
2656
|
+
);
|
|
2657
|
+
}
|
|
2658
|
+
return { legacy, scope };
|
|
2659
|
+
}
|
|
2660
|
+
function groupByType(entries) {
|
|
2661
|
+
return entries.reduce(
|
|
2662
|
+
(groups, entry) => ({
|
|
2663
|
+
...groups,
|
|
2664
|
+
[entry.scope.type]: [...groups[entry.scope.type] ?? [], entry]
|
|
2665
|
+
}),
|
|
2666
|
+
{}
|
|
2667
|
+
);
|
|
2668
|
+
}
|
|
2669
|
+
function deduplicateEntries(entries) {
|
|
2670
|
+
return entries.filter(
|
|
2671
|
+
(entry, index) => entries.findIndex((e) => (0, import_lodash.isEqual)(e.scope, entry.scope)) === index
|
|
2672
|
+
);
|
|
2673
|
+
}
|
|
2674
|
+
function mergeEntries(type, entries) {
|
|
2675
|
+
const optionsList = entries.map(
|
|
2676
|
+
(e) => "options" in e.scope && e.scope.options ? e.scope.options : {}
|
|
2677
|
+
);
|
|
2678
|
+
const allKeys = optionsList.flatMap(
|
|
2679
|
+
(opts) => Object.keys(opts).filter((k) => opts[k] !== void 0)
|
|
2680
|
+
);
|
|
2681
|
+
const conflictKey = allKeys.find((key, i) => allKeys.indexOf(key) !== i);
|
|
2682
|
+
if (conflictKey) {
|
|
2683
|
+
const conflicting = entries.filter(
|
|
2684
|
+
(e) => conflictKey in ("options" in e.scope && e.scope.options || {})
|
|
2685
|
+
).map((e) => JSON.stringify(e.legacy));
|
|
2686
|
+
throw new Error(
|
|
2687
|
+
`Cannot auto-merge two '${type}' scopes that both define '${conflictKey}'. Conflicting legacy scopes: [${conflicting.join(", ")}]. Resolve manually in roles.ts and re-run.`
|
|
2688
|
+
);
|
|
2689
|
+
}
|
|
2690
|
+
const mergedOptions = Object.assign({}, ...optionsList);
|
|
2691
|
+
const merged = Object.keys(mergedOptions).length > 0 ? { type, options: mergedOptions } : { type };
|
|
2692
|
+
const parsed = Scope2.safeParse(merged);
|
|
2693
|
+
if (!parsed.success) {
|
|
2694
|
+
throw new Error(
|
|
2695
|
+
`Merged '${type}' scope failed schema validation: ${parsed.error.message}. Legacy scopes: [${entries.map((e) => JSON.stringify(e.legacy)).join(", ")}].`
|
|
2696
|
+
);
|
|
2697
|
+
}
|
|
2698
|
+
return parsed.data;
|
|
2699
|
+
}
|
|
2700
|
+
function migrateLegacyScopesArrayToV2Scopes(legacyScopes) {
|
|
2701
|
+
const groups = groupByType(legacyScopes.map(decodeLegacyScope));
|
|
2702
|
+
return Object.entries(groups).flatMap(([type, entries]) => {
|
|
2703
|
+
const deduped = deduplicateEntries(entries);
|
|
2704
|
+
if (deduped.length <= 1) return deduped.map((e) => e.scope);
|
|
2705
|
+
if (!isMergeableUserScopeType(type)) {
|
|
2706
|
+
console.warn(
|
|
2707
|
+
`Multiple non-mergeable '${type}' scopes detected after dedup \u2014 kept all as-is. Legacy scopes: [${deduped.map((e) => JSON.stringify(e.legacy)).join(", ")}]. Review whether the duplication is intentional.`
|
|
2708
|
+
);
|
|
2709
|
+
return deduped.map((e) => e.scope);
|
|
2710
|
+
}
|
|
2711
|
+
return [mergeEntries(type, deduped)];
|
|
2712
|
+
});
|
|
2713
|
+
}
|
|
2558
2714
|
|
|
2559
2715
|
// src/migrations/v2.0/migrate-scopes.ts
|
|
2560
2716
|
var ROLES_FILE_RELATIVE_PATH = "src/data-seeding/roles/roles.ts";
|
|
@@ -2592,57 +2748,65 @@ function resolveLegacyScopeFromElement(element) {
|
|
|
2592
2748
|
}
|
|
2593
2749
|
function migrateScopesArrays(rolesFilePath, project) {
|
|
2594
2750
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
2595
|
-
if (!sourceFile)
|
|
2751
|
+
if (!sourceFile) {
|
|
2752
|
+
return { migratedCount: 0, removedCount: 0, mergedCount: 0 };
|
|
2753
|
+
}
|
|
2596
2754
|
let migratedCount = 0;
|
|
2597
2755
|
let removedCount = 0;
|
|
2756
|
+
let mergedCount = 0;
|
|
2598
2757
|
const scopesProperties = sourceFile.getDescendantsOfKind(import_ts_morph11.SyntaxKind.PropertyAssignment).filter((prop) => prop.getName() === SCOPES_PROPERTY_NAME);
|
|
2758
|
+
const relPath = import_path11.default.relative(process.cwd(), rolesFilePath);
|
|
2599
2759
|
for (const scopesProp of scopesProperties) {
|
|
2600
2760
|
const initializer = scopesProp.getInitializer();
|
|
2601
2761
|
if (!initializer || !import_ts_morph11.Node.isArrayLiteralExpression(initializer)) continue;
|
|
2602
|
-
const
|
|
2603
|
-
|
|
2604
|
-
|
|
2605
|
-
|
|
2762
|
+
const rawTexts = [];
|
|
2763
|
+
const legacyStrings = [];
|
|
2764
|
+
let anyChange = false;
|
|
2765
|
+
for (const element of initializer.getElements()) {
|
|
2606
2766
|
const scopeKey = resolveScopeKeyFromElementAccess(element);
|
|
2607
2767
|
if (scopeKey && !(scopeKey in SCOPES)) {
|
|
2608
2768
|
console.warn(
|
|
2609
|
-
` [${
|
|
2769
|
+
` [${relPath}] Removing unknown scope reference: SCOPES.${scopeKey}`
|
|
2610
2770
|
);
|
|
2611
|
-
initializer.removeElement(index);
|
|
2612
2771
|
removedCount++;
|
|
2772
|
+
anyChange = true;
|
|
2613
2773
|
continue;
|
|
2614
2774
|
}
|
|
2615
2775
|
const legacyScope = resolveLegacyScopeFromElement(element);
|
|
2616
2776
|
if (!legacyScope) {
|
|
2617
2777
|
console.warn(
|
|
2618
|
-
` [${
|
|
2778
|
+
` [${relPath}] Preserving non-literal scope expression verbatim: ${element.getText()}`
|
|
2619
2779
|
);
|
|
2780
|
+
rawTexts.push(element.getText());
|
|
2620
2781
|
continue;
|
|
2621
2782
|
}
|
|
2622
|
-
|
|
2623
|
-
|
|
2624
|
-
const scope = decodeScope(migratedScope);
|
|
2625
|
-
if (!scope) {
|
|
2626
|
-
console.warn(
|
|
2627
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not decode migrated scope '${migratedScope}'.`
|
|
2628
|
-
);
|
|
2629
|
-
continue;
|
|
2630
|
-
}
|
|
2631
|
-
element.replaceWithText(JSON.stringify(scope));
|
|
2632
|
-
migratedCount++;
|
|
2633
|
-
} catch (error) {
|
|
2634
|
-
console.warn(
|
|
2635
|
-
` [${import_path11.default.relative(process.cwd(), rolesFilePath)}] Could not migrate scope '${legacyScope}': ${error}`
|
|
2636
|
-
);
|
|
2637
|
-
}
|
|
2783
|
+
legacyStrings.push(legacyScope);
|
|
2784
|
+
anyChange = true;
|
|
2638
2785
|
}
|
|
2786
|
+
if (!anyChange) continue;
|
|
2787
|
+
let mergedScopes;
|
|
2788
|
+
try {
|
|
2789
|
+
mergedScopes = migrateLegacyScopesArrayToV2Scopes(legacyStrings);
|
|
2790
|
+
} catch (error) {
|
|
2791
|
+
throw new Error(
|
|
2792
|
+
`[${relPath}] Failed to migrate scopes for role: ${error instanceof Error ? error.message : String(error)}`,
|
|
2793
|
+
{ cause: error }
|
|
2794
|
+
);
|
|
2795
|
+
}
|
|
2796
|
+
migratedCount += legacyStrings.length;
|
|
2797
|
+
mergedCount += legacyStrings.length - mergedScopes.length;
|
|
2798
|
+
const outputElements = [
|
|
2799
|
+
...rawTexts,
|
|
2800
|
+
...mergedScopes.map((s) => JSON.stringify(s))
|
|
2801
|
+
];
|
|
2802
|
+
scopesProp.setInitializer(`[${outputElements.join(", ")}]`);
|
|
2639
2803
|
}
|
|
2640
2804
|
if (removedCount > 0) {
|
|
2641
2805
|
console.log(
|
|
2642
|
-
` Removed ${removedCount} unknown SCOPES reference(s) from '${
|
|
2806
|
+
` Removed ${removedCount} unknown SCOPES reference(s) from '${relPath}'.`
|
|
2643
2807
|
);
|
|
2644
2808
|
}
|
|
2645
|
-
return { migratedCount, removedCount };
|
|
2809
|
+
return { migratedCount, removedCount, mergedCount };
|
|
2646
2810
|
}
|
|
2647
2811
|
function ensureScopesHelpersImport(rolesFilePath, project) {
|
|
2648
2812
|
const sourceFile = project.getSourceFile(rolesFilePath);
|
|
@@ -2777,7 +2941,7 @@ async function main11() {
|
|
|
2777
2941
|
return;
|
|
2778
2942
|
}
|
|
2779
2943
|
const importChanged = ensureScopesHelpersImport(rolesFilePath, project);
|
|
2780
|
-
const { migratedCount, removedCount } = migrateScopesArrays(
|
|
2944
|
+
const { migratedCount, removedCount, mergedCount } = migrateScopesArrays(
|
|
2781
2945
|
rolesFilePath,
|
|
2782
2946
|
project
|
|
2783
2947
|
);
|
|
@@ -2796,7 +2960,7 @@ async function main11() {
|
|
|
2796
2960
|
}
|
|
2797
2961
|
await sourceFile.save();
|
|
2798
2962
|
console.log(
|
|
2799
|
-
`Done. Migrated ${migratedCount} legacy scope(s), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
|
|
2963
|
+
`Done. Migrated ${migratedCount} legacy scope(s), merged ${mergedCount} AND-paired scope(s) into single v2 objects (privilege-escalation fix, see issue #12489), removed ${removedCount} unknown SCOPES reference(s), wrapped ${wrappedScopesCount} scope array(s) with defineScopes()${wrappedRoles ? ", wrapped roles with defineRoles()" : ""}${removedRoleType ? ", and removed Role type definition" : ""}${importChanged ? ". Updated toolkit/scopes imports." : "."}`
|
|
2800
2964
|
);
|
|
2801
2965
|
}
|
|
2802
2966
|
|
|
@@ -3602,6 +3766,10 @@ var ACTION_PROPERTY_NAME2 = "action";
|
|
|
3602
3766
|
var CONDITIONALS_PROPERTY_NAME = "conditionals";
|
|
3603
3767
|
var TYPE_PROPERTY_NAME7 = "type";
|
|
3604
3768
|
var SLUG_PROPERTY_NAME = "slug";
|
|
3769
|
+
var READ_ACTION_TYPE = "READ";
|
|
3770
|
+
var ACTION_TYPE_IMPORT_NAME = "ActionType";
|
|
3771
|
+
var TOOLKIT_EVENTS_MODULE2 = "@opencrvs/toolkit/events";
|
|
3772
|
+
var READ_ACTION_FALLBACK_INITIALIZER = `{ type: ${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE} }`;
|
|
3605
3773
|
var SUPPORTED_WORKQUEUE_ACTION_TYPES = /* @__PURE__ */ new Set([
|
|
3606
3774
|
"READ",
|
|
3607
3775
|
"DELETE",
|
|
@@ -3649,91 +3817,137 @@ function isUnsupportedActionType(action) {
|
|
|
3649
3817
|
}
|
|
3650
3818
|
return !SUPPORTED_WORKQUEUE_ACTION_TYPES.has(typeName);
|
|
3651
3819
|
}
|
|
3652
|
-
function
|
|
3653
|
-
const
|
|
3654
|
-
|
|
3655
|
-
|
|
3656
|
-
|
|
3657
|
-
|
|
3658
|
-
|
|
3659
|
-
|
|
3820
|
+
function ensureValidAction(workqueue, relPath) {
|
|
3821
|
+
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3822
|
+
const actionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3823
|
+
if (actionProperty && import_ts_morph17.Node.isPropertyAssignment(actionProperty)) {
|
|
3824
|
+
const initializer = actionProperty.getInitializer();
|
|
3825
|
+
if (initializer && import_ts_morph17.Node.isObjectLiteralExpression(initializer)) {
|
|
3826
|
+
if (!isUnsupportedActionType(initializer)) {
|
|
3827
|
+
return { changed: false, usedReadFallback: false };
|
|
3828
|
+
}
|
|
3829
|
+
actionProperty.set({
|
|
3830
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3831
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3832
|
+
});
|
|
3833
|
+
console.log(
|
|
3834
|
+
` [${relPath}] Replaced unsupported 'action' type with '${ACTION_TYPE_IMPORT_NAME}.${READ_ACTION_TYPE}' on workqueue '${workqueueLabel}'`
|
|
3835
|
+
);
|
|
3836
|
+
return { changed: true, usedReadFallback: true };
|
|
3837
|
+
}
|
|
3660
3838
|
}
|
|
3839
|
+
workqueue.addPropertyAssignment({
|
|
3840
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3841
|
+
initializer: READ_ACTION_FALLBACK_INITIALIZER
|
|
3842
|
+
});
|
|
3843
|
+
console.log(
|
|
3844
|
+
` [${relPath}] Added default 'action: ${READ_ACTION_FALLBACK_INITIALIZER}' to workqueue '${workqueueLabel}'`
|
|
3845
|
+
);
|
|
3846
|
+
return { changed: true, usedReadFallback: true };
|
|
3847
|
+
}
|
|
3848
|
+
function migrateWorkqueueActions(workqueue, relPath) {
|
|
3661
3849
|
const workqueueLabel = getWorkqueueLabel(workqueue);
|
|
3662
|
-
const
|
|
3663
|
-
|
|
3664
|
-
|
|
3665
|
-
|
|
3666
|
-
|
|
3667
|
-
|
|
3668
|
-
|
|
3850
|
+
const actionsProperty = workqueue.getProperty(ACTIONS_PROPERTY_NAME5);
|
|
3851
|
+
let actionsArrayMigrated = false;
|
|
3852
|
+
if (actionsProperty && import_ts_morph17.Node.isPropertyAssignment(actionsProperty)) {
|
|
3853
|
+
const actionsInitializer = actionsProperty.getInitializer();
|
|
3854
|
+
if (actionsInitializer && import_ts_morph17.Node.isArrayLiteralExpression(actionsInitializer)) {
|
|
3855
|
+
const existingActionProperty = workqueue.getProperty(ACTION_PROPERTY_NAME2);
|
|
3856
|
+
if (existingActionProperty) {
|
|
3857
|
+
if (import_ts_morph17.Node.isPropertyAssignment(existingActionProperty)) {
|
|
3858
|
+
const existingActionInitializer = existingActionProperty.getInitializer();
|
|
3859
|
+
if (existingActionInitializer && import_ts_morph17.Node.isObjectLiteralExpression(existingActionInitializer)) {
|
|
3860
|
+
const conditionalsProperty = existingActionInitializer.getProperty(
|
|
3861
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3862
|
+
);
|
|
3863
|
+
if (conditionalsProperty) {
|
|
3864
|
+
conditionalsProperty.remove();
|
|
3865
|
+
console.log(
|
|
3866
|
+
` [${relPath}] Removed deprecated 'conditionals' from 'action' on workqueue '${workqueueLabel}'`
|
|
3867
|
+
);
|
|
3868
|
+
}
|
|
3869
|
+
}
|
|
3870
|
+
}
|
|
3871
|
+
actionsProperty.remove();
|
|
3872
|
+
console.log(
|
|
3873
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3874
|
+
);
|
|
3875
|
+
actionsArrayMigrated = true;
|
|
3876
|
+
} else {
|
|
3877
|
+
const actionCandidates = actionsInitializer.getElements().filter(
|
|
3878
|
+
(element) => import_ts_morph17.Node.isObjectLiteralExpression(element)
|
|
3669
3879
|
);
|
|
3670
|
-
if (
|
|
3671
|
-
|
|
3880
|
+
if (actionCandidates.length === 0) {
|
|
3881
|
+
actionsProperty.remove();
|
|
3672
3882
|
console.log(
|
|
3673
|
-
` [${relPath}] Removed
|
|
3883
|
+
` [${relPath}] Removed empty 'actions' from workqueue '${workqueueLabel}'`
|
|
3674
3884
|
);
|
|
3675
|
-
|
|
3676
|
-
|
|
3677
|
-
|
|
3678
|
-
|
|
3679
|
-
|
|
3885
|
+
actionsArrayMigrated = true;
|
|
3886
|
+
} else {
|
|
3887
|
+
if (actionCandidates.length > 1) {
|
|
3888
|
+
const droppedCount = actionCandidates.length - 1;
|
|
3889
|
+
console.warn(
|
|
3890
|
+
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3891
|
+
);
|
|
3892
|
+
}
|
|
3893
|
+
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3894
|
+
CONDITIONALS_PROPERTY_NAME
|
|
3680
3895
|
);
|
|
3896
|
+
if (conditionalsProperty) {
|
|
3897
|
+
conditionalsProperty.remove();
|
|
3898
|
+
console.log(
|
|
3899
|
+
` [${relPath}] Removed deprecated 'conditionals' from migrated 'action' on workqueue '${workqueueLabel}'`
|
|
3900
|
+
);
|
|
3901
|
+
}
|
|
3902
|
+
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3903
|
+
actionsProperty.remove();
|
|
3904
|
+
console.log(
|
|
3905
|
+
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3906
|
+
);
|
|
3907
|
+
actionsArrayMigrated = true;
|
|
3908
|
+
} else {
|
|
3909
|
+
const firstActionText = actionCandidates[0].getText();
|
|
3910
|
+
workqueue.addPropertyAssignment({
|
|
3911
|
+
name: ACTION_PROPERTY_NAME2,
|
|
3912
|
+
initializer: firstActionText
|
|
3913
|
+
});
|
|
3914
|
+
actionsProperty.remove();
|
|
3915
|
+
console.log(
|
|
3916
|
+
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3917
|
+
);
|
|
3918
|
+
actionsArrayMigrated = true;
|
|
3919
|
+
}
|
|
3681
3920
|
}
|
|
3682
3921
|
}
|
|
3683
3922
|
}
|
|
3684
|
-
actionsProperty.remove();
|
|
3685
|
-
console.log(
|
|
3686
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' (existing 'action' kept)`
|
|
3687
|
-
);
|
|
3688
|
-
return 1;
|
|
3689
3923
|
}
|
|
3690
|
-
const
|
|
3691
|
-
|
|
3692
|
-
|
|
3693
|
-
|
|
3694
|
-
|
|
3695
|
-
|
|
3696
|
-
|
|
3697
|
-
|
|
3698
|
-
|
|
3699
|
-
}
|
|
3700
|
-
if (actionCandidates.length > 1) {
|
|
3701
|
-
const droppedCount = actionCandidates.length - 1;
|
|
3702
|
-
console.warn(
|
|
3703
|
-
` [${relPath}] Workqueue '${workqueueLabel}' has ${actionCandidates.length} actions; keeping first as 'action' and dropping ${droppedCount} extra action(s)`
|
|
3704
|
-
);
|
|
3705
|
-
}
|
|
3706
|
-
const conditionalsProperty = actionCandidates[0].getProperty(
|
|
3707
|
-
CONDITIONALS_PROPERTY_NAME
|
|
3924
|
+
const fallback = ensureValidAction(workqueue, relPath);
|
|
3925
|
+
return {
|
|
3926
|
+
changed: actionsArrayMigrated || fallback.changed,
|
|
3927
|
+
usedReadFallback: fallback.usedReadFallback
|
|
3928
|
+
};
|
|
3929
|
+
}
|
|
3930
|
+
function ensureActionTypeImport(sourceFile) {
|
|
3931
|
+
const existingImport = sourceFile.getImportDeclaration(
|
|
3932
|
+
(decl) => decl.getModuleSpecifierValue() === TOOLKIT_EVENTS_MODULE2
|
|
3708
3933
|
);
|
|
3709
|
-
if (
|
|
3710
|
-
|
|
3711
|
-
|
|
3712
|
-
|
|
3713
|
-
|
|
3714
|
-
|
|
3715
|
-
if (isUnsupportedActionType(actionCandidates[0])) {
|
|
3716
|
-
actionsProperty.remove();
|
|
3717
|
-
console.log(
|
|
3718
|
-
` [${relPath}] Removed deprecated 'actions' from workqueue '${workqueueLabel}' because action type is unsupported`
|
|
3719
|
-
);
|
|
3720
|
-
return 1;
|
|
3934
|
+
if (existingImport) {
|
|
3935
|
+
const alreadyImported = existingImport.getNamedImports().some((ni) => ni.getName() === ACTION_TYPE_IMPORT_NAME);
|
|
3936
|
+
if (!alreadyImported) {
|
|
3937
|
+
existingImport.addNamedImport(ACTION_TYPE_IMPORT_NAME);
|
|
3938
|
+
}
|
|
3939
|
+
return;
|
|
3721
3940
|
}
|
|
3722
|
-
|
|
3723
|
-
|
|
3724
|
-
|
|
3725
|
-
initializer: firstActionText
|
|
3941
|
+
sourceFile.addImportDeclaration({
|
|
3942
|
+
moduleSpecifier: TOOLKIT_EVENTS_MODULE2,
|
|
3943
|
+
namedImports: [ACTION_TYPE_IMPORT_NAME]
|
|
3726
3944
|
});
|
|
3727
|
-
actionsProperty.remove();
|
|
3728
|
-
console.log(
|
|
3729
|
-
` [${relPath}] Replaced 'actions' with 'action' on workqueue '${workqueueLabel}'`
|
|
3730
|
-
);
|
|
3731
|
-
return 1;
|
|
3732
3945
|
}
|
|
3733
3946
|
function processFile13(filePath, project) {
|
|
3734
3947
|
const sourceFile = project.getSourceFile(filePath);
|
|
3735
3948
|
if (!sourceFile) return 0;
|
|
3736
3949
|
let migratedWorkqueues = 0;
|
|
3950
|
+
let needsActionTypeImport = false;
|
|
3737
3951
|
const relPath = import_path18.default.relative(process.cwd(), filePath);
|
|
3738
3952
|
const callExpressions = sourceFile.getDescendantsOfKind(
|
|
3739
3953
|
import_ts_morph17.SyntaxKind.CallExpression
|
|
@@ -3749,9 +3963,14 @@ function processFile13(filePath, project) {
|
|
|
3749
3963
|
if (!import_ts_morph17.Node.isArrayLiteralExpression(workqueuesArg)) continue;
|
|
3750
3964
|
for (const element of workqueuesArg.getElements()) {
|
|
3751
3965
|
if (!import_ts_morph17.Node.isObjectLiteralExpression(element)) continue;
|
|
3752
|
-
|
|
3966
|
+
const result = migrateWorkqueueActions(element, relPath);
|
|
3967
|
+
if (result.changed) migratedWorkqueues++;
|
|
3968
|
+
if (result.usedReadFallback) needsActionTypeImport = true;
|
|
3753
3969
|
}
|
|
3754
3970
|
}
|
|
3971
|
+
if (needsActionTypeImport) {
|
|
3972
|
+
ensureActionTypeImport(sourceFile);
|
|
3973
|
+
}
|
|
3755
3974
|
return migratedWorkqueues;
|
|
3756
3975
|
}
|
|
3757
3976
|
async function main18() {
|
|
@@ -4086,7 +4305,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4086
4305
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4087
4306
|
var import_child_process = require("child_process");
|
|
4088
4307
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4089
|
-
var UPSTREAM_BRANCH = "
|
|
4308
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4090
4309
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4091
4310
|
var FILES_TO_CHECKOUT = [
|
|
4092
4311
|
"src/analytics/analytics.ts",
|
|
@@ -4625,9 +4844,9 @@ var import_path24 = require("path");
|
|
|
4625
4844
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4626
4845
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4627
4846
|
var BASE_BRANCH = "release-v1.9";
|
|
4628
|
-
function gitShowBytes(ref,
|
|
4847
|
+
function gitShowBytes(ref, path24) {
|
|
4629
4848
|
try {
|
|
4630
|
-
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${
|
|
4849
|
+
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
4631
4850
|
cwd: process.cwd(),
|
|
4632
4851
|
stdio: ["ignore", "pipe", "pipe"]
|
|
4633
4852
|
});
|
|
@@ -4636,9 +4855,13 @@ function gitShowBytes(ref, path23) {
|
|
|
4636
4855
|
return null;
|
|
4637
4856
|
}
|
|
4638
4857
|
}
|
|
4639
|
-
async function main25(
|
|
4858
|
+
async function main25({
|
|
4859
|
+
subdirs = []
|
|
4860
|
+
} = {}) {
|
|
4861
|
+
const pathspecs = subdirs.length > 0 ? subdirs.map((s) => `${INFRASTRUCTURE_DIR}/${s}/`) : [`${INFRASTRUCTURE_DIR}/`];
|
|
4862
|
+
const scopeLabel = pathspecs.map((p) => `'${p}'`).join(", ");
|
|
4640
4863
|
console.log(
|
|
4641
|
-
`Merging
|
|
4864
|
+
`Merging ${scopeLabel} from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
|
|
4642
4865
|
`
|
|
4643
4866
|
);
|
|
4644
4867
|
assertIsGitRepo();
|
|
@@ -4653,20 +4876,12 @@ async function main25() {
|
|
|
4653
4876
|
const ref = `${TEMP_REMOTE2}/${UPSTREAM_BRANCH}`;
|
|
4654
4877
|
const baseRef = `${TEMP_REMOTE2}/${BASE_BRANCH}`;
|
|
4655
4878
|
const upstreamFiles = runGit(
|
|
4656
|
-
[
|
|
4657
|
-
"ls-tree",
|
|
4658
|
-
"-r",
|
|
4659
|
-
"--name-only",
|
|
4660
|
-
"-z",
|
|
4661
|
-
ref,
|
|
4662
|
-
"--",
|
|
4663
|
-
`${INFRASTRUCTURE_DIR}/`
|
|
4664
|
-
],
|
|
4879
|
+
["ls-tree", "-r", "--name-only", "-z", ref, "--", ...pathspecs],
|
|
4665
4880
|
{ silent: true }
|
|
4666
4881
|
).split("\0").filter(Boolean);
|
|
4667
4882
|
if (upstreamFiles.length === 0) {
|
|
4668
4883
|
console.log(
|
|
4669
|
-
` No files found under
|
|
4884
|
+
` No files found under ${scopeLabel} on ${ref}. Nothing to merge.`
|
|
4670
4885
|
);
|
|
4671
4886
|
return;
|
|
4672
4887
|
}
|
|
@@ -4741,7 +4956,9 @@ async function main25() {
|
|
|
4741
4956
|
var import_fs6 = require("fs");
|
|
4742
4957
|
var import_path25 = require("path");
|
|
4743
4958
|
var INFRASTRUCTURE_DIR2 = "infrastructure";
|
|
4744
|
-
async function main26(
|
|
4959
|
+
async function main26({
|
|
4960
|
+
keep = []
|
|
4961
|
+
} = {}) {
|
|
4745
4962
|
const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
|
|
4746
4963
|
if (!(0, import_fs6.existsSync)(fullPath)) {
|
|
4747
4964
|
console.log(
|
|
@@ -4749,24 +4966,152 @@ async function main26() {
|
|
|
4749
4966
|
);
|
|
4750
4967
|
return;
|
|
4751
4968
|
}
|
|
4752
|
-
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4753
|
-
`);
|
|
4754
4969
|
assertIsGitRepo();
|
|
4755
|
-
|
|
4756
|
-
|
|
4970
|
+
if (keep.length === 0) {
|
|
4971
|
+
console.log(`Deleting '${INFRASTRUCTURE_DIR2}/'...
|
|
4972
|
+
`);
|
|
4973
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", `${INFRASTRUCTURE_DIR2}/`], {
|
|
4974
|
+
silent: true
|
|
4975
|
+
});
|
|
4976
|
+
console.log(
|
|
4977
|
+
` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4978
|
+
);
|
|
4979
|
+
if ((0, import_fs6.existsSync)(fullPath)) {
|
|
4980
|
+
(0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
|
|
4981
|
+
console.log(
|
|
4982
|
+
` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`
|
|
4983
|
+
);
|
|
4984
|
+
}
|
|
4985
|
+
console.log(
|
|
4986
|
+
`
|
|
4987
|
+
Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
4988
|
+
);
|
|
4989
|
+
return;
|
|
4990
|
+
}
|
|
4991
|
+
const keepSet = new Set(keep);
|
|
4992
|
+
console.log(
|
|
4993
|
+
`Deleting contents of '${INFRASTRUCTURE_DIR2}/' except: ${[...keepSet].map((name) => `'${name}'`).join(", ")}
|
|
4994
|
+
`
|
|
4995
|
+
);
|
|
4996
|
+
const topLevelEntries = (0, import_fs6.readdirSync)(fullPath, { withFileTypes: true });
|
|
4997
|
+
let deleted = 0;
|
|
4998
|
+
for (const entry of topLevelEntries) {
|
|
4999
|
+
if (keepSet.has(entry.name)) {
|
|
5000
|
+
console.log(` Keeping '${INFRASTRUCTURE_DIR2}/${entry.name}'.`);
|
|
5001
|
+
continue;
|
|
5002
|
+
}
|
|
5003
|
+
const relPath = `${INFRASTRUCTURE_DIR2}/${entry.name}${entry.isDirectory() ? "/" : ""}`;
|
|
5004
|
+
runGit(["rm", "-rf", "--ignore-unmatch", "--", relPath], { silent: true });
|
|
5005
|
+
const fullEntryPath = (0, import_path25.join)(fullPath, entry.name);
|
|
5006
|
+
if ((0, import_fs6.existsSync)(fullEntryPath)) {
|
|
5007
|
+
(0, import_fs6.rmSync)(fullEntryPath, { recursive: true, force: true });
|
|
5008
|
+
}
|
|
5009
|
+
console.log(` Deleted '${relPath}'.`);
|
|
5010
|
+
deleted++;
|
|
5011
|
+
}
|
|
5012
|
+
const presentNames = new Set(topLevelEntries.map((e) => e.name));
|
|
5013
|
+
const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
|
|
5014
|
+
if (missingKeeps.length > 0) {
|
|
5015
|
+
console.warn(
|
|
5016
|
+
` [warn] Requested to keep ${missingKeeps.map((n) => `'${n}'`).join(", ")} but they don't exist under '${INFRASTRUCTURE_DIR2}/'.`
|
|
5017
|
+
);
|
|
5018
|
+
}
|
|
5019
|
+
console.log(
|
|
5020
|
+
`
|
|
5021
|
+
Done. Deleted ${deleted} top-level entr${deleted === 1 ? "y" : "ies"}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR2}/'`
|
|
5022
|
+
);
|
|
5023
|
+
}
|
|
5024
|
+
|
|
5025
|
+
// src/migrations/v2.0/fix-accept-requested-registration-function-type.ts
|
|
5026
|
+
var import_ts_morph22 = require("ts-morph");
|
|
5027
|
+
var import_path26 = __toESM(require("path"));
|
|
5028
|
+
var TARGET_FUNCTION_NAME = "acceptRequestedRegistration";
|
|
5029
|
+
var ACTION_PARAMETER_NAME = "action";
|
|
5030
|
+
var OLD_TYPE = "ActionInput";
|
|
5031
|
+
var NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
|
|
5032
|
+
function isAcceptRequestedRegistrationParameter(parameter) {
|
|
5033
|
+
const functionDeclaration = parameter.getFirstAncestorByKind(
|
|
5034
|
+
import_ts_morph22.SyntaxKind.FunctionDeclaration
|
|
5035
|
+
);
|
|
5036
|
+
if (functionDeclaration?.getName() === TARGET_FUNCTION_NAME) {
|
|
5037
|
+
return true;
|
|
5038
|
+
}
|
|
5039
|
+
const arrowFunction = parameter.getFirstAncestorByKind(
|
|
5040
|
+
import_ts_morph22.SyntaxKind.ArrowFunction
|
|
5041
|
+
);
|
|
5042
|
+
const variableDeclaration = arrowFunction?.getFirstAncestorByKind(
|
|
5043
|
+
import_ts_morph22.SyntaxKind.VariableDeclaration
|
|
5044
|
+
);
|
|
5045
|
+
return variableDeclaration?.getName() === TARGET_FUNCTION_NAME;
|
|
5046
|
+
}
|
|
5047
|
+
function processFile14(filePath, project) {
|
|
5048
|
+
const sourceFile = project.getSourceFile(filePath);
|
|
5049
|
+
if (!sourceFile) return 0;
|
|
5050
|
+
let updatedCount = 0;
|
|
5051
|
+
for (const parameter of sourceFile.getDescendantsOfKind(
|
|
5052
|
+
import_ts_morph22.SyntaxKind.Parameter
|
|
5053
|
+
)) {
|
|
5054
|
+
if (parameter.getName() !== ACTION_PARAMETER_NAME) {
|
|
5055
|
+
continue;
|
|
5056
|
+
}
|
|
5057
|
+
if (!isAcceptRequestedRegistrationParameter(parameter)) {
|
|
5058
|
+
continue;
|
|
5059
|
+
}
|
|
5060
|
+
const typeNode = parameter.getTypeNode();
|
|
5061
|
+
if (!typeNode || typeNode.getText() !== OLD_TYPE) {
|
|
5062
|
+
continue;
|
|
5063
|
+
}
|
|
5064
|
+
parameter.setType(NEW_TYPE);
|
|
5065
|
+
updatedCount++;
|
|
5066
|
+
console.log(
|
|
5067
|
+
` [${import_path26.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`
|
|
5068
|
+
);
|
|
5069
|
+
}
|
|
5070
|
+
return updatedCount;
|
|
5071
|
+
}
|
|
5072
|
+
async function main27() {
|
|
5073
|
+
const srcDir = import_path26.default.join(process.cwd(), "src");
|
|
5074
|
+
console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}
|
|
5075
|
+
`);
|
|
5076
|
+
const project = new import_ts_morph22.Project({
|
|
5077
|
+
tsConfigFilePath: import_path26.default.resolve(srcDir, "../tsconfig.json"),
|
|
5078
|
+
skipAddingFilesFromTsConfig: false
|
|
4757
5079
|
});
|
|
4758
|
-
|
|
4759
|
-
|
|
4760
|
-
|
|
4761
|
-
|
|
5080
|
+
const sourceFiles = project.getSourceFiles().filter((sf) => {
|
|
5081
|
+
const filePath = sf.getFilePath();
|
|
5082
|
+
return filePath.includes("/src/") && !filePath.includes("/node_modules/");
|
|
5083
|
+
});
|
|
5084
|
+
let totalUpdated = 0;
|
|
5085
|
+
const modifiedFiles = [];
|
|
5086
|
+
for (const sourceFile of sourceFiles) {
|
|
5087
|
+
const filePath = sourceFile.getFilePath();
|
|
5088
|
+
const updated = processFile14(filePath, project);
|
|
5089
|
+
if (updated > 0) {
|
|
5090
|
+
totalUpdated += updated;
|
|
5091
|
+
modifiedFiles.push(filePath);
|
|
5092
|
+
}
|
|
5093
|
+
}
|
|
5094
|
+
if (modifiedFiles.length === 0) {
|
|
5095
|
+
console.log(
|
|
5096
|
+
`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`
|
|
5097
|
+
);
|
|
5098
|
+
return;
|
|
5099
|
+
}
|
|
5100
|
+
console.log(`
|
|
5101
|
+
Saving ${modifiedFiles.length} modified file(s)...`);
|
|
5102
|
+
for (const filePath of modifiedFiles) {
|
|
5103
|
+
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
5104
|
+
await sourceFile.save();
|
|
5105
|
+
console.log(` Saved: ${import_path26.default.relative(process.cwd(), filePath)}`);
|
|
4762
5106
|
}
|
|
4763
5107
|
console.log(
|
|
4764
5108
|
`
|
|
4765
|
-
|
|
5109
|
+
Done. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`
|
|
4766
5110
|
);
|
|
4767
5111
|
}
|
|
4768
5112
|
|
|
4769
5113
|
// src/migrations/v2.0/index.ts
|
|
5114
|
+
var NON_SWARM_INFRA_SUBDIRS = ["postgres", "metabase"];
|
|
4770
5115
|
async function runUpgrade(dockerSwarm) {
|
|
4771
5116
|
await main18();
|
|
4772
5117
|
await main();
|
|
@@ -4791,11 +5136,13 @@ async function runUpgrade(dockerSwarm) {
|
|
|
4791
5136
|
await main22();
|
|
4792
5137
|
await main23();
|
|
4793
5138
|
await main24();
|
|
5139
|
+
await main27();
|
|
4794
5140
|
await main17();
|
|
4795
5141
|
if (dockerSwarm) {
|
|
4796
5142
|
await main25();
|
|
4797
5143
|
} else {
|
|
4798
|
-
await main26();
|
|
5144
|
+
await main26({ keep: NON_SWARM_INFRA_SUBDIRS });
|
|
5145
|
+
await main25({ subdirs: NON_SWARM_INFRA_SUBDIRS });
|
|
4799
5146
|
}
|
|
4800
5147
|
}
|
|
4801
5148
|
|
|
@@ -4824,7 +5171,7 @@ Options:
|
|
|
4824
5171
|
'infrastructure/' directory is deleted (default).
|
|
4825
5172
|
-h, --help Show this message.
|
|
4826
5173
|
`.trim();
|
|
4827
|
-
function
|
|
5174
|
+
function main28() {
|
|
4828
5175
|
const command = args[0];
|
|
4829
5176
|
if (!command || command === "--help" || command === "-h") {
|
|
4830
5177
|
console.log(USAGE);
|
|
@@ -4899,4 +5246,4 @@ function handleCheckTranslations() {
|
|
|
4899
5246
|
console.warn("This command is not implemented yet!");
|
|
4900
5247
|
process.exit(1);
|
|
4901
5248
|
}
|
|
4902
|
-
|
|
5249
|
+
main28();
|