@eagleoutice/flowr 2.1.12 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.1.12",
+  "version": "2.2.1",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -21,18 +21,21 @@
     "stats-helper": "ts-node src/cli/statistics-helper-app.ts",
     "slicer": "ts-node src/cli/slicer-app.ts",
     "benchmark-helper": "ts-node src/cli/benchmark-helper-app.ts",
-    "benchmark": "npm run build && node dist/src/cli/benchmark-app.js",
+    "benchmark": "npm run build && npm run build:copy-wasm && node dist/src/cli/benchmark-app.js",
     "summarizer": "ts-node src/cli/summarizer-app.ts",
     "export-quads": "ts-node src/cli/export-quads-app.ts",
     "capabilities-markdown": "ts-node src/documentation/print-capabilities-markdown.ts",
     "wiki:df-graph": "ts-node src/documentation/print-dataflow-graph-wiki.ts",
     "wiki:normalized-ast": "ts-node src/documentation/print-normalized-ast-wiki.ts",
     "wiki:query-api": "ts-node src/documentation/print-query-wiki.ts",
+    "wiki:engines": "ts-node src/documentation/print-engines-wiki.ts",
     "wiki:search-api": "ts-node src/documentation/print-search-wiki.ts",
     "wiki:linting-and-testing": "ts-node src/documentation/print-linting-and-testing-wiki.ts",
     "wiki:interface": "ts-node src/documentation/print-interface-wiki.ts",
     "build": "tsc --project .",
-    "build:bundle-flowr": "npm run build && esbuild --bundle dist/src/cli/flowr.js --platform=node --bundle --minify --target=node22 --outfile=dist/src/cli/flowr.min.js",
+    "build:bundle-flowr": "npm run build && esbuild --bundle dist/src/cli/flowr.js --platform=node --bundle --minify --target=node22 --outfile=dist/src/cli/flowr.min.js && npm run build:copy-wasm-min",
+    "build:copy-wasm": "cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter-r.wasm dist/src/r-bridge/lang-4.x/tree-sitter/ && cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter.wasm dist/src/r-bridge/lang-4.x/tree-sitter/",
+    "build:copy-wasm-min": "cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter-r.wasm dist/src/cli && cp src/r-bridge/lang-4.x/tree-sitter/tree-sitter.wasm dist/src/cli",
     "lint-local": "npx eslint --version && npx eslint src/ test/ --rule \"no-warning-comments: off\"",
     "lint": "npm run license-compat -- --summary && npx eslint --version && npx eslint src/ test/",
     "license-compat": "license-checker --onlyAllow 'MIT;MIT OR X11;GPLv2;LGPL;GNUGPL;ISC;Apache-2.0;FreeBSD;BSD-2-Clause;clearbsd;ModifiedBSD;BSD-3-Clause;Python-2.0;Unlicense;WTFPL;BlueOak-1.0.0;CC-BY-4.0;CC-BY-3.0;CC0-1.0;0BSD'",
@@ -40,7 +43,7 @@
     "test": "vitest --exclude \"test/system-tests/**\" --config test/vitest.config.mts",
     "test:system": "vitest --dir test/system-tests --config test/system-tests/vitest.config.mts",
     "test:coverage": "npm run test -- --coverage",
-    "performance-test": "func() { cd test/performance/ && bash run-all-suites.sh $1 $2 $3; cd ../../; }; func",
+    "performance-test": "func() { cd test/performance/ && bash run-all-suites.sh $1 $2 $3 $4; cd ../../; }; func",
     "test-full": "npm run test:coverage -- --no-watch -- --make-summary --test-installation",
     "detect-circular-deps": "npx madge  --extensions ts,tsx --circular src/",
     "checkup": "npm run flowr -- --execute \":version\" && npm run lint && npm run test-full -- --allowOnly=false && npm run test:system -- --no-watch && docker build -t test-flowr -f scripts/Dockerfile . && npm run doc && npm-run-all wiki:*"
@@ -163,7 +166,7 @@
         "npm run lint",
         "npm run test-full"
       ],
-      "after:bump": "npm run build",
+      "after:bump": "npm run build && npm run build:copy-wasm",
       "after:git:release": "echo After git push, before github release",
       "after:release": "echo Successfully released ${name} v${version} to ${repo.repository}."
     },
@@ -220,6 +223,7 @@
     "tmp": "^0.2.3",
     "ts-essentials": "^10.0.2",
     "tslog": "^4.9.3",
+    "web-tree-sitter": "^0.24.7",
     "ws": "^8.18.0",
     "xpath-ts2": "^1.4.2"
   }

