@eagleoutice/flowr 2.2.7 → 2.2.9

package/README.md

@@ -48,7 +48,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.2.5, R v4.4.0 (r-shell engine)
+    flowR repl using flowR v2.2.8, R v4.4.0 (r-shell engine)
     R> :slicer test/testfiles/example.R --criterion "11@sum"
     ```
     
@@ -95,7 +95,7 @@ It offers a wide variety of features, for example:
         
 
 * 🚀 **fast data- and control-flow graphs**\
-  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">117.7 ms</i></span> (as of Feb 17, 2025), 
+  Within just <i><span title="This measurement is automatically fetched from the latest benchmark!">120.8 ms</span></i> (as of Feb 19, 2025), 
   _flowR_ can analyze the data- and control-flow of the average real-world R script. See the [benchmarks](https://flowr-analysis.github.io/flowr/wiki/stats/benchmark) for more information,
   and consult the [wiki pages](https://github.com/flowr-analysis/flowr/wiki/Dataflow-Graph) for more details on the dataflow graph.
 
@@ -131,7 +131,7 @@ It offers a wide variety of features, for example:
     
     ```shell
     $ docker run -it --rm eagleoutice/flowr # or npm run flowr 
-    flowR repl using flowR v2.2.5, R v4.4.0 (r-shell engine)
+    flowR repl using flowR v2.2.8, R v4.4.0 (r-shell engine)
     R> :dataflow* test/testfiles/example.R
     ```
     
@@ -140,7 +140,7 @@ It offers a wide variety of features, for example:
     
     
     ```text
