@eagleoutice/flowr 2.4.8 → 2.6.0

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

@@ -4,19 +4,21 @@ import Joi from 'joi';
 import { executeDependenciesQuery } from './dependencies-query-executor';
 import type { FunctionInfo } from './function-info/function-info';
 import type { CallContextQueryResult } from '../call-context-query/call-context-query-format';
+import type { Range } from 'semver';
+import type { AsyncOrSync } from 'ts-essentials';
 export declare const Unknown = "unknown";
 export interface DependencyCategorySettings {
     queryDisplayName?: string;
     functions: FunctionInfo[];
     defaultValue?: string;
-    additionalAnalysis?: (data: BasicQueryData, ignoreDefault: boolean, functions: FunctionInfo[], queryResults: CallContextQueryResult, result: DependencyInfo[]) => void;
+    additionalAnalysis?: (data: BasicQueryData, ignoreDefault: boolean, functions: FunctionInfo[], queryResults: CallContextQueryResult, result: DependencyInfo[]) => AsyncOrSync<void>;
 }
 export declare const DefaultDependencyCategories: {
     readonly library: {
         readonly queryDisplayName: "Libraries";
         readonly functions: FunctionInfo[];
         readonly defaultValue: "unknown";
-        readonly additionalAnalysis: (data: BasicQueryData, ignoreDefault: boolean, _functions: FunctionInfo[], _queryResults: CallContextQueryResult, result: DependencyInfo[]) => void;
+        readonly additionalAnalysis: (data: BasicQueryData, ignoreDefault: boolean, _functions: FunctionInfo[], _queryResults: CallContextQueryResult, result: DependencyInfo[]) => Promise<void>;
     };
     readonly source: {
         readonly queryDisplayName: "Sourced Files";
@@ -59,64 +61,13 @@ export interface DependencyInfo extends Record<string, unknown> {
     lexemeOfArgument?: string;
     /** The library name, file, source, destination etc. being sourced, read from, or written to. */
     value?: string;
+    versionConstraints?: Range[];
+    derivedVersion?: Range;
 }
 export declare function getAllCategories(queries: readonly DependenciesQuery[]): Record<DependencyCategoryName, DependencyCategorySettings>;
 export declare const DependenciesQueryDefinition: {
     readonly executor: typeof executeDependenciesQuery;
-    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[], queries: readonly import("../../query").Query[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[], queries: readonly import("../../query").Query[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult, query: readonly import("../../query").Query[]) => NodeId[];
 };

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

@@ -23,15 +23,18 @@ exports.DefaultDependencyCategories = {
         functions: library_functions_1.LibraryFunctions,
         defaultValue: exports.Unknown,
         /* for libraries, we have to additionally track all uses of `::` and `:::`, for this we currently simply traverse all uses */
-        additionalAnalysis: (data, ignoreDefault, _functions, _queryResults, result) => {
+        additionalAnalysis: async (data, ignoreDefault, _functions, _queryResults, result) => {
             if (!ignoreDefault) {
-                (0, visitor_1.visitAst)(data.ast.ast, n => {
+                (0, visitor_1.visitAst)((await data.analyzer.normalize()).ast, n => {
                     if (n.type === type_1.RType.Symbol && n.namespace) {
+                        const dep = data.analyzer.context().deps.getDependency(n.namespace);
                         /* we should improve the identification of ':::' */
                         result.push({
                             nodeId: n.info.id,
                             functionName: (n.info.fullLexeme ?? n.lexeme).includes(':::') ? ':::' : '::',
                             value: n.namespace,
+                            versionConstraints: dep?.versionConstraints,
+                            derivedVersion: dep?.derivedVersion
                         });
                     }
                 });
@@ -75,7 +78,7 @@ function printResultSection(title, infos, result) {
     }, new Map());
     for (const [functionName, infos] of grouped) {
         result.push(`       ╰ \`${functionName}\``);
-        result.push(infos.map(i => `           ╰ Node Id: ${i.nodeId}${i.value !== undefined ? `, \`${i.value}\`` : ''}`).join('\n'));
+        result.push(infos.map(i => `           ╰ Node Id: ${i.nodeId}${i.value !== undefined ? `, \`${i.value}\`` : ''}${i.derivedVersion !== undefined ? `, Version: \`${i.derivedVersion.format()}\`` : ''}`).join('\n'));
     }
 }
 function getAllCategories(queries) {
@@ -95,7 +98,7 @@ const functionInfoSchema = joi_1.default.array().items(joi_1.default.object({
 })).optional();
 exports.DependenciesQueryDefinition = {
     executor: dependencies_query_executor_1.executeDependenciesQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result, queries) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result, queries) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('dependencies', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [category, value] of Object.entries(getAllCategories(queries))) {

package/queries/catalog/df-shape-query/df-shape-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { DfShapeQuery, DfShapeQueryResult } from './df-shape-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeDfShapeQuery({ dataflow: { graph }, ast, config }: BasicQueryData, queries: readonly DfShapeQuery[]): DfShapeQueryResult;
+export declare function executeDfShapeQuery({ analyzer }: BasicQueryData, queries: readonly DfShapeQuery[]): Promise<DfShapeQueryResult>;

package/queries/catalog/df-shape-query/df-shape-query-executor.js

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeDfShapeQuery = executeDfShapeQuery;
 const log_1 = require("../../../util/log");
-const extract_cfg_1 = require("../../../control-flow/extract-cfg");
 const shape_inference_1 = require("../../../abstract-interpretation/data-frame/shape-inference");
 const parse_1 = require("../../../slicing/criterion/parse");
-function executeDfShapeQuery({ dataflow: { graph }, ast, config }, queries) {
+async function executeDfShapeQuery({ analyzer }, queries) {
     if (queries.length !== 1 && queries.some(query => query.criterion === undefined)) {
         log_1.log.warn('The dataframe shape query expects only up to one query without slicing criterion, but got', queries.length);
         queries = [{ type: 'df-shape' }];
     }
+    const ast = await analyzer.normalize();
+    const graph = (await analyzer.dataflow()).graph;
     const start = Date.now();
-    const cfg = (0, extract_cfg_1.extractCfg)(ast, config, graph);
-    const domains = (0, shape_inference_1.inferDataFrameShapes)(cfg, graph, ast, config);
+    const domains = (0, shape_inference_1.inferDataFrameShapes)(await analyzer.controlflow(), graph, ast, analyzer.flowrConfig);
     if (queries.length === 1 && queries[0].criterion === undefined) {
         return {
             '.meta': {

package/queries/catalog/df-shape-query/df-shape-query-format.d.ts

@@ -13,60 +13,7 @@ export interface DfShapeQueryResult extends BaseQueryResult {
 }
 export declare const DfShapeQueryDefinition: {
     readonly executor: typeof executeDfShapeQuery;
-    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/df-shape-query/df-shape-query-format.js

@@ -11,7 +11,7 @@ const df_shape_query_executor_1 = require("./df-shape-query-executor");
 const json_1 = require("../../../util/json");
 exports.DfShapeQueryDefinition = {
     executor: df_shape_query_executor_1.executeDfShapeQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('df-shape', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push(...out.domains.entries().take(20).map(([key, domain]) => {

package/queries/catalog/happens-before-query/happens-before-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { BasicQueryData } from '../../base-query-format';
 import type { HappensBeforeQuery, HappensBeforeQueryResult } from './happens-before-query-format';
-export declare function executeHappensBefore({ ast }: BasicQueryData, queries: readonly HappensBeforeQuery[]): HappensBeforeQueryResult;
+export declare function executeHappensBefore({ analyzer }: BasicQueryData, queries: readonly HappensBeforeQuery[]): Promise<HappensBeforeQueryResult>;

package/queries/catalog/happens-before-query/happens-before-query-executor.js

@@ -6,9 +6,10 @@ const log_1 = require("../../../util/log");
 const extract_cfg_1 = require("../../../control-flow/extract-cfg");
 const happens_before_1 = require("../../../control-flow/happens-before");
 const parse_1 = require("../../../slicing/criterion/parse");
-function executeHappensBefore({ ast }, queries) {
+async function executeHappensBefore({ analyzer }, queries) {
     const start = Date.now();
     const results = {};
+    const ast = await analyzer.normalize();
     const cfg = (0, extract_cfg_1.extractCfgQuick)(ast);
     for (const query of queries) {
         const { a, b } = query;

package/queries/catalog/happens-before-query/happens-before-query-format.d.ts

@@ -13,60 +13,7 @@ export interface HappensBeforeQueryResult extends BaseQueryResult {
 }
 export declare const HappensBeforeQueryDefinition: {
     readonly executor: typeof executeHappensBefore;
-    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/happens-before-query/happens-before-query-format.js

@@ -10,7 +10,7 @@ const joi_1 = __importDefault(require("joi"));
 const happens_before_query_executor_1 = require("./happens-before-query-executor");
 exports.HappensBeforeQueryDefinition = {
     executor: happens_before_query_executor_1.executeHappensBefore,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('happens-before', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [key, value] of Object.entries(out.results)) {

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

@@ -1,3 +1,3 @@
 import type { IdMapQuery, IdMapQueryResult } from './id-map-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeIdMapQuery({ ast }: BasicQueryData, queries: readonly IdMapQuery[]): IdMapQueryResult;
+export declare function executeIdMapQuery({ analyzer }: BasicQueryData, queries: readonly IdMapQuery[]): Promise<IdMapQueryResult>;

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/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,