@pnpm/cli.commands 1100.0.26 → 1100.0.28

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @pnpm/cli.commands
 
+## 1100.0.28
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/config.reader@1101.12.1
+
+## 1100.0.27
+
+### Patch Changes
+
+- Updated dependencies:
+  - @pnpm/config.reader@1101.12.0
+
 ## 1100.0.26
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/cli.commands",
-  "version": "1100.0.26",
+  "version": "1100.0.28",
   "description": "Commands for pnpm CLI",
   "keywords": [
     "pnpm",
@@ -28,15 +28,15 @@
   ],
   "dependencies": {
     "@pnpm/cli.command": "^1100.0.1",
-    "@pnpm/cli.parse-cli-args": "^1100.1.5",
-    "@pnpm/cli.utils": "^1101.0.13",
-    "@pnpm/config.reader": "1101.11.2",
+    "@pnpm/cli.parse-cli-args": "^1100.1.6",
+    "@pnpm/cli.utils": "^1101.0.15",
+    "@pnpm/config.reader": "1101.12.1",
     "@pnpm/error": "^1100.0.1",
     "@pnpm/nopt": "^0.3.1",
     "@pnpm/tabtab": "^0.5.4",
-    "@pnpm/workspace.projects-reader": "^1101.0.13",
+    "@pnpm/workspace.projects-reader": "^1101.0.15",
     "@pnpm/workspace.root-finder": "^1100.0.3",
-    "@pnpm/workspace.workspace-manifest-reader": "^1100.0.9",
+    "@pnpm/workspace.workspace-manifest-reader": "^1100.1.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
     "render-help": "^2.0.0",
     "split-cmd": "^1.1.0"
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",
-    "@pnpm/cli.commands": "1100.0.26",
+    "@pnpm/cli.commands": "1100.0.28",
     "@pnpm/logger": "1100.0.0",
     "@types/ramda": "0.31.1"
   },

package/lib/completion/complete.d.ts

@@ -1,16 +0,0 @@
-import type { CompletionFunc } from '@pnpm/cli.command';
-import type { CompletionItem } from '@pnpm/tabtab';
-export declare function complete(ctx: {
-    cliOptionsTypesByCommandName: Record<string, () => Record<string, unknown>>;
-    completionByCommandName: Record<string, CompletionFunc>;
-    initialCompletion: () => CompletionItem[];
-    shorthandsByCommandName: Record<string, Record<string, string | string[]>>;
-    universalOptionsTypes: Record<string, unknown>;
-    universalShorthands: Record<string, string>;
-}, input: {
-    params: string[];
-    cmd: string | null;
-    currentTypedWordType: 'option' | 'value' | null;
-    lastOption: string | null;
-    options: Record<string, unknown>;
-}): Promise<CompletionItem[]>;

package/lib/completion/complete.js

