@eagleoutice/flowr 2.9.9 → 2.9.11

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

@@ -1,3 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RParameter = void 0;
+const type_1 = require("../type");
+/**
+ * Helper for working with {@link RParameter} AST nodes.
+ */
+exports.RParameter = {
+    name: 'RParameter',
+    /**
+     * Type guard for {@link RParameter} nodes.
+     * @see {@link RParameter.isDotDotDotDot} - to check whether a parameter is the special `...` parameter
+     */
+    is(node) {
+        return node?.type === type_1.RType.Parameter;
+    },
+    /**
+     * Type guard for the special `...` parameter.
+     * @see {@link RParameter.is} - to check whether a node is a parameter at all
+     */
+    isDotDotDotDot(node) {
+        return exports.RParameter.is(node) && node.special;
+    }
+};
 //# sourceMappingURL=r-parameter.js.map

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

@@ -1,5 +1,6 @@
 import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
-import type { RType } from '../type';
+import { RType } from '../type';
+import { SemVer } from 'semver';
 /**
  * Variant of the binary operator, specifically for the new, built-in pipe operator.
  */
@@ -8,3 +9,17 @@ export interface RPipe<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     readonly lhs: RNode<Info>;
     readonly rhs: RNode<Info>;
 }
+/**
+ * Helper for working with {@link RPipe} AST nodes.
+ */
+export declare const RPipe: {
+    readonly name: "RPipe";
+    /**
+     * Type guard for {@link RPipe} nodes.
+     */
+    readonly is: <Info = object>(this: void, node: RNode<Info> | undefined) => node is RPipe<Info>;
+    /**
+     * Returns the minimum R version that supports the pipe operator.
+     */
+    readonly availableFromRVersion: (this: void) => SemVer;
+};

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

@@ -1,3 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RPipe = void 0;
+const type_1 = require("../type");
+const semver_1 = require("semver");
+const versions_1 = require("../versions");
+/**
+ * Helper for working with {@link RPipe} AST nodes.
+ */
+exports.RPipe = {
+    name: 'RPipe',
+    /**
+     * Type guard for {@link RPipe} nodes.
+     */
+    is(node) {
+        return node?.type === type_1.RType.Pipe;
+    },
+    /**
+     * Returns the minimum R version that supports the pipe operator.
+     */
+    availableFromRVersion() {
+        return new semver_1.SemVer(versions_1.MIN_VERSION_PIPE);
+    },
+};
 //# sourceMappingURL=r-pipe.js.map

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

@@ -1,7 +1,10 @@
 import type { NoInfo } from '../model';
+import { RNode } from '../model';
 import { RType } from '../type';
 import type { RExpressionList } from './r-expression-list';
 import type { NodeId } from '../processing/node-id';
+import type { OnEnter, OnExit } from '../processing/visitor';
+import type { ParentInformation } from '../processing/decorate';
 /**
  * Holds a single R file starting with an expression list.
  */
@@ -11,8 +14,9 @@ export interface RProjectFile<Info = NoInfo> {
 }
 /**
  * Holds a collection of files (started with the expression list)
+ * @see {@link RProject.visitAst} - to visit all nodes in the project and related helper functions
  * @see {@link RExpressionList} - for the root of each file
- * @see {@link mergeProjects} - to merge multiple projects into a single one
+ * @see {@link RProject.merge} - to merge multiple projects into a single one
  * @see {@link RProjectFile} - for each file in the project
  */
 export interface RProject<Info = NoInfo> {
@@ -23,11 +27,44 @@ export interface RProject<Info = NoInfo> {
     };
 }
 /**
- * Type guard for RProject nodes.
+ * Helper object to identify RProject nodes by their type and to provide related functions.
+ * @see {@link RNode.visitAst} - to visit all nodes in the project
  */
