@opencrvs/toolkit 2.0.0-rc.fdc585a → 2.0.0-rc.fe94e41

package/dist/migrations/v2.0/checkout-upstream-files.d.ts

@@ -1,5 +1,5 @@
 export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
-export declare const UPSTREAM_BRANCH = "develop";
+export declare const UPSTREAM_BRANCH = "release-v2.0.0";
 /**
  * Runs a git command in the country config working directory.
  *

package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map

@@ -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"}
+{"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"}

package/dist/migrations/v2.0/checkout-upstream-files.js

@@ -59,8 +59,7 @@ exports.main = main;
  */
 const child_process_1 = require("child_process");
 exports.UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
-// @TODO: This needs to be changed to 'release-v2.0.0' once the branch is created
-exports.UPSTREAM_BRANCH = 'develop';
+exports.UPSTREAM_BRANCH = 'release-v2.0.0';
 // Remote name used only for the duration of this codemod. Prefixed to avoid
 // clashing with remotes the user may have (origin, upstream, etc.).
 const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';

package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts

@@ -1,3 +1,11 @@
-declare function main(): Promise<void>;
+interface DeleteInfrastructureOptions {
+    /**
+     * Top-level entries directly under `infrastructure/` to preserve. Names
+     * match against the basename of each entry (file or directory). When
+     * empty (the default), the whole `infrastructure/` directory is deleted.
+     */
+    keep?: string[];
+}
+declare function main({ keep }?: DeleteInfrastructureOptions): Promise<void>;
 export { main };
 //# sourceMappingURL=delete-infrastructure-directory.d.ts.map

package/dist/migrations/v2.0/delete-infrastructure-directory.d.ts.map

@@ -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"}
+{"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"}

package/dist/migrations/v2.0/delete-infrastructure-directory.js

@@ -27,20 +27,28 @@ exports.main = main;
  * via Docker Swarm. In that case the `infrastructure/` directory shipped
  * with opencrvs-countryconfig is no longer needed and can be removed.
  *
+ * Some non-Swarm deployments still need a small subset of
+ * `infrastructure/` (e.g. `postgres/` and `metabase/`). Pass `keep` to
+ * preserve those top-level subdirectories — everything else under
+ * `infrastructure/` is deleted, and the kept subdirectories can then be
+ * refreshed from upstream by `merge-infrastructure-directory.ts` with the
+ * matching `subdirs` option.
+ *
  * Usage:
  *   ts-node -r tsconfig-paths/register src/migrations/v2.0/delete-infrastructure-directory.ts
  *
  * What it does:
  *   1. Stages deletion of all tracked files under `infrastructure/` via
- *      `git rm -rf --ignore-unmatch -- infrastructure/`. This both removes
- *      the files from the working tree and records the deletion in the
+ *      `git rm -rf --ignore-unmatch -- <path>`. This both removes the
+ *      files from the working tree and records the deletion in the
  *      index, so it shows up in the upgrade commit alongside the other
- *      codemod changes.
+ *      codemod changes. When `keep` is provided, deletion is scoped to
+ *      the top-level entries that are NOT in `keep`.
  *   2. Cleans up any untracked files / empty directory that `git rm` left
- *      behind, so the path is fully gone from the working tree.
+ *      behind, so the deleted paths are fully gone from the working tree.
  *
  * Caveats:
- *   - Destructive: any local edits to `infrastructure/` are lost. Run on a
+ *   - Destructive: any local edits to deleted paths are lost. Run on a
  *     clean working tree (or after committing your local changes).
  *   - If `infrastructure/` doesn't exist, this codemod is a no-op.
  *   - Requires git to be installed and the country config working directory
