@opencrvs/toolkit 2.0.0-rc.153df7b → 2.0.0-rc.1d9a00b

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.
@@ -190,6 +190,8 @@ function ensureImports(sourceFile) {
190
190
  var DEFINE_CONFIG_NAME2 = "defineConfig";
191
191
  var ACTIONS_PROPERTY_NAME2 = "actions";
192
192
  var TYPE_PROPERTY_NAME2 = "type";
193
+ var ID_PROPERTY_NAME = "id";
194
+ var FLAGS_PROPERTY_NAME = "flags";
193
195
  var CUSTOM_ACTION_TYPE_PROPERTY_NAME = "customActionType";
194
196
  var AUDIT_HISTORY_LABEL_PROPERTY_NAME = "auditHistoryLabel";
195
197
  var DEDUPLICATION_PROPERTY_NAME = "deduplication";
@@ -199,9 +201,12 @@ var FORM_PROPERTY_NAME = "form";
199
201
  var ACTION_TYPE_ENUM_NAME = "ActionType";
200
202
  var VALIDATE_MEMBER_NAME = "VALIDATE";
201
203
  var CUSTOM_MEMBER_NAME = "CUSTOM";
204
+ var REGISTER_MEMBER_NAME2 = "REGISTER";
202
205
  var VALIDATE_STRING_LITERAL = "VALIDATE";
203
206
  var CUSTOM_STRING_LITERAL = "CUSTOM";
207
+ var REGISTER_STRING_LITERAL2 = "REGISTER";
204
208
  var VALIDATE_DECLARATION_VALUE = "VALIDATE_DECLARATION";
209
+ var VALIDATED_FLAG_VALUE = "validated";
205
210
  function isValidateType(typeInitializer) {
206
211
  if (typeInitializer.getKind() === import_ts_morph2.SyntaxKind.PropertyAccessExpression) {
207
212
  const propAccess = typeInitializer.asKindOrThrow(
@@ -325,6 +330,50 @@ function transformValidateActionToCustom(obj, eventType) {
325
330
  }
326
331
  return true;
327
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
+ }
328
377
  function processFile2(filePath, project) {
329
378
  const sourceFile = project.getSourceFile(filePath);
330
379
  if (!sourceFile) return 0;
@@ -390,6 +439,18 @@ function processFile2(filePath, project) {
390
439
  ` [${import_path2.default.relative(process.cwd(), filePath)}] Added top-level 'flags' array to defineConfig`
391
440
  );
392
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
+ }
393
454
  if (fileNeedsImports) {
394
455
  ensureImports(sourceFile);
395
456
  }
@@ -436,7 +497,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
436
497
  }
437
498
  console.log(
438
499
  `
439
- Done. Transformed ${totalTransformed} VALIDATE action(s) to CUSTOM with customActionType: '${VALIDATE_DECLARATION_VALUE}'.`
500
+ Done. Applied ${totalTransformed} change(s): VALIDATE \u2192 CUSTOM (${VALIDATE_DECLARATION_VALUE}) and '${VALIDATED_FLAG_VALUE}' remove-flag on matching REGISTER actions.`
440
501
  );
441
502
  }
442
503
 
@@ -679,14 +740,14 @@ var QUERY_PROPERTY_NAME = "query";
679
740
  var TYPE_PROPERTY_NAME5 = "type";
680
741
  var CLAUSES_PROPERTY_NAME = "clauses";
681
742
  var STATUS_PROPERTY_NAME = "status";
682
- var FLAGS_PROPERTY_NAME = "flags";
743
+ var FLAGS_PROPERTY_NAME2 = "flags";
683
744
  var TERMS_PROPERTY_NAME = "terms";
684
745
  var TERM_PROPERTY_NAME = "term";
685
746
  var ANY_OF_PROPERTY_NAME = "anyOf";
686
747
  var VALIDATED_STATUS_VALUE = "VALIDATED";
687
- var VALIDATED_FLAG_VALUE = "validated";
748
+ var VALIDATED_FLAG_VALUE2 = "validated";
688
749
  function addValidatedFlag(clause) {
689
- const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME);
750
+ const flagsProperty = clause.getProperty(FLAGS_PROPERTY_NAME2);
690
751
  if (flagsProperty && import_ts_morph5.Node.isPropertyAssignment(flagsProperty)) {
691
752
  const flagsInit = flagsProperty.getInitializer();
692
753
  if (flagsInit && import_ts_morph5.Node.isObjectLiteralExpression(flagsInit)) {
@@ -694,19 +755,19 @@ function addValidatedFlag(clause) {
694
755
  if (anyOfProperty && import_ts_morph5.Node.isPropertyAssignment(anyOfProperty)) {
695
756
  const anyOfInit = anyOfProperty.getInitializer();
696
757
  if (anyOfInit && import_ts_morph5.Node.isArrayLiteralExpression(anyOfInit)) {
697
- anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE}'`);
758
+ anyOfInit.addElement(`'${VALIDATED_FLAG_VALUE2}'`);
698
759
  }
699
760
  } else {
700
761
  flagsInit.addPropertyAssignment({
701
762
  name: ANY_OF_PROPERTY_NAME,
702
- initializer: `['${VALIDATED_FLAG_VALUE}']`
763
+ initializer: `['${VALIDATED_FLAG_VALUE2}']`
703
764
  });
704
765
  }
