@13w/miri 1.1.18 → 1.1.20

package/dist/cli.js

@@ -14,11 +14,7 @@ const pkg = await readFile(join(import.meta.dirname, '../package.json'), 'utf-8'
 const mirirc = await readFile(join(process.cwd(), '.mirirc'), 'utf-8').then((content) => JSON.parse(content), () => ({}));
 const { SSH_AUTH_SOCK } = process.env;
 const fileExists = (filename) => lstat(filename).then(() => true, () => false);
-const isKeyEncrypted = (key) => key.toString('utf-8')
-    .split('\n')
-    .slice(1, -1)
-    .join('')
-    .includes('bcrypt');
+const isKeyEncrypted = (key) => key.toString('utf-8').split('\n').slice(1, -1).join('').includes('bcrypt');
 const isKeyPublic = (key) => /^(ssh-(rsa|ed25519)|ecdsa-sha2-nistp\d+)\s+[A-Za-z0-9+/=]+/.test(key.toString().trim());
 const listSshAgentKeys = async () => {
     const keys = [];
@@ -26,10 +22,10 @@ const listSshAgentKeys = async () => {
         return keys;
     }
     const conn = createConnection(SSH_AUTH_SOCK, () => {
-        const request = Buffer.from([0, 0, 0, 1, 0x0B]); // SSH_AGENTC_REQUEST_IDENTITIES
+        const request = Buffer.from([0, 0, 0, 1, 0x0b]); // SSH_AGENTC_REQUEST_IDENTITIES
         conn.end(request);
     });
-    console.log(colors.dim('  reading keys from SSH-Agent...'));
+    console.log(colors.gray('  reading keys from SSH-Agent...'));
     for await (const chunk of conn) {
         if (chunk.length < 5 || chunk.readUInt8(4) !== 12) {
             continue;
@@ -39,14 +35,14 @@ const listSshAgentKeys = async () => {
         for (let i = 0; i < numKeys; i += 1) {
             const keyLen = chunk.readUInt32BE(offset);
             offset += 4;
-            const key = chunk.slice(offset, offset + keyLen).toString("base64");
+            const key = chunk.slice(offset, offset + keyLen).toString('base64');
             offset += keyLen;
             offset += chunk.readUInt32BE(offset) + 4;
             keys.push(key);
         }
     }
     if (keys.length) {
-        console.log(colors.dim(`    ${keys.length} loaded...`));
+        console.log(colors.gray(`    ${keys.length} loaded...`));
     }
     return keys;
 };
@@ -56,7 +52,7 @@ const askPassword = async (message = 'Password: ') => {
     process.stdin.setRawMode(true);
     return new Promise((resolve, reject) => {
         let password = '';
-        const readPass = function (chunk) {
+        const readPass = (chunk) => {
             const str = chunk.toString();
             // backspace
             if (str.charCodeAt(0) === 127) {
@@ -138,7 +134,7 @@ const getConfig = async (programOpts) => {
             config.sshPublicKey = `${config.sshKey}.pub`;
         }
     }
-    return configCache = config;
+    return (configCache = config);
 };
 const createSSHTunnel = async (opts) => {
     const config = await getConfig(opts);
@@ -152,14 +148,14 @@ const createSSHTunnel = async (opts) => {
         const agentKeys = await listSshAgentKeys();
         const publicKeyBody = await readFile(config.sshPublicKey, 'utf-8').catch(() => '');
         if (agentKeys.includes(publicKeyBody.split(' ')[1])) {
-            console.log(colors.dim('  Using SSH-Agent'));
+            console.log(colors.gray('  Using SSH-Agent'));
             // key already loaded
         }
         else if (config.sshKey) {
             const privateKey = await readFile(config.sshKey).catch(() => void 0);
             if (privateKey && !isKeyPublic(privateKey)) {
                 sshOptions.privateKey = privateKey;
-                console.log(colors.dim(`  Using private key: ${config.sshKey}`));
+                console.log(colors.gray(`  Using private key: ${config.sshKey}`));
                 if (isKeyEncrypted(privateKey)) {
                     sshOptions.passphrase = await askPassword();
                 }
@@ -244,11 +240,13 @@ const syncIndexes = async (miri, coll) => {
     }
     console.groupEnd();
 };
-program.command('status')
+program
+    .command('status')
     .option('--all', 'show all applied patches')
     .description('Displays list of applied migrations')
     .action(({ all }) => status(true, void 0, all));
-program.command('sync')
+program
+    .command('sync')
     .description('Applies all available patches from migrations folder')
     .option('--degraded', 'Re-apply patches on degraded migrations')
     .option('--all', 'Re-apply all patches')
@@ -259,30 +257,30 @@ program.command('sync')
     await miri.sync(opts);
     await miri[Symbol.asyncDispose]();
 });
-const initProgram = program.command('init')
-    .description('Manage initial scripts');
-initProgram.command('apply')
+const initProgram = program.command('init').description('Manage initial scripts');
+initProgram
+    .command('apply')
     .argument('[patch]', 'patch name')
-    .option('--no-exec', 'Don\' execute patch, just set as done')
+    .option('--no-exec', "Don' execute patch, just set as done")
     .option('--force', 'Force apply patch')
     .action(async (patch, opts) => {
     const miri = await getMiri();
     await miri.init(opts, patch);
     await miri[Symbol.asyncDispose]();
 });
-initProgram.command('remove')
+initProgram
+    .command('remove')
     .argument('<patch>', 'patch name')
-    .option('--no-exec', 'Don\' execute patch, just set as done')
+    .option('--no-exec', "Don' execute patch, just set as done")
     .action(async (patch, opts) => {
     const miri = await getMiri();
     await miri.remove('init', patch, Boolean(opts?.exec));
     await miri[Symbol.asyncDispose]();
 });
-initProgram.command('status')
-    .action(() => status(false, 'init'));
-const indexesProgram = program.command('indexes')
-    .description('Manage indexes');
-indexesProgram.command('status')
+initProgram.command('status').action(() => status(false, 'init'));
+const indexesProgram = program.command('indexes').description('Manage indexes');
+indexesProgram
+    .command('status')
     .argument('[collection]', 'MongoDB Collection name')
     .option('-q --quiet', 'Show only changes', false)
     .action(async (collection, { quiet }) => {
@@ -317,18 +315,18 @@ indexesProgram.command('status')
     }
 });
 const indexSyncProgram = indexesProgram.command('sync');
-indexSyncProgram.argument('[collection]', 'MongoDB Collection name', '')
-    .action(async (collection) => {
+indexSyncProgram.argument('[collection]', 'MongoDB Collection name', '').action(async (collection) => {
     const miri = await getMiri();
     await syncIndexes(miri, collection);
     await miri[Symbol.asyncDispose]();
 });
-const patchProgram = program.command('patch')
-    .description('Applies patch to database');
-patchProgram.command('diff')
+const patchProgram = program.command('patch').description('Applies patch to database');
+patchProgram
+    .command('diff')
     .description('Displays difference between local and applied migrations')
     .action(() => status());
-patchProgram.command('sync')
+patchProgram
+    .command('sync')
     .description('Applies migrations')
     .option('--remote', 'Remote only')
     .option('--degraded', 'Re-apply patches on degraded migrations')
@@ -338,19 +336,21 @@ patchProgram.command('sync')
     await miri.sync(opts);
     await miri[Symbol.asyncDispose]();
 });
-patchProgram.command('apply')
+patchProgram
+    .command('apply')
     .argument('<group>', 'group name')
     .argument('<patch>', 'patch name')
-    .option('--no-exec', 'Don\' execute patch, just set as done')
+    .option('--no-exec', "Don' execute patch, just set as done")
     .action(async (group, patch, opts) => {
     const miri = await getMiri();
     await miri.applySingle(group, patch, Boolean(opts.exec));
     await miri[Symbol.asyncDispose]();
 });
-patchProgram.command('remove')
+patchProgram
+    .command('remove')
     .argument('<group>', 'group name')
     .argument('<patch>', 'patch name')
-    .option('--no-exec', 'Don\' execute patch, just set as done')
+    .option('--no-exec', "Don' execute patch, just set as done")
     .action(async (group, patch, opts) => {
     const miri = await getMiri();
     await miri.remove(group, patch, Boolean(opts.exec));

package/dist/evaluator.js

@@ -10,9 +10,7 @@ const print = (values, type) => {
         if (type === 'print') {
             return String(object);
         }
-        else {
-            return inspect(object, { colors: false, customInspect: true, depth: 22 });
-        }
+        return inspect(object, { colors: false, customInspect: true, depth: 22 });
     };
     for (const value of values) {
         const printable = value.printable ?? value.rawValue;
@@ -33,24 +31,34 @@ export async function evaluateMongo(client, code, filename = '[no file]') {
         productName: 'MIRI: Migration manager',
         productDocsLink: 'https://example.com/',
     });
-    const instanceState = new ShellInstanceState(cliServiceProvider);
+    // Add compatibility layer for missing clientBulkWrite method
+    // Properly extend the service provider to preserve all prototype methods
+    const serviceProviderWithBulkWrite = Object.create(Object.getPrototypeOf(cliServiceProvider));
+    Object.assign(serviceProviderWithBulkWrite, cliServiceProvider);
+    serviceProviderWithBulkWrite.clientBulkWrite = (operations, options) => {
+        // Fallback implementation - delegate to client if available
+        if ('bulkWrite' in client && typeof client.bulkWrite === 'function') {
+            return client.bulkWrite(operations, options);
+        }
+        throw new Error('clientBulkWrite not supported in this MongoDB version');
+    };
+    const instanceState = new ShellInstanceState(serviceProviderWithBulkWrite);
     instanceState.setCtx(context);
     instanceState.setEvaluationListener({
         onPrint(values, type) {
             return print(values, type);
         },
         onPrompt() {
-            throw new Error('Prompt isn\'t supported');
+            throw new Error("Prompt isn't supported");
         },
         onLoad() {
-            throw new Error('Load isn\'t supported');
+            throw new Error("Load isn't supported");
         },
         onExit() {
-            throw new Error('Exit isn\'t supported');
+            throw new Error("Exit isn't supported");
         },
     });
-    const output = await new ShellEvaluator(instanceState)
-        .customEval(runInContext, `${code};`, context, filename);
+    const output = await new ShellEvaluator(instanceState).customEval(runInContext, `${code};`, context, filename);
     return output.rawValue;
 }
 export async function evaluateJs(code, identifier = '[no file]') {
@@ -63,8 +71,7 @@ export async function evaluateJs(code, identifier = '[no file]') {
             }, { context: referencingModule.context });
         });
     });
-    await module.evaluate()
-        .catch((error) => {
+    await module.evaluate().catch((error) => {
         error.message += ` # at file ${identifier}`;
         throw error;
     });

package/dist/miri.js

@@ -53,8 +53,8 @@ export default class Migrator {
                 if (localPatch.content.up?.hash !== remotePatch.content.up?.hash) {
                     localPatch.status = PatchStatus.Changed;
                 }
-                else if (localPatch.content.test?.hash !== remotePatch.content.test?.hash
-                    || localPatch.content.down?.hash !== remotePatch.content.down?.hash) {
+                else if (localPatch.content.test?.hash !== remotePatch.content.test?.hash ||
+                    localPatch.content.down?.hash !== remotePatch.content.down?.hash) {
                     localPatch.status = PatchStatus.Updated;
                 }
                 if (localPatch.status !== PatchStatus.Ok) {
@@ -81,10 +81,9 @@ export default class Migrator {
             return -1;
         }
         const code = Buffer.from(content.body, 'base64').toString();
-        return evaluateMongo(this.client, wrap ? `(async ${code})();` : code, filename)
-            .catch((error) => {
+        return (evaluateMongo(this.client, wrap ? `(async ${code})();` : code, filename).catch((error) => {
             throw error;
-        }) ?? 0;
+        }) ?? 0);
     }
     async sync({ remote = false, all = false, degraded = false } = {}) {
         const patches = remote ? await this.getRemotePatches() : await this.diff();
@@ -147,9 +146,12 @@ export default class Migrator {
             if (!['.js', '.json'].includes(extension)) {
                 continue;
             }
+            // Construct full file path manually for newer Node.js types compatibility
+            const filePath = file.parentPath || resolve(migrationsDir, file.name);
+            const fullFilePath = resolve(filePath, file.name);
             const patchObject = {
                 _id: new ObjectId(),
-                group: file.path.substring(migrationsDir.length + 1),
+                group: filePath.substring(migrationsDir.length + 1),
                 name: file.name,
                 title: basename(file.name, extension),
                 content: {},
@@ -161,13 +163,12 @@ export default class Migrator {
                 continue;
             }
             patches.push(patchObject);
-            const patchContent = await readFile(resolve(process.cwd(), file.path, file.name));
+            const patchContent = await readFile(fullFilePath);
             if (raw) {
                 patchObject.raw = patchContent.toString('base64');
                 continue;
             }
-            const patchExports = await evaluateJs(patchContent.toString())
-                .catch(() => ({}));
+            const patchExports = await evaluateJs(patchContent.toString()).catch(() => ({}));
             for (const key of ['test', 'up', 'down']) {
                 const func = patchExports[key];
                 if (typeof func !== 'function') {
@@ -192,7 +193,8 @@ export default class Migrator {
         if (name) {
             filter.name = name;
         }
-        const patches = await this.#collection.find(filter, {
+        const patches = await this.#collection
+            .find(filter, {
             projection: {
                 _id: 1,
                 group: 1,
@@ -212,7 +214,8 @@ export default class Migrator {
                     },
                 },
             },
-        }).toArray();
+        })
+            .toArray();
         patches.sort(sortPatches);
         return patches;
     }
@@ -225,7 +228,9 @@ export default class Migrator {
             structure[patch.title] = {};
             const collection = structure[patch.title];
             // console.log(`Reading indexes from ${patch.title}...`)
-            const remoteIndexes = await db.collection(patch.title).indexes({ full: true })
+            const remoteIndexes = await db
+                .collection(patch.title)
+                .indexes({ full: true })
                 .catch(() => []);
             // console.dir([patch.title, remoteIndexes], { colors: true, customInspect: true, depth: 22 })
             for (const index of indexes) {
@@ -233,7 +238,7 @@ export default class Migrator {
                 if (typeof index === 'string') {
                     continue;
                 }
-                const [key, options] = (Array.isArray(index) ? index : [index, {}]);
+                const [key, options] = Array.isArray(index) ? index : [index, {}];
                 const name = Object.entries(key).reduce((result, [key, value]) => `${result ? `${result}_` : ''}${key}_${value}`, '');
                 const remoteIndex = remoteIndexes.find(({ name: indexName }) => indexName === name);
                 collection[name] = { key, options, status: remoteIndex ? IndexStatus.Applied : IndexStatus.New };
@@ -259,14 +264,16 @@ export default class Migrator {
             const coll = db.collection(collection);
             for (const [name, { key, status, options }] of Object.entries(indexes)) {
                 if (status === IndexStatus.Removed) {
-                    const error = await coll.dropIndex(name)
+                    const error = await coll
+                        .dropIndex(name)
                         .then(() => { })
                         .catch((error) => error);
                     yield { collection, name, error, status };
                     continue;
                 }
                 if (status === IndexStatus.New) {
-                    const error = await coll.createIndex(key, options)
+                    const error = await coll
+                        .createIndex(key, options)
                         .then(() => { })
                         .catch((error) => error);
                     yield { collection, name, error, status };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@13w/miri",
   "description": "MongoDB patch manager",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "type": "module",
   "engines": {
     "node": "v22"
@@ -26,23 +26,23 @@
   "types": "types/miri.d.ts",
   "dependencies": {
     "@mongosh/service-provider-server": "^2.3.2",
-    "@mongosh/shell-api": "^3.8.0",
-    "@mongosh/shell-evaluator": "^3.8.0",
+    "@mongosh/shell-api": "^3.20.0",
+    "@mongosh/shell-evaluator": "^3.20.0",
     "colors": "^1.4.0",
-    "commander": "^13.1.0",
-    "console-table-printer": "^2.12.1",
-    "mongodb": "^6.14.2",
+    "commander": "^14.0.0",
+    "console-table-printer": "^2.14.6",
+    "mongodb": "^6.19.0",
     "ssh-config": "^5.0.3",
     "tunnel-ssh": "^5.2.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.21.0",
-    "@types/node": "^22.13.9",
-    "eslint": "^9.21.0",
-    "mongodb-log-writer": "^2.4.0",
+    "@eslint/js": "^9.34.0",
+    "@types/node": "^24.3.0",
+    "eslint": "^9.34.0",
+    "mongodb-log-writer": "^2.4.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.2",
-    "typescript-eslint": "^8.26.0"
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.42.0"
   },
   "license": "MIT",
   "scripts": {