@formulavize/lezer-fiz 0.1.2 → 0.2.1
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/.github/workflows/ci.yml +13 -21
- package/README.md +1 -0
- package/dist/index.cjs +66 -40
- package/dist/index.es.js +66 -38
- package/package.json +16 -11
- package/rollup.config.js +15 -14
- package/src/fiz.grammar +16 -10
- package/src/highlight.js +5 -2
- package/src/tokens.js +65 -33
- package/test/assignments.txt +8 -8
- package/test/calls.txt +31 -25
- package/test/namespaces.txt +171 -0
- package/test/qualifiers.txt +94 -0
- package/test/statements.txt +88 -33
- package/test/styling.txt +31 -27
- package/test/test-fiz.js +14 -11
- package/src/parser.js +0 -26
- package/src/parser.terms.js +0 -27
package/.github/workflows/ci.yml
CHANGED
|
@@ -1,31 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
|
|
3
|
-
|
|
4
|
-
name: Node.js CI
|
|
1
|
+
name: Run Tests
|
|
5
2
|
|
|
6
3
|
on:
|
|
7
4
|
push:
|
|
8
|
-
branches:
|
|
5
|
+
branches:
|
|
6
|
+
- main
|
|
9
7
|
pull_request:
|
|
10
|
-
branches:
|
|
8
|
+
branches:
|
|
9
|
+
- main
|
|
11
10
|
|
|
12
11
|
jobs:
|
|
13
12
|
build:
|
|
14
|
-
|
|
15
13
|
runs-on: ubuntu-latest
|
|
16
14
|
|
|
17
|
-
strategy:
|
|
18
|
-
matrix:
|
|
19
|
-
node-version: [14.x, 16.x]
|
|
20
|
-
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
|
|
21
|
-
|
|
22
15
|
steps:
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
- run: npm test
|
|
16
|
+
- uses: actions/checkout@v4
|
|
17
|
+
- uses: actions/setup-node@v4
|
|
18
|
+
with:
|
|
19
|
+
node-version: 20
|
|
20
|
+
|
|
21
|
+
- run: npm ci
|
|
22
|
+
- run: npm run build
|
|
23
|
+
- run: npm test
|
package/README.md
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# lezer-fiz
|
|
2
|
+
|
|
2
3
|
This is the fiz grammar for the [lezer](https://lezer.codemirror.net) parser system.
|
|
3
4
|
|
|
4
5
|
**fiz** is a functionally inspired language for describing workflows in [formulavize](https://github.com/formulavize/formulavize). It borrows many language constructs from [javascript](https://github.com/lezer-parser/javascript) and [CSS](https://github.com/lezer-parser/css).
|
package/dist/index.cjs
CHANGED
|
@@ -1,65 +1,88 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
-
|
|
5
3
|
var lr = require('@lezer/lr');
|
|
6
4
|
var highlight = require('@lezer/highlight');
|
|
7
5
|
|
|
8
6
|
// This file was generated by lezer-generator. You probably shouldn't edit it.
|
|
9
7
|
const Unit = 1,
|
|
10
|
-
cssIdentifier =
|
|
11
|
-
insertSemi =
|
|
12
|
-
spaces =
|
|
13
|
-
newline =
|
|
8
|
+
cssIdentifier = 43,
|
|
9
|
+
insertSemi = 44,
|
|
10
|
+
spaces = 46,
|
|
11
|
+
newline = 47,
|
|
14
12
|
LineComment = 2,
|
|
15
13
|
BlockComment = 3;
|
|
16
14
|
|
|
17
|
-
const space = [
|
|
18
|
-
5760, 8192, 8193, 8194, 8195, 8196, 8197,
|
|
19
|
-
8201, 8202, 8232, 8233, 8239, 8287, 12288
|
|
15
|
+
const space = [
|
|
16
|
+
9, 10, 11, 12, 13, 32, 133, 160, 5760, 8192, 8193, 8194, 8195, 8196, 8197,
|
|
17
|
+
8198, 8199, 8200, 8201, 8202, 8232, 8233, 8239, 8287, 12288,
|
|
18
|
+
];
|
|
20
19
|
|
|
21
|
-
const percent = 37,
|
|
20
|
+
const percent = 37,
|
|
21
|
+
dash = 45,
|
|
22
|
+
underscore = 95,
|
|
23
|
+
braceR = 125;
|
|
22
24
|
|
|
23
|
-
function isAlpha(ch) {
|
|
25
|
+
function isAlpha(ch) {
|
|
26
|
+
return (ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122) || ch >= 161;
|
|
27
|
+
}
|
|
24
28
|
|
|
25
|
-
function isDigit(ch) {
|
|
29
|
+
function isDigit(ch) {
|
|
30
|
+
return ch >= 48 && ch <= 57;
|
|
31
|
+
}
|
|
26
32
|
|
|
27
33
|
const trackNewline = new lr.ContextTracker({
|
|
28
34
|
start: false,
|
|
29
35
|
shift(context, term) {
|
|
30
|
-
return term == LineComment || term == BlockComment || term == spaces
|
|
36
|
+
return term == LineComment || term == BlockComment || term == spaces
|
|
37
|
+
? context
|
|
38
|
+
: term == newline;
|
|
31
39
|
},
|
|
32
|
-
strict: false
|
|
40
|
+
strict: false,
|
|
33
41
|
});
|
|
34
42
|
|
|
35
|
-
const insertSemicolon = new lr.ExternalTokenizer(
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
43
|
+
const insertSemicolon = new lr.ExternalTokenizer(
|
|
44
|
+
(input, stack) => {
|
|
45
|
+
let { next } = input;
|
|
46
|
+
if (
|
|
47
|
+
(next == braceR || next == -1 || stack.context) &&
|
|
48
|
+
stack.canShift(insertSemi)
|
|
49
|
+
)
|
|
50
|
+
input.acceptToken(insertSemi);
|
|
51
|
+
},
|
|
52
|
+
{ contextual: true, fallback: true },
|
|
53
|
+
);
|
|
40
54
|
|
|
41
|
-
const unitToken = new lr.ExternalTokenizer(input => {
|
|
55
|
+
const unitToken = new lr.ExternalTokenizer((input) => {
|
|
42
56
|
if (!space.includes(input.peek(-1))) {
|
|
43
|
-
let {next} = input;
|
|
44
|
-
if (next == percent) {
|
|
57
|
+
let { next } = input;
|
|
58
|
+
if (next == percent) {
|
|
59
|
+
input.advance();
|
|
60
|
+
input.acceptToken(Unit);
|
|
61
|
+
}
|
|
45
62
|
if (isAlpha(next)) {
|
|
46
|
-
do {
|
|
63
|
+
do {
|
|
64
|
+
input.advance();
|
|
65
|
+
} while (isAlpha(input.next));
|
|
47
66
|
input.acceptToken(Unit);
|
|
48
67
|
}
|
|
49
68
|
}
|
|
50
69
|
});
|
|
51
70
|
|
|
52
71
|
const cssIdentifierToken = new lr.ExternalTokenizer((input) => {
|
|
53
|
-
for (let inside = false, dashes = 0, i = 0
|
|
54
|
-
let {next} = input;
|
|
55
|
-
if (
|
|
72
|
+
for (let inside = false, dashes = 0, i = 0; ; i++) {
|
|
73
|
+
let { next } = input;
|
|
74
|
+
if (
|
|
75
|
+
isAlpha(next) ||
|
|
76
|
+
next == dash ||
|
|
77
|
+
next == underscore ||
|
|
78
|
+
(inside && isDigit(next))
|
|
79
|
+
) {
|
|
56
80
|
if (!inside && (next != dash || i > 0)) inside = true;
|
|
57
81
|
if (dashes === i && next == dash) dashes++;
|
|
58
82
|
input.advance();
|
|
59
83
|
} else {
|
|
60
|
-
if (inside)
|
|
61
|
-
|
|
62
|
-
break
|
|
84
|
+
if (inside) input.acceptToken(cssIdentifier);
|
|
85
|
+
break;
|
|
63
86
|
}
|
|
64
87
|
}
|
|
65
88
|
});
|
|
@@ -75,33 +98,36 @@ const fizHighlighting = highlight.styleTags({
|
|
|
75
98
|
ColorLiteral: highlight.tags.color,
|
|
76
99
|
Unit: highlight.tags.unit,
|
|
77
100
|
StyleTag: highlight.tags.tagName,
|
|
101
|
+
Namespace: highlight.tags.namespace,
|
|
78
102
|
"( )": highlight.tags.paren,
|
|
79
103
|
"{ }": highlight.tags.brace,
|
|
104
|
+
"[ ]": highlight.tags.squareBracket,
|
|
80
105
|
":": highlight.tags.punctuation,
|
|
81
106
|
", ;": highlight.tags.separator,
|
|
107
|
+
".": highlight.tags.derefOperator,
|
|
82
108
|
});
|
|
83
109
|
|
|
84
110
|
// This file was generated by lezer-generator. You probably shouldn't edit it.
|
|
85
111
|
const parser = lr.LRParser.deserialize({
|
|
86
112
|
version: 14,
|
|
87
|
-
states: "
|
|
88
|
-
stateData: "
|
|
89
|
-
goto: "
|
|
90
|
-
nodeNames: "⚠ Unit LineComment BlockComment Recipe Call Identifier ) ( ArgList
|
|
91
|
-
maxTerm:
|
|
113
|
+
states: ",YQ`QSOOOnQSO'#CbO!SQSO'#CaO!XQSO'#CtO!aQSO'#CxO!fQSO'#CyO!kQSO'#C|O!|QdO'#D^OOQO'#DP'#DPQ`QSOOO#UQSO'#DQO#ZQfO,58|O#{QUO'#CkOOQO,59a,59aO$ZQSO,59hO$lQSO'#CgO$tQdO,58{O%VQSO,59`O%[QSO'#DUO%aQSO,59cO%iQSO,59dO%nQSO,59eO%sQdO,59hO$ZQSO,59hOOQQ'#Dc'#DcOOQO,59x,59xOOQO-E6}-E6}OOQb,59l,59lOOQb-E7O-E7OOOQO'#Cm'#CmO&RQSO'#ClO%VQSO'#CrOOQQ'#DS'#DSO&WQUO,59VOOQ`,59V,59VO&fQdO1G/SO&tQSO1G/SO'VQfO'#CbO'wQdO'#ChOOQO'#D_'#D_OOQ`,59R,59RO(YQSO,59ROOQ`1G.g1G.gOOQ`1G.z1G.zOOQ`1G.}1G.}O(bQSO'#CuOOQO,59p,59pOOQO-E7S-E7SO%VQSO1G.}OOQ`1G/O1G/OO(mQSO'#C{OOQ`1G/P1G/POOQ`1G/S1G/SO&iQdO1G/SO(uQWO,59WOOQQ,59^,59^OOQQ-E7Q-E7QOOQ`1G.q1G.qOOQ`7+$n7+$nO)QQdO7+$nO)]QdO7+$nO%VQSO'#DRO)kQSO1G.mOOQ`1G.m1G.mOOQ`7+$i7+$iOOQO'#DV'#DVO)sQSO,59gOOQ`,59g,59gO){QeO'#CpOOQ`'#Da'#DaO*ZQdO1G.rOOQ`<<HY<<HYO*fQdO<<HYOOQO,59m,59mOOQO-E7P-E7POOQ`7+$X7+$XOOQO-E7T-E7TOOQ`1G/R1G/ROOQ`,59[,59[O(uQWO'#DTO*ZQdO7+$^OOQQ7+$^7+$^OOQ`AN=tAN=tOOQ`,59o,59oOOQ`-E7R-E7ROOQQ<<Gx<<Gx",
|
|
114
|
+
stateData: "*v~O!OOS!POSQOSROS~OVPOgSOnTOqUO~OWYO^[Oq^OYUXjiX!SiX~OY_O~OjaO!SbO~OVdO~OVeO~OVPOgSOnTOqUOrfO~O|hO!WhO~OVkO~OWYOYUaXUa!SUa|Ua!WUa]UaeUagUa{Ua~O]rOepOgoO{mO~OVPOgSOnTOqUOrsO~OVuOXxO~O^[O|Ta!WTaXTa!STa~OVuO~OV}O~Oj!QO!SbO~O^[O~O^!SO~OY_O^[O|pa!Wpa~Ob!WO~O]!ZOepOgoO{mO~OY_O^[O|pi!Wpi~OVPOgSOnTOqUOr!^O~OWYOXUXYUX!SUX|UX!WUX]UXeUXgUX{UX~OY_OX[X!S[X|[X!W[X~OX!aO!S!_O~O^[OjiX!SiX~O]!eOgoO~Oc!gOe!gO!U!fO~O^[O|pq!Wpq~OY_O^[O|pq!Wpq~OX!mO!S!_O~O]!oOgoO~OP!pO|dX!SdX!WdX~O|hO!S!qO!WhO~O^[O|py!Wpy~O!O!PV!P~",
|
|
115
|
+
goto: "&j!WPPPPP!X!kPPPP!|#ZPP#b#z$OPP$SP$WP$`$hP$`$`$`P$s$`PP$v%U%]%c%i%o%uPPPPPP%{&TP&ZP&a[VOUX^gtSw_!_Q|aR!b!Q^QOUX^gt!QUv_a!_R!XoS`QvQ!VfQ!]sR!j!^Sw_!_R{aS]P}Qz`Q!RdQ!UfS![s!VS!i!]!^R!t!jTp[qTn[qT!g!W!qSp[qT!c!S!d]VOUX^gt[ROUX^gtR!ObR!TeQXOQgUUjXgtRt^SZPuRlZQ!`yR!l!`Qq[R!YqQ!r!hR!v!rQcRR!PcQ!d!SR!n!d]WOUX^gtQy_R!k!_Q!h!WR!u!qQiVQ!s!hR!w!r",
|
|
116
|
+
nodeNames: "⚠ Unit LineComment BlockComment Recipe Call QualifiableIdentifier Identifier . ) ( ArgList RhsVariable } { StyleArgList StyleDeclaration PropertyName : ColorLiteral NumberLiteral StringLiteral StyleTag # Alias LhsVariable Eq Assignment StyleTagDeclaration StyleBinding % StyleTagList Namespace [ ]",
|
|
117
|
+
maxTerm: 54,
|
|
92
118
|
context: trackNewline,
|
|
93
119
|
nodeProps: [
|
|
94
|
-
["group", -2,5,
|
|
95
|
-
["openedBy",
|
|
96
|
-
["closedBy",
|
|
120
|
+
["group", -2,5,12,"Value",-3,19,20,21,"StyleValue"],
|
|
121
|
+
["openedBy", 9,"(",13,"{"],
|
|
122
|
+
["closedBy", 10,")",14,"}"]
|
|
97
123
|
],
|
|
98
124
|
propSources: [fizHighlighting],
|
|
99
125
|
skippedNodes: [0,2,3],
|
|
100
|
-
repeatNodeCount:
|
|
101
|
-
tokenData: "
|
|
126
|
+
repeatNodeCount: 7,
|
|
127
|
+
tokenData: "2o~R!PXY$UYZ$yZ[$U]^$ypq$Urs%Ost&rtu)Tuv)xwx)}xy+lyz+q{|+v|}-b}!O+v!O!P-g!P!Q-o!Q![-P![!]/h!]!^/m!_!`/r!c!})T!}#O/w#P#Q/|#R#S)T#T#o)T#o#p0R#q#r0W$f$g$U$g#BY)T#BY#BZ0]#BZ$IS)T$IS$I_0]$I_$I|)T$I|$I}2O$I}$JO2O$JO$JT)T$JT$JU0]$JU$KV)T$KV$KW0]$KW&FU)T&FU&FV0]&FV;'S)T;'S;=`)r<%l?HT)T?HT?HU0]?HUO)T~$ZY!O~XY$UZ[$Upq$U$f$g$U#BY#BZ$U$IS$I_$U$JT$JU$U$KV$KW$U&FU&FV$U?HT?HU$U~%OO!P~~%RWOY%OZr%Ors%ks#O%O#O#P%p#P;'S%O;'S;=`&l<%lO%O~%pOe~~%sRO;'S%O;'S;=`%|;=`O%O~&PXOY%OZr%Ors%ks#O%O#O#P%p#P;'S%O;'S;=`&l;=`<%l%O<%lO%O~&oP;=`<%l%OR&wRgP!Q!['Q!c!i'Q#T#Z'QQ'TR!Q!['^!c!i'^#T#Z'^Q'aR!Q!['j!c!i'j#T#Z'jQ'oRcQ!Q!['x!c!i'x#T#Z'xQ'}RcQ!Q![(W!c!i(W#T#Z(WQ(ZR!Q![(d!c!i(d#T#Z(dQ(iRcQ!Q![(r!c!i(r#T#Z(rQ(uR!Q![)O!c!i)O#T#Z)OQ)TOcQ~)YWV~tu)T!Q![)T!c!})T#R#S)T#T#o)T$g;'S)T;'S;=`)r<%lO)T~)uP;=`<%l)T~)}On~~*QWOY)}Zw)}wx%kx#O)}#O#P*j#P;'S)};'S;=`+f<%lO)}~*mRO;'S)};'S;=`*v;=`O)}~*yXOY)}Zw)}wx%kx#O)}#O#P*j#P;'S)};'S;=`+f;=`<%l)}<%lO)}~+iP;=`<%l)}~+qOY~~+vOX~Q+yQ!O!P,P!Q![-PQ,SP!Q![,VQ,[R!UQ!Q![,V!g!h,e#X#Y,eQ,hR{|,q}!O,q!Q![,wQ,tP!Q![,wQ,|P!UQ!Q![,wQ-US!UQ!O!P,V!Q![-P!g!h,e#X#Y,e~-gO!S~R-lPWP!Q![,V~-rQz{-x!P!Q/P~-{TOz-xz{.[{;'S-x;'S;=`.y<%lO-x~._VOz-xz{.[{!P-x!P!Q.t!Q;'S-x;'S;=`.y<%lO-x~.yOR~~.|P;=`<%l-x~/USQ~OY/PZ;'S/P;'S;=`/b<%lO/P~/eP;=`<%l/P~/mOb~~/rO!W~~/wOj~~/|Oq~~0ROr~~0WO^~~0]O]~~0dh!O~V~XY$UZ[$Upq$Utu)T!Q![)T!c!})T#R#S)T#T#o)T$f$g$U$g#BY)T#BY#BZ0]#BZ$IS)T$IS$I_0]$I_$JT)T$JT$JU0]$JU$KV)T$KV$KW0]$KW&FU)T&FU&FV0]&FV;'S)T;'S;=`)r<%l?HT)T?HT?HU0]?HUO)T~2VW!P~V~tu)T!Q![)T!c!})T#R#S)T#T#o)T$g;'S)T;'S;=`)r<%lO)T",
|
|
102
128
|
tokenizers: [unitToken, cssIdentifierToken, 0, 1, insertSemicolon],
|
|
103
129
|
topRules: {"Recipe":[0,4]},
|
|
104
|
-
tokenPrec:
|
|
130
|
+
tokenPrec: 447
|
|
105
131
|
});
|
|
106
132
|
|
|
107
133
|
exports.parser = parser;
|
package/dist/index.es.js
CHANGED
|
@@ -3,59 +3,84 @@ import { styleTags, tags } from '@lezer/highlight';
|
|
|
3
3
|
|
|
4
4
|
// This file was generated by lezer-generator. You probably shouldn't edit it.
|
|
5
5
|
const Unit = 1,
|
|
6
|
-
cssIdentifier =
|
|
7
|
-
insertSemi =
|
|
8
|
-
spaces =
|
|
9
|
-
newline =
|
|
6
|
+
cssIdentifier = 43,
|
|
7
|
+
insertSemi = 44,
|
|
8
|
+
spaces = 46,
|
|
9
|
+
newline = 47,
|
|
10
10
|
LineComment = 2,
|
|
11
11
|
BlockComment = 3;
|
|
12
12
|
|
|
13
|
-
const space = [
|
|
14
|
-
5760, 8192, 8193, 8194, 8195, 8196, 8197,
|
|
15
|
-
8201, 8202, 8232, 8233, 8239, 8287, 12288
|
|
13
|
+
const space = [
|
|
14
|
+
9, 10, 11, 12, 13, 32, 133, 160, 5760, 8192, 8193, 8194, 8195, 8196, 8197,
|
|
15
|
+
8198, 8199, 8200, 8201, 8202, 8232, 8233, 8239, 8287, 12288,
|
|
16
|
+
];
|
|
16
17
|
|
|
17
|
-
const percent = 37,
|
|
18
|
+
const percent = 37,
|
|
19
|
+
dash = 45,
|
|
20
|
+
underscore = 95,
|
|
21
|
+
braceR = 125;
|
|
18
22
|
|
|
19
|
-
function isAlpha(ch) {
|
|
23
|
+
function isAlpha(ch) {
|
|
24
|
+
return (ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122) || ch >= 161;
|
|
25
|
+
}
|
|
20
26
|
|
|
21
|
-
function isDigit(ch) {
|
|
27
|
+
function isDigit(ch) {
|
|
28
|
+
return ch >= 48 && ch <= 57;
|
|
29
|
+
}
|
|
22
30
|
|
|
23
31
|
const trackNewline = new ContextTracker({
|
|
24
32
|
start: false,
|
|
25
33
|
shift(context, term) {
|
|
26
|
-
return term == LineComment || term == BlockComment || term == spaces
|
|
34
|
+
return term == LineComment || term == BlockComment || term == spaces
|
|
35
|
+
? context
|
|
36
|
+
: term == newline;
|
|
27
37
|
},
|
|
28
|
-
strict: false
|
|
38
|
+
strict: false,
|
|
29
39
|
});
|
|
30
40
|
|
|
31
|
-
const insertSemicolon = new ExternalTokenizer(
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
41
|
+
const insertSemicolon = new ExternalTokenizer(
|
|
42
|
+
(input, stack) => {
|
|
43
|
+
let { next } = input;
|
|
44
|
+
if (
|
|
45
|
+
(next == braceR || next == -1 || stack.context) &&
|
|
46
|
+
stack.canShift(insertSemi)
|
|
47
|
+
)
|
|
48
|
+
input.acceptToken(insertSemi);
|
|
49
|
+
},
|
|
50
|
+
{ contextual: true, fallback: true },
|
|
51
|
+
);
|
|
36
52
|
|
|
37
|
-
const unitToken = new ExternalTokenizer(input => {
|
|
53
|
+
const unitToken = new ExternalTokenizer((input) => {
|
|
38
54
|
if (!space.includes(input.peek(-1))) {
|
|
39
|
-
let {next} = input;
|
|
40
|
-
if (next == percent) {
|
|
55
|
+
let { next } = input;
|
|
56
|
+
if (next == percent) {
|
|
57
|
+
input.advance();
|
|
58
|
+
input.acceptToken(Unit);
|
|
59
|
+
}
|
|
41
60
|
if (isAlpha(next)) {
|
|
42
|
-
do {
|
|
61
|
+
do {
|
|
62
|
+
input.advance();
|
|
63
|
+
} while (isAlpha(input.next));
|
|
43
64
|
input.acceptToken(Unit);
|
|
44
65
|
}
|
|
45
66
|
}
|
|
46
67
|
});
|
|
47
68
|
|
|
48
69
|
const cssIdentifierToken = new ExternalTokenizer((input) => {
|
|
49
|
-
for (let inside = false, dashes = 0, i = 0
|
|
50
|
-
let {next} = input;
|
|
51
|
-
if (
|
|
70
|
+
for (let inside = false, dashes = 0, i = 0; ; i++) {
|
|
71
|
+
let { next } = input;
|
|
72
|
+
if (
|
|
73
|
+
isAlpha(next) ||
|
|
74
|
+
next == dash ||
|
|
75
|
+
next == underscore ||
|
|
76
|
+
(inside && isDigit(next))
|
|
77
|
+
) {
|
|
52
78
|
if (!inside && (next != dash || i > 0)) inside = true;
|
|
53
79
|
if (dashes === i && next == dash) dashes++;
|
|
54
80
|
input.advance();
|
|
55
81
|
} else {
|
|
56
|
-
if (inside)
|
|
57
|
-
|
|
58
|
-
break
|
|
82
|
+
if (inside) input.acceptToken(cssIdentifier);
|
|
83
|
+
break;
|
|
59
84
|
}
|
|
60
85
|
}
|
|
61
86
|
});
|
|
@@ -71,33 +96,36 @@ const fizHighlighting = styleTags({
|
|
|
71
96
|
ColorLiteral: tags.color,
|
|
72
97
|
Unit: tags.unit,
|
|
73
98
|
StyleTag: tags.tagName,
|
|
99
|
+
Namespace: tags.namespace,
|
|
74
100
|
"( )": tags.paren,
|
|
75
101
|
"{ }": tags.brace,
|
|
102
|
+
"[ ]": tags.squareBracket,
|
|
76
103
|
":": tags.punctuation,
|
|
77
104
|
", ;": tags.separator,
|
|
105
|
+
".": tags.derefOperator,
|
|
78
106
|
});
|
|
79
107
|
|
|
80
108
|
// This file was generated by lezer-generator. You probably shouldn't edit it.
|
|
81
109
|
const parser = LRParser.deserialize({
|
|
82
110
|
version: 14,
|
|
83
|
-
states: "
|
|
84
|
-
stateData: "
|
|
85
|
-
goto: "
|
|
86
|
-
nodeNames: "⚠ Unit LineComment BlockComment Recipe Call Identifier ) ( ArgList
|
|
87
|
-
maxTerm:
|
|
111
|
+
states: ",YQ`QSOOOnQSO'#CbO!SQSO'#CaO!XQSO'#CtO!aQSO'#CxO!fQSO'#CyO!kQSO'#C|O!|QdO'#D^OOQO'#DP'#DPQ`QSOOO#UQSO'#DQO#ZQfO,58|O#{QUO'#CkOOQO,59a,59aO$ZQSO,59hO$lQSO'#CgO$tQdO,58{O%VQSO,59`O%[QSO'#DUO%aQSO,59cO%iQSO,59dO%nQSO,59eO%sQdO,59hO$ZQSO,59hOOQQ'#Dc'#DcOOQO,59x,59xOOQO-E6}-E6}OOQb,59l,59lOOQb-E7O-E7OOOQO'#Cm'#CmO&RQSO'#ClO%VQSO'#CrOOQQ'#DS'#DSO&WQUO,59VOOQ`,59V,59VO&fQdO1G/SO&tQSO1G/SO'VQfO'#CbO'wQdO'#ChOOQO'#D_'#D_OOQ`,59R,59RO(YQSO,59ROOQ`1G.g1G.gOOQ`1G.z1G.zOOQ`1G.}1G.}O(bQSO'#CuOOQO,59p,59pOOQO-E7S-E7SO%VQSO1G.}OOQ`1G/O1G/OO(mQSO'#C{OOQ`1G/P1G/POOQ`1G/S1G/SO&iQdO1G/SO(uQWO,59WOOQQ,59^,59^OOQQ-E7Q-E7QOOQ`1G.q1G.qOOQ`7+$n7+$nO)QQdO7+$nO)]QdO7+$nO%VQSO'#DRO)kQSO1G.mOOQ`1G.m1G.mOOQ`7+$i7+$iOOQO'#DV'#DVO)sQSO,59gOOQ`,59g,59gO){QeO'#CpOOQ`'#Da'#DaO*ZQdO1G.rOOQ`<<HY<<HYO*fQdO<<HYOOQO,59m,59mOOQO-E7P-E7POOQ`7+$X7+$XOOQO-E7T-E7TOOQ`1G/R1G/ROOQ`,59[,59[O(uQWO'#DTO*ZQdO7+$^OOQQ7+$^7+$^OOQ`AN=tAN=tOOQ`,59o,59oOOQ`-E7R-E7ROOQQ<<Gx<<Gx",
|
|
112
|
+
stateData: "*v~O!OOS!POSQOSROS~OVPOgSOnTOqUO~OWYO^[Oq^OYUXjiX!SiX~OY_O~OjaO!SbO~OVdO~OVeO~OVPOgSOnTOqUOrfO~O|hO!WhO~OVkO~OWYOYUaXUa!SUa|Ua!WUa]UaeUagUa{Ua~O]rOepOgoO{mO~OVPOgSOnTOqUOrsO~OVuOXxO~O^[O|Ta!WTaXTa!STa~OVuO~OV}O~Oj!QO!SbO~O^[O~O^!SO~OY_O^[O|pa!Wpa~Ob!WO~O]!ZOepOgoO{mO~OY_O^[O|pi!Wpi~OVPOgSOnTOqUOr!^O~OWYOXUXYUX!SUX|UX!WUX]UXeUXgUX{UX~OY_OX[X!S[X|[X!W[X~OX!aO!S!_O~O^[OjiX!SiX~O]!eOgoO~Oc!gOe!gO!U!fO~O^[O|pq!Wpq~OY_O^[O|pq!Wpq~OX!mO!S!_O~O]!oOgoO~OP!pO|dX!SdX!WdX~O|hO!S!qO!WhO~O^[O|py!Wpy~O!O!PV!P~",
|
|
113
|
+
goto: "&j!WPPPPP!X!kPPPP!|#ZPP#b#z$OPP$SP$WP$`$hP$`$`$`P$s$`PP$v%U%]%c%i%o%uPPPPPP%{&TP&ZP&a[VOUX^gtSw_!_Q|aR!b!Q^QOUX^gt!QUv_a!_R!XoS`QvQ!VfQ!]sR!j!^Sw_!_R{aS]P}Qz`Q!RdQ!UfS![s!VS!i!]!^R!t!jTp[qTn[qT!g!W!qSp[qT!c!S!d]VOUX^gt[ROUX^gtR!ObR!TeQXOQgUUjXgtRt^SZPuRlZQ!`yR!l!`Qq[R!YqQ!r!hR!v!rQcRR!PcQ!d!SR!n!d]WOUX^gtQy_R!k!_Q!h!WR!u!qQiVQ!s!hR!w!r",
|
|
114
|
+
nodeNames: "⚠ Unit LineComment BlockComment Recipe Call QualifiableIdentifier Identifier . ) ( ArgList RhsVariable } { StyleArgList StyleDeclaration PropertyName : ColorLiteral NumberLiteral StringLiteral StyleTag # Alias LhsVariable Eq Assignment StyleTagDeclaration StyleBinding % StyleTagList Namespace [ ]",
|
|
115
|
+
maxTerm: 54,
|
|
88
116
|
context: trackNewline,
|
|
89
117
|
nodeProps: [
|
|
90
|
-
["group", -2,5,
|
|
91
|
-
["openedBy",
|
|
92
|
-
["closedBy",
|
|
118
|
+
["group", -2,5,12,"Value",-3,19,20,21,"StyleValue"],
|
|
119
|
+
["openedBy", 9,"(",13,"{"],
|
|
120
|
+
["closedBy", 10,")",14,"}"]
|
|
93
121
|
],
|
|
94
122
|
propSources: [fizHighlighting],
|
|
95
123
|
skippedNodes: [0,2,3],
|
|
96
|
-
repeatNodeCount:
|
|
97
|
-
tokenData: "
|
|
124
|
+
repeatNodeCount: 7,
|
|
125
|
+
tokenData: "2o~R!PXY$UYZ$yZ[$U]^$ypq$Urs%Ost&rtu)Tuv)xwx)}xy+lyz+q{|+v|}-b}!O+v!O!P-g!P!Q-o!Q![-P![!]/h!]!^/m!_!`/r!c!})T!}#O/w#P#Q/|#R#S)T#T#o)T#o#p0R#q#r0W$f$g$U$g#BY)T#BY#BZ0]#BZ$IS)T$IS$I_0]$I_$I|)T$I|$I}2O$I}$JO2O$JO$JT)T$JT$JU0]$JU$KV)T$KV$KW0]$KW&FU)T&FU&FV0]&FV;'S)T;'S;=`)r<%l?HT)T?HT?HU0]?HUO)T~$ZY!O~XY$UZ[$Upq$U$f$g$U#BY#BZ$U$IS$I_$U$JT$JU$U$KV$KW$U&FU&FV$U?HT?HU$U~%OO!P~~%RWOY%OZr%Ors%ks#O%O#O#P%p#P;'S%O;'S;=`&l<%lO%O~%pOe~~%sRO;'S%O;'S;=`%|;=`O%O~&PXOY%OZr%Ors%ks#O%O#O#P%p#P;'S%O;'S;=`&l;=`<%l%O<%lO%O~&oP;=`<%l%OR&wRgP!Q!['Q!c!i'Q#T#Z'QQ'TR!Q!['^!c!i'^#T#Z'^Q'aR!Q!['j!c!i'j#T#Z'jQ'oRcQ!Q!['x!c!i'x#T#Z'xQ'}RcQ!Q![(W!c!i(W#T#Z(WQ(ZR!Q![(d!c!i(d#T#Z(dQ(iRcQ!Q![(r!c!i(r#T#Z(rQ(uR!Q![)O!c!i)O#T#Z)OQ)TOcQ~)YWV~tu)T!Q![)T!c!})T#R#S)T#T#o)T$g;'S)T;'S;=`)r<%lO)T~)uP;=`<%l)T~)}On~~*QWOY)}Zw)}wx%kx#O)}#O#P*j#P;'S)};'S;=`+f<%lO)}~*mRO;'S)};'S;=`*v;=`O)}~*yXOY)}Zw)}wx%kx#O)}#O#P*j#P;'S)};'S;=`+f;=`<%l)}<%lO)}~+iP;=`<%l)}~+qOY~~+vOX~Q+yQ!O!P,P!Q![-PQ,SP!Q![,VQ,[R!UQ!Q![,V!g!h,e#X#Y,eQ,hR{|,q}!O,q!Q![,wQ,tP!Q![,wQ,|P!UQ!Q![,wQ-US!UQ!O!P,V!Q![-P!g!h,e#X#Y,e~-gO!S~R-lPWP!Q![,V~-rQz{-x!P!Q/P~-{TOz-xz{.[{;'S-x;'S;=`.y<%lO-x~._VOz-xz{.[{!P-x!P!Q.t!Q;'S-x;'S;=`.y<%lO-x~.yOR~~.|P;=`<%l-x~/USQ~OY/PZ;'S/P;'S;=`/b<%lO/P~/eP;=`<%l/P~/mOb~~/rO!W~~/wOj~~/|Oq~~0ROr~~0WO^~~0]O]~~0dh!O~V~XY$UZ[$Upq$Utu)T!Q![)T!c!})T#R#S)T#T#o)T$f$g$U$g#BY)T#BY#BZ0]#BZ$IS)T$IS$I_0]$I_$JT)T$JT$JU0]$JU$KV)T$KV$KW0]$KW&FU)T&FU&FV0]&FV;'S)T;'S;=`)r<%l?HT)T?HT?HU0]?HUO)T~2VW!P~V~tu)T!Q![)T!c!})T#R#S)T#T#o)T$g;'S)T;'S;=`)r<%lO)T",
|
|
98
126
|
tokenizers: [unitToken, cssIdentifierToken, 0, 1, insertSemicolon],
|
|
99
127
|
topRules: {"Recipe":[0,4]},
|
|
100
|
-
tokenPrec:
|
|
128
|
+
tokenPrec: 447
|
|
101
129
|
});
|
|
102
130
|
|
|
103
131
|
export { parser };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@formulavize/lezer-fiz",
|
|
3
|
-
"version": "0.1
|
|
3
|
+
"version": "0.2.1",
|
|
4
4
|
"description": "fiz grammar for lezer",
|
|
5
5
|
"main": "dist/index.cjs",
|
|
6
6
|
"type": "module",
|
|
@@ -11,20 +11,25 @@
|
|
|
11
11
|
"module": "dist/index.es.js",
|
|
12
12
|
"types": "dist/index.d.ts",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@lezer/highlight": "^1.
|
|
15
|
-
"@lezer/lr": "^1.
|
|
14
|
+
"@lezer/highlight": "^1.2.0",
|
|
15
|
+
"@lezer/lr": "^1.4.0"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
|
-
"@lezer/generator": "^1.
|
|
19
|
-
"
|
|
20
|
-
"mocha": "^10.
|
|
21
|
-
"
|
|
18
|
+
"@lezer/generator": "^1.7.0",
|
|
19
|
+
"chokidar-cli": "^3.0.0",
|
|
20
|
+
"mocha": "^10.4.0",
|
|
21
|
+
"npm-run-all": "^4.1.5",
|
|
22
|
+
"prettier": "^3.2.5",
|
|
23
|
+
"rollup": "^4.13.0"
|
|
22
24
|
},
|
|
23
25
|
"scripts": {
|
|
24
|
-
"build": "
|
|
25
|
-
"build
|
|
26
|
-
"
|
|
27
|
-
"test": "
|
|
26
|
+
"build": "rollup -c",
|
|
27
|
+
"build:watch": "npm run build -- --watch",
|
|
28
|
+
"test": "mocha test/test-*.js",
|
|
29
|
+
"test:watch": "chokidar '{dist,test}/**/*.{js,txt}' -c 'npm test'",
|
|
30
|
+
"format": "prettier . --write",
|
|
31
|
+
"dev": "run-p *:watch",
|
|
32
|
+
"all": "run-s build test"
|
|
28
33
|
},
|
|
29
34
|
"repository": {
|
|
30
35
|
"type": "git",
|
package/rollup.config.js
CHANGED
|
@@ -1,18 +1,19 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { lezer } from "@lezer/generator/rollup";
|
|
2
2
|
|
|
3
3
|
export default {
|
|
4
|
-
input: "./src/
|
|
5
|
-
output: [
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
4
|
+
input: "./src/fiz.grammar",
|
|
5
|
+
output: [
|
|
6
|
+
{
|
|
7
|
+
format: "cjs",
|
|
8
|
+
file: "./dist/index.cjs",
|
|
9
|
+
},
|
|
10
|
+
{
|
|
11
|
+
format: "es",
|
|
12
|
+
file: "./dist/index.es.js",
|
|
13
|
+
},
|
|
14
|
+
],
|
|
12
15
|
external(id) {
|
|
13
|
-
return !/^[\.\/]/.test(id)
|
|
16
|
+
return !/^[\.\/]/.test(id);
|
|
14
17
|
},
|
|
15
|
-
plugins: [
|
|
16
|
-
|
|
17
|
-
]
|
|
18
|
-
}
|
|
18
|
+
plugins: [lezer()],
|
|
19
|
+
};
|
package/src/fiz.grammar
CHANGED
|
@@ -1,23 +1,25 @@
|
|
|
1
1
|
@top Recipe { statement* }
|
|
2
2
|
|
|
3
|
-
statement { ( Call | Alias | Assignment | StyleTagDeclaration | StyleBinding ) semi }
|
|
3
|
+
statement[@isGroup=Statement] { ( Call | Alias | Assignment | StyleTagDeclaration | StyleBinding | Namespace ) semi }
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
QualifiableIdentifier { Identifier ("." Identifier)* }
|
|
6
|
+
|
|
7
|
+
Call { QualifiableIdentifier ArgList StyleArgList? }
|
|
6
8
|
|
|
7
9
|
ArgList { "(" ( value ("," value)* )? ")" }
|
|
8
10
|
|
|
9
|
-
value[@isGroup=Value] {
|
|
11
|
+
value[@isGroup=Value] { RhsVariable | Call }
|
|
12
|
+
|
|
13
|
+
RhsVariable { QualifiableIdentifier }
|
|
10
14
|
|
|
11
|
-
|
|
15
|
+
LhsVariable { Identifier StyleArgList? }
|
|
12
16
|
|
|
13
|
-
Alias { LhsVariable "="
|
|
17
|
+
Alias { LhsVariable "=" RhsVariable }
|
|
14
18
|
|
|
15
19
|
Assignment { LhsVariable ("," LhsVariable)* "=" Call }
|
|
16
20
|
|
|
17
21
|
semi { ";" | insertSemi }
|
|
18
22
|
|
|
19
|
-
LhsVariable { Variable StyleArgList? }
|
|
20
|
-
|
|
21
23
|
NumberLiteral { numberLiteralInner Unit? }
|
|
22
24
|
|
|
23
25
|
// StyleValueName { cssIdentifier }
|
|
@@ -30,9 +32,9 @@ styleValue[@isGroup=StyleValue] { ColorLiteral | NumberLiteral | StringLiteral }
|
|
|
30
32
|
|
|
31
33
|
StyleDeclaration { PropertyName ":" styleValue ("," styleValue)* semi }
|
|
32
34
|
|
|
33
|
-
StyleTagDeclaration {
|
|
35
|
+
StyleTagDeclaration { "#" Identifier StyleArgList }
|
|
34
36
|
|
|
35
|
-
StyleTag { "#"
|
|
37
|
+
StyleTag { "#" QualifiableIdentifier }
|
|
36
38
|
|
|
37
39
|
StyleArgList { "{" (StyleDeclaration | StyleTag | StringLiteral)* "}" }
|
|
38
40
|
|
|
@@ -44,6 +46,8 @@ StyleTagList { "{" StyleTag* "}" }
|
|
|
44
46
|
|
|
45
47
|
StyleBinding { "%" Identifier StyleTagList }
|
|
46
48
|
|
|
49
|
+
Namespace { Identifier? "[" statement* "]" ArgList? StyleArgList? }
|
|
50
|
+
|
|
47
51
|
@skip { spaces | newline | LineComment | BlockComment }
|
|
48
52
|
|
|
49
53
|
@context trackNewline from "./tokens.js"
|
|
@@ -84,11 +88,13 @@ StyleBinding { "%" Identifier StyleTagList }
|
|
|
84
88
|
|
|
85
89
|
"#"
|
|
86
90
|
|
|
91
|
+
"."
|
|
92
|
+
|
|
87
93
|
":"
|
|
88
94
|
|
|
89
95
|
"%"
|
|
90
96
|
|
|
91
|
-
"(" ")" "{" "}"
|
|
97
|
+
"(" ")" "{" "}" "[" "]"
|
|
92
98
|
|
|
93
99
|
}
|
|
94
100
|
|
package/src/highlight.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {styleTags, tags as t} from "@lezer/highlight"
|
|
1
|
+
import { styleTags, tags as t } from "@lezer/highlight";
|
|
2
2
|
|
|
3
3
|
export const fizHighlighting = styleTags({
|
|
4
4
|
Variable: t.variableName,
|
|
@@ -11,8 +11,11 @@ export const fizHighlighting = styleTags({
|
|
|
11
11
|
ColorLiteral: t.color,
|
|
12
12
|
Unit: t.unit,
|
|
13
13
|
StyleTag: t.tagName,
|
|
14
|
+
Namespace: t.namespace,
|
|
14
15
|
"( )": t.paren,
|
|
15
16
|
"{ }": t.brace,
|
|
17
|
+
"[ ]": t.squareBracket,
|
|
16
18
|
":": t.punctuation,
|
|
17
19
|
", ;": t.separator,
|
|
18
|
-
|
|
20
|
+
".": t.derefOperator,
|
|
21
|
+
});
|