@eagleoutice/flowr 2.0.11 → 2.0.12

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

@@ -26,6 +26,7 @@ export type IdGenerator<OtherInfo> = (data: RNode<OtherInfo>) => NodeId;
  * The simplest id generator which just increments a number on each call.
  */
 export declare function deterministicCountingIdGenerator(id?: number): () => NodeId;
+export declare function deterministicPrefixIdGenerator(prefix: string, id?: number): () => NodeId;
 export declare function sourcedDeterministicCountingIdGenerator(path: string, location: SourceRange, start?: number): () => NodeId;
 /**
  * Generates the location id, used by {@link deterministicLocationIdGenerator}.

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

@@ -10,7 +10,7 @@
  * @module
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateAst = exports.deterministicLocationIdGenerator = exports.nodeToLocationId = exports.sourcedDeterministicCountingIdGenerator = exports.deterministicCountingIdGenerator = void 0;
+exports.decorateAst = exports.deterministicLocationIdGenerator = exports.nodeToLocationId = exports.sourcedDeterministicCountingIdGenerator = exports.deterministicPrefixIdGenerator = exports.deterministicCountingIdGenerator = void 0;
 const assert_1 = require("../../../../../util/assert");
 const bimap_1 = require("../../../../../util/bimap");
 const stateful_fold_1 = require("./stateful-fold");
@@ -22,6 +22,10 @@ function deterministicCountingIdGenerator(id = 0) {
     return () => id++;
 }
 exports.deterministicCountingIdGenerator = deterministicCountingIdGenerator;
+function deterministicPrefixIdGenerator(prefix, id = 0) {
+    return () => `${prefix}-${id++}`;
+}
+exports.deterministicPrefixIdGenerator = deterministicPrefixIdGenerator;
 function sourcedDeterministicCountingIdGenerator(path, location, start = 0) {
     let id = start;
     return () => `${path}-${loc2Id(location)}-${id++}`;

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

@@ -4,9 +4,9 @@ import type { RRepeatLoop } from '../../../../model/nodes/r-repeat-loop';
 /**
  * Try to parse the construct as a {@link RRepeatLoop}.
  *
- * @param data - The data used by the parser (see {@link NormalizerData})
+ * @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
+ * @param bodyToken   - The `body` of the repeat-loop
  *
  * @returns The parsed {@link RRepeatLoop} or `undefined` if the given construct is not a repeat-loop
  */

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

@@ -8,9 +8,9 @@ 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 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
+ * @param bodyToken   - The `body` of the repeat-loop
  *
  * @returns The parsed {@link RRepeatLoop} or `undefined` if the given construct is not a repeat-loop
  */

package/r-bridge/retriever.d.ts

@@ -5,45 +5,53 @@ import type { NormalizedAst } from './lang-4.x/ast/model/processing/decorate';
 export declare const fileProtocol = "file://";
 export interface RParseRequestFromFile {
     readonly request: 'file';
-    /** The path to the file (absolute paths are probably best here) */
+    /**
+     * The path to the file (an absolute path is probably best here).
+     * See {@link RParseRequests} for multiple files.
+     */
     readonly content: string;
 }
 export interface RParseRequestFromText {
     readonly request: 'text';
+    /**
+     * Source code to parse (not a file path).
+     * If you want to parse multiple files as one, either use {@link RParseRequests},
+     * a higher request as a {@link FileAnalysisRequestMessage},
+     * or concatenate their contents to pass them with this request.
+     */
     readonly content: string;
 }
 /**
- * A provider for an {@link RParseRequest} that can be used, for example, to override source file parsing behavior in tests
+ * A provider for an {@link RParseRequests} that can be used, for example, to override source file parsing behavior in tests
  */
 export interface RParseRequestProvider {
     createRequest(path: string): RParseRequest;
 }
+export type RParseRequest = RParseRequestFromFile | RParseRequestFromText;
 /**
- * A request that can be passed along to {@link retrieveParseDataFromRCode}.
+ * Several requests that can be passed along to {@link retrieveParseDataFromRCode}.
  */
-export type RParseRequest = (RParseRequestFromFile | RParseRequestFromText);
+export type RParseRequests = RParseRequest | ReadonlyArray<RParseRequest>;
 export declare function requestFromInput(input: `${typeof fileProtocol}${string}`): RParseRequestFromFile;
+export declare function requestFromInput(input: `${typeof fileProtocol}${string}`[]): RParseRequestFromFile[];
 export declare function requestFromInput(input: string): RParseRequestFromText;
+export declare function requestFromInput(input: readonly string[]): RParseRequests;
 export declare function requestProviderFromFile(): RParseRequestProvider;
-export declare function requestProviderFromText(text: {
+export declare function requestProviderFromText(text: Readonly<{
     [path: string]: string;
-}): RParseRequestProvider;
+}>): RParseRequestProvider;
 export declare function requestFingerprint(request: RParseRequest): string;
-/**
- * Provides the capability to parse R files/R code using the R parser.
- * Depends on {@link RShell} to provide a connection to R.
- * <p>
- * Throws if the file could not be parsed.
- * If successful, allows to further query the last result with {@link retrieveNumberOfRTokensOfLastParse}.
- */
-export declare function retrieveParseDataFromRCode(request: RParseRequest, shell: (RShell | RShellExecutor)): AsyncOrSync<string>;
+export declare function isEmptyRequest(request: RParseRequest): boolean;
+export declare function retrieveParseDataFromRCode(request: RParseRequest, shell: RShell): Promise<string>;
+export declare function retrieveParseDataFromRCode(request: RParseRequest, shell: RShellExecutor): string;
+export declare function retrieveParseDataFromRCode(request: RParseRequest, shell: RShell | RShellExecutor): AsyncOrSync<string>;
 /**
  * Uses {@link retrieveParseDataFromRCode} and returns the nicely formatted object-AST.
- * If successful, allows to further query the last result with {@link retrieveNumberOfRTokensOfLastParse}.
+ * If successful, allows further querying the last result with {@link retrieveNumberOfRTokensOfLastParse}.
  */
 export declare function retrieveNormalizedAstFromRCode(request: RParseRequest, shell: RShell): Promise<NormalizedAst>;
 /**
- * If the string has (R-)quotes around it, they will be removed, otherwise the string is returned unchanged.
+ * If the string has (R-)quotes around it, they will be removed; otherwise the string is returned unchanged.
  */
 export declare function removeRQuotes(str: string): string;
 /**

package/r-bridge/retriever.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retrieveNumberOfRTokensOfLastParse = exports.removeRQuotes = exports.retrieveNormalizedAstFromRCode = exports.retrieveParseDataFromRCode = exports.requestFingerprint = exports.requestProviderFromText = exports.requestProviderFromFile = exports.requestFromInput = exports.fileProtocol = void 0;
+exports.retrieveNumberOfRTokensOfLastParse = exports.removeRQuotes = exports.retrieveNormalizedAstFromRCode = exports.retrieveParseDataFromRCode = exports.isEmptyRequest = exports.requestFingerprint = exports.requestProviderFromText = exports.requestProviderFromFile = exports.requestFromInput = exports.fileProtocol = void 0;
 const strings_1 = require("../util/strings");
 const assert_1 = require("../util/assert");
 const shell_executor_1 = require("./shell-executor");
@@ -13,13 +13,20 @@ const init_1 = require("./init");
 const convert_values_1 = require("./lang-4.x/convert-values");
 exports.fileProtocol = 'file://';
 /**
- * Creates a {@link RParseRequest} from a given input.
+ * Creates a {@link RParseRequests} from a given input.
+ * If your input starts with {@link fileProtocol}, it is assumed to be a file path and will be processed as such.
+ * Giving an array, you can mix file paths and text content (again using the {@link fileProtocol}).
+ *
  */
 function requestFromInput(input) {
-    const file = input.startsWith(exports.fileProtocol);
+    if (Array.isArray(input)) {
+        return input.flatMap(requestFromInput);
+    }
+    const content = input;
+    const file = content.startsWith(exports.fileProtocol);
     return {
         request: file ? 'file' : 'text',
-        content: file ? input.slice(7) : input
+        content: file ? content.slice(7) : content
     };
 }
 exports.requestFromInput = requestFromInput;
