@eagleoutice/flowr 2.9.11 → 2.9.13

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

@@ -2,20 +2,20 @@ import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import { executeConfigQuery } from './config-query-executor';
 import { type OutputFormatter } from '../../../util/text/ansi';
 import Joi from 'joi';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 import type { DeepPartial } from 'ts-essentials';
 import type { ParsedQueryLine, Query } from '../../query';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
 import type { CommandCompletions } from '../../../cli/repl/core';
 export interface ConfigQuery extends BaseQueryFormat {
     readonly type: 'config';
-    readonly update?: DeepPartial<FlowrConfigOptions>;
+    readonly update?: DeepPartial<FlowrConfig>;
 }
 export interface ConfigQueryResult extends BaseQueryResult {
-    readonly config: FlowrConfigOptions;
+    readonly config: FlowrConfig;
 }
-declare function configReplCompleter(partialLine: readonly string[], _startingNewArg: boolean, config: FlowrConfigOptions): CommandCompletions;
-declare function configQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'config'>;
+declare function configReplCompleter(partialLine: readonly string[], _startingNewArg: boolean, config: FlowrConfig): CommandCompletions;
+declare function configQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'config'>;
 export declare const ConfigQueryDefinition: {
     readonly executor: typeof executeConfigQuery;
     readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[], queries: readonly Query[]) => true;

package/queries/catalog/dependencies-query/function-info/library-functions.js

@@ -13,6 +13,7 @@ exports.LibraryFunctions = [
     { package: 'easypackages', name: 'from_import', argIdx: 0, argName: 'package', resolveValue: true },
     { package: 'easypackages', name: 'libraries', argIdx: 'unnamed', resolveValue: true },
     { package: 'librarian', name: 'shelf', argIdx: 'unnamed', resolveValue: true },
-    { package: 'devtools', name: 'load_all', argIdx: 0, argName: 'path', resolveValue: true }
+    { package: 'devtools', name: 'load_all', argIdx: 0, argName: 'path', resolveValue: true, defaultValue: '.' },
+    { package: 'devtools', name: 'load_code', argIdx: 0, argName: 'path', resolveValue: true, defaultValue: '.' },
 ];
 //# sourceMappingURL=library-functions.js.map

package/queries/catalog/dependencies-query/function-info/read-functions.js

@@ -93,7 +93,7 @@ exports.ReadFunctions = [
     { package: 'XLConnect', name: 'loadWorkbook', argIdx: 0, argName: 'filename', resolveValue: true },
     { package: 'DiagrammeR', name: 'import_graph', argIdx: 0, argName: 'graph_file', resolveValue: true },
     { package: 'DiagrammeR', name: 'open_graph', argIdx: 0, argName: 'file', resolveValue: true },
-    { package: 'highcharter', name: 'download_map_data', argIdx: 0, argName: 'url', resolveValue: true },
+    { package: 'highcharter', name: 'download_map_data', argIdx: 0, argName: 'url', resolveValue: true, defaultValue: 'custom/world.js' },
     { package: 'rvest', name: 'read_html', argIdx: 0, argName: 'x', resolveValue: true },
     { package: 'rvest', name: 'read_html_live', argIdx: 0, argName: 'url', resolveValue: true },
     { package: 'stats', name: 'read.ftable', argIdx: 0, argName: 'file', resolveValue: true },

package/queries/catalog/dependencies-query/function-info/visualize-functions.js

@@ -9,5 +9,13 @@ exports.VisualizeFunctions =
 // plot creation
 default_builtin_config_1.GgPlotCreate.map(f => ({ package: 'ggplot2', name: f })).concat(default_builtin_config_1.TinyPlotCrate.map(f => ({ package: 'tinyplot', name: f })), default_builtin_config_1.GraphicsPlotCreate.map(f => ({ name: f })), 
 // plot modification
-default_builtin_config_1.GgPlotImplicitAddons.concat(default_builtin_config_1.GgPlotAddons).map(f => ({ package: 'ggplot2', name: f, linkTo: LinkToPlotCreation })), default_builtin_config_1.TinyPlotAddons.map(f => ({ package: 'tinyplot', name: f, linkTo: LinkToPlotCreation })), default_builtin_config_1.GraphicsPlotAddons.map(f => ({ name: f, linkTo: LinkToPlotCreation })));
+default_builtin_config_1.GgPlotImplicitAddons.concat(default_builtin_config_1.GgPlotAddons).map(f => ({ package: 'ggplot2', name: f, linkTo: LinkToPlotCreation })), default_builtin_config_1.TinyPlotAddons.map(f => ({ package: 'tinyplot', name: f, linkTo: LinkToPlotCreation })), default_builtin_config_1.GraphicsPlotAddons.map(f => ({ name: f, linkTo: LinkToPlotCreation }))).map(f => {
+    if (f.name !== 'hist') {
+        return f;
+    }
+    else {
+        // ignore if plot is false.
+        return { ...f, ignoreIf: 'arg-false', additionalArgs: { val: { argIdx: 17, argName: 'plot', resolveValue: true } } };
+    }
+});
 //# sourceMappingURL=visualize-functions.js.map

package/queries/catalog/dependencies-query/function-info/write-functions.js

@@ -115,5 +115,6 @@ exports.WriteFunctions = [
     { package: 'rpolars', name: 'write_csv', argIdx: 0, argName: 'file', resolveValue: true, ignoreIf: 'arg-missing' },
     { package: 'rpolars', name: 'write_ndjson', argIdx: 0, argName: 'file', resolveValue: true, ignoreIf: 'arg-missing' },
     { package: 'rpolars', name: 'write_parquet', argIdx: 0, argName: 'file', resolveValue: true, ignoreIf: 'arg-missing' },
+    { package: 'magick', name: 'image_write', argIdx: 1, argName: 'path', resolveValue: true, ignoreIf: 'arg-missing' },
 ];
 //# sourceMappingURL=write-functions.js.map

package/queries/catalog/df-shape-query/df-shape-query-format.d.ts

@@ -2,7 +2,7 @@ import Joi from 'joi';
 import type { DataFrameDomain } from '../../../abstract-interpretation/data-frame/dataframe-domain';
 import type { StateAbstractDomain } from '../../../abstract-interpretation/domains/state-abstract-domain';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import type { ParsedQueryLine } from '../../query';
@@ -15,7 +15,7 @@ export interface DfShapeQuery extends BaseQueryFormat {
 export interface DfShapeQueryResult extends BaseQueryResult {
     domains: StateAbstractDomain<DataFrameDomain> | Map<SingleSlicingCriterion, DataFrameDomain | undefined>;
 }
-declare function dfShapeQueryLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'df-shape'>;
+declare function dfShapeQueryLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'df-shape'>;
 export declare const DfShapeQueryDefinition: {
     readonly executor: typeof executeDfShapeQuery;
     readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;

package/queries/catalog/does-call-query/does-call-query-format.d.ts

@@ -5,7 +5,7 @@ import { executeDoesCallQuery } from './does-call-query-executor';
 import { type NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 interface CallsIdConstraint {
     readonly type: 'calls-id';
     /** The id of the function being called. */
@@ -40,7 +40,7 @@ export interface DoesCallQueryResult extends BaseQueryResult {
     /** Results are either false (does not call) or an object with details on the calls made */
     readonly results: Record<string, FindAllCallsResult | false>;
 }
-declare function doesCallQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'does-call'>;
+declare function doesCallQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'does-call'>;
 export declare const DoesCallQueryDefinition: {
     readonly executor: typeof executeDoesCallQuery;
     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/files-query/files-query-format.d.ts

@@ -5,7 +5,7 @@ import { executeFileQuery } from './files-query-executor';
 import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { FileRole } from '../../../project/context/flowr-file';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 import type { CommandCompletions } from '../../../cli/repl/core';
 /**
  * Returns the content(s) of all files matching the given pattern.
@@ -24,8 +24,8 @@ export interface FileQueryInfo<T = object> {
 export interface FilesQueryResult extends BaseQueryResult {
     files: FileQueryInfo[];
 }
-declare function filesQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'files'>;
-declare function filesQueryCompleter(line: readonly string[], startingNewArg: boolean, _config: FlowrConfigOptions): CommandCompletions;
+declare function filesQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'files'>;
+declare function filesQueryCompleter(line: readonly string[], startingNewArg: boolean, _config: FlowrConfig): CommandCompletions;
 export declare const FilesQueryDefinition: {
     readonly executor: typeof executeFileQuery;
     readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;

package/queries/catalog/inspect-exceptions-query/inspect-exception-query-format.d.ts

@@ -4,7 +4,7 @@ import type { ParsedQueryLine } from '../../query';
 import { executeExceptionQuery } from './inspect-exception-query-executor';
 import { 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';
+import type { FlowrConfig } from '../../../config';
 import type { ExceptionPoint } from '../../../dataflow/fn/exceptions-of-function';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 /**
@@ -23,7 +23,7 @@ export interface InspectExceptionQueryResult extends BaseQueryResult {
      */
     readonly exceptions: Record<NodeId, ExceptionPoint[]>;
 }
-declare function inspectExceptionLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'inspect-exception'>;
+declare function inspectExceptionLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'inspect-exception'>;
 export declare const InspectExceptionQueryDefinition: {
     readonly executor: typeof executeExceptionQuery;
     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.d.ts

@@ -5,7 +5,7 @@ import { executeHigherOrderQuery } from './inspect-higher-order-query-executor';
 import { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 /**
  * Either returns all function definitions alongside whether they are higher-order functions,
  * or just those matching the filters.
@@ -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: FlowrConfig): 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-recursion-query/inspect-recursion-query-format.d.ts

@@ -5,7 +5,7 @@ import { executeRecursionQuery } from './inspect-recursion-query-executor';
 import { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
-import type { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 /**
  * Either returns all function definitions alongside whether they are recursive,
  * or just those matching the filters.
@@ -17,7 +17,7 @@ export interface InspectRecursionQuery extends BaseQueryFormat {
 export interface InspectRecursionQueryResult extends BaseQueryResult {
     readonly recursive: Record<NodeId, boolean>;
 }
-declare function inspectRecLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'inspect-recursion'>;
+declare function inspectRecLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'inspect-recursion'>;
 export declare const InspectRecursionQueryDefinition: {
     readonly executor: typeof executeRecursionQuery;
     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/linter-query/linter-query-format.d.ts

@@ -4,7 +4,7 @@ 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 { FlowrConfigOptions } from '../../../config';
+import type { FlowrConfig } from '../../../config';
 import type { ReplOutput } from '../../../cli/repl/commands/repl-main';
 import type { CommandCompletions } from '../../../cli/repl/core';
 export interface LinterQuery extends BaseQueryFormat {
@@ -23,8 +23,8 @@ 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;
+declare function linterQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'linter'>;
+declare function linterQueryCompleter(line: readonly string[], startingNewArg: boolean, _config: FlowrConfig): CommandCompletions;
 export declare const LinterQueryDefinition: {
     readonly executor: typeof executeLinterQuery;
     readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;

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

@@ -6,7 +6,7 @@ import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/nod
 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 { FlowrConfig } from '../../../config';
 import type { ParsedQueryLine } from '../../query';
 export interface LocationMapQuery extends BaseQueryFormat {
     readonly type: 'location-map';
@@ -25,7 +25,7 @@ export interface LocationMapQueryResult extends BaseQueryResult {
         ids: Record<NodeId, [FileId, SourceRange]>;
     };
 }
-declare function locationMapLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'location-map'>;
+declare function locationMapLineParser(_output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'location-map'>;
 export declare const LocationMapQueryDefinition: {
     readonly executor: typeof executeLocationMapQuery;
     readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => true;

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

@@ -6,7 +6,7 @@ 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';
+import type { FlowrConfig } from '../../../config';
 export interface OriginQuery extends BaseQueryFormat {
     readonly type: 'origin';
     /** The slicing criteria to use */
@@ -15,7 +15,7 @@ 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'>;
+declare function originQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'origin'>;
 export declare const OriginQueryDefinition: {
     readonly executor: typeof executeResolveValueQuery;
     readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;

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

@@ -18,15 +18,15 @@ async function executeResolveValueQuery({ analyzer }, queries) {
     const start = Date.now();
     const results = {};
     const graph = (await analyzer.dataflow()).graph;
-    const ast = await analyzer.normalize();
+    const idMap = (await analyzer.normalize()).idMap;
     for (const query of queries) {
         const key = fingerPrintOfQuery(query);
         if (results[key]) {
             log_1.log.warn(`Duplicate Key for resolve-value-query: ${key}, skipping...`);
         }
         const values = query.criteria
-            .map(criteria => (0, parse_1.slicingCriterionToId)(criteria, ast.idMap))
-            .flatMap(ident => (0, alias_tracking_1.resolveIdToValue)(ident, { graph, full: true, idMap: ast.idMap, resolve: analyzer.flowrConfig.solver.variables, ctx: analyzer.inspectContext() }));
+            .map(criteria => (0, parse_1.slicingCriterionToId)(criteria, idMap))
+            .flatMap(ident => (0, alias_tracking_1.resolveIdToValue)(ident, { graph, full: true, idMap, resolve: analyzer.flowrConfig.solver.variables, ctx: analyzer.inspectContext() }));
         results[key] = {
             values: values
         };

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

@@ -5,7 +5,7 @@ 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';
+import type { FlowrConfig } from '../../../config';
 export interface ResolveValueQuery extends BaseQueryFormat {
     readonly type: 'resolve-value';
     /** The slicing criteria to use */
@@ -16,7 +16,7 @@ export interface ResolveValueQueryResult extends BaseQueryResult {
         values: ResolveResult[];
     }>;
 }
-declare function resolveValueLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'resolve-value'>;
+declare function resolveValueLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'resolve-value'>;
 export declare const ResolveValueQueryDefinition: {
     readonly executor: typeof executeResolveValueQuery;
     readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;

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

@@ -30,6 +30,10 @@ exports.ResolveValueQueryDefinition = {
     executor: resolve_value_query_executor_1.executeResolveValueQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
+        if (out === undefined || typeof out !== 'object' || !('.meta' in out)) {
+            result.push(formatter.format('Resolve value failed (maybe your criterion does not exist?)!', { color: 1 /* Colors.Red */, effect: ansi_1.ColorEffect.Foreground, style: 1 /* FontStyles.Bold */ }));
+            return true;
+        }
         result.push(`Query: ${(0, ansi_1.bold)('resolve-value', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [fingerprint, obj] of Object.entries(out.results)) {
             const { criteria } = JSON.parse(fingerprint);

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

@@ -8,7 +8,7 @@ import { executeStaticSliceQuery } from './static-slice-query-executor';
 import { SliceDirection } from '../../../core/steps/all/static-slicing/00-slice';
 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';
+import type { FlowrConfig } from '../../../config';
 /** Calculates and returns all clusters encountered in the dataflow graph. */
 export interface StaticSliceQuery extends BaseQueryFormat {
     readonly type: 'static-slice';
@@ -31,7 +31,7 @@ export interface StaticSliceQueryResult extends BaseQueryResult {
      */
     results: Record<string, Omit<PipelineOutput<typeof DEFAULT_SLICING_PIPELINE>, keyof PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>> | Omit<PipelineOutput<typeof DEFAULT_SLICE_WITHOUT_RECONSTRUCT_PIPELINE>, keyof PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>>>;
 }
-declare function sliceQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'static-slice'>;
+declare function sliceQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfig): ParsedQueryLine<'static-slice'>;
 export declare const StaticSliceQueryDefinition: {
     readonly executor: typeof executeStaticSliceQuery;
     readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;

package/queries/query.d.ts

@@ -23,7 +23,7 @@ import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { type ControlFlowQuery } from './catalog/control-flow-query/control-flow-query-format';
 import { type DfShapeQuery } from './catalog/df-shape-query/df-shape-query-format';
 import type { AsyncOrSync } from 'ts-essentials';
-import type { FlowrConfigOptions } from '../config';
+import type { FlowrConfig } from '../config';
 import { type InspectHigherOrderQuery } from './catalog/inspect-higher-order-query/inspect-higher-order-query-format';
 import type { ReadonlyFlowrAnalysisProvider } from '../project/flowr-analyzer';
 import type { ReplOutput } from '../cli/repl/commands/repl-main';
@@ -53,9 +53,9 @@ export interface ParsedQueryLine<QueryType extends BaseQueryFormat['type']> {
 export interface SupportedQuery<QueryType extends BaseQueryFormat['type'] = BaseQueryFormat['type']> {
     executor: QueryExecutor<QueryArgumentsWithType<QueryType>, Promise<BaseQueryResult>>;
     /** optional completion in, e.g., the repl */
-    completer?: (splitLine: readonly string[], startingNewArg: boolean, config: FlowrConfigOptions) => CommandCompletions;
+    completer?: (splitLine: readonly string[], startingNewArg: boolean, config: FlowrConfig) => CommandCompletions;
     /** optional query construction from an, e.g., repl line */
-    fromLine?: (output: ReplOutput, splitLine: readonly string[], config: FlowrConfigOptions) => ParsedQueryLine<QueryType>;
+    fromLine?: (output: ReplOutput, splitLine: readonly string[], config: FlowrConfig) => ParsedQueryLine<QueryType>;
     /**
      * Generates an ASCII summary of the query result to be printed in, e.g., the REPL.
      * @returns whether a summary was produced (`true` if so, `false` if not, in this case a default/generic summary will be created)
@@ -79,8 +79,8 @@ export declare const SupportedQueries: {
     readonly config: {
         readonly executor: typeof import("./catalog/config-query/config-query-executor").executeConfigQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[], queries: readonly Query[]) => true;
-        readonly completer: (partialLine: readonly string[], _startingNewArg: boolean, config: FlowrConfigOptions) => CommandCompletions;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"config">;
+        readonly completer: (partialLine: readonly string[], _startingNewArg: boolean, config: FlowrConfig) => CommandCompletions;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"config">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
@@ -105,7 +105,7 @@ export declare const SupportedQueries: {
     readonly 'does-call': {
         readonly executor: typeof import("./catalog/does-call-query/does-call-query-executor").executeDoesCallQuery;
         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<"does-call">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"does-call">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
@@ -119,15 +119,15 @@ export declare const SupportedQueries: {
         readonly executor: typeof import("./catalog/df-shape-query/df-shape-query-executor").executeDfShapeQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly jsonFormatter: (queryResults: BaseQueryResult) => object;
-        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"df-shape">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"df-shape">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly files: {
         readonly executor: typeof import("./catalog/files-query/files-query-executor").executeFileQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfigOptions) => CommandCompletions;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"files">;
+        readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfig) => CommandCompletions;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"files">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (_: BaseQueryResult) => NodeId[];
     };
@@ -152,7 +152,7 @@ export declare const SupportedQueries: {
     readonly 'static-slice': {
         readonly executor: typeof import("./catalog/static-slice-query/static-slice-query-executor").executeStaticSliceQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"static-slice">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"static-slice">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
@@ -165,7 +165,7 @@ export declare const SupportedQueries: {
     readonly 'location-map': {
         readonly executor: typeof import("./catalog/location-map-query/location-map-query-executor").executeLocationMapQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"location-map">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"location-map">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
@@ -184,28 +184,28 @@ export declare const SupportedQueries: {
     readonly 'inspect-exception': {
         readonly executor: typeof import("./catalog/inspect-exceptions-query/inspect-exception-query-executor").executeExceptionQuery;
         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-exception">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"inspect-exception">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     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: FlowrConfig) => ParsedQueryLine<"inspect-higher-order">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'inspect-recursion': {
         readonly executor: typeof import("./catalog/inspect-recursion-query/inspect-recursion-query-executor").executeRecursionQuery;
         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-recursion">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"inspect-recursion">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'resolve-value': {
         readonly executor: typeof import("./catalog/resolve-value-query/resolve-value-query-executor").executeResolveValueQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"resolve-value">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"resolve-value">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
@@ -218,15 +218,15 @@ export declare const SupportedQueries: {
     readonly origin: {
         readonly executor: typeof import("./catalog/origin-query/origin-query-executor").executeResolveValueQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"origin">;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"origin">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly linter: {
         readonly executor: typeof import("./catalog/linter-query/linter-query-executor").executeLinterQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfigOptions) => CommandCompletions;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"linter">;
+        readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfig) => CommandCompletions;
+        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfig) => ParsedQueryLine<"linter">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => ((string & {
             __brand?: "node-id";

package/r-bridge/lang-4.x/ast/model/model.d.ts

@@ -258,13 +258,18 @@ export declare const RNode: {
      * Returns the direct parent of a node.
      * Usually, only root nodes do not have a parent, and you can assume that there is a
      * linear chain of parents leading to the root node.
+     * @see {@link iterateParents} - to get all parents of a node
      */
-    readonly directParent: <OtherInfo>(this: void, node: RNode<OtherInfo & ParentInformation>, idMap: Map<NodeId, RNode<OtherInfo>>) => RNode<OtherInfo> | undefined;
+    readonly directParent: <OtherInfo>(this: void, node: RNode<OtherInfo & ParentInformation>, idMap: Map<NodeId, RNode<OtherInfo & ParentInformation>>) => RNode<OtherInfo & ParentInformation> | undefined;
+    /**
+     * Returns an iterable of all parents of a node, starting with the direct parent and ending with the root node.
+     */
+    readonly iterateParents: <OtherInfo>(this: void, node: RNode<OtherInfo & ParentInformation> | undefined, idMap: Map<NodeId, RNode<OtherInfo & ParentInformation>>) => Generator<RNode<OtherInfo & ParentInformation>>;
     /**
      * In contrast to the nesting stored in the {@link RNode} structure,
      * this function calculates the depth of a node by counting the number of parents until the root node is reached.
      */
-    readonly depth: (this: void, node: RNode, idMap: Map<NodeId, RNode>) => number;
+    readonly depth: (this: void, node: RNode<ParentInformation>, idMap: Map<NodeId, RNode<ParentInformation>>) => number;
     /**
      * Collects all node ids within a tree given by a respective root node, but stops collecting at nodes where the given `stop` function returns `true`.
      * <p>

package/r-bridge/lang-4.x/ast/model/model.js

@@ -200,6 +200,7 @@ exports.RNode = {
      * Returns the direct parent of a node.
      * Usually, only root nodes do not have a parent, and you can assume that there is a
      * linear chain of parents leading to the root node.
+     * @see {@link iterateParents} - to get all parents of a node
      */
     directParent(node, idMap) {
         const parentId = node.info.parent;
@@ -208,6 +209,18 @@ exports.RNode = {
         }
         return idMap.get(parentId);
     },
+    /**
+     * Returns an iterable of all parents of a node, starting with the direct parent and ending with the root node.
+     */
+    *iterateParents(node, idMap) {
+        let currentNode = node;
+        while (currentNode) {
+            currentNode = exports.RNode.directParent(currentNode, idMap);
+            if (currentNode) {
+                yield currentNode;
+            }
+        }
+    },
     /**
      * In contrast to the nesting stored in the {@link RNode} structure,
      * this function calculates the depth of a node by counting the number of parents until the root node is reached.

package/r-bridge/lang-4.x/ast/parser/json/parser.d.ts

@@ -1,7 +1,7 @@
 import { type IdGenerator, type NormalizedAst } from '../../model/processing/decorate';
 import type { NoInfo } from '../../model/model';
 import type { ParseStepOutput, ParseStepOutputSingleFile } from '../../../../parser';
-import { type FlowrConfigOptions } from '../../../../../config';
+import { FlowrConfig } from '../../../../../config';
 import type { Tree } from 'web-tree-sitter';
 import { RProject } from '../../model/nodes/r-project';
 export declare const parseLog: import("tslog").Logger<import("tslog").ILogObj>;
@@ -19,4 +19,4 @@ export declare function normalizeButNotDecorated({ parsed, filePath }: ParseStep
 /**
  * Tree-Sitter pendant to {@link normalize}.
  */
-export declare function normalizeTreeSitter(parsed: ParseStepOutput<Tree>, getId: IdGenerator<NoInfo> | undefined, config: FlowrConfigOptions): NormalizedAst;
+export declare function normalizeTreeSitter(parsed: ParseStepOutput<Tree>, getId?: IdGenerator<NoInfo>, config?: FlowrConfig): NormalizedAst;

package/r-bridge/lang-4.x/ast/parser/json/parser.js

@@ -32,8 +32,8 @@ function normalizeButNotDecorated({ parsed, filePath }) {
 /**
  * Tree-Sitter pendant to {@link normalize}.
  */
-function normalizeTreeSitter(parsed, getId = (0, decorate_1.deterministicCountingIdGenerator)(0), config) {
-    const lax = (0, config_1.getEngineConfig)(config, 'tree-sitter')?.lax;
+function normalizeTreeSitter(parsed, getId = (0, decorate_1.deterministicCountingIdGenerator)(0), config = config_1.FlowrConfig.default()) {
+    const lax = config_1.FlowrConfig.getForEngine(config, 'tree-sitter')?.lax;
     const result = (0, decorate_1.decorateAst)((0, tree_sitter_normalize_1.normalizeTreeSitterTreeToAst)(parsed.files, lax), { getId });
     result.hasError = parsed.files.some(p => p.parsed.rootNode.hasError);
     return result;

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

@@ -224,14 +224,18 @@ function convertTreeNode(node) {
                 }
             }
             case tree_sitter_types_1.TreeSitterType.UnaryOperator: {
-                const [op, operand] = nonErrorChildren(node);
+                const [comments, children] = splitComments(nonErrorChildren(node));
+                const [op, operand] = children;
                 return {
                     type: type_1.RType.UnaryOp,
                     operand: convertTreeNode(operand),
                     location: makeSourceRange(op),
                     operator: op.text,
                     lexeme: op.text,
-                    ...defaultInfo
+                    info: {
+                        ...defaultInfo.info,
+                        adToks: comments.map(c => c[1]),
+                    }
                 };
             }
             case tree_sitter_types_1.TreeSitterType.NamespaceOperator: {

package/statistics/statistics.d.ts

@@ -4,7 +4,7 @@ import type { PipelineOutput } from '../core/steps/pipeline/pipeline';
 import { DEFAULT_DATAFLOW_PIPELINE } from '../core/steps/pipeline/default-pipelines';
 import type { RShell } from '../r-bridge/shell';
 import { type FeatureSelection, type FeatureStatistics } from './features/feature';
-import type { FlowrConfigOptions } from '../config';
+import type { FlowrConfig } from '../config';
 /**
  * By default, {@link extractUsageStatistics} requires a generator, but sometimes you already know all the files
  * that you want to process. This function simply reps your requests as a generator.
@@ -21,7 +21,7 @@ type DataflowResult = PipelineOutput<typeof DEFAULT_DATAFLOW_PIPELINE>;
  *                    If your request is statically known, you can use {@link staticRequests} to create this generator.
  * @param rootPath  - The root path to the project, this is used to relativize the file paths in the statistics.
  */
-export declare function extractUsageStatistics<T extends RParseRequestFromText | RParseRequestFromFile>(shell: RShell, config: FlowrConfigOptions, onRequest: (request: T) => void, features: FeatureSelection, requests: AsyncGenerator<T>, rootPath?: string): Promise<{
+export declare function extractUsageStatistics<T extends RParseRequestFromText | RParseRequestFromFile>(shell: RShell, config: FlowrConfig, onRequest: (request: T) => void, features: FeatureSelection, requests: AsyncGenerator<T>, rootPath?: string): Promise<{
     features: FeatureStatistics;
     meta: MetaStatistics;
     outputs: Map<T, DataflowResult>;

package/util/mermaid/dfg.d.ts

@@ -1,6 +1,7 @@
 import { type DataflowGraph } from '../../dataflow/graph/graph';
 import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { type IdentifierDefinition } from '../../dataflow/environments/identifier';
+import { type DataflowGraphVertexInfo } from '../../dataflow/graph/vertex';
 import { type MermaidMarkdownMark, type MermaidMarkStyle } from './info';
 interface MermaidGraph {
     nodeLines: string[];
@@ -15,6 +16,13 @@ interface MermaidGraph {
     /** if given, the dataflow graph will only focus on the "important" parts */
     simplified?: boolean;
 }
+/**
+ * Translates a vertex tag to the corresponding mermaid node brackets.
+ */
+export declare function mermaidNodeBrackets(tag: DataflowGraphVertexInfo['tag']): {
+    open: string;
+    close: string;
+};
 /**
  * Prints an identifier definition in a human-readable format.
  */