@eagleoutice/flowr 2.9.14 → 2.10.1

package/slicing/static/static-slicer.js

@@ -11,6 +11,7 @@ const vertex_1 = require("../../dataflow/graph/vertex");
 const edge_1 = require("../../dataflow/graph/edge");
 const df_helper_1 = require("../../dataflow/graph/df-helper");
 const slice_direction_1 = require("../../util/slice-direction");
+const model_1 = require("../../r-bridge/lang-4.x/ast/model/model");
 exports.slicerLogger = log_1.log.getSubLogger({ name: 'slicer' });
 /**
  * This returns the ids to include in the static slice of the given type, when slicing with the given seed id's (must be at least one).
@@ -99,7 +100,29 @@ function staticSlice(ctx, info, { idMap }, ids, direction, threshold = 75, cache
             }
         }
     }
-    return { ...queue.status(), slicedFor: ids };
+    if (ctx.config.solver.slicer?.autoExtend) {
+        return { ...queue.status(), slicedFor: ids, result: extendSlices(queue.status().result, idMap) };
+    }
+    else {
+        return { ...queue.status(), slicedFor: ids };
+    }
+}
+function extendSlices(results, ast) {
+    const res = new Set();
+    for (const id of results) {
+        res.add(id);
+        let parent = ast.get(id);
+        while (parent && parent.info.role !== "root" /* RoleInParent.Root */ && parent.info.role !== "el-c" /* RoleInParent.ExpressionListChild */) {
+            parent = parent.info.parent ? ast.get(parent.info.parent) : undefined;
+        }
+        if (!parent) {
+            continue; // no parent, no need to extend
+        }
+        for (const id of model_1.RNode.collectAllIds(parent)) {
+            res.add(id);
+        }
+    }
+    return res;
 }
 /**
  * Updates the potential addition for the given target node in the visiting queue.

package/util/collections/arrays.d.ts

@@ -92,6 +92,10 @@ export declare function equidistantSampling<T>(list: readonly T[], sampleCount:
 export declare function cartesianProduct<T>(...arrays: T[][]): T[][];
 /** merge two arrays, removing duplicates */
 export declare function uniqueArrayMerge<T>(left: readonly T[], right: readonly T[]): T[];
+/**
+ * Returns a duplicate-free array.
+ */
+export declare function uniqueArray<T>(a: Iterable<T>): T[];
 /**
  * Groups the elements of the given array by the key returned by the given key function.
  */

package/util/collections/arrays.js

@@ -11,6 +11,7 @@ exports.arrayEqual = arrayEqual;
 exports.equidistantSampling = equidistantSampling;
 exports.cartesianProduct = cartesianProduct;
 exports.uniqueArrayMerge = uniqueArrayMerge;
+exports.uniqueArray = uniqueArray;
 exports.arraysGroupBy = arraysGroupBy;
 const assert_1 = require("../assert");
 /**
@@ -227,6 +228,12 @@ function uniqueArrayMerge(left, right) {
     }
     return Array.from(result);
 }
+/**
+ * Returns a duplicate-free array.
+ */
+function uniqueArray(a) {
+    return Array.from(new Set(a));
+}
 /**
  * Groups the elements of the given array by the key returned by the given key function.
  */

package/util/mermaid/dfg.js

@@ -156,8 +156,9 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
         const escapedName = mermaid_1.Mermaid.escape(node ? `[${node.type}] ${lexeme}` : '??');
         const deps = info.cds ? ', :may:' + info.cds.map(c => c.id + (c.when ? '+' : '-')).join(',') : '';
         const lnks = info.link?.origin ? ', :links:' + info.link.origin.join(',') : '';
+        const sources = info.source ? ', sources: ' + JSON.stringify(info.source) : '';
         const n = node?.info.fullRange ?? node?.location ?? (node?.type === type_1.RType.ExpressionList ? node?.grouping?.[0].location : undefined);
-        mermaid.nodeLines.push(`    ${idPrefix}${id}${open}"\`${escapedName}${escapedName.length > 10 ? '\n      ' : ' '}(${id}${deps}${lnks})\n      *${range_1.SourceRange.format(n)}*${fCall ? displayFunctionArgMapping(info.args) : '' + (info.tag === vertex_1.VertexType.FunctionDefinition && info.mode && info.mode.length > 0 ? mermaid_1.Mermaid.escape(JSON.stringify(info.mode)) : '')}\`"${close}`);
+        mermaid.nodeLines.push(`    ${idPrefix}${id}${open}"\`${escapedName}${escapedName.length > 10 ? '\n      ' : ' '}(${id}${deps}${lnks}${sources})\n      *${range_1.SourceRange.format(n)}*${fCall ? displayFunctionArgMapping(info.args) : '' + (info.tag === vertex_1.VertexType.FunctionDefinition && info.mode && info.mode.length > 0 ? mermaid_1.Mermaid.escape(JSON.stringify(info.mode)) : '')}\`"${close}`);
     }
     if (mark?.has(id)) {
         mermaid.nodeLines.push(`    style ${idPrefix}${id} ${mermaid.markStyle.vertex} `);

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.9.14';
+const version = '2.10.1';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */