@opencrvs/toolkit 2.0.0-rc.153df7b → 2.0.0-rc.1589761

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 (43) 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 +53 -31
  4. package/dist/cli.js +714 -173
  5. package/dist/commons/api/router.d.ts +62 -54
  6. package/dist/commons/application-config/index.d.ts +16 -4
  7. package/dist/commons/conditionals/conditionals.d.ts +6 -6
  8. package/dist/commons/events/ActionInput.d.ts +36 -0
  9. package/dist/commons/events/Draft.d.ts +1 -0
  10. package/dist/commons/events/FieldConfig.d.ts +10 -0
  11. package/dist/commons/events/locations.d.ts +38 -1
  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/conditionals/index.js +37 -7
  15. package/dist/events/index.js +143 -27
  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/add-resend-invite-notification.d.ts +3 -0
  19. package/dist/migrations/v2.0/add-resend-invite-notification.d.ts.map +1 -0
  20. package/dist/migrations/v2.0/add-resend-invite-notification.js +373 -0
  21. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
  22. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  23. package/dist/migrations/v2.0/checkout-upstream-files.js +1 -2
  24. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts +9 -1
  25. package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map +1 -1
  26. package/dist/migrations/v2.0/delete-infrastructure-directory.js +66 -20
  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 +712 -171
  30. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.d.ts.map +1 -1
  31. package/dist/migrations/v2.0/make-built-in-validate-actions-custom.js +90 -1
  32. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts +11 -1
  33. package/dist/migrations/v2.0/merge-infrastructure-directory.d.ts.map +1 -1
  34. package/dist/migrations/v2.0/merge-infrastructure-directory.js +17 -16
  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 +50 -27
  38. package/dist/scopes/index.d.ts +87 -10
  39. package/dist/scopes/index.js +43 -8
  40. package/opencrvs-toolkit-2.0.0-rc.1589761.tgz +0 -0
  41. package/package.json +1 -1
  42. package/tsconfig.tsbuildinfo +1 -1
  43. package/opencrvs-toolkit-2.0.0-rc.153df7b.tgz +0 -0
