@eagleoutice/flowr 2.7.0 → 2.7.2

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

@@ -0,0 +1,114 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilesQueryDefinition = void 0;
+const ansi_1 = require("../../../util/text/ansi");
+const joi_1 = __importDefault(require("joi"));
+const files_query_executor_1 = require("./files-query-executor");
+const flowr_file_1 = require("../../../project/context/flowr-file");
+const json_1 = require("../../../util/json");
+const retriever_1 = require("../../../r-bridge/retriever");
+function summarizeObjectWithLimit(obj, limitChars = 500, limitLines = 10) {
+    const str = JSON.stringify(obj, json_1.jsonReplacer, 2);
+    if (str.split('\n').length > limitLines) {
+        const lines = str.split('\n').slice(0, limitLines);
+        return lines.join('\n') + '\n... (truncated)';
+    }
+    else if (str.length > limitChars) {
+        return str.slice(0, limitChars) + '... (truncated)';
+    }
+    else {
+        return str;
+    }
+}
+function rolesFromInput(rolesPart) {
+    return rolesPart
+        .reduce((acc, roleName) => {
+        roleName = roleName.trim();
+        // check if it is one of the values
+        if (Object.values(flowr_file_1.FileRole).includes(roleName)) {
+            acc.valid.push(roleName);
+        }
+        else {
+            acc.invalid.push(roleName);
+        }
+        return acc;
+    }, { valid: [], invalid: [] });
+}
+const rolePrefix = 'role:';
+function filesQueryLineParser(output, line, _config) {
+    let roles = undefined;
+    let input = undefined;
+    if (line.length > 0 && line[0].startsWith(rolePrefix)) {
+        const rolesPart = line[0].slice(rolePrefix.length).split(',');
+        const parseResult = rolesFromInput(rolesPart);
+        if (parseResult.invalid.length > 0) {
+            output.stderr(`Invalid roles: ${parseResult.invalid.map(r => (0, ansi_1.bold)(r, output.formatter)).join(', ')}`
+                + `\nValid roles are: ${Object.values(flowr_file_1.FileRole).map(r => (0, ansi_1.bold)(r, output.formatter)).join(', ')}`);
+        }
+        roles = parseResult.valid;
+        input = line[1];
+    }
+    else if (line.length > 0) {
+        input = line[0];
+    }
+    return { query: [{ type: 'files', roles }], rCode: input };
+}
+function filesQueryCompleter(line, startingNewArg, _config) {
+    const rolesPrefixNotPresent = line.length == 0 || (line.length == 1 && line[0].length < rolePrefix.length);
+    const rolesNotFinished = line.length == 1 && line[0].startsWith(rolePrefix) && !startingNewArg;
+    const endOfRoles = line.length == 1 && startingNewArg || line.length == 2;
+    if (rolesPrefixNotPresent) {
+        return { completions: [`${rolePrefix}`] };
+    }
+    else if (endOfRoles) {
+        return { completions: [retriever_1.fileProtocol] };
+    }
+    else if (rolesNotFinished) {
+        const rolesWithoutPrefix = line[0].slice(rolePrefix.length);
+        const usedRoles = rolesWithoutPrefix.split(',').map(r => r.trim());
+        const allRoles = Object.values(flowr_file_1.FileRole);
+        const unusedRoles = allRoles.filter(r => !usedRoles.includes(r));
+        const lastRole = usedRoles[usedRoles.length - 1];
+        const lastRoleIsUnfinished = !allRoles.includes(lastRole);
+        if (lastRoleIsUnfinished) {
+            return { completions: unusedRoles, argumentPart: lastRole };
+        }
+        else if (unusedRoles.length > 0) {
+            return { completions: [','], argumentPart: '' };
+        }
+        else {
+            return { completions: [' '], argumentPart: '' };
+        }
+    }
+    return { completions: [] };
+}
+exports.FilesQueryDefinition = {
+    executor: files_query_executor_1.executeFileQuery,
+    asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
+        const out = queryResults;
+        result.push(`Query: ${(0, ansi_1.bold)('files', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
+        result.push(`   ╰ Found ${out.files.length} file${out.files.length === 1 ? '' : 's'}`);
+        for (const f of out.files) {
+            result.push(`      ╰ ${(0, ansi_1.bold)(f.path, formatter)}${f.role ? ` [role: ${f.role}]` : ''}:`);
+            const summary = summarizeObjectWithLimit(f.content);
+            for (const line of summary.split('\n')) {
+                result.push(`          ${line}`);
+            }
+        }
+        return true;
+    },
+    completer: filesQueryCompleter,
+    fromLine: filesQueryLineParser,
+    schema: joi_1.default.object({
+        type: joi_1.default.string().valid('files').required().description('The type of the query.'),
+        roles: joi_1.default.array().optional().items(joi_1.default.string().valid(...Object.values(flowr_file_1.FileRole))).description('Optional roles of the files to query. If not provided, all roles are considered.'),
+        matchesPathRegex: joi_1.default.string().optional().description('An optional regular expression to match the file paths against.')
+    }).description('The file query finds files in the project based on their roles and path patterns.'),
+    flattenInvolvedNodes: (_) => {
+        return [];
+    }
+};
+//# sourceMappingURL=files-query-format.js.map

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

@@ -34,7 +34,7 @@ function linterQueryLineParser(output, line, _config) {
         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(', ')}`
+            output.stderr(`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;

package/queries/query.d.ts

@@ -28,10 +28,11 @@ import { type InspectHigherOrderQuery } from './catalog/inspect-higher-order-que
 import type { ReadonlyFlowrAnalysisProvider } from '../project/flowr-analyzer';
 import type { ReplOutput } from '../cli/repl/commands/repl-main';
 import type { CommandCompletions } from '../cli/repl/core';
+import type { FilesQuery } from './catalog/files-query/files-query-format';
 /**
  * These are all queries that can be executed from within flowR
  */
-export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | ControlFlowQuery | DataflowLensQuery | DfShapeQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery | InspectHigherOrderQuery | ResolveValueQuery | ProjectQuery | OriginQuery | LinterQuery;
+export type Query = CallContextQuery | ConfigQuery | SearchQuery | DataflowQuery | ControlFlowQuery | DataflowLensQuery | FilesQuery | DfShapeQuery | NormalizedAstQuery | IdMapQuery | DataflowClusterQuery | StaticSliceQuery | DependenciesQuery | LocationMapQuery | HappensBeforeQuery | InspectHigherOrderQuery | ResolveValueQuery | ProjectQuery | OriginQuery | LinterQuery;
 export type QueryArgumentsWithType<QueryType extends BaseQueryFormat['type']> = Query & {
     type: QueryType;
 };
@@ -105,6 +106,14 @@ export declare const SupportedQueries: {
         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 schema: Joi.ObjectSchema<any>;
+        readonly flattenInvolvedNodes: (_: BaseQueryResult) => NodeId[];
+    };
     readonly 'id-map': {
         readonly executor: typeof import("./catalog/id-map-query/id-map-query-executor").executeIdMapQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;

package/queries/query.js

@@ -35,6 +35,7 @@ const control_flow_query_format_1 = require("./catalog/control-flow-query/contro
 const df_shape_query_format_1 = require("./catalog/df-shape-query/df-shape-query-format");
 const inspect_higher_order_query_format_1 = require("./catalog/inspect-higher-order-query/inspect-higher-order-query-format");
 const log_1 = require("../util/log");
+const files_query_format_1 = require("./catalog/files-query/files-query-format");
 exports.SupportedQueries = {
     'call-context': call_context_query_format_1.CallContextQueryDefinition,
     'config': config_query_format_1.ConfigQueryDefinition,
@@ -42,6 +43,7 @@ exports.SupportedQueries = {
     'dataflow': dataflow_query_format_1.DataflowQueryDefinition,
     'dataflow-lens': dataflow_lens_query_format_1.DataflowLensQueryDefinition,
     'df-shape': df_shape_query_format_1.DfShapeQueryDefinition,
+    'files': files_query_format_1.FilesQueryDefinition,
     'id-map': id_map_query_format_1.IdMapQueryDefinition,
     'normalized-ast': normalized_ast_query_format_1.NormalizedAstQueryDefinition,
     'dataflow-cluster': cluster_query_format_1.ClusterQueryDefinition,
@@ -103,7 +105,7 @@ async function executeQueries(data, queries) {
     const results = [];
     for (const [type, group] of entries) {
         try {
-            const result = await Promise.resolve(executeQueriesOfSameType(data, group));
+            const result = await executeQueriesOfSameType(data, group);
             results.push([type, result]);
         }
         catch (e) {

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

@@ -102,7 +102,7 @@ export interface Namespace {
      * The namespace attached to the given node
      * (e.g., a namespaced symbol in `x::y`).
      */
-    namespace: NamespaceIdentifier | undefined;
+    namespace?: NamespaceIdentifier;
 }
 /**
  * This subtype of {@link RNode} represents all types of constants

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

@@ -187,7 +187,7 @@ function createFoldForUnaryOp(info) {
         info.idMap.set(id, decorated);
         const opInfo = operand.info;
         opInfo.parent = id;
-        opInfo.role = "unary-operand" /* RoleInParent.UnaryOperand */;
+        opInfo.role = "unary-op" /* RoleInParent.UnaryOperand */;
         decorated.info.file = info.file;
         return decorated;
     };
@@ -208,7 +208,7 @@ function createFoldForAccess(info) {
                     const curInfo = acc.info;
                     curInfo.parent = id;
                     curInfo.index = idx;
-                    curInfo.role = "index-access" /* RoleInParent.IndexAccess */;
+                    curInfo.role = "index-acc" /* RoleInParent.IndexAccess */;
                 }
             }
         }
@@ -223,11 +223,11 @@ function createFoldForForLoop(info) {
         info.idMap.set(id, decorated);
         const varInfo = variable.info;
         varInfo.parent = id;
-        varInfo.role = "for-variable" /* RoleInParent.ForVariable */;
+        varInfo.role = "for-var" /* RoleInParent.ForVariable */;
         const vecInfo = vector.info;
         vecInfo.parent = id;
         vecInfo.index = 1;
-        vecInfo.role = "for-vector" /* RoleInParent.ForVector */;
+        vecInfo.role = "for-vec" /* RoleInParent.ForVector */;
         const bodyInfo = body.info;
         bodyInfo.parent = id;
         bodyInfo.index = 2;
@@ -280,7 +280,7 @@ function createFoldForIfThenElse(info) {
             const otherwiseInfo = otherwise.info;
             otherwiseInfo.parent = id;
             otherwiseInfo.index = 2;
-            otherwiseInfo.role = "if-otherwise" /* RoleInParent.IfOtherwise */;
+            otherwiseInfo.role = "if-other" /* RoleInParent.IfOtherwise */;
         }
         decorated.info.file = info.file;
         return decorated;
@@ -323,7 +323,7 @@ function createFoldForFunctionCall(info) {
                 const argInfo = arg.info;
                 argInfo.parent = id;
                 argInfo.index = idx;
-                argInfo.role = "call-argument" /* RoleInParent.FunctionCallArgument */;
+                argInfo.role = "call-arg" /* RoleInParent.FunctionCallArgument */;
             }
         }
         decorated.info.file = info.file;
@@ -340,12 +340,12 @@ function createFoldForFunctionDefinition(info) {
             const paramInfo = param.info;
             paramInfo.parent = id;
             paramInfo.index = idx++;
-            paramInfo.role = "function-def-param" /* RoleInParent.FunctionDefinitionParameter */;
+            paramInfo.role = "param" /* RoleInParent.FunctionDefinitionParameter */;
         }
         const bodyInfo = body.info;
         bodyInfo.parent = id;
         bodyInfo.index = idx;
-        bodyInfo.role = "function-def-body" /* RoleInParent.FunctionDefinitionBody */;
+        bodyInfo.role = "fun-body" /* RoleInParent.FunctionDefinitionBody */;
         decorated.info.file = info.file;
         return decorated;
     };

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

@@ -10,29 +10,29 @@ export declare const enum RoleInParent {
     Root = "root",
     IfCondition = "if-cond",
     IfThen = "if-then",
-    IfOtherwise = "if-otherwise",
+    IfOtherwise = "if-other",
     WhileCondition = "while-cond",
     WhileBody = "while-body",
     RepeatBody = "repeat-body",
-    ForVariable = "for-variable",
-    ForVector = "for-vector",
+    ForVariable = "for-var",
+    ForVector = "for-vec",
     ForBody = "for-body",
     FunctionCallName = "call-name",
-    FunctionCallArgument = "call-argument",
-    FunctionDefinitionBody = "function-def-body",
-    FunctionDefinitionParameter = "function-def-param",
+    FunctionCallArgument = "call-arg",
+    FunctionDefinitionBody = "fun-body",
+    FunctionDefinitionParameter = "param",
     ExpressionListChild = "expr-list-child",
     BinaryOperationLhs = "binop-lhs",
     BinaryOperationRhs = "binop-rhs",
     PipeLhs = "pipe-lhs",
     PipeRhs = "pipe-rhs",
-    UnaryOperand = "unary-operand",
+    UnaryOperand = "unary-op",
     ParameterName = "param-name",
     ParameterDefaultValue = "param-value",
     ArgumentName = "arg-name",
     ArgumentValue = "arg-value",
     Accessed = "accessed",
-    IndexAccess = "index-access"
+    IndexAccess = "index-acc"
 }
 /**
  * Returns the roles of the parents of the given node, starting with the parent-role of the node itself.

package/r-bridge/lang-4.x/ast/parser/main/internal/functions/normalize-parameter.js

@@ -34,7 +34,6 @@ function tryNormalizeParameter(data, objs) {
         name: {
             type: type_1.RType.Symbol,
             location, content,
-            namespace: undefined,
             lexeme: content,
             info: {
                 fullRange: location,

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

@@ -483,7 +483,6 @@ function convertTreeNode(node) {
                 name: {
                     type: type_1.RType.Symbol,
                     location: nameRange,
-                    namespace: undefined,
                     content: name.text,
                     lexeme: name.text,
                     info: {

package/statistics/features/supported/data-access/data-access.js

@@ -58,7 +58,7 @@ function visitAccess(info, input) {
                 acc = true;
                 break; // we only account for the first one
             }
-            else if (role === "index-access" /* RoleInParent.IndexAccess */) {
+            else if (role === "index-acc" /* RoleInParent.IndexAccess */) {
                 idxAcc = true;
                 break;
             }

package/util/containers.js

@@ -16,7 +16,7 @@ const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
 function getAccessOperands(args) {
     const nonEmptyArgs = args.filter(arg => arg !== r_function_call_1.EmptyArgument);
     const accessedArg = nonEmptyArgs.find(arg => arg.info.role === "accessed" /* RoleInParent.Accessed */);
-    const accessArg = nonEmptyArgs.find(arg => arg.info.role === "index-access" /* RoleInParent.IndexAccess */);
+    const accessArg = nonEmptyArgs.find(arg => arg.info.role === "index-acc" /* RoleInParent.IndexAccess */);
     return { accessedArg, accessArg };
 }
 /**

package/util/files.d.ts

@@ -1,6 +1,5 @@
 import { type PathLike } from 'fs';
 import type { RParseRequestFromFile } from '../r-bridge/retriever';
-import type { FlowrFileProvider } from '../project/context/flowr-file';
 /**
  * Represents a table, identified by a header and a list of rows.
  */
@@ -70,12 +69,6 @@ export declare function readLineByLineSync(filePath: string, onLine: (line: Buff
  * @param directory - The directory whose parent to return
  */
 export declare function getParentDirectory(directory: string): string;
-/**
- * Parses the given file in the 'Debian Control Format'.
- * @param file - The file to parse
- * @returns Map containing the keys and values of the provided file.
- */
-export declare function parseDCF(file: FlowrFileProvider): Map<string, string[]>;
 /**
  * Checks whether the given path-like object is a file that exists on the local filesystem.
  */

package/util/files.js

@@ -44,7 +44,6 @@ exports.writeTableAsCsv = writeTableAsCsv;
 exports.readLineByLine = readLineByLine;
 exports.readLineByLineSync = readLineByLineSync;
 exports.getParentDirectory = getParentDirectory;
-exports.parseDCF = parseDCF;
 exports.isFilePath = isFilePath;
 const fs_1 = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -201,46 +200,6 @@ function getParentDirectory(directory) {
     // apparently this is somehow the best way to do it in node, what
     return directory.split(path_1.default.sep).slice(0, -1).join(path_1.default.sep);
 }
-/**
- * Parses the given file in the 'Debian Control Format'.
- * @param file - The file to parse
- * @returns Map containing the keys and values of the provided file.
- */
-function parseDCF(file) {
-    const result = new Map();
-    let currentKey = '';
-    let currentValue = '';
-    const indentRegex = new RegExp(/^\s/);
-    const firstColonRegex = new RegExp(/:(.*)/s);
-    const fileContent = file.content().toString().split(/\r?\n/);
-    for (const line of fileContent) {
-        if (indentRegex.test(line)) {
-            currentValue += '\n' + line.trim();
-        }
-        else {
-            if (currentKey) {
-                const values = currentValue ? cleanValues(currentValue) : [];
-                result.set(currentKey, values);
-            }
-            const [key, rest] = line.split(firstColonRegex).map(s => s.trim());
-            currentKey = key.trim();
-            currentValue = rest.trim();
-        }
-    }
-    if (currentKey) {
-        const values = currentValue ? cleanValues(currentValue) : [];
-        result.set(currentKey, values);
-    }
-    return result;
-}
-const cleanSplitRegex = /[\n,]+/;
-const cleanQuotesRegex = /'/g;
-function cleanValues(values) {
-    return values
-        .split(cleanSplitRegex)
-        .map(s => s.trim().replace(cleanQuotesRegex, ''))
-        .filter(s => s.length > 0);
-}
 /**
  * Checks whether the given path-like object is a file that exists on the local filesystem.
  */

package/util/mermaid/ast.d.ts

@@ -1,10 +1,11 @@
 import type { ParentInformation, RNodeWithParent } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { RProject } from '../../r-bridge/lang-4.x/ast/model/nodes/r-project';
+import type { MermaidGraphPrinterInfo } from './info';
 /**
  * Serialize the normalized AST to mermaid format
  */
-export declare function normalizedAstToMermaid(ast: RProject<ParentInformation> | RNodeWithParent, prefix?: string): string;
+export declare function normalizedAstToMermaid(ast: RProject<ParentInformation> | RNodeWithParent, { prefix, markStyle, includeOnlyIds, mark }?: MermaidGraphPrinterInfo): string;
 /**
  * Use mermaid to visualize the normalized AST.
  */
-export declare function normalizedAstToMermaidUrl(ast: RProject<ParentInformation> | RNodeWithParent, prefix?: string): string;
+export declare function normalizedAstToMermaidUrl(ast: RProject<ParentInformation> | RNodeWithParent, info?: MermaidGraphPrinterInfo): string;

package/util/mermaid/ast.js

@@ -7,6 +7,7 @@ const visitor_1 = require("../../r-bridge/lang-4.x/ast/model/processing/visitor"
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 const r_function_call_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-function-call");
 const flowr_file_1 = require("../../project/context/flowr-file");
+const info_1 = require("./info");
 function identifyMermaidDirection(prefix) {
     const directionMatch = prefix.match(/flowchart (TD|LR|RL|BT)/);
     if (directionMatch) {
@@ -17,14 +18,20 @@ function identifyMermaidDirection(prefix) {
 /**
  * Serialize the normalized AST to mermaid format
  */
-function normalizedAstToMermaid(ast, prefix = 'flowchart TD\n') {
+function normalizedAstToMermaid(ast, { prefix = 'flowchart TD\n', markStyle = info_1.MermaidDefaultMarkStyle, includeOnlyIds, mark } = {}) {
     let output = prefix;
     function showNode(n) {
+        if (includeOnlyIds && !includeOnlyIds.has(n.info.id)) {
+            return;
+        }
         const name = `${n.type} (${n.info.id})\\n${n.lexeme ?? ' '}`;
         output += `    n${n.info.id}(["${(0, mermaid_1.escapeMarkdown)(name)}"])\n`;
-        if (n.info.parent !== undefined) {
+        if (mark?.has(n.info.id)) {
+            output += `    style n${n.info.id} ${markStyle.vertex}\n`;
+        }
+        if (n.info.parent !== undefined && (!includeOnlyIds || includeOnlyIds.has(n.info.parent))) {
             const context = n.info;
-            const roleSuffix = context.role === "expr-list-child" /* RoleInParent.ExpressionListChild */ || context.role === "call-argument" /* RoleInParent.FunctionCallArgument */ || context.role === "function-def-param" /* RoleInParent.FunctionDefinitionParameter */ ? `-${context.index}` : '';
+            const roleSuffix = context.role === "expr-list-child" /* RoleInParent.ExpressionListChild */ || context.role === "call-arg" /* RoleInParent.FunctionCallArgument */ || context.role === "param" /* RoleInParent.FunctionDefinitionParameter */ ? `-${context.index}` : '';
             output += `    n${n.info.parent} -->|"${context.role}${roleSuffix}"| n${n.info.id}\n`;
         }
         if (n.type === type_1.RType.ExpressionList && n.grouping !== undefined) {
@@ -49,9 +56,8 @@ function normalizedAstToMermaid(ast, prefix = 'flowchart TD\n') {
         for (const f of ast.files) {
             // add a subgraph for each file
             if (ast.files.length !== 1 || (f.filePath && f.filePath !== flowr_file_1.FlowrFile.INLINE_PATH)) {
-                output += `    subgraph "File: ${(0, mermaid_1.escapeMarkdown)(f.filePath ?? flowr_file_1.FlowrFile.INLINE_PATH)}"\n`;
                 const direction = identifyMermaidDirection(prefix);
-                output += `        direction ${direction}\n`;
+                output += `    subgraph "File: ${(0, mermaid_1.escapeMarkdown)(f.filePath ?? flowr_file_1.FlowrFile.INLINE_PATH)}" direction ${direction}\n`;
                 showAst(f.root);
                 output += '    end\n';
             }
@@ -68,7 +74,7 @@ function normalizedAstToMermaid(ast, prefix = 'flowchart TD\n') {
 /**
  * Use mermaid to visualize the normalized AST.
  */
-function normalizedAstToMermaidUrl(ast, prefix = 'flowchart TD\n') {
-    return (0, mermaid_1.mermaidCodeToUrl)(normalizedAstToMermaid(ast, prefix));
+function normalizedAstToMermaidUrl(ast, info) {
+    return (0, mermaid_1.mermaidCodeToUrl)(normalizedAstToMermaid(ast, info ?? {}));
 }
 //# sourceMappingURL=ast.js.map

package/util/mermaid/cfg.d.ts

@@ -1,5 +1,6 @@
 import type { NormalizedAst } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import { type ControlFlowInformation } from '../../control-flow/control-flow-graph';
+import { type MermaidGraphPrinterInfo } from './info';
 /**
  * Convert the control flow graph to a mermaid string.
  * @param cfg              - The control flow graph to convert.
@@ -7,8 +8,8 @@ import { type ControlFlowInformation } from '../../control-flow/control-flow-gra
  * @param prefix           - The prefix to use for the mermaid string.
  * @param simplify         - Whether to simplify the control flow graph (especially in the context of basic blocks).
  */
-export declare function cfgToMermaid(cfg: ControlFlowInformation, normalizedAst: NormalizedAst, prefix?: string, simplify?: boolean): string;
+export declare function cfgToMermaid(cfg: ControlFlowInformation, normalizedAst: NormalizedAst, { prefix, simplify, markStyle, includeOnlyIds, mark }?: MermaidGraphPrinterInfo): string;
 /**
  * Use mermaid to visualize the normalized AST.
  */
-export declare function cfgToMermaidUrl(cfg: ControlFlowInformation, normalizedAst: NormalizedAst, prefix?: string): string;
+export declare function cfgToMermaidUrl(cfg: ControlFlowInformation, normalizedAst: NormalizedAst, info?: MermaidGraphPrinterInfo): string;

package/util/mermaid/cfg.js

@@ -7,6 +7,7 @@ const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 const control_flow_graph_1 = require("../../control-flow/control-flow-graph");
 const reconstruct_1 = require("../../reconstruct/reconstruct");
 const auto_select_defaults_1 = require("../../reconstruct/auto-select/auto-select-defaults");
+const info_1 = require("./info");
 function getLexeme(n) {
     return n ? n.info.fullLexeme ?? n.lexeme ?? '' : undefined;
 }
@@ -30,7 +31,7 @@ const getDirRegex = /flowchart\s+([A-Za-z]+)/;
  * @param prefix           - The prefix to use for the mermaid string.
  * @param simplify         - Whether to simplify the control flow graph (especially in the context of basic blocks).
  */
-function cfgToMermaid(cfg, normalizedAst, prefix = 'flowchart BT\n', simplify = false) {
+function cfgToMermaid(cfg, normalizedAst, { prefix = 'flowchart BT\n', simplify = false, markStyle = info_1.MermaidDefaultMarkStyle, includeOnlyIds, mark } = {}) {
     let output = prefix;
     const dirIs = getDirRegex.exec(prefix)?.at(1) ?? 'LR';
     for (const [id, vertex] of cfg.graph.vertices(false)) {
@@ -52,6 +53,10 @@ function cfgToMermaid(cfg, normalizedAst, prefix = 'flowchart BT\n', simplify =
                 output += `        direction ${dirIs}\n`;
                 let last = undefined;
                 for (const element of vertex.elems ?? []) {
+                    if (includeOnlyIds && !includeOnlyIds.has(element.id)) {
+                        last = undefined;
+                        continue;
+                    }
                     const childNormalizedVertex = normalizedAst?.idMap.get(element.id);
                     const childContent = getLexeme(childNormalizedVertex);
                     output = cfgOfNode(vertex, childNormalizedVertex, element.id, childContent, output);
@@ -64,7 +69,7 @@ function cfgToMermaid(cfg, normalizedAst, prefix = 'flowchart BT\n', simplify =
                 output += '    end\n';
             }
         }
-        else {
+        else if (!includeOnlyIds || includeOnlyIds.has(id)) {
             output = cfgOfNode(vertex, normalizedVertex, id, content, output);
         }
         if (vertex.name === type_1.RType.ExpressionList && vertex.type === control_flow_graph_1.CfgVertexType.EndMarker) {
@@ -72,24 +77,39 @@ function cfgToMermaid(cfg, normalizedAst, prefix = 'flowchart BT\n', simplify =
         }
     }
     for (const [from, targets] of cfg.graph.edges()) {
+        if (includeOnlyIds && !includeOnlyIds.has(from)) {
+            continue;
+        }
         for (const [to, edge] of targets) {
+            if (includeOnlyIds && !includeOnlyIds.has(to)) {
+                continue;
+            }
             const edgeType = edge.label === 1 /* CfgEdgeType.Cd */ ? '-->' : '-.->';
             const edgeSuffix = edge.label === 1 /* CfgEdgeType.Cd */ ? ` (${edge.when})` : '';
             output += `    n${from} ${edgeType}|"${(0, mermaid_1.escapeMarkdown)((0, control_flow_graph_1.edgeTypeToString)(edge.label))}${edgeSuffix}"| n${to}\n`;
         }
     }
     for (const entryPoint of cfg.entryPoints) {
-        output += `    style n${entryPoint} stroke:cyan,stroke-width:6.5px;`;
+        if (!includeOnlyIds || includeOnlyIds.has(entryPoint)) {
+            output += `    style n${entryPoint} stroke:cyan,stroke-width:6.5px;`;
+        }
     }
     for (const exitPoint of cfg.exitPoints) {
-        output += `    style n${exitPoint} stroke:green,stroke-width:6.5px;`;
+        if (!includeOnlyIds || includeOnlyIds.has(exitPoint)) {
+            output += `    style n${exitPoint} stroke:green,stroke-width:6.5px;`;
+        }
+    }
+    if (mark) {
+        for (const id of mark.values()) {
+            output += `    style n${id} ${markStyle.vertex}`;
+        }
     }
     return output;
 }
 /**
  * Use mermaid to visualize the normalized AST.
  */
-function cfgToMermaidUrl(cfg, normalizedAst, prefix = 'flowchart BT\n') {
-    return (0, mermaid_1.mermaidCodeToUrl)(cfgToMermaid(cfg, normalizedAst, prefix));
+function cfgToMermaidUrl(cfg, normalizedAst, info) {
+    return (0, mermaid_1.mermaidCodeToUrl)(cfgToMermaid(cfg, normalizedAst, info ?? {}));
 }
 //# sourceMappingURL=cfg.js.map

package/util/mermaid/dfg.d.ts

@@ -2,13 +2,7 @@ import type { SourceRange } from '../range';
 import { type DataflowGraph } from '../../dataflow/graph/graph';
 import { type NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { type IdentifierDefinition } from '../../dataflow/environments/identifier';
-type MarkVertex = NodeId;
-type MarkEdge = `${string}->${string}`;
-export type MermaidMarkdownMark = MarkVertex | MarkEdge;
-export interface MermaidMarkStyle {
-    readonly vertex: string;
-    readonly edge: string;
-}
+import { type MermaidMarkdownMark, type MermaidMarkStyle } from './info';
 interface MermaidGraph {
     nodeLines: string[];
     edgeLines: string[];

package/util/mermaid/dfg.js

@@ -15,6 +15,7 @@ const edge_1 = require("../../dataflow/graph/edge");
 const vertex_1 = require("../../dataflow/graph/vertex");
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 const built_in_1 = require("../../dataflow/environments/built-in");
+const info_1 = require("./info");
 /**
  * Prints a {@link SourceRange|range} as a human-readable string.
  */
@@ -147,7 +148,7 @@ function printEnvironmentToLines(env) {
     }
     return lines;
 }
-function vertexToMermaid(info, mermaid, id, idPrefix, mark) {
+function vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds) {
     const fCall = info.tag === vertex_1.VertexType.FunctionCall;
     const { open, close } = mermaidNodeBrackets(info.tag);
     id = (0, mermaid_1.escapeId)(id);
@@ -184,6 +185,9 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark) {
     const artificialCdEdges = (info.cds ?? []).map(x => [x.id, { types: new Set([x.when ? 'CD-True' : 'CD-False']) }]);
     // eslint-disable-next-line prefer-const
     for (let [target, edge] of [...edges[1], ...artificialCdEdges]) {
+        if (includeOnlyIds && !includeOnlyIds.has(target)) {
+            continue;
+        }
         const originalTarget = target;
         target = (0, mermaid_1.escapeId)(target);
         const edgeTypes = typeof edge.types == 'number' ? new Set((0, edge_1.splitEdgeTypes)(edge.types)) : edge.types;
@@ -214,11 +218,11 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark) {
     }
 }
 // make the passing of root ids more performant again
-function graphToMermaidGraph(rootIds, { simplified, graph, prefix = 'flowchart BT', idPrefix = '', includeEnvironments = !simplified, mark, rootGraph, presentEdges = new Set(), markStyle = { vertex: 'stroke:teal,stroke-width:7px,stroke-opacity:.8;', edge: 'stroke:teal,stroke-width:4.2px,stroke-opacity:.8' } }) {
+function graphToMermaidGraph(rootIds, { simplified, graph, prefix = 'flowchart BT', idPrefix = '', includeEnvironments = !simplified, mark, rootGraph, presentEdges = new Set(), markStyle = info_1.MermaidDefaultMarkStyle, includeOnlyIds }) {
     const mermaid = { nodeLines: prefix === null ? [] : [prefix], edgeLines: [], presentEdges, presentVertices: new Set(), mark, rootGraph: rootGraph ?? graph, includeEnvironments, markStyle, simplified };
     for (const [id, info] of graph.vertices(true)) {
         if (rootIds.has(id)) {
-            vertexToMermaid(info, mermaid, id, idPrefix, mark);
+            vertexToMermaid(info, mermaid, id, idPrefix, mark, includeOnlyIds);
         }
     }
     return mermaid;