@eagleoutice/flowr 2.6.3 → 2.7.0

package/statistics/features/supported/variables/variables.js

@@ -7,6 +7,7 @@ const visitor_1 = require("../../../../r-bridge/lang-4.x/ast/model/processing/vi
 const type_1 = require("../../../../r-bridge/lang-4.x/ast/model/type");
 const r_symbol_1 = require("../../../../r-bridge/lang-4.x/ast/model/nodes/r-symbol");
 const statistics_file_1 = require("../../../output/statistics-file");
+const vertex_1 = require("../../../../dataflow/graph/vertex");
 const initialVariableInfo = {
     numberOfVariableUses: 0,
     numberOfDefinitions: 0,
@@ -30,7 +31,7 @@ function visitVariables(info, input) {
             return;
         }
         const [dfNode] = mayNode;
-        if (dfNode.tag === 'variable-definition') {
+        if (dfNode.tag === vertex_1.VertexType.VariableDefinition) {
             info.numberOfDefinitions++;
             const lexeme = node.info.fullLexeme ?? node.lexeme;
             (0, statistics_file_1.appendStatisticsFile)(exports.variables.name, 'definedVariables', [[

package/util/containers.js

@@ -26,7 +26,7 @@ function getAccessOperands(args) {
  * @returns The indicesCollection of the resolved definitions
  */
 function resolveIndicesByName(name, environment) {
-    const definitions = (0, resolve_by_name_1.resolveByName)(name, environment);
+    const definitions = (0, resolve_by_name_1.resolveByNameAnyType)(name, environment);
     return definitions?.flatMap(def => def?.indicesCollection ?? []);
 }
 /**

package/util/mermaid/dfg.d.ts

@@ -40,6 +40,7 @@ interface MermaidGraphConfiguration {
     rootGraph?: DataflowGraph;
     presentEdges?: Set<string>;
     simplified?: boolean;
+    includeOnlyIds?: ReadonlySet<NodeId>;
 }
 /**
  * Converts a dataflow graph to mermaid graph code that visualizes the graph.

package/util/mermaid/dfg.js

@@ -108,7 +108,7 @@ function encodeEdge(from, to, types) {
 function mermaidNodeBrackets(tag) {
     let open;
     let close;
-    if (tag === 'function-definition' || tag === 'variable-definition') {
+    if (tag === vertex_1.VertexType.FunctionDefinition || tag === vertex_1.VertexType.VariableDefinition) {
         open = '[';
         close = ']';
     }
@@ -209,7 +209,7 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark) {
             }
         }
     }
-    if (info.tag === 'function-definition') {
+    if (info.tag === vertex_1.VertexType.FunctionDefinition) {
         subflowToMermaid(id, info.exitPoints, info.subflow, mermaid, idPrefix);
     }
 }
@@ -227,7 +227,7 @@ function graphToMermaidGraph(rootIds, { simplified, graph, prefix = 'flowchart B
  * Converts a dataflow graph to mermaid graph code that visualizes the graph.
  */
 function graphToMermaid(config) {
-    const mermaid = graphToMermaidGraph(config.graph.rootIds(), config);
+    const mermaid = graphToMermaidGraph(config.includeOnlyIds ? config.includeOnlyIds : config.graph.rootIds(), config);
     return { string: `${mermaid.nodeLines.join('\n')}\n${mermaid.edgeLines.join('\n')}`, mermaid };
 }
 /**

package/util/simple-df/dfg-view.d.ts

@@ -2,6 +2,7 @@ import { DataflowGraph } from '../../dataflow/graph/graph';
 import { VertexType } from '../../dataflow/graph/vertex';
 import { type MergeableRecord } from '../objects';
 import type { DeepPartial } from 'ts-essentials';
+import type { REnvironmentInformation } from '../../dataflow/environments/environment';
 export interface ReduceVertexOptions extends MergeableRecord {
     tags: VertexType[];
     nameRegex: string;
@@ -16,4 +17,4 @@ export interface ReduceOptions extends MergeableRecord {
 /**
  * Produces a reduced version of the given dataflow graph according to the given options.
  */
-export declare function reduceDfg(dfg: DataflowGraph, options: DeepPartial<ReduceOptions>): DataflowGraph;
+export declare function reduceDfg(dfg: DataflowGraph, options: DeepPartial<ReduceOptions>, cleanEnv: REnvironmentInformation): DataflowGraph;

package/util/simple-df/dfg-view.js

@@ -36,7 +36,7 @@ function makeFilter(options, idMap) {
 /**
  * Produces a reduced version of the given dataflow graph according to the given options.
  */
-function reduceDfg(dfg, options) {
+function reduceDfg(dfg, options, cleanEnv) {
     const newDfg = new graph_1.DataflowGraph(dfg.idMap);
     const applyOptions = (0, objects_1.deepMergeObject)(defaultReduceOptions, options);
     // overwrite the tag set if possible
@@ -48,7 +48,7 @@ function reduceDfg(dfg, options) {
     for (const [id, info] of dfg.vertices(!applyOptions)) {
         const result = applyFilter(info);
         if (result) {
-            newDfg.addVertex(result, dfg.isRoot(id));
+            newDfg.addVertex(result, cleanEnv, dfg.isRoot(id));
         }
     }
     for (const [from, out] of dfg.edges()) {

package/util/version.js

@@ -6,7 +6,7 @@ exports.printVersionInformation = printVersionInformation;
 const semver_1 = require("semver");
 const assert_1 = require("./assert");
 // this is automatically replaced with the current version by release-it
-const version = '2.6.3';
+const version = '2.7.0';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */

package/dataflow/environments/remove.d.ts

@@ -1,12 +0,0 @@
-import type { IEnvironment, REnvironmentInformation } from './environment';
-import type { Identifier } from './identifier';
-import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
-/**
- * Removes all definitions of a given name from the environment.
- */
-export declare function remove(name: Identifier, environment: REnvironmentInformation, defaultEnvironment: IEnvironment): REnvironmentInformation;
-/** Creates a copy of the original environment but without the definitions of the given ids */
-export declare function removeAll(definitions: readonly {
-    nodeId: NodeId;
-    name: Identifier | undefined;
-}[], environment: REnvironmentInformation): REnvironmentInformation;

package/dataflow/environments/remove.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.remove = remove;
-exports.removeAll = removeAll;
-const info_1 = require("../info");
-const clone_1 = require("./clone");
-/**
- * Removes all definitions of a given name from the environment.
- */
-function remove(name, environment, defaultEnvironment) {
-    let current = environment.current;
-    do {
-        const definition = current.memory.get(name);
-        if (definition !== undefined) {
-            current.memory.delete(name);
-            if (definition.every(d => (0, info_1.happensInEveryBranch)(d.controlDependencies))) {
-                break;
-            }
-        }
-        current = current.parent;
-    } while (current.id !== defaultEnvironment.id);
-    // we never remove built ins
-    return environment;
-}
-/** Creates a copy of the original environment but without the definitions of the given ids */
-function removeAll(definitions, environment) {
-    environment = (0, clone_1.cloneEnvironmentInformation)(environment, true);
-    let current = environment.current;
-    do {
-        for (const { nodeId, name } of definitions) {
-            if (name) {
-                current.memory.delete(name);
-            }
-            else {
-                // remove all definitions for the node id
-                for (const [key, values] of current.memory) {
-                    const res = values.filter(v => v.nodeId === nodeId);
-                    if (res.length > 0) {
-                        current.memory.set(key, values);
-                    }
-                    else {
-                        current.memory.delete(key);
-                    }
-                }
-            }
-        }
-        current = current.parent;
-    } while (!current.builtInEnv);
-    // we never remove built ins so we can stop one early
-    return environment;
-}
-//# sourceMappingURL=remove.js.map