@@ -51,27 +59,65 @@ const path_1 = require("path");
 const checkout_upstream_files_1 = require("./checkout-upstream-files");
 const INFRASTRUCTURE_DIR = 'infrastructure';
 function main() {
-    return __awaiter(this, void 0, void 0, function* () {
+    return __awaiter(this, arguments, void 0, function* ({ keep = [] } = {}) {
         const fullPath = (0, path_1.join)(process.cwd(), INFRASTRUCTURE_DIR);
         if (!(0, fs_1.existsSync)(fullPath)) {
             console.log(`'${INFRASTRUCTURE_DIR}/' not found in ${process.cwd()} — nothing to delete.`);
             return;
         }
-        console.log(`Deleting '${INFRASTRUCTURE_DIR}/'...\n`);
         (0, checkout_upstream_files_1.assertIsGitRepo)();
-        // `git rm -rf --ignore-unmatch` removes tracked files (working tree + index)
-        // and is a no-op for paths with no tracked entries, so it's safe to run
-        // even when `infrastructure/` exists only as untracked files.
-        (0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', `${INFRASTRUCTURE_DIR}/`], {
-            silent: true
-        });
-        console.log(`  Staged deletion of tracked files under '${INFRASTRUCTURE_DIR}/'.`);
-        // `git rm` leaves untracked files (and any now-empty directory) on disk;
-        // remove whatever's left so the path is fully gone.
-        if ((0, fs_1.existsSync)(fullPath)) {
-            (0, fs_1.rmSync)(fullPath, { recursive: true, force: true });
-            console.log(`  Removed remaining untracked files under '${INFRASTRUCTURE_DIR}/'.`);
+        // ─── Whole-directory delete (legacy behavior) ────────────────────────
+        if (keep.length === 0) {
+            console.log(`Deleting '${INFRASTRUCTURE_DIR}/'...\n`);
+            // `git rm -rf --ignore-unmatch` removes tracked files (working tree +
+            // index) and is a no-op for paths with no tracked entries, so it's
+            // safe to run even when `infrastructure/` exists only as untracked
+            // files.
+            (0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', `${INFRASTRUCTURE_DIR}/`], {
+                silent: true
+            });
+            console.log(`  Staged deletion of tracked files under '${INFRASTRUCTURE_DIR}/'.`);
+            // `git rm` leaves untracked files (and any now-empty directory) on
+            // disk; remove whatever's left so the path is fully gone.
+            if ((0, fs_1.existsSync)(fullPath)) {
+                (0, fs_1.rmSync)(fullPath, { recursive: true, force: true });
+                console.log(`  Removed remaining untracked files under '${INFRASTRUCTURE_DIR}/'.`);
+            }
+            console.log(`\n  Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
+            return;
+        }
+        // ─── Selective delete: keep listed top-level entries ─────────────────
+        const keepSet = new Set(keep);
+        console.log(`Deleting contents of '${INFRASTRUCTURE_DIR}/' except: ${[...keepSet]
+            .map((name) => `'${name}'`)
+            .join(', ')}\n`);
+        const topLevelEntries = (0, fs_1.readdirSync)(fullPath, { withFileTypes: true });
+        let deleted = 0;
+        for (const entry of topLevelEntries) {
+            if (keepSet.has(entry.name)) {
+                console.log(`  Keeping '${INFRASTRUCTURE_DIR}/${entry.name}'.`);
+                continue;
+            }
+            // Append a trailing slash for directories so git treats it as a tree
+            // pathspec (matches the recursive behavior of `git rm -rf`).
+            const relPath = `${INFRASTRUCTURE_DIR}/${entry.name}${entry.isDirectory() ? '/' : ''}`;
+            (0, checkout_upstream_files_1.runGit)(['rm', '-rf', '--ignore-unmatch', '--', relPath], { silent: true });
+            const fullEntryPath = (0, path_1.join)(fullPath, entry.name);
+            if ((0, fs_1.existsSync)(fullEntryPath)) {
+                (0, fs_1.rmSync)(fullEntryPath, { recursive: true, force: true });
+            }
+            console.log(`  Deleted '${relPath}'.`);
+            deleted++;
+        }
+        // Note any requested keeps that weren't actually present, so the dev
+        // notices typos / missing directories.
+        const presentNames = new Set(topLevelEntries.map((e) => e.name));
+        const missingKeeps = [...keepSet].filter((name) => !presentNames.has(name));
+        if (missingKeeps.length > 0) {
+            console.warn(`  [warn] Requested to keep ${missingKeeps
+                .map((n) => `'${n}'`)
+                .join(', ')} but they don't exist under '${INFRASTRUCTURE_DIR}/'.`);
         }
-        console.log(`\n  Done. Review the staged deletion with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
+        console.log(`\n  Done. Deleted ${deleted} top-level entr${deleted === 1 ? 'y' : 'ies'}. Review the staged deletions with: git diff --cached -- '${INFRASTRUCTURE_DIR}/'`);
     });
 }

package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts

@@ -0,0 +1,3 @@
+declare function main(): Promise<void>;
+export { main };
+//# sourceMappingURL=fix-accept-requested-registration-function-type.d.ts.map

package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.d.ts.map

@@ -0,0 +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"}

package/dist/migrations/v2.0/fix-accept-requested-registration-function-type.js

@@ -0,0 +1,110 @@
+"use strict";
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = main;
+/**
+ * Codemod: In `acceptRequestedRegistration`, update the `action` parameter type from:
+ *   action: ActionInput
+ * to:
+ *   action: Extract<ActionInput, { type?: 'REGISTER' }>
+ *
+ * What it does:
+ *   - Scans all TypeScript files under `src/`
+ *   - Finds `acceptRequestedRegistration` (function declaration or const assignment)
+ *   - Rewrites only the `action` parameter when its type is exactly `ActionInput`
+ *   - Saves modified files in-place
+ */
+/* eslint-disable no-console */
+const ts_morph_1 = require("ts-morph");
+const path_1 = __importDefault(require("path"));
+const TARGET_FUNCTION_NAME = 'acceptRequestedRegistration';
+const ACTION_PARAMETER_NAME = 'action';
+const OLD_TYPE = 'ActionInput';
+const NEW_TYPE = "Extract<ActionInput, { type?: 'REGISTER' }>";
+function isAcceptRequestedRegistrationParameter(parameter) {
+    const functionDeclaration = parameter.getFirstAncestorByKind(ts_morph_1.SyntaxKind.FunctionDeclaration);
+    if ((functionDeclaration === null || functionDeclaration === void 0 ? void 0 : functionDeclaration.getName()) === TARGET_FUNCTION_NAME) {
+        return true;
+    }
+    const arrowFunction = parameter.getFirstAncestorByKind(ts_morph_1.SyntaxKind.ArrowFunction);
+    const variableDeclaration = arrowFunction === null || arrowFunction === void 0 ? void 0 : arrowFunction.getFirstAncestorByKind(ts_morph_1.SyntaxKind.VariableDeclaration);
+    return (variableDeclaration === null || variableDeclaration === void 0 ? void 0 : variableDeclaration.getName()) === TARGET_FUNCTION_NAME;
+}
+function processFile(filePath, project) {
+    const sourceFile = project.getSourceFile(filePath);
+    if (!sourceFile)
+        return 0;
+    let updatedCount = 0;
+    for (const parameter of sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.Parameter)) {
+        if (parameter.getName() !== ACTION_PARAMETER_NAME) {
+            continue;
+        }
+        if (!isAcceptRequestedRegistrationParameter(parameter)) {
+            continue;
+        }
+        const typeNode = parameter.getTypeNode();
+        if (!typeNode || typeNode.getText() !== OLD_TYPE) {
+            continue;
+        }
+        parameter.setType(NEW_TYPE);
+        updatedCount++;
+        console.log(`  [${path_1.default.relative(process.cwd(), filePath)}] Updated '${ACTION_PARAMETER_NAME}' in ${TARGET_FUNCTION_NAME} to ${NEW_TYPE}`);
+    }
+    return updatedCount;
+}
+function main() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const srcDir = path_1.default.join(process.cwd(), 'src');
+        console.log(`Scanning for ${TARGET_FUNCTION_NAME} in: ${srcDir}\n`);
+        const project = new ts_morph_1.Project({
+            tsConfigFilePath: path_1.default.resolve(srcDir, '../tsconfig.json'),
+            skipAddingFilesFromTsConfig: false
+        });
+        const sourceFiles = project.getSourceFiles().filter((sf) => {
+            const filePath = sf.getFilePath();
+            return filePath.includes('/src/') && !filePath.includes('/node_modules/');
+        });
+        let totalUpdated = 0;
+        const modifiedFiles = [];
+        for (const sourceFile of sourceFiles) {
+            const filePath = sourceFile.getFilePath();
+            const updated = processFile(filePath, project);
+            if (updated > 0) {
+                totalUpdated += updated;
+                modifiedFiles.push(filePath);
+            }
+        }
+        if (modifiedFiles.length === 0) {
+            console.log(`No '${ACTION_PARAMETER_NAME}: ${OLD_TYPE}' parameter in ${TARGET_FUNCTION_NAME} found. Nothing to do.`);
+            return;
+        }
+        console.log(`\nSaving ${modifiedFiles.length} modified file(s)...`);
+        for (const filePath of modifiedFiles) {
+            const sourceFile = project.getSourceFileOrThrow(filePath);
+            yield sourceFile.save();
+            console.log(`  Saved: ${path_1.default.relative(process.cwd(), filePath)}`);
+        }
+        console.log(`\nDone. Updated ${totalUpdated} parameter type annotation(s) in ${TARGET_FUNCTION_NAME}.`);
+    });
+}

package/dist/migrations/v2.0/index.d.ts

@@ -3,9 +3,11 @@
  * directory.
  *
  * @param dockerSwarm - When true, the local `infrastructure/` directory is
- *   merged with upstream changes (Docker Swarm deployments still need it).
- *   When false (the default), `infrastructure/` is deleted entirely, since
- *   non-Swarm deployments no longer ship it.
+ *   merged with upstream changes in its entirety (Docker Swarm deployments
+ *   still need it all). When false (the default), everything under
+ *   `infrastructure/` is deleted EXCEPT the subdirectories listed in
+ *   `NON_SWARM_INFRA_SUBDIRS`, and those preserved subdirectories are then
+ *   merged with upstream.
  */
 export declare function runUpgrade(dockerSwarm: boolean): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/migrations/v2.0/index.d.ts.map

@@ -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"}
+{"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"}