@fnndsc/brasa 0.56.2 → 0.56.3

package/dist/builtins/fs/mv.js

@@ -1,44 +1,76 @@
 /**
- * @file Builtin mv command.
- * Moves or renames files/directories, reported as a command envelope.
+ * @file `mv`: moves or renames files and folders within ChRIS's filesystem
+ * (CFS), reported as a command envelope.
+ *
+ * Declared in one record (`mvCommand`): the sources, then the destination,
+ * each a path that may be a wildcard; a lone source, or `-t`, asks where.
+ * Each path is acted on where the store keeps it (`storePath_resolve`): a
+ * source is the entry itself, so moving a link moves the link, never what
+ * it points at; a destination through a link lands in the link's target.
+ * What mv says names the paths as the session resolves them.
+ *
+ * Key components:
+ * - mvCommand: the declaration.
+ * - builtin_mv: the declaration run over words already split.
+ * - mv_run: the typed core behind both, and the typed API.
+ *
+ * Typical usage:
+ * ```ts
+ * await builtin_mv(['old.txt', 'new.txt']);
+ * await mv_run({ sources: ['a.txt', 'b.txt'], dest: 'archive/' });
+ * ```
+ *
+ * Dependencies: the session's filesystem and listing cache, and the
+ * destination question.
+ *
+ * @module
  */
 import chalk from 'chalk';
 import path from 'path';
-import { commandArgs_process, optionsUnknown_refusal, path_resolve } from '../utils.js';
+import { path_resolve, storePath_resolve } from '../utils.js';
+import { command_declare } from '../../core/commandDeclaration.js';
+import { declaredCommand_run } from '../../core/commandParse.js';
 import { listingCache_get, vfsDispatcher_get } from '../../core/filesystem.js';
 import { destination_ask, destination_missing, operands_fix } from './destination.js';
 import { pathEntry_find, entry_isFolder } from './entries.js';
 import { mv_render, vfs_fail, vfsRefusal_text } from '@fnndsc/fond';
 import { envelope_ok, envelope_error } from '@fnndsc/menu';
 import { exitCode_set } from '../../core/handlerRun.js';
+/** What an `mv` line may hold. */
+const MV_GRAMMAR = {
+    operands: [
+        { name: 'paths', kind: 'cfsPath', repeat: true, glob: true, summary: 'The sources, then the destination; a lone source asks where it goes' },
+    ],
+    options: {
+        askTarget: { short: 't', summary: 'Every operand is a source; asks for the target directory, and the answer must be one' },
+        targetDirectory: { long: 'target-directory', summary: 'Every operand is a source; move into this directory', value: { name: 'dir', kind: 'cfsPath' } },
+    },
+};
 /**
- * Moves or renames a file or directory.
- * Supports multiple sources when destination is a directory.
+ * Runs a parsed `mv` line: into a target directory given or asked for, to a
+ * destination asked for a lone source, or to the last operand.
  *
- * @param args - [src1, src2, ..., dest] or [src, dest]
- * @returns An envelope whose rendered text reports progress and results and
- *   whose model carries per-source outcomes.
+ * @param args - The typed line.
+ * @returns The move's envelope, or the refusal of an abandoned question.
  */
-export async function builtin_mv(args) {
-    const parsed = commandArgs_process(args);
-    const refusal = optionsUnknown_refusal('mv', parsed, ['t']);
-    if (refusal !== null)
-        return envelope_error('', undefined, `${chalk.red(refusal)}\n`);
-    const pathArgs = parsed._;
-    // `-t <dir>` names the TARGET DIRECTORY, so every operand is a source —
-    // the shell's own answer to "several things, one destination". Given no
-    // value it is a question (an-absent-value-is-a-question), and the answer
-    // wants a directory: `mv a b` without it means rename a ONTO b, which
-    // is the right reading of that line and the wrong thing for a set.
-    const target = parsed.t;
-    if (target !== undefined && pathArgs.length > 0) {
-        if (typeof target === 'string' && target !== '') {
-            return mv_run({ sources: pathArgs, dest: target });
-        }
+async function mv_handle(args) {
+    const paths = args.operands.paths;
+    // `--target-directory <dir>` names the TARGET DIRECTORY, so every operand
+    // is a source: the shell's own answer to "several things, one destination".
+    const target = args.options.targetDirectory;
+    if (target !== undefined)
+        return mv_run({ sources: paths, dest: target });
+    // `-t` alone is that line with the directory not said: a question
+    // (an-absent-value-is-a-question), and the answer wants a directory:
+    // `mv a b` without it means rename a ONTO b, the right reading of that
+    // line and the wrong thing for a set. One operand names what to move and
+    // not where: a question too, not a usage error. The answer opens where
+    // the file already lives, so the ordinary case is a rename.
+    if (args.options.askTarget || paths.length === 1) {
         // The sources are fixed before the question: other commands run while it is open.
-        const sources = await operands_fix(pathArgs);
+        const sources = await operands_fix(paths);
         const chosen = await destination_ask({
-            verb: 'mv', commit: 'MOVE HERE', sources, wantsDirectory: true,
+            verb: 'mv', commit: 'MOVE HERE', sources, ...(args.options.askTarget ? { wantsDirectory: true } : {}),
         });
         if (chosen === '') {
             exitCode_set(1);
@@ -46,26 +78,47 @@ export async function builtin_mv(args) {
         }
         return mv_run({ sources, dest: chosen });
     }
-    // One operand names what to move and not where: that is a question, not a
-    // usage error. The answer opens where the file already lives and offers
-    // its own name, so the ordinary case is a rename.
-    if (pathArgs.length === 1) {
-        // The sources are fixed before the question: other commands run while it is open.
-        const sources = await operands_fix(pathArgs);
-        const chosen = await destination_ask({
-            verb: 'mv', commit: 'MOVE HERE', sources,
-        });
-        if (chosen === '') {
-            exitCode_set(1);
-            return envelope_error('', undefined, `${chalk.red(destination_missing('mv'))}\n`);
-        }
-        return mv_run({ sources, dest: chosen });
-    }
-    // Last arg is destination, all others are sources
-    return mv_run({
-        sources: pathArgs.slice(0, -1),
-        dest: pathArgs.length > 0 ? pathArgs[pathArgs.length - 1] : '',
-    });
+    // The last operand is the destination, all others are sources.
+    return mv_run({ sources: paths.slice(0, -1), dest: paths[paths.length - 1] ?? '' });
+}
+/**
+ * `mv [-t] [--target-directory <dir>] <paths…>`: the declaration.
+ *
+ * @example
+ * ```ts
+ * commands_register({ declarations: [mvCommand] });
+ * ```
+ */
+export const mvCommand = command_declare({
+    name: 'mv',
+    grammar: MV_GRAMMAR,
+    help: {
+        summary: 'Move or rename files or directories (supports wildcards and multiple sources)',
+        description: "Moves or renames files or folders within ChRIS's filesystem: the last operand is the destination, and into a folder it names an entry keeps its name. Given only a source, the destination is asked for. A link is moved as itself, never what it points at; a destination through a link lands in the folder it points at.",
+        category: 'Files',
+        posix: { group: 'Files', differs: 'moves within CFS' },
+        examples: [
+            'mv old.txt new.txt                # Rename file',
+            'mv dir1/ dir2/                    # Move directory into dir2',
+            'mv file.txt /home/user/archive/   # Move into existing directory',
+            'mv file1 file2 file3 dest/        # Move multiple files',
+            'mv uploads/* backup/              # Move with wildcard',
+            'mv --target-directory backup/ a b # Move several into one folder',
+            'mv -t a.txt b.txt                 # Ask which folder they go to',
+            'mv "file with spaces.txt" dest/   # Use quotes for spaces',
+        ],
+    },
+    handler: mv_handle,
+});
+/**
+ * `mv` over words already split: the declaration's parse and handler.
+ *
+ * @param args - The words after `mv`.
+ * @returns An envelope whose rendered text reports progress and results and
+ *   whose model carries per-source outcomes, or the refusal of a bad line.
+ */
+export async function builtin_mv(args) {
+    return declaredCommand_run(mvCommand, args);
 }
 /**
  * Moves one entry. Into a folder the destination names (or one named with a
@@ -74,20 +127,32 @@ export async function builtin_mv(args) {
  * and across one it refuses.
  *
  * @param dispatcher - The session's filesystem.
- * @param srcPath - The absolute source.
- * @param destPath - The absolute destination.
- * @param intoFolder - Whether the destination was written with a trailing slash.
+ * @param move - The source and destination, as the store keeps them.
  * @returns Done, or why not.
  */
-async function entry_move(dispatcher, srcPath, destPath, intoFolder) {
-    if (dispatcher.path_isVirtual(srcPath) || dispatcher.path_isVirtual(destPath))
-        return dispatcher.rename(srcPath, destPath);
-    if ((await pathEntry_find(dispatcher, srcPath)) === null)
+async function entry_move(dispatcher, move) {
+    const { srcStore, destStore, srcPath, intoFolder } = move;
+    if (dispatcher.path_isVirtual(srcStore) || dispatcher.path_isVirtual(destStore))
+        return dispatcher.rename(srcStore, destStore);
+    if ((await pathEntry_find(dispatcher, srcStore)) === null)
         return vfs_fail('ENOENT', `Source not found: ${srcPath}`);
-    const finalDest = intoFolder || entry_isFolder(await pathEntry_find(dispatcher, destPath))
-        ? path.posix.join(destPath, path.posix.basename(srcPath))
-        : destPath;
-    return dispatcher.rename(srcPath, finalDest);
+    const finalDest = intoFolder || entry_isFolder(await pathEntry_find(dispatcher, destStore))
+        ? path.posix.join(destStore, path.posix.basename(srcStore))
+        : destStore;
+    return dispatcher.rename(srcStore, finalDest);
+}
+/**
+ * Forgets the cached listings a move changes at a path: beneath it and of
+ * its parent, by each name it has.
+ *
+ * @param listCache - The session's listing cache.
+ * @param names - The path as the session names it and as the store keeps it.
+ */
+function listings_invalidate(listCache, names) {
+    for (const name of new Set(names)) {
+        listCache.cache_invalidate?.(path.posix.dirname(name));
+        listCache.cache_invalidateTree?.(name);
+    }
 }
 /**
  * Moves or renames files or directories: the shared typed core behind the
@@ -104,6 +169,8 @@ export async function mv_run(options) {
         return envelope_error(`${chalk.red('Usage: mv <source...> <dest>')}\n`);
     }
     const destPath = await path_resolve(dest);
+    // Written where the store keeps it: into a linked folder lands in the link's target.
+    const destStore = await storePath_resolve(destPath);
     const listCache = listingCache_get();
     const dispatcher = vfsDispatcher_get();
     let successCount = 0;
@@ -114,6 +181,8 @@ export async function mv_run(options) {
     for (const src of sources) {
         try {
             const srcPath = await path_resolve(src);
+            // The entry itself: moving a link moves the link, not what it points at.
+            const srcStore = await storePath_resolve(srcPath, { entry: true });
             // For multiple sources, show which file we're moving
             if (sources.length > 1) {
                 rendered += `${chalk.gray(`Moving ${srcPath}...`)}\n`;
@@ -121,7 +190,7 @@ export async function mv_run(options) {
             else {
                 rendered += `Moving ${srcPath} to ${destPath}...\n`;
             }
-            const moved = await entry_move(dispatcher, srcPath, destPath, dest.endsWith('/'));
+            const moved = await entry_move(dispatcher, { srcStore, destStore, srcPath, intoFolder: dest.endsWith('/') });
             const success = moved.ok;
             if (sources.length === 1) {
                 rendered += `${mv_render(srcPath, destPath, success)}\n`;
@@ -138,9 +207,7 @@ export async function mv_run(options) {
                 // Invalidate the source's parent AND the moved subtree: listings
                 // cached beneath the old path would otherwise serve the vanished
                 // tree until their TTL expires.
-                const srcDir = path.posix.dirname(srcPath);
-                listCache.cache_invalidate?.(srcDir);
-                listCache.cache_invalidateTree?.(srcPath);
+                listings_invalidate(listCache, [srcPath, srcStore]);
             }
             else {
                 failCount++;
@@ -155,9 +222,7 @@ export async function mv_run(options) {
     }
     // Invalidate the destination subtree (a moved directory replaces whatever
     // listings were cached beneath it) and its parent.
-    listCache.cache_invalidateTree?.(destPath);
-    const destParent = path.posix.dirname(destPath);
-    listCache.cache_invalidate?.(destParent);
+    listings_invalidate(listCache, [destPath, destStore]);
     // Summary for multiple files
     if (sources.length > 1) {
         if (failCount === 0) {

package/dist/builtins/fs/mv.js.map

@@ -1 +1 @@
-{"version":3,"file":"mv.js","sourceRoot":"","sources":["../../../src/builtins/fs/mv.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mv.js","sourceRoot":"","sources":["../../../src/builtins/fs/mv.ts"],"names":[],"mappings":"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"}

package/dist/builtins/fs/pull.args.d.ts

@@ -1,25 +1,64 @@
 /**
- * @file Pure argument parsing for the `pull` builtin.
+ * @file What a pull's line may hold, as `pull` and `pacs pull` both take it:
+ * the queries, studies or series to pull, and how to wait for them.
  *
- * Dependency-free so it is trivially unit-testable.
+ * One grammar, so the standalone verb and the subcommand cannot drift. It
+ * lives apart from the pull verb so `pacs` reads it without loading that
+ * verb's graph.
+ *
+ * Key components:
+ * - PULL_GRAMMAR: the operands and options.
+ * - PullLine: what a handler of either line reads.
+ *
+ * Dependencies: the declaration types only.
  *
  * @module
  */
+import type { CommandArguments } from '../../core/commandDeclaration.js';
 /**
- * Parsed `pull` arguments.
- */
-export interface PullArgs {
-    nowait: boolean;
-    retryMax: number;
-    newFeedTitle: string | null;
-    parseError: string | null;
-    paths: string[];
-}
-/**
- * Parses `pull` arguments: `--detach` (`--nowait`), `--retry N`, `--new-feed TITLE`, and
- * path operands.
+ * A pull's operands and options.
  *
- * @param args - Raw command arguments.
- * @returns The parsed flags and paths.
+ * @example
+ * ```ts
+ * const pullCommand = command_declare({ name: 'pull', grammar: PULL_GRAMMAR, help, handler });
+ * ```
  */
-export declare function pullArgs_parse(args: string[]): PullArgs;
+export declare const PULL_GRAMMAR: {
+    readonly operands: readonly [{
+        readonly name: "target";
+        readonly kind: "pacsQuery";
+        readonly repeat: true;
+        readonly glob: true;
+        readonly summary: "A /net/pacs/queries/… path (a query, a study or a series), or a Key:Value question asked first";
+    }];
+    readonly options: {
+        readonly detach: {
+            readonly long: "detach";
+            readonly summary: "Fire the retrieves and return the handles at once: <seriesUID> <retrieveId> per line";
+        };
+        readonly nowait: {
+            readonly long: "nowait";
+            readonly summary: "The older spelling of --detach";
+        };
+        readonly retry: {
+            readonly long: "retry";
+            readonly summary: "Re-fire retrieves for [NO LONK] series up to N more times";
+            readonly value: {
+                readonly name: "N";
+                readonly kind: "int";
+                readonly min: 0;
+            };
+        };
+        readonly newFeed: {
+            readonly long: "new-feed";
+            readonly repeat: true;
+            readonly summary: "Create one named feed from the complete retrieved selection";
+            readonly value: {
+                readonly name: "title";
+                readonly kind: "word";
+            };
+        };
+    };
+};
+/** What a handler of a pull line reads: the targets and the options, from `pull` or `pacs pull`. */
+export type PullLine = Pick<CommandArguments<typeof PULL_GRAMMAR>, 'operands' | 'options'>;

package/dist/builtins/fs/pull.args.js

@@ -1,70 +1,20 @@
 /**
- * @file Pure argument parsing for the `pull` builtin.
+ * A pull's operands and options.
  *
- * Dependency-free so it is trivially unit-testable.
- *
- * @module
- */
-/**
- * Parses `pull` arguments: `--detach` (`--nowait`), `--retry N`, `--new-feed TITLE`, and
- * path operands.
- *
- * @param args - Raw command arguments.
- * @returns The parsed flags and paths.
+ * @example
+ * ```ts
+ * const pullCommand = command_declare({ name: 'pull', grammar: PULL_GRAMMAR, help, handler });
+ * ```
  */
-export function pullArgs_parse(args) {
-    const commandArgs = args;
-    // `--detach` is the language's word for it; `--nowait` is what pull
-    // called it first and still answers to.
-    const nowait = commandArgs.includes('--nowait') || commandArgs.includes('--detach');
-    let retryMax = 0;
-    let newFeedTitle = null;
-    let parseError = null;
-    const paths = [];
-    for (let i = 0; i < commandArgs.length; i++) {
-        if (commandArgs[i] === '--nowait' || commandArgs[i] === '--detach') {
-            continue;
-        }
-        else if (commandArgs[i] === '--retry') {
-            const value = commandArgs[i + 1];
-            if (value === undefined || value.startsWith('--')) {
-                parseError ??= '--retry requires a non-negative integer';
-                continue;
-            }
-            i++;
-            const n = Number(value);
-            if (Number.isInteger(n) && n >= 0) {
-                retryMax = n;
-            }
-            else {
-                parseError ??= '--retry requires a non-negative integer';
-            }
-        }
-        else if (commandArgs[i] === '--new-feed') {
-            if (newFeedTitle !== null) {
-                parseError = '--new-feed may only be specified once';
-            }
-            const title = commandArgs[i + 1];
-            if (title === undefined || title.startsWith('--') || title.trim().length === 0) {
-                parseError ??= '--new-feed requires a title';
-            }
-            else {
-                newFeedTitle = title.trim();
-                i++;
-            }
-        }
-        else if (commandArgs[i] === '--plugin' || commandArgs[i] === '--pipeline') {
-            // Pulling lands data; running over it is `gather process`, or a run
-            // by name where the pull's feed stands.
-            parseError ??= `${commandArgs[i]} is retired: pull lands the data; run over it with gather process <name>, or cd into the feed and run by name`;
-        }
-        else if (commandArgs[i].startsWith('--')) {
-            parseError ??= `unsupported option: ${commandArgs[i]}`;
-        }
-        else {
-            paths.push(commandArgs[i]);
-        }
-    }
-    return { nowait, retryMax, newFeedTitle, parseError, paths };
-}
+export const PULL_GRAMMAR = {
+    operands: [
+        { name: 'target', kind: 'pacsQuery', repeat: true, glob: true, summary: 'A /net/pacs/queries/… path (a query, a study or a series), or a Key:Value question asked first' },
+    ],
+    options: {
+        detach: { long: 'detach', summary: 'Fire the retrieves and return the handles at once: <seriesUID> <retrieveId> per line' },
+        nowait: { long: 'nowait', summary: 'The older spelling of --detach' },
+        retry: { long: 'retry', summary: 'Re-fire retrieves for [NO LONK] series up to N more times', value: { name: 'N', kind: 'int', min: 0 } },
+        newFeed: { long: 'new-feed', repeat: true, summary: 'Create one named feed from the complete retrieved selection', value: { name: 'title', kind: 'word' } },
+    },
+};
 //# sourceMappingURL=pull.args.js.map

package/dist/builtins/fs/pull.args.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull.args.js","sourceRoot":"","sources":["../../../src/builtins/fs/pull.args.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAaH;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,IAAc;IAC3C,MAAM,WAAW,GAAa,IAAI,CAAC;IACnC,oEAAoE;IACpE,wCAAwC;IACxC,MAAM,MAAM,GAAY,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC7F,IAAI,QAAQ,GAAW,CAAC,CAAC;IACzB,IAAI,YAAY,GAAkB,IAAI,CAAC;IACvC,IAAI,UAAU,GAAkB,IAAI,CAAC;IACrC,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpD,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,UAAU,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;YACnE,SAAS;QACX,CAAC;aAAM,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,KAAK,GAAuB,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClD,UAAU,KAAK,yCAAyC,CAAC;gBACzD,SAAS;YACX,CAAC;YACD,CAAC,EAAE,CAAC;YACJ,MAAM,CAAC,GAAW,MAAM,CAAC,KAAK,CAAC,CAAC;YAChC,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,QAAQ,GAAG,CAAC,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,UAAU,KAAK,yCAAyC,CAAC;YAC3D,CAAC;QACH,CAAC;aAAM,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC;YAC3C,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;gBAC1B,UAAU,GAAG,uCAAuC,CAAC;YACvD,CAAC;YACD,MAAM,KAAK,GAAuB,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/E,UAAU,KAAK,6BAA6B,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC5B,CAAC,EAAE,CAAC;YACN,CAAC;QACH,CAAC;aAAM,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,UAAU,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC;YAC5E,oEAAoE;YACpE,wCAAwC;YACxC,UAAU,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,+GAA+G,CAAC;QAClJ,CAAC;aAAM,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3C,UAAU,KAAK,uBAAuB,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"pull.args.js","sourceRoot":"","sources":["../../../src/builtins/fs/pull.args.ts"],"names":[],"mappings":"AAkBA;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE;QACR,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gGAAgG,EAAE;KAC3K;IACD,OAAO,EAAE;QACP,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,sFAAsF,EAAE;QAC3H,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gCAAgC,EAAE;QACrE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,2DAA2D,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE;QACzI,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,6DAA6D,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;KAC5J;CACgC,CAAC"}

package/dist/builtins/fs/pull.d.ts

@@ -10,6 +10,7 @@
  *
  * @module
  */
+import { type PullLine } from './pull.args.js';
 import { type CommandEnvelope } from '@fnndsc/menu';
 /**
  * Pulls one or more `/net/pacs/queries/...` VFS paths into ChRIS storage.
@@ -20,9 +21,70 @@ import { type CommandEnvelope } from '@fnndsc/menu';
  * With `--retry N`: re-fires retrieves for [NO LONK] series up to N additional times.
  * With `--new-feed TITLE`: creates one feed from the exact successfully retrieved set.
  *
+ * The declaration's parse and handler, over words already split.
+ *
  * @param args - Command arguments (VFS paths, optional flags).
+ * @returns The outcome, or the refusal of a bad line.
  * @example
  * pull /net/pacs/queries/42_AccessionNumber:12345678
  * pull --retry 3 /net/pacs/queries/42_AccessionNumber:12345678/Study_1.2.3_US-Hips
  */
 export declare function builtin_pull(args: string[]): Promise<CommandEnvelope>;
+/**
+ * `pull [options] <target>…`: the declaration. `pacs pull` takes the same
+ * line (`PULL_GRAMMAR`) and runs the same handler.
+ *
+ * @example
+ * ```ts
+ * commands_register({ declarations: [pullCommand] }, 'backend');
+ * ```
+ */
+export declare const pullCommand: import("../../core/commandDeclaration.js").CommandDeclaration<{
+    readonly operands: readonly [{
+        readonly name: "target";
+        readonly kind: "pacsQuery";
+        readonly repeat: true;
+        readonly glob: true;
+        readonly summary: "A /net/pacs/queries/… path (a query, a study or a series), or a Key:Value question asked first";
+    }];
+    readonly options: {
+        readonly detach: {
+            readonly long: "detach";
+            readonly summary: "Fire the retrieves and return the handles at once: <seriesUID> <retrieveId> per line";
+        };
+        readonly nowait: {
+            readonly long: "nowait";
+            readonly summary: "The older spelling of --detach";
+        };
+        readonly retry: {
+            readonly long: "retry";
+            readonly summary: "Re-fire retrieves for [NO LONK] series up to N more times";
+            readonly value: {
+                readonly name: "N";
+                readonly kind: "int";
+                readonly min: 0;
+            };
+        };
+        readonly newFeed: {
+            readonly long: "new-feed";
+            readonly repeat: true;
+            readonly summary: "Create one named feed from the complete retrieved selection";
+            readonly value: {
+                readonly name: "title";
+                readonly kind: "word";
+            };
+        };
+    };
+}>;
+/**
+ * Pulls the series a line names: the handler of `pull` and of `pacs pull`.
+ *
+ * @param args - The line, parsed.
+ * @returns The outcome; the progress and the CUBE paths stream as it runs.
+ *
+ * @example
+ * ```ts
+ * await pullLine_run({ operands: { target: ['/net/pacs/queries/42_AccessionNumber:1'] }, options: { detach: true, … } });
+ * ```
+ */
+export declare function pullLine_run(args: PullLine): Promise<CommandEnvelope>;