@eagleoutice/flowr 1.3.13 → 1.4.1

package/r-bridge/shell-executor.js

@@ -0,0 +1,119 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RShellExecutor = void 0;
+const shell_1 = require("./shell");
+const objects_1 = require("../util/objects");
+const child_process_1 = require("child_process");
+const lang_4_x_1 = require("./lang-4.x");
+const preload_1 = __importDefault(require("semver/preload"));
+const log_1 = require("../util/log");
+const fs_1 = __importDefault(require("fs"));
+const retriever_1 = require("./retriever");
+class RShellExecutor {
+    options;
+    log;
+    prerequisites = [];
+    constructor(options) {
+        this.options = (0, objects_1.deepMergeObject)(shell_1.DEFAULT_R_SHELL_OPTIONS, options);
+        this.log = log_1.log.getSubLogger({ name: 'RShellExecutor' });
+    }
+    continueOnError() {
+        this.log.info('continue in case of Errors');
+        this.addPrerequisites('options(error=function() {})');
+        return this;
+    }
+    injectLibPaths(...paths) {
+        this.log.debug(`injecting lib paths ${JSON.stringify(paths)}`);
+        this.addPrerequisites(`.libPaths(c(.libPaths(), ${paths.map(lang_4_x_1.ts2r).join(',')}))`);
+        return this;
+    }
+    tryToInjectHomeLibPath() {
+        if (this.options.homeLibPath === undefined) {
+            this.log.debug('ensuring home lib path exists (automatic inject)');
+            this.addPrerequisites([
+                'if(!dir.exists(Sys.getenv("R_LIBS_USER"))) { dir.create(path=Sys.getenv("R_LIBS_USER"),showWarnings=FALSE,recursive=TRUE) }',
+                '.libPaths(c(.libPaths(), Sys.getenv("R_LIBS_USER")))'
+            ]);
+        }
+        else {
+            this.injectLibPaths(this.options.homeLibPath);
+        }
+        return this;
+    }
+    addPrerequisites(commands) {
+        this.prerequisites.push(...(typeof commands == 'string' ? [commands] : commands));
+        return this;
+    }
+    usedRVersion() {
+        const version = this.run(`cat(paste0(R.version$major,".",R.version$minor), ${(0, lang_4_x_1.ts2r)(this.options.eol)})`);
+        this.log.trace(`raw version: ${JSON.stringify(version)}`);
+        return preload_1.default.coerce(version);
+    }
+    allInstalledPackages() {
+        this.log.debug('getting all installed packages');
+        const packages = this.run(`cat(paste0(installed.packages()[,1], collapse=","),"${this.options.eol}")`);
+        return packages.split(',');
+    }
+    isPackageInstalled(packageName) {
+        this.log.debug(`checking if package "${packageName}" is installed`);
+        return this.run(`cat(system.file(package="${packageName}")!="","${this.options.eol}")`) === 'TRUE';
+    }
+    ensurePackageInstalled(packageName, autoload = false, force = false) {
+        const packageExistedAlready = this.isPackageInstalled(packageName);
+        if (!force && packageExistedAlready) {
+            this.log.info(`package "${packageName}" is already installed`);
+            if (autoload)
+                this.addPrerequisites(`library(${(0, lang_4_x_1.ts2r)(packageName)})`);
+            return { packageName, packageExistedAlready };
+        }
+        const tempDir = this.obtainTempDir();
+        this.log.debug(`using temporary directory: "${tempDir}" to install package "${packageName}"`);
+        this.run(`install.packages(${(0, lang_4_x_1.ts2r)(packageName)},repos="https://cloud.r-project.org/",quiet=FALSE,lib=temp)`);
+        if (autoload)
+            this.addPrerequisites(`library(${(0, lang_4_x_1.ts2r)(packageName)},lib.loc=temp)`);
+        return { packageName, packageExistedAlready, libraryLocation: tempDir };
+    }
+    obtainTempDir() {
+        const tempDir = this.run([
+            'temp <- tempdir()',
+            `cat(temp, ${(0, lang_4_x_1.ts2r)(this.options.eol)})`
+        ]);
+        log_1.log.info(`obtained temp dir ${tempDir}`);
+        const deleteOnExit = function () {
+            if (fs_1.default.existsSync(tempDir)) {
+                log_1.log.info(`deleting temp dir ${tempDir}`);
+                fs_1.default.rmSync(tempDir, { recursive: true, force: true });
+            }
+        };
+        process.on('SIGINT', deleteOnExit);
+        process.on('SIGTERM', deleteOnExit);
+        return tempDir;
+    }
+    getTokenMap() {
+        this.ensurePackageInstalled('xmlparsedata', true);
+        // we invert the token map to get a mapping back from the replacement
+        const parsed = (0, lang_4_x_1.parseCSV)(this.run('write.table(xmlparsedata::xml_parse_token_map,sep=",",col.names=FALSE)').split('\n'));
+        if (parsed.some(s => s.length !== 2))
+            throw new Error(`Expected two columns in token map, but got ${JSON.stringify(parsed)}`);
+        // we swap key and value to get the other direction, furthermore we remove quotes from keys if they are quoted
+        const ret = {};
+        for (const [key, value] of parsed)
+            ret[value] = (0, retriever_1.removeTokenMapQuotationMarks)(key);
+        return ret;
+    }
+    run(commands, returnErr = false) {
+        this.log.trace(`> ${JSON.stringify(commands)}`);
+        const returns = (0, child_process_1.spawnSync)(this.options.pathToRExecutable, this.options.commandLineOptions, {
+            env: this.options.env,
+            cwd: this.options.cwd,
+            encoding: 'utf8',
+            input: [...this.prerequisites, commands].join(this.options.eol)
+        });
+        return (returnErr ? returns.stderr : returns.stdout).trim();
+    }
+}
+exports.RShellExecutor = RShellExecutor;
+//# sourceMappingURL=shell-executor.js.map

