@bikky/replication 1.0.3 → 1.0.4

package/Expressions/Compiler/Parser/MatchGrammar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatchGrammar.js","sourceRoot":"","sources":["MatchGrammar.ts"],"names":[],"mappings":"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"}

package/Expressions/Compiler/Parser/MatchRepeatingRule.d.ts

@@ -0,0 +1,4 @@
+import { MatchSuccess, NextMatchDetails, PartialEASTNode } from "./TypesAndPrint.js";
+import { NodeType } from "./Enums.js";
+import { GrammarInterfaces } from "./Interfaces.js";
+export declare function MatchRepeatingRule(details: NextMatchDetails, rule: GrammarInterfaces.Rule, progress: PartialEASTNode, historicalMatches: NodeType[]): MatchSuccess<PartialEASTNode>;

package/Expressions/Compiler/Parser/MatchRepeatingRule.js

@@ -0,0 +1,51 @@
+import { PrintNodeName } from "./TypesAndPrint.js";
+import { MatchRule } from "./MatchRule.js";
+import { TokenDataMatchesRule } from "./Checks.js";
+export function MatchRepeatingRule(details, rule, progress, historicalMatches) {
+    let ruleCurrentRepeatNumber = 0;
+    let cachable = true;
+    do {
+        //Consume repeat token if present!
+        if (rule.repeatSeparator && ruleCurrentRepeatNumber > 0) {
+            if (rule.repeatSeparator.optional == "previous") {
+                throw new Error(`Repeat separator's optionality can't be based on previous rule.`);
+            }
+            if (details.parser.token.type == rule.repeatSeparator.type
+                && TokenDataMatchesRule(details.parser.version, rule.repeatSeparator, details.parser.token)) {
+                console.debug(`${details.debugTabs}Skipping ${PrintNodeName(details.parser.token)} ${details.parser.token.data}`);
+                details.parser.consumeToken();
+            }
+            else {
+                break;
+            }
+        }
+        // Finished repeats - so return success.
+        if (details.parser.done) {
+            break;
+        }
+        //For each type that may be next, there is an early exit if repeating but no more tokens.
+        let valid = MatchRule(details, rule, progress, historicalMatches);
+        if (details.parser.currentNodeIndex === progress.startTokenIndex) {
+            cachable &&= valid.cachable;
+        }
+        if (!valid.result) {
+            //Didn't repeat enough, so die in a fire!
+            if (ruleCurrentRepeatNumber < rule.repeat[0]) {
+                console.debug(`${details.debugTabs}Repeated ${ruleCurrentRepeatNumber} times, which is less than ${rule.repeat[0]}!`);
+                return { result: null, cachable };
+            }
+            //We hit the minimum needed repeats, so we can stop with a valid node here.
+            break;
+        }
+        ruleCurrentRepeatNumber++;
+        //Repeat too much, so force continue.
+        if (ruleCurrentRepeatNumber >= rule.repeat[1]) {
+            break;
+        }
+    } while (true);
+    return {
+        result: progress,
+        cachable
+    };
+}
+//# sourceMappingURL=MatchRepeatingRule.js.map

