@vltpkg/cli-sdk 1.0.1 → 1.0.3

package/dist/commands/cache.js

@@ -140,7 +140,7 @@ const info = async (conf, keys, view) => {
     }, view);
 };
 const fetchAll = async (conf, test) => {
-    const rc = conf.options.packageInfo.registryClient;
+    const rc = await conf.options.packageInfo.getRegistryClient();
     const { cache } = rc;
     const map = {};
     for await (const [key, val] of cache) {
@@ -152,7 +152,7 @@ const fetchAll = async (conf, test) => {
     return map;
 };
 const fetchKeys = async (conf, keys, test, view) => {
-    const rc = conf.options.packageInfo.registryClient;
+    const rc = await conf.options.packageInfo.getRegistryClient();
     const { cache } = rc;
     const map = {};
     const results = await Promise.all(keys.map(async (key) => {
@@ -172,7 +172,7 @@ const fetchKeys = async (conf, keys, test, view) => {
     return map;
 };
 const deleteEntries = async (conf, keys, test, view) => {
-    const rc = conf.options.packageInfo.registryClient;
+    const rc = await conf.options.packageInfo.getRegistryClient();
     const { cache } = rc;
     let count = 0;
     let size = 0;
@@ -223,7 +223,7 @@ const deleteKeys = async (conf, keys, view) => {
     return deleteEntries(conf, keys, () => true, view);
 };
 const deleteAll = async (conf, _, view) => {
-    const { cache } = conf.options.packageInfo.registryClient;
+    const { cache } = await conf.options.packageInfo.getRegistryClient();
     await rm(cache.path(), { recursive: true, force: true });
     await mkdir(cache.path(), { recursive: true });
     view?.stdout('Deleted all cache entries.');
@@ -243,7 +243,7 @@ const add = async (conf, specs, view) => {
         })
             .then(async (r) => {
             const { resolved, integrity } = r;
-            await packageInfo.registryClient.request(resolved, {
+            await (await packageInfo.getRegistryClient()).request(resolved, {
                 ...conf.options,
                 integrity,
                 staleWhileRevalidate: false,

package/dist/commands/ci.d.ts

@@ -1,4 +1,3 @@
-import { InstallReporter } from './install/reporter.ts';
 import type { CommandFn, CommandUsage } from '../index.ts';
 import type { InstallResult } from './install.ts';
 export type CIResult = Omit<InstallResult, 'buildQueue'>;
@@ -6,6 +5,6 @@ export declare const needsRegistry = true;
 export declare const usage: CommandUsage;
 export declare const views: {
     readonly json: (i: CIResult) => import("@vltpkg/graph").LockfileData;
-    readonly human: typeof InstallReporter;
+    readonly human: import("../view.ts").LazyView<InstallResult>;
 };
 export declare const command: CommandFn<CIResult>;

package/dist/commands/ci.js

@@ -1,6 +1,6 @@
 import { install } from '@vltpkg/graph';
 import { commandUsage } from "../config/usage.js";
-import { InstallReporter } from "./install/reporter.js";
+import { lazyView } from "../view.js";
 export const needsRegistry = true;
 export const usage = () => commandUsage({
     command: 'ci',
@@ -24,7 +24,7 @@ export const usage = () => commandUsage({
 });
 export const views = {
     json: i => i.graph.toJSON(),
-    human: InstallReporter,
+    human: lazyView(async () => (await import('./install/reporter.ts')).InstallReporter),
 };
 export const command = async (conf) => {
     const ciOptions = {

package/dist/commands/install.d.ts

@@ -1,4 +1,3 @@
-import { InstallReporter } from './install/reporter.ts';
 import type { DepID } from '@vltpkg/dep-id';
 import type { Diff, Graph } from '@vltpkg/graph';
 import type { CommandFn, CommandUsage } from '../index.ts';
@@ -42,6 +41,6 @@ export declare const views: {
         }[];
         removed: number;
     };
-    readonly human: typeof InstallReporter;
+    readonly human: import("../view.ts").LazyView<InstallResult>;
 };
 export declare const command: CommandFn<InstallResult>;

package/dist/commands/install.js

@@ -1,8 +1,8 @@
 import { commandUsage } from "../config/usage.js";
 import { install } from '@vltpkg/graph';
 import { parseAddArgs } from "../parse-add-remove-args.js";
-import { InstallReporter } from "./install/reporter.js";
 import { trackInstall } from "../telemetry.js";
+import { lazyView } from "../view.js";
 export const needsRegistry = true;
 export const usage = () => commandUsage({
     command: 'install',
@@ -112,7 +112,7 @@ export const views = {
                 : null),
         };
     },
-    human: InstallReporter,
+    human: lazyView(async () => (await import('./install/reporter.ts')).InstallReporter),
 };
 export const command = async (conf) => {
     // TODO: we should probably throw an error if the user

package/dist/commands/setup.js

@@ -13,6 +13,17 @@ export const VLT_REGISTRY_BASE = 'https://registry.vlt.io';
  * `npm` is the {@link https://docs.vlt.sh | default bare-spec alias}.
  */
 export const accountRegistries = ['npm', 'main'];
+/**
+ * What each account registry is, in the order {@link accountRegistries}
+ * is authenticated. Every registry has its own credentials, so the
+ * web-login flow opens the browser once per registry -- naming what is
+ * being authenticated keeps the second prompt from reading like a repeat
+ * of the first.
+ */
+const accountRegistryAuthPrompts = {
+    npm: `First, let's authenticate your public npm registry mirror`,
+    main: `Now let's authenticate your private registry`,
+};
 /** Build the per-account registry URL for a given registry name. */
 export const accountRegistryURL = (account, name) => `${VLT_REGISTRY_BASE}/${encodeURIComponent(account)}/${name}/`;
 /** Ensure a registry URL ends with a single trailing slash. */
@@ -97,8 +108,10 @@ export const command = async (conf) => {
         if (!yes) {
             const doAuth = await ask('Authenticate with your vlt.io account now? (Y/n) ');
             if (!/^n/i.test(doAuth)) {
+                stdout('Each registry is authenticated separately, so the browser ' +
+                    'opens once per registry.');
                 for (const name of accountRegistries) {
-                    stdout(`Authenticating against the "${name}" registry...`);
+                    stdout(`${accountRegistryAuthPrompts[name]} ("${name}")...`);
                     await rc.login(accountRegistryURL(account, name));
                 }
             }

package/dist/commands/uninstall.d.ts

@@ -1,6 +1,5 @@
 import type { Graph } from '@vltpkg/graph';
 import type { CommandFn, CommandUsage } from '../index.ts';
-import { InstallReporter } from './install/reporter.ts';
 export type UninstallResult = {
     /**
      * The resulting graph structure at the end of an uninstall.
@@ -11,6 +10,6 @@ export declare const needsRegistry = true;
 export declare const usage: CommandUsage;
 export declare const views: {
     readonly json: (i: UninstallResult) => import("@vltpkg/graph").LockfileData;
-    readonly human: typeof InstallReporter;
+    readonly human: import("../view.ts").LazyView<import("./install.ts").InstallResult>;
 };
 export declare const command: CommandFn<UninstallResult>;

package/dist/commands/uninstall.js

@@ -1,7 +1,7 @@
 import { uninstall } from '@vltpkg/graph';
 import { commandUsage } from "../config/usage.js";
 import { parseRemoveArgs } from "../parse-add-remove-args.js";
-import { InstallReporter } from "./install/reporter.js";
+import { lazyView } from "../view.js";
 export const needsRegistry = true;
 export const usage = () => commandUsage({
     command: 'uninstall',
@@ -25,7 +25,7 @@ export const usage = () => commandUsage({
 });
 export const views = {
     json: i => i.graph.toJSON(),
-    human: InstallReporter,
+    human: lazyView(async () => (await import('./install/reporter.ts')).InstallReporter),
 };
 export const command = async (conf) => {
     const { monorepo, scurry } = conf.options;

package/dist/commands/update.d.ts

@@ -1,5 +1,4 @@
 import type { CommandFn, CommandUsage } from '../index.ts';
-import { InstallReporter } from './install/reporter.ts';
 import type { InstallResult } from './install.ts';
 export declare const needsRegistry = true;
 export declare const usage: CommandUsage;
@@ -9,6 +8,6 @@ export declare const views: {
         buildQueue?: import("@vltpkg/dep-id").DepID[] | undefined;
         message?: string | undefined;
     };
-    readonly human: typeof InstallReporter;
+    readonly human: import("../view.ts").LazyView<InstallResult>;
 };
 export declare const command: CommandFn<InstallResult>;

package/dist/commands/update.js

@@ -1,7 +1,7 @@
 import { update } from '@vltpkg/graph';
 import { error } from '@vltpkg/error-cause';
 import { commandUsage } from "../config/usage.js";
-import { InstallReporter } from "./install/reporter.js";
+import { lazyView } from "../view.js";
 export const needsRegistry = true;
 export const usage = () => commandUsage({
     command: 'update',
@@ -25,7 +25,7 @@ export const views = {
             : null),
         graph: i.graph.toJSON(),
     }),
-    human: InstallReporter,
+    human: lazyView(async () => (await import('./install/reporter.ts')).InstallReporter),
 };
 export const command = async (conf) => {
     // Throw error if any arguments are provided

package/dist/output.d.ts

@@ -7,7 +7,7 @@ export declare const stderr: (...args: unknown[]) => void;
 type StyleTextFn = (format: Parameters<typeof utilStyleText>[0], s: string) => string;
 export declare let styleTextStdout: StyleTextFn;
 export declare let styleTextStderr: StyleTextFn;
-export declare const getView: <T>(conf: LoadedConfig, views?: Views<T>) => View<T>;
+export declare const getView: <T>(conf: LoadedConfig, views?: Views<T>) => Promise<View<T>>;
 export type OnDone<T> = (result: T) => Promise<unknown>;
 /**
  * Main export. Run the command appropriately, displaying output using

package/dist/output.js

@@ -3,7 +3,7 @@ import { createSupportsColor } from 'supports-color';
 import { defaultView } from "./config/definition.js";
 import { printErr, formatOptions } from "./print-err.js";
 import { hasConfiguredRegistry, missingRegistryError, } from "./require-registry.js";
-import { isViewClass } from "./view.js";
+import { isLazyView, isViewClass, loadLazyView } from "./view.js";
 import { generateDefaultHelp, generateFullHelp, } from "./custom-help.js";
 import { flush as flushTelemetry, trackCommand, trackError, } from "./telemetry.js";
 import { startRequestLog } from "./verbose-log.js";
@@ -36,13 +36,20 @@ export let styleTextStdout = (_, s) => s;
 export let styleTextStderr = (_, s) => s;
 /* c8 ignore stop */
 const identity = (x) => x;
-export const getView = (conf, views) => {
-    const viewName = conf.values.view;
-    const viewFn = viewName === 'inspect' ? identity
-        : viewName === 'silent' ? () => undefined
-            : typeof views === 'function' ? views
-                : views && typeof views === 'object' ? views[viewName]
-                    : identity;
+const selectView = (viewName, views) => {
+    if (viewName === 'inspect')
+        return identity;
+    if (viewName === 'silent')
+        return () => undefined;
+    if (isLazyView(views) || typeof views === 'function') {
+        return views;
+    }
+    if (views)
+        return views[viewName];
+    return identity;
+};
+export const getView = async (conf, views) => {
+    const viewFn = selectView(conf.values.view, views);
     // if the user specified a view that doesn't exist, then set it back to the
     // default, and try again. This will fall back to identity if it's also
     // missing. We also always treat 'json' as a valid view that falls back to
@@ -56,14 +63,18 @@ export const getView = (conf, views) => {
         process.env.VLT_VIEW = defaultView;
         return getView(conf, views);
     }
-    return viewFn ?? identity;
+    const resolved = viewFn ?? identity;
+    if (isLazyView(resolved)) {
+        return loadLazyView(resolved);
+    }
+    return resolved;
 };
 /**
  * If the view is a View class, then instantiate and start it.
  * If it's a view function, then just define the onDone method.
  */
-const startView = (conf, opts, views, { start } = { start: Date.now() }) => {
-    const View = getView(conf, views);
+const startView = async (conf, opts, views, { start } = { start: Date.now() }) => {
+    const View = await getView(conf, views);
     if (isViewClass(View)) {
         const view = new View(opts, conf);
         view.start();
@@ -116,7 +127,7 @@ export const outputCommand = async (cliCommand, conf, { start, vltVersion } = {
     // Stream per-request diagnostics to stderr when `--loglevel` is verbose
     // or higher (e.g. via `--verbose`). No-op otherwise.
     const stopRequestLog = startRequestLog(conf.values.loglevel, line => stderr(line), styleTextStderr);
-    const { onDone, onError } = startView(conf, 
+    const { onDone, onError } = await startView(conf, 
     // assume views will always output to stdout so use color support from there
     { colors: stdoutColor }, views, { start });
     const telemetryEnabled = conf.values.telemetry;

package/dist/view.d.ts

@@ -26,4 +26,12 @@ export declare class ViewClass<T = unknown> {
 export type ViewFn<T = unknown> = (result: T, options: ViewOptions, conf: LoadedConfig) => unknown;
 export type View<T = unknown> = ViewFn<T> | typeof ViewClass<T>;
 export declare const isViewClass: <T = unknown>(view: View<T>) => view is typeof ViewClass<T>;
-export type Views<T = unknown> = View<T> | Record<string, View<T>>;
+declare const kLazyView: unique symbol;
+export type LazyView<T = unknown> = {
+    readonly [kLazyView]: () => Promise<View<T>>;
+};
+export declare const lazyView: <T>(load: () => Promise<View<T>>) => LazyView<T>;
+export declare const isLazyView: <T = unknown>(v: unknown) => v is LazyView<T>;
+export declare const loadLazyView: <T>(v: LazyView<T>) => Promise<View<T>>;
+export type Views<T = unknown> = View<T> | LazyView<T> | Record<string, View<T> | LazyView<T>>;
+export {};

package/dist/view.js

@@ -28,3 +28,7 @@ export class ViewClass {
 export const isViewClass = (view) => typeof view === 'function' &&
     'prototype' in view &&
     view.prototype instanceof ViewClass;
+const kLazyView = Symbol.for('vlt.lazyView');
+export const lazyView = (load) => ({ [kLazyView]: load });
+export const isLazyView = (v) => !!v && typeof v === 'object' && kLazyView in v;
+export const loadLazyView = (v) => v[kLazyView]();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/cli-sdk",
   "description": "The source for the vlt CLI",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "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.1",
-    "@vltpkg/dep-id": "1.0.1",
-    "@vltpkg/dot-prop": "1.0.1",
-    "@vltpkg/error-cause": "1.0.1",
-    "@vltpkg/git": "1.0.1",
-    "@vltpkg/graph": "1.0.1",
-    "@vltpkg/graph-run": "1.0.1",
-    "@vltpkg/init": "1.0.1",
-    "@vltpkg/output": "1.0.1",
-    "@vltpkg/package-info": "1.0.1",
-    "@vltpkg/package-json": "1.0.1",
-    "@vltpkg/promise-spawn": "1.0.1",
-    "@vltpkg/query": "1.0.1",
-    "@vltpkg/registry-client": "1.0.1",
-    "@vltpkg/rollback-remove": "1.0.1",
-    "@vltpkg/run": "1.0.1",
-    "@vltpkg/security-archive": "1.0.1",
-    "@vltpkg/spec": "1.0.1",
-    "@vltpkg/types": "1.0.1",
-    "@vltpkg/url-open": "1.0.1",
-    "@vltpkg/vlt-json": "1.0.1",
-    "@vltpkg/vlx": "1.0.1",
-    "@vltpkg/workspaces": "1.0.1",
-    "@vltpkg/xdg": "1.0.1",
+    "@vltpkg/config": "1.0.3",
+    "@vltpkg/dep-id": "1.0.3",
+    "@vltpkg/dot-prop": "1.0.3",
+    "@vltpkg/error-cause": "1.0.3",
+    "@vltpkg/git": "1.0.3",
+    "@vltpkg/graph": "1.0.3",
+    "@vltpkg/graph-run": "1.0.3",
+    "@vltpkg/init": "1.0.3",
+    "@vltpkg/output": "1.0.3",
+    "@vltpkg/package-info": "1.0.3",
+    "@vltpkg/package-json": "1.0.3",
+    "@vltpkg/promise-spawn": "1.0.3",
+    "@vltpkg/query": "1.0.3",
+    "@vltpkg/registry-client": "1.0.3",
+    "@vltpkg/rollback-remove": "1.0.3",
+    "@vltpkg/run": "1.0.3",
+    "@vltpkg/security-archive": "1.0.3",
+    "@vltpkg/spec": "1.0.3",
+    "@vltpkg/types": "1.0.3",
+    "@vltpkg/url-open": "1.0.3",
+    "@vltpkg/vlt-json": "1.0.3",
+    "@vltpkg/vlx": "1.0.3",
+    "@vltpkg/workspaces": "1.0.3",
+    "@vltpkg/xdg": "1.0.3",
     "ansi-to-pre": "^1.0.6",
     "beautiful-mermaid": "^1.1.3",
     "chalk": "^5.6.2",