@eagleoutice/flowr 2.3.0 → 2.4.0

package/util/collections/arrays.js

@@ -10,6 +10,7 @@ exports.array2bag = array2bag;
 exports.arrayEqual = arrayEqual;
 exports.equidistantSampling = equidistantSampling;
 exports.cartesianProduct = cartesianProduct;
+exports.uniqueArrayMerge = uniqueArrayMerge;
 const assert_1 = require("../assert");
 /**
  * Splits the array every time the given predicate fires.
@@ -215,4 +216,12 @@ function equidistantSampling(list, sampleCount, rounding = 'ceil') {
 function cartesianProduct(...arrays) {
     return arrays.reduce((a, b) => a.flatMap(x => b.map(y => x.concat(y))), [[]]);
 }
+/** merge two arrays, removing duplicates */
+function uniqueArrayMerge(left, right) {
+    const result = new Set(left);
+    for (const elem of right) {
+        result.add(elem);
+    }
+    return Array.from(result);
+}
 //# sourceMappingURL=arrays.js.map

package/util/mermaid/dfg.js

@@ -6,7 +6,6 @@ exports.graphToMermaid = graphToMermaid;
 exports.graphToMermaidUrl = graphToMermaidUrl;
 exports.diffGraphsToMermaid = diffGraphsToMermaid;
 exports.diffGraphsToMermaidUrl = diffGraphsToMermaidUrl;
-const assert_1 = require("../assert");
 const mermaid_1 = require("./mermaid");
 const graph_1 = require("../../dataflow/graph/graph");
 const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
@@ -176,7 +175,10 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark) {
         mermaid.nodeLines.push(`    style ${idPrefix}${id} stroke:red,stroke-width:5px; `);
     }
     const edges = mermaid.rootGraph.get((0, node_id_1.normalizeIdToNumberIfPossible)(id), true);
-    (0, assert_1.guard)(edges !== undefined, `node ${id} must be found`);
+    if (edges === undefined) {
+        mermaid.nodeLines.push('   %% No edges found for ' + id);
+        return;
+    }
     const artificialCdEdges = (info.cds ?? []).map(x => [x.id, { types: new Set([x.when ? 'CD-True' : 'CD-False']) }]);
     // eslint-disable-next-line prefer-const
     for (let [target, edge] of [...edges[1], ...artificialCdEdges]) {

package/util/range.d.ts

@@ -68,3 +68,4 @@ export declare function rangeCompare([r1sl, r1sc, ,]: SourceRange, [r2sl, r2sc,
  * Checks if the first range is a subset of the second range.
  */
 export declare function rangeIsSubsetOf([r1sl, r1sc, r1el, r1ec]: SourceRange, [r2sl, r2sc, r2el, r2ec]: SourceRange): boolean;
+export declare function combineRanges(...ranges: SourceRange[]): SourceRange[];

package/util/range.js

@@ -9,6 +9,7 @@ exports.rangesOverlap = rangesOverlap;
 exports.addRanges = addRanges;
 exports.rangeCompare = rangeCompare;
 exports.rangeIsSubsetOf = rangeIsSubsetOf;
+exports.combineRanges = combineRanges;
 const assert_1 = require("./assert");
 function getRangeStart(p) {
     return p === undefined ? undefined : [p[0], p[1]];
@@ -70,6 +71,9 @@ function rangeCompare([r1sl, r1sc, ,], [r2sl, r2sc, ,]) {
  * Checks if the first range is a subset of the second range.
  */
 function rangeIsSubsetOf([r1sl, r1sc, r1el, r1ec], [r2sl, r2sc, r2el, r2ec]) {
-    return r1sl >= r2sl && r1sc >= r2sc && r1el <= r2el && r1ec <= r2ec;
+    return (r1sl > r2sl || r1sl === r2sl && r1sc >= r2sc) && (r1el < r2el || r1sl === r2sl && r1ec <= r2ec);
+}
+function combineRanges(...ranges) {
+    return ranges.filter(range => !ranges.some(other => range !== other && rangeIsSubsetOf(range, other)));
 }
 //# sourceMappingURL=range.js.map

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = flowrVersion;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.3.0';
+const version = '2.4.0';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }