@eagleoutice/flowr 2.6.0 → 2.6.2

package/linter/rules/dataframe-access-validation.d.ts

@@ -1,9 +1,8 @@
-import type { NormalizedAst, ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
+import type { ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { FlowrSearchElements } from '../../search/flowr-search';
 import { type MergeableRecord } from '../../util/objects';
 import { type SourceRange } from '../../util/range';
-import type { LintingResult } from '../linter-format';
-import { LintingRuleCertainty } from '../linter-format';
+import { type LintingResult, LintingRuleCertainty } from '../linter-format';
 import { LintingRuleTag } from '../linter-tags';
 export interface DataFrameAccessValidationResult extends LintingResult {
     /** The type of the data frame access ("column" or "row") */
@@ -32,7 +31,7 @@ export interface DataFrameAccessValidationMetadata extends MergeableRecord {
 export declare const DATA_FRAME_ACCESS_VALIDATION: {
     readonly createSearch: () => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with"], ParentInformation, Promise<FlowrSearchElements<ParentInformation, import("../../search/flowr-search").FlowrSearchElement<ParentInformation>[]>>>;
     readonly processSearchResult: (elements: FlowrSearchElements<ParentInformation, import("../../search/flowr-search").FlowrSearchElement<ParentInformation>[]>, config: DataFrameAccessValidationConfig, data: {
-        normalize: NormalizedAst;
+        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;
         config: import("../../config").FlowrConfigOptions;

package/linter/rules/dataframe-access-validation.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DATA_FRAME_ACCESS_VALIDATION = void 0;
 const absint_info_1 = require("../../abstract-interpretation/data-frame/absint-info");
-const domain_1 = require("../../abstract-interpretation/data-frame/domain");
 const shape_inference_1 = require("../../abstract-interpretation/data-frame/shape-inference");
+const satisfiable_domain_1 = require("../../abstract-interpretation/domains/satisfiable-domain");
 const config_1 = require("../../config");
 const extract_cfg_1 = require("../../control-flow/extract-cfg");
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 const flowr_search_builder_1 = require("../../search/flowr-search-builder");
 const search_enrichers_1 = require("../../search/search-executor/search-enrichers");
+const logic_1 = require("../../util/logic");
 const dfg_1 = require("../../util/mermaid/dfg");
 const range_1 = require("../../util/range");
 const linter_format_1 = require("../linter-format");
@@ -24,7 +25,7 @@ exports.DATA_FRAME_ACCESS_VALIDATION = {
         });
         const cfg = (0, extract_cfg_1.extractCfg)(data.normalize, flowrConfig, data.dataflow.graph);
         (0, shape_inference_1.inferDataFrameShapes)(cfg, data.dataflow.graph, data.normalize, flowrConfig);
-        const accessOperations = getAccessOperations(elements, data.normalize);
+        const accessOperations = getAccessOperations(elements);
         const accesses = [];
         for (const [nodeId, operations] of accessOperations) {
             const access = { nodeId };
@@ -84,12 +85,9 @@ exports.DATA_FRAME_ACCESS_VALIDATION = {
         defaultConfig: { readLoadedData: false }
     }
 };
-function getAccessOperations(elements, normalize) {
-    const nodes = elements.getElements().map(element => {
-        const id = element.node.info.id;
-        return normalize.idMap.get(id);
-    }).filter(n => n !== undefined);
-    return new Map(nodes
+function getAccessOperations(elements) {
+    return new Map(elements.getElements()
+        .map(element => element.node)
         .filter(absint_info_1.hasDataFrameExpressionInfo)
         .map(node => [node.info.id, node.info.dataFrame.operations
             .filter(({ operation }) => operation === 'accessCols' || operation === 'accessRows')
@@ -101,15 +99,15 @@ function findInvalidDataFrameAccesses({ operandShape, accessedCols, accessedRows
     const invalidAccesses = [];
     if (operandShape !== undefined) {
         for (const row of accessedRows ?? []) {
-            if (!(0, domain_1.satisfiesLeqInterval)(operandShape.rows, row)) {
+            if (operandShape.rows.satisfies(row, satisfiable_domain_1.NumericalComparator.LessOrEqual) === logic_1.Ternary.Never) {
                 invalidAccesses.push({ type: 'row', accessed: row });
             }
         }
         for (const col of accessedCols ?? []) {
-            if (typeof col === 'string' && !(0, domain_1.satisfiesColsNames)(operandShape.colnames, col)) {
+            if (typeof col === 'string' && operandShape.colnames.satisfies([col], satisfiable_domain_1.SetComparator.SubsetOrEqual) === logic_1.Ternary.Never) {
                 invalidAccesses.push({ type: 'column', accessed: col });
             }
-            else if (typeof col === 'number' && !(0, domain_1.satisfiesLeqInterval)(operandShape.cols, col)) {
+            else if (typeof col === 'number' && operandShape.cols.satisfies(col, satisfiable_domain_1.NumericalComparator.LessOrEqual) === logic_1.Ternary.Never) {
                 invalidAccesses.push({ type: 'column', accessed: col });
             }
         }

package/linter/rules/dead-code.d.ts

@@ -1,5 +1,5 @@
 import { LintingResultCertainty, type LintingResult, LintingRuleCertainty } from '../linter-format';
-import type { SourceRange } from '../../util/range';
+import { type SourceRange } from '../../util/range';
 import type { MergeableRecord } from '../../util/objects';
 import { LintingRuleTag } from '../linter-tags';
 import { type CfgSimplificationPassName } from '../../control-flow/cfg-simplification';

package/linter/rules/deprecated-functions.d.ts

@@ -1,6 +1,6 @@
 import { LintingRuleCertainty } from '../linter-format';
 import { LintingRuleTag } from '../linter-tags';
-import type { FunctionsMetadata, FunctionsResult, FunctionsToDetectConfig } from './function-finder-util';
+import { type FunctionsMetadata, type FunctionsResult, type FunctionsToDetectConfig } from './function-finder-util';
 export declare const DEPRECATED_FUNCTIONS: {
     readonly createSearch: (config: FunctionsToDetectConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["with", "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: <T extends import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>(elements: import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, T>, _config: FunctionsToDetectConfig, _data: {

package/linter/rules/file-path-validity.d.ts

@@ -1,5 +1,4 @@
-import type { LintingResult } from '../linter-format';
-import { LintingRuleCertainty } from '../linter-format';
+import { type LintingResult, LintingRuleCertainty } from '../linter-format';
 import type { MergeableRecord } from '../../util/objects';
 import type { SourceRange } from '../../util/range';
 import type { FunctionInfo } from '../../queries/catalog/dependencies-query/function-info/function-info';

package/linter/rules/function-finder-util.d.ts

@@ -1,7 +1,6 @@
 import type { SourceRange } from '../../util/range';
 import type { Identifier } from '../../dataflow/environments/identifier';
-import type { LintingResult } from '../linter-format';
-import { LintingResultCertainty } from '../linter-format';
+import { type LintingResult, LintingResultCertainty } from '../linter-format';
 import type { FlowrSearchElement, FlowrSearchElements } from '../../search/flowr-search';
 import type { NormalizedAst, ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { MergeableRecord } from '../../util/objects';

package/linter/rules/naming-convention.d.ts

@@ -2,8 +2,7 @@ import type { DataflowGraph } from '../../dataflow/graph/graph';
 import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { MergeableRecord } from '../../util/objects';
 import type { SourceRange } from '../../util/range';
-import type { LintingResult, LintQuickFixReplacement } from '../linter-format';
-import { LintingResultCertainty, LintingRuleCertainty } from '../linter-format';
+import { type LintingResult, type LintQuickFixReplacement, LintingResultCertainty, LintingRuleCertainty } from '../linter-format';
 import { LintingRuleTag } from '../linter-tags';
 export declare enum CasingConvention {
     CamelCase = "camelCase",
@@ -34,11 +33,23 @@ export interface NamingConventionMetadata extends MergeableRecord {
     /** number of symbols breaking the casing convetion */
     numBreak: number;
 }
+/**
+ * Attempts to detect the casing convention used in the given identifier.
+ */
 export declare function detectCasing(identifier: string): CasingConvention;
+/**
+ * Determines the most used casing convention in the given list of symbols.
+ */
 export declare function getMostUsedCasing(symbols: {
     detectedCasing: CasingConvention;
 }[]): CasingConvention;
+/**
+ * Attempts to fix the casing of the given identifier to match the provided convention.
+ */
 export declare function fixCasing(identifier: string, convention: CasingConvention): string | undefined;
+/**
+ * Creates quick fixes for renaming all references to the given node to match the provided replacement.
+ */
 export declare function createNamingConventionQuickFixes(graph: DataflowGraph, nodeId: NodeId, replacement: string, conv: CasingConvention): LintQuickFixReplacement[] | undefined;
 export declare const NAMING_CONVENTION: {
     readonly createSearch: (_config: NamingConventionConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["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>[]>>>;

package/linter/rules/naming-convention.js

@@ -25,6 +25,9 @@ var CasingConvention;
 function containsAlpha(s) {
     return /[A-Za-z]/.test(s);
 }
+/**
+ * Attempts to detect the casing convention used in the given identifier.
+ */
 function detectCasing(identifier) {
     if (identifier.trim() === '' || !containsAlpha(identifier)) {
         return CasingConvention.Unknown;
@@ -68,6 +71,9 @@ function detectCasing(identifier) {
     }
     return CasingConvention.Unknown;
 }
+/**
+ * Determines the most used casing convention in the given list of symbols.
+ */
 function getMostUsedCasing(symbols) {
     if (symbols.length === 0) {
         return CasingConvention.Unknown;
@@ -77,9 +83,12 @@ function getMostUsedCasing(symbols) {
         const o = map.get(symbol.detectedCasing) ?? 0;
         map.set(symbol.detectedCasing, o + 1);
     }
-    // Return element with most occurances 
+    // Return element with most occurances
     return [...map].reduce((p, c) => p[1] > c[1] ? p : c)[0];
 }
+/**
+ * Attempts to fix the casing of the given identifier to match the provided convention.
+ */
 function fixCasing(identifier, convention) {
     if (!containsAlpha(identifier)) {
         return undefined;
@@ -110,6 +119,9 @@ function fixCasing(identifier, convention) {
             (0, assert_1.assertUnreachable)(convention);
     }
 }
+/**
+ * Creates quick fixes for renaming all references to the given node to match the provided replacement.
+ */
 function createNamingConventionQuickFixes(graph, nodeId, replacement, conv) {
     const refs = (0, dfg_get_symbol_refs_1.getAllRefsToSymbol)(graph, nodeId);
     const idMap = graph.idMap;

package/linter/rules/network-functions.d.ts

@@ -1,5 +1,5 @@
 import { LintingRuleCertainty } from '../linter-format';
-import type { FunctionsMetadata, FunctionsResult } from './function-finder-util';
+import { type FunctionsMetadata, type FunctionsResult } from './function-finder-util';
 import { LintingRuleTag } from '../linter-tags';
 import type { MergeableRecord } from '../../util/objects';
 export interface NetworkFunctionsConfig extends MergeableRecord {

package/linter/rules/seeded-randomness.d.ts

@@ -1,5 +1,4 @@
-import type { LintingResult } from '../linter-format';
-import { LintingResultCertainty, LintingRuleCertainty } from '../linter-format';
+import { type LintingResult, LintingResultCertainty, LintingRuleCertainty } from '../linter-format';
 import type { SourceRange } from '../../util/range';
 import type { MergeableRecord } from '../../util/objects';
 import type { Identifier } from '../../dataflow/environments/identifier';

package/linter/rules/unused-definition.d.ts

@@ -1,7 +1,6 @@
-import type { LintingResult } from '../linter-format';
-import { LintingRuleCertainty } from '../linter-format';
+import { type LintingResult, LintingRuleCertainty } from '../linter-format';
 import type { MergeableRecord } from '../../util/objects';
-import type { SourceRange } from '../../util/range';
+import { type SourceRange } from '../../util/range';
 import { LintingRuleTag } from '../linter-tags';
 import type { NormalizedAst, ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 export interface UnusedDefinitionResult extends LintingResult {

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -178,7 +178,7 @@
   "devDependencies": {
     "@commitlint/cli": "^19.7.1",
     "@commitlint/config-angular": "^19.7.1",
-    "@eagleoutice/eslint-config-flowr": "^1.0.19",
+    "@eagleoutice/eslint-config-flowr": "^1.0.27",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.34.0",
     "@j-ulrich/release-it-regex-bumper": "^5.3.0",

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

@@ -1,7 +1,6 @@
 import type { KnownParser } from '../../r-bridge/parser';
-import type { CacheInvalidationEvent } from './flowr-cache';
-import { FlowrCache } from './flowr-cache';
-import type { DEFAULT_DATAFLOW_PIPELINE, TREE_SITTER_DATAFLOW_PIPELINE } from '../../core/steps/pipeline/default-pipelines';
+import { type CacheInvalidationEvent, FlowrCache } from './flowr-cache';
+import { type DEFAULT_DATAFLOW_PIPELINE, type TREE_SITTER_DATAFLOW_PIPELINE } from '../../core/steps/pipeline/default-pipelines';
 import type { FlowrConfigOptions } from '../../config';
 import type { RParseRequests } from '../../r-bridge/retriever';
 import type { IdGenerator } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
@@ -10,6 +9,7 @@ import type { TreeSitterExecutor } from '../../r-bridge/lang-4.x/tree-sitter/tre
 import type { PipelineOutput } from '../../core/steps/pipeline/pipeline';
 import type { CfgSimplificationPassName } from '../../control-flow/cfg-simplification';
 import type { ControlFlowInformation } from '../../control-flow/control-flow-graph';
+import { CfgKind } from '../cfg-kind';
 interface FlowrAnalyzerCacheOptions<Parser extends KnownParser> {
     parser: Parser;
     config: FlowrConfigOptions;
@@ -17,7 +17,7 @@ interface FlowrAnalyzerCacheOptions<Parser extends KnownParser> {
     getId?: IdGenerator<NoInfo>;
     overwriteFilePath?: string;
 }
-type AnalyzerCacheType<Parser extends KnownParser> = Parser extends TreeSitterExecutor ? Partial<PipelineOutput<typeof TREE_SITTER_DATAFLOW_PIPELINE>> : Partial<PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>>;
+export type AnalyzerCacheType<Parser extends KnownParser> = Parser extends TreeSitterExecutor ? Partial<PipelineOutput<typeof TREE_SITTER_DATAFLOW_PIPELINE>> : Partial<PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>>;
 /**
  * This provides the full analyzer caching layer, please avoid using this directly
  * and prefer the {@link FlowrAnalyzer}.
@@ -36,14 +36,12 @@ export declare class FlowrAnalyzerCache<Parser extends KnownParser> extends Flow
     /**
      * Get the parse output for the request, parsing if necessary.
      * @param force - Do not use the cache, instead force a new parse.
-     *
      * @see {@link FlowrAnalyzerCache#peekParse} - to get the parse output if already available without triggering a new parse.
      */
     parse(force?: boolean): Promise<NonNullable<AnalyzerCacheType<Parser>['parse']>>;
     /**
      * Get the parse output for the request if already available, otherwise return `undefined`.
      * This will not trigger a new parse.
-     *
      * @see {@link FlowrAnalyzerCache#parse} - to get the parse output, parsing if necessary.
      */
     peekParse(): NonNullable<AnalyzerCacheType<Parser>['parse']> | undefined;
@@ -56,38 +54,34 @@ export declare class FlowrAnalyzerCache<Parser extends KnownParser> extends Flow
     /**
      * Get the normalized abstract syntax tree for the request if already available, otherwise return `undefined`.
      * This will not trigger a new normalization.
-     *
      * @see {@link FlowrAnalyzerCache#normalize} - to get the normalized AST, normalizing if necessary.
      */
     peekNormalize(): NonNullable<AnalyzerCacheType<Parser>['normalize']> | undefined;
     /**
      * Get the dataflow graph for the request, computing if necessary.
      * @param force - Do not use the cache, instead force new analyses.
-     *
      * @see {@link FlowrAnalyzerCache#peekDataflow} - to get the dataflow graph if already available without triggering a new computation.
      */
     dataflow(force?: boolean): Promise<NonNullable<AnalyzerCacheType<Parser>['dataflow']>>;
     /**
      * Get the dataflow graph for the request if already available, otherwise return `undefined`.
      * This will not trigger a new computation.
-     *
      * @see {@link FlowrAnalyzerCache#dataflow} - to get the dataflow graph, computing if necessary.
      */
     peekDataflow(): NonNullable<AnalyzerCacheType<Parser>['dataflow']> | undefined;
     /**
      * Get the control flow graph (CFG) for the request, computing if necessary.
      * @param force - Do not use the cache, instead force new analyses.
-     * @param useDataflow - Whether to use the dataflow graph for the creation of the CFG.
+     * @param kind - The kind of CFG that is requested.
      * @param simplifications - Simplification passes to be applied to the CFG.
      */
-    controlflow(force: boolean | undefined, useDataflow: boolean, simplifications: readonly CfgSimplificationPassName[] | undefined): Promise<ControlFlowInformation>;
+    controlflow(force: boolean | undefined, kind: CfgKind, simplifications: readonly CfgSimplificationPassName[] | undefined): Promise<ControlFlowInformation>;
     /**
      * Get the control flow graph (CFG) for the request if already available, otherwise return `undefined`.
-     * @param useDataflow - Whether to use the dataflow graph for the creation of the CFG.
+     * @param kind - The kind of CFG that is requested.
      * @param simplifications - Simplification passes to be applied to the CFG.
-     *
      * @see {@link FlowrAnalyzerCache#controlflow} - to get the control flow graph, computing if necessary.
      */
-    peekControlflow(useDataflow: boolean, simplifications: readonly CfgSimplificationPassName[] | undefined): ControlFlowInformation | undefined;
+    peekControlflow(kind: CfgKind, simplifications: readonly CfgSimplificationPassName[] | undefined): ControlFlowInformation | undefined;
 }
 export {};

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

@@ -6,6 +6,7 @@ const default_pipelines_1 = require("../../core/steps/pipeline/default-pipelines
 const assert_1 = require("../../util/assert");
 const objectmap_1 = require("../../util/collections/objectmap");
 const extract_cfg_1 = require("../../control-flow/extract-cfg");
+const cfg_kind_1 = require("../cfg-kind");
 /**
  * This provides the full analyzer caching layer, please avoid using this directly
  * and prefer the {@link FlowrAnalyzer}.
@@ -50,6 +51,7 @@ class FlowrAnalyzerCache extends flowr_cache_1.FlowrCache {
         this.receive({ type: "full" /* CacheInvalidationEventType.Full */ });
     }
     async runTapeUntil(force, until) {
+        (0, assert_1.guard)(this.args.request && (Array.isArray(this.args.request) ? this.args.request.length > 0 : true), 'At least one request must be set to run the analysis pipeline');
         if (force) {
             this.reset();
         }
@@ -63,7 +65,6 @@ class FlowrAnalyzerCache extends flowr_cache_1.FlowrCache {
     /**
      * Get the parse output for the request, parsing if necessary.
      * @param force - Do not use the cache, instead force a new parse.
-     *
      * @see {@link FlowrAnalyzerCache#peekParse} - to get the parse output if already available without triggering a new parse.
      */
     async parse(force) {
@@ -73,7 +74,6 @@ class FlowrAnalyzerCache extends flowr_cache_1.FlowrCache {
     /**
      * Get the parse output for the request if already available, otherwise return `undefined`.
      * This will not trigger a new parse.
-     *
      * @see {@link FlowrAnalyzerCache#parse} - to get the parse output, parsing if necessary.
      */
     peekParse() {
@@ -91,7 +91,6 @@ class FlowrAnalyzerCache extends flowr_cache_1.FlowrCache {
     /**
      * Get the normalized abstract syntax tree for the request if already available, otherwise return `undefined`.
      * This will not trigger a new normalization.
-     *
      * @see {@link FlowrAnalyzerCache#normalize} - to get the normalized AST, normalizing if necessary.
      */
     peekNormalize() {
@@ -100,7 +99,6 @@ class FlowrAnalyzerCache extends flowr_cache_1.FlowrCache {
     /**
      * Get the dataflow graph for the request, computing if necessary.
      * @param force - Do not use the cache, instead force new analyses.
-     *
      * @see {@link FlowrAnalyzerCache#peekDataflow} - to get the dataflow graph if already available without triggering a new computation.
      */
     async dataflow(force) {
@@ -110,7 +108,6 @@ class FlowrAnalyzerCache extends flowr_cache_1.FlowrCache {
     /**
      * Get the dataflow graph for the request if already available, otherwise return `undefined`.
      * This will not trigger a new computation.
-     *
      * @see {@link FlowrAnalyzerCache#dataflow} - to get the dataflow graph, computing if necessary.
      */
     peekDataflow() {
@@ -119,37 +116,42 @@ class FlowrAnalyzerCache extends flowr_cache_1.FlowrCache {
     /**
      * Get the control flow graph (CFG) for the request, computing if necessary.
      * @param force - Do not use the cache, instead force new analyses.
-     * @param useDataflow - Whether to use the dataflow graph for the creation of the CFG.
+     * @param kind - The kind of CFG that is requested.
      * @param simplifications - Simplification passes to be applied to the CFG.
      */
-    async controlflow(force, useDataflow, simplifications) {
+    async controlflow(force, kind, simplifications) {
+        (0, assert_1.guard)(kind === cfg_kind_1.CfgKind.Quick ? simplifications === undefined : true, 'Cannot apply simplifications to quick CFG');
         simplifications ??= [];
         if (!force) {
-            const value = this.controlFlowCache.simplified.get([simplifications, useDataflow]);
+            const value = this.controlFlowCache.simplified.get([simplifications, kind]);
             if (value !== undefined) {
                 return value;
             }
         }
         const normalized = await this.normalize(force);
-        let dataflow = undefined;
-        if (useDataflow) {
-            /* if force is active, it will have triggered with normalize */
-            dataflow = await this.dataflow();
+        let result;
+        switch (kind) {
+            case cfg_kind_1.CfgKind.WithDataflow:
+                result = (0, extract_cfg_1.extractCfg)(normalized, this.args.config, (await this.dataflow()).graph, simplifications);
+                break;
+            case cfg_kind_1.CfgKind.NoDataflow:
+                result = (0, extract_cfg_1.extractCfg)(normalized, this.args.config, undefined, simplifications);
+                break;
+            case cfg_kind_1.CfgKind.Quick:
+                result = this.peekDataflow()?.cfgQuick ?? (0, extract_cfg_1.extractCfgQuick)(normalized);
+                break;
         }
-        const result = simplifications.length === 0 && !useDataflow ? (0, extract_cfg_1.extractCfgQuick)(normalized) :
-            (0, extract_cfg_1.extractCfg)(normalized, this.args.config, dataflow?.graph, simplifications);
-        this.controlFlowCache.simplified.set([simplifications, useDataflow], result);
+        this.controlFlowCache.simplified.set([simplifications, kind], result);
         return result;
     }
     /**
      * Get the control flow graph (CFG) for the request if already available, otherwise return `undefined`.
-     * @param useDataflow - Whether to use the dataflow graph for the creation of the CFG.
+     * @param kind - The kind of CFG that is requested.
      * @param simplifications - Simplification passes to be applied to the CFG.
-     *
      * @see {@link FlowrAnalyzerCache#controlflow} - to get the control flow graph, computing if necessary.
      */
-    peekControlflow(useDataflow, simplifications) {
-        return this.controlFlowCache.simplified.get([simplifications ?? [], useDataflow]);
+    peekControlflow(kind, simplifications) {
+        return this.controlFlowCache.simplified.get([simplifications ?? [], kind]);
     }
 }
 exports.FlowrAnalyzerCache = FlowrAnalyzerCache;

package/project/cfg-kind.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Denotes the kind of control flow graph (CFG).
+ */
+export declare enum CfgKind {
+    /**
+     * CFG with dataflow information.
+     */
+    WithDataflow = 0,
+    /**
+     * CFG without dataflow information.
+     */
+    NoDataflow = 1,
+    /**
+     * A CFG version that is much quicker and does not apply any simplifications or dataflow information.
+     */
+    Quick = 2
+}

package/project/cfg-kind.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CfgKind = void 0;
+/**
+ * Denotes the kind of control flow graph (CFG).
+ */
+var CfgKind;
+(function (CfgKind) {
+    /**
+     * CFG with dataflow information.
+     */
+    CfgKind[CfgKind["WithDataflow"] = 0] = "WithDataflow";
+    /**
+     * CFG without dataflow information.
+     */
+    CfgKind[CfgKind["NoDataflow"] = 1] = "NoDataflow";
+    /**
+     * A CFG version that is much quicker and does not apply any simplifications or dataflow information.
+     */
+    CfgKind[CfgKind["Quick"] = 2] = "Quick";
+})(CfgKind || (exports.CfgKind = CfgKind = {}));
+//# sourceMappingURL=cfg-kind.js.map

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

@@ -32,4 +32,8 @@ export declare abstract class AbstractFlowrAnalyzerContext<In, Out, Plugin exten
      * Returns the project context this sub-context is attached to
      */
     getAttachedContext(): FlowrAnalyzerContext;
+    /**
+     * Reset the context to its initial state.
+     */
+    abstract reset(): void;
 }

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

@@ -1,9 +1,6 @@
-import type { RAnalysisRequest, ReadOnlyFlowrAnalyzerFilesContext } from './flowr-analyzer-files-context';
-import { FlowrAnalyzerFilesContext } from './flowr-analyzer-files-context';
-import type { ReadOnlyFlowrAnalyzerDependenciesContext } from './flowr-analyzer-dependencies-context';
-import { FlowrAnalyzerDependenciesContext } from './flowr-analyzer-dependencies-context';
-import type { FlowrAnalyzerPlugin } from '../plugins/flowr-analyzer-plugin';
-import { PluginType } from '../plugins/flowr-analyzer-plugin';
+import { type RAnalysisRequest, type ReadOnlyFlowrAnalyzerFilesContext, FlowrAnalyzerFilesContext } from './flowr-analyzer-files-context';
+import { type ReadOnlyFlowrAnalyzerDependenciesContext, FlowrAnalyzerDependenciesContext } from './flowr-analyzer-dependencies-context';
+import { type FlowrAnalyzerPlugin, PluginType } from '../plugins/flowr-analyzer-plugin';
 /**
  * This is a read-only interface to the {@link FlowrAnalyzerContext}.
  * It prevents you from modifying the context, but allows you to inspect it (which is probably what you want when using the {@link FlowrAnalyzer}).
@@ -37,6 +34,8 @@ export declare class FlowrAnalyzerContext implements ReadOnlyFlowrAnalyzerContex
     constructor(plugins: ReadonlyMap<PluginType, readonly FlowrAnalyzerPlugin[]>);
     /** delegate request addition */
     addRequests(requests: readonly RAnalysisRequest[]): void;
+    /** delegate request addition */
+    addRequest(request: RAnalysisRequest): void;
     /** this conducts all the step that can be done before the main analysis run */
     resolvePreAnalysis(): void;
     /**
@@ -45,4 +44,8 @@ export declare class FlowrAnalyzerContext implements ReadOnlyFlowrAnalyzerContex
      * the available methods.
      */
     inspect(): ReadOnlyFlowrAnalyzerContext;
+    /**
+     * Reset the context to its initial state, removing all files, dependencies, and loading orders.
+     */
+    reset(): void;
 }

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

@@ -29,6 +29,10 @@ class FlowrAnalyzerContext {
     addRequests(requests) {
         this.files.addRequests(requests);
     }
+    /** delegate request addition */
+    addRequest(request) {
+        this.files.addRequest(request);
+    }
     /** this conducts all the step that can be done before the main analysis run */
     resolvePreAnalysis() {
         this.files.computeLoadingOrder();
@@ -42,6 +46,13 @@ class FlowrAnalyzerContext {
     inspect() {
         return this;
     }
+    /**
+     * Reset the context to its initial state, removing all files, dependencies, and loading orders.
+     */
+    reset() {
+        this.files.reset();
+        this.deps.reset();
+    }
 }
 exports.FlowrAnalyzerContext = FlowrAnalyzerContext;
 //# sourceMappingURL=flowr-analyzer-context.js.map

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

@@ -16,7 +16,6 @@ export interface ReadOnlyFlowrAnalyzerDependenciesContext {
      * Get the dependency with the given name, if it exists.
      *
      * If the static dependencies have not yet been loaded, this may trigger a resolution step.
-     *
      * @param name - The name of the dependency to get.
      * @returns The dependency with the given name, or undefined if it does not exist.
      */
@@ -31,6 +30,7 @@ export declare class FlowrAnalyzerDependenciesContext extends AbstractFlowrAnaly
     readonly name = "flowr-analyzer-dependencies-context";
     private dependencies;
     private staticsLoaded;
+    reset(): void;
     constructor(ctx: FlowrAnalyzerContext, plugins?: readonly FlowrAnalyzerPackageVersionsPlugin[]);
     resolveStaticDependencies(): void;
     addDependency(pkg: Package): void;

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

@@ -12,6 +12,10 @@ class FlowrAnalyzerDependenciesContext extends abstract_flowr_analyzer_context_1
     name = 'flowr-analyzer-dependencies-context';
     dependencies = new Map();
     staticsLoaded = false;
+    reset() {
+        this.dependencies = new Map();
+        this.staticsLoaded = false;
+    }
     constructor(ctx, plugins) {
         super(ctx, flowr_analyzer_package_versions_plugin_1.FlowrAnalyzerPackageVersionsPlugin.defaultPlugin(), plugins);
     }

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

@@ -1,10 +1,9 @@
 import { AbstractFlowrAnalyzerContext } from './abstract-flowr-analyzer-context';
-import type { RParseRequest, RParseRequestFromFile } from '../../r-bridge/retriever';
+import { type RParseRequest, type RParseRequestFromFile } from '../../r-bridge/retriever';
 import type { FlowrAnalyzerLoadingOrderContext, ReadOnlyFlowrAnalyzerLoadingOrderContext } from './flowr-analyzer-loading-order-context';
 import { FlowrAnalyzerProjectDiscoveryPlugin } from '../plugins/project-discovery/flowr-analyzer-project-discovery-plugin';
 import { FlowrAnalyzerFilePlugin } from '../plugins/file-plugins/flowr-analyzer-file-plugin';
-import type { FlowrFile, FlowrFileProvider } from './flowr-file';
-import { SpecialFileRole } from './flowr-file';
+import { type FlowrFile, type FlowrFileProvider, SpecialFileRole } from './flowr-file';
 import type { FlowrDescriptionFile } from '../plugins/file-plugins/flowr-description-file';
 /**
  * This is a request to process a folder as a project, which will be expanded by the registered {@link FlowrAnalyzerProjectDiscoveryPlugin}s.
@@ -39,7 +38,6 @@ export interface ReadOnlyFlowrAnalyzerFilesContext {
     readonly loadingOrder: ReadOnlyFlowrAnalyzerLoadingOrderContext;
     /**
      * Get all requests that have been added to this context.
-     *
      * @example If you want to obtain all description files, use
      * ```ts
      * getFilesByRole(SpecialFileRole.Description)
@@ -59,6 +57,7 @@ export declare class FlowrAnalyzerFilesContext extends AbstractFlowrAnalyzerCont
     private readonly fileLoaders;
     private specialFiles;
     constructor(loadingOrder: FlowrAnalyzerLoadingOrderContext, plugins: readonly FlowrAnalyzerProjectDiscoveryPlugin[], fileLoaders: readonly FlowrAnalyzerFilePlugin[]);
+    reset(): void;
     /**
      * Add multiple requests to the context. This is just a convenience method that calls {@link addRequest} for each request.
      */

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

@@ -49,6 +49,10 @@ class FlowrAnalyzerFilesContext extends abstract_flowr_analyzer_context_1.Abstra
         this.fileLoaders = [...fileLoaders, flowr_analyzer_file_plugin_1.FlowrAnalyzerFilePlugin.defaultPlugin()];
         this.loadingOrder = loadingOrder;
     }
+    reset() {
+        this.loadingOrder.reset();
+        this.files = new Map();
+    }
     /**
      * Add multiple requests to the context. This is just a convenience method that calls {@link addRequest} for each request.
      */