@eagleoutice/flowr 2.1.3 → 2.1.5

package/r-bridge/shell-executor.js

@@ -16,7 +16,7 @@ class RShellExecutor {
     options;
     prerequisites;
     constructor(options) {
-        this.options = (0, objects_1.deepMergeObject)(shell_1.DEFAULT_R_SHELL_OPTIONS, options);
+        this.options = (0, objects_1.deepMergeObject)((0, shell_1.getDefaultRShellOptions)(), options);
         this.prerequisites = [(0, init_1.initCommand)(this.options.eol)];
     }
     addPrerequisites(commands) {

package/r-bridge/shell.d.ts

@@ -66,8 +66,7 @@ export interface RShellOptions extends RShellSessionOptions {
     readonly sessionName: string;
 }
 export declare const DEFAULT_R_PATH: string;
-export declare const DEFAULT_R_SHELL_EXEC_OPTIONS: RShellExecutionOptions;
-export declare const DEFAULT_R_SHELL_OPTIONS: RShellOptions;
+export declare function getDefaultRShellOptions(): RShellOptions;
 /**
  * The `RShell` represents an interactive session with the R interpreter.
  * You can configure it by {@link RShellOptions}.

package/r-bridge/shell.js

@@ -26,7 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RShell = exports.DEFAULT_R_SHELL_OPTIONS = exports.DEFAULT_R_SHELL_EXEC_OPTIONS = exports.DEFAULT_R_PATH = exports.DEFAULT_OUTPUT_COLLECTOR_CONFIGURATION = void 0;
+exports.RShell = exports.DEFAULT_R_PATH = exports.DEFAULT_OUTPUT_COLLECTOR_CONFIGURATION = void 0;
+exports.getDefaultRShellOptions = getDefaultRShellOptions;
 const child_process_1 = require("child_process");
 const objects_1 = require("../util/objects");
 const readline = __importStar(require("readline"));
@@ -49,22 +50,25 @@ exports.DEFAULT_OUTPUT_COLLECTOR_CONFIGURATION = {
     errorStopsWaiting: true
 };
 exports.DEFAULT_R_PATH = (0, os_1.getPlatform)() === 'windows' ? 'R.exe' : 'R';
-exports.DEFAULT_R_SHELL_EXEC_OPTIONS = {
-    pathToRExecutable: (0, config_1.getConfig)().rPath ?? exports.DEFAULT_R_PATH,
-    // -s is a short form of --no-echo (and the old version --slave), but this one works in R 3 and 4
-    // (see https://github.com/wch/r-source/commit/f1ff49e74593341c74c20de9517f31a22c8bcb04)
-    commandLineOptions: ['--vanilla', '--quiet', '--no-save', '-s'],
-    cwd: process.cwd(),
-    env: undefined,
-    eol: '\n',
-    homeLibPath: (0, os_1.getPlatform)() === 'windows' ? undefined : '~/.r-libs'
-};
-exports.DEFAULT_R_SHELL_OPTIONS = {
-    ...exports.DEFAULT_R_SHELL_EXEC_OPTIONS,
-    sessionName: 'default',
-    revive: 0 /* RShellReviveOptions.Never */,
-    onRevive: () => { }
-};
+let DEFAULT_R_SHELL_OPTIONS = undefined;
+function getDefaultRShellOptions() {
+    if (!DEFAULT_R_SHELL_OPTIONS) {
+        DEFAULT_R_SHELL_OPTIONS = {
+            pathToRExecutable: (0, config_1.getConfig)().rPath ?? exports.DEFAULT_R_PATH,
+            // -s is a short form of --no-echo (and the old version --slave), but this one works in R 3 and 4
+            // (see https://github.com/wch/r-source/commit/f1ff49e74593341c74c20de9517f31a22c8bcb04)
+            commandLineOptions: ['--vanilla', '--quiet', '--no-save', '-s'],
+            cwd: process.cwd(),
+            env: undefined,
+            eol: '\n',
+            homeLibPath: (0, os_1.getPlatform)() === 'windows' ? undefined : '~/.r-libs',
+            sessionName: 'default',
+            revive: 0 /* RShellReviveOptions.Never */,
+            onRevive: () => { }
+        };
+    }
+    return DEFAULT_R_SHELL_OPTIONS;
+}
 /**
  * The `RShell` represents an interactive session with the R interpreter.
  * You can configure it by {@link RShellOptions}.
@@ -81,7 +85,7 @@ class RShell {
     // should never be more than one, but let's be sure
     tempDirs = new Set();
     constructor(options) {
-        this.options = { ...exports.DEFAULT_R_SHELL_OPTIONS, ...options };
+        this.options = { ...getDefaultRShellOptions(), ...options };
         this.log = log_1.log.getSubLogger({ name: this.options.sessionName });
         this.session = new RShellSession(this.options, this.log);
         this.revive();

package/slicing/static/static-slicer.js

@@ -43,7 +43,9 @@ function staticSlicing(graph, { idMap }, criteria, threshold = 75) {
          * include all the implicit side effects that we have to consider as we are unable to narrow them down
          */
         for (const id of graph.unknownSideEffects) {
-            queue.add(id, emptyEnv, basePrint, true);
+            if (typeof id !== 'object') { /* otherwise, their target is just missing */
+                queue.add(id, emptyEnv, basePrint, true);
+            }
         }
     }
     while (queue.nonEmpty()) {

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

@@ -84,7 +84,7 @@ function visitCalls(info, input) {
                 hasCallsEdge ? 1 : 0
             ]);
         }
