@13w/miri 1.1.4 → 1.1.6

package/dist/cli.js

@@ -11,7 +11,7 @@ const getMiri = async () => {
     const opts = program.opts();
     const client = await connection(opts.db);
     return new Miri(client, {
-        localMigrations: program.opts().migrations,
+        localMigrations: opts.migrations,
     });
 };
 const stats = async (remote = false) => {

package/dist/evaluator.js

@@ -5,8 +5,6 @@ import { inspect } from 'node:util';
 import { CliServiceProvider } from '@mongosh/service-provider-server';
 import { ShellInstanceState } from '@mongosh/shell-api';
 import { ShellEvaluator } from '@mongosh/shell-evaluator';
-import connect from './mongodb.js';
-const mongoClient = await connect();
 const print = (values, type) => {
     const prepare = (object, type = 'print') => {
         if (type === 'print') {
@@ -25,53 +23,46 @@ const print = (values, type) => {
         process.stdout.write('\n');
     }
 };
-const bus = new EventEmitter();
-const cliServiceProvider = new CliServiceProvider(mongoClient, bus, {
-    productName: 'MIRI: Migration manager',
-    productDocsLink: 'https://example.com/',
-});
-const context = createContext({
-    __env: Object.fromEntries(Object.entries(process.env)
-        .filter(([key]) => key.startsWith('MIRI_'))
-        .map(([key, value]) => [key.substring(5), value])),
-});
-const originalEval = (code) => runInContext(code, context);
-const instanceState = new ShellInstanceState(cliServiceProvider);
-instanceState.setCtx(context);
-instanceState.setEvaluationListener({
-    onPrint(values, type) {
-        // console.dir(['onPrint', type, values])
-        return print(values, type);
-    },
-    onPrompt() {
-        throw new Error('Prompt isn\'t supported');
-    },
-    onLoad() {
-        throw new Error('Load isn\'t supported');
-    },
-    async onExit(exitCode) {
-        process.stdout.write(`onExit: ${exitCode}\n`);
-        await mongoClient.close();
-        process.exit(exitCode);
-    },
-});
-export async function evaluateMongo(code, filename = '[no file]') {
+const __env = Object.fromEntries(Object.entries(process.env)
+    .filter(([key]) => key.startsWith('MIRI_'))
+    .map(([key, value]) => [key.substring(5), value]));
+export async function evaluateMongo(client, code, filename = '[no file]') {
+    const context = createContext({ __env });
+    const bus = new EventEmitter();
+    const cliServiceProvider = new CliServiceProvider(client, bus, {
+        productName: 'MIRI: Migration manager',
+        productDocsLink: 'https://example.com/',
+    });
+    const instanceState = new ShellInstanceState(cliServiceProvider);
+    instanceState.setCtx(context);
+    instanceState.setEvaluationListener({
+        onPrint(values, type) {
+            return print(values, type);
+        },
+        onPrompt() {
+            throw new Error('Prompt isn\'t supported');
+        },
+        onLoad() {
+            throw new Error('Load isn\'t supported');
+        },
+        async onExit() {
+            throw new Error('Exit isn\'t supported');
+        },
+    });
     const output = await new ShellEvaluator(instanceState)
-        .customEval(originalEval, `${code};`, context, filename);
-    // print([output])
+        .customEval(runInContext, `${code};`, context, filename);
     return output.rawValue;
 }
-async function linker(specifier, referencingModule) {
-    return import(specifier).then((module) => {
-        return new SyntheticModule(['default'], function () {
-            this.setExport('default', module.default);
-        }, { context: referencingModule.context });
-    });
-}
 export async function evaluateJs(code, identifier = '[no file]') {
-    const context = createContext({ console });
+    const context = createContext({ __env, console });
     const module = new SourceTextModule(code, { context, identifier });
-    await module.link(linker);
+    await module.link(async function linker(specifier, referencingModule) {
+        return import(specifier).then((module) => {
+            return new SyntheticModule(['default'], function () {
+                this.setExport('default', module.default);
+            }, { context: referencingModule.context });
+        });
+    });
     await module.evaluate()
         .catch((error) => {
         error.message += ` # at file ${identifier}`;

package/dist/miri.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { createHash } from 'node:crypto';
 import { readdir, readFile, realpath } from 'node:fs/promises';
-import { join } from 'node:path';
+import { resolve } from 'node:path';
 import { ObjectId } from 'mongodb';
 import { evaluateJs, evaluateMongo } from './evaluator.js';
 export var PatchStatus;
@@ -69,12 +69,12 @@ export default class Migrator {
         localPatches.sort(sortPatches);
         return localPatches;
     }
-    async applyPatchContent(content, wrap = true) {
+    async applyPatchContent(content, filename, wrap = true) {
         if (!content?.body) {
             return -1;
         }
         const code = Buffer.from(content.body, 'base64').toString();
-        return evaluateMongo(wrap ? `(${code})();` : code)
+        return evaluateMongo(this.client, wrap ? `(${code})();` : code, filename)
             .catch((error) => {
             throw error;
         }) ?? 0;
@@ -82,10 +82,11 @@ export default class Migrator {
     async sync() {
         const patches = await this.diff();
         for (const patch of patches) {
+            const filename = `${patch.group}/${patch.name}`;
             console.group(`Patch ${patch.group} / ${patch.name}...`);
             if (patch.status === PatchStatus.Removed) {
                 console.group('Reverting changes');
-                const result = await this.applyPatchContent(patch.remoteContent?.down);
+                const result = await this.applyPatchContent(patch.remoteContent?.down, filename);
                 console.log(result === -1 ? 'Revert script not found' : 'done');
                 console.groupEnd();
                 await this.#collection.deleteOne({ _id: patch._id });
@@ -94,18 +95,18 @@ export default class Migrator {
             }
             if (patch.status === PatchStatus.Changed) {
                 console.group('Reverting changes');
-                const result = await this.applyPatchContent(patch.remoteContent?.down);
+                const result = await this.applyPatchContent(patch.remoteContent?.down, filename);
                 console.log(result === -1 ? 'Revert script not found' : 'done');
                 console.groupEnd();
                 patch.status = PatchStatus.New;
             }
             if (patch.status === PatchStatus.New) {
                 console.group('Testing migration');
-                const test = await this.applyPatchContent(patch.content.test);
+                const test = await this.applyPatchContent(patch.content.test, filename);
                 console.log(`degradation level: ${test}`);
                 if (test !== 0) {
                     console.group('Applying migration...');
-                    await this.applyPatchContent(patch.content.up);
+                    await this.applyPatchContent(patch.content.up, filename);
                     console.log('Done');
                     console.groupEnd();
                 }
@@ -126,7 +127,7 @@ export default class Migrator {
         }
     }
     async getLocalPatches(raw = false, group = '', name = '') {
-        const migrationsDir = await realpath(join(process.cwd(), this.#options.localMigrations ?? 'migrations'));
+        const migrationsDir = await realpath(resolve(process.cwd(), this.#options.localMigrations ?? 'migrations'));
         console.debug(`Reading ${migrationsDir}...`);
         const files = await readdir(migrationsDir, { recursive: true, withFileTypes: true });
         const patches = [];
@@ -147,7 +148,7 @@ export default class Migrator {
                 continue;
             }
             patches.push(patchObject);
-            const patchContent = await readFile(join(file.path, file.name));
+            const patchContent = await readFile(resolve(process.cwd(), file.path, file.name));
             if (raw) {
                 patchObject.raw = patchContent.toString('base64');
                 continue;
@@ -218,7 +219,7 @@ export default class Migrator {
                 continue;
             }
             console.log('applying');
-            await this.applyPatchContent({ body: patch.raw, hash: '' }, false);
+            await this.applyPatchContent({ body: patch.raw, hash: '' }, `${patch.group}/${patch.name}`, false);
             await this.#collection.insertOne({
                 group: patch.group,
                 name: patch.name,
@@ -232,7 +233,7 @@ export default class Migrator {
         const patches = await (remote ? this.getRemotePatches() : this.diff());
         for (const patch of patches) {
             patch.status = patch.status ?? PatchStatus.Ok;
-            const degradation = await this.applyPatchContent(patch.content.test);
+            const degradation = await this.applyPatchContent(patch.content.test, `${patch.group}/${patch.name}`);
             patch.degradation = degradation === -1 ? '-' : degradation;
             if (degradation > 0 && [PatchStatus.Ok, PatchStatus.Updated].includes(patch.status)) {
                 patch.status = PatchStatus.Degraded;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@13w/miri",
   "description": "MongoDB patch manager",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "type": "module",
   "engines": {
     "node": "v20"
@@ -40,6 +40,6 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "lint": "eslint src/ --ext .ts --quiet",
-    "postinstall": "pnpm run build"
+    "prepublish": "pnpm run build"
   }
 }