package/r-bridge/shell.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { type MergeableRecord } from '../util/objects';
-import { SemVer } from 'semver';
-import { TokenMap } from './retriever';
+import type { SemVer } from 'semver';
+import type { TokenMap } from './retriever';
 export type OutputStreamSelector = 'stdout' | 'stderr' | 'both';
 export interface CollectorTimeout extends MergeableRecord {
     /**
@@ -33,7 +33,7 @@ export interface OutputCollectorConfiguration extends MergeableRecord {
     automaticallyTrimOutput: boolean;
 }
 export declare const DEFAULT_OUTPUT_COLLECTOR_CONFIGURATION: OutputCollectorConfiguration;
-export interface RShellSessionOptions extends MergeableRecord {
+export interface RShellExecutionOptions extends MergeableRecord {
     /** The path to the R executable, can be only the executable if it is to be found on the PATH. */
     readonly pathToRExecutable: string;
     /** Command line options to use when starting the R session. */
@@ -44,12 +44,14 @@ export interface RShellSessionOptions extends MergeableRecord {
     readonly eol: string;
     /** The environment variables available in the R session. */
     readonly env: NodeJS.ProcessEnv;
+    /** The path to the library directory, use undefined to let R figure that out for itself */
+    readonly homeLibPath: string | undefined;
+}
+export interface RShellSessionOptions extends RShellExecutionOptions {
     /** If set, the R session will be restarted if it exits due to an error */
     readonly revive: 'never' | 'on-error' | 'always';
     /** Called when the R session is restarted, this makes only sense if `revive` is not set to `'never'` */
     readonly onRevive: (code: number, signal: string | null) => void;
-    /** The path to the library directory, use undefined to let R figure that out for itself */
-    readonly homeLibPath: string | undefined;
 }
 /**
  * Configuration of an {@link RShell} instance.
@@ -58,6 +60,7 @@ export interface RShellSessionOptions extends MergeableRecord {
 export interface RShellOptions extends RShellSessionOptions {
     readonly sessionName: string;
 }
+export declare const DEFAULT_R_SHELL_EXEC_OPTIONS: RShellExecutionOptions;
 export declare const DEFAULT_R_SHELL_OPTIONS: RShellOptions;
 /**
  * The `RShell` represents an interactive session with the R interpreter.

package/r-bridge/shell.js

@@ -26,7 +26,7 @@ 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_OUTPUT_COLLECTOR_CONFIGURATION = void 0;
+exports.RShell = exports.DEFAULT_R_SHELL_OPTIONS = exports.DEFAULT_R_SHELL_EXEC_OPTIONS = exports.DEFAULT_OUTPUT_COLLECTOR_CONFIGURATION = void 0;
 const child_process_1 = require("child_process");
 const objects_1 = require("../util/objects");
 const readline = __importStar(require("node:readline"));
@@ -47,14 +47,17 @@ exports.DEFAULT_OUTPUT_COLLECTOR_CONFIGURATION = {
     automaticallyTrimOutput: true,
     errorStopsWaiting: true
 };
-exports.DEFAULT_R_SHELL_OPTIONS = {
-    sessionName: 'default',
+exports.DEFAULT_R_SHELL_EXEC_OPTIONS = {
     pathToRExecutable: (0, os_1.getPlatform)() === 'windows' ? 'R.exe' : 'R',
     commandLineOptions: ['--vanilla', '--quiet', '--no-echo', '--no-save'],
     cwd: process.cwd(),
     env: process.env,
     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: 'never',
     onRevive: () => { }
 };

package/reconstruct/reconstruct.d.ts

@@ -3,7 +3,7 @@
  * as the file itself is way too long). See {@link reconstructToCode}.
  * @module
  */
-import { NormalizedAst, NodeId, ParentInformation, RNode } from '../r-bridge';
+import type { NormalizedAst, NodeId, ParentInformation, RNode } from '../r-bridge';
 type Selection = Set<NodeId>;
 export declare const reconstructLogger: import("tslog").Logger<import("tslog").ILogObj>;
 /** The structure of the predicate that should be used to determine if a given normalized node should be included in the reconstructed code independent of if it is selected by the slice or not */

package/slicing/criterion/collect-all.d.ts

@@ -3,9 +3,9 @@
  * This module provides a function to collect all slicing criteria.
  * @module
  */
-import { MergeableRecord } from '../../util/objects';
-import { NodeId, RNodeWithParent } from '../../r-bridge';
-import { SlicingCriteria } from './parse';
+import type { MergeableRecord } from '../../util/objects';
+import type { NodeId, RNodeWithParent } from '../../r-bridge';
+import type { SlicingCriteria } from './parse';
 /**
  * Defines the filter for collecting all possible slicing criteria.
  * @see DefaultAllVariablesFilter

package/slicing/criterion/filters/all-variables.d.ts

@@ -1,2 +1,2 @@
-import { SlicingCriteriaFilter } from '../collect-all';
+import type { SlicingCriteriaFilter } from '../collect-all';
 export declare const DefaultAllVariablesFilter: SlicingCriteriaFilter;

package/slicing/criterion/parse.d.ts

@@ -1,4 +1,4 @@
-import { NormalizedAst, NodeId, NoInfo, ParentInformation } from '../../r-bridge';
+import type { NormalizedAst, NodeId, NoInfo, ParentInformation } from '../../r-bridge';
 /** Either `line:column`, `line@variable-name`, or `$id` */
 export type SingleSlicingCriterion = `${number}:${number}` | `${number}@${string}` | `$${number}`;
 export type SlicingCriteria = SingleSlicingCriterion[];

package/slicing/static/static-slicer.d.ts

@@ -1,6 +1,6 @@
-import { DataflowGraph } from '../../dataflow';
-import { NodeId, NormalizedAst } from '../../r-bridge';
-import { DecodedCriteria, SlicingCriteria } from '../criterion';
+import type { DataflowGraph } from '../../dataflow';
+import type { NodeId, NormalizedAst } from '../../r-bridge';
+import type { DecodedCriteria, SlicingCriteria } from '../criterion';
 export declare const slicerLogger: import("tslog").Logger<import("tslog").ILogObj>;
 /**
  * The result of the slice step

package/statistics/features/common-syntax-probability.d.ts

@@ -1,8 +1,9 @@
 /**
  * Defines the type of syntax constructs that we track (e.g., true, false, 0, 1, T, F, conditions...)
  */
-import { RFalse, RNodeWithParent, RTrue } from '../../r-bridge';
-import { SummarizedMeasurement } from '../../util/summarizer/benchmark/data';
+import type { RNodeWithParent } from '../../r-bridge';
+import { RFalse, RTrue } from '../../r-bridge';
+import type { SummarizedMeasurement } from '../../util/summarizer/benchmark/data';
 export interface CommonSyntaxTypeCounts<Measurement = bigint> {
     total: Measurement;
     multiple: Measurement;

package/statistics/features/common-syntax-probability.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.summarizeCommonSyntaxTypeCounter = exports.appendCommonSyntaxTypeCounter = exports.updateCommonSyntaxTypeCounts = exports.emptyCommonSyntaxTypeCounts = void 0;
-/**
- * Defines the type of syntax constructs that we track (e.g., true, false, 0, 1, T, F, conditions...)
- */
 const r_bridge_1 = require("../../r-bridge");
 const process_1 = require("../../util/summarizer/benchmark/first-phase/process");
 const numbers_1 = require("../../util/numbers");

package/statistics/features/feature.d.ts

@@ -1,9 +1,9 @@
-import { EvalOptions } from 'xpath-ts2/src/parse-api';
-import { MergeableRecord } from '../../util/objects';
-import { NormalizedAst } from '../../r-bridge';
-import { DataflowInformation } from '../../dataflow/internal/info';
-import { MetaStatistics } from '../meta-statistics';
-import { StatisticsSummarizerConfiguration } from '../../util/summarizer/statistics/summarizer';
+import type { EvalOptions } from 'xpath-ts2/src/parse-api';
+import type { MergeableRecord } from '../../util/objects';
+import type { NormalizedAst } from '../../r-bridge';
+import type { DataflowInformation } from '../../dataflow/internal/info';
+import type { MetaStatistics } from '../meta-statistics';
+import type { StatisticsSummarizerConfiguration } from '../../util/summarizer/statistics/summarizer';
 /**
  * Maps each sub-feature name to the number of occurrences of that sub-feature.
  * Allows for one nesting level to denote hierarchical features.

package/statistics/features/post-processing.d.ts

@@ -1,5 +1,5 @@
-import { MergeableRecord } from '../../util/objects';
-import { StatisticsSummarizerConfiguration } from '../../util/summarizer/statistics/summarizer';
+import type { MergeableRecord } from '../../util/objects';
+import type { StatisticsSummarizerConfiguration } from '../../util/summarizer/statistics/summarizer';
 export interface SummarizedWithProject<Uniques = Set<string>, Count = number[]> {
     uniqueProjects: Uniques;
     uniqueFiles: Uniques;

package/statistics/features/supported/assignments/assignments.d.ts

@@ -1,5 +1,5 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
 declare const initialAssignmentInfo: {
     assignmentOperator: Record<string, bigint>;
     assigned: import("../../common-syntax-probability").CommonSyntaxTypeCounts<bigint>;

package/statistics/features/supported/assignments/post-process.d.ts

@@ -1,3 +1,3 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/comments/comments.d.ts

@@ -1,5 +1,5 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
 export declare const initialCommentInfo: {
     totalAmount: number;
     roxygenComments: number;

package/statistics/features/supported/comments/post-process.d.ts

@@ -1,3 +1,3 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/control-flow/control-flow.d.ts

@@ -1,5 +1,5 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
 declare const initialControlflowInfo: {
     ifThen: import("../../common-syntax-probability").CommonSyntaxTypeCounts<bigint>;
     thenBody: import("../../common-syntax-probability").CommonSyntaxTypeCounts<bigint>;

package/statistics/features/supported/control-flow/post-process.d.ts

@@ -1,3 +1,3 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/data-access/data-access.d.ts

@@ -1,6 +1,6 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
-import { CommonSyntaxTypeCounts } from '../../common-syntax-probability';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
+import type { CommonSyntaxTypeCounts } from '../../common-syntax-probability';
 declare const initialDataAccessInfo: {
     singleBracket: Record<number, bigint | CommonSyntaxTypeCounts<bigint>>;
     doubleBracket: Record<number, bigint | CommonSyntaxTypeCounts<bigint>>;

package/statistics/features/supported/data-access/post-process.d.ts

@@ -1,3 +1,3 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/defined-functions/defined-functions.d.ts

@@ -1,7 +1,7 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
-import { SourcePosition } from '../../../../util/range';
-import { MergeableRecord } from '../../../../util/objects';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
+import type { SourcePosition } from '../../../../util/range';
+import type { MergeableRecord } from '../../../../util/objects';
 declare const initialFunctionDefinitionInfo: {
     /** all, anonymous, assigned, non-assigned, ... */
     total: number;

package/statistics/features/supported/defined-functions/post-process.d.ts

@@ -1,5 +1,5 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 /**
  * Note: the summary does not contain a 0 for each function that is _not_ called by a file. Hence, the minimum can not be 0 (division for mean etc. will still be performed on total file count)
  */

package/statistics/features/supported/expression-list/expression-list.d.ts

@@ -1,5 +1,5 @@
-import { Writable } from 'ts-essentials';
-import { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
+import type { Feature } from '../../feature';
 declare const initialExpressionListInfo: {
     allExpressionLists: number;
     deepestNesting: number;

package/statistics/features/supported/expression-list/post-process.d.ts

@@ -1,3 +1,3 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/loops/loops.d.ts

@@ -1,5 +1,5 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
 declare const initialLoopInfo: {
     forLoops: import("../../common-syntax-probability").CommonSyntaxTypeCounts<bigint>;
     forLoopVar: import("../../common-syntax-probability").CommonSyntaxTypeCounts<bigint>;

package/statistics/features/supported/loops/post-process.d.ts

@@ -1,3 +1,3 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/used-functions/post-process.d.ts

@@ -1,5 +1,5 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 /**
  * Note: the summary does not contain a 0 for each function that is _not_ called by a file. Hence, the minimum can not be 0 (division for mean etc. will still be performed on total file count)
  */

package/statistics/features/supported/used-functions/used-functions.d.ts

@@ -1,6 +1,6 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
-import { CommonSyntaxTypeCounts } from '../../common-syntax-probability';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
+import type { CommonSyntaxTypeCounts } from '../../common-syntax-probability';
 declare const initialFunctionUsageInfo: {
     allFunctionCalls: number;
     args: Record<number, bigint | CommonSyntaxTypeCounts<bigint>>;

package/statistics/features/supported/used-packages/post-process.d.ts

@@ -1,3 +1,3 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/used-packages/used-packages.d.ts

@@ -1,5 +1,5 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
 export declare const initialUsedPackageInfos: {
     library: number;
     require: number;

package/statistics/features/supported/values/post-process.d.ts

@@ -1,3 +1,3 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;

package/statistics/features/supported/values/values.d.ts

@@ -1,5 +1,5 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
 declare const initialValueInfo: {
     allNumerics: number;
     imaginaryNumbers: number;

package/statistics/features/supported/variables/post-process.d.ts

@@ -1,6 +1,6 @@
-import { FeatureStatisticsWithMeta } from '../../feature';
-import { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
-import { SummarizedWithProject } from '../../post-processing';
+import type { FeatureStatisticsWithMeta } from '../../feature';
+import type { StatisticsSummarizerConfiguration } from '../../../../util/summarizer/statistics/summarizer';
+import type { SummarizedWithProject } from '../../post-processing';
 export declare function postProcess(featureRoot: string, info: Map<string, FeatureStatisticsWithMeta>, outputPath: string, config: StatisticsSummarizerConfiguration): void;
 type VariableInfoMap = Map<string, SummarizedWithProject & {
     linePercentageInFile: number[][];

package/statistics/features/supported/variables/variables.d.ts

@@ -1,5 +1,5 @@
-import { Feature } from '../../feature';
-import { Writable } from 'ts-essentials';
+import type { Feature } from '../../feature';
+import type { Writable } from 'ts-essentials';
 declare const initialVariableInfo: {
     numberOfVariableUses: number;
     numberOfDefinitions: number;

package/statistics/meta-statistics.d.ts

@@ -1,4 +1,4 @@
-import { RParseRequestFromFile, RParseRequestFromText } from '../r-bridge';
+import type { RParseRequestFromFile, RParseRequestFromText } from '../r-bridge';
 /**
  * Statistics on skipped files, the time required, and more.
  *

package/statistics/output/print-stats.d.ts

@@ -1,5 +1,5 @@
-import { FeatureKey, FeatureStatistics } from '../features';
-import { MetaStatistics } from '../meta-statistics';
+import type { FeatureKey, FeatureStatistics } from '../features';
+import type { MetaStatistics } from '../meta-statistics';
 interface MinMaxAvgMedian {
     sum: number;
     min: number;

package/statistics/output/statistics-file.d.ts

@@ -1,4 +1,4 @@
-import { DummyAppendMemoryMap, StatisticAppendProvider } from './file-provider';
+import type { DummyAppendMemoryMap, StatisticAppendProvider } from './file-provider';
 /**
  * Requires source information to be attached on parsing!
  * <p>

package/statistics/statistics.d.ts

@@ -1,7 +1,7 @@
-import { RParseRequestFromFile, RParseRequestFromText, RShell } from '../r-bridge';
-import { FeatureSelection, FeatureStatistics } from './features';
-import { MetaStatistics } from './meta-statistics';
-import { StepResults } from '../core';
+import type { RParseRequestFromFile, RParseRequestFromText, RShell } from '../r-bridge';
+import type { FeatureSelection, FeatureStatistics } from './features';
+import type { MetaStatistics } from './meta-statistics';
+import type { StepResults } from '../core';
 /**
  * By default, {@link extractUsageStatistics} requires a generator, but sometimes you already know all the files
  * that you want to process. This function simply reps your requests as a generator.

package/util/{cfg.d.ts → cfg/cfg.d.ts}

@@ -1,8 +1,20 @@
-import { NodeId, NormalizedAst, ParentInformation, RFalse, RTrue } from '../r-bridge';
-import { MergeableRecord } from './objects';
-import { QuadSerializationConfiguration } from './quads';
+import type { NodeId, NormalizedAst, ParentInformation } from '../../r-bridge';
+import { RFalse, RTrue } from '../../r-bridge';
+import type { MergeableRecord } from '../objects';
+import type { QuadSerializationConfiguration } from '../quads';
+export declare const enum CfgVertexType {
+    /** Marks a break point in a construct (e.g., between the name and the value of an argument, or the formals and the body of a function)  */
+    MidMarker = "mid-marker",
+    /** The explicit exit-nodes to ensure the hammock property */
+    EndMarker = "end-marker",
+    /** something like an if, assignment, ... even though in the classical sense of R they are still expressions */
+    Statement = "statement",
+    /** something like an addition, ... */
+    Expression = "expression"
+}
 export interface CfgVertex {
     id: NodeId;
+    type: CfgVertexType;
     name: string;
     /** in case of a function definition */
     children?: NodeId[];
@@ -14,7 +26,7 @@ interface CfgControlDependencyEdge extends MergeableRecord {
     label: 'CD';
     when: typeof RTrue | typeof RFalse;
 }
-export type CFGEdge = CfgFlowDependencyEdge | CfgControlDependencyEdge;
+export type CfgEdge = CfgFlowDependencyEdge | CfgControlDependencyEdge;
 /**
  * This class represents the control flow graph of an R program.
  * The control flow may be hierarchical when confronted with function definitions (see {@link CfgVertex} and {@link CFG#rootVertexIds|rootVertexIds()}).
@@ -24,10 +36,10 @@ export declare class ControlFlowGraph {
     private vertexInformation;
     private edgeInformation;
     addVertex(vertex: CfgVertex, rootVertex?: boolean): this;
-    addEdge(from: NodeId, to: NodeId, edge: CFGEdge): this;
+    addEdge(from: NodeId, to: NodeId, edge: CfgEdge): this;
     rootVertexIds(): ReadonlySet<NodeId>;
     vertices(): ReadonlyMap<NodeId, CfgVertex>;
-    edges(): ReadonlyMap<NodeId, ReadonlyMap<NodeId, CFGEdge>>;
+    edges(): ReadonlyMap<NodeId, ReadonlyMap<NodeId, CfgEdge>>;
     merge(other: ControlFlowGraph, forceNested?: boolean): this;
 }
 export interface ControlFlowInformation extends MergeableRecord {