@@ -0,0 +1,373 @@
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: Add `TriggerEvent.RESEND_INVITE` wiring to the country config
28
+ * (email schemas, templates, `/triggers/user/resend-invite` route,
29
+ * SMS keys, CSV copy, HTML template).
30
+ *
31
+ * Idempotent: safe to run multiple times; skips edits when markers are
32
+ * already present.
33
+ */
34
+ const fs_1 = require("fs");
35
+ const path_1 = __importDefault(require("path"));
36
+ const ts_morph_1 = require("ts-morph");
37
+ const TS_MORPH_PROJECT_OPTIONS = {
38
+ skipAddingFilesFromTsConfig: true,
39
+ manipulationSettings: {
40
+ indentationText: ts_morph_1.IndentationText.TwoSpaces
41
+ }
42
+ };
43
+ const EMAIL_TEMPLATES_INDEX = 'src/api/notification/email-templates/index.ts';
44
+ const NOTIFICATION_HANDLER = 'src/api/notification/handler.ts';
45
+ const USER_NOTIFICATION_ROUTES = 'src/config/routes/userNotificationRoutes.ts';
46
+ const SMS_SERVICE = 'src/api/notification/sms-service.ts';
47
+ const NOTIFICATION_CSV = 'src/translations/notification.csv';
48
+ const RESEND_INVITE_HTML = 'src/api/notification/email-templates/other/resend-invite.html';
49
+ const RESEND_INVITE_HTML_CONTENT = `<!doctype html>
50
+ <html>
51
+ <head>
52
+ <link
53
+ href="https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400;700&display=swap"
54
+ rel="stylesheet"
55
+ />
56
+ <style type="text/css">
57
+ body {
58
+ font-family: 'Noto Sans', sans-serif;
59
+ color: #222;
60
+ padding: 16px 24px;
61
+ }
62
+
63
+ h1 {
64
+ font-size: 21px;
65
+ margin-top: 32px;
66
+ margin-bottom: 36px;
67
+ font-weight: 700;
68
+ }
69
+
70
+ p {
71
+ font-weight: 400;
72
+ font-size: 16px;
73
+ line-height: 1.8;
74
+ margin-bottom: 24px;
75
+ }
76
+
77
+ i {
78
+ color: #666;
79
+ font-weight: 400;
80
+ font-size: 16px;
81
+ }
82
+ </style>
83
+ </head>
84
+
85
+ <body>
86
+ <img
87
+ src="{{countryLogo}}"
88
+ alt="country_logo"
89
+ style="max-height: 88px; max-width: 100%"
90
+ />
91
+ <h1>Your {{applicationName}} account invitation</h1>
92
+ <p>Hello {{firstname}},</p>
93
+ <p>Your account invitation has been resent. Please use the following credentials to access your account:</p>
94
+ <p>
95
+ Username: <strong>{{username}}</strong><br />
96
+ Password: <strong>{{temporaryPassword}}</strong>
97
+ </p>
98
+ <p>
99
+ Please click the link below to complete your account setup and start using
100
+ {{applicationName}}.
101
+ </p>
102
+
103
+ <div style="margin-top: 32px; margin-bottom: 32px">
104
+ <a href="{{loginURL}}">Complete setup</a>
105
+ </div>
106
+ <br />
107
+ <p>
108
+ Best regards, <br />
109
+ {{applicationName}} Team
110
+ </p>
111
+ </body>
112
+ </html>
113
+ `;
114
+ const CSV_ROW = "resendInviteNotification,The SMS message that is sent when a user invitation is resent,Your OpenCRVS account invitation was resent. Please login with your username: {{username}} and temporary password: {{temporaryPassword}},Votre invitation de compte OpenCRVS a été renvoyée. Veuillez vous connecter avec votre nom d'utilisateur : {{username}} et votre mot de passe temporaire : {{temporaryPassword}}.\n";
115
+ function getObjectLiteralFromConst(declaration) {
116
+ if (!declaration) {
117
+ return;
118
+ }
119
+ const initializer = declaration.getInitializer();
120
+ if (!initializer) {
121
+ return;
122
+ }
123
+ if (ts_morph_1.Node.isObjectLiteralExpression(initializer)) {
124
+ return initializer;
125
+ }
126
+ /* `{...} as const` */
127
+ if (ts_morph_1.Node.isAsExpression(initializer)) {
128
+ const expression = initializer.getExpression();
129
+ if (ts_morph_1.Node.isObjectLiteralExpression(expression)) {
130
+ return expression;
131
+ }
132
+ }
133
+ /* `{...} satisfies Record<...>` */
134
+ if (ts_morph_1.Node.isSatisfiesExpression(initializer)) {
135
+ const expression = initializer.getExpression();
136
+ if (ts_morph_1.Node.isObjectLiteralExpression(expression)) {
137
+ return expression;
138
+ }
139
+ }
140
+ }
141
+ function patchEmailTemplatesIndex() {
142
+ const full = path_1.default.join(process.cwd(), EMAIL_TEMPLATES_INDEX);
143
+ if (!(0, fs_1.existsSync)(full)) {
144
+ // eslint-disable-next-line no-console
145
+ console.log(` '${EMAIL_TEMPLATES_INDEX}' missing — skipping.`);
146
+ return false;
147
+ }
148
+ const project = new ts_morph_1.Project(TS_MORPH_PROJECT_OPTIONS);
149
+ const sourceFile = project.addSourceFileAtPath(full);
150
+ let changed = false;
151
+ const triggerVariableObject = getObjectLiteralFromConst(sourceFile.getVariableDeclaration('TriggerVariable'));
152
+ if (triggerVariableObject) {
153
+ const hasResendInviteVariable = triggerVariableObject
154
+ .getProperties()
155
+ .some((prop) => prop.getText().includes('[TriggerEvent.RESEND_INVITE]'));
156
+ if (!hasResendInviteVariable) {
157
+ const properties = triggerVariableObject.getProperties();
158
+ const lastProperty = properties[properties.length - 1];
159
+ if (lastProperty) {
160
+ sourceFile.insertText(lastProperty.getEnd(), `,
161
+ [TriggerEvent.RESEND_INVITE]: z.object({
162
+ firstname: z.string(),
163
+ username: z.string(),
164
+ temporaryPassword: z.string(),
165
+ completeSetupUrl: z.string(),
166
+ loginURL: z.string()
167
+ })`);
168
+ changed = true;
169
+ }
170
+ }
171
+ }
172
+ const templatesObject = getObjectLiteralFromConst(sourceFile.getVariableDeclaration('templates'));
173
+ if (templatesObject) {
174
+ const hasResendInviteTemplate = templatesObject
175
+ .getProperties()
176
+ .some((prop) => prop
177
+ .getText()
178
+ .includes("readOtherTemplate<TriggerVariable['resend-invite']>"));
179
+ if (!hasResendInviteTemplate) {
180
+ const userCreatedProp = templatesObject
181
+ .getProperties()
182
+ .find((prop) => prop.getText().includes('[TriggerEvent.USER_CREATED]'));
183
+ const anchor = userCreatedProp !== null && userCreatedProp !== void 0 ? userCreatedProp : templatesObject.getProperties()[templatesObject.getProperties().length - 1];
184
+ if (anchor) {
185
+ sourceFile.insertText(anchor.getEnd(), `,
186
+ [TriggerEvent.RESEND_INVITE]: {
187
+ type: 'resend-invite',
188
+ subject: 'Your OpenCRVS account invitation',
189
+ template:
190
+ readOtherTemplate<TriggerVariable['resend-invite']>('resend-invite')
191
+ }`);
192
+ changed = true;
193
+ }
194
+ }
195
+ }
196
+ if (changed) {
197
+ sourceFile.saveSync();
198
+ }
199
+ return changed;
200
+ }
201
+ function patchNotificationHandler() {
202
+ const full = path_1.default.join(process.cwd(), NOTIFICATION_HANDLER);
203
+ if (!(0, fs_1.existsSync)(full)) {
204
+ return false;
205
+ }
206
+ const project = new ts_morph_1.Project(TS_MORPH_PROJECT_OPTIONS);
207
+ const sourceFile = project.addSourceFileAtPath(full);
208
+ const convertFn = sourceFile.getFunction('convertPayloadToVariable');
209
+ if (!convertFn) {
210
+ return false;
211
+ }
212
+ const switchStmt = convertFn.getFirstDescendantByKind(ts_morph_1.SyntaxKind.SwitchStatement);
213
+ if (!switchStmt) {
214
+ return false;
215
+ }
216
+ const clauses = switchStmt.getCaseBlock().getClauses();
217
+ const hasResendInvite = clauses.some((clause) => ts_morph_1.Node.isCaseClause(clause) &&
218
+ clause.getExpression().getText() === 'TriggerEvent.RESEND_INVITE');
219
+ if (hasResendInvite) {
220
+ return false;
221
+ }
222
+ const userCreatedClauseIndex = clauses.findIndex((clause) => ts_morph_1.Node.isCaseClause(clause) &&
223
+ clause.getExpression().getText() === 'TriggerEvent.USER_CREATED');
224
+ if (userCreatedClauseIndex < 0) {
225
+ return false;
226
+ }
227
+ const userCreatedClause = clauses[userCreatedClauseIndex];
228
+ sourceFile.insertText(userCreatedClause.getEnd(), `
229
+
230
+ case TriggerEvent.RESEND_INVITE:
231
+ return {
232
+ firstname,
233
+ username: payload.username,
234
+ temporaryPassword: payload.temporaryPassword,
235
+ completeSetupUrl: LOGIN_URL,
236
+ loginURL: LOGIN_URL
237
+ }`);
238
+ sourceFile.saveSync();
239
+ return true;
240
+ }
241
+ function getReturnedArrayLiteral(functionFilePath, fnName) {
242
+ const project = new ts_morph_1.Project(TS_MORPH_PROJECT_OPTIONS);
243
+ const sourceFile = project.addSourceFileAtPath(functionFilePath);
244
+ const fn = sourceFile.getFunction(fnName);
245
+ const returnStmt = fn === null || fn === void 0 ? void 0 : fn.getFirstDescendantByKind(ts_morph_1.SyntaxKind.ReturnStatement);
246
+ const expr = returnStmt === null || returnStmt === void 0 ? void 0 : returnStmt.getExpression();
247
+ if (!expr || !ts_morph_1.Node.isArrayLiteralExpression(expr)) {
248
+ return { sourceFile, arrayLiteral: undefined };
249
+ }
250
+ return { sourceFile, arrayLiteral: expr };
251
+ }
252
+ function patchUserNotificationRoutes() {
253
+ var _a;
254
+ const full = path_1.default.join(process.cwd(), USER_NOTIFICATION_ROUTES);
255
+ if (!(0, fs_1.existsSync)(full)) {
256
+ return false;
257
+ }
258
+ const { sourceFile, arrayLiteral } = getReturnedArrayLiteral(full, 'getUserNotificationRoutes');
259
+ if (!arrayLiteral) {
260
+ return false;
261
+ }
262
+ const elements = arrayLiteral.getElements();
263
+ const routeExists = elements.some((element) => element.getText().includes(`path: '/triggers/user/resend-invite'`));
264
+ if (routeExists) {
265
+ return false;
266
+ }
267
+ const anchor = (_a = elements.find((element) => element.getText().includes(`path: '/triggers/user/user-created'`))) !== null && _a !== void 0 ? _a : elements[elements.length - 1];
268
+ if (!anchor) {
269
+ return false;
270
+ }
271
+ sourceFile.insertText(anchor.getEnd(), `,
272
+ {
273
+ method: 'POST',
274
+ path: '/triggers/user/resend-invite',
275
+ handler: makeNotificationHandler('resend-invite'),
276
+ options: {
277
+ auth: false,
278
+ tags: ['api'],
279
+ description: 'Handles notification for resent user invite'
280
+ }
281
+ }`);
282
+ sourceFile.saveSync();
283
+ return true;
284
+ }
285
+ function patchSmsService() {
286
+ const full = path_1.default.join(process.cwd(), SMS_SERVICE);
287
+ if (!(0, fs_1.existsSync)(full)) {
288
+ return false;
289
+ }
290
+ const project = new ts_morph_1.Project(TS_MORPH_PROJECT_OPTIONS);
291
+ const sourceFile = project.addSourceFileAtPath(full);
292
+ let changed = false;
293
+ const otherTemplatesObject = getObjectLiteralFromConst(sourceFile.getVariableDeclaration('otherTemplates'));
294
+ if (otherTemplatesObject) {
295
+ const hasResendTemplate = otherTemplatesObject
296
+ .getProperties()
297
+ .some((prop) => prop.getText().includes('resendInviteNotification'));
298
+ if (!hasResendTemplate) {
299
+ const userCredentialsIndex = otherTemplatesObject
300
+ .getProperties()
301
+ .findIndex((prop) => prop.getText().includes('userCredentialsNotification'));
302
+ otherTemplatesObject.insertPropertyAssignment(userCredentialsIndex >= 0
303
+ ? userCredentialsIndex + 1
304
+ : otherTemplatesObject.getProperties().length, {
305
+ name: 'resendInviteNotification',
306
+ initializer: `'resendInviteNotification'`
307
+ });
308
+ changed = true;
309
+ }
310
+ }
311
+ const triggerToSmsTemplateObject = getObjectLiteralFromConst(sourceFile.getVariableDeclaration('TriggerToSMSTemplate'));
312
+ if (triggerToSmsTemplateObject) {
313
+ const hasResendInviteMap = triggerToSmsTemplateObject
314
+ .getProperties()
315
+ .some((prop) => prop.getText().includes(`['resend-invite']`));
316
+ if (!hasResendInviteMap) {
317
+ const userCreatedIndex = triggerToSmsTemplateObject
318
+ .getProperties()
319
+ .findIndex((prop) => prop.getText().includes(`['user-created']`));
320
+ triggerToSmsTemplateObject.insertPropertyAssignment(userCreatedIndex >= 0
321
+ ? userCreatedIndex + 1
322
+ : triggerToSmsTemplateObject.getProperties().length, {
323
+ name: `['resend-invite']`,
324
+ initializer: `'resendInviteNotification'`
325
+ });
326
+ changed = true;
327
+ }
328
+ }
329
+ if (changed) {
330
+ sourceFile.saveSync();
331
+ }
332
+ return changed;
333
+ }
334
+ function main() {
335
+ return __awaiter(this, void 0, void 0, function* () {
336
+ // eslint-disable-next-line no-console
337
+ console.log('Adding RESEND_INVITE notification wiring…');
338
+ const touched = [];
339
+ if (patchEmailTemplatesIndex())
340
+ touched.push(EMAIL_TEMPLATES_INDEX);
341
+ if (patchNotificationHandler())
342
+ touched.push(NOTIFICATION_HANDLER);
343
+ if (patchUserNotificationRoutes())
344
+ touched.push(USER_NOTIFICATION_ROUTES);
345
+ if (patchSmsService())
346
+ touched.push(SMS_SERVICE);
347
+ /* csv */
348
+ const csvPath = path_1.default.join(process.cwd(), NOTIFICATION_CSV);
349
+ if ((0, fs_1.existsSync)(csvPath)) {
350
+ let t = (0, fs_1.readFileSync)(csvPath, 'utf8');
351
+ if (!/^resendInviteNotification,/m.test(t)) {
352
+ if (!t.endsWith('\n'))
353
+ t += '\n';
354
+ (0, fs_1.writeFileSync)(csvPath, t + CSV_ROW);
355
+ touched.push(NOTIFICATION_CSV);
356
+ }
357
+ }
358
+ /* html */
359
+ const htmlPath = path_1.default.join(process.cwd(), RESEND_INVITE_HTML);
360
+ (0, fs_1.mkdirSync)(path_1.default.dirname(htmlPath), { recursive: true });
361
+ if (!(0, fs_1.existsSync)(htmlPath)) {
362
+ (0, fs_1.writeFileSync)(htmlPath, RESEND_INVITE_HTML_CONTENT);
363
+ touched.push(RESEND_INVITE_HTML);
364
+ }
365
+ if (touched.length === 0) {
366
+ // eslint-disable-next-line no-console
367
+ console.log(' Nothing to update (already present or anchors not found).');
368
+ return;
369
+ }
370
+ // eslint-disable-next-line no-console
371
+ console.log(` Updated:\n${touched.map((f) => ` - ${f}`).join('\n')}`);
372
+ });
373
+ }
@@ -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
  }
@@ -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":"AAoCA;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBA8BpD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/index.ts"],"names":[],"mappings":"AA6CA;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBAgCpD"}