@eagleoutice/flowr 2.9.12 → 2.9.13

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: () => 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: (jsonString: string) => FlowrConfig | undefined;
+    /**
+     * Creates a new flowr config that has the updated values.
+     */
+    readonly amend: (config: FlowrConfig, amendmentFunc: (config: DeepWritable<FlowrConfig>) => FlowrConfig | void) => FlowrConfig;
+    /**
+     * Clones the given flowr config object.
+     */
+    readonly clone: (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: (configFile?: string, configWorkingDirectory?: string) => FlowrConfig;
+    /**
+     * Gets the configuration for the given engine type from the config.
+     */
+    readonly getForEngine: <T extends EngineConfig["type"]>(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>(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>(config: FlowrConfig, key: Path, value: PathValue<FlowrConfig, Path>) => void;
+};

package/config.js

@@ -3,18 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flowrConfigFileSchema = exports.defaultConfigOptions = exports.DropPathsOption = exports.InferWorkingDirectory = exports.VariableResolve = void 0;
-exports.parseConfig = parseConfig;
-exports.amendConfig = amendConfig;
-exports.cloneConfig = cloneConfig;
-exports.getConfig = getConfig;
-exports.getEngineConfig = getEngineConfig;
+exports.FlowrConfig = exports.DropPathsOption = exports.InferWorkingDirectory = exports.VariableResolve = void 0;
 const objects_1 = require("./util/objects");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const log_1 = require("./util/log");
 const files_1 = require("./util/files");
 const joi_1 = __importDefault(require("joi"));
+const object_path_1 = __importDefault(require("object-path"));
 var VariableResolve;
 (function (VariableResolve) {
     /** Don't resolve constants at all */
@@ -54,173 +50,213 @@ const defaultEngineConfigs = {
     'tree-sitter': { type: 'tree-sitter' },
     'r-shell': { type: 'r-shell' }
 };
-exports.defaultConfigOptions = {
-    ignoreSourceCalls: false,
-    semantics: {
-        environment: {
-            overwriteBuiltIns: {
-                loadDefaults: true,
-                definitions: []
+/**
+ * Helper Object to work with {@link FlowrConfig}, provides the default config and the Joi schema for validation.
+ */
+exports.FlowrConfig = {
+    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.
+     */
+    default() {
+        return {
+            ignoreSourceCalls: false,
+            semantics: {
+                environment: {
+                    overwriteBuiltIns: {
+                        loadDefaults: true,
+                        definitions: []
+                    }
+                }
+            },
+            repl: {
+                quickStats: false,
+                dfProcessorHeat: false
+            },
+            project: {
+                resolveUnknownPathsOnDisk: true
+            },
+            engines: [],
+            defaultEngine: 'tree-sitter',
+            solver: {
+                variables: VariableResolve.Alias,
+                evalStrings: true,
+                resolveSource: {
+                    dropPaths: DropPathsOption.No,
+                    ignoreCapitalization: true,
+                    inferWorkingDirectory: InferWorkingDirectory.ActiveScript,
+                    searchPath: [],
+                    repeatedSourceLimit: 2
+                },
+                instrument: {
+                    dataflowExtractors: undefined
+                },
+                slicer: {
+                    threshold: 50
+                }
+            },
+            abstractInterpretation: {
+                wideningThreshold: 4,
+                dataFrame: {
+                    maxColNames: 50,
+                    readLoadedData: {
+                        readExternalFiles: true,
+                        maxReadLines: 1e6
+                    }
+                }
             }
+        };
+    },
+    /**
+     * 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.
+     */
+    Schema: joi_1.default.object({
+        ignoreSourceCalls: joi_1.default.boolean().optional().description('Whether source calls should be ignored, causing {@link processSourceCall}\'s behavior to be skipped.'),
+        semantics: joi_1.default.object({
+            environment: joi_1.default.object({
+                overwriteBuiltIns: joi_1.default.object({
+                    loadDefaults: joi_1.default.boolean().optional().description('Should the default configuration still be loaded?'),
+                    definitions: joi_1.default.array().items(joi_1.default.object()).optional().description('The definitions to load/overwrite.')
+                }).optional().description('Do you want to overwrite (parts) of the builtin definition?')
+            }).optional().description('Semantics regarding how to handle the R environment.')
+        }).description('Configure language semantics and how flowR handles them.'),
+        repl: joi_1.default.object({
+            quickStats: joi_1.default.boolean().optional().description('Whether to show quick stats in the REPL after each evaluation.'),
+            dfProcessorHeat: joi_1.default.boolean().optional().description('This instruments the dataflow processors to count how often each processor is called.')
+        }).description('Configuration options for the REPL.'),
+        project: joi_1.default.object({
+            resolveUnknownPathsOnDisk: joi_1.default.boolean().optional().description('Whether to resolve unknown paths loaded by the r project disk when trying to source/analyze files.')
+        }).description('Project specific configuration options.'),
+        engines: joi_1.default.array().items(joi_1.default.alternatives(joi_1.default.object({
+            type: joi_1.default.string().required().valid('tree-sitter').description('Use the tree sitter engine.'),
+            wasmPath: joi_1.default.string().optional().description('The path to the tree-sitter-r WASM binary to use. If this is undefined, this uses the default path.'),
+            treeSitterWasmPath: joi_1.default.string().optional().description('The path to the tree-sitter WASM binary to use. If this is undefined, this uses the default path.'),
+            lax: joi_1.default.boolean().optional().description('Whether to use the lax parser for parsing R code (allowing for syntax errors). If this is undefined, the strict parser will be used.')
+        }).description('The configuration for the tree sitter engine.'), joi_1.default.object({
+            type: joi_1.default.string().required().valid('r-shell').description('Use the R shell engine.'),
+            rPath: joi_1.default.string().optional().description('The path to the R executable to use. If this is undefined, this uses the default path.')
+        }).description('The configuration for the R shell engine.'))).description('The engine or set of engines to use for interacting with R code. An empty array means all available engines will be used.'),
+        defaultEngine: joi_1.default.string().optional().valid('tree-sitter', 'r-shell').description('The default engine to use for interacting with R code. If this is undefined, an arbitrary engine from the specified list will be used.'),
+        solver: joi_1.default.object({
+            variables: joi_1.default.string().valid(...Object.values(VariableResolve)).description('How to resolve variables and their values.'),
+            evalStrings: joi_1.default.boolean().description('Should we include eval(parse(text="...")) calls in the dataflow graph?'),
+            instrument: joi_1.default.object({
+                dataflowExtractors: joi_1.default.any().optional().description('These keys are only intended for use within code, allowing to instrument the dataflow analyzer!')
+            }),
+            resolveSource: joi_1.default.object({
+                dropPaths: joi_1.default.string().valid(...Object.values(DropPathsOption)).description('Allow to drop the first or all parts of the sourced path, if it is relative.'),
+                ignoreCapitalization: joi_1.default.boolean().description('Search for filenames matching in the lowercase.'),
+                inferWorkingDirectory: joi_1.default.string().valid(...Object.values(InferWorkingDirectory)).description('Try to infer the working directory from the main or any script to analyze.'),
+                searchPath: joi_1.default.array().items(joi_1.default.string()).description('Additionally search in these paths.'),
+                repeatedSourceLimit: joi_1.default.number().optional().description('How often the same file can be sourced within a single run? Please be aware: in case of cyclic sources this may not reach a fixpoint so give this a sensible limit.'),
+                applyReplacements: joi_1.default.array().items(joi_1.default.object()).description('Provide name replacements for loaded files')
+            }).optional().description('If lax source calls are active, flowR searches for sourced files much more freely, based on the configurations you give it. This option is only in effect if `ignoreSourceCalls` is set to false.'),
+            slicer: joi_1.default.object({
+                threshold: joi_1.default.number().optional().description('The maximum number of iterations to perform on a single function call during slicing.')
+            }).optional().description('The configuration for the slicer.')
+        }).description('How to resolve constants, constraints, cells, ...'),
+        abstractInterpretation: joi_1.default.object({
+            wideningThreshold: joi_1.default.number().min(1).description('The threshold for the number of visitations of a node at which widening should be performed to ensure the termination of the fixpoint iteration.'),
+            dataFrame: joi_1.default.object({
+                maxColNames: joi_1.default.number().min(0).description('The maximum number of columns names to infer for data frames before over-approximating the column names to top.'),
+                readLoadedData: joi_1.default.object({
+                    readExternalFiles: joi_1.default.boolean().description('Whether data frame shapes should be extracted from loaded external files, such as CSV files.'),
+                    maxReadLines: joi_1.default.number().min(1).description('The maximum number of lines to read when extracting data frame shapes from loaded files, such as CSV files.')
+                }).description('Configuration options for reading data frame shapes from loaded external data files, such as CSV files.')
+            }).description('The configuration of the shape inference for data frames.')
+        }).description('The configuration options for abstract interpretation.')
+    }).description('The configuration file format for flowR.'),
+    /**
+     * 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.
+     */
+    parse(jsonString) {
+        try {
+            const parsed = JSON.parse(jsonString);
+            const validate = exports.FlowrConfig.Schema.validate(parsed);
+            if (!validate.error) {
+                // assign default values to all config options except for the specified ones
+                return (0, objects_1.deepMergeObject)(exports.FlowrConfig.default(), parsed);
+            }
+            else {
+                log_1.log.error(`Failed to validate config ${jsonString}: ${validate.error.message}`);
+                return undefined;
+            }
+        }
+        catch (e) {
+            log_1.log.error(`Failed to parse config ${jsonString}: ${e.message}`);
         }
     },
-    repl: {
-        quickStats: false,
-        dfProcessorHeat: false
+    /**
+     * Creates a new flowr config that has the updated values.
+     */
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    amend(config, amendmentFunc) {
+        const newConfig = exports.FlowrConfig.clone(config);
+        return amendmentFunc(newConfig) ?? newConfig;
     },
-    project: {
-        resolveUnknownPathsOnDisk: true
+    /**
+     * Clones the given flowr config object.
+     */
+    clone(config) {
+        return (0, objects_1.deepClonePreserveUnclonable)(config);
     },
-    engines: [],
-    defaultEngine: 'tree-sitter',
-    solver: {
-        variables: VariableResolve.Alias,
-        evalStrings: true,
-        resolveSource: {
-            dropPaths: DropPathsOption.No,
-            ignoreCapitalization: true,
-            inferWorkingDirectory: InferWorkingDirectory.ActiveScript,
-            searchPath: [],
-            repeatedSourceLimit: 2
-        },
-        instrument: {
-            dataflowExtractors: undefined
-        },
-        slicer: {
-            threshold: 50
+    /**
+     * 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.
+     */
+    fromFile(configFile, configWorkingDirectory = process.cwd()) {
+        try {
+            return loadConfigFromFile(configFile, configWorkingDirectory);
         }
-    },
-    abstractInterpretation: {
-        wideningThreshold: 4,
-        dataFrame: {
-            maxColNames: 50,
-            readLoadedData: {
-                readExternalFiles: true,
-                maxReadLines: 1e6
-            }
+        catch (e) {
+            log_1.log.error(`Failed to load config: ${e.message}`);
+            return exports.FlowrConfig.default();
         }
-    }
-};
-exports.flowrConfigFileSchema = joi_1.default.object({
-    ignoreSourceCalls: joi_1.default.boolean().optional().description('Whether source calls should be ignored, causing {@link processSourceCall}\'s behavior to be skipped.'),
-    semantics: joi_1.default.object({
-        environment: joi_1.default.object({
-            overwriteBuiltIns: joi_1.default.object({
-                loadDefaults: joi_1.default.boolean().optional().description('Should the default configuration still be loaded?'),
-                definitions: joi_1.default.array().items(joi_1.default.object()).optional().description('The definitions to load/overwrite.')
-            }).optional().description('Do you want to overwrite (parts) of the builtin definition?')
-        }).optional().description('Semantics regarding how to handle the R environment.')
-    }).description('Configure language semantics and how flowR handles them.'),
-    repl: joi_1.default.object({
-        quickStats: joi_1.default.boolean().optional().description('Whether to show quick stats in the REPL after each evaluation.'),
-        dfProcessorHeat: joi_1.default.boolean().optional().description('This instruments the dataflow processors to count how often each processor is called.')
-    }).description('Configuration options for the REPL.'),
-    project: joi_1.default.object({
-        resolveUnknownPathsOnDisk: joi_1.default.boolean().optional().description('Whether to resolve unknown paths loaded by the r project disk when trying to source/analyze files.')
-    }).description('Project specific configuration options.'),
-    engines: joi_1.default.array().items(joi_1.default.alternatives(joi_1.default.object({
-        type: joi_1.default.string().required().valid('tree-sitter').description('Use the tree sitter engine.'),
-        wasmPath: joi_1.default.string().optional().description('The path to the tree-sitter-r WASM binary to use. If this is undefined, this uses the default path.'),
-        treeSitterWasmPath: joi_1.default.string().optional().description('The path to the tree-sitter WASM binary to use. If this is undefined, this uses the default path.'),
-        lax: joi_1.default.boolean().optional().description('Whether to use the lax parser for parsing R code (allowing for syntax errors). If this is undefined, the strict parser will be used.')
-    }).description('The configuration for the tree sitter engine.'), joi_1.default.object({
-        type: joi_1.default.string().required().valid('r-shell').description('Use the R shell engine.'),
-        rPath: joi_1.default.string().optional().description('The path to the R executable to use. If this is undefined, this uses the default path.')
-    }).description('The configuration for the R shell engine.'))).min(1).description('The engine or set of engines to use for interacting with R code. An empty array means all available engines will be used.'),
-    defaultEngine: joi_1.default.string().optional().valid('tree-sitter', 'r-shell').description('The default engine to use for interacting with R code. If this is undefined, an arbitrary engine from the specified list will be used.'),
-    solver: joi_1.default.object({
-        variables: joi_1.default.string().valid(...Object.values(VariableResolve)).description('How to resolve variables and their values.'),
-        evalStrings: joi_1.default.boolean().description('Should we include eval(parse(text="...")) calls in the dataflow graph?'),
-        instrument: joi_1.default.object({
-            dataflowExtractors: joi_1.default.any().optional().description('These keys are only intended for use within code, allowing to instrument the dataflow analyzer!')
-        }),
-        resolveSource: joi_1.default.object({
-            dropPaths: joi_1.default.string().valid(...Object.values(DropPathsOption)).description('Allow to drop the first or all parts of the sourced path, if it is relative.'),
-            ignoreCapitalization: joi_1.default.boolean().description('Search for filenames matching in the lowercase.'),
-            inferWorkingDirectory: joi_1.default.string().valid(...Object.values(InferWorkingDirectory)).description('Try to infer the working directory from the main or any script to analyze.'),
-            searchPath: joi_1.default.array().items(joi_1.default.string()).description('Additionally search in these paths.'),
-            repeatedSourceLimit: joi_1.default.number().optional().description('How often the same file can be sourced within a single run? Please be aware: in case of cyclic sources this may not reach a fixpoint so give this a sensible limit.'),
-            applyReplacements: joi_1.default.array().items(joi_1.default.object()).description('Provide name replacements for loaded files')
-        }).optional().description('If lax source calls are active, flowR searches for sourced files much more freely, based on the configurations you give it. This option is only in effect if `ignoreSourceCalls` is set to false.'),
-        slicer: joi_1.default.object({
-            threshold: joi_1.default.number().optional().description('The maximum number of iterations to perform on a single function call during slicing.')
-        }).optional().description('The configuration for the slicer.')
-    }).description('How to resolve constants, constraints, cells, ...'),
-    abstractInterpretation: joi_1.default.object({
-        dataFrame: joi_1.default.object({
-            maxColNames: joi_1.default.number().min(0).description('The maximum number of columns names to infer for data frames before over-approximating the column names to top.'),
-            wideningThreshold: joi_1.default.number().min(1).description('The threshold for the number of visitations of a node at which widening should be performed to ensure the termination of the fixpoint iteration.'),
-            readLoadedData: joi_1.default.object({
-                readExternalFiles: joi_1.default.boolean().description('Whether data frame shapes should be extracted from loaded external files, such as CSV files.'),
-                maxReadLines: joi_1.default.number().min(1).description('The maximum number of lines to read when extracting data frame shapes from loaded files, such as CSV files.')
-            }).description('Configuration options for reading data frame shapes from loaded external data files, such as CSV files.')
-        }).description('The configuration of the shape inference for data frames.')
-    }).description('The configuration options for abstract interpretation.')
-}).description('The configuration file format for flowR.');
-/**
- * Parses the given JSON string as a flowR config file.
- */
-function parseConfig(jsonString) {
-    try {
-        const parsed = JSON.parse(jsonString);
-        const validate = exports.flowrConfigFileSchema.validate(parsed);
-        if (!validate.error) {
-            // assign default values to all config options except for the specified ones
-            return (0, objects_1.deepMergeObject)(exports.defaultConfigOptions, parsed);
+    },
+    /**
+     * Gets the configuration for the given engine type from the config.
+     */
+    getForEngine(config, engine) {
+        const engines = config.engines;
+        if (engines.length > 0) {
+            return engines.find(e => e.type === engine);
         }
         else {
-            log_1.log.error(`Failed to validate config ${jsonString}: ${validate.error.message}`);
-            return undefined;
+            return defaultEngineConfigs[engine];
         }
+    },
+    /**
+     * 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"
+     * ```
+     */
+    setInConfig(config, key, value) {
+        const clone = exports.FlowrConfig.clone(config);
+        object_path_1.default.set(clone, key, value);
+        return clone;
+    },
+    /**
+     * 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.
+     */
+    setInConfigInPlace(config, key, value) {
+        object_path_1.default.set(config, key, value);
     }
-    catch (e) {
-        log_1.log.error(`Failed to parse config ${jsonString}: ${e.message}`);
-    }
-}
-/**
- * Creates a new flowr config that has the updated values.
- */
-// eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-function amendConfig(config, amendmentFunc) {
-    const newConfig = cloneConfig(config);
-    amendmentFunc(newConfig);
-    return newConfig;
-}
-/**
- * Clones the given flowr config object.
- */
-function cloneConfig(config) {
-    return JSON.parse(JSON.stringify(config));
-}
-/**
- * Loads the flowr config from the given file or the default locations.
- */
-function getConfig(configFile, configWorkingDirectory = process.cwd()) {
-    try {
-        return loadConfigFromFile(configFile, configWorkingDirectory);
-    }
-    catch (e) {
-        log_1.log.error(`Failed to load config: ${e.message}`);
-        return exports.defaultConfigOptions;
-    }
-}
-/**
- * Gets the configuration for the given engine type from the config.
- */
-function getEngineConfig(config, engine) {
-    const engines = config.engines;
-    if (!engines.length) {
-        return defaultEngineConfigs[engine];
-    }
-    else {
-        return engines.find(e => e.type === engine);
-    }
-}
+};
 function loadConfigFromFile(configFile, workingDirectory) {
     if (configFile !== undefined) {
         if (path_1.default.isAbsolute(configFile) && fs_1.default.existsSync(configFile)) {
             log_1.log.trace(`Found config at ${configFile} (absolute)`);
-            const ret = parseConfig(fs_1.default.readFileSync(configFile, { encoding: 'utf-8' }));
+            const ret = exports.FlowrConfig.parse(fs_1.default.readFileSync(configFile, { encoding: 'utf-8' }));
             if (ret) {
                 log_1.log.info(`Using config ${JSON.stringify(ret)}`);
                 return ret;
@@ -231,7 +267,7 @@ function loadConfigFromFile(configFile, workingDirectory) {
             const configPath = path_1.default.join(searchPath, configFile);
             if (fs_1.default.existsSync(configPath)) {
                 log_1.log.trace(`Found config at ${configPath}`);
-                const ret = parseConfig(fs_1.default.readFileSync(configPath, { encoding: 'utf-8' }));
+                const ret = exports.FlowrConfig.parse(fs_1.default.readFileSync(configPath, { encoding: 'utf-8' }));
                 if (ret) {
                     log_1.log.info(`Using config ${JSON.stringify(ret)}`);
                     return ret;
@@ -241,7 +277,7 @@ function loadConfigFromFile(configFile, workingDirectory) {
             searchPath = (0, files_1.getParentDirectory)(searchPath);
         } while (fs_1.default.existsSync(searchPath));
     }
-    log_1.log.info(`Using default config ${JSON.stringify(exports.defaultConfigOptions)}`);
-    return exports.defaultConfigOptions;
+    log_1.log.info('Using default config');
+    return exports.FlowrConfig.default();
 }
 //# sourceMappingURL=config.js.map

package/control-flow/extract-cfg.js

@@ -292,14 +292,11 @@ function cfgFor(forLoop, variable, vector, body) {
     for (const breakPoint of body.breaks) {
         graph.addEdge(control_flow_graph_1.CfgVertex.toExitId(forLoopId), breakPoint, control_flow_graph_1.CfgEdge.makeFd());
     }
-    const isNotEndless = body.exitPoints.length > 0 || body.breaks.length > 0;
-    if (isNotEndless) {
-        graph.addVertex(control_flow_graph_1.CfgVertex.makeExitMarker(forLoopId));
-        for (const e of variable.exitPoints) {
-            graph.addEdge(control_flow_graph_1.CfgVertex.toExitId(forLoopId), e, control_flow_graph_1.CfgEdge.makeCdFalse(forLoopId));
-        }
+    graph.addVertex(control_flow_graph_1.CfgVertex.makeExitMarker(forLoopId));
+    for (const e of variable.exitPoints) {
+        graph.addEdge(control_flow_graph_1.CfgVertex.toExitId(forLoopId), e, control_flow_graph_1.CfgEdge.makeCdFalse(forLoopId));
     }
-    return { graph, breaks: [], nexts: [], returns: body.returns, exitPoints: isNotEndless ? [control_flow_graph_1.CfgVertex.toExitId(forLoopId)] : [], entryPoints: [forLoopId] };
+    return { graph, breaks: [], nexts: [], returns: body.returns, exitPoints: [control_flow_graph_1.CfgVertex.toExitId(forLoopId)], entryPoints: [forLoopId] };
 }
 function cfgFunctionDefinition(fn, params, body) {
     const fnId = fn.info.id;
@@ -336,7 +333,7 @@ function cfgFunctionDefinition(fn, params, body) {
     return { graph: graph, breaks: [], nexts: [], returns: [], exitPoints: [fnId], entryPoints: [fnId] };
 }
 function cfgFunctionCall(call, name, args, down) {
-    if (call.named && call.functionName.content === 'ifelse') {
+    if (call.named && call.functionName.content === 'ifelse' && args.length > 1) {
         // special built-in handling for ifelse as it is an expression that does not short-circuit
         return cfgIfThenElse(call, args[0] === r_function_call_1.EmptyArgument ? (0, control_flow_graph_1.emptyControlFlowInformation)() : args[0], args[1] === r_function_call_1.EmptyArgument ? (0, control_flow_graph_1.emptyControlFlowInformation)() : args[1], args[2] === r_function_call_1.EmptyArgument ? (0, control_flow_graph_1.emptyControlFlowInformation)() : args[2]);
     }