@@ -1,70 +0,0 @@
-import { findWorkspaceProjects } from '@pnpm/workspace.projects-reader';
-import { findWorkspaceDir } from '@pnpm/workspace.root-finder';
-import { readWorkspaceManifest } from '@pnpm/workspace.workspace-manifest-reader';
-import { getOptionCompletions } from './getOptionType.js';
-import { optionTypesToCompletions } from './optionTypesToCompletions.js';
-export async function complete(ctx, input) {
-    if (input.options.version)
-        return [];
-    const optionTypes = {
-        ...ctx.universalOptionsTypes,
-        ...((input.cmd && ctx.cliOptionsTypesByCommandName[input.cmd]?.()) ?? {}),
-    };
-    // Autocompleting option values
-    if (input.currentTypedWordType !== 'option') {
-        if (input.lastOption === '--filter' || input.lastOption === '-F') {
-            const workspaceDir = await findWorkspaceDir(process.cwd()) ?? process.cwd();
-            const workspaceManifest = await readWorkspaceManifest(workspaceDir);
-            const allProjects = await findWorkspaceProjects(workspaceDir, {
-                patterns: workspaceManifest?.packages,
-                supportedArchitectures: {
-                    os: ['current'],
-                    cpu: ['current'],
-                    libc: ['current'],
-                },
-            });
-            return allProjects
-                .map(({ manifest }) => ({ name: manifest.name }))
-                .filter((item) => !!item.name);
-        }
-        else if (input.lastOption) {
-            const optionCompletions = getOptionCompletions(optionTypes, // eslint-disable-line
-            {
-                ...ctx.universalShorthands,
-                ...(input.cmd ? ctx.shorthandsByCommandName[input.cmd] : {}),
-            }, input.lastOption);
-            if (optionCompletions !== undefined) {
-                return optionCompletions.map((name) => ({ name }));
-            }
-        }
-    }
-    let completions = [];
-    if (input.currentTypedWordType !== 'option') {
-        if (!input.cmd || input.currentTypedWordType === 'value' && !ctx.completionByCommandName[input.cmd]) {
-            completions = ctx.initialCompletion();
-        }
-        else if (ctx.completionByCommandName[input.cmd]) {
-            try {
-                completions = await ctx.completionByCommandName[input.cmd](input.options, input.params);
-            }
-            catch {
-                // Ignore
-            }
-        }
-    }
-    if (input.currentTypedWordType === 'value') {
-        return completions;
-    }
-    if (!input.cmd) {
-        return [
-            ...completions,
-            ...optionTypesToCompletions(optionTypes),
-            { name: '--version' },
-        ];
-    }
-    return [
-        ...completions,
-        ...optionTypesToCompletions(optionTypes), // eslint-disable-line
-    ];
-}
-//# sourceMappingURL=complete.js.map

package/lib/completion/completionServer.d.ts

@@ -1,12 +0,0 @@
-import type { CompletionFunc } from '@pnpm/cli.command';
-import type { ParsedCliArgs } from '@pnpm/cli.parse-cli-args';
-import { type CompletionItem } from '@pnpm/tabtab';
-export declare function createCompletionServer(opts: {
-    cliOptionsTypesByCommandName: Record<string, () => Record<string, unknown>>;
-    completionByCommandName: Record<string, CompletionFunc>;
-    initialCompletion: () => CompletionItem[];
-    shorthandsByCommandName: Record<string, Record<string, string | string[]>>;
-    parseCliArgs: (args: string[]) => Promise<ParsedCliArgs>;
-    universalOptionsTypes: Record<string, unknown>;
-    universalShorthands: Record<string, string>;
-}): () => Promise<void>;

package/lib/completion/completionServer.js

@@ -1,36 +0,0 @@
-import tabtab from '@pnpm/tabtab';
-import { getShellFromEnv } from '@pnpm/tabtab';
-import { split as splitCmd } from 'split-cmd/index.modern.mjs';
-import { complete } from './complete.js';
-import { currentTypedWordType, getLastOption, } from './getOptionType.js';
-export function createCompletionServer(opts) {
-    return async () => {
-        const shell = getShellFromEnv(process.env);
-        const env = tabtab.parseEnv(process.env);
-        if (!env.complete)
-            return;
-        const inputArgv = splitCmd(stripPartialWord(env)).slice(1);
-        // We cannot autocomplete what a user types after "pnpm test --"
-        if (inputArgv.includes('--'))
-            return;
-        const { params, options, cmd } = await opts.parseCliArgs(inputArgv);
-        tabtab.log(await complete(opts, {
-            cmd,
-            currentTypedWordType: currentTypedWordType(env),
-            lastOption: getLastOption(env),
-            options,
-            params,
-        }), shell);
-    };
-}
-/**
- * Returns the portion of the command line that consists of fully typed words,
- */
-function stripPartialWord(env) {
-    if (env.lastPartial.length > 0) {
-        // stripping any word the user is currently typing.
-        return env.partial.slice(0, -env.lastPartial.length);
-    }
-    return env.partial;
-}
-//# sourceMappingURL=completionServer.js.map

package/lib/completion/generateCompletion.d.ts

