@opencrvs/toolkit 2.0.0-rc.18d8164 → 2.0.0-rc.18f6ed6

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/dist/application-config/index.js +29 -29
  2. package/dist/cli.js +392 -128
  3. package/dist/commons/api/router.d.ts +3359 -239
  4. package/dist/commons/conditionals/validate.d.ts +1 -0
  5. package/dist/commons/events/ActionDocument.d.ts +6 -0
  6. package/dist/commons/events/ActionInput.d.ts +114 -0
  7. package/dist/commons/events/Draft.d.ts +3 -0
  8. package/dist/commons/events/EventDocument.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/WorkqueueConfig.d.ts +146 -146
  12. package/dist/commons/events/state/index.d.ts +0 -4
  13. package/dist/commons/events/state/utils.d.ts +3 -2
  14. package/dist/commons/events/utils.d.ts +4 -1
  15. package/dist/conditionals/index.js +3 -1
  16. package/dist/events/index.js +58 -78
  17. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  18. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  19. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  20. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  21. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  22. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  23. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts +3 -0
  24. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map +1 -0
  25. package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js +110 -0
  26. package/dist/migrations/v2.0/index.d.ts +5 -3
  27. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  28. package/dist/migrations/v2.0/index.js +390 -126
  29. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  30. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  31. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  32. package/dist/migrations/v2.0/migrate-scopes.d.ts.map +1 -1
  33. package/dist/migrations/v2.0/migrate-scopes.js +54 -30
  34. package/dist/migrations/v2.0/migrate-workqueue-configs.d.ts.map +1 -1
  35. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  36. package/dist/notification/index.js +45 -48
  37. package/dist/scopes/index.js +3 -1
  38. package/opencrvs-toolkit-2.0.0-rc.18f6ed6.tgz +0 -0
  39. package/package.json +1 -1
  40. package/tsconfig.tsbuildinfo +1 -1
  41. package/opencrvs-toolkit-2.0.0-rc.18d8164.tgz +0 -0
