@eagleoutice/flowr 2.5.0 → 2.6.1

package/queries/catalog/id-map-query/id-map-query-executor.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeIdMapQuery = executeIdMapQuery;
 const log_1 = require("../../../util/log");
-function executeIdMapQuery({ ast }, queries) {
+async function executeIdMapQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('Id-Map query expects only up to one query, but got', queries.length);
     }
@@ -11,7 +11,7 @@ function executeIdMapQuery({ ast }, queries) {
             /* there is no sense in measuring a get */
             timing: 0
         },
-        idMap: ast.idMap
+        idMap: (await analyzer.normalize()).idMap
     };
 }
 //# sourceMappingURL=id-map-query-executor.js.map

package/queries/catalog/id-map-query/id-map-query-format.d.ts

@@ -10,60 +10,7 @@ export interface IdMapQueryResult extends BaseQueryResult {
 }
 export declare const IdMapQueryDefinition: {
     readonly executor: typeof executeIdMapQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _processed: import("../../../core/steps/pipeline/pipeline").PipelineOutput<import("../../../core/steps/pipeline/pipeline").Pipeline<{
-        readonly name: "parse";
-        readonly humanReadableName: "parse with R shell";
-        readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: {
-                (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
-                (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
-            };
-            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
-        };
-        readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
-    } | {
-        readonly name: "normalize";
-        readonly humanReadableName: "normalize";
-        readonly description: "Normalize the AST to flowR's AST";
-        readonly processor: (results: {
-            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
-        }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: typeof import("../../../core/print/normalize-printer").normalizedAstToJson;
-            readonly 5: typeof import("../../../core/print/normalize-printer").normalizedAstToQuads;
-            readonly 3: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaid;
-            readonly 4: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaidUrl;
-        };
-        readonly dependencies: readonly ["parse"];
-        readonly requiredInput: import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput;
-    } | {
-        readonly humanReadableName: "dataflow";
-        readonly processor: (results: {
-            normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
-        }, input: {
-            request?: import("../../../r-bridge/retriever").RParseRequests;
-            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
-        }, config: import("../../../config").FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
-        readonly requiredInput: {};
-        readonly name: "dataflow";
-        readonly description: "Construct the dataflow graph";
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: typeof import("../../../core/print/dataflow-printer").dataflowGraphToJson;
-            readonly 5: typeof import("../../../core/print/dataflow-printer").dataflowGraphToQuads;
-            readonly 3: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaid;
-            readonly 4: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaidUrl;
-        };
-        readonly dependencies: readonly ["normalize"];
-    }>>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };

package/queries/catalog/id-map-query/id-map-query-format.js

@@ -11,10 +11,10 @@ const joi_1 = __importDefault(require("joi"));
 const query_print_1 = require("../../query-print");
 exports.IdMapQueryDefinition = {
     executor: id_map_query_executor_1.executeIdMapQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('id-map', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
-        result.push(`   ╰ Id List: {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, [...out.idMap.keys()])}}`);
+        result.push(`   ╰ Id List: {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, Array.from(out.idMap.keys()))}}`);
         return true;
     },
     schema: joi_1.default.object({

package/queries/catalog/inspect-higher-order-query/inspect-higher-order-query-executor.d.ts

@@ -0,0 +1,3 @@
+import type { InspectHigherOrderQuery, InspectHigherOrderQueryResult } from './inspect-higher-order-query-format';
+import type { BasicQueryData } from '../../base-query-format';
+export declare function executeHigherOrderQuery({ analyzer }: BasicQueryData, queries: readonly InspectHigherOrderQuery[]): Promise<InspectHigherOrderQueryResult>;

package/queries/catalog/inspect-higher-order-query/inspect-higher-order-query-executor.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeHigherOrderQuery = executeHigherOrderQuery;
+const parse_1 = require("../../../slicing/criterion/parse");
+const vertex_1 = require("../../../dataflow/graph/vertex");
+const higher_order_function_1 = require("../../../dataflow/fn/higher-order-function");
+async function executeHigherOrderQuery({ analyzer }, queries) {
+    const start = Date.now();
+    let filters = undefined;
+    // filter will remain undefined if at least one of the queries wants all functions
+    for (const q of queries) {
+        if (q.filter === undefined) {
+            filters = undefined;
+            break;
+        }
+        else {
+            filters ??= [];
+            filters = filters.concat(filters);
+        }
+    }
+    const ast = await analyzer.normalize();
+    const filterFor = new Set();
+    if (filters) {
+        for (const f of filters) {
+            const i = (0, parse_1.tryResolveSliceCriterionToId)(f, ast.idMap);
+            if (i !== undefined) {
+                filterFor.add(i);
+            }
+        }
+    }
+    const graph = (await analyzer.dataflow()).graph;
+    const fns = graph.vertices(true)
+        .filter(([, v]) => (0, vertex_1.isFunctionDefinitionVertex)(v) && (filterFor.size === 0 || filterFor.has(v.id)));
+    const result = {};
+    for (const [id,] of fns) {
+        result[id] = (0, higher_order_function_1.isHigherOrder)(id, graph);
+    }
+    return {
+        '.meta': {
+            timing: Date.now() - start
+        },
+        higherOrder: result
+    };
+}
+//# sourceMappingURL=inspect-higher-order-query-executor.js.map

package/queries/catalog/inspect-higher-order-query/inspect-higher-order-query-format.d.ts

@@ -0,0 +1,22 @@
+import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
+import Joi from 'joi';
+import { executeHigherOrderQuery } from './inspect-higher-order-query-executor';
+import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
+/**
+ * Either returns all function definitions alongside whether they are higher-order functions,
+ * or just those matching the filters.
+ */
+export interface InspectHigherOrderQuery extends BaseQueryFormat {
+    readonly type: 'inspect-higher-order';
+    readonly filter?: SingleSlicingCriterion[];
+}
+export interface InspectHigherOrderQueryResult extends BaseQueryResult {
+    readonly higherOrder: Record<NodeId, boolean>;
+}
+export declare const InspectHigherOrderQueryDefinition: {
+    readonly executor: typeof executeHigherOrderQuery;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, processed: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
+    readonly schema: Joi.ObjectSchema<any>;
+    readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
+};

package/queries/catalog/inspect-higher-order-query/inspect-higher-order-query-format.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InspectHigherOrderQueryDefinition = void 0;
+const ansi_1 = require("../../../util/text/ansi");
+const joi_1 = __importDefault(require("joi"));
+const inspect_higher_order_query_executor_1 = require("./inspect-higher-order-query-executor");
+const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
+const dfg_1 = require("../../../util/mermaid/dfg");
+exports.InspectHigherOrderQueryDefinition = {
+    executor: inspect_higher_order_query_executor_1.executeHigherOrderQuery,
+    asciiSummarizer: async (formatter, processed, queryResults, result) => {
+        const out = queryResults;
+        result.push(`Query: ${(0, ansi_1.bold)('inspect-higher-order', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
+        for (const [r, v] of Object.entries(out.higherOrder)) {
+            const loc = (await processed.normalize()).idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r))?.location ?? undefined;
+            result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${(0, dfg_1.formatRange)(loc)}) is ${v ? '' : 'not '}a higher-order function`);
+        }
+        return true;
+    },
+    schema: joi_1.default.object({
+        type: joi_1.default.string().valid('inspect-higher-order').required().description('The type of the query.'),
+        filter: joi_1.default.array().items(joi_1.default.string().required()).optional().description('If given, only function definitions that match one of the given slicing criteria are considered. Each criterion can be either `line:column`, `line@variable-name`, or `$id`, where the latter directly specifies the node id of the function definition to be considered.')
+    }).description('Either returns all function definitions alongside whether they are higher-order functions, or just those matching the filters.'),
+    flattenInvolvedNodes: (queryResults) => {
+        const out = queryResults;
+        return Object.keys(out.higherOrder).filter(id => out.higherOrder[id]);
+    }
+};
+//# sourceMappingURL=inspect-higher-order-query-format.js.map

package/queries/catalog/lineage-query/lineage-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { LineageQuery, LineageQueryResult } from './lineage-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeLineageQuery({ dataflow: { graph }, ast }: BasicQueryData, queries: readonly LineageQuery[]): LineageQueryResult;
+export declare function executeLineageQuery({ analyzer }: BasicQueryData, queries: readonly LineageQuery[]): Promise<LineageQueryResult>;

package/queries/catalog/lineage-query/lineage-query-executor.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeLineageQuery = executeLineageQuery;
 const log_1 = require("../../../util/log");
 const repl_lineage_1 = require("../../../cli/repl/commands/repl-lineage");
-function executeLineageQuery({ dataflow: { graph }, ast }, queries) {
+async function executeLineageQuery({ analyzer }, queries) {
     const start = Date.now();
     const result = {};
     for (const { criterion } of queries) {
         if (result[criterion]) {
             log_1.log.warn('Duplicate criterion in lineage query:', criterion);
         }
-        result[criterion] = (0, repl_lineage_1.getLineage)(criterion, graph, ast.idMap);
+        result[criterion] = (0, repl_lineage_1.getLineage)(criterion, (await analyzer.dataflow()).graph, (await analyzer.normalize()).idMap);
     }
     return {
         '.meta': {

package/queries/catalog/lineage-query/lineage-query-format.d.ts

@@ -16,60 +16,7 @@ export interface LineageQueryResult extends BaseQueryResult {
 }
 export declare const LineageQueryDefinition: {
     readonly executor: typeof executeLineageQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _processed: import("../../../core/steps/pipeline/pipeline").PipelineOutput<import("../../../core/steps/pipeline/pipeline").Pipeline<{
-        readonly name: "parse";
-        readonly humanReadableName: "parse with R shell";
-        readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: {
-                (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
-                (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
-            };
-            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
-        };
-        readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
-    } | {
-        readonly name: "normalize";
-        readonly humanReadableName: "normalize";
-        readonly description: "Normalize the AST to flowR's AST";
-        readonly processor: (results: {
-            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
-        }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: typeof import("../../../core/print/normalize-printer").normalizedAstToJson;
-            readonly 5: typeof import("../../../core/print/normalize-printer").normalizedAstToQuads;
-            readonly 3: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaid;
-            readonly 4: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaidUrl;
-        };
-        readonly dependencies: readonly ["parse"];
-        readonly requiredInput: import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput;
-    } | {
-        readonly humanReadableName: "dataflow";
-        readonly processor: (results: {
-            normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
-        }, input: {
-            request?: import("../../../r-bridge/retriever").RParseRequests;
-            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
-        }, config: import("../../../config").FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
-        readonly requiredInput: {};
-        readonly name: "dataflow";
-        readonly description: "Construct the dataflow graph";
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: typeof import("../../../core/print/dataflow-printer").dataflowGraphToJson;
-            readonly 5: typeof import("../../../core/print/dataflow-printer").dataflowGraphToQuads;
-            readonly 3: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaid;
-            readonly 4: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaidUrl;
-        };
-        readonly dependencies: readonly ["normalize"];
-    }>>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

package/queries/catalog/lineage-query/lineage-query-format.js

@@ -11,7 +11,7 @@ const lineage_query_executor_1 = require("./lineage-query-executor");
 const query_print_1 = require("../../query-print");
 exports.LineageQueryDefinition = {
     executor: lineage_query_executor_1.executeLineageQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('lineage', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [criteria, lineage] of Object.entries(out.lineages)) {

package/queries/catalog/linter-query/linter-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { BasicQueryData } from '../../base-query-format';
 import type { LinterQuery, LinterQueryResult } from './linter-query-format';
-export declare function executeLinterQuery({ ast, dataflow, config }: BasicQueryData, queries: readonly LinterQuery[]): LinterQueryResult;
+export declare function executeLinterQuery({ analyzer }: BasicQueryData, queries: readonly LinterQuery[]): Promise<LinterQueryResult>;

package/queries/catalog/linter-query/linter-query-executor.js

@@ -4,7 +4,7 @@ exports.executeLinterQuery = executeLinterQuery;
 const linter_rules_1 = require("../../../linter/linter-rules");
 const log_1 = require("../../../util/log");
 const linter_executor_1 = require("../../../linter/linter-executor");
-function executeLinterQuery({ ast, dataflow, config }, queries) {
+async function executeLinterQuery({ analyzer }, queries) {
     const flattened = queries.flatMap(q => q.rules ?? Object.keys(linter_rules_1.LintingRules));
     const distinct = new Set(flattened);
     if (distinct.size !== flattened.length) {
@@ -13,10 +13,9 @@ function executeLinterQuery({ ast, dataflow, config }, queries) {
     }
     const results = { results: {} };
     const start = Date.now();
-    const input = { normalize: ast, dataflow, config };
     for (const entry of distinct) {
         const ruleName = typeof entry === 'string' ? entry : entry.name;
-        results.results[ruleName] = (0, linter_executor_1.executeLintingRule)(ruleName, input, entry?.config);
+        results.results[ruleName] = await (0, linter_executor_1.executeLintingRule)(ruleName, analyzer, entry?.config);
     }
     return {
         ...results,

package/queries/catalog/linter-query/linter-query-format.d.ts

@@ -21,60 +21,7 @@ export interface LinterQueryResult extends BaseQueryResult {
 }
 export declare const LinterQueryDefinition: {
     readonly executor: typeof executeLinterQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _processed: import("../../../core/steps/pipeline/pipeline").PipelineOutput<import("../../../core/steps/pipeline/pipeline").Pipeline<{
-        readonly name: "parse";
-        readonly humanReadableName: "parse with R shell";
-        readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: {
-                (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
-                (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
-            };
-            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
-        };
-        readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
-    } | {
-        readonly name: "normalize";
-        readonly humanReadableName: "normalize";
-        readonly description: "Normalize the AST to flowR's AST";
-        readonly processor: (results: {
-            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
-        }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: typeof import("../../../core/print/normalize-printer").normalizedAstToJson;
-            readonly 5: typeof import("../../../core/print/normalize-printer").normalizedAstToQuads;
-            readonly 3: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaid;
-            readonly 4: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaidUrl;
-        };
-        readonly dependencies: readonly ["parse"];
-        readonly requiredInput: import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput;
-    } | {
-        readonly humanReadableName: "dataflow";
-        readonly processor: (results: {
-            normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
-        }, input: {
-            request?: import("../../../r-bridge/retriever").RParseRequests;
-            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
-        }, config: import("../../../config").FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
-        readonly requiredInput: {};
-        readonly name: "dataflow";
-        readonly description: "Construct the dataflow graph";
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: typeof import("../../../core/print/dataflow-printer").dataflowGraphToJson;
-            readonly 5: typeof import("../../../core/print/dataflow-printer").dataflowGraphToQuads;
-            readonly 3: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaid;
-            readonly 4: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaidUrl;
-        };
-        readonly dependencies: readonly ["normalize"];
-    }>>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };

package/queries/catalog/linter-query/linter-query-format.js

@@ -13,7 +13,7 @@ const time_1 = require("../../../util/text/time");
 const doc_code_1 = require("../../../documentation/doc-util/doc-code");
 exports.LinterQueryDefinition = {
     executor: linter_query_executor_1.executeLinterQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('linter', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [ruleName, results] of Object.entries(out.results)) {

package/queries/catalog/location-map-query/location-map-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { LocationMapQuery, LocationMapQueryResult } from './location-map-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeLocationMapQuery({ ast, dataflow: { graph } }: BasicQueryData, queries: readonly LocationMapQuery[]): LocationMapQueryResult;
+export declare function executeLocationMapQuery({ analyzer }: BasicQueryData, queries: readonly LocationMapQuery[]): Promise<LocationMapQueryResult>;

package/queries/catalog/location-map-query/location-map-query-executor.js

@@ -22,7 +22,7 @@ function fuzzyFindFile(node, idMap) {
     }
     return '<inline>';
 }
-function executeLocationMapQuery({ ast, dataflow: { graph } }, queries) {
+async function executeLocationMapQuery({ analyzer }, queries) {
     const start = Date.now();
     const criteriaOfInterest = new Set(queries
         .flatMap(q => q.ids ?? [])
@@ -34,11 +34,12 @@ function executeLocationMapQuery({ ast, dataflow: { graph } }, queries) {
     };
     let count = 0;
     const inverseMap = new Map();
-    for (const file of graph.sourced) {
+    for (const file of (await analyzer.dataflow()).graph.sourced) {
         locationMap.files[count] = file;
         inverseMap.set(file, count);
         count++;
     }
+    const ast = await analyzer.normalize();
     for (const [id, node] of ast.idMap.entries()) {
         if (node.location && (criteriaOfInterest.size === 0 || criteriaOfInterest.has(id))) {
             const file = fuzzyFindFile(node, ast.idMap);

package/queries/catalog/location-map-query/location-map-query-format.d.ts

@@ -24,7 +24,7 @@ export interface LocationMapQueryResult extends BaseQueryResult {
 }
 export declare const LocationMapQueryDefinition: {
     readonly executor: typeof executeLocationMapQuery;
-    readonly asciiSummarizer: (formatter: OutputFormatter, _processed: unknown, queryResults: BaseQueryResult, result: string[]) => boolean;
+    readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => boolean;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };

package/queries/catalog/location-map-query/location-map-query-format.js

@@ -11,7 +11,7 @@ const joi_1 = __importDefault(require("joi"));
 const query_print_1 = require("../../query-print");
 exports.LocationMapQueryDefinition = {
     executor: location_map_query_executor_1.executeLocationMapQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('location-map', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push('   ╰ File List:');

package/queries/catalog/normalized-ast-query/normalized-ast-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { NormalizedAstQuery, NormalizedAstQueryResult } from './normalized-ast-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeNormalizedAstQuery({ ast }: BasicQueryData, queries: readonly NormalizedAstQuery[]): NormalizedAstQueryResult;
+export declare function executeNormalizedAstQuery({ analyzer }: BasicQueryData, queries: readonly NormalizedAstQuery[]): Promise<NormalizedAstQueryResult>;

package/queries/catalog/normalized-ast-query/normalized-ast-query-executor.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeNormalizedAstQuery = executeNormalizedAstQuery;
 const log_1 = require("../../../util/log");
-function executeNormalizedAstQuery({ ast }, queries) {
+async function executeNormalizedAstQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('Normalized-Ast query expects only up to one query, but got', queries.length);
     }
@@ -11,7 +11,7 @@ function executeNormalizedAstQuery({ ast }, queries) {
             /* there is no sense in measuring a get */
             timing: 0
         },
-        normalized: ast
+        normalized: await analyzer.normalize()
     };
 }
 //# sourceMappingURL=normalized-ast-query-executor.js.map

package/queries/catalog/normalized-ast-query/normalized-ast-query-format.d.ts

@@ -13,60 +13,7 @@ export interface NormalizedAstQueryResult extends BaseQueryResult {
 }
 export declare const NormalizedAstQueryDefinition: {
     readonly executor: typeof executeNormalizedAstQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _processed: import("../../../core/steps/pipeline/pipeline").PipelineOutput<import("../../../core/steps/pipeline/pipeline").Pipeline<{
-        readonly name: "parse";
-        readonly humanReadableName: "parse with R shell";
-        readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: {
-                (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
-                (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
-            };
-            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
-        };
-        readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
-    } | {
-        readonly name: "normalize";
-        readonly humanReadableName: "normalize";
-        readonly description: "Normalize the AST to flowR's AST";
-        readonly processor: (results: {
-            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
-        }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: typeof import("../../../core/print/normalize-printer").normalizedAstToJson;
-            readonly 5: typeof import("../../../core/print/normalize-printer").normalizedAstToQuads;
-            readonly 3: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaid;
-            readonly 4: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaidUrl;
-        };
-        readonly dependencies: readonly ["parse"];
-        readonly requiredInput: import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput;
-    } | {
-        readonly humanReadableName: "dataflow";
-        readonly processor: (results: {
-            normalize?: NormalizedAst;
-        }, input: {
-            request?: import("../../../r-bridge/retriever").RParseRequests;
-            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
-        }, config: import("../../../config").FlowrConfigOptions) => import("../../../dataflow/info").DataflowInformation;
-        readonly requiredInput: {};
-        readonly name: "dataflow";
-        readonly description: "Construct the dataflow graph";
-        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
-        readonly printer: {
-            readonly 0: typeof import("../../../core/print/print").internalPrinter;
-            readonly 2: typeof import("../../../core/print/dataflow-printer").dataflowGraphToJson;
-            readonly 5: typeof import("../../../core/print/dataflow-printer").dataflowGraphToQuads;
-            readonly 3: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaid;
-            readonly 4: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaidUrl;
-        };
-        readonly dependencies: readonly ["normalize"];
-    }>>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };

package/queries/catalog/normalized-ast-query/normalized-ast-query-format.js

@@ -11,7 +11,7 @@ const ast_1 = require("../../../util/mermaid/ast");
 const joi_1 = __importDefault(require("joi"));
 exports.NormalizedAstQueryDefinition = {
     executor: normalized_ast_query_executor_1.executeNormalizedAstQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('normalized-ast', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push(`   ╰ [Normalized AST](${(0, ast_1.normalizedAstToMermaidUrl)(out.normalized.ast)})`);

package/queries/catalog/origin-query/origin-query-executor.d.ts

@@ -1,5 +1,5 @@
 import type { BasicQueryData } from '../../base-query-format';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
-import type { OriginQueryResult, OriginQuery } from './origin-query-format';
+import type { OriginQuery, OriginQueryResult } from './origin-query-format';
 export declare function fingerPrintOfQuery(query: OriginQuery): SingleSlicingCriterion;
-export declare function executeResolveValueQuery({ dataflow: { graph }, ast }: BasicQueryData, queries: readonly OriginQuery[]): OriginQueryResult;
+export declare function executeResolveValueQuery({ analyzer }: BasicQueryData, queries: readonly OriginQuery[]): Promise<OriginQueryResult>;

package/queries/catalog/origin-query/origin-query-executor.js

@@ -8,7 +8,7 @@ const dfg_get_origin_1 = require("../../../dataflow/origin/dfg-get-origin");
 function fingerPrintOfQuery(query) {
     return query.criterion;
 }
-function executeResolveValueQuery({ dataflow: { graph }, ast }, queries) {
+async function executeResolveValueQuery({ analyzer }, queries) {
     const start = Date.now();
     const results = {};
     for (const query of queries) {
@@ -16,12 +16,12 @@ function executeResolveValueQuery({ dataflow: { graph }, ast }, queries) {
         if (results[key]) {
             log_1.log.warn(`Duplicate Key for origin-query: ${key}, skipping...`);
         }
-        const astId = (0, parse_1.slicingCriterionToId)(key, ast.idMap);
+        const astId = (0, parse_1.slicingCriterionToId)(key, (await analyzer.normalize()).idMap);
         if (astId === undefined) {
             log_1.log.warn(`Could not resolve id for ${key}, skipping...`);
             continue;
         }
-        results[key] = (0, dfg_get_origin_1.getOriginInDfg)(graph, astId);
+        results[key] = (0, dfg_get_origin_1.getOriginInDfg)((await analyzer.dataflow()).graph, astId);
     }
     return {
         '.meta': {