@eagleoutice/flowr 1.3.14 → 1.4.2

package/dataflow/internal/process/operators/non-assignment-binary-op.d.ts

@@ -1,4 +1,4 @@
-import { DataflowInformation } from '../../info';
-import { DataflowProcessorInformation } from '../../../processor';
-import { ParentInformation, RBinaryOp } from '../../../../r-bridge';
+import type { DataflowInformation } from '../../info';
+import type { DataflowProcessorInformation } from '../../../processor';
+import type { ParentInformation, RBinaryOp } from '../../../../r-bridge';
 export declare function processNonAssignmentBinaryOp<OtherInfo>(op: RBinaryOp<OtherInfo & ParentInformation>, data: DataflowProcessorInformation<OtherInfo & ParentInformation>): DataflowInformation;

package/dataflow/internal/process/operators/pipe.d.ts

@@ -1,4 +1,4 @@
-import { DataflowInformation } from '../../info';
-import { DataflowProcessorInformation } from '../../../processor';
-import { ParentInformation, RPipe } from '../../../../r-bridge';
+import type { DataflowInformation } from '../../info';
+import type { DataflowProcessorInformation } from '../../../processor';
+import type { ParentInformation, RPipe } from '../../../../r-bridge';
 export declare function processPipeOperation<OtherInfo>(op: RPipe<OtherInfo & ParentInformation>, data: DataflowProcessorInformation<OtherInfo & ParentInformation>): DataflowInformation;

package/dataflow/internal/process/operators/unary-op.d.ts

@@ -1,4 +1,4 @@
-import { DataflowInformation } from '../../info';
-import { DataflowProcessorInformation } from '../../../processor';
-import { ParentInformation, RUnaryOp } from '../../../../r-bridge';
+import type { DataflowInformation } from '../../info';
+import type { DataflowProcessorInformation } from '../../../processor';
+import type { ParentInformation, RUnaryOp } from '../../../../r-bridge';
 export declare function processUnaryOp<OtherInfo>(op: RUnaryOp<OtherInfo & ParentInformation>, data: DataflowProcessorInformation<OtherInfo & ParentInformation>): DataflowInformation;

package/dataflow/internal/process/symbol.d.ts

@@ -1,4 +1,4 @@
-import { ParentInformation, RSymbol } from '../../../r-bridge';
-import { DataflowInformation } from '../info';
-import { DataflowProcessorInformation } from '../../processor';
+import type { ParentInformation, RSymbol } from '../../../r-bridge';
+import type { DataflowInformation } from '../info';
+import type { DataflowProcessorInformation } from '../../processor';
 export declare function processSymbol<OtherInfo>(symbol: RSymbol<OtherInfo & ParentInformation>, data: DataflowProcessorInformation<OtherInfo>): DataflowInformation;

package/dataflow/internal/process/uninteresting-leaf.d.ts

@@ -1,3 +1,3 @@
-import { DataflowInformation } from '../info';
-import { DataflowProcessorInformation } from '../../processor';
+import type { DataflowInformation } from '../info';
+import type { DataflowProcessorInformation } from '../../processor';
 export declare function processUninterestingLeaf<OtherInfo>(_leaf: unknown, info: DataflowProcessorInformation<OtherInfo>): DataflowInformation;

package/dataflow/processor.d.ts

@@ -1,9 +1,9 @@
 /**
  * Based on a two-way fold, this processor will automatically supply scope information
  */
-import { NormalizedAst, ParentInformation, RNode, RNodeWithParent } from '../r-bridge';
-import { DataflowInformation } from './internal/info';
-import { DataflowScopeName, REnvironmentInformation } from './environments';
+import type { NormalizedAst, ParentInformation, RNode, RNodeWithParent, RParseRequest } from '../r-bridge';
+import type { DataflowInformation } from './internal/info';
+import type { DataflowScopeName, REnvironmentInformation } from './environments';
 export interface DataflowProcessorInformation<OtherInfo> {
     /**
    * Initial and frozen ast-information
@@ -22,6 +22,15 @@ export interface DataflowProcessorInformation<OtherInfo> {
    * Other processors to be called by the given functions
    */
     readonly processors: DataflowProcessors<OtherInfo>;
+    /**
+     * The {@link RParseRequest} that is currently being parsed
+     */
+    readonly currentRequest: RParseRequest;
+    /**
+     * The chain of {@link RParseRequest} fingerprints ({@link requestFingerprint}) that lead to the {@link currentRequest}.
+     * The most recent (last) entry is expected to always be the {@link currentRequest}.
+     */
+    readonly referenceChain: string[];
 }
 export type DataflowProcessor<OtherInfo, NodeType extends RNodeWithParent<OtherInfo>> = (node: NodeType, data: DataflowProcessorInformation<OtherInfo>) => DataflowInformation;
 type NodeWithKey<OtherInfo, Node extends RNode<OtherInfo & ParentInformation>, TypeKey> = Node['type'] extends TypeKey ? Node : never;

package/flowr.d.ts

@@ -1,4 +1,4 @@
-import commandLineUsage, { OptionDefinition } from 'command-line-usage';
+import type { OptionDefinition } from 'command-line-usage';
 export declare const toolName = "flowr";
 export declare const optionDefinitions: OptionDefinition[];
 export interface FlowrCliOptions {
@@ -6,10 +6,13 @@ export interface FlowrCliOptions {
     version: boolean;
     help: boolean;
     server: boolean;
+    ws: boolean;
     port: number;
     'no-ansi': boolean;
     execute: string | undefined;
     script: string | undefined;
+    'config-file': string;
+    'r-path': string | undefined;
 }
 export declare const optionHelp: ({
     header: string;
@@ -21,6 +24,6 @@ export declare const optionHelp: ({
     optionList?: undefined;
 } | {
     header: string;
-    optionList: commandLineUsage.OptionDefinition[];
+    optionList: OptionDefinition[];
     content?: undefined;
 })[];

package/flowr.js

@@ -22,6 +22,8 @@ const package_json_1 = require("../package.json");
 const version_1 = require("./cli/repl/commands/version");
 const server_1 = require("./cli/repl/server/server");
 const commands_1 = require("./cli/repl/commands");
+const net_1 = require("./cli/repl/server/net");
+const config_1 = require("./config");
 const scriptsText = Array.from(Object.entries(common_1.scripts).filter(([, { type }]) => type === 'master script'), ([k,]) => k).join(', ');
 exports.toolName = 'flowr';
 exports.optionDefinitions = [
@@ -29,10 +31,13 @@ exports.optionDefinitions = [
     { name: 'help', alias: 'h', type: Boolean, description: 'Print this usage guide (or the guide of the corresponding script)' },
     { name: 'version', alias: 'V', type: Boolean, description: 'Provide information about the version of flowR as well as its underlying R system and exit.' },
     { name: 'server', type: Boolean, description: 'Do not drop into a repl, but instead start a server on the given port (default: 1042) and listen for messages.' },
+    { name: 'ws', type: Boolean, description: 'If the server flag is set, use websocket for messaging' },
     { name: 'port', type: Number, description: 'The port to listen on, if --server is given.', defaultValue: 1042, typeLabel: '{underline port}' },
     { name: 'execute', alias: 'e', type: String, description: 'Execute the given command and exit. Use a semicolon ";" to separate multiple commands.', typeLabel: '{underline command}', multiple: false },
     { name: 'no-ansi', type: Boolean, description: 'Disable ansi-escape-sequences in the output. Useful, if you want to redirect the output to a file.' },
     { name: 'script', alias: 's', type: String, description: `The sub-script to run (${scriptsText})`, multiple: false, defaultOption: true, typeLabel: '{underline files}', defaultValue: undefined },
+    { name: 'config-file', type: String, description: 'The name of the configuration file to use', multiple: false },
+    { name: 'r-path', type: String, description: 'The path to the R executable to use. Defaults to your PATH.', multiple: false }
 ];
 exports.optionHelp = [
     {
@@ -61,19 +66,21 @@ if (options['no-ansi']) {
     log_1.log.info('disabling ansi colors');
     (0, statistics_1.setFormatter)(statistics_1.voidFormatter);
 }
-async function retrieveShell() {
+(0, config_1.setConfigFile)(undefined, options['config-file'] ?? config_1.defaultConfigFile, true);
+function retrieveShell() {
     // we keep an active shell session to allow other parse investigations :)
-    const shell = new r_bridge_1.RShell({
+    let opts = {
         revive: 'always',
         onRevive: (code, signal) => {
             const signalText = signal == null ? '' : ` and signal ${signal}`;
             console.log(statistics_1.formatter.format(`R process exited with code ${code}${signalText}. Restarting...`, { color: 5 /* Colors.Magenta */, effect: statistics_1.ColorEffect.Foreground }));
             console.log((0, statistics_1.italic)(`If you want to exit, press either Ctrl+C twice, or enter ${(0, statistics_1.bold)(':quit')}`));
-        },
-    });
-    shell.tryToInjectHomeLibPath();
-    await shell.ensurePackageInstalled('xmlparsedata', true);
-    return shell;
+        }
+    };
+    if (options['r-path']) {
+        opts = { ...opts, pathToRExecutable: options['r-path'] };
+    }
+    return new r_bridge_1.RShell(opts);
 }
 async function mainRepl() {
     if (options.script) {
@@ -93,7 +100,7 @@ async function mainRepl() {
         await (0, version_1.printVersionInformation)(commands_1.standardReplOutput);
         process.exit(0);
     }
-    const shell = await retrieveShell();
+    const shell = retrieveShell();
     const end = () => {
         if (options.execute === undefined) {
             console.log(`\n${(0, statistics_1.italic)('Exiting...')}`);
@@ -112,8 +119,8 @@ async function mainRepl() {
     }
     process.exit(0);
 }
-async function mainServer() {
-    const shell = await retrieveShell();
+async function mainServer(backend = new net_1.NetServer()) {
+    const shell = retrieveShell();
     const end = () => {
         if (options.execute === undefined) {
             console.log(`\n${(0, statistics_1.italic)('Exiting...')}`);
@@ -124,10 +131,10 @@ async function mainServer() {
     // hook some handlers
     process.on('SIGINT', end);
     process.on('SIGTERM', end);
-    await new server_1.FlowRServer(shell).start(options.port);
+    await new server_1.FlowRServer(shell, backend).start(options.port);
 }
 if (options.server) {
-    void mainServer();
+    void mainServer(options.ws ? new net_1.WebSocketServerWrapper() : new net_1.NetServer());
 }
 else {
     void mainRepl();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "1.3.14",
+  "version": "1.4.2",
   "description": "Static Dataflow Analyzer and Program Slicer for the R Programming Language",
   "types": "dist/src/index.d.ts",
   "repository": {
@@ -19,7 +19,7 @@
     "slicer": "ts-node src/cli/slicer-app.ts",
     "release": "release-it --ci",
     "benchmark-helper": "ts-node src/cli/benchmark-helper-app.ts",
-    "benchmark": "ts-node src/cli/benchmark-app.ts",
+    "benchmark": "npm run build && node dist/src/cli/benchmark-app.js",
     "summarizer": "ts-node src/cli/summarizer-app.ts",
     "export-quads": "ts-node src/cli/export-quads-app.ts",
     "build": "tsc --project .",
@@ -27,8 +27,8 @@
     "lint": "npm run license-compat -- --summary && eslint src/ test/",
     "license-compat": "license-checker --onlyAllow 'MIT;MIT OR X11;GPLv2;LGPL;GNUGPL;ISC;Apache-2.0;FreeBSD;BSD-2-Clause;clearbsd;ModifiedBSD;BSD-3-Clause;Python-2.0;Unlicense;WTFPL;CC-BY-4.0;CC-BY-3.0;CC0-1.0;0BSD'",
     "doc": "typedoc",
-    "test": "nyc --no-clean mocha --require ts-node/register --timeout 60000 \"test/**/*.spec.ts\"",
-    "performance-test": "func() { cd test/performance/ && bash run-all-suites.sh $1 $2; cd ../../; }; func",
+    "test": "nyc --no-clean mocha",
+    "performance-test": "func() { cd test/performance/ && bash run-all-suites.sh $1 $2 $3; cd ../../; }; func",
     "test-full": "npm run test -- --test-installation"
   },
   "keywords": [
@@ -41,6 +41,11 @@
   ],
   "author": "Florian Sihler",
   "license": "ISC",
+  "mocha": {
+    "require": "ts-node/register",
+    "timeout": 60000,
+    "spec": "test/**/*.spec.ts"
+  },
   "nyc": {
     "all": true,
     "per-file": true,
@@ -132,11 +137,18 @@
     "plugins": [
       "@typescript-eslint",
       "eslint-plugin-tsdoc",
-      "check-file"
+      "check-file",
+      "@stylistic",
+      "@stylistic/js",
+      "@stylistic/ts",
+      "import"
     ],
     "rules": {
-      "indent": "off",
-      "@typescript-eslint/indent": [
+      "@stylistic/js/object-curly-spacing": [
+        "error",
+        "always"
+      ],
+      "@stylistic/js/indent": [
         "error",
         "tab",
         {
@@ -147,14 +159,14 @@
           "SwitchCase": 1
         }
       ],
-      "quotes": [
+      "@stylistic/js/quotes": [
         "error",
         "single",
         {
           "avoidEscape": true
         }
       ],
-      "no-mixed-spaces-and-tabs": [
+      "@stylistic/no-mixed-spaces-and-tabs": [
         "error",
         "smart-tabs"
       ],
@@ -172,21 +184,27 @@
       "@typescript-eslint/non-nullable-type-assertion-style": "off",
       "@typescript-eslint/no-unsafe-enum-comparison": "off",
       "@typescript-eslint/no-redundant-type-constituents": "off",
-      "@typescript-eslint/key-spacing": [
+      "@typescript-eslint/consistent-type-assertions": [
+        "error",
+        {
+          "assertionStyle": "as"
+        }
+      ],
+      "@stylistic/ts/key-spacing": [
         "error",
         {
           "align": "value"
         }
       ],
-      "semi": [
+      "@stylistic/js/semi": [
         "error",
         "never"
       ],
-      "space-before-function-paren": [
+      "@stylistic/js/space-before-function-paren": [
         "error",
         "never"
       ],
-      "keyword-spacing": "off",
+      "@stylistic/js/keyword-spacing": "off",
       "check-file/filename-naming-convention": [
         "error",
         {
@@ -199,7 +217,7 @@
           "*.spec.{js,jsx,ts,tsx}": "test/**"
         }
       ],
-      "@typescript-eslint/keyword-spacing": [
+      "@stylistic/ts/keyword-spacing": [
         "error",
         {
           "before": true,
@@ -232,7 +250,7 @@
           }
         }
       ],
-      "@typescript-eslint/space-before-function-paren": [
+      "@stylistic/ts/space-before-function-paren": [
         "error",
         "never"
       ],
@@ -288,7 +306,15 @@
             "PascalCase"
           ]
         }
-      ]
+      ],
+      "@typescript-eslint/consistent-type-imports": "error",
+      "curly": "error",
+      "@stylistic/js/brace-style": [
+        "error",
+        "1tbs"
+      ],
+      "@stylistic/js/new-parens": "error",
+      "import/no-duplicates": "error"
     }
   },
   "release-it": {
@@ -325,9 +351,15 @@
       "after:release": "echo Successfully released ${name} v${version} to ${repo.repository}."
     }
   },
+  "engines": {
+    "node": ">=16.0.0"
+  },
   "devDependencies": {
     "@commitlint/cli": "^18.4.3",
     "@commitlint/config-angular": "^18.4.3",
+    "@stylistic/eslint-plugin": "^1.6.2",
+    "@stylistic/eslint-plugin-plus": "^1.6.2",
+    "@stylistic/eslint-plugin-ts": "^1.6.2",
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.8",
     "@types/command-line-args": "^5.2.3",
@@ -337,7 +369,6 @@
     "@types/n3": "^1.16.4",
     "@types/object-hash": "^3.0.6",
     "@types/tmp": "^0.2.6",
-    "@types/xml2js": "^0.4.14",
     "@typescript-eslint/eslint-plugin": "^6.13.2",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
@@ -363,6 +394,7 @@
   "dependencies": {
     "@types/semver": "^7.5.6",
     "@types/tar": "^6.1.10",
+    "@types/ws": "^8.5.10",
     "@xmldom/xmldom": "^0.8.10",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^7.0.1",
@@ -377,7 +409,7 @@
     "tmp": "^0.2.1",
     "ts-essentials": "^9.4.1",
     "tslog": "^4.9.2",
-    "xml2js": "^0.6.2",
+    "ws": "^8.16.0",
     "xpath-ts2": "^1.4.2"
   }
 }

package/r-bridge/lang-4.x/ast/index.d.ts

@@ -1,2 +1,3 @@
 export * from './model';
 export * from './parser/xml';
+export { parseLog } from './parser/json/parser';

package/r-bridge/lang-4.x/ast/index.js

@@ -14,6 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseLog = void 0;
 __exportStar(require("./model"), exports);
 __exportStar(require("./parser/xml"), exports);
+var parser_1 = require("./parser/json/parser");
+Object.defineProperty(exports, "parseLog", { enumerable: true, get: function () { return parser_1.parseLog; } });
 //# sourceMappingURL=index.js.map

package/r-bridge/lang-4.x/ast/model/collect.d.ts

@@ -1,5 +1,5 @@
-import { NodeId, ParentInformation } from './processing';
-import { RNode } from './model';
+import type { NodeId, ParentInformation } from './processing';
+import type { RNode } from './model';
 /**
  * Collects all node ids within a tree given by a respective root node
  *

package/r-bridge/lang-4.x/ast/model/model.d.ts

@@ -1,9 +1,9 @@
-import { SourceRange } from '../../../../util/range';
-import { RType } from './type';
-import { MergeableRecord } from '../../../../util/objects';
-import { RNa, RNull } from '../../values';
-import { RExpressionList, RNumber, RSymbol, RLogical, RString, RBinaryOp, RUnaryOp, RIfThenElse, RParameter, RFunctionDefinition, RRepeatLoop, RForLoop, RWhileLoop, RComment, RFunctionCall, RBreak, RNext, RArgument, RNamedAccess, RIndexAccess, RLineDirective, RPipe } from './nodes';
-import { OtherInfoNode } from './nodes/info';
+import type { SourceRange } from '../../../../util/range';
+import type { RType } from './type';
+import type { MergeableRecord } from '../../../../util/objects';
+import type { RNa, RNull } from '../../values';
+import type { RExpressionList, RNumber, RSymbol, RLogical, RString, RBinaryOp, RUnaryOp, RIfThenElse, RParameter, RFunctionDefinition, RRepeatLoop, RForLoop, RWhileLoop, RComment, RFunctionCall, RBreak, RNext, RArgument, RNamedAccess, RIndexAccess, RLineDirective, RPipe } from './nodes';
+import type { OtherInfoNode } from './nodes/info';
 /** Simply an empty interface used to say that there are additional decorations (see {@link Base}). */
 export interface NoInfo {
 }

package/r-bridge/lang-4.x/ast/model/nodes/info/index.d.ts

@@ -7,7 +7,7 @@
  * In the future, they could be still integrated into the main ast.
  * @module
  */
-import { RNode } from '../../model';
-import { RDelimiter } from './r-delimiter';
+import type { RNode } from '../../model';
+import type { RDelimiter } from './r-delimiter';
 export * from './r-delimiter';
 export type OtherInfoNode = RNode | RDelimiter;

package/r-bridge/lang-4.x/ast/model/nodes/info/r-delimiter.d.ts

@@ -1,6 +1,6 @@
-import { RawRType, RType } from '../../type';
-import { Location } from '../../model';
-import { MergeableRecord } from '../../../../../../util/objects';
+import type { RawRType, RType } from '../../type';
+import type { Location } from '../../model';
+import type { MergeableRecord } from '../../../../../../util/objects';
 /**
  * Combines '`{`', '`}`', '`(`', '`)`', and other delimiters used by R, they are ignored for most analysis
  * but helpful during reconstruction.

package/r-bridge/lang-4.x/ast/model/nodes/r-access.d.ts

@@ -1,6 +1,6 @@
-import { Base, Location, NoInfo, RNode } from '../model';
-import { RType } from '../type';
-import { RArgument } from './r-argument';
+import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RType } from '../type';
+import type { RArgument } from './r-argument';
 /**
  * Represents an R Indexing operation with `$`, `@`, `[[`, or `[`.
  */

package/r-bridge/lang-4.x/ast/model/nodes/r-argument.d.ts

@@ -1,6 +1,6 @@
-import { Base, Location, NoInfo, RNode } from '../model';
-import { RType } from '../type';
-import { RSymbol } from './r-symbol';
+import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RType } from '../type';
+import type { RSymbol } from './r-symbol';
 /**
  * Represents a named or unnamed argument of a function definition in R.
  */

package/r-bridge/lang-4.x/ast/model/nodes/r-binary-op.d.ts

@@ -1,6 +1,6 @@
-import { Base, Location, NoInfo, RNode } from '../model';
-import { RType } from '../type';
-import { BinaryOperatorFlavor } from '../operators';
+import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RType } from '../type';
+import type { BinaryOperatorFlavor } from '../operators';
 export interface RBinaryOp<Info = NoInfo> extends Base<Info>, Location {
     readonly type: RType.BinaryOp;
     readonly flavor: BinaryOperatorFlavor;

package/r-bridge/lang-4.x/ast/model/nodes/r-break.d.ts

@@ -1,5 +1,5 @@
-import { Leaf, Location, NoInfo } from '../model';
-import { RType } from '../type';
+import type { Leaf, Location, NoInfo } from '../model';
+import type { RType } from '../type';
 export interface RBreak<Info = NoInfo> extends Location, Leaf<Info> {
     readonly type: RType.Break;
 }

package/r-bridge/lang-4.x/ast/model/nodes/r-comment.d.ts

@@ -1,5 +1,5 @@
-import { Leaf, Location, NoInfo } from '../model';
-import { RType } from '../type';
+import type { Leaf, Location, NoInfo } from '../model';
+import type { RType } from '../type';
 export interface RComment<Info = NoInfo> extends Location, Leaf<Info> {
     readonly type: RType.Comment;
     content: string;

package/r-bridge/lang-4.x/ast/model/nodes/r-expression-list.d.ts

@@ -1,5 +1,5 @@
-import { Base, Location, NoInfo, RNode, WithChildren } from '../model';
-import { RType } from '../type';
+import type { Base, Location, NoInfo, RNode, WithChildren } from '../model';
+import type { RType } from '../type';
 export interface RExpressionList<Info = NoInfo> extends WithChildren<Info, RNode<Info>>, Base<Info, string | undefined>, Partial<Location> {
     readonly type: RType.ExpressionList;
     readonly content?: string;

package/r-bridge/lang-4.x/ast/model/nodes/r-for-loop.d.ts

@@ -1,7 +1,7 @@
-import { Base, Location, NoInfo, RNode } from '../model';
-import { RType } from '../type';
-import { RSymbol } from './r-symbol';
-import { RExpressionList } from './r-expression-list';
+import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RType } from '../type';
+import type { RSymbol } from './r-symbol';
+import type { RExpressionList } from './r-expression-list';
 /**
  * ```ts
  * for(<variable> in <vector>) <body>

package/r-bridge/lang-4.x/ast/model/nodes/r-function-call.d.ts

@@ -1,7 +1,7 @@
-import { Base, Location, NoInfo, RNode } from '../model';
-import { RType } from '../type';
-import { RSymbol } from './r-symbol';
-import { RArgument } from './r-argument';
+import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RType } from '../type';
+import type { RSymbol } from './r-symbol';
+import type { RArgument } from './r-argument';
 /**
  * Calls of functions like `a()` and `foo(42, "hello")`.
  *

package/r-bridge/lang-4.x/ast/model/nodes/r-function-definition.d.ts

@@ -1,7 +1,7 @@
-import { Base, Location, NoInfo } from '../model';
-import { RType } from '../type';
-import { RParameter } from './r-parameter';
-import { RExpressionList } from './r-expression-list';
+import type { Base, Location, NoInfo } from '../model';
+import type { RType } from '../type';
+import type { RParameter } from './r-parameter';
+import type { RExpressionList } from './r-expression-list';
 export interface RFunctionDefinition<Info = NoInfo> extends Base<Info>, Location {
     readonly type: RType.FunctionDefinition;
     /** the R formals, to our knowledge they must be unique */

package/r-bridge/lang-4.x/ast/model/nodes/r-if-then-else.d.ts

@@ -1,6 +1,6 @@
-import { Base, Location, NoInfo, RNode } from '../model';
-import { RType } from '../type';
-import { RExpressionList } from './r-expression-list';
+import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RType } from '../type';
+import type { RExpressionList } from './r-expression-list';
 export interface RIfThenElse<Info = NoInfo> extends Base<Info>, Location {
     readonly type: RType.IfThenElse;
     condition: RNode<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-line-directive.d.ts

@@ -1,5 +1,5 @@
-import { Leaf, Location, NoInfo } from '../model';
-import { RType } from '../type';
+import type { Leaf, Location, NoInfo } from '../model';
+import type { RType } from '../type';
 export interface RLineDirective<Info = NoInfo> extends Location, Leaf<Info> {
     readonly type: RType.LineDirective;
     line: number;

package/r-bridge/lang-4.x/ast/model/nodes/r-logical.d.ts

@@ -1,5 +1,5 @@
-import { Leaf, Location, NoInfo } from '../model';
-import { RType } from '../type';
+import type { Leaf, Location, NoInfo } from '../model';
+import type { RType } from '../type';
 export type RLogicalValue = boolean;
 export interface RLogical<Info = NoInfo> extends Leaf<Info>, Location {
     readonly type: RType.Logical;

package/r-bridge/lang-4.x/ast/model/nodes/r-next.d.ts

@@ -1,5 +1,5 @@
-import { Leaf, Location, NoInfo } from '../model';
-import { RType } from '../type';
+import type { Leaf, Location, NoInfo } from '../model';
+import type { RType } from '../type';
 export interface RNext<Info = NoInfo> extends Location, Leaf<Info> {
     readonly type: RType.Next;
 }

package/r-bridge/lang-4.x/ast/model/nodes/r-number.d.ts

@@ -1,6 +1,6 @@
-import { Leaf, Location, NoInfo } from '../model';
-import { RType } from '../type';
-import { RNumberValue } from '../../../values';
+import type { Leaf, Location, NoInfo } from '../model';
+import type { RType } from '../type';
+import type { RNumberValue } from '../../../values';
 /** includes numeric, integer, and complex */
 export interface RNumber<Info = NoInfo> extends Leaf<Info>, Location {
     readonly type: RType.Number;

package/r-bridge/lang-4.x/ast/model/nodes/r-parameter.d.ts

@@ -1,6 +1,6 @@
-import { Base, Location, NoInfo, RNode } from '../model';
-import { RType } from '../type';
-import { RSymbol } from './r-symbol';
+import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RType } from '../type';
+import type { RSymbol } from './r-symbol';
 /**
  * Represents a parameter of a function definition in R.
  */

package/r-bridge/lang-4.x/ast/model/nodes/r-pipe.d.ts

@@ -1,5 +1,5 @@
-import { Base, Location, NoInfo, RNode } from '../model';
-import { RType } from '../type';
+import type { Base, Location, NoInfo, RNode } from '../model';
+import type { RType } from '../type';
 export interface RPipe<Info = NoInfo> extends Base<Info>, Location {
     readonly type: RType.Pipe;
     readonly lhs: RNode<Info>;

package/r-bridge/lang-4.x/ast/model/nodes/r-repeat-loop.d.ts

@@ -1,6 +1,6 @@
-import { Base, Location, NoInfo } from '../model';
-import { RType } from '../type';
-import { RExpressionList } from './r-expression-list';
+import type { Base, Location, NoInfo } from '../model';
+import type { RType } from '../type';
+import type { RExpressionList } from './r-expression-list';
 /**
  * ```ts
  * repeat <body>

package/r-bridge/lang-4.x/ast/model/nodes/r-string.d.ts

@@ -1,6 +1,6 @@
-import { Leaf, Location, NoInfo } from '../model';
-import { RType } from '../type';
-import { RStringValue } from '../../../values';
+import type { Leaf, Location, NoInfo } from '../model';
+import type { RType } from '../type';
+import type { RStringValue } from '../../../values';
 export interface RString<Info = NoInfo> extends Leaf<Info>, Location {
     readonly type: RType.String;
     content: RStringValue;