@eagleoutice/flowr 2.9.2 → 2.9.4

package/linter/rules/network-functions.d.ts

@@ -2,6 +2,8 @@ import { LintingRuleCertainty } from '../linter-format';
 import { type FunctionsMetadata, type FunctionsResult } from './function-finder-util';
 import { LintingRuleTag } from '../linter-tags';
 import type { MergeableRecord } from '../../util/objects';
+import type { FlowrSearchElement } from '../../search/flowr-search';
+import type { ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 export interface NetworkFunctionsConfig extends MergeableRecord {
     /** The list of function names that should be marked in the given context if their arguments match. */
     fns: readonly string[];
@@ -9,19 +11,14 @@ export interface NetworkFunctionsConfig extends MergeableRecord {
     onlyTriggerWithArgument?: RegExp | string;
 }
 export declare const NETWORK_FUNCTIONS: {
-    readonly createSearch: (config: NetworkFunctionsConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter"], import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, [] | import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>>>;
-    readonly processSearchResult: (e: import("../../search/flowr-search").FlowrSearchElements<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../search/flowr-search").FlowrSearchElement<import("../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>[]>, c: NetworkFunctionsConfig, d: {
+    readonly createSearch: (config: NetworkFunctionsConfig) => import("../../search/flowr-search-builder").FlowrSearchBuilder<"all", ["filter", "with", "filter"], ParentInformation, Promise<import("../../search/flowr-search").FlowrSearchElements<ParentInformation, [] | FlowrSearchElement<ParentInformation>[]>>>;
+    readonly processSearchResult: (e: import("../../search/flowr-search").FlowrSearchElements<ParentInformation, FlowrSearchElement<ParentInformation>[]>, c: NetworkFunctionsConfig, d: {
         normalize: import("../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         dataflow: import("../../dataflow/info").DataflowInformation;
         cfg: import("../../control-flow/control-flow-graph").ControlFlowInformation;
         analyzer: import("../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider;
     }) => {
-        results: {
-            certainty: import("../linter-format").LintingResultCertainty;
-            involvedId: import("../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
-            function: import("../../dataflow/environments/identifier").BrandedIdentifier;
-            range: import("../../util/range").SourceRange;
-        }[];
+        results: FunctionsResult[];
         '.meta': FunctionsMetadata;
     };
     readonly prettyPrint: {

package/linter/rules/network-functions.js

@@ -5,9 +5,22 @@ const linter_format_1 = require("../linter-format");
 const function_finder_util_1 = require("./function-finder-util");
 const linter_tags_1 = require("../linter-tags");
 const read_functions_1 = require("../../queries/catalog/dependencies-query/function-info/read-functions");
+const logic_1 = require("../../util/logic");
 exports.NETWORK_FUNCTIONS = {
     createSearch: (config) => function_finder_util_1.functionFinderUtil.createSearch(config.fns),
-    processSearchResult: (e, c, d) => function_finder_util_1.functionFinderUtil.processSearchResult(e, c, d, es => es.filter(e => function_finder_util_1.functionFinderUtil.requireArgumentValue(e, read_functions_1.ReadFunctions, { analyzer: d.analyzer, dataflow: d.dataflow, normalize: d.normalize }, c.onlyTriggerWithArgument))),
+    processSearchResult: (e, c, d) => function_finder_util_1.functionFinderUtil.processSearchResult(e, c, d, es => {
+        const res = [];
+        for (const e of es) {
+            const val = function_finder_util_1.functionFinderUtil.requireArgumentValue(e, read_functions_1.ReadFunctions, d, c.onlyTriggerWithArgument);
+            if (val === logic_1.Ternary.Never) {
+                continue;
+            }
+            const x = e;
+            x.certainty = val === logic_1.Ternary.Always ? linter_format_1.LintingResultCertainty.Certain : linter_format_1.LintingResultCertainty.Uncertain;
+            res.push(x);
+        }
+        return res;
+    }),
     prettyPrint: function_finder_util_1.functionFinderUtil.prettyPrint('network operations'),
     info: {
         name: 'Network Functions',

package/linter/rules/seeded-randomness.d.ts

@@ -1,11 +1,11 @@
 import { type LintingResult, LintingResultCertainty, LintingRuleCertainty } from '../linter-format';
-import type { SourceRange } from '../../util/range';
+import { SourceLocation } from '../../util/range';
 import type { MergeableRecord } from '../../util/objects';
 import type { BrandedIdentifier } from '../../dataflow/environments/identifier';
 import { LintingRuleTag } from '../linter-tags';
 export interface SeededRandomnessResult extends LintingResult {
     function: string;
-    range: SourceRange;
+    loc: SourceLocation;
 }
 export interface SeededRandomnessConfig extends MergeableRecord {
     /**
@@ -41,7 +41,7 @@ export declare const SEEDED_RANDOMNESS: {
             involvedId: import("../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
             certainty: LintingResultCertainty;
             function: BrandedIdentifier;
-            range: SourceRange;
+            loc: [startLine: number, startColumn: number, endLine: number, endColumn: number, f?: string | undefined];
         }[];
         '.meta': SeededRandomnessMeta;
     };

package/linter/rules/seeded-randomness.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SEEDED_RANDOMNESS = void 0;
 const linter_format_1 = require("../linter-format");
+const range_1 = require("../../util/range");
 const flowr_search_builder_1 = require("../../search/flowr-search-builder");
-const dfg_1 = require("../../util/mermaid/dfg");
 const search_enrichers_1 = require("../../search/search-executor/search-enrichers");
 const identifier_1 = require("../../dataflow/environments/identifier");
 const flowr_search_filters_1 = require("../../search/flowr-search-filters");
@@ -51,7 +51,7 @@ exports.SEEDED_RANDOMNESS = {
                 metadata.consumerCalls++;
                 return {
                     involvedId: element.node.info.id,
-                    range: element.node.info.fullRange,
+                    loc: range_1.SourceLocation.fromNode(element.node) ?? range_1.SourceLocation.invalid(),
                     target: target,
                     searchElement: element
                 };
@@ -117,7 +117,7 @@ exports.SEEDED_RANDOMNESS = {
                         involvedId: element.involvedId,
                         certainty: cdsOfProduces.size > 0 ? linter_format_1.LintingResultCertainty.Uncertain : linter_format_1.LintingResultCertainty.Certain,
                         function: element.target,
-                        range: element.range
+                        loc: element.loc
                     }];
             }),
             '.meta': metadata
@@ -135,8 +135,8 @@ exports.SEEDED_RANDOMNESS = {
         description: 'Checks whether randomness-based function calls are preceded by a random seed generation function. For consistent reproducibility, functions that use randomness should only be called after a constant random seed is set using a function like `set.seed`.'
     },
     prettyPrint: {
-        [linter_format_1.LintingPrettyPrintContext.Query]: (result, _meta) => `Function \`${result.function}\` at ${(0, dfg_1.formatRange)(result.range)}`,
-        [linter_format_1.LintingPrettyPrintContext.Full]: (result, _meta) => `Function \`${result.function}\` at ${(0, dfg_1.formatRange)(result.range)} is called without a preceding random seed function like \`set.seed\``
+        [linter_format_1.LintingPrettyPrintContext.Query]: (result, _meta) => `Function \`${result.function}\` at ${range_1.SourceLocation.format(result.loc)}`,
+        [linter_format_1.LintingPrettyPrintContext.Full]: (result, _meta) => `Function \`${result.function}\` at ${range_1.SourceLocation.format(result.loc)} is called without a preceding random seed function like \`set.seed\``
     }
 };
 function getDefaultAssignments() {

package/linter/rules/unused-definition.d.ts

@@ -1,11 +1,11 @@
 import { type LintingResult, LintingRuleCertainty } from '../linter-format';
 import type { MergeableRecord } from '../../util/objects';
-import { type SourceRange } from '../../util/range';
+import { SourceLocation } from '../../util/range';
 import { LintingRuleTag } from '../linter-tags';
 import type { NormalizedAst, ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 export interface UnusedDefinitionResult extends LintingResult {
     variableName?: string;
-    range: SourceRange;
+    loc: SourceLocation;
 }
 export interface UnusedDefinitionConfig extends MergeableRecord {
     /**

package/linter/rules/unused-definition.js

@@ -4,7 +4,6 @@ exports.UNUSED_DEFINITION = void 0;
 const linter_format_1 = require("../linter-format");
 const flowr_search_builder_1 = require("../../search/flowr-search-builder");
 const range_1 = require("../../util/range");
-const dfg_1 = require("../../util/mermaid/dfg");
 const linter_tags_1 = require("../linter-tags");
 const assert_1 = require("../../util/assert");
 const vertex_1 = require("../../dataflow/graph/vertex");
@@ -14,8 +13,8 @@ const InterestingEdgesVariable = edge_1.EdgeType.Reads | edge_1.EdgeType.Calls |
 const InterestingEdgesFunction = edge_1.EdgeType.Reads | edge_1.EdgeType.Calls; // include read as this could print the function definition
 const InterestingEdgesTargets = edge_1.EdgeType.SideEffectOnCall;
 function getDefinitionArguments(def, dfg) {
-    return [...dfg.outgoingEdges(def) ?? []].filter(([, e]) => edge_1.DfEdge.includesType(e, edge_1.EdgeType.DefinedBy))
-        .map(([target]) => target);
+    return dfg.outgoingEdges(def)?.entries().filter(([, e]) => edge_1.DfEdge.includesType(e, edge_1.EdgeType.DefinedBy))
+        .map(([target]) => target).toArray() ?? [];
 }
 function buildQuickFix(variable, dfg, ast) {
     // first we check whether any of the 'Defined by' targets have any obligations - if so, we can not remove the definition
@@ -26,21 +25,21 @@ function buildQuickFix(variable, dfg, ast) {
     }
     const definedBys = getDefinitionArguments(variable.info.id, dfg);
     const hasImportantArgs = definedBys.some(d => dfg.unknownSideEffects.has(d))
-        || definedBys.flatMap(e => [...dfg.outgoingEdges(e) ?? []])
+        || definedBys.flatMap(e => Array.from(dfg.outgoingEdges(e) ?? []))
             .some(([target, e]) => {
             return edge_1.DfEdge.includesType(e, InterestingEdgesTargets) || dfg.unknownSideEffects.has(target);
         });
     if (hasImportantArgs) {
         return undefined; // we can not remove this definition, it has important arguments
     }
-    const totalRangeToRemove = (0, range_1.mergeRanges)([...definedBys.map(d => {
+    const totalRangeToRemove = range_1.SourceLocation.merge([...definedBys.map(d => {
             const vertex = ast.idMap.get(d);
-            return vertex?.info.fullRange ?? vertex?.location;
+            return vertex ? range_1.SourceLocation.fromNode(vertex) : undefined;
         }),
         variable.info.fullRange ?? variable.location]);
     return [{
             type: 'remove',
-            range: totalRangeToRemove,
+            loc: totalRangeToRemove ?? range_1.SourceLocation.invalid(),
             description: `Remove unused definition of \`${variable.lexeme}\``
         }];
 }
@@ -48,13 +47,13 @@ function buildQuickFix(variable, dfg, ast) {
  * consider `x <- function() ...` if we say `x` is unused and propose to remove everything, there should be no separate quick fix for the function definition
  */
 function onlyKeepSupersetOfUnused(elements) {
-    const ranges = elements.flatMap(e => e.quickFix?.map(q => q.range) ?? [e.range]);
-    if (ranges.length <= 1) {
+    const locs = elements.flatMap(e => e.quickFix?.map(q => q.loc) ?? [e.loc]);
+    if (locs.length <= 1) {
         return elements; // nothing to filter, only one element
     }
     return elements.filter(e => {
-        const otherRange = (0, range_1.mergeRanges)((e.quickFix?.map(q => q.range) ?? [e.range]));
-        return !ranges.some(r => (0, range_1.rangeCompare)(r, otherRange) !== 0 && (0, range_1.rangeIsSubsetOf)(otherRange, r)); // there is no smaller remove
+        const otherLoc = range_1.SourceLocation.merge((e.quickFix?.map(q => q.loc) ?? [e.loc])) ?? range_1.SourceLocation.invalid();
+        return !locs.some(r => range_1.SourceLocation.compare(r, otherLoc) !== 0 && range_1.SourceLocation.isSubsetOf(otherLoc, r)); // there is no smaller remove
     });
 }
 exports.UNUSED_DEFINITION = {
@@ -84,7 +83,7 @@ exports.UNUSED_DEFINITION = {
                         certainty: linter_format_1.LintingResultCertainty.Uncertain,
                         variableName,
                         involvedId: element.node.info.id,
-                        range: element.node.info.fullRange ?? element.node.location ?? (0, range_1.rangeFrom)(-1, -1, -1, -1),
+                        loc: range_1.SourceLocation.fromNode(element.node) ?? range_1.SourceLocation.invalid(),
                         quickFix: buildQuickFix(element.node, data.dataflow.graph, data.normalize)
                     }];
             }).filter(assert_1.isNotUndefined)),
@@ -92,8 +91,8 @@ exports.UNUSED_DEFINITION = {
         };
     },
     prettyPrint: {
-        [linter_format_1.LintingPrettyPrintContext.Query]: result => `Definition of \`${result.variableName}\` at ${(0, dfg_1.formatRange)(result.range)}`,
-        [linter_format_1.LintingPrettyPrintContext.Full]: result => `Definition of \`${result.variableName}\` at ${(0, dfg_1.formatRange)(result.range)} is unused`
+        [linter_format_1.LintingPrettyPrintContext.Query]: result => `Definition of \`${result.variableName}\` at ${range_1.SourceLocation.format(result.loc)}`,
+        [linter_format_1.LintingPrettyPrintContext.Full]: result => `Definition of \`${result.variableName}\` at ${range_1.SourceLocation.format(result.loc)} is unused`
     },
     info: {
         name: 'Unused Definitions',

package/linter/rules/useless-loop.d.ts

@@ -1,11 +1,11 @@
 import type { BuiltInProcName } from '../../dataflow/environments/built-in';
 import type { MergeableRecord } from '../../util/objects';
-import type { SourceRange } from '../../util/range';
+import { SourceLocation } from '../../util/range';
 import { type LintingResult, LintingResultCertainty, LintingRuleCertainty } from '../linter-format';
 import { LintingRuleTag } from '../linter-tags';
 export interface UselessLoopResult extends LintingResult {
     name: string;
-    range: SourceRange;
+    loc: SourceLocation;
 }
 export interface UselessLoopConfig extends MergeableRecord {
     /** Function origins that are considered loops */
@@ -25,7 +25,7 @@ export declare const USELESS_LOOP: {
         results: {
             certainty: LintingResultCertainty.Certain;
             name: string;
-            range: SourceRange;
+            loc: [startLine: number, startColumn: number, endLine: number, endColumn: number, f?: string | undefined];
             involvedId: import("../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
         }[];
         '.meta': {

package/linter/rules/useless-loop.js

@@ -4,7 +4,7 @@ exports.USELESS_LOOP = void 0;
 const useless_loop_1 = require("../../control-flow/useless-loop");
 const vertex_1 = require("../../dataflow/graph/vertex");
 const flowr_search_builder_1 = require("../../search/flowr-search-builder");
-const dfg_1 = require("../../util/mermaid/dfg");
+const range_1 = require("../../util/range");
 const linter_format_1 = require("../linter-format");
 const linter_tags_1 = require("../linter-tags");
 exports.USELESS_LOOP = {
@@ -19,7 +19,7 @@ exports.USELESS_LOOP = {
         }).filter(loop => (0, useless_loop_1.onlyLoopsOnce)(loop.node.info.id, dataflow.graph, cfg, normalize, analyzer.inspectContext())).map(res => ({
             certainty: linter_format_1.LintingResultCertainty.Certain,
             name: res.node.lexeme,
-            range: res.node.info.fullRange,
+            loc: range_1.SourceLocation.fromNode(res.node) ?? range_1.SourceLocation.invalid(),
             involvedId: res.node.info.id
         }));
         return {
@@ -30,8 +30,8 @@ exports.USELESS_LOOP = {
         };
     },
     prettyPrint: {
-        [linter_format_1.LintingPrettyPrintContext.Query]: result => `${result.name}-loop at ${(0, dfg_1.formatRange)(result.range)} only loops once`,
-        [linter_format_1.LintingPrettyPrintContext.Full]: result => `${result.name}-loop at ${(0, dfg_1.formatRange)(result.range)} only loops once`
+        [linter_format_1.LintingPrettyPrintContext.Query]: result => `${result.name}-loop at ${range_1.SourceLocation.format(result.loc)} only loops once`,
+        [linter_format_1.LintingPrettyPrintContext.Full]: result => `${result.name}-loop at ${range_1.SourceLocation.format(result.loc)} only loops once`
     },
     info: {
         name: 'Useless Loops',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {

package/project/plugins/file-plugins/files/flowr-namespace-file.js

@@ -207,9 +207,9 @@ function wrapRNodeInNotCall(node, idMap) {
             info: node.info,
             lexeme: 'not',
             content: identifier_1.Identifier.make('not'),
-            location: node.location ?? (0, range_1.invalidRange)(),
+            location: node.location ?? range_1.SourceRange.invalid(),
         },
-        location: node.location ?? (0, range_1.invalidRange)(),
+        location: node.location ?? range_1.SourceRange.invalid(),
         lexeme: 'not',
         arguments: [(0, make_argument_1.toUnnamedArgument)(node, idMap)]
     };

package/queries/catalog/does-call-query/does-call-query-format.js

@@ -7,9 +7,9 @@ exports.DoesCallQueryDefinition = void 0;
 const ansi_1 = require("../../../util/text/ansi");
 const joi_1 = __importDefault(require("joi"));
 const does_call_query_executor_1 = require("./does-call-query-executor");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const args_1 = require("../../../util/text/args");
 const strings_1 = require("../../../util/text/strings");
+const range_1 = require("../../../util/range");
 const FormatError = 'Invalid constraint format, expected format "(left:$id/"regex")"';
 /**
  * Parses a constraint from a string argument.
@@ -80,7 +80,7 @@ exports.DoesCallQueryDefinition = {
             }
             else {
                 const loc = idMap.get(v.call)?.location ?? undefined;
-                result.push(`    - Call with id ${(0, ansi_1.bold)(String(v.call), formatter)} (${(0, dfg_1.formatRange)(loc)})`);
+                result.push(`    - Call with id ${(0, ansi_1.bold)(String(v.call), formatter)} (${range_1.SourceRange.format(loc)})`);
             }
         }
         return true;

package/queries/catalog/inspect-exceptions-query/inspect-exception-query-format.js

@@ -8,8 +8,8 @@ const ansi_1 = require("../../../util/text/ansi");
 const joi_1 = __importDefault(require("joi"));
 const inspect_exception_query_executor_1 = require("./inspect-exception-query-executor");
 const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
+const range_1 = require("../../../util/range");
 const info_1 = require("../../../dataflow/info");
 function inspectExceptionLineParser(_output, line, _config) {
     const criteria = (0, slice_query_parser_1.sliceCriteriaParser)(line[0]);
@@ -28,15 +28,16 @@ exports.InspectExceptionQueryDefinition = {
         result.push(`Query: ${(0, ansi_1.bold)('inspect-exception', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
         const n = await processed.normalize();
         function getLoc(r) {
-            return n.idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r))?.location ?? undefined;
+            const node = n.idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r));
+            return node ? range_1.SourceLocation.fromNode(node) : undefined;
         }
         function getLexeme(r) {
             return n.idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r))?.lexeme ?? String(r);
         }
         for (const [r, v] of Object.entries(out.exceptions)) {
-            result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${(0, dfg_1.formatRange)(getLoc(r))}) ${v.length > 0 ? 'throws exceptions:' : 'does not throw exceptions.'}`);
+            result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${range_1.SourceLocation.format(getLoc(r))}) ${v.length > 0 ? 'throws exceptions:' : 'does not throw exceptions.'}`);
             for (const { id: ex, cds } of v) {
-                result.push(`      - Exception ${(0, info_1.happensInEveryBranch)(cds) ? 'always ' : 'maybe '}thrown at id ${(0, ansi_1.bold)(String(ex), formatter)} "${getLexeme(ex)}" (${(0, dfg_1.formatRange)(getLoc(ex))}, cds: ${cds?.map(c => c.when + ':' + (0, dfg_1.formatRange)(getLoc(c.id))).join(', ') ?? 'none'})`);
+                result.push(`      - Exception ${(0, info_1.happensInEveryBranch)(cds) ? 'always ' : 'maybe '}thrown at id ${(0, ansi_1.bold)(String(ex), formatter)} "${getLexeme(ex)}" (${range_1.SourceLocation.format(getLoc(ex))}, cds: ${cds?.map(c => c.when + ':' + range_1.SourceLocation.format(getLoc(c.id))).join(', ') ?? 'none'})`);
             }
         }
         return true;

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

@@ -4,6 +4,7 @@ exports.executeHigherOrderQuery = executeHigherOrderQuery;
 const higher_order_function_1 = require("../../../dataflow/fn/higher-order-function");
 const parse_1 = require("../../../slicing/criterion/parse");
 const vertex_1 = require("../../../dataflow/graph/vertex");
+const invert_dfg_1 = require("../../../dataflow/graph/invert-dfg");
 /**
  * Execute higher-order function inspection queries on the given analyzer.
  */
@@ -34,9 +35,13 @@ async function executeHigherOrderQuery({ analyzer }, queries) {
     const graph = (await analyzer.dataflow()).graph;
     const fns = graph.verticesOfType(vertex_1.VertexType.FunctionDefinition)
         .filter(([, v]) => filterFor.size === 0 || filterFor.has(v.id));
+    let invertedGraph;
+    if (filterFor.size === 0 || filterFor.size > 10) {
+        invertedGraph = (0, invert_dfg_1.invertDfg)(graph, analyzer.inspectContext().env.makeCleanEnv());
+    }
     const result = {};
     for (const [id] of fns) {
-        result[id] = (0, higher_order_function_1.isFunctionHigherOrder)(id, graph, analyzer.inspectContext());
+        result[id] = (0, higher_order_function_1.isFunctionHigherOrder)(id, graph, analyzer.inspectContext(), invertedGraph);
     }
     return {
         '.meta': {

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

@@ -17,7 +17,7 @@ export interface InspectHigherOrderQuery extends BaseQueryFormat {
 export interface InspectHigherOrderQueryResult extends BaseQueryResult {
     readonly higherOrder: Record<NodeId, boolean>;
 }
-declare function inspectHoLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'inspect-higher-order'>;
+declare function inspectHoLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'inspect-higher-order'>;
 export declare const InspectHigherOrderQueryDefinition: {
     readonly executor: typeof executeHigherOrderQuery;
     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>;

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

@@ -8,9 +8,9 @@ const ansi_1 = require("../../../util/text/ansi");
 const joi_1 = __importDefault(require("joi"));
 const inspect_higher_order_query_executor_1 = require("./inspect-higher-order-query-executor");
 const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
-function inspectHoLineParser(output, line, _config) {
+const range_1 = require("../../../util/range");
+function inspectHoLineParser(_output, line, _config) {
     const criteria = (0, slice_query_parser_1.sliceCriteriaParser)(line[0]);
     return {
         query: {
@@ -26,8 +26,9 @@ exports.InspectHigherOrderQueryDefinition = {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('inspect-higher-order', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
         for (const [r, v] of Object.entries(out.higherOrder)) {
-            const loc = (await processed.normalize()).idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r))?.location ?? undefined;
-            result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${(0, dfg_1.formatRange)(loc)}) is ${v ? '' : 'not '}a higher-order function`);
+            const node = (await processed.normalize()).idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r));
+            const loc = node ? range_1.SourceLocation.fromNode(node) : undefined;
+            result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${range_1.SourceLocation.format(loc)}) is ${v ? '' : 'not '}a higher-order function`);
         }
         return true;
     },

package/queries/catalog/inspect-recursion-query/inspect-recursion-query-format.js

@@ -8,8 +8,8 @@ const ansi_1 = require("../../../util/text/ansi");
 const joi_1 = __importDefault(require("joi"));
 const inspect_recursion_query_executor_1 = require("./inspect-recursion-query-executor");
 const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
-const dfg_1 = require("../../../util/mermaid/dfg");
 const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
+const range_1 = require("../../../util/range");
 function inspectRecLineParser(output, line, _config) {
     const criteria = (0, slice_query_parser_1.sliceCriteriaParser)(line[0]);
     return {
@@ -26,8 +26,9 @@ exports.InspectRecursionQueryDefinition = {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('inspect-recursion', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
         for (const [r, v] of Object.entries(out.recursive)) {
-            const loc = (await processed.normalize()).idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r))?.location ?? undefined;
-            result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${(0, dfg_1.formatRange)(loc)}) is ${v ? '' : 'not '}recursive`);
+            const node = (await processed.normalize()).idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r));
+            const loc = node ? range_1.SourceLocation.fromNode(node) : undefined;
+            result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${range_1.SourceLocation.format(loc)}) is ${v ? '' : 'not '}recursive`);
         }
         return true;
     },

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

@@ -3,7 +3,7 @@ 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, type LintingResults } from '../../../linter/linter-format';
+import { type ConfiguredLintingRule, 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';

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

@@ -82,13 +82,22 @@ exports.LinterQueryDefinition = {
     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));
+        const allDidFail = Object.values(out.results).every(linter_format_1.LintingResults.isError);
         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'));
             }
+            else if (Object.values(out.results).length === 1) {
+                const fst = Object.values(out.results)[0];
+                result.push('Error: ' + linter_format_1.LintingResults.stringifyError(fst));
+                if (fst.error instanceof Error) {
+                    // print stack
+                    result.push('Stack Trace:\n' + fst.error.stack);
+                }
+            }
+            result.push('If you consider this an error that should be fixed, please report a bug: ' + (0, assert_1.getGuardIssueUrl)('linting rule threw an error'));
             return true;
         }
         for (const [ruleName, results] of Object.entries(out.results)) {
@@ -107,19 +116,14 @@ exports.LinterQueryDefinition = {
     }).description('The linter query lints for the given set of rules and returns the result.'),
     flattenInvolvedNodes: (queryResults) => {
         const out = queryResults;
-        return Object.values(out.results).flatMap(v => {
-            if ((0, linter_format_1.isLintingResultsError)(v)) {
-                return [];
-            }
-            return v.results.flatMap(v => Array.isArray(v.involvedId) ? v.involvedId : [v.involvedId]);
-        }).filter(assert_1.isNotUndefined);
+        return Object.values(out.results).flatMap(v => Array.from(linter_format_1.LintingResults.allInvolvedIds(v))).filter(assert_1.isNotUndefined);
     }
 };
 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)) {
-        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;
+    if (linter_format_1.LintingResults.isError(results)) {
+        const error = linter_format_1.LintingResults.stringifyError(results).includes('At least one request must be set') ? 'No requests to lint for were found in the analysis.' : 'Error during execution of rule: ' + linter_format_1.LintingResults.stringifyError(results);
         result.push(`       ╰ ${error}`);
         return;
     }

package/queries/query.d.ts

@@ -191,7 +191,7 @@ export declare const SupportedQueries: {
     readonly 'inspect-higher-order': {
         readonly executor: typeof import("./catalog/inspect-higher-order-query/inspect-higher-order-query-executor").executeHigherOrderQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, processed: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"inspect-higher-order">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"inspect-higher-order">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };

package/r-bridge/lang-4.x/ast/parser/main/normalize-meta.d.ts

@@ -1,5 +1,5 @@
 import type { JsonEntry, NamedJsonEntry } from '../json/format';
-import { type SourceRange } from '../../../../../util/range';
+import { SourceRange } from '../../../../../util/range';
 import { type RawRType } from '../../model/type';
 import type { RNode } from '../../model/model';
 import type { RExpressionList } from '../../model/nodes/r-expression-list';

package/r-bridge/lang-4.x/ast/parser/main/normalize-meta.js

@@ -15,7 +15,7 @@ const type_1 = require("../../model/type");
  * Given a JSON element, extract the source location of the corresponding element in the R-ast
  */
 function extractLocation(ast) {
-    return (0, range_1.rangeFrom)(ast.line1, ast.col1, ast.line2, ast.col2);
+    return range_1.SourceRange.from(ast.line1, ast.col1, ast.line2, ast.col2);
 }
 /**
  * The JSON object that represents the input contains various meta-information.
@@ -69,7 +69,7 @@ function retrieveOpName(operator) {
 function ensureChildrenAreLhsAndRhsOrdered(first, second) {
     const firstOtherLoc = extractLocation(first);
     const secondOtherLoc = extractLocation(second);
-    if (!(0, range_1.rangeStartsCompletelyBefore)(firstOtherLoc, secondOtherLoc)) {
+    if (!range_1.SourceRange.startsCompletelyBefore(firstOtherLoc, secondOtherLoc)) {
         throw new normalizer_data_1.ParseError(`expected the first child to be the lhs, yet received ${JSON.stringify(first)} & ${JSON.stringify(second)}`);
     }
 }

package/r-bridge/lang-4.x/tree-sitter/tree-sitter-normalize.js

@@ -594,7 +594,7 @@ function convertTreeNode(node) {
 }
 function makeSourceRange(node) {
     if (!node) {
-        return (0, range_1.invalidRange)();
+        return range_1.SourceRange.invalid();
     }
     if (node.startPosition && node.endPosition) {
         return [

package/r-bridge/roxygen2/roxygen-parse.js

@@ -49,7 +49,7 @@ function parseRoxygenCommentsOfNode(node, idMap) {
         attachedTo: cur?.info.id,
         requestNode: node.info.id,
         range: [
-            ...(0, range_1.mergeRanges)(comments.map(c => c.location)),
+            ...range_1.SourceRange.merge(comments.map(c => c.location)),
             comments.find(c => c.info.file)?.info.file
         ]
     };

package/statistics/features/supported/defined-functions/defined-functions.d.ts

@@ -1,7 +1,7 @@
 import type { Feature } from '../../feature';
 import type { Writable } from 'ts-essentials';
 import type { MergeableRecord } from '../../../../util/objects';
-import { type SourcePosition } from '../../../../util/range';
+import { SourcePosition } from '../../../../util/range';
 declare const initialFunctionDefinitionInfo: {
     /** all, anonymous, assigned, non-assigned, ... */
     total: number;

package/statistics/features/supported/defined-functions/defined-functions.js

@@ -31,13 +31,13 @@ function retrieveAllCallsites(input, node, recursiveCalls) {
         }
         const loc = input.normalizedRAst.idMap.get(target)?.location;
         if (loc) {
-            callsites.push((0, range_1.getRangeStart)(loc));
+            callsites.push(range_1.SourceRange.getStart(loc));
         }
     }
     for (const call of recursiveCalls) {
         const loc = call.location;
         if (loc) {
-            callsites.push((0, range_1.getRangeStart)(loc));
+            callsites.push(range_1.SourceRange.getStart(loc));
         }
     }
     return callsites;
@@ -61,7 +61,7 @@ function visitDefinitions(info, input) {
             .map(([vertex]) => {
             const l = graph.idMap?.get(vertex.id)?.location;
             return {
-                location: l ? (0, range_1.getRangeStart)(l) : [-1, -1]
+                location: l ? range_1.SourceRange.getStart(l) : range_1.SourcePosition.invalid()
             };
         });
         if (definitionStack.length > 0) {
@@ -112,7 +112,7 @@ function visitDefinitions(info, input) {
         const lexeme = node.info.fullLexeme;
         const lexemeSplit = lexeme?.split('\n');
         allDefinitions.push({
-            location: (0, range_1.getRangeStart)(node.location),
+            location: range_1.SourceRange.getStart(node.location),
             callsites: retrieveAllCallsites(input, node, recursiveCalls),
             numberOfParameters: node.parameters.length,
             returns: returnTypes,