705
766
  }
706
767
  } else {
707
768
  clause.addPropertyAssignment({
708
- name: FLAGS_PROPERTY_NAME,
709
- initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE}'] }`
769
+ name: FLAGS_PROPERTY_NAME2,
770
+ initializer: `{ ${ANY_OF_PROPERTY_NAME}: ['${VALIDATED_FLAG_VALUE2}'] }`
710
771
  });
711
772
  }
712
773
  }
@@ -872,23 +933,26 @@ var DEFINE_CONFIG_NAME4 = "defineConfig";
872
933
  var DEFINE_WORKQUEUES_NAME2 = "defineWorkqueues";
873
934
  var ACTIONS_PROPERTY_NAME4 = "actions";
874
935
  var ACTION_PROPERTY_NAME = "action";
875
- var FLAGS_PROPERTY_NAME2 = "flags";
936
+ var FLAGS_PROPERTY_NAME3 = "flags";
876
937
  var QUERY_PROPERTY_NAME2 = "query";
877
938
  var TYPE_PROPERTY_NAME6 = "type";
939
+ var ID_PROPERTY_NAME2 = "id";
878
940
  var CLAUSES_PROPERTY_NAME2 = "clauses";
879
941
  var ANY_OF_PROPERTY_NAME2 = "anyOf";
880
942
  var FLAG_ID = "pending-first-certificate-issuance";
881
943
  var REGISTER_TYPE = "REGISTER";
882
944
  var PRINT_CERTIFICATE_TYPE = "PRINT_CERTIFICATE";
883
- var FLAG_DEFINITION_INITIALIZER = `{
945
+ function flagDefinitionInitializer(eventType) {
946
+ return `{
884
947
  id: '${FLAG_ID}',
885
948
  label: {
886
- id: 'event.birth.flag.${FLAG_ID}',
949
+ id: 'event.${eventType}.flag.${FLAG_ID}',
887
950
  defaultMessage: 'Pending first certificate issuance',
888
951
  description: 'Flag label for first certificate issuance'
889
952
  },
890
953
  requiresAction: true
891
954
  }`;
955
+ }
892
956
  function isActionOfType(obj, typeName) {
893
957
  const typeProperty = obj.getProperty(TYPE_PROPERTY_NAME6);
894
958
  if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
@@ -902,18 +966,20 @@ function isActionOfType(obj, typeName) {
902
966
  }
903
967
  return false;
904
968
  }
905
- function isBirthConfig(configArg) {
906
- const typeProperty = configArg.getProperty(TYPE_PROPERTY_NAME6);
907
- if (!typeProperty || !import_ts_morph6.Node.isPropertyAssignment(typeProperty)) return false;
908
- const initializer = typeProperty.getInitializer();
909
- if (!initializer) return false;
910
- if (import_ts_morph6.Node.isStringLiteral(initializer)) {
911
- return initializer.getLiteralValue().toLowerCase() === "birth";
912
- }
913
- if (import_ts_morph6.Node.isPropertyAccessExpression(initializer)) {
914
- return initializer.getName().toLowerCase() === "birth";
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
+ }
915
981
  }
916
- return false;
982
+ return null;
917
983
  }
918
984
  function hasElementWithId(array3, id) {
919
985
  for (const el of array3.getElements()) {
@@ -927,27 +993,28 @@ function hasElementWithId(array3, id) {
927
993
  }
928
994
  return false;
929
995
  }
930
- function ensureTopLevelFlagDefinition(configArg) {
931
- const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME2);
996
+ function ensureTopLevelFlagDefinition(configArg, eventType) {
997
+ const initializer = flagDefinitionInitializer(eventType);
998
+ const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME3);
932
999
  if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
933
1000
  const flagsInit = flagsProp.getInitializer();
934
1001
  if (flagsInit && import_ts_morph6.Node.isArrayLiteralExpression(flagsInit)) {
935
1002
  if (hasElementWithId(flagsInit, FLAG_ID)) return false;
936
- flagsInit.addElement(FLAG_DEFINITION_INITIALIZER);
1003
+ flagsInit.addElement(initializer);
937
1004
  return true;
938
1005
  }
939
1006
  return false;
940
1007
  }
941
1008
  configArg.addPropertyAssignment({
942
- name: FLAGS_PROPERTY_NAME2,
1009
+ name: FLAGS_PROPERTY_NAME3,
943
1010
  initializer: `[
944
- ${FLAG_DEFINITION_INITIALIZER}
1011
+ ${initializer}
945
1012
  ]`
946
1013
  });
947
1014
  return true;
948
1015
  }
949
1016
  function ensureActionOperationFlag(action, operation) {
950
- const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME2);
1017
+ const flagsProp = action.getProperty(FLAGS_PROPERTY_NAME3);
951
1018
  const entry = `{ id: '${FLAG_ID}', operation: '${operation}' }`;
952
1019
  if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
953
1020
  const flagsInit = flagsProp.getInitializer();
@@ -959,16 +1026,18 @@ function ensureActionOperationFlag(action, operation) {
959
1026
  return false;
960
1027
  }
961
1028
  action.addPropertyAssignment({
962
- name: FLAGS_PROPERTY_NAME2,
1029
+ name: FLAGS_PROPERTY_NAME3,
963
1030
  initializer: `[${entry}]`
964
1031
  });
965
1032
  return true;
966
1033
  }
967
- function processBirthConfig(configArg, relPath) {
1034
+ function processConfig(configArg, eventType, relPath) {
968
1035
  let changes = 0;
969
- if (ensureTopLevelFlagDefinition(configArg)) {
1036
+ if (ensureTopLevelFlagDefinition(configArg, eventType)) {
970
1037
  changes++;
971
- console.log(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
1038
+ console.log(
1039
+ ` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`
1040
+ );
972
1041
  }
973
1042
  const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME4);
974
1043
  if (!actionsProp || !import_ts_morph6.Node.isPropertyAssignment(actionsProp)) return changes;
@@ -982,7 +1051,7 @@ function processBirthConfig(configArg, relPath) {
982
1051
  if (ensureActionOperationFlag(element, "add")) {
983
1052
  changes++;
984
1053
  console.log(
985
- ` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`
1054
+ ` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`
986
1055
  );
987
1056
  }
988
1057
  }
@@ -990,7 +1059,7 @@ function processBirthConfig(configArg, relPath) {
990
1059
  if (ensureActionOperationFlag(element, "remove")) {
991
1060
  changes++;
992
1061
  console.log(
993
- ` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
1062
+ ` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`
994
1063
  );
995
1064
  }
996
1065
  }
@@ -1019,7 +1088,7 @@ function hasPrintCertificateAction(workqueue) {
1019
1088
  return false;
1020
1089
  }
1021
1090
  function addFlagToQueryClause(clause) {
1022
- const flagsProp = clause.getProperty(FLAGS_PROPERTY_NAME2);
1091
+ const flagsProp = clause.getProperty(FLAGS_PROPERTY_NAME3);
1023
1092
  if (flagsProp && import_ts_morph6.Node.isPropertyAssignment(flagsProp)) {
1024
1093
  const flagsInit = flagsProp.getInitializer();
1025
1094
  if (flagsInit && import_ts_morph6.Node.isObjectLiteralExpression(flagsInit)) {
@@ -1044,7 +1113,7 @@ function addFlagToQueryClause(clause) {
1044
1113
  }
1045
1114
  } else {
1046
1115
  clause.addPropertyAssignment({
1047
- name: FLAGS_PROPERTY_NAME2,
1116
+ name: FLAGS_PROPERTY_NAME3,
1048
1117
  initializer: `{ ${ANY_OF_PROPERTY_NAME2}: ['${FLAG_ID}'] }`
1049
1118
  });
1050
1119
  return true;
@@ -1088,8 +1157,9 @@ function processFile6(filePath, project) {
1088
1157
  if (args.length === 0) continue;
1089
1158
  const configArg = args[0];
1090
1159
  if (!import_ts_morph6.Node.isObjectLiteralExpression(configArg)) continue;
1091
- if (!isBirthConfig(configArg)) continue;
1092
- totalChanges += processBirthConfig(configArg, relPath);
1160
+ const eventType = getEventType(configArg);
1161
+ if (!eventType) continue;
1162
+ totalChanges += processConfig(configArg, eventType, relPath);
1093
1163
  }
1094
1164
  if (calleeName === DEFINE_WORKQUEUES_NAME2) {
1095
1165
  const args = call.getArguments();
@@ -1118,7 +1188,7 @@ function processFile6(filePath, project) {
1118
1188
  async function main6() {
1119
1189
  const srcDir = import_path6.default.join(process.cwd(), "src");
1120
1190
  console.log(
1121
- `Scanning for birth defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
1191
+ `Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}
1122
1192
  `
1123
1193
  );
1124
1194
  const project = new import_ts_morph6.Project({
@@ -1143,7 +1213,7 @@ async function main6() {
1143
1213
  }
1144
1214
  if (modifiedFiles.length === 0) {
1145
1215
  console.log(
1146
- "No birth configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
1216
+ "No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do."
1147
1217
  );
1148
1218
  return;
1149
1219
  }
@@ -1825,9 +1895,9 @@ function updateRouteHandlers(sourceFiles, group, srcDir, relCwd) {
1825
1895
  }
1826
1896
  return replacedCount;
1827
1897
  }
1828
- function resolveConfigChain(configObj, path22) {
1898
+ function resolveConfigChain(configObj, path23) {
1829
1899
  let current = configObj;
1830
- for (const key of path22) {
1900
+ for (const key of path23) {
1831
1901
  if (!import_ts_morph10.Node.isObjectLiteralExpression(current)) return null;
1832
1902
  const prop = current.getProperty(key);
1833
1903
  if (!prop || !import_ts_morph10.Node.isPropertyAssignment(prop)) return null;
@@ -2122,6 +2192,10 @@ var scopeByEvent = z3.preprocess(
2122
2192
  (val) => val === void 0 ? void 0 : [val].flat(),
2123
2193
  z3.array(z3.string()).optional()
2124
2194
  ).describe("Event type, e.g. birth, death");
2195
+ var userRole = z3.preprocess(
2196
+ (val) => val === void 0 ? void 0 : [val].flat(),
2197
+ z3.array(z3.string()).optional()
2198
+ ).describe("User role, e.g. admin, field agent");
2125
2199
  var scopeOptionsPlaceEvent = z3.object({
2126
2200
  event: scopeByEvent,
2127
2201
  placeOfEvent: JurisdictionFilter.optional()
@@ -2145,6 +2219,9 @@ var CustomActionScopeOptions = AllRecordScopeOptions.extend({
2145
2219
  var AccessLevelOptions = z3.object({
2146
2220
  accessLevel: JurisdictionFilter.optional()
2147
2221
  });
2222
+ var AllUserScopeOptions = AccessLevelOptions.extend({
2223
+ role: userRole.optional()
2224
+ });
2148
2225
  var WorkqueueOrDashboardOptions = z3.object({
2149
2226
  ids: z3.preprocess(
2150
2227
  (val) => val === void 0 ? void 0 : [val].flat(),
@@ -2154,6 +2231,7 @@ var WorkqueueOrDashboardOptions = z3.object({
2154
2231
  var AllScopeOptions = z3.object({
2155
2232
  ...AllRecordScopeOptions.shape,
2156
2233
  ...AccessLevelOptions.shape,
2234
+ ...AllUserScopeOptions.shape,
2157
2235
  ...WorkqueueOrDashboardOptions.shape
2158
2236
  });
2159
2237
  var ScopeOptionKey = AllScopeOptions.keyof();
@@ -2226,6 +2304,28 @@ var RecordScopeV2 = z3.discriminatedUnion("type", [
2226
2304
  ]).describe(
2227
2305
  "Scopes used to check user's permission to perform actions on a record."
2228
2306
  );
2307
+ var SystemScopeType = z3.enum([
2308
+ "organisation.read-locations",
2309
+ "user.read",
2310
+ "user.create",
2311
+ "user.edit"
2312
+ ]);
2313
+ var UserScopeType = SystemScopeType.extract([
2314
+ "user.read",
2315
+ "user.create",
2316
+ "user.edit"
2317
+ ]);
2318
+ var ScopesWithRoleOption = UserScopeType.extract(["user.edit", "user.create"]);
2319
+ var UserScopeV2 = z3.discriminatedUnion("type", [
2320
+ z3.object({
2321
+ type: ScopesWithRoleOption,
2322
+ options: AllUserScopeOptions.optional()
2323
+ }),
2324
+ z3.object({
2325
+ type: UserScopeType.extract(["user.read"]),
2326
+ options: AccessLevelOptions.optional()
2327
+ })
2328
+ ]);
2229
2329
  var ResolvedRecordScopeV2 = z3.discriminatedUnion("type", [
2230
2330
  z3.object({
2231
2331
  type: ScopesWithPlaceEventOptions,
@@ -2246,16 +2346,14 @@ var ResolvedRecordScopeV2 = z3.discriminatedUnion("type", [
2246
2346
  }).optional()
2247
2347
  })
2248
2348
  ]).describe("Resolved scope with location/user IDs instead of filters.");
2249
- var SystemScopeType = z3.enum([
2250
- "organisation.read-locations",
2251
- "user.read",
2252
- "user.create",
2253
- "user.edit"
2254
- ]);
2255
2349
  var Scope2 = z3.discriminatedUnion("type", [
2256
2350
  z3.object({ type: PlainScopeType }),
2257
2351
  ...RecordScopeV2.options,
2258
- z3.object({ type: SystemScopeType, options: AccessLevelOptions.optional() }),
2352
+ ...UserScopeV2.options,
2353
+ z3.object({
2354
+ type: z3.literal("organisation.read-locations"),
2355
+ options: AccessLevelOptions.optional()
2356
+ }),
2259
2357
  z3.object({
2260
2358
  type: z3.literal("workqueue"),
2261
2359
  options: WorkqueueOrDashboardOptions
@@ -4147,10 +4245,356 @@ async function main22() {
4147
4245
  }
4148
4246
  }
4149
4247
 
4150
- // src/migrations/v2.0/simplify-analytics-precalculations.ts
4151
- var import_ts_morph20 = require("ts-morph");
4152
- var import_fs3 = __toESM(require("fs"));
4248
+ // src/migrations/v2.0/add-resend-invite-notification.ts
4249
+ var import_fs3 = require("fs");
4153
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
+
4594
+ // src/migrations/v2.0/simplify-analytics-precalculations.ts
4595
+ var import_ts_morph21 = require("ts-morph");
4596
+ var import_fs4 = __toESM(require("fs"));
4597
+ var import_path23 = __toESM(require("path"));
4154
4598
  var ANALYTICS_FILE_REL = "src/analytics/analytics.ts";
4155
4599
  var FUNCTION_NAME = "precalculateAdditionalAnalytics";
4156
4600
  var IMPORT_NAMES_TO_REMOVE = /* @__PURE__ */ new Set(["Event", "precalculateBirthEvent"]);
@@ -4186,10 +4630,10 @@ function findPrecalculateFunction(sourceFile) {
4186
4630
  return void 0;
4187
4631
  }
4188
4632
  function getFunctionBodyBlock(fn) {
4189
- if (import_ts_morph20.Node.isFunctionDeclaration(fn)) return fn.getBody();
4633
+ if (import_ts_morph21.Node.isFunctionDeclaration(fn)) return fn.getBody();
4190
4634
  const initializer = fn.getInitializer();
4191
4635
  if (!initializer) return void 0;
4192
- if (!import_ts_morph20.Node.isArrowFunction(initializer) && !import_ts_morph20.Node.isFunctionExpression(initializer)) {
4636
+ if (!import_ts_morph21.Node.isArrowFunction(initializer) && !import_ts_morph21.Node.isFunctionExpression(initializer)) {
4193
4637
  return void 0;
4194
4638
  }
4195
4639
  return initializer.getBody();
@@ -4199,9 +4643,9 @@ function simplifyPrecalculateFunction(sourceFile) {
4199
4643
  const fn = findPrecalculateFunction(sourceFile);
4200
4644
  if (!fn) return log;
4201
4645
  const body = getFunctionBodyBlock(fn);
4202
- if (!body || !import_ts_morph20.Node.isBlock(body)) return log;
4646
+ if (!body || !import_ts_morph21.Node.isBlock(body)) return log;
4203
4647
  for (const statement of [...body.getStatements()]) {
4204
- const references = statement.getDescendantsOfKind(import_ts_morph20.SyntaxKind.Identifier).some((id) => IMPORT_NAMES_TO_REMOVE.has(id.getText()));
4648
+ const references = statement.getDescendantsOfKind(import_ts_morph21.SyntaxKind.Identifier).some((id) => IMPORT_NAMES_TO_REMOVE.has(id.getText()));
4205
4649
  if (references) {
4206
4650
  statement.remove();
4207
4651
  log.push(`removed statement in ${FUNCTION_NAME} referencing removed imports`);
@@ -4209,7 +4653,7 @@ function simplifyPrecalculateFunction(sourceFile) {
4209
4653
  }
4210
4654
  const remaining = body.getStatements();
4211
4655
  const last = remaining[remaining.length - 1];
4212
- const alreadyCorrect = last && import_ts_morph20.Node.isReturnStatement(last) && last.getExpression()?.getText() === RETURN_EXPRESSION_TEXT;
4656
+ const alreadyCorrect = last && import_ts_morph21.Node.isReturnStatement(last) && last.getExpression()?.getText() === RETURN_EXPRESSION_TEXT;
4213
4657
  if (!alreadyCorrect) {
4214
4658
  body.addStatements(`return ${RETURN_EXPRESSION_TEXT}`);
4215
4659
  log.push(
@@ -4218,17 +4662,17 @@ function simplifyPrecalculateFunction(sourceFile) {
4218
4662
  }
4219
4663
  return log;
4220
4664
  }
4221
- async function main23() {
4665
+ async function main24() {
4222
4666
  const cwd = process.cwd();
4223
- const absPath = import_path22.default.join(cwd, ANALYTICS_FILE_REL);
4224
- if (!import_fs3.default.existsSync(absPath)) {
4667
+ const absPath = import_path23.default.join(cwd, ANALYTICS_FILE_REL);
4668
+ if (!import_fs4.default.existsSync(absPath)) {
4225
4669
  console.log(
4226
4670
  `[${ANALYTICS_FILE_REL}] does not exist \u2014 nothing to clean up.`
4227
4671
  );
4228
4672
  return;
4229
4673
  }
4230
- const project = new import_ts_morph20.Project({
4231
- tsConfigFilePath: import_path22.default.resolve(cwd, "tsconfig.json"),
4674
+ const project = new import_ts_morph21.Project({
4675
+ tsConfigFilePath: import_path23.default.resolve(cwd, "tsconfig.json"),
4232
4676
  skipAddingFilesFromTsConfig: false
4233
4677
  });
4234
4678
  const sourceFile = project.getSourceFile(absPath);
@@ -4257,15 +4701,15 @@ Saved ${ANALYTICS_FILE_REL}.`);
4257
4701
 
4258
4702
  // src/migrations/v2.0/merge-infrastructure-directory.ts
4259
4703
  var import_child_process2 = require("child_process");
4260
- var import_fs4 = require("fs");
4704
+ var import_fs5 = require("fs");
4261
4705
  var import_os = require("os");
4262
- var import_path23 = require("path");
4706
+ var import_path24 = require("path");
4263
4707
  var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
4264
4708
  var INFRASTRUCTURE_DIR = "infrastructure";
4265
4709
  var BASE_BRANCH = "release-v1.9";
4266
- function gitShowBytes(ref, path22) {
4710
+ function gitShowBytes(ref, path23) {
4267
4711
  try {
4268
- const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path22}`], {
4712
+ const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path23}`], {
4269
4713
  cwd: process.cwd(),
4270
4714
  stdio: ["ignore", "pipe", "pipe"]
4271
4715
  });
@@ -4274,7 +4718,7 @@ function gitShowBytes(ref, path22) {
4274
4718
  return null;
4275
4719
  }
4276
4720
  }
4277
- async function main24() {
4721
+ async function main25() {
4278
4722
  console.log(
4279
4723
  `Merging '${INFRASTRUCTURE_DIR}/' from ${UPSTREAM_URL}@${UPSTREAM_BRANCH} (base: ${BASE_BRANCH})...
4280
4724
  `
@@ -4308,15 +4752,15 @@ async function main24() {
4308
4752
  );
4309
4753
  return;
4310
4754
  }
4311
- const tmpDir = (0, import_fs4.mkdtempSync)((0, import_path23.join)((0, import_os.tmpdir)(), "opencrvs-merge-infra-"));
4312
- const baseTmp = (0, import_path23.join)(tmpDir, "base");
4313
- const theirsTmp = (0, import_path23.join)(tmpDir, "theirs");
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");
4314
4758
  let added = 0;
4315
4759
  let merged = 0;
4316
4760
  const conflictedFiles = [];
4317
4761
  for (const file of upstreamFiles) {
4318
- const fullPath = (0, import_path23.join)(process.cwd(), file);
4319
- if (!(0, import_fs4.existsSync)(fullPath)) {
4762
+ const fullPath = (0, import_path24.join)(process.cwd(), file);
4763
+ if (!(0, import_fs5.existsSync)(fullPath)) {
4320
4764
  if (tryGit(["checkout", ref, "--", file])) {
4321
4765
  console.log(` + ${file} (new from upstream)`);
4322
4766
  added++;
@@ -4330,9 +4774,9 @@ async function main24() {
4330
4774
  console.warn(` [warn] could not read ${file} from ${ref} \u2014 skipping.`);
4331
4775
  continue;
4332
4776
  }
4333
- (0, import_fs4.writeFileSync)(theirsTmp, theirContents);
4777
+ (0, import_fs5.writeFileSync)(theirsTmp, theirContents);
4334
4778
  const baseContents = gitShowBytes(baseRef, file);
4335
- (0, import_fs4.writeFileSync)(baseTmp, baseContents ?? new Uint8Array(0));
4779
+ (0, import_fs5.writeFileSync)(baseTmp, baseContents ?? new Uint8Array(0));
4336
4780
  try {
4337
4781
  (0, import_child_process2.execFileSync)("git", ["merge-file", fullPath, baseTmp, theirsTmp], {
4338
4782
  cwd: process.cwd(),
@@ -4376,12 +4820,12 @@ async function main24() {
4376
4820
  }
4377
4821
 
4378
4822
  // src/migrations/v2.0/delete-infrastructure-directory.ts
4379
- var import_fs5 = require("fs");
4380
- var import_path24 = require("path");
4823
+ var import_fs6 = require("fs");
4824
+ var import_path25 = require("path");
4381
4825
  var INFRASTRUCTURE_DIR2 = "infrastructure";
4382
- async function main25() {
4383
- const fullPath = (0, import_path24.join)(process.cwd(), INFRASTRUCTURE_DIR2);
4384
- if (!(0, import_fs5.existsSync)(fullPath)) {
4826
+ async function main26() {
4827
+ const fullPath = (0, import_path25.join)(process.cwd(), INFRASTRUCTURE_DIR2);
4828
+ if (!(0, import_fs6.existsSync)(fullPath)) {
4385
4829
  console.log(
4386
4830
  `'${INFRASTRUCTURE_DIR2}/' not found in ${process.cwd()} \u2014 nothing to delete.`
4387
4831
  );
@@ -4394,8 +4838,8 @@ async function main25() {
4394
4838
  silent: true
4395
4839
  });
4396
4840
  console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR2}/'.`);
4397
- if ((0, import_fs5.existsSync)(fullPath)) {
4398
- (0, import_fs5.rmSync)(fullPath, { recursive: true, force: true });
4841
+ if ((0, import_fs6.existsSync)(fullPath)) {
4842
+ (0, import_fs6.rmSync)(fullPath, { recursive: true, force: true });
4399
4843
  console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR2}/'.`);
4400
4844
  }
4401
4845
  console.log(
@@ -4428,10 +4872,11 @@ async function runUpgrade(dockerSwarm) {
4428
4872
  await main21();
4429
4873
  await main22();
4430
4874
  await main23();
4875
+ await main24();
4431
4876
  await main17();
4432
4877
  if (dockerSwarm) {
4433
- await main24();
4434
- } else {
4435
4878
  await main25();
4879
+ } else {
4880
+ await main26();
4436
4881
  }
4437
4882
  }