mopub 0.0.2 → 0.0.4

package/dist/publish.js

@@ -19,7 +19,11 @@ export const PublishInput = z
         .optional(),
     otp: z
         .string()
-        .describe('npm OTP to pass through to `npm publish --otp`. Only needed for registries that still require OTP-based 2FA. Leave unset to use npm\'s default browser-based auth flow.')
+        .describe('npm OTP to pass through to `npm publish --otp`. If not provided you will be prompted for it (press enter at the prompt to try publishing without MFA, e.g. for registries that use browser-based auth).')
+        .optional(),
+    tag: z
+        .string()
+        .describe('tag to publish to. Leave unset to use the last tag from the registry.')
         .optional(),
     bump: z
         .enum(['major', 'minor', 'patch', 'premajor', 'preminor', 'prepatch', 'prerelease', 'other', 'independent'])
@@ -118,6 +122,21 @@ async function getRegistryVersions(pkg) {
     const registryVersionsStdout = StdoutShape.parse(JSON.parse(registryVersionsResult.stdout));
     return Array.isArray(registryVersionsStdout) ? registryVersionsStdout : [];
 }
+async function getRegistryDistTags(pkgName) {
+    const result = await execa('npm', ['view', pkgName, 'dist-tags', '--json'], { reject: false });
+    if (!result.stdout)
+        return {};
+    try {
+        const parsed = JSON.parse(result.stdout);
+        if (parsed && typeof parsed === 'object' && !('error' in parsed)) {
+            return parsed;
+        }
+    }
+    catch {
+        // ignore - fall through to empty
+    }
+    return {};
+}
 const _breakpoint = (why = 'hmm') => ({
     title: `wait a bit because ${why}`,
     task: async (ctx, task) => {
@@ -440,7 +459,18 @@ export const publish = async (input) => {
             rendererOptions: { persistentOutput: true },
             task: async (ctx, task) => {
                 const shouldActuallyPublish = input.publish;
-                const publishTasks = createPublishTasks(ctx, { otp: input.otp });
+                let otp = input.otp;
+                if (shouldActuallyPublish) {
+                    otp ||= await task.prompt(ListrEnquirerPromptAdapter).run({
+                        message: 'Enter npm OTP (press enter to try publishing without MFA)',
+                        type: 'Input',
+                        validate: v => v === '' || (typeof v === 'string' && /^\d{6}$/.test(v)),
+                    });
+                    if (otp.length === 0) {
+                        task.output = 'No OTP provided - publish will likely error unless you have disabled MFA.';
+                    }
+                }
+                const publishTasks = createPublishTasks(ctx, { otp, tag: input.tag });
                 if (!shouldActuallyPublish)
                     publishTasks.forEach(t => (t.skip = true));
                 return task.newListr(publishTasks, { rendererOptions: { collapseSubtasks: false } });
@@ -477,7 +507,11 @@ export const PrebuiltInput = z.tuple([
     z.object({
         otp: z
             .string()
-            .describe('npm OTP to pass through to `npm publish --otp`. Only needed for registries that still require OTP-based 2FA. Leave unset to use npm\'s default browser-based auth flow.')
+            .describe('npm OTP to pass through to `npm publish --otp`. If not provided you will be prompted for it (press enter at the prompt to try publishing without MFA, e.g. for registries that use browser-based auth).')
+            .optional(),
+        tag: z
+            .string()
+            .describe('tag to publish to. Leave unset to use the last tag from the registry.')
             .optional(),
     }),
 ]);
@@ -487,7 +521,29 @@ export async function publishPrebuilt([folder, options]) {
         throw new Error(`Failed to get npm username: ${me.stderr}`);
     console.log(me.stdout, '<<<<<<< npm whoami');
     const ctx = loadContext(folder);
-    const tasks = new Listr(createPublishTasks(ctx, options), { ctx });
+    const tasks = new Listr([
+        {
+            title: 'Get OTP',
+            enabled: () => !options.otp,
+            task: async (_ctx, task) => {
+                options.otp = await task.prompt(ListrEnquirerPromptAdapter).run({
+                    message: 'Enter npm OTP (press enter to try publishing without MFA)',
+                    type: 'Input',
+                    validate: v => v === '' || (typeof v === 'string' && /^\d{6}$/.test(v)),
+                });
+                if (options.otp === '') {
+                    const confirmed = await task.prompt(ListrEnquirerPromptAdapter).run({
+                        message: 'This will fail unless you have disabled MFA, which is not recommended.',
+                        type: 'confirm',
+                    });
+                    if (!confirmed) {
+                        throw new Error('OTP not provided');
+                    }
+                }
+            },
+        },
+        ...createPublishTasks(ctx, options),
+    ], { ctx });
     await tasks.run();
 }
 function createPublishTasks(ctx, options) {
@@ -502,10 +558,30 @@ function createPublishTasks(ctx, options) {
                     const publishArgs = ['--access', 'public'];
                     if (options.otp)
                         publishArgs.push('--otp', options.otp);
-                    if (rhsPackageJson && semver.prerelease(rhsPackageJson.version)) {
+                    let resolvedTag = options.tag;
+                    // default to whichever dist-tag the previous comparable release was published under,
+                    // when both versions are the same prerelease/non-prerelease type. e.g. if 0.0.1-1 was
+                    // published as "latest", a follow-up 0.0.1-2 should also go to "latest" (not "next");
+                    // if 4.0.0 was published as "next", 4.0.1 should also be "next" (not "latest").
+                    if (!resolvedTag && lhsPackageJson?.version && rhsPackageJson?.version) {
+                        const sameType = Boolean(semver.prerelease(lhsPackageJson.version)) ===
+                            Boolean(semver.prerelease(rhsPackageJson.version));
+                        if (sameType) {
+                            const distTags = await getRegistryDistTags(pkg.name);
+                            const matchingTags = Object.entries(distTags)
+                                .filter(([, v]) => v === lhsPackageJson.version)
+                                .map(([t]) => t);
+                            if (matchingTags.length > 0) {
+                                resolvedTag = matchingTags.find(t => t === 'latest') || matchingTags[0];
+                            }
+                        }
+                    }
+                    if (resolvedTag) {
+                        publishArgs.push('--tag', resolvedTag);
+                    }
+                    else if (rhsPackageJson && semver.prerelease(rhsPackageJson.version)) {
                         const first = semver.prerelease(rhsPackageJson.version)?.[0];
-                        const tag = typeof first === 'string' ? first : 'next';
-                        publishArgs.push('--tag', tag);
+                        publishArgs.push('--tag', typeof first === 'string' ? first : 'next');
                     }
                     await pipeExeca(subtask, 'pnpm', ['publish', ...publishArgs], {
                         cwd: path.dirname(packageJsonFilepath(pkg, RHS_FOLDER)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mopub",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Publish packages in a pnpm monorepo",
   "type": "module",
   "bin": {
@@ -32,7 +32,7 @@
     "typescript": "^6.0.3"
   },
   "scripts": {
-    "dogfood": "tsx src/cli",
+    "clean": "rm -rf dist",
     "build": "tsc --noEmit false --outDir dist",
     "lint": "eslint .",
     "test": "echo maybe later"