@eagleoutice/flowr 2.9.12 → 2.9.14

package/linter/rules/seeded-randomness.js

@@ -19,7 +19,7 @@ const vertex_1 = require("../../dataflow/graph/vertex");
 const r_function_call_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const r_value_1 = require("../../dataflow/eval/values/r-value");
 const info_1 = require("../../dataflow/info");
-const built_in_1 = require("../../dataflow/environments/built-in");
+const built_in_proc_name_1 = require("../../dataflow/environments/built-in-proc-name");
 exports.SEEDED_RANDOMNESS = {
     createSearch: (config) => flowr_search_builder_1.Q.all().filter(vertex_1.VertexType.FunctionCall)
         .with(search_enrichers_1.Enrichment.CallTargets, { onlyBuiltin: true })
@@ -140,7 +140,7 @@ exports.SEEDED_RANDOMNESS = {
     }
 };
 function getDefaultAssignments() {
-    return default_builtin_config_1.DefaultBuiltinConfig.filter(b => b.type === 'function' && (b.processor === built_in_1.BuiltInProcName.Assignment || b.processor === built_in_1.BuiltInProcName.AssignmentLike));
+    return default_builtin_config_1.DefaultBuiltinConfig.filter(b => b.type === 'function' && (b.processor === built_in_proc_name_1.BuiltInProcName.Assignment || b.processor === built_in_proc_name_1.BuiltInProcName.AssignmentLike));
 }
 function isConstantArgument(graph, call, argIndex, ctx) {
     const args = call.args.filter(arg => arg !== r_function_call_1.EmptyArgument && !arg.name).map(graph_1.FunctionArgument.getReference);

package/linter/rules/stop-with-call-arg.d.ts

@@ -0,0 +1,35 @@
+import { type LintingResult, LintingRuleCertainty } from '../linter-format';
+import { SourceLocation } from '../../util/range';
+import type { MergeableRecord } from '../../util/objects';
+import { LintingRuleTag } from '../linter-tags';
+import type { Writable } from 'ts-essentials';
+export interface StopWithCallResult extends LintingResult {
+    readonly loc: SourceLocation;
+}
+export type StopWithCallConfig = MergeableRecord;
+export interface StopWithCallMetadata extends MergeableRecord {
+    consideredNodes: number;
+}
+export declare const STOP_WITH_CALL_ARG: {
+    readonly createSearch: () => import("../../search/flowr-search-builder").FlowrSearchBuilder<"get", ["filter"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
+    readonly processSearchResult: (elements: import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>, _config: MergeableRecord, { dataflow, analyzer }: {
+        normalize: import("../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
+        dataflow: import("../../dataflow/info").DataflowInformation;
+        cfg: import("../../control-flow/control-flow-graph").ControlFlowInformation;
+        analyzer: import("../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider;
+    }) => {
+        results: Writable<StopWithCallResult>[];
+        '.meta': StopWithCallMetadata;
+    };
+    readonly prettyPrint: {
+        readonly query: (result: StopWithCallResult) => string;
+        readonly full: (result: StopWithCallResult) => string;
+    };
+    readonly info: {
+        readonly name: "Stop without call.=False argument";
+        readonly tags: readonly [LintingRuleTag.Smell];
+        readonly certainty: LintingRuleCertainty.BestEffort;
+        readonly description: "Checks whether stop calls without call. argument set to FALSE are used.";
+        readonly defaultConfig: {};
+    };
+};

package/linter/rules/stop-with-call-arg.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STOP_WITH_CALL_ARG = void 0;
+const linter_format_1 = require("../linter-format");
+const range_1 = require("../../util/range");
+const flowr_search_builder_1 = require("../../search/flowr-search-builder");
+const linter_tags_1 = require("../linter-tags");
+const assert_1 = require("../../util/assert");
+const vertex_1 = require("../../dataflow/graph/vertex");
+const alias_tracking_1 = require("../../dataflow/eval/resolve/alias-tracking");
+const dfg_get_origin_1 = require("../../dataflow/origin/dfg-get-origin");
+const linker_1 = require("../../dataflow/internal/linker");
+const general_1 = require("../../dataflow/eval/values/general");
+exports.STOP_WITH_CALL_ARG = {
+    createSearch: () => flowr_search_builder_1.Q.var('stop').filter(vertex_1.VertexType.FunctionCall),
+    processSearchResult: (elements, _config, { dataflow, analyzer }) => {
+        const meta = {
+            consideredNodes: 0
+        };
+        return {
+            results: elements.getElements()
+                .filter(element => {
+                //only built-in functions
+                const origins = (0, dfg_get_origin_1.getOriginInDfg)(dataflow.graph, element.node.info.id);
+                if ((0, assert_1.isNotUndefined)(origins)) {
+                    const builtIn = origins.every(e => e.type === 3 /* OriginType.BuiltInFunctionOrigin */);
+                    if (!builtIn) {
+                        return false;
+                    }
+                }
+                const fCall = dataflow.graph.getVertex(element.node.info.id);
+                //filter out function calls with argument "call." set to false
+                const stopParamMap = {
+                    '...': '...',
+                    'call.': 'call.',
+                    'domain': 'domain'
+                };
+                const mapping = (0, linker_1.pMatch)(fCall.args, stopParamMap);
+                const mappedToStop = mapping.get('call.') ?? [];
+                for (const argId of mappedToStop) {
+                    const res = (0, alias_tracking_1.resolveIdToValue)(argId, { graph: dataflow.graph, environment: fCall.environment, ctx: analyzer.inspectContext() });
+                    const values = (0, general_1.valueSetGuard)(res);
+                    if (values?.type === 'set' && values.elements.length !== 0) {
+                        if (values.elements[0].type === 'logical') {
+                            return values.elements[0].value;
+                        }
+                    }
+                }
+                return true;
+            })
+                .map(element => ({
+                certainty: linter_format_1.LintingResultCertainty.Uncertain,
+                involvedId: element.node.info.id,
+                loc: range_1.SourceLocation.fromNode(element.node)
+            }))
+                .filter(element => (0, assert_1.isNotUndefined)(element.loc)),
+            '.meta': meta
+        };
+    },
+    prettyPrint: {
+        [linter_format_1.LintingPrettyPrintContext.Query]: result => `Code at ${range_1.SourceLocation.format(result.loc)}`,
+        [linter_format_1.LintingPrettyPrintContext.Full]: result => `Code at ${range_1.SourceLocation.format(result.loc)} does call stop without setting call. to FALSE`,
+    },
+    info: {
+        name: 'Stop without call.=False argument',
+        tags: [linter_tags_1.LintingRuleTag.Smell],
+        certainty: linter_format_1.LintingRuleCertainty.BestEffort,
+        description: 'Checks whether stop calls without call. argument set to FALSE are used.',
+        defaultConfig: {}
+    }
+};
+//# sourceMappingURL=stop-with-call-arg.js.map

package/linter/rules/useless-loop.d.ts

@@ -1,8 +1,8 @@
-import type { BuiltInProcName } from '../../dataflow/environments/built-in';
 import type { MergeableRecord } from '../../util/objects';
 import { SourceLocation } from '../../util/range';
 import { type LintingResult, LintingResultCertainty, LintingRuleCertainty } from '../linter-format';
 import { LintingRuleTag } from '../linter-tags';
+import type { BuiltInProcName } from '../../dataflow/environments/built-in-proc-name';
 export interface UselessLoopResult extends LintingResult {
     name: string;
     loc: SourceLocation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.9.12",
+  "version": "2.9.14",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -178,6 +178,7 @@
     "@types/n-readlines": "^1.0.6",
     "@types/n3": "^1.26.0",
     "@types/object-hash": "^3.0.6",
+    "@types/object-path": "^0.11.4",
     "@types/seedrandom": "^3.0.8",
     "@types/semver": "^7.7.0",
     "@types/tmp": "^0.2.6",
@@ -212,6 +213,7 @@
     "n-readlines": "^1.0.3",
     "n3": "^1.26.0",
     "object-hash": "^3.0.0",
+    "object-path": "^0.11.8",
     "object-sizeof": "^2.6.5",
     "rotating-file-stream": "^3.2.8",
     "seedrandom": "^3.0.5",

package/project/cache/flowr-analyzer-cache.d.ts

@@ -9,7 +9,7 @@ import type { CfgSimplificationPassName } from '../../control-flow/cfg-simplific
 import type { ControlFlowInformation } from '../../control-flow/control-flow-graph';
 import type { CfgKind } from '../cfg-kind';
 import type { FlowrAnalyzerContext } from '../context/flowr-analyzer-context';
-import type { CallGraph } from '../../dataflow/graph/call-graph';
+import { CallGraph } from '../../dataflow/graph/call-graph';
 interface FlowrAnalyzerCacheOptions<Parser extends KnownParser> {
     parser: Parser;
     context: FlowrAnalyzerContext;

package/project/cache/flowr-analyzer-cache.js

@@ -141,7 +141,7 @@ class FlowrAnalyzerCache extends flowr_cache_1.FlowrCache {
      */
     async callGraph(force) {
         if (!this.callGraphCache || force) {
-            this.callGraphCache = (0, call_graph_1.computeCallGraph)((await this.dataflow(force)).graph);
+            this.callGraphCache = call_graph_1.CallGraph.compute((await this.dataflow(force)).graph);
         }
         return this.callGraphCache;
     }

package/project/context/flowr-analyzer-context.d.ts

@@ -2,7 +2,7 @@ import { FlowrAnalyzerFilesContext, type RAnalysisRequest, type ReadOnlyFlowrAna
 import { FlowrAnalyzerDependenciesContext, type ReadOnlyFlowrAnalyzerDependenciesContext } from './flowr-analyzer-dependencies-context';
 import { type FlowrAnalyzerPlugin, PluginType } from '../plugins/flowr-analyzer-plugin';
 import type { fileProtocol, RParseRequestFromFile, RParseRequests } from '../../r-bridge/retriever';
-import type { FlowrConfigOptions } from '../../config';
+import { FlowrConfig } from '../../config';
 import type { FlowrFileProvider } from './flowr-file';
 import type { ReadOnlyFlowrAnalyzerEnvironmentContext } from './flowr-analyzer-environment-context';
 import { FlowrAnalyzerEnvironmentContext } from './flowr-analyzer-environment-context';
@@ -34,7 +34,7 @@ export interface ReadOnlyFlowrAnalyzerContext {
     /**
      * The configuration options used by the analyzer.
      */
-    readonly config: FlowrConfigOptions;
+    readonly config: FlowrConfig;
     /**
      * Run all resolution steps that can be done before the main analysis run.
      */
@@ -58,8 +58,8 @@ export declare class FlowrAnalyzerContext implements ReadOnlyFlowrAnalyzerContex
     readonly deps: FlowrAnalyzerDependenciesContext;
     readonly env: FlowrAnalyzerEnvironmentContext;
     private _analyzer;
-    readonly config: FlowrConfigOptions;
-    constructor(config: FlowrConfigOptions, plugins: ReadonlyMap<PluginType, readonly FlowrAnalyzerPlugin[]>);
+    readonly config: FlowrConfig;
+    constructor(config: FlowrConfig, plugins: ReadonlyMap<PluginType, readonly FlowrAnalyzerPlugin[]>);
     /**
      * Provides the analyzer associated with this context, if any.
      * This is usually set when the context is used within an analyzer instance.
@@ -91,7 +91,7 @@ export declare class FlowrAnalyzerContext implements ReadOnlyFlowrAnalyzerContex
  * @see {@link requestFromInput} - for details on how inputs are processed into requests.
  * @see {@link contextFromSources} - to create a context from source code strings directly.
  */
-export declare function contextFromInput(input: `${typeof fileProtocol}${string}` | string | readonly string[] | RParseRequests, config?: FlowrConfigOptions, plugins?: FlowrAnalyzerPlugin[]): FlowrAnalyzerContext;
+export declare function contextFromInput(input: `${typeof fileProtocol}${string}` | string | readonly string[] | RParseRequests, config?: FlowrConfig, plugins?: FlowrAnalyzerPlugin[]): FlowrAnalyzerContext;
 /**
  * Create a {@link FlowrAnalyzerContext} from a set of source code strings.
  * @param sources - A record mapping file paths to their source code content.
@@ -100,4 +100,4 @@ export declare function contextFromInput(input: `${typeof fileProtocol}${string}
  * @see {@link contextFromInput}    - to create a context from input requests.
  * @see {@link FlowrInlineTextFile} - to create inline text files for the sources.
  */
-export declare function contextFromSources(sources: Record<string, string>, config?: FlowrConfigOptions, plugins?: FlowrAnalyzerPlugin[]): FlowrAnalyzerContext;
+export declare function contextFromSources(sources: Record<string, string>, config?: FlowrConfig, plugins?: FlowrAnalyzerPlugin[]): FlowrAnalyzerContext;

package/project/context/flowr-analyzer-context.js

@@ -93,7 +93,7 @@ exports.FlowrAnalyzerContext = FlowrAnalyzerContext;
  * @see {@link requestFromInput} - for details on how inputs are processed into requests.
  * @see {@link contextFromSources} - to create a context from source code strings directly.
  */
-function contextFromInput(input, config = config_1.defaultConfigOptions, plugins) {
+function contextFromInput(input, config = config_1.FlowrConfig.default(), plugins) {
     const context = new FlowrAnalyzerContext(config, (0, arrays_1.arraysGroupBy)(plugins ?? [], (p) => p.type));
     if (typeof input === 'string' || Array.isArray(input) && input.every(i => typeof i === 'string')) {
         const requests = (0, retriever_1.requestFromInput)(input);
@@ -113,7 +113,7 @@ function contextFromInput(input, config = config_1.defaultConfigOptions, plugins
  * @see {@link contextFromInput}    - to create a context from input requests.
  * @see {@link FlowrInlineTextFile} - to create inline text files for the sources.
  */
-function contextFromSources(sources, config = config_1.defaultConfigOptions, plugins) {
+function contextFromSources(sources, config = config_1.FlowrConfig.default(), plugins) {
     const context = new FlowrAnalyzerContext(config, (0, arrays_1.arraysGroupBy)(plugins ?? [], (p) => p.type));
     for (const [p, c] of Object.entries(sources)) {
         context.addFile(new flowr_file_1.FlowrInlineTextFile(p, c));

package/project/context/flowr-analyzer-files-context.d.ts

@@ -59,7 +59,7 @@ export interface ReadOnlyFlowrAnalyzerFilesContext {
     /**
      * Check if the context has a file with the given path.
      * Please note, that this may also check the file system, depending on the configuration
-     * (see {@link FlowrConfigOptions.project.resolveUnknownPathsOnDisk}).
+     * (see {@link FlowrConfig.project.resolveUnknownPathsOnDisk}).
      * @param path - The path to the file.
      *
      * If you do not know the exact path or, e.g., casing of the file, use {@link exists} instead.
@@ -70,7 +70,7 @@ export interface ReadOnlyFlowrAnalyzerFilesContext {
      * @param path - The path to the file.
      * @param ignoreCase - Whether to ignore case when checking for the file.
      *
-     * Please note that this method checks the file system based on the configuration (see {@link FlowrConfigOptions.project.resolveUnknownPathsOnDisk}).
+     * Please note that this method checks the file system based on the configuration (see {@link FlowrConfig.project.resolveUnknownPathsOnDisk}).
      * @returns The actual path of the file if it exists, otherwise `undefined`.
      */
     exists(path: string, ignoreCase: boolean): string | undefined;

package/project/context/flowr-analyzer-files-context.js

@@ -129,19 +129,39 @@ class FlowrAnalyzerFilesContext extends abstract_flowr_analyzer_context_1.Abstra
             if (!ignoreCase) {
                 return this.hasFile(p) ? p : undefined;
             }
+            if (this.hasFile(p)) {
+                return p;
+            }
             // walk the directory and find the first match
             const dir = path_1.default.dirname(p);
-            const file = path_1.default.basename(p);
+            const file = path_1.default.basename(p).toLowerCase();
             // try to find in local known files first
-            const localFound = Array.from(this.files.keys()).find(f => {
-                return path_1.default.dirname(f) === dir && path_1.default.basename(f).toLowerCase() === file.toLowerCase();
-            });
-            if (localFound) {
-                return localFound;
+            for (const f of this.files.keys()) {
+                if (path_1.default.dirname(f).toLowerCase() !== dir.toLowerCase()) {
+                    continue;
+                }
+                const lf = path_1.default.basename(f).toLowerCase();
+                if (file === lf) {
+                    return f;
+                }
             }
             if (this.ctx.config.project.resolveUnknownPathsOnDisk) {
-                const files = fs_1.default.readdirSync(dir);
-                const found = files.find(f => f.toLowerCase() === file.toLowerCase());
+                let files;
+                if (fs_1.default.existsSync(dir)) {
+                    files = fs_1.default.readdirSync(dir);
+                }
+                else {
+                    // try to find a dir in parent
+                    const parentDir = path_1.default.dirname(dir);
+                    if (fs_1.default.existsSync(parentDir)) {
+                        const parentFiles = fs_1.default.readdirSync(parentDir);
+                        const foundDir = parentFiles.find(f => f.toLowerCase() === path_1.default.basename(dir).toLowerCase());
+                        if (foundDir) {
+                            files = fs_1.default.readdirSync(path_1.default.join(parentDir, foundDir));
+                        }
+                    }
+                }
+                const found = files?.find(f => f.toLowerCase() === file);
                 return found ? path_1.default.join(dir, found) : undefined;
             }
             return undefined;

package/project/flowr-analyzer-builder.d.ts

@@ -1,10 +1,11 @@
-import { type EngineConfig, type FlowrConfigOptions } from '../config';
-import type { DeepWritable } from 'ts-essentials';
+import { type EngineConfig, FlowrConfig } from '../config';
+import type { DeepWritable, PathValue } from 'ts-essentials';
 import { FlowrAnalyzer } from './flowr-analyzer';
 import type { KnownParser } from '../r-bridge/parser';
 import type { FlowrAnalyzerPlugin } from './plugins/flowr-analyzer-plugin';
 import type { NormalizeRequiredInput } from '../core/steps/all/core/10-normalize';
 import type { BuiltInFlowrPluginName, PluginToRegister } from './plugins/plugin-registry';
+import type { AutocompletablePaths } from '../util/objects';
 /**
  * Builder for the {@link FlowrAnalyzer}, use it to configure all analysis aspects before creating the analyzer instance
  * with {@link FlowrAnalyzerBuilder#build|`.build()`} or {@link FlowrAnalyzerBuilder#buildSync|`.buildSync()`}.
@@ -32,7 +33,7 @@ export declare class FlowrAnalyzerBuilder {
     private flowrConfig;
     private parser?;
     private input?;
-    private plugins;
+    private readonly plugins;
     /**
      * Creates a new builder for the {@link FlowrAnalyzer}.
      * By default, the standard set of plugins as returned by {@link FlowrAnalyzerPluginDefaults} are registered.
@@ -44,15 +45,21 @@ export declare class FlowrAnalyzerBuilder {
     constructor(withDefaultPlugins?: boolean);
     /**
      * Apply an amendment to the configuration the builder currently holds.
-     * Per default, the {@link defaultConfigOptions} are used.
+     * This is mostly intended for more complex logic to transform the config.
+     * Please consider using {@link FlowrAnalyzerBuilder.configure} to set/amend individual values
+     * Per default, the value returned by {@link FlowrConfig.default} is used.
      * @param func - Receives the current configuration of the builder and allows for amendment.
      */
-    amendConfig(func: (config: DeepWritable<FlowrConfigOptions>) => FlowrConfigOptions | void): this;
+    amendConfig(func: (config: DeepWritable<FlowrConfig>) => FlowrConfig | void): this;
     /**
      * Overwrite the configuration used by the resulting analyzer.
      * @param config - The new configuration.
      */
-    setConfig(config: FlowrConfigOptions): this;
+    setConfig(config: FlowrConfig): this;
+    /**
+     * Set a specific value in the configuration used by the resulting analyzer.
+     */
+    configure<K extends AutocompletablePaths<FlowrConfig>>(key: K, value: PathValue<FlowrConfig, K>): this;
     /**
      * Set the parser instance used by the analyzer.
      * This is an alternative to {@link FlowrAnalyzerBuilder#setEngine} if you already have a parser instance.

package/project/flowr-analyzer-builder.js

@@ -33,7 +33,7 @@ const plugin_registry_1 = require("./plugins/plugin-registry");
  * @see https://github.com/flowr-analysis/flowr/wiki/Analyzer
  */
 class FlowrAnalyzerBuilder {
-    flowrConfig = (0, config_1.cloneConfig)(config_1.defaultConfigOptions);
+    flowrConfig = config_1.FlowrConfig.default();
     parser;
     input;
     plugins = new Map();
@@ -52,12 +52,14 @@ class FlowrAnalyzerBuilder {
     }
     /**
      * Apply an amendment to the configuration the builder currently holds.
-     * Per default, the {@link defaultConfigOptions} are used.
+     * This is mostly intended for more complex logic to transform the config.
+     * Please consider using {@link FlowrAnalyzerBuilder.configure} to set/amend individual values
+     * Per default, the value returned by {@link FlowrConfig.default} is used.
      * @param func - Receives the current configuration of the builder and allows for amendment.
      */
     // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
     amendConfig(func) {
-        this.flowrConfig = (0, config_1.amendConfig)(this.flowrConfig, func);
+        this.flowrConfig = config_1.FlowrConfig.amend(this.flowrConfig, func);
         return this;
     }
     /**
@@ -68,6 +70,13 @@ class FlowrAnalyzerBuilder {
         this.flowrConfig = config;
         return this;
     }
+    /**
+     * Set a specific value in the configuration used by the resulting analyzer.
+     */
+    configure(key, value) {
+        config_1.FlowrConfig.setInConfigInPlace(this.flowrConfig, key, value);
+        return this;
+    }
     /**
      * Set the parser instance used by the analyzer.
      * This is an alternative to {@link FlowrAnalyzerBuilder#setEngine} if you already have a parser instance.

package/project/flowr-analyzer.d.ts

@@ -1,4 +1,4 @@
-import type { FlowrConfigOptions } from '../config';
+import type { FlowrConfig } from '../config';
 import type { KnownParser, KnownParserInformation } from '../r-bridge/parser';
 import { type Queries, type QueryResults, type SupportedQueryTypes } from '../queries/query';
 import type { ControlFlowInformation } from '../control-flow/control-flow-graph';
@@ -15,8 +15,8 @@ import type { RAnalysisRequest } from './context/flowr-analyzer-files-context';
 import type { RParseRequest, RParseRequestFromFile } from '../r-bridge/retriever';
 import { fileProtocol } from '../r-bridge/retriever';
 import type { FlowrFileProvider } from './context/flowr-file';
-import type { CallGraph } from '../dataflow/graph/call-graph';
 import type { Tree } from 'web-tree-sitter';
+import type { CallGraph } from '../dataflow/graph/call-graph';
 /**
  * Extends the {@link ReadonlyFlowrAnalysisProvider} with methods that allow modifying the analyzer state.
  */
@@ -139,7 +139,7 @@ export interface ReadonlyFlowrAnalysisProvider<Parser extends KnownParser = Know
      */
     runFull(force?: boolean): Promise<void>;
     /** This is the config used for the analyzer */
-    flowrConfig: FlowrConfigOptions;
+    flowrConfig: FlowrConfig;
 }
 /**
  * Central class for conducting analyses with FlowR.
@@ -165,7 +165,7 @@ export declare class FlowrAnalyzer<Parser extends KnownParser = KnownParser> imp
      * @param cache  - The caching layer to use for storing analysis results.
      */
     constructor(parser: Parser, ctx: FlowrAnalyzerContext, cache: FlowrAnalyzerCache<Parser>);
-    get flowrConfig(): FlowrConfigOptions;
+    get flowrConfig(): FlowrConfig;
     context(): FlowrAnalyzerContext;
     parserInformation(): KnownParserInformation;
     inspectContext(): ReadOnlyFlowrAnalyzerContext;

package/queries/catalog/call-context-query/identify-link-to-nested-call-relation.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.identifyLinkToNestedRelation = identifyLinkToNestedRelation;
-const call_graph_1 = require("../../../dataflow/graph/call-graph");
 const vertex_1 = require("../../../dataflow/graph/vertex");
 const identifier_1 = require("../../../dataflow/environments/identifier");
+const call_graph_1 = require("../../../dataflow/graph/call-graph");
 /**
  * **Please refer to {@link identifyLinkToRelation}.**
  *
@@ -19,7 +19,7 @@ async function identifyLinkToNestedRelation(from, analyzer, { callName, ignoreIf
     const test = callName instanceof RegExp ? (t) => callName.test(t) : callName;
     const found = [];
     const cg = await analyzer.callGraph();
-    const subCg = (0, call_graph_1.getSubCallGraph)(cg, new Set([from]));
+    const subCg = call_graph_1.CallGraph.computeSubCallGraph(cg, new Set([from]));
     for (const [, t] of subCg.vertices(true)) {
         if (!(0, vertex_1.isFunctionCallVertex)(t)) {
             continue;

package/queries/catalog/call-graph-query/call-graph-query-format.d.ts

@@ -2,7 +2,7 @@ import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import { executeCallGraphQuery } from './call-graph-query-executor';
 import Joi from 'joi';
 import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
-import type { CallGraph } from '../../../dataflow/graph/call-graph';
+import { CallGraph } from '../../../dataflow/graph/call-graph';
 /**
  * Computes the Call Graph of the analyzed project.
  */

package/queries/catalog/call-graph-query/call-graph-query-format.js

@@ -7,14 +7,14 @@ exports.CallGraphQueryDefinition = void 0;
 const call_graph_query_executor_1 = require("./call-graph-query-executor");
 const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const joi_1 = __importDefault(require("joi"));
+const call_graph_1 = require("../../../dataflow/graph/call-graph");
 exports.CallGraphQueryDefinition = {
     executor: call_graph_query_executor_1.executeCallGraphQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('call-graph', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
-        result.push(`   ╰ [Call Graph](${(0, dfg_1.graphToMermaidUrl)(out.graph)})`);
+        result.push(`   ╰ [Call Graph](${call_graph_1.CallGraph.visualize.mermaid.url(out.graph)})`);
         return true;
     },
     schema: joi_1.default.object({

package/queries/catalog/cluster-query/cluster-query-format.js

@@ -7,8 +7,8 @@ exports.ClusterQueryDefinition = void 0;
 const ansi_1 = require("../../../util/text/ansi");
 const joi_1 = __importDefault(require("joi"));
 const cluster_query_executor_1 = require("./cluster-query-executor");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const query_print_1 = require("../../query-print");
+const df_helper_1 = require("../../../dataflow/graph/df-helper");
 exports.ClusterQueryDefinition = {
     executor: cluster_query_executor_1.executeDataflowClusterQuery,
     asciiSummarizer: async (formatter, analyzer, queryResults, result) => {
@@ -19,7 +19,7 @@ exports.ClusterQueryDefinition = {
             const unknownSideEffects = cluster.hasUnknownSideEffects ? '(has unknown side effect)' : '';
             let suffix = '';
             if (formatter === ansi_1.markdownFormatter) {
-                suffix = `([marked](${(0, dfg_1.graphToMermaidUrl)((await analyzer.dataflow()).graph, false, new Set(cluster.members))}))`;
+                suffix = `([marked](${df_helper_1.Dataflow.visualize.mermaid.url((await analyzer.dataflow()).graph, false, new Set(cluster.members))}))`;
             }
             result.push(`      ╰ ${unknownSideEffects} {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, cluster.members)}} ${suffix}`);
         }

package/queries/catalog/config-query/config-query-format.d.ts

@@ -2,20 +2,20 @@ import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import { executeConfigQuery } from './config-query-executor';
 import { type OutputFormatter } from '../../../util/text/ansi';
 import Joi from 'joi';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 import type { DeepPartial } from 'ts-essentials';
 import type { ParsedQueryLine, Query } from '../../query';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
 import type { CommandCompletions } from '../../../cli/repl/core';
 export interface ConfigQuery extends BaseQueryFormat {
     readonly type: 'config';
-    readonly update?: DeepPartial<FlowrConfigOptions>;
+    readonly update?: DeepPartial<FlowrConfig>;
 }
 export interface ConfigQueryResult extends BaseQueryResult {
-    readonly config: FlowrConfigOptions;
+    readonly config: FlowrConfig;
 }
-declare function configReplCompleter(partialLine: readonly string[], _startingNewArg: boolean, config: FlowrConfigOptions): CommandCompletions;
-declare function configQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'config'>;
+declare function configReplCompleter(partialLine: readonly string[], _startingNewArg: boolean, config: FlowrConfig): CommandCompletions;
+declare function configQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'config'>;
 export declare const ConfigQueryDefinition: {
     readonly executor: typeof executeConfigQuery;
     readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[], queries: readonly Query[]) => true;

package/queries/catalog/dataflow-lens-query/dataflow-lens-query-format.js

@@ -7,14 +7,14 @@ exports.DataflowLensQueryDefinition = void 0;
 const dataflow_lens_query_executor_1 = require("./dataflow-lens-query-executor");
 const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const joi_1 = __importDefault(require("joi"));
+const df_helper_1 = require("../../../dataflow/graph/df-helper");
 exports.DataflowLensQueryDefinition = {
     executor: dataflow_lens_query_executor_1.executeDataflowLensQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('dataflow-lens', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
-        result.push(`   ╰ [Simplified Graph](${(0, dfg_1.graphToMermaidUrl)(out.simplifiedGraph, false, undefined, true)})`);
+        result.push(`   ╰ [Simplified Graph](${df_helper_1.Dataflow.visualize.mermaid.url(out.simplifiedGraph, false, undefined, true)})`);
         return true;
     },
     schema: joi_1.default.object({

package/queries/catalog/dataflow-query/dataflow-query-format.js

@@ -7,14 +7,14 @@ exports.DataflowQueryDefinition = void 0;
 const dataflow_query_executor_1 = require("./dataflow-query-executor");
 const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const joi_1 = __importDefault(require("joi"));
+const df_helper_1 = require("../../../dataflow/graph/df-helper");
 exports.DataflowQueryDefinition = {
     executor: dataflow_query_executor_1.executeDataflowQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('dataflow', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
-        result.push(`   ╰ [Dataflow Graph](${(0, dfg_1.graphToMermaidUrl)(out.graph)})`);
+        result.push(`   ╰ [Dataflow Graph](${df_helper_1.Dataflow.visualize.mermaid.url(out.graph)})`);
         return true;
     },
     schema: joi_1.default.object({

package/queries/catalog/df-shape-query/df-shape-query-executor.js

@@ -39,14 +39,13 @@ async function executeDfShapeQuery({ analyzer }, queries) {
             continue;
         }
         try {
-            const nodeId = (0, parse_1.slicingCriterionToId)(query.criterion, ast.idMap);
+            const nodeId = parse_1.SingleSlicingCriterion.parse(query.criterion, ast.idMap);
             const node = ast.idMap.get(nodeId);
             const value = inference.getAbstractValue(node?.info.id);
             result.set(query.criterion, value);
         }
         catch (e) {
             console.error(e instanceof Error ? e.message : e);
-            continue;
         }
     }
     return {

package/queries/catalog/df-shape-query/df-shape-query-format.d.ts

@@ -2,7 +2,7 @@ import Joi from 'joi';
 import type { DataFrameDomain } from '../../../abstract-interpretation/data-frame/dataframe-domain';
 import type { StateAbstractDomain } from '../../../abstract-interpretation/domains/state-abstract-domain';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import type { ParsedQueryLine } from '../../query';
@@ -15,7 +15,7 @@ export interface DfShapeQuery extends BaseQueryFormat {
 export interface DfShapeQueryResult extends BaseQueryResult {
     domains: StateAbstractDomain<DataFrameDomain> | Map<SingleSlicingCriterion, DataFrameDomain | undefined>;
 }
-declare function dfShapeQueryLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'df-shape'>;
+declare function dfShapeQueryLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'df-shape'>;
 export declare const DfShapeQueryDefinition: {
     readonly executor: typeof executeDfShapeQuery;
     readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;

package/queries/catalog/does-call-query/does-call-query-executor.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeDoesCallQuery = executeDoesCallQuery;
 const log_1 = require("../../../util/log");
 const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
-const parse_1 = require("../../../slicing/criterion/parse");
 const identifier_1 = require("../../../dataflow/environments/identifier");
+const parse_1 = require("../../../slicing/criterion/parse");
 /**
  * Execute does call queries on the given analyzer.
  */
@@ -19,7 +19,7 @@ async function executeDoesCallQuery({ analyzer }, queries) {
             log_1.log.warn(`Duplicate query id '${id}' in does-call queries, SKIP.`);
             continue;
         }
-        const nodeId = (0, parse_1.tryResolveSliceCriterionToId)(query.call, idMap);
+        const nodeId = parse_1.SingleSlicingCriterion.tryParse(query.call, idMap);
         if (!nodeId) {
             results[id] = false;
             continue;