@eagleoutice/flowr 2.8.15 → 2.9.0

package/documentation/wiki-dataflow-graph.js

@@ -83,10 +83,10 @@ ${subExplanations.length > 0 ? await printAllSubExplanations(parser, subExplanat
 	`;
 }
 function edgeTypeToId(edgeType) {
-    return (0, edge_1.edgeTypeToName)(edgeType).toLowerCase().replaceAll(' ', '-');
+    return edge_1.DfEdge.typeToName(edgeType).toLowerCase().replaceAll(' ', '-');
 }
 function linkEdgeName(edgeType, page = '') {
-    return `[\`${(0, edge_1.edgeTypeToName)(edgeType)}\`](${page}#${edgeTypeToId(edgeType)})`;
+    return `[\`${edge_1.DfEdge.typeToName(edgeType)}\`](${page}#${edgeTypeToId(edgeType)})`;
 }
 async function getVertexExplanations(parser, ctx) {
     /* we use the map to ensure order easily :D */
@@ -198,7 +198,7 @@ However, in general, flowR may use any fitting handler as an origin (see the ${c
 ${(0, doc_structure_1.details)('Example: Simple Function Call (unresolved)', await (async () => {
                 const code = 'foo(x,3,y=3,)';
                 const [text, info] = await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { mark: new Set([8]), exposeResult: true });
-                const callInfo = info.dataflow.graph.vertices(true).find(([, vertex]) => vertex.tag === vertex_1.VertexType.FunctionCall && vertex.name === 'foo');
+                const callInfo = info.dataflow.graph.vertices(true).find(([, vertex]) => vertex.tag === vertex_1.VertexType.FunctionCall && identifier_1.Identifier.getName(vertex.name) === 'foo');
                 (0, assert_1.guard)(callInfo !== undefined, () => `Could not find call vertex for ${code}`);
                 const [callId, callVert] = callInfo;
                 const inverseMapReferenceTypes = Object.fromEntries(Object.entries(identifier_1.ReferenceType).map(([k, v]) => [v, k]));
@@ -265,7 +265,7 @@ ${await (async () => {
                     const code = 'foo <- function() 3\nfoo()';
                     const [text, info] = await (0, doc_dfg_1.printDfGraphForCode)(parser, code, { exposeResult: true, mark: new Set([6, '6->0', '6->1', '6->3']) });
                     const numberOfEdges = [...info.dataflow.graph.edges()].flatMap(e => [...e[1].keys()]).length;
-                    const callVertex = info.dataflow.graph.vertices(true).find(([, vertex]) => vertex.tag === vertex_1.VertexType.FunctionCall && vertex.name === 'foo');
+                    const callVertex = info.dataflow.graph.vertices(true).find(([, vertex]) => vertex.tag === vertex_1.VertexType.FunctionCall && identifier_1.Identifier.getName(vertex.name) === 'foo');
                     (0, assert_1.guard)(callVertex !== undefined, () => `Could not find call vertex for ${code}`);
                     const [callId] = callVertex;
                     return `
@@ -336,7 +336,7 @@ Hence, trying to re-resolve the call using ${ctx.link(linker_1.getAllFunctionCal
 the following target ids: { \`${[...(0, linker_1.getAllFunctionCallTargets)(id, info.dataflow.graph)].join('`, `')}\` }.
 This way we know that the call may refer to the built-in assignment operator or to the multiplication.
 Similarly, trying to resolve the name with ${ctx.link(resolve_by_name_1.resolveByName)}\` using the environment attached to the call vertex (filtering for any reference type) returns (in a similar fashion): 
-{ \`${(0, resolve_by_name_1.resolveByNameAnyType)(name, env)?.map(d => d.nodeId).join('`, `')}\` } (however, the latter will not trace aliases).
+{ \`${(0, resolve_by_name_1.resolveByNameAnyType)(identifier_1.Identifier.make(name), env)?.map(d => d.nodeId).join('`, `')}\` } (however, the latter will not trace aliases).
 
 	`;
                 })()}
@@ -1004,7 +1004,8 @@ Depending on what you are interested in, there exists a plethora of functions an
 * ${ctx.link(node_id_1.recoverName)} and ${ctx.link(node_id_1.recoverContent)} to get the name or content of a vertex in the dataflow graph
 * ${ctx.link(alias_tracking_1.resolveIdToValue)} to resolve the value of a variable or id (if possible, see [below](#dfg-resolving-values))
 * ${ctx.link(alias_tracking_1.getAliases)} to get all (potentially currently) aliases of a given definition
-* ${ctx.link(edge_1.edgeIncludesType)} to check if an edge includes a specific type and ${ctx.link(edge_1.splitEdgeTypes)} to split the bitmask of edges into its types (see [below](#dfg-resolving-values))
+* ${ctx.link('DfEdge', undefined, { type: 'variable' })} to get helpful functions wrt. edges (see [below](#dfg-resolving-values))
+* ${ctx.link('Identifier', undefined, { type: 'variable' })} to get helpful functions wrt. identifiers
 * ${ctx.link(identify_link_to_last_call_relation_1.getValueOfArgument)} to get the (syntactical) value of an argument in a function call 
 * ${ctx.link(dfg_get_origin_1.getOriginInDfg)} to get information about where a read, call, ... comes from (see [below](#dfg-resolving-values))
 
@@ -1047,8 +1048,8 @@ ${await (async () => {
                 }
                 throw new Error('Could not find edge');
             })()}&mdash;which is usually not very helpful.
-You can use ${ctx.link(edge_1.splitEdgeTypes.name)} to get the individual bitmasks of all included types, and 
-${ctx.link(edge_1.edgeIncludesType.name)} to check whether a specific type (or one of a collection of types) is included in the edge.
+You can use ${ctx.link('DfEdge::splitTypes')} to get the individual bitmasks of all included types, and 
+${ctx.link('DfEdge::includesType')} to check whether a specific type (or one of a collection of types) is included in the edge.
 
 ${(0, doc_structure_1.section)('Handling Origins', 3, 'dfg-handling-origins')}
 

package/documentation/wiki-interface.js

@@ -16,12 +16,10 @@ const schema_1 = require("../util/schema");
 const ansi_1 = require("../util/text/ansi");
 const flowr_main_options_1 = require("../cli/flowr-main-options");
 const doc_issue_1 = require("./doc-util/doc-issue");
-const pipeline_executor_1 = require("../core/pipeline-executor");
 const doc_structure_1 = require("./doc-util/doc-structure");
-const tree_sitter_executor_1 = require("../r-bridge/lang-4.x/tree-sitter/tree-sitter-executor");
-const flowr_analyzer_1 = require("../project/flowr-analyzer");
 const doc_maker_1 = require("./wiki-mk/doc-maker");
 const built_in_1 = require("../dataflow/environments/built-in");
+const doc_writing_code_1 = require("./data/interface/doc-writing-code");
 async function explainServer(parser) {
     (0, doc_data_server_messages_1.documentAllServerMessages)();
     return `
@@ -252,7 +250,6 @@ ${(0, doc_code_1.codeBlock)('json', JSON.stringify({
         solver: {
             variables: config_1.VariableResolve.Alias,
             evalStrings: true,
-            pointerTracking: true,
             resolveSource: {
                 dropPaths: config_1.DropPathsOption.No,
                 ignoreCapitalization: true,
@@ -307,159 +304,6 @@ ${(0, schema_1.describeSchema)(config_1.flowrConfigFileSchema, ansi_1.markdownFo
 
 	`;
 }
-function explainWritingCode(shell, ctx) {
-    return `
-_flowR_ can be used as a [module](${doc_files_1.FlowrNpmRef}) and offers several main classes and interfaces that are interesting for extension writers 
-(see the [Visual Studio Code extension](${doc_files_1.FlowrGithubBaseRef}/vscode-flowr) or the [core](${doc_files_1.FlowrWikiBaseRef}/Core) wiki page for more information).
-
-### Using the ${ctx.link(shell_1.RShell)} to Interact with R
-
-The ${ctx.link(shell_1.RShell.name)} class allows interfacing with the \`R\` ecosystem installed on the host system.
-Please have a look at [flowR's engines](${doc_files_1.FlowrWikiBaseRef}/Engines) for more information on alterantives (for example, the ${ctx.link(tree_sitter_executor_1.TreeSitterExecutor)}).
-
-${(0, doc_structure_1.block)({
-        type: 'IMPORTANT',
-        content: `
-Each ${ctx.link(shell_1.RShell.name)} controls a new instance of the R interpreter, 
-make sure to call ${(0, doc_code_1.codeInline)(ctx.linkM(shell_1.RShell, 'close', { codeFont: false, realNameWrapper: 'i' }) + '()')} when you are done.`
-    })}
-
-You can start a new "session" simply by constructing a new object with ${(0, doc_code_1.codeInline)('new ' + ctx.link(shell_1.RShell, { codeFont: false }) + '()')}.
-
-However, there are several options that may be of interest 
-(e.g., to automatically revive the shell in case of errors or to control the name location of the R process on the system).
-
-With a shell object (let's call it \`shell\`), you can execute R code by using ${ctx.linkM(shell_1.RShell, 'sendCommand', { realNameWrapper: 'i' })}, 
-for example ${(0, doc_code_1.codeInline)('shell.' + ctx.linkM(shell_1.RShell, 'sendCommand', { codeFont: false, hideClass: true }) + '("1 + 1")')}. 
-However, this does not return anything, so if you want to collect the output of your command, use
-${ctx.linkM(shell_1.RShell, 'sendCommandWithOutput', { realNameWrapper: 'i' })} instead.
-
-Besides that, the command ${ctx.linkM(shell_1.RShell, 'tryToInjectHomeLibPath')} may be of interest, as it enables all libraries available on the host system.
-
-### Creating _flowR_ analyses
-
-Nowadays, instances of ${ctx.link(flowr_analyzer_1.FlowrAnalyzer)} should be used as central frontend to get analysis results from _flowR_.
-For example, a program slice can be created like this:
-
-${(0, doc_code_1.codeBlock)('ts', `
-const analyzer = await new FlowrAnalyzerBuilder(requestFromInput('x <- 1\\ny <- x\\nx')).build();
-const result = await analyzer.query([
-	{
-		type:     'static-slice',
-		criteria: ['3@x']
-	}
-]);
-//console.log(result['static-slice']);
-`)}
-        
-### The Pipeline Executor
-
-Once, in the beginning, _flowR_ was meant to produce a dataflow graph merely to provide *program slices*. 
-However, with continuous updates, the [dataflow graph](${doc_files_1.FlowrWikiBaseRef}/Dataflow-Graph) repeatedly proves to be the more interesting part.
-With this, we restructured _flowR_'s originally *hardcoded* pipeline to be far more flexible. 
-Now, it can be theoretically extended or replaced with arbitrary steps, optional steps, and what we call 'decorations' of these steps. 
-In short, a slicing pipeline using the ${ctx.link(pipeline_executor_1.PipelineExecutor)} looks like this:
-
-${(0, doc_code_1.codeBlock)('ts', `
-const slicer = new ${pipeline_executor_1.PipelineExecutor.name}(DEFAULT_SLICING_PIPELINE, {
-  parser:    new ${shell_1.RShell.name}(),
-  request:   ${retriever_1.requestFromInput.name}('x <- 1\\nx + 1'),
-  criterion: ['2@x']
-})
-const slice = await slicer.allRemainingSteps()
-// console.log(slice.reconstruct.code)
-`)}
-
-${(0, doc_structure_1.details)('More Information', `
-
-If you compare this, with what you would have done with the old (and removed) \`SteppingSlicer\`, 
-this essentially just requires you to replace the \`SteppingSlicer\` with the ${ctx.link(pipeline_executor_1.PipelineExecutor)}
-and to pass the ${ctx.link('DEFAULT_SLICING_PIPELINE')} as the first argument.
-The ${ctx.link(pipeline_executor_1.PipelineExecutor)}...
-
-1. Provides structures to investigate the results of all intermediate steps
-2. Can be executed step-by-step
-3. Can repeat steps (e.g., to calculate multiple slices on the same input)
-
-See the in-code documentation for more information.
-
-	`)}
-
-
-### Generate Statistics
-
-
-<details>
-
-<summary>Adding a New Feature to Extract</summary>
-
-In this example, we construct a new feature to extract, with the name "*example*".
-Whenever this name appears, you may substitute this with whatever name fits your feature best (as long as the name is unique).
-
-1. **Create a new file in \`src/statistics/features/supported\`**\\
-   Create the file \`example.ts\`, and add its export to the \`index.ts\` file in the same directory (if not done automatically).
-
-2. **Create the basic structure**\\
-   To get a better feel of what a feature must have, let's look
-   at the basic structure (of course, due to TypeScript syntax,
-   there are other ways to achieve the same goal):
-
-   \`\`\`ts
-   const initialExampleInfo = {
-       /* whatever start value is good for you */
-       someCounter: 0
-   }
-
-   export type ExampleInfo = Writable<typeof initialExampleInfo>
-
-   export const example: Feature<ExampleInfo> = {
-    name:        'Example Feature',
-    description: 'A longer example description',
-
-    process(existing: ExampleInfo, input: FeatureProcessorInput): ExampleInfo {
-      /* perform analysis on the input */
-      return existing
-    },
-
-    initialValue: initialExampleInfo
-   }
-   \`\`\`
-
-   The \`initialExampleInfo\` type holds the initial values for each counter that you want to maintain during the feature extraction (they will usually be initialized with 0). The resulting \`ExampleInfo\` type holds the structure of the data that is to be counted. Due to the vast amount of data processed, information like the name and location of a function call is not stored here, but instead written to disk (see below).
-
-   Every new feature must be of the \`Feature<Info>\` type, with \`Info\` referring to a \`FeatureInfo\` (like \`ExampleInfo\` in this example). Next to a \`name\` and a \`description\`, each Feature must provide:
-
-   - a processor that extracts the information from the input, adding it to the existing information.
-   - a function returning the initial value of the information (in this case, \`initialExampleInfo\`).
-
-3. **Add it to the feature-mapping**\\
-   Now, in the \`feature.ts\` file in \`src/statistics/features\`, add your feature to the \`ALL_FEATURES\` object.
-
-Now, we want to extract something. For the *example* feature created in the previous steps, we choose to count the amount of \`COMMENT\` tokens.
-So we define a corresponding [XPath](https://developer.mozilla.org/en-US/docs/Web/XPath) query:
-
-\`\`\`ts
-const commentQuery: Query = xpath.parse('//COMMENT')
-\`\`\`
-
-Within our feature's \`process\` function, running the query is as simple as:
-
-\`\`\`ts
-const comments = commentQuery.select({ node: input.parsedRAst })
-\`\`\`
-
-Now we could do a lot of further processing, but for simplicity, we only record every comment found this way:
-
-\`\`\`ts
-appendStatisticsFile(example.name, 'comments', comments, input.filepath)
-\`\`\`
-
-We use \`example.name\` to avoid duplication with the name that we’ve assigned to the feature. It corresponds to the name of the folder in the statistics output.
-\`'comments'\` refers to a freely chosen (but unique) name, that will be used as the name for the output file within the folder. The \`comments\` variable holds the result of the query, which is an array of nodes. Finally, we pass the \`filepath\` of the file that was analyzed (if known), so that it can be added to the statistics file (as additional information).
-
-</details>
-	`;
-}
 /**
  * https://github.com/flowr-analysis/flowr/wiki/Interface
  */
@@ -474,20 +318,15 @@ this wiki page explains how to interface with _flowR_ in more detail.
 In general, command line arguments and other options provide short descriptions on hover over.
 
 * [💻 Using the REPL](#using-the-repl)
-* [💬 Communicating with the Server](#communicating-with-the-server)
 * [⚙️ Configuring FlowR](#configuring-flowr)
 * [⚒️ Writing Code](#writing-code)
+* [💬 Communicating with the Server](#communicating-with-the-server)
 
 <a id='using-the-repl'></a>
 ## 💻 Using the REPL
 
 ${await explainRepl(treeSitter, ctx)}
 
-<a id='communicating-with-the-server'></a>
-## 💬 Communicating with the Server
-
-${await explainServer(shell)}
-
 
 <a id='configuring-flowr'></a>
 ## ⚙️ Configuring FlowR
@@ -497,7 +336,12 @@ ${explainConfigFile()}
 <a id='writing-code'></a>
 ## ⚒️ Writing Code
 
-${explainWritingCode(shell, ctx)}
+${(0, doc_writing_code_1.explainWritingCode)(shell, ctx)}
+
+<a id='communicating-with-the-server'></a>
+## 💬 Communicating with the Server
+
+${await explainServer(shell)}
 `;
     }
 }

package/documentation/wiki-mk/doc-context.d.ts

@@ -46,6 +46,16 @@ type ProtoKeys<T> = T extends {
 type StaticKeys<T> = T extends {
     prototype: infer P;
 } ? Exclude<keyof T, keyof P> : never;
+export declare const ConstantWikiLinkInfo: {
+    readonly 'flowr:npm': "https://www.npmjs.com/package/@eagleoutice/flowr";
+    readonly 'flowr:github': string;
+    readonly 'flowr:wiki': "https://github.com/flowr-analysis/flowr/wiki";
+    readonly 'flowr:docker': "https://hub.docker.com/r/eagleoutice/flowr";
+    readonly 'flowr:vscode': "https://marketplace.visualstudio.com/items?itemName=code-inspect.vscode-flowr";
+    readonly 'flowr:positron': "https://open-vsx.org/extension/code-inspect/vscode-flowr";
+    readonly 'flowr:rstudio-addin': "https://github.com/flowr-analysis/rstudio-addin-flowr";
+    readonly 'flowr:radapter': "https://github.com/flowr-analysis/flowr-r-adapter";
+};
 /**
  * Provides methods to generate links, code snippets, and documentation for code elements.
  * These wrap around a collection of useful helpers originating from the doc utils.
@@ -184,11 +194,12 @@ export interface GeneralDocContext {
      * linkWikiPage('wiki/Setup')
      * ```
      * Creates a link to the `wiki/Setup` wiki page with the link text `Setup`.
+     * This also supports a select subset of external pages in the context of flowR
      * @param pageName - The name of the wiki page to link to.
      * @param linkText - Optional text to display for the link. If not provided, the page name will be used.
      * @param segment  - An optional segment within the page to link to (e.g., a header anchor).
      */
-    linkPage(pageName: ValidWikiDocumentTargetsNoSuffix, linkText?: string, segment?: string): string;
+    linkPage(pageName: ValidWikiDocumentTargetsNoSuffix | keyof typeof ConstantWikiLinkInfo, linkText?: string, segment?: string): string;
     /**
      * Generates a link to a code file in the code base.
      * @param path       - The path to the code file.

package/documentation/wiki-mk/doc-context.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConstantWikiLinkInfo = void 0;
 exports.makeDocContextForTypes = makeDocContextForTypes;
 const doc_types_1 = require("../doc-util/doc-types");
 const path_1 = __importDefault(require("path"));
@@ -21,6 +22,16 @@ function getNameFromElementIdOrRef(element) {
         return element;
     }
 }
+exports.ConstantWikiLinkInfo = {
+    'flowr:npm': doc_files_1.FlowrNpmRef,
+    'flowr:github': doc_files_1.FlowrGithubRef,
+    'flowr:wiki': doc_files_1.FlowrWikiBaseRef,
+    'flowr:docker': doc_files_1.FlowrDockerRef,
+    'flowr:vscode': doc_files_1.FlowrVsCode,
+    'flowr:positron': doc_files_1.FlowrPositron,
+    'flowr:rstudio-addin': doc_files_1.FlowrRStudioAddin,
+    'flowr:radapter': doc_files_1.FlowrRAdapter
+};
 /**
  * Creates a wiki context for generating documentation for code elements.
  * This context provides methods to create links, code snippets, and documentation for code elements.
@@ -44,8 +55,8 @@ function makeDocContextForTypes(shell, ...rootFolders) {
             return (0, doc_types_1.getDocumentationForType)(getNameFromElementIdOrRef(element), info, '', filter);
         },
         link(element, fmt, filter) {
-            (0, assert_1.guard)(filter === undefined, 'ElementFilter is not yet supported for link');
-            return (0, doc_types_1.shortLink)(getNameFromElementIdOrRef(element), info, fmt?.codeFont, fmt?.realNameWrapper);
+            (0, assert_1.guard)(filter?.file === undefined, 'filtering for files is not yet supported for link');
+            return (0, doc_types_1.shortLink)(getNameFromElementIdOrRef(element), info, fmt?.codeFont, fmt?.realNameWrapper, filter?.fuzzy, filter?.type);
         },
         linkM(cls, element, fmt, filter) {
             const className = cls.prototype.constructor.name;
@@ -83,8 +94,14 @@ function makeDocContextForTypes(shell, ...rootFolders) {
         },
         linkPage(pageName, linkText, segment) {
             const text = linkText ?? pageName.split('/').pop() ?? pageName;
-            const link = pageName.toLowerCase().replace(/ /g, '-');
-            return `[${text}](${doc_files_1.FlowrGithubRef}/${link}${segment ? `#${segment}` : ''})`;
+            let link;
+            if (pageName in exports.ConstantWikiLinkInfo) {
+                link = exports.ConstantWikiLinkInfo[pageName];
+            }
+            else {
+                link = `${doc_files_1.FlowrWikiBaseRef}/${pageName.toLowerCase().replace(/ /g, '-')}`;
+            }
+            return `[${text}](${link}${segment ? `#${segment}` : ''})`;
         },
         linkCode(path, lineNumber) {
             const lnk = lineNumber ? `${path.toString()}#L${lineNumber}` : path.toString();

package/documentation/wiki-normalized-ast.js

@@ -170,6 +170,11 @@ Please note, that they usually operate on the ${ctx.link('RExpressionList')} lev
 you to decide how you want to traverse multiple files with a ${ctx.link('RProject')} in the AST (you can, for example, simplify flat-map over the files).
 The ${ctx.link('RProject')} node cannot appear nested within other nodes, so you can safely assume that any child of a node is not an ${ctx.link('RProject')}.
 
+${(0, doc_structure_1.block)({
+            type: 'TIP',
+            content: 'When working with names and identifiers, consider using the utilities provided with the ' + ctx.link('Identifier', undefined, { type: 'variable' }) + ' object.',
+        })}
+
 ### Visitors
 
 If you want a simple visitor which traverses the AST, the ${ctx.link(visitor_1.visitAst)} function is a good starting point.

package/linter/linter-rules.d.ts

@@ -10,7 +10,7 @@ export declare const LintingRules: {
             results: {
                 certainty: import("./linter-format").LintingResultCertainty;
                 involvedId: import("../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
-                function: import("../dataflow/environments/identifier").Identifier;
+                function: import("../dataflow/environments/identifier").BrandedIdentifier;
                 range: import("../util/range").SourceRange;
             }[];
             '.meta': import("./rules/function-finder-util").FunctionsMetadata;
@@ -67,7 +67,7 @@ export declare const LintingRules: {
             results: {
                 involvedId: import("../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
                 certainty: import("./linter-format").LintingResultCertainty;
-                function: import("../dataflow/environments/identifier").Identifier;
+                function: import("../dataflow/environments/identifier").BrandedIdentifier;
                 range: import("../util/range").SourceRange;
             }[];
             '.meta': import("./rules/seeded-randomness").SeededRandomnessMeta;
@@ -196,7 +196,7 @@ export declare const LintingRules: {
             results: {
                 certainty: import("./linter-format").LintingResultCertainty;
                 involvedId: import("../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
-                function: import("../dataflow/environments/identifier").Identifier;
+                function: import("../dataflow/environments/identifier").BrandedIdentifier;
                 range: import("../util/range").SourceRange;
             }[];
             '.meta': import("./rules/function-finder-util").FunctionsMetadata;

package/linter/rules/absolute-path.js

@@ -48,28 +48,28 @@ function buildQuickFix(str, filePath, wd) {
         }];
 }
 /** return all strings constructable by these functions */
-const PathFunctions = {
-    'file.path': (df, vtx, ctx) => {
-        const fsep = (0, resolve_argument_1.getArgumentStringValue)(ctx.config.solver.variables, df, vtx, undefined, 'fsep', true, ctx);
-        // in the future we can access `.Platform$file.sep` here
-        const sepValues = fsep?.values()?.flatMap(s => s.values().filter(assert_1.isNotUndefined)).toArray() ?? [path_1.default.sep];
-        if (sepValues.some(s => s === dependencies_query_format_1.Unknown || (0, assert_1.isUndefined)(s))) {
-            // if we have no fsep, we cannot construct a path
-            return undefined;
-        }
-        const args = (0, resolve_argument_1.getArgumentStringValue)(ctx.config.solver.variables, df, vtx, 'unnamed', undefined, true, ctx);
-        const argValues = args ? Array.from(args.values()).flatMap(v => [...v]) : [];
-        if (!argValues || argValues.length === 0 || argValues.some(v => v === dependencies_query_format_1.Unknown || (0, assert_1.isUndefined)(v))) {
-            // if we have no arguments, we cannot construct a path
-            return undefined;
-        }
-        const results = [];
-        for (const val of sepValues) {
-            results.push(argValues.join(val));
-        }
-        return results;
-    }
-};
+const PathFunctions = new Map([
+    ['file.path', (df, vtx, ctx) => {
+            const fsep = (0, resolve_argument_1.getArgumentStringValue)(ctx.config.solver.variables, df, vtx, undefined, 'fsep', true, ctx);
+            // in the future we can access `.Platform$file.sep` here
+            const sepValues = fsep?.values()?.flatMap(s => s.values().filter(assert_1.isNotUndefined)).toArray() ?? [path_1.default.sep];
+            if (sepValues.some(s => s === dependencies_query_format_1.Unknown || (0, assert_1.isUndefined)(s))) {
+                // if we have no fsep, we cannot construct a path
+                return undefined;
+            }
+            const args = (0, resolve_argument_1.getArgumentStringValue)(ctx.config.solver.variables, df, vtx, 'unnamed', undefined, true, ctx);
+            const argValues = args ? Array.from(args.values()).flatMap(v => [...v]) : [];
+            if (!argValues || argValues.length === 0 || argValues.some(v => v === dependencies_query_format_1.Unknown || (0, assert_1.isUndefined)(v))) {
+                // if we have no arguments, we cannot construct a path
+                return undefined;
+            }
+            const results = [];
+            for (const val of sepValues) {
+                results.push(argValues.join(val));
+            }
+            return results;
+        }]
+]);
 exports.ABSOLUTE_PATH = {
     /* this can be done better once we have types */
     createSearch: (config) => {
@@ -138,7 +138,7 @@ exports.ABSOLUTE_PATH = {
                 else {
                     const dfNode = data.dataflow.graph.getVertex(node.info.id);
                     if ((0, vertex_1.isFunctionCallVertex)(dfNode)) {
-                        const handler = PathFunctions[dfNode.name ?? ''];
+                        const handler = dfNode.name ? PathFunctions.get(dfNode.name) : undefined;
                         const strings = handler ? handler(data.dataflow.graph, dfNode, data.analyzer.inspectContext()) : [];
                         if (strings) {
                             return strings.filter(s => (0, strings_1.isAbsolutePath)(s, regex)).map(str => ({

package/linter/rules/dataframe-access-validation.js

@@ -13,6 +13,7 @@ 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");
+const identifier_1 = require("../../dataflow/environments/identifier");
 exports.DATA_FRAME_ACCESS_VALIDATION = {
     createSearch: () => flowr_search_builder_1.Q.all().with(search_enrichers_1.Enrichment.CallTargets, { onlyBuiltin: true }),
     processSearchResult: (elements, config, data) => {
@@ -67,7 +68,7 @@ exports.DATA_FRAME_ACCESS_VALIDATION = {
             ...accessed,
             involvedId: node?.info.id,
             access: node?.lexeme ?? '???',
-            ...(operand?.type === type_1.RType.Symbol ? { operand: operand.content } : {}),
+            ...(operand?.type === type_1.RType.Symbol ? { operand: identifier_1.Identifier.getName(operand.content) } : {}),
             range: node?.info.fullRange ?? node?.location ?? (0, range_1.rangeFrom)(-1, -1, -1, -1),
             certainty: linter_format_1.LintingResultCertainty.Certain
         }));

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

@@ -7,7 +7,7 @@ export declare const DEPRECATED_FUNCTIONS: {
         results: {
             certainty: import("../linter-format").LintingResultCertainty;
             involvedId: import("../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
-            function: import("../../dataflow/environments/identifier").Identifier;
+            function: import("../../dataflow/environments/identifier").BrandedIdentifier;
             range: import("../../util/range").SourceRange;
         }[];
         '.meta': FunctionsMetadata;

package/linter/rules/deprecated-functions.js

@@ -15,7 +15,7 @@ exports.DEPRECATED_FUNCTIONS = {
         certainty: linter_format_1.LintingRuleCertainty.BestEffort,
         description: 'Marks deprecated functions that should not be used anymore.',
         defaultConfig: {
-            fns: ['all_equal', 'arrange_all', 'distinct_all', 'filter_all', 'group_by_all', 'summarise_all', 'mutate_all', 'select_all', 'vars', 'all_vars', 'id', 'failwith', 'select_vars', 'rename_vars', 'select_var', 'current_vars', 'bench_tbls', 'compare_tbls', 'compare_tbls2', 'eval_tbls', 'eval_tbls2', 'location', 'changes', 'combine', 'do', 'funs', 'add_count_', 'add_tally_', 'arrange_', 'count_', 'distinct_', 'do_', 'filter_', 'funs_', 'group_by_', 'group_indices_', 'mutate_', 'tally_', 'transmute_', 'rename_', 'rename_vars_', 'select_', 'select_vars_', 'slice_', 'summarise_', 'summarize_', 'summarise_each', 'src_local', 'tbl_df', 'add_rownames', 'group_nest', 'group_split', 'with_groups', 'nest_by', 'progress_estimated', 'recode', 'sample_n', 'top_n', 'transmute', 'fct_explicit_na', 'aes_', 'aes_auto', 'annotation_logticks', 'is.Coord', 'coord_flip', 'coord_map', 'is.facet', 'fortify', 'is.ggproto', 'guide_train', 'is.ggplot', 'qplot', 'is.theme', 'gg_dep', 'liply', 'isplit2', 'list_along', 'cross', 'invoke', 'at_depth', 'prepend', 'rerun', 'splice', '`%@%`', 'rbernoulli', 'rdunif', 'when', 'update_list', 'map_raw', 'accumulate', 'reduce_right', 'flatten', 'map_dfr', 'as_vector', 'transpose', 'melt_delim', 'melt_fwf', 'melt_table', 'read_table2', 'str_interp', 'as_tibble', 'data_frame', 'tibble_', 'data_frame_', 'lst_', 'as_data_frame', 'as.tibble', 'frame_data', 'trunc_mat', 'is.tibble', 'tidy_names', 'set_tidy_names', 'repair_names', 'extract_numeric', 'complete_', 'drop_na_', 'expand_', 'crossing_', 'nesting_', 'extract_', 'fill_', 'gather_', 'nest_', 'separate_rows_', 'separate_', 'spread_', 'unite_', 'unnest_', 'extract', 'gather', 'nest_legacy', 'separate_rows', 'separate', 'spread',]
+            fns: ['all_equal', 'arrange_all', 'distinct_all', 'filter_all', 'group_by_all', 'summarise_all', 'mutate_all', 'select_all', 'vars', 'all_vars', 'id', 'failwith', 'select_vars', 'rename_vars', 'select_var', 'current_vars', 'bench_tbls', 'compare_tbls', 'compare_tbls2', 'eval_tbls', 'eval_tbls2', 'location', 'changes', 'combine', 'do', 'funs', 'add_count_', 'add_tally_', 'arrange_', 'count_', 'distinct_', 'do_', 'filter_', 'funs_', 'group_by_', 'group_indices_', 'mutate_', 'tally_', 'transmute_', 'rename_', 'rename_vars_', 'select_', 'select_vars_', 'slice_', 'summarise_', 'summarize_', 'summarise_each', 'src_local', 'tbl_df', 'add_rownames', 'group_nest', 'group_split', 'with_groups', 'nest_by', 'progress_estimated', 'recode', 'sample_n', 'top_n', 'transmute', 'fct_explicit_na', 'aes_', 'aes_auto', 'annotation_logticks', 'is.Coord', 'coord_flip', 'coord_map', 'is.facet', 'fortify', 'is.ggproto', 'guide_train', 'is.ggplot', 'qplot', 'is.theme', 'gg_dep', 'liply', 'isplit2', 'list_along', 'cross', 'invoke', 'at_depth', 'prepend', 'rerun', 'splice', '`%@%`', 'rbernoulli', 'rdunif', 'when', 'update_list', 'map_raw', 'accumulate', 'reduce_right', 'flatten', 'map_dfr', 'as_vector', 'transpose', 'melt_delim', 'melt_fwf', 'melt_table', 'read_table2', 'str_interp', 'as_tibble', 'data_frame', 'tibble_', 'data_frame_', 'lst_', 'as_data_frame', 'as.tibble', 'frame_data', 'trunc_mat', 'is.tibble', 'tidy_names', 'set_tidy_names', 'repair_names', 'extract_numeric', 'complete_', 'drop_na_', 'expand_', 'crossing_', 'nesting_', 'extract_', 'fill_', 'gather_', 'nest_', 'separate_rows_', 'separate_', 'spread_', 'unite_', 'unnest_', 'extract', 'gather', 'nest_legacy', 'separate_rows', 'separate', 'spread']
         }
     }
 };

package/linter/rules/function-finder-util.d.ts

@@ -1,5 +1,4 @@
 import type { SourceRange } from '../../util/range';
-import type { Identifier } from '../../dataflow/environments/identifier';
 import { type LintingResult, LintingResultCertainty } from '../linter-format';
 import type { FlowrSearchElement, FlowrSearchElements } from '../../search/flowr-search';
 import type { NormalizedAst, ParentInformation } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
@@ -7,6 +6,7 @@ import type { MergeableRecord } from '../../util/objects';
 import type { DataflowInformation } from '../../dataflow/info';
 import type { FunctionInfo } from '../../queries/catalog/dependencies-query/function-info/function-info';
 import type { ReadonlyFlowrAnalysisProvider } from '../../project/flowr-analyzer';
+import type { BrandedIdentifier } from '../../dataflow/environments/identifier';
 export interface FunctionsResult extends LintingResult {
     function: string;
     range: SourceRange;
@@ -30,7 +30,7 @@ export declare const functionFinderUtil: {
         results: {
             certainty: LintingResultCertainty;
             involvedId: import("../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
-            function: Identifier;
+            function: BrandedIdentifier;
             range: SourceRange;
         }[];
         '.meta': FunctionsMetadata;

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

@@ -19,7 +19,7 @@ export declare const NETWORK_FUNCTIONS: {
         results: {
             certainty: import("../linter-format").LintingResultCertainty;
             involvedId: import("../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
-            function: import("../../dataflow/environments/identifier").Identifier;
+            function: import("../../dataflow/environments/identifier").BrandedIdentifier;
             range: import("../../util/range").SourceRange;
         }[];
         '.meta': FunctionsMetadata;

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

@@ -1,7 +1,7 @@
 import { type LintingResult, LintingResultCertainty, LintingRuleCertainty } from '../linter-format';
 import type { SourceRange } from '../../util/range';
 import type { MergeableRecord } from '../../util/objects';
-import type { Identifier } from '../../dataflow/environments/identifier';
+import type { BrandedIdentifier } from '../../dataflow/environments/identifier';
 import { LintingRuleTag } from '../linter-tags';
 export interface SeededRandomnessResult extends LintingResult {
     function: string;
@@ -40,7 +40,7 @@ export declare const SEEDED_RANDOMNESS: {
         results: {
             involvedId: import("../../r-bridge/lang-4.x/ast/model/processing/node-id").NodeId;
             certainty: LintingResultCertainty;
-            function: Identifier;
+            function: BrandedIdentifier;
             range: SourceRange;
         }[];
         '.meta': SeededRandomnessMeta;

package/linter/rules/seeded-randomness.js

@@ -5,6 +5,7 @@ const linter_format_1 = require("../linter-format");
 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");
 const default_builtin_config_1 = require("../../dataflow/environments/default-builtin-config");
 const graph_1 = require("../../dataflow/graph/graph");
@@ -31,11 +32,11 @@ exports.SEEDED_RANDOMNESS = {
     })
         .with(search_enrichers_1.Enrichment.LastCall, [
         { callName: config.randomnessProducers.filter(p => p.type === 'function').map(p => p.name) },
-        { callName: getDefaultAssignments().flatMap(b => b.names), cascadeIf: () => cascade_action_1.CascadeAction.Continue }
+        { callName: getDefaultAssignments().flatMap(b => b.names).map(identifier_1.Identifier.getName), cascadeIf: () => cascade_action_1.CascadeAction.Continue }
     ]),
     processSearchResult: (elements, config, { dataflow, analyzer }) => {
         const assignmentProducers = new Set(config.randomnessProducers.filter(p => p.type == 'assignment').map(p => p.name));
-        const assignmentArgIndexes = new Map(getDefaultAssignments().flatMap(a => a.names.map(n => ([n, a.config?.swapSourceAndTarget ? 1 : 0]))));
+        const assignmentArgIndexes = new Map(getDefaultAssignments().flatMap(a => a.names.map(n => ([identifier_1.Identifier.getName(n), a.config?.swapSourceAndTarget ? 1 : 0]))));
         const metadata = {
             consumerCalls: 0,
             callsWithFunctionProducers: 0,
@@ -61,7 +62,7 @@ exports.SEEDED_RANDOMNESS = {
                 const cds = dfgElement ? new Set(dfgElement.cds) : new Set();
                 const producers = (0, search_enrichers_1.enrichmentContent)(element.searchElement, search_enrichers_1.Enrichment.LastCall).linkedIds
                     .map(e => dataflow.graph.getVertex(e.node.info.id));
-                const { assignment, func } = Object.groupBy(producers, f => assignmentArgIndexes.has(f.name) ? 'assignment' : 'func');
+                const { assignment, func } = Object.groupBy(producers, f => assignmentArgIndexes.has(identifier_1.Identifier.getName(f.name)) ? 'assignment' : 'func');
                 let nonConstant = false;
                 const cdsOfProduces = new Set();
                 // function calls are already taken care of through the LastCall enrichment itself
@@ -84,7 +85,7 @@ exports.SEEDED_RANDOMNESS = {
                 }
                 // assignments have to be queried for their destination
                 for (const a of assignment ?? []) {
-                    const argIdx = assignmentArgIndexes.get(a.name);
+                    const argIdx = assignmentArgIndexes.get(identifier_1.Identifier.getName(a.name));
                     const dest = (0, graph_1.getReferenceOfArgument)(a.args[argIdx]);
                     if (dest !== undefined && assignmentProducers.has((0, node_id_1.recoverName)(dest, dataflow.graph.idMap))) {
                         // we either have arg index 0 or 1 for the assignmentProducers destination, so we select the assignment value as 1-argIdx here

package/linter/rules/unused-definition.js

@@ -14,7 +14,7 @@ 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(([, { types }]) => (0, edge_1.edgeIncludesType)(types, edge_1.EdgeType.DefinedBy))
+    return [...dfg.outgoingEdges(def) ?? []].filter(([, e]) => edge_1.DfEdge.includesType(e, edge_1.EdgeType.DefinedBy))
         .map(([target]) => target);
 }
 function buildQuickFix(variable, dfg, ast) {
@@ -27,8 +27,8 @@ 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) ?? []])
-            .some(([target, { types }]) => {
-            return (0, edge_1.edgeIncludesType)(types, InterestingEdgesTargets) || dfg.unknownSideEffects.has(target);
+            .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
@@ -74,7 +74,7 @@ exports.UNUSED_DEFINITION = {
                 }
                 const ingoingEdges = data.dataflow.graph.ingoingEdges(dfgVertex.id);
                 const interestedIn = (0, vertex_1.isVariableDefinitionVertex)(dfgVertex) ? InterestingEdgesVariable : InterestingEdgesFunction;
-                const ingoingInteresting = ingoingEdges?.values().some(e => (0, edge_1.edgeIncludesType)(e.types, interestedIn));
+                const ingoingInteresting = ingoingEdges?.values().some(e => edge_1.DfEdge.includesType(e, interestedIn));
                 if (ingoingInteresting) {
                     return undefined;
                 }