@@ -1,11 +0,0 @@
-export declare const commandNames: string[];
-export declare const skipPackageManagerCheck = true;
-export declare const rcOptionsTypes: () => Record<string, unknown>;
-export declare const cliOptionsTypes: () => Record<string, unknown>;
-export declare function help(): string;
-export interface Context {
-    readonly log: (output: string) => void;
-}
-export type CompletionGenerator = (_opts: unknown, params: string[]) => Promise<void>;
-export declare function createCompletionGenerator(ctx: Context): CompletionGenerator;
-export declare const handler: CompletionGenerator;

package/lib/completion/generateCompletion.js

@@ -1,41 +0,0 @@
-import { getCompletionScript, SUPPORTED_SHELLS } from '@pnpm/tabtab';
-import { renderHelp } from 'render-help';
-import { getShellFromParams } from './getShell.js';
-export const commandNames = ['completion'];
-export const skipPackageManagerCheck = true;
-export const rcOptionsTypes = () => ({});
-export const cliOptionsTypes = () => ({});
-export function help() {
-    return renderHelp({
-        description: 'Print shell completion code to stdout',
-        url: 'https://pnpm.io/completion',
-        usages: SUPPORTED_SHELLS.map(shell => `pnpm completion ${shell}`),
-    });
-}
-const PNPM_COMMAND = 'pnpm';
-const PNPM_SHORT_ALIAS = 'pn';
-export function createCompletionGenerator(ctx) {
-    return async function handler(_opts, params) {
-        const shell = getShellFromParams(params);
-        const output = await getCompletionScript({ name: PNPM_COMMAND, completer: PNPM_COMMAND, shell });
-        ctx.log(registerShortAlias(output, shell));
-    };
-}
-function registerShortAlias(output, shell) {
-    switch (shell) {
-        case 'bash':
-            return output.replace(`complete -o default -F _${PNPM_COMMAND}_completion ${PNPM_COMMAND}`, `complete -o default -F _${PNPM_COMMAND}_completion ${PNPM_COMMAND} ${PNPM_SHORT_ALIAS}`);
-        case 'fish':
-            return output.replace(`complete -f -d '${PNPM_COMMAND}' -c ${PNPM_COMMAND} -a "(_${PNPM_COMMAND}_completion)"`, `complete -f -d '${PNPM_COMMAND}' -c ${PNPM_COMMAND} -a "(_${PNPM_COMMAND}_completion)"\ncomplete -f -d '${PNPM_COMMAND}' -c ${PNPM_SHORT_ALIAS} -a "(_${PNPM_COMMAND}_completion)"`);
-        case 'pwsh':
-            return output.replace(`Register-ArgumentCompleter -CommandName '${PNPM_COMMAND}' -ScriptBlock`, `Register-ArgumentCompleter -CommandName '${PNPM_COMMAND}','${PNPM_SHORT_ALIAS}' -ScriptBlock`);
-        case 'zsh':
-            return output
-                .replace(`#compdef ${PNPM_COMMAND}`, `#compdef ${PNPM_COMMAND} ${PNPM_SHORT_ALIAS}`)
-                .replace(`compdef _${PNPM_COMMAND}_completion ${PNPM_COMMAND}`, `compdef _${PNPM_COMMAND}_completion ${PNPM_COMMAND} ${PNPM_SHORT_ALIAS}`);
-    }
-}
-export const handler = createCompletionGenerator({
-    log: console.log,
-});
-//# sourceMappingURL=generateCompletion.js.map

package/lib/completion/getOptionType.d.ts

@@ -1,12 +0,0 @@
-export interface CompletionCtx {
-    last: string;
-    lastPartial: string;
-    line: string;
-    partial: string;
-    point: number;
-    prev: string;
-    words: number;
-}
-export declare function getOptionCompletions(optionTypes: Record<string, unknown>, shorthands: Record<string, string | string[]>, option: string): string[] | undefined;
-export declare function getLastOption(completionCtx: CompletionCtx): string | null;
-export declare function currentTypedWordType(completionCtx: CompletionCtx): 'option' | 'value' | null;

package/lib/completion/getOptionType.js