package/Expressions/Compiler/Parser/MatchRepeatingRule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatchRepeatingRule.js","sourceRoot":"","sources":["MatchRepeatingRule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmD,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAInD,MAAM,UAAU,kBAAkB,CAAC,OAAyB,EAAE,IAA4B,EAAE,QAAyB,EAAE,iBAA6B;IACnJ,IAAI,uBAAuB,GAAG,CAAC,CAAC;IAChC,IAAI,QAAQ,GAAG,IAAI,CAAC;IAEpB,GAAG,CAAC;QACH,kCAAkC;QAClC,IAAI,IAAI,CAAC,eAAe,IAAI,uBAAuB,GAAG,CAAC,EAAE,CAAC;YACzD,IAAI,IAAI,CAAC,eAAe,CAAC,QAAQ,IAAI,UAAU,EAAE,CAAC;gBACjD,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;YACpF,CAAC;YACD,IACC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI;mBACnD,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAC1F,CAAC;gBACF,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,SAAS,YAAY,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClH,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YAC/B,CAAC;iBACI,CAAC;gBACL,MAAM;YACP,CAAC;QACF,CAAC;QAED,wCAAwC;QACxC,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACzB,MAAM;QACP,CAAC;QAED,yFAAyF;QACzF,IAAI,KAAK,GAAG,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QAClE,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,KAAK,QAAQ,CAAC,eAAe,EAAE,CAAC;YAClE,QAAQ,KAAK,KAAK,CAAC,QAAQ,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACnB,yCAAyC;YACzC,IAAI,uBAAuB,GAAG,IAAI,CAAC,MAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/C,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,SAAS,YAAY,uBAAuB,8BAA8B,IAAI,CAAC,MAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBACvH,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;YACnC,CAAC;YACD,2EAA2E;YAC3E,MAAM;QACP,CAAC;QAED,uBAAuB,EAAE,CAAC;QAE1B,qCAAqC;QACrC,IAAI,uBAAuB,IAAI,IAAI,CAAC,MAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,MAAM;QACP,CAAC;IACF,CAAC,QAAQ,IAAI,EAAE;IAEf,OAAO;QACN,MAAM,EAAE,QAAQ;QAChB,QAAQ;KACR,CAAA;AACF,CAAC"}

package/Expressions/Compiler/Parser/MatchRule.d.ts

@@ -0,0 +1,4 @@
+import { MatchSuccess, NextMatchDetails, PartialEASTNode } from "./TypesAndPrint.js";
+import { GrammarInterfaces } from "./Interfaces.js";
+import { NodeType } from "./Enums.js";
+export declare function MatchRule(details: NextMatchDetails, rule: GrammarInterfaces.Rule, progress: PartialEASTNode, historicalMatches: NodeType[]): MatchSuccess<PartialEASTNode>;

package/Expressions/Compiler/Parser/MatchRule.js

@@ -0,0 +1,57 @@
+import { PrintNodeName, PrintTokenText } from "./TypesAndPrint.js";
+import { AddToPartialEASTNode, ComputeChildInputs, ComputeValidTypes } from "./Updates.js";
+import { TokenDataMatchesRule } from "./Checks.js";
+import { MatchGrammar } from "./MatchGrammar.js";
+import { NodeType, TokenType } from "./Enums.js";
+export function MatchRule(details, rule, progress, historicalMatches) {
+    let validTypes = ComputeValidTypes(rule, details.extraTypes);
+    let childInputs = ComputeChildInputs(rule, details.extraTypes);
+    let cachable = true;
+    if ("value" in rule || "values" in rule) {
+        if (!TokenDataMatchesRule(details.parser.version, rule, details.parser.token)) {
+            console.debug(`${details.debugTabs}  - Token data ${PrintTokenText(details.parser.token)} is undesirable, skipping type.`);
+            // Value mismatch, assuming this tokenType can only ever match one value it's safe to break.
+            return {
+                result: null,
+                cachable
+            };
+        }
+    }
+    for (let type of validTypes) {
+        //Check if type is the current valid type.
+        if (type == details.parser.token.type) {
+            console.debug(`${details.debugTabs}  - Matched a ${TokenType[type]} ${PrintTokenText(details.parser.token)}`);
+            AddToPartialEASTNode(details, rule, progress, details.parser.token);
+            return {
+                result: progress,
+                cachable
+            };
+        }
+        //Or if we're currently looking at a compound node type, we'll see if we can create it!
+        else if (type in NodeType) {
+            console.debug(`${details.debugTabs} - Trying to make a ${NodeType[type]}`);
+            //Try make a node.
+            //Run through all of the rules of a possible compound rule.
+            //If the rules match, then make a new node.
+            let subMatch = MatchGrammar({ ...details, extraTypes: childInputs }, type, historicalMatches);
+            if (!subMatch.cachable && details.parser.currentNodeIndex == progress.startTokenIndex) {
+                cachable = false;
+            }
+            //Node succeeded, continue.
+            if (subMatch.result) {
+                console.debug(`${details.debugTabs}Made a ${NodeType[type]}`);
+                AddToPartialEASTNode(details, rule, progress, subMatch.result);
+                return {
+                    result: progress,
+                    cachable
+                };
+            }
+        }
+    }
+    console.debug(`${details.debugTabs}Failed to create a ${PrintNodeName(progress)}, '${details.parser.token.data}' != '${rule.debug_name ?? rule.value ?? rule.values}'`);
+    return {
+        result: null,
+        cachable
+    };
+}
+//# sourceMappingURL=MatchRule.js.map

