@formulavize/lezer-fiz 0.1.1 → 0.2.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.
@@ -1,31 +1,23 @@
1
- # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
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: [ "main" ]
5
+ branches:
6
+ - main
9
7
  pull_request:
10
- branches: [ "main" ]
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: [12.x, 14.x, 16.x]
20
- # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
21
-
22
15
  steps:
23
- - uses: actions/checkout@v3
24
- - name: Use Node.js ${{ matrix.node-version }}
25
- uses: actions/setup-node@v3
26
- with:
27
- node-version: ${{ matrix.node-version }}
28
- cache: 'npm'
29
- - run: npm ci
30
- - run: npm run build --if-present
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 = 37,
11
- insertSemi = 38,
12
- spaces = 40,
13
- newline = 41,
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 = [9, 10, 11, 12, 13, 32, 133, 160,
18
- 5760, 8192, 8193, 8194, 8195, 8196, 8197, 8198, 8199, 8200,
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, dash = 45, underscore = 95, braceR = 125;
20
+ const percent = 37,
21
+ dash = 45,
22
+ underscore = 95,
23
+ braceR = 125;
22
24
 
23
- function isAlpha(ch) { return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 161 }
25
+ function isAlpha(ch) {
26
+ return (ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122) || ch >= 161;
27
+ }
24
28
 
25
- function isDigit(ch) { return ch >= 48 && ch <= 57 }
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 ? context : term == newline
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((input, stack) => {
36
- let {next} = input;
37
- if ((next == braceR || next == -1 || stack.context) && stack.canShift(insertSemi))
38
- input.acceptToken(insertSemi);
39
- }, {contextual: true, fallback: true});
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) { input.advance(); input.acceptToken(Unit); }
57
+ let { next } = input;
58
+ if (next == percent) {
59
+ input.advance();
60
+ input.acceptToken(Unit);
61
+ }
45
62
  if (isAlpha(next)) {
46
- do { input.advance(); } while (isAlpha(input.next))
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;; i++) {
54
- let {next} = input;
55
- if (isAlpha(next) || next == dash || next == underscore || (inside && isDigit(next))) {
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
- input.acceptToken(cssIdentifier);
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: ")rQ`QSOOOkQdO'#CfO!SQSO'#CpO!XQSO'#CsO!dQSO'#CrO!lQSO'#CvO!qQSO'#CwO!vQdO'#DWOOQO'#Cz'#CzQ`QSOOO#OQSO'#CeO#WQdO,58{OOQQ,59[,59[O#iQUO'#CiOOQO,59_,59_O#tQSO,59^O#yQSO'#DOO$OQSO,59aOOQ`,59b,59bO$WQSO,59cOOQQ'#D]'#D]OOQO,59r,59rOOQO-E6x-E6xOOQO'#DX'#DXOOQ`,59P,59PO$]QSO,59POOQ`1G.g1G.gOOQO'#Ck'#CkO$eQSO'#CjOOQQ'#C|'#C|O$jQUO,59TOOQ`,59T,59TOOQ`1G.x1G.xOOQ`1G.{1G.{OOQO'#Cf'#CfOOQO,59j,59jOOQO-E6|-E6|O$uQSO1G.{O$zQSO'#CyOOQ`1G.}1G.}O#tQSO'#C{O%SQSO1G.kOOQ`1G.k1G.kO%[QWO,59UOOQQ-E6z-E6zOOQ`1G.o1G.oO%gQSO'#CaOOQ`7+$g7+$gOOQO'#DP'#DPO%lQSO,59eOOQ`,59e,59eOOQO,59g,59gOOQO-E6y-E6yOOQ`7+$V7+$VO%tQiO'#CnOOQ`'#DZ'#DZO&]QhO1G.pOOQO-E6}-E6}OOQ`1G/P1G/POOQ`,59Y,59YOOQ`'#C}'#C}O%[QWO'#C}O&]QhO7+$[OOQQ7+$[7+$[OOQ`,59i,59iOOQ`-E6{-E6{OOQQ<<Gv<<Gv",
88
- stateData: "&q~OxOSyOSQOSROS~OUPOeQOlUO~OWYO[YXhYX|YXVYXvYX!QYX~OU[O~O[]OhgX|gX~Oh_O|`O~O[]O~OUcO~OvdO!QdO~OUPOVhO~O[]OvTa!QTaVTa|Ta~OZoOeQOukO~OUPO~OUrO~OhuO|`O~O[vO~OVzO|xO~O`{O~OZ}OeQOukO~OU!OO~OZ!SOeQO~OV!VO|xO~Oa!XOc!XO!O!WO~OWYO~OZ![OeQO~OP!]OabXcbXvbX|bX!ObX!QbX~Oa!XOc!XOvdO|!_O!O!WO!QdO~O",
89
- goto: "%X!QPPPPP!RPPP!a!ePP!q!z#OPP#SP#YP#f#jP#f#f#fP#q#t#z$Q$W$^$dPPPPPP$j$nP$tP%OSVOXSgYxQq_R!PuTZP!OUROX`SgYxRp_Q^RQbTRjZTm]nTl]nX!X{!Y!_!`STOXSm]nT!Qv!RTVOXSSOXRs`RwcQXORfXQyiR!UyQn]R|nQ!`!YR!c!`QaSRtaQ!RvR!Z!RTWOXQiYR!TxQ!Y{S!^!Y!`R!b!_QeVQ!a!YR!d!`",
90
- nodeNames: "⚠ Unit LineComment BlockComment Recipe Call Identifier ) ( ArgList Variable } { StyleArgList StyleDeclaration PropertyName : ColorLiteral NumberLiteral StringLiteral StyleTag # Alias LhsVariable Eq Assignment StyleTagDeclaration StyleBinding % StyleTagList",
91
- maxTerm: 48,
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,10,"Value",-3,17,18,19,"StyleValue"],
95
- ["openedBy", 7,"(",11,"{"],
96
- ["closedBy", 8,")",12,"}"]
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: 6,
101
- tokenData: ".s~R{XY#xYZ$mZ[#x]^$mpq#xrs$rst%dtu'uuv(^wx(cxy)Oyz)T{|)Y|}*t}!O)Y!O!P)c!P!Q*y!Q![*c![!],S!]!^,X!_!`,^!c!}'u#R#S'u#T#o'u#o#p,c#q#r,h$f$g#x$g#BY'u#BY#BZ,m#BZ$IS'u$IS$I_,m$I_$I|'u$I|$I}.Y$I}$JO.Y$JO$JT'u$JT$JU,m$JU$KV'u$KV$KW,m$KW&FU'u&FU&FV,m&FV?HT'u?HT?HU,m?HU~'u~#}Yx~XY#xZ[#xpq#x$f$g#x#BY#BZ#x$IS$I_#x$JT$JU#x$KV$KW#x&FU&FV#x?HT?HU#x~$rOy~~$uUOY$rZr$rrs%Xs#O$r#O#P%^#P~$r~%^Oc~~%aPO~$rR%iReP!Q![%r!c!i%r#T#Z%rQ%uR!Q![&O!c!i&O#T#Z&OQ&RR!Q![&[!c!i&[#T#Z&[Q&aRaQ!Q![&j!c!i&j#T#Z&jQ&oRaQ!Q![&x!c!i&x#T#Z&xQ&{R!Q!['U!c!i'U#T#Z'UQ'ZRaQ!Q!['d!c!i'd#T#Z'dQ'gR!Q!['p!c!i'p#T#Z'pQ'uOaQ~'zUU~tu'u!Q!['u!c!}'u#R#S'u#T#o'u$g~'u~(cOl~~(fUOY(cZw(cwx%Xx#O(c#O#P(x#P~(c~({PO~(c~)TOW~~)YOV~~)]Q!O!P)c!Q![*c~)fP!Q![)i~)nR!O~!Q![)i!g!h)w#X#Y)w~)zR{|*T}!O*T!Q![*Z~*WP!Q![*Z~*`P!O~!Q![*Z~*hS!O~!O!P)i!Q![*c!g!h)w#X#Y)w~*yO|~~*|Qz{+S!P!Q+w~+VROz+Sz{+`{~+S~+cTOz+Sz{+`{!P+S!P!Q+r!Q~+S~+wOR~~+|QQ~OY+wZ~+w~,XO`~~,^O!Q~~,cOh~~,hO[~~,mOZ~~,tfx~U~XY#xZ[#xpq#xtu'u!Q!['u!c!}'u#R#S'u#T#o'u$f$g#x$g#BY'u#BY#BZ,m#BZ$IS'u$IS$I_,m$I_$JT'u$JT$JU,m$JU$KV'u$KV$KW,m$KW&FU'u&FU&FV,m&FV?HT'u?HT?HU,m?HU~'u~.aUy~U~tu'u!Q!['u!c!}'u#R#S'u#T#o'u$g~'u",
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: 0
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 = 37,
7
- insertSemi = 38,
8
- spaces = 40,
9
- newline = 41,
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 = [9, 10, 11, 12, 13, 32, 133, 160,
14
- 5760, 8192, 8193, 8194, 8195, 8196, 8197, 8198, 8199, 8200,
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, dash = 45, underscore = 95, braceR = 125;
18
+ const percent = 37,
19
+ dash = 45,
20
+ underscore = 95,
21
+ braceR = 125;
18
22
 
19
- function isAlpha(ch) { return ch >= 65 && ch <= 90 || ch >= 97 && ch <= 122 || ch >= 161 }
23
+ function isAlpha(ch) {
24
+ return (ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122) || ch >= 161;
25
+ }
20
26
 
21
- function isDigit(ch) { return ch >= 48 && ch <= 57 }
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 ? context : term == newline
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((input, stack) => {
32
- let {next} = input;
33
- if ((next == braceR || next == -1 || stack.context) && stack.canShift(insertSemi))
34
- input.acceptToken(insertSemi);
35
- }, {contextual: true, fallback: true});
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) { input.advance(); input.acceptToken(Unit); }
55
+ let { next } = input;
56
+ if (next == percent) {
57
+ input.advance();
58
+ input.acceptToken(Unit);
59
+ }
41
60
  if (isAlpha(next)) {
42
- do { input.advance(); } while (isAlpha(input.next))
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;; i++) {
50
- let {next} = input;
51
- if (isAlpha(next) || next == dash || next == underscore || (inside && isDigit(next))) {
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
- input.acceptToken(cssIdentifier);
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: ")rQ`QSOOOkQdO'#CfO!SQSO'#CpO!XQSO'#CsO!dQSO'#CrO!lQSO'#CvO!qQSO'#CwO!vQdO'#DWOOQO'#Cz'#CzQ`QSOOO#OQSO'#CeO#WQdO,58{OOQQ,59[,59[O#iQUO'#CiOOQO,59_,59_O#tQSO,59^O#yQSO'#DOO$OQSO,59aOOQ`,59b,59bO$WQSO,59cOOQQ'#D]'#D]OOQO,59r,59rOOQO-E6x-E6xOOQO'#DX'#DXOOQ`,59P,59PO$]QSO,59POOQ`1G.g1G.gOOQO'#Ck'#CkO$eQSO'#CjOOQQ'#C|'#C|O$jQUO,59TOOQ`,59T,59TOOQ`1G.x1G.xOOQ`1G.{1G.{OOQO'#Cf'#CfOOQO,59j,59jOOQO-E6|-E6|O$uQSO1G.{O$zQSO'#CyOOQ`1G.}1G.}O#tQSO'#C{O%SQSO1G.kOOQ`1G.k1G.kO%[QWO,59UOOQQ-E6z-E6zOOQ`1G.o1G.oO%gQSO'#CaOOQ`7+$g7+$gOOQO'#DP'#DPO%lQSO,59eOOQ`,59e,59eOOQO,59g,59gOOQO-E6y-E6yOOQ`7+$V7+$VO%tQiO'#CnOOQ`'#DZ'#DZO&]QhO1G.pOOQO-E6}-E6}OOQ`1G/P1G/POOQ`,59Y,59YOOQ`'#C}'#C}O%[QWO'#C}O&]QhO7+$[OOQQ7+$[7+$[OOQ`,59i,59iOOQ`-E6{-E6{OOQQ<<Gv<<Gv",
84
- stateData: "&q~OxOSyOSQOSROS~OUPOeQOlUO~OWYO[YXhYX|YXVYXvYX!QYX~OU[O~O[]OhgX|gX~Oh_O|`O~O[]O~OUcO~OvdO!QdO~OUPOVhO~O[]OvTa!QTaVTa|Ta~OZoOeQOukO~OUPO~OUrO~OhuO|`O~O[vO~OVzO|xO~O`{O~OZ}OeQOukO~OU!OO~OZ!SOeQO~OV!VO|xO~Oa!XOc!XO!O!WO~OWYO~OZ![OeQO~OP!]OabXcbXvbX|bX!ObX!QbX~Oa!XOc!XOvdO|!_O!O!WO!QdO~O",
85
- goto: "%X!QPPPPP!RPPP!a!ePP!q!z#OPP#SP#YP#f#jP#f#f#fP#q#t#z$Q$W$^$dPPPPPP$j$nP$tP%OSVOXSgYxQq_R!PuTZP!OUROX`SgYxRp_Q^RQbTRjZTm]nTl]nX!X{!Y!_!`STOXSm]nT!Qv!RTVOXSSOXRs`RwcQXORfXQyiR!UyQn]R|nQ!`!YR!c!`QaSRtaQ!RvR!Z!RTWOXQiYR!TxQ!Y{S!^!Y!`R!b!_QeVQ!a!YR!d!`",
86
- nodeNames: "⚠ Unit LineComment BlockComment Recipe Call Identifier ) ( ArgList Variable } { StyleArgList StyleDeclaration PropertyName : ColorLiteral NumberLiteral StringLiteral StyleTag # Alias LhsVariable Eq Assignment StyleTagDeclaration StyleBinding % StyleTagList",
87
- maxTerm: 48,
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,10,"Value",-3,17,18,19,"StyleValue"],
91
- ["openedBy", 7,"(",11,"{"],
92
- ["closedBy", 8,")",12,"}"]
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: 6,
97
- tokenData: ".s~R{XY#xYZ$mZ[#x]^$mpq#xrs$rst%dtu'uuv(^wx(cxy)Oyz)T{|)Y|}*t}!O)Y!O!P)c!P!Q*y!Q![*c![!],S!]!^,X!_!`,^!c!}'u#R#S'u#T#o'u#o#p,c#q#r,h$f$g#x$g#BY'u#BY#BZ,m#BZ$IS'u$IS$I_,m$I_$I|'u$I|$I}.Y$I}$JO.Y$JO$JT'u$JT$JU,m$JU$KV'u$KV$KW,m$KW&FU'u&FU&FV,m&FV?HT'u?HT?HU,m?HU~'u~#}Yx~XY#xZ[#xpq#x$f$g#x#BY#BZ#x$IS$I_#x$JT$JU#x$KV$KW#x&FU&FV#x?HT?HU#x~$rOy~~$uUOY$rZr$rrs%Xs#O$r#O#P%^#P~$r~%^Oc~~%aPO~$rR%iReP!Q![%r!c!i%r#T#Z%rQ%uR!Q![&O!c!i&O#T#Z&OQ&RR!Q![&[!c!i&[#T#Z&[Q&aRaQ!Q![&j!c!i&j#T#Z&jQ&oRaQ!Q![&x!c!i&x#T#Z&xQ&{R!Q!['U!c!i'U#T#Z'UQ'ZRaQ!Q!['d!c!i'd#T#Z'dQ'gR!Q!['p!c!i'p#T#Z'pQ'uOaQ~'zUU~tu'u!Q!['u!c!}'u#R#S'u#T#o'u$g~'u~(cOl~~(fUOY(cZw(cwx%Xx#O(c#O#P(x#P~(c~({PO~(c~)TOW~~)YOV~~)]Q!O!P)c!Q![*c~)fP!Q![)i~)nR!O~!Q![)i!g!h)w#X#Y)w~)zR{|*T}!O*T!Q![*Z~*WP!Q![*Z~*`P!O~!Q![*Z~*hS!O~!O!P)i!Q![*c!g!h)w#X#Y)w~*yO|~~*|Qz{+S!P!Q+w~+VROz+Sz{+`{~+S~+cTOz+Sz{+`{!P+S!P!Q+r!Q~+S~+wOR~~+|QQ~OY+wZ~+w~,XO`~~,^O!Q~~,cOh~~,hO[~~,mOZ~~,tfx~U~XY#xZ[#xpq#xtu'u!Q!['u!c!}'u#R#S'u#T#o'u$f$g#x$g#BY'u#BY#BZ,m#BZ$IS'u$IS$I_,m$I_$JT'u$JT$JU,m$JU$KV'u$KV$KW,m$KW&FU'u&FU&FV,m&FV?HT'u?HT?HU,m?HU~'u~.aUy~U~tu'u!Q!['u!c!}'u#R#S'u#T#o'u$g~'u",
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: 0
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.1",
3
+ "version": "0.2.0",
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.0.0",
15
- "@lezer/lr": "^1.2.3"
14
+ "@lezer/highlight": "^1.2.0",
15
+ "@lezer/lr": "^1.4.0"
16
16
  },
17
17
  "devDependencies": {
18
- "@lezer/generator": "^1.1.1",
19
- "@rollup/plugin-node-resolve": "^13.3.0",
20
- "mocha": "^10.0.0",
21
- "rollup": "^2.78.1"
18
+ "@lezer/generator": "^1.6.0",
19
+ "chokidar-cli": "^3.0.0",
20
+ "mocha": "^10.3.0",
21
+ "npm-run-all": "^4.1.5",
22
+ "prettier": "^3.2.5",
23
+ "rollup": "^4.12.1"
22
24
  },
23
25
  "scripts": {
24
- "build": "lezer-generator src/fiz.grammar -o src/parser && rollup -c",
25
- "build-debug": "lezer-generator src/fiz.grammar --names -o src/parser && rollup -c",
26
- "prepare": "npm run build",
27
- "test": "npm run build && mocha test/test-fiz.js"
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 { nodeResolve } from "@rollup/plugin-node-resolve"
1
+ import { lezer } from "@lezer/generator/rollup";
2
2
 
3
3
  export default {
4
- input: "./src/parser.js",
5
- output: [{
6
- format: "cjs",
7
- file: "./dist/index.cjs"
8
- }, {
9
- format: "es",
10
- file: "./dist/index.es.js"
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
- nodeResolve()
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 { ( Call | Alias | Assignment | StyleTagDeclaration | StyleBinding | Namespace ) semi }
4
4
 
5
- Call { Identifier ArgList StyleArgList? }
5
+ QualifiableIdentifier { Identifier ("." Identifier)* }
6
+
7
+ Call { QualifiableIdentifier ArgList StyleArgList? }
6
8
 
7
9
  ArgList { "(" ( value ("," value)* )? ")" }
8
10
 
9
- value[@isGroup=Value] { Variable | Call }
11
+ value[@isGroup=Value] { RhsVariable | Call }
12
+
13
+ RhsVariable { QualifiableIdentifier }
10
14
 
11
- Variable { Identifier }
15
+ LhsVariable { Identifier StyleArgList? }
12
16
 
13
- Alias { LhsVariable "=" Variable }
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 }
@@ -28,13 +30,13 @@ PropertyName { cssIdentifier }
28
30
 
29
31
  styleValue[@isGroup=StyleValue] { ColorLiteral | NumberLiteral | StringLiteral }
30
32
 
31
- StyleDeclaration { PropertyName ":" styleValue (","? styleValue)* semi }
33
+ StyleDeclaration { PropertyName ":" styleValue ("," styleValue)* semi }
32
34
 
33
- StyleTagDeclaration { StyleTag StyleArgList }
35
+ StyleTagDeclaration { "#" Identifier StyleArgList }
34
36
 
35
- StyleTag { "#" Identifier }
37
+ StyleTag { "#" QualifiableIdentifier }
36
38
 
37
- StyleArgList { "{" (StyleDeclaration | StyleTag)* "}" }
39
+ StyleArgList { "{" (StyleDeclaration | StyleTag | StringLiteral)* "}" }
38
40
 
39
41
  /* Only StyleTags are allowed in StyleBindings
40
42
  Although disallowing StyleDeclarations is inconsistent with other curly brackets
@@ -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
+ });