@eagleoutice/flowr 2.6.1 → 2.6.3

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

@@ -4,24 +4,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DfShapeQueryDefinition = void 0;
+const dataframe_domain_1 = require("../../../abstract-interpretation/data-frame/dataframe-domain");
 const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
-const joi_1 = __importDefault(require("joi"));
 const df_shape_query_executor_1 = require("./df-shape-query-executor");
-const json_1 = require("../../../util/json");
+const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
+const joi_1 = __importDefault(require("joi"));
+function dfShapeQueryLineParser(_output, line, _config) {
+    const criterion = (0, slice_query_parser_1.sliceCriterionParser)(line[0]);
+    return {
+        query: {
+            type: 'df-shape',
+            criterion: criterion
+        },
+        rCode: criterion ? line[1] : line[0]
+    };
+}
 exports.DfShapeQueryDefinition = {
     executor: df_shape_query_executor_1.executeDfShapeQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
+        const domains = out.domains instanceof dataframe_domain_1.DataFrameStateDomain ? out.domains.value : out.domains;
         result.push(`Query: ${(0, ansi_1.bold)('df-shape', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
-        result.push(...out.domains.entries().take(20).map(([key, domain]) => {
-            return `   ╰ ${key}: ${JSON.stringify(domain, json_1.jsonReplacer)}`;
+        result.push(...domains.entries().take(20).map(([key, domain]) => {
+            return `   ╰ ${key}: ${domain?.toString()}`;
         }));
-        if (out.domains.size > 20) {
+        if (domains.size > 20) {
             result.push('   ╰ ... (see JSON)');
         }
         return true;
     },
+    jsonFormatter: (queryResults) => {
+        const { domains, ...out } = queryResults;
+        const state = domains instanceof dataframe_domain_1.DataFrameStateDomain ? domains.value : domains;
+        const json = Object.fromEntries(state.entries().map(([key, domain]) => [key, domain?.toJson() ?? null]));
+        const result = { domains: json, ...out };
+        return result;
+    },
+    fromLine: dfShapeQueryLineParser,
     schema: joi_1.default.object({
         type: joi_1.default.string().valid('df-shape').required().description('The type of the query.'),
         criterion: joi_1.default.string().optional().description('The slicing criterion of the node to get the dataframe shape for.')

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

@@ -1,3 +1,7 @@
 import type { BasicQueryData } from '../../base-query-format';
 import type { HappensBeforeQuery, HappensBeforeQueryResult } from './happens-before-query-format';
+/**
+ * Execute happens-before queries on the given analyzer.
+ * This checks, whether for two given slicing criteria `a` and `b`, `a` happens before `b` in the control flow graph.
+ */
 export declare function executeHappensBefore({ analyzer }: BasicQueryData, queries: readonly HappensBeforeQuery[]): Promise<HappensBeforeQueryResult>;

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

@@ -6,6 +6,10 @@ const log_1 = require("../../../util/log");
 const extract_cfg_1 = require("../../../control-flow/extract-cfg");
 const happens_before_1 = require("../../../control-flow/happens-before");
 const parse_1 = require("../../../slicing/criterion/parse");
+/**
+ * Execute happens-before queries on the given analyzer.
+ * This checks, whether for two given slicing criteria `a` and `b`, `a` happens before `b` in the control flow graph.
+ */
 async function executeHappensBefore({ analyzer }, queries) {
     const start = Date.now();
     const results = {};

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

@@ -13,7 +13,7 @@ export interface HappensBeforeQueryResult extends BaseQueryResult {
 }
 export declare const HappensBeforeQueryDefinition: {
     readonly executor: typeof executeHappensBefore;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };

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

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

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

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeIdMapQuery = executeIdMapQuery;
 const log_1 = require("../../../util/log");
+/**
+ * Executes the given ID map queries using the provided analyzer.
+ */
 async function executeIdMapQuery({ analyzer }, queries) {
     if (queries.length !== 1) {
         log_1.log.warn('Id-Map query expects only up to one query, but got', queries.length);

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

@@ -10,7 +10,7 @@ export interface IdMapQueryResult extends BaseQueryResult {
 }
 export declare const IdMapQueryDefinition: {
     readonly executor: typeof executeIdMapQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };

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

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

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

@@ -4,6 +4,9 @@ exports.executeHigherOrderQuery = executeHigherOrderQuery;
 const parse_1 = require("../../../slicing/criterion/parse");
 const vertex_1 = require("../../../dataflow/graph/vertex");
 const higher_order_function_1 = require("../../../dataflow/fn/higher-order-function");
+/**
+ * Execute higher-order function inspection queries on the given analyzer.
+ */
 async function executeHigherOrderQuery({ analyzer }, queries) {
     const start = Date.now();
     let filters = undefined;

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

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

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

@@ -1,3 +1,7 @@
 import type { BasicQueryData } from '../../base-query-format';
 import type { LinterQuery, LinterQueryResult } from './linter-query-format';
+/**
+ * Executes the given linter queries using the provided analyzer.
+ * @see {@link executeLintingRule}
+ */
 export declare function executeLinterQuery({ analyzer }: BasicQueryData, queries: readonly LinterQuery[]): Promise<LinterQueryResult>;

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

@@ -4,6 +4,10 @@ exports.executeLinterQuery = executeLinterQuery;
 const linter_rules_1 = require("../../../linter/linter-rules");
 const log_1 = require("../../../util/log");
 const linter_executor_1 = require("../../../linter/linter-executor");
+/**
+ * Executes the given linter queries using the provided analyzer.
+ * @see {@link executeLintingRule}
+ */
 async function executeLinterQuery({ analyzer }, queries) {
     const flattened = queries.flatMap(q => q.rules ?? Object.keys(linter_rules_1.LintingRules));
     const distinct = new Set(flattened);

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

@@ -1,8 +1,12 @@
 import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
+import type { ParsedQueryLine } from '../../query';
 import Joi from 'joi';
 import { executeLinterQuery } from './linter-query-executor';
-import type { LintingRuleNames } from '../../../linter/linter-rules';
-import type { ConfiguredLintingRule, LintingResults } from '../../../linter/linter-format';
+import { type LintingRuleNames } from '../../../linter/linter-rules';
+import { type ConfiguredLintingRule, type LintingResults } from '../../../linter/linter-format';
+import type { FlowrConfigOptions } from '../../../config';
+import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
+import type { CommandCompletions } from '../../../cli/repl/core';
 export interface LinterQuery extends BaseQueryFormat {
     readonly type: 'linter';
     /**
@@ -19,9 +23,14 @@ export interface LinterQueryResult extends BaseQueryResult {
         [L in LintingRuleNames]?: LintingResults<L>;
     };
 }
+declare function linterQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'linter'>;
+declare function linterQueryCompleter(line: readonly string[], startingNewArg: boolean, _config: FlowrConfigOptions): CommandCompletions;
 export declare const LinterQueryDefinition: {
     readonly executor: typeof executeLinterQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly completer: typeof linterQueryCompleter;
+    readonly fromLine: typeof linterQueryLineParser;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };
+export {};

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

@@ -11,16 +11,93 @@ const linter_format_1 = require("../../../linter/linter-format");
 const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
 const doc_code_1 = require("../../../documentation/doc-util/doc-code");
+const retriever_1 = require("../../../r-bridge/retriever");
+const assert_1 = require("../../../util/assert");
+function rulesFromInput(output, rulesPart) {
+    return rulesPart
+        .reduce((acc, ruleName) => {
+        ruleName = ruleName.trim();
+        if (ruleName in linter_rules_1.LintingRules) {
+            acc.valid.push(ruleName);
+        }
+        else {
+            acc.invalid.push(ruleName);
+        }
+        return acc;
+    }, { valid: [], invalid: [] });
+}
+const rulesPrefix = 'rules:';
+function linterQueryLineParser(output, line, _config) {
+    let rules = undefined;
+    let input = undefined;
+    if (line.length > 0 && line[0].startsWith(rulesPrefix)) {
+        const rulesPart = line[0].slice(rulesPrefix.length).split(',');
+        const parseResult = rulesFromInput(output, rulesPart);
+        if (parseResult.invalid.length > 0) {
+            output.stdout(`Invalid linting rule name(s): ${parseResult.invalid.map(r => (0, ansi_1.bold)(r, output.formatter)).join(', ')}`
+                + `\nValid rule names are: ${Object.keys(linter_rules_1.LintingRules).map(r => (0, ansi_1.bold)(r, output.formatter)).join(', ')}`);
+        }
+        rules = parseResult.valid;
+        input = line[1];
+    }
+    else if (line.length > 0) {
+        input = line[0];
+    }
+    return { query: [{ type: 'linter', rules: rules }], rCode: input };
+}
+function linterQueryCompleter(line, startingNewArg, _config) {
+    const rulesPrefixNotPresent = line.length == 0 || (line.length == 1 && line[0].length < rulesPrefix.length);
+    const rulesNotFinished = line.length == 1 && line[0].startsWith(rulesPrefix) && !startingNewArg;
+    const endOfRules = line.length == 1 && startingNewArg || line.length == 2;
+    if (rulesPrefixNotPresent) {
+        return { completions: [`${rulesPrefix}`] };
+    }
+    else if (endOfRules) {
+        return { completions: [retriever_1.fileProtocol] };
+    }
+    else if (rulesNotFinished) {
+        const rulesWithoutPrefix = line[0].slice(rulesPrefix.length);
+        const usedRules = rulesWithoutPrefix.split(',').map(r => r.trim());
+        const allRules = Object.keys(linter_rules_1.LintingRules);
+        const unusedRules = allRules.filter(r => !usedRules.includes(r));
+        const lastRule = usedRules[usedRules.length - 1];
+        const lastRuleIsUnfinished = !allRules.includes(lastRule);
+        if (lastRuleIsUnfinished) {
+            // Return all rules that have not been added yet
+            return { completions: unusedRules, argumentPart: lastRule };
+        }
+        else if (unusedRules.length > 0) {
+            // Add a comma, if the current last rule is complete
+            return { completions: [','], argumentPart: '' };
+        }
+        else {
+            // All rules are used, complete with a space
+            return { completions: [' '], argumentPart: '' };
+        }
+    }
+    return { completions: [] };
+}
 exports.LinterQueryDefinition = {
     executor: linter_query_executor_1.executeLinterQuery,
-    asciiSummarizer: (formatter, _analyzer, 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)})`);
+        const allDidFail = Object.values(out.results).every(r => (0, linter_format_1.isLintingResultsError)(r));
+        if (allDidFail) {
+            result.push('All linting rules failed to execute.');
+            if (analyzer.inspectContext().files.loadingOrder.getUnorderedRequests().length === 0) {
+                result.push(formatter.format('No requests to lint for were found in the analysis.', { color: 1 /* Colors.Red */, effect: ansi_1.ColorEffect.Foreground, style: 1 /* FontStyles.Bold */ }));
+                result.push('If you consider this an error, please report a bug: ' + (0, assert_1.getGuardIssueUrl)('analyzer found no requests to lint for'));
+            }
+            return true;
+        }
         for (const [ruleName, results] of Object.entries(out.results)) {
             addLintingRuleResult(ruleName, results, result);
         }
         return true;
     },
+    completer: linterQueryCompleter,
+    fromLine: linterQueryLineParser,
     schema: joi_1.default.object({
         type: joi_1.default.string().valid('linter').required().description('The type of the query.'),
         rules: joi_1.default.array().items(joi_1.default.string().valid(...Object.keys(linter_rules_1.LintingRules)), joi_1.default.object({
@@ -34,7 +111,8 @@ function addLintingRuleResult(ruleName, results, result) {
     const rule = linter_rules_1.LintingRules[ruleName];
     result.push(`   ╰ **${rule.info.name}** (${ruleName}):`);
     if ((0, linter_format_1.isLintingResultsError)(results)) {
-        result.push(`       ╰ Error during execution of Rule: ${results.error}`);
+        const error = results.error.includes('At least one request must be set') ? 'No requests to lint for were found in the analysis.' : 'Error during execution of rule: ' + results.error;
+        result.push(`       ╰ ${error}`);
         return;
     }
     for (const certainty of [linter_format_1.LintingResultCertainty.Certain, linter_format_1.LintingResultCertainty.Uncertain]) {

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

@@ -1,3 +1,7 @@
 import type { LocationMapQuery, LocationMapQueryResult } from './location-map-query-format';
 import type { BasicQueryData } from '../../base-query-format';
+/**
+ * Executes a location map query
+ * @see {@link LocationMapQuery}
+ */
 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,12 @@ function fuzzyFindFile(node, idMap) {
     }
     return '<inline>';
 }
+/**
+ * Executes a location map query
+ * @see {@link LocationMapQuery}
+ */
 async function executeLocationMapQuery({ analyzer }, queries) {
+    const ast = await analyzer.normalize();
     const start = Date.now();
     const criteriaOfInterest = new Set(queries
         .flatMap(q => q.ids ?? [])
@@ -34,12 +39,12 @@ async function executeLocationMapQuery({ analyzer }, queries) {
     };
     let count = 0;
     const inverseMap = new Map();
-    for (const file of (await analyzer.dataflow()).graph.sourced) {
+    await analyzer.dataflow(); // ensure all files are considered
+    for (const file of analyzer.inspectContext().files.consideredFilesList()) {
         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

@@ -5,6 +5,9 @@ import Joi from 'joi';
 import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { SourceRange } from '../../../util/range';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
+import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
+import type { FlowrConfigOptions } from '../../../config';
+import type { ParsedQueryLine } from '../../query';
 export interface LocationMapQuery extends BaseQueryFormat {
     readonly type: 'location-map';
     /** Optional list of ids to filter the results by. If not provided, all ids will be included. */
@@ -22,9 +25,12 @@ export interface LocationMapQueryResult extends BaseQueryResult {
         ids: Record<NodeId, [FileId, SourceRange]>;
     };
 }
+declare function locationMapLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'location-map'>;
 export declare const LocationMapQueryDefinition: {
     readonly executor: typeof executeLocationMapQuery;
-    readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => boolean;
+    readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly fromLine: typeof locationMapLineParser;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };
+export {};

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

@@ -9,6 +9,17 @@ const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
 const joi_1 = __importDefault(require("joi"));
 const query_print_1 = require("../../query-print");
+const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
+function locationMapLineParser(_output, line, _config) {
+    const criteria = (0, slice_query_parser_1.sliceCriteriaParser)(line[0]);
+    return {
+        query: {
+            type: 'location-map',
+            ids: criteria
+        },
+        rCode: criteria ? line[1] : line[0]
+    };
+}
 exports.LocationMapQueryDefinition = {
     executor: location_map_query_executor_1.executeLocationMapQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
@@ -21,6 +32,7 @@ exports.LocationMapQueryDefinition = {
         result.push(`   ╰ Id List: {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, [...Object.keys(out.map.ids)])}}`);
         return true;
     },
+    fromLine: locationMapLineParser,
     schema: joi_1.default.object({
         type: joi_1.default.string().valid('location-map').required().description('The type of the query.'),
         ids: joi_1.default.array().items(joi_1.default.string()).optional().description('Optional list of ids to filter the results by.')

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

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

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

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeNormalizedAstQuery = executeNormalizedAstQuery;
 const log_1 = require("../../../util/log");
+/**
+ *
+ */
 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);

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

@@ -13,7 +13,7 @@ export interface NormalizedAstQueryResult extends BaseQueryResult {
 }
 export declare const NormalizedAstQueryDefinition: {
     readonly executor: typeof executeNormalizedAstQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };

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

@@ -1,5 +1,11 @@
 import type { BasicQueryData } from '../../base-query-format';
-import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
+import { type SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 import type { OriginQuery, OriginQueryResult } from './origin-query-format';
+/**
+ * Produce a fingerprint string for an origin query
+ */
 export declare function fingerPrintOfQuery(query: OriginQuery): SingleSlicingCriterion;
+/**
+ * Execute origin queries, catching duplicates with the same fingerprint
+ */
 export declare function executeResolveValueQuery({ analyzer }: BasicQueryData, queries: readonly OriginQuery[]): Promise<OriginQueryResult>;

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

@@ -5,9 +5,15 @@ exports.executeResolveValueQuery = executeResolveValueQuery;
 const log_1 = require("../../../util/log");
 const parse_1 = require("../../../slicing/criterion/parse");
 const dfg_get_origin_1 = require("../../../dataflow/origin/dfg-get-origin");
+/**
+ * Produce a fingerprint string for an origin query
+ */
 function fingerPrintOfQuery(query) {
     return query.criterion;
 }
+/**
+ * Execute origin queries, catching duplicates with the same fingerprint
+ */
 async function executeResolveValueQuery({ analyzer }, queries) {
     const start = Date.now();
     const results = {};

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

@@ -1,9 +1,12 @@
 import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
+import type { ParsedQueryLine } from '../../query';
 import Joi from 'joi';
 import { executeResolveValueQuery } from './origin-query-executor';
 import type { Origin } from '../../../dataflow/origin/dfg-get-origin';
 import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
+import type { FlowrConfigOptions } from '../../../config';
 export interface OriginQuery extends BaseQueryFormat {
     readonly type: 'origin';
     /** The slicing criteria to use */
@@ -12,9 +15,12 @@ export interface OriginQuery extends BaseQueryFormat {
 export interface OriginQueryResult extends BaseQueryResult {
     results: Record<SingleSlicingCriterion, Origin[] | undefined>;
 }
+declare function originQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'origin'>;
 export declare const OriginQueryDefinition: {
     readonly executor: typeof executeResolveValueQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly fromLine: typeof originQueryLineParser;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };
+export {};

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

@@ -8,6 +8,21 @@ const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
 const joi_1 = __importDefault(require("joi"));
 const origin_query_executor_1 = require("./origin-query-executor");
+const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
+function originQueryLineParser(output, line, _config) {
+    const criterion = (0, slice_query_parser_1.sliceCriterionParser)(line[0]);
+    if (!criterion) {
+        output.stderr(output.formatter.format('Invalid origin query format, slicing criterion must be given in parentheses, e.g. (2@var), (1:5) or ($10)', { color: 1 /* Colors.Red */, effect: ansi_1.ColorEffect.Foreground, style: 1 /* FontStyles.Bold */ }));
+        return { query: [] };
+    }
+    return {
+        query: {
+            type: 'origin',
+            criterion: criterion
+        },
+        rCode: line[1]
+    };
+}
 exports.OriginQueryDefinition = {
     executor: origin_query_executor_1.executeResolveValueQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
@@ -15,10 +30,11 @@ exports.OriginQueryDefinition = {
         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)) {
             result.push(`   ╰ Origins for {${criteria}}`);
-            result.push(`   	╰ ${obj?.map(o => JSON.stringify(o)).join(', ')}`);
+            result.push(`     ╰ ${obj?.map(o => JSON.stringify(o)).join(', ')}`);
         }
         return true;
     },
+    fromLine: originQueryLineParser,
     schema: joi_1.default.object({
         type: joi_1.default.string().valid('origin').required().description('The type of the query.'),
         criterion: joi_1.default.string().required().description('The slicing criteria to use'),

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

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

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

@@ -2,16 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeProjectQuery = executeProjectQuery;
 const log_1 = require("../../../util/log");
+/**
+ * Executes the given project 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);
     }
+    // we need to know what is considered by the analyzer
+    await analyzer.dataflow();
     return {
         '.meta': {
             /* there is no sense in measuring a get */
             timing: 0
         },
-        files: (await analyzer.dataflow()).graph.sourced
+        files: [...analyzer.inspectContext().files.consideredFilesList()]
     };
 }
 //# sourceMappingURL=project-query-executor.js.map

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

@@ -9,7 +9,7 @@ export interface ProjectQueryResult extends BaseQueryResult {
 }
 export declare const ProjectQueryDefinition: {
     readonly executor: typeof executeProjectQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };

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

@@ -1,4 +1,10 @@
 import type { ResolveValueQuery, ResolveValueQueryResult } from './resolve-value-query-format';
 import type { BasicQueryData } from '../../base-query-format';
+/**
+ * Naive fingerprint to filter out duplicate queries.
+ */
 export declare function fingerPrintOfQuery(query: ResolveValueQuery): string;
+/**
+ * Executes a resolve-value query.
+ */
 export declare function executeResolveValueQuery({ analyzer }: BasicQueryData, queries: readonly ResolveValueQuery[]): Promise<ResolveValueQueryResult>;

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

@@ -5,9 +5,15 @@ exports.executeResolveValueQuery = executeResolveValueQuery;
 const log_1 = require("../../../util/log");
 const parse_1 = require("../../../slicing/criterion/parse");
 const alias_tracking_1 = require("../../../dataflow/eval/resolve/alias-tracking");
+/**
+ * Naive fingerprint to filter out duplicate queries.
+ */
 function fingerPrintOfQuery(query) {
     return JSON.stringify(query);
 }
+/**
+ * Executes a resolve-value query.
+ */
 async function executeResolveValueQuery({ analyzer }, queries) {
     const start = Date.now();
     const results = {};

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

@@ -1,8 +1,11 @@
 import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import type { SlicingCriteria } from '../../../slicing/criterion/parse';
+import type { ParsedQueryLine } from '../../query';
 import Joi from 'joi';
 import { executeResolveValueQuery } from './resolve-value-query-executor';
 import type { ResolveResult } from '../../../dataflow/eval/resolve/alias-tracking';
+import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
+import type { FlowrConfigOptions } from '../../../config';
 export interface ResolveValueQuery extends BaseQueryFormat {
     readonly type: 'resolve-value';
     /** The slicing criteria to use */
@@ -13,9 +16,12 @@ export interface ResolveValueQueryResult extends BaseQueryResult {
         values: ResolveResult[];
     }>;
 }
+declare function resolveValueLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'resolve-value'>;
 export declare const ResolveValueQueryDefinition: {
     readonly executor: typeof executeResolveValueQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").FlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly fromLine: typeof resolveValueLineParser;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: () => never[];
 };
+export {};