auklet 0.0.23 → 0.0.25

package/README.md

@@ -125,10 +125,16 @@ Publish controls stay on CLI flags:
 auk publish --filter @scope/ui
 auk publish --version patch --dry-run
 auk publish --no-format
+auk publish --otp 123456
 ```
 
 `--no-format` disables auklet's publish output formatter for that run. It is not
 configured in `package.json`.
+Before writing versions, auklet checks npm authentication from each target
+package directory. Package-local `.npmrc` files and
+`package.json#publishConfig.registry` are respected.
+`--otp` is forwarded to `pnpm publish` for npm accounts or organizations that
+require publish 2FA. In CI, prefer an npm automation token.
 
 ## Configuration
 

package/dist/build/runTsdown.js

@@ -3,8 +3,7 @@ import { createRequire } from 'node:module';
 import { execa } from 'execa';
 const require = createRequire(import.meta.url);
 const tsdownRunFile = require.resolve('tsdown/run');
-const currentExtension = import.meta.url.endsWith('.ts') ? 'ts' : 'js';
-const defaultConfigFile = fileURLToPath(new URL(`./tsdownConfig.${currentExtension}`, import.meta.url));
+const defaultConfigFile = fileURLToPath(new URL('./tsdownConfig.js', import.meta.url));
 export function hasTsdownConfigArg(args) {
     return args.some((arg, index) => arg === '--no-config' ||
         arg === '-c' ||

package/dist/build/tsdown/dependencies.js

@@ -1,4 +1,4 @@
-import { parseModuleId } from '#auklet/build/tsdown/parseModuleId';
+import { parseModuleId } from 'conditional-export';
 import { createScopedAukletLogger } from '#auklet/logger';
 const logger = createScopedAukletLogger('build');
 const getExternal = (names) => {

package/dist/publish/api/pnpmApi.d.ts

@@ -6,7 +6,10 @@ export declare function ensurePnpm(): Promise<string>;
 export declare function readPnpmWorkspacePackages(root: string): Promise<WorkspacePackage[]>;
 export declare function runPnpmBuild(packageRoot: string): Promise<void>;
 export declare function runPnpmPublish(packageRoot: string, args: Array<string>): Promise<void>;
-export declare function runPnpmWhoami(root: string): Promise<string>;
+export declare function runPnpmWhoami(packageRoot: string, options?: {
+    packageName?: string;
+    registry?: string;
+}): Promise<string>;
 export declare function runPnpmOwnerAdd(packageName: string, user: string, options: {
     cwd: string;
     otp?: string;

package/dist/publish/api/pnpmApi.js

@@ -5,7 +5,8 @@ import { readPnpmWorkspacePackageInfo } from '#auklet/workspace/packages';
 const supportedPnpmRange = '>=10.0.0';
 export class NpmPublishAuthenticationError extends Error {
     constructor(packageRoot) {
-        super(`[publish] pnpm publish failed at ${packageRoot}: npm publish requires additional authentication.`);
+        super(`[publish] pnpm publish failed at ${packageRoot}: ` +
+            `npm publish requires additional authentication.`);
     }
 }
 const runPnpm = async (args, options = {}) => {
@@ -66,12 +67,17 @@ export async function runPnpmPublish(packageRoot, args) {
         throw new Error(`[publish] pnpm publish failed at ${packageRoot}.`);
     }
 }
-export async function runPnpmWhoami(root) {
-    const result = await runPnpm(['whoami'], {
-        cwd: root,
+export async function runPnpmWhoami(packageRoot, options = {}) {
+    const args = ['whoami'];
+    if (options.registry)
+        args.push('--registry', options.registry);
+    const result = await runPnpm(args, {
+        cwd: packageRoot,
     });
     if (result.exitCode) {
-        throw new Error('[publish] npm authentication is required before publishing.\n' +
+        const target = options.packageName ? ` for ${options.packageName}` : '';
+        const registry = options.registry ? ` at ${options.registry}` : '';
+        throw new Error(`[publish] npm authentication is required${target}${registry} before publishing.\n` +
             '[publish] Run `pnpm login` or configure an npm token before retrying.');
     }
     return String(result.stdout ?? '').trim();

package/dist/publish/runner/publishPreflight.js

@@ -1,3 +1,4 @@
+import { isPlainObject, isString } from 'aidly';
 import { PnpmPublishApi } from '#auklet/publish/api/pnpmPublishApi';
 import { runPnpmWhoami } from '#auklet/publish/api/pnpmApi';
 import { logAuthenticationError } from '#auklet/publish/runner/packagePublisher';
@@ -16,7 +17,18 @@ export class PublishPreflight {
     async verifyAuthentication(plan) {
         if (plan.dryRun)
             return;
-        await runPnpmWhoami(plan.root);
+        const checked = new Set();
+        for (const target of plan.targets) {
+            const registry = getPublishRegistry(target.packageJson.publishConfig);
+            const key = `${target.packageRoot}\n${registry ?? ''}`;
+            if (checked.has(key))
+                continue;
+            await runPnpmWhoami(target.packageRoot, {
+                packageName: target.packageName,
+                registry,
+            });
+            checked.add(key);
+        }
     }
     async verifyPnpmPublishDryRun(plan) {
         const options = {
@@ -34,3 +46,9 @@ export class PublishPreflight {
         }
     }
 }
+const getPublishRegistry = (publishConfig) => {
+    if (!isPlainObject(publishConfig))
+        return undefined;
+    const registry = Reflect.get(publishConfig, 'registry');
+    return isString(registry) && registry.length > 0 ? registry : undefined;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auklet",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "type": "module",
   "author": "chentao.arthur",
   "description": "Build utilities for TypeScript packages and module CSS output.",

package/dist/build/tsdown/parseModuleId.d.ts

@@ -1,6 +0,0 @@
-export declare function parseModuleId(moduleId: string): {
-    name: string;
-    path: string;
-    version: string;
-    raw: string;
-};

package/dist/build/tsdown/parseModuleId.js

@@ -1,100 +0,0 @@
-export function parseModuleId(moduleId) {
-    let name = '';
-    let path = '';
-    let version = '';
-    let buf = '';
-    let slash = 0;
-    let isScope = false;
-    const set = (type) => {
-        if (type === 'path')
-            path = buf;
-        if (type === 'name')
-            name = buf;
-        if (type === 'version')
-            version = buf;
-        buf = '';
-    };
-    const setValueBySlash = (char) => {
-        if (!name) {
-            set('name');
-        }
-        else if (!version) {
-            set('version');
-        }
-        else {
-            buf += char;
-        }
-    };
-    for (let i = 0, l = moduleId.length; i < l; i++) {
-        const char = moduleId[i];
-        if (char === '@') {
-            if (i === 0) {
-                buf += char;
-                isScope = true;
-            }
-            else if (!name) {
-                if (isScope) {
-                    if (slash === 1 && buf[buf.length - 1] !== '/') {
-                        set('name');
-                    }
-                    else {
-                        buf += char;
-                    }
-                }
-                else {
-                    set('name');
-                }
-            }
-            else {
-                buf += char;
-            }
-        }
-        else if (char === '/') {
-            if (slash === 0) {
-                if (!isScope) {
-                    setValueBySlash(char);
-                }
-                buf += char;
-            }
-            else if (slash === 1) {
-                if (isScope) {
-                    setValueBySlash(char);
-                }
-                buf += char;
-            }
-            else {
-                buf += char;
-            }
-            slash++;
-        }
-        else {
-            buf += char;
-        }
-    }
-    if (!name) {
-        set('name');
-    }
-    else if (!version) {
-        moduleId[name.length] === '@' ? set('version') : set('path');
-    }
-    else if (!path) {
-        set('path');
-    }
-    if (path) {
-        path = `.${path}`;
-    }
-    // `@vue` -> ''
-    // `@vue/` -> ''
-    // `@vue//` -> ''
-    if (isScope && (slash === 0 || name[name.length - 1] === '/')) {
-        name = '';
-        path = '';
-        version = '';
-    }
-    return {
-        name,
-        path,
-        version,
-        raw: moduleId,
-    };
-}