@eagleoutice/flowr 2.4.8 → 2.6.0

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

@@ -15,60 +15,7 @@ export interface DataflowClusterQueryResult extends BaseQueryResult {
 }
 export declare const ClusterQueryDefinition: {
     readonly executor: typeof executeDataflowClusterQuery;
-    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[]) => Promise<boolean>;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

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

@@ -11,7 +11,7 @@ const dfg_1 = require("../../../util/mermaid/dfg");
 const query_print_1 = require("../../query-print");
 exports.ClusterQueryDefinition = {
     executor: cluster_query_executor_1.executeDataflowClusterQuery,
-    asciiSummarizer: (formatter, processed, queryResults, result) => {
+    asciiSummarizer: async (formatter, analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('dataflow-cluster', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
         result.push(`   ╰ Found ${out.clusters.length} cluster${out.clusters.length === 1 ? '' : 's'}`);
@@ -19,7 +19,7 @@ exports.ClusterQueryDefinition = {
             const unknownSideEffects = cluster.hasUnknownSideEffects ? '(has unknown side effect)' : '';
             let suffix = '';
             if (formatter === ansi_1.markdownFormatter) {
-                suffix = `([marked](${(0, dfg_1.graphToMermaidUrl)(processed.dataflow.graph, false, new Set(cluster.members))}))`;
+                suffix = `([marked](${(0, dfg_1.graphToMermaidUrl)((await analyzer.dataflow()).graph, false, new Set(cluster.members))}))`;
             }
             result.push(`      ╰ ${unknownSideEffects} {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, cluster.members)}} ${suffix}`);
         }

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

@@ -1,3 +1,3 @@
 import type { ConfigQuery, ConfigQueryResult } from './config-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeConfigQuery({ config }: BasicQueryData, queries: readonly ConfigQuery[]): ConfigQueryResult;
+export declare function executeConfigQuery({ analyzer }: BasicQueryData, queries: readonly ConfigQuery[]): Promise<ConfigQueryResult>;

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

@@ -4,20 +4,20 @@ exports.executeConfigQuery = executeConfigQuery;
 const log_1 = require("../../../util/log");
 const assert_1 = require("../../../util/assert");
 const objects_1 = require("../../../util/objects");
-function executeConfigQuery({ config }, queries) {
+function executeConfigQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('Config query usually expects only up to one query, but got', queries.length);
     }
     const updates = queries.map(q => q.update).filter(assert_1.isNotUndefined);
     for (const update of updates) {
-        (0, objects_1.deepMergeObjectInPlace)(config, update);
+        (0, objects_1.deepMergeObjectInPlace)(analyzer.flowrConfig, update);
     }
-    return {
+    return Promise.resolve({
         '.meta': {
             /* there is no sense in measuring a get */
             timing: 0
         },
-        config: config
-    };
+        config: analyzer.flowrConfig
+    });
 }
 //# sourceMappingURL=config-query-executor.js.map

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

@@ -15,7 +15,7 @@ declare function configReplCompleter(partialLine: readonly string[], config: Flo
 declare function configQueryLineParser(line: readonly string[], _config: FlowrConfigOptions): [ConfigQuery];
 export declare const ConfigQueryDefinition: {
     readonly executor: typeof executeConfigQuery;
-    readonly asciiSummarizer: (formatter: OutputFormatter, _processed: unknown, queryResults: BaseQueryResult, result: string[]) => boolean;
+    readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => boolean;
     readonly completer: typeof configReplCompleter;
     readonly fromLine: typeof configQueryLineParser;
     readonly schema: Joi.ObjectSchema<any>;

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

@@ -79,7 +79,7 @@ function configQueryLineParser(line, _config) {
 }
 exports.ConfigQueryDefinition = {
     executor: config_query_executor_1.executeConfigQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('config', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push(`   ╰ Config:\n${JSON.stringify(out.config, json_1.jsonReplacer, 4)}`);

package/queries/catalog/control-flow-query/control-flow-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { ControlFlowQuery, ControlFlowQueryResult } from './control-flow-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeControlFlowQuery({ dataflow: { graph }, ast, config }: BasicQueryData, queries: readonly ControlFlowQuery[]): ControlFlowQueryResult;
+export declare function executeControlFlowQuery({ analyzer }: BasicQueryData, queries: readonly ControlFlowQuery[]): Promise<ControlFlowQueryResult>;

package/queries/catalog/control-flow-query/control-flow-query-executor.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeControlFlowQuery = executeControlFlowQuery;
 const log_1 = require("../../../util/log");
-const extract_cfg_1 = require("../../../control-flow/extract-cfg");
-function executeControlFlowQuery({ dataflow: { graph }, ast, config }, queries) {
+async function executeControlFlowQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('The control flow query expects only up to one query, but got', queries.length);
     }
     const query = queries[0];
     const start = Date.now();
-    const controlFlow = (0, extract_cfg_1.extractCfg)(ast, config, graph, query.config?.simplificationPasses);
+    const controlFlow = await analyzer.controlflow(query.config?.simplificationPasses, true);
     return {
         '.meta': {
             timing: Date.now() - start

package/queries/catalog/control-flow-query/control-flow-query-format.d.ts

@@ -22,60 +22,7 @@ export interface ControlFlowQueryResult extends BaseQueryResult {
 }
 export declare const ControlFlowQueryDefinition: {
     readonly executor: typeof executeControlFlowQuery;
-    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[]) => Promise<boolean>;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

package/queries/catalog/control-flow-query/control-flow-query-format.js

@@ -12,10 +12,10 @@ const cfg_1 = require("../../../util/mermaid/cfg");
 const cfg_simplification_1 = require("../../../control-flow/cfg-simplification");
 exports.ControlFlowQueryDefinition = {
     executor: control_flow_query_executor_1.executeControlFlowQuery,
-    asciiSummarizer: (formatter, processed, queryResults, result) => {
+    asciiSummarizer: async (formatter, analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('control-flow', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
-        result.push(`   ╰ CFG: ${(0, cfg_1.cfgToMermaidUrl)(out.controlFlow, processed.normalize)}`);
+        result.push(`   ╰ CFG: ${(0, cfg_1.cfgToMermaidUrl)(out.controlFlow, await analyzer.normalize())}`);
         return true;
     },
     schema: joi_1.default.object({

package/queries/catalog/dataflow-lens-query/dataflow-lens-query-executor.d.ts

@@ -1,3 +1,3 @@
 import type { DataflowLensQuery, DataflowLensQueryResult } from './dataflow-lens-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeDataflowLensQuery({ dataflow: { graph } }: BasicQueryData, queries: readonly DataflowLensQuery[]): DataflowLensQueryResult;
+export declare function executeDataflowLensQuery({ analyzer }: BasicQueryData, queries: readonly DataflowLensQuery[]): Promise<DataflowLensQueryResult>;

package/queries/catalog/dataflow-lens-query/dataflow-lens-query-executor.js

@@ -4,12 +4,12 @@ exports.executeDataflowLensQuery = executeDataflowLensQuery;
 const log_1 = require("../../../util/log");
 const dfg_view_1 = require("../../../util/simple-df/dfg-view");
 const vertex_1 = require("../../../dataflow/graph/vertex");
-function executeDataflowLensQuery({ dataflow: { graph } }, queries) {
+async function executeDataflowLensQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('Dataflow query expects only up to one query, but got', queries.length);
     }
     const now = Date.now();
-    const simplifiedGraph = (0, dfg_view_1.reduceDfg)(graph, {
+    const simplifiedGraph = (0, dfg_view_1.reduceDfg)((await analyzer.dataflow()).graph, {
         vertices: {
             keepEnv: false,
             keepCd: true,

package/queries/catalog/dataflow-lens-query/dataflow-lens-query-format.d.ts

@@ -14,60 +14,7 @@ export interface DataflowLensQueryResult extends BaseQueryResult {
 }
 export declare const DataflowLensQueryDefinition: {
     readonly executor: typeof executeDataflowLensQuery;
-    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/dataflow-lens-query/dataflow-lens-query-format.js

@@ -11,7 +11,7 @@ const dfg_1 = require("../../../util/mermaid/dfg");
 const joi_1 = __importDefault(require("joi"));
 exports.DataflowLensQueryDefinition = {
     executor: dataflow_lens_query_executor_1.executeDataflowLensQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('dataflow-lens', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push(`   ╰ [Simplified Graph](${(0, dfg_1.graphToMermaidUrl)(out.simplifiedGraph, false, undefined, true)})`);

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

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

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

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

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

@@ -15,60 +15,7 @@ export interface DataflowQueryResult extends BaseQueryResult {
 }
 export declare const DataflowQueryDefinition: {
     readonly executor: typeof executeDataflowQuery;
-    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/dataflow-query/dataflow-query-format.js

@@ -11,7 +11,7 @@ const dfg_1 = require("../../../util/mermaid/dfg");
 const joi_1 = __importDefault(require("joi"));
 exports.DataflowQueryDefinition = {
     executor: dataflow_query_executor_1.executeDataflowQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('dataflow', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push(`   ╰ [Dataflow Graph](${(0, dfg_1.graphToMermaidUrl)(out.graph)})`);

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

@@ -1,3 +1,3 @@
 import type { DependenciesQuery, DependenciesQueryResult } from './dependencies-query-format';
 import type { BasicQueryData } from '../../base-query-format';
-export declare function executeDependenciesQuery(data: BasicQueryData, queries: readonly DependenciesQuery[]): DependenciesQueryResult;
+export declare function executeDependenciesQuery({ analyzer, }: BasicQueryData, queries: readonly DependenciesQuery[]): Promise<DependenciesQueryResult>;

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

@@ -11,10 +11,14 @@ const function_info_1 = require("./function-info/function-info");
 const identify_link_to_last_call_relation_1 = require("../call-context-query/identify-link-to-last-call-relation");
 const resolve_argument_1 = require("../../../dataflow/eval/resolve/resolve-argument");
 const assert_1 = require("../../../util/assert");
-function executeDependenciesQuery(data, queries) {
+async function executeDependenciesQuery({ analyzer, }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('Dependencies query expects only up to one query, but got ', queries.length, 'only using the first query');
     }
+    const data = { analyzer };
+    const normalize = await analyzer.normalize();
+    const dataflow = await analyzer.dataflow();
+    const config = analyzer.flowrConfig;
     const now = Date.now();
     const [query] = queries;
     const ignoreDefault = query.ignoreDefaultFunctions ?? false;
@@ -28,10 +32,10 @@ function executeDependenciesQuery(data, queries) {
         }
     }
     const queryResults = functions.values().toArray().flat().length === 0 ? { kinds: {}, '.meta': { timing: 0 } } :
-        (0, query_1.executeQueriesOfSameType)(data, functions.entries().map(([c, f]) => makeCallContextQuery(f, c)).toArray().flat());
+        await (0, query_1.executeQueriesOfSameType)(data, functions.entries().map(([c, f]) => makeCallContextQuery(f, c)).toArray().flat());
     const results = Object.fromEntries(functions.entries().map(([c, f]) => {
-        const results = getResults(queries, data, queryResults, c, f);
-        // only default categories allow additional analyses, so we null coalese here!
+        const results = getResults(queries, { dataflow, config, normalize }, queryResults, c, f, data);
+        // only default categories allow additional analyses, so we null-coalesce here!
         dependencies_query_format_1.DefaultDependencyCategories[c]?.additionalAnalysis?.(data, ignoreDefault, f, queryResults, results);
         return [c, results];
     }));
@@ -39,7 +43,7 @@ function executeDependenciesQuery(data, queries) {
         '.meta': {
             timing: Date.now() - now
         },
-        ...results
+        ...results,
     };
 }
 function makeCallContextQuery(functions, kind) {
@@ -62,15 +66,15 @@ function dropInfoOnLinkedIds(linkedIds) {
 }
 const readOnlyModes = new Set(['r', 'rt', 'rb']);
 const writeOnlyModes = new Set(['w', 'wt', 'wb', 'a', 'at', 'ab']);
-function getResults(queries, data, results, kind, functions) {
+function getResults(queries, { dataflow, config, normalize }, results, kind, functions, data) {
     const defaultValue = (0, dependencies_query_format_1.getAllCategories)(queries)[kind].defaultValue;
     const functionMap = new Map(functions.map(f => [f.name, f]));
     const kindEntries = Object.entries(results?.kinds[kind]?.subkinds ?? {});
     return kindEntries.flatMap(([name, results]) => results.flatMap(({ id, linkedIds }) => {
-        const vertex = data.dataflow.graph.getVertex(id);
+        const vertex = dataflow.graph.getVertex(id);
         const info = functionMap.get(name);
-        const args = (0, resolve_argument_1.getArgumentStringValue)(data.config.solver.variables, data.dataflow.graph, vertex, info.argIdx, info.argName, info.resolveValue);
-        const linkedArgs = collectValuesFromLinks(args, data, linkedIds);
+        const args = (0, resolve_argument_1.getArgumentStringValue)(config.solver.variables, dataflow.graph, vertex, info.argIdx, info.argName, info.resolveValue);
+        const linkedArgs = collectValuesFromLinks(args, { dataflow, config }, linkedIds);
         const linked = dropInfoOnLinkedIds(linkedIds);
         const foundValues = linkedArgs ?? args;
         if (!foundValues) {
@@ -90,7 +94,7 @@ function getResults(queries, data, results, kind, functions) {
             (0, assert_1.guard)('mode' in (info.additionalArgs ?? {}), 'Need additional argument mode when checking for mode');
             const margs = info.additionalArgs?.mode;
             (0, assert_1.guard)(margs, 'Need additional argument mode when checking for mode');
-            const modeArgs = (0, resolve_argument_1.getArgumentStringValue)(data.config.solver.variables, data.dataflow.graph, vertex, margs.argIdx, margs.argName, margs.resolveValue);
+            const modeArgs = (0, resolve_argument_1.getArgumentStringValue)(config.solver.variables, dataflow.graph, vertex, margs.argIdx, margs.argName, margs.resolveValue);
             const modeValues = modeArgs?.values().flatMap(v => [...v]) ?? [];
             if (info.ignoreIf === 'mode-only-read' && modeValues.every(m => m && readOnlyModes.has(m))) {
                 // all modes are read-only, so we can ignore this
@@ -104,12 +108,15 @@ function getResults(queries, data, results, kind, functions) {
         const results = [];
         for (const [arg, values] of foundValues.entries()) {
             for (const value of values) {
+                const dep = value ? data?.analyzer.context().deps.getDependency(value) ?? undefined : undefined;
                 const result = (0, objects_1.compactRecord)({
                     nodeId: id,
                     functionName: vertex.name,
                     lexemeOfArgument: getLexeme(value, arg),
                     linkedIds: linked?.length ? linked : undefined,
-                    value: value ?? defaultValue
+                    value: value ?? defaultValue,
+                    versionConstraints: dep?.versionConstraints,
+                    derivedVersion: dep?.derivedVersion
                 });
                 if (result) {
                     results.push(result);
@@ -122,7 +129,7 @@ function getResults(queries, data, results, kind, functions) {
         if ((argument && argument !== dependencies_query_format_1.Unknown) || !id) {
             return undefined;
         }
-        let get = data.ast.idMap.get(id);
+        let get = normalize.idMap.get(id);
         if (get?.type === type_1.RType.Argument) {
             get = get.value;
         }