@eagleoutice/flowr 2.6.1 → 2.6.3

package/dataflow/eval/resolve/resolve-argument.d.ts

@@ -1,4 +1,4 @@
-import type { DataflowGraph } from '../../graph/graph';
+import { type DataflowGraph } from '../../graph/graph';
 import type { DataflowGraphVertexFunctionCall } from '../../graph/vertex';
 import type { NodeId } from '../../../r-bridge/lang-4.x/ast/model/processing/node-id';
 import type { VariableResolve } from '../../../config';

package/dataflow/eval/resolve/resolve-argument.js

@@ -65,8 +65,8 @@ function hasCharacterOnly(variableResolve, graph, vertex, idMap) {
     if (!treatAsChar) {
         return false;
     }
-    const hasTrue = [...treatAsChar.values()].some(set => set?.has('TRUE'));
-    const hasFalse = hasTrue ? [...treatAsChar.values()].some(set => set === undefined || set.has('FALSE')) : false;
+    const hasTrue = treatAsChar.values().some(set => set?.has('TRUE'));
+    const hasFalse = hasTrue ? treatAsChar.values().some(set => set === undefined || set.has('FALSE')) : false;
     if (hasTrue && hasFalse) {
         return 'maybe';
     }

package/dataflow/eval/resolve/resolve.d.ts

@@ -1,8 +1,7 @@
 import type { AstIdMap, RNodeWithParent } from '../../../r-bridge/lang-4.x/ast/model/processing/decorate';
 import type { REnvironmentInformation } from '../../environments/environment';
 import type { DataflowGraph } from '../../graph/graph';
-import type { Lift, Value, ValueNumber, ValueVector } from '../values/r-value';
-import { Top } from '../values/r-value';
+import { type Lift, type Value, type ValueNumber, type ValueVector, Top } from '../values/r-value';
 import type { VariableResolve } from '../../../config';
 /**
  * Helper function used by {@link resolveIdToValue}, please use that instead, if
@@ -10,7 +9,6 @@ import type { VariableResolve } from '../../../config';
  *
  * This function converts an RNode to its Value, but also recursively resolves
  * aliases and vectors (in case of a vector).
- *
  * @param a       - Ast node to resolve
  * @param resolve - Variable resolve mode
  * @param env     - Environment to use
@@ -25,7 +23,6 @@ export declare function resolveNode(resolve: VariableResolve, a: RNodeWithParent
  *
  * This function resolves a vector function call `c` to a {@link ValueVector}
  * by recursively resolving the values of the arguments by calling {@link resolveIdToValue}
- *
  * @param resolve - Variable resolve mode
  * @param node    - Node of the vector function to resolve
  * @param env     - Environment to use
@@ -40,7 +37,6 @@ export declare function resolveAsVector(resolve: VariableResolve, node: RNodeWit
  *
  * This function resolves a binary sequence operator `:` to a {@link ValueVector} of {@link ValueNumber}s
  * by recursively resolving the values of the arguments by calling {@link resolveIdToValue}
- *
  * @param resolve  - Variable resolve mode
  * @param operator - Node of the sequence operator to resolve
  * @param env      - Environment to use
@@ -55,7 +51,6 @@ export declare function resolveAsSeq(resolve: VariableResolve, operator: RNodeWi
  *
  * This function resolves a unary plus operator `+` to a {@link ValueNumber} or {@link ValueVector} of ValueNumbers
  * by recursively resolving the values of the arguments by calling {@link resolveIdToValue}
- *
  * @param resolve  - Variable resolve mode
  * @param operator - Node of the plus operator to resolve
  * @param env      - Environment to use
@@ -70,7 +65,6 @@ export declare function resolveAsPlus(resolve: VariableResolve, operator: RNodeW
  *
  * This function resolves a unary minus operator `-` to a {@link ValueNumber} or {@link ValueVector} of ValueNumbers
  * by recursively resolving the values of the arguments by calling {@link resolveIdToValue}
- *
  * @param resolve  - Variable resolve mode
  * @param operator - Node of the minus operator to resolve
  * @param env      - Environment to use

package/dataflow/eval/resolve/resolve.js

@@ -23,7 +23,6 @@ const scalar_consatnts_1 = require("../values/scalar/scalar-consatnts");
  *
  * This function converts an RNode to its Value, but also recursively resolves
  * aliases and vectors (in case of a vector).
- *
  * @param a       - Ast node to resolve
  * @param resolve - Variable resolve mode
  * @param env     - Environment to use
@@ -75,7 +74,6 @@ function resolveNode(resolve, a, env, graph, map) {
  *
  * This function resolves a vector function call `c` to a {@link ValueVector}
  * by recursively resolving the values of the arguments by calling {@link resolveIdToValue}
- *
  * @param resolve - Variable resolve mode
  * @param node    - Node of the vector function to resolve
  * @param env     - Environment to use
@@ -97,7 +95,6 @@ function resolveAsVector(resolve, node, environment, graph, idMap) {
  *
  * This function resolves a binary sequence operator `:` to a {@link ValueVector} of {@link ValueNumber}s
  * by recursively resolving the values of the arguments by calling {@link resolveIdToValue}
- *
  * @param resolve  - Variable resolve mode
  * @param operator - Node of the sequence operator to resolve
  * @param env      - Environment to use
@@ -125,7 +122,6 @@ function resolveAsSeq(resolve, operator, environment, graph, idMap) {
  *
  * This function resolves a unary plus operator `+` to a {@link ValueNumber} or {@link ValueVector} of ValueNumbers
  * by recursively resolving the values of the arguments by calling {@link resolveIdToValue}
- *
  * @param resolve  - Variable resolve mode
  * @param operator - Node of the plus operator to resolve
  * @param env      - Environment to use
@@ -154,7 +150,6 @@ function resolveAsPlus(resolve, operator, environment, graph, idMap) {
  *
  * This function resolves a unary minus operator `-` to a {@link ValueNumber} or {@link ValueVector} of ValueNumbers
  * by recursively resolving the values of the arguments by calling {@link resolveIdToValue}
- *
  * @param resolve  - Variable resolve mode
  * @param operator - Node of the minus operator to resolve
  * @param env      - Environment to use

package/dataflow/eval/values/general.d.ts

@@ -1,6 +1,5 @@
 import type { RNodeWithParent } from '../../../r-bridge/lang-4.x/ast/model/processing/decorate';
-import type { Lift, Value, ValueSet } from './r-value';
-import { Bottom, Top } from './r-value';
+import { type Lift, type Value, type ValueSet, Bottom, Top } from './r-value';
 /**
  * Takes n potentially lifted ops and returns `Top` or `Bottom` if any is `Top` or `Bottom`.
  */
@@ -8,7 +7,6 @@ export declare function bottomTopGuard(...a: Lift<unknown>[]): typeof Top | type
 /**
  * Returns a value set, if a is not bottom or top, otherwise undefined.
  * Useful when working with values returned by {@link resolveIdToValue}
- *
  * @param a - value set to check
  * @returns value set if a is not top or bottom
  */

package/dataflow/eval/values/general.js

@@ -23,7 +23,6 @@ function bottomTopGuard(...a) {
 /**
  * Returns a value set, if a is not bottom or top, otherwise undefined.
  * Useful when working with values returned by {@link resolveIdToValue}
- *
  * @param a - value set to check
  * @returns value set if a is not top or bottom
  */

package/dataflow/eval/values/intervals/interval-constants.d.ts

@@ -1,4 +1,10 @@
 import type { RNumberValue } from '../../../../r-bridge/lang-4.x/convert-values';
-import type { Lift, ValueInterval, ValueNumber } from '../r-value';
+import { type Lift, type ValueInterval, type ValueNumber } from '../r-value';
+/**
+ *
+ */
 export declare function intervalFrom(start: RNumberValue | number, end?: number | RNumberValue, startInclusive?: boolean, endInclusive?: boolean): ValueInterval;
+/**
+ *
+ */
 export declare function intervalFromValues(start: Lift<ValueNumber>, end?: Lift<ValueNumber<Lift<RNumberValue>>>, startInclusive?: boolean, endInclusive?: boolean): ValueInterval;

package/dataflow/eval/values/intervals/interval-constants.js

@@ -4,6 +4,9 @@ exports.intervalFrom = intervalFrom;
 exports.intervalFromValues = intervalFromValues;
 const r_value_1 = require("../r-value");
 const scalar_consatnts_1 = require("../scalar/scalar-consatnts");
+/**
+ *
+ */
 function intervalFrom(start, end = start, startInclusive = true, endInclusive = true) {
     return intervalFromValues(typeof start === 'number' ? (0, scalar_consatnts_1.getScalarFromInteger)(start) : (0, scalar_consatnts_1.liftScalar)(start), typeof end === 'number' ? (0, scalar_consatnts_1.getScalarFromInteger)(end) : (0, scalar_consatnts_1.liftScalar)(end), startInclusive, endInclusive);
 }
@@ -15,6 +18,9 @@ function shiftNum(v) {
         return v;
     }
 }
+/**
+ *
+ */
 function intervalFromValues(start, end = start, startInclusive = true, endInclusive = true) {
     return {
         type: 'interval',

package/dataflow/eval/values/logical/logical-constants.d.ts

@@ -1,4 +1,7 @@
-import type { Lift, TernaryLogical, ValueLogical } from '../r-value';
+import { type Lift, type TernaryLogical, type ValueLogical } from '../r-value';
+/**
+ *
+ */
 export declare function liftLogical(log: Lift<TernaryLogical>): ValueLogical;
 export declare const ValueLogicalTrue: ValueLogical;
 export declare const ValueLogicalFalse: ValueLogical;

package/dataflow/eval/values/logical/logical-constants.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValueLogicalBot = exports.ValueLogicalTop = exports.ValueLogicalMaybe = exports.ValueLogicalFalse = exports.ValueLogicalTrue = void 0;
 exports.liftLogical = liftLogical;
 const r_value_1 = require("../r-value");
+/**
+ *
+ */
 function liftLogical(log) {
     if (log === r_value_1.Top) {
         return exports.ValueLogicalTop;

package/dataflow/eval/values/r-value.d.ts

@@ -53,9 +53,21 @@ export type ValueType<V> = V extends {
     type: infer T;
 } ? T : never;
 export type ValueTypes = ValueType<Value>;
+/**
+ *
+ */
 export declare function typeOfValue<V extends Value>(value: V): V['type'];
+/** Checks whether the given value is the top value */
 export declare function isTop<V extends Lift<unknown>>(value: V): value is typeof Top;
+/** Checks whether the given value is the bottom value */
 export declare function isBottom<V extends Lift<unknown>>(value: V): value is typeof Bottom;
+/** Checks whether the given value is a proper value (neither top nor bottom) */
 export declare function isValue<V extends Lift<unknown>>(value: V): value is Unlift<V>;
+/**
+ * Treat a value as unlifted value, throws if it is top or bottom.
+ */
 export declare function asValue<V extends Lift<unknown>>(value: V): Unlift<V>;
+/**
+ *
+ */
 export declare function stringifyValue(value: Lift<Value>): string;

package/dataflow/eval/values/r-value.js

@@ -10,20 +10,29 @@ exports.stringifyValue = stringifyValue;
 const assert_1 = require("../../../util/assert");
 exports.Top = { type: Symbol('⊤') };
 exports.Bottom = { type: Symbol('⊥') };
+/**
+ *
+ */
 function typeOfValue(value) {
     return value.type;
 }
+/** Checks whether the given value is the top value */
 // @ts-expect-error -- this is a save cast
 function isTop(value) {
     return value === exports.Top;
 }
+/** Checks whether the given value is the bottom value */
 // @ts-expect-error -- this is a save cast
 function isBottom(value) {
     return value === exports.Bottom;
 }
+/** Checks whether the given value is a proper value (neither top nor bottom) */
 function isValue(value) {
     return !isTop(value) && !isBottom(value);
 }
+/**
+ * Treat a value as unlifted value, throws if it is top or bottom.
+ */
 function asValue(value) {
     (0, assert_1.guard)(isValue(value), 'Expected a value, but got a top or bottom value');
     return value;
@@ -60,6 +69,9 @@ function renderString(value) {
         return `${quote}${JSON.stringify(value.str).slice(1, -1)}${quote}`;
     }
 }
+/**
+ *
+ */
 function stringifyValue(value) {
     return tryStringifyBoTop(value, v => {
         const t = v.type;

package/dataflow/eval/values/scalar/scalar-consatnts.d.ts

@@ -1,6 +1,12 @@
-import type { Lift, ValueNumber } from '../r-value';
+import { type Lift, type ValueNumber } from '../r-value';
 import type { RNumberValue } from '../../../../r-bridge/lang-4.x/convert-values';
+/**
+ *
+ */
 export declare function getScalarFromInteger(num: number, markedAsInt?: boolean, complexNumber?: boolean): ValueNumber<RNumberValue>;
+/**
+ *
+ */
 export declare function liftScalar(value: Lift<RNumberValue>): ValueNumber;
 export declare const ValueIntegerOne: ValueNumber<RNumberValue>;
 export declare const ValueNumberComplexOne: ValueNumber<RNumberValue>;

package/dataflow/eval/values/scalar/scalar-consatnts.js

@@ -4,6 +4,9 @@ exports.ValueIntegerBottom = exports.ValueIntegerTop = exports.ValueNumberOneHal
 exports.getScalarFromInteger = getScalarFromInteger;
 exports.liftScalar = liftScalar;
 const r_value_1 = require("../r-value");
+/**
+ *
+ */
 function getScalarFromInteger(num, markedAsInt = Number.isInteger(num), complexNumber = false) {
     return {
         type: 'number',
@@ -14,6 +17,9 @@ function getScalarFromInteger(num, markedAsInt = Number.isInteger(num), complexN
         }
     };
 }
+/**
+ *
+ */
 function liftScalar(value) {
     return {
         type: 'number',

package/dataflow/eval/values/sets/set-constants.d.ts

@@ -1,6 +1,11 @@
-import type { Lift, Value, ValueSet } from '../r-value';
-import { Top } from '../r-value';
+import { type Lift, type Value, type ValueSet, Top } from '../r-value';
+/**
+ *
+ */
 export declare function setFrom<V extends Value[]>(...elements: V): Lift<ValueSet<Value[]>>;
+/**
+ *
+ */
 export declare function isSet<V extends Value>(element: V): boolean;
 export declare const ValueEmptySet: Lift<ValueSet<Value[]>>;
 export declare const ValueSetTop: ValueSet<typeof Top>;

package/dataflow/eval/values/sets/set-constants.js

@@ -10,6 +10,9 @@ function flattenSetElements(s) {
         return e.type === 'set' ? flattenSetElements(e.elements) : e;
     });
 }
+/**
+ *
+ */
 function setFrom(...elements) {
     const vals = elements.flatMap(e => {
         return e.type === 'set' ? flattenSetElements(e.elements) : e;
@@ -19,6 +22,9 @@ function setFrom(...elements) {
         elements: vals
     };
 }
+/**
+ *
+ */
 function isSet(element) {
     return element.type === 'set';
 }

package/dataflow/eval/values/string/string-constants.d.ts

@@ -1,7 +1,22 @@
 import type { RStringValue } from '../../../../r-bridge/lang-4.x/convert-values';
-import type { Lift, Value, ValueString } from '../r-value';
+import { type Lift, type Value, type ValueString } from '../r-value';
+/**
+ * Lift a raw string or R string value into a ValueString.
+ * @see {@link liftString} - for lifting a Lift<RStringValue>
+ */
 export declare function stringFrom(str: RStringValue | string): ValueString;
+/**
+ * Lift a Lift<RStringValue> into a ValueString.
+ * @see {@link stringFrom} - for lifting a raw string or R string value.
+ */
 export declare function liftString(str: Lift<RStringValue>): ValueString;
+/**
+ * Collect strings from an array of ValueString.
+ * If any value is not a string, or is Bottom/Top, undefined is returned.
+ * @param a           - The array of Value to collect strings from.
+ * @param withQuotes  - Whether to include the quotes in the returned strings.
+ * @returns           - An array of strings, or undefined if any value is not a string.
+ */
 export declare function collectStrings(a: Value[], withQuotes?: boolean): string[] | undefined;
 export declare const ValueEmptyString: ValueString<Lift<RStringValue>>;
 export declare const ValueStringTop: ValueString<Lift<RStringValue>>;

package/dataflow/eval/values/string/string-constants.js

@@ -6,6 +6,10 @@ exports.liftString = liftString;
 exports.collectStrings = collectStrings;
 const general_1 = require("../general");
 const r_value_1 = require("../r-value");
+/**
+ * Lift a raw string or R string value into a ValueString.
+ * @see {@link liftString} - for lifting a Lift<RStringValue>
+ */
 function stringFrom(str) {
     return {
         type: 'string',
@@ -15,12 +19,23 @@ function stringFrom(str) {
         } : str,
     };
 }
+/**
+ * Lift a Lift<RStringValue> into a ValueString.
+ * @see {@link stringFrom} - for lifting a raw string or R string value.
+ */
 function liftString(str) {
     return {
         type: 'string',
         value: str
     };
 }
+/**
+ * Collect strings from an array of ValueString.
+ * If any value is not a string, or is Bottom/Top, undefined is returned.
+ * @param a           - The array of Value to collect strings from.
+ * @param withQuotes  - Whether to include the quotes in the returned strings.
+ * @returns           - An array of strings, or undefined if any value is not a string.
+ */
 function collectStrings(a, withQuotes = false) {
     if ((0, general_1.bottomTopGuard)(a)) {
         return undefined;

package/dataflow/eval/values/vectors/vector-constants.d.ts

@@ -1,4 +1,4 @@
-import type { Lift, Value, ValueVector } from '../r-value';
+import { type Lift, type Value, type ValueVector } from '../r-value';
 /**
  * Creates an abstract vector from abstract values
  * @param elements - elements that the vector should contain

package/dataflow/extractor.d.ts

@@ -1,10 +1,9 @@
 import type { DataflowInformation } from './info';
-import type { DataflowProcessors } from './processor';
+import { type DataflowProcessors } from './processor';
 import type { NormalizedAst, ParentInformation } from '../r-bridge/lang-4.x/ast/model/processing/decorate';
-import type { RParseRequests } from '../r-bridge/retriever';
 import type { KnownParserType, Parser } from '../r-bridge/parser';
 import type { ControlFlowInformation } from '../control-flow/control-flow-graph';
-import type { FlowrConfigOptions } from '../config';
+import type { FlowrAnalyzerContext } from '../project/context/flowr-analyzer-context';
 /**
  * The best friend of {@link produceDataFlowGraph} and {@link processDataflowFor}.
  * Maps every {@link RType} in the normalized AST to a processor.
@@ -16,6 +15,6 @@ export declare const processors: DataflowProcessors<ParentInformation>;
  * (e.g., in the event of a `source` call).
  * For the actual, canonical fold entry point, see {@link processDataflowFor}.
  */
-export declare function produceDataFlowGraph<OtherInfo>(parser: Parser<KnownParserType>, request: RParseRequests, completeAst: NormalizedAst<OtherInfo & ParentInformation>, config: FlowrConfigOptions): DataflowInformation & {
+export declare function produceDataFlowGraph<OtherInfo>(parser: Parser<KnownParserType>, completeAst: NormalizedAst<OtherInfo & ParentInformation>, ctx: FlowrAnalyzerContext): DataflowInformation & {
     cfgQuick: ControlFlowInformation | undefined;
 };

package/dataflow/extractor.js

@@ -21,6 +21,7 @@ const edge_1 = require("./graph/edge");
 const identify_link_to_last_call_relation_1 = require("../queries/catalog/call-context-query/identify-link-to-last-call-relation");
 const built_in_function_definition_1 = require("./internal/process/functions/call/built-in/built-in-function-definition");
 const built_in_config_1 = require("./environments/built-in-config");
+const flowr_file_1 = require("../project/context/flowr-file");
 /**
  * The best friend of {@link produceDataFlowGraph} and {@link processDataflowFor}.
  * Maps every {@link RType} in the normalized AST to a processor.
@@ -60,13 +61,24 @@ exports.processors = {
 };
 function resolveLinkToSideEffects(ast, graph) {
     let cf = undefined;
+    let knownCalls;
+    const handled = new Set();
     for (const s of graph.unknownSideEffects) {
         if (typeof s !== 'object') {
             continue;
         }
-        cf ??= (0, extract_cfg_1.extractCfgQuick)(ast);
+        if (cf === undefined) {
+            cf = (0, extract_cfg_1.extractCfgQuick)(ast);
+            if (graph.unknownSideEffects.size > 20) {
+                knownCalls = (0, extract_cfg_1.getCallsInCfg)(cf, graph);
+            }
+        }
+        else if (handled.has(s.id)) {
+            continue;
+        }
+        handled.add(s.id);
         /* this has to change whenever we add a new link to relations because we currently offer no abstraction for the type */
-        const potentials = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(s.id, cf?.graph, graph, s.linkTo);
+        const potentials = (0, identify_link_to_last_call_relation_1.identifyLinkToLastCallRelation)(s.id, cf.graph, graph, s.linkTo, knownCalls);
         for (const pot of potentials) {
             graph.addEdge(s.id, pot, edge_1.EdgeType.Reads);
         }
@@ -82,36 +94,27 @@ function resolveLinkToSideEffects(ast, graph) {
  * (e.g., in the event of a `source` call).
  * For the actual, canonical fold entry point, see {@link processDataflowFor}.
  */
-function produceDataFlowGraph(parser, request, completeAst, config) {
-    let firstRequest;
-    const multifile = Array.isArray(request);
-    if (multifile) {
-        firstRequest = request[0];
-    }
-    else {
-        firstRequest = request;
-    }
-    const builtInsConfig = config.semantics.environment.overwriteBuiltIns;
+function produceDataFlowGraph(parser, completeAst, ctx) {
+    const builtInsConfig = ctx.config.semantics.environment.overwriteBuiltIns;
     const builtIns = (0, built_in_config_1.getBuiltInDefinitions)(builtInsConfig.definitions, builtInsConfig.loadDefaults);
     const env = (0, environment_1.initializeCleanEnvironments)(builtIns.builtInMemory);
+    // we freeze the files here to avoid endless modifications during processing
+    const files = completeAst.ast.files.slice();
+    ctx.files.addConsideredFile(files[0].filePath ? files[0].filePath : flowr_file_1.FlowrFile.INLINE_PATH);
     const dfData = {
         parser,
         completeAst,
         environment: env,
         builtInEnvironment: env.current.parent,
         processors: exports.processors,
-        currentRequest: firstRequest,
         controlDependencies: undefined,
-        referenceChain: [firstRequest],
-        flowrConfig: config
+        referenceChain: [files[0].filePath],
+        ctx
     };
-    let df = (0, processor_1.processDataflowFor)(completeAst.ast, dfData);
-    df.graph.sourced.unshift(firstRequest.request === 'file' ? firstRequest.content : '<inline>');
-    if (multifile) {
-        for (let i = 1; i < request.length; i++) {
-            /* source requests register automatically */
-            df = (0, built_in_source_1.standaloneSourceFile)(request[i], dfData, `root-${i}`, df);
-        }
+    let df = (0, processor_1.processDataflowFor)(files[0].root, dfData);
+    for (let i = 1; i < files.length; i++) {
+        /* source requests register automatically */
+        df = (0, built_in_source_1.standaloneSourceFile)(i, files[i], dfData, df);
     }
     // finally, resolve linkages
     (0, built_in_function_definition_1.updateNestedFunctionCalls)(df.graph, df.environment);