package/Expressions/Compiler/Parser/MatchRule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatchRule.js","sourceRoot":"","sources":["MatchRule.ts"],"names":[],"mappings":"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"}

package/Expressions/Compiler/Parser/Parser.d.ts

@@ -0,0 +1,26 @@
+import { Map2D } from "@bikky/smart-collections";
+import { FileNode } from "../Grammar/General.js";
+import { GrammarInterfaces } from "./Interfaces.js";
+import Token = GrammarInterfaces.Token;
+export declare class ExpressionParser {
+    tokens: Token[];
+    version: string;
+    versionIndex: number;
+    currentNodeIndex: number;
+    done: boolean;
+    token: Token;
+    file: Partial<FileNode>;
+    sourceLocation: string;
+    partialEvaluationResults: Map2D<number, GrammarInterfaces.EAST_Complex_Node | null>;
+    constructor(version: string, code: string, sourceLocation: string, start: {
+        line: number;
+        column: number;
+    });
+    consumeToken(): void;
+    resetToken(index: number): void;
+    run(): FileNode | null;
+}
+export declare function CreateASTFromString(version: string, lines: string, sourceLocation: string, start: {
+    line: number;
+    column: number;
+}): FileNode | null;

package/Expressions/Compiler/Parser/Parser.js

@@ -0,0 +1,67 @@
+import { TokenizeExpression } from "./Tokenizer.js";
+import { GetVersionIndex } from "../../../Constants/Versions.js";
+import { MatchGrammar } from "./MatchGrammar.js";
+import { Map2D } from "@bikky/smart-collections";
+import { NodeType, TokenType } from "./Enums.js";
+let debug = false;
+export class ExpressionParser {
+    constructor(version, code, sourceLocation, start) {
+        // Keeps track of successful and failed partial evaluations to speed up compilation.
+        this.partialEvaluationResults = new Map2D();
+        this.tokens = TokenizeExpression(code, version);
+        this.versionIndex = GetVersionIndex(version);
+        this.version = version;
+        this.sourceLocation = sourceLocation;
+        this.currentNodeIndex = 0;
+        this.done = false;
+        this.token = this.tokens[0];
+        if (this.token.type == TokenType.WHITESPACE)
+            this.consumeToken();
+        this.file = {
+            text: code,
+            line: start.line,
+            column: start.column,
+            sourceLocation: sourceLocation
+        };
+    }
+    consumeToken() {
+        this.currentNodeIndex++;
+        while (this.tokens[this.currentNodeIndex]?.type == TokenType.WHITESPACE) {
+            this.currentNodeIndex++;
+        }
+        this.token = this.tokens[this.currentNodeIndex];
+        if (this.token) {
+            debug &&
+                console.log(`[New token is ${this.currentNodeIndex}: ${TokenType[this.token.type]} '${this.token.data.slice(0, Math.min(this.token.data.length, 20))}']`);
+        }
+        this.done = this.currentNodeIndex >= this.tokens.length;
+    }
+    //We reset if we fail to generate a node.
+    resetToken(index) {
+        this.currentNodeIndex = index;
+        this.token = this.tokens[this.currentNodeIndex];
+        console.debug(`[Reset token to ${this.currentNodeIndex}: ${TokenType[this.token.type]} '${this.token.data.slice(0, Math.min(this.token.data.length, 20))}']`);
+        this.done = this.currentNodeIndex >= this.tokens.length;
+    }
+    run() {
+        if (this.token.type == TokenType.WHITESPACE)
+            this.consumeToken();
+        //Start with a file :]
+        let node = MatchGrammar({
+            parser: this,
+            extraTypes: [],
+            debugTabs: ""
+        }, NodeType.FILE, []).result;
+        if (node == null)
+            return null;
+        let prop;
+        for (prop in node) {
+            this.file[prop] = node[prop];
+        }
+        return this.file;
+    }
+}
+export function CreateASTFromString(version, lines, sourceLocation, start) {
+    return new ExpressionParser(version, lines, sourceLocation, start).run();
+}
+//# sourceMappingURL=Parser.js.map

package/Expressions/Compiler/Parser/Parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Parser.js","sourceRoot":"","sources":["Parser.ts"],"names":[],"mappings":"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"}

package/Expressions/Compiler/Parser/Tokenizer.d.ts

@@ -0,0 +1,12 @@
+import { GrammarInterfaces } from "./Interfaces.js";
+import TokenCategoryRule = GrammarInterfaces.TokenCategoryRule;
+import Token = GrammarInterfaces.Token;
+export declare function getEASTTokenValues(fileVersion: string, category: TokenCategoryRule): Set<string>;
+/**
+ *
+ * @param expression The whole string
+ * @param version The version of the expression language this was compiled against
+ * @param offset The offset from the start of the file that this expression occurred within.
+ * @constructor
+ */
+export declare function TokenizeExpression(expression: string, version: string, offset?: number): Token[];

package/Expressions/Compiler/Parser/Tokenizer.js

@@ -0,0 +1,138 @@
+import { GetVersionIndex } from "../../../Constants/Versions.js";
+import { EAST_Tokens } from "../Grammar/Tokens.js";
+import { TokenType } from "./Enums.js";
+let debug = false;
+export function getEASTTokenValues(fileVersion, category) {
+    let index = GetVersionIndex(fileVersion);
+    if (index < 0)
+        throw new Error(`Can't parse file using version that isn't supported: ${fileVersion}`);
+    let vals = new Set();
+    for (; index >= 0; index--) {
+        let thisVersionVals = category.versions[index];
+        if (thisVersionVals instanceof RegExp) {
+            if (vals.size == 0) {
+                throw new Error(`Token is regexp not values.`);
+            }
+            else {
+                break;
+            }
+        }
+        for (let val of thisVersionVals) {
+            vals.add(val);
+        }
+    }
+    return vals;
+}
+function getEASTTokenRegex(fileVersion, category) {
+    let index = GetVersionIndex(fileVersion);
+    if (index < 0)
+        throw new Error(`Can't parse file using version that isn't supported: ${fileVersion}`);
+    let vals = new Set();
+    for (; index >= 0; index--) {
+        let thisVersionVals = category.versions[index];
+        //Regular expression overrides all previously defined syntax.
+        if (thisVersionVals instanceof RegExp) {
+            if (vals.size == 0) {
+                return thisVersionVals;
+            }
+            else {
+                break;
+            }
+        }
+        else if (thisVersionVals) {
+            for (let val of thisVersionVals) {
+                vals.add(val);
+            }
+        }
+    }
+    return new RegExp([...vals].map((e) => {
+        return "[.*+?^${}()|[]\\]".includes(e) ? "\\" + e : e;
+    }).join("|"), "g");
+}
+function makeVersionParser(version) {
+    let parser = [];
+    for (let category of Object.values(EAST_Tokens)) {
+        parser.push({
+            type: category.type,
+            regex: getEASTTokenRegex(version, category),
+            execute: category.execution,
+            precedence: category.precedence,
+            name: category.debug_name
+        });
+    }
+    return parser;
+}
+let Parsers = new Map();
+/**
+ *
+ * @param expression The whole string
+ * @param version The version of the expression language this was compiled against
+ * @param offset The offset from the start of the file that this expression occurred within.
+ * @constructor
+ */
+export function TokenizeExpression(expression, version, offset = 0) {
+    let rawTokens = [];
+    if (!Parsers.has(version))
+        Parsers.set(version, makeVersionParser(version));
+    let parser = Parsers.get(version);
+    for (let category of parser) {
+        let matches = expression.matchAll(category.regex);
+        debug && console.log(TokenType[category.type], category.precedence);
+        for (let match of matches) {
+            rawTokens.push({
+                data: match[0],
+                position: match.index,
+                length: match[0].length,
+                execute: category.execute,
+                precedence: category.precedence,
+                type: category.type
+            });
+        }
+    }
+    //Newlines are stored based on the last character in that line, once a line's position exceeds the node's position we know we're
+    // at a line that contains this given node.
+    let newlines = [...expression.matchAll(/\r\n|\n|\r/g)].map((e) => e.index);
+    newlines.unshift(0);
+    //Add one more line for anything left-over.
+    newlines.push(expression.length);
+    /**
+     * The first token takes precedence, but if multiple start at the same time then we sort
+     *  by precedence.
+     */
+    rawTokens = rawTokens.sort((a, b) => {
+        let offset = a.position - b.position;
+        if (offset == 0) {
+            return a.precedence - b.precedence;
+        }
+        return offset;
+    });
+    let lastToken;
+    let tokens = [];
+    for (let rtoken of rawTokens) {
+        if (lastToken && lastToken.position + lastToken.length > rtoken.position) {
+            //We are in the middle of a different kind of identifier, so skip
+            // this token.
+            //console.log("Discarding", TokenType[token.type], token.data, token.precedence, "because of", TokenType[lastToken.type], lastToken.data, token.precedence);
+            continue;
+        }
+        let line;
+        for (let i = 0; i < newlines.length; i++) {
+            if (newlines[i] > rtoken.position + offset) {
+                line = i;
+            }
+        }
+        tokens.push({
+            data: rtoken.data,
+            type: rtoken.type,
+            execute: rtoken.execute,
+            //Add an offset, since multiple expressions can exist in the same string.
+            position: rtoken.position + offset,
+            length: rtoken.length,
+            line: line,
+            column: rtoken.position + offset - newlines[line - 1]
+        });
+        lastToken = rtoken;
+    }
+    return tokens;
+}
+//# sourceMappingURL=Tokenizer.js.map

package/Expressions/Compiler/Parser/Tokenizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Tokenizer.js","sourceRoot":"","sources":["Tokenizer.ts"],"names":[],"mappings":"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"}

package/Expressions/Compiler/Parser/TypesAndPrint.d.ts

@@ -0,0 +1,29 @@
+import { ExpressionParser } from "./Parser.js";
+import { NodeType, TokenType } from "./Enums.js";
+import { GrammarInterfaces } from "./Interfaces.js";
+import NodeExecution = GrammarInterfaces.NodeExecution;
+import EAST_Token = GrammarInterfaces.EAST_Token;
+import EAST_Complex_Node = GrammarInterfaces.EAST_Complex_Node;
+import SpecialType = GrammarInterfaces.SpecialType;
+import Token = GrammarInterfaces.Token;
+import Node = GrammarInterfaces.Node;
+export interface PartialEASTNode {
+    type: NodeType;
+    debugName: string;
+    startTokenIndex: number;
+    execute: NodeExecution;
+    values: {
+        [name: string]: EAST_Token | EAST_Complex_Node | (EAST_Token | EAST_Complex_Node)[];
+    };
+}
+export interface NextMatchDetails {
+    parser: ExpressionParser;
+    extraTypes: (TokenType | NodeType | SpecialType)[];
+    debugTabs: string;
+}
+export interface MatchSuccess<T extends EAST_Complex_Node | PartialEASTNode> {
+    result: T | null;
+    cachable: boolean;
+}
+export declare function PrintNodeName(value: Token | Node | PartialEASTNode): string;
+export declare function PrintTokenText(token: Token): string;

package/Expressions/Compiler/Parser/TypesAndPrint.js

@@ -0,0 +1,15 @@
+import { NodeType, TokenType } from "./Enums.js";
+import { isToken } from "../Grammar/Tokens.js";
+export function PrintNodeName(value) {
+    if (isToken(value)) {
+        return TokenType[value.type];
+    }
+    return NodeType[value.type];
+}
+export function PrintTokenText(token) {
+    if (token.data.length > 20) {
+        return token.data.slice(0, 20) + "...";
+    }
+    return token.data;
+}
+//# sourceMappingURL=TypesAndPrint.js.map

package/Expressions/Compiler/Parser/TypesAndPrint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypesAndPrint.js","sourceRoot":"","sources":["TypesAndPrint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAQjD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AA0B/C,MAAM,UAAU,aAAa,CAAC,KAAqC;IAClE,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAY;IAC1C,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC;IACxC,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC;AACnB,CAAC"}

package/Expressions/Compiler/Parser/Updates.d.ts

@@ -0,0 +1,10 @@
+import { NextMatchDetails, PartialEASTNode } from "./TypesAndPrint.js";
+import { GrammarInterfaces } from "./Interfaces.js";
+import { NodeType, TokenType } from "./Enums.js";
+import SpecialType = GrammarInterfaces.SpecialType;
+export declare function ComputeValidTypes(rule: GrammarInterfaces.Rule, extraTypes: (TokenType | NodeType | SpecialType)[]): (NodeType | TokenType | GrammarInterfaces.SpecialType)[];
+export declare function ComputeChildInputs(rule: GrammarInterfaces.Rule, extraTypes: (TokenType | NodeType | SpecialType)[]): (NodeType | TokenType | GrammarInterfaces.SpecialType)[];
+export declare function MakeNewNodeFrom(details: NextMatchDetails, value: GrammarInterfaces.Token | GrammarInterfaces.Node): GrammarInterfaces.EAST_Complex_Node;
+export declare function AddToPartialEASTNode(details: NextMatchDetails, rule: GrammarInterfaces.Rule, progress: PartialEASTNode, value: GrammarInterfaces.Token | (GrammarInterfaces.Node & {
+    values?: any;
+})): void;

package/Expressions/Compiler/Parser/Updates.js

@@ -0,0 +1,79 @@
+import { PrintNodeName } from "./TypesAndPrint.js";
+import { GrammarInterfaces } from "./Interfaces.js";
+import { NodeType } from "./Enums.js";
+var SpecialType = GrammarInterfaces.SpecialType;
+import { isToken } from "../Grammar/Tokens.js";
+export function ComputeValidTypes(rule, extraTypes) {
+    let validTypes = Array.isArray(rule.type) ? [...rule.type] : [rule.type];
+    if (validTypes.includes(SpecialType.INPUT_TYPES)) {
+        console.debug(`* adding ${extraTypes.map((e) => NodeType[e])} to ${NodeType[rule.type]}`);
+        validTypes.splice(validTypes.indexOf(SpecialType.INPUT_TYPES), 1, ...extraTypes);
+    }
+    return validTypes;
+}
+export function ComputeChildInputs(rule, extraTypes) {
+    let childInputs = rule.input ?? [];
+    if (childInputs.includes(SpecialType.INPUT_TYPES)) {
+        console.debug(`** sending ${extraTypes.map((e) => NodeType[e])} to child`);
+        childInputs.splice(childInputs.indexOf(SpecialType.INPUT_TYPES), 1, ...extraTypes);
+    }
+    return childInputs;
+}
+export function MakeNewNodeFrom(details, value) {
+    //If it's a token, make a copy and add a file reference to convert it to a node.
+    if (isToken(value)) {
+        return {
+            ...value,
+            file: details.parser.file
+        };
+    }
+    //Otherwise add it as-is.
+    else {
+        return value;
+    }
+}
+//Sets the node's values object to equal the values specified by the rule.
+export function AddToPartialEASTNode(details, rule, progress, value) {
+    //Set the values to a particular name.
+    if (rule.name) {
+        console.debug(`${details.debugTabs}Adding ${PrintNodeName(value)} ${rule.repeat ? "to" : "as"} ${rule.name}`);
+        //Repeated rules are stored as arrays
+        if (rule.repeat) {
+            if (rule.unroll) {
+                throw new Error(`Can't unroll repeated grammar rule.`);
+            }
+            //Create the array if it doesn't exist.
+            if (!progress.values[rule.name]) {
+                progress.values[rule.name] = [];
+            }
+            //Ensure the array is an array.
+            if (!Array.isArray(progress.values[rule.name])) {
+                throw new Error(`Node ${PrintNodeName(progress)}'s ${rule.name} should be an array but isn't.`);
+            }
+            progress.values[rule.name]
+                .push(MakeNewNodeFrom(details, value));
+        }
+        else {
+            progress.values[rule.name] = MakeNewNodeFrom(details, value);
+        }
+    }
+    else {
+        if (rule.unroll) {
+            if (!("values" in value)) {
+                throw new Error("Can't unroll tokens.");
+            }
+            console.debug(`${details.debugTabs} - Unrolling ${Object.keys(value.values)} to `
+                + `${PrintNodeName(progress)}'s ${Object.keys(progress.values)}`);
+            progress.values = {
+                ...value.values,
+                ...progress.values
+            };
+        }
+        // Skip any rule that isn't given a name or unroll, since it's not meant to be stored.
+    }
+    //Only increment token position if token.
+    if (isToken(value)) {
+        details.parser.consumeToken();
+    }
+}
+//# sourceMappingURL=Updates.js.map

package/Expressions/Compiler/Parser/Updates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Updates.js","sourceRoot":"","sources":["Updates.ts"],"names":[],"mappings":"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"}

package/Networking.d.ts

@@ -25,6 +25,9 @@ export declare namespace Messenger {
             reason: string;
         }) => void) | null;
         send(data: any): void;
+    } | {
+        on(channel: "message", handler: (event: any, data: any) => void): void;
+        emit(channel: "message", data: any): void;
     };
     export interface ConnectionDetails<Remote = any> {
         connection: Remote;

package/Networking.js

@@ -22,7 +22,7 @@ var Connections;
             this.messages = [];
             this.id = id;
             this.socket = connection;
-            if ("on" in this.socket) {
+            if ("on" in this.socket && !("emit" in this.socket)) {
                 this.socket.on("message", (body) => {
                     var data = JSON.parse(body);
                     this.recieveMessages(data, id);
@@ -31,6 +31,12 @@ var Connections;
                     this.handleDisconnect();
                 });
             }
+            if ("on" in this.socket) {
+                this.socket.on("message", (event, body) => {
+                    var data = JSON.parse(body);
+                    this.recieveMessages(data, id);
+                });
+            }
             else {
                 this.socket.onmessage = (event) => {
                     var body = event.data;
@@ -83,10 +89,18 @@ var Connections;
         }
         sendMessages() {
             try {
-                this.socket.send(JSON.stringify({
-                    time: LocalTime,
-                    messages: this.messages
-                }));
+                if ("send" in this.socket) {
+                    this.socket.send(JSON.stringify({
+                        time: LocalTime,
+                        messages: this.messages
+                    }));
+                }
+                else {
+                    this.socket.emit("message", JSON.stringify({
+                        time: LocalTime,
+                        messages: this.messages
+                    }));
+                }
                 this.messages = [];
             }
             catch (e) {