@eagleoutice/flowr 2.9.9 → 2.9.11

package/documentation/wiki-cfg.js

@@ -46,7 +46,7 @@ function sampleCollectNumbers(cfg, ast) {
         /* obtain the corresponding node from the AST */
         const node = ast.idMap.get(id);
         /* if it is present and a number, add the parsed value to the list */
-        if ((0, r_number_1.isRNumber)(node)) {
+        if (r_number_1.RNumber.is(node)) {
             numbers.push(node.content);
         }
     });
@@ -61,7 +61,7 @@ class CollectNumbersVisitor extends basic_cfg_guided_visitor_1.BasicCfgGuidedVis
     }
     onVisitNode(node) {
         const astNode = this.ast.idMap.get(node);
-        if ((0, r_number_1.isRNumber)(astNode)) {
+        if (r_number_1.RNumber.is(astNode)) {
             this.numbers.push(astNode.content);
         }
         super.onVisitNode(node);
@@ -89,7 +89,7 @@ class CollectNumbersDataflowVisitor extends dfg_cfg_guided_visitor_1.DataflowAwa
     }
     visitValue(node) {
         const astNode = this.config.dfg.idMap?.get(node.id);
-        if ((0, r_number_1.isRNumber)(astNode)) {
+        if (r_number_1.RNumber.is(astNode)) {
             this.numbers.push(astNode.content);
         }
     }

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

@@ -98,10 +98,18 @@ export interface GeneralDocContext {
      *
      * Creates a (markdown) link to the `myMethod` member of the `MyClass` class in the code base.
      * @see {@link GeneralWikiContext#link|link} - for the underlying impl.
+     * @see {@link GeneralWikiContext#linkO|linkO} - to link using an object reference instead of a class and member name (e.g. for helper objects).
      */
     linkM<T extends NamedPrototype>(cls: T, element: ProtoKeys<T> | StaticKeys<T>, fmt?: LinkFormat & {
         hideClass?: boolean;
     }, filter?: ElementFilter): string;
+    /**
+     * Generate a hyperlink to a type/element definition in the code base which is displayed using the type/element name as link text.
+     * This is similar to {@link GeneralDocContext#link}, but it uses the type/element name as link text, which is especially useful for types with long or complex names.
+     */
+    linkO<T extends object & {
+        name: string;
+    }>(obj: T, element: keyof T, fmt?: LinkFormat, filter?: ElementFilter): string;
     /**
      * Generate a hyperlink to a type/element definition in the code base which is displayed using the file path as name
      * @param element - The element to create a link for, the name can be qualified with `::` to specify the class.

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

@@ -67,6 +67,10 @@ function makeDocContextForTypes(shell, ...rootFolders) {
             const fullName = `${className}${sep}${String(element)}`;
             return this.link(fullName, fmt, filter);
         },
+        linkO(obj, element, fmt, filter) {
+            const fullName = `${obj.name}::${String(element)}`;
+            return this.link(fullName, fmt, filter);
+        },
         linkFile(element) {
             return (0, doc_types_1.shortLinkFile)(getNameFromElementIdOrRef(element), info);
         },

package/documentation/wiki-normalized-ast.d.ts

@@ -2,7 +2,7 @@ import { DefaultNormalizedAstFold } from '../abstract-interpretation/normalized-
 import type { DocMakerArgs } from './wiki-mk/doc-maker';
 import { DocMaker } from './wiki-mk/doc-maker';
 import type { RNumber } from '../r-bridge/lang-4.x/ast/model/nodes/r-number';
-import type { RBinaryOp } from '../r-bridge/lang-4.x/ast/model/nodes/r-binary-op';
+import { RBinaryOp } from '../r-bridge/lang-4.x/ast/model/nodes/r-binary-op';
 export declare class MyMathFold<Info> extends DefaultNormalizedAstFold<number, Info> {
     constructor();
     protected concat(a: number, b: number): number;

package/documentation/wiki-normalized-ast.js

@@ -7,14 +7,15 @@ const doc_files_1 = require("./doc-util/doc-files");
 const doc_cli_option_1 = require("./doc-util/doc-cli-option");
 const doc_structure_1 = require("./doc-util/doc-structure");
 const retriever_1 = require("../r-bridge/retriever");
-const visitor_1 = require("../r-bridge/lang-4.x/ast/model/processing/visitor");
-const collect_1 = require("../r-bridge/lang-4.x/ast/model/collect");
 const normalized_ast_fold_1 = require("../abstract-interpretation/normalized-ast-fold");
 const flowr_analyzer_1 = require("../project/flowr-analyzer");
 const flowr_analyzer_builder_1 = require("../project/flowr-analyzer-builder");
 const flowr_file_1 = require("../project/context/flowr-file");
 const doc_maker_1 = require("./wiki-mk/doc-maker");
 const roxygen_parse_1 = require("../r-bridge/roxygen2/roxygen-parse");
+const r_binary_op_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-binary-op");
+const model_1 = require("../r-bridge/lang-4.x/ast/model/model");
+const r_project_1 = require("../r-bridge/lang-4.x/ast/model/nodes/r-project");
 async function quickNormalizedAstMultipleFiles() {
     const analyzer = await new flowr_analyzer_builder_1.FlowrAnalyzerBuilder()
         .setEngine('tree-sitter')
@@ -77,7 +78,9 @@ offering the following benefits:
 3. decorate the AST with additional information, e.g., parent relations and nesting information
 
 In general, the mapping should be rather intuitive and focused primarily on the
-syntactic structure of the program.
+syntactic structure of the program. As with other types in flowR, you get corresponding helper objects.
+So if you want to work with an \`RBinaryOp\` node, you can use the ${ctx.link(r_binary_op_1.RBinaryOp)} object to check whether a node is an \`RBinaryOp\` and to access its fields
+(e.g., with ${ctx.linkO(r_binary_op_1.RBinaryOp, 'is')}).
 Consider the following example which shows the normalized AST of the code
 
 ${(0, doc_code_1.codeBlock)('r', 'x <- 2 * 3 + 1')}
@@ -120,7 +123,7 @@ Most notably, the \`info\` field holds the \`id\` of the node, which is used to
 
 In summary, we have the following types:
 
-${(0, doc_structure_1.details)('Normalized AST Node Types', ctx.hierarchy('RNode', { collapseFromNesting: Number.MAX_VALUE }))}
+${(0, doc_structure_1.details)('Normalized AST Node Types', ctx.hierarchy('RNode', { collapseFromNesting: Number.MAX_VALUE, ignoredTypes: ['Info', 'LogLevel'] }))}
 
 The following segments intend to give you an overview of how to work with the normalized AST:
 
@@ -177,11 +180,11 @@ ${(0, doc_structure_1.block)({
 
 ### Visitors
 
-If you want a simple visitor which traverses the AST, the ${ctx.link(visitor_1.visitAst)} function is a good starting point.
+If you want a simple visitor which traverses the AST, the ${ctx.linkO(model_1.RNode, 'visitAst')} function is a good starting point.
 You may specify functions to be called whenever you enter and exit a node during the traversal, and any
 computation is to be done by side effects.
 For example, if you want to collect all the \`id\`s present within a normalized (sub-)AST,
-as it is done by the ${ctx.link(collect_1.collectAllIds)} function, you can use the following visitor:
+as it is done by the ${ctx.linkO(model_1.RNode, 'collectAllIds')} (and corresponding ${ctx.linkO(model_1.RNode, 'collectAllIdsWithStop')}, ${ctx.linkO(r_project_1.RProject, 'collectAllIds')}, ...) function, you can use the following visitor:
 
 ${(0, doc_code_1.codeBlock)('ts', `
 const ids = new Set<NodeId>();

package/linter/linter-format.d.ts

@@ -155,10 +155,20 @@ export declare const LintingResults: {
      * If the results represent an error, an empty set is returned.
      */
     readonly allInvolvedIds: <L extends LintingRuleNames>(this: void, res: LintingResults<L> | undefined) => Set<NodeId>;
+    /**
+     * Gets all locations from the given linting results, i.e. the `loc` property of all results that have a location.
+     */
+    readonly allLocations: <L extends LintingRuleNames>(this: void, res: LintingResults<L> | undefined) => SourceLocation[];
     /**
      * Stringifies the error contained in the given linting results error.
      */
     readonly stringifyError: (this: void, { error }: LintingResultsError) => string;
+    /**
+     * Checks whether the given linting result has a location, i.e. whether it has a `loc` property.
+     */
+    readonly hasLocation: <R extends LintingResult>(this: void, res: R) => res is R & {
+        loc: SourceLocation;
+    };
 };
 export declare enum LintingResultCertainty {
     /**

package/linter/linter-format.js

@@ -42,6 +42,15 @@ exports.LintingResults = {
         }
         return new Set(res.results.flatMap(r => r.involvedId).filter(assert_1.isNotUndefined));
     },
+    /**
+     * Gets all locations from the given linting results, i.e. the `loc` property of all results that have a location.
+     */
+    allLocations(res) {
+        if (!res || exports.LintingResults.isError(res)) {
+            return [];
+        }
+        return res.results.filter(exports.LintingResults.hasLocation).map(r => r.loc);
+    },
     /**
      * Stringifies the error contained in the given linting results error.
      */
@@ -58,6 +67,12 @@ exports.LintingResults = {
         catch {
             return String(error);
         }
+    },
+    /**
+     * Checks whether the given linting result has a location, i.e. whether it has a `loc` property.
+     */
+    hasLocation(res) {
+        return 'loc' in res;
     }
 };
 var LintingResultCertainty;

package/linter/rules/absolute-path.js

@@ -11,7 +11,6 @@ const range_1 = require("../../util/range");
 const linter_tags_1 = require("../linter-tags");
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 const strings_1 = require("../../util/text/strings");
-const r_string_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-string");
 const assert_1 = require("../../util/assert");
 const read_functions_1 = require("../../queries/catalog/dependencies-query/function-info/read-functions");
 const write_functions_1 = require("../../queries/catalog/dependencies-query/function-info/write-functions");
@@ -21,6 +20,7 @@ const vertex_1 = require("../../dataflow/graph/vertex");
 const dependencies_query_format_1 = require("../../queries/catalog/dependencies-query/dependencies-query-format");
 const resolve_argument_1 = require("../../dataflow/eval/resolve/resolve-argument");
 const path_1 = __importDefault(require("path"));
+const r_string_1 = require("../../r-bridge/lang-4.x/ast/model/nodes/r-string");
 function inferWd(file, wd) {
     if (wd === '@script') {
         // we can use the script path as the working directory
@@ -36,7 +36,7 @@ function inferWd(file, wd) {
 }
 // this can be improved by respecting raw strings and supporting more scenarios
 function buildQuickFix(str, filePath, wd) {
-    if (!wd || !(0, r_string_1.isRString)(str)) {
+    if (!wd || !str || !r_string_1.RString.is(str)) {
         return undefined;
     }
     return [{
@@ -102,7 +102,7 @@ exports.ABSOLUTE_PATH = {
                 metadata.totalConsidered++;
                 const node = element.node;
                 const wd = inferWd(node.info.file, config.useAsWd);
-                if ((0, r_string_1.isRString)(node)) {
+                if (r_string_1.RString.is(node)) {
                     if (node.content.str.length >= 3 && (0, strings_1.isAbsolutePath)(node.content.str, regex)) {
                         return [{
                                 certainty: linter_format_1.LintingResultCertainty.Uncertain,

package/linter/rules/dead-code.js

@@ -22,7 +22,7 @@ exports.DEAD_CODE = {
                 .filter(element => {
                 meta.consideredNodes++;
                 const cfgInformation = (0, search_enrichers_1.enrichmentContent)(element, search_enrichers_1.Enrichment.CfgInformation);
-                return cfgInformation.isRoot && !cfgInformation.isReachable;
+                return element.node.info.role !== "el-g" /* RoleInParent.ExpressionListGrouping */ && !cfgInformation.isReachable;
             })
                 .map(element => ({
                 certainty: linter_format_1.LintingResultCertainty.Certain,

package/linter/rules/file-path-validity.js

@@ -28,7 +28,7 @@ exports.FILE_PATH_VALIDITY = {
         const results = elements.enrichmentContent(search_enrichers_1.Enrichment.QueryData).queries['dependencies'];
         return {
             results: elements.getElements().flatMap(element => {
-                const matchingRead = results.read.find(r => r.nodeId == element.node.info.id);
+                const matchingRead = results.read.find(r => r.nodeId === element.node.info.id);
                 if (!matchingRead) {
                     return [];
                 }

package/linter/rules/seeded-randomness.js

@@ -35,7 +35,7 @@ exports.SEEDED_RANDOMNESS = {
         { 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 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 => ([identifier_1.Identifier.getName(n), a.config?.swapSourceAndTarget ? 1 : 0]))));
         const metadata = {
             consumerCalls: 0,

package/linter/rules/unused-definition.js

@@ -19,7 +19,7 @@ function getDefinitionArguments(def, dfg) {
 function buildQuickFix(variable, dfg, ast) {
     // first we check whether any of the 'Defined by' targets have any obligations - if so, we can not remove the definition
     // otherwise we can automatically remove the full definition!
-    if (variable.info.role === "accessed" /* RoleInParent.Accessed */ || variable.info.role === "for-var" /* RoleInParent.ForVariable */) {
+    if (variable.info.role === "acc" /* RoleInParent.Accessed */ || variable.info.role === "for-var" /* RoleInParent.ForVariable */) {
         // this is an access or a for variable, we can not remove it currently
         return undefined;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.9.9",
+  "version": "2.9.11",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -199,7 +199,7 @@
   },
   "dependencies": {
     "@eagleoutice/tree-sitter-r": "^1.1.2",
-    "@jupyterlab/nbformat": "^4.5.0",
+    "@jupyterlab/nbformat": "^4.5.4",
     "@xmldom/xmldom": "^0.9.7",
     "clipboardy": "^4.0.0",
     "command-line-args": "^6.0.1",
@@ -209,17 +209,17 @@
     "gray-matter": "^4.0.3",
     "joi": "^18.0.1",
     "lz-string": "^1.5.0",
-    "n-readlines": "^1.0.1",
-    "n3": "^1.23.1",
+    "n-readlines": "^1.0.3",
+    "n3": "^1.26.0",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.5",
-    "rotating-file-stream": "^3.2.6",
+    "rotating-file-stream": "^3.2.8",
     "seedrandom": "^3.0.5",
-    "semver": "^7.7.1",
+    "semver": "^7.7.4",
     "tar": "^7.4.3",
     "tmp": "^0.2.3",
     "ts-essentials": "^10.1.1",
-    "tslog": "^4.9.3",
+    "tslog": "^4.10.2",
     "web-tree-sitter": "^0.24.7",
     "ws": "^8.18.0",
     "xpath-ts2": "^1.4.2"

package/project/plugins/file-plugins/files/flowr-description-file.d.ts

@@ -24,6 +24,10 @@ export declare class FlowrDescriptionFile extends FlowrFile<DeepReadonly<DCF>> {
      * @see {@link parseDCF} for details on the parsing logic.
      */
     protected loadContent(): DCF;
+    /**
+     * Creates a FlowrDescriptionFile from given DCF content, path and optional roles.
+     * This is useful if you already have the DCF content parsed and want to create a description file instance without re-parsing.
+     */
     static fromDCF(dcf: DCF, path: string, roles?: FileRole[]): FlowrDescriptionFile;
     /**
      * Description file lifter, this does not re-create if already a description file
@@ -55,6 +59,11 @@ export declare class FlowrDescriptionFile extends FlowrFile<DeepReadonly<DCF>> {
      * Returns the parsed dependencies from the 'Depends' field in the DESCRIPTION file.
      */
     depends(): readonly Package[] | undefined;
+    /**
+     * Returns the parsed linking dependencies from the 'LinkingTo' field in the DESCRIPTION file.
+     * This field is used for packages that need to link to C/C++ code and is treated similarly to 'Imports'.
+     */
+    linkingTo(): readonly Package[] | undefined;
     /**
      * Returns the parsed imports from the 'Imports' field in the DESCRIPTION file.
      */

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

@@ -34,6 +34,10 @@ class FlowrDescriptionFile extends flowr_file_1.FlowrFile {
     loadContent() {
         return parseDCF(this.wrapped);
     }
+    /**
+     * Creates a FlowrDescriptionFile from given DCF content, path and optional roles.
+     * This is useful if you already have the DCF content parsed and want to create a description file instance without re-parsing.
+     */
     static fromDCF(dcf, path, roles) {
         const file = new FlowrDescriptionFile(new flowr_file_1.FlowrTextFile(path, roles));
         file.setContent(dcf);
@@ -103,6 +107,14 @@ class FlowrDescriptionFile extends flowr_file_1.FlowrFile {
         const deps = this.content().get('Depends');
         return deps ? parsePackagesWithVersions(deps, 'r') : undefined;
     }
+    /**
+     * Returns the parsed linking dependencies from the 'LinkingTo' field in the DESCRIPTION file.
+     * This field is used for packages that need to link to C/C++ code and is treated similarly to 'Imports'.
+     */
+    linkingTo() {
+        const lt = this.content().get('LinkingTo');
+        return lt ? parsePackagesWithVersions(lt, 'package') : undefined;
+    }
     /**
      * Returns the parsed imports from the 'Imports' field in the DESCRIPTION file.
      */

package/queries/catalog/call-context-query/call-context-query-executor.js

@@ -173,7 +173,7 @@ function doesFilepathMatch(file, filter) {
 function isParameterDefaultValue(nodeId, ast) {
     let node = ast.idMap.get(nodeId);
     while (node !== undefined) {
-        if (node.info.role === "param-value" /* RoleInParent.ParameterDefaultValue */) {
+        if (node.info.role === "param-v" /* RoleInParent.ParameterDefaultValue */) {
             return true;
         }
         const nip = node.info.parent;

package/queries/catalog/call-context-query/identify-link-to-last-call-relation.d.ts

@@ -1,4 +1,4 @@
-import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import { type DataflowGraph } from '../../../dataflow/graph/graph';
 import { type DataflowGraphVertexFunctionCall } from '../../../dataflow/graph/vertex';
 import { RType } from '../../../r-bridge/lang-4.x/ast/model/type';

package/queries/catalog/call-context-query/identify-link-to-last-call-relation.js

@@ -5,16 +5,15 @@ exports.satisfiesCallTargets = satisfiesCallTargets;
 exports.getValueOfArgument = getValueOfArgument;
 exports.identifyLinkToLastCallRelation = identifyLinkToLastCallRelation;
 exports.identifyLinkToLastCallRelationSync = identifyLinkToLastCallRelationSync;
+const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const graph_1 = require("../../../dataflow/graph/graph");
 const simple_visitor_1 = require("../../../control-flow/simple-visitor");
 const vertex_1 = require("../../../dataflow/graph/vertex");
 const edge_1 = require("../../../dataflow/graph/edge");
 const resolve_by_name_1 = require("../../../dataflow/environments/resolve-by-name");
 const identifier_1 = require("../../../dataflow/environments/identifier");
-const built_in_1 = require("../../../dataflow/environments/built-in");
 const assert_1 = require("../../../util/assert");
 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 cascade_action_1 = require("./cascade-action");
 const cfg_kind_1 = require("../../../project/cfg-kind");
 var CallTargets;
@@ -49,7 +48,7 @@ function satisfiesCallTargets(info, graph, callTarget) {
          * including any potential built-in mapping.
          */
         const reResolved = (0, resolve_by_name_1.resolveByName)(info.name, info.environment, identifier_1.ReferenceType.Unknown);
-        if (reResolved?.some(t => (0, built_in_1.isBuiltIn)(t.definedAt))) {
+        if (reResolved?.some(t => node_id_1.NodeId.isBuiltIn(t.definedAt))) {
             builtIn = true;
         }
     }
@@ -63,7 +62,7 @@ function satisfiesCallTargets(info, graph, callTarget) {
         case CallTargets.Any:
             return callTargets;
         case CallTargets.OnlyGlobal:
-            if (callTargets.every(built_in_1.isBuiltIn)) {
+            if (callTargets.every(node_id_1.NodeId.isBuiltIn)) {
                 return builtIn ? ['built-in'] : [];
             }
             else {
@@ -94,7 +93,7 @@ function getValueOfArgument(graph, call, argument, additionalAllowedTypes) {
     const totalIndex = argument.name ? call.args.findIndex(arg => graph_1.FunctionArgument.hasName(arg, argument.name)) : -1;
     let refAtIndex;
     if (totalIndex < 0) {
-        const references = call.args.filter(arg => arg !== r_function_call_1.EmptyArgument && !arg.name).map(graph_1.FunctionArgument.getReference);
+        const references = call.args.filter(graph_1.FunctionArgument.isPositional).map(graph_1.FunctionArgument.getReference);
         refAtIndex = references[argument.index];
     }
     else {

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

@@ -11,6 +11,7 @@ const identify_link_to_last_call_relation_1 = require("../call-context-query/ide
 const resolve_argument_1 = require("../../../dataflow/eval/resolve/resolve-argument");
 const assert_1 = require("../../../util/assert");
 const log_1 = require("../../../util/log");
+const model_1 = require("../../../r-bridge/lang-4.x/ast/model/model");
 /**
  * Executes a dependencies query.
  */
@@ -185,7 +186,7 @@ function getResults(queries, { dataflow, config, normalize }, results, kind, fun
         if (get?.type === type_1.RType.Argument) {
             get = get.value;
         }
-        return get?.info.fullLexeme ?? get?.lexeme;
+        return model_1.RNode.lexeme(get);
     }
 }
 function collectValuesFromLinks(args, data, linkedIds) {

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

@@ -14,10 +14,11 @@ const source_functions_1 = require("./function-info/source-functions");
 const read_functions_1 = require("./function-info/read-functions");
 const write_functions_1 = require("./function-info/write-functions");
 const visualize_functions_1 = require("./function-info/visualize-functions");
-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 test_functions_1 = require("./function-info/test-functions");
 const identifier_1 = require("../../../dataflow/environments/identifier");
+const r_project_1 = require("../../../r-bridge/lang-4.x/ast/model/nodes/r-project");
+const model_1 = require("../../../r-bridge/lang-4.x/ast/model/model");
 exports.Unknown = 'unknown';
 exports.DefaultDependencyCategories = {
     'library': {
@@ -27,14 +28,14 @@ exports.DefaultDependencyCategories = {
         /* for libraries, we have to additionally track all uses of `::` and `:::`, for this we currently simply traverse all uses */
         additionalAnalysis: async (data, ignoreDefault, _functions, _queryResults, result) => {
             if (!ignoreDefault) {
-                (0, visitor_1.visitAst)((await data.analyzer.normalize()).ast.files.map(f => f.root), n => {
+                r_project_1.RProject.visitAst((await data.analyzer.normalize()).ast, node => {
                     let ns;
-                    if (n.type === type_1.RType.Symbol && (ns = identifier_1.Identifier.getNamespace(n.content)) !== undefined) {
+                    if (node.type === type_1.RType.Symbol && (ns = identifier_1.Identifier.getNamespace(node.content)) !== undefined) {
                         const dep = data.analyzer.inspectContext().deps.getDependency(ns);
                         /* we should improve the identification of ':::' */
                         result.push({
-                            nodeId: n.info.id,
-                            functionName: (n.info.fullLexeme ?? n.lexeme).includes(':::') ? ':::' : '::',
+                            nodeId: node.info.id,
+                            functionName: model_1.RNode.lexeme(node).includes(':::') ? ':::' : '::',
                             value: ns,
                             versionConstraints: dep?.versionConstraints,
                             derivedVersion: dep?.derivedVersion,

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

@@ -1,6 +1,6 @@
 import Joi from 'joi';
 import type { DataFrameDomain } from '../../../abstract-interpretation/data-frame/dataframe-domain';
-import { StateAbstractDomain } from '../../../abstract-interpretation/domains/state-abstract-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 { SingleSlicingCriterion } from '../../../slicing/criterion/parse';

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

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DfShapeQueryDefinition = void 0;
 const joi_1 = __importDefault(require("joi"));
-const state_abstract_domain_1 = require("../../../abstract-interpretation/domains/state-abstract-domain");
 const slice_query_parser_1 = require("../../../cli/repl/parser/slice-query-parser");
 const ansi_1 = require("../../../util/text/ansi");
 const time_1 = require("../../../util/text/time");
 const df_shape_query_executor_1 = require("./df-shape-query-executor");
+const abstract_domain_1 = require("../../../abstract-interpretation/domains/abstract-domain");
 function dfShapeQueryLineParser(_output, line, _config) {
     const criterion = (0, slice_query_parser_1.sliceCriterionParser)(line[0]);
     return {
@@ -24,7 +24,7 @@ exports.DfShapeQueryDefinition = {
     executor: df_shape_query_executor_1.executeDfShapeQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
-        const domains = out.domains instanceof state_abstract_domain_1.StateAbstractDomain ? out.domains.value : out.domains;
+        const domains = out.domains instanceof abstract_domain_1.AbstractDomain ? out.domains.value : out.domains;
         result.push(`Query: ${(0, ansi_1.bold)('df-shape', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         result.push(...domains.entries().take(20).map(([key, domain]) => {
             return `   ╰ ${key}: ${domain?.toString()}`;
@@ -36,7 +36,7 @@ exports.DfShapeQueryDefinition = {
     },
     jsonFormatter: (queryResults) => {
         const { domains, ...out } = queryResults;
-        const state = domains instanceof state_abstract_domain_1.StateAbstractDomain ? domains.value : domains;
+        const state = domains instanceof abstract_domain_1.AbstractDomain ? domains.value : domains;
         const json = Object.fromEntries(state.entries().map(([key, domain]) => [key, domain?.toJson() ?? null]));
         const result = { domains: json, ...out };
         return result;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeDoesCallQuery = executeDoesCallQuery;
 const log_1 = require("../../../util/log");
+const node_id_1 = require("../../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const parse_1 = require("../../../slicing/criterion/parse");
-const built_in_1 = require("../../../dataflow/environments/built-in");
 const identifier_1 = require("../../../dataflow/environments/identifier");
 /**
  * Execute does call queries on the given analyzer.
@@ -77,8 +77,8 @@ function findCallersMatchingConstraints(cg, start, constraints) {
             continue;
         }
         visited.add(cur);
-        if ((0, built_in_1.isBuiltIn)(cur)) {
-            const name = (0, built_in_1.dropBuiltInPrefix)(cur);
+        if (node_id_1.NodeId.isBuiltIn(cur)) {
+            const name = node_id_1.NodeId.fromBuiltIn(cur);
             if (constraints({ id: cur, name }, cg)) {
                 return { call: start };
             }

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

@@ -2,7 +2,7 @@ import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import Joi from 'joi';
 import type { ParsedQueryLine } from '../../query';
 import { executeExceptionQuery } from './inspect-exception-query-executor';
-import { type NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+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 { ExceptionPoint } from '../../../dataflow/fn/exceptions-of-function';

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

@@ -28,11 +28,11 @@ exports.InspectExceptionQueryDefinition = {
         result.push(`Query: ${(0, ansi_1.bold)('inspect-exception', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
         const n = await processed.normalize();
         function getLoc(r) {
-            const node = n.idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r));
+            const node = n.idMap.get(node_id_1.NodeId.normalize(r));
             return node ? range_1.SourceLocation.fromNode(node) : undefined;
         }
         function getLexeme(r) {
-            return n.idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r))?.lexeme ?? String(r);
+            return n.idMap.get(node_id_1.NodeId.normalize(r))?.lexeme ?? String(r);
         }
         for (const [r, v] of Object.entries(out.exceptions)) {
             result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${range_1.SourceLocation.format(getLoc(r))}) ${v.length > 0 ? 'throws exceptions:' : 'does not throw exceptions.'}`);

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

@@ -2,7 +2,7 @@ import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import Joi from 'joi';
 import type { ParsedQueryLine } from '../../query';
 import { executeHigherOrderQuery } from './inspect-higher-order-query-executor';
-import { type NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+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';

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

@@ -26,7 +26,7 @@ exports.InspectHigherOrderQueryDefinition = {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('inspect-higher-order', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
         for (const [r, v] of Object.entries(out.higherOrder)) {
-            const node = (await processed.normalize()).idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r));
+            const node = (await processed.normalize()).idMap.get(node_id_1.NodeId.normalize(r));
             const loc = node ? range_1.SourceLocation.fromNode(node) : undefined;
             result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${range_1.SourceLocation.format(loc)}) is ${v ? '' : 'not '}a higher-order function`);
         }

package/queries/catalog/inspect-recursion-query/inspect-recursion-query-format.d.ts

@@ -2,7 +2,7 @@ import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
 import Joi from 'joi';
 import type { ParsedQueryLine } from '../../query';
 import { executeRecursionQuery } from './inspect-recursion-query-executor';
-import { type NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
+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';

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

@@ -26,7 +26,7 @@ exports.InspectRecursionQueryDefinition = {
         const out = queryResults;
         result.push(`Query: ${(0, ansi_1.bold)('inspect-recursion', formatter)} (${out['.meta'].timing.toFixed(0)}ms)`);
         for (const [r, v] of Object.entries(out.recursive)) {
-            const node = (await processed.normalize()).idMap.get((0, node_id_1.normalizeIdToNumberIfPossible)(r));
+            const node = (await processed.normalize()).idMap.get(node_id_1.NodeId.normalize(r));
             const loc = node ? range_1.SourceLocation.fromNode(node) : undefined;
             result.push(`  - Function ${(0, ansi_1.bold)(r, formatter)} (${range_1.SourceLocation.format(loc)}) is ${v ? '' : 'not '}recursive`);
         }

package/queries/query-print.d.ts

@@ -1,6 +1,6 @@
 import { type OutputFormatter } from '../util/text/ansi';
 import { type Queries, type QueryResults, type SupportedQueryTypes } from './query';
-import type { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
+import { NodeId } from '../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { AstIdMap, ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { ReadonlyFlowrAnalysisProvider } from '../project/flowr-analyzer';
 /**

package/queries/query-print.js

@@ -5,21 +5,22 @@ exports.summarizeIdsIfTooLong = summarizeIdsIfTooLong;
 exports.asciiSummaryOfQueryResult = asciiSummaryOfQueryResult;
 const ansi_1 = require("../util/text/ansi");
 const query_1 = require("./query");
+const node_id_1 = require("../r-bridge/lang-4.x/ast/model/processing/node-id");
 const html_hover_over_1 = require("../util/html-hover-over");
 const time_1 = require("../util/text/time");
-const built_in_1 = require("../dataflow/environments/built-in");
+const model_1 = require("../r-bridge/lang-4.x/ast/model/model");
 function nodeString(nodeId, formatter, idMap) {
     const isObj = typeof nodeId === 'object' && nodeId !== null && 'id' in nodeId;
     const id = isObj ? nodeId?.id : nodeId;
     const info = isObj ? nodeId?.info : undefined;
-    if ((0, built_in_1.isBuiltIn)(id)) {
+    if (node_id_1.NodeId.isBuiltIn(id)) {
         return (0, ansi_1.italic)(id, formatter) + (info ? ` (${JSON.stringify(info)})` : '');
     }
     const node = idMap.get(id);
     if (node === undefined) {
         return `UNKNOWN: ${id} (info: ${JSON.stringify(info)})`;
     }
-    return `${(0, ansi_1.italic)('`' + (node.lexeme ?? node.info.fullLexeme ?? 'UNKNOWN') + '`', formatter)} (L.${node.location?.[0]}${info ? ', ' + JSON.stringify(info) : ''})`;
+    return `${(0, ansi_1.italic)('`' + (model_1.RNode.lexeme(node) ?? 'UNKNOWN') + '`', formatter)} (L.${node.location?.[0]}${info ? ', ' + JSON.stringify(info) : ''})`;
 }
 function asciiCallContextSubHit(formatter, results, idMap) {
     const result = [];