@eagleoutice/flowr 2.1.6 → 2.1.7

package/documentation/print-query-wiki.js

@@ -259,7 +259,7 @@ Now, the results no longer contain calls to \`plot\` that are not defined locall
     name: 'Static Slice Query',
     type: 'active',
     shortDescription: 'Slice the dataflow graph reducing the code to just the parts relevant for the given criteria.',
-    functionName: static_slice_query_executor_1.executeStaticSliceClusterQuery.name,
+    functionName: static_slice_query_executor_1.executeStaticSliceQuery.name,
     functionFile: '../queries/catalog/static-slice-query/static-slice-query-executor.ts',
     buildExplanation: async (shell) => {
         const exampleCode = 'x <- 1\ny <- 2\nx';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {

package/queries/catalog/static-slice-query/static-slice-query-executor.d.ts

@@ -1,4 +1,4 @@
 import type { StaticSliceQuery, StaticSliceQueryResult } from './static-slice-query-format';
 import type { BasicQueryData } from '../../base-query-format';
 export declare function fingerPrintOfQuery(query: StaticSliceQuery): string;
-export declare function executeStaticSliceClusterQuery({ graph, ast }: BasicQueryData, queries: readonly StaticSliceQuery[]): StaticSliceQueryResult;
+export declare function executeStaticSliceQuery({ graph, ast }: BasicQueryData, queries: readonly StaticSliceQuery[]): StaticSliceQueryResult;

package/queries/catalog/static-slice-query/static-slice-query-executor.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fingerPrintOfQuery = fingerPrintOfQuery;
-exports.executeStaticSliceClusterQuery = executeStaticSliceClusterQuery;
+exports.executeStaticSliceQuery = executeStaticSliceQuery;
 const static_slicer_1 = require("../../../slicing/static/static-slicer");
 const reconstruct_1 = require("../../../reconstruct/reconstruct");
 const auto_select_defaults_1 = require("../../../reconstruct/auto-select/auto-select-defaults");
@@ -10,7 +10,7 @@ const log_1 = require("../../../util/log");
 function fingerPrintOfQuery(query) {
     return JSON.stringify(query);
 }
-function executeStaticSliceClusterQuery({ graph, ast }, queries) {
+function executeStaticSliceQuery({ graph, ast }, queries) {
     const start = Date.now();
     const results = {};
     for (const query of queries) {

package/queries/catalog/static-slice-query/static-slice-query-format.d.ts

@@ -3,7 +3,7 @@ import type { PipelineOutput } from '../../../core/steps/pipeline/pipeline';
 import type { DEFAULT_DATAFLOW_PIPELINE, DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE, DEFAULT_SLICING_PIPELINE } from '../../../core/steps/pipeline/default-pipelines';
 import type { SlicingCriteria } from '../../../slicing/criterion/parse';
 import Joi from 'joi';
-import { executeStaticSliceClusterQuery } from './static-slice-query-executor';
+import { executeStaticSliceQuery } from './static-slice-query-executor';
 /** Calculates and returns all clusters encountered in the dataflow graph. */
 export interface StaticSliceQuery extends BaseQueryFormat {
     readonly type: 'static-slice';
@@ -25,7 +25,7 @@ export interface StaticSliceQueryResult extends BaseQueryResult {
     results: Record<string, Omit<PipelineOutput<typeof DEFAULT_SLICING_PIPELINE>, keyof PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>> | Omit<PipelineOutput<typeof DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE>, keyof PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>>>;
 }
 export declare const StaticSliceQueryDefinition: {
-    readonly executor: typeof executeStaticSliceClusterQuery;
+    readonly executor: typeof executeStaticSliceQuery;
     readonly asciiSummarizer: (formatter: import("../../../util/ansi").OutputFormatter, _processed: PipelineOutput<import("../../../core/steps/pipeline/pipeline").Pipeline<{
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";

package/queries/catalog/static-slice-query/static-slice-query-format.js

@@ -10,7 +10,7 @@ const joi_1 = __importDefault(require("joi"));
 const static_slice_query_executor_1 = require("./static-slice-query-executor");
 const query_print_1 = require("../../query-print");
 exports.StaticSliceQueryDefinition = {
-    executor: static_slice_query_executor_1.executeStaticSliceClusterQuery,
+    executor: static_slice_query_executor_1.executeStaticSliceQuery,
     asciiSummarizer: (formatter, _processed, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('static-slice', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);

package/queries/query.d.ts

@@ -262,7 +262,7 @@ export declare const SupportedQueries: {
         readonly schema: Joi.ObjectSchema<any>;
     };
     readonly 'static-slice': {
-        readonly executor: typeof import("./catalog/static-slice-query/static-slice-query-executor").executeStaticSliceClusterQuery;
+        readonly executor: typeof import("./catalog/static-slice-query/static-slice-query-executor").executeStaticSliceQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _processed: PipelineOutput<import("../core/steps/pipeline/pipeline").Pipeline<{
             readonly name: "parse";
             readonly humanReadableName: "parse with R shell";

package/slicing/static/slice-call.js

@@ -15,13 +15,14 @@ const edge_1 = require("../../dataflow/graph/edge");
 const identifier_1 = require("../../dataflow/environments/identifier");
 function retrieveActiveEnvironment(callerInfo, baseEnvironment) {
     let callerEnvironment = callerInfo.environment;
-    const level = callerEnvironment?.level ?? 0;
+    let level = callerEnvironment?.level ?? 0;
     if (baseEnvironment.level !== level) {
         while (baseEnvironment.level < level) {
             baseEnvironment = (0, scoping_1.pushLocalEnvironment)(baseEnvironment);
         }
         while (baseEnvironment.level > level) {
             callerEnvironment = (0, scoping_1.pushLocalEnvironment)(callerEnvironment ?? (0, environment_1.initializeCleanEnvironments)(true));
+            level = callerEnvironment.level;
         }
     }
     return (0, overwrite_1.overwriteEnvironment)(baseEnvironment, callerEnvironment);

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.1.6';
+const version = '2.1.7';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }