@eagleoutice/flowr 2.0.0 → 2.0.2

package/statistics/features/supported/used-functions/used-functions.js

@@ -63,7 +63,7 @@ function visitCalls(info, input) {
         if (dataflowNode) {
             hasCallsEdge = [...dataflowNode[1].values()].some(e => (0, edge_1.edgeIncludesType)(e.types, 4 /* EdgeType.Calls */));
         }
-        if (node.flavor === 'unnamed') {
+        if (!node.named) {
             info.unnamedCalls++;
             (0, statistics_file_1.appendStatisticsFile)(exports.usedFunctions.name, 'unnamed-calls', [node.lexeme], input.filepath);
             allCalls.push([

package/util/assert.d.ts

@@ -9,4 +9,4 @@ export type GuardMessage = string | (() => string);
  * @param message - if a string, will be used as error message, if a function, will be called to produce the error message (can be used to avoid costly message generations)
  * @throws GuardError - if the assertion fails
  */
-export declare function guard(assertion: boolean, message?: GuardMessage): asserts assertion;
+export declare function guard(assertion: boolean | undefined, message?: GuardMessage): asserts assertion;

package/util/mermaid/ast.js

@@ -13,6 +13,10 @@ function normalizedAstToMermaid(ast, prefix = '') {
             const roleSuffix = context.role === "expr-list-child" /* RoleInParent.ExpressionListChild */ || context.role === "call-argument" /* RoleInParent.FunctionCallArgument */ || context.role === "function-def-param" /* RoleInParent.FunctionDefinitionParameter */ ? `-${context.index}` : '';
             output += `    n${n.info.parent} -->|"${context.role}${roleSuffix}"| n${n.info.id}\n`;
         }
+        if (n.type === "RExpressionList" /* RType.ExpressionList */ && n.grouping !== undefined) {
+            output += `    n${n.info.id} -.-|"group-open"| n${n.grouping[0].info.id}\n`;
+            output += `    n${n.info.id} -.-|"group-close"| n${n.grouping[1].info.id}\n`;
+        }
         return false;
     });
     return output;

package/util/mermaid/dfg.js

@@ -12,6 +12,14 @@ function formatRange(range) {
     if (range === undefined) {
         return '??-??';
     }
+    else if (range[0] === range[2]) {
+        if (range[1] === range[3]) {
+            return `${range[0]}.${range[1]}`;
+        }
+        else {
+            return `${range[0]}.${range[1]}-${range[3]}`;
+        }
+    }
     return `${range[0]}.${range[1]}-${range[2]}.${range[3]}`;
 }
 exports.formatRange = formatRange;
@@ -102,7 +110,7 @@ function printEnvironmentToLines(env) {
     else if (env.id === environment_1.BuiltInEnvironment.id) {
         return ['Built-in'];
     }
-    const lines = [...printEnvironmentToLines(env.parent), `${env.id}--${env.name}${'-'.repeat(40)}`];
+    const lines = [...printEnvironmentToLines(env.parent), `${env.id}${'-'.repeat(40)}`];
     const longestName = Math.max(...[...env.memory.keys()].map(x => x.length));
     for (const [name, defs] of env.memory.entries()) {
         const printName = `${name}:`;
@@ -119,15 +127,17 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark) {
         }
     }
     const node = mermaid.rootGraph.idMap?.get(info.id);
-    const escapedName = (0, mermaid_1.escapeMarkdown)(node ? `[${node.type}] ${node.lexeme ?? '??'}` : '??');
+    const lexeme = node?.lexeme ?? (node?.type === "RExpressionList" /* RType.ExpressionList */ ? node?.grouping?.[0]?.lexeme : '') ?? '??';
+    const escapedName = (0, mermaid_1.escapeMarkdown)(node ? `[${node.type}] ${lexeme}` : '??');
     const deps = info.controlDependencies ? ', :maybe:' + info.controlDependencies.join(',') : '';
-    mermaid.nodeLines.push(`    ${idPrefix}${id}${open}"\`${escapedName}${escapedName.length > 10 ? '\n      ' : ' '}(${id}${deps})\n      *${formatRange(mermaid.rootGraph.idMap?.get(id)?.location)}*${fCall ? displayFunctionArgMapping(info.args) : ''}\`"${close}`);
+    const n = node?.info.fullRange ?? node?.location ?? (node?.type === "RExpressionList" /* RType.ExpressionList */ ? node?.grouping?.[0].location : undefined);
+    mermaid.nodeLines.push(`    ${idPrefix}${id}${open}"\`${escapedName}${escapedName.length > 10 ? '\n      ' : ' '}(${id}${deps})\n      *${formatRange(n)}*${fCall ? displayFunctionArgMapping(info.args) : ''}\`"${close}`);
     if (mark?.has(id)) {
         mermaid.nodeLines.push(`    style ${idPrefix}${id} stroke:black,stroke-width:7px; `);
     }
     const edges = mermaid.rootGraph.get(id, true);
     (0, assert_1.guard)(edges !== undefined, `node ${id} must be found`);
-    const artificialCdEdges = (info.controlDependencies ?? []).map(x => [x, { types: new Set(['CD']) }]);
+    const artificialCdEdges = (info.controlDependencies ?? []).map(x => [x.id, { types: new Set([x.when ? 'CD-True' : 'CD-False']) }]);
     for (const [target, edge] of [...edges[1], ...artificialCdEdges]) {
         const edgeTypes = typeof edge.types == 'number' ? new Set((0, edge_1.splitEdgeTypes)(edge.types)) : edge.types;
         const edgeId = encodeEdge(idPrefix + id, idPrefix + target, edgeTypes);
@@ -138,7 +148,7 @@ function vertexToMermaid(info, mermaid, id, idPrefix, mark) {
                 // who invented this syntax?!
                 mermaid.edgeLines.push(`    linkStyle ${mermaid.presentEdges.size - 1} stroke:red,color:red,stroke-width:4px;`);
             }
-            if (edgeTypes.has('CD')) {
+            if (edgeTypes.has('CD-True')) {
                 mermaid.edgeLines.push(`    linkStyle ${mermaid.presentEdges.size - 1} stroke:gray,color:gray;`);
             }
             if (target === built_in_1.BuiltIn) {

package/util/mermaid/mermaid.js

@@ -1,8 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mermaidCodeToUrl = exports.escapeMarkdown = void 0;
+const replacements = {
+    // keep newlines
+    '\\n': '\n',
+    '`': '#96;',
+    '[': '#91;',
+    ']': '#93;',
+    '<': '#60;',
+    '>': '#62;',
+    '*': '#42;',
+    '+': '#43;',
+    '-': '#45;',
+    '"': '#34;',
+    '\\': '#92;',
+    '_': '#95;',
+    '{': '#123;',
+    '}': '#125;'
+};
 function escapeMarkdown(text) {
-    return text.replaceAll(/([+*<>-])/g, '\\$1').replaceAll('"', '\'\'');
+    for (const [key, value] of Object.entries(replacements)) {
+        text = text.replaceAll(key, value);
+    }
+    return text;
 }
 exports.escapeMarkdown = escapeMarkdown;
 /**

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