@opencrvs/toolkit 2.0.0-rc.da37d4e → 2.0.0-rc.db5d96b

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 (37) 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 +19 -24
  4. package/dist/cli.js +297 -133
  5. package/dist/commons/api/router.d.ts +37 -34
  6. package/dist/commons/application-config/index.d.ts +16 -4
  7. package/dist/commons/events/ActionInput.d.ts +36 -0
  8. package/dist/commons/events/Draft.d.ts +1 -0
  9. package/dist/commons/events/EventIndex.d.ts +1 -0
  10. package/dist/commons/events/EventMetadata.d.ts +1 -0
  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 +2 -1
  15. package/dist/events/index.js +71 -20
  16. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.d.ts.map +1 -1
  17. package/dist/migrations/v2.0/add-birth-certificate-issuance-flag.js +60 -35
  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/index.d.ts +5 -3
  25. package/dist/migrations/v2.0/index.d.ts.map +1 -1
  26. package/dist/migrations/v2.0/index.js +297 -133
  27. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
  28. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
  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-workqueue-configs.d.ts.map +1 -1
  33. package/dist/migrations/v2.0/migrate-workqueue-configs.js +140 -59
  34. package/dist/notification/index.js +16 -20
  35. package/opencrvs-toolkit-2.0.0-rc.db5d96b.tgz +0 -0
  36. package/package.json +1 -1
  37. package/opencrvs-toolkit-2.0.0-rc.da37d4e.tgz +0 -0