@@ -306,7 +306,6 @@ __export(events_exports, {
306
306
  getAllUniqueFields: () => getAllUniqueFields,
307
307
  getAnnotationFromDrafts: () => getAnnotationFromDrafts,
308
308
  getAssignedUserFromActions: () => getAssignedUserFromActions,
309
- getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
310
309
  getAssignmentStatus: () => getAssignmentStatus,
311
310
  getAvailableActionsForEvent: () => getAvailableActionsForEvent,
312
311
  getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
@@ -705,7 +704,9 @@ var decodeScope = (query) => {
705
704
  };
706
705
  var DEFAULT_SCOPE_OPTIONS = {
707
706
  placeOfEvent: JurisdictionFilter.enum.all,
708
- accessLevel: JurisdictionFilter.enum.all
707
+ accessLevel: JurisdictionFilter.enum.all,
708
+ registeredIn: JurisdictionFilter.enum.all,
709
+ declaredIn: JurisdictionFilter.enum.all
709
710
  };
710
711
  function getAcceptedScopesByType({
711
712
  acceptedScopes,
@@ -1078,7 +1079,10 @@ var ActionConditional = z7.discriminatedUnion("type", [
1078
1079
  ShowConditional,
1079
1080
  // Action can be shown to the user in the list but as disabled
1080
1081
  EnableConditional
1081
- ]);
1082
+ ]).meta({
1083
+ description: "Action conditional configuration",
1084
+ id: "ActionConditional"
1085
+ });
1082
1086
  var DisplayOnReviewConditional = z7.object({
1083
1087
  type: z7.literal(ConditionalType.DISPLAY_ON_REVIEW),
1084
1088
  conditional: Conditional
@@ -1414,28 +1418,20 @@ function schemaPriority(schema) {
1414
1418
  return idx === -1 ? 9999 : idx;
1415
1419
  }
1416
1420
  function safeUnion(schemas) {
1421
+ const sortedSchemas = [...schemas].sort(
1422
+ (a, b) => schemaPriority(a) - schemaPriority(b)
1423
+ );
1417
1424
  return z12.any().superRefine((val, ctx) => {
1418
- const successful = schemas.filter((s) => s.safeParse(val).success);
1419
- if (successful.length === 1) {
1420
- return;
1421
- }
1422
- if (successful.length === 0) {
1423
- ctx.addIssue({
1424
- code: "invalid_type",
1425
- expected: "custom",
1426
- message: "Value does not match any schema"
1427
- });
1428
- return;
1429
- }
1430
- successful.sort((a, b) => schemaPriority(a) - schemaPriority(b));
1431
- const best = successful[0];
1432
- if (!best.safeParse(val).success) {
1433
- ctx.addIssue({
1434
- expected: "custom",
1435
- code: "invalid_type",
1436
- message: "Value did not match the best schema"
1437
- });
1425
+ for (const schema of sortedSchemas) {
1426
+ if (schema.safeParse(val).success) {
1427
+ return;
1428
+ }
1438
1429
  }
1430
+ ctx.addIssue({
1431
+ code: "invalid_type",
1432
+ expected: "custom",
1433
+ message: "Value does not match any schema"
1434
+ });
1439
1435
  }).meta({
1440
1436
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1441
1437
  });
@@ -1652,8 +1648,9 @@ var RequestedCorrectionAction = ActionBase.extend(
1652
1648
  var ApprovedCorrectionAction = ActionBase.extend(
1653
1649
  z14.object({
1654
1650
  type: z14.literal(ActionType.APPROVE_CORRECTION),
1655
- requestId: z14.string()
1651
+ requestId: z14.string(),
1656
1652
  // TODO move into 'content' property
1653
+ content: z14.object({ immediateCorrection: z14.boolean().optional() }).optional()
1657
1654
  }).shape
1658
1655
  );
1659
1656
  var RejectedCorrectionAction = ActionBase.extend(
@@ -1745,6 +1742,9 @@ var FlagConfig = z15.object({
1745
1742
  "Indicates if this flag expects an action to be performed to be cleared."
1746
1743
  ),
1747
1744
  label: TranslationConfig.describe("Human readable label of the flag.")
1745
+ }).meta({
1746
+ description: "Flag configuration",
1747
+ id: "FlagConfig"
1748
1748
  });
1749
1749
  var ActionFlagConfig = z15.object({
1750
1750
  id: Flag,
@@ -1752,6 +1752,9 @@ var ActionFlagConfig = z15.object({
1752
1752
  conditional: Conditional.optional().describe(
1753
1753
  "When conditional is met, the operation is performed on the flag. If not provided, the operation is performed unconditionally."
1754
1754
  )
1755
+ }).meta({
1756
+ description: "Action flag configuration",
1757
+ id: "ActionFlagConfig"
1755
1758
  });
1756
1759
 
1757
1760
  // ../commons/src/events/EventMetadata.ts
@@ -1773,8 +1776,7 @@ var ActionCreationMetadata = z16.object({
1773
1776
  ),
1774
1777
  createdByUserType: z16.enum(["user", "system"]).nullish().describe("Whether the user is a normal user or a system."),
1775
1778
  acceptedAt: z16.iso.datetime().describe("Timestamp when the action request was accepted."),
1776
- createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation."),
1777
- createdBySignature: z16.string().nullish().describe("Signature of the user who created the action request.")
1779
+ createdByRole: z16.string().optional().describe("Role of the user at the time of action request creation.")
1778
1780
  });
1779
1781
  var RegistrationCreationMetadata = ActionCreationMetadata.extend({
1780
1782
  registrationNumber: z16.string().describe(
@@ -1802,9 +1804,6 @@ var EventMetadata = z16.object({
1802
1804
  createdAtLocation: UUID.nullish().describe(
1803
1805
  "Location of the user who created the event."
1804
1806
  ),
1805
- createdBySignature: DocumentPath.nullish().describe(
1806
- "Signature of the user who created the event."
1807
- ),
1808
1807
  updatedAtLocation: UUID.nullish().describe(
1809
1808
  "Location of the user who last changed the status."
1810
1809
  ),
@@ -2179,7 +2178,7 @@ var FieldId = import_v43.default.string().superRefine((val, ctx) => {
2179
2178
  }
2180
2179
  }).describe("Unique identifier for the field");
2181
2180
  var FieldReference = import_v43.default.object({
2182
- $$field: FieldId,
2181
+ $$field: FieldId.describe("Id of the field to reference"),
2183
2182
  $$subfield: import_v43.default.array(import_v43.default.string()).optional().default([]).describe(
2184
2183
  'If the FieldValue is an object, subfield can be used to refer to e.g. `["foo", "bar"]` in `{ foo: { bar: 3 } }`'
2185
2184
  )
@@ -2892,10 +2891,10 @@ var VerificationPageConfig = FormPageConfig.extend({
2892
2891
  type: z21.literal(PageTypes.enum.VERIFICATION),
2893
2892
  actions: VerificationActionConfig
2894
2893
  });
2895
- var PageConfig = z21.discriminatedUnion("type", [
2896
- FormPageConfig,
2897
- VerificationPageConfig
2898
- ]);
2894
+ var PageConfig = z21.discriminatedUnion("type", [FormPageConfig, VerificationPageConfig]).meta({
2895
+ description: "Page configuration",
2896
+ id: "PageConfig"
2897
+ });
2899
2898
 
2900
2899
  // ../commons/src/events/FormConfig.ts
2901
2900
  var DeclarationFormConfig = z22.object({
@@ -3804,6 +3803,9 @@ function precompileActionSchemas(eventConfigurations) {
3804
3803
  function isAgeValue(value) {
3805
3804
  return typeof value === "object" && value !== null && "age" in value && typeof value.age === "number";
3806
3805
  }
3806
+ function mergeWithBaseFormState(values, context) {
3807
+ return { ...context.baseFormState, ...values };
3808
+ }
3807
3809
  function validate(schema, data) {
3808
3810
  const validator = ajv.getSchema(schema.$id) || ajv.compile(schema);
3809
3811
  if ("$form" in data) {
@@ -3842,7 +3844,7 @@ function isOnline() {
3842
3844
  }
3843
3845
  function isConditionMet(conditional, values, context, eventIndex) {
3844
3846
  return validate(conditional, {
3845
- $form: values,
3847
+ $form: mergeWithBaseFormState(values, context),
3846
3848
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3847
3849
  $online: isOnline(),
3848
3850
  $user: context.user,
@@ -3871,7 +3873,7 @@ function isFieldConditionMet(field3, form, conditionalType, context) {
3871
3873
  return true;
3872
3874
  }
3873
3875
  const validConditionals = getConditionalActionsForField(field3, {
3874
- $form: form,
3876
+ $form: mergeWithBaseFormState(form, context),
3875
3877
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
3876
3878
  $online: isOnline(),
3877
3879
  $user: context.user,
@@ -4063,7 +4065,7 @@ function runFieldValidations({
4063
4065
  return [];
4064
4066
  }
4065
4067
  const conditionalParameters = {
4066
- $form: form,
4068
+ $form: mergeWithBaseFormState(form, context),
4067
4069
  $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" }),
4068
4070
  /**
4069
4071
  * In real use cases, there can be hundreds of thousands of locations.
@@ -4307,17 +4309,16 @@ function isPageVisible(page, formValues, context) {
4307
4309
  }
4308
4310
  return isConditionMet(page.conditional, formValues, context);
4309
4311
  }
4310
- function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false, declarationContext) {
4312
+ function omitHiddenFields(fields, formValues, validatorContext, includeHiddenFieldsWithNullValues = false) {
4311
4313
  const base = (0, import_lodash.cloneDeep)(formValues);
4312
4314
  function fn(prevVisibilityContext) {
4313
- const visibilityForm = declarationContext ? { ...declarationContext, ...prevVisibilityContext } : prevVisibilityContext;
4314
4315
  const cleaned = (0, import_lodash.omitBy)(base, (value, fieldId) => {
4315
4316
  const fieldConfig = fields.filter((f) => f.id === fieldId);
4316
4317
  if (!fieldConfig.length) {
4317
4318
  return false;
4318
4319
  }
4319
4320
  const isHidden = fieldConfig.every(
4320
- (f) => !isFieldVisible(f, visibilityForm, validatorContext)
4321
+ (f) => !isFieldVisible(f, prevVisibilityContext, validatorContext)
4321
4322
  );
4322
4323
  if (!isHidden) {
4323
4324
  return false;
@@ -4335,7 +4336,7 @@ function omitHiddenPaginatedFields(formConfig, values, validatorContext, include
4335
4336
  const visibleFields = formConfig.pages.filter((p) => isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4336
4337
  const hiddenFields = formConfig.pages.filter((p) => !isPageVisible(p, values, validatorContext)).flatMap((p) => p.fields);
4337
4338
  const valuesExceptHiddenPage = (0, import_lodash.omitBy)(values, (_2, fieldId) => {
4338
- return hiddenFields.some((f) => f.id === fieldId);
4339
+ return hiddenFields.some((f) => f.id === fieldId) && !visibleFields.some((f) => f.id === fieldId);
4339
4340
  });
4340
4341
  return omitHiddenFields(
4341
4342
  visibleFields,
@@ -4382,13 +4383,10 @@ function getVisibleVerificationPageIds(pages, annotation, context) {
4382
4383
  }
4383
4384
  function omitHiddenAnnotationFields(actionConfig, declaration, annotation, context) {
4384
4385
  const annotationFields = getActionAnnotationFields(actionConfig);
4385
- return omitHiddenFields(
4386
- annotationFields,
4387
- annotation,
4388
- context,
4389
- false,
4390
- declaration
4391
- );
4386
+ return omitHiddenFields(annotationFields, annotation, {
4387
+ ...context,
4388
+ baseFormState: declaration
4389
+ });
4392
4390
  }
4393
4391
  function deepMerge(currentDocument, actionDocument) {
4394
4392
  const currentDocumentClone = (0, import_lodash.cloneDeep)(currentDocument);
@@ -5377,7 +5375,7 @@ var _EventConfigBase = z33.object({
5377
5375
  ),
5378
5376
  label: TranslationConfig.describe("Human-readable label for the event type."),
5379
5377
  actions: z33.array(ActionConfig).describe(
5380
- "Configuration of system-defined actions associated with the event."
5378
+ "Configuration of core and custom actions associated with the event."
5381
5379
  ),
5382
5380
  actionOrder: z33.array(z33.string()).optional().describe(
5383
5381
  "Order of actions in the action menu. Use either the action type for core actions or the customActionType for custom actions."
@@ -5389,7 +5387,7 @@ var _EventConfigBase = z33.object({
5389
5387
  "Configuration of fields available in the advanced search feature."
5390
5388
  ),
5391
5389
  flags: z33.array(FlagConfig).optional().default([]).describe(
5392
- "Configuration of flags associated with the actions of this event type."
5390
+ "Configuration of custom flags associated with the actions of this event type."
5393
5391
  ),
5394
5392
  analytics: z33.boolean().optional().default(true).describe(
5395
5393
  "Indicates whether the records of this event type are included in analytics"
@@ -5828,18 +5826,11 @@ var WorkqueueConfigWithoutQuery = WorkqueueConfig.omit({
5828
5826
  query: true,
5829
5827
  columns: true
5830
5828
  });
5831
- var WorkqueueConfigInput = z37.object({
5832
- slug: z37.string().describe("Determines the url of the workqueue."),
5833
- name: TranslationConfig.describe(
5834
- "Title of the workflow (both in navigation and on the page)"
5835
- ),
5836
- query: CountryConfigQueryInputType,
5837
- action: z37.object({ type: WorkqueueActionType }).optional().describe(
5838
- "Workqueue call-to-action button configuration. This determines the quick action button shown on each event card and the action taken when the button is clicked."
5839
- ),
5840
- columns: z37.array(WorkqueueColumn).default(mandatoryColumns),
5841
- icon: AvailableIcons,
5842
- emptyMessage: TranslationConfig.optional()
5829
+ var WorkqueueConfigInput = WorkqueueConfig.extend({
5830
+ query: CountryConfigQueryInputType
5831
+ }).meta({
5832
+ description: "Workqueue configuration",
5833
+ id: "WorkqueueConfig"
5843
5834
  });
5844
5835
  function defineWorkqueue(workqueueInput) {
5845
5836
  const queryInput = workqueueInput.query;
@@ -5900,6 +5891,9 @@ var BaseActionInput = z38.object({
5900
5891
  originalActionId: UUID.optional(),
5901
5892
  // should not be part of base action.
5902
5893
  keepAssignment: z38.boolean().optional(),
5894
+ keepAssignmentIfAccepted: z38.boolean().optional(),
5895
+ keepAssignmentIfRejected: z38.boolean().optional(),
5896
+ waitFor: z38.boolean().optional(),
5903
5897
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5904
5898
  // @TODO: createdAtLocation should be limited to actions that system users can perform. For normal users, it should not be part of the base action.
5905
5899
  createdAtLocation: UUID.nullish().describe(
@@ -6017,7 +6011,8 @@ var RejectCorrectionActionInput = BaseActionInput.extend(
6017
6011
  var ApproveCorrectionActionInput = BaseActionInput.extend(
6018
6012
  z38.object({
6019
6013
  requestId: z38.string(),
6020
- type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION)
6014
+ type: z38.literal(ActionType.APPROVE_CORRECTION).default(ActionType.APPROVE_CORRECTION),
6015
+ content: z38.object({ immediateCorrection: z38.boolean().optional() }).optional()
6021
6016
  }).shape
6022
6017
  );
6023
6018
  var ReadActionInput = BaseActionInput.extend(
@@ -6153,7 +6148,6 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
6153
6148
  createdAtLocation: requestAction?.createdAtLocation ?? acceptAction.createdAtLocation,
6154
6149
  acceptedAt: acceptAction.createdAt,
6155
6150
  createdByRole: requestAction?.createdByRole ?? acceptAction.createdByRole,
6156
- createdBySignature: requestAction?.createdBySignature ?? acceptAction.createdBySignature,
6157
6151
  registrationNumber
6158
6152
  };
6159
6153
  }
@@ -6367,17 +6361,6 @@ function getAssignedUserFromActions(actions) {
6367
6361
  return user2;
6368
6362
  }, null);
6369
6363
  }
6370
- function getAssignedUserSignatureFromActions(actions) {
6371
- return actions.reduce((signature, action) => {
6372
- if (action.type === ActionType.ASSIGN) {
6373
- return action.createdBySignature || null;
6374
- }
6375
- if (action.type === ActionType.UNASSIGN) {
6376
- return null;
6377
- }
6378
- return signature;
6379
- }, null);
6380
- }
6381
6364
  function deepDropNulls(obj) {
6382
6365
  if (Array.isArray(obj)) {
6383
6366
  return obj.map(deepDropNulls);
@@ -6473,10 +6456,8 @@ function getCurrentEventState(event2, config) {
6473
6456
  createdBy: creationAction.createdBy,
6474
6457
  createdByUserType: creationAction.createdByUserType,
6475
6458
  createdAtLocation: creationAction.createdAtLocation,
6476
- createdBySignature: creationAction.createdBySignature,
6477
6459
  updatedAt: acceptedActionMetadata.createdAt,
6478
6460
  assignedTo: getAssignedUserFromActions(acceptedActions),
6479
- assignedToSignature: getAssignedUserSignatureFromActions(acceptedActions),
6480
6461
  updatedBy: requestActionMetadata.createdBy,
6481
6462
  updatedAtLocation: requestActionMetadata.createdAtLocation,
6482
6463
  declaration,
@@ -9735,7 +9716,6 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
9735
9716
  createdBy: overrides.createdBy ?? generateUuid(rng),
9736
9717
  createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
9737
9718
  updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
9738
- createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
9739
9719
  updatedAt: overrides.updatedAt ?? (0, import_date_fns4.addDays)(new Date(createdAt), 1).toISOString(),
9740
9720
  assignedTo: overrides.assignedTo ?? null,
9741
9721
  updatedBy: overrides.updatedBy ?? generateUuid(rng),
@@ -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"}