npm - @eagleoutice/flowr - Versions diffs - 1.3.14 → 1.4.2 - Mend

@eagleoutice/flowr 1.3.14 → 1.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (309) hide show

package/r-bridge/lang-4.x/ast/model/nodes/r-symbol.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { Leaf, Location, Namespace, NoInfo } from '../model';
-import { RType } from '../type';
+import type { Leaf, Location, Namespace, NoInfo } from '../model';
+import type { RType } from '../type';
 export declare function isSpecialSymbol(symbol: RSymbol): boolean;
 export interface RSymbol<Info = NoInfo, T extends string = string> extends Leaf<Info>, Namespace, Location {
     readonly type: RType.Symbol;

package/r-bridge/lang-4.x/ast/model/nodes/r-unary-op.d.ts CHANGED Viewed

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

package/r-bridge/lang-4.x/ast/model/nodes/r-while-loop.d.ts CHANGED Viewed

@@ -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';
 /**
  * ```ts
  * while ( <condition> ) <body>

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

@@ -1,4 +1,4 @@
-import { MergeableRecord } from '../../../../util/objects';
+import type { MergeableRecord } from '../../../../util/objects';
 import { RawRType } from './type';
 /**
  * Just a type-alias so that type declarations become more readable.

package/r-bridge/lang-4.x/ast/model/processing/decorate.d.ts CHANGED Viewed

@@ -8,9 +8,10 @@
  *
  * @module
  */
-import { NoInfo, RNode } from '../model';
+import type { NoInfo, RNode } from '../model';
+import type { SourceRange } from '../../../../../util/range';
 import { BiMap } from '../../../../../util/bimap';
-import { MergeableRecord } from '../../../../../util/objects';
+import type { MergeableRecord } from '../../../../../util/objects';
 import { RoleInParent } from './role';
 /** The type of the id assigned to each node. Branded to avoid problematic usages with other string types. */
 export type NodeId = string & {
@@ -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 CHANGED Viewed

@@ -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/model/processing/fold.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { DeepReadonly } from 'ts-essentials';
-import { RNode } from '../model';
-import { StatefulFoldFunctions } from './stateful-fold';
+import type { DeepReadonly } from 'ts-essentials';
+import type { RNode } from '../model';
+import type { StatefulFoldFunctions } from './stateful-fold';
 export type FoldFunctions<Info, Out> = Omit<StatefulFoldFunctions<Info, undefined, Out>, 'down'>;
 /**
  * Folds in old functional-fashion over the AST structure.

package/r-bridge/lang-4.x/ast/model/processing/role.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { DecoratedAstMap, RNodeWithParent } from './decorate';
+import type { DecoratedAstMap, RNodeWithParent } from './decorate';
 /**
  * Describes the role of the node in its parent. For example,
  * if we have `if(TRUE) { ... }`, the role of the `TRUE` node is `IfCondition`.

package/r-bridge/lang-4.x/ast/model/processing/stateful-fold.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { DeepReadonly } from 'ts-essentials';
-import { RExpressionList, RNumber, RSymbol, RLogical, RString, RArithmeticBinaryOp, RAssignmentOp, RComparisonBinaryOp, RLogicalBinaryOp, RArithmeticUnaryOp, RLogicalUnaryOp, RIfThenElse, RForLoop, RRepeatLoop, RWhileLoop, RFunctionCall, RComment, RNext, RBreak, RParameter, RArgument, RFunctionDefinition, RAccess, RModelFormulaBinaryOp, RModelFormulaUnaryOp, RLineDirective, RPipe } from '../nodes';
-import { RNode } from '../model';
+import type { DeepReadonly } from 'ts-essentials';
+import type { RExpressionList, RNumber, RSymbol, RLogical, RString, RArithmeticBinaryOp, RAssignmentOp, RComparisonBinaryOp, RLogicalBinaryOp, RArithmeticUnaryOp, RLogicalUnaryOp, RIfThenElse, RForLoop, RRepeatLoop, RWhileLoop, RFunctionCall, RComment, RNext, RBreak, RParameter, RArgument, RFunctionDefinition, RAccess, RModelFormulaBinaryOp, RModelFormulaUnaryOp, RLineDirective, RPipe } from '../nodes';
+import type { RNode } from '../model';
 /**
  * Called during the down-pass, will pe propagated to children and used in the up-pass (see {@link StatefulFoldFunctions}).
  * <p>

package/r-bridge/lang-4.x/ast/model/processing/visitor.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { NoInfo, RNode } from '../model';
+import type { NoInfo, RNode } from '../model';
 /** Return `true` to stop visiting from this node (i.e., do not continue to visit this node *and* the children) */
 export type OnEnter<OtherInfo> = (node: RNode<OtherInfo>) => (boolean | void);
 /** Similar to {@link OnEnter} but called when leaving a node. Can't stop exploration as the subtree is already visited! */

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

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -1,14 +1,11 @@
-import { MergeableRecord } from '../../../../../util/objects';
-import { DeepReadonly } from 'ts-essentials';
-import { XmlParserConfig } from './config';
-import { XmlParserHooks } from './hooks';
-import { SourceRange } from '../../../../../util/range';
+import type { MergeableRecord } from '../../../../../util/objects';
+import type { DeepReadonly } from 'ts-essentials';
+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/hooks.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import { NamedXmlBasedJson, XmlBasedJson } from './input-format';
-import { RNumber, NoInfo, RBinaryOp, RComment, RForLoop, RFunctionCall, RIfThenElse, RNode, RRepeatLoop, RString, RUnaryOp, RWhileLoop, RSymbol, RLogical, BinaryOperatorFlavor, RParameter, RFunctionDefinition, RArgument, UnaryOperatorFlavor, RBreak, RNext, RAccess, RLineDirective, RPipe } from '../../model';
-import { RNa } from '../../../values';
-import { ParserData } from './data';
-import { DeepReadonly, DeepRequired } from 'ts-essentials';
+import type { NamedXmlBasedJson, XmlBasedJson } from './input-format';
+import type { RNumber, NoInfo, RBinaryOp, RComment, RForLoop, RFunctionCall, RIfThenElse, RNode, RRepeatLoop, RString, RUnaryOp, RWhileLoop, RSymbol, RLogical, BinaryOperatorFlavor, RParameter, RFunctionDefinition, RArgument, UnaryOperatorFlavor, RBreak, RNext, RAccess, RLineDirective, RPipe } from '../../model';
+import type { RNa } from '../../../values';
+import type { ParserData } from './data';
+import type { DeepReadonly, DeepRequired } from 'ts-essentials';
 /** Denotes that if you return `undefined`, the parser will automatically take the original arguments (unchanged) */
 type AutoIfOmit<T> = T | undefined | void;
 /**

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,4 +1,8 @@
-import { RawRType } from '../../model';
+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>;

package/r-bridge/lang-4.x/ast/parser/xml/input-format.js CHANGED Viewed

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKeysGuarded = exports.XmlParseError = void 0;
+exports.getKeysGuarded = exports.XmlParseError = exports.nameKey = exports.contentKey = exports.childrenKey = exports.attributesKey = void 0;
+exports.attributesKey = 'a';
+exports.childrenKey = 'c';
+exports.contentKey = '@';
+exports.nameKey = '#';
 /**
  * Thrown if the given input xml is not valid/contains unexpected elements.
  */
@@ -12,19 +16,12 @@ class XmlParseError extends Error {
 }
 exports.XmlParseError = XmlParseError;
 function getKeysGuarded(obj, ...key) {
-    const keys = Object.keys(obj);
-    const check = (key) => {
-        if (!keys.includes(key)) {
-            throw new XmlParseError(`expected obj to have key ${key}, yet received ${JSON.stringify(obj)}`);
-        }
-        return obj[key];
-    };
     if (key.length === 1) {
-        return check(key[0]);
+        return obj[key[0]];
     }
     else {
         return key.reduce((acc, key) => {
-            acc[key] = check(key);
+            acc[key] = obj[key];
             return acc;
         }, {});
     }

package/r-bridge/lang-4.x/ast/parser/xml/internal/access.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { NamedXmlBasedJson } from '../input-format';
-import { ParserData } from '../data';
-import { RAccess } from '../../../model';
+import type { NamedXmlBasedJson } from '../input-format';
+import type { ParserData } from '../data';
+import type { RAccess } from '../../../model';
 /**
  * Tries to normalize the given data as access (e.g., indexing).
  *

package/r-bridge/lang-4.x/ast/parser/xml/internal/access.js CHANGED Viewed

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeAccess = void 0;
 const meta_1 = require("./meta");
-const parser_1 = require("../parser");
 const hooks_1 = require("../hooks");
 const structure_1 = require("./structure");
 const assert_1 = require("../../../../../../util/assert");
 const arrays_1 = require("../../../../../../util/arrays");
 const argument_1 = require("./functions/argument");
+const parser_1 = require("../../json/parser");
 /**
  * Tries to normalize the given data as access (e.g., indexing).
  *
@@ -75,7 +75,7 @@ function tryNormalizeAccess(data, mappedWithName) {
         (0, assert_1.guard)(first !== null && (first.type === "RSymbol" /* RType.Symbol */ || first.type === "RString" /* RType.String */ || first.type === "RLogical" /* RType.Logical */), () => `${JSON.stringify(operator)} requires one symbol, yet received ${JSON.stringify(parsedAccess)}`);
         resultingAccess = first.type === "RString" /* RType.String */ ? first.content.str : first.lexeme;
     }
