@eagleoutice/flowr 2.0.5 → 2.0.6

package/dataflow/internal/linker.js

@@ -55,7 +55,7 @@ function linkArgumentsOnCall(args, params, graph) {
                 graph.addEdge(arg.nodeId, specialDotParameter.name.info.id, { type: 16 /* EdgeType.DefinesOnCall */ });
             }
             else {
-                logger_1.dataflowLogger.error(`skipping argument ${i} as there is no corresponding parameter - R should block that`);
+                logger_1.dataflowLogger.warn(`skipping argument ${i} as there is no corresponding parameter - R should block that`);
             }
             continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {

package/r-bridge/lang-4.x/ast/parser/xml/internal/operators/normalize-binary.js

@@ -33,7 +33,9 @@ function parseBinaryOp(data, lhs, operator, rhs) {
     const operationName = (0, normalize_meta_1.retrieveOpName)(operator);
     const { location, content } = (0, normalize_meta_1.retrieveMetaStructure)(operator.content);
     if ((0, strings_1.startAndEndsWith)(operationName, '%')) {
-        (0, assert_1.guard)(parsedLhs.location !== undefined && parsedLhs.lexeme !== undefined && parsedRhs.location !== undefined && parsedRhs.lexeme !== undefined, () => `special op lhs and rhs must have a locations and lexemes, but ${JSON.stringify(parsedLhs)} and ${JSON.stringify(parsedRhs)})`);
+        const lhsLoc = parsedLhs.type === "RExpressionList" /* RType.ExpressionList */ ? parsedLhs.grouping?.[0].location : parsedLhs.location;
+        const rhsLoc = parsedRhs.type === "RExpressionList" /* RType.ExpressionList */ ? parsedRhs.grouping?.[0].location : parsedRhs.location;
+        (0, assert_1.guard)(lhsLoc !== undefined && rhsLoc !== undefined, () => `special op lhs and rhs must have a locations, but ${JSON.stringify(parsedLhs)} || ${JSON.stringify(lhsLoc)} and ${JSON.stringify(parsedRhs)} ||  || ${JSON.stringify(rhsLoc)})`);
         // parse as infix function call!
         return {
             type: "RFunctionCall" /* RType.FunctionCall */,
@@ -52,18 +54,18 @@ function parseBinaryOp(data, lhs, operator, rhs) {
             arguments: [
                 {
                     type: "RArgument" /* RType.Argument */,
-                    location: parsedLhs.location,
+                    location: lhsLoc,
                     value: parsedLhs,
                     name: undefined,
-                    lexeme: parsedLhs.lexeme,
+                    lexeme: parsedLhs.lexeme ?? '',
                     info: {}
                 },
                 {
                     type: "RArgument" /* RType.Argument */,
-                    location: parsedRhs.location,
+                    location: rhsLoc,
                     value: parsedRhs,
                     name: undefined,
-                    lexeme: parsedRhs.lexeme,
+                    lexeme: parsedRhs.lexeme ?? '',
                     info: {}
                 }
             ],

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

@@ -7,4 +7,4 @@ export declare function splitComments(tokens: readonly NamedXmlBasedJson[]): {
     others: NamedXmlBasedJson[];
 };
 export declare function normalizeExpressions(data: NormalizerData, tokens: readonly XmlBasedJson[] | readonly NamedXmlBasedJson[]): (RNode | RDelimiter)[];
-export declare function parseNodesWithUnknownType(data: NormalizerData, mappedWithName: readonly NamedXmlBasedJson[]): (RNode | RDelimiter)[];
+export declare function parseNodesWithUnknownType(data: NormalizerData, mappedWithName: readonly NamedXmlBasedJson[] | undefined): (RNode | RDelimiter)[];

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

@@ -18,7 +18,7 @@ const normalize_if_then_else_1 = require("../control/normalize-if-then-else");
 const normalize_comment_1 = require("../other/normalize-comment");
 function normalizeMappedWithoutSemicolonBasedOnType(mappedWithName, data) {
     let result = undefined;
-    switch (mappedWithName.length) {
+    switch (mappedWithName?.length) {
         case 1:
             result = (0, normalize_single_node_1.normalizeSingleNode)(data, mappedWithName[0]);
             break;
@@ -93,7 +93,7 @@ function handleExpressionList(raw) {
         return { segments: [], comments: [], braces: undefined };
     }
     const { comments, others: tokens } = splitComments(raw);
-    const first = tokens[0].name;
+    const first = tokens[0]?.name;
     if (first === "{" /* RawRType.BraceLeft */) {
         const endType = tokens[tokens.length - 1].name;
         (0, assert_1.guard)(endType === "}" /* RawRType.BraceRight */, () => `expected a brace at the end of the expression list as well, but ${endType} :: ${JSON.stringify(tokens[tokens.length - 1], json_1.jsonReplacer)}`);
@@ -172,7 +172,7 @@ exports.normalizeExpressions = normalizeExpressions;
 function parseNodesWithUnknownType(data, mappedWithName) {
     const parsedNodes = [];
     // used to indicate the new root node of this set of nodes
-    for (const elem of mappedWithName) {
+    for (const elem of mappedWithName ?? []) {
         const retrieved = (0, normalize_single_node_1.normalizeSingleNode)(data, elem);
         parsedNodes.push(retrieved);
     }

package/r-bridge/lang-4.x/ast/parser/xml/normalize-meta.d.ts

@@ -32,7 +32,7 @@ export declare function assureTokenType(obj: XmlBasedJson, expectedName: RawRTyp
  * @param content  - the json object to extract the token-type from
  */
 export declare function getTokenType(content: XmlBasedJson): RawRType;
-export declare function getWithTokenType(obj: XmlBasedJson[]): {
+export declare function getWithTokenType(obj: readonly XmlBasedJson[]): {
     name: RawRType;
     content: XmlBasedJson;
 }[];

package/r-bridge/lang-4.x/ast/parser/xml/normalize-meta.js

@@ -66,7 +66,7 @@ function getTokenType(content) {
 }
 exports.getTokenType = getTokenType;
 function getWithTokenType(obj) {
-    return obj.map((content) => ({
+    return obj.map(content => ({
         name: getTokenType(content),
         content
     }));

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.5';
+const version = '2.0.6';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }