@eagleoutice/flowr 2.8.3 → 2.8.4

package/r-bridge/roxygen2/documentation-provider.js

@@ -41,12 +41,14 @@ function getDocumentationOf(nodeId, idMap) {
     if (!node) {
         return undefined;
     }
-    else if (node.info.doc) {
+    else if ('doc' in node.info) {
         return node.info.doc;
     }
     const retriever = CommentRetriever[node.type] ?? ((c, a) => (0, roxygen_parse_1.parseRoxygenCommentsOfNode)(c, a)?.tags);
     const doc = retriever(node, idMap);
     if (doc) {
+        // to avoid endless recursion, we block the caching here once:
+        node.info.doc = undefined;
         // cache the documentation for future queries
         const expanded = expandInheritsOfTags(doc, idMap);
         node.info.doc = expanded;

package/r-bridge/roxygen2/roxygen-parse.d.ts

@@ -22,5 +22,5 @@ type TagLine = [tag: string, remTagLine?: string];
  * @see {@link parseRoxygenCommentsOfNode} - to parse comments attached to a node
  */
 export declare function parseRoxygenComment(commentText: readonly string[]): RoxygenTag[];
-export declare const firstAndRest: (firstName: string, secondName: string) => (s: RoxygenParseContext, t: TagLine) => void;
+export declare const firstAndRest: (firstName: string, secondName: string) => (s: RoxygenParseContext, t: TagLine) => TagLine | undefined;
 export {};

package/r-bridge/roxygen2/roxygen-parse.js

@@ -49,7 +49,7 @@ function parseRoxygenCommentsOfNode(node, idMap) {
         attachedTo: cur?.info.id,
         requestNode: node.info.id,
         range: [
-            ...(0, range_1.mergeRanges)(...comments.map(c => c.location)),
+            ...(0, range_1.mergeRanges)(comments.map(c => c.location)),
             comments.find(c => c.info.file)?.info.file
         ]
     };
@@ -66,7 +66,10 @@ function parseRoxygenComment(commentText) {
         tags: [],
         idx: 0
     };
-    val(state, [roxygen_ast_1.KnownRoxygenTags.Text]);
+    let tag = val(state, [roxygen_ast_1.KnownRoxygenTags.Text]);
+    while (tag) {
+        tag = parseRoxygenTag(state, tag);
+    }
     return state.tags;
 }
 function atEnd(state) {
@@ -125,7 +128,7 @@ function val(state, tagName, lineToVal = l => l.join('\n').trim()) {
             });
         }
     }
-    parseRoxygenTag(state, nextTag);
+    return nextTag;
 }
 const spaceVals = (s, t) => val(s, t, l => (0, args_1.splitAtEscapeSensitive)(l.join(' ')));
 const flagVal = (s, t) => val(s, t, () => undefined);
@@ -206,11 +209,12 @@ const TagMap = {
         content: l.join(' ')
     }))
 };
+/** returns the next tag */
 function parseRoxygenTag(state, tagName) {
     if (tagName === undefined) {
-        return;
+        return undefined;
     }
     const parser = TagMap[tagName[0]] ?? val;
-    parser(state, tagName);
+    return parser(state, tagName);
 }
 //# sourceMappingURL=roxygen-parse.js.map

package/util/r-version.js

@@ -9,6 +9,18 @@ function makeVersion(version, original) {
     semver.str = original;
     return semver;
 }
+function tryNormalizeNumberPart(part) {
+    try {
+        const res = Number(part);
+        if (!Number.isNaN(res)) {
+            return String(res);
+        }
+    }
+    catch {
+        return part;
+    }
+    return part;
+}
 function normalizeVersion(version) {
     version = version.trim();
     let comparator = '';
@@ -29,7 +41,11 @@ function normalizeVersion(version) {
             mainVersionParts.push('0');
         }
     }
-    return comparator + mainVersionParts.map(n => String(Number(n))).join('.') + (preReleaseParts.length > 0 ? `-${preReleaseParts.join('-')}` : '');
+    let prerelease = '';
+    if (preReleaseParts.length > 0) {
+        prerelease = '-' + preReleaseParts.join('-').split('.').map(part => tryNormalizeNumberPart(part)).join('.');
+    }
+    return comparator + mainVersionParts.map(tryNormalizeNumberPart).join('.') + prerelease;
 }
 const AnyVerWithMaybeRangeRegex = /(\s*[<>=~^]*\s*\d+(\.\d*)*(-[0-9A-Za-z-.]+)?)/g;
 function normalizeVersions(versions) {

package/util/range.d.ts

@@ -52,7 +52,7 @@ export declare function invalidRange(): SourceRange;
  * If you are interested in combining overlapping ranges into a minimal set of ranges, see {@link combineRanges}.
  * @throws if no ranges are provided
  */
-export declare function mergeRanges(...rs: (SourceRange | undefined)[]): SourceRange;
+export declare function mergeRanges(rs?: (SourceRange | undefined)[]): SourceRange;
 /**
  * @returns true iff `r1` starts and ends before `r2` starts (i.e., if `r1` and `r2` do not overlap and `r1` comes before `r2`
  */

package/util/range.js

@@ -45,7 +45,7 @@ function invalidRange() {
  * If you are interested in combining overlapping ranges into a minimal set of ranges, see {@link combineRanges}.
  * @throws if no ranges are provided
  */
-function mergeRanges(...rs) {
+function mergeRanges(rs = []) {
     const rsSafe = rs.filter(assert_1.isNotUndefined);
     (0, assert_1.guard)(rsSafe.length > 0, 'Cannot merge no ranges');
     return rsSafe.reduce(([sl, sc, el, ec], [nsl, nsc, nel, nec]) => [

package/util/version.js

@@ -6,7 +6,7 @@ exports.printVersionInformation = printVersionInformation;
 const semver_1 = require("semver");
 const assert_1 = require("./assert");
 // this is automatically replaced with the current version by release-it
-const version = '2.8.3';
+const version = '2.8.4';
 /**
  * Retrieves the current flowR version as a new {@link SemVer} object.
  */