@eagleoutice/flowr 1.4.1 → 1.4.2

package/dataflow/extractor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processBinaryOp = exports.produceDataFlowGraph = void 0;
+const r_bridge_1 = require("../r-bridge");
 const processor_1 = require("./processor");
 const uninteresting_leaf_1 = require("./internal/process/uninteresting-leaf");
 const symbol_1 = require("./internal/process/symbol");
@@ -44,8 +45,15 @@ const processors = {
     ["RArgument" /* RType.Argument */]: argument_1.processFunctionArgument,
     ["RExpressionList" /* RType.ExpressionList */]: expression_list_1.processExpressionList,
 };
-function produceDataFlowGraph(ast, initialScope = scopes_1.LocalScope) {
-    return (0, processor_1.processDataflowFor)(ast.ast, { completeAst: ast, activeScope: initialScope, environments: (0, environments_1.initializeCleanEnvironments)(), processors: processors });
+function produceDataFlowGraph(request, ast, initialScope = scopes_1.LocalScope) {
+    return (0, processor_1.processDataflowFor)(ast.ast, {
+        completeAst: ast,
+        activeScope: initialScope,
+        environments: (0, environments_1.initializeCleanEnvironments)(),
+        processors: processors,
+        currentRequest: request,
+        referenceChain: [(0, r_bridge_1.requestFingerprint)(request)]
+    });
 }
 exports.produceDataFlowGraph = produceDataFlowGraph;
 function processBinaryOp(node, data) {

package/dataflow/internal/process/functions/function-call.js

@@ -7,6 +7,7 @@ const assert_1 = require("../../../../util/assert");
 const index_1 = require("../../../index");
 const linker_1 = require("../../linker");
 const scopes_1 = require("../../../environments/scopes");
+const source_1 = require("./source");
 exports.UnnamedFunctionCallPrefix = 'unnamed-function-call-';
 function processFunctionCall(functionCall, data) {
     const named = functionCall.flavor === 'named';
@@ -86,7 +87,7 @@ function processFunctionCall(functionCall, data) {
         // push the called function to the ids:
         inIds.push(...functionName.in, ...functionName.unknownReferences);
     }
-    return {
+    let info = {
         unknownReferences: [],
         in: inIds,
         out: functionName.out, // we do not keep argument out as it has been linked by the function
@@ -94,6 +95,11 @@ function processFunctionCall(functionCall, data) {
         environments: finalEnv,
         scope: data.activeScope
     };
+    // parse a source call and analyze the referenced code
+    if ((0, source_1.isSourceCall)(functionCallName, data.activeScope, finalEnv)) {
+        info = (0, source_1.processSourceCall)(functionCall, data, info);
+    }
+    return info;
 }
 exports.processFunctionCall = processFunctionCall;
 //# sourceMappingURL=function-call.js.map

package/dataflow/internal/process/functions/source.d.ts

@@ -0,0 +1,8 @@
+import type { IdGenerator, NoInfo, RParseRequest, RParseRequestProvider, ParentInformation, RFunctionCall } from '../../../../r-bridge';
+import { type DataflowProcessorInformation } from '../../../processor';
+import { type DataflowScopeName, type Identifier, type REnvironmentInformation } from '../../../environments';
+import type { DataflowInformation } from '../../info';
+export declare function setSourceProvider(provider: RParseRequestProvider): void;
+export declare function isSourceCall(name: Identifier, scope: DataflowScopeName, environments: REnvironmentInformation): boolean;
+export declare function processSourceCall<OtherInfo>(functionCall: RFunctionCall<OtherInfo & ParentInformation>, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, information: DataflowInformation): DataflowInformation;
+export declare function sourceRequest<OtherInfo>(request: RParseRequest, data: DataflowProcessorInformation<OtherInfo & ParentInformation>, information: DataflowInformation, getId: IdGenerator<NoInfo>): DataflowInformation;

package/dataflow/internal/process/functions/source.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sourceRequest = exports.processSourceCall = exports.isSourceCall = exports.setSourceProvider = void 0;
+const r_bridge_1 = require("../../../../r-bridge");
+const shell_executor_1 = require("../../../../r-bridge/shell-executor");
+const core_1 = require("../../../../core");
+const processor_1 = require("../../../processor");
+const environments_1 = require("../../../environments");
+const index_1 = require("../../../index");
+const config_1 = require("../../../../config");
+let sourceProvider = (0, r_bridge_1.requestProviderFromFile)();
+function setSourceProvider(provider) {
+    sourceProvider = provider;
+}
+exports.setSourceProvider = setSourceProvider;
+function isSourceCall(name, scope, environments) {
+    const definitions = (0, environments_1.resolveByName)(name, scope, environments);
+    if (definitions === undefined) {
+        return false;
+    }
+    // fail if there are multiple definitions because then we must treat the complete import as a maybe because it might do something different
+    if (definitions.length !== 1) {
+        return false;
+    }
+    const def = definitions[0];
+    return def.name == 'source' && def.kind == 'built-in-function';
+}
+exports.isSourceCall = isSourceCall;
+function processSourceCall(functionCall, data, information) {
+    const sourceFile = functionCall.arguments[0];
+    if ((0, config_1.getConfig)().ignoreSourceCalls) {
+        index_1.dataflowLogger.info(`Skipping source call ${JSON.stringify(sourceFile)} (disabled in config file)`);
+        return information;
+    }
+    if (sourceFile?.value?.type == "RString" /* RType.String */) {
+        const path = (0, r_bridge_1.removeRQuotes)(sourceFile.lexeme);
+        const request = sourceProvider.createRequest(path);
+        // check if the sourced file has already been dataflow analyzed, and if so, skip it
+        if (data.referenceChain.includes((0, r_bridge_1.requestFingerprint)(request))) {
+            index_1.dataflowLogger.info(`Found loop in dataflow analysis for ${JSON.stringify(request)}: ${JSON.stringify(data.referenceChain)}, skipping further dataflow analysis`);
+            return information;
+        }
+        return sourceRequest(request, data, information, (0, r_bridge_1.sourcedDeterministicCountingIdGenerator)(path, functionCall.location));
+    }
+    else {
+        index_1.dataflowLogger.info(`Non-constant argument ${JSON.stringify(sourceFile)} for source is currently not supported, skipping`);
+        return information;
+    }
+}
+exports.processSourceCall = processSourceCall;
+function sourceRequest(request, data, information, getId) {
+    const executor = new shell_executor_1.RShellExecutor();
+    // parse, normalize and dataflow the sourced file
+    let normalized;
+    let dataflow;
+    try {
+        const parsed = (0, core_1.executeSingleSubStep)('parse', request, executor);
+        normalized = (0, core_1.executeSingleSubStep)('normalize', parsed, undefined, getId);
+        dataflow = (0, processor_1.processDataflowFor)(normalized.ast, {
+            ...data,
+            currentRequest: request,
+            environments: information.environments,
+            referenceChain: [...data.referenceChain, (0, r_bridge_1.requestFingerprint)(request)]
+        });
+    }
+    catch (e) {
+        index_1.dataflowLogger.warn(`Failed to analyze sourced file ${JSON.stringify(request)}, skipping: ${e.message}`);
+        return information;
+    }
+    // update our graph with the sourced file's information
+    const newInformation = { ...information };
+    newInformation.environments = (0, environments_1.overwriteEnvironments)(information.environments, dataflow.environments);
+    newInformation.graph.mergeWith(dataflow.graph);
+    // this can be improved, see issue #628
+    for (const [k, v] of normalized.idMap) {
+        data.completeAst.idMap.set(k, v);
+    }
+    return newInformation;
+}
+exports.sourceRequest = sourceRequest;
+//# sourceMappingURL=source.js.map

package/dataflow/processor.d.ts

@@ -1,7 +1,7 @@
 /**
  * Based on a two-way fold, this processor will automatically supply scope information
  */
-import type { NormalizedAst, ParentInformation, RNode, RNodeWithParent } from '../r-bridge';
+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> {
@@ -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

@@ -11,6 +11,8 @@ export interface FlowrCliOptions {
     'no-ansi': boolean;
     execute: string | undefined;
     script: string | undefined;
+    'config-file': string;
+    'r-path': string | undefined;
 }
 export declare const optionHelp: ({
     header: string;

package/flowr.js

@@ -23,6 +23,7 @@ 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 = [
@@ -35,6 +36,8 @@ exports.optionDefinitions = [
     { 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 = [
     {
@@ -63,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) {
@@ -95,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...')}`);
@@ -115,7 +120,7 @@ async function mainRepl() {
     process.exit(0);
 }
 async function mainServer(backend = new net_1.NetServer()) {
-    const shell = await retrieveShell();
+    const shell = retrieveShell();
     const end = () => {
         if (options.execute === undefined) {
             console.log(`\n${(0, statistics_1.italic)('Exiting...')}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eagleoutice/flowr",
-  "version": "1.4.1",
+  "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"
       ],
@@ -178,21 +190,21 @@
           "assertionStyle": "as"
         }
       ],
-      "@typescript-eslint/key-spacing": [
+      "@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",
         {
@@ -205,7 +217,7 @@
           "*.spec.{js,jsx,ts,tsx}": "test/**"
         }
       ],
-      "@typescript-eslint/keyword-spacing": [
+      "@stylistic/ts/keyword-spacing": [
         "error",
         {
           "before": true,
@@ -238,7 +250,7 @@
           }
         }
       ],
-      "@typescript-eslint/space-before-function-paren": [
+      "@stylistic/ts/space-before-function-paren": [
         "error",
         "never"
       ],
@@ -295,7 +307,14 @@
           ]
         }
       ],
-      "@typescript-eslint/consistent-type-imports": "error"
+      "@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": {
@@ -332,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",
@@ -344,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",
@@ -386,7 +410,6 @@
     "ts-essentials": "^9.4.1",
     "tslog": "^4.9.2",
     "ws": "^8.16.0",
-    "xml2js": "^0.6.2",
     "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/processing/decorate.d.ts

@@ -9,6 +9,7 @@
  * @module
  */
 import type { NoInfo, RNode } from '../model';
+import type { SourceRange } from '../../../../../util/range';
 import { BiMap } from '../../../../../util/bimap';
 import type { MergeableRecord } from '../../../../../util/objects';
 import { RoleInParent } from './role';
@@ -27,6 +28,7 @@ export type IdGenerator<OtherInfo> = (data: RNode<OtherInfo>) => NodeId;
  * The simplest id generator which just increments a number on each call.
  */
 export declare function deterministicCountingIdGenerator(start?: number): () => NodeId;
+export declare function sourcedDeterministicCountingIdGenerator(path: string, location: SourceRange, start?: number): () => NodeId;
 /**
  * Generates the location id, used by {@link deterministicLocationIdGenerator}.
  *

package/r-bridge/lang-4.x/ast/model/processing/decorate.js

@@ -10,7 +10,7 @@
  * @module
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateAst = exports.deterministicLocationIdGenerator = exports.nodeToLocationId = exports.deterministicCountingIdGenerator = void 0;
+exports.decorateAst = exports.deterministicLocationIdGenerator = exports.nodeToLocationId = exports.sourcedDeterministicCountingIdGenerator = exports.deterministicCountingIdGenerator = void 0;
 const assert_1 = require("../../../../../util/assert");
 const bimap_1 = require("../../../../../util/bimap");
 const fold_1 = require("./fold");
@@ -22,6 +22,11 @@ function deterministicCountingIdGenerator(start = 0) {
     return () => `${id++}`;
 }
 exports.deterministicCountingIdGenerator = deterministicCountingIdGenerator;
+function sourcedDeterministicCountingIdGenerator(path, location, start = 0) {
+    let id = start;
+    return () => `${path}-${loc2Id(location)}-${id++}`;
+}
+exports.sourcedDeterministicCountingIdGenerator = sourcedDeterministicCountingIdGenerator;
 function loc2Id(loc) {
     return `${loc.start.line}:${loc.start.column}-${loc.end.line}:${loc.end.column}`;
 }

package/r-bridge/lang-4.x/ast/parser/json/format.d.ts

@@ -0,0 +1,14 @@
+export declare const RootId = 0;
+export interface Entry extends Record<string, unknown> {
+    line1: number;
+    col1: number;
+    line2: number;
+    col2: number;
+    id: number;
+    parent: number;
+    token: string;
+    terminal: boolean;
+    text: string;
+    children?: Entry[];
+}
+export declare function prepareParsedData(data: string): Map<number, Entry>;

package/r-bridge/lang-4.x/ast/parser/json/format.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareParsedData = exports.RootId = void 0;
+const retriever_1 = require("../../../../retriever");
+const assert_1 = require("../../../../../util/assert");
+exports.RootId = 0;
+function prepareParsedData(data) {
+    const json = JSON.parse(data);
+    (0, assert_1.guard)(Array.isArray(json), () => `Expected ${data} to be an array but was not`);
+    const ret = new Map(json.map(([line1, col1, line2, col2, id, parent, token, terminal, text]) => {
+        return [id, { line1, col1, line2, col2, id, parent, token: (0, retriever_1.removeRQuotes)(token), terminal, text }];
+    }));
+    // iterate a second time to set parent-child relations (since they may be out of order in the csv)
+    for (const entry of ret.values()) {
+        if (entry.parent != exports.RootId) {
+            const parent = ret.get(entry.parent);
+            if (parent) {
+                parent.children ??= [];
+                parent.children.push(entry);
+            }
+        }
+    }
+    return ret;
+}
+exports.prepareParsedData = prepareParsedData;
+//# sourceMappingURL=format.js.map

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

@@ -0,0 +1,7 @@
+import type { DeepPartial } from 'ts-essentials';
+import type { XmlBasedJson, XmlParserHooks } from '../xml';
+import type { IdGenerator, NoInfo, NormalizedAst } from '../../model';
+import type { Entry } from './format';
+export declare const parseLog: import("tslog").Logger<import("tslog").ILogObj>;
+export declare function normalize(jsonString: string, hooks?: DeepPartial<XmlParserHooks>, getId?: IdGenerator<NoInfo>): NormalizedAst;
+export declare function convertPreparedParsedData(valueMapping: Map<number, Entry>): XmlBasedJson;

package/r-bridge/lang-4.x/ast/parser/json/parser.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertPreparedParsedData = exports.normalize = exports.parseLog = void 0;
+const xml_1 = require("../xml");
+const model_1 = require("../../model");
+const objects_1 = require("../../../../../util/objects");
+const format_1 = require("./format");
+const internal_1 = require("../xml/internal");
+const log_1 = require("../../../../../util/log");
+exports.parseLog = log_1.log.getSubLogger({ name: 'ast-parser' });
+function normalize(jsonString, hooks, getId = (0, model_1.deterministicCountingIdGenerator)(0)) {
+    const hooksWithDefaults = (0, objects_1.deepMergeObject)(xml_1.DEFAULT_PARSER_HOOKS, hooks);
+    const data = { hooks: hooksWithDefaults, currentRange: undefined, currentLexeme: undefined };
+    const object = convertPreparedParsedData((0, format_1.prepareParsedData)(jsonString));
+    return (0, model_1.decorateAst)((0, internal_1.parseRootObjToAst)(data, object), getId);
+}
+exports.normalize = normalize;
+function convertPreparedParsedData(valueMapping) {
+    const exprlist = {};
+    exprlist[xml_1.nameKey] = 'exprlist';
+    const children = [];
+    for (const entry of valueMapping.values()) {
+        if (entry.parent == format_1.RootId) {
+            children.push(convertEntry(entry));
+        }
+    }
+    exprlist[xml_1.childrenKey] = children;
+    return { 'exprlist': exprlist };
+}
+exports.convertPreparedParsedData = convertPreparedParsedData;
+function convertEntry(csvEntry) {
+    const xmlEntry = {};
+    xmlEntry[xml_1.attributesKey] = {
+        'line1': csvEntry.line1,
+        'col1': csvEntry.col1,
+        'line2': csvEntry.line2,
+        'col2': csvEntry.col2
+    };
+    xmlEntry[xml_1.nameKey] = csvEntry.token;
+    if (csvEntry.text) {
+        xmlEntry[xml_1.contentKey] = csvEntry.text;
+    }
+    // check and recursively iterate children
+    if (csvEntry.children && csvEntry.children.length > 0) {
+        xmlEntry[xml_1.childrenKey] = csvEntry.children
+            // we sort children the same way xmlparsedata does (by line, by column, by inverse end line, by inverse end column, by terminal state, by combined "start" tiebreaker value)
+            // (https://github.com/r-lib/xmlparsedata/blob/main/R/package.R#L153C72-L153C78)
+            .sort((c1, c2) => c1.line1 - c2.line1 || c1.col1 - c2.col1 || c2.line2 - c1.line2 || c2.col2 - c1.col2 || Number(c1.terminal) - Number(c2.terminal) || sortTiebreak(c1) - sortTiebreak(c2))
+            .map(convertEntry);
+    }
+    return xmlEntry;
+}
+function sortTiebreak(entry) {
+    // see https://github.com/r-lib/xmlparsedata/blob/main/R/package.R#L110C5-L110C11
+    return entry.line1 * (Math.max(entry.col1, entry.col2) + 1) + entry.col1;
+}
+//# sourceMappingURL=parser.js.map

package/r-bridge/lang-4.x/ast/parser/xml/data.d.ts

@@ -1,14 +1,11 @@
 import type { MergeableRecord } from '../../../../../util/objects';
 import type { DeepReadonly } from 'ts-essentials';
-import type { XmlParserConfig } from './config';
 import type { XmlParserHooks } from './hooks';
 import type { SourceRange } from '../../../../../util/range';
 /**
  * Contains all information populated and present during parsing and normalization of the R AST.
  */
 export interface ParserData extends MergeableRecord {
-    /** @see XmlParserConfig */
-    readonly config: DeepReadonly<XmlParserConfig>;
     /** @see XmlParserHooks */
     readonly hooks: DeepReadonly<XmlParserHooks>;
     /**

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

@@ -1,5 +1,3 @@
 export * from './data';
 export * from './hooks';
-export * from './config';
-export * from './parser';
 export * from './input-format';

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

@@ -16,7 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./data"), exports);
 __exportStar(require("./hooks"), exports);
-__exportStar(require("./config"), exports);
-__exportStar(require("./parser"), exports);
 __exportStar(require("./input-format"), exports);
 //# sourceMappingURL=index.js.map

package/r-bridge/lang-4.x/ast/parser/xml/input-format.d.ts

@@ -1,4 +1,8 @@
 import type { RawRType } from '../../model';
+export declare const attributesKey = "a";
+export declare const childrenKey = "c";
+export declare const contentKey = "@";
+export declare const nameKey = "#";
 /**
  * Thrown if the given input xml is not valid/contains unexpected elements.
  */
@@ -29,4 +33,4 @@ export interface NamedXmlBasedJson {
  * @typeParam T - the type of the values to retrieve. Note, that this type is not checked at runtime.
  */
 export declare function getKeysGuarded<T extends XmlBasedJsonValue>(obj: XmlBasedJson, key: string): T;
-export declare function getKeysGuarded<T extends XmlBasedJsonValue>(obj: XmlBasedJson, ...key: string[]): Record<string, T>;
+export declare function getKeysGuarded<T extends XmlBasedJsonValue>(obj: XmlBasedJson, ...key: readonly string[]): Record<string, T>;