@eagleoutice/flowr 2.6.1 → 2.6.3

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

@@ -2,7 +2,6 @@
  * Token types as they are produced by the R parser.
  * Not all of them are directly handled by the normalize step.
  * Some of them are also listed as part of the {@link OperatorDatabase}.
- *
  * @see RType
  */
 export declare enum RawRType {
@@ -132,7 +131,8 @@ export declare enum RawRType {
     BraceRight = "}",
     /** T63 */
     Expression = "expr",
-    /** T64
+    /**
+     * T64
      *
      * https://github.com/REditorSupport/languageserver/issues/327
      * https://github.com/REditorSupport/languageserver/pull/328
@@ -152,7 +152,6 @@ export declare enum RawRType {
  * See {@link RNode} for a union type of all normalized AST nodes in-use.
  * For each enum member, the respective normalized AST node should be referenced
  * in the corresponding comment.
- *
  * @see RawRType
  */
 export declare enum RType {
@@ -198,7 +197,10 @@ export declare enum RType {
     String = "RString",
     /** {@link RSymbol} */
     Symbol = "RSymbol",
-    /** {@link RDelimiter}.
+    /** {@link RProject} */
+    Project = "RProject",
+    /**
+     * {@link RDelimiter}.
      * Is not part of the normalized AST but can be found in
      * {@link Source#additionalTokens}.
      */
@@ -210,7 +212,6 @@ export declare const ValidRTypesReverse: {
 };
 /**
  * Validates, whether the given type can be used as a symbol in R
- *
  * @see RawRType
  */
 export declare function isSymbol(type: string): boolean;

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

@@ -6,7 +6,6 @@ exports.isSymbol = isSymbol;
  * Token types as they are produced by the R parser.
  * Not all of them are directly handled by the normalize step.
  * Some of them are also listed as part of the {@link OperatorDatabase}.
- *
  * @see RType
  */
 var RawRType;
@@ -137,7 +136,8 @@ var RawRType;
     RawRType["BraceRight"] = "}";
     /** T63 */
     RawRType["Expression"] = "expr";
-    /** T64
+    /**
+     * T64
      *
      * https://github.com/REditorSupport/languageserver/issues/327
      * https://github.com/REditorSupport/languageserver/pull/328
@@ -157,7 +157,6 @@ var RawRType;
  * See {@link RNode} for a union type of all normalized AST nodes in-use.
  * For each enum member, the respective normalized AST node should be referenced
  * in the corresponding comment.
- *
  * @see RawRType
  */
 var RType;
@@ -205,7 +204,10 @@ var RType;
     /** {@link RSymbol} */
     RType["Symbol"] = "RSymbol";
     /* ------ special types ------ */
-    /** {@link RDelimiter}.
+    /** {@link RProject} */
+    RType["Project"] = "RProject";
+    /**
+     * {@link RDelimiter}.
      * Is not part of the normalized AST but can be found in
      * {@link Source#additionalTokens}.
      */
@@ -227,7 +229,6 @@ const validSymbolTypes = new Set([
 ]);
 /**
  * Validates, whether the given type can be used as a symbol in R
- *
  * @see RawRType
  */
 function isSymbol(type) {

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

@@ -1,6 +1,5 @@
 /**
  * Link certain concepts to the version they have been introduced in R
- *
  * @module
  */
 export declare const MIN_VERSION_PIPE = "4.1.0";

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

@@ -1,7 +1,6 @@
 "use strict";
 /**
  * Link certain concepts to the version they have been introduced in R
- *
  * @module
  */
 Object.defineProperty(exports, "__esModule", { value: true });

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,22 +1,22 @@
-import type { IdGenerator, NormalizedAst } from '../../model/processing/decorate';
-import type { NoInfo, RNode } from '../../model/model';
-import type { ParseStepOutputTS } from '../../../../../core/steps/all/core/01-parse-tree-sitter';
-import type { ParseStepOutput } from '../../../../parser';
-import type { FlowrConfigOptions } from '../../../../../config';
+import { type IdGenerator, type NormalizedAst } from '../../model/processing/decorate';
+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 }: ParseStepOutputTS, 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,32 +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/control/normalize-if-then.d.ts

@@ -1,4 +1,4 @@
-import type { NormalizerData } from '../../normalizer-data';
+import { type NormalizerData } from '../../normalizer-data';
 import type { RIfThenElse } from '../../../../model/nodes/r-if-then-else';
 import type { NamedJsonEntry } from '../../../json/format';
 /**

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

@@ -3,7 +3,6 @@ import type { RNode } from '../../../../model/model';
 import type { JsonEntry } from '../../../json/format';
 /**
  * Returns an expression list if there are multiple children, otherwise returns the single child directly with no expr wrapper
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param entry  - The JSON object to extract the meta-information from
  */

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

@@ -11,7 +11,6 @@ const type_1 = require("../../../../model/type");
 const normalize_comment_1 = require("../other/normalize-comment");
 /**
  * Returns an expression list if there are multiple children, otherwise returns the single child directly with no expr wrapper
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param entry  - The JSON object to extract the meta-information from
  */

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

@@ -4,10 +4,8 @@ import type { NamedJsonEntry } from '../../../json/format';
 /**
  * Either parses `[expr]` or `[SYMBOL_SUB, EQ_SUB, expr]` as an argument of a function call in R.
  * Probably directly called by the function call parser as otherwise, we do not expect to find arguments.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param objs - Either `[expr]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]`
- *
  * @returns The parsed argument or `undefined` if the given object is not an argument.
  */
 export declare function tryToNormalizeArgument(data: NormalizerData, objs: readonly NamedJsonEntry[]): RArgument | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/functions/normalize-argument.js

@@ -10,10 +10,8 @@ const strings_1 = require("../../../../../../../util/text/strings");
 /**
  * Either parses `[expr]` or `[SYMBOL_SUB, EQ_SUB, expr]` as an argument of a function call in R.
  * Probably directly called by the function call parser as otherwise, we do not expect to find arguments.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param objs - Either `[expr]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]`
- *
  * @returns The parsed argument or `undefined` if the given object is not an argument.
  */
 function tryToNormalizeArgument(data, objs) {

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

@@ -1,14 +1,12 @@
 import type { NormalizerData } from '../../normalizer-data';
-import type { RFunctionCall } from '../../../../model/nodes/r-function-call';
+import { type RFunctionCall } from '../../../../model/nodes/r-function-call';
 import type { RNext } from '../../../../model/nodes/r-next';
 import type { RBreak } from '../../../../model/nodes/r-break';
 import type { NamedJsonEntry } from '../../../json/format';
 /**
  * Tries to parse the given data as a function call.
- *
  * @param data           - The data used by the parser (see {@link NormalizerData})
  * @param mappedWithName - The JSON object to extract the meta-information from
- *
  * @returns The parsed {@link RFunctionCall} (either named or unnamed) or `undefined` if the given construct is not a function call
  * May return a {@link RNext} or {@link RBreak} as `next()` and `break()` work as such.
  */

package/r-bridge/lang-4.x/ast/parser/main/internal/functions/normalize-call.js

@@ -13,10 +13,8 @@ const normalize_string_1 = require("../values/normalize-string");
 const normalize_symbol_1 = require("../values/normalize-symbol");
 /**
  * Tries to parse the given data as a function call.
- *
  * @param data           - The data used by the parser (see {@link NormalizerData})
  * @param mappedWithName - The JSON object to extract the meta-information from
- *
  * @returns The parsed {@link RFunctionCall} (either named or unnamed) or `undefined` if the given construct is not a function call
  * May return a {@link RNext} or {@link RBreak} as `next()` and `break()` work as such.
  */

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

@@ -3,10 +3,8 @@ import type { RFunctionDefinition } from '../../../../model/nodes/r-function-def
 import type { NamedJsonEntry } from '../../../json/format';
 /**
  * Tries to parse the given data as a function definition.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param mappedWithName - The JSON object to extract the meta-information from
- *
  * @returns The parsed {@link RFunctionDefinition} or `undefined` if the given construct is not a function definition
  */
 export declare function tryNormalizeFunctionDefinition(data: NormalizerData, mappedWithName: readonly NamedJsonEntry[]): RFunctionDefinition | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/functions/normalize-definition.js

@@ -10,10 +10,8 @@ const type_1 = require("../../../../model/type");
 const normalize_expressions_1 = require("../structure/normalize-expressions");
 /**
  * Tries to parse the given data as a function definition.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param mappedWithName - The JSON object to extract the meta-information from
- *
  * @returns The parsed {@link RFunctionDefinition} or `undefined` if the given construct is not a function definition
  */
 function tryNormalizeFunctionDefinition(data, mappedWithName) {

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

@@ -4,10 +4,8 @@ import type { NamedJsonEntry } from '../../../json/format';
 /**
  * Either parses `[SYMBOL_FORMALS]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]` as a parameter of a function definition in R.
  * Probably directly called by the function definition parser as otherwise, we do not expect to find parameters.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param objs - Either `[SYMBOL_FORMALS]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]`
- *
  * @returns The parsed parameter or `undefined` if the given object is not a parameter.
  */
 export declare function tryNormalizeParameter(data: NormalizerData, objs: readonly NamedJsonEntry[]): RParameter | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/functions/normalize-parameter.js

@@ -9,10 +9,8 @@ const normalize_single_node_1 = require("../structure/normalize-single-node");
 /**
  * Either parses `[SYMBOL_FORMALS]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]` as a parameter of a function definition in R.
  * Probably directly called by the function definition parser as otherwise, we do not expect to find parameters.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param objs - Either `[SYMBOL_FORMALS]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]`
- *
  * @returns The parsed parameter or `undefined` if the given object is not a parameter.
  */
 function tryNormalizeParameter(data, objs) {

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

@@ -1,4 +1,7 @@
 import type { NormalizerData } from '../../normalizer-data';
 import type { RBreak } from '../../../../model/nodes/r-break';
 import type { JsonEntry } from '../../../json/format';
+/**
+ *
+ */
 export declare function normalizeBreak(data: NormalizerData, obj: JsonEntry): RBreak;

package/r-bridge/lang-4.x/ast/parser/main/internal/loops/normalize-break.js

@@ -5,6 +5,9 @@ const parser_1 = require("../../../json/parser");
 const log_1 = require("../../../../../../../util/log");
 const normalize_meta_1 = require("../../normalize-meta");
 const type_1 = require("../../../../model/type");
+/**
+ *
+ */
 function normalizeBreak(data, obj) {
     (0, log_1.expensiveTrace)(parser_1.parseLog, () => `[break] ${JSON.stringify(obj)}`);
     const { location, content } = (0, normalize_meta_1.retrieveMetaStructure)(obj);

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

@@ -1,4 +1,7 @@
-import type { NormalizerData } from '../../normalizer-data';
+import { type NormalizerData } from '../../normalizer-data';
 import type { RForLoop } from '../../../../model/nodes/r-for-loop';
 import type { NamedJsonEntry } from '../../../json/format';
+/**
+ *
+ */
 export declare function tryNormalizeFor(data: NormalizerData, [forToken, head, body]: [NamedJsonEntry, NamedJsonEntry, NamedJsonEntry]): RForLoop | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/loops/normalize-for.js

@@ -10,6 +10,9 @@ const normalize_single_node_1 = require("../structure/normalize-single-node");
 const normalize_expressions_1 = require("../structure/normalize-expressions");
 const normalize_symbol_1 = require("../values/normalize-symbol");
 const normalize_comment_1 = require("../other/normalize-comment");
+/**
+ *
+ */
 function tryNormalizeFor(data, [forToken, head, body]) {
     // funny, for does not use top-level parenthesis
     if (forToken.name !== type_1.RawRType.For) {

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

@@ -1,4 +1,7 @@
 import type { NormalizerData } from '../../normalizer-data';
 import type { RNext } from '../../../../model/nodes/r-next';
 import type { JsonEntry } from '../../../json/format';
+/**
+ *
+ */
 export declare function normalizeNext(data: NormalizerData, obj: JsonEntry): RNext;

package/r-bridge/lang-4.x/ast/parser/main/internal/loops/normalize-next.js

@@ -5,6 +5,9 @@ const log_1 = require("../../../../../../../util/log");
 const parser_1 = require("../../../json/parser");
 const normalize_meta_1 = require("../../normalize-meta");
 const type_1 = require("../../../../model/type");
+/**
+ *
+ */
 function normalizeNext(data, obj) {
     (0, log_1.expensiveTrace)(parser_1.parseLog, () => `[next] ${JSON.stringify(obj)}`);
     const { location, content } = (0, normalize_meta_1.retrieveMetaStructure)(obj);

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

@@ -3,11 +3,9 @@ import type { RRepeatLoop } from '../../../../model/nodes/r-repeat-loop';
 import type { NamedJsonEntry } from '../../../json/format';
 /**
  * Try to parse the construct as a {@link RRepeatLoop}.
- *
  * @param data        - The data used by the parser (see {@link NormalizerData})
  * @param repeatToken - Token which represents the `repeat` keyword
  * @param bodyToken   - The `body` of the repeat-loop
- *
  * @returns The parsed {@link RRepeatLoop} or `undefined` if the given construct is not a repeat-loop
  */
 export declare function tryNormalizeRepeat(data: NormalizerData, [repeatToken, bodyToken]: [NamedJsonEntry, NamedJsonEntry]): RRepeatLoop | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/loops/normalize-repeat.js

@@ -8,11 +8,9 @@ const type_1 = require("../../../../model/type");
 const normalize_single_node_1 = require("../structure/normalize-single-node");
 /**
  * Try to parse the construct as a {@link RRepeatLoop}.
- *
  * @param data        - The data used by the parser (see {@link NormalizerData})
  * @param repeatToken - Token which represents the `repeat` keyword
  * @param bodyToken   - The `body` of the repeat-loop
- *
  * @returns The parsed {@link RRepeatLoop} or `undefined` if the given construct is not a repeat-loop
  */
 function tryNormalizeRepeat(data, [repeatToken, bodyToken]) {

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

@@ -1,4 +1,7 @@
-import type { NormalizerData } from '../../normalizer-data';
+import { type NormalizerData } from '../../normalizer-data';
 import type { RWhileLoop } from '../../../../model/nodes/r-while-loop';
 import type { NamedJsonEntry } from '../../../json/format';
+/**
+ * Tries to normalize a while-loop structure from the given tokens.
+ */
 export declare function tryNormalizeWhile(data: NormalizerData, [whileToken, leftParen, condition, rightParen, body]: [NamedJsonEntry, NamedJsonEntry, NamedJsonEntry, NamedJsonEntry, NamedJsonEntry]): RWhileLoop | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/loops/normalize-while.js

@@ -6,6 +6,9 @@ const parser_1 = require("../../../json/parser");
 const normalize_meta_1 = require("../../normalize-meta");
 const type_1 = require("../../../../model/type");
 const normalize_single_node_1 = require("../structure/normalize-single-node");
+/**
+ * Tries to normalize a while-loop structure from the given tokens.
+ */
 function tryNormalizeWhile(data, [whileToken, leftParen, condition, rightParen, body]) {
     if (whileToken.name !== type_1.RawRType.While) {
         parser_1.parseLog.debug('encountered non-while token for supposed while-loop structure');

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

@@ -3,10 +3,8 @@ import type { RAccess } from '../../../model/nodes/r-access';
 import type { NamedJsonEntry } from '../../json/format';
 /**
  * Tries to normalize the given data as access (e.g., indexing).
- *
  * @param data           - The data used by the parser (see {@link NormalizerData})
  * @param mappedWithName - The JSON object to extract the meta-information from
- *
  * @returns The parsed {@link RAccess} or `undefined` if the given construct is not accessing a value
  */
 export declare function tryNormalizeAccess(data: NormalizerData, mappedWithName: NamedJsonEntry[]): RAccess | undefined;

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

@@ -38,10 +38,8 @@ function normalizeAbstractArgument(x, data, operator) {
 }
 /**
  * Tries to normalize the given data as access (e.g., indexing).
- *
  * @param data           - The data used by the parser (see {@link NormalizerData})
  * @param mappedWithName - The JSON object to extract the meta-information from
- *
  * @returns The parsed {@link RAccess} or `undefined` if the given construct is not accessing a value
  */
 function tryNormalizeAccess(data, mappedWithName) {

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

@@ -1,4 +1,4 @@
-import type { NormalizerData } from '../../normalizer-data';
+import { type NormalizerData } from '../../normalizer-data';
 import type { RNode } from '../../../../model/model';
 import type { NamedJsonEntry } from '../../../json/format';
 /**

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

@@ -3,11 +3,9 @@ import type { RNode } from '../../../../model/model';
 import type { NamedJsonEntry } from '../../../json/format';
 /**
  * Parses the construct as a {@link RUnaryOp}.
- *
  * @param data     - The data used by the parser (see {@link NormalizerData})
  * @param operator - The operator token
  * @param operand  - The operand of the unary operator
- *
  * @returns The parsed {@link RUnaryOp} or `undefined` if the given construct is not a unary operator
  */
 export declare function tryNormalizeUnary(data: NormalizerData, [operator, operand]: [NamedJsonEntry, NamedJsonEntry]): RNode | undefined;

package/r-bridge/lang-4.x/ast/parser/main/internal/operators/normalize-unary.js

@@ -10,11 +10,9 @@ const normalize_single_node_1 = require("../structure/normalize-single-node");
 const type_1 = require("../../../../model/type");
 /**
  * Parses the construct as a {@link RUnaryOp}.
- *
  * @param data     - The data used by the parser (see {@link NormalizerData})
  * @param operator - The operator token
  * @param operand  - The operand of the unary operator
- *
  * @returns The parsed {@link RUnaryOp} or `undefined` if the given construct is not a unary operator
  */
 function tryNormalizeUnary(data, [operator, operand]) {

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

@@ -4,7 +4,6 @@ import type { JsonEntry } from '../../../json/format';
 /**
  * Normalize the given object as an R comment.
  * This requires you to check the corresponding name beforehand.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param obj  - The JSON object to extract the meta-information from
  */

package/r-bridge/lang-4.x/ast/parser/main/internal/other/normalize-comment.js

@@ -7,7 +7,6 @@ const type_1 = require("../../../../model/type");
 /**
  * Normalize the given object as an R comment.
  * This requires you to check the corresponding name beforehand.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param obj  - The JSON object to extract the meta-information from
  */

package/r-bridge/lang-4.x/ast/parser/main/internal/other/normalize-line-directive.d.ts

@@ -6,7 +6,6 @@ import type { JsonEntry } from '../../../json/format';
  * Normalize the given object as an R line directive (`#line <number> "<file>"`).
  * This requires you to check the corresponding name beforehand.
  * If the given object turns out to be no line directive, this returns a normal comment instead.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param obj  - The JSON object to extract the meta-information from
  */

package/r-bridge/lang-4.x/ast/parser/main/internal/other/normalize-line-directive.js

@@ -10,7 +10,6 @@ const LineDirectiveRegex = /^#line\s+(\d+)\s+"([^"]+)"\s*$/;
  * Normalize the given object as an R line directive (`#line <number> "<file>"`).
  * This requires you to check the corresponding name beforehand.
  * If the given object turns out to be no line directive, this returns a normal comment instead.
- *
  * @param data - The data used by the parser (see {@link NormalizerData})
  * @param obj  - The JSON object to extract the meta-information from
  */

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

@@ -1,3 +1,6 @@
 import type { RDelimiter } from '../../../../model/nodes/info/r-delimiter';
 import type { NamedJsonEntry } from '../../../json/format';
+/**
+ * Normalizes a delimiter node like `,`.
+ */
 export declare function normalizeDelimiter(elem: NamedJsonEntry): RDelimiter;

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

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeDelimiter = normalizeDelimiter;
 const normalize_meta_1 = require("../../normalize-meta");
 const type_1 = require("../../../../model/type");
+/**
+ * Normalizes a delimiter node like `,`.
+ */
 function normalizeDelimiter(elem) {
     const { location, content } = (0, normalize_meta_1.retrieveMetaStructure)(elem.content);
     return {

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

@@ -2,9 +2,18 @@ import type { NormalizerData } from '../../normalizer-data';
 import type { RDelimiter } from '../../../../model/nodes/info/r-delimiter';
 import type { RNode } from '../../../../model/model';
 import type { JsonEntry, NamedJsonEntry } from '../../../json/format';
+/**
+ * Split a token collection into comments tokens and "other" tokens
+ */
 export declare function splitComments(tokens: readonly NamedJsonEntry[]): {
     comments: NamedJsonEntry[];
     others: NamedJsonEntry[];
 };
+/**
+ * Normalizes a list of expressions, handling semicolons and braces
+ */
 export declare function normalizeExpressions(data: NormalizerData, tokens: readonly JsonEntry[] | readonly NamedJsonEntry[]): (RNode | RDelimiter)[];
+/**
+ * Parses nodes when their type is unknown
+ */
 export declare function parseNodesWithUnknownType(data: NormalizerData, mappedWithName: readonly NamedJsonEntry[] | undefined): (RNode | RDelimiter)[];

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

@@ -45,6 +45,9 @@ function normalizeMappedWithoutSemicolonBasedOnType(mappedWithName, data) {
     // otherwise perform default parsing
     return result !== undefined ? [result] : parseNodesWithUnknownType(data, mappedWithName);
 }
+/**
+ * Split a token collection into comments tokens and "other" tokens
+ */
 function splitComments(tokens) {
     const comments = [];
     const others = [];
@@ -132,6 +135,9 @@ function processBraces([start, end], processed, comments, data) {
         }
     };
 }
+/**
+ * Normalizes a list of expressions, handling semicolons and braces
+ */
 function normalizeExpressions(data, tokens) {
     if (tokens.length === 0) {
         parser_1.parseLog.warn('no children received, skipping');
@@ -170,6 +176,9 @@ function normalizeExpressions(data, tokens) {
     }
     return [...parsedComments, ...normalizeMappedWithoutSemicolonBasedOnType(mappedWithName, data)];
 }
+/**
+ * Parses nodes when their type is unknown
+ */
 function parseNodesWithUnknownType(data, mappedWithName) {
     const parsedNodes = [];
     // used to indicate the new root node of this set of nodes

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;