@eagleoutice/flowr 1.3.14 → 1.4.2

package/cli/benchmark-helper-app.js

@@ -25,7 +25,10 @@ async function benchmark() {
     // we do not use the limit argument to be able to pick the limit randomly
     (0, assert_1.guard)(options.input !== undefined, 'No input file given');
     (0, assert_1.guard)(options.output !== undefined, 'No output file given');
-    console.log(`[${options.input}] Appending output to ${options.output}`);
+    (0, assert_1.guard)((options['file-id'] === undefined) === (options['run-num'] === undefined), 'When giving a file-id or run-num, both have to be given');
+    // prefix for printing to console, includes file id and run number if present
+    const prefix = `[${options.input}${options['file-id'] !== undefined ? ` (file ${options['file-id']}, run ${options['run-num']})` : ''}]`;
+    console.log(`${prefix} Appending output to ${options.output}`);
     // ensure the file exists
     const fileStat = fs_1.default.statSync(options.input);
     (0, assert_1.guard)(fileStat.isFile(), `File ${options.input} does not exist or is no file`);
@@ -35,21 +38,27 @@ async function benchmark() {
         await slicer.init(request);
         // ${escape}1F${escape}1G${escape}2K for line reset
         if (options.slice === 'all') {
-            const count = await slicer.sliceForAll(slicing_1.DefaultAllVariablesFilter, (i, total, arr) => console.log(`[${options.input}] Slicing ${i + 1}/${total} [${JSON.stringify(arr[i])}]`));
-            console.log(`[${options.input}] Completed Slicing`);
+            const count = await slicer.sliceForAll(slicing_1.DefaultAllVariablesFilter, (i, total, arr) => console.log(`${prefix} Slicing ${i + 1}/${total} [${JSON.stringify(arr[i])}]`));
+            console.log(`${prefix} Completed Slicing`);
             (0, assert_1.guard)(count > 0, `No possible slices found for ${options.input}, skipping in count`);
         }
         else {
-            console.log(`[${options.input}] Skipping Slicing due to --slice=${options.slice}`);
+            console.log(`${prefix} Skipping Slicing due to --slice=${options.slice}`);
         }
         const { stats } = slicer.finish();
+        const output = {
+            filename: options.input,
+            'file-id': options['file-id'],
+            'run-num': options['run-num'],
+            stats
+        };
         // append line by line
-        fs_1.default.appendFileSync(options.output, `${JSON.stringify({ filename: options.input, stats }, json_1.jsonReplacer)}\n`);
+        fs_1.default.appendFileSync(options.output, `${JSON.stringify(output, json_1.jsonReplacer)}\n`);
     }
     catch (e) {
         if (e instanceof Error) {
             if (!e.message.includes('unable to parse R')) {
-                console.log(`[${options.input}] Non R-Side error : ${e.message}`);
+                console.log(`${prefix} Non R-Side error : ${e.message}`);
             }
         }
         slicer.ensureSessionClosed(); // ensure finish

package/cli/common/features.d.ts

@@ -1,3 +1,3 @@
-import { FeatureKey } from '../../statistics';
+import type { FeatureKey } from '../../statistics';
 export declare function validateFeatures(features: (string[] | ['all'] | FeatureKey[])): Set<FeatureKey>;
 export declare function retrieveArchiveName(p: string): string;

package/cli/common/options.d.ts

@@ -1,4 +1,4 @@
-import { OptionDefinition } from 'command-line-usage';
+import type { OptionDefinition } from 'command-line-usage';
 /**
  * This interface describes options, that every script *must* provide.
  */

package/cli/common/options.js

@@ -15,15 +15,18 @@ exports.benchmarkOptions = [
     { name: 'verbose', alias: 'v', type: Boolean, description: 'Run with verbose logging [do not use for the real benchmark as this affects the time measurements, but only to find errors]' },
     { name: 'help', alias: 'h', type: Boolean, description: 'Print this usage guide' },
     { name: 'limit', alias: 'l', type: Number, description: 'Limit the number of files to process (if given, this will choose these files randomly and add the chosen names to the output' },
+    { name: 'runs', alias: 'r', type: Number, description: 'The amount of benchmark runs that should be done, out of which an average will be calculated' },
     { name: 'input', alias: 'i', type: String, description: 'Pass a folder or file as src to read from', multiple: true, defaultOption: true, defaultValue: [], typeLabel: '{underline files/folders}' },
     { name: 'parallel', alias: 'p', type: String, description: 'Number of parallel executors (defaults to {italic max(cpu.count-1, 1)})', defaultValue: Math.max(os_1.default.cpus().length - 1, 1), typeLabel: '{underline number}' },
     { name: 'slice', alias: 's', type: String, description: 'Automatically slice for *all* variables (default) or *no* slicing and only parsing/dataflow construction', defaultValue: 'all', typeLabel: '{underline all/no}' },
-    { name: 'output', alias: 'o', type: String, description: `File to write all the measurements to in a per-file-basis (defaults to {italic benchmark-${StartTimeString}.json})`, defaultValue: `benchmark-${StartTimeString}.json`, typeLabel: '{underline file}' }
+    { name: 'output', alias: 'o', type: String, description: `Directory to write all the measurements to in a per-file-basis (defaults to {italic benchmark-${StartTimeString}})`, defaultValue: `benchmark-${StartTimeString}`, typeLabel: '{underline file}' }
 ];
 exports.benchmarkHelperOptions = [
     { name: 'verbose', alias: 'v', type: Boolean, description: 'Run with verbose logging [do not use for the real benchmark as this affects the time measurements, but only to find errors]' },
     { name: 'help', alias: 'h', type: Boolean, description: 'Print this usage guide' },
     { name: 'input', alias: 'i', type: String, description: 'Pass a single file as src to read from', multiple: false, defaultOption: true, typeLabel: '{underline file}' },
+    { name: 'file-id', alias: 'd', type: Number, description: 'A numeric file id that can be used to match an input and run-num to a file' },
+    { name: 'run-num', alias: 'r', type: Number, description: 'The n-th time that the file with the given file-id is being benchmarked' },
     { name: 'slice', alias: 's', type: String, description: 'Automatically slice for *all* variables (default) or *no* slicing and only parsing/dataflow construction', defaultValue: 'all', typeLabel: '{underline all/no}' },
     { name: 'output', alias: 'o', type: String, description: 'File to write the measurements to (appends a single line in JSON format)', typeLabel: '{underline file}' },
 ];

package/cli/common/script.d.ts

@@ -4,7 +4,7 @@
  * @module
  */
 import { scripts } from './scripts-info';
-import { CommonOptions } from './options';
+import type { CommonOptions } from './options';
 /**
  * Just a helping data structure to allow the user to provide example usages of the respective script.
  * The subtitle will be displayed next to the title.

package/cli/common/scripts-info.d.ts

@@ -3,8 +3,8 @@
  *
  * @module
  */
-import { MergeableRecord } from '../../util/objects';
-import { OptionDefinition } from 'command-line-usage';
+import type { MergeableRecord } from '../../util/objects';
+import type { OptionDefinition } from 'command-line-usage';
 interface BaseScriptInformation extends MergeableRecord {
     toolName: string;
     target: string;
@@ -21,4 +21,5 @@ export interface HelperScriptInformation extends BaseScriptInformation {
 }
 export type ScriptInformation = MasterScriptInformation | HelperScriptInformation;
 export declare const scripts: Record<"slicer" | "benchmark" | "stats" | "summarizer" | "export-quads" | "stats-helper" | "benchmark-helper", ScriptInformation>;
+export declare function getValidOptionsForCompletion(options: readonly OptionDefinition[], prevArgs: readonly string[]): string[];
 export {};

package/cli/common/scripts-info.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scripts = void 0;
+exports.getValidOptionsForCompletion = exports.scripts = void 0;
 const options_1 = require("./options");
+const commands_1 = require("../repl/commands");
 /**
  * We hold `_scripts` internally, as the modifiable variant and export the readonly scripts
  */
@@ -66,4 +67,17 @@ const _scripts = {
     }
 };
 exports.scripts = _scripts;
+function getValidOptionsForCompletion(options, prevArgs) {
+    return options.filter(o => canAddOption(o, prevArgs)).flatMap(o => {
+        const args = [(0, commands_1.asOptionName)(o.name)];
+        if (o.alias) {
+            args.push((0, commands_1.asOptionName)(o.alias));
+        }
+        return args;
+    });
+}
+exports.getValidOptionsForCompletion = getValidOptionsForCompletion;
+function canAddOption(option, prevArgs) {
+    return option.multiple || !prevArgs.includes((0, commands_1.asOptionName)(option.name)) && (!option.alias || !prevArgs.includes((0, commands_1.asOptionName)(option.alias)));
+}
 //# sourceMappingURL=scripts-info.js.map

package/cli/export-quads-app.js

@@ -17,12 +17,8 @@ const options = (0, common_1.processCommandLineArgs)('export-quads', [], {
     ]
 });
 const shell = new r_bridge_1.RShell();
-shell.tryToInjectHomeLibPath();
 async function writeQuadForSingleFile(request, output) {
-    const normalized = await (0, r_bridge_1.retrieveNormalizedAstFromRCode)({
-        ...request,
-        ensurePackageInstalled: true
-    }, shell);
+    const normalized = await (0, r_bridge_1.retrieveNormalizedAstFromRCode)(request, shell);
     const serialized = (0, quads_1.serialize2quads)(normalized.ast, { context: request.content });
     log_1.log.info(`Appending quads to ${output}`);
     fs_1.default.appendFileSync(output, serialized);

package/cli/repl/commands/cfg.d.ts

@@ -1,3 +1,3 @@
-import { ReplCommand } from './main';
+import type { ReplCommand } from './main';
 export declare const controlflowCommand: ReplCommand;
 export declare const controlflowStarCommand: ReplCommand;

package/cli/repl/commands/cfg.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.controlflowStarCommand = exports.controlflowCommand = void 0;
 const core_1 = require("../../../core");
 const r_bridge_1 = require("../../../r-bridge");
-const cfg_1 = require("../../../util/cfg");
+const cfg_1 = require("../../../util/cfg/cfg");
 const mermaid_1 = require("../../../util/mermaid");
 async function controlflow(shell, remainingLine) {
     return await new core_1.SteppingSlicer({
@@ -13,7 +13,7 @@ async function controlflow(shell, remainingLine) {
     }).allRemainingSteps();
 }
 exports.controlflowCommand = {
-    description: 'Get mermaid code for the control-flow graph of R code, start with \'file://\' to indicate a file',
+    description: `Get mermaid code for the control-flow graph of R code, start with '${r_bridge_1.fileProtocol}' to indicate a file`,
     usageExample: ':controlflow',
     aliases: ['cfg', 'cf'],
     script: false,
@@ -24,7 +24,7 @@ exports.controlflowCommand = {
     }
 };
 exports.controlflowStarCommand = {
-    description: 'Get a mermaid url of the control-flow graph of R code, start with \'file://\' to indicate a file',
+    description: `Get a mermaid url of the control-flow graph of R code, start with '${r_bridge_1.fileProtocol}' to indicate a file`,
     usageExample: ':controlflow',
     aliases: ['cfg*', 'cf*'],
     script: false,

package/cli/repl/commands/commands.d.ts

@@ -1,11 +1,13 @@
-import { ReplCommand } from './main';
+import type { ReplCommand } from './main';
 export declare const helpCommand: ReplCommand;
 /**
  * The names of all commands including their aliases (but without the leading `:`)
  */
-export declare const commandNames: string[];
+export declare function getCommandNames(): string[];
 /**
  * Get the command for a given command name or alias.
  * @param command - The name of the command (without the leading `:`)
  */
 export declare function getCommand(command: string): ReplCommand | undefined;
+export declare function asOptionName(argument: string): string;
+export declare function longestCommandName(): number;

package/cli/repl/commands/commands.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCommand = exports.commandNames = exports.helpCommand = void 0;
+exports.longestCommandName = exports.asOptionName = exports.getCommand = exports.getCommandNames = exports.helpCommand = void 0;
 const quit_1 = require("./quit");
 const common_1 = require("../../common");
 const execute_1 = require("../execute");
@@ -28,16 +28,17 @@ exports.helpCommand = {
     usageExample: ':help',
     aliases: ['h', '?'],
     fn: output => {
+        initCommandMapping();
         output.stdout(`
 You can always just enter R expressions which get evaluated right away:
 ${prompt_1.rawPrompt} ${(0, statistics_1.bold)('1 + 1', output.formatter)}
 ${(0, statistics_1.italic)('[1] 2', output.formatter)}
 
 Besides that, you can use the following commands. The scripts ${(0, statistics_1.italic)('can', output.formatter)} accept further arguments. There are the following basic commands:
-${Array.from(Object.entries(commands)).filter(([, { script }]) => !script).map(c => printHelpForScript(c, output.formatter)).join('\n')}
+${Array.from(Object.entries(commands())).filter(([, { script }]) => !script).map(c => printHelpForScript(c, output.formatter)).join('\n')}
 
 Furthermore, you can directly call the following scripts which accept arguments. If you are unsure, try to add ${(0, statistics_1.italic)('--help', output.formatter)} after the command.
-${Array.from(Object.entries(commands)).filter(([, { script }]) => script).map(([command, { description }]) => `  ${(0, statistics_1.bold)(padCmd(':' + command), output.formatter)}${description}`).join('\n')}
+${Array.from(Object.entries(commands())).filter(([, { script }]) => script).map(([command, { description }]) => `  ${(0, statistics_1.bold)(padCmd(':' + command), output.formatter)}${description}`).join('\n')}
 
 You can combine commands by separating them with a semicolon ${(0, statistics_1.bold)(';', output.formatter)}.
 `);
@@ -46,7 +47,7 @@ You can combine commands by separating them with a semicolon ${(0, statistics_1.
 /**
  * All commands that should be available in the REPL.
  */
-const commands = {
+const _commands = {
     'help': exports.helpCommand,
     'quit': quit_1.quitCommand,
     'version': version_1.versionCommand,
@@ -59,45 +60,83 @@ const commands = {
     'controlflow': cfg_1.controlflowCommand,
     'controlflow*': cfg_1.controlflowStarCommand
 };
-for (const [script, { target, description, type }] of Object.entries(common_1.scripts)) {
-    if (type === 'master script') {
-        commands[script] = {
-            description,
-            aliases: [],
-            script: true,
-            usageExample: `:${script} --help`,
-            fn: async (output, _s, remainingLine) => {
-                await (0, execute_1.waitOnScript)(`${__dirname}/../../${target}`, (0, args_1.splitAtEscapeSensitive)(remainingLine), stdio => (0, execute_1.stdioCaptureProcessor)(stdio, msg => output.stdout(msg), msg => output.stderr(msg)));
-            }
-        };
+let commandsInitialized = false;
+function commands() {
+    if (commandsInitialized) {
+        return _commands;
     }
+    commandsInitialized = true;
+    for (const [script, { target, description, type }] of Object.entries(common_1.scripts)) {
+        if (type === 'master script') {
+            _commands[script] = {
+                description,
+                aliases: [],
+                script: true,
+                usageExample: `:${script} --help`,
+                fn: async (output, _s, remainingLine) => {
+                    await (0, execute_1.waitOnScript)(`${__dirname}/../../${target}`, (0, args_1.splitAtEscapeSensitive)(remainingLine), stdio => (0, execute_1.stdioCaptureProcessor)(stdio, msg => output.stdout(msg), msg => output.stderr(msg)));
+                }
+            };
+        }
+    }
+    return _commands;
 }
 /**
  * The names of all commands including their aliases (but without the leading `:`)
  */
-exports.commandNames = [];
+function getCommandNames() {
+    if (commandNames === undefined) {
+        initCommandMapping();
+    }
+    return commandNames;
+}
+exports.getCommandNames = getCommandNames;
+let commandNames = undefined;
 // maps command names or aliases to the actual command name
-const commandMapping = {};
-for (const [command, { aliases }] of Object.entries(commands)) {
-    (0, assert_1.guard)(commandMapping[command] === undefined, `Command ${command} is already registered!`);
-    commandMapping[command] = command;
-    for (const alias of aliases) {
-        (0, assert_1.guard)(commandMapping[alias] === undefined, `Command (alias) ${alias} is already registered!`);
-        commandMapping[alias] = command;
+let commandMapping = undefined;
+function initCommandMapping() {
+    commandMapping = {};
+    commandNames = [];
+    for (const [command, { aliases }] of Object.entries(commands())) {
+        (0, assert_1.guard)(commandMapping[command] === undefined, `Command ${command} is already registered!`);
+        commandMapping[command] = command;
+        for (const alias of aliases) {
+            (0, assert_1.guard)(commandMapping[alias] === undefined, `Command (alias) ${alias} is already registered!`);
+            commandMapping[alias] = command;
+        }
+        commandNames.push(command);
+        commandNames.push(...aliases);
     }
-    exports.commandNames.push(command);
-    exports.commandNames.push(...aliases);
 }
 /**
  * Get the command for a given command name or alias.
  * @param command - The name of the command (without the leading `:`)
  */
 function getCommand(command) {
-    return commands[commandMapping[command]];
+    if (commandMapping === undefined) {
+        initCommandMapping();
+    }
+    return commands()[commandMapping[command]];
 }
 exports.getCommand = getCommand;
-const longestKey = Array.from(Object.keys(commands), k => k.length).reduce((p, n) => Math.max(p, n), 0);
+function asOptionName(argument) {
+    if (argument.length == 1) {
+        return `-${argument}`;
+    }
+    else {
+        return `--${argument}`;
+    }
+}
+exports.asOptionName = asOptionName;
+let _longestCommandName = undefined;
+function longestCommandName() {
+    if (_longestCommandName === undefined) {
+        _longestCommandName = Array.from(Object.keys(commands()), k => k.length).reduce((p, n) => Math.max(p, n), 0);
+    }
+    return _longestCommandName;
+}
+exports.longestCommandName = longestCommandName;
 function padCmd(string) {
-    return String(string).padEnd(longestKey + 2, ' ');
+    return String(string).padEnd(longestCommandName() + 2, ' ');
 }
 //# sourceMappingURL=commands.js.map

package/cli/repl/commands/dataflow.d.ts

@@ -1,3 +1,3 @@
-import { ReplCommand } from './main';
+import type { ReplCommand } from './main';
 export declare const dataflowCommand: ReplCommand;
 export declare const dataflowStarCommand: ReplCommand;

package/cli/repl/commands/dataflow.js

@@ -12,7 +12,7 @@ async function dataflow(shell, remainingLine) {
     }).allRemainingSteps();
 }
 exports.dataflowCommand = {
-    description: 'Get mermaid code for the dataflow graph of R code, start with \'file://\' to indicate a file',
+    description: `Get mermaid code for the dataflow graph of R code, start with '${r_bridge_1.fileProtocol}' to indicate a file`,
     usageExample: ':dataflow',
     aliases: ['d', 'df'],
     script: false,
@@ -22,7 +22,7 @@ exports.dataflowCommand = {
     }
 };
 exports.dataflowStarCommand = {
-    description: 'Get a mermaid url of the dataflow graph of R code, start with \'file://\' to indicate a file',
+    description: `Get a mermaid url of the dataflow graph of R code, start with '${r_bridge_1.fileProtocol}' to indicate a file`,
     usageExample: ':dataflow*',
     aliases: ['d*', 'df*'],
     script: false,

package/cli/repl/commands/execute.d.ts

@@ -1,4 +1,4 @@
-import { RShell } from '../../../r-bridge';
-import { ReplCommand, ReplOutput } from './main';
+import type { RShell } from '../../../r-bridge';
+import type { ReplCommand, ReplOutput } from './main';
 export declare function executeRShellCommand(output: ReplOutput, shell: RShell, statement: string): Promise<void>;
 export declare const executeCommand: ReplCommand;

package/cli/repl/commands/main.d.ts

@@ -1,5 +1,5 @@
-import { RShell } from '../../../r-bridge';
-import { OutputFormatter } from '../../../statistics';
+import type { RShell } from '../../../r-bridge';
+import type { OutputFormatter } from '../../../statistics';
 /**
  * Defines the main interface for output of the repl.
  * This allows us to redirect it (e.g., in the case of a server connection or tests).

package/cli/repl/commands/normalize.d.ts

@@ -1,3 +1,3 @@
-import { ReplCommand } from './main';
+import type { ReplCommand } from './main';
 export declare const normalizeCommand: ReplCommand;
 export declare const normalizeStarCommand: ReplCommand;

package/cli/repl/commands/normalize.js

@@ -12,7 +12,7 @@ async function normalize(shell, remainingLine) {
     }).allRemainingSteps();
 }
 exports.normalizeCommand = {
-    description: 'Get mermaid code for the normalized AST of R code, start with \'file://\' to indicate a file',
+    description: `Get mermaid code for the normalized AST of R code, start with '${r_bridge_1.fileProtocol}' to indicate a file`,
     usageExample: ':normalize',
     aliases: ['n'],
     script: false,
@@ -22,7 +22,7 @@ exports.normalizeCommand = {
     }
 };
 exports.normalizeStarCommand = {
-    description: 'Get a mermaid url of the normalized AST of R code, start with \'file://\' to indicate a file',
+    description: `Get a mermaid url of the normalized AST of R code, start with '${r_bridge_1.fileProtocol}' to indicate a file`,
     usageExample: ':normalize',
     aliases: ['n*'],
     script: false,

package/cli/repl/commands/parse.d.ts

@@ -1,2 +1,2 @@
-import { ReplCommand } from './main';
+import type { ReplCommand } from './main';
 export declare const parseCommand: ReplCommand;

package/cli/repl/commands/parse.js

@@ -4,8 +4,9 @@ exports.parseCommand = void 0;
 const r_bridge_1 = require("../../../r-bridge");
 const internal_1 = require("../../../r-bridge/lang-4.x/ast/parser/xml/internal");
 const core_1 = require("../../../core");
-const objects_1 = require("../../../util/objects");
-function toDepthMap(xml, config) {
+const format_1 = require("../../../r-bridge/lang-4.x/ast/parser/json/format");
+const parser_1 = require("../../../r-bridge/lang-4.x/ast/parser/json/parser");
+function toDepthMap(xml) {
     const root = (0, r_bridge_1.getKeysGuarded)(xml, "exprlist" /* RawRType.ExpressionList */);
     const visit = [{ depth: 0, node: root }];
     const result = [];
@@ -14,7 +15,7 @@ function toDepthMap(xml, config) {
         if (current === undefined) {
             continue;
         }
-        const children = current.node[config.childrenName] ?? [];
+        const children = current.node[r_bridge_1.childrenKey] ?? [];
         result.push({ ...current, leaf: children.length === 0 });
         children.reverse();
         const nextDepth = current.depth + 1;
@@ -62,7 +63,7 @@ function retrieveLocationString(locationRaw) {
         return ` (${extracted.start.line}:${extracted.start.column}─${extracted.end.line}:${extracted.end.column})`;
     }
 }
-function depthListToTextTree(list, config, f) {
+function depthListToTextTree(list, f) {
     let result = '';
     const deadDepths = new Set();
     let i = 0;
@@ -72,13 +73,13 @@ function depthListToTextTree(list, config, f) {
         result += initialIndentation(i, depth, deadDepths, nextDepth, list, f);
         result += f.reset();
         const raw = (0, internal_1.objectWithArrUnwrap)(node);
-        const content = raw[config.contentName];
-        const locationRaw = raw[config.attributeName];
+        const content = raw[r_bridge_1.contentKey];
+        const locationRaw = raw[r_bridge_1.attributesKey];
         let location = '';
         if (locationRaw !== undefined) {
             location = retrieveLocationString(locationRaw);
         }
-        const type = (0, internal_1.getTokenType)(config.tokenMap, node);
+        const type = (0, internal_1.getTokenType)(node);
         if (leaf) {
             const suffix = `${f.format(content ? JSON.stringify(content) : '', { style: 1 /* FontStyles.Bold */ })}${f.format(location, { style: 3 /* FontStyles.Italic */ })}`;
             result += `${type} ${suffix}`;
@@ -91,7 +92,7 @@ function depthListToTextTree(list, config, f) {
     return result;
 }
 exports.parseCommand = {
-    description: 'Prints ASCII Art of the parsed, unmodified AST, start with \'file://\' to indicate a file',
+    description: `Prints ASCII Art of the parsed, unmodified AST, start with '${r_bridge_1.fileProtocol}' to indicate a file`,
     usageExample: ':parse',
     aliases: ['p'],
     script: false,
@@ -99,11 +100,10 @@ exports.parseCommand = {
         const result = await new core_1.SteppingSlicer({
             stepOfInterest: 'parse',
             shell,
-            request: (0, r_bridge_1.requestFromInput)(remainingLine.trim())
+            request: (0, r_bridge_1.requestFromInput)((0, r_bridge_1.removeRQuotes)(remainingLine.trim()))
         }).allRemainingSteps();
-        const config = (0, objects_1.deepMergeObject)(r_bridge_1.DEFAULT_XML_PARSER_CONFIG, { tokenMap: await shell.tokenMap() });
-        const object = await (0, internal_1.xlm2jsonObject)(config, result.parse);
-        output.stdout(depthListToTextTree(toDepthMap(object, config), config, output.formatter));
+        const object = (0, parser_1.convertPreparedParsedData)((0, format_1.prepareParsedData)(result.parse));
+        output.stdout(depthListToTextTree(toDepthMap(object), output.formatter));
     }
 };
 //# sourceMappingURL=parse.js.map

package/cli/repl/commands/quit.d.ts

@@ -1,2 +1,2 @@
-import { ReplCommand } from './main';
+import type { ReplCommand } from './main';
 export declare const quitCommand: ReplCommand;

package/cli/repl/commands/quit.js

@@ -7,6 +7,9 @@ exports.quitCommand = {
     aliases: ['q', 'exit'],
     usageExample: ':quit',
     script: false,
-    fn: () => { log_1.log.info('bye'); process.exit(0); }
+    fn: () => {
+        log_1.log.info('bye');
+        process.exit(0);
+    }
 };
 //# sourceMappingURL=quit.js.map

package/cli/repl/commands/version.d.ts

@@ -1,4 +1,4 @@
-import { ReplCommand, ReplOutput } from './main';
+import type { ReplCommand, ReplOutput } from './main';
 import { RShell } from '../../../r-bridge';
 type Version = `${number}.${number}.${number}`;
 /**

package/cli/repl/core.d.ts

@@ -5,8 +5,8 @@
  * @module
  */
 import { RShell } from '../../r-bridge';
-import { ReplOutput } from './commands';
-import * as readline from 'node:readline';
+import type { ReplOutput } from './commands';
+import * as readline from 'readline';
 /**
  * Used by the repl to provide automatic completions for a given (partial) input line
  */
@@ -32,8 +32,10 @@ export declare function replProcessAnswer(output: ReplOutput, expr: string, shel
  *                    If you want to provide a custom one but use the same `completer`, refer to {@link replCompleter}.
  *                    For the default arguments, see {@link DEFAULT_REPL_READLINE_CONFIGURATION}.
  * @param output    - Defines two methods that every function in the repl uses to output its data.
+ * @param historyFile - The file to use for persisting the repl's history. Passing undefined causes history not to be saved.
  *
  * For the execution, this function makes use of {@link replProcessAnswer}
  *
  */
-export declare function repl(shell?: RShell, rl?: readline.Interface, output?: ReplOutput): Promise<void>;
+export declare function repl(shell?: RShell, rl?: readline.Interface, output?: ReplOutput, historyFile?: string | undefined): Promise<void>;
+export declare function loadReplHistory(historyFile: string): string[] | undefined;