@eagleoutice/flowr 1.3.14 → 1.4.2

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/break.d.ts

@@ -1,4 +1,4 @@
-import { ParserData } from '../../data';
-import { XmlBasedJson } from '../../input-format';
-import { RBreak } from '../../../../model';
+import type { ParserData } from '../../data';
+import type { XmlBasedJson } from '../../input-format';
+import type { RBreak } from '../../../../model';
 export declare function normalizeBreak(data: ParserData, obj: XmlBasedJson): RBreak;

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/break.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeBreak = void 0;
-const parser_1 = require("../../parser");
 const hooks_1 = require("../../hooks");
 const meta_1 = require("../meta");
+const parser_1 = require("../../../json/parser");
 function normalizeBreak(data, obj) {
     parser_1.parseLog.debug(`[break] try: ${JSON.stringify(obj)}`);
     obj = (0, hooks_1.executeHook)(data.hooks.loops.onBreak.before, data, obj);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(obj);
     const result = {
         type: "RBreak" /* RType.Break */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/for.d.ts

@@ -1,4 +1,4 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RForLoop } from '../../../../model';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RForLoop } from '../../../../model';
 export declare function tryNormalizeFor(data: ParserData, forToken: NamedXmlBasedJson, head: NamedXmlBasedJson, body: NamedXmlBasedJson): RForLoop | undefined;

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/for.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeFor = void 0;
 const input_format_1 = require("../../input-format");
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const assert_1 = require("../../../../../../../util/assert");
 const values_1 = require("../values");
 const structure_1 = require("../structure");
 const hooks_1 = require("../../hooks");
 const other_1 = require("../other");
+const parser_1 = require("../../../json/parser");
 function tryNormalizeFor(data, forToken, head, body) {
     // funny, for does not use top-level parenthesis
     if (forToken.name !== "FOR" /* RawRType.For */) {
@@ -35,7 +35,7 @@ function tryNormalizeFor(data, forToken, head, body) {
             parseBody,
         ])}`);
     }
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, forToken.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(forToken.content);
     const result = {
         type: "RForLoop" /* RType.ForLoop */,
         variable: parsedVariable,
@@ -54,10 +54,7 @@ function tryNormalizeFor(data, forToken, head, body) {
 exports.tryNormalizeFor = tryNormalizeFor;
 function normalizeForHead(data, forCondition) {
     // must have a child which is `in`, a variable on the left, and a vector on the right
-    const children = (0, input_format_1.getKeysGuarded)(forCondition, data.config.childrenName).map(content => ({
-        name: (0, meta_1.getTokenType)(data.config.tokenMap, content),
-        content
-    }));
+    const children = (0, input_format_1.getKeysGuarded)(forCondition, input_format_1.childrenKey).map(content => ({ name: (0, meta_1.getTokenType)(content), content }));
     const { comments, others } = (0, structure_1.splitComments)(children);
     const inPosition = others.findIndex(elem => elem.name === "IN" /* RawRType.ForIn */);
     (0, assert_1.guard)(inPosition > 0 && inPosition < others.length - 1, () => `for loop searched in and found at ${inPosition}, but this is not in legal bounds for ${JSON.stringify(children)}`);

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/next.d.ts

@@ -1,4 +1,4 @@
-import { ParserData } from '../../data';
-import { XmlBasedJson } from '../../input-format';
-import { RNext } from '../../../../model';
+import type { ParserData } from '../../data';
+import type { XmlBasedJson } from '../../input-format';
+import type { RNext } from '../../../../model';
 export declare function normalizeNext(data: ParserData, obj: XmlBasedJson): RNext;

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/next.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeNext = void 0;
-const parser_1 = require("../../parser");
 const hooks_1 = require("../../hooks");
 const meta_1 = require("../meta");
+const parser_1 = require("../../../json/parser");
 function normalizeNext(data, obj) {
     parser_1.parseLog.debug(`[next] try: ${JSON.stringify(obj)}`);
     obj = (0, hooks_1.executeHook)(data.hooks.loops.onNext.before, data, obj);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(obj);
     const result = {
         type: "RNext" /* RType.Next */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/repeat.d.ts

@@ -1,6 +1,6 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RRepeatLoop } from '../../../../model';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RRepeatLoop } from '../../../../model';
 /**
  * Try to parse the construct as a {@link RRepeatLoop}.
  *

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/repeat.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeRepeat = void 0;
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const structure_1 = require("../structure");
 const assert_1 = require("../../../../../../../util/assert");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 /**
  * Try to parse the construct as a {@link RRepeatLoop}.
  *
@@ -24,7 +24,7 @@ function tryNormalizeRepeat(data, repeatToken, body) {
     ({ repeatToken, body } = (0, hooks_1.executeHook)(data.hooks.loops.onRepeatLoop.before, data, { repeatToken, body }));
     const parseBody = (0, structure_1.tryNormalizeSingleNode)(data, body);
     (0, assert_1.guard)(parseBody.type !== "RDelimiter" /* RType.Delimiter */, () => `no body for repeat-loop ${JSON.stringify(repeatToken)} (${JSON.stringify(body)})`);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, repeatToken.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(repeatToken.content);
     const result = {
         type: "RRepeatLoop" /* RType.RepeatLoop */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/while.d.ts

@@ -1,4 +1,4 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RWhileLoop } from '../../../../model';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RWhileLoop } from '../../../../model';
 export declare function tryNormalizeWhile(data: ParserData, whileToken: NamedXmlBasedJson, leftParen: NamedXmlBasedJson, condition: NamedXmlBasedJson, rightParen: NamedXmlBasedJson, body: NamedXmlBasedJson): RWhileLoop | undefined;

package/r-bridge/lang-4.x/ast/parser/xml/internal/loops/while.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeWhile = void 0;
 const input_format_1 = require("../../input-format");
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const structure_1 = require("../structure");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 function tryNormalizeWhile(data, whileToken, leftParen, condition, rightParen, body) {
     if (whileToken.name !== "WHILE" /* RawRType.While */) {
         parser_1.parseLog.debug('encountered non-while token for supposed while-loop structure');
@@ -26,7 +26,7 @@ function tryNormalizeWhile(data, whileToken, leftParen, condition, rightParen, b
             parseBody,
         ])} for ${JSON.stringify([whileToken, condition, body])}`);
     }
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, whileToken.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(whileToken.content);
     const result = {
         type: "RWhileLoop" /* RType.WhileLoop */,
         condition: parsedCondition,

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

@@ -1,7 +1,6 @@
-import { NamedXmlBasedJson, XmlBasedJson } from '../input-format';
-import { SourceRange } from '../../../../../../util/range';
-import { XmlParserConfig } from '../config';
-import { RawRType, RExpressionList, RNode } from '../../../model';
+import type { NamedXmlBasedJson, XmlBasedJson } from '../input-format';
+import type { SourceRange } from '../../../../../../util/range';
+import type { RawRType, RExpressionList, RNode } from '../../../model';
 /**
  * if the passed object is an array with only one element, remove the array wrapper
  */
@@ -14,37 +13,33 @@ export declare function extractLocation(ast: XmlBasedJson): SourceRange;
  * The json object that represents the input xml contains various meta-information.
  * This function extracts the meta-information and returns it.
  *
- * @param config - The configuration of the parser to use to retrieve the corresponding name fields
  * @param obj    - The json object to extract the meta-information from
  */
-export declare function retrieveMetaStructure(config: XmlParserConfig, obj: XmlBasedJson): {
+export declare function retrieveMetaStructure(obj: XmlBasedJson): {
     /** the obj passed in, but potentially without surrounding array wrappers (see {@link objectWithArrUnwrap}) */
     unwrappedObj: XmlBasedJson;
     /** location information of the corresponding R-ast element */
     location: SourceRange;
     content: string;
 };
-export declare function revertTokenReplacement(tokenMap: XmlParserConfig['tokenMap'], token: string): string;
-export declare function assureTokenType(tokenMap: XmlParserConfig['tokenMap'], obj: XmlBasedJson, expectedName: RawRType): void;
+export declare function assureTokenType(obj: XmlBasedJson, expectedName: RawRType): void;
 /**
  * Extract the token-type of the given object. This is based on the knowledge, that all json objects created
  * from the R xml have a name attached.
  *
- * @param tokenMap - used to revert token types (i.e., revert `xmlparsedata`)
  * @param content  - the json object to extract the token-type from
  */
-export declare function getTokenType(tokenMap: XmlParserConfig['tokenMap'], content: XmlBasedJson): RawRType;
-export declare function getWithTokenType(tokenMap: XmlParserConfig['tokenMap'], obj: XmlBasedJson[]): {
+export declare function getTokenType(content: XmlBasedJson): RawRType;
+export declare function getWithTokenType(obj: XmlBasedJson[]): {
     name: RawRType;
     content: XmlBasedJson;
 }[];
-export declare function retrieveOpName(config: XmlParserConfig, operator: NamedXmlBasedJson): string;
+export declare function retrieveOpName(operator: NamedXmlBasedJson): string;
 /**
  * Ensure that the first child is completely before the second child.
  *
- * @param config - the configuration of the parser to use to retrieve the corresponding name fields
  * @param first  - the first child which should be the lhs
  * @param second - the second child which should be the rhs
  */
-export declare function ensureChildrenAreLhsAndRhsOrdered(config: XmlParserConfig, first: XmlBasedJson, second: XmlBasedJson): void;
+export declare function ensureChildrenAreLhsAndRhsOrdered(first: XmlBasedJson, second: XmlBasedJson): void;
 export declare function ensureExpressionList<Info>(node: RNode<Info>): RExpressionList<Info>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureExpressionList = exports.ensureChildrenAreLhsAndRhsOrdered = exports.retrieveOpName = exports.getWithTokenType = exports.getTokenType = exports.assureTokenType = exports.revertTokenReplacement = exports.retrieveMetaStructure = exports.extractLocation = exports.objectWithArrUnwrap = void 0;
+exports.ensureExpressionList = exports.ensureChildrenAreLhsAndRhsOrdered = exports.retrieveOpName = exports.getWithTokenType = exports.getTokenType = exports.assureTokenType = exports.retrieveMetaStructure = exports.extractLocation = exports.objectWithArrUnwrap = void 0;
 const input_format_1 = require("../input-format");
 const range_1 = require("../../../../../../util/range");
 const assert_1 = require("../../../../../../util/assert");
@@ -34,13 +34,12 @@ exports.extractLocation = extractLocation;
  * The json object that represents the input xml contains various meta-information.
  * This function extracts the meta-information and returns it.
  *
- * @param config - The configuration of the parser to use to retrieve the corresponding name fields
  * @param obj    - The json object to extract the meta-information from
  */
-function retrieveMetaStructure(config, obj) {
+function retrieveMetaStructure(obj) {
     const unwrappedObj = objectWithArrUnwrap(obj);
-    const attributes = obj[config.attributeName];
-    const content = obj[config.contentName] ?? '';
+    const attributes = obj[input_format_1.attributesKey];
+    const content = obj[input_format_1.contentKey] ?? '';
     (0, assert_1.guard)(attributes !== undefined, () => `expected attributes to be defined for ${JSON.stringify(obj)}`);
     const location = extractLocation(attributes);
     return {
@@ -50,13 +49,8 @@ function retrieveMetaStructure(config, obj) {
     };
 }
 exports.retrieveMetaStructure = retrieveMetaStructure;
-function revertTokenReplacement(tokenMap, token) {
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- it is still necessary as we do not know if we have a replacement for the given token
-    return tokenMap[token] ?? token;
-}
-exports.revertTokenReplacement = revertTokenReplacement;
-function assureTokenType(tokenMap, obj, expectedName) {
-    const name = getTokenType(tokenMap, obj);
+function assureTokenType(obj, expectedName) {
+    const name = getTokenType(obj);
     if (name !== expectedName) {
         throw new input_format_1.XmlParseError(`expected name to be ${expectedName}, yet received ${name} for ${JSON.stringify(obj)}`);
     }
@@ -66,37 +60,35 @@ exports.assureTokenType = assureTokenType;
  * Extract the token-type of the given object. This is based on the knowledge, that all json objects created
  * from the R xml have a name attached.
  *
- * @param tokenMap - used to revert token types (i.e., revert `xmlparsedata`)
  * @param content  - the json object to extract the token-type from
  */
-function getTokenType(tokenMap, content) {
-    return revertTokenReplacement(tokenMap, (0, input_format_1.getKeysGuarded)(content, '#name'));
+function getTokenType(content) {
+    return (0, input_format_1.getKeysGuarded)(content, input_format_1.nameKey);
 }
 exports.getTokenType = getTokenType;
-function getWithTokenType(tokenMap, obj) {
+function getWithTokenType(obj) {
     return obj.map((content) => ({
-        name: getTokenType(tokenMap, content),
+        name: getTokenType(content),
         content
     }));
 }
 exports.getWithTokenType = getWithTokenType;
-function retrieveOpName(config, operator) {
+function retrieveOpName(operator) {
     /*
    * only real arithmetic ops have their operation as their own name, the others identify via content
    */
-    return operator.content[config.contentName];
+    return operator.content[input_format_1.contentKey];
 }
 exports.retrieveOpName = retrieveOpName;
 /**
  * Ensure that the first child is completely before the second child.
  *
- * @param config - the configuration of the parser to use to retrieve the corresponding name fields
  * @param first  - the first child which should be the lhs
  * @param second - the second child which should be the rhs
  */
-function ensureChildrenAreLhsAndRhsOrdered(config, first, second) {
-    const firstOtherLoc = extractLocation(first[config.attributeName]);
-    const secondOtherLoc = extractLocation(second[config.attributeName]);
+function ensureChildrenAreLhsAndRhsOrdered(first, second) {
+    const firstOtherLoc = extractLocation(first[input_format_1.attributesKey]);
+    const secondOtherLoc = extractLocation(second[input_format_1.attributesKey]);
     if (!(0, range_1.rangeStartsCompletelyBefore)(firstOtherLoc, secondOtherLoc)) {
         throw new input_format_1.XmlParseError(`expected the first child to be the lhs, yet received ${JSON.stringify(first)} & ${JSON.stringify(second)}`);
     }

package/r-bridge/lang-4.x/ast/parser/xml/internal/operators/binary.d.ts

@@ -1,6 +1,6 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RNode } from '../../../../model';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RNode } from '../../../../model';
 /**
  * Parsing binary operations includes the pipe, even though the produced PIPE construct is not a binary operation,
  * to ensure it is handled separately from the others (especially in the combination of a pipe bind)

package/r-bridge/lang-4.x/ast/parser/xml/internal/operators/binary.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeBinary = void 0;
 const input_format_1 = require("../../input-format");
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const special_1 = require("./special");
 const structure_1 = require("../structure");
 const model_1 = require("../../../../model");
 const hooks_1 = require("../../hooks");
 const assert_1 = require("../../../../../../../util/assert");
+const parser_1 = require("../../../json/parser");
 /**
  * Parsing binary operations includes the pipe, even though the produced PIPE construct is not a binary operation,
  * to ensure it is handled separately from the others (especially in the combination of a pipe bind)
@@ -46,18 +46,18 @@ exports.tryNormalizeBinary = tryNormalizeBinary;
 function parseBinaryOp(data, flavor, lhs, operator, rhs) {
     parser_1.parseLog.debug(`[binary op] trying to parse ${flavor}`);
     ({ flavor, lhs, rhs, operator } = (0, hooks_1.executeHook)(data.hooks.operators.onBinary.before, data, { flavor, lhs, operator, rhs }));
-    (0, meta_1.ensureChildrenAreLhsAndRhsOrdered)(data.config, lhs.content, rhs.content);
+    (0, meta_1.ensureChildrenAreLhsAndRhsOrdered)(lhs.content, rhs.content);
     let parsedLhs = (0, structure_1.tryNormalizeSingleNode)(data, lhs);
     let parsedRhs = (0, structure_1.tryNormalizeSingleNode)(data, rhs);
     if (parsedLhs.type === "RDelimiter" /* RType.Delimiter */ || parsedRhs.type === "RDelimiter" /* RType.Delimiter */) {
         throw new input_format_1.XmlParseError(`unexpected under-sided binary op, received ${JSON.stringify([parsedLhs, parsedRhs])} for ${JSON.stringify([lhs, operator, rhs])}`);
     }
-    const operationName = (0, meta_1.retrieveOpName)(data.config, operator);
+    const operationName = (0, meta_1.retrieveOpName)(operator);
     // special support for strings in assignments
     if (flavor === 'assignment') {
-        [parsedLhs, parsedRhs] = processLhsAndRhsForAssignment(data, operationName, parsedLhs, parsedRhs);
+        [parsedLhs, parsedRhs] = processLhsAndRhsForAssignment(operationName, parsedLhs, parsedRhs);
     }
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, operator.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(operator.content);
     if (flavor === 'special') {
         flavor = (0, special_1.identifySpecialOp)(content);
     }
@@ -142,7 +142,7 @@ function parseBinaryOp(data, flavor, lhs, operator, rhs) {
     }
     return (0, hooks_1.executeHook)(data.hooks.operators.onBinary.after, data, result);
 }
-function processLhsAndRhsForAssignment(data, opName, parsedLhs, parsedRhs) {
+function processLhsAndRhsForAssignment(opName, parsedLhs, parsedRhs) {
     const isRhs = opName === '->' || opName === '->>';
     const assigned = isRhs ? parsedRhs : parsedLhs;
     if (assigned.type !== "RString" /* RType.String */) {

package/r-bridge/lang-4.x/ast/parser/xml/internal/operators/special.d.ts

@@ -1,4 +1,4 @@
-import { BinaryOperatorFlavor } from '../../../../model';
+import type { BinaryOperatorFlavor } from '../../../../model';
 /**
  * Identify the flavor of a given operator, as we do not really have a use for "special"
  * operators within our internal AST.

package/r-bridge/lang-4.x/ast/parser/xml/internal/operators/unary.d.ts

@@ -1,6 +1,6 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RNode } from '../../../../model';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RNode } from '../../../../model';
 /**
  * Parses the construct as a {@link RUnaryOp} (automatically identifies the flavor).
  *

package/r-bridge/lang-4.x/ast/parser/xml/internal/operators/unary.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeUnary = void 0;
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const structure_1 = require("../structure");
 const assert_1 = require("../../../../../../../util/assert");
 const model_1 = require("../../../../model");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 /**
  * Parses the construct as a {@link RUnaryOp} (automatically identifies the flavor).
  *
@@ -39,8 +39,8 @@ function parseUnaryOp(data, flavor, operator, operand) {
     ({ flavor, operator, operand } = (0, hooks_1.executeHook)(data.hooks.operators.onUnary.before, data, { flavor, operator, operand }));
     const parsedOperand = (0, structure_1.tryNormalizeSingleNode)(data, operand);
     (0, assert_1.guard)(parsedOperand.type !== "RDelimiter" /* RType.Delimiter */, () => 'unexpected under-sided unary op');
-    const operationName = (0, meta_1.retrieveOpName)(data.config, operator);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, operator.content);
+    const operationName = (0, meta_1.retrieveOpName)(operator);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(operator.content);
     const result = {
         type: "RUnaryOp" /* RType.UnaryOp */,
         flavor,

package/r-bridge/lang-4.x/ast/parser/xml/internal/other/comment.d.ts

@@ -1,6 +1,6 @@
-import { XmlBasedJson } from '../../input-format';
-import { RComment } from '../../../../model';
-import { ParserData } from '../../data';
+import type { XmlBasedJson } from '../../input-format';
+import type { RComment } from '../../../../model';
+import type { ParserData } from '../../data';
 /**
  * Normalize the given object as an R comment.
  * This requires you to check the corresponding name beforehand.

package/r-bridge/lang-4.x/ast/parser/xml/internal/other/comment.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeComment = void 0;
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const assert_1 = require("../../../../../../../util/assert");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 /**
  * Normalize the given object as an R comment.
  * This requires you to check the corresponding name beforehand.
@@ -15,7 +15,7 @@ const hooks_1 = require("../../hooks");
 function normalizeComment(data, obj) {
     parser_1.parseLog.debug('[comment]');
     obj = (0, hooks_1.executeHook)(data.hooks.other.onComment.before, data, obj);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(obj);
     (0, assert_1.guard)(content.startsWith('#'), 'comment must start with #');
     const result = {
         type: "RComment" /* RType.Comment */,

package/r-bridge/lang-4.x/ast/parser/xml/internal/other/line-directive.d.ts

@@ -1,6 +1,6 @@
-import { XmlBasedJson } from '../../input-format';
-import { RComment, RLineDirective } from '../../../../model';
-import { ParserData } from '../../data';
+import type { XmlBasedJson } from '../../input-format';
+import type { RComment, RLineDirective } from '../../../../model';
+import type { ParserData } from '../../data';
 /**
  * Normalize the given object as an R line directive (`#line <number> "<file>"`).
  * This requires you to check the corresponding name beforehand.

package/r-bridge/lang-4.x/ast/parser/xml/internal/other/line-directive.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeLineDirective = void 0;
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const assert_1 = require("../../../../../../../util/assert");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 const LineDirectiveRegex = /^#line\s+(\d+)\s+"([^"]+)"\s*$/;
 /**
  * Normalize the given object as an R line directive (`#line <number> "<file>"`).
@@ -17,7 +17,7 @@ const LineDirectiveRegex = /^#line\s+(\d+)\s+"([^"]+)"\s*$/;
 function normalizeLineDirective(data, obj) {
     parser_1.parseLog.debug('[line-directive]');
     obj = (0, hooks_1.executeHook)(data.hooks.other.onLineDirective.before, data, obj);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(obj);
     (0, assert_1.guard)(content.startsWith('#line'), 'line directive must start with #line');
     const match = LineDirectiveRegex.exec(content);
     let result;

package/r-bridge/lang-4.x/ast/parser/xml/internal/structure/elements.d.ts

@@ -1,7 +1,7 @@
-import { NamedXmlBasedJson, XmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RNode } from '../../../../model';
-import { RDelimiter } from '../../../../model/nodes/info';
+import type { NamedXmlBasedJson, XmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RNode } from '../../../../model';
+import type { RDelimiter } from '../../../../model/nodes/info';
 export declare function splitComments(mappedWithName: NamedXmlBasedJson[]): {
     comments: NamedXmlBasedJson[];
     others: NamedXmlBasedJson[];

package/r-bridge/lang-4.x/ast/parser/xml/internal/structure/elements.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseNodesWithUnknownType = exports.normalizeBasedOnType = exports.splitComments = void 0;
 const arrays_1 = require("../../../../../../../util/arrays");
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const single_element_1 = require("./single-element");
 const values_1 = require("../values");
@@ -11,6 +10,7 @@ const loops_1 = require("../loops");
 const control_1 = require("../control");
 const log_1 = require("../../../../../../../util/log");
 const other_1 = require("../other");
+const parser_1 = require("../../../json/parser");
 function normalizeMappedWithoutSemicolonBasedOnType(mappedWithName, data) {
     if (mappedWithName.length === 1) {
         return [(0, single_element_1.tryNormalizeSingleNode)(data, mappedWithName[0])];
@@ -103,14 +103,14 @@ function normalizeBasedOnType(data, obj) {
         mappedWithName = obj;
     }
     else {
-        mappedWithName = (0, meta_1.getWithTokenType)(data.config.tokenMap, obj);
+        mappedWithName = (0, meta_1.getWithTokenType)(obj);
     }
     log_1.log.trace(`[parseBasedOnType] names: [${mappedWithName.map(({ name }) => name).join(', ')}]`);
     const semiColons = [];
     const splitOnSemicolon = (0, arrays_1.splitArrayOn)(mappedWithName, node => {
         const res = node.name === ";" /* RawRType.Semicolon */;
         if (res) {
-            const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, node.content);
+            const { location, content } = (0, meta_1.retrieveMetaStructure)(node.content);
             semiColons.push({
                 type: "RDelimiter" /* RType.Delimiter */,
                 subtype: ";" /* RawRType.Semicolon */,

package/r-bridge/lang-4.x/ast/parser/xml/internal/structure/root.d.ts

@@ -1,4 +1,4 @@
-import { XmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RExpressionList } from '../../../../model';
+import type { XmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RExpressionList } from '../../../../model';
 export declare function parseRootObjToAst(data: ParserData, obj: XmlBasedJson): RExpressionList;

package/r-bridge/lang-4.x/ast/parser/xml/internal/structure/root.js

@@ -7,12 +7,11 @@ const elements_1 = require("./elements");
 const log_1 = require("../../../../../../../util/log");
 const arrays_1 = require("../../../../../../../util/arrays");
 function parseRootObjToAst(data, obj) {
-    const config = data.config;
     const exprContent = (0, input_format_1.getKeysGuarded)(obj, "exprlist" /* RawRType.ExpressionList */);
-    (0, meta_1.assureTokenType)(config.tokenMap, exprContent, "exprlist" /* RawRType.ExpressionList */);
+    (0, meta_1.assureTokenType)(exprContent, "exprlist" /* RawRType.ExpressionList */);
     let parsedChildren = [];
-    if (config.childrenName in exprContent) {
-        const children = (0, input_format_1.getKeysGuarded)(exprContent, config.childrenName);
+    if (input_format_1.childrenKey in exprContent) {
+        const children = (0, input_format_1.getKeysGuarded)(exprContent, input_format_1.childrenKey);
         parsedChildren = (0, elements_1.normalizeBasedOnType)(data, children);
     }
     else {

package/r-bridge/lang-4.x/ast/parser/xml/internal/structure/single-element.d.ts

@@ -1,7 +1,7 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RNode } from '../../../../model';
-import { RDelimiter } from '../../../../model/nodes/info';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RNode } from '../../../../model';
+import type { RDelimiter } from '../../../../model/nodes/info';
 /**
  * Parses a single structure in the ast based on its type (e.g., a string, a number, a symbol, ...)
  *

package/r-bridge/lang-4.x/ast/parser/xml/internal/structure/single-element.js

@@ -10,7 +10,7 @@ const other_1 = require("../other");
 const loops_1 = require("../loops");
 const line_directive_1 = require("../other/line-directive");
 function normalizeDelimiter(data, elem) {
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, elem.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(elem.content);
     return {
         type: "RDelimiter" /* RType.Delimiter */,
         location,
@@ -52,7 +52,7 @@ function tryNormalizeSingleNode(data, elem) {
         case "SYMBOL" /* RawRType.Symbol */:
         case "SLOT" /* RawRType.Slot */:
         case "NULL_CONST" /* RawRType.NullConst */: {
-            const symbol = (0, values_1.tryNormalizeSymbol)(data, (0, meta_1.getWithTokenType)(data.config.tokenMap, [elem.content]));
+            const symbol = (0, values_1.tryNormalizeSymbol)(data, (0, meta_1.getWithTokenType)([elem.content]));
             (0, assert_1.guard)(symbol !== undefined, () => `should have been parsed to a symbol but was ${JSON.stringify(symbol)}`);
             return symbol;
         }

package/r-bridge/lang-4.x/ast/parser/xml/internal/values/number.d.ts

@@ -1,7 +1,7 @@
-import { XmlBasedJson } from '../../input-format';
-import { RNa } from '../../../../../values';
-import { RLogical, RSymbol, NoInfo, RNumber } from '../../../../model';
-import { ParserData } from '../../data';
+import type { XmlBasedJson } from '../../input-format';
+import type { RNa } from '../../../../../values';
+import type { RLogical, RSymbol, NoInfo, RNumber } from '../../../../model';
+import type { ParserData } from '../../data';
 /**
  * Normalize the given object as a R number (see {@link number2ts}), supporting booleans (see {@link boolean2ts}),
  * and special values.

package/r-bridge/lang-4.x/ast/parser/xml/internal/values/number.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeNumber = void 0;
 const values_1 = require("../../../../../values");
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 /**
  * Normalize the given object as a R number (see {@link number2ts}), supporting booleans (see {@link boolean2ts}),
  * and special values.
@@ -16,7 +16,7 @@ const hooks_1 = require("../../hooks");
 function normalizeNumber(data, obj) {
     parser_1.parseLog.debug('[number]');
     obj = (0, hooks_1.executeHook)(data.hooks.values.onNumber.before, data, obj);
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(obj);
     const common = {
         location,
         lexeme: content,

package/r-bridge/lang-4.x/ast/parser/xml/internal/values/string.d.ts

@@ -1,6 +1,6 @@
-import { XmlBasedJson } from '../../input-format';
-import { RString } from '../../../../model';
-import { ParserData } from '../../data';
+import type { XmlBasedJson } from '../../input-format';
+import type { RString } from '../../../../model';
+import type { ParserData } from '../../data';
 /**
  * Normalize the given object as a R string (see {@link string2ts}).
  * This requires you to check the corresponding name beforehand.