@vltpkg/cli-sdk 1.0.8 → 1.0.10

package/dist/commands/publish.js

@@ -262,6 +262,9 @@ const commandSingle = async (location, conf) => {
         }
         catch (err) {
             throw error('Failed to publish package', {
+                code: 'EREQUEST',
+                url: publishUrl,
+                method: 'PUT',
                 cause: asError(err),
             });
         }
@@ -269,6 +272,10 @@ const commandSingle = async (location, conf) => {
         // respond with a 202 Accepted when processing is deferred (e.g. for
         // publish-time malware scanning).
         if (response.statusCode < 200 || response.statusCode >= 300) {
+            // the registry turning down our credentials is the user's to fix,
+            // not a bug to report, so it gets told apart from a registry that
+            // is simply broken.
+            const denied = response.statusCode === 401 || response.statusCode === 403;
             let advice = '';
             if (response.statusCode === 409) {
                 advice = `\n⚠️ ${name}@${version} already exists in the registry. Bump the version and try again.`;
@@ -277,8 +284,16 @@ const commandSingle = async (location, conf) => {
                 advice =
                     "\n⚠️ Make sure you're logged in and have access to publish the package.";
             }
+            else if (response.statusCode === 401) {
+                advice = `\n⚠️ Not logged in to ${registryUrl.origin}. Run \`vlt login\` and try again.`;
+            }
+            else if (response.statusCode === 403) {
+                advice = `\n⚠️ ${name} cannot be published by this account. Run \`vlt whoami\` to see who you are logged in as, and \`vlt login\` to switch accounts. A name already taken by someone else cannot be reused.`;
+            }
             throw error(`Failed to publish package: ${registryErrorMessage(response)}${advice}`, {
+                code: denied ? 'ENEEDAUTH' : 'EREQUEST',
                 url: publishUrl,
+                method: 'PUT',
                 response,
             });
         }

package/dist/commands/setup.js

@@ -1,6 +1,7 @@
 import { error } from '@vltpkg/error-cause';
 import { RegistryClient } from '@vltpkg/registry-client';
 import { defaultRegistries } from '@vltpkg/spec';
+import { asError, isErrorWithCause, isObject } from '@vltpkg/types';
 import { createInterface } from 'node:readline/promises';
 import { configWriteTarget } from "../config/index.js";
 import { registrySelectionFields } from "../config/merge-layers.js";
@@ -17,6 +18,24 @@ export const VLT_REGISTRY_BASE = 'https://registry.vlt.io';
 export const accountRegistries = ['npm', 'main'];
 /** Build the per-account registry URL for a given registry name. */
 export const accountRegistryURL = (account, name) => `${VLT_REGISTRY_BASE}/${encodeURIComponent(account)}/${name}/`;
+/**
+ * The account registries live at `${VLT_REGISTRY_BASE}/<account>/<name>/`, so
+ * an account slug that doesn't exist is a 404 from the login endpoint. Say
+ * that in terms of the slug the user typed, rather than passing along the
+ * bare HTTP failure.
+ */
+const accountAuthError = (account, er) => (isErrorWithCause(er) &&
+    isObject(er.cause) &&
+    er.cause.status === 404) ?
+    error([
+        `No vlt.io account or organization named "${account}".`,
+        '',
+        `Looked for it at ${accountRegistryURL(account, accountRegistries[0])}`,
+        '',
+        'Check the spelling of the slug, or sign up / create the',
+        `organization at ${VLT_SIGNUP_URL}, then run \`vlt setup\` again.`,
+    ].join('\n'), { code: 'ECONFIG', cause: er })
+    : asError(er);
 /** Ensure a registry URL ends with a single trailing slash. */
 const normalizeRegistryURL = (url) => url.endsWith('/') ? url : `${url}/`;
 export const views = {
@@ -113,7 +132,12 @@ export const command = async (conf) => {
                 // one token covers every registry on the account, so the browser
                 // opens once and the token is stored for all of them.
                 stdout(`Authenticating your account registries (${accountRegistries.join(', ')})...`);
-                await rc.login(accountRegistries.map(name => accountRegistryURL(account, name)));
+                try {
+                    await rc.login(accountRegistries.map(name => accountRegistryURL(account, name)));
+                }
+                catch (er) {
+                    throw accountAuthError(account, er);
+                }
             }
             // 5. offer to add further custom aliases
             for (;;) {

package/dist/commands/version.js

@@ -9,11 +9,16 @@ import { actual } from '@vltpkg/graph';
 import { Query } from '@vltpkg/query';
 import { createHostContextsMap } from "../query-host-contexts.js";
 import { minimatch } from 'minimatch';
+/**
+ * `--no-git-tag-version` skips the whole git dance, matching npm.
+ * `--no-commit` only skips the commit, leaving the bump uncommitted.
+ */
+const gitOptions = (conf) => {
+    const tag = conf.get('git-tag-version');
+    return { tag, commit: tag && conf.get('commit') };
+};
 const isValidVersionIncrement = (value) => versionIncrements.includes(value);
-const version = async (conf, increment, cwd, { 
-// Hardcode happy path options for now.
-// TODO: make these config definitions
-prereleaseId = 'pre', commit = true, tag = true, message = 'v%s', tagMessage = 'v%s', includeNameInCommit = false, includeNameInTag = false, } = {}) => {
+const version = async (conf, increment, cwd, { prereleaseId = 'pre', commit = true, tag = true, message = 'v%s', tagMessage = 'v%s', includeNameInCommit = false, includeNameInTag = false, } = {}) => {
     assert(increment, error('Version increment argument is required', {
         code: 'EUSAGE',
         validOptions: versionIncrements,
@@ -66,9 +71,7 @@ prereleaseId = 'pre', commit = true, tag = true, message = 'v%s', tagMessage = '
         dir: manifestDir,
     };
     // Handle git operations if we're in a git repository
-    if (
-    /* c8 ignore next -- commit and tag are always true for now */
-    (commit || tag) &&
+    if ((commit || tag) &&
         (await isGit({ cwd: conf.options.projectRoot }))) {
         // Check for uncommitted changes (excluding package.json since we just modified it)
         if (!(await isClean({ cwd: conf.options.projectRoot }))) {
@@ -146,7 +149,7 @@ export const usage = () => {
 
     The \`<newversion>\` argument should be a valid semver string or a valid increment type (one of patch, minor, major, prepatch, preminor, premajor, prerelease).
 
-    If run in a git repository, it will also create a version commit and tag.`,
+    If run in a git repository, it will also create a version commit and tag. Use \`--no-git-tag-version\` to skip both, or \`--no-commit\` to skip only the commit.`,
         options: {
             scope: {
                 value: '<query>',
@@ -163,6 +166,12 @@ export const usage = () => {
             recursive: {
                 description: 'Run version bump across all workspaces in the monorepo.',
             },
+            'no-git-tag-version': {
+                description: 'Bump the version without creating a git commit or tag.',
+            },
+            'no-commit': {
+                description: 'Create the git tag, but leave the version bump uncommitted.',
+            },
         },
     });
 };
@@ -238,12 +247,13 @@ export const command = async (conf) => {
     }
     else {
         const cwd = options.packageJson.find(process.cwd()) ?? projectRoot;
-        return version(conf, positionals[0], cwd);
+        return version(conf, positionals[0], cwd, gitOptions(conf));
     }
     assert(locations.length > 0, error('No workspaces or query results found'));
     const results = [];
     for (const location of locations) {
         results.push(await version(conf, positionals[0], location, {
+            ...gitOptions(conf),
             includeNameInCommit: true,
             includeNameInTag: true,
         }));

package/dist/config/definition.d.ts

@@ -413,6 +413,18 @@ export declare const definition: import("jackspeak").Jack<{
     };
 } & {
     access: import("jackspeak").ConfigOption<"string", false, readonly string[] | undefined>;
+} & {
+    'git-tag-version': {
+        description: string;
+        default: true;
+    };
+    commit: {
+        description: string;
+        default: true;
+    };
+} & {
+    'git-tag-version': import("jackspeak").ConfigOption<"boolean", false, undefined>;
+    commit: import("jackspeak").ConfigOption<"boolean", false, undefined>;
 } & {
     otp: {
         description: string;

package/dist/config/definition.js

@@ -716,6 +716,24 @@ export const definition = j
         description: 'Set the access level of the package',
         validOptions: ['public', 'restricted'],
     },
+})
+    .flag({
+    'git-tag-version': {
+        description: `Commit and tag the version change made by \`vlt version\`.
+
+                    Set \`--no-git-tag-version\` to bump the version in
+                    \`package.json\` without touching git at all, so that a
+                    series of bumps can be committed together.`,
+        default: true,
+    },
+    commit: {
+        description: `Create the version commit in \`vlt version\`.
+
+                    Set \`--no-commit\` to leave the bumped \`package.json\`
+                    uncommitted while still creating the git tag. Implied by
+                    \`--no-git-tag-version\`.`,
+        default: true,
+    },
 })
     .opt({
     otp: {

package/dist/print-err.js

@@ -166,6 +166,14 @@ const printCode = (err, usage, stderr, format) => {
             }
             return { file: true };
         }
+        case 'ENEEDAUTH': {
+            const { url } = err.cause;
+            stderr(`Authentication Error: ${err.message}`);
+            if (url) {
+                stderr(indent(`URL: ${formatURL(url, format)}`));
+            }
+            return {};
+        }
         case 'EREQUEST': {
             const { url, method } = err.cause;
             const { code, syscall } = err.cause.cause ?? {};
@@ -184,6 +192,20 @@ const printCode = (err, usage, stderr, format) => {
             }
             return { file: true };
         }
+        case 'EQUERY': {
+            const { found, wanted, validOptions } = err.cause;
+            stderr(`Query Error: ${err.message}`);
+            if (found) {
+                stderr(indent(`Found: ${format(found)}`));
+            }
+            if (wanted) {
+                stderr(indent(`Did you mean: ${format(wanted)}`));
+            }
+            if (validOptions) {
+                stderr(indent(`Valid Options: ${format(validOptions)}`));
+            }
+            return {};
+        }
         case 'ECONFIG': {
             const { found, wanted, validOptions } = err.cause;
             stderr(`Config Error: ${err.message}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/cli-sdk",
   "description": "The source for the vlt CLI",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
@@ -14,30 +14,30 @@
   },
   "dependencies": {
     "@resvg/resvg-wasm": "^2.6.2",
-    "@vltpkg/config": "1.0.8",
-    "@vltpkg/dep-id": "1.0.8",
-    "@vltpkg/dot-prop": "1.0.8",
-    "@vltpkg/error-cause": "1.0.8",
-    "@vltpkg/git": "1.0.8",
-    "@vltpkg/graph": "1.0.8",
-    "@vltpkg/graph-run": "1.0.8",
-    "@vltpkg/init": "1.0.8",
-    "@vltpkg/output": "1.0.8",
-    "@vltpkg/package-info": "1.0.8",
-    "@vltpkg/package-json": "1.0.8",
-    "@vltpkg/promise-spawn": "1.0.8",
-    "@vltpkg/query": "1.0.8",
-    "@vltpkg/registry-client": "1.0.8",
-    "@vltpkg/rollback-remove": "1.0.8",
-    "@vltpkg/run": "1.0.8",
-    "@vltpkg/security-archive": "1.0.8",
-    "@vltpkg/spec": "1.0.8",
-    "@vltpkg/types": "1.0.8",
-    "@vltpkg/url-open": "1.0.8",
-    "@vltpkg/vlt-json": "1.0.8",
-    "@vltpkg/vlx": "1.0.8",
-    "@vltpkg/workspaces": "1.0.8",
-    "@vltpkg/xdg": "1.0.8",
+    "@vltpkg/config": "1.0.10",
+    "@vltpkg/dep-id": "1.0.10",
+    "@vltpkg/dot-prop": "1.0.10",
+    "@vltpkg/error-cause": "1.0.10",
+    "@vltpkg/git": "1.0.10",
+    "@vltpkg/graph": "1.0.10",
+    "@vltpkg/graph-run": "1.0.10",
+    "@vltpkg/init": "1.0.10",
+    "@vltpkg/output": "1.0.10",
+    "@vltpkg/package-info": "1.0.10",
+    "@vltpkg/package-json": "1.0.10",
+    "@vltpkg/promise-spawn": "1.0.10",
+    "@vltpkg/query": "1.0.10",
+    "@vltpkg/registry-client": "1.0.10",
+    "@vltpkg/rollback-remove": "1.0.10",
+    "@vltpkg/run": "1.0.10",
+    "@vltpkg/security-archive": "1.0.10",
+    "@vltpkg/spec": "1.0.10",
+    "@vltpkg/types": "1.0.10",
+    "@vltpkg/url-open": "1.0.10",
+    "@vltpkg/vlt-json": "1.0.10",
+    "@vltpkg/vlx": "1.0.10",
+    "@vltpkg/workspaces": "1.0.10",
+    "@vltpkg/xdg": "1.0.10",
     "ansi-to-pre": "^1.0.6",
     "beautiful-mermaid": "^1.1.3",
     "chalk": "^5.6.2",