package/queries/catalog/cluster-query/cluster-query-format.d.ts

@@ -18,7 +18,7 @@ export declare const ClusterQueryDefinition: {
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";
         readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../core/steps/all/core/00-parse").ParseRequiredInput>) => Promise<import("../../../core/steps/all/core/00-parse").ParseStepOutput>;
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
             readonly 0: typeof import("../../../core/print/print").internalPrinter;
@@ -26,16 +26,16 @@ export declare const ClusterQueryDefinition: {
                 (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
                 (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
             };
-            readonly 5: ({ parsed }: import("../../../core/steps/all/core/00-parse").ParseStepOutput, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
         };
         readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../core/steps/all/core/00-parse").ParseRequiredInput;
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
     } | {
         readonly name: "normalize";
         readonly humanReadableName: "normalize";
         readonly description: "Normalize the AST to flowR's AST";
         readonly processor: (results: {
-            parse?: import("../../../core/steps/all/core/00-parse").ParseStepOutput;
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
         }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
@@ -53,6 +53,7 @@ export declare const ClusterQueryDefinition: {
             normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         }, input: {
             request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
         }) => import("../../../dataflow/info").DataflowInformation;
         readonly requiredInput: {};
         readonly name: "dataflow";

package/queries/catalog/dataflow-query/dataflow-query-format.d.ts

@@ -18,7 +18,7 @@ export declare const DataflowQueryDefinition: {
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";
         readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../core/steps/all/core/00-parse").ParseRequiredInput>) => Promise<import("../../../core/steps/all/core/00-parse").ParseStepOutput>;
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
             readonly 0: typeof import("../../../core/print/print").internalPrinter;
@@ -26,16 +26,16 @@ export declare const DataflowQueryDefinition: {
                 (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
                 (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
             };
-            readonly 5: ({ parsed }: import("../../../core/steps/all/core/00-parse").ParseStepOutput, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
         };
         readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../core/steps/all/core/00-parse").ParseRequiredInput;
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
     } | {
         readonly name: "normalize";
         readonly humanReadableName: "normalize";
         readonly description: "Normalize the AST to flowR's AST";
         readonly processor: (results: {
-            parse?: import("../../../core/steps/all/core/00-parse").ParseStepOutput;
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
         }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
@@ -53,6 +53,7 @@ export declare const DataflowQueryDefinition: {
             normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         }, input: {
             request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
         }) => import("../../../dataflow/info").DataflowInformation;
         readonly requiredInput: {};
         readonly name: "dataflow";

package/queries/catalog/dependencies-query/dependencies-query-format.d.ts

@@ -49,7 +49,7 @@ export declare const DependenciesQueryDefinition: {
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";
         readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../core/steps/all/core/00-parse").ParseRequiredInput>) => Promise<import("../../../core/steps/all/core/00-parse").ParseStepOutput>;
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
             readonly 0: typeof import("../../../core/print/print").internalPrinter;
@@ -57,16 +57,16 @@ export declare const DependenciesQueryDefinition: {
                 (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
                 (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
             };
-            readonly 5: ({ parsed }: import("../../../core/steps/all/core/00-parse").ParseStepOutput, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
         };
         readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../core/steps/all/core/00-parse").ParseRequiredInput;
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
     } | {
         readonly name: "normalize";
         readonly humanReadableName: "normalize";
         readonly description: "Normalize the AST to flowR's AST";
         readonly processor: (results: {
-            parse?: import("../../../core/steps/all/core/00-parse").ParseStepOutput;
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
         }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
@@ -84,6 +84,7 @@ export declare const DependenciesQueryDefinition: {
             normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         }, input: {
             request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
         }) => import("../../../dataflow/info").DataflowInformation;
         readonly requiredInput: {};
         readonly name: "dataflow";

package/queries/catalog/happens-before-query/happens-before-query-executor.d.ts

@@ -0,0 +1,3 @@
+import type { BasicQueryData } from '../../base-query-format';
+import type { HappensBeforeQuery, HappensBeforeQueryResult } from './happens-before-query-format';
+export declare function executeHappensBefore({ ast }: BasicQueryData, queries: readonly HappensBeforeQuery[]): HappensBeforeQueryResult;

package/queries/catalog/happens-before-query/happens-before-query-executor.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeHappensBefore = executeHappensBefore;
+const logic_1 = require("../../../util/logic");
+const log_1 = require("../../../util/log");
+const cfg_1 = require("../../../util/cfg/cfg");
+const happens_before_1 = require("../../../util/cfg/happens-before");
+const parse_1 = require("../../../slicing/criterion/parse");
+function executeHappensBefore({ ast }, queries) {
+    const start = Date.now();
+    const results = {};
+    const cfg = (0, cfg_1.extractCFG)(ast);
+    for (const query of queries) {
+        const { a, b } = query;
+        const fingerprint = `${a}<${b}`;
+        if (fingerprint in results) {
+            log_1.log.warn('Duplicate happens-before query', query, 'ignoring');
+        }
+        try {
+            const resolvedA = (0, parse_1.slicingCriterionToId)(a, ast.idMap);
+            const resolvedB = (0, parse_1.slicingCriterionToId)(b, ast.idMap);
+            results[fingerprint] = (0, happens_before_1.happensBefore)(cfg.graph, resolvedA, resolvedB);
+        }
+        catch (e) {
+            log_1.log.error('Error while executing happens-before query', query, e);
+            results[fingerprint] = logic_1.Ternary.Maybe;
+        }
+    }
+    return {
+        '.meta': {
+            timing: Date.now() - start
+        },
+        results
+    };
+}
+//# sourceMappingURL=happens-before-query-executor.js.map

package/queries/catalog/happens-before-query/happens-before-query-format.d.ts

@@ -0,0 +1,71 @@
+import type { BaseQueryFormat, BaseQueryResult } from '../../base-query-format';
+import Joi from 'joi';
+import { executeHappensBefore } from './happens-before-query-executor';
+import type { SingleSlicingCriterion } from '../../../slicing/criterion/parse';
+import type { Ternary } from '../../../util/logic';
+export interface HappensBeforeQuery extends BaseQueryFormat {
+    readonly type: 'happens-before';
+    readonly a: SingleSlicingCriterion;
+    readonly b: SingleSlicingCriterion;
+}
+export interface HappensBeforeQueryResult extends BaseQueryResult {
+    readonly results: Record<string, Ternary>;
+}
+export declare const HappensBeforeQueryDefinition: {
+    readonly executor: typeof executeHappensBefore;
+    readonly asciiSummarizer: (formatter: import("../../../util/ansi").OutputFormatter, _processed: import("../../../core/steps/pipeline/pipeline").PipelineOutput<import("../../../core/steps/pipeline/pipeline").Pipeline<{
+        readonly name: "parse";
+        readonly humanReadableName: "parse with R shell";
+        readonly description: "Parse the given R code into an AST";
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
+        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+        readonly printer: {
+            readonly 0: typeof import("../../../core/print/print").internalPrinter;
+            readonly 2: {
+                (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
+                (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
+            };
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+        };
+        readonly dependencies: readonly [];
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
+    } | {
+        readonly name: "normalize";
+        readonly humanReadableName: "normalize";
+        readonly description: "Normalize the AST to flowR's AST";
+        readonly processor: (results: {
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
+        }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
+        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+        readonly printer: {
+            readonly 0: typeof import("../../../core/print/print").internalPrinter;
+            readonly 2: typeof import("../../../core/print/normalize-printer").normalizedAstToJson;
+            readonly 5: typeof import("../../../core/print/normalize-printer").normalizedAstToQuads;
+            readonly 3: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaid;
+            readonly 4: typeof import("../../../core/print/normalize-printer").printNormalizedAstToMermaidUrl;
+        };
+        readonly dependencies: readonly ["parse"];
+        readonly requiredInput: import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput;
+    } | {
+        readonly humanReadableName: "dataflow";
+        readonly processor: (results: {
+            normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
+        }, input: {
+            request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
+        }) => import("../../../dataflow/info").DataflowInformation;
+        readonly requiredInput: {};
+        readonly name: "dataflow";
+        readonly description: "Construct the dataflow graph";
+        readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
+        readonly printer: {
+            readonly 0: typeof import("../../../core/print/print").internalPrinter;
+            readonly 2: typeof import("../../../core/print/dataflow-printer").dataflowGraphToJson;
+            readonly 5: typeof import("../../../core/print/dataflow-printer").dataflowGraphToQuads;
+            readonly 3: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaid;
+            readonly 4: typeof import("../../../core/print/dataflow-printer").dataflowGraphToMermaidUrl;
+        };
+        readonly dependencies: readonly ["normalize"];
+    }>>, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly schema: Joi.ObjectSchema<any>;
+};

package/queries/catalog/happens-before-query/happens-before-query-format.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HappensBeforeQueryDefinition = void 0;
+const ansi_1 = require("../../../util/ansi");
+const time_1 = require("../../../util/time");
+const joi_1 = __importDefault(require("joi"));
+const happens_before_query_executor_1 = require("./happens-before-query-executor");
+exports.HappensBeforeQueryDefinition = {
+    executor: happens_before_query_executor_1.executeHappensBefore,
+    asciiSummarizer: (formatter, _processed, queryResults, result) => {
+        const out = queryResults;
+        result.push(`Query: ${(0, ansi_1.bold)('happens-before', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
+        for (const [key, value] of Object.entries(out.results)) {
+            result.push(`   ╰ ${key}: ${value}`);
+        }
+        return true;
+    },
+    schema: joi_1.default.object({
+        type: joi_1.default.string().valid('happens-before').required().description('The type of the query.'),
+        a: joi_1.default.string().required().description('The first slicing criterion.'),
+        b: joi_1.default.string().required().description('The second slicing criterion.')
+    }).description('The id map query retrieves the id map from the normalized AST.')
+};
+//# sourceMappingURL=happens-before-query-format.js.map

package/queries/catalog/id-map-query/id-map-query-format.d.ts

@@ -14,7 +14,7 @@ export declare const IdMapQueryDefinition: {
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";
         readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../core/steps/all/core/00-parse").ParseRequiredInput>) => Promise<import("../../../core/steps/all/core/00-parse").ParseStepOutput>;
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
             readonly 0: typeof import("../../../core/print/print").internalPrinter;
@@ -22,16 +22,16 @@ export declare const IdMapQueryDefinition: {
                 (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
                 (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
             };
-            readonly 5: ({ parsed }: import("../../../core/steps/all/core/00-parse").ParseStepOutput, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
         };
         readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../core/steps/all/core/00-parse").ParseRequiredInput;
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
     } | {
         readonly name: "normalize";
         readonly humanReadableName: "normalize";
         readonly description: "Normalize the AST to flowR's AST";
         readonly processor: (results: {
-            parse?: import("../../../core/steps/all/core/00-parse").ParseStepOutput;
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
         }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
@@ -49,6 +49,7 @@ export declare const IdMapQueryDefinition: {
             normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         }, input: {
             request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
         }) => import("../../../dataflow/info").DataflowInformation;
         readonly requiredInput: {};
         readonly name: "dataflow";

package/queries/catalog/lineage-query/lineage-query-format.d.ts

@@ -20,7 +20,7 @@ export declare const LineageQueryDefinition: {
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";
         readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../core/steps/all/core/00-parse").ParseRequiredInput>) => Promise<import("../../../core/steps/all/core/00-parse").ParseStepOutput>;
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
             readonly 0: typeof import("../../../core/print/print").internalPrinter;
@@ -28,16 +28,16 @@ export declare const LineageQueryDefinition: {
                 (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
                 (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
             };
-            readonly 5: ({ parsed }: import("../../../core/steps/all/core/00-parse").ParseStepOutput, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
         };
         readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../core/steps/all/core/00-parse").ParseRequiredInput;
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
     } | {
         readonly name: "normalize";
         readonly humanReadableName: "normalize";
         readonly description: "Normalize the AST to flowR's AST";
         readonly processor: (results: {
-            parse?: import("../../../core/steps/all/core/00-parse").ParseStepOutput;
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
         }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
@@ -55,6 +55,7 @@ export declare const LineageQueryDefinition: {
             normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         }, input: {
             request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
         }) => import("../../../dataflow/info").DataflowInformation;
         readonly requiredInput: {};
         readonly name: "dataflow";

package/queries/catalog/normalized-ast-query/normalized-ast-query-format.d.ts

@@ -17,7 +17,7 @@ export declare const NormalizedAstQueryDefinition: {
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";
         readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../core/steps/all/core/00-parse").ParseRequiredInput>) => Promise<import("../../../core/steps/all/core/00-parse").ParseStepOutput>;
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
             readonly 0: typeof import("../../../core/print/print").internalPrinter;
@@ -25,16 +25,16 @@ export declare const NormalizedAstQueryDefinition: {
                 (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
                 (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
             };
-            readonly 5: ({ parsed }: import("../../../core/steps/all/core/00-parse").ParseStepOutput, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
         };
         readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../core/steps/all/core/00-parse").ParseRequiredInput;
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
     } | {
         readonly name: "normalize";
         readonly humanReadableName: "normalize";
         readonly description: "Normalize the AST to flowR's AST";
         readonly processor: (results: {
-            parse?: import("../../../core/steps/all/core/00-parse").ParseStepOutput;
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
         }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
@@ -52,6 +52,7 @@ export declare const NormalizedAstQueryDefinition: {
             normalize?: NormalizedAst;
         }, input: {
             request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
         }) => import("../../../dataflow/info").DataflowInformation;
         readonly requiredInput: {};
         readonly name: "dataflow";

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

@@ -1,13 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeSearch = executeSearch;
-const log_1 = require("../../../util/log");
 const flowr_search_executor_1 = require("../../../search/flowr-search-executor");
 function executeSearch({ ast, dataflow }, queries) {
     const start = Date.now();
-    if (queries.length !== 1) {
-        log_1.log.warn('Id-Map query expects only up to one query, but got', queries.length);
-    }
     const results = [];
     for (const query of queries) {
         const { search } = query;

package/queries/catalog/search-query/search-query-format.d.ts

@@ -19,7 +19,7 @@ export declare const SearchQueryDefinition: {
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";
         readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../core/steps/all/core/00-parse").ParseRequiredInput>) => Promise<import("../../../core/steps/all/core/00-parse").ParseStepOutput>;
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
             readonly 0: typeof import("../../../core/print/print").internalPrinter;
@@ -27,16 +27,16 @@ export declare const SearchQueryDefinition: {
                 (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
                 (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
             };
-            readonly 5: ({ parsed }: import("../../../core/steps/all/core/00-parse").ParseStepOutput, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
         };
         readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../core/steps/all/core/00-parse").ParseRequiredInput;
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
     } | {
         readonly name: "normalize";
         readonly humanReadableName: "normalize";
         readonly description: "Normalize the AST to flowR's AST";
         readonly processor: (results: {
-            parse?: import("../../../core/steps/all/core/00-parse").ParseStepOutput;
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
         }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
@@ -54,6 +54,7 @@ export declare const SearchQueryDefinition: {
             normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         }, input: {
             request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
         }) => import("../../../dataflow/info").DataflowInformation;
         readonly requiredInput: {};
         readonly name: "dataflow";

package/queries/catalog/static-slice-query/static-slice-query-format.d.ts

@@ -30,7 +30,7 @@ export declare const StaticSliceQueryDefinition: {
         readonly name: "parse";
         readonly humanReadableName: "parse with R shell";
         readonly description: "Parse the given R code into an AST";
-        readonly processor: (_results: unknown, input: Partial<import("../../../core/steps/all/core/00-parse").ParseRequiredInput>) => Promise<import("../../../core/steps/all/core/00-parse").ParseStepOutput>;
+        readonly processor: (_results: unknown, input: Partial<import("../../../r-bridge/parser").ParseRequiredInput<string>>) => Promise<import("../../../r-bridge/parser").ParseStepOutput<string>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
             readonly 0: typeof import("../../../core/print/print").internalPrinter;
@@ -38,16 +38,16 @@ export declare const StaticSliceQueryDefinition: {
                 (value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
                 (value: any, replacer?: (number | string)[] | null, space?: string | number): string;
             };
-            readonly 5: ({ parsed }: import("../../../core/steps/all/core/00-parse").ParseStepOutput, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
+            readonly 5: ({ parsed }: import("../../../r-bridge/parser").ParseStepOutput<string>, config: import("../../../util/quads").QuadSerializationConfiguration) => string;
         };
         readonly dependencies: readonly [];
-        readonly requiredInput: import("../../../core/steps/all/core/00-parse").ParseRequiredInput;
+        readonly requiredInput: import("../../../r-bridge/parser").ParseRequiredInput<string>;
     } | {
         readonly name: "normalize";
         readonly humanReadableName: "normalize";
         readonly description: "Normalize the AST to flowR's AST";
         readonly processor: (results: {
-            parse?: import("../../../core/steps/all/core/00-parse").ParseStepOutput;
+            parse?: import("../../../r-bridge/parser").ParseStepOutput<string>;
         }, input: Partial<import("../../../core/steps/all/core/10-normalize").NormalizeRequiredInput>) => import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation, import("../../../r-bridge/lang-4.x/ast/model/model").RNode<import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").ParentInformation>>;
         readonly executed: import("../../../core/steps/pipeline-step").PipelineStepStage.OncePerFile;
         readonly printer: {
@@ -65,6 +65,7 @@ export declare const StaticSliceQueryDefinition: {
             normalize?: import("../../../r-bridge/lang-4.x/ast/model/processing/decorate").NormalizedAst;
         }, input: {
             request?: import("../../../r-bridge/retriever").RParseRequests;
+            parser?: import("../../../r-bridge/parser").Parser<import("../../../r-bridge/parser").KnownParserType>;
         }) => import("../../../dataflow/info").DataflowInformation;
         readonly requiredInput: {};
         readonly name: "dataflow";