@eagleoutice/flowr 2.9.12 → 2.9.14

package/cli/benchmark-helper-app.js

@@ -31,14 +31,14 @@ async function benchmark() {
     (0, assert_1.guard)(options.output !== undefined, 'No output file given');
     (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']})` : ''}]`;
+    const prefix = `[${options.input}${options['file-id'] === undefined ? '' : ` (file ${options['file-id']}, run ${options['run-num']})`}]`;
     console.log(`${prefix} Appending output to ${options.output}`);
     const directory = path_1.default.parse(options.output).dir;
     // ensure the directory exists if the path contains one
     if (directory !== '') {
         fs_1.default.mkdirSync(directory, { recursive: true });
     }
-    const config = (0, config_1.getConfig)();
+    const config = config_1.FlowrConfig.fromFile();
     // 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`);
@@ -58,7 +58,7 @@ async function benchmark() {
             console.log(`${prefix} Skipping Slicing due to --slice=${options.slice}`);
         }
         else {
-            const limit = parseInt(options.slice);
+            const limit = Number.parseInt(options.slice);
             console.log(`${prefix} Slicing up to ${limit} possible slices`);
             const count = await slicer.sliceForAll(all_variables_1.DefaultAllVariablesFilter, (i, total, arr) => console.log(`${prefix} Slicing ${i + 1}/${total} [${JSON.stringify(arr[i])}]`), { sampleCount: limit, maxSliceCount: maxSlices, sampleStrategy: options['sampling-strategy'], seed: options.seed });
             console.log(`${prefix} Completed Slicing`);
@@ -68,6 +68,9 @@ async function benchmark() {
         if (options['cfg'] || options['dataframe-shape-inference']) {
             slicer.extractCFG();
         }
+        if (options['cg']) {
+            slicer.extractCG();
+        }
         if (options['dataframe-shape-inference']) {
             console.log(`${prefix} Performing shape inference for data frames`);
             slicer.inferDataFrameShapes();

package/cli/common/options.d.ts

@@ -105,6 +105,10 @@ export declare const benchmarkOptions: [{
     readonly alias: "c";
     readonly type: BooleanConstructor;
     readonly description: "Extract the control flow graph of the file (benchmark it too)";
+}, {
+    readonly name: "cg";
+    readonly type: BooleanConstructor;
+    readonly description: "Extract the call graph of the file (benchmark it too)";
 }];
 export declare const benchmarkHelperOptions: [{
     readonly name: "verbose";
@@ -146,6 +150,10 @@ export declare const benchmarkHelperOptions: [{
     readonly alias: "c";
     readonly type: BooleanConstructor;
     readonly description: "Extract the control flow graph of the file (benchmark it too)";
+}, {
+    readonly name: "cg";
+    readonly type: BooleanConstructor;
+    readonly description: "Extract the call graph of the file (benchmark it too)";
 }, {
     readonly name: "output";
     readonly alias: "o";

package/cli/common/options.js

@@ -27,7 +27,8 @@ exports.benchmarkOptions = [
     { name: 'threshold', alias: 't', type: Number, description: 'How many re-visits of the same node are ok?', defaultValue: undefined, typeLabel: '{underline number}' },
     { name: 'per-file-time-limit', type: Number, description: 'Time limit in milliseconds to process single file (disabled by default)', defaultValue: undefined, typeLabel: '{underline number}' },
     { name: 'sampling-strategy', type: String, description: 'Which strategy to use, when sampling is enabled', defaultValue: 'random', typeLabel: '{underline random/equidistant}' },
-    { name: 'cfg', alias: 'c', type: Boolean, description: 'Extract the control flow graph of the file (benchmark it too)' }
+    { name: 'cfg', alias: 'c', type: Boolean, description: 'Extract the control flow graph of the file (benchmark it too)' },
+    { name: 'cg', type: Boolean, description: 'Extract the call graph of the file (benchmark it too)' }
 ];
 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]' },
@@ -37,6 +38,7 @@ exports.benchmarkHelperOptions = [
     { 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. Numbers will indicate: sample X random slices from all.', defaultValue: 'all', typeLabel: '{underline all/no}' },
     { name: 'cfg', alias: 'c', type: Boolean, description: 'Extract the control flow graph of the file (benchmark it too)' },
+    { name: 'cg', type: Boolean, description: 'Extract the call graph of the file (benchmark it too)' },
     { name: 'output', alias: 'o', type: String, description: 'File to write the measurements to (appends a single line in JSON format)', typeLabel: '{underline file}' },
     { name: 'parser', type: String, description: 'The parser to use for the benchmark', defaultValue: 'r-shell', typeLabel: '{underline parser}' },
     { name: 'dataframe-shape-inference', type: Boolean, description: 'Infer the shape of data frames using abstract interpretation (includes control flow graph extraction)', defaultValue: false },

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

@@ -192,6 +192,10 @@ declare const _scripts: {
             readonly alias: "c";
             readonly type: BooleanConstructor;
             readonly description: "Extract the control flow graph of the file (benchmark it too)";
+        }, {
+            readonly name: "cg";
+            readonly type: BooleanConstructor;
+            readonly description: "Extract the call graph of the file (benchmark it too)";
         }];
     };
     'benchmark-helper': {
@@ -239,6 +243,10 @@ declare const _scripts: {
             readonly alias: "c";
             readonly type: BooleanConstructor;
             readonly description: "Extract the control flow graph of the file (benchmark it too)";
+        }, {
+            readonly name: "cg";
+            readonly type: BooleanConstructor;
+            readonly description: "Extract the call graph of the file (benchmark it too)";
         }, {
             readonly name: "output";
             readonly alias: "o";

package/cli/export-quads-app.js

@@ -18,7 +18,7 @@ const options = (0, script_1.processCommandLineArgs)('export-quads', [], {
         '{bold --help}'
     ]
 });
-const shell = new shell_1.RShell((0, config_1.getEngineConfig)((0, config_1.getConfig)(), 'r-shell'));
+const shell = new shell_1.RShell(config_1.FlowrConfig.getForEngine(config_1.FlowrConfig.fromFile(), 'r-shell'));
 async function writeQuadForSingleFile(request, output) {
     const normalized = await (0, retriever_1.retrieveNormalizedAstFromRCode)(request, shell);
     const serialized = (0, quads_1.serialize2quads)(normalized.ast.files[0].root, { context: request.content });

package/cli/flowr.js

@@ -54,7 +54,7 @@ if (options['no-ansi']) {
 function createConfig() {
     let config;
     if (options['config-json']) {
-        const passedConfig = (0, config_1.parseConfig)(options['config-json']);
+        const passedConfig = config_1.FlowrConfig.parse(options['config-json']);
         if (passedConfig) {
             log_1.log.info(`Using passed config ${JSON.stringify(passedConfig)}`);
             config = passedConfig;
@@ -68,10 +68,10 @@ function createConfig() {
                 process.exit(1);
             }
         }
-        config = (0, config_1.getConfig)(options['config-file'] ?? flowr_main_options_1.defaultConfigFile);
+        config = config_1.FlowrConfig.fromFile(options['config-file'] ?? flowr_main_options_1.defaultConfigFile);
     }
     // for all options that we manually supply that have a config equivalent, set them in the config
-    config = (0, config_1.amendConfig)(config, c => {
+    config = config_1.FlowrConfig.amend(config, c => {
         c.engines ??= [];
         if (!options['engine.r-shell.disabled']) {
             c.engines.push({ type: 'r-shell', rPath: options['r-path'] || options['engine.r-shell.r-path'] });

package/cli/repl/commands/repl-dataflow.js

@@ -35,11 +35,11 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataflowSimpleStarCommand = exports.dataflowSimplifiedCommand = exports.dataflowSilentCommand = exports.dataflowAsciiCommand = exports.dataflowStarCommand = exports.dataflowCommand = void 0;
 const retriever_1 = require("../../../r-bridge/retriever");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const ansi_1 = require("../../../util/text/ansi");
 const core_1 = require("../core");
 const vertex_1 = require("../../../dataflow/graph/vertex");
 const dfg_ascii_1 = require("../../../util/simple-df/dfg-ascii");
+const df_helper_1 = require("../../../dataflow/graph/df-helper");
 function formatInfo(out, type, meta) {
     return out.formatter.format(`Copied ${type} to clipboard (dataflow: ${meta['.meta'].timing + 'ms'}).`, { color: 7 /* Colors.White */, effect: ansi_1.ColorEffect.Foreground, style: 3 /* FontStyles.Italic */ });
 }
@@ -52,7 +52,7 @@ exports.dataflowCommand = {
     argsParser: (args) => (0, core_1.handleString)(args),
     fn: async ({ output, analyzer }) => {
         const result = await analyzer.dataflow();
-        const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.graph, includeEnvironments: false }).string;
+        const mermaid = df_helper_1.Dataflow.visualize.mermaid.convert({ graph: result.graph, includeEnvironments: false }).string;
         output.stdout(mermaid);
         try {
             const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
@@ -72,7 +72,7 @@ exports.dataflowStarCommand = {
     argsParser: (args) => (0, core_1.handleString)(args),
     fn: async ({ output, analyzer }) => {
         const result = await analyzer.dataflow();
-        const mermaid = (0, dfg_1.graphToMermaidUrl)(result.graph, false);
+        const mermaid = df_helper_1.Dataflow.visualize.mermaid.url(result.graph, false);
         output.stdout(mermaid);
         try {
             const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
@@ -126,7 +126,7 @@ exports.dataflowSimplifiedCommand = {
     argsParser: (args) => (0, core_1.handleString)(args),
     fn: async ({ output, analyzer }) => {
         const result = await analyzer.dataflow();
-        const mermaid = (0, dfg_1.graphToMermaid)({ graph: result.graph, includeEnvironments: false, simplified: true }).string;
+        const mermaid = df_helper_1.Dataflow.visualize.mermaid.convert({ graph: result.graph, includeEnvironments: false, simplified: true }).string;
         output.stdout(mermaid);
         try {
             const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));
@@ -145,7 +145,7 @@ exports.dataflowSimpleStarCommand = {
     argsParser: (args) => (0, core_1.handleString)(args),
     fn: async ({ output, analyzer }) => {
         const result = await analyzer.dataflow();
-        const mermaid = (0, dfg_1.graphToMermaidUrl)(result.graph, false, undefined, true);
+        const mermaid = df_helper_1.Dataflow.visualize.mermaid.url(result.graph, false, undefined, true);
         output.stdout(mermaid);
         try {
             const clipboard = await Promise.resolve().then(() => __importStar(require('clipboardy')));

package/cli/repl/core.d.ts

@@ -1,7 +1,7 @@
 import * as readline from 'readline';
 import { type ReplOutput } from './commands/repl-main';
 import type { MergeableRecord } from '../../util/objects';
-import type { FlowrConfigOptions } from '../../config';
+import type { FlowrConfig } from '../../config';
 import type { FlowrAnalyzer } from '../../project/flowr-analyzer';
 /**
  * Completion suggestions for a specific REPL command
@@ -18,11 +18,11 @@ export interface CommandCompletions {
 /**
  * Used by the repl to provide automatic completions for a given (partial) input line
  */
-export declare function replCompleter(line: string, config: FlowrConfigOptions): [string[], string];
+export declare function replCompleter(line: string, config: FlowrConfig): [string[], string];
 /**
  * Produces default readline options for the flowR REPL
  */
-export declare function makeDefaultReplReadline(config: FlowrConfigOptions): readline.ReadLineOptions;
+export declare function makeDefaultReplReadline(config: FlowrConfig): readline.ReadLineOptions;
 /**
  * Handles a string input for the REPL, returning the parsed string and any remaining input.
  */

package/cli/repl/parser/slice-query-parser.d.ts

@@ -1,5 +1,5 @@
-import { SliceDirection } from '../../../core/steps/all/static-slicing/00-slice';
 import type { SingleSlicingCriterion, SlicingCriteria } from '../../../slicing/criterion/parse';
+import { SliceDirection } from '../../../util/slice-direction';
 /**
  * Checks whether the given argument represents a slicing direction with an `f` suffix.
  */

package/cli/repl/parser/slice-query-parser.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sliceDirectionParser = sliceDirectionParser;
 exports.sliceCriterionParser = sliceCriterionParser;
 exports.sliceCriteriaParser = sliceCriteriaParser;
-const _00_slice_1 = require("../../../core/steps/all/static-slicing/00-slice");
+const slice_direction_1 = require("../../../util/slice-direction");
 /**
  * Checks whether the given argument represents a slicing direction with an `f` suffix.
  */
 function sliceDirectionParser(argument) {
     const endBracket = argument.indexOf(')');
-    return argument[endBracket + 1] === 'f' ? _00_slice_1.SliceDirection.Forward : _00_slice_1.SliceDirection.Backward;
+    return argument[endBracket + 1] === 'f' ? slice_direction_1.SliceDirection.Forward : slice_direction_1.SliceDirection.Backward;
 }
 /**
  * Parses a single slicing criterion from the given argument.

package/cli/repl/server/connection.d.ts

@@ -3,7 +3,7 @@ import { type TREE_SITTER_DATAFLOW_PIPELINE, DEFAULT_SLICING_PIPELINE } from '..
 import type { PipelineOutput } from '../../../core/steps/pipeline/pipeline';
 import type { DeepPartial } from 'ts-essentials';
 import type { KnownParser, ParseStepOutput } from '../../../r-bridge/parser';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 import type { NormalizedAst } from '../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { DataflowInformation } from '../../../dataflow/info';
 import type { Tree } from 'web-tree-sitter';
@@ -19,7 +19,7 @@ export declare class FlowRServerConnection {
     private readonly allowRSessionAccess;
     private readonly config;
     private readonly fileMap;
-    constructor(socket: Socket, name: string, parser: KnownParser, allowRSessionAccess: boolean, config: FlowrConfigOptions);
+    constructor(socket: Socket, name: string, parser: KnownParser, allowRSessionAccess: boolean, config: FlowrConfig);
     private currentMessageBuffer;
     private handleData;
     private handleFileAnalysisRequest;

package/cli/repl/server/connection.js

@@ -58,8 +58,8 @@ const tmp = __importStar(require("tmp"));
 const fs_1 = __importDefault(require("fs"));
 const message_query_1 = require("./messages/message-query");
 const compact_1 = require("./compact");
-const _00_slice_1 = require("../../../core/steps/all/static-slicing/00-slice");
 const flowr_analyzer_builder_1 = require("../../../project/flowr-analyzer-builder");
+const slice_direction_1 = require("../../../util/slice-direction");
 /**
  * Each connection handles a single client, answering to its requests.
  * There is no need to construct this class manually, {@link FlowRServer} will do it for you.
@@ -235,7 +235,7 @@ class FlowRServerConnection {
             return;
         }
         const request = requestResult.message;
-        this.logger.info(`[${request.filetoken}] Received ${request.direction ?? _00_slice_1.SliceDirection.Backward} slice request with criteria ${JSON.stringify(request.criterion)}`);
+        this.logger.info(`[${request.filetoken}] Received ${request.direction ?? slice_direction_1.SliceDirection.Backward} slice request with criteria ${JSON.stringify(request.criterion)}`);
         const fileInformation = this.fileMap.get(request.filetoken);
         if (!fileInformation) {
             (0, send_1.sendMessage)(this.socket, {

package/cli/repl/server/messages/message-slice.d.ts

@@ -2,7 +2,7 @@ import type { IdMessageBase, MessageDefinition } from './all-messages';
 import type { SlicingCriteria } from '../../../../slicing/criterion/parse';
 import type { PipelineOutput } from '../../../../core/steps/pipeline/pipeline';
 import type { DEFAULT_DATAFLOW_PIPELINE, DEFAULT_SLICING_PIPELINE } from '../../../../core/steps/pipeline/default-pipelines';
-import { SliceDirection } from '../../../../core/steps/all/static-slicing/00-slice';
+import { SliceDirection } from '../../../../util/slice-direction';
 /**
  * Can only be sent after you have sent the {@link FileAnalysisRequestMessage}.
  * Using the same `filetoken` as in the {@link FileAnalysisRequestMessage} you

package/cli/repl/server/messages/message-slice.js

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.responseSliceMessage = exports.requestSliceMessage = void 0;
 const Joi = __importStar(require("joi"));
-const _00_slice_1 = require("../../../../core/steps/all/static-slicing/00-slice");
+const slice_direction_1 = require("../../../../util/slice-direction");
 exports.requestSliceMessage = {
     type: 'request-slice',
     schema: Joi.object({
@@ -43,7 +43,7 @@ exports.requestSliceMessage = {
         id: Joi.string().optional().description('The id of the message, if you passed one in the request.'),
         filetoken: Joi.string().required().description('The filetoken of the file to slice must be the same as with the analysis request.'),
         criterion: Joi.array().items(Joi.string()).min(0).required().required().description('The slicing criteria to use.'),
-        direction: Joi.string().valid(...Object.values(_00_slice_1.SliceDirection)).description('The direction to slice in. Defaults to backward slicing if unset.')
+        direction: Joi.string().valid(...Object.values(slice_direction_1.SliceDirection)).description('The direction to slice in. Defaults to backward slicing if unset.')
     })
 };
 exports.responseSliceMessage = {

package/cli/repl/server/server.d.ts

@@ -1,6 +1,6 @@
 import { type Server } from './net';
 import { FlowrLogger } from '../../../util/log';
-import type { FlowrConfigOptions, KnownEngines } from '../../../config';
+import type { FlowrConfig, KnownEngines } from '../../../config';
 export declare const serverLog: FlowrLogger;
 /**
  * This class controls the TCP server, which can be started by calling {@link start}.
@@ -17,7 +17,7 @@ export declare class FlowRServer {
     /** maps names to the respective connection */
     private readonly connections;
     private nameCounter;
-    constructor(engines: KnownEngines, defaultEngine: keyof KnownEngines, allowRSessionAccess: boolean, config: FlowrConfigOptions, server?: Server);
+    constructor(engines: KnownEngines, defaultEngine: keyof KnownEngines, allowRSessionAccess: boolean, config: FlowrConfig, server?: Server);
     start(port: number): Promise<void>;
     private onConnect;
 }

package/cli/script-core/statistics-core.d.ts

@@ -1,6 +1,6 @@
 import type { StatsCliOptions } from '../statistics-app';
-import type { FlowrConfigOptions } from '../../config';
+import type { FlowrConfig } from '../../config';
 /**
  * The core function for the 'flowr stats' script.
  */
-export declare function flowrScriptGetStats(options: StatsCliOptions, config: FlowrConfigOptions): Promise<void>;
+export declare function flowrScriptGetStats(options: StatsCliOptions, config: FlowrConfig): Promise<void>;

package/cli/script-core/statistics-helper-core.d.ts

@@ -1,6 +1,6 @@
 import type { StatsHelperCliOptions } from '../statistics-helper-app';
-import { type FlowrConfigOptions } from '../../config';
+import { FlowrConfig } from '../../config';
 /**
  * Get statistics for a single file
  */
-export declare function getStatsForSingleFile(options: StatsHelperCliOptions, config: FlowrConfigOptions): Promise<void>;
+export declare function getStatsForSingleFile(options: StatsHelperCliOptions, config: FlowrConfig): Promise<void>;

package/cli/script-core/statistics-helper-core.js

@@ -55,7 +55,7 @@ async function getStatsForSingleFile(options, config) {
     }
     // assume correct
     const processedFeatures = new Set(options.features);
-    const shell = new shell_1.RShell((0, config_1.getEngineConfig)(config, 'r-shell'));
+    const shell = new shell_1.RShell(config_1.FlowrConfig.getForEngine(config, 'r-shell'));
     (0, statistics_file_1.initFileProvider)(options['output-dir']);
     await shell.obtainTmpDir();
     const stats = await (0, statistics_1.extractUsageStatistics)(shell, config, () => { }, processedFeatures, (0, statistics_1.staticRequests)({ request: 'file', content: options.input }), options['root-dir']);

package/cli/slicer-app.js

@@ -29,7 +29,7 @@ async function getSlice() {
     const slicer = new slicer_1.BenchmarkSlicer('r-shell');
     (0, assert_1.guard)(options.input !== undefined, 'input must be given');
     (0, assert_1.guard)(options.criterion !== undefined, 'a slicing criterion must be given');
-    const config = (0, config_1.getConfig)();
+    const config = config_1.FlowrConfig.fromFile();
     await slicer.init(options['input-is-text']
         ? { request: 'text', content: options.input.replaceAll('\\n', '\n') }
         : { request: 'file', content: options.input }, config, options['no-magic-comments'] ? auto_select_defaults_1.doNotAutoSelect : (0, magic_comments_1.makeMagicCommentHandler)(auto_select_defaults_1.doNotAutoSelect));
@@ -60,7 +60,7 @@ async function getSlice() {
     const { stats, normalize, parse, tokenMap, dataflow } = slicer.finish();
     const mappedCriteria = mappedSlices.map(c => `    ${c.criterion} => ${c.id} (${JSON.stringify(normalize.idMap.get(c.id)?.location)})`).join('\n');
     log_1.log.info(`Mapped criteria:\n${mappedCriteria}`);
-    const sliceStatsAsString = (0, print_1.stats2string)(await (0, process_1.summarizeSlicerStats)(stats, undefined, (0, config_1.getEngineConfig)(config, 'r-shell')));
+    const sliceStatsAsString = (0, print_1.stats2string)(await (0, process_1.summarizeSlicerStats)(stats, undefined, config_1.FlowrConfig.getForEngine(config, 'r-shell')));
     if (options.api) {
         const output = {
             tokenMap,

package/cli/statistics-app.js

@@ -12,5 +12,5 @@ const scriptOptions = (0, script_1.processCommandLineArgs)('stats', [], {
         '{bold --help}'
     ]
 });
-void (0, statistics_core_1.flowrScriptGetStats)(scriptOptions, (0, config_1.getConfig)());
+void (0, statistics_core_1.flowrScriptGetStats)(scriptOptions, config_1.FlowrConfig.fromFile());
 //# sourceMappingURL=statistics-app.js.map

package/cli/statistics-helper-app.js

@@ -10,5 +10,5 @@ const scriptOptions = (0, script_1.processCommandLineArgs)('stats-helper', [], {
         '{bold --help}'
     ]
 });
-void (0, statistics_helper_core_1.getStatsForSingleFile)(scriptOptions, (0, config_1.getConfig)());
+void (0, statistics_helper_core_1.getStatsForSingleFile)(scriptOptions, config_1.FlowrConfig.fromFile());
 //# sourceMappingURL=statistics-helper-app.js.map

package/cli/wiki.js

@@ -86,7 +86,7 @@ async function makeAllWikis(force, filter) {
         },
         writeFileSync: fs_1.default.writeFileSync
     };
-    console.log(`Setup for wiki generation took ${(new Date().getTime() - setupStart.getTime())}ms`);
+    console.log(`Setup for wiki generation took ${(Date.now() - setupStart.getTime())}ms`);
     const changedWikis = new Set();
     try {
         const sortedDocs = sortByLeastRecentChanged(exports.AllWikiDocuments);
@@ -105,7 +105,7 @@ async function makeAllWikis(force, filter) {
                 changedWikis.add(doc.getTarget());
             }
             const color = changed ? 2 /* Colors.Green */ : 7 /* Colors.White */;
-            console.log(ansi_1.ansiFormatter.format(`  [${doc.getTarget()}] ${text}: ${doc.getTarget()} (took ${new Date().getTime() - now.getTime()}ms)`, { color, effect: ansi_1.ColorEffect.Foreground }));
+            console.log(ansi_1.ansiFormatter.format(`  [${doc.getTarget()}] ${text}: ${doc.getTarget()} (took ${Date.now() - now.getTime()}ms)`, { color, effect: ansi_1.ColorEffect.Foreground }));
             for (const out of doc.getWrittenSubfiles()) {
                 changedWikis.add(out);
                 console.log(`    - Also updated: ${out}`);

package/config.d.ts

@@ -2,7 +2,7 @@ import { type MergeableRecord } from './util/objects';
 import Joi from 'joi';
 import type { BuiltInDefinitions } from './dataflow/environments/built-in-config';
 import type { KnownParser } from './r-bridge/parser';
-import type { DeepWritable } from 'ts-essentials';
+import type { DeepWritable, Paths, PathValue } from 'ts-essentials';
 import type { DataflowProcessors } from './dataflow/processor';
 import type { ParentInformation } from './r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { FlowrAnalyzerContext } from './project/context/flowr-analyzer-context';
@@ -83,7 +83,12 @@ export interface FlowrLaxSourcingOptions extends MergeableRecord {
      */
     readonly applyReplacements?: Record<string, string>[];
 }
-export interface FlowrConfigOptions extends MergeableRecord {
+/**
+ * The configuration file format for flowR.
+ * @see {@link FlowrConfig.default} for the default configuration.
+ * @see {@link FlowrConfig.Schema} for the Joi schema for validation.
+ */
+export interface FlowrConfig extends MergeableRecord {
     /**
      * Whether source calls should be ignored, causing {@link processSourceCall}'s behavior to be skipped
      */
@@ -188,6 +193,9 @@ export interface FlowrConfigOptions extends MergeableRecord {
         };
     };
 }
+export type ValidFlowrConfigPaths = Paths<FlowrConfig, {
+    depth: 9;
+}>;
 export interface TreeSitterEngineConfig extends MergeableRecord {
     readonly type: 'tree-sitter';
     /**
@@ -214,27 +222,60 @@ export type EngineConfig = TreeSitterEngineConfig | RShellEngineConfig;
 export type KnownEngines = {
     [T in EngineConfig['type']]?: KnownParser;
 };
-export declare const defaultConfigOptions: FlowrConfigOptions;
-export declare const flowrConfigFileSchema: Joi.ObjectSchema<any>;
-/**
- * Parses the given JSON string as a flowR config file.
- */
-export declare function parseConfig(jsonString: string): FlowrConfigOptions | undefined;
-/**
- * Creates a new flowr config that has the updated values.
- */
-export declare function amendConfig(config: FlowrConfigOptions, amendmentFunc: (config: DeepWritable<FlowrConfigOptions>) => FlowrConfigOptions | void): FlowrConfigOptions;
-/**
- * Clones the given flowr config object.
- */
-export declare function cloneConfig(config: FlowrConfigOptions): FlowrConfigOptions;
 /**
- * Loads the flowr config from the given file or the default locations.
+ * Helper Object to work with {@link FlowrConfig}, provides the default config and the Joi schema for validation.
  */
-export declare function getConfig(configFile?: string, configWorkingDirectory?: string): FlowrConfigOptions;
-/**
- * Gets the configuration for the given engine type from the config.
- */
-export declare function getEngineConfig<T extends EngineConfig['type']>(config: FlowrConfigOptions, engine: T): EngineConfig & {
-    type: T;
-} | undefined;
+export declare const FlowrConfig: {
+    readonly name: "FlowrConfig";
+    /**
+     * The default configuration for flowR, used when no config file is found or when a config file is missing some options.
+     * You can use this as a base for your own config and only specify the options you want to change.
+     */
+    readonly default: (this: void) => FlowrConfig;
+    /**
+     * The Joi schema for validating a config file, use this to validate your config file before using it. You can also use this to generate documentation for the config file format.
+     */
+    readonly Schema: Joi.ObjectSchema<any>;
+    /**
+     * Parses the given JSON string as a flowR config file, returning the resulting config object if the parsing and validation were successful, or `undefined` if there was an error.
+     */
+    readonly parse: (this: void, jsonString: string) => FlowrConfig | undefined;
+    /**
+     * Creates a new flowr config that has the updated values.
+     */
+    readonly amend: (this: void, config: FlowrConfig, amendmentFunc: (config: DeepWritable<FlowrConfig>) => FlowrConfig | void) => FlowrConfig;
+    /**
+     * Clones the given flowr config object.
+     */
+    readonly clone: (this: void, config: FlowrConfig) => FlowrConfig;
+    /**
+     * Loads the flowr config from the given file or the default locations.
+     * Please note that you can also use this without a path parameter to
+     * infer the config from flowR's default locations.
+     * This is mostly useful for user-facing features.
+     */
+    readonly fromFile: (this: void, configFile?: string, configWorkingDirectory?: string) => FlowrConfig;
+    /**
+     * Gets the configuration for the given engine type from the config.
+     */
+    readonly getForEngine: <T extends EngineConfig["type"]>(this: void, config: FlowrConfig, engine: T) => (EngineConfig & {
+        type: T;
+    }) | undefined;
+    /**
+     * Returns a new config object with the given value set at the given key, where the key is a dot-separated path to the value in the config object.
+     * @see {@link setInConfigInPlace} for a version that modifies the config object in place instead of returning a new one.
+     * @example
+     * ```ts
+     * const config = FlowrConfig.default();
+     * const newConfig = FlowrConfig.setInConfig(config, 'solver.variables', VariableResolve.Builtin);
+     * console.log(config.solver.variables); // Output: "alias"
+     * console.log(newConfig.solver.variables); // Output: "builtin"
+     * ```
+     */
+    readonly setInConfig: <Path extends ValidFlowrConfigPaths>(this: void, config: FlowrConfig, key: Path, value: PathValue<FlowrConfig, Path>) => FlowrConfig;
+    /**
+     * Modifies the given config object in place by setting the given value at the given key, where the key is a dot-separated path to the value in the config object.
+     * @see {@link setInConfig} for a version that returns a new config object instead of modifying the given one in place.
+     */
+    readonly setInConfigInPlace: <Path extends ValidFlowrConfigPaths>(this: void, config: FlowrConfig, key: Path, value: PathValue<FlowrConfig, Path>) => void;
+};