@eagleoutice/flowr 2.9.10 → 2.9.12

package/dataflow/environments/built-in.d.ts

@@ -16,8 +16,8 @@ import { processExpressionList } from '../internal/process/functions/call/built-
 import { processGet } from '../internal/process/functions/call/built-in/built-in-get';
 import type { AstIdMap, ParentInformation, RNodeWithParent } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { type RFunctionArgument } from '../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
-import type { RSymbol } from '../../r-bridge/lang-4.x/ast/model/nodes/r-symbol';
-import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { RSymbol } from '../../r-bridge/lang-4.x/ast/model/nodes/r-symbol';
+import { type BuiltIn, NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { processLibrary } from '../internal/process/functions/call/built-in/built-in-library';
 import { processSourceCall } from '../internal/process/functions/call/built-in/built-in-source';
 import type { ForceArguments } from '../internal/process/functions/call/common';
@@ -42,19 +42,6 @@ import { processS3Dispatch } from '../internal/process/functions/call/built-in/b
 import { processRecall } from '../internal/process/functions/call/built-in/built-in-recall';
 import { processS7NewGeneric } from '../internal/process/functions/call/built-in/built-in-s-seven-new-generic';
 import { processS7Dispatch } from '../internal/process/functions/call/built-in/built-in-s-seven-dispatch';
-export type BuiltIn = `built-in:${string}`;
-/**
- * Generate a built-in id for the given name
- */
-export declare function builtInId<T extends string>(name: T): `built-in:${T}`;
-/**
- * Checks whether the given name is a built-in identifier
- */
-export declare function isBuiltIn(name: NodeId | string): name is BuiltIn;
-/**
- * Drops the `built-in:` prefix from the given built-in name
- */
-export declare function dropBuiltInPrefix<T extends string>(name: `built-in:${T}`): T;
 export type BuiltInIdentifierProcessor = <OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>) => DataflowInformation;
 export type BuiltInIdentifierProcessorWithConfig<Config> = <OtherInfo>(name: RSymbol<OtherInfo & ParentInformation>, args: readonly RFunctionArgument<OtherInfo & ParentInformation>[], rootId: NodeId, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, config: Config) => DataflowInformation;
 export interface BuiltInIdentifierDefinition extends IdentifierReference {

package/dataflow/environments/built-in.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuiltIns = exports.BuiltInEvalHandlerMapper = exports.BuiltInProcessorMapper = exports.BuiltInProcName = void 0;
-exports.builtInId = builtInId;
-exports.isBuiltIn = isBuiltIn;
-exports.dropBuiltInPrefix = dropBuiltInPrefix;
 const known_call_handling_1 = require("../internal/process/functions/call/known-call-handling");
 const built_in_access_1 = require("../internal/process/functions/call/built-in/built-in-access");
 const built_in_if_then_else_1 = require("../internal/process/functions/call/built-in/built-in-if-then-else");
@@ -21,6 +18,8 @@ const built_in_function_definition_1 = require("../internal/process/functions/ca
 const built_in_expression_list_1 = require("../internal/process/functions/call/built-in/built-in-expression-list");
 const built_in_get_1 = require("../internal/process/functions/call/built-in/built-in-get");
 const r_function_call_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
+const r_symbol_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-symbol");
+const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const edge_1 = require("../graph/edge");
 const built_in_library_1 = require("../internal/process/functions/call/built-in/built-in-library");
 const built_in_source_1 = require("../internal/process/functions/call/built-in/built-in-source");
@@ -30,7 +29,6 @@ const built_in_vector_1 = require("../internal/process/functions/call/built-in/b
 const built_in_rm_1 = require("../internal/process/functions/call/built-in/built-in-rm");
 const built_in_eval_1 = require("../internal/process/functions/call/built-in/built-in-eval");
 const vertex_1 = require("../graph/vertex");
-const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 const unknown_side_effect_1 = require("../graph/unknown-side-effect");
 const resolve_1 = require("../eval/resolve/resolve");
 const built_in_stop_if_not_1 = require("../internal/process/functions/call/built-in/built-in-stop-if-not");
@@ -41,25 +39,7 @@ const built_in_s_three_dispatch_1 = require("../internal/process/functions/call/
 const built_in_recall_1 = require("../internal/process/functions/call/built-in/built-in-recall");
 const built_in_s_seven_new_generic_1 = require("../internal/process/functions/call/built-in/built-in-s-seven-new-generic");
 const built_in_s_seven_dispatch_1 = require("../internal/process/functions/call/built-in/built-in-s-seven-dispatch");
-/**
- * Generate a built-in id for the given name
- */
-function builtInId(name) {
-    return `built-in:${name}`;
-}
-/**
- * Checks whether the given name is a built-in identifier
- */
-function isBuiltIn(name) {
-    return String(name).startsWith('built-in:');
-}
-const builtInPrefixLength = 'built-in:'.length;
-/**
- * Drops the `built-in:` prefix from the given built-in name
- */
-function dropBuiltInPrefix(name) {
-    return name.slice(builtInPrefixLength);
-}
+const r_string_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-string");
 function defaultBuiltInProcessor(name, args, rootId, data, { returnsNthArgument, useAsProcessor = BuiltInProcName.Default, forceArgs, readAllArguments, cfg, hasUnknownSideEffects, treatAsFnCall }) {
     const { information: res, processedArguments } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs, origin: useAsProcessor });
     if (returnsNthArgument !== undefined) {
@@ -90,11 +70,11 @@ function defaultBuiltInProcessor(name, args, rootId, data, { returnsNthArgument,
                 const rhs = arg.value;
                 let fnName;
                 let fnId;
-                if (rhs.type === type_1.RType.String) {
+                if (r_string_1.RString.is(rhs)) {
                     fnName = rhs.content.str;
                     fnId = rhs.info.id;
                 }
-                else if (rhs.type === type_1.RType.Symbol) {
+                else if (r_symbol_1.RSymbol.is(rhs)) {
                     fnName = rhs.content;
                     fnId = rhs.info.id;
                 }
@@ -120,14 +100,14 @@ function defaultBuiltInProcessor(name, args, rootId, data, { returnsNthArgument,
     return res;
 }
 function defaultBuiltInProcessorReadallArgs(name, args, rootId, data, { useAsProcessor = BuiltInProcName.Default, forceArgs }) {
-    const { information: res, processedArguments } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs, origin: useAsProcessor });
-    const g = res.graph;
+    const { information, processedArguments } = (0, known_call_handling_1.processKnownFunctionCall)({ name, args, rootId, data, forceArgs, origin: useAsProcessor });
+    const g = information.graph;
     for (const arg of processedArguments) {
         if (arg) {
             g.addEdge(rootId, arg.entryPoint, edge_1.EdgeType.Reads);
         }
     }
-    return res;
+    return information;
 }
 /**
  * This contains all names of built-in function handlers and origins
@@ -259,7 +239,7 @@ class BuiltIns {
     registerBuiltInConstant({ names, value, assumePrimitive }) {
         for (const name of names) {
             const n = identifier_1.Identifier.getName(name);
-            const id = builtInId(n);
+            const id = node_id_1.NodeId.toBuiltIn(n);
             const d = [{
                     type: identifier_1.ReferenceType.BuiltInConstant,
                     definedAt: id,
@@ -280,7 +260,7 @@ class BuiltIns {
         (0, assert_1.guard)(mappedProcessor !== undefined, () => `Processor for ${processor} is undefined! Please pass a valid builtin name ${JSON.stringify(Object.keys(exports.BuiltInProcessorMapper))}!`);
         for (const name of names) {
             const n = identifier_1.Identifier.getName(name);
-            const id = builtInId(n);
+            const id = node_id_1.NodeId.toBuiltIn(n);
             const d = [{
                     type: identifier_1.ReferenceType.BuiltInFunction,
                     definedAt: id,
@@ -303,7 +283,7 @@ class BuiltIns {
         for (const assignment of names) {
             for (const suffix of suffixes) {
                 const effectiveName = `${identifier_1.Identifier.getName(assignment)}${suffix}`;
-                const id = builtInId(effectiveName);
+                const id = node_id_1.NodeId.toBuiltIn(effectiveName);
                 const d = [{
                         type: identifier_1.ReferenceType.BuiltInFunction,
                         definedAt: id,

package/dataflow/eval/resolve/alias-tracking.d.ts

@@ -1,6 +1,6 @@
 import { VariableResolve } from '../../../config';
 import type { AstIdMap, RNodeWithParent } from '../../../r-bridge/lang-4.x/ast/model/processing/decorate';
-import { type NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { type REnvironmentInformation } from '../../environments/environment';
 import { Identifier } from '../../environments/identifier';
 import type { DataflowGraph } from '../../graph/graph';

package/dataflow/eval/resolve/alias-tracking.js

@@ -20,6 +20,7 @@ const general_1 = require("../values/general");
 const r_value_1 = require("../values/r-value");
 const set_constants_1 = require("../values/sets/set-constants");
 const resolve_1 = require("./resolve");
+const model_1 = require("../../../r-bridge/lang-4.x/ast/model/model");
 const AliasHandler = {
     [vertex_1.VertexType.Value]: (sourceId) => [sourceId],
     [vertex_1.VertexType.Use]: getUseAlias,
@@ -292,7 +293,7 @@ function trackAliasesInGraph(id, graph, ctx, idMap) {
             if (target === undefined) {
                 continue;
             }
-            if (target.type === type_1.RType.WhileLoop || target.type === type_1.RType.RepeatLoop || target.type === type_1.RType.ForLoop) {
+            if (model_1.RLoopConstructs.is(target)) {
                 forceTop = true;
                 break;
             }

package/dataflow/eval/resolve/resolve.js

@@ -18,6 +18,7 @@ const vector_constants_1 = require("../values/vectors/vector-constants");
 const alias_tracking_1 = require("./alias-tracking");
 const scalar_constants_1 = require("../values/scalar/scalar-constants");
 const identifier_1 = require("../../environments/identifier");
+const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
 /**
  * Helper function used by {@link resolveIdToValue}, please use that instead, if
  * you want to resolve the value of an identifier / node
@@ -46,14 +47,14 @@ function resolveNode({ resolve, node, ctx, blocked, environment, graph, idMap })
             return r_value_2.Top;
         }
         let builtInName;
-        if ((0, built_in_1.isBuiltIn)(origin.proc)) {
+        if (node_id_1.NodeId.isBuiltIn(origin.proc)) {
             builtInName = origin.proc;
         }
         else if (nt === type_1.RType.FunctionCall && node.named) {
-            builtInName = (0, built_in_1.builtInId)(identifier_1.Identifier.getName(node.functionName.content));
+            builtInName = node_id_1.NodeId.toBuiltIn(identifier_1.Identifier.getName(node.functionName.content));
         }
         else if (nt === type_1.RType.BinaryOp || nt === type_1.RType.UnaryOp) {
-            builtInName = (0, built_in_1.builtInId)(node.operator);
+            builtInName = node_id_1.NodeId.toBuiltIn(node.operator);
         }
         else {
             return r_value_2.Top;

package/dataflow/fn/exceptions-of-function.d.ts

@@ -1,4 +1,4 @@
-import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { CallGraph } from '../graph/call-graph';
 import type { ControlDependency } from '../info';
 export interface ExceptionPoint {

package/dataflow/fn/exceptions-of-function.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateExceptionsOfFunction = calculateExceptionsOfFunction;
+const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const vertex_1 = require("../graph/vertex");
 const built_in_1 = require("../environments/built-in");
 const CatchHandlers = new Set([built_in_1.BuiltInProcName.Try]);
@@ -35,7 +36,7 @@ function calculateExceptionsOfFunction(id, graph, knownThrower = {}) {
         if (!vtx) {
             continue;
         }
-        if ((0, built_in_1.isBuiltIn)(currentId)) {
+        if (node_id_1.NodeId.isBuiltIn(currentId)) {
             continue;
         }
         if (vtx.tag === vertex_1.VertexType.FunctionDefinition) {

package/dataflow/graph/call-graph.d.ts

@@ -1,6 +1,6 @@
 import { DataflowGraph } from './graph';
 import type { DataflowGraphVertexFunctionCall, DataflowGraphVertexFunctionDefinition } from './vertex';
-import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { DefaultMap } from '../../util/collections/defaultmap';
 /**
  * A call graph is a dataflow graph where all vertices are function calls.

package/dataflow/graph/call-graph.js

@@ -6,6 +6,7 @@ exports.dropTransitiveEdges = dropTransitiveEdges;
 exports.computeCallGraph = computeCallGraph;
 const graph_1 = require("./graph");
 const vertex_1 = require("./vertex");
+const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const linker_1 = require("../internal/linker");
 const edge_1 = require("./edge");
 const built_in_1 = require("../environments/built-in");
@@ -176,7 +177,7 @@ function processCall(vtx, from, graph, result, state) {
     let addedTarget = false;
     let addedBiTarget = false;
     for (const tar of tars) {
-        if ((0, built_in_1.isBuiltIn)(tar)) {
+        if (node_id_1.NodeId.isBuiltIn(tar)) {
             result.addEdge(vid, tar, edge_1.EdgeType.Calls);
             addedTarget = true;
             addedBiTarget = true;
@@ -193,7 +194,7 @@ function processCall(vtx, from, graph, result, state) {
         for (const origs of vtx.origin) {
             if (origs.startsWith('builtin:')) {
                 addedTarget = true;
-                result.addEdge(vid, (0, built_in_1.builtInId)(origs.substring('builtin:'.length)), edge_1.EdgeType.Calls);
+                result.addEdge(vid, node_id_1.NodeId.toBuiltIn(origs.substring('builtin:'.length)), edge_1.EdgeType.Calls);
             }
         }
     }
@@ -237,7 +238,7 @@ function processUnknown(vtx, from, graph, result, state) {
             return;
         case vertex_1.VertexType.FunctionDefinition:
             if (from) {
-                result.addEdge(from, (0, built_in_1.builtInId)('function'), edge_1.EdgeType.Calls);
+                result.addEdge(from, node_id_1.NodeId.toBuiltIn('function'), edge_1.EdgeType.Calls);
             }
             return;
         default:

package/dataflow/graph/dataflowgraph-builder.d.ts

@@ -1,4 +1,4 @@
-import { type NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { AstIdMap } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { type DataflowFunctionFlowInformation, DataflowGraph, FunctionArgument } from './graph';
 import { type IEnvironment, type REnvironmentInformation } from '../environments/environment';

package/dataflow/graph/dataflowgraph-builder.js

@@ -48,21 +48,21 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
     defineFunction(id, exitPoints, subflow, info, asRoot = true) {
         return this.addVertexWithDefaultEnv({
             tag: vertex_1.VertexType.FunctionDefinition,
-            id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
+            id: node_id_1.NodeId.normalize(id),
             params: Object.fromEntries(info?.readParams ?? []),
             subflow: {
                 ...subflow,
-                entryPoint: (0, node_id_1.normalizeIdToNumberIfPossible)(subflow.entryPoint),
-                graph: new Set([...subflow.graph].map(node_id_1.normalizeIdToNumberIfPossible)),
-                out: subflow.out.map(o => ({ ...o, nodeId: (0, node_id_1.normalizeIdToNumberIfPossible)(o.nodeId), cds: o.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })) })),
-                in: subflow.in.map(o => ({ ...o, nodeId: (0, node_id_1.normalizeIdToNumberIfPossible)(o.nodeId), cds: o.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })) })),
-                unknownReferences: subflow.unknownReferences.map(o => ({ ...o, nodeId: (0, node_id_1.normalizeIdToNumberIfPossible)(o.nodeId), cds: o.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })) })),
+                entryPoint: node_id_1.NodeId.normalize(subflow.entryPoint),
+                graph: new Set([...subflow.graph].map(node_id_1.NodeId.normalize)),
+                out: subflow.out.map(o => ({ ...o, nodeId: node_id_1.NodeId.normalize(o.nodeId), cds: o.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) })) })),
+                in: subflow.in.map(o => ({ ...o, nodeId: node_id_1.NodeId.normalize(o.nodeId), cds: o.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) })) })),
+                unknownReferences: subflow.unknownReferences.map(o => ({ ...o, nodeId: node_id_1.NodeId.normalize(o.nodeId), cds: o.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) })) })),
                 hooks: subflow.hooks ?? [],
             },
             mode: info?.mode,
-            exitPoints: exitPoints.map(e => typeof e === 'object' ? ({ ...e, nodeId: (0, node_id_1.normalizeIdToNumberIfPossible)(e.nodeId), cds: e.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })) }) :
-                ({ nodeId: (0, node_id_1.normalizeIdToNumberIfPossible)(e), type: 0 /* ExitPointType.Default */, cds: undefined })),
-            cds: info?.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
+            exitPoints: exitPoints.map(e => typeof e === 'object' ? ({ ...e, nodeId: node_id_1.NodeId.normalize(e.nodeId), cds: e.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) })) }) :
+                ({ nodeId: node_id_1.NodeId.normalize(e), type: 0 /* ExitPointType.Default */, cds: undefined })),
+            cds: info?.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) })),
             environment: info?.environment,
         }, asRoot);
     }
@@ -76,14 +76,14 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
      * (i.e., be a valid entry point), or is it nested (e.g., as part of a function definition)
      */
     call(id, name, args, info, asRoot = true) {
-        const onlyBuiltInAuto = info?.reads?.length === 1 && (0, built_in_1.isBuiltIn)(info?.reads[0]);
+        const onlyBuiltInAuto = info?.reads?.length === 1 && node_id_1.NodeId.isBuiltIn(info?.reads[0]);
         this.addVertexWithDefaultEnv({
             tag: vertex_1.VertexType.FunctionCall,
-            id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
+            id: node_id_1.NodeId.normalize(id),
             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), cds: undefined }),
+            args: args.map(a => a === r_function_call_1.EmptyArgument ? r_function_call_1.EmptyArgument : { ...a, nodeId: node_id_1.NodeId.normalize(a.nodeId), cds: undefined }),
             environment: (info?.onlyBuiltIn || onlyBuiltInAuto) ? undefined : info?.environment ?? this.defaultEnvironment,
-            cds: info?.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
+            cds: info?.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) })),
             onlyBuiltin: info?.onlyBuiltIn ?? onlyBuiltInAuto ?? false,
             origin: info?.origin ?? [(0, default_builtin_config_1.getDefaultProcessor)(name) ?? built_in_1.BuiltInProcName.Function],
             link: info?.link
@@ -133,9 +133,9 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
     defineVariable(id, name, info, asRoot = true) {
         this.addVertexWithDefaultEnv({
             tag: vertex_1.VertexType.VariableDefinition,
-            id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
+            id: node_id_1.NodeId.normalize(id),
             name,
-            cds: info?.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
+            cds: info?.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) })),
         }, asRoot);
         if (info?.definedBy) {
             for (const def of info.definedBy) {
@@ -155,13 +155,13 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
     use(id, name, info, asRoot = true) {
         return this.addVertexWithDefaultEnv((0, objects_1.deepMergeObject)({
             tag: vertex_1.VertexType.Use,
-            id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
+            id: node_id_1.NodeId.normalize(id),
             name,
             cds: undefined,
             environment: undefined
         }, {
             ...info,
-            cds: info?.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) }))
+            cds: info?.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) }))
         }), asRoot);
     }
     /**
@@ -174,8 +174,8 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
     constant(id, options, asRoot = true) {
         return this.addVertexWithDefaultEnv({
             tag: vertex_1.VertexType.Value,
-            id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
-            cds: options?.cds?.map(c => ({ ...c, id: (0, node_id_1.normalizeIdToNumberIfPossible)(c.id) })),
+            id: node_id_1.NodeId.normalize(id),
+            cds: options?.cds?.map(c => ({ ...c, id: node_id_1.NodeId.normalize(c.id) })),
             environment: undefined
         }, asRoot);
     }
@@ -186,7 +186,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
             }
             return this;
         }
-        return this.addEdge((0, node_id_1.normalizeIdToNumberIfPossible)(from), (0, node_id_1.normalizeIdToNumberIfPossible)(to), type);
+        return this.addEdge(node_id_1.NodeId.normalize(from), node_id_1.NodeId.normalize(to), type);
     }
     async queryHelper(from, to, data, type) {
         let fromId;
@@ -344,7 +344,7 @@ class DataflowGraphBuilder extends graph_1.DataflowGraph {
      * this is just an easier variant in case you working with a lot of functions this saves you a lot of `false` flags.
      */
     overwriteRootIds(ids) {
-        this.rootVertices = new Set(ids.map(node_id_1.normalizeIdToNumberIfPossible));
+        this.rootVertices = new Set(ids.map(node_id_1.NodeId.normalize));
         return this;
     }
 }

package/dataflow/graph/graph.d.ts

@@ -3,7 +3,7 @@ import type { DataflowInformation } from '../info';
 import { type DataflowGraphVertexArgument, type DataflowGraphVertexFunctionCall, type DataflowGraphVertexInfo } from './vertex';
 import { EmptyArgument } from '../../r-bridge/lang-4.x/ast/model/nodes/r-function-call';
 import type { BrandedIdentifier, IdentifierDefinition, IdentifierReference } from '../environments/identifier';
-import { type NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { type REnvironmentInformation } from '../environments/environment';
 import type { AstIdMap } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { LinkTo } from '../../queries/catalog/call-context-query/call-context-query-format';
@@ -91,9 +91,9 @@ export declare const FunctionArgument: {
     readonly isEmpty: (this: void, arg: unknown) => arg is typeof EmptyArgument;
     /**
      * Checks whether the given argument is not an empty argument.
-     * @see {@link isEmpty}
+     * @see {@link FunctionArgument.isEmpty}
      */
-    readonly isNotEmpty: (this: void, arg: FunctionArgument) => arg is NamedFunctionArgument | PositionalFunctionArgument;
+    readonly isNotEmpty: <T>(this: void, arg: T) => arg is Exclude<T, typeof EmptyArgument>;
     /**
      * Returns the reference of a non-empty argument.
      * @example
@@ -262,7 +262,7 @@ export declare class DataflowGraph<Vertex extends DataflowGraphVertexInfo = Data
      */
     updateToFunctionCall(info: DataflowGraphVertexFunctionCall): void;
     /** If you do not pass the `to` node, this will just mark the node as maybe */
-    addControlDependency(from: NodeId, to?: NodeId, when?: boolean): this;
+    addControlDependency(from: NodeId, to: NodeId, when?: boolean): this;
     /** Marks the given node as having unknown side effects */
     markIdForUnknownSideEffects(id: NodeId, target?: LinkTo<RegExp | string>): this;
     /**

package/dataflow/graph/graph.js

@@ -61,7 +61,7 @@ exports.FunctionArgument = {
     },
     /**
      * Checks whether the given argument is not an empty argument.
-     * @see {@link isEmpty}
+     * @see {@link FunctionArgument.isEmpty}
      */
     isNotEmpty(arg) {
         return arg !== r_function_call_1.EmptyArgument;
@@ -292,11 +292,10 @@ class DataflowGraph {
         if (fromId === toId) {
             return this;
         }
-        /* we now that we pass all required arguments */
-        const edge = { types: type };
         const existingFrom = this.edgeInformation.get(fromId);
         const edgeInFrom = existingFrom?.get(toId);
         if (edgeInFrom === undefined) {
+            const edge = { types: type };
             if (existingFrom === undefined) {
                 this.edgeInformation.set(fromId, new Map([[toId, edge]]));
             }
@@ -373,8 +372,9 @@ class DataflowGraph {
             vertex.cds = reference.cds;
         }
         else {
-            this.vertexInformation.set(reference.nodeId, { ...vertex, tag: vertex_1.VertexType.VariableDefinition });
-            this.types.set(vertex.tag, (this.types.get(vertex.tag) ?? []).filter(id => id !== reference.nodeId));
+            const oldTag = vertex.tag;
+            vertex.tag = vertex_1.VertexType.VariableDefinition;
+            this.types.set(oldTag, (this.types.get(oldTag) ?? []).filter(id => id !== reference.nodeId));
             this.types.set(vertex_1.VertexType.VariableDefinition, (this.types.get(vertex_1.VertexType.VariableDefinition) ?? []).concat([reference.nodeId]));
         }
     }
@@ -383,43 +383,48 @@ class DataflowGraph {
      * @param info - The information about the new function call node
      */
     updateToFunctionCall(info) {
-        const vertex = this.getVertex(info.id);
+        const infoId = info.id;
+        const vertex = this.getVertex(infoId);
         (0, assert_1.guard)(vertex !== undefined && (vertex.tag === vertex_1.VertexType.Use || vertex.tag === vertex_1.VertexType.Value), () => `node must be a use or value node for ${JSON.stringify(info.id)} to update it to a function call but is ${vertex?.tag}`);
         const previousTag = vertex.tag;
-        this.vertexInformation.set(info.id, { ...vertex, ...info, tag: vertex_1.VertexType.FunctionCall });
-        this.types.set(previousTag, (this.types.get(previousTag) ?? []).filter(id => id !== info.id));
-        this.types.set(vertex_1.VertexType.FunctionCall, (this.types.get(vertex_1.VertexType.FunctionCall) ?? []).concat([info.id]));
+        this.vertexInformation.set(infoId, { ...vertex, ...info, tag: vertex_1.VertexType.FunctionCall });
+        this.types.set(previousTag, (this.types.get(previousTag) ?? []).filter(id => id !== infoId));
+        const g = this.types.get(vertex_1.VertexType.FunctionCall);
+        if (g) {
+            g.push(infoId);
+        }
+        else {
+            this.types.set(vertex_1.VertexType.FunctionCall, [infoId]);
+        }
     }
     /** If you do not pass the `to` node, this will just mark the node as maybe */
     addControlDependency(from, to, when) {
-        to = to ? (0, node_id_1.normalizeIdToNumberIfPossible)(to) : undefined;
+        to = node_id_1.NodeId.normalize(to);
         const vertex = this.getVertex(from);
         (0, assert_1.guard)(vertex !== undefined, () => `node must be defined for ${from} to add control dependency`);
         vertex.cds ??= [];
-        if (to) {
-            let hasControlDependency = false;
-            for (const { id, when: cond } of vertex.cds) {
-                if (id === to && when !== cond) {
-                    hasControlDependency = true;
-                    break;
-                }
-            }
-            if (!hasControlDependency) {
-                vertex.cds.push({ id: to, when });
+        let hasControlDependency = false;
+        for (const { id, when: cond } of vertex.cds) {
+            if (id === to && when !== cond) {
+                hasControlDependency = true;
+                break;
             }
         }
+        if (!hasControlDependency) {
+            vertex.cds.push({ id: to, when });
+        }
         return this;
     }
     /** Marks the given node as having unknown side effects */
     markIdForUnknownSideEffects(id, target) {
         if (target) {
             this._unknownSideEffects.add({
-                id: (0, node_id_1.normalizeIdToNumberIfPossible)(id),
+                id: node_id_1.NodeId.normalize(id),
                 linkTo: typeof target.callName === 'string' ? { ...target, callName: new RegExp(target.callName) } : target
             });
             return this;
         }
-        this._unknownSideEffects.add((0, node_id_1.normalizeIdToNumberIfPossible)(id));
+        this._unknownSideEffects.add(node_id_1.NodeId.normalize(id));
         return this;
     }
     /**

package/dataflow/graph/quads.js

@@ -10,13 +10,10 @@ const edge_1 = require("./edge");
  */
 function df2quads(graph, config) {
     return (0, quads_1.graph2quads)({
-        rootIds: [...graph.rootIds()],
-        vertices: graph.vertices(true)
-            .map(([id, v]) => ({
-            ...v,
-            id
-        })).toArray(),
-        edges: graph.edges().flatMap(([fromId, targets]) => [...targets].map(([toId, info]) => ({
+        rootIds: Array.from(graph.rootIds()),
+        vertices: Array.from(graph.vertices(true)
+            .map(([, v]) => v)),
+        edges: graph.edges().flatMap(([fromId, targets]) => Array.from(targets).map(([toId, info]) => ({
             from: fromId,
             to: toId,
             type: Array.from(edge_1.DfEdge.typesToNames(info)),

package/dataflow/internal/linker.d.ts

@@ -1,11 +1,11 @@
 import { DefaultMap } from '../../util/collections/defaultmap';
-import { type NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import type { BuiltIn } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { Identifier, type IdentifierReference } from '../environments/identifier';
 import { type DataflowGraph, FunctionArgument } from '../graph/graph';
 import type { RParameter } from '../../r-bridge/lang-4.x/ast/model/nodes/r-parameter';
 import type { AstIdMap, ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { type DataflowGraphVertexFunctionCall, type DataflowGraphVertexFunctionDefinition, type DataflowGraphVertexInfo } from '../graph/vertex';
-import { type BuiltIn } from '../environments/built-in';
 import type { REnvironmentInformation } from '../environments/environment';
 import type { ExitPoint } from '../info';
 export type NameIdMap = DefaultMap<Identifier, IdentifierReference[]>;