@eagleoutice/flowr 2.4.8 → 2.6.0

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

@@ -15,60 +15,7 @@ export interface SearchQueryResult extends BaseQueryResult {
 }
 export declare const SearchQueryDefinition: {
     readonly executor: typeof executeSearch;
-    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/search-query/search-query-format.js

@@ -13,7 +13,7 @@ const flowr_search_printer_1 = require("../../../search/flowr-search-printer");
 const mermaid_1 = require("../../../util/mermaid/mermaid");
 exports.SearchQueryDefinition = {
     executor: search_query_executor_1.executeSearch,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('search', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [, { ids, search }] of out.results.entries()) {

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

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

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

@@ -11,7 +11,7 @@ const _00_slice_1 = require("../../../core/steps/all/static-slicing/00-slice");
 function fingerPrintOfQuery(query) {
     return JSON.stringify(query);
 }
-function executeStaticSliceQuery({ dataflow, ast, config }, queries) {
+async function executeStaticSliceQuery({ analyzer }, queries) {
     const start = Date.now();
     const results = {};
     for (const query of queries) {
@@ -21,14 +21,14 @@ function executeStaticSliceQuery({ dataflow, ast, config }, queries) {
         }
         const { criteria, noReconstruction, noMagicComments } = query;
         const sliceStart = Date.now();
-        const slice = (0, static_slicer_1.staticSlice)(dataflow, ast, criteria, query.direction ?? _00_slice_1.SliceDirection.Backward, config.solver.slicer?.threshold);
+        const slice = (0, static_slicer_1.staticSlice)(await analyzer.dataflow(), await analyzer.normalize(), criteria, query.direction ?? _00_slice_1.SliceDirection.Backward, analyzer.flowrConfig.solver.slicer?.threshold);
         const sliceEnd = Date.now();
         if (noReconstruction) {
             results[key] = { slice: { ...slice, '.meta': { timing: sliceEnd - sliceStart } } };
         }
         else {
             const reconstructStart = Date.now();
-            const reconstruct = (0, reconstruct_1.reconstructToCode)(ast, slice.result, noMagicComments ? auto_select_defaults_1.doNotAutoSelect : (0, magic_comments_1.makeMagicCommentHandler)(auto_select_defaults_1.doNotAutoSelect));
+            const reconstruct = (0, reconstruct_1.reconstructToCode)(await analyzer.normalize(), slice.result, noMagicComments ? auto_select_defaults_1.doNotAutoSelect : (0, magic_comments_1.makeMagicCommentHandler)(auto_select_defaults_1.doNotAutoSelect));
             const reconstructEnd = Date.now();
             results[key] = {
                 slice: { ...slice, '.meta': { timing: sliceEnd - sliceStart } },

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

@@ -30,60 +30,7 @@ export interface StaticSliceQueryResult extends BaseQueryResult {
 }
 export declare const StaticSliceQueryDefinition: {
     readonly executor: typeof executeStaticSliceQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _processed: 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/static-slice-query/static-slice-query-format.js

@@ -12,7 +12,7 @@ const query_print_1 = require("../../query-print");
 const _00_slice_1 = require("../../../core/steps/all/static-slicing/00-slice");
 exports.StaticSliceQueryDefinition = {
     executor: static_slice_query_executor_1.executeStaticSliceQuery,
-    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('static-slice', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [fingerprint, obj] of Object.entries(out.results)) {

package/queries/query-print.d.ts

@@ -1,8 +1,8 @@
 import type { OutputFormatter } from '../util/text/ansi';
 import type { Queries, QueryResults, SupportedQueryTypes } from './query';
-import type { PipelineOutput } from '../core/steps/pipeline/pipeline';
-import type { DEFAULT_DATAFLOW_PIPELINE } from '../core/steps/pipeline/default-pipelines';
 import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
-export declare function asciiCallContext(formatter: OutputFormatter, results: QueryResults<'call-context'>['call-context'], processed: PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>): string;
+import type { AstIdMap, ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
+import type { FlowrAnalysisProvider } from '../project/flowr-analyzer';
+export declare function asciiCallContext(formatter: OutputFormatter, results: QueryResults<'call-context'>['call-context'], idMap: AstIdMap<ParentInformation>): string;
 export declare function summarizeIdsIfTooLong(formatter: OutputFormatter, ids: readonly NodeId[]): string;
-export declare function asciiSummaryOfQueryResult<S extends SupportedQueryTypes>(formatter: OutputFormatter, totalInMs: number, results: Awaited<QueryResults<S>>, processed: PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>, queries: Queries<S>): string;
+export declare function asciiSummaryOfQueryResult<S extends SupportedQueryTypes>(formatter: OutputFormatter, totalInMs: number, results: QueryResults<S>, analyzer: FlowrAnalysisProvider, queries: Queries<S>): Promise<string>;

package/queries/query-print.js

@@ -8,48 +8,48 @@ const query_1 = require("./query");
 const html_hover_over_1 = require("../util/html-hover-over");
 const time_1 = require("../util/text/time");
 const built_in_1 = require("../dataflow/environments/built-in");
-function nodeString(nodeId, formatter, processed) {
+function nodeString(nodeId, formatter, idMap) {
     const isObj = typeof nodeId === 'object' && nodeId !== null && 'id' in nodeId;
     const id = isObj ? nodeId.id : nodeId;
     const info = isObj ? nodeId.info : undefined;
     if ((0, built_in_1.isBuiltIn)(id)) {
         return (0, ansi_1.italic)(id, formatter) + (info ? ` (${JSON.stringify(info)})` : '');
     }
-    const node = processed.normalize.idMap.get(id);
+    const node = idMap.get(id);
     if (node === undefined) {
         return `UNKNOWN: ${id} (info: ${JSON.stringify(info)})`;
     }
     return `${(0, ansi_1.italic)('`' + (node.lexeme ?? node.info.fullLexeme ?? 'UNKNOWN') + '`', formatter)} (L.${node.location?.[0]}${info ? ', ' + JSON.stringify(info) : ''})`;
 }
-function asciiCallContextSubHit(formatter, results, processed) {
+function asciiCallContextSubHit(formatter, results, idMap) {
     const result = [];
     for (const { id, calls = [], linkedIds = [], aliasRoots = [] } of results) {
-        const node = processed.normalize.idMap.get(id);
+        const node = idMap.get(id);
         if (node === undefined) {
             result.push(` ${(0, ansi_1.bold)('UNKNOWN: ' + JSON.stringify({ calls, linkedIds }))}`);
             continue;
         }
-        let line = nodeString(id, formatter, processed);
+        let line = nodeString(id, formatter, idMap);
         if (calls.length > 0) {
-            line += ` with ${calls.length} call${calls.length > 1 ? 's' : ''} (${calls.map(c => nodeString(c, formatter, processed)).join(', ')})`;
+            line += ` with ${calls.length} call${calls.length > 1 ? 's' : ''} (${calls.map(c => nodeString(c, formatter, idMap)).join(', ')})`;
         }
         if (linkedIds.length > 0) {
-            line += ` with ${linkedIds.length} link${linkedIds.length > 1 ? 's' : ''} (${linkedIds.map(c => nodeString(c, formatter, processed)).join(', ')})`;
+            line += ` with ${linkedIds.length} link${linkedIds.length > 1 ? 's' : ''} (${linkedIds.map(c => nodeString(c, formatter, idMap)).join(', ')})`;
         }
         if (aliasRoots.length > 0) {
-            line += ` with ${aliasRoots.length} alias root${aliasRoots.length > 1 ? 's' : ''} (${aliasRoots.map(c => nodeString(c, formatter, processed)).join(', ')})`;
+            line += ` with ${aliasRoots.length} alias root${aliasRoots.length > 1 ? 's' : ''} (${aliasRoots.map(c => nodeString(c, formatter, idMap)).join(', ')})`;
         }
         result.push(line);
     }
     return result.join(', ');
 }
-function asciiCallContext(formatter, results, processed) {
+function asciiCallContext(formatter, results, idMap) {
     /* traverse over 'kinds' and within them 'subkinds' */
     const result = [];
     for (const [kind, { subkinds }] of Object.entries(results['kinds'])) {
         result.push(`   ╰ ${(0, ansi_1.bold)(kind, formatter)}`);
         for (const [subkind, values] of Object.entries(subkinds)) {
-            result.push(`     ╰ ${(0, ansi_1.bold)(subkind, formatter)}: ${asciiCallContextSubHit(formatter, values, processed)}`);
+            result.push(`     ╰ ${(0, ansi_1.bold)(subkind, formatter)}: ${asciiCallContextSubHit(formatter, values, idMap)}`);
         }
     }
     return result.join('\n');
@@ -69,7 +69,7 @@ function summarizeIdsIfTooLong(formatter, ids) {
     }
     return formatter === ansi_1.markdownFormatter ? (0, html_hover_over_1.textWithTooltip)(acc, JSON.stringify(ids)) : acc;
 }
-function asciiSummaryOfQueryResult(formatter, totalInMs, results, processed, queries) {
+async function asciiSummaryOfQueryResult(formatter, totalInMs, results, analyzer, queries) {
     const result = [];
     for (const [query, queryResults] of Object.entries(results)) {
         if (query === '.meta') {
@@ -77,7 +77,7 @@ function asciiSummaryOfQueryResult(formatter, totalInMs, results, processed, que
         }
         const queryType = query_1.SupportedQueries[query];
         const relevantQueries = queries.filter(q => q.type === query);
-        if (queryType.asciiSummarizer(formatter, processed, queryResults, result, relevantQueries)) {
+        if (await queryType.asciiSummarizer(formatter, analyzer, queryResults, result, relevantQueries)) {
             continue;
         }
         result.push(`Query: ${(0, ansi_1.bold)(query, formatter)}`);