@eagleoutice/flowr 2.9.13 → 2.10.1

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

@@ -1,4 +1,5 @@
-import type { Leaf, Location, NoInfo, RNode } from '../model';
+import type { Leaf, Location, NoInfo } from '../model';
+import { RNode } from '../model';
 import type { RStringValue } from '../../../convert-values';
 import { RType } from '../type';
 import { SemVer } from 'semver';
@@ -25,4 +26,18 @@ export declare const RString: {
      * @see {@link RString}
      */
     rawStringAvailableFromRVersion(): SemVer;
+    getLocation: (this: void, node: RNode) => import("../../../../../util/range").SourceLocation | undefined;
+    getId: (this: void, node: RNode<import("../processing/decorate").ParentInformation>) => import("../processing/node-id").NodeId;
+    getType: (this: void, node: RNode) => RType;
+    visitAst: <OtherInfo = object>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo>>, onVisit?: import("../processing/visitor").OnEnter<OtherInfo>, onExit?: import("../processing/visitor").OnExit<OtherInfo>) => void;
+    collectAllIds: <OtherInfo>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => Set<import("../processing/node-id").NodeId>;
+    directChildren: <OtherInfo>(this: void, node: RNode<OtherInfo>) => readonly (RNode<OtherInfo> | typeof import("./r-function-call").EmptyArgument)[];
+    directParent: <OtherInfo>(this: void, node: RNode<OtherInfo & import("../processing/decorate").ParentInformation>, idMap: Map<import("../processing/node-id").NodeId, RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => RNode<OtherInfo & import("../processing/decorate").ParentInformation> | undefined;
+    iterateParents: <OtherInfo>(this: void, node: RNode<OtherInfo & import("../processing/decorate").ParentInformation> | undefined, idMap: Map<import("../processing/node-id").NodeId, RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => Generator<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>;
+    depth: (this: void, node: RNode<import("../processing/decorate").ParentInformation>, idMap: Map<import("../processing/node-id").NodeId, RNode<import("../processing/decorate").ParentInformation>>) => number;
+    collectAllIdsWithStop: <OtherInfo>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>, stop: (node: RNode<OtherInfo & import("../processing/decorate").ParentInformation>) => boolean) => Set<import("../processing/node-id").NodeId>;
+    lexeme: <R extends RNode<import("../processing/decorate").ParentInformation>>(this: void, node: R | undefined) => R extends {
+        lexeme: string;
+    } ? string : string | undefined;
+    documentation: typeof import("../../../../roxygen2/documentation-provider").getDocumentationOf;
 };

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RString = void 0;
+const model_1 = require("../model");
 const type_1 = require("../type");
 const semver_1 = require("semver");
 const versions_1 = require("../versions");