-    https://mermaid.live/view#base64:eyJjb2RlIjoiZmxvd2NoYXJ0IFREXG4gICAgMChbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RcbiAgICAgICgwKVxuICAgICAgKjEuMS00KmBcIl0pXG4gICAgMShbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RmaWxlc1xuICAgICAgKDEpXG4gICAgICAqMS42LTE0KmBcIl0pXG4gICAgMltbXCJgIzkxO1JCaW5hcnlPcCM5MzsgL1xuICAgICAgKDIpXG4gICAgICAqMS4xLTE0KlxuICAgICgwLCAxKWBcIl1dXG4gICAgMyhbXCJgIzkxO1JTeW1ib2wjOTM7IGV4YW1wbGUuUlxuICAgICAgKDMpXG4gICAgICAqMS4xNi0yNCpgXCJdKVxuICAgIDRbW1wiYCM5MTtSQmluYXJ5T3AjOTM7IC9cbiAgICAgICg0KVxuICAgICAgKjEuMS0yNCpcbiAgICAoMiwgMylgXCJdXVxuICAgIDIgLS0+fFwicmVhZHMsIGFyZ3VtZW50XCJ8IDBcbiAgICAyIC0tPnxcInJlYWRzLCBhcmd1bWVudFwifCAxXG4gICAgNCAtLT58XCJyZWFkcywgYXJndW1lbnRcInwgMlxuICAgIDQgLS0+fFwicmVhZHMsIGFyZ3VtZW50XCJ8IDMiLCJtZXJtYWlkIjp7ImF1dG9TeW5jIjp0cnVlfX0=
+    https://mermaid.live/view#base64:eyJjb2RlIjoiZmxvd2NoYXJ0IEJUXG4gICAgMChbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RcbiAgICAgICgwKVxuICAgICAgKjEuMS00KmBcIl0pXG4gICAgMShbXCJgIzkxO1JTeW1ib2wjOTM7IHRlc3RmaWxlc1xuICAgICAgKDEpXG4gICAgICAqMS42LTE0KmBcIl0pXG4gICAgMltbXCJgIzkxO1JCaW5hcnlPcCM5MzsgL1xuICAgICAgKDIpXG4gICAgICAqMS4xLTE0KlxuICAgICgwLCAxKWBcIl1dXG4gICAgMyhbXCJgIzkxO1JTeW1ib2wjOTM7IGV4YW1wbGUuUlxuICAgICAgKDMpXG4gICAgICAqMS4xNi0yNCpgXCJdKVxuICAgIDRbW1wiYCM5MTtSQmluYXJ5T3AjOTM7IC9cbiAgICAgICg0KVxuICAgICAgKjEuMS0yNCpcbiAgICAoMiwgMylgXCJdXVxuICAgIDIgLS0+fFwicmVhZHMsIGFyZ3VtZW50XCJ8IDBcbiAgICAyIC0tPnxcInJlYWRzLCBhcmd1bWVudFwifCAxXG4gICAgNCAtLT58XCJyZWFkcywgYXJndW1lbnRcInwgMlxuICAgIDQgLS0+fFwicmVhZHMsIGFyZ3VtZW50XCJ8IDMiLCJtZXJtYWlkIjp7ImF1dG9TeW5jIjp0cnVlfX0=
     ```
     
     
@@ -149,6 +149,7 @@ It offers a wide variety of features, for example:
     
     
     
+    
     ```mermaid
     flowchart LR
         1{{"`#91;RNumber#93; 0
@@ -374,8 +375,9 @@ It offers a wide variety of features, for example:
         52 -->|"reads, argument"| 48
         52 -->|"argument"| 50
     ```
+    
     	
-    (The analysis required _24.34 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
+    (The analysis required _22.72 ms_ (including parse and normalize, using the [r-shell](https://github.com/flowr-analysis/flowr/wiki/Engines) engine) within the generation environment.)
     
     
     

package/cli/flowr-main-options.js

@@ -111,6 +111,12 @@ exports.flowrMainOptionDefinitions = [
         description: 'The path to the tree-sitter WASM binary to use. Defaults to the path specified by the tree-sitter package.',
         multiple: false
     },
+    {
+        name: 'engine.tree-sitter.lax',
+        type: Boolean,
+        description: 'Use the lax parser for parsing R code (allowing for syntax errors).',
+        multiple: false
+    },
     {
         name: 'default-engine',
         type: String,

package/cli/flowr.d.ts

@@ -20,6 +20,7 @@ export interface FlowrCliOptions {
     'engine.tree-sitter.disabled': boolean;
     'engine.tree-sitter.wasm-path': string | undefined;
     'engine.tree-sitter.tree-sitter-wasm-path': string | undefined;
+    'engine.tree-sitter.lax': boolean;
 }
 export declare const optionHelp: ({
     header: string;

package/cli/flowr.js

@@ -79,7 +79,8 @@ if (!options['engine.tree-sitter.disabled']) {
     (0, config_1.amendConfig)({ engines: [{
                 type: 'tree-sitter',
                 wasmPath: options['engine.tree-sitter.wasm-path'],
-                treeSitterWasmPath: options['engine.tree-sitter.tree-sitter-wasm-path']
+                treeSitterWasmPath: options['engine.tree-sitter.tree-sitter-wasm-path'],
+                lax: options['engine.tree-sitter.lax']
             }] });
 }
 if (options['default-engine']) {

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

@@ -0,0 +1,2 @@
+export declare function compact(obj: unknown): Buffer;
+export declare function uncompact(buf: Buffer | Uint8Array): unknown;

package/cli/repl/server/compact.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compact = compact;
+exports.uncompact = uncompact;
+const json_1 = require("../../../util/json");
+const msgpack_1 = require("@msgpack/msgpack");
+function compact(obj) {
+    return Buffer.from((0, msgpack_1.encode)(JSON.parse(JSON.stringify(obj, json_1.jsonReplacer))));
+}
+function uncompact(buf) {
+    return (0, msgpack_1.decode)(new Uint8Array(Buffer.from(buf)));
+}
+//# sourceMappingURL=compact.js.map

package/cli/repl/server/connection.js

@@ -60,6 +60,7 @@ const assert_1 = require("../../../util/assert");
 const auto_select_defaults_1 = require("../../../reconstruct/auto-select/auto-select-defaults");
 const message_query_1 = require("./messages/message-query");
 const query_1 = require("../../../queries/query");
+const compact_1 = require("./compact");
 /**
  * Each connection handles a single client, answering to its requests.
  * There is no need to construct this class manually, {@link FlowRServer} will do it for you.
@@ -181,6 +182,15 @@ class FlowRServerConnection {
                 }
             });
         }
+        else if (message.format === 'compact') {
+            (0, send_1.sendMessage)(this.socket, {
+                type: 'response-file-analysis',
+                format: 'compact',
+                id: message.id,
+                cfg: cfg ? (0, compact_1.compact)(cfg) : undefined,
+                results: (0, compact_1.compact)(sanitizedResults)
+            });
+        }
         else {
             (0, send_1.sendMessage)(this.socket, {
                 type: 'response-file-analysis',

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

@@ -1,6 +1,6 @@
 import type { IdMessageBase, MessageDefinition } from './all-messages';
 import type { ControlFlowInformation } from '../../../../util/cfg/cfg';
-import type { DEFAULT_DATAFLOW_PIPELINE, DEFAULT_SLICING_PIPELINE } from '../../../../core/steps/pipeline/default-pipelines';
+import type { DEFAULT_DATAFLOW_PIPELINE } from '../../../../core/steps/pipeline/default-pipelines';
 import type { PipelineOutput } from '../../../../core/steps/pipeline/pipeline';
 /**
  * Send by the client to request an analysis of a given file.
@@ -33,7 +33,7 @@ export interface FileAnalysisRequestMessage extends IdMessageBase {
     /** Can be used to additionally extract the {@link ControlFlowInformation} of the file, which is not exposed (and not fully calculated) by default. */
     cfg?: boolean;
     /** Controls the serialization of the `results` (and the {@link ControlFlowGraph} if the corresponding flag is set). If missing, we assume _json_. */
-    format?: 'json' | 'n-quads';
+    format?: 'compact' | 'json' | 'n-quads';
 }
 export declare const requestAnalysisMessage: MessageDefinition<FileAnalysisRequestMessage>;
 /**
@@ -45,20 +45,36 @@ export declare const requestAnalysisMessage: MessageDefinition<FileAnalysisReque
  *
  * @note The serialization of maps and sets is controlled by the {@link jsonReplacer} as part of {@link sendMessage}.
  *
- * @see FileAnalysisResponseMessageNQuads
+ * @see {@link FileAnalysisResponseMessageNQuads}
+ * @see {@link FileAnalysisResponseMessageCompact}
  */
 export interface FileAnalysisResponseMessageJson extends IdMessageBase {
     type: 'response-file-analysis';
     format: 'json';
     /**
-     * See the {@link SteppingSlicer} and {@link StepResults} for details on the results.
+     * See the {@link PipelineExecutor} and {@link DEFAULT_DATAFLOW_PIPELINE} for details on the results.
      */
-    results: PipelineOutput<typeof DEFAULT_SLICING_PIPELINE>;
+    results: PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>;
     /**
      * Only if the {@link FileAnalysisRequestMessage} contained a `cfg: true` this will contain the {@link ControlFlowInformation} of the file.
      */
     cfg?: ControlFlowInformation;
 }
+/**
+ * Similar to {@link FileAnalysisResponseMessageJson} but using a compact serialization format.
+ */
+export interface FileAnalysisResponseMessageCompact extends IdMessageBase {
+    type: 'response-file-analysis';
+    format: 'compact';
+    /**
+     * See the {@link PipelineExecutor} and {@link DEFAULT_DATAFLOW_PIPELINE} for details on the results.
+     */
+    results: Buffer;
+    /**
+     * Only if the {@link FileAnalysisRequestMessage} contained a `cfg: true` this will contain the {@link ControlFlowInformation} of the file.
+     */
+    cfg?: Buffer;
+}
 /**
  * Similar to {@link FileAnalysisResponseMessageJson} but using n-quads as serialization format.
  */

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

@@ -15,7 +15,7 @@ exports.requestAnalysisMessage = {
         content: joi_1.default.string().optional().description('The content of the file or an R expression (either give this or the filepath).'),
         filepath: joi_1.default.alternatives(joi_1.default.string(), joi_1.default.array().items(joi_1.default.string())).optional().description('The path to the file(s) on the local machine (either give this or the content).'),
         cfg: joi_1.default.boolean().optional().description('If you want to extract the control flow information of the file.'),
-        format: joi_1.default.string().valid('json', 'n-quads').optional().description('The format of the results, if missing we assume json.')
+        format: joi_1.default.string().valid('json', 'n-quads', 'compact').optional().description('The format of the results, if missing we assume json.')
     }).xor('content', 'filepath')
 };
 const jsonSchema = joi_1.default.object({
@@ -25,6 +25,13 @@ const jsonSchema = joi_1.default.object({
     results: joi_1.default.object().required().description('The results of the analysis (one field per step).'),
     cfg: joi_1.default.object().optional().description('The control flow information of the file, only present if requested.')
 }).description('The response in JSON format.');
+const compactSchema = joi_1.default.object({
+    type: joi_1.default.string().valid('response-file-analysis').required().description('The type of the message.'),
+    id: joi_1.default.string().optional().description('The id of the message, if you passed one in the request.'),
+    format: joi_1.default.string().valid('bson').required().description('The format of the results in bson format.'),
+    results: joi_1.default.binary().required().description('The results of the analysis (one field per step).'),
+    cfg: joi_1.default.binary().optional().description('The control flow information of the file, only present if requested.')
+});
 const nquadsSchema = joi_1.default.object({
     type: joi_1.default.string().valid('response-file-analysis').required().description('The type of the message.'),
     id: joi_1.default.string().optional().description('The id of the message, if you passed one in the request.'),
@@ -34,6 +41,6 @@ const nquadsSchema = joi_1.default.object({
 }).description('The response as n-quads.');
 exports.analysisResponseMessage = {
     type: 'response-file-analysis',
-    schema: joi_1.default.alternatives(jsonSchema, nquadsSchema).required().description('The response to a file analysis request (based on the `format` field).')
+    schema: joi_1.default.alternatives(jsonSchema, nquadsSchema, compactSchema).required().description('The response to a file analysis request (based on the `format` field).')
 };
 //# sourceMappingURL=message-analysis.js.map

package/config.d.ts

@@ -10,6 +10,30 @@ export declare enum VariableResolve {
     /** Only resolve directly assigned builtin constants */
     Builtin = "builtin"
 }
+/**
+ * How to infer the working directory from a script
+ */
+export declare enum InferWorkingDirectory {
+    /** Don't infer the working directory */
+    No = "no",
+    /** Infer the working directory from the main script */
+    MainScript = "main-script",
+    /** Infer the working directory from the active script */
+    ActiveScript = "active-script",
+    /** Infer the working directory from any script */
+    AnyScript = "any-script"
+}
+/**
+ * How to handle fixed strings in a source path
+ */
+export declare enum DropPathsOption {
+    /** Don't drop any parts of the sourced path */
+    No = "no",
+    /** try to drop everything but the filename */
+    Once = "once",
+    /** try to drop every folder of the path */
+    All = "all"
+}
 export interface FlowrConfigOptions extends MergeableRecord {
     /**
      * Whether source calls should be ignored, causing {@link processSourceCall}'s behavior to be skipped
@@ -17,7 +41,7 @@ export interface FlowrConfigOptions extends MergeableRecord {
     readonly ignoreSourceCalls: boolean;
     /** Configure language semantics and how flowR handles them */
     readonly semantics: {
-        /** Semantics regarding the handlings of the environment */
+        /** Semantics regarding the handling of the environment */
         readonly environment: {
             /** Do you want to overwrite (parts) of the builtin definition? */
             readonly overwriteBuiltIns: {
@@ -49,6 +73,30 @@ export interface FlowrConfigOptions extends MergeableRecord {
          * containers and accesses
          */
         readonly pointerTracking: boolean;
+        /**
+         * 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 {@link ignoreSourceCalls} is set to false.
+         */
+        readonly resolveSource?: {
+            /**
+             * search for filenames matching in the lowercase
+             */
+            readonly ignoreCapitalization: boolean;
+            /**
+             * try to infer the working directory from the main or any script to analyze.
+             */
+            readonly inferWorkingDirectory: InferWorkingDirectory;
+            /**
+             * Additionally search in these paths
+             */
+            readonly searchPath: readonly string[];
+            /**
+             * Allow to drop the first or all parts of the sourced path,
+             * if it is relative.
+             */
+            readonly dropPaths: DropPathsOption;
+        };
     };
 }
 export interface TreeSitterEngineConfig extends MergeableRecord {
@@ -61,6 +109,10 @@ export interface TreeSitterEngineConfig extends MergeableRecord {
      * The path to the tree-sitter WASM binary to use. If this is undefined, the path specified by the tree-sitter package will be used.
      */
     readonly treeSitterWasmPath?: string;
+    /**
+     * Whether to use the lax parser for parsing R code (allowing for syntax errors). If this is undefined, the strict parser will be used.
+     */
+    readonly lax?: boolean;
 }
 export interface RShellEngineConfig extends MergeableRecord {
     readonly type: 'r-shell';

package/config.js

@@ -3,7 +3,7 @@ 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.VariableResolve = void 0;
+exports.flowrConfigFileSchema = exports.defaultConfigOptions = exports.DropPathsOption = exports.InferWorkingDirectory = exports.VariableResolve = void 0;
 exports.setConfigFile = setConfigFile;
 exports.parseConfig = parseConfig;
 exports.setConfig = setConfig;
@@ -25,6 +25,33 @@ var VariableResolve;
     /** Only resolve directly assigned builtin constants */
     VariableResolve["Builtin"] = "builtin";
 })(VariableResolve || (exports.VariableResolve = VariableResolve = {}));
+/**
+ * How to infer the working directory from a script
+ */
+var InferWorkingDirectory;
+(function (InferWorkingDirectory) {
+    /** Don't infer the working directory */
+    InferWorkingDirectory["No"] = "no";
+    /** Infer the working directory from the main script */
+    InferWorkingDirectory["MainScript"] = "main-script";
+    /** Infer the working directory from the active script */
+    InferWorkingDirectory["ActiveScript"] = "active-script";
+    /** Infer the working directory from any script */
+    InferWorkingDirectory["AnyScript"] = "any-script";
+})(InferWorkingDirectory || (exports.InferWorkingDirectory = InferWorkingDirectory = {}));
+/**
+ * How to handle fixed strings in a source path
+ */
+var DropPathsOption;
+(function (DropPathsOption) {
+    /** Don't drop any parts of the sourced path */
+    DropPathsOption["No"] = "no";
+    /** try to drop everything but the filename */
+    DropPathsOption["Once"] = "once";
+    /** try to drop every folder of the path */
+    DropPathsOption["All"] = "all";
+})(DropPathsOption || (exports.DropPathsOption = DropPathsOption = {}));
+;
 const defaultEngineConfigs = {
     'tree-sitter': { type: 'tree-sitter' },
     'r-shell': { type: 'r-shell' }
@@ -43,7 +70,13 @@ exports.defaultConfigOptions = {
     defaultEngine: 'r-shell',
     solver: {
         variables: VariableResolve.Alias,
-        pointerTracking: true
+        pointerTracking: true,
+        resolveSource: {
+            dropPaths: DropPathsOption.No,
+            ignoreCapitalization: true,
+            inferWorkingDirectory: InferWorkingDirectory.ActiveScript,
+            searchPath: []
+        }
     }
 };
 exports.flowrConfigFileSchema = joi_1.default.object({
@@ -54,12 +87,13 @@ exports.flowrConfigFileSchema = 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 the handlings of the environment.')
+        }).optional().description('Semantics regarding how to handle the R environment.')
     }).description('Configure language semantics and how flowR handles them.'),
     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.')
+        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.')
@@ -67,7 +101,13 @@ exports.flowrConfigFileSchema = joi_1.default.object({
     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.'),
-        pointerTracking: joi_1.default.boolean().description('Whether to track pointers in the dataflow graph, if not, the graph will be over-approximated wrt. containers and accesses.')
+        pointerTracking: joi_1.default.boolean().description('Whether to track pointers in the dataflow graph, if not, the graph will be over-approximated wrt. containers and accesses.'),
+        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.')
+        }).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.')
     }).description('How to resolve constants, constraints, cells, ...')
 }).description('The configuration file format for flowR.');
 // we don't load from a config file at all by default unless setConfigFile is called

package/dataflow/environments/built-in.js

@@ -89,7 +89,7 @@ exports.BuiltInProcessorMapper = {
     'builtin:repeat-loop': built_in_repeat_loop_1.processRepeatLoop,
     'builtin:while-loop': built_in_while_loop_1.processWhileLoop,
     'builtin:replacement': built_in_replacement_1.processReplacementFunction,
-    'builtin:list': built_in_list_1.processList,
+    'builtin:list': built_in_list_1.processList
 };
 exports.BuiltInMemory = new Map();
 exports.EmptyBuiltInMemory = new Map();

package/dataflow/environments/environment.d.ts

@@ -29,6 +29,10 @@ export declare class Environment implements IEnvironment {
     memory: Map<Identifier, IdentifierDefinition[]>;
     constructor(parent: IEnvironment);
 }
+export interface WorkingDirectoryReference {
+    readonly path: string;
+    readonly controlDependencies: ControlDependency[] | undefined;
+}
 /**
  * An environment describes a ({@link IEnvironment#parent|scoped}) mapping of names to their definitions ({@link EnvironmentMemory}).
  *

package/dataflow/environments/environment.js

@@ -29,11 +29,11 @@ function makeReferenceMaybe(ref, graph, environments, includeDefs, defaultCd = u
     }
     if (node) {
         const [fst] = node;
-        if (fst.controlDependencies && defaultCd && !fst.controlDependencies.includes(defaultCd)) {
-            fst.controlDependencies.push(defaultCd);
+        if (fst.cds && defaultCd && !fst.cds.includes(defaultCd)) {
+            fst.cds.push(defaultCd);
         }
         else {
-            fst.controlDependencies = defaultCd ? [defaultCd] : [];
+            fst.cds = defaultCd ? [defaultCd] : [];
         }
     }
     return { ...ref, controlDependencies: [...ref.controlDependencies ?? [], ...(defaultCd ? [defaultCd] : [])] };

package/dataflow/environments/resolve-by-name.js

@@ -221,7 +221,7 @@ function trackAliasesInGraph(id, graph, idMap) {
             continue;
         }
         const [vertex, outgoingEdges] = res;
-        const cds = vertex.controlDependencies;
+        const cds = vertex.cds;
         for (const cd of cds ?? []) {
             const target = graph.idMap?.get(cd.id);
             if (target === undefined) {

package/dataflow/extractor.js

@@ -14,7 +14,6 @@ const named_call_handling_1 = require("./internal/process/functions/call/named-c
 const make_argument_1 = require("./internal/process/functions/call/argument/make-argument");
 const range_1 = require("../util/range");
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
-const retriever_1 = require("../r-bridge/retriever");
 const environment_1 = require("./environments/environment");
 const built_in_source_1 = require("./internal/process/functions/call/built-in/built-in-source");
 const cfg_1 = require("../util/cfg/cfg");
@@ -46,14 +45,17 @@ exports.processors = {
     [type_1.RType.FunctionDefinition]: (n, d) => (0, process_named_call_1.processAsNamedCall)(n, d, n.lexeme, [...n.parameters, n.body]),
     [type_1.RType.Parameter]: process_parameter_1.processFunctionParameter,
     [type_1.RType.Argument]: process_argument_1.processFunctionArgument,
-    [type_1.RType.ExpressionList]: (n, d) => (0, named_call_handling_1.processNamedCall)({
-        type: type_1.RType.Symbol,
-        info: n.info,
-        content: n.grouping?.[0].content ?? '{',
-        lexeme: n.grouping?.[0].lexeme ?? '{',
-        location: n.location ?? (0, range_1.rangeFrom)(-1, -1, -1, -1),
-        namespace: n.grouping?.[0].content ? undefined : 'base'
-    }, (0, make_argument_1.wrapArgumentsUnnamed)(n.children, d.completeAst.idMap), n.info.id, d)
+    [type_1.RType.ExpressionList]: ({ grouping, info, children, location }, d) => {
+        const groupStart = grouping?.[0];
+        return (0, named_call_handling_1.processNamedCall)({
+            type: type_1.RType.Symbol,
+            info: info,
+            content: groupStart?.content ?? '{',
+            lexeme: groupStart?.lexeme ?? '{',
+            location: location ?? (0, range_1.rangeFrom)(-1, -1, -1, -1),
+            namespace: groupStart?.content ? undefined : 'base'
+        }, (0, make_argument_1.wrapArgumentsUnnamed)(children, d.completeAst.idMap), info.id, d);
+    }
 };
 function resolveLinkToSideEffects(ast, graph) {
     let cfg = undefined;
@@ -94,7 +96,7 @@ function produceDataFlowGraph(parser, request, ast) {
         processors: exports.processors,
         currentRequest: firstRequest,
         controlDependencies: undefined,
-        referenceChain: [(0, retriever_1.requestFingerprint)(firstRequest)]
+        referenceChain: [firstRequest],
     };
     let df = (0, processor_1.processDataflowFor)(ast.ast, dfData);
     if (multifile) {

package/dataflow/graph/dataflowgraph-builder.js

@@ -44,7 +44,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
                 unknownReferences: subflow.unknownReferences.map(o => ({ ...o, nodeId: (0, node_id_1.normalizeIdToNumberIfPossible)(o.nodeId), controlDependencies: o.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })) }))
             },
             exitPoints: exitPoints.map(node_id_1.normalizeIdToNumberIfPossible),
-            controlDependencies: info?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
+            cds: info?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
             environment: info?.environment
         }, asRoot);
     }
@@ -66,7 +66,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
             name,
             args: args.map(a => a === r_function_call_1.EmptyArgument ? r_function_call_1.EmptyArgument : { ...a, nodeId: (0, node_id_1.normalizeIdToNumberIfPossible)(a.nodeId), controlDependencies: undefined }),
             environment: (info?.onlyBuiltIn || onlyBuiltInAuto) ? undefined : info?.environment ?? (0, environment_1.initializeCleanEnvironments)(),
-            controlDependencies: info?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
+            cds: info?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
             onlyBuiltin: info?.onlyBuiltIn ?? onlyBuiltInAuto ?? false
         }, asRoot);
         this.addArgumentLinks(id, args);
@@ -96,7 +96,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
                 }
             }
             else if (!this.hasVertex(arg.nodeId, true)) {
-                this.use(arg.nodeId, arg.name, { controlDependencies: arg.controlDependencies });
+                this.use(arg.nodeId, arg.name, { cds: arg.controlDependencies });
                 this.argument(id, arg.nodeId);
             }
         }
@@ -115,7 +115,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
             tag: vertex_1.VertexType.VariableDefinition,
             id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
             name,
-            controlDependencies: info?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
+            cds: info?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
         }, asRoot);
         if (info?.definedBy) {
             for (const def of info.definedBy) {
@@ -138,11 +138,11 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
             tag: vertex_1.VertexType.Use,
             id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
             name,
-            controlDependencies: undefined,
+            cds: undefined,
             environment: undefined
         }, {
             ...info,
-            controlDependencies: info?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) }))
+            cds: info?.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) }))
         }), asRoot);
     }
     /**
@@ -157,7 +157,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
         return this.addVertex({
             tag: vertex_1.VertexType.Value,
             id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
-            controlDependencies: options?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
+            cds: options?.controlDependencies?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
             environment: undefined
         }, asRoot);
     }

package/dataflow/graph/diff.js

@@ -199,7 +199,7 @@ function diffVertices(ctx) {
                 });
             }
         }
-        (0, info_1.diffControlDependencies)(lInfo.controlDependencies, rInfo.controlDependencies, { ...ctx, position: `Vertex ${id} differs in controlDependencies. ` });
+        (0, info_1.diffControlDependencies)(lInfo.cds, rInfo.cds, { ...ctx, position: `Vertex ${id} differs in controlDependencies. ` });
         if ((lInfo.environment === undefined && rInfo.environment !== undefined && !ctx.config.leftIsSubgraph)
             || (lInfo.environment !== undefined && rInfo.environment === undefined && !ctx.config.rightIsSubgraph)) {
             /* only diff them if specified at all */

package/dataflow/graph/graph.d.ts

@@ -178,11 +178,11 @@ export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = Data
      */
     addVertex(vertex: DataflowGraphVertexArgument & Omit<Vertex, keyof DataflowGraphVertexArgument>, asRoot?: boolean): this;
     /** {@inheritDoc} */
-    addEdge(from: NodeId, to: NodeId, type: EdgeType): this;
+    addEdge(from: NodeId, to: NodeId, type: EdgeType | number): this;
     /** {@inheritDoc} */
-    addEdge(from: ReferenceForEdge, to: ReferenceForEdge, type: EdgeType): this;
+    addEdge(from: ReferenceForEdge, to: ReferenceForEdge, type: EdgeType | number): this;
     /** {@inheritDoc} */
-    addEdge(from: NodeId | ReferenceForEdge, to: NodeId | ReferenceForEdge, type: EdgeType): this;
+    addEdge(from: NodeId | ReferenceForEdge, to: NodeId | ReferenceForEdge, type: EdgeType | number): this;
     /**
      * Merges the other graph into *this* one (in-place). The return value is only for convenience.
      *

package/dataflow/graph/graph.js

@@ -272,7 +272,7 @@ class DataflowGraph {
         const vertex = this.getVertex(reference.nodeId, true);
         (0, assert_1.guard)(vertex !== undefined, () => `node must be defined for ${JSON.stringify(reference)} to set reference`);
         if (vertex.tag === vertex_1.VertexType.FunctionDefinition || vertex.tag === vertex_1.VertexType.VariableDefinition) {
-            vertex.controlDependencies = reference.controlDependencies;
+            vertex.cds = reference.controlDependencies;
         }
         else {
             this.vertexInformation.set(reference.nodeId, { ...vertex, tag: vertex_1.VertexType.VariableDefinition });
@@ -292,17 +292,17 @@ class DataflowGraph {
         to = to ? (0, node_id_1.normalizeIdToNumberIfPossible)(to) : undefined;
         const vertex = this.getVertex(from, true);
         (0, assert_1.guard)(vertex !== undefined, () => `node must be defined for ${from} to add control dependency`);
-        vertex.controlDependencies ??= [];
+        vertex.cds ??= [];
         if (to) {
             let hasControlDependency = false;
-            for (const { id, when: cond } of vertex.controlDependencies) {
+            for (const { id, when: cond } of vertex.cds) {
                 if (id === to && when !== cond) {
                     hasControlDependency = true;
                     break;
                 }
             }
             if (!hasControlDependency) {
-                vertex.controlDependencies.push({ id: to, when });
+                vertex.cds.push({ id: to, when });
             }
         }
         return this;

package/dataflow/graph/vertex.d.ts

@@ -90,7 +90,7 @@ interface DataflowGraphVertexBase extends MergeableRecord {
     /**
      * @see {@link ControlDependency} - the collection of control dependencies which have an influence on whether the vertex is executed.
      */
-    controlDependencies: ControlDependency[] | undefined;
+    cds: ControlDependency[] | undefined;
     /**
      * this attribute links a vertex to indices (pointer links) it may be affected by or related to
      */

package/dataflow/internal/process/functions/call/built-in/built-in-access.js

@@ -53,7 +53,7 @@ function processAccess(name, args, rootId, data, config) {
     }
     /* access always reads all of its indices */
     for (const arg of fnCall.processedArguments) {
-        if (arg !== undefined) {
+        if (arg) {
             info.graph.addEdge(name.info.id, arg.entryPoint, edge_1.EdgeType.Reads);
         }
         /* we include the read edges to the constant arguments as well so that they are included if necessary */

package/dataflow/internal/process/functions/call/built-in/built-in-apply.js

@@ -70,7 +70,7 @@ function processApply(name, args, rootId, data, { indexOfFunction = 1, nameOfFun
         args: allOtherArguments,
         environment: data.environment,
         onlyBuiltin: false,
-        controlDependencies: data.controlDependencies
+        cds: data.controlDependencies
     });
     for (const arg of processedArguments) {
         if (arg) {