@eagleoutice/flowr 2.6.2 → 2.6.3

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

@@ -15,7 +15,7 @@ export interface SearchQueryResult extends BaseQueryResult {
 }
 export declare const SearchQueryDefinition: {
     readonly executor: typeof executeSearch;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
 };

package/queries/catalog/static-slice-query/static-slice-query-executor.js

@@ -37,7 +37,7 @@ async function executeStaticSliceQuery({ analyzer }, queries) {
         }
         else {
             const reconstructStart = Date.now();
-            const reconstruct = (0, reconstruct_1.reconstructToCode)(await analyzer.normalize(), slice.result, noMagicComments ? auto_select_defaults_1.doNotAutoSelect : (0, magic_comments_1.makeMagicCommentHandler)(auto_select_defaults_1.doNotAutoSelect));
+            const reconstruct = (0, reconstruct_1.reconstructToCode)(await analyzer.normalize(), { nodes: slice.result }, noMagicComments ? auto_select_defaults_1.doNotAutoSelect : (0, magic_comments_1.makeMagicCommentHandler)(auto_select_defaults_1.doNotAutoSelect));
             const reconstructEnd = Date.now();
             results[key] = {
                 slice: { ...slice, '.meta': { timing: sliceEnd - sliceStart } },

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

@@ -34,7 +34,7 @@ export interface StaticSliceQueryResult extends BaseQueryResult {
 declare function sliceQueryLineParser(output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions): ParsedQueryLine<'static-slice'>;
 export declare const StaticSliceQueryDefinition: {
     readonly executor: typeof executeStaticSliceQuery;
-    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+    readonly asciiSummarizer: (formatter: import("../../../util/text/ansi").OutputFormatter, _analyzer: import("../../../project/flowr-analyzer").ReadonlyFlowrAnalysisProvider<import("../../../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
     readonly fromLine: typeof sliceQueryLineParser;
     readonly schema: Joi.ObjectSchema<any>;
     readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];

package/queries/catalog/static-slice-query/static-slice-query-format.js

@@ -30,6 +30,17 @@ exports.StaticSliceQueryDefinition = {
     executor: static_slice_query_executor_1.executeStaticSliceQuery,
     asciiSummarizer: (formatter, _analyzer, queryResults, result) => {
         const out = queryResults;
+        if (Object.keys(out.results).length === 1) {
+            // just print the single result without fingerprint
+            const [, obj] = Object.entries(out.results)[0];
+            if ('reconstruct' in obj) {
+                const code = Array.isArray(obj.reconstruct.code) ? obj.reconstruct.code : [obj.reconstruct.code];
+                if (code.length === 1) {
+                    result.push(code[0]);
+                    return true;
+                }
+            }
+        }
         result.push(`Query: ${(0, ansi_1.bold)('static-slice', formatter)} (${(0, time_1.printAsMs)(out['.meta'].timing, 0)})`);
         for (const [fingerprint, obj] of Object.entries(out.results)) {
             const { criteria, noMagicComments, noReconstruction } = JSON.parse(fingerprint);
@@ -42,7 +53,8 @@ exports.StaticSliceQueryDefinition = {
             }
             result.push(`   ╰ Slice for {${criteria.join(', ')}} ${addons.join(', ')}`);
             if ('reconstruct' in obj) {
-                result.push('     ╰ Code (newline as <code>&#92;n</code>): <code>' + obj.reconstruct.code.split('\n').join('\\n') + '</code>');
+                const code = Array.isArray(obj.reconstruct.code) ? obj.reconstruct.code : [obj.reconstruct.code];
+                result.push('     ╰ Code (newline as <code>&#92;n</code>): <code>' + code.flatMap(c => c.split('\n')).join('\\n') + '</code>');
             }
             else {
                 result.push(`     ╰ Id List: {${(0, query_print_1.summarizeIdsIfTooLong)(formatter, [...obj.slice.result])}}`);

package/queries/query.d.ts

@@ -51,6 +51,10 @@ export interface SupportedQuery<QueryType extends BaseQueryFormat['type'] = Base
     completer?: (splitLine: readonly string[], startingNewArg: boolean, config: FlowrConfigOptions) => CommandCompletions;
     /** optional query construction from an, e.g., repl line */
     fromLine?: (output: ReplOutput, splitLine: readonly string[], config: FlowrConfigOptions) => ParsedQueryLine<QueryType>;
+    /**
+     * Generates an ASCII summary of the query result to be printed in, e.g., the REPL.
+     * @returns whether a summary was produced (`true` if so, `false` if not, in this case a default/generic summary will be created)
+     */
     asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, resultStrings: string[], query: readonly Query[]) => AsyncOrSync<boolean>;
     jsonFormatter?: (queryResults: BaseQueryResult) => object;
     schema: Joi.ObjectSchema;
@@ -77,109 +81,109 @@ export declare const SupportedQueries: {
     };
     readonly 'control-flow': {
         readonly executor: typeof import("./catalog/control-flow-query/control-flow-query-executor").executeControlFlowQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
+        readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly dataflow: {
         readonly executor: typeof import("./catalog/dataflow-query/dataflow-query-executor").executeDataflowQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'dataflow-lens': {
         readonly executor: typeof import("./catalog/dataflow-lens-query/dataflow-lens-query-executor").executeDataflowLensQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'df-shape': {
         readonly executor: typeof import("./catalog/df-shape-query/df-shape-query-executor").executeDfShapeQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly jsonFormatter: (queryResults: BaseQueryResult) => object;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"df-shape">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"df-shape">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'id-map': {
         readonly executor: typeof import("./catalog/id-map-query/id-map-query-executor").executeIdMapQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'normalized-ast': {
         readonly executor: typeof import("./catalog/normalized-ast-query/normalized-ast-query-executor").executeNormalizedAstQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'dataflow-cluster': {
         readonly executor: typeof import("./catalog/cluster-query/cluster-query-executor").executeDataflowClusterQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
+        readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'static-slice': {
         readonly executor: typeof import("./catalog/static-slice-query/static-slice-query-executor").executeStaticSliceQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"static-slice">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly dependencies: {
         readonly executor: typeof import("./catalog/dependencies-query/dependencies-query-executor").executeDependenciesQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[], queries: readonly Query[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[], queries: readonly Query[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult, query: readonly Query[]) => NodeId[];
     };
     readonly 'location-map': {
         readonly executor: typeof import("./catalog/location-map-query/location-map-query-executor").executeLocationMapQuery;
         readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: unknown, queryResults: BaseQueryResult, result: string[]) => true;
-        readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"location-map">;
+        readonly fromLine: (_output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"location-map">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly search: {
         readonly executor: typeof import("./catalog/search-query/search-query-executor").executeSearch;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'happens-before': {
         readonly executor: typeof import("./catalog/happens-before-query/happens-before-query-executor").executeHappensBefore;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly 'inspect-higher-order': {
         readonly executor: typeof import("./catalog/inspect-higher-order-query/inspect-higher-order-query-executor").executeHigherOrderQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, processed: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
+        readonly asciiSummarizer: (formatter: OutputFormatter, processed: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => Promise<boolean>;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly 'resolve-value': {
         readonly executor: typeof import("./catalog/resolve-value-query/resolve-value-query-executor").executeResolveValueQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"resolve-value">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly project: {
         readonly executor: typeof import("./catalog/project-query/project-query-executor").executeProjectQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: () => never[];
     };
     readonly origin: {
         readonly executor: typeof import("./catalog/origin-query/origin-query-executor").executeResolveValueQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"origin">;
         readonly schema: Joi.ObjectSchema<any>;
         readonly flattenInvolvedNodes: (queryResults: BaseQueryResult) => NodeId[];
     };
     readonly linter: {
         readonly executor: typeof import("./catalog/linter-query/linter-query-executor").executeLinterQuery;
-        readonly asciiSummarizer: (formatter: OutputFormatter, _analyzer: ReadonlyFlowrAnalysisProvider, queryResults: BaseQueryResult, result: string[]) => true;
+        readonly asciiSummarizer: (formatter: OutputFormatter, analyzer: ReadonlyFlowrAnalysisProvider<import("../r-bridge/parser").KnownParser>, queryResults: BaseQueryResult, result: string[]) => true;
         readonly completer: (line: readonly string[], startingNewArg: boolean, _config: FlowrConfigOptions) => CommandCompletions;
         readonly fromLine: (output: ReplOutput, line: readonly string[], _config: FlowrConfigOptions) => ParsedQueryLine<"linter">;
         readonly schema: Joi.ObjectSchema<any>;
@@ -224,4 +228,8 @@ export declare function AnyQuerySchema(): Joi.AlternativesSchema<any>;
  * Produces a Joi schema representing an array of supported queries.
  */
 export declare function QueriesSchema(): Joi.ArraySchema<any[]>;
+/**
+ * Wraps a function that executes a REPL query and, if it fails, checks whether there were any requests to analyze.
+ */
+export declare function genericWrapReplFailIfNoRequest<T>(fn: () => Promise<T>, output: ReplOutput, analyzer: ReadonlyFlowrAnalysisProvider): Promise<T | undefined>;
 export {};

package/queries/query.js

@@ -10,6 +10,7 @@ exports.SupportedQueriesSchema = SupportedQueriesSchema;
 exports.VirtualQuerySchema = VirtualQuerySchema;
 exports.AnyQuerySchema = AnyQuerySchema;
 exports.QueriesSchema = QueriesSchema;
+exports.genericWrapReplFailIfNoRequest = genericWrapReplFailIfNoRequest;
 const call_context_query_format_1 = require("./catalog/call-context-query/call-context-query-format");
 const assert_1 = require("../util/assert");
 const virtual_queries_1 = require("./virtual-query/virtual-queries");
@@ -19,6 +20,7 @@ const normalized_ast_query_format_1 = require("./catalog/normalized-ast-query/no
 const static_slice_query_format_1 = require("./catalog/static-slice-query/static-slice-query-format");
 const cluster_query_format_1 = require("./catalog/cluster-query/cluster-query-format");
 const dependencies_query_format_1 = require("./catalog/dependencies-query/dependencies-query-format");
+const ansi_1 = require("../util/text/ansi");
 const joi_1 = __importDefault(require("joi"));
 const location_map_query_format_1 = require("./catalog/location-map-query/location-map-query-format");
 const config_query_format_1 = require("./catalog/config-query/config-query-format");
@@ -105,7 +107,7 @@ async function executeQueries(data, queries) {
             results.push([type, result]);
         }
         catch (e) {
-            log_1.log.error(e);
+            log_1.log.warn(e);
             results.push([type, undefined]);
         }
     }
@@ -145,4 +147,22 @@ function AnyQuerySchema() {
 function QueriesSchema() {
     return joi_1.default.array().items(AnyQuerySchema()).description('Queries to run on the file analysis information (in the form of an array)');
 }
+/**
+ * Wraps a function that executes a REPL query and, if it fails, checks whether there were any requests to analyze.
+ */
+async function genericWrapReplFailIfNoRequest(fn, output, analyzer) {
+    try {
+        return await fn();
+    }
+    catch (e) {
+        if (analyzer.inspectContext().files.loadingOrder.getUnorderedRequests().length === 0) {
+            output.stderr(output.formatter.format('No requests to analyze were found.', { color: 1 /* Colors.Red */, style: 1 /* FontStyles.Bold */, effect: ansi_1.ColorEffect.Foreground })
+                + '\nIf you consider this an error, please report a bug: '
+                + (0, assert_1.getGuardIssueUrl)('analyzer found no requests to analyze'));
+        }
+        else {
+            throw e;
+        }
+    }
+}
 //# sourceMappingURL=query.js.map

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

@@ -1,9 +1,10 @@
 import type { RNode } from './model';
 import type { NodeId } from './processing/node-id';
 import type { ParentInformation } from './processing/decorate';
+import type { RProject } from './nodes/r-project';
 /**
  * Collects all node ids within a tree given by a respective root node
  * @param nodes - The root id nodes to start collecting from
  * @param stop  - A function that determines whether to stop collecting at a given node, does not stop by default
  */
-export declare function collectAllIds<OtherInfo>(nodes: RNode<OtherInfo & ParentInformation> | (RNode<OtherInfo & ParentInformation> | null | undefined)[] | undefined, stop?: (node: RNode<OtherInfo & ParentInformation>) => boolean): Set<NodeId>;
+export declare function collectAllIds<OtherInfo>(nodes: RProject<OtherInfo & ParentInformation> | RNode<OtherInfo & ParentInformation> | (RNode<OtherInfo & ParentInformation> | null | undefined)[] | undefined, stop?: (node: RNode<OtherInfo & ParentInformation>) => boolean): Set<NodeId>;

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

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectAllIds = collectAllIds;
 const visitor_1 = require("./processing/visitor");
+const type_1 = require("./type");
 /**
  * Collects all node ids within a tree given by a respective root node
  * @param nodes - The root id nodes to start collecting from
  * @param stop  - A function that determines whether to stop collecting at a given node, does not stop by default
  */
 function collectAllIds(nodes, stop = () => false) {
+    if (nodes && 'type' in nodes && nodes.type === type_1.RType.Project) {
+        nodes = nodes.files.map(f => f.root);
+    }
     const ids = new Set();
     (0, visitor_1.visitAst)(nodes, (node) => {
         if (stop(node)) {

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

@@ -0,0 +1,29 @@
+import type { NoInfo } from '../model';
+import { RType } from '../type';
+import type { RExpressionList } from './r-expression-list';
+import type { NodeId } from '../processing/node-id';
+/**
+ * Holds a single R file starting with an expression list.
+ */
+export interface RProjectFile<Info = NoInfo> {
+    readonly filePath?: string;
+    readonly root: RExpressionList<Info>;
+}
+/**
+ * Holds a collection of files (started with the expression list)
+ * @see {@link RExpressionList} - for the root of each file
+ * @see {@link mergeProjects} - to merge multiple projects into a single one
+ * @see {@link RProjectFile} - for each file in the project
+ */
+export interface RProject<Info = NoInfo> {
+    readonly type: RType.Project;
+    readonly files: RProjectFile<Info>[];
+    readonly info?: {
+        id: NodeId;
+    };
+}
+/**
+ * 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>;

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeProjects = mergeProjects;
+const type_1 = require("../type");
+/**
+ * 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)
+    };
+}
+//# sourceMappingURL=r-project.js.map

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

@@ -14,12 +14,13 @@ import type { MergeableRecord } from '../../../../../util/objects';
 import { RoleInParent } from './role';
 import type { NodeId } from './node-id';
 import type { RDelimiter } from '../nodes/info/r-delimiter';
+import type { RProject } from '../nodes/r-project';
 /**
  * A function that given an RNode returns a (guaranteed) unique id for it
  * @param data - the node to generate an id for
  * @returns a unique id for the given node
  */
-export type IdGenerator<OtherInfo> = (data: RNode<OtherInfo>) => NodeId;
+export type IdGenerator<OtherInfo> = (data: RProject<OtherInfo> | RNode<OtherInfo>) => NodeId;
 /**
  * The simplest id generator which just increments a number on each call.
  */
@@ -71,7 +72,7 @@ export type AstIdMap<OtherInfo = NoInfo> = BiMap<NodeId, RNodeWithParent<OtherIn
  * Contains the normalized AST as a doubly linked tree
  * and a map from ids to nodes so that parent links can be chased easily.
  */
-export interface NormalizedAst<OtherInfo = ParentInformation, Node = RNode<OtherInfo & ParentInformation>> {
+export interface NormalizedAst<OtherInfo = ParentInformation, Node = RProject<OtherInfo & ParentInformation>> {
     /** Bidirectional mapping of ids to the corresponding nodes and the other way */
     idMap: AstIdMap<OtherInfo>;
     /** The root of the AST with parent information */
@@ -82,15 +83,12 @@ export interface NormalizedAst<OtherInfo = ParentInformation, Node = RNode<Other
 export interface NormalizedAstDecorationConfiguration<OtherInfo> {
     /** The id generator: must generate a unique id für each passed node */
     getId?: IdGenerator<OtherInfo>;
-    /** the path to the file this AST was extracted from will be added to the nodes */
-    file?: string;
 }
 /**
  * Covert the given AST into a doubly linked tree while assigning ids (so it stays serializable).
- * @param ast   - The root of the AST to convert
+ * @param project - The AST to decorate
  * @param getId - The id generator: must generate a unique id für each passed node
- * @param file  - the path to the file this AST was extracted from will be added to the nodes
  * @typeParam OtherInfo - The original decoration of the ast nodes (probably is nothing as the id decoration is most likely the first step to be performed after extraction)
  * @returns A decorated AST based on the input and the id provider.
  */
-export declare function decorateAst<OtherInfo = NoInfo>(ast: RNode<OtherInfo>, { getId, file }: NormalizedAstDecorationConfiguration<OtherInfo>): NormalizedAst<OtherInfo & ParentInformation>;
+export declare function decorateAst<OtherInfo = NoInfo>(project: RProject<OtherInfo>, { getId }: NormalizedAstDecorationConfiguration<OtherInfo>): NormalizedAst<OtherInfo & ParentInformation>;

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

@@ -58,7 +58,7 @@ function nodeToLocationId(data) {
  */
 function deterministicLocationIdGenerator(start = 0) {
     let id = start;
-    return (data) => data.location !== undefined ? nodeToLocationId(data) : `${id++}`;
+    return (data) => 'location' in data && data.location !== undefined ? nodeToLocationId(data) : `${id++}`;
 }
 const defaultParentContext = {
     role: "root" /* RoleInParent.Root */,
@@ -69,21 +69,19 @@ const nestForElement = new Set([
 ]);
 /**
  * Covert the given AST into a doubly linked tree while assigning ids (so it stays serializable).
- * @param ast   - The root of the AST to convert
+ * @param project - The AST to decorate
  * @param getId - The id generator: must generate a unique id für each passed node
- * @param file  - the path to the file this AST was extracted from will be added to the nodes
  * @typeParam OtherInfo - The original decoration of the ast nodes (probably is nothing as the id decoration is most likely the first step to be performed after extraction)
  * @returns A decorated AST based on the input and the id provider.
  */
-function decorateAst(ast, { getId = deterministicCountingIdGenerator(0), file }) {
+function decorateAst(project, { getId = deterministicCountingIdGenerator(0) }) {
     const idMap = new bimap_1.BiMap();
-    const info = { idMap, getId, file };
+    const info = { idMap, getId, file: undefined };
     /* Please note, that all fold processors do not re-create copies in higher-folding steps so that the idMap stays intact. */
     const foldLeaf = createFoldForLeaf(info);
     const foldBinaryOp = createFoldForBinaryOp(info);
     const unaryOp = createFoldForUnaryOp(info);
-    /* we pass down the nesting depth */
-    const decoratedAst = (0, stateful_fold_1.foldAstStateful)(ast, 0, {
+    const folds = {
         down: (n, nesting) => {
             if (nestForElement.has(n.type)) {
                 return nesting + 1;
@@ -119,11 +117,26 @@ function decorateAst(ast, { getId = deterministicCountingIdGenerator(0), file })
             foldArgument: createFoldForFunctionArgument(info),
             foldParameter: createFoldForFunctionParameter(info)
         }
-    });
-    decoratedAst.info.role = "root" /* RoleInParent.Root */;
-    decoratedAst.info.index = 0;
+    };
+    // we return the project by mapping over the files
+    const decoratedProject = {
+        ...project,
+        files: project.files.map(file => {
+            info.file = file.filePath;
+            const decoratedAst = (0, stateful_fold_1.foldAstStateful)(file.root, 0, folds);
+            decoratedAst.info.role = "root" /* RoleInParent.Root */;
+            decoratedAst.info.index = 0;
+            return {
+                root: decoratedAst,
+                filePath: file.filePath
+            };
+        }),
+        info: {
+            id: getId(project)
+        }
+    };
     return {
-        ast: decoratedAst,
+        ast: decoratedProject,
         idMap
     };
 }

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

@@ -197,6 +197,8 @@ export declare enum RType {
     String = "RString",
     /** {@link RSymbol} */
     Symbol = "RSymbol",
+    /** {@link RProject} */
+    Project = "RProject",
     /**
      * {@link RDelimiter}.
      * Is not part of the normalized AST but can be found in

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

@@ -204,6 +204,8 @@ var RType;
     /** {@link RSymbol} */
     RType["Symbol"] = "RSymbol";
     /* ------ special types ------ */
+    /** {@link RProject} */
+    RType["Project"] = "RProject";
     /**
      * {@link RDelimiter}.
      * Is not part of the normalized AST but can be found in

package/r-bridge/lang-4.x/ast/parser/json/format.js

@@ -61,7 +61,7 @@ function convertPreparedParsedData(roots) {
         };
     }
     // Locate start, end of a source file (order children in advance).
-    const rootEntries = [...roots].sort(orderOf);
+    const rootEntries = roots.slice().sort(orderOf);
     const start = rootEntries[0];
     const end = rootEntries[rootEntries.length - 1];
     // Construct CsvEntry for the root, handling empty input.

package/r-bridge/lang-4.x/ast/parser/json/parser.d.ts

@@ -1,21 +1,22 @@
 import { type IdGenerator, type NormalizedAst } from '../../model/processing/decorate';
-import type { NoInfo, RNode } from '../../model/model';
-import type { ParseStepOutput } from '../../../../parser';
+import type { NoInfo } from '../../model/model';
+import type { ParseStepOutput, ParseStepOutputSingleFile } from '../../../../parser';
 import { type FlowrConfigOptions } from '../../../../../config';
 import type { Tree } from 'web-tree-sitter';
+import type { RProject } from '../../model/nodes/r-project';
 export declare const parseLog: import("tslog").Logger<import("tslog").ILogObj>;
 /**
  * Take the output as produced by the parse step and normalize the AST from the R parser.
- * @see {@link normalizeButNotDecorated} for a version that does not decorate the AST
- * @see {@link normalizeTreeSitter} for a version that normalizes the AST from the TreeSitter parser
+ * @see {@link normalizeButNotDecorated} - for a version that does not decorate the AST
+ * @see {@link normalizeTreeSitter}      - for a version that normalizes the AST from the TreeSitter parser
  */
-export declare function normalize(parsed: ParseStepOutput<string>, getId?: IdGenerator<NoInfo>, file?: string): NormalizedAst;
+export declare function normalize(parsed: ParseStepOutput<string>, getId?: IdGenerator<NoInfo>): NormalizedAst;
 /**
  * Take the output as produced by the parse step and normalize the AST from the R parser.
- * For additional decoration with ${@link decorateAst} use {@link normalize}.
+ * For additional decoration with {@link decorateAst} use {@link normalize}.
  */
-export declare function normalizeButNotDecorated({ parsed }: ParseStepOutput<string>): RNode;
+export declare function normalizeButNotDecorated({ parsed, filePath }: ParseStepOutputSingleFile<string>): RProject;
 /**
  * Tree-Sitter pendant to {@link normalize}.
  */
-export declare function normalizeTreeSitter({ parsed }: ParseStepOutput<Tree>, getId: IdGenerator<NoInfo> | undefined, config: FlowrConfigOptions, file?: string): NormalizedAst;
+export declare function normalizeTreeSitter(parsed: ParseStepOutput<Tree>, getId: IdGenerator<NoInfo> | undefined, config: FlowrConfigOptions): NormalizedAst;

package/r-bridge/lang-4.x/ast/parser/json/parser.js

@@ -10,31 +10,32 @@ const decorate_1 = require("../../model/processing/decorate");
 const normalize_root_1 = require("../main/internal/structure/normalize-root");
 const tree_sitter_normalize_1 = require("../../../tree-sitter/tree-sitter-normalize");
 const config_1 = require("../../../../../config");
+const r_project_1 = require("../../model/nodes/r-project");
 exports.parseLog = log_1.log.getSubLogger({ name: 'ast-parser' });
 /**
  * Take the output as produced by the parse step and normalize the AST from the R parser.
- * @see {@link normalizeButNotDecorated} for a version that does not decorate the AST
- * @see {@link normalizeTreeSitter} for a version that normalizes the AST from the TreeSitter parser
+ * @see {@link normalizeButNotDecorated} - for a version that does not decorate the AST
+ * @see {@link normalizeTreeSitter}      - for a version that normalizes the AST from the TreeSitter parser
  */
-function normalize(parsed, getId = (0, decorate_1.deterministicCountingIdGenerator)(0), file) {
-    return (0, decorate_1.decorateAst)(normalizeButNotDecorated(parsed), { getId, file });
+function normalize(parsed, getId = (0, decorate_1.deterministicCountingIdGenerator)(0)) {
+    return (0, decorate_1.decorateAst)((0, r_project_1.mergeProjects)(parsed.files.map(normalizeButNotDecorated)), { getId });
 }
 /**
  * Take the output as produced by the parse step and normalize the AST from the R parser.
- * For additional decoration with ${@link decorateAst} use {@link normalize}.
+ * For additional decoration with {@link decorateAst} use {@link normalize}.
  */
-function normalizeButNotDecorated({ parsed }) {
+function normalizeButNotDecorated({ parsed, filePath }) {
     const data = { currentRange: undefined, currentLexeme: undefined };
     const object = (0, format_1.convertPreparedParsedData)((0, format_1.prepareParsedData)(parsed));
-    return (0, normalize_root_1.normalizeRootObjToAst)(data, object);
+    return (0, normalize_root_1.normalizeRootObjToAst)(data, object, filePath);
 }
 /**
  * Tree-Sitter pendant to {@link normalize}.
  */
-function normalizeTreeSitter({ parsed }, getId = (0, decorate_1.deterministicCountingIdGenerator)(0), config, file) {
+function normalizeTreeSitter(parsed, getId = (0, decorate_1.deterministicCountingIdGenerator)(0), config) {
     const lax = (0, config_1.getEngineConfig)(config, 'tree-sitter')?.lax;
-    const result = (0, decorate_1.decorateAst)((0, tree_sitter_normalize_1.normalizeTreeSitterTreeToAst)(parsed, lax), { getId, file });
-    result.hasError = parsed.rootNode.hasError;
+    const result = (0, decorate_1.decorateAst)((0, tree_sitter_normalize_1.normalizeTreeSitterTreeToAst)(parsed.files, lax), { getId });
+    result.hasError = parsed.files.some(p => p.parsed.rootNode.hasError);
     return result;
 }
 //# sourceMappingURL=parser.js.map

package/r-bridge/lang-4.x/ast/parser/main/internal/structure/normalize-root.d.ts

@@ -1,7 +1,8 @@
 import type { NormalizerData } from '../../normalizer-data';
-import type { RExpressionList } from '../../../../model/nodes/r-expression-list';
 import type { JsonEntry } from '../../../json/format';
+import type { RProject } from '../../../../model/nodes/r-project';
 /**
- * Takes the parse dta as object and produces an undecorated, normalized AST.
+ * Takes the parse data as object and produces an undecorated, normalized AST.
+ * @see {@link normalize} - for a version that also decorates the AST
  */
-export declare function normalizeRootObjToAst(data: NormalizerData, obj: JsonEntry): RExpressionList;
+export declare function normalizeRootObjToAst(data: NormalizerData, obj: JsonEntry, filePath?: string): RProject;

package/r-bridge/lang-4.x/ast/parser/main/internal/structure/normalize-root.js

@@ -7,9 +7,10 @@ const log_1 = require("../../../../../../../util/log");
 const arrays_1 = require("../../../../../../../util/collections/arrays");
 const type_1 = require("../../../../model/type");
 /**
- * Takes the parse dta as object and produces an undecorated, normalized AST.
+ * Takes the parse data as object and produces an undecorated, normalized AST.
+ * @see {@link normalize} - for a version that also decorates the AST
  */
-function normalizeRootObjToAst(data, obj) {
+function normalizeRootObjToAst(data, obj, filePath) {
     const exprContent = obj.token;
     (0, normalize_meta_1.assureTokenType)(exprContent, type_1.RawRType.ExpressionList);
     let parsedChildren = [];
@@ -22,15 +23,23 @@ function normalizeRootObjToAst(data, obj) {
     }
     const [delimiters, nodes] = (0, arrays_1.partition)(parsedChildren, x => x.type === type_1.RType.Delimiter || x.type === type_1.RType.Comment);
     return {
-        type: type_1.RType.ExpressionList,
-        children: nodes,
-        grouping: undefined,
-        lexeme: undefined,
-        info: {
-            fullRange: data.currentRange,
-            additionalTokens: delimiters,
-            fullLexeme: data.currentLexeme
-        }
+        type: type_1.RType.Project,
+        files: [
+            {
+                filePath,
+                root: {
+                    type: type_1.RType.ExpressionList,
+                    children: nodes,
+                    grouping: undefined,
+                    lexeme: undefined,
+                    info: {
+                        fullRange: data.currentRange,
+                        additionalTokens: delimiters,
+                        fullLexeme: data.currentLexeme
+                    }
+                }
+            }
+        ]
     };
 }
 //# sourceMappingURL=normalize-root.js.map