@opencrvs/toolkit 2.0.0-rc.725758 → 2.0.0-rc.74d11ba

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.
Files changed (41) hide show
  1. package/create-countryconfig/index.js +73 -0
  2. package/create-countryconfig/package.json +11 -0
  3. package/dist/application-config/index.js +23 -26
  4. package/dist/cli.js +389 -127
  5. package/dist/commons/api/router.d.ts +3301 -247
  6. package/dist/commons/conditionals/validate.d.ts +1 -0
  7. package/dist/commons/events/ActionInput.d.ts +108 -0
  8. package/dist/commons/events/Draft.d.ts +3 -0
  9. package/dist/commons/events/EventIndex.d.ts +0 -3
  10. package/dist/commons/events/EventMetadata.d.ts +0 -7
  11. package/dist/commons/events/locations.d.ts +21 -0
  12. package/dist/commons/events/mocks.test.utils.d.ts +19 -0
  13. package/dist/commons/events/scopes.d.ts +24 -1
  14. package/dist/commons/events/state/index.d.ts +0 -4
  15. package/dist/commons/events/state/utils.d.ts +0 -2
  16. package/dist/commons/events/utils.d.ts +1 -1
  17. package/dist/events/index.js +98 -60
  18. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  19. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  20. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  21. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  22. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  23. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  24. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
  25. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
  26. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
  27. package/dist/migrations/v2.0/index.d.ts +5 -3
  28. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  29. package/dist/migrations/v2.0/index.js +387 -125
  30. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  31. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  32. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  33. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  34. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  35. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  36. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  37. package/dist/notification/index.js +30 -30
  38. package/opencrvs-toolkit-2.0.0-rc.74d11ba.tgz +0 -0
  39. package/package.json +1 -1
  40. package/tsconfig.tsbuildinfo +1 -1
  41. package/opencrvs-toolkit-2.0.0-rc.0725758.tgz +0 -0
