@mcptoolshop/roll 1.0.0 → 2.0.0
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.
- package/CHANGELOG.md +64 -0
- package/README.md +105 -137
- package/dist/analyze/distribution.d.ts.map +1 -1
- package/dist/analyze/distribution.js +249 -33
- package/dist/analyze/distribution.js.map +1 -1
- package/dist/bridge/handler.d.ts +14 -0
- package/dist/bridge/handler.d.ts.map +1 -0
- package/dist/bridge/handler.js +163 -0
- package/dist/bridge/handler.js.map +1 -0
- package/dist/bridge/protocol.d.ts +53 -0
- package/dist/bridge/protocol.d.ts.map +1 -0
- package/dist/bridge/protocol.js +8 -0
- package/dist/bridge/protocol.js.map +1 -0
- package/dist/bridge/server.d.ts +3 -0
- package/dist/bridge/server.d.ts.map +1 -0
- package/dist/bridge/server.js +71 -0
- package/dist/bridge/server.js.map +1 -0
- package/dist/display/format.d.ts.map +1 -1
- package/dist/display/format.js +28 -3
- package/dist/display/format.js.map +1 -1
- package/dist/engine/pipeline.d.ts +27 -0
- package/dist/engine/pipeline.d.ts.map +1 -0
- package/dist/engine/pipeline.js +304 -0
- package/dist/engine/pipeline.js.map +1 -0
- package/dist/engine/roller.d.ts +3 -0
- package/dist/engine/roller.d.ts.map +1 -1
- package/dist/engine/roller.js +82 -125
- package/dist/engine/roller.js.map +1 -1
- package/dist/index.d.ts +9 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -1
- package/dist/index.js.map +1 -1
- package/dist/mcp/server.d.ts +3 -0
- package/dist/mcp/server.d.ts.map +1 -0
- package/dist/mcp/server.js +182 -0
- package/dist/mcp/server.js.map +1 -0
- package/dist/mcp/tools.d.ts +12 -0
- package/dist/mcp/tools.d.ts.map +1 -0
- package/dist/mcp/tools.js +106 -0
- package/dist/mcp/tools.js.map +1 -0
- package/dist/parser/ast.d.ts +7 -1
- package/dist/parser/ast.d.ts.map +1 -1
- package/dist/parser/lexer.d.ts.map +1 -1
- package/dist/parser/lexer.js +138 -45
- package/dist/parser/lexer.js.map +1 -1
- package/dist/parser/parser.d.ts.map +1 -1
- package/dist/parser/parser.js +107 -15
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/tokens.d.ts +14 -0
- package/dist/parser/tokens.d.ts.map +1 -1
- package/dist/parser/tokens.js +22 -0
- package/dist/parser/tokens.js.map +1 -1
- package/dist/tables/conditions.d.ts +7 -0
- package/dist/tables/conditions.d.ts.map +1 -0
- package/dist/tables/conditions.js +65 -0
- package/dist/tables/conditions.js.map +1 -0
- package/dist/tables/engine.d.ts +10 -0
- package/dist/tables/engine.d.ts.map +1 -0
- package/dist/tables/engine.js +147 -0
- package/dist/tables/engine.js.map +1 -0
- package/dist/tables/schema.d.ts +89 -0
- package/dist/tables/schema.d.ts.map +1 -0
- package/dist/tables/schema.js +3 -0
- package/dist/tables/schema.js.map +1 -0
- package/dist/tables/validate.d.ts +4 -0
- package/dist/tables/validate.d.ts.map +1 -0
- package/dist/tables/validate.js +98 -0
- package/dist/tables/validate.js.map +1 -0
- package/package.json +12 -2
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
/** MCP tool definitions for the Roll dice engine. */
|
|
2
|
+
export const TOOLS = [
|
|
3
|
+
{
|
|
4
|
+
name: "roll_dice",
|
|
5
|
+
description: "Roll a dice expression using full RPG notation. Supports: NdM, keep/drop (kh/kl/dh/dl), exploding (!), compounding (!!), penetrating (!p), reroll (r/ro), min/max, success counting (cs>=N), failure counting (cf<=N), sorting (sa/sd). Returns individual die results and total.",
|
|
6
|
+
inputSchema: {
|
|
7
|
+
type: "object",
|
|
8
|
+
properties: {
|
|
9
|
+
expression: {
|
|
10
|
+
type: "string",
|
|
11
|
+
description: "Dice expression (e.g., '4d6kh3+5', '8d6cs>=5', '2d6r<2!!')",
|
|
12
|
+
},
|
|
13
|
+
times: {
|
|
14
|
+
type: "number",
|
|
15
|
+
description: "Number of times to roll (default: 1)",
|
|
16
|
+
},
|
|
17
|
+
seed: {
|
|
18
|
+
type: "number",
|
|
19
|
+
description: "Optional seed for deterministic results",
|
|
20
|
+
},
|
|
21
|
+
},
|
|
22
|
+
required: ["expression"],
|
|
23
|
+
},
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
name: "analyze_dice",
|
|
27
|
+
description: "Compute the exact probability distribution and statistics for a dice expression. Returns mean, median, mode, std dev, percentiles, entropy, and the full distribution. Optionally computes P(result >= target).",
|
|
28
|
+
inputSchema: {
|
|
29
|
+
type: "object",
|
|
30
|
+
properties: {
|
|
31
|
+
expression: {
|
|
32
|
+
type: "string",
|
|
33
|
+
description: "Dice expression to analyze",
|
|
34
|
+
},
|
|
35
|
+
at_least: {
|
|
36
|
+
type: "number",
|
|
37
|
+
description: "Optional target — returns P(result >= target)",
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
|
+
required: ["expression"],
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
name: "compare_dice",
|
|
45
|
+
description: "Compare two dice expressions side by side. Returns statistics for both including mean, median, mode, std dev, range, and entropy.",
|
|
46
|
+
inputSchema: {
|
|
47
|
+
type: "object",
|
|
48
|
+
properties: {
|
|
49
|
+
expression_a: {
|
|
50
|
+
type: "string",
|
|
51
|
+
description: "First dice expression",
|
|
52
|
+
},
|
|
53
|
+
expression_b: {
|
|
54
|
+
type: "string",
|
|
55
|
+
description: "Second dice expression",
|
|
56
|
+
},
|
|
57
|
+
},
|
|
58
|
+
required: ["expression_a", "expression_b"],
|
|
59
|
+
},
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
name: "roll_table",
|
|
63
|
+
description: "Roll on a game table (loot, encounter, critical, fumble, reward, status, event). Supports weighted selection, conditions, level filtering, nested tables, chains, and dice expressions for quantity/roll/duration.",
|
|
64
|
+
inputSchema: {
|
|
65
|
+
type: "object",
|
|
66
|
+
properties: {
|
|
67
|
+
table_name: {
|
|
68
|
+
type: "string",
|
|
69
|
+
description: "Name of the table to roll on",
|
|
70
|
+
},
|
|
71
|
+
collection: {
|
|
72
|
+
type: "object",
|
|
73
|
+
description: "GameTableCollection JSON with version and tables array",
|
|
74
|
+
},
|
|
75
|
+
context: {
|
|
76
|
+
type: "object",
|
|
77
|
+
description: "Optional context: {level?, tags?, variables?, triggerRoll?, triggerNat?}",
|
|
78
|
+
},
|
|
79
|
+
count: {
|
|
80
|
+
type: "number",
|
|
81
|
+
description: "Number of rolls (default: 1)",
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
required: ["table_name", "collection"],
|
|
85
|
+
},
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
name: "query_table",
|
|
89
|
+
description: "Inspect a game table definition. Returns the table's entries, conditions, and metadata without rolling.",
|
|
90
|
+
inputSchema: {
|
|
91
|
+
type: "object",
|
|
92
|
+
properties: {
|
|
93
|
+
table_name: {
|
|
94
|
+
type: "string",
|
|
95
|
+
description: "Name of the table to inspect",
|
|
96
|
+
},
|
|
97
|
+
collection: {
|
|
98
|
+
type: "object",
|
|
99
|
+
description: "GameTableCollection JSON",
|
|
100
|
+
},
|
|
101
|
+
},
|
|
102
|
+
required: ["table_name", "collection"],
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
];
|
|
106
|
+
//# sourceMappingURL=tools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/mcp/tools.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAYrD,MAAM,CAAC,MAAM,KAAK,GAAwB;IACxC;QACE,IAAI,EAAE,WAAW;QACjB,WAAW,EACT,mRAAmR;QACrR,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,4DAA4D;iBAC1E;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,sCAAsC;iBACpD;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,yCAAyC;iBACvD;aACF;YACD,QAAQ,EAAE,CAAC,YAAY,CAAC;SACzB;KACF;IACD;QACE,IAAI,EAAE,cAAc;QACpB,WAAW,EACT,iNAAiN;QACnN,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,4BAA4B;iBAC1C;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,+CAA+C;iBAC7D;aACF;YACD,QAAQ,EAAE,CAAC,YAAY,CAAC;SACzB;KACF;IACD;QACE,IAAI,EAAE,cAAc;QACpB,WAAW,EACT,mIAAmI;QACrI,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,YAAY,EAAE;oBACZ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,uBAAuB;iBACrC;gBACD,YAAY,EAAE;oBACZ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,wBAAwB;iBACtC;aACF;YACD,QAAQ,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;SAC3C;KACF;IACD;QACE,IAAI,EAAE,YAAY;QAClB,WAAW,EACT,oNAAoN;QACtN,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,8BAA8B;iBAC5C;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,wDAAwD;iBACtE;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,0EAA0E;iBACxF;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,8BAA8B;iBAC5C;aACF;YACD,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC;SACvC;KACF;IACD;QACE,IAAI,EAAE,aAAa;QACnB,WAAW,EACT,yGAAyG;QAC3G,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,8BAA8B;iBAC5C;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,0BAA0B;iBACxC;aACF;YACD,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC;SACvC;KACF;CACF,CAAC"}
|
package/dist/parser/ast.d.ts
CHANGED
|
@@ -3,9 +3,14 @@ export interface NumberNode {
|
|
|
3
3
|
type: "number";
|
|
4
4
|
value: number;
|
|
5
5
|
}
|
|
6
|
+
export interface ComparePoint {
|
|
7
|
+
operator: "=" | ">" | ">=" | "<" | "<=";
|
|
8
|
+
value: number;
|
|
9
|
+
}
|
|
6
10
|
export interface DiceModifier {
|
|
7
|
-
kind: "kh" | "kl" | "dh" | "dl" | "explode";
|
|
11
|
+
kind: "kh" | "kl" | "dh" | "dl" | "explode" | "compound" | "penetrate" | "reroll" | "reroll_once" | "cs_count" | "cf_count" | "cs_mark" | "cf_mark" | "min" | "max" | "sort_asc" | "sort_desc";
|
|
8
12
|
value?: number;
|
|
13
|
+
compare?: ComparePoint;
|
|
9
14
|
}
|
|
10
15
|
export type DiceSides = number | "%" | "F";
|
|
11
16
|
export interface DiceNode {
|
|
@@ -13,6 +18,7 @@ export interface DiceNode {
|
|
|
13
18
|
count: number;
|
|
14
19
|
sides: DiceSides;
|
|
15
20
|
modifiers: DiceModifier[];
|
|
21
|
+
resultMode?: "sum" | "success_count";
|
|
16
22
|
}
|
|
17
23
|
export interface BinaryOpNode {
|
|
18
24
|
type: "binary";
|
package/dist/parser/ast.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/parser/ast.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,UAAU,GAAG,QAAQ,GAAG,YAAY,GAAG,cAAc,CAAC;AAE5E,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,
|
|
1
|
+
{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../src/parser/ast.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,UAAU,GAAG,QAAQ,GAAG,YAAY,GAAG,cAAc,CAAC;AAE5E,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;IACxC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EACA,IAAI,GACJ,IAAI,GACJ,IAAI,GACJ,IAAI,GACJ,SAAS,GACT,UAAU,GACV,WAAW,GACX,QAAQ,GACR,aAAa,GACb,UAAU,GACV,UAAU,GACV,SAAS,GACT,SAAS,GACT,KAAK,GACL,KAAK,GACL,UAAU,GACV,WAAW,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC;AAE3C,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,KAAK,GAAG,eAAe,CAAC;CACtC;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lexer.d.ts","sourceRoot":"","sources":["../../src/parser/lexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAa,MAAM,aAAa,CAAC;AAE/C,qBAAa,UAAW,SAAQ,KAAK;IACC,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIrD;
|
|
1
|
+
{"version":3,"file":"lexer.d.ts","sourceRoot":"","sources":["../../src/parser/lexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAa,MAAM,aAAa,CAAC;AAE/C,qBAAa,UAAW,SAAQ,KAAK;IACC,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIrD;AA0GD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,CAuH/C"}
|
package/dist/parser/lexer.js
CHANGED
|
@@ -7,12 +7,97 @@ export class LexerError extends Error {
|
|
|
7
7
|
this.name = "LexerError";
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
10
|
+
// Longest-match keyword table — ordered longest-first within each length group.
|
|
11
|
+
// Keywords that are prefixes of others MUST come after the longer variant
|
|
12
|
+
// (e.g., "ro" before "r") to ensure greedy matching.
|
|
13
|
+
const KEYWORDS = [
|
|
14
|
+
// 3-char
|
|
15
|
+
["min", TokenType.MIN],
|
|
16
|
+
["max", TokenType.MAX],
|
|
17
|
+
// 2-char
|
|
18
|
+
["kh", TokenType.KH],
|
|
19
|
+
["kl", TokenType.KL],
|
|
20
|
+
["dh", TokenType.DH],
|
|
21
|
+
["dl", TokenType.DL],
|
|
22
|
+
["ro", TokenType.RO],
|
|
23
|
+
["cs", TokenType.CS],
|
|
24
|
+
["cf", TokenType.CF],
|
|
25
|
+
["sa", TokenType.SA],
|
|
26
|
+
["sd", TokenType.SD],
|
|
27
|
+
// 1-char (must be last — "r" is a prefix of "ro")
|
|
28
|
+
["r", TokenType.R],
|
|
29
|
+
];
|
|
30
|
+
// Token types that indicate dice context (for dh/dl disambiguation)
|
|
31
|
+
const DICE_CONTEXT_TOKENS = new Set([
|
|
32
|
+
TokenType.NUMBER,
|
|
33
|
+
TokenType.PERCENT,
|
|
34
|
+
TokenType.F,
|
|
35
|
+
TokenType.KH,
|
|
36
|
+
TokenType.KL,
|
|
37
|
+
TokenType.DH,
|
|
38
|
+
TokenType.DL,
|
|
39
|
+
TokenType.BANG,
|
|
40
|
+
TokenType.BANG_BANG,
|
|
41
|
+
TokenType.BANG_P,
|
|
42
|
+
TokenType.GT,
|
|
43
|
+
TokenType.GTE,
|
|
44
|
+
TokenType.LT,
|
|
45
|
+
TokenType.LTE,
|
|
46
|
+
TokenType.EQ,
|
|
47
|
+
TokenType.R,
|
|
48
|
+
TokenType.RO,
|
|
49
|
+
TokenType.CS,
|
|
50
|
+
TokenType.CF,
|
|
51
|
+
TokenType.SA,
|
|
52
|
+
TokenType.SD,
|
|
53
|
+
TokenType.MIN,
|
|
54
|
+
TokenType.MAX,
|
|
55
|
+
]);
|
|
56
|
+
function tryMatchKeyword(input, pos, tokens) {
|
|
57
|
+
const remaining = input.slice(pos).toLowerCase();
|
|
58
|
+
for (const [keyword, type] of KEYWORDS) {
|
|
59
|
+
if (!remaining.startsWith(keyword))
|
|
60
|
+
continue;
|
|
61
|
+
// Ensure the character after the keyword is not a letter (word boundary).
|
|
62
|
+
// This prevents matching "min" inside "mint" or "r" inside "roll".
|
|
63
|
+
const nextChar = input[pos + keyword.length];
|
|
64
|
+
if (nextChar && nextChar >= "a" && nextChar <= "z")
|
|
65
|
+
continue;
|
|
66
|
+
if (nextChar && nextChar >= "A" && nextChar <= "Z")
|
|
67
|
+
continue;
|
|
68
|
+
// Context-sensitive disambiguation for dh/dl/r/ro/cs/cf/sa/sd/min/max:
|
|
69
|
+
// These are modifier keywords only valid after dice-related tokens.
|
|
70
|
+
// Without this check, "d20" would match "d" then fail on "2" if "d" + something matched.
|
|
71
|
+
if (type === TokenType.DH || type === TokenType.DL) {
|
|
72
|
+
const lastToken = tokens[tokens.length - 1];
|
|
73
|
+
if (!lastToken || !DICE_CONTEXT_TOKENS.has(lastToken.type)) {
|
|
74
|
+
continue; // Not in dice context — fall through to single-char "d"
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
// "r" alone could appear in contexts where it's not a reroll modifier.
|
|
78
|
+
// Only match r/ro as keywords after dice context.
|
|
79
|
+
if (type === TokenType.R || type === TokenType.RO) {
|
|
80
|
+
const lastToken = tokens[tokens.length - 1];
|
|
81
|
+
if (!lastToken || !DICE_CONTEXT_TOKENS.has(lastToken.type)) {
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
// cs/cf/sa/sd/min/max are only valid after dice context
|
|
86
|
+
if (type === TokenType.CS ||
|
|
87
|
+
type === TokenType.CF ||
|
|
88
|
+
type === TokenType.SA ||
|
|
89
|
+
type === TokenType.SD ||
|
|
90
|
+
type === TokenType.MIN ||
|
|
91
|
+
type === TokenType.MAX) {
|
|
92
|
+
const lastToken = tokens[tokens.length - 1];
|
|
93
|
+
if (!lastToken || !DICE_CONTEXT_TOKENS.has(lastToken.type)) {
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return { type, length: keyword.length };
|
|
98
|
+
}
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
16
101
|
export function tokenize(input) {
|
|
17
102
|
const tokens = [];
|
|
18
103
|
let i = 0;
|
|
@@ -34,43 +119,18 @@ export function tokenize(input) {
|
|
|
34
119
|
tokens.push({ type: TokenType.NUMBER, value: num, position: pos });
|
|
35
120
|
continue;
|
|
36
121
|
}
|
|
37
|
-
//
|
|
38
|
-
const
|
|
39
|
-
if (
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
lastToken.type === TokenType.PERCENT ||
|
|
48
|
-
lastToken.type === TokenType.F ||
|
|
49
|
-
lastToken.type === TokenType.KH ||
|
|
50
|
-
lastToken.type === TokenType.KL ||
|
|
51
|
-
lastToken.type === TokenType.DH ||
|
|
52
|
-
lastToken.type === TokenType.DL ||
|
|
53
|
-
lastToken.type === TokenType.BANG)) {
|
|
54
|
-
tokens.push({
|
|
55
|
-
type: TWO_CHAR_KEYWORDS[twoChar],
|
|
56
|
-
value: twoChar,
|
|
57
|
-
position: pos,
|
|
58
|
-
});
|
|
59
|
-
i += 2;
|
|
60
|
-
continue;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
tokens.push({
|
|
65
|
-
type: TWO_CHAR_KEYWORDS[twoChar],
|
|
66
|
-
value: twoChar,
|
|
67
|
-
position: pos,
|
|
68
|
-
});
|
|
69
|
-
i += 2;
|
|
70
|
-
continue;
|
|
71
|
-
}
|
|
122
|
+
// Try keyword match (longest-match, context-sensitive)
|
|
123
|
+
const kwMatch = tryMatchKeyword(input, i, tokens);
|
|
124
|
+
if (kwMatch) {
|
|
125
|
+
tokens.push({
|
|
126
|
+
type: kwMatch.type,
|
|
127
|
+
value: input.slice(i, i + kwMatch.length),
|
|
128
|
+
position: pos,
|
|
129
|
+
});
|
|
130
|
+
i += kwMatch.length;
|
|
131
|
+
continue;
|
|
72
132
|
}
|
|
73
|
-
//
|
|
133
|
+
// Multi-char and single-char operators
|
|
74
134
|
switch (ch.toLowerCase()) {
|
|
75
135
|
case "d":
|
|
76
136
|
tokens.push({ type: TokenType.D, value: ch, position: pos });
|
|
@@ -109,11 +169,44 @@ export function tokenize(input) {
|
|
|
109
169
|
i++;
|
|
110
170
|
break;
|
|
111
171
|
case "!":
|
|
112
|
-
|
|
113
|
-
i
|
|
172
|
+
// Peek ahead: !! = compound, !p = penetrate, ! = explode
|
|
173
|
+
if (i + 1 < input.length && input[i + 1] === "!") {
|
|
174
|
+
tokens.push({ type: TokenType.BANG_BANG, value: "!!", position: pos });
|
|
175
|
+
i += 2;
|
|
176
|
+
}
|
|
177
|
+
else if (i + 1 < input.length && input[i + 1].toLowerCase() === "p") {
|
|
178
|
+
tokens.push({ type: TokenType.BANG_P, value: "!p", position: pos });
|
|
179
|
+
i += 2;
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
tokens.push({ type: TokenType.BANG, value: ch, position: pos });
|
|
183
|
+
i++;
|
|
184
|
+
}
|
|
114
185
|
break;
|
|
115
186
|
case ">":
|
|
116
|
-
|
|
187
|
+
// Peek ahead: >= or >
|
|
188
|
+
if (i + 1 < input.length && input[i + 1] === "=") {
|
|
189
|
+
tokens.push({ type: TokenType.GTE, value: ">=", position: pos });
|
|
190
|
+
i += 2;
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
tokens.push({ type: TokenType.GT, value: ch, position: pos });
|
|
194
|
+
i++;
|
|
195
|
+
}
|
|
196
|
+
break;
|
|
197
|
+
case "<":
|
|
198
|
+
// Peek ahead: <= or <
|
|
199
|
+
if (i + 1 < input.length && input[i + 1] === "=") {
|
|
200
|
+
tokens.push({ type: TokenType.LTE, value: "<=", position: pos });
|
|
201
|
+
i += 2;
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
tokens.push({ type: TokenType.LT, value: ch, position: pos });
|
|
205
|
+
i++;
|
|
206
|
+
}
|
|
207
|
+
break;
|
|
208
|
+
case "=":
|
|
209
|
+
tokens.push({ type: TokenType.EQ, value: ch, position: pos });
|
|
117
210
|
i++;
|
|
118
211
|
break;
|
|
119
212
|
default:
|
package/dist/parser/lexer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lexer.js","sourceRoot":"","sources":["../../src/parser/lexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,SAAS,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,OAAO,UAAW,SAAQ,KAAK;IACC;IAApC,YAAY,OAAe,EAAS,QAAgB;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC;QADmB,aAAQ,GAAR,QAAQ,CAAQ;QAElD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"lexer.js","sourceRoot":"","sources":["../../src/parser/lexer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAyC,MAAM,UAAU,CAAC;AAI1E,qBAAa,UAAW,SAAQ,KAAK;IACC,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIrD;AA2SD,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAe5C"}
|
package/dist/parser/parser.js
CHANGED
|
@@ -8,6 +8,13 @@ export class ParseError extends Error {
|
|
|
8
8
|
this.name = "ParseError";
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
+
const COMPARE_TOKENS = new Set([
|
|
12
|
+
TokenType.GT,
|
|
13
|
+
TokenType.GTE,
|
|
14
|
+
TokenType.LT,
|
|
15
|
+
TokenType.LTE,
|
|
16
|
+
TokenType.EQ,
|
|
17
|
+
]);
|
|
11
18
|
class Parser {
|
|
12
19
|
tokens;
|
|
13
20
|
pos = 0;
|
|
@@ -35,6 +42,23 @@ class Parser {
|
|
|
35
42
|
}
|
|
36
43
|
return null;
|
|
37
44
|
}
|
|
45
|
+
/** Parse a compare point: >, >=, <, <=, = followed by a number. */
|
|
46
|
+
parseComparePoint() {
|
|
47
|
+
const token = this.peek();
|
|
48
|
+
if (!COMPARE_TOKENS.has(token.type))
|
|
49
|
+
return undefined;
|
|
50
|
+
this.advance();
|
|
51
|
+
const numToken = this.expect(TokenType.NUMBER);
|
|
52
|
+
const value = parseInt(numToken.value, 10);
|
|
53
|
+
const operatorMap = {
|
|
54
|
+
[TokenType.GT]: ">",
|
|
55
|
+
[TokenType.GTE]: ">=",
|
|
56
|
+
[TokenType.LT]: "<",
|
|
57
|
+
[TokenType.LTE]: "<=",
|
|
58
|
+
[TokenType.EQ]: "=",
|
|
59
|
+
};
|
|
60
|
+
return { operator: operatorMap[token.type], value };
|
|
61
|
+
}
|
|
38
62
|
// expression → term (('+' | '-') term)*
|
|
39
63
|
parseExpression() {
|
|
40
64
|
let left = this.parseTerm();
|
|
@@ -126,46 +150,114 @@ class Parser {
|
|
|
126
150
|
let parsing = true;
|
|
127
151
|
while (parsing) {
|
|
128
152
|
switch (this.peek().type) {
|
|
153
|
+
// --- Keep/Drop (unchanged from V1) ---
|
|
129
154
|
case TokenType.KH: {
|
|
130
155
|
this.advance();
|
|
131
|
-
|
|
132
|
-
modifiers.push({ kind: "kh", value: n });
|
|
156
|
+
modifiers.push({ kind: "kh", value: this.parseOptionalNumber(1) });
|
|
133
157
|
break;
|
|
134
158
|
}
|
|
135
159
|
case TokenType.KL: {
|
|
136
160
|
this.advance();
|
|
137
|
-
|
|
138
|
-
modifiers.push({ kind: "kl", value: n });
|
|
161
|
+
modifiers.push({ kind: "kl", value: this.parseOptionalNumber(1) });
|
|
139
162
|
break;
|
|
140
163
|
}
|
|
141
164
|
case TokenType.DH: {
|
|
142
165
|
this.advance();
|
|
143
|
-
|
|
144
|
-
modifiers.push({ kind: "dh", value: n });
|
|
166
|
+
modifiers.push({ kind: "dh", value: this.parseOptionalNumber(1) });
|
|
145
167
|
break;
|
|
146
168
|
}
|
|
147
169
|
case TokenType.DL: {
|
|
148
170
|
this.advance();
|
|
149
|
-
|
|
150
|
-
modifiers.push({ kind: "dl", value: n });
|
|
171
|
+
modifiers.push({ kind: "dl", value: this.parseOptionalNumber(1) });
|
|
151
172
|
break;
|
|
152
173
|
}
|
|
174
|
+
// --- Explosion variants ---
|
|
153
175
|
case TokenType.BANG: {
|
|
154
176
|
this.advance();
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
177
|
+
const cp = this.parseComparePoint();
|
|
178
|
+
modifiers.push({ kind: "explode", compare: cp });
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
case TokenType.BANG_BANG: {
|
|
182
|
+
this.advance();
|
|
183
|
+
const cp = this.parseComparePoint();
|
|
184
|
+
modifiers.push({ kind: "compound", compare: cp });
|
|
185
|
+
break;
|
|
186
|
+
}
|
|
187
|
+
case TokenType.BANG_P: {
|
|
188
|
+
this.advance();
|
|
189
|
+
const cp = this.parseComparePoint();
|
|
190
|
+
modifiers.push({ kind: "penetrate", compare: cp });
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
193
|
+
// --- Reroll ---
|
|
194
|
+
case TokenType.R: {
|
|
195
|
+
this.advance();
|
|
196
|
+
const cp = this.parseComparePoint() ?? { operator: "=", value: 1 };
|
|
197
|
+
modifiers.push({ kind: "reroll", compare: cp });
|
|
198
|
+
break;
|
|
199
|
+
}
|
|
200
|
+
case TokenType.RO: {
|
|
201
|
+
this.advance();
|
|
202
|
+
const cp = this.parseComparePoint() ?? { operator: "=", value: 1 };
|
|
203
|
+
modifiers.push({ kind: "reroll_once", compare: cp });
|
|
204
|
+
break;
|
|
205
|
+
}
|
|
206
|
+
// --- Success/failure counting and marking ---
|
|
207
|
+
case TokenType.CS: {
|
|
208
|
+
this.advance();
|
|
209
|
+
const cp = this.parseComparePoint();
|
|
210
|
+
if (cp) {
|
|
211
|
+
modifiers.push({ kind: "cs_count", compare: cp });
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
modifiers.push({ kind: "cs_mark" });
|
|
160
215
|
}
|
|
161
|
-
|
|
216
|
+
break;
|
|
217
|
+
}
|
|
218
|
+
case TokenType.CF: {
|
|
219
|
+
this.advance();
|
|
220
|
+
const cp = this.parseComparePoint();
|
|
221
|
+
if (cp) {
|
|
222
|
+
modifiers.push({ kind: "cf_count", compare: cp });
|
|
223
|
+
}
|
|
224
|
+
else {
|
|
225
|
+
modifiers.push({ kind: "cf_mark" });
|
|
226
|
+
}
|
|
227
|
+
break;
|
|
228
|
+
}
|
|
229
|
+
// --- Min/Max clamping ---
|
|
230
|
+
case TokenType.MIN: {
|
|
231
|
+
this.advance();
|
|
232
|
+
const numToken = this.expect(TokenType.NUMBER);
|
|
233
|
+
modifiers.push({ kind: "min", value: parseInt(numToken.value, 10) });
|
|
234
|
+
break;
|
|
235
|
+
}
|
|
236
|
+
case TokenType.MAX: {
|
|
237
|
+
this.advance();
|
|
238
|
+
const numToken = this.expect(TokenType.NUMBER);
|
|
239
|
+
modifiers.push({ kind: "max", value: parseInt(numToken.value, 10) });
|
|
240
|
+
break;
|
|
241
|
+
}
|
|
242
|
+
// --- Sorting ---
|
|
243
|
+
case TokenType.SA: {
|
|
244
|
+
this.advance();
|
|
245
|
+
modifiers.push({ kind: "sort_asc" });
|
|
246
|
+
break;
|
|
247
|
+
}
|
|
248
|
+
case TokenType.SD: {
|
|
249
|
+
this.advance();
|
|
250
|
+
modifiers.push({ kind: "sort_desc" });
|
|
162
251
|
break;
|
|
163
252
|
}
|
|
164
253
|
default:
|
|
165
254
|
parsing = false;
|
|
166
255
|
}
|
|
167
256
|
}
|
|
168
|
-
|
|
257
|
+
// Determine result mode: success_count if any cs_count modifier present
|
|
258
|
+
const hasSuccessCounting = modifiers.some((m) => m.kind === "cs_count");
|
|
259
|
+
const resultMode = hasSuccessCounting ? "success_count" : undefined;
|
|
260
|
+
return { type: "dice", count, sides, modifiers, resultMode };
|
|
169
261
|
}
|
|
170
262
|
parseOptionalNumber(defaultValue) {
|
|
171
263
|
if (this.peek().type === TokenType.NUMBER) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,SAAS,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,OAAO,UAAW,SAAQ,KAAK;IACC;IAApC,YAAY,OAAe,EAAS,QAAgB;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC;QADmB,aAAQ,GAAR,QAAQ,CAAQ;QAElD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,MAAM;IACF,MAAM,CAAU;IAChB,GAAG,GAAG,CAAC,CAAC;IAEhB,YAAY,MAAe;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEO,IAAI;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAEO,OAAO;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,IAAe;QAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,IAAI,UAAU,CAClB,YAAY,IAAI,YAAY,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,KAAK,IAAI,EAC3D,KAAK,CAAC,QAAQ,CACf,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAEO,KAAK,CAAC,GAAG,KAAkB;QACjC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wCAAwC;IACxC,eAAe;QACb,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAE5B,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,EAAE,CAAC;YACnF,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/B,IAAI,GAAG;gBACL,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;gBAC1C,IAAI;gBACJ,KAAK;aACN,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sCAAsC;IAC9B,SAAS;QACf,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAE9B,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,EAAE,CAAC;YACnF,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACjC,IAAI,GAAG;gBACL,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;gBAC1C,IAAI;gBACJ,KAAK;aACN,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2DAA2D;IACnD,WAAW;QACjB,cAAc;QACd,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,EAAE,CAAC;YACzC,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACnC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;QAC1C,CAAC;QAED,2BAA2B;QAC3B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;YAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,0CAA0C;QAC1C,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAE9C,6CAA6C;YAC7C,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;YAED,gBAAgB;YAChB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QAC7C,CAAC;QAED,yBAAyB;QACzB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,IAAI,UAAU,CAClB,qBAAqB,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,EAChE,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CACrB,CAAC;IACJ,CAAC;IAED,2BAA2B;IAC3B,mCAAmC;IAC3B,SAAS,CAAC,KAAa;QAC7B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAEzB,+BAA+B;QAC/B,IAAI,KAAgB,CAAC;QACrB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;YAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,KAAK,GAAG,GAAG,CAAC;QACd,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,KAAK,GAAG,GAAG,CAAC;QACd,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;YACjD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7B,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAClC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACd,MAAM,IAAI,UAAU,CAAC,+BAA+B,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,UAAU,CAClB,oCAAoC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EACtD,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CACrB,CAAC;QACJ,CAAC;QAED,kBAAkB;QAClB,MAAM,SAAS,GAAmB,EAAE,CAAC;QACrC,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,OAAO,OAAO,EAAE,CAAC;YACf,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;gBACzB,KAAK,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;oBAClB,IAAI,CAAC,OAAO,EAAE,CAAC;oBACf,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"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"}
|
package/dist/parser/tokens.d.ts
CHANGED
|
@@ -12,7 +12,21 @@ export declare enum TokenType {
|
|
|
12
12
|
DH = "DH",
|
|
13
13
|
DL = "DL",
|
|
14
14
|
BANG = "BANG",
|
|
15
|
+
BANG_BANG = "BANG_BANG",
|
|
16
|
+
BANG_P = "BANG_P",
|
|
15
17
|
GT = "GT",
|
|
18
|
+
GTE = "GTE",
|
|
19
|
+
LT = "LT",
|
|
20
|
+
LTE = "LTE",
|
|
21
|
+
EQ = "EQ",
|
|
22
|
+
R = "R",
|
|
23
|
+
RO = "RO",
|
|
24
|
+
CS = "CS",
|
|
25
|
+
CF = "CF",
|
|
26
|
+
SA = "SA",
|
|
27
|
+
SD = "SD",
|
|
28
|
+
MIN = "MIN",
|
|
29
|
+
MAX = "MAX",
|
|
16
30
|
PERCENT = "PERCENT",
|
|
17
31
|
F = "F",
|
|
18
32
|
EOF = "EOF"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/parser/tokens.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IACnB,MAAM,WAAW;IACjB,CAAC,MAAM;IACP,IAAI,SAAS;IACb,KAAK,UAAU;IACf,IAAI,SAAS;IACb,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/parser/tokens.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IACnB,MAAM,WAAW;IACjB,CAAC,MAAM;IACP,IAAI,SAAS;IACb,KAAK,UAAU;IACf,IAAI,SAAS;IACb,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IAEjB,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IACT,EAAE,OAAO;IAET,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,MAAM,WAAW;IAEjB,EAAE,OAAO;IACT,GAAG,QAAQ;IACX,EAAE,OAAO;IACT,GAAG,QAAQ;IACX,EAAE,OAAO;IAET,CAAC,MAAM;IACP,EAAE,OAAO;IAET,EAAE,OAAO;IACT,EAAE,OAAO;IAET,EAAE,OAAO;IACT,EAAE,OAAO;IAET,GAAG,QAAQ;IACX,GAAG,QAAQ;IAEX,OAAO,YAAY;IACnB,CAAC,MAAM;IACP,GAAG,QAAQ;CACZ;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB"}
|