@@ -50,6 +50,7 @@ export declare const EventIndex: z.ZodObject<{
50
50
  updatedAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
51
51
  updatedAt: z.ZodISODateTime;
52
52
  assignedTo: z.ZodOptional<z.ZodNullable<z.ZodString>>;
53
+ assignedToSignature: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodString, "DocumentPath", "out">>>;
53
54
  updatedBy: z.ZodOptional<z.ZodNullable<z.ZodString>>;
54
55
  trackingId: z.ZodString;
55
56
  potentialDuplicates: z.ZodArray<z.ZodObject<{
@@ -123,6 +123,7 @@ export declare const EventMetadata: z.ZodObject<{
123
123
  updatedAtLocation: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>>;
124
124
  updatedAt: z.ZodISODateTime;
125
125
  assignedTo: z.ZodOptional<z.ZodNullable<z.ZodString>>;
126
+ assignedToSignature: z.ZodOptional<z.ZodNullable<z.core.$ZodBranded<z.ZodString, "DocumentPath", "out">>>;
126
127
  updatedBy: z.ZodOptional<z.ZodNullable<z.ZodString>>;
127
128
  trackingId: z.ZodString;
128
129
  potentialDuplicates: z.ZodArray<z.ZodObject<{
@@ -73,5 +73,26 @@ export declare function canAccessOtherUserWithScopes({ scopes, userToAccess, use
73
73
  * One of the scopes must allow access for the event to be accessible.
74
74
  */
75
75
  export declare function userCanAccessEventWithScopes(event: Partial<EventIndexWithAdministrativeHierarchy>, scopes: RecordScopeV2[], user: UserContext | SystemContext, customActionType?: string): boolean;
76
+ export declare function getAdministrativeAreaHierarchy(administrativeAreaId: string | undefined | null, administrativeAreas: Map<UUID, AdministrativeArea>): {
77
+ id: string & z.core.$brand<"UUID">;
78
+ name: string;
79
+ parentId: (string & z.core.$brand<"UUID">) | null;
80
+ validUntil: string | null;
81
+ externalId?: string | null | undefined;
82
+ }[];
83
+ /**
84
+ * Resolves a location or administrative area UUID into a root-first hierarchy of UUIDs.
85
+ *
86
+ * If the ID refers to a `Location` (e.g. CRVS office), the hierarchy includes
87
+ * the administrative area ancestors followed by the location itself.
88
+ * If the ID refers to an `AdministrativeArea`, returns the area's ancestor chain (root-first).
89
+ *
90
+ * Uses `getAdministrativeAreaHierarchy` which returns leaf-first order,
91
+ * so the result is reversed to match the root-first convention used by the server.
92
+ */
93
+ export declare function getLocationHierarchy(selectedId: UUID, context: {
94
+ administrativeAreas: Map<UUID, AdministrativeArea>;
95
+ locations: Map<UUID, Location>;
96
+ }): UUID[];
76
97
  export {};
77
98
  //# sourceMappingURL=locations.d.ts.map
@@ -0,0 +1,19 @@
1
+ import { AdministrativeArea, Location } from './locations';
2
+ export declare const V2_DEFAULT_MOCK_ADMINISTRATIVE_AREAS: AdministrativeArea[];
3
+ export declare const V2_DEFAULT_MOCK_LOCATIONS: Location[];
4
+ export declare const V2_DEFAULT_MOCK_LOCATIONS_MAP: Map<string & import("zod").$brand<"UUID">, {
5
+ id: string & import("zod").$brand<"UUID">;
6
+ name: string;
7
+ administrativeAreaId: (string & import("zod").$brand<"UUID">) | null;
8
+ validUntil: string | null;
9
+ locationType: string | null;
10
+ externalId?: string | null | undefined;
11
+ }>;
12
+ export declare const V2_DEFAULT_MOCK_ADMINISTRATIVE_AREAS_MAP: Map<string & import("zod").$brand<"UUID">, {
13
+ id: string & import("zod").$brand<"UUID">;
14
+ name: string;
15
+ parentId: (string & import("zod").$brand<"UUID">) | null;
16
+ validUntil: string | null;
17
+ externalId?: string | null | undefined;
18
+ }>;
19
+ //# sourceMappingURL=mocks.test.utils.d.ts.map
@@ -1,8 +1,9 @@
1
1
  import { DisplayableAction } from './ActionType';
2
- import { EncodedScope } from '../scopes';
2
+ import { EncodedScope, UserScopeV2 } from '../scopes';
3
3
  import { EventIndexWithAdministrativeHierarchy } from './locations';
4
4
  import { UserContext } from '../users/User';
5
5
  import { EventIndex } from './EventIndex';
6
+ import { UUID } from 'src/uuid';
6
7
  export declare const ACTION_SCOPE_MAP: {
7
8
  READ: "record.read"[];
8
9
  CREATE: "record.create"[];
@@ -53,4 +54,26 @@ export declare function isActionInScope({ scopes, action, event, currentUser }:
53
54
  event: EventIndexWithAdministrativeHierarchy;
54
55
  currentUser: UserContext;
55
56
  }): boolean;
57
+ /**
58
+ *
59
+ *
60
+ * @param allRoles - All possible roles in the system
61
+ * @param userLocation - The location and role information of the user whose role options are being determined
62
+ * @param acceptedScopes - The scopes of the user requesting the role update, used to determine which roles they can assign.
63
+ * @param userRequesting - The user context of the user requesting the role update, used to check location-based access to the target user's location.
64
+ *
65
+ * @returns An array of roles that the requesting user is allowed to assign to the target user based on their scopes and location
66
+ *
67
+ * 1) Used to determine which roles should be available in the dropdown when a user is editing another user's role in the user management interface.
68
+ * 2) Used to check if payload includes valid role.
69
+ */
70
+ export declare function getAvailableRolesForUserUpdatePayload({ allRoles, userLocation, acceptedScopes, userRequesting }: {
71
+ allRoles: string[];
72
+ userRequesting: UserContext;
73
+ acceptedScopes: UserScopeV2[];
74
+ userLocation: {
75
+ administrativeHierarchy: UUID[];
76
+ primaryOfficeId: UUID;
77
+ };
78
+ }): string[];
56
79
  //# sourceMappingURL=scopes.d.ts.map
@@ -9,7 +9,7 @@ import { UUID } from '../../uuid';
9
9
  import { DocumentPath } from '../../documents';
10
10
  export declare function getStatusFromActions(actions: Array<Action>): "CREATED" | "NOTIFIED" | "DECLARED" | "REGISTERED" | "ARCHIVED";
11
11
  export declare function getAssignedUserFromActions(actions: Array<ActionDocument>): string | null;
12
- export declare function getAssignedUserSignatureFromActions(actions: Array<ActionDocument>): string | null;
12
+ export declare function getAssignedUserSignatureFromActions(actions: Array<ActionDocument>): (string & import("zod").$brand<"DocumentPath">) | null;
13
13
  type NonNullableDeep<T> = T extends [unknown, ...unknown[]] ? {
14
14
  [K in keyof T]: NonNullableDeep<NonNullable<T[K]>>;
15
15
  } : T extends UUID ? T : T extends DocumentPath ? T : T extends string ? NonNullable<T> : T extends (infer U)[] ? NonNullableDeep<U>[] : T extends object ? {
@@ -104,6 +104,7 @@ export declare function applyDraftToEventIndex(eventIndex: EventIndex, draft: Dr
104
104
  createdBySignature?: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
105
105
  updatedAtLocation?: (string & import("zod").$brand<"UUID">) | null | undefined;
106
106
  assignedTo?: string | null | undefined;
107
+ assignedToSignature?: (string & import("zod").$brand<"DocumentPath">) | null | undefined;
107
108
  updatedBy?: string | null | undefined;
108
109
  };
109
110
  /**
@@ -302,12 +302,14 @@ __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
309
  getAssignedUserSignatureFromActions: () => getAssignedUserSignatureFromActions,
309
310
  getAssignmentStatus: () => getAssignmentStatus,
310
311
  getAvailableActionsForEvent: () => getAvailableActionsForEvent,
312
+ getAvailableRolesForUserUpdatePayload: () => getAvailableRolesForUserUpdatePayload,
311
313
  getCompleteActionAnnotation: () => getCompleteActionAnnotation,
312
314
  getCompleteActionDeclaration: () => getCompleteActionDeclaration,
313
315
  getCurrentEventState: () => getCurrentEventState,
@@ -318,6 +320,7 @@ __export(events_exports, {
318
320
  getDeclarationPages: () => getDeclarationPages,
319
321
  getEventConfigById: () => getEventConfigById,
320
322
  getFilePathsFromEvent: () => getFilePathsFromEvent,
323
+ getLocationHierarchy: () => getLocationHierarchy,
321
324
  getMixedPath: () => getMixedPath,
322
325
  getPendingAction: () => getPendingAction,
323
326
  getPrintCertificatePages: () => getPrintCertificatePages,
@@ -1411,28 +1414,20 @@ function schemaPriority(schema) {
1411
1414
  return idx === -1 ? 9999 : idx;
1412
1415
  }
1413
1416
  function safeUnion(schemas) {
1417
+ const sortedSchemas = [...schemas].sort(
1418
+ (a, b) => schemaPriority(a) - schemaPriority(b)
1419
+ );
1414
1420
  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
- });
1421
+ for (const schema of sortedSchemas) {
1422
+ if (schema.safeParse(val).success) {
1423
+ return;
1424
+ }
1435
1425
  }
1426
+ ctx.addIssue({
1427
+ code: "invalid_type",
1428
+ expected: "custom",
1429
+ message: "Value does not match any schema"
1430
+ });
1436
1431
  }).meta({
1437
1432
  description: "Value that matches exactly one of the possible schema types (TextValue, DateValue, DateRangeFieldValue). The best matching schema is chosen by priority."
1438
1433
  });
@@ -1809,6 +1804,9 @@ var EventMetadata = z16.object({
1809
1804
  "Timestamp of the most recent *accepted* status change. Possibly 3rd party update, if action is validation asynchronously."
1810
1805
  ),
1811
1806
  assignedTo: z16.string().nullish().describe("ID of the user currently assigned to the event."),
1807
+ assignedToSignature: DocumentPath.nullish().describe(
1808
+ "Signature of the user who is currently assigned to the event."
1809
+ ),
1812
1810
  updatedBy: z16.string().nullish().describe("ID of the user who last changed the status."),
1813
1811
  trackingId: z16.string().describe(
1814
1812
  "System-generated tracking ID used by informants or registrars to look up the event."
@@ -5897,6 +5895,7 @@ 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
+ waitFor: z38.boolean().optional(),
5900
5899
  // For normal users, the createdAtLocation is resolved on the backend from the user's primaryOfficeId.
5901
5900
  // @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
5901
  createdAtLocation: UUID.nullish().describe(
@@ -10003,6 +10002,39 @@ function userCanAccessEventWithScopes(event2, scopes, user2, customActionType) {
10003
10002
  (scope) => canAccessEventWithScope(event2, scope, user2, customActionType)
10004
10003
  );
10005
10004
  }
10005
+ function getAdministrativeAreaHierarchy(administrativeAreaId, administrativeAreas) {
10006
+ const collectedLocations = [];
10007
+ const parsedAdministrativeAreaId = administrativeAreaId && UUID.safeParse(administrativeAreaId).data;
10008
+ let current = parsedAdministrativeAreaId ? administrativeAreas.get(parsedAdministrativeAreaId) : null;
10009
+ while (current) {
10010
+ collectedLocations.push(current);
10011
+ if (!current.parentId) {
10012
+ break;
10013
+ }
10014
+ const parentId = current.parentId;
10015
+ current = administrativeAreas.get(parentId);
10016
+ }
10017
+ return collectedLocations;
10018
+ }
10019
+ function getLocationHierarchy(selectedId, context) {
10020
+ const { administrativeAreas, locations } = context;
10021
+ const loc = locations.get(selectedId);
10022
+ if (loc) {
10023
+ if (loc.administrativeAreaId) {
10024
+ const hierarchy2 = getAdministrativeAreaHierarchy(
10025
+ loc.administrativeAreaId,
10026
+ administrativeAreas
10027
+ );
10028
+ return [...hierarchy2.reverse().map((area) => area.id), loc.id];
10029
+ }
10030
+ return [loc.id];
10031
+ }
10032
+ const hierarchy = getAdministrativeAreaHierarchy(
10033
+ selectedId,
10034
+ administrativeAreas
10035
+ );
10036
+ return hierarchy.reverse().map((area) => area.id);
10037
+ }
10006
10038
 
10007
10039
  // ../commons/src/events/scopes.ts
10008
10040
  var ACTION_SCOPE_MAP = {
@@ -10077,6 +10109,25 @@ function isActionInScope({
10077
10109
  );
10078
10110
  return canAccess;
10079
10111
  }
10112
+ function getAvailableRolesForUserUpdatePayload({
10113
+ allRoles,
10114
+ userLocation,
10115
+ acceptedScopes,
10116
+ userRequesting
10117
+ }) {
10118
+ const availableRoles = allRoles.filter((role) => {
10119
+ const canAccess = canAccessOtherUserWithScopes({
10120
+ userToAccess: {
10121
+ ...userLocation,
10122
+ role
10123
+ },
10124
+ user: userRequesting,
10125
+ scopes: acceptedScopes
10126
+ });
10127
+ return canAccess;
10128
+ });
10129
+ return availableRoles;
10130
+ }
10080
10131
 
10081
10132
  // ../commons/src/events/serializers/user/deserializer.ts
10082
10133
  function userDeserializer(serializedUserField, user2) {
@@ -1 +1 @@
1
- {"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"AA2aA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
1
+ {"version":3,"file":"add-birth-certificate-issuance-flag.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/add-birth-certificate-issuance-flag.ts"],"names":[],"mappings":"AAycA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
@@ -24,15 +24,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.main = main;
26
26
  /**
27
- * Codemod: Add `pending-first-certificate-issuance` flag to birth event configs and workqueues.
27
+ * Codemod: Add `pending-first-certificate-issuance` flag to event configs and workqueues.
28
28
  *
29
29
  * Usage:
30
30
  * ts-node -r tsconfig-paths/register src/migrations/v2.0/add-birth-certificate-issuance-flag.ts
31
31
  *
32
32
  * What it does:
33
- * defineConfig (birth type only):
33
+ * defineConfig (every event type — birth, death, marriage, custom, etc.):
34
34
  * - Ensures the top-level `flags` array contains the `pending-first-certificate-issuance`
35
- * flag definition
35
+ * flag definition. The flag's i18n `label.id` is event-specific, e.g.
36
+ * `event.birth.flag.pending-first-certificate-issuance`,
37
+ * `event.death.flag.pending-first-certificate-issuance`.
36
38
  * - Ensures every `REGISTER` action has
37
39
  * `flags: [{ id: 'pending-first-certificate-issuance', operation: 'add' }]`
38
40
  * - Ensures every `PRINT_CERTIFICATE` action has
@@ -55,20 +57,27 @@ const ACTION_PROPERTY_NAME = 'action';
55
57
  const FLAGS_PROPERTY_NAME = 'flags';
56
58
  const QUERY_PROPERTY_NAME = 'query';
57
59
  const TYPE_PROPERTY_NAME = 'type';
60
+ const ID_PROPERTY_NAME = 'id';
58
61
  const CLAUSES_PROPERTY_NAME = 'clauses';
59
62
  const ANY_OF_PROPERTY_NAME = 'anyOf';
60
63
  const FLAG_ID = 'pending-first-certificate-issuance';
61
64
  const REGISTER_TYPE = 'REGISTER';
62
65
  const PRINT_CERTIFICATE_TYPE = 'PRINT_CERTIFICATE';
63
- const FLAG_DEFINITION_INITIALIZER = `{
66
+ /**
67
+ * Builds the flag-definition object literal for a given event type so the i18n
68
+ * `label.id` is namespaced per event (e.g. `event.death.flag.…`).
69
+ */
70
+ function flagDefinitionInitializer(eventType) {
71
+ return `{
64
72
  id: '${FLAG_ID}',
65
73
  label: {
66
- id: 'event.birth.flag.${FLAG_ID}',
74
+ id: 'event.${eventType}.flag.${FLAG_ID}',
67
75
  defaultMessage: 'Pending first certificate issuance',
68
76
  description: 'Flag label for first certificate issuance'
69
77
  },
70
78
  requiresAction: true
71
79
  }`;
80
+ }
72
81
  // ─── Generic helpers ──────────────────────────────────────────────────────────
73
82
  /**
74
83
  * Returns true if the object's `type` property matches the given type name.
@@ -90,23 +99,36 @@ function isActionOfType(obj, typeName) {
90
99
  return false;
91
100
  }
92
101
  /**
93
- * Returns true when the `defineConfig` root config object describes a birth event.
94
- * Handles both `'birth'` string literal and `EventType.BIRTH` enum access.
102
+ * Extracts the event type from a `defineConfig` root config object, using the
103
+ * (lower-cased) value of either the `type` or `id` property. Property name has
104
+ * shifted across core/country-config versions, so both are tried.
105
+ *
106
+ * Handles all known shapes:
107
+ * - `type: 'birth'` / `id: 'birth'`
108
+ * - `type: EventType.BIRTH` / `id: Event.Birth`
109
+ *
110
+ * For `PropertyAccessExpression` (enum access), the *member name* is returned
111
+ * lower-cased — this works for the conventional `EventType.BIRTH = 'birth'` and
112
+ * `Event.Birth = 'birth'` mappings used in core and country configs.
113
+ *
114
+ * Returns null when no event type can be determined.
95
115
  */
96
- function isBirthConfig(configArg) {
97
- const typeProperty = configArg.getProperty(TYPE_PROPERTY_NAME);
98
- if (!typeProperty || !ts_morph_1.Node.isPropertyAssignment(typeProperty))
99
- return false;
100
- const initializer = typeProperty.getInitializer();
101
- if (!initializer)
102
- return false;
103
- if (ts_morph_1.Node.isStringLiteral(initializer)) {
104
- return initializer.getLiteralValue().toLowerCase() === 'birth';
105
- }
106
- if (ts_morph_1.Node.isPropertyAccessExpression(initializer)) {
107
- return initializer.getName().toLowerCase() === 'birth';
116
+ function getEventType(configArg) {
117
+ for (const propName of [TYPE_PROPERTY_NAME, ID_PROPERTY_NAME]) {
118
+ const prop = configArg.getProperty(propName);
119
+ if (!prop || !ts_morph_1.Node.isPropertyAssignment(prop))
120
+ continue;
121
+ const initializer = prop.getInitializer();
122
+ if (!initializer)
123
+ continue;
124
+ if (ts_morph_1.Node.isStringLiteral(initializer)) {
125
+ return initializer.getLiteralValue().toLowerCase();
126
+ }
127
+ if (ts_morph_1.Node.isPropertyAccessExpression(initializer)) {
128
+ return initializer.getName().toLowerCase();
129
+ }
108
130
  }
109
- return false;
131
+ return null;
110
132
  }
111
133
  /**
112
134
  * Returns true if an array literal contains an object literal with `id: <id>`.
@@ -129,17 +151,19 @@ function hasElementWithId(array, id) {
129
151
  }
130
152
  // ─── defineConfig helpers ─────────────────────────────────────────────────────
131
153
  /**
132
- * Ensures the top-level `flags` array in a birth `defineConfig` contains the
133
- * `pending-first-certificate-issuance` flag definition.
154
+ * Ensures the top-level `flags` array in a `defineConfig` contains the
155
+ * `pending-first-certificate-issuance` flag definition. The flag's i18n
156
+ * `label.id` is namespaced per event type (e.g. `event.death.flag.…`).
134
157
  */
135
- function ensureTopLevelFlagDefinition(configArg) {
158
+ function ensureTopLevelFlagDefinition(configArg, eventType) {
159
+ const initializer = flagDefinitionInitializer(eventType);
136
160
  const flagsProp = configArg.getProperty(FLAGS_PROPERTY_NAME);
137
161
  if (flagsProp && ts_morph_1.Node.isPropertyAssignment(flagsProp)) {
138
162
  const flagsInit = flagsProp.getInitializer();
139
163
  if (flagsInit && ts_morph_1.Node.isArrayLiteralExpression(flagsInit)) {
140
164
  if (hasElementWithId(flagsInit, FLAG_ID))
141
165
  return false;
142
- flagsInit.addElement(FLAG_DEFINITION_INITIALIZER);
166
+ flagsInit.addElement(initializer);
143
167
  return true;
144
168
  }
145
169
  return false;
@@ -147,7 +171,7 @@ function ensureTopLevelFlagDefinition(configArg) {
147
171
  // No `flags` property at all — create it
148
172
  configArg.addPropertyAssignment({
149
173
  name: FLAGS_PROPERTY_NAME,
150
- initializer: `[\n ${FLAG_DEFINITION_INITIALIZER}\n]`
174
+ initializer: `[\n ${initializer}\n]`
151
175
  });
152
176
  return true;
153
177
  }
@@ -174,15 +198,15 @@ function ensureActionOperationFlag(action, operation) {
174
198
  return true;
175
199
  }
176
200
  /**
177
- * Processes a birth defineConfig object: ensures top-level flag definition,
201
+ * Processes a `defineConfig` object: ensures top-level flag definition,
178
202
  * REGISTER action flags, and PRINT_CERTIFICATE action flags.
179
203
  * Returns the number of changes made.
180
204
  */
181
- function processBirthConfig(configArg, relPath) {
205
+ function processConfig(configArg, eventType, relPath) {
182
206
  let changes = 0;
183
- if (ensureTopLevelFlagDefinition(configArg)) {
207
+ if (ensureTopLevelFlagDefinition(configArg, eventType)) {
184
208
  changes++;
185
- console.log(` [${relPath}] Added '${FLAG_ID}' to top-level flags`);
209
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' to top-level flags`);
186
210
  }
187
211
  const actionsProp = configArg.getProperty(ACTIONS_PROPERTY_NAME);
188
212
  if (!actionsProp || !ts_morph_1.Node.isPropertyAssignment(actionsProp))
@@ -197,13 +221,13 @@ function processBirthConfig(configArg, relPath) {
197
221
  if (isActionOfType(element, REGISTER_TYPE)) {
198
222
  if (ensureActionOperationFlag(element, 'add')) {
199
223
  changes++;
200
- console.log(` [${relPath}] Added '${FLAG_ID}' add-flag to REGISTER action`);
224
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' add-flag to REGISTER action`);
201
225
  }
202
226
  }
203
227
  if (isActionOfType(element, PRINT_CERTIFICATE_TYPE)) {
204
228
  if (ensureActionOperationFlag(element, 'remove')) {
205
229
  changes++;
206
- console.log(` [${relPath}] Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
230
+ console.log(` [${relPath}] (${eventType}) Added '${FLAG_ID}' remove-flag to PRINT_CERTIFICATE action`);
207
231
  }
208
232
  }
209
233
  }
@@ -332,9 +356,10 @@ function processFile(filePath, project) {
332
356
  const configArg = args[0];
333
357
  if (!ts_morph_1.Node.isObjectLiteralExpression(configArg))
334
358
  continue;
335
- if (!isBirthConfig(configArg))
359
+ const eventType = getEventType(configArg);
360
+ if (!eventType)
336
361
  continue;
337
- totalChanges += processBirthConfig(configArg, relPath);
362
+ totalChanges += processConfig(configArg, eventType, relPath);
338
363
  }
339
364
  // ── defineWorkqueues ──────────────────────────────────────────────────────
340
365
  if (calleeName === DEFINE_WORKQUEUES_NAME) {
@@ -369,7 +394,7 @@ function processFile(filePath, project) {
369
394
  function main() {
370
395
  return __awaiter(this, void 0, void 0, function* () {
371
396
  const srcDir = path_1.default.join(process.cwd(), 'src');
372
- console.log(`Scanning for birth defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
397
+ console.log(`Scanning for defineConfig and PRINT_CERTIFICATE workqueues in: ${srcDir}\n`);
373
398
  const project = new ts_morph_1.Project({
374
399
  tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
375
400
  skipAddingFilesFromTsConfig: false
@@ -390,7 +415,7 @@ function main() {
390
415
  }
391
416
  }
392
417
  if (modifiedFiles.length === 0) {
393
- console.log('No birth configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
418
+ console.log('No event configs or PRINT_CERTIFICATE workqueues found. Nothing to do.');
394
419
  return;
395
420
  }
396
421
  console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
@@ -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
  }