@vltpkg/cli-sdk 0.0.0-8 → 1.0.0-rc.1

package/dist/esm/commands/help.js.map

@@ -1 +1 @@
-{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/commands/help.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,MAAM,CAAC,MAAM,KAAK,GAAiB,GAAG,EAAE,CACtC,YAAY,CAAC;IACX,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,EAAE;IACT,WAAW,EAAE,wCAAwC;CACtD,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,OAAO,GAAsB,KAAK,EAAC,IAAI,EAAC,EAAE;IACrD,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAA;AAC1B,CAAC,CAAA","sourcesContent":["import { commandUsage } from '../config/usage.ts'\nimport type { CommandFn, CommandUsage } from '../index.ts'\n\nexport const usage: CommandUsage = () =>\n  commandUsage({\n    command: 'help',\n    usage: '',\n    description: 'Print the full help output for the CLI',\n  })\n\nexport const command: CommandFn<string> = async conf => {\n  return conf.jack.usage()\n}\n"]}
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../src/commands/help.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,CAAC,MAAM,KAAK,GAAiB,GAAG,EAAE,CACtC,YAAY,CAAC;IACX,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,aAAa;IACpB,WAAW,EACT,wEAAwE;IAC1E,QAAQ,EAAE;QACR,EAAE,EAAE,EAAE,WAAW,EAAE,uBAAuB,EAAE;QAC5C,OAAO,EAAE,EAAE,WAAW,EAAE,mCAAmC,EAAE;QAC7D,GAAG,EAAE,EAAE,WAAW,EAAE,+BAA+B,EAAE;KACtD;CACF,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,OAAO,GAAsB,KAAK,EAAC,IAAI,EAAC,EAAE;IACrD,gDAAgD;IAChD,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,+EAA+E;QAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAA;QAExD,4CAA4C;QAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YACpB,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAA;QACjC,CAAC;QACD,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;IAED,0DAA0D;IAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IACnC,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IAExC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,KAAK,CAAC,oBAAoB,OAAO,EAAE,EAAE;YACzC,KAAK,EAAE,OAAO;YACd,IAAI,EAAE,QAAQ;SACf,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,CAAA;IAC/C,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAA;AAChC,CAAC,CAAA","sourcesContent":["import { error } from '@vltpkg/error-cause'\nimport { commandUsage } from '../config/usage.ts'\nimport type { CommandFn, CommandUsage } from '../load-command.ts'\nimport { loadCommand } from '../load-command.ts'\nimport { getCommand } from '../config/definition.ts'\nimport {\n  generateDefaultHelp,\n  generateFullHelp,\n} from '../custom-help.ts'\n\nexport const usage: CommandUsage = () =>\n  commandUsage({\n    command: 'help',\n    usage: '[<command>]',\n    description:\n      'Print the full help output for the CLI, or help for a specific command',\n    examples: {\n      '': { description: 'Show general CLI help' },\n      install: { description: 'Show help for the install command' },\n      run: { description: 'Show help for the run command' },\n    },\n  })\n\nexport const command: CommandFn<string> = async conf => {\n  // If no positional arguments, show general help\n  if (conf.positionals.length === 0) {\n    // Check for color support (prefer explicit config, fall back to TTY detection)\n    const colors = conf.values.color ?? process.stdout.isTTY\n\n    // Use full custom help if --all flag is set\n    if (conf.values.all) {\n      return generateFullHelp(colors)\n    }\n    return generateDefaultHelp(colors)\n  }\n\n  // Get the command name from the first positional argument\n  const cmdName = conf.positionals[0]\n  const canonicalCmd = getCommand(cmdName)\n\n  if (!canonicalCmd) {\n    throw error(`Unknown command: ${cmdName}`, {\n      found: cmdName,\n      code: 'EUSAGE',\n    })\n  }\n\n  const command = await loadCommand(canonicalCmd)\n  return command.usage().usage()\n}\n"]}

package/dist/esm/commands/init.d.ts

@@ -1,9 +1,8 @@
-import type { CommandFn, CommandUsage } from '../index.ts';
 import type { InitFileResults } from '@vltpkg/init';
-import type { ViewFn, Views } from '../view.ts';
+import type { CommandFn, CommandUsage } from '../index.ts';
 export declare const usage: CommandUsage;
-export declare const views: Views<InitFileResults> & {
-    human: ViewFn<InitFileResults>;
+export declare const views: {
+    readonly human: (results: InitFileResults | InitFileResults[]) => string;
 };
-export declare const command: CommandFn<InitFileResults>;
+export declare const command: CommandFn<InitFileResults | InitFileResults[]>;
 //# sourceMappingURL=init.d.ts.map

package/dist/esm/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAE/C,eAAO,MAAM,KAAK,EAAE,YAKhB,CAAA;AAEJ,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,GAAG;IAC3C,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,CAAA;CAgB/B,CAAA;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,eAAe,CACX,CAAA"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG1D,eAAO,MAAM,KAAK,EAAE,YAKhB,CAAA;AAGJ,eAAO,MAAM,KAAK;8BACC,eAAe,GAAG,eAAe,EAAE;CAsBX,CAAA;AAE3C,eAAO,MAAM,OAAO,EAAE,SAAS,CAC7B,eAAe,GAAG,eAAe,EAAE,CAoFpC,CAAA"}

package/dist/esm/commands/init.js

@@ -1,25 +1,111 @@
-import { commandUsage } from "../config/usage.js";
+import { mkdirSync } from 'node:fs';
+import { relative, resolve } from 'node:path';
+import { minimatch } from 'minimatch';
 import { init } from '@vltpkg/init';
+import { load, save } from '@vltpkg/vlt-json';
+import { assertWSConfig, asWSConfig } from '@vltpkg/workspaces';
+import { commandUsage } from "../config/usage.js";
 export const usage = () => commandUsage({
     command: 'init',
     usage: '',
     description: `Create a new package.json file in the current directory.`,
 });
+// TODO: colorize the JSON if config.options.color
 export const views = {
-    human: (results, _options, _config) => {
+    human: (results) => {
         const output = [];
-        // TODO: colorize the JSON if config.options.color
-        for (const [type, { path, data }] of Object.entries(results)) {
-            output.push(`Wrote ${type} to ${path}:
+        // if results is an array, it means multiple workspaces were initialized
+        if (Array.isArray(results)) {
+            for (const result of results) {
+                for (const [type, { path }] of Object.entries(result)) {
+                    output.push(`Wrote ${type} to ${path}:`);
+                }
+            }
+        }
+        else {
+            // otherwise, it's a single result
+            for (const [type, { path, data }] of Object.entries(results)) {
+                output.push(`Wrote ${type} to ${path}:
 
-${JSON.stringify(data, null, 2)}
-`);
+${JSON.stringify(data, null, 2)}`);
+            }
         }
-        output.push(`Modify/add properties using \`vlt pkg\`. For example:
+        output.push(`\nModify/add properties using \`vlt pkg\`. For example:
 
   vlt pkg set "description=My new project"`);
         return output.join('\n');
     },
 };
-export const command = async () => await init({ cwd: process.cwd() });
+export const command = async (conf) => {
+    if (conf.values.workspace?.length) {
+        const workspacesConfig = load('workspaces', assertWSConfig);
+        const parsedWSConfig = asWSConfig(workspacesConfig ?? {});
+        const results = [];
+        const addToConfig = [];
+        // create a new package.json file for every workspace
+        // defined as cli --workspace options
+        for (const workspace of conf.values.workspace) {
+            // cwd is the resolved location of the workspace
+            const cwd = resolve(conf.options.projectRoot, workspace);
+            // create the folder in case it's missing
+            mkdirSync(cwd, { recursive: true });
+            // run the initialization script and collect results
+            results.push(await init({ cwd }));
+            // Check if this workspace path is covered by existing workspace patterns
+            const isMatched = Object.values(parsedWSConfig).some((patterns) => {
+                return patterns.some(pattern => minimatch(workspace, pattern));
+            });
+            // When a workspace is not matched we track it for insertion later
+            if (!isMatched) {
+                addToConfig.push(relative(conf.options.projectRoot, cwd).replace(/\\/g, '/'));
+            }
+        }
+        // if there are workspaces that were not matched by existing
+        // patterns, we add them to the workspaces config
+        if (addToConfig.length > 0) {
+            let workspaces = workspacesConfig;
+            // if the original workspaces config is a string, we'll need
+            // to convert it to an array in order to append the recently
+            // added workspaces
+            if (typeof workspacesConfig === 'string') {
+                workspaces = [workspacesConfig, ...addToConfig];
+            }
+            else if (Array.isArray(workspacesConfig)) {
+                // if the original workspaces config is an array, we simply
+                // append the missing items to it
+                workspaces = [...workspacesConfig, ...addToConfig];
+            }
+            else {
+                // otherwise we assume it's an Record<string, string[]> object
+                // and we'll add the new workspaces to the `packages` keys
+                workspaces = (workspacesConfig ?? {});
+                // if the `packages` key is not being used
+                if (!workspaces.packages) {
+                    workspaces.packages = addToConfig;
+                }
+                else {
+                    // if the `packages` key is defined as a string, we
+                    // convert it to an array to append the new items
+                    if (typeof workspaces.packages === 'string') {
+                        workspaces.packages = [
+                            workspaces.packages,
+                            ...addToConfig,
+                        ];
+                    }
+                    else {
+                        // if it is, we simply append the new workspaces
+                        workspaces.packages = [
+                            ...workspaces.packages,
+                            ...addToConfig,
+                        ];
+                    }
+                }
+            }
+            // finally, we add the new workspaces to the config file
+            save('workspaces', workspaces);
+        }
+        return results;
+    }
+    return init({ cwd: process.cwd() });
+};
 //# sourceMappingURL=init.js.map

package/dist/esm/commands/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAInC,MAAM,CAAC,MAAM,KAAK,GAAiB,GAAG,EAAE,CACtC,YAAY,CAAC;IACX,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,EAAE;IACT,WAAW,EAAE,0DAA0D;CACxE,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,KAAK,GAEd;IACF,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;QACpC,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,kDAAkD;QAClD,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7D,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,OAAO,IAAI;;EAExC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;CAC9B,CAAC,CAAA;QACE,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;;2CAE2B,CAAC,CAAA;QACxC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAA+B,KAAK,IAAI,EAAE,CAC5D,MAAM,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA","sourcesContent":["import { commandUsage } from '../config/usage.ts'\nimport type { CommandFn, CommandUsage } from '../index.ts'\nimport { init } from '@vltpkg/init'\nimport type { InitFileResults } from '@vltpkg/init'\nimport type { ViewFn, Views } from '../view.ts'\n\nexport const usage: CommandUsage = () =>\n  commandUsage({\n    command: 'init',\n    usage: '',\n    description: `Create a new package.json file in the current directory.`,\n  })\n\nexport const views: Views<InitFileResults> & {\n  human: ViewFn<InitFileResults>\n} = {\n  human: (results, _options, _config) => {\n    const output: string[] = []\n    // TODO: colorize the JSON if config.options.color\n    for (const [type, { path, data }] of Object.entries(results)) {\n      output.push(`Wrote ${type} to ${path}:\n\n${JSON.stringify(data, null, 2)}\n`)\n    }\n    output.push(`Modify/add properties using \\`vlt pkg\\`. For example:\n\n  vlt pkg set \"description=My new project\"`)\n    return output.join('\\n')\n  },\n}\n\nexport const command: CommandFn<InitFileResults> = async () =>\n  await init({ cwd: process.cwd() })\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init.ts"],"names":[],"mappings":"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","sourcesContent":["import { mkdirSync } from 'node:fs'\nimport { relative, resolve } from 'node:path'\nimport { minimatch } from 'minimatch'\nimport { init } from '@vltpkg/init'\nimport { load, save } from '@vltpkg/vlt-json'\nimport { assertWSConfig, asWSConfig } from '@vltpkg/workspaces'\nimport { commandUsage } from '../config/usage.ts'\nimport type { InitFileResults } from '@vltpkg/init'\nimport type { CommandFn, CommandUsage } from '../index.ts'\nimport type { Views } from '../view.ts'\n\nexport const usage: CommandUsage = () =>\n  commandUsage({\n    command: 'init',\n    usage: '',\n    description: `Create a new package.json file in the current directory.`,\n  })\n\n// TODO: colorize the JSON if config.options.color\nexport const views = {\n  human: (results: InitFileResults | InitFileResults[]) => {\n    const output: string[] = []\n    // if results is an array, it means multiple workspaces were initialized\n    if (Array.isArray(results)) {\n      for (const result of results) {\n        for (const [type, { path }] of Object.entries(result)) {\n          output.push(`Wrote ${type} to ${path}:`)\n        }\n      }\n    } else {\n      // otherwise, it's a single result\n      for (const [type, { path, data }] of Object.entries(results)) {\n        output.push(`Wrote ${type} to ${path}:\n\n${JSON.stringify(data, null, 2)}`)\n      }\n    }\n    output.push(`\\nModify/add properties using \\`vlt pkg\\`. For example:\n\n  vlt pkg set \"description=My new project\"`)\n    return output.join('\\n')\n  },\n} as const satisfies Views<InitFileResults>\n\nexport const command: CommandFn<\n  InitFileResults | InitFileResults[]\n> = async conf => {\n  if (conf.values.workspace?.length) {\n    const workspacesConfig = load('workspaces', assertWSConfig)\n    const parsedWSConfig = asWSConfig(workspacesConfig ?? {})\n    const results: InitFileResults[] = []\n    const addToConfig: string[] = []\n\n    // create a new package.json file for every workspace\n    // defined as cli --workspace options\n    for (const workspace of conf.values.workspace) {\n      // cwd is the resolved location of the workspace\n      const cwd = resolve(conf.options.projectRoot, workspace)\n\n      // create the folder in case it's missing\n      mkdirSync(cwd, { recursive: true })\n\n      // run the initialization script and collect results\n      results.push(await init({ cwd }))\n\n      // Check if this workspace path is covered by existing workspace patterns\n      const isMatched = Object.values(parsedWSConfig).some(\n        (patterns: string[]) => {\n          return patterns.some(pattern =>\n            minimatch(workspace, pattern),\n          )\n        },\n      )\n\n      // When a workspace is not matched we track it for insertion later\n      if (!isMatched) {\n        addToConfig.push(\n          relative(conf.options.projectRoot, cwd).replace(/\\\\/g, '/'),\n        )\n      }\n    }\n\n    // if there are workspaces that were not matched by existing\n    // patterns, we add them to the workspaces config\n    if (addToConfig.length > 0) {\n      let workspaces = workspacesConfig\n      // if the original workspaces config is a string, we'll need\n      // to convert it to an array in order to append the recently\n      // added workspaces\n      if (typeof workspacesConfig === 'string') {\n        workspaces = [workspacesConfig, ...addToConfig]\n      } else if (Array.isArray(workspacesConfig)) {\n        // if the original workspaces config is an array, we simply\n        // append the missing items to it\n        workspaces = [...workspacesConfig, ...addToConfig]\n      } else {\n        // otherwise we assume it's an Record<string, string[]> object\n        // and we'll add the new workspaces to the `packages` keys\n        workspaces = (workspacesConfig ?? {}) as Record<\n          string,\n          string[]\n        >\n        // if the `packages` key is not being used\n        if (!workspaces.packages) {\n          workspaces.packages = addToConfig\n        } else {\n          // if the `packages` key is defined as a string, we\n          // convert it to an array to append the new items\n          if (typeof workspaces.packages === 'string') {\n            workspaces.packages = [\n              workspaces.packages,\n              ...addToConfig,\n            ]\n          } else {\n            // if it is, we simply append the new workspaces\n            workspaces.packages = [\n              ...workspaces.packages,\n              ...addToConfig,\n            ]\n          }\n        }\n      }\n      // finally, we add the new workspaces to the config file\n      save('workspaces', workspaces)\n    }\n    return results\n  }\n\n  return init({ cwd: process.cwd() })\n}\n"]}

package/dist/esm/commands/install/reporter.d.ts

@@ -1,10 +1,11 @@
 import { ViewClass } from '../../view.ts';
+import type { InstallResult } from '../install.ts';
 export declare class InstallReporter extends ViewClass {
     #private;
     start(): void;
-    done(_result: unknown, { time }: {
+    done(_result: InstallResult, { time }: {
         time: number;
-    }): undefined;
+    }): Promise<undefined>;
     error(err: unknown): void;
 }
 //# sourceMappingURL=reporter.d.ts.map

package/dist/esm/commands/install/reporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../../../src/commands/install/reporter.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAgFzC,qBAAa,eAAgB,SAAQ,SAAS;;IAG5C,KAAK;IAIL,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAMjD,KAAK,CAAC,GAAG,EAAE,OAAO;CAGnB"}
+{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../../../../src/commands/install/reporter.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAEzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAqGlD,qBAAa,eAAgB,SAAQ,SAAS;;IAG5C,KAAK;IAIC,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAe7D,KAAK,CAAC,GAAG,EAAE,OAAO;CAGnB"}

package/dist/esm/commands/install/reporter.js

@@ -1,20 +1,26 @@
 import { emitter } from '@vltpkg/output';
 import { Box, render, Text } from 'ink';
 import Spinner from 'ink-spinner';
-import { createElement as $, Fragment, useLayoutEffect, useState, } from 'react';
-import { stdout } from "../../output.js";
+import { createElement as $, Fragment, useEffect, useState, } from 'react';
 import { ViewClass } from "../../view.js";
+import { asError } from '@vltpkg/types';
+const labels = {
+    build: 'resolving dependencies',
+    actual: '',
+    reify: 'extracting files',
+};
 const GraphStep = ({ text, step }) => {
     if (step.state === 'waiting') {
         return $(Text, { color: 'gray' }, text);
     }
     if (step.state === 'in_progress') {
-        return $(Text, { color: 'yellow' }, text, $(Spinner, { type: 'dots' }));
+        return $(Text, { color: 'yellow' }, text + ' ', $(Spinner, { type: 'dots' }));
     }
     return $(Text, { color: 'green' }, text, ' ✓');
 };
-const App = () => {
+const App = ({ trailer }) => {
     const [requests, setRequests] = useState(0);
+    const [cacheHit, setCacheHit] = useState(0);
     const [steps, setSteps] = useState({
         build: {
             state: 'waiting',
@@ -26,12 +32,19 @@ const App = () => {
             state: 'waiting',
         },
     });
-    useLayoutEffect(() => {
-        const update = () => setRequests(p => p + 1);
-        emitter.on('request', update);
-        return () => emitter.off('request', update);
+    useEffect(() => {
+        const updateRequests = ({ state }) => {
+            if (state === 'start') {
+                setRequests(p => p + 1);
+            }
+            else if (state === 'cache' || state === 'stale') {
+                setCacheHit(p => p + 1);
+            }
+        };
+        emitter.on('request', updateRequests);
+        return () => emitter.off('request', updateRequests);
     }, []);
-    useLayoutEffect(() => {
+    useEffect(() => {
         const update = ({ step, state }) => {
             setSteps(p => ({
                 ...p,
@@ -46,21 +59,36 @@ const App = () => {
     }, []);
     return $(Fragment, null, $(Box, null, ...['build', 'actual', 'reify'].map((step, idx, list) => {
         const separator = idx === list.length - 1 ? '' : ' > ';
-        return $(Text, { key: step }, $(GraphStep, { text: step, step: steps[step] }), $(Text, { color: 'gray' }, separator));
-    })), requests > 0 ? $(Text, null, `${requests} requests`) : null);
+        const label = labels[step];
+        if (!label)
+            return null;
+        return $(Text, { key: step }, $(GraphStep, { text: label, step: steps[step] }), $(Text, { color: 'gray' }, separator));
+    })), cacheHit > 0 ?
+        $(Text, null, `${cacheHit} cache hit${cacheHit > 1 ? 's' : ''}`)
+        : null, requests > 0 ?
+        $(Text, null, `${requests} request${requests > 1 ? 's' : ''}`)
+        : null, trailer ? $(Text, null, trailer) : null);
 };
 export class InstallReporter extends ViewClass {
     #instance = null;
     start() {
         this.#instance = render($(App));
     }
-    done(_result, { time }) {
-        this.#instance?.unmount();
-        stdout(`Done in ${time}ms`);
+    async done(_result, { time }) {
+        let out = `Done in ${time}ms`;
+        // prints a very complete message explaining users the next steps
+        // in case there are packages to be built
+        if (_result.buildQueue?.length) {
+            out += `\n\n📦 ${_result.buildQueue.length} packages have install scripts defined & were not fully built\n`;
+            out += '🔎 Run `vlt query :scripts` to list them\n';
+            out +=
+                '🔨 Run `vlt build` to run all required scripts to build installed packages.\n';
+        }
+        this.#instance?.rerender($(App, { trailer: out }));
         return undefined;
     }
     error(err) {
-        this.#instance?.unmount(err);
+        this.#instance?.unmount(asError(err));
     }
 }
 //# sourceMappingURL=reporter.js.map

package/dist/esm/commands/install/reporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../src/commands/install/reporter.ts"],"names":[],"mappings":"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","sourcesContent":["import { emitter } from '@vltpkg/output'\nimport type { Events } from '@vltpkg/output'\nimport { Box, render, Text } from 'ink'\nimport type { Instance } from 'ink'\nimport Spinner from 'ink-spinner'\nimport {\n  createElement as $,\n  Fragment,\n  useLayoutEffect,\n  useState,\n} from 'react'\nimport { stdout } from '../../output.ts'\nimport { ViewClass } from '../../view.ts'\n\ntype Step = {\n  state: 'waiting' | 'in_progress' | 'completed'\n}\n\nconst GraphStep = ({ text, step }: { text: string; step: Step }) => {\n  if (step.state === 'waiting') {\n    return $(Text, { color: 'gray' }, text)\n  }\n  if (step.state === 'in_progress') {\n    return $(\n      Text,\n      { color: 'yellow' },\n      text,\n      $(Spinner, { type: 'dots' }),\n    )\n  }\n  return $(Text, { color: 'green' }, text, ' ✓')\n}\n\nconst App = () => {\n  const [requests, setRequests] = useState(0)\n\n  const [steps, setSteps] = useState<\n    Record<Events['graphStep']['step'], Step>\n  >({\n    build: {\n      state: 'waiting',\n    },\n    actual: {\n      state: 'waiting',\n    },\n    reify: {\n      state: 'waiting',\n    },\n  })\n\n  useLayoutEffect(() => {\n    const update = () => setRequests(p => p + 1)\n    emitter.on('request', update)\n    return () => emitter.off('request', update)\n  }, [])\n\n  useLayoutEffect(() => {\n    const update = ({ step, state }: Events['graphStep']) => {\n      setSteps(p => ({\n        ...p,\n        [step]: {\n          ...p[step],\n          state: state === 'start' ? 'in_progress' : 'completed',\n        },\n      }))\n    }\n    emitter.on('graphStep', update)\n    return () => emitter.off('graphStep', update)\n  }, [])\n\n  return $(\n    Fragment,\n    null,\n    $(\n      Box,\n      null,\n      ...(['build', 'actual', 'reify'] as const).map(\n        (step, idx, list) => {\n          const separator = idx === list.length - 1 ? '' : ' > '\n          return $(\n            Text,\n            { key: step },\n            $(GraphStep, { text: step, step: steps[step] }),\n            $(Text, { color: 'gray' }, separator),\n          )\n        },\n      ),\n    ),\n    requests > 0 ? $(Text, null, `${requests} requests`) : null,\n  )\n}\n\nexport class InstallReporter extends ViewClass {\n  #instance: Instance | null = null\n\n  start() {\n    this.#instance = render($(App))\n  }\n\n  done(_result: unknown, { time }: { time: number }) {\n    this.#instance?.unmount()\n    stdout(`Done in ${time}ms`)\n    return undefined\n  }\n\n  error(err: unknown) {\n    this.#instance?.unmount(err as Error)\n  }\n}\n"]}
+{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../src/commands/install/reporter.ts"],"names":[],"mappings":"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","sourcesContent":["import { emitter } from '@vltpkg/output'\nimport type { Events } from '@vltpkg/output'\nimport { Box, render, Text } from 'ink'\nimport type { Instance } from 'ink'\nimport Spinner from 'ink-spinner'\nimport {\n  createElement as $,\n  Fragment,\n  useEffect,\n  useState,\n} from 'react'\nimport { ViewClass } from '../../view.ts'\nimport { asError } from '@vltpkg/types'\nimport type { InstallResult } from '../install.ts'\n\ntype Step = {\n  state: 'waiting' | 'in_progress' | 'completed'\n}\n\nconst labels: Record<Events['graphStep']['step'], string> = {\n  build: 'resolving dependencies',\n  actual: '',\n  reify: 'extracting files',\n}\n\nconst GraphStep = ({ text, step }: { text: string; step: Step }) => {\n  if (step.state === 'waiting') {\n    return $(Text, { color: 'gray' }, text)\n  }\n  if (step.state === 'in_progress') {\n    return $(\n      Text,\n      { color: 'yellow' },\n      text + ' ',\n      $(Spinner, { type: 'dots' }),\n    )\n  }\n  return $(Text, { color: 'green' }, text, ' ✓')\n}\n\nconst App = ({ trailer }: { trailer?: string }) => {\n  const [requests, setRequests] = useState(0)\n  const [cacheHit, setCacheHit] = useState(0)\n\n  const [steps, setSteps] = useState<\n    Record<Events['graphStep']['step'], Step>\n  >({\n    build: {\n      state: 'waiting',\n    },\n    actual: {\n      state: 'waiting',\n    },\n    reify: {\n      state: 'waiting',\n    },\n  })\n\n  useEffect(() => {\n    const updateRequests = ({ state }: Events['request']) => {\n      if (state === 'start') {\n        setRequests(p => p + 1)\n      } else if (state === 'cache' || state === 'stale') {\n        setCacheHit(p => p + 1)\n      }\n    }\n    emitter.on('request', updateRequests)\n    return () => emitter.off('request', updateRequests)\n  }, [])\n\n  useEffect(() => {\n    const update = ({ step, state }: Events['graphStep']) => {\n      setSteps(p => ({\n        ...p,\n        [step]: {\n          ...p[step],\n          state: state === 'start' ? 'in_progress' : 'completed',\n        },\n      }))\n    }\n    emitter.on('graphStep', update)\n    return () => emitter.off('graphStep', update)\n  }, [])\n\n  return $(\n    Fragment,\n    null,\n    $(\n      Box,\n      null,\n      ...(['build', 'actual', 'reify'] as const).map(\n        (step, idx, list) => {\n          const separator = idx === list.length - 1 ? '' : ' > '\n          const label = labels[step]\n          if (!label) return null\n          return $(\n            Text,\n            { key: step },\n            $(GraphStep, { text: label, step: steps[step] }),\n            $(Text, { color: 'gray' }, separator),\n          )\n        },\n      ),\n    ),\n    cacheHit > 0 ?\n      $(Text, null, `${cacheHit} cache hit${cacheHit > 1 ? 's' : ''}`)\n    : null,\n    requests > 0 ?\n      $(Text, null, `${requests} request${requests > 1 ? 's' : ''}`)\n    : null,\n    trailer ? $(Text, null, trailer) : null,\n  )\n}\n\nexport class InstallReporter extends ViewClass {\n  #instance: Instance | null = null\n\n  start() {\n    this.#instance = render($(App))\n  }\n\n  async done(_result: InstallResult, { time }: { time: number }) {\n    let out = `Done in ${time}ms`\n\n    // prints a very complete message explaining users the next steps\n    // in case there are packages to be built\n    if (_result.buildQueue?.length) {\n      out += `\\n\\n📦 ${_result.buildQueue.length} packages have install scripts defined & were not fully built\\n`\n      out += '🔎 Run `vlt query :scripts` to list them\\n'\n      out +=\n        '🔨 Run `vlt build` to run all required scripts to build installed packages.\\n'\n    }\n    this.#instance?.rerender($(App, { trailer: out }))\n    return undefined\n  }\n\n  error(err: unknown) {\n    this.#instance?.unmount(asError(err))\n  }\n}\n"]}

package/dist/esm/commands/install.d.ts

@@ -1,7 +1,28 @@
+import { InstallReporter } from './install/reporter.ts';
+import type { DepID } from '@vltpkg/dep-id';
 import type { Graph } from '@vltpkg/graph';
 import type { CommandFn, CommandUsage } from '../index.ts';
-import type { Views } from '../view.ts';
+/**
+ * The resulting object of an install operation. To be used by the view impl.
+ */
+export type InstallResult = {
+    /**
+     * A queue of package IDs that need to be built after the install is complete.
+     */
+    buildQueue?: DepID[];
+    /**
+     * The resulting graph structure at the end of an install.
+     */
+    graph: Graph;
+};
 export declare const usage: CommandUsage;
-export declare const views: Views<Graph>;
-export declare const command: CommandFn<Graph>;
+export declare const views: {
+    readonly json: (i: InstallResult) => {
+        graph: import("@vltpkg/graph").LockfileData;
+        buildQueue?: DepID[] | undefined;
+        message?: string | undefined;
+    };
+    readonly human: typeof InstallReporter;
+};
+export declare const command: CommandFn<InstallResult>;
 //# sourceMappingURL=install.d.ts.map

package/dist/esm/commands/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/commands/install.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAGvC,eAAO,MAAM,KAAK,EAAE,YAMhB,CAAA;AAEJ,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAG9B,CAAA;AAED,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,KAAK,CAKpC,CAAA"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/commands/install.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG1D;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,UAAU,CAAC,EAAE,KAAK,EAAE,CAAA;IACpB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,eAAO,MAAM,KAAK,EAAE,YAMhB,CAAA;AAEJ,eAAO,MAAM,KAAK;;;;;;;CAWuB,CAAA;AAEzC,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,aAAa,CAyB5C,CAAA"}

package/dist/esm/commands/install.js

@@ -9,13 +9,37 @@ export const usage = () => commandUsage({
                   vlt-lock.json appropriately.`,
 });
 export const views = {
-    json: g => g.toJSON(),
+    json: i => ({
+        ...(i.buildQueue?.length ?
+            {
+                buildQueue: i.buildQueue,
+                message: `${i.buildQueue.length} packages that will need to be built, run "vlt build" to complete the install.`,
+            }
+            : null),
+        graph: i.graph.toJSON(),
+    }),
     human: InstallReporter,
 };
 export const command = async (conf) => {
+    // TODO: we should probably throw an error if the user
+    // tries to install using either view=mermaid or view=gui
     const monorepo = conf.options.monorepo;
     const { add } = parseAddArgs(conf, monorepo);
-    const { graph } = await install(conf.options, add);
-    return graph;
+    const frozenLockfile = conf.options['frozen-lockfile'];
+    const expectLockfile = conf.options['expect-lockfile'];
+    const lockfileOnly = conf.options['lockfile-only'];
+    /* c8 ignore start */
+    const allowScripts = conf.get('allow-scripts') ?
+        String(conf.get('allow-scripts'))
+        : ':not(*)';
+    /* c8 ignore stop */
+    const { buildQueue, graph } = await install({
+        ...conf.options,
+        frozenLockfile,
+        expectLockfile,
+        allowScripts,
+        lockfileOnly,
+    }, add);
+    return { buildQueue, graph };
 };
 //# sourceMappingURL=install.js.map

package/dist/esm/commands/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/install.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,MAAM,CAAC,MAAM,KAAK,GAAiB,GAAG,EAAE,CACtC,YAAY,CAAC;IACX,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,gBAAgB;IACvB,WAAW,EAAE;+CAC8B;CAC5C,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,KAAK,GAAiB;IACjC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE;IACrB,KAAK,EAAE,eAAe;CACvB,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAqB,KAAK,EAAC,IAAI,EAAC,EAAE;IACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAA;IACtC,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC5C,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAClD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA","sourcesContent":["import type { Graph } from '@vltpkg/graph'\nimport { commandUsage } from '../config/usage.ts'\nimport type { CommandFn, CommandUsage } from '../index.ts'\nimport { install } from '@vltpkg/graph'\nimport { parseAddArgs } from '../parse-add-remove-args.ts'\nimport type { Views } from '../view.ts'\nimport { InstallReporter } from './install/reporter.ts'\n\nexport const usage: CommandUsage = () =>\n  commandUsage({\n    command: 'install',\n    usage: '[packages ...]',\n    description: `Install the specified packages, updating package.json and\n                  vlt-lock.json appropriately.`,\n  })\n\nexport const views: Views<Graph> = {\n  json: g => g.toJSON(),\n  human: InstallReporter,\n}\n\nexport const command: CommandFn<Graph> = async conf => {\n  const monorepo = conf.options.monorepo\n  const { add } = parseAddArgs(conf, monorepo)\n  const { graph } = await install(conf.options, add)\n  return graph\n}\n"]}
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAoBvD,MAAM,CAAC,MAAM,KAAK,GAAiB,GAAG,EAAE,CACtC,YAAY,CAAC;IACX,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,gBAAgB;IACvB,WAAW,EAAE;+CAC8B;CAC5C,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACV,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACxB;gBACE,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,OAAO,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,MAAM,gFAAgF;aAChH;YACH,CAAC,CAAC,IAAI,CAAC;QACP,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE;KACxB,CAAC;IACF,KAAK,EAAE,eAAe;CACiB,CAAA;AAEzC,MAAM,CAAC,MAAM,OAAO,GAA6B,KAAK,EAAC,IAAI,EAAC,EAAE;IAC5D,sDAAsD;IACtD,yDAAyD;IACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAA;IACtC,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACtD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACtD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;IAClD,qBAAqB;IACrB,MAAM,YAAY,GAChB,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACnC,CAAC,CAAC,SAAS,CAAA;IACb,oBAAoB;IACpB,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CACzC;QACE,GAAG,IAAI,CAAC,OAAO;QACf,cAAc;QACd,cAAc;QACd,YAAY;QACZ,YAAY;KACb,EACD,GAAG,CACJ,CAAA;IACD,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAA;AAC9B,CAAC,CAAA","sourcesContent":["import { commandUsage } from '../config/usage.ts'\nimport { install } from '@vltpkg/graph'\nimport { parseAddArgs } from '../parse-add-remove-args.ts'\nimport { InstallReporter } from './install/reporter.ts'\nimport type { DepID } from '@vltpkg/dep-id'\nimport type { Graph } from '@vltpkg/graph'\nimport type { CommandFn, CommandUsage } from '../index.ts'\nimport type { Views } from '../view.ts'\n\n/**\n * The resulting object of an install operation. To be used by the view impl.\n */\nexport type InstallResult = {\n  /**\n   * A queue of package IDs that need to be built after the install is complete.\n   */\n  buildQueue?: DepID[]\n  /**\n   * The resulting graph structure at the end of an install.\n   */\n  graph: Graph\n}\n\nexport const usage: CommandUsage = () =>\n  commandUsage({\n    command: 'install',\n    usage: '[packages ...]',\n    description: `Install the specified packages, updating package.json and\n                  vlt-lock.json appropriately.`,\n  })\n\nexport const views = {\n  json: i => ({\n    ...(i.buildQueue?.length ?\n      {\n        buildQueue: i.buildQueue,\n        message: `${i.buildQueue.length} packages that will need to be built, run \"vlt build\" to complete the install.`,\n      }\n    : null),\n    graph: i.graph.toJSON(),\n  }),\n  human: InstallReporter,\n} as const satisfies Views<InstallResult>\n\nexport const command: CommandFn<InstallResult> = async conf => {\n  // TODO: we should probably throw an error if the user\n  // tries to install using either view=mermaid or view=gui\n  const monorepo = conf.options.monorepo\n  const { add } = parseAddArgs(conf, monorepo)\n  const frozenLockfile = conf.options['frozen-lockfile']\n  const expectLockfile = conf.options['expect-lockfile']\n  const lockfileOnly = conf.options['lockfile-only']\n  /* c8 ignore start */\n  const allowScripts =\n    conf.get('allow-scripts') ?\n      String(conf.get('allow-scripts'))\n    : ':not(*)'\n  /* c8 ignore stop */\n  const { buildQueue, graph } = await install(\n    {\n      ...conf.options,\n      frozenLockfile,\n      expectLockfile,\n      allowScripts,\n      lockfileOnly,\n    },\n    add,\n  )\n  return { buildQueue, graph }\n}\n"]}

package/dist/esm/commands/list.d.ts

@@ -1,5 +1,5 @@
-import type { HumanReadableOutputGraph, JSONOutputGraph, MermaidOutputGraph } from '@vltpkg/graph';
 import { humanReadableOutput, jsonOutput, mermaidOutput } from '@vltpkg/graph';
+import type { HumanReadableOutputGraph, JSONOutputGraph, MermaidOutputGraph } from '@vltpkg/graph';
 import type { CommandFn, CommandUsage } from '../index.ts';
 export declare const usage: CommandUsage;
 export type ListResult = JSONOutputGraph & MermaidOutputGraph & HumanReadableOutputGraph & {
@@ -9,7 +9,7 @@ export declare const views: {
     readonly json: typeof jsonOutput;
     readonly mermaid: typeof mermaidOutput;
     readonly human: typeof humanReadableOutput;
-    readonly gui: ({ queryString }: ListResult, _: import("../view.ts").ViewOptions, conf: import("../config/index.ts").LoadedConfig) => Promise<void>;
+    readonly gui: ({ queryString }: ListResult, _: import("../view.ts").ViewOptions, conf: import("../config/index.ts").ParsedConfig) => Promise<void>;
 };
 export declare const command: CommandFn<ListResult>;
 //# sourceMappingURL=list.d.ts.map

package/dist/esm/commands/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAEnB,MAAM,eAAe,CAAA;AACtB,OAAO,EAEL,mBAAmB,EACnB,UAAU,EACV,aAAa,EACd,MAAM,eAAe,CAAA;AAItB,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI1D,eAAO,MAAM,KAAK,EAAE,YAkChB,CAAA;AAEJ,MAAM,MAAM,UAAU,GAAG,eAAe,GACtC,kBAAkB,GAClB,wBAAwB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD,eAAO,MAAM,KAAK;;;;;CAUoB,CAAA;AAEtC,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,UAAU,CAmEzC,CAAA"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mBAAmB,EACnB,UAAU,EACV,aAAa,EAEd,MAAM,eAAe,CAAA;AAQtB,OAAO,KAAK,EACV,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAGnB,MAAM,eAAe,CAAA;AAGtB,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG1D,eAAO,MAAM,KAAK,EAAE,YAyDhB,CAAA;AAEJ,MAAM,MAAM,UAAU,GAAG,eAAe,GACtC,kBAAkB,GAClB,wBAAwB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AAEpD,eAAO,MAAM,KAAK;;;;;CAUoB,CAAA;AAEtC,eAAO,MAAM,OAAO,EAAE,SAAS,CAAC,UAAU,CA+JzC,CAAA"}