-export declare function isRProject<Info = NoInfo>(node: unknown): node is RProject<Info>;
-/**
- * Merge multiple projects into a single one by concatenating their files.
- * This will remove the `info` property of the resulting project.
- */
-export declare function mergeProjects<Info = NoInfo>(projects: RProject<Info>[]): RProject<Info>;
+export declare const RProject: {
+    readonly name: "RProject";
+    /**
+     * Visits all nodes in the project by visiting the root of each file.
+     * @param project          - The project to visit file by file
+     * @param onVisit        - Called before visiting the subtree of each node. Can be used to stop visiting the subtree starting with this node (return `true` stop)
+     * @param onExit         - Called after the subtree of a node has been visited, called for leafs too (even though their subtree is empty)
+     */
+    readonly visitAst: <OtherInfo>(this: void, project: RProject<OtherInfo>, onVisit?: OnEnter<OtherInfo>, onExit?: OnExit<OtherInfo>) => void;
+    /**
+     * Collects all node ids within a project
+     * @param project - The project to collect ids from
+     * @see {@link RNode.collectAllIds} - to stop collecting at certain nodes
+     * @see {@link RProject.collectAllIdsWithStop} - to stop collecting at certain nodes
+     */
+    readonly collectAllIds: <OtherInfo>(this: void, project: RProject<OtherInfo & ParentInformation>) => Set<NodeId>;
+    /**
+     * Collects all node ids within a project, but stops collecting at nodes where the given `stop` function returns `true`.
+     * @param project - The project to collect ids from
+     * @param stop    - A function that determines whether to stop collecting at a given node, does not stop by default
+     * @see {@link RNode.collectAllIdsWithStop} - to collect all ids without stopping
+     * @see {@link RProject.collectAllIds} - to collect all ids without stopping
+     */
+    readonly collectAllIdsWithStop: <OtherInfo>(this: void, project: RProject<OtherInfo & ParentInformation>, stop: (node: RNode<OtherInfo & ParentInformation>) => boolean) => Set<NodeId>;
+    /**
+     * Flattens the project to an array of nodes by collecting the root nodes of each file.
+     */
+    readonly asNodes: <OtherInfo>(this: void, project: RProject<OtherInfo>) => RNode<OtherInfo>[];
+    /**
+     * Type guard for RProject nodes.
+     */
+    readonly is: <OtherInfo = object>(this: void, node: unknown) => node is RProject<OtherInfo>;
+    /**
+     * Merge multiple projects into a single one by concatenating their files.
+     * This will remove the `info` property of the resulting project.
+     */
+    readonly merge: <Info = object>(this: void, projects: readonly RProject<Info>[]) => RProject<Info>;
+};

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

@@ -1,22 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRProject = isRProject;
-exports.mergeProjects = mergeProjects;
+exports.RProject = void 0;
+const model_1 = require("../model");
 const type_1 = require("../type");
 /**
- * Type guard for RProject nodes.
+ * Helper object to identify RProject nodes by their type and to provide related functions.
+ * @see {@link RNode.visitAst} - to visit all nodes in the project
  */
-function isRProject(node) {
-    return typeof node === 'object' && node !== null && 'type' in node && node.type === type_1.RType.Project;
-}
-/**
- * Merge multiple projects into a single one by concatenating their files.
- * This will remove the `info` property of the resulting project.
- */
-function mergeProjects(projects) {
-    return {
-        type: type_1.RType.Project,
-        files: projects.flatMap(p => p.files)
-    };
-}
+exports.RProject = {
+    name: 'RProject',
+    /**
+     * Visits all nodes in the project by visiting the root of each file.
+     * @param project          - The project to visit file by file
+     * @param onVisit        - Called before visiting the subtree of each node. Can be used to stop visiting the subtree starting with this node (return `true` stop)
+     * @param onExit         - Called after the subtree of a node has been visited, called for leafs too (even though their subtree is empty)
+     */
+    visitAst(project, onVisit, onExit) {
+        return model_1.RNode.visitAst(project.files.map(f => f.root), onVisit, onExit);
+    },
+    /**
+     * Collects all node ids within a project
+     * @param project - The project to collect ids from
+     * @see {@link RNode.collectAllIds} - to stop collecting at certain nodes
+     * @see {@link RProject.collectAllIdsWithStop} - to stop collecting at certain nodes
+     */
+    collectAllIds(project) {
+        return model_1.RNode.collectAllIds(exports.RProject.asNodes(project));
+    },
+    /**
+     * Collects all node ids within a project, but stops collecting at nodes where the given `stop` function returns `true`.
+     * @param project - The project to collect ids from
+     * @param stop    - A function that determines whether to stop collecting at a given node, does not stop by default
+     * @see {@link RNode.collectAllIdsWithStop} - to collect all ids without stopping
+     * @see {@link RProject.collectAllIds} - to collect all ids without stopping
+     */
+    collectAllIdsWithStop(project, stop) {
+        return model_1.RNode.collectAllIdsWithStop(exports.RProject.asNodes(project), stop);
+    },
+    /**
+     * Flattens the project to an array of nodes by collecting the root nodes of each file.
+     */
+    asNodes(project) {
+        return project.files.map(f => f.root);
+    },
+    /**
+     * Type guard for RProject nodes.
+     */
+    is(node) {
+        return typeof node === 'object' && node !== null && 'type' in node && node.type === type_1.RType.Project;
+    },
+    /**
+     * Merge multiple projects into a single one by concatenating their files.
+     * This will remove the `info` property of the resulting project.
+     */
+    merge(projects) {
+        return {
+            type: type_1.RType.Project,
+            files: projects.flatMap(p => p.files)
+        };
+    }
+};
 //# sourceMappingURL=r-project.js.map

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

@@ -1,5 +1,5 @@
-import type { RAstNodeBase, Location, NoInfo } from '../model';
-import type { RType } from '../type';
+import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
+import { RType } from '../type';
 import type { RExpressionList } from './r-expression-list';
 /**
  * ```r
@@ -10,3 +10,13 @@ export interface RRepeatLoop<Info = NoInfo> extends RAstNodeBase<Info>, Location
     readonly type: RType.RepeatLoop;
     body: RExpressionList<Info>;
 }
+/**
+ * Helper for working with {@link RRepeatLoop} AST nodes.
+ */
+export declare const RRepeatLoop: {
+    readonly name: "RRepeatLoop";
+    /**
+     * Type guard for RRepeatLoop nodes.
+     */
+    readonly is: <Info = object>(this: void, node: RNode<Info> | undefined) => node is RRepeatLoop<Info>;
+};

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

@@ -1,3 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RRepeatLoop = void 0;
+const type_1 = require("../type");
+/**
+ * Helper for working with {@link RRepeatLoop} AST nodes.
+ */
+exports.RRepeatLoop = {
+    name: 'RRepeatLoop',
+    /**
+     * Type guard for RRepeatLoop nodes.
+     */
+    is(node) {
+        return node?.type === type_1.RType.RepeatLoop;
+    }
+};
 //# sourceMappingURL=r-repeat-loop.js.map

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

@@ -1,6 +1,7 @@
 import type { Leaf, Location, NoInfo, RNode } from '../model';
 import type { RStringValue } from '../../../convert-values';
 import { RType } from '../type';
+import { SemVer } from 'semver';
 /**
  * Represents a string like `"hello"`, including raw strings like `r"(hello)"`.
  * @see {@link isRString} - to check whether a node is an R string
@@ -10,7 +11,18 @@ export interface RString<Info = NoInfo> extends Leaf<Info>, Location {
     content: RStringValue;
 }
 /**
- * Type guard for RString nodes.
- * @see {@link RString}
+ * Helper for working with {@link RString} AST nodes.
  */
-export declare function isRString(node: RNode | undefined): node is RString;
+export declare const RString: {
+    name: string;
+    /**
+     * Type guard for RString nodes.
+     * @see {@link RString}
+     */
+    is<Info = object>(this: void, node: RNode<Info> | undefined): node is RString<Info>;
+    /**
+     * Returns the minimum R version that supports raw strings (in a stable format).
+     * @see {@link RString}
+     */
+    rawStringAvailableFromRVersion(): SemVer;
+};

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

@@ -1,12 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRString = isRString;
+exports.RString = void 0;
 const type_1 = require("../type");
+const semver_1 = require("semver");
+const versions_1 = require("../versions");
 /**
- * Type guard for RString nodes.
- * @see {@link RString}
+ * Helper for working with {@link RString} AST nodes.
  */
-function isRString(node) {
-    return node?.type === type_1.RType.String;
-}
+exports.RString = {
+    name: 'RString',
+    /**
+     * Type guard for RString nodes.
+     * @see {@link RString}
+     */
+    is(node) {
+        return node?.type === type_1.RType.String;
+    },
+    /**
+     * Returns the minimum R version that supports raw strings (in a stable format).
+     * @see {@link RString}
+     */
+    rawStringAvailableFromRVersion() {
+        return new semver_1.SemVer(versions_1.MIN_VERSION_RAW_STABLE);
+    }
+};
 //# sourceMappingURL=r-string.js.map

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

@@ -1,10 +1,7 @@
-import type { Leaf, Location, NoInfo } from '../model';
-import type { RType } from '../type';
+import type { Leaf, Location, NoInfo, RNode } from '../model';
+import { RType } from '../type';
+import { RNa, RNull } from '../../../convert-values';
 import type { Identifier } from '../../../../../dataflow/environments/identifier';
-/**
- *
- */
-export declare function isSpecialSymbol(symbol: RSymbol): boolean;
 /**
  * Represents identifiers (variables) such as `x` in `x <- 42` or `a::foo` in `a::foo()`.
  * See {@link Identifier} for more information about how identifiers are represented.
@@ -15,3 +12,21 @@ export interface RSymbol<Info = NoInfo, T extends Identifier = Identifier> exten
     readonly type: RType.Symbol;
     content: T;
 }
+/**
+ * Helper for working with {@link RSymbol} AST nodes.
+ */
+export declare const RSymbol: {
+    readonly name: "RSymbol";
+    /**
+     * Type guard for {@link RSymbol} nodes.
+     * @see {@link RSymbol.isSpecial} - to check whether a symbol is a special symbol like `NA` or `NULL`
+     */
+    readonly is: <OtherInfo = object>(this: void, node: RNode<OtherInfo> | undefined) => node is RSymbol<OtherInfo>;
+    /**
+     * Type guard for special symbols, i.e. `NA` and `NULL`.
+     * @see {@link RNa} - for the value of `NA`
+     * @see {@link RNull} - for the value of `NULL`
+     * @see {@link RSymbol.is} - to check whether a node is a symbol at all
+     */
+    readonly isSpecial: <OtherInfo = object>(this: void, node: RNode<OtherInfo> | undefined) => node is RSymbol<OtherInfo, typeof RNull | typeof RNa>;
+};

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

@@ -1,11 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSpecialSymbol = isSpecialSymbol;
+exports.RSymbol = void 0;
+const type_1 = require("../type");
 const convert_values_1 = require("../../../convert-values");
 /**
- *
+ * Helper for working with {@link RSymbol} AST nodes.
  */
-function isSpecialSymbol(symbol) {
-    return symbol.content === convert_values_1.RNull || symbol.content === convert_values_1.RNa;
-}
+exports.RSymbol = {
+    name: 'RSymbol',
+    /**
+     * Type guard for {@link RSymbol} nodes.
+     * @see {@link RSymbol.isSpecial} - to check whether a symbol is a special symbol like `NA` or `NULL`
+     */
+    is(node) {
+        return node?.type === type_1.RType.Symbol;
+    },
+    /**
+     * Type guard for special symbols, i.e. `NA` and `NULL`.
+     * @see {@link RNa} - for the value of `NA`
+     * @see {@link RNull} - for the value of `NULL`
+     * @see {@link RSymbol.is} - to check whether a node is a symbol at all
+     */
+    isSpecial(node) {
+        return exports.RSymbol.is(node) && (node.content === convert_values_1.RNull || node.content === convert_values_1.RNa);
+    }
+};
 //# sourceMappingURL=r-symbol.js.map

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

@@ -1,5 +1,6 @@
 import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
-import type { RType } from '../type';
+import { RType } from '../type';
+import type { OperatorInformationValue } from '../operators';
 /**
  * Unary operations like `+` and `-`
  */
@@ -8,3 +9,17 @@ export interface RUnaryOp<Info = NoInfo> extends RAstNodeBase<Info>, Location {
     operator: string;
     operand: RNode<Info>;
 }
+/**
+ * Helper for working with {@link RUnaryOp} AST nodes.
+ */
+export declare const RUnaryOp: {
+    readonly name: "RUnaryOp";
+    /**
+     * Type guard for {@link RUnaryOp} nodes.
+     */
+    readonly is: <Info = object>(this: void, node: RNode<Info> | undefined) => node is RUnaryOp<Info>;
+    /**
+     * Get the operator information for a binary operator node.
+     */
+    readonly getOperatorInfo: <Info = object>(node: RUnaryOp<Info>) => OperatorInformationValue | undefined;
+};

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

@@ -1,3 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RUnaryOp = void 0;
+const type_1 = require("../type");
+const operators_1 = require("../operators");
+/**
+ * Helper for working with {@link RUnaryOp} AST nodes.
+ */
+exports.RUnaryOp = {
+    name: 'RUnaryOp',
+    /**
+     * Type guard for {@link RUnaryOp} nodes.
+     */
+    is(node) {
+        return node?.type === type_1.RType.UnaryOp;
+    },
+    /**
+     * Get the operator information for a binary operator node.
+     */
+    getOperatorInfo(node) {
+        return operators_1.OperatorDatabase[node.operator];
+    }
+};
 //# sourceMappingURL=r-unary-op.js.map

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

@@ -1,5 +1,5 @@
 import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
-import type { RType } from '../type';
+import { RType } from '../type';
 import type { RExpressionList } from './r-expression-list';
 /**
  * ```r
@@ -11,3 +11,13 @@ export interface RWhileLoop<Info = NoInfo> extends RAstNodeBase<Info>, Location
     condition: RNode<Info>;
     body: RExpressionList<Info>;
 }
+/**
+ * Helper for working with {@link RWhileLoop} AST nodes.
+ */
+export declare const RWhileLoop: {
+    readonly name: "RWhileLoop";
+    /**
+     * Type guard for {@link RWhileLoop} nodes.
+     */
+    readonly is: <Info = object>(this: void, node: RNode<Info> | undefined) => node is RWhileLoop<Info>;
+};

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

@@ -1,3 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RWhileLoop = void 0;
+const type_1 = require("../type");
+/**
+ * Helper for working with {@link RWhileLoop} AST nodes.
+ */
+exports.RWhileLoop = {
+    name: 'RWhileLoop',
+    /**
+     * Type guard for {@link RWhileLoop} nodes.
+     */
+    is(node) {
+        return node?.type === type_1.RType.WhileLoop;
+    }
+};
 //# sourceMappingURL=r-while-loop.js.map

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

@@ -173,12 +173,12 @@ function createFoldForBinaryOp(info) {
         rhsInfo.parent = id;
         rhsInfo.index = 1;
         if (data.type === type_1.RType.Pipe) {
-            lhsInfo.role = "pipe-lhs" /* RoleInParent.PipeLhs */;
-            rhsInfo.role = "pipe-rhs" /* RoleInParent.PipeRhs */;
+            lhsInfo.role = "pipe-l" /* RoleInParent.PipeLhs */;
+            rhsInfo.role = "pipe-r" /* RoleInParent.PipeRhs */;
         }
         else {
-            lhsInfo.role = "binop-lhs" /* RoleInParent.BinaryOperationLhs */;
-            rhsInfo.role = "binop-rhs" /* RoleInParent.BinaryOperationRhs */;
+            lhsInfo.role = "bin-l" /* RoleInParent.BinaryOperationLhs */;
+            rhsInfo.role = "bin-r" /* RoleInParent.BinaryOperationRhs */;
         }
         decorated.info.file = info.file;
         return decorated;
@@ -203,7 +203,7 @@ function createFoldForAccess(info) {
         info.idMap.set(id, decorated);
         const accessedInfo = accessed.info;
         accessedInfo.parent = id;
-        accessedInfo.role = "accessed" /* RoleInParent.Accessed */;
+        accessedInfo.role = "acc" /* RoleInParent.Accessed */;
         if (typeof access !== 'string') {
             let idx = 0; // the first oe will be skipped in the first iter
             for (const acc of access) {
@@ -212,7 +212,7 @@ function createFoldForAccess(info) {
                     const curInfo = acc.info;
                     curInfo.parent = id;
                     curInfo.index = idx;
-                    curInfo.role = "index-acc" /* RoleInParent.IndexAccess */;
+                    curInfo.role = "idx-acc" /* RoleInParent.IndexAccess */;
                 }
             }
         }
@@ -235,7 +235,7 @@ function createFoldForForLoop(info) {
         const bodyInfo = body.info;
         bodyInfo.parent = id;
         bodyInfo.index = 2;
-        bodyInfo.role = "for-body" /* RoleInParent.ForBody */;
+        bodyInfo.role = "for-b" /* RoleInParent.ForBody */;
         decorated.info.file = info.file;
         return decorated;
     };
@@ -247,7 +247,7 @@ function createFoldForRepeatLoop(info) {
         info.idMap.set(id, decorated);
         const bodyInfo = body.info;
         bodyInfo.parent = id;
-        bodyInfo.role = "repeat-body" /* RoleInParent.RepeatBody */;
+        bodyInfo.role = "repeat-b" /* RoleInParent.RepeatBody */;
         decorated.info.file = info.file;
         return decorated;
     };
@@ -259,11 +259,11 @@ function createFoldForWhileLoop(info) {
         info.idMap.set(id, decorated);
         const condInfo = condition.info;
         condInfo.parent = id;
-        condInfo.role = "while-cond" /* RoleInParent.WhileCondition */;
+        condInfo.role = "while-c" /* RoleInParent.WhileCondition */;
         const bodyInfo = body.info;
         bodyInfo.parent = id;
         bodyInfo.index = 1;
-        bodyInfo.role = "while-body" /* RoleInParent.WhileBody */;
+        bodyInfo.role = "while-b" /* RoleInParent.WhileBody */;
         decorated.info.file = info.file;
         return decorated;
     };
@@ -275,7 +275,7 @@ function createFoldForIfThenElse(info) {
         info.idMap.set(id, decorated);
         const condInfo = condition.info;
         condInfo.parent = id;
-        condInfo.role = "if-cond" /* RoleInParent.IfCondition */;
+        condInfo.role = "if-c" /* RoleInParent.IfCondition */;
         const thenInfo = then.info;
         thenInfo.parent = id;
         thenInfo.index = 1;
@@ -300,7 +300,13 @@ function createFoldForExprList(info) {
             const childInfo = child.info;
             childInfo.parent = id;
             childInfo.index = i++;
-            childInfo.role = "expr-list-child" /* RoleInParent.ExpressionListChild */;
+            childInfo.role = "el-c" /* RoleInParent.ExpressionListChild */;
+        }
+        // assign role for grouping
+        if (grouping) {
+            const [open, close] = grouping;
+            open.info.role = "el-g" /* RoleInParent.ExpressionListGrouping */;
+            close.info.role = "el-g" /* RoleInParent.ExpressionListGrouping */;
         }
         decorated.info.file = info.file;
         return decorated;
@@ -349,7 +355,7 @@ function createFoldForFunctionDefinition(info) {
         const bodyInfo = body.info;
         bodyInfo.parent = id;
         bodyInfo.index = idx;
-        bodyInfo.role = "fun-body" /* RoleInParent.FunctionDefinitionBody */;
+        bodyInfo.role = "fun-b" /* RoleInParent.FunctionDefinitionBody */;
         decorated.info.file = info.file;
         return decorated;
     };
@@ -361,12 +367,12 @@ function createFoldForFunctionParameter(info) {
         info.idMap.set(id, decorated);
         const nameInfo = name.info;
         nameInfo.parent = id;
-        nameInfo.role = "param-name" /* RoleInParent.ParameterName */;
+        nameInfo.role = "param-n" /* RoleInParent.ParameterName */;
         if (defaultValue) {
             const defaultInfo = defaultValue.info;
             defaultInfo.parent = id;
             defaultInfo.index = 1;
-            defaultInfo.role = "param-value" /* RoleInParent.ParameterDefaultValue */;
+            defaultInfo.role = "param-v" /* RoleInParent.ParameterDefaultValue */;
         }
         decorated.info.file = info.file;
         return decorated;
@@ -381,14 +387,14 @@ function createFoldForFunctionArgument(info) {
         if (name) {
             const nameInfo = name.info;
             nameInfo.parent = id;
-            nameInfo.role = "arg-name" /* RoleInParent.ArgumentName */;
+            nameInfo.role = "arg-n" /* RoleInParent.ArgumentName */;
             idx++; // adaptive, 0 for the value if there is no name!
         }
         if (value) {
             const valueInfo = value.info;
             valueInfo.parent = id;
             valueInfo.index = idx;
-            valueInfo.role = "arg-value" /* RoleInParent.ArgumentValue */;
+            valueInfo.role = "arg-v" /* RoleInParent.ArgumentValue */;
         }
         decorated.info.file = info.file;
         return decorated;