@@ -1,46 +0,0 @@
-import nopt from '@pnpm/nopt';
-import { omit } from 'ramda';
-export function getOptionCompletions(optionTypes, shorthands, option) {
-    const optionType = getOptionType(optionTypes, shorthands, option);
-    return optionTypeToCompletion(optionType);
-}
-function optionTypeToCompletion(optionType) {
-    switch (optionType) {
-        // In this case the option is complete
-        case undefined:
-        case Boolean: return undefined;
-        // In this case, anything may be the option value
-        case String:
-        case Number: return [];
-    }
-    if (!Array.isArray(optionType))
-        return [];
-    if (optionType.length === 1) {
-        return optionTypeToCompletion(optionType);
-    }
-    return optionType.filter((ot) => typeof ot === 'string');
-}
-function getOptionType(optionTypes, shorthands, option) {
-    const allBools = Object.fromEntries(Object.keys(optionTypes).map((optionName) => [optionName, Boolean]));
-    const result = omit(['argv'], nopt(allBools, shorthands, [option], 0));
-    return optionTypes[Object.entries(result)[0]?.[0]];
-}
-export function getLastOption(completionCtx) {
-    if (isOption(completionCtx.prev))
-        return completionCtx.prev;
-    if (completionCtx.lastPartial === '' || completionCtx.words <= 1)
-        return null;
-    const words = completionCtx.line.slice(0, completionCtx.point).trim().split(/\s+/);
-    const lastWord = words[words.length - 2];
-    return isOption(lastWord) ? lastWord : null;
-}
-function isOption(word) {
-    return word.startsWith('--') && word.length >= 3 ||
-        word[0] === '-' && word.length >= 2;
-}
-export function currentTypedWordType(completionCtx) {
-    if (completionCtx.partial.endsWith(' '))
-        return null;
-    return completionCtx.lastPartial[0] === '-' ? 'option' : 'value';
-}
-//# sourceMappingURL=getOptionType.js.map

package/lib/completion/getShell.d.ts

@@ -1,3 +0,0 @@
-import { type SupportedShell } from '@pnpm/tabtab';
-export declare function getShellFromString(shell?: string): SupportedShell;
-export declare function getShellFromParams(params: string[]): SupportedShell;

package/lib/completion/getShell.js

@@ -1,22 +0,0 @@
-import { PnpmError } from '@pnpm/error';
-import { isShellSupported, SUPPORTED_SHELLS } from '@pnpm/tabtab';
-export function getShellFromString(shell) {
-    shell = shell?.trim();
-    if (!shell) {
-        throw new PnpmError('MISSING_SHELL_NAME', '`pnpm completion` requires a shell name');
-    }
-    if (!isShellSupported(shell)) {
-        throw new PnpmError('UNSUPPORTED_SHELL', `'${shell}' is not supported`, {
-            hint: `Supported shells are: ${SUPPORTED_SHELLS.join(', ')}`,
-        });
-    }
-    return shell;
-}
-export function getShellFromParams(params) {
-    const [shell, ...rest] = params;
-    if (rest.length) {
-        throw new PnpmError('REDUNDANT_PARAMETERS', `The ${rest.length} parameters after shell is not necessary`);
-    }
-    return getShellFromString(shell);
-}
-//# sourceMappingURL=getShell.js.map

package/lib/completion/optionTypesToCompletions.d.ts

@@ -1,2 +0,0 @@
-import type { CompletionItem } from '@pnpm/tabtab';
-export declare function optionTypesToCompletions(optionTypes: Record<string, unknown>): CompletionItem[];

package/lib/completion/optionTypesToCompletions.js

@@ -1,14 +0,0 @@
-export function optionTypesToCompletions(optionTypes) {
-    const completions = [];
-    for (const [name, typeObj] of Object.entries(optionTypes)) {
-        if (typeObj === Boolean) {
-            completions.push({ name: `--${name}` });
-            completions.push({ name: `--no-${name}` });
-        }
-        else {
-            completions.push({ name: `--${name}` });
-        }
-    }
-    return completions;
-}
-//# sourceMappingURL=optionTypesToCompletions.js.map

package/lib/index.d.ts

@@ -1,2 +0,0 @@
-export { createCompletionServer } from './completion/completionServer.js';
-export * as generateCompletion from './completion/generateCompletion.js';