@@ -8,6 +9,7 @@ const versions_1 = require("../versions");
  * Helper for working with {@link RString} AST nodes.
  */
 exports.RString = {
+    ...model_1.RNode,
     name: 'RString',
     /**
      * Type guard for RString nodes.

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

@@ -1,4 +1,5 @@
-import type { Leaf, Location, NoInfo, RNode } from '../model';
+import type { Leaf, Location, NoInfo } from '../model';
+import { RNode } from '../model';
 import { RType } from '../type';
 import { RNa, RNull } from '../../../convert-values';
 import type { Identifier } from '../../../../../dataflow/environments/identifier';
@@ -29,4 +30,18 @@ export declare const RSymbol: {
      * @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>;
+    readonly getLocation: (this: void, node: RNode) => import("../../../../../util/range").SourceLocation | undefined;
+    readonly getId: (this: void, node: RNode<import("../processing/decorate").ParentInformation>) => import("../processing/node-id").NodeId;
+    readonly getType: (this: void, node: RNode) => RType;
+    readonly visitAst: <OtherInfo = object>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo>>, onVisit?: import("../processing/visitor").OnEnter<OtherInfo>, onExit?: import("../processing/visitor").OnExit<OtherInfo>) => void;
+    readonly collectAllIds: <OtherInfo>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => Set<import("../processing/node-id").NodeId>;
+    readonly directChildren: <OtherInfo>(this: void, node: RNode<OtherInfo>) => readonly (RNode<OtherInfo> | typeof import("./r-function-call").EmptyArgument)[];
+    readonly directParent: <OtherInfo>(this: void, node: RNode<OtherInfo & import("../processing/decorate").ParentInformation>, idMap: Map<import("../processing/node-id").NodeId, RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => RNode<OtherInfo & import("../processing/decorate").ParentInformation> | undefined;
+    readonly iterateParents: <OtherInfo>(this: void, node: RNode<OtherInfo & import("../processing/decorate").ParentInformation> | undefined, idMap: Map<import("../processing/node-id").NodeId, RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => Generator<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>;
+    readonly depth: (this: void, node: RNode<import("../processing/decorate").ParentInformation>, idMap: Map<import("../processing/node-id").NodeId, RNode<import("../processing/decorate").ParentInformation>>) => number;
+    readonly collectAllIdsWithStop: <OtherInfo>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>, stop: (node: RNode<OtherInfo & import("../processing/decorate").ParentInformation>) => boolean) => Set<import("../processing/node-id").NodeId>;
+    readonly lexeme: <R extends RNode<import("../processing/decorate").ParentInformation>>(this: void, node: R | undefined) => R extends {
+        lexeme: string;
+    } ? string : string | undefined;
+    readonly documentation: typeof import("../../../../roxygen2/documentation-provider").getDocumentationOf;
 };

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

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RSymbol = void 0;
+const model_1 = require("../model");
 const type_1 = require("../type");
 const convert_values_1 = require("../../../convert-values");
 /**
  * Helper for working with {@link RSymbol} AST nodes.
  */
 exports.RSymbol = {
+    ...model_1.RNode,
     name: 'RSymbol',
     /**
      * Type guard for {@link RSymbol} nodes.

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

@@ -1,4 +1,5 @@
-import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo } from '../model';
+import { RNode } from '../model';
 import { RType } from '../type';
 import type { OperatorInformationValue } from '../operators';
 /**
@@ -22,4 +23,18 @@ export declare const RUnaryOp: {
      * Get the operator information for a binary operator node.
      */
     readonly getOperatorInfo: <Info = object>(node: RUnaryOp<Info>) => OperatorInformationValue | undefined;
+    readonly getLocation: (this: void, node: RNode) => import("../../../../../util/range").SourceLocation | undefined;
+    readonly getId: (this: void, node: RNode<import("../processing/decorate").ParentInformation>) => import("../processing/node-id").NodeId;
+    readonly getType: (this: void, node: RNode) => RType;
+    readonly visitAst: <OtherInfo = object>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo>>, onVisit?: import("../processing/visitor").OnEnter<OtherInfo>, onExit?: import("../processing/visitor").OnExit<OtherInfo>) => void;
+    readonly collectAllIds: <OtherInfo>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => Set<import("../processing/node-id").NodeId>;
+    readonly directChildren: <OtherInfo>(this: void, node: RNode<OtherInfo>) => readonly (RNode<OtherInfo> | typeof import("./r-function-call").EmptyArgument)[];
+    readonly directParent: <OtherInfo>(this: void, node: RNode<OtherInfo & import("../processing/decorate").ParentInformation>, idMap: Map<import("../processing/node-id").NodeId, RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => RNode<OtherInfo & import("../processing/decorate").ParentInformation> | undefined;
+    readonly iterateParents: <OtherInfo>(this: void, node: RNode<OtherInfo & import("../processing/decorate").ParentInformation> | undefined, idMap: Map<import("../processing/node-id").NodeId, RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => Generator<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>;
+    readonly depth: (this: void, node: RNode<import("../processing/decorate").ParentInformation>, idMap: Map<import("../processing/node-id").NodeId, RNode<import("../processing/decorate").ParentInformation>>) => number;
+    readonly collectAllIdsWithStop: <OtherInfo>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>, stop: (node: RNode<OtherInfo & import("../processing/decorate").ParentInformation>) => boolean) => Set<import("../processing/node-id").NodeId>;
+    readonly lexeme: <R extends RNode<import("../processing/decorate").ParentInformation>>(this: void, node: R | undefined) => R extends {
+        lexeme: string;
+    } ? string : string | undefined;
+    readonly documentation: typeof import("../../../../roxygen2/documentation-provider").getDocumentationOf;
 };

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

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RUnaryOp = void 0;
+const model_1 = require("../model");
 const type_1 = require("../type");
 const operators_1 = require("../operators");
 /**
  * Helper for working with {@link RUnaryOp} AST nodes.
  */
 exports.RUnaryOp = {
+    ...model_1.RNode,
     name: 'RUnaryOp',
     /**
      * Type guard for {@link RUnaryOp} nodes.

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

@@ -1,4 +1,5 @@
-import type { RAstNodeBase, Location, NoInfo, RNode } from '../model';
+import type { RAstNodeBase, Location, NoInfo } from '../model';
+import { RNode } from '../model';
 import { RType } from '../type';
 import type { RExpressionList } from './r-expression-list';
 /**
@@ -20,4 +21,18 @@ export declare const RWhileLoop: {
      * Type guard for {@link RWhileLoop} nodes.
      */
     readonly is: <Info = object>(this: void, node: RNode<Info> | undefined) => node is RWhileLoop<Info>;
+    readonly getLocation: (this: void, node: RNode) => import("../../../../../util/range").SourceLocation | undefined;
+    readonly getId: (this: void, node: RNode<import("../processing/decorate").ParentInformation>) => import("../processing/node-id").NodeId;
+    readonly getType: (this: void, node: RNode) => RType;
+    readonly visitAst: <OtherInfo = object>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo>>, onVisit?: import("../processing/visitor").OnEnter<OtherInfo>, onExit?: import("../processing/visitor").OnExit<OtherInfo>) => void;
+    readonly collectAllIds: <OtherInfo>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => Set<import("../processing/node-id").NodeId>;
+    readonly directChildren: <OtherInfo>(this: void, node: RNode<OtherInfo>) => readonly (RNode<OtherInfo> | typeof import("./r-function-call").EmptyArgument)[];
+    readonly directParent: <OtherInfo>(this: void, node: RNode<OtherInfo & import("../processing/decorate").ParentInformation>, idMap: Map<import("../processing/node-id").NodeId, RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => RNode<OtherInfo & import("../processing/decorate").ParentInformation> | undefined;
+    readonly iterateParents: <OtherInfo>(this: void, node: RNode<OtherInfo & import("../processing/decorate").ParentInformation> | undefined, idMap: Map<import("../processing/node-id").NodeId, RNode<OtherInfo & import("../processing/decorate").ParentInformation>>) => Generator<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>;
+    readonly depth: (this: void, node: RNode<import("../processing/decorate").ParentInformation>, idMap: Map<import("../processing/node-id").NodeId, RNode<import("../processing/decorate").ParentInformation>>) => number;
+    readonly collectAllIdsWithStop: <OtherInfo>(this: void, nodes: import("../../../../../abstract-interpretation/normalized-ast-fold").SingleOrArrayOrNothing<RNode<OtherInfo & import("../processing/decorate").ParentInformation>>, stop: (node: RNode<OtherInfo & import("../processing/decorate").ParentInformation>) => boolean) => Set<import("../processing/node-id").NodeId>;
+    readonly lexeme: <R extends RNode<import("../processing/decorate").ParentInformation>>(this: void, node: R | undefined) => R extends {
+        lexeme: string;
+    } ? string : string | undefined;
+    readonly documentation: typeof import("../../../../roxygen2/documentation-provider").getDocumentationOf;
 };

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RWhileLoop = void 0;
+const model_1 = require("../model");
 const type_1 = require("../type");
 /**
  * Helper for working with {@link RWhileLoop} AST nodes.
  */
 exports.RWhileLoop = {
+    ...model_1.RNode,
     name: 'RWhileLoop',
     /**
      * Type guard for {@link RWhileLoop} nodes.

package/search/flowr-search-filters.d.ts

@@ -3,8 +3,8 @@ import { VertexType } from '../dataflow/graph/vertex';
 import type { ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { FlowrSearchElement } from './flowr-search';
 import { Enrichment } from './search-executor/search-enrichers';
-import type { BuiltInProcName } from '../dataflow/environments/built-in';
 import type { DataflowInformation } from '../dataflow/info';
+import type { BuiltInProcName } from '../dataflow/environments/built-in-proc-name';
 export type FlowrFilterName = keyof typeof FlowrFilters;
 interface FlowrFilterWithArgs<Filter extends FlowrFilterName, Args extends FlowrFilterArgs<Filter>> {
     name: Filter;

package/search/flowr-search-printer.js

@@ -4,10 +4,10 @@ exports.flowrSearchToMermaid = flowrSearchToMermaid;
 exports.flowrSearchToAscii = flowrSearchToAscii;
 exports.flowrSearchToCode = flowrSearchToCode;
 const flowr_search_traverse_1 = require("./flowr-search-traverse");
-const mermaid_1 = require("../util/mermaid/mermaid");
 const flowr_search_filters_1 = require("./flowr-search-filters");
 const vertex_1 = require("../dataflow/graph/vertex");
 const type_1 = require("../r-bridge/lang-4.x/ast/model/type");
+const mermaid_1 = require("../util/mermaid/mermaid");
 /**
  * Converts a {@link FlowrSearchLike} object to a mermaid flowchart.
  */
@@ -21,8 +21,8 @@ function argsToMermaidString(args) {
     if (args === undefined) {
         return '';
     }
-    return Object.entries(args).map(([key, value]) => `${key}: ${(0, flowr_search_filters_1.isBinaryTree)(value) ? '_' + (0, mermaid_1.escapeMarkdown)((0, flowr_search_filters_1.binaryTreeToString)(value.tree)) + '_'
-        : (0, mermaid_1.escapeMarkdown)(JSON.stringify(value))}`)
+    return Object.entries(args).map(([key, value]) => `${key}: ${(0, flowr_search_filters_1.isBinaryTree)(value) ? '_' + mermaid_1.Mermaid.escape((0, flowr_search_filters_1.binaryTreeToString)(value.tree)) + '_'
+        : mermaid_1.Mermaid.escape(JSON.stringify(value))}`)
         .join(', ');
 }
 function argsToAsciiString(args) {

package/search/search-executor/search-enrichers.js

@@ -6,13 +6,13 @@ exports.enrichElement = enrichElement;
 const objects_1 = require("../../util/objects");
 const vertex_1 = require("../../dataflow/graph/vertex");
 const assert_1 = require("../../util/assert");
-const dfg_get_origin_1 = require("../../dataflow/origin/dfg-get-origin");
 const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const cfg_simplification_1 = require("../../control-flow/cfg-simplification");
 const call_context_query_executor_1 = require("../../queries/catalog/call-context-query/call-context-query-executor");
 const cfg_kind_1 = require("../../project/cfg-kind");
 const identify_link_to_last_call_relation_1 = require("../../queries/catalog/call-context-query/identify-link-to-last-call-relation");
 const identifier_1 = require("../../dataflow/environments/identifier");
+const df_helper_1 = require("../../dataflow/graph/df-helper");
 /**
  * An enumeration that stores the names of the available enrichments that can be applied to a set of search elements.
  * See {@link FlowrSearchBuilder.with} for more information on how to apply enrichments.
@@ -37,7 +37,7 @@ exports.Enrichments = {
             const n = await analyzer.normalize();
             const callVertex = df.graph.getVertex(e.node.info.id);
             if (callVertex?.tag === vertex_1.VertexType.FunctionCall) {
-                const origins = (0, dfg_get_origin_1.getOriginInDfg)(df.graph, callVertex.id);
+                const origins = df_helper_1.Dataflow.origin(df.graph, callVertex.id);
                 if (!origins || origins.length === 0) {
                     content.targets = [(0, node_id_1.recoverName)(callVertex.id, n.idMap)];
                 }

package/search/search-executor/search-generators.js

@@ -133,7 +133,7 @@ async function generateSyntax(input, args) {
 }
 async function generateCriterion(input, args) {
     const idMap = (await input.normalize()).idMap;
-    return new flowr_search_1.FlowrSearchElements(args.criterion.map(c => ({ node: idMap.get((0, parse_1.slicingCriterionToId)(c, idMap)) })));
+    return new flowr_search_1.FlowrSearchElements(args.criterion.map(c => ({ node: idMap.get(parse_1.SlicingCriterion.parse(c, idMap)) })));
 }
 /**
  * Gets the search generator function for the given name

package/slicing/criterion/parse.d.ts

@@ -1,31 +1,56 @@
 import { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { AstIdMap } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
 /** Either `line:column`, `line@variable-name`, or `$id` */
-export type SingleSlicingCriterion = `${number}:${number}` | `${number}@${string}` | `$${NodeId | number}`;
-export type SlicingCriteria = SingleSlicingCriterion[];
+export type SlicingCriterion = `${number}:${number}` | `${number}@${string}` | `$${NodeId | number}`;
 /**
- * Thrown if the given slicing criteria can not be found
- */
-export declare class CriteriaParseError extends Error {
-    constructor(message: string);
-}
-/**
- * Takes a criterion in the form of `line:column` or `line@variable-name` and returns the corresponding node id
- * @see {@link tryResolveSliceCriterionToId} for a version that does not throw an error
+ * The helper object associated with {@link SlicingCriterion} which makes it easy
+ * to parse, validate and resolve slicing criteria.
  */
-export declare function slicingCriterionToId(criterion: SingleSlicingCriterion, idMap: AstIdMap): NodeId;
+export declare const SlicingCriterion: {
+    readonly name: "SlicingCriterion";
+    /**
+     * Takes a criterion in the form of `line:column` or `line@variable-name` and returns the corresponding node id
+     * @see {@link SlicingCriterion.tryParse} for a version that does not throw an error
+     */
+    readonly parse: (this: void, criterion: SlicingCriterion, idMap: AstIdMap) => NodeId;
+    /**
+     * Tries to resolve a slicing criterion to an id, but does not throw an error if it fails.
+     * @see {@link SlicingCriterion.parse} for the version that throws an error
+     */
+    readonly tryParse: (this: void, criterion: SlicingCriterion | NodeId, idMap: AstIdMap) => NodeId | undefined;
+    /**
+     * Converts a node id to a slicing criterion in the form of `$id`
+     */
+    readonly fromId: (this: void, id: NodeId) => SlicingCriterion;
+};
 /**
- * Tries to resolve a slicing criterion to an id, but does not throw an error if it fails.
- * @see {@link slicingCriterionToId} for the version that throws an error
+ * A slicing criterion is a list of single slicing criteria, which can be in the form of `line:column`, `line@variable-name`, or `$id`.
  */
-export declare function tryResolveSliceCriterionToId(criterion: string | NodeId, idMap: AstIdMap): NodeId | undefined;
+export type SlicingCriteria = SlicingCriterion[];
 export interface DecodedCriterion {
-    criterion: SingleSlicingCriterion;
+    criterion: SlicingCriterion;
     id: NodeId;
 }
 export type DecodedCriteria = ReadonlyArray<DecodedCriterion>;
 /**
- * Converts all slicing criteria to their corresponding node ids
- * @throws CriteriaParseError if any of the criteria can not be resolved
+ * The helper object associated with {@link SlicingCriteria} which makes it easy to parse, validate and resolve slicing criteria.
  */
-export declare function convertAllSlicingCriteriaToIds(criteria: SlicingCriteria, decorated: AstIdMap): DecodedCriteria;
+export declare const SlicingCriteria: {
+    /**
+     * Decodes all slicing criteria to their corresponding node ids
+     * @throws CriteriaParseError if any of the criteria can not be resolved
+     * @see {@link SlicingCriteria.convertAll}
+     */
+    readonly decodeAll: (this: void, criteria: SlicingCriteria, decorated: AstIdMap) => DecodedCriteria;
+    /**
+     * Converts all criteria to their id in the AST if possible, this keeps the original criterion if it can not be resolved.
+     * @see {@link SlicingCriteria.decodeAll}
+     */
+    readonly convertAll: (this: void, criteria: SlicingCriteria, decorated: AstIdMap) => NodeId[];
+};
+/**
+ * Thrown if the given slicing criteria can not be found
+ */
+export declare class CriteriaParseError extends Error {
+    constructor(message: string);
+}

package/slicing/criterion/parse.js

@@ -1,63 +1,84 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CriteriaParseError = void 0;
-exports.slicingCriterionToId = slicingCriterionToId;
-exports.tryResolveSliceCriterionToId = tryResolveSliceCriterionToId;
-exports.convertAllSlicingCriteriaToIds = convertAllSlicingCriteriaToIds;
+exports.CriteriaParseError = exports.SlicingCriteria = exports.SlicingCriterion = void 0;
 const log_1 = require("../../util/log");
 const node_id_1 = require("../../r-bridge/lang-4.x/ast/model/processing/node-id");
 const static_slicer_1 = require("../static/static-slicer");
 const type_1 = require("../../r-bridge/lang-4.x/ast/model/type");
 /**
- * Thrown if the given slicing criteria can not be found
+ * The helper object associated with {@link SlicingCriterion} which makes it easy
+ * to parse, validate and resolve slicing criteria.
  */
-class CriteriaParseError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'CriteriaParseError';
+exports.SlicingCriterion = {
+    name: 'SlicingCriterion',
+    /**
+     * Takes a criterion in the form of `line:column` or `line@variable-name` and returns the corresponding node id
+     * @see {@link SlicingCriterion.tryParse} for a version that does not throw an error
+     */
+    parse(criterion, idMap) {
+        const resolved = exports.SlicingCriterion.tryParse(criterion, idMap);
+        if (resolved === undefined) {
+            throw new CriteriaParseError(`invalid slicing criterion ${criterion}`);
+        }
+        return resolved;
+    },
+    /**
+     * Tries to resolve a slicing criterion to an id, but does not throw an error if it fails.
+     * @see {@link SlicingCriterion.parse} for the version that throws an error
+     */
+    tryParse(criterion, idMap) {
+        criterion = criterion.toString(); // in case it's a number
+        if (criterion.startsWith('$')) {
+            return node_id_1.NodeId.normalize(criterion.substring(1));
+        }
+        else if (criterion.includes('@')) {
+            const at = criterion.indexOf('@');
+            const line = parseInt(criterion.substring(0, at));
+            const name = criterion.substring(at + 1);
+            return conventionalCriteriaToId(line, name, idMap);
+        }
+        else if (criterion.includes(':')) {
+            const [line, column] = criterion.split(':').map(c => parseInt(c));
+            return locationToId([line, column], idMap);
+        }
+    },
+    /**
+     * Converts a node id to a slicing criterion in the form of `$id`
+     */
+    fromId(id) {
+        return `$${id}`;
     }
-}
-exports.CriteriaParseError = CriteriaParseError;
+};
 /**
- * Takes a criterion in the form of `line:column` or `line@variable-name` and returns the corresponding node id
- * @see {@link tryResolveSliceCriterionToId} for a version that does not throw an error
+ * The helper object associated with {@link SlicingCriteria} which makes it easy to parse, validate and resolve slicing criteria.
  */
-function slicingCriterionToId(criterion, idMap) {
-    let resolved;
-    if (criterion.startsWith('$')) {
-        resolved = node_id_1.NodeId.normalize(criterion.substring(1));
-    }
-    else if (criterion.includes('@')) {
-        const at = criterion.indexOf('@');
-        const line = parseInt(criterion.substring(0, at));
-        const name = criterion.substring(at + 1);
-        resolved = conventionalCriteriaToId(line, name, idMap);
+exports.SlicingCriteria = {
+    /**
+     * Decodes all slicing criteria to their corresponding node ids
+     * @throws CriteriaParseError if any of the criteria can not be resolved
+     * @see {@link SlicingCriteria.convertAll}
+     */
+    decodeAll(criteria, decorated) {
+        return criteria.map(l => ({ criterion: l, id: exports.SlicingCriterion.parse(l, decorated) }));
+    },
+    /**
+     * Converts all criteria to their id in the AST if possible, this keeps the original criterion if it can not be resolved.
+     * @see {@link SlicingCriteria.decodeAll}
+     */
+    convertAll(criteria, decorated) {
+        return criteria.map(l => exports.SlicingCriterion.tryParse(l, decorated) ?? l);
     }
-    else if (criterion.includes(':')) {
-        const [line, column] = criterion.split(':').map(c => parseInt(c));
-        resolved = locationToId([line, column], idMap);
-    }
-    if (resolved === undefined) {
-        throw new CriteriaParseError(`invalid slicing criterion ${criterion}`);
-    }
-    return resolved;
-}
+};
 /**
- * Tries to resolve a slicing criterion to an id, but does not throw an error if it fails.
- * @see {@link slicingCriterionToId} for the version that throws an error
+ * Thrown if the given slicing criteria can not be found
  */
-function tryResolveSliceCriterionToId(criterion, idMap) {
-    try {
-        return slicingCriterionToId(criterion, idMap);
-    }
-    catch (e) {
-        if (e instanceof CriteriaParseError) {
-            (0, log_1.expensiveTrace)(static_slicer_1.slicerLogger, () => `could not resolve slicing criterion ${criterion}: ${e.message}`);
-            return undefined;
-        }
-        throw e; // rethrow other errors
+class CriteriaParseError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'CriteriaParseError';
     }
 }
+exports.CriteriaParseError = CriteriaParseError;
 function locationToId(location, dataflowIdMap) {
     let candidate;
     for (const [id, nodeInfo] of dataflowIdMap.entries()) {
@@ -71,36 +92,20 @@ function locationToId(location, dataflowIdMap) {
         }
         candidate = nodeInfo;
     }
-    const id = candidate?.info.id;
-    if (id) {
-        (0, log_1.expensiveTrace)(static_slicer_1.slicerLogger, () => `resolve id ${id} (${JSON.stringify(candidate?.info)}) for location ${JSON.stringify(location)}`);
-    }
-    return id;
+    return candidate?.info.id;
 }
 function conventionalCriteriaToId(line, name, dataflowIdMap) {
     let candidate;
-    for (const [id, nodeInfo] of dataflowIdMap.entries()) {
+    for (const nodeInfo of dataflowIdMap.values()) {
         if (nodeInfo.location === undefined || nodeInfo.location[0] !== line || nodeInfo.lexeme !== name) {
             continue;
         }
-        static_slicer_1.slicerLogger.trace(`can resolve id ${id} (${JSON.stringify(nodeInfo)}) for line ${line} and name ${name}`);
         // function calls have the same location as the symbol they refer to, so we need to prefer the function call
         if (candidate !== undefined && nodeInfo.type !== type_1.RType.FunctionCall || nodeInfo.type === type_1.RType.Argument || nodeInfo.type === type_1.RType.ExpressionList) {
             continue;
         }
         candidate = nodeInfo;
     }
-    const id = candidate?.info.id;
-    if (id) {
-        static_slicer_1.slicerLogger.trace(`resolve id ${id} (${JSON.stringify(candidate?.info)}) for line ${line} and name ${name}`);
-    }
-    return id;
-}
-/**
- * Converts all slicing criteria to their corresponding node ids
- * @throws CriteriaParseError if any of the criteria can not be resolved
- */
-function convertAllSlicingCriteriaToIds(criteria, decorated) {
-    return criteria.map(l => ({ criterion: l, id: slicingCriterionToId(l, decorated) }));
+    return candidate?.info.id;
 }
 //# sourceMappingURL=parse.js.map

package/slicing/static/slicer-types.d.ts

@@ -1,6 +1,5 @@
 import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { REnvironmentInformation } from '../../dataflow/environments/environment';
-import type { DecodedCriteria } from '../criterion/parse';
 /**
  * Represents a node during the slicing process, together with the environment it is traversed in
  * (modified by function calls) and whether it is only used for its side effects.
@@ -29,7 +28,7 @@ export interface SliceResult {
      */
     readonly result: ReadonlySet<NodeId>;
     /**
-     * The mapping produced to decode the entered criteria
+     * The ids of the nodes in the normalized ast that were used as seed ids for slicing. This is a subset of {@link result}.
      */
-    readonly decodedCriteria: DecodedCriteria;
+    readonly slicedFor: readonly NodeId[];
 }

package/slicing/static/static-slicer.d.ts

@@ -2,12 +2,11 @@ import type { SliceResult } from './slicer-types';
 import { type Fingerprint } from './fingerprint';
 import { VisitingQueue } from './visiting-queue';
 import type { NormalizedAst } from '../../r-bridge/lang-4.x/ast/model/processing/decorate';
-import { type SlicingCriteria } from '../criterion/parse';
 import { type REnvironmentInformation } from '../../dataflow/environments/environment';
 import type { NodeId } from '../../r-bridge/lang-4.x/ast/model/processing/node-id';
-import { SliceDirection } from '../../core/steps/all/static-slicing/00-slice';
 import type { DataflowInformation } from '../../dataflow/info';
 import type { ReadOnlyFlowrAnalyzerContext } from '../../project/context/flowr-analyzer-context';
+import { SliceDirection } from '../../util/slice-direction';
 export declare const slicerLogger: import("tslog").Logger<import("tslog").ILogObj>;
 /**
  * This returns the ids to include in the static slice of the given type, when slicing with the given seed id's (must be at least one).
@@ -16,12 +15,12 @@ export declare const slicerLogger: import("tslog").Logger<import("tslog").ILogOb
  * @param ctx  - The analyzer context used for slicing.
  * @param info      - The dataflow information used for slicing.
  * @param idMap     - The mapping from node ids to their information in the AST.
- * @param criteria  - The criteria to slice on.
+ * @param ids       - The seed ids to slice with. Must be at least one.
  * @param direction - The direction to slice in.
  * @param threshold - The maximum number of nodes to visit in the graph. If the threshold is reached, the slice will side with inclusion and drop its minimal guarantee. The limit ensures that the algorithm halts.
  * @param cache     - A cache to store the results of the slice. If provided, the slice may use this cache to speed up the slicing process.
  */
-export declare function staticSlice(ctx: ReadOnlyFlowrAnalyzerContext, info: DataflowInformation, { idMap }: NormalizedAst, criteria: SlicingCriteria, direction: SliceDirection, threshold?: number, cache?: Map<Fingerprint, Set<NodeId>>): Readonly<SliceResult>;
+export declare function staticSlice(ctx: ReadOnlyFlowrAnalyzerContext, info: DataflowInformation, { idMap }: NormalizedAst, ids: readonly NodeId[], direction: SliceDirection, threshold?: number, cache?: Map<Fingerprint, Set<NodeId>>): Readonly<SliceResult>;
 /**
  * Updates the potential addition for the given target node in the visiting queue.
  * This describes vertices that might be added *if* another path reaches them.

package/slicing/static/static-slicer.js

@@ -7,11 +7,11 @@ const assert_1 = require("../../util/assert");
 const log_1 = require("../../util/log");
 const visiting_queue_1 = require("./visiting-queue");
 const slice_call_1 = require("./slice-call");
-const parse_1 = require("../criterion/parse");
 const vertex_1 = require("../../dataflow/graph/vertex");
 const edge_1 = require("../../dataflow/graph/edge");
-const _00_slice_1 = require("../../core/steps/all/static-slicing/00-slice");
-const invert_dfg_1 = require("../../dataflow/graph/invert-dfg");
+const df_helper_1 = require("../../dataflow/graph/df-helper");
+const slice_direction_1 = require("../../util/slice-direction");
+const model_1 = require("../../r-bridge/lang-4.x/ast/model/model");
 exports.slicerLogger = log_1.log.getSubLogger({ name: 'slicer' });
 /**
  * This returns the ids to include in the static slice of the given type, when slicing with the given seed id's (must be at least one).
@@ -20,18 +20,16 @@ exports.slicerLogger = log_1.log.getSubLogger({ name: 'slicer' });
  * @param ctx  - The analyzer context used for slicing.
  * @param info      - The dataflow information used for slicing.
  * @param idMap     - The mapping from node ids to their information in the AST.
- * @param criteria  - The criteria to slice on.
+ * @param ids       - The seed ids to slice with. Must be at least one.
  * @param direction - The direction to slice in.
  * @param threshold - The maximum number of nodes to visit in the graph. If the threshold is reached, the slice will side with inclusion and drop its minimal guarantee. The limit ensures that the algorithm halts.
  * @param cache     - A cache to store the results of the slice. If provided, the slice may use this cache to speed up the slicing process.
  */
-function staticSlice(ctx, info, { idMap }, criteria, direction, threshold = 75, cache) {
-    (0, assert_1.guard)(criteria.length > 0, 'must have at least one seed id to calculate slice');
-    const decodedCriteria = (0, parse_1.convertAllSlicingCriteriaToIds)(criteria, idMap);
-    (0, log_1.expensiveTrace)(exports.slicerLogger, () => `calculating ${direction} slice for ${decodedCriteria.length} seed criteria: ${decodedCriteria.map(s => JSON.stringify(s)).join(', ')}`);
+function staticSlice(ctx, info, { idMap }, ids, direction, threshold = 75, cache) {
+    (0, assert_1.guard)(ids.length > 0, 'must have at least one seed id to calculate slice');
     let { graph } = info;
-    if (direction === _00_slice_1.SliceDirection.Forward) {
-        graph = (0, invert_dfg_1.invertDfg)(graph, ctx.env.makeCleanEnv());
+    if (direction === slice_direction_1.SliceDirection.Forward) {
+        graph = df_helper_1.Dataflow.invertGraph(graph, ctx.env.makeCleanEnv());
     }
     const queue = new visiting_queue_1.VisitingQueue(threshold, cache);
     let minNesting = Number.MAX_SAFE_INTEGER;
@@ -40,7 +38,7 @@ function staticSlice(ctx, info, { idMap }, criteria, direction, threshold = 75,
     {
         const emptyEnv = ctx.env.makeCleanEnv();
         const basePrint = ctx.env.getCleanEnvFingerprint();
-        for (const { id: startId } of decodedCriteria) {
+        for (const startId of ids) {
             queue.add(startId, emptyEnv, basePrint, false);
             // retrieve the minimum nesting of all nodes to only add control dependencies if they are "part" of the current execution
             minNesting = Math.min(minNesting, idMap.get(startId)?.info.nesting ?? minNesting);
@@ -102,7 +100,29 @@ function staticSlice(ctx, info, { idMap }, criteria, direction, threshold = 75,
             }
         }
     }
-    return { ...queue.status(), decodedCriteria };
+    if (ctx.config.solver.slicer?.autoExtend) {
+        return { ...queue.status(), slicedFor: ids, result: extendSlices(queue.status().result, idMap) };
+    }
+    else {
+        return { ...queue.status(), slicedFor: ids };
+    }
+}
+function extendSlices(results, ast) {
+    const res = new Set();
+    for (const id of results) {
+        res.add(id);
+        let parent = ast.get(id);
+        while (parent && parent.info.role !== "root" /* RoleInParent.Root */ && parent.info.role !== "el-c" /* RoleInParent.ExpressionListChild */) {
+            parent = parent.info.parent ? ast.get(parent.info.parent) : undefined;
+        }
+        if (!parent) {
+            continue; // no parent, no need to extend
+        }
+        for (const id of model_1.RNode.collectAllIds(parent)) {
+            res.add(id);
+        }
+    }
+    return res;
 }
 /**
  * Updates the potential addition for the given target node in the visiting queue.