@eagleoutice/flowr 2.4.8 → 2.6.0

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': {

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

@@ -14,60 +14,7 @@ export interface OriginQueryResult extends BaseQueryResult {
 }
 export declare const OriginQueryDefinition: {
     readonly executor: typeof executeResolveValueQuery;
-    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/origin-query/origin-query-format.js

@@ -10,7 +10,7 @@ const joi_1 = __importDefault(require("joi"));
 const origin_query_executor_1 = require("./origin-query-executor");
 exports.OriginQueryDefinition = {
     executor: origin_query_executor_1.executeResolveValueQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('origin', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [criteria, obj] of Object.entries(out.results)) {

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

@@ -1,3 +1,3 @@
 import type { ProjectQuery, ProjectQueryResult } from './project-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeProjectQuery({ dataflow }: BasicQueryData, queries: readonly ProjectQuery[]): ProjectQueryResult;
+export declare function executeProjectQuery({ analyzer }: BasicQueryData, queries: readonly ProjectQuery[]): Promise<ProjectQueryResult>;

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

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

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

@@ -9,60 +9,7 @@ export interface ProjectQueryResult extends BaseQueryResult {
 }
 export declare const ProjectQueryDefinition: {
     readonly executor: typeof executeProjectQuery;
-    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/project-query/project-query-format.js

@@ -10,7 +10,7 @@ const time_1 = require("../../../util/text/time");
 const joi_1 = __importDefault(require("joi"));
 exports.ProjectQueryDefinition = {
     executor: project_query_executor_1.executeProjectQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('project', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push(`   ╰ Contains ${out.files.length} file${out.files.length === 1 ? '' : 's'}`);

package/queries/catalog/resolve-value-query/resolve-value-query-executor.d.ts

@@ -1,4 +1,4 @@
 import type { ResolveValueQuery, ResolveValueQueryResult } from './resolve-value-query-format';
 import type { BasicQueryData } from '../../base-query-format';
 export declare function fingerPrintOfQuery(query: ResolveValueQuery): string;
-export declare function executeResolveValueQuery({ dataflow: { graph }, ast, config }: BasicQueryData, queries: readonly ResolveValueQuery[]): ResolveValueQueryResult;
+export declare function executeResolveValueQuery({ analyzer }: BasicQueryData, queries: readonly ResolveValueQuery[]): Promise<ResolveValueQueryResult>;

package/queries/catalog/resolve-value-query/resolve-value-query-executor.js

@@ -8,9 +8,11 @@ const alias_tracking_1 = require("../../../dataflow/eval/resolve/alias-tracking"
 function fingerPrintOfQuery(query) {
     return JSON.stringify(query);
 }
-function executeResolveValueQuery({ dataflow: { graph }, ast, config }, queries) {
+async function executeResolveValueQuery({ analyzer }, queries) {
     const start = Date.now();
     const results = {};
+    const graph = (await analyzer.dataflow()).graph;
+    const ast = await analyzer.normalize();
     for (const query of queries) {
         const key = fingerPrintOfQuery(query);
         if (results[key]) {
@@ -18,7 +20,7 @@ function executeResolveValueQuery({ dataflow: { graph }, ast, config }, queries)
         }
         const values = query.criteria
             .map(criteria => (0, parse_1.slicingCriterionToId)(criteria, ast.idMap))
-            .flatMap(ident => (0, alias_tracking_1.resolveIdToValue)(ident, { graph, full: true, idMap: ast.idMap, resolve: config.solver.variables }));
+            .flatMap(ident => (0, alias_tracking_1.resolveIdToValue)(ident, { graph, full: true, idMap: ast.idMap, resolve: analyzer.flowrConfig.solver.variables }));
         results[key] = {
             values: values
         };

package/queries/catalog/resolve-value-query/resolve-value-query-format.d.ts

@@ -15,60 +15,7 @@ export interface ResolveValueQueryResult extends BaseQueryResult {
 }
 export declare const ResolveValueQueryDefinition: {
     readonly executor: typeof executeResolveValueQuery;
-    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/resolve-value-query/resolve-value-query-format.js

@@ -11,7 +11,7 @@ const resolve_value_query_executor_1 = require("./resolve-value-query-executor")
 const r_value_1 = require("../../../dataflow/eval/values/r-value");
 exports.ResolveValueQueryDefinition = {
     executor: resolve_value_query_executor_1.executeResolveValueQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('resolve-value', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [fingerprint, obj] of Object.entries(out.results)) {

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

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

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

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeSearch = executeSearch;
 const flowr_search_executor_1 = require("../../../search/flowr-search-executor");
-function executeSearch({ ast, dataflow, config }, queries) {
+async function executeSearch({ analyzer }, queries) {
     const start = Date.now();
     const results = [];
     for (const query of queries) {
         const { search } = query;
+        const searchResult = await (0, flowr_search_executor_1.runSearch)(search, analyzer);
         results.push({
-            ids: (0, flowr_search_executor_1.runSearch)(search, { normalize: ast, dataflow, config })
-                .getElements().map(({ node }) => node.info.id),
+            ids: searchResult.getElements().map(({ node }) => node.info.id),
             search
         });
     }