@@ -302,12 +302,13 @@ __export(events_exports, {
302
302
  getActionConfig: () => getActionConfig,
303
303
  getActionReview: () => getActionReview,
304
304
  getActionReviewFields: () => getActionReviewFields,
305
+ getAdministrativeAreaHierarchy: () => getAdministrativeAreaHierarchy,
305
306
  getAllUniqueFields: () => getAllUniqueFields,
306
307
  getAnnotationFromDrafts: () => getAnnotationFromDrafts,
307
308
  getAssignedUserFromActions: () => getAssignedUserFromActions,
308
- getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
309
309
  getAssignmentStatus: () => getAssignmentStatus,
310
310
  getAvailableActionsForEvent: () => getAvailableActionsForEvent,
311
+ getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
311
312
  getCompleteActionAnnotation: () => getCompleteActionAnnotation,
312
313
  getCompleteActionDeclaration: () => getCompleteActionDeclaration,
313
314
  getCurrentEventState: () => getCurrentEventState,
@@ -318,6 +319,7 @@ __export(events_exports, {
318
319
  getDeclarationPages: () => getDeclarationPages,
319
320
  getEventConfigById: () => getEventConfigById,
320
321
  getFilePathsFromEvent: () => getFilePathsFromEvent,
322
+ getLocationHierarchy: () => getLocationHierarchy,
321
323
  getMixedPath: () => getMixedPath,
322
324
  getPendingAction: () => getPendingAction,
323
325
  getPrintCertificatePages: () => getPrintCertificatePages,
@@ -1075,7 +1077,10 @@ var ActionConditional = z7.discriminatedUnion("type", [
1075
1077
  ShowConditional,
1076
1078
  // Action can be shown to the user in the list but as disabled
1077
1079
  EnableConditional
1078
- ]);
1080
+ ]).meta({
1081
+ description: "Action conditional configuration",
1082
+ id: "ActionConditional"
1083
+ });
1079
1084
  var DisplayOnReviewConditional = z7.object({
1080
1085
  type: z7.literal(ConditionalType.DISPLAY_ON_REVIEW),
1081
1086
  conditional: Conditional
@@ -1411,28 +1416,20 @@ function schemaPriority(schema) {
1411
1416
  return idx === -1 ? 9999 : idx;
1412
1417
  }
1413
1418
  function safeUnion(schemas) {
1419
+ const sortedSchemas = [...schemas].sort(
1420
+ (a, b) => schemaPriority(a) - schemaPriority(b)
1421
+ );
1414
1422
  return z12.any().superRefine((val, ctx) => {
1415
- const successful = schemas.filter((s) => s.safeParse(val).success);
1416
- if (successful.length === 1) {
1417
- return;
1418
- }
1419
- if (successful.length === 0) {
1420
- ctx.addIssue({
1421
- code: "invalid_type",
1422
- expected: "custom",
1423
- message: "Value does not match any schema"
1424
- });
1425
- return;
1426
- }
1427
- successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
1428
- const best = successful[0];
1429
- if (!best.safeParse(val).success) {
1430
- ctx.addIssue({
1431
- expected: "custom",
1432
- code: "invalid_type",
1433
- message: "Value did not match the best schema"
1434
- });
1423
+ for (const schema of sortedSchemas) {
1424
+ if (schema.safeParse(val).success) {
1425
+ return;
1426
+ }
1435
1427
  }
1428
+ ctx.addIssue({
1429
+ code: "invalid_type",
1430
+ expected: "custom",
1431
+ message: "Value does not match any schema"
1432
+ });
1436
1433
  }).meta({
1437
1434
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1438
1435
  });
@@ -1742,6 +1739,9 @@ var FlagConfig = z15.object({
1742
1739
  "Indicates if this flag expects an action to be performed to be cleared."
1743
1740
  ),
1744
1741
  label: TranslationConfig.describe("Human readable label of the flag.")
1742
+ }).meta({
1743
+ description: "Flag configuration",
1744
+ id: "FlagConfig"
1745
1745
  });
1746
1746
  var ActionFlagConfig = z15.object({
1747
1747
  id: Flag,
@@ -1749,6 +1749,9 @@ var ActionFlagConfig = z15.object({
1749
1749
  conditional: Conditional.optional().describe(
1750
1750
  "When conditional is met, the operation is performed on the flag. If not provided, the operation is performed unconditionally."
1751
1751
  )
1752
+ }).meta({
1753
+ description: "Action flag configuration",
1754
+ id: "ActionFlagConfig"
1752
1755
  });
1753
1756
 
1754
1757
  // ../commons/src/events/EventMetadata.ts
@@ -1770,8 +1773,7 @@ var ActionCreationMetadata = z16.object({
1770
1773
  ),
1771
1774
  createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
1772
1775
  acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
1773
- createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation."),
1774
- createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
1776
+ createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
1775
1777
  });
1776
1778
  var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1777
1779
  registrationNumber: z16.string().describe(
@@ -1799,9 +1801,6 @@ var EventMetadata = z16.object({
1799
1801
  createdAtLocation: UUID.nullish().describe(
1800
1802
  "Location of the user who created the event."
1801
1803
  ),
1802
- createdBySignature: DocumentPath.nullish().describe(
1803
- "Signature of the user who created the event."
1804
- ),
1805
1804
  updatedAtLocation: UUID.nullish().describe(
1806
1805
  "Location of the user who last changed the status."
1807
1806
  ),
@@ -2889,10 +2888,10 @@ var VerificationPageConfig = FormPageConfig.extend({
2889
2888
  type: z21.literal(PageTypes.enum.VERIFICATION),
2890
2889
  actions: VerificationActionConfig
2891
2890
  });
2892
- var PageConfig = z21.discriminatedUnion("type", [
2893
- FormPageConfig,
2894
- VerificationPageConfig
2895
- ]);
2891
+ var PageConfig = z21.discriminatedUnion("type", [FormPageConfig, VerificationPageConfig]).meta({
2892
+ description: "Page configuration",
2893
+ id: "PageConfig"
2894
+ });
2896
2895
 
2897
2896
  // ../commons/src/events/FormConfig.ts
2898
2897
  var DeclarationFormConfig = z22.object({
@@ -3801,6 +3800,9 @@ function precompileActionSchemas(eventConfigurations) {
3801
3800
  function isAgeValue(value) {
3802
3801
  return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
3803
3802
  }
3803
+ function mergeWithBaseFormState(values, context) {
3804
+ return { ...context.baseFormState, ...values };
3805
+ }
3804
3806
  function validate(schema, data) {
3805
3807
  const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
3806
3808
  if ("$form" in data) {
@@ -3839,7 +3841,7 @@ function isOnline() {
3839
3841
  }
3840
3842
  function isConditionMet(conditional, values, context, eventIndex) {
3841
3843
  return validate(conditional, {
3842
- $form: values,
3844
+ $form: mergeWithBaseFormState(values, context),
3843
3845
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3844
3846
  $online: isOnline(),
3845
3847
  $user: context.user,
@@ -3868,7 +3870,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
3868
3870
  return true;
3869
3871
  }
3870
3872
  const validConditionals = getConditionalActionsForField(field3, {
3871
- $form: form,
3873
+ $form: mergeWithBaseFormState(form, context),
3872
3874
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3873
3875
  $online: isOnline(),
3874
3876
  $user: context.user,
@@ -4060,7 +4062,7 @@ function runFieldValidations({
4060
4062
  return [];
4061
4063
  }
4062
4064
  const conditionalParameters = {
4063
- $form: form,
4065
+ $form: mergeWithBaseFormState(form, context),
4064
4066
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
4065
4067
  /**
4066
4068
  * In real use cases, there can be hundreds of thousands of locations.
@@ -4304,17 +4306,16 @@ function isPageVisible(page, formValues, context) {
4304
4306
  }
4305
4307
  return isConditionMet(page.conditional, formValues, context);
4306
4308
  }
4307
- function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false, declarationContext) {
4309
+ function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
4308
4310
  const base = (0, import_lodash.cloneDeep)(formValues);
4309
4311
  function fn(prevVisibilityContext) {
4310
- const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
4311
4312
  const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
4312
4313
  const fieldConfig = fields.filter((f) => f.id === fieldId);
4313
4314
  if (!fieldConfig.length) {
4314
4315
  return false;
4315
4316
  }
4316
4317
  const isHidden = fieldConfig.every(
4317
- (f) => !isFieldVisible(f, visibilityForm, validatorContext)
4318
+ (f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
4318
4319
  );
4319
4320
  if (!isHidden) {
4320
4321
  return false;
@@ -4332,7 +4333,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
4332
4333
  const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4333
4334
  const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4334
4335
  const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
4335
- return hiddenFields.some((f) => f.id === fieldId);
4336
+ return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
4336
4337
  });
4337
4338
  return omitHiddenFields(
4338
4339
  visibleFields,
@@ -4379,13 +4380,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
4379
4380
  }
4380
4381
  function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
4381
4382
  const annotationFields = getActionAnnotationFields(actionConfig);
4382
- return omitHiddenFields(
4383
- annotationFields,
4384
- annotation,
4385
- context,
4386
- false,
4387
- declaration
4388
- );
4383
+ return omitHiddenFields(annotationFields, annotation, {
4384
+ ...context,
4385
+ baseFormState: declaration
4386
+ });
4389
4387
  }
4390
4388
  function deepMerge(currentDocument, actionDocument) {
4391
4389
  const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
@@ -5897,6 +5895,9 @@ var BaseActionInput = z38.object({
5897
5895
  originalActionId: UUID.optional(),
5898
5896
  // should not be part of base action.
5899
5897
  keepAssignment: z38.boolean().optional(),
5898
+ keepAssignmentIfAccepted: z38.boolean().optional(),
5899
+ keepAssignmentIfRejected: z38.boolean().optional(),
5900
+ waitFor: z38.boolean().optional(),
5900
5901
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5901
5902
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
5902
5903
  createdAtLocation: UUID.nullish().describe(
@@ -6150,7 +6151,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
6150
6151
  createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
6151
6152
  acceptedAt: acceptAction.createdAt,
6152
6153
  createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
6153
- createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
6154
6154
  registrationNumber
6155
6155
  };
6156
6156
  }
@@ -6364,17 +6364,6 @@ function getAssignedUserFromActions(actions) {
6364
6364
  return user2;
6365
6365
  }, null);
6366
6366
  }
6367
- function getAssignedUserSignatureFromActions(actions) {
6368
- return actions.reduce((signature, action) => {
6369
- if (action.type === ActionType.ASSIGN) {
6370
- return action.createdBySignature || null;
6371
- }
6372
- if (action.type === ActionType.UNASSIGN) {
6373
- return null;
6374
- }
6375
- return signature;
6376
- }, null);
6377
- }
6378
6367
  function deepDropNulls(obj) {
6379
6368
  if (Array.isArray(obj)) {
6380
6369
  return obj.map(deepDropNulls);
@@ -6470,10 +6459,8 @@ function getCurrentEventState(event2, config) {
6470
6459
  createdBy: creationAction.createdBy,
6471
6460
  createdByUserType: creationAction.createdByUserType,
6472
6461
  createdAtLocation: creationAction.createdAtLocation,
6473
- createdBySignature: creationAction.createdBySignature,
6474
6462
  updatedAt: acceptedActionMetadata.createdAt,
6475
6463
  assignedTo: getAssignedUserFromActions(acceptedActions),
6476
- assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
6477
6464
  updatedBy: requestActionMetadata.createdBy,
6478
6465
  updatedAtLocation: requestActionMetadata.createdAtLocation,
6479
6466
  declaration,
@@ -9732,7 +9719,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
9732
9719
  createdBy: overrides.createdBy ?? generateUuid(rng),
9733
9720
  createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
9734
9721
  updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
9735
- createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
9736
9722
  updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
9737
9723
  assignedTo: overrides.assignedTo ?? null,
9738
9724
  updatedBy: overrides.updatedBy ?? generateUuid(rng),
@@ -10003,6 +9989,39 @@ function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
10003
9989
  (scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
10004
9990
  );
10005
9991
  }
9992
+ function getAdministrativeAreaHierarchy(administrativeAreaId, administrativeAreas) {
9993
+ const collectedLocations = [];
9994
+ const parsedAdministrativeAreaId = administrativeAreaId && UUID.safeParse(administrativeAreaId).data;
9995
+ let current = parsedAdministrativeAreaId ? administrativeAreas.get(parsedAdministrativeAreaId) : null;
9996
+ while (current) {
9997
+ collectedLocations.push(current);
9998
+ if (!current.parentId) {
9999
+ break;
10000
+ }
10001
+ const parentId = current.parentId;
10002
+ current = administrativeAreas.get(parentId);
10003
+ }
10004
+ return collectedLocations;
10005
+ }
10006
+ function getLocationHierarchy(selectedId, context) {
10007
+ const { administrativeAreas, locations } = context;
10008
+ const loc = locations.get(selectedId);
10009
+ if (loc) {
10010
+ if (loc.administrativeAreaId) {
10011
+ const hierarchy2 = getAdministrativeAreaHierarchy(
10012
+ loc.administrativeAreaId,
10013
+ administrativeAreas
10014
+ );
10015
+ return [...hierarchy2.reverse().map((area) => area.id), loc.id];
10016
+ }
10017
+ return [loc.id];
10018
+ }
10019
+ const hierarchy = getAdministrativeAreaHierarchy(
10020
+ selectedId,
10021
+ administrativeAreas
10022
+ );
10023
+ return hierarchy.reverse().map((area) => area.id);
10024
+ }
10006
10025
 
10007
10026
  // ../commons/src/events/scopes.ts
10008
10027
  var ACTION_SCOPE_MAP = {
@@ -10077,6 +10096,25 @@ function isActionInScope({
10077
10096
  );
10078
10097
  return canAccess;
10079
10098
  }
10099
+ function getAvailableRolesForUserUpdatePayload({
10100
+ allRoles,
10101
+ userLocation,
10102
+ acceptedScopes,
10103
+ userRequesting
10104
+ }) {
10105
+ const availableRoles = allRoles.filter((role) => {
10106
+ const canAccess = canAccessOtherUserWithScopes({
10107
+ userToAccess: {
10108
+ ...userLocation,
10109
+ role
10110
+ },
10111
+ user: userRequesting,
10112
+ scopes: acceptedScopes
10113
+ });
10114
+ return canAccess;
10115
+ });
10116
+ return availableRoles;
10117
+ }
10080
10118
 
10081
10119
  // ../commons/src/events/serializers/user/deserializer.ts
10082
10120
  function userDeserializer(serializedUserField, user2) {
@@ -1,5 +1,5 @@
1
1
  export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
2
- export declare const UPSTREAM_BRANCH = "develop";
2
+ export declare const UPSTREAM_BRANCH = "release-v2.0.0";
3
3
  /**
4
4
  * Runs a git command in the country config working directory.
5
5
  *
@@ -1 +1 @@
1
- {"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAG1D,eAAO,MAAM,eAAe,YAAY,CAAA;AAcxC;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,MAAc,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAO9C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAMtC;AAID,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,mBAAmB,CAAA;AAc/C;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,MAAc,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAO9C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAMtC;AAID,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
@@ -59,8 +59,7 @@ exports.main = main;
59
59
  */
60
60
  const child_process_1 = require("child_process");
61
61
  exports.UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
62
- // @TODO: This needs to be changed to 'release-v2.0.0' once the branch is created
63
- exports.UPSTREAM_BRANCH = 'develop';
62
+ exports.UPSTREAM_BRANCH = 'release-v2.0.0';
64
63
  // Remote name used only for the duration of this codemod. Prefixed to avoid
65
64
  // clashing with remotes the user may have (origin, upstream, etc.).
66
65
  const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
@@ -1,3 +1,11 @@
1
- declare function main(): Promise<void>;
1
+ interface DeleteInfrastructureOptions {
2
+ /**
3
+ * Top-level entries directly under `infrastructure/` to preserve. Names
4
+ * match against the basename of each entry (file or directory). When
5
+ * empty (the default), the whole `infrastructure/` directory is deleted.
6
+ */
7
+ keep?: string[];
8
+ }
9
+ declare function main({ keep }?: DeleteInfrastructureOptions): Promise<void>;
2
10
  export { main };
3
11
  //# sourceMappingURL=delete-infrastructure-directory.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"delete-infrastructure-directory.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/delete-infrastructure-directory.ts"],"names":[],"mappings":"AA4CA,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAgCnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"delete-infrastructure-directory.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/delete-infrastructure-directory.ts"],"names":[],"mappings":"AAoDA,UAAU,2BAA2B;IACnC;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAChB;AAED,iBAAe,IAAI,CAAC,EAClB,IAAS,EACV,GAAE,2BAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,CA4FlD;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
@@ -27,20 +27,28 @@ exports.main = main;
27
27
  * via Docker Swarm. In that case the `infrastructure/` directory shipped
28
28
  * with opencrvs-countryconfig is no longer needed and can be removed.
29
29
  *
30
+ * Some non-Swarm deployments still need a small subset of
31
+ * `infrastructure/` (e.g. `postgres/` and `metabase/`). Pass `keep` to
32
+ * preserve those top-level subdirectories — everything else under
33
+ * `infrastructure/` is deleted, and the kept subdirectories can then be
34
+ * refreshed from upstream by `merge-infrastructure-directory.ts` with the
35
+ * matching `subdirs` option.
36
+ *
30
37
  * Usage:
31
38
  * ts-node -r tsconfig-paths/register src/migrations/v2.0/delete-infrastructure-directory.ts
32
39
  *
33
40
  * What it does:
34
41
  * 1. Stages deletion of all tracked files under `infrastructure/` via
35
- * `git rm -rf --ignore-unmatch -- infrastructure/`. This both removes
36
- * the files from the working tree and records the deletion in the
42
+ * `git rm -rf --ignore-unmatch -- <path>`. This both removes the
43
+ * files from the working tree and records the deletion in the
37
44
  * index, so it shows up in the upgrade commit alongside the other
38
- * codemod changes.
45
+ * codemod changes. When `keep` is provided, deletion is scoped to
46
+ * the top-level entries that are NOT in `keep`.
39
47
  * 2. Cleans up any untracked files / empty directory that `git rm` left
40
- * behind, so the path is fully gone from the working tree.
48
+ * behind, so the deleted paths are fully gone from the working tree.
41
49
  *
42
50
  * Caveats:
43
- * - Destructive: any local edits to `infrastructure/` are lost. Run on a
51
+ * - Destructive: any local edits to deleted paths are lost. Run on a
44
52
  * clean working tree (or after committing your local changes).
45
53
  * - If `infrastructure/` doesn't exist, this codemod is a no-op.
46
54
  * - Requires git to be installed and the country config working directory
@@ -51,27 +59,65 @@ const path_1 = require("path");
51
59
  const checkout_upstream_files_1 = require("./checkout-upstream-files");
52
60
  const INFRASTRUCTURE_DIR = 'infrastructure';
53
61
  function main() {
54
- return __awaiter(this, void 0, void 0, function* () {
62
+ return __awaiter(this, arguments, void 0, function* ({ keep = [] } = {}) {
55
63
  const fullPath = (0, path_1.join)(process.cwd(), INFRASTRUCTURE_DIR);
56
64
  if (!(0, fs_1.existsSync)(fullPath)) {
57
65
  console.log(`'${INFRASTRUCTURE_DIR}/' not found in ${process.cwd()} — nothing to delete.`);
58
66
  return;
59
67
  }
60
- console.log(`Deleting '${INFRASTRUCTURE_DIR}/'...\n`);
61
68
  (0, checkout_upstream_files_1.assertIsGitRepo)();
62
- // `git rm -rf --ignore-unmatch` removes tracked files (working tree + index)
63
- // and is a no-op for paths with no tracked entries, so it's safe to run
64
- // even when `infrastructure/` exists only as untracked files.
65
- (0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', `${INFRASTRUCTURE_DIR}/`], {
66
- silent: true
67
- });
68
- console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR}/'.`);
69
- // `git rm` leaves untracked files (and any now-empty directory) on disk;
70
- // remove whatever's left so the path is fully gone.
71
- if ((0, fs_1.existsSync)(fullPath)) {
72
- (0, fs_1.rmSync)(fullPath, { recursive: true, force: true });
73
- console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR}/'.`);
69
+ // ─── Whole-directory delete (legacy behavior) ────────────────────────
70
+ if (keep.length === 0) {
71
+ console.log(`Deleting '${INFRASTRUCTURE_DIR}/'...\n`);
72
+ // `git rm -rf --ignore-unmatch` removes tracked files (working tree +
73
+ // index) and is a no-op for paths with no tracked entries, so it's
74
+ // safe to run even when `infrastructure/` exists only as untracked
75
+ // files.
76
+ (0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', `${INFRASTRUCTURE_DIR}/`], {
77
+ silent: true
78
+ });
79
+ console.log(` Staged deletion of tracked files under '${INFRASTRUCTURE_DIR}/'.`);
80
+ // `git rm` leaves untracked files (and any now-empty directory) on
81
+ // disk; remove whatever's left so the path is fully gone.
82
+ if ((0, fs_1.existsSync)(fullPath)) {
83
+ (0, fs_1.rmSync)(fullPath, { recursive: true, force: true });
84
+ console.log(` Removed remaining untracked files under '${INFRASTRUCTURE_DIR}/'.`);
85
+ }
86
+ console.log(`\n Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
87
+ return;
88
+ }
89
+ // ─── Selective delete: keep listed top-level entries ─────────────────
90
+ const keepSet = new Set(keep);
91
+ console.log(`Deleting contents of '${INFRASTRUCTURE_DIR}/' except: ${[...keepSet]
92
+ .map((name) => `'${name}'`)
93
+ .join(', ')}\n`);
94
+ const topLevelEntries = (0, fs_1.readdirSync)(fullPath, { withFileTypes: true });
95
+ let deleted = 0;
96
+ for (const entry of topLevelEntries) {
97
+ if (keepSet.has(entry.name)) {
98
+ console.log(` Keeping '${INFRASTRUCTURE_DIR}/${entry.name}'.`);
99
+ continue;
100
+ }
101
+ // Append a trailing slash for directories so git treats it as a tree
102
+ // pathspec (matches the recursive behavior of `git rm -rf`).
103
+ const relPath = `${INFRASTRUCTURE_DIR}/${entry.name}${entry.isDirectory() ? '/' : ''}`;
104
+ (0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', relPath], { silent: true });
105
+ const fullEntryPath = (0, path_1.join)(fullPath, entry.name);
106
+ if ((0, fs_1.existsSync)(fullEntryPath)) {
107
+ (0, fs_1.rmSync)(fullEntryPath, { recursive: true, force: true });
108
+ }
109
+ console.log(` Deleted '${relPath}'.`);
110
+ deleted++;
111
+ }
112
+ // Note any requested keeps that weren't actually present, so the dev
113
+ // notices typos / missing directories.
114
+ const presentNames = new Set(topLevelEntries.map((e) => e.name));
115
+ const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
116
+ if (missingKeeps.length > 0) {
117
+ console.warn(` [warn] Requested to keep ${missingKeeps
118
+ .map((n) => `'${n}'`)
119
+ .join(', ')} but they don't exist under '${INFRASTRUCTURE_DIR}/'.`);
74
120
  }
75
- console.log(`\n Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
121
+ console.log(`\n Done. Deleted ${deleted} top-level entr${deleted === 1 ? 'y' : 'ies'}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
76
122
  });
77
123
  }
@@ -0,0 +1,3 @@
1
+ declare function main(): Promise<void>;
2
+ export { main };
3
+ //# sourceMappingURL=fix-accept-requested-registration-function-type.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fix-accept-requested-registration-function-type.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/fix-accept-requested-registration-function-type.ts"],"names":[],"mappings":"AAuFA,iBAAe,IAAI,kBA6ClB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
@@ -0,0 +1,110 @@
1
+ "use strict";
2
+ /*
3
+ * This Source Code Form is subject to the terms of the Mozilla Public
4
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
5
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
+ *
7
+ * OpenCRVS is also distributed under the terms of the Civil Registration
8
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
9
+ *
10
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
11
+ */
12
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
13
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
14
+ return new (P || (P = Promise))(function (resolve, reject) {
15
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
16
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
17
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
18
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
19
+ });
20
+ };
21
+ var __importDefault = (this && this.__importDefault) || function (mod) {
22
+ return (mod && mod.__esModule) ? mod : { "default": mod };
23
+ };
24
+ Object.defineProperty(exports, "__esModule", { value: true });
25
+ exports.main = main;
26
+ /**
27
+ * Codemod: In `acceptRequestedRegistration`, update the `action` parameter type from:
28
+ * action: ActionInput
29
+ * to:
30
+ * action: Extract<ActionInput, { type?: 'REGISTER' }>
31
+ *
32
+ * What it does:
33
+ * - Scans all TypeScript files under `src/`
34
+ * - Finds `acceptRequestedRegistration` (function declaration or const assignment)
35
+ * - Rewrites only the `action` parameter when its type is exactly `ActionInput`
36
+ * - Saves modified files in-place
37
+ */
38
+ /* eslint-disable no-console */
39
+ const ts_morph_1 = require("ts-morph");
40
+ const path_1 = __importDefault(require("path"));
41
+ const TARGET_FUNCTION_NAME = 'acceptRequestedRegistration';
42
+ const ACTION_PARAMETER_NAME = 'action';
43
+ const OLD_TYPE = 'ActionInput';
44
+ const NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
45
+ function isAcceptRequestedRegistrationParameter(parameter) {
46
+ const functionDeclaration = parameter.getFirstAncestorByKind(ts_morph_1.SyntaxKind.FunctionDeclaration);
47
+ if ((functionDeclaration === null || functionDeclaration === void 0 ? void 0 : functionDeclaration.getName()) === TARGET_FUNCTION_NAME) {
48
+ return true;
49
+ }
50
+ const arrowFunction = parameter.getFirstAncestorByKind(ts_morph_1.SyntaxKind.ArrowFunction);
51
+ const variableDeclaration = arrowFunction === null || arrowFunction === void 0 ? void 0 : arrowFunction.getFirstAncestorByKind(ts_morph_1.SyntaxKind.VariableDeclaration);
52
+ return (variableDeclaration === null || variableDeclaration === void 0 ? void 0 : variableDeclaration.getName()) === TARGET_FUNCTION_NAME;
53
+ }
54
+ function processFile(filePath, project) {
55
+ const sourceFile = project.getSourceFile(filePath);
56
+ if (!sourceFile)
57
+ return 0;
58
+ let updatedCount = 0;
59
+ for (const parameter of sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.Parameter)) {
60
+ if (parameter.getName() !== ACTION_PARAMETER_NAME) {
61
+ continue;
62
+ }
63
+ if (!isAcceptRequestedRegistrationParameter(parameter)) {
64
+ continue;
65
+ }
66
+ const typeNode = parameter.getTypeNode();
67
+ if (!typeNode || typeNode.getText() !== OLD_TYPE) {
68
+ continue;
69
+ }
70
+ parameter.setType(NEW_TYPE);
71
+ updatedCount++;
72
+ console.log(` [${path_1.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`);
73
+ }
74
+ return updatedCount;
75
+ }
76
+ function main() {
77
+ return __awaiter(this, void 0, void 0, function* () {
78
+ const srcDir = path_1.default.join(process.cwd(), 'src');
79
+ console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}\n`);
80
+ const project = new ts_morph_1.Project({
81
+ tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
82
+ skipAddingFilesFromTsConfig: false
83
+ });
84
+ const sourceFiles = project.getSourceFiles().filter((sf) => {
85
+ const filePath = sf.getFilePath();
86
+ return filePath.includes('/src/') && !filePath.includes('/node_modules/');
87
+ });
88
+ let totalUpdated = 0;
89
+ const modifiedFiles = [];
90
+ for (const sourceFile of sourceFiles) {
91
+ const filePath = sourceFile.getFilePath();
92
+ const updated = processFile(filePath, project);
93
+ if (updated > 0) {
94
+ totalUpdated += updated;
95
+ modifiedFiles.push(filePath);
96
+ }
97
+ }
98
+ if (modifiedFiles.length === 0) {
99
+ console.log(`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`);
100
+ return;
101
+ }
102
+ console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
103
+ for (const filePath of modifiedFiles) {
104
+ const sourceFile = project.getSourceFileOrThrow(filePath);
105
+ yield sourceFile.save();
106
+ console.log(` Saved: ${path_1.default.relative(process.cwd(), filePath)}`);
107
+ }
108
+ console.log(`\nDone. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`);
109
+ });
110
+ }
@@ -3,9 +3,11 @@
3
3
  * directory.
4
4
  *
5
5
  * @param dockerSwarm - When true, the local `infrastructure/` directory is
6
- * merged with upstream changes (Docker Swarm deployments still need it).
7
- * When false (the default), `infrastructure/` is deleted entirely, since
8
- * non-Swarm deployments no longer ship it.
6
+ * merged with upstream changes in its entirety (Docker Swarm deployments
7
+ * still need it all). When false (the default), everything under
8
+ * `infrastructure/` is deleted EXCEPT the subdirectories listed in
9
+ * `NON_SWARM_INFRA_SUBDIRS`, and those preserved subdirectories are then
10
+ * merged with upstream.
9
11
  */
10
12
  export declare function runUpgrade(dockerSwarm: boolean): Promise<void>;
11
13
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"AAqCA;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBA+BpD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"AA8CA;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBAiCpD"}