@@ -49,15 +56,19 @@ function requestFingerprint(request) {
     return (0, object_hash_1.default)(request);
 }
 exports.requestFingerprint = requestFingerprint;
+function isEmptyRequest(request) {
+    return request.content.trim().length === 0;
+}
+exports.isEmptyRequest = isEmptyRequest;
 /**
  * Provides the capability to parse R files/R code using the R parser.
  * Depends on {@link RShell} to provide a connection to R.
  * <p>
  * Throws if the file could not be parsed.
- * If successful, allows to further query the last result with {@link retrieveNumberOfRTokensOfLastParse}.
+ * If successful, allows further querying the last result with {@link retrieveNumberOfRTokensOfLastParse}.
  */
 function retrieveParseDataFromRCode(request, shell) {
-    if (request.content.trim() === '') {
+    if (isEmptyRequest(request)) {
         return Promise.resolve('');
     }
     const suffix = request.request === 'file' ? ', encoding="utf-8"' : '';
@@ -73,7 +84,7 @@ function retrieveParseDataFromRCode(request, shell) {
 exports.retrieveParseDataFromRCode = retrieveParseDataFromRCode;
 /**
  * Uses {@link retrieveParseDataFromRCode} and returns the nicely formatted object-AST.
- * If successful, allows to further query the last result with {@link retrieveNumberOfRTokensOfLastParse}.
+ * If successful, allows further querying the last result with {@link retrieveNumberOfRTokensOfLastParse}.
  */
 async function retrieveNormalizedAstFromRCode(request, shell) {
     const data = await retrieveParseDataFromRCode(request, shell);
@@ -81,7 +92,7 @@ async function retrieveNormalizedAstFromRCode(request, shell) {
 }
 exports.retrieveNormalizedAstFromRCode = retrieveNormalizedAstFromRCode;
 /**
- * If the string has (R-)quotes around it, they will be removed, otherwise the string is returned unchanged.
+ * If the string has (R-)quotes around it, they will be removed; otherwise the string is returned unchanged.
  */
 function removeRQuotes(str) {
     if (str.length > 1 && ((0, strings_1.startAndEndsWith)(str, '\'') || (0, strings_1.startAndEndsWith)(str, '"'))) {

package/slicing/criterion/parse.js

@@ -19,7 +19,10 @@ exports.CriteriaParseError = CriteriaParseError;
  */
 function slicingCriterionToId(criterion, decorated) {
     let resolved;
-    if (criterion.includes(':')) {
+    if (criterion.startsWith('$')) {
+        resolved = (0, node_id_1.normalizeIdToNumberIfPossible)(criterion.substring(1));
+    }
+    else if (criterion.includes(':')) {
         const [line, column] = criterion.split(':').map(c => parseInt(c));
         resolved = locationToId([line, column], decorated.idMap);
     }
@@ -27,9 +30,6 @@ function slicingCriterionToId(criterion, decorated) {
         const [line, name] = criterion.split(/@(.*)/s); // only split at first occurrence
         resolved = conventionalCriteriaToId(parseInt(line), name, decorated.idMap);
     }
-    else if (criterion.startsWith('$')) {
-        resolved = (0, node_id_1.normalizeIdToNumberIfPossible)(criterion.substring(1));
-    }
     if (resolved === undefined) {
         throw new CriteriaParseError(`invalid slicing criterion ${criterion}`);
     }

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = void 0;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.0.11';
+const version = '2.0.12';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }