simple-graph-query 3.0.1 → 3.2.0

package/dist/forge-antlr/ForgeParser.d.ts

@@ -71,58 +71,47 @@ export declare class ForgeParser extends Parser {
     static readonly IMP_TOK = 60;
     static readonly ELSE_TOK = 61;
     static readonly AND_TOK = 62;
-    static readonly UNTIL_TOK = 63;
-    static readonly RELEASE_TOK = 64;
-    static readonly SINCE_TOK = 65;
-    static readonly TRIGGERED_TOK = 66;
-    static readonly NEG_TOK = 67;
-    static readonly ALWAYS_TOK = 68;
-    static readonly EVENTUALLY_TOK = 69;
-    static readonly AFTER_TOK = 70;
-    static readonly BEFORE_TOK = 71;
-    static readonly ONCE_TOK = 72;
-    static readonly HISTORICALLY_TOK = 73;
-    static readonly CARD_TOK = 74;
-    static readonly PPLUS_TOK = 75;
-    static readonly AMP_TOK = 76;
-    static readonly SUBT_TOK = 77;
-    static readonly SUPT_TOK = 78;
-    static readonly PRIME_TOK = 79;
-    static readonly TILDE_TOK = 80;
-    static readonly EXP_TOK = 81;
-    static readonly STAR_TOK = 82;
-    static readonly AT_TOK = 83;
-    static readonly BACKQUOTE_TOK = 84;
-    static readonly THIS_TOK = 85;
-    static readonly SEXPR_TOK = 86;
-    static readonly INST_TOK = 87;
-    static readonly EVAL_TOK = 88;
-    static readonly EXAMPLE_TOK = 89;
-    static readonly ARROW_TOK = 90;
-    static readonly GET_LABEL_TOK = 91;
-    static readonly GET_LABEL_STR_TOK = 92;
-    static readonly GET_LABEL_BOOL_TOK = 93;
-    static readonly GET_LABEL_NUM_TOK = 94;
-    static readonly EQ_TOK = 95;
-    static readonly LT_TOK = 96;
-    static readonly GT_TOK = 97;
-    static readonly LEQ_TOK = 98;
-    static readonly GEQ_TOK = 99;
-    static readonly NI_TOK = 100;
-    static readonly NO_TOK = 101;
-    static readonly SUM_TOK = 102;
-    static readonly INT_TOK = 103;
-    static readonly OPTION_TOK = 104;
-    static readonly COMMA_TOK = 105;
-    static readonly SLASH_TOK = 106;
-    static readonly NUM_CONST_TOK = 107;
-    static readonly QUOTED_IDENTIFIER_TOK = 108;
-    static readonly IDENTIFIER_TOK = 109;
-    static readonly WS = 110;
-    static readonly CCOMMENT = 111;
-    static readonly COMMENT = 112;
-    static readonly MULTCOMMENT = 113;
-    static readonly LANG_DECL = 114;
+    static readonly NEG_TOK = 63;
+    static readonly CARD_TOK = 64;
+    static readonly PPLUS_TOK = 65;
+    static readonly AMP_TOK = 66;
+    static readonly SUBT_TOK = 67;
+    static readonly SUPT_TOK = 68;
+    static readonly TILDE_TOK = 69;
+    static readonly EXP_TOK = 70;
+    static readonly STAR_TOK = 71;
+    static readonly AT_TOK = 72;
+    static readonly BACKQUOTE_TOK = 73;
+    static readonly THIS_TOK = 74;
+    static readonly SEXPR_TOK = 75;
+    static readonly INST_TOK = 76;
+    static readonly EVAL_TOK = 77;
+    static readonly EXAMPLE_TOK = 78;
+    static readonly ARROW_TOK = 79;
+    static readonly GET_LABEL_TOK = 80;
+    static readonly GET_LABEL_STR_TOK = 81;
+    static readonly GET_LABEL_BOOL_TOK = 82;
+    static readonly GET_LABEL_NUM_TOK = 83;
+    static readonly EQ_TOK = 84;
+    static readonly LT_TOK = 85;
+    static readonly GT_TOK = 86;
+    static readonly LEQ_TOK = 87;
+    static readonly GEQ_TOK = 88;
+    static readonly NI_TOK = 89;
+    static readonly NO_TOK = 90;
+    static readonly SUM_TOK = 91;
+    static readonly INT_TOK = 92;
+    static readonly OPTION_TOK = 93;
+    static readonly COMMA_TOK = 94;
+    static readonly SLASH_TOK = 95;
+    static readonly NUM_CONST_TOK = 96;
+    static readonly QUOTED_IDENTIFIER_TOK = 97;
+    static readonly IDENTIFIER_TOK = 98;
+    static readonly WS = 99;
+    static readonly CCOMMENT = 100;
+    static readonly COMMENT = 101;
+    static readonly MULTCOMMENT = 102;
+    static readonly LANG_DECL = 103;
     static readonly RULE_predDecl = 0;
     static readonly RULE_parseExpr = 1;
     static readonly RULE_alloyModule = 2;
@@ -176,38 +165,36 @@ export declare class ForgeParser extends Parser {
     static readonly RULE_expr2 = 50;
     static readonly RULE_expr3 = 51;
     static readonly RULE_expr4 = 52;
-    static readonly RULE_expr4_5 = 53;
-    static readonly RULE_expr5 = 54;
-    static readonly RULE_expr6 = 55;
-    static readonly RULE_expr7 = 56;
-    static readonly RULE_expr8 = 57;
-    static readonly RULE_expr9 = 58;
-    static readonly RULE_expr10 = 59;
-    static readonly RULE_expr11 = 60;
-    static readonly RULE_expr12 = 61;
-    static readonly RULE_expr13 = 62;
-    static readonly RULE_expr14 = 63;
-    static readonly RULE_expr15 = 64;
-    static readonly RULE_expr16 = 65;
-    static readonly RULE_expr17 = 66;
-    static readonly RULE_expr18 = 67;
-    static readonly RULE_arrowExpr = 68;
-    static readonly RULE_sexprDecl = 69;
-    static readonly RULE_sexpr = 70;
-    static readonly RULE_instDecl = 71;
-    static readonly RULE_evalRelDecl = 72;
-    static readonly RULE_evalDecl = 73;
-    static readonly RULE_exampleDecl = 74;
-    static readonly RULE_queryDecl = 75;
-    static readonly RULE_numberList = 76;
-    static readonly RULE_number = 77;
-    static readonly RULE_bounds = 78;
-    static readonly RULE_atomNameOrNumber = 79;
-    static readonly RULE_bound = 80;
-    static readonly RULE_boundLHS = 81;
-    static readonly RULE_bindRHSUnion = 82;
-    static readonly RULE_bindRHSProduct = 83;
-    static readonly RULE_bindRHSProductBase = 84;
+    static readonly RULE_expr5 = 53;
+    static readonly RULE_expr6 = 54;
+    static readonly RULE_expr7 = 55;
+    static readonly RULE_expr8 = 56;
+    static readonly RULE_expr9 = 57;
+    static readonly RULE_expr10 = 58;
+    static readonly RULE_expr11 = 59;
+    static readonly RULE_expr12 = 60;
+    static readonly RULE_expr13 = 61;
+    static readonly RULE_expr14 = 62;
+    static readonly RULE_expr15 = 63;
+    static readonly RULE_expr17 = 64;
+    static readonly RULE_expr18 = 65;
+    static readonly RULE_arrowExpr = 66;
+    static readonly RULE_sexprDecl = 67;
+    static readonly RULE_sexpr = 68;
+    static readonly RULE_instDecl = 69;
+    static readonly RULE_evalRelDecl = 70;
+    static readonly RULE_evalDecl = 71;
+    static readonly RULE_exampleDecl = 72;
+    static readonly RULE_queryDecl = 73;
+    static readonly RULE_numberList = 74;
+    static readonly RULE_number = 75;
+    static readonly RULE_bounds = 76;
+    static readonly RULE_atomNameOrNumber = 77;
+    static readonly RULE_bound = 78;
+    static readonly RULE_boundLHS = 79;
+    static readonly RULE_bindRHSUnion = 80;
+    static readonly RULE_bindRHSProduct = 81;
+    static readonly RULE_bindRHSProductBase = 82;
     static readonly ruleNames: string[];
     private static readonly _LITERAL_NAMES;
     private static readonly _SYMBOLIC_NAMES;
@@ -275,7 +262,6 @@ export declare class ForgeParser extends Parser {
     expr3(): Expr3Context;
     expr4(): Expr4Context;
     expr4(_p: number): Expr4Context;
-    expr4_5(): Expr4_5Context;
     expr5(): Expr5Context;
     expr6(): Expr6Context;
     expr6(_p: number): Expr6Context;
@@ -295,8 +281,6 @@ export declare class ForgeParser extends Parser {
     expr14(_p: number): Expr14Context;
     expr15(): Expr15Context;
     expr15(_p: number): Expr15Context;
-    expr16(): Expr16Context;
-    expr16(_p: number): Expr16Context;
     expr17(): Expr17Context;
     expr18(): Expr18Context;
     arrowExpr(): ArrowExprContext;
@@ -331,7 +315,6 @@ export declare class ForgeParser extends Parser {
     private expr13_sempred;
     private expr14_sempred;
     private expr15_sempred;
-    private expr16_sempred;
     private bindRHSUnion_sempred;
     private bindRHSProduct_sempred;
     private static readonly _serializedATNSegments;
@@ -1003,7 +986,7 @@ export declare class Expr3Context extends ParserRuleContext {
     accept<Result>(visitor: ForgeVisitor<Result>): Result;
 }
 export declare class Expr4Context extends ParserRuleContext {
-    expr4_5(): Expr4_5Context;
+    expr5(): Expr5Context;
     expr4(): Expr4Context | undefined;
     AND_TOK(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1012,29 +995,10 @@ export declare class Expr4Context extends ParserRuleContext {
     exitRule(listener: ForgeListener): void;
     accept<Result>(visitor: ForgeVisitor<Result>): Result;
 }
-export declare class Expr4_5Context extends ParserRuleContext {
-    expr5(): Expr5Context[];
-    expr5(i: number): Expr5Context;
-    UNTIL_TOK(): TerminalNode | undefined;
-    RELEASE_TOK(): TerminalNode | undefined;
-    SINCE_TOK(): TerminalNode | undefined;
-    TRIGGERED_TOK(): TerminalNode | undefined;
-    constructor(parent: ParserRuleContext | undefined, invokingState: number);
-    get ruleIndex(): number;
-    enterRule(listener: ForgeListener): void;
-    exitRule(listener: ForgeListener): void;
-    accept<Result>(visitor: ForgeVisitor<Result>): Result;
-}
 export declare class Expr5Context extends ParserRuleContext {
     expr6(): Expr6Context | undefined;
     NEG_TOK(): TerminalNode | undefined;
     expr5(): Expr5Context | undefined;
-    ALWAYS_TOK(): TerminalNode | undefined;
-    EVENTUALLY_TOK(): TerminalNode | undefined;
-    AFTER_TOK(): TerminalNode | undefined;
-    BEFORE_TOK(): TerminalNode | undefined;
-    ONCE_TOK(): TerminalNode | undefined;
-    HISTORICALLY_TOK(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
     enterRule(listener: ForgeListener): void;
@@ -1142,7 +1106,7 @@ export declare class Expr14Context extends ParserRuleContext {
     accept<Result>(visitor: ForgeVisitor<Result>): Result;
 }
 export declare class Expr15Context extends ParserRuleContext {
-    expr16(): Expr16Context | undefined;
+    expr17(): Expr17Context | undefined;
     expr15(): Expr15Context | undefined;
     DOT_TOK(): TerminalNode | undefined;
     name(): NameContext | undefined;
@@ -1155,16 +1119,6 @@ export declare class Expr15Context extends ParserRuleContext {
     exitRule(listener: ForgeListener): void;
     accept<Result>(visitor: ForgeVisitor<Result>): Result;
 }
-export declare class Expr16Context extends ParserRuleContext {
-    expr17(): Expr17Context | undefined;
-    expr16(): Expr16Context | undefined;
-    PRIME_TOK(): TerminalNode | undefined;
-    constructor(parent: ParserRuleContext | undefined, invokingState: number);
-    get ruleIndex(): number;
-    enterRule(listener: ForgeListener): void;
-    exitRule(listener: ForgeListener): void;
-    accept<Result>(visitor: ForgeVisitor<Result>): Result;
-}
 export declare class Expr17Context extends ParserRuleContext {
     expr18(): Expr18Context | undefined;
     expr17(): Expr17Context | undefined;

package/dist/forge-antlr/ForgeVisitor.d.ts

@@ -52,7 +52,6 @@ import { Expr1_5Context } from "./ForgeParser";
 import { Expr2Context } from "./ForgeParser";
 import { Expr3Context } from "./ForgeParser";
 import { Expr4Context } from "./ForgeParser";
-import { Expr4_5Context } from "./ForgeParser";
 import { Expr5Context } from "./ForgeParser";
 import { Expr6Context } from "./ForgeParser";
 import { Expr7Context } from "./ForgeParser";
@@ -64,7 +63,6 @@ import { Expr12Context } from "./ForgeParser";
 import { Expr13Context } from "./ForgeParser";
 import { Expr14Context } from "./ForgeParser";
 import { Expr15Context } from "./ForgeParser";
-import { Expr16Context } from "./ForgeParser";
 import { Expr17Context } from "./ForgeParser";
 import { Expr18Context } from "./ForgeParser";
 import { ArrowExprContext } from "./ForgeParser";
@@ -410,12 +408,6 @@ export interface ForgeVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExpr4?: (ctx: Expr4Context) => Result;
-    /**
-     * Visit a parse tree produced by `ForgeParser.expr4_5`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitExpr4_5?: (ctx: Expr4_5Context) => Result;
     /**
      * Visit a parse tree produced by `ForgeParser.expr5`.
      * @param ctx the parse tree
@@ -482,12 +474,6 @@ export interface ForgeVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExpr15?: (ctx: Expr15Context) => Result;
-    /**
-     * Visit a parse tree produced by `ForgeParser.expr16`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitExpr16?: (ctx: Expr16Context) => Result;
     /**
      * Visit a parse tree produced by `ForgeParser.expr17`.
      * @param ctx the parse tree

package/dist/forge-antlr/utils.d.ts

@@ -22,7 +22,8 @@ export declare function getIdentifierName(ctx: NameContext): string;
  */
 export declare function quoteIfReserved(identifier: string, reservedKeywords: Set<string>): string;
 /**
- * Set of all reserved keywords in Forge.
+ * Every spelling a bare name cannot carry: the keywords, and `/`, which matches
+ * the identifier pattern but is claimed by SLASH_TOK.
  * Use with quoteIfReserved() when generating Forge expressions.
  */
 export declare const FORGE_RESERVED_KEYWORDS: Set<string>;