-    const { content, location } = (0, meta_1.retrieveMetaStructure)(data.config, accessOp.content);
+    const { content, location } = (0, meta_1.retrieveMetaStructure)(accessOp.content);
     const result = {
         type: "RAccess" /* RType.Access */,
         location,

package/r-bridge/lang-4.x/ast/parser/xml/internal/control/if-then-else.d.ts CHANGED Viewed

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

package/r-bridge/lang-4.x/ast/parser/xml/internal/control/if-then-else.js CHANGED Viewed

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeIfThenElse = void 0;
 const structure_1 = require("../structure");
-const parser_1 = require("../../parser");
 const if_then_1 = require("./if-then");
 const assert_1 = require("../../../../../../../util/assert");
 const hooks_1 = require("../../hooks");
 const meta_1 = require("../meta");
+const parser_1 = require("../../../json/parser");
 /**
  * Try to parse the construct as a {@link RIfThenElse}.
  */

package/r-bridge/lang-4.x/ast/parser/xml/internal/control/if-then.d.ts CHANGED Viewed

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

package/r-bridge/lang-4.x/ast/parser/xml/internal/control/if-then.js CHANGED Viewed

@@ -4,8 +4,8 @@ exports.tryNormalizeIfThen = void 0;
 const input_format_1 = require("../../input-format");
 const structure_1 = require("../structure");
 const meta_1 = require("../meta");
-const parser_1 = require("../../parser");
 const hooks_1 = require("../../hooks");
+const parser_1 = require("../../../json/parser");
 /**
  * Try to parse the construct as a {@link RIfThenElse}.
  */
@@ -27,7 +27,7 @@ function tryNormalizeIfThen(data, tokens) {
     if (parsedCondition.type === "RDelimiter" /* RType.Delimiter */ || parsedThen.type === "RDelimiter" /* RType.Delimiter */) {
         throw new input_format_1.XmlParseError(`unexpected missing parts of if, received ${JSON.stringify([parsedCondition, parsedThen])} for ${JSON.stringify(tokens)}`);
     }
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, tokens[0].content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(tokens[0].content);
     const result = {
         type: "RIfThenElse" /* RType.IfThenElse */,
         condition: parsedCondition,

package/r-bridge/lang-4.x/ast/parser/xml/internal/expression/expression.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { XmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RNode } from '../../../../model';
+import type { XmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RNode } from '../../../../model';
 /**
  * Returns an expression list if there are multiple children, otherwise returns the single child directly with no expr wrapper
  *

package/r-bridge/lang-4.x/ast/parser/xml/internal/expression/expression.js CHANGED Viewed

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeExpression = 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 functions_1 = require("../functions");
 const hooks_1 = require("../../hooks");
 const access_1 = require("../access");
 const other_1 = require("../other");
 const arrays_1 = require("../../../../../../../util/arrays");
+const parser_1 = require("../../../json/parser");
 /**
  * Returns an expression list if there are multiple children, otherwise returns the single child directly with no expr wrapper
  *
@@ -19,9 +19,9 @@ const arrays_1 = require("../../../../../../../util/arrays");
 function normalizeExpression(data, obj) {
     parser_1.parseLog.debug('Parsing expr');
     obj = (0, hooks_1.executeHook)(data.hooks.expression.onExpression.before, data, obj);
-    const { unwrappedObj, content, location } = (0, meta_1.retrieveMetaStructure)(data.config, obj);
-    const childrenSource = (0, input_format_1.getKeysGuarded)(unwrappedObj, data.config.childrenName);
-    const typed = (0, meta_1.getWithTokenType)(data.config.tokenMap, childrenSource);
+    const { unwrappedObj, content, location } = (0, meta_1.retrieveMetaStructure)(obj);
+    const childrenSource = (0, input_format_1.getKeysGuarded)(unwrappedObj, input_format_1.childrenKey);
+    const typed = (0, meta_1.getWithTokenType)(childrenSource);
     const { others, comments } = (0, structure_1.splitComments)(typed);
     const childData = { ...data, currentRange: location, currentLexeme: content };
     const maybeFunctionCall = (0, functions_1.tryNormalizeFunctionCall)(childData, others);

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/argument.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { RArgument } from '../../../../model';
-import { ParserData } from '../../data';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { RArgument } from '../../../../model';
+import type { ParserData } from '../../data';
 /**
  * Either parses `[expr]` or `[SYMBOL_SUB, EQ_SUB, expr]` as an argument of a function call in R.
  * Probably directly called by the function call parser as otherwise, we do not expect to find arguments.

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/argument.js CHANGED Viewed

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryToNormalizeArgument = void 0;
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const hooks_1 = require("../../hooks");
 const log_1 = require("../../../../../../../util/log");
 const assert_1 = require("../../../../../../../util/assert");
 const structure_1 = require("../structure");
+const parser_1 = require("../../../json/parser");
 /**
  * Either parses `[expr]` or `[SYMBOL_SUB, EQ_SUB, expr]` as an argument of a function call in R.
  * Probably directly called by the function call parser as otherwise, we do not expect to find arguments.
@@ -24,7 +24,7 @@ function tryToNormalizeArgument(data, objs) {
         return (0, hooks_1.executeUnknownHook)(data.hooks.functions.onArgument.unknown, data, objs);
     }
     const symbolOrExpr = objs[0];
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, symbolOrExpr.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(symbolOrExpr.content);
     let parsedValue;
     let name;
     if (symbolOrExpr.name === "expr" /* RawRType.Expression */) {

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/call.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { ParserData } from '../../data';
-import { RFunctionCall, RNext, RBreak } from '../../../../model';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { ParserData } from '../../data';
+import type { RFunctionCall, RNext, RBreak } from '../../../../model';
 /**
  * Tries to parse the given data as a function call.
  *

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/call.js CHANGED Viewed

@@ -5,11 +5,11 @@ const input_format_1 = require("../../input-format");
 const assert_1 = require("../../../../../../../util/assert");
 const meta_1 = require("../meta");
 const arrays_1 = require("../../../../../../../util/arrays");
-const parser_1 = require("../../parser");
 const values_1 = require("../values");
 const hooks_1 = require("../../hooks");
 const argument_1 = require("./argument");
 const expression_1 = require("../expression");
+const parser_1 = require("../../../json/parser");
 /**
  * Tries to parse the given data as a function call.
  *
@@ -31,10 +31,10 @@ function tryNormalizeFunctionCall(data, mappedWithName) {
     }
     parser_1.parseLog.trace('trying to parse function call');
     mappedWithName = (0, hooks_1.executeHook)(data.hooks.functions.onFunctionCall.before, data, mappedWithName);
-    const { unwrappedObj, content, location } = (0, meta_1.retrieveMetaStructure)(data.config, fnBase.content);
-    const symbolContent = (0, input_format_1.getKeysGuarded)(unwrappedObj, data.config.childrenName);
+    const { unwrappedObj, content, location } = (0, meta_1.retrieveMetaStructure)(fnBase.content);
+    const symbolContent = (0, input_format_1.getKeysGuarded)(unwrappedObj, input_format_1.childrenKey);
     let result;
-    const namedSymbolContent = (0, meta_1.getWithTokenType)(data.config.tokenMap, symbolContent);
+    const namedSymbolContent = (0, meta_1.getWithTokenType)(symbolContent);
     if (namedSymbolContent.length === 1 && namedSymbolContent[0].name === "STR_CONST" /* RawRType.StringConst */) {
         // special handling when someone calls a function by string
         result = parseNamedFunctionCall(data, namedSymbolContent, mappedWithName, location, content);

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/definition.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { ParserData } from '../../data';
-import { NamedXmlBasedJson } from '../../input-format';
-import { RFunctionDefinition } from '../../../../model';
+import type { ParserData } from '../../data';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { RFunctionDefinition } from '../../../../model';
 /**
  * Tries to parse the given data as a function definition.
  *

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/definition.js CHANGED Viewed

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeFunctionDefinition = void 0;
-const parser_1 = require("../../parser");
 const hooks_1 = require("../../hooks");
 const meta_1 = require("../meta");
 const assert_1 = require("../../../../../../../util/assert");
@@ -9,6 +8,7 @@ const arrays_1 = require("../../../../../../../util/arrays");
 const structure_1 = require("../structure");
 const parameter_1 = require("./parameter");
 const log_1 = require("../../../../../../../util/log");
+const parser_1 = require("../../../json/parser");
 /**
  * Tries to parse the given data as a function definition.
  *
@@ -25,7 +25,7 @@ function tryNormalizeFunctionDefinition(data, mappedWithName) {
     }
     parser_1.parseLog.trace('trying to parse function definition');
     mappedWithName = (0, hooks_1.executeHook)(data.hooks.functions.onFunctionDefinition.before, data, mappedWithName);
-    const { content, location } = (0, meta_1.retrieveMetaStructure)(data.config, fnBase.content);
+    const { content, location } = (0, meta_1.retrieveMetaStructure)(fnBase.content);
     const openParen = mappedWithName[1];
     (0, assert_1.guard)(openParen.name === "(" /* RawRType.ParenLeft */, () => `expected opening parenthesis, yet received ${openParen.name}`);
     const closingParenIndex = mappedWithName.findIndex(x => x.name === ")" /* RawRType.ParenRight */);

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/parameter.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { NamedXmlBasedJson } from '../../input-format';
-import { RParameter } from '../../../../model';
-import { ParserData } from '../../data';
+import type { NamedXmlBasedJson } from '../../input-format';
+import type { RParameter } from '../../../../model';
+import type { ParserData } from '../../data';
 /**
  * Either parses `[SYMBOL_FORMALS]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]` as a parameter of a function definition in R.
  * Probably directly called by the function definition parser as otherwise, we do not expect to find parameters.

package/r-bridge/lang-4.x/ast/parser/xml/internal/functions/parameter.js CHANGED Viewed

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryNormalizeParameter = void 0;
-const parser_1 = require("../../parser");
 const meta_1 = require("../meta");
 const hooks_1 = require("../../hooks");
 const log_1 = require("../../../../../../../util/log");
 const assert_1 = require("../../../../../../../util/assert");
 const structure_1 = require("../structure");
+const parser_1 = require("../../../json/parser");
 /**
  * Either parses `[SYMBOL_FORMALS]` or `[SYMBOL_FORMALS, EQ_FORMALS, expr]` as a parameter of a function definition in R.
  * Probably directly called by the function definition parser as otherwise, we do not expect to find parameters.
@@ -29,7 +29,7 @@ function tryNormalizeParameter(data, objs) {
         return (0, hooks_1.executeUnknownHook)(data.hooks.functions.onParameter.unknown, data, objs);
     }
     const defaultValue = objs.length === 3 ? parseWithDefaultValue(data, objs) : undefined;
-    const { location, content } = (0, meta_1.retrieveMetaStructure)(data.config, symbol.content);
+    const { location, content } = (0, meta_1.retrieveMetaStructure)(symbol.content);
     const result = {
         type: "RParameter" /* RType.Parameter */,
         location,

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

@@ -7,4 +7,3 @@ export * from './operators';
 export * from './structure';
 export * from './expression';
 export * from './meta';
-export * from './xml-to-json';

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

@@ -23,5 +23,4 @@ __exportStar(require("./operators"), exports);
 __exportStar(require("./structure"), exports);
 __exportStar(require("./expression"), exports);
 __exportStar(require("./meta"), exports);
-__exportStar(require("./xml-to-json"), exports);
 //# sourceMappingURL=index.js.map