-        classifyArguments(node.arguments.map(unpack_argument_1.unpackArgument), info.args);
+        classifyArguments(node.arguments.map(e => (0, unpack_argument_1.unpackArgument)(e)), info.args);
         calls.push(node);
     }, node => {
         // drop again :D

package/{documentation/doc-util/doc-hover-over.js → util/html-hover-over.js}

@@ -4,4 +4,4 @@ exports.textWithTooltip = textWithTooltip;
 function textWithTooltip(text, tooltip) {
     return tooltip ? `<span title=${JSON.stringify(tooltip)}>${text}</span>` : text;
 }
-//# sourceMappingURL=doc-hover-over.js.map
+//# sourceMappingURL=html-hover-over.js.map

package/util/json.d.ts

@@ -1,2 +1,3 @@
-export declare function jsonReplacer(key: any, value: any): any;
+export declare function jsonReplacer(key: unknown, value: unknown): unknown;
 export declare function jsonBigIntRetriever(key: string, value: unknown): unknown;
+export declare function superBigJsonStringify(obj: unknown, end: string, send: (s: string) => void): void;

package/util/json.js

@@ -1,11 +1,16 @@
 "use strict";
+// to get the types within JSON.stringify
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsonReplacer = jsonReplacer;
 exports.jsonBigIntRetriever = jsonBigIntRetriever;
-// to get the types within JSON.stringify
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.superBigJsonStringify = superBigJsonStringify;
+const environment_1 = require("../dataflow/environments/environment");
 function jsonReplacer(key, value) {
-    if (value instanceof Map || value instanceof Set) {
+    if (key === 'fullLexeme') {
+        return undefined;
+    }
+    else if (value instanceof Map || value instanceof Set) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return [...value];
     }
@@ -24,4 +29,97 @@ function jsonBigIntRetriever(key, value) {
         return value;
     }
 }
+function superBigJsonStringify(obj, end, send) {
+    try {
+        const tryOut = JSON.stringify(obj, jsonReplacer) + end;
+        send(tryOut);
+    }
+    catch {
+        /* let's try the sad path! */
+        const remainder = bigStringify(obj, '', send);
+        send(remainder + end);
+    }
+}
+function bigStringify(obj, current, send) {
+    if (current.length > 20_000) {
+        send(current);
+        current = '';
+    }
+    if (obj === undefined || obj === null) {
+        return current + 'null';
+    }
+    else if (obj === environment_1.BuiltInEnvironment) {
+        return current + '<BuiltInEnvironment>';
+    }
+    else if (obj === environment_1.EmptyBuiltInEnvironment) {
+        return current + '<EmptyBuiltInEnvironment>';
+    }
+    else if (Array.isArray(obj)) {
+        let str = current + '[';
+        for (let i = 0; i < obj.length; i++) {
+            if (i > 0) {
+                str += ',';
+            }
+            str = bigStringify(obj[i], str, send);
+            if (str.length > 20_000) {
+                send(str);
+                str = '';
+            }
+        }
+        return str + ']';
+    }
+    else if (obj instanceof Map || obj instanceof Set) {
+        let str = current + '[';
+        let i = 0;
+        for (const value of obj) {
+            if (i++ > 0) {
+                str += ',';
+            }
+            str = bigStringify(value, str, send);
+            if (str.length > 20_000) {
+                send(str);
+                str = '';
+            }
+        }
+        return str + ']';
+    }
+    else if (typeof obj === 'bigint') {
+        return current + `${obj.toString()}n`;
+    }
+    else if (obj instanceof Date) {
+        return current + `"${obj.toISOString()}"`;
+    }
+    else if (obj instanceof RegExp) {
+        return current + `"${obj.toString()}"`;
+    }
+    else if (typeof obj === 'object') {
+        let str = current + '{';
+        let i = 0;
+        for (const key in obj) {
+            if (Object.hasOwn(obj, key)) {
+                // @ts-expect-error - We know that obj[key] is not undefined, it its own property
+                const value = obj[key];
+                if (value === undefined || typeof value === 'function' || typeof value === 'symbol' || key === 'info') {
+                    continue;
+                }
+                if (i++ > 0) {
+                    str += ',';
+                }
+                str += `"${key}":`;
+                str = bigStringify(value, str, send);
+                if (str.length > 20_000) {
+                    send(str);
+                    str = '';
+                }
+            }
+        }
+        return str + '}';
+    }
+    else if (typeof obj === 'function' || typeof obj === 'symbol') {
+        return current + 'null'; // Optionally skip functions and symbols
+    }
+    else {
+        return current + JSON.stringify(obj, environment_1.builtInEnvJsonReplacer);
+    }
+}
 //# sourceMappingURL=json.js.map

package/util/objects.d.ts

@@ -19,6 +19,7 @@ type Defined<T> = Exclude<T, undefined>;
 type DefinedRecord<T> = {
     [K in keyof T as T[K] extends undefined ? never : K]: Defined<T[K]>;
 };
-/** from a record take only the keys that are not undefined */
 export declare function compactRecord<T extends Record<string, unknown>>(record: T): DefinedRecord<T>;
+export declare function compactRecord(record: undefined): undefined;
+export declare function compactRecord<T extends Record<string, unknown>>(record: T | undefined): DefinedRecord<T> | undefined;
 export {};

package/util/objects.js

@@ -63,6 +63,9 @@ function assertSameType(base, addon) {
 }
 /** from a record take only the keys that are not undefined */
 function compactRecord(record) {
+    if (record === undefined) {
+        return undefined;
+    }
     const result = {};
     for (const key of Object.keys(record)) {
         if (record[key] !== undefined) {

package/util/version.js

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

package/queries/query-schema.d.ts

@@ -1,13 +0,0 @@
-import Joi from 'joi';
-export declare const CallContextQuerySchema: Joi.ObjectSchema<any>;
-export declare const DataflowQuerySchema: Joi.ObjectSchema<any>;
-export declare const IdMapQuerySchema: Joi.ObjectSchema<any>;
-export declare const NormalizedAstQuerySchema: Joi.ObjectSchema<any>;
-export declare const DataflowClusterQuerySchema: Joi.ObjectSchema<any>;
-export declare const StaticSliceQuerySchema: Joi.ObjectSchema<any>;
-export declare const LineageQuerySchema: Joi.ObjectSchema<any>;
-export declare const SupportedQueriesSchema: Joi.AlternativesSchema<any>;
-export declare const CompoundQuerySchema: Joi.ObjectSchema<any>;
-export declare const VirtualQuerySchema: Joi.AlternativesSchema<any>;
-export declare const AnyQuerySchema: Joi.AlternativesSchema<any>;
-export declare const QueriesSchema: Joi.ArraySchema<any[]>;

package/queries/query-schema.js

@@ -1,54 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueriesSchema = exports.AnyQuerySchema = exports.VirtualQuerySchema = exports.CompoundQuerySchema = exports.SupportedQueriesSchema = exports.LineageQuerySchema = exports.StaticSliceQuerySchema = exports.DataflowClusterQuerySchema = exports.NormalizedAstQuerySchema = exports.IdMapQuerySchema = exports.DataflowQuerySchema = exports.CallContextQuerySchema = void 0;
-const joi_1 = __importDefault(require("joi"));
-const call_context_query_format_1 = require("./catalog/call-context-query/call-context-query-format");
-exports.CallContextQuerySchema = joi_1.default.object({
-    type: joi_1.default.string().valid('call-context').required().description('The type of the query.'),
-    callName: joi_1.default.string().required().description('Regex regarding the function name!'),
-    callNameExact: joi_1.default.boolean().optional().description('Should we automatically add the `^` and `$` anchors to the regex to make it an exact match?'),
-    kind: joi_1.default.string().optional().description('The kind of the call, this can be used to group calls together (e.g., linking `plot` to `visualize`). Defaults to `.`'),
-    subkind: joi_1.default.string().optional().description('The subkind of the call, this can be used to uniquely identify the respective call type when grouping the output (e.g., the normalized name, linking `ggplot` to `plot`). Defaults to `.`'),
-    callTargets: joi_1.default.string().valid(...Object.values(call_context_query_format_1.CallTargets)).optional().description('Call targets the function may have. This defaults to `any`. Request this specifically to gain all call targets we can resolve.'),
-    includeAliases: joi_1.default.boolean().optional().description('Consider a case like `f <- function_of_interest`, do you want uses of `f` to be included in the results?'),
-    linkTo: joi_1.default.object({
-        type: joi_1.default.string().valid('link-to-last-call').required().description('The type of the linkTo sub-query.'),
-        callName: joi_1.default.string().required().description('Regex regarding the function name of the last call. Similar to `callName`, strings are interpreted as a regular expression.')
-    }).optional().description('Links the current call to the last call of the given kind. This way, you can link a call like `points` to the latest graphics plot etc.')
-}).description('Call context query used to find calls in the dataflow graph');
-exports.DataflowQuerySchema = joi_1.default.object({
-    type: joi_1.default.string().valid('dataflow').required().description('The type of the query.'),
-}).description('The dataflow query simply returns the dataflow graph, there is no need to pass it multiple times!');
-exports.IdMapQuerySchema = joi_1.default.object({
-    type: joi_1.default.string().valid('id-map').required().description('The type of the query.'),
-}).description('The id map query retrieves the id map from the normalized AST.');
-exports.NormalizedAstQuerySchema = joi_1.default.object({
-    type: joi_1.default.string().valid('normalized-ast').required().description('The type of the query.'),
-}).description('The normalized AST query simply returns the normalized AST, there is no need to pass it multiple times!');
-exports.DataflowClusterQuerySchema = joi_1.default.object({
-    type: joi_1.default.string().valid('dataflow-cluster').required().description('The type of the query.'),
-}).description('The cluster query calculates and returns all clusters in the dataflow graph.');
-exports.StaticSliceQuerySchema = joi_1.default.object({
-    type: joi_1.default.string().valid('static-slice').required().description('The type of the query.'),
-    criteria: joi_1.default.array().items(joi_1.default.string()).min(0).required().description('The slicing criteria to use.'),
-    noReconstruction: joi_1.default.boolean().optional().description('Do not reconstruct the slice into readable code.'),
-    noMagicComments: joi_1.default.boolean().optional().description('Should the magic comments (force-including lines within the slice) be ignored?')
-}).description('Slice query used to slice the dataflow graph');
-exports.LineageQuerySchema = joi_1.default.object({
-    type: joi_1.default.string().valid('lineage').required().description('The type of the query.'),
-    id: joi_1.default.string().required().description('The ID of the node to get the lineage of.')
-}).description('Lineage query used to find the lineage of a node in the dataflow graph');
-exports.SupportedQueriesSchema = joi_1.default.alternatives(exports.CallContextQuerySchema, exports.DataflowQuerySchema, exports.IdMapQuerySchema, exports.NormalizedAstQuerySchema, exports.DataflowClusterQuerySchema, exports.StaticSliceQuerySchema, exports.LineageQuerySchema).description('Supported queries');
-exports.CompoundQuerySchema = joi_1.default.object({
-    type: joi_1.default.string().valid('compound').required().description('The type of the query.'),
-    query: joi_1.default.string().required().description('The query to run on the file analysis information.'),
-    commonArguments: joi_1.default.object().required().description('Common arguments for all queries.'),
-    arguments: joi_1.default.array().items(joi_1.default.object()).required().description('Arguments for each query.')
-}).description('Compound query used to combine queries of the same type');
-exports.VirtualQuerySchema = joi_1.default.alternatives(exports.CompoundQuerySchema).description('Virtual queries (used for structure)');
-exports.AnyQuerySchema = joi_1.default.alternatives(exports.SupportedQueriesSchema, exports.VirtualQuerySchema).description('Any query');
-exports.QueriesSchema = joi_1.default.array().items(exports.AnyQuerySchema).description('Queries to run on the file analysis information (in the form of an array)');
-//# sourceMappingURL=query-schema.js.map