open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update CSSLint (#967)

Browse Source 
* refactor Tokens to enable goto-symbol and find-usages

* refactor <length-percentage>

* CSS Text Module L3 (ED 2020-06-08)

* CSS Fonts Module L4 parts (ED 2020-06-11)

* CSS Scrollbars Module L1 (ED 2020-02-24)

* skip all successfully parsed parts after var()
This commit is contained in:
tophf 2020-06-17 16:13:28 +03:00 committed by GitHub
parent 2ffad1b6bb
commit e1ed3bf222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 140 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

277
vendor-overwrites/csslint/parserlib.js
View File

@ -319,7 +319,7 @@ self.parserlib = (() => {
'drop-initial-before-align': 'caps-height | baseline | use-script | before-edge | text-before-edge | ' + 'drop-initial-before-align': 'caps-height | baseline | use-script | before-edge | text-before-edge | ' +
'after-edge | text-after-edge | central | middle | ideographic | alphabetic | ' + 'after-edge | text-after-edge | central | middle | ideographic | alphabetic | ' +
'hanging | mathematical', 'hanging | mathematical',
'drop-initial-size': 'auto | line | <length> | <percentage>', 'drop-initial-size': 'auto | line | <length-percentage>',
'drop-initial-value': '<integer>', 'drop-initial-value': '<integer>',
// E // E
@ -347,19 +347,28 @@ self.parserlib = (() => {
'flood-opacity': '<opacity-value>', 'flood-opacity': '<opacity-value>',
'font': '<font-shorthand> | caption | icon | menu | message-box | small-caption | status-bar', 'font': '<font-shorthand> | caption | icon | menu | message-box | small-caption | status-bar',
'font-family': '<font-family>', 'font-family': '<font-family>',
'font-feature-settings': '<feature-tag-value> | normal', 'font-feature-settings': '<feature-tag-value># | normal',
'font-kerning': 'auto | normal | none', 'font-kerning': 'auto | normal | none',
'font-language-override': 'normal | <string>',
'font-optical-sizing': 'auto | none',
'font-palette': 'none | normal | light | dark | <ident>',
'font-size': '<font-size>', 'font-size': '<font-size>',
'font-size-adjust': '<number> | none', 'font-size-adjust': '<number> | none',
'font-stretch': '<font-stretch>', 'font-stretch': '<font-stretch>',
'font-style': '<font-style>', 'font-style': '<font-style>',
'font-synthesis': 'none | [ weight || style ]',
'font-synthesis-style': 'auto | none',
'font-synthesis-weight': 'auto | none',
'font-synthesis-small-caps': 'auto | none',
'font-variant': '<font-variant> | normal | none', 'font-variant': '<font-variant> | normal | none',
'font-variant-alternates': '<font-variant-alternates> | normal', 'font-variant-alternates': '<font-variant-alternates> | normal',
'font-variant-caps': '<font-variant-caps> | normal', 'font-variant-caps': '<font-variant-caps> | normal',
'font-variant-east-asian': '<font-variant-east-asian> | normal', 'font-variant-east-asian': '<font-variant-east-asian> | normal',
'font-variant-emoji': 'auto | text | emoji | unicode',
'font-variant-ligatures': '<font-variant-ligatures> | normal | none', 'font-variant-ligatures': '<font-variant-ligatures> | normal | none',
'font-variant-numeric': '<font-variant-numeric> | normal', 'font-variant-numeric': '<font-variant-numeric> | normal',
'font-variant-position': 'normal | sub | super', 'font-variant-position': 'normal | sub | super',
'font-variation-settings': 'normal | [ <string> <number>]#',
'font-weight': '<font-weight>', 'font-weight': '<font-weight>',
'-ms-flex-align': 'start | end | center | stretch | baseline', '-ms-flex-align': 'start | end | center | stretch | baseline',
'-ms-flex-order': '<number>', '-ms-flex-order': '<number>',
@ -392,7 +401,7 @@ self.parserlib = (() => {
'grid-gap': '<row-gap> <column-gap>?', 'grid-gap': '<row-gap> <column-gap>?',
// H // H
'hanging-punctuation': 1, 'hanging-punctuation': 'none | [ first || [ force-end | allow-end ] || last ]',
'height': 'auto | <width-height>', 'height': 'auto | <width-height>',
'hyphenate-after': '<integer> | auto', 'hyphenate-after': '<integer> | auto',
'hyphenate-before': '<integer> | auto', 'hyphenate-before': '<integer> | auto',
@ -431,7 +440,7 @@ self.parserlib = (() => {
'left': '<width>', 'left': '<width>',
'letter-spacing': '<length> | normal', 'letter-spacing': '<length> | normal',
'line-height': '<line-height>', 'line-height': '<line-height>',
'line-break': 'auto | loose | normal | strict', 'line-break': 'auto | loose | normal | strict | anywhere',
'line-stacking': 1, 'line-stacking': 1,
'line-stacking-ruby': 'exclude-ruby | include-ruby', 'line-stacking-ruby': 'exclude-ruby | include-ruby',
'line-stacking-shift': 'consider-shifts | disregard-shifts', 'line-stacking-shift': 'consider-shifts | disregard-shifts',
@ -502,7 +511,7 @@ self.parserlib = (() => {
'overflow-block': '<overflow>', 'overflow-block': '<overflow>',
'overflow-inline': '<overflow>', 'overflow-inline': '<overflow>',
'overflow-style': 1, 'overflow-style': 1,
'overflow-wrap': 'normal | break-word', 'overflow-wrap': 'normal | break-word | anywhere',
'overflow-x': '<overflow>', 'overflow-x': '<overflow>',
'overflow-y': '<overflow>', 'overflow-y': '<overflow>',
@ -564,6 +573,8 @@ self.parserlib = (() => {
// S // S
'scale': 'none | <number>{1,3}', 'scale': 'none | <number>{1,3}',
'scrollbar-color': 'auto | dark | light | <color>{2}',
'scrollbar-width': 'auto | thin | none',
'shape-inside': 'auto | outside-shape | [ <basic-shape> || shape-box ] | <image> | display', 'shape-inside': 'auto | outside-shape | [ <basic-shape> || shape-box ] | <image> | display',
'shape-rendering': 'auto | optimizeSpeed | crispEdges | geometricPrecision', 'shape-rendering': 'auto | optimizeSpeed | crispEdges | geometricPrecision',
'size': 1, 'size': 1,
@ -588,14 +599,14 @@ self.parserlib = (() => {
// T // T
'table-layout': 'auto | fixed', 'table-layout': 'auto | fixed',
'tab-size': '<integer> | <length>', 'tab-size': '<number> | <length>',
'target': 1, 'target': 1,
'target-name': 1, 'target-name': 1,
'target-new': 1, 'target-new': 1,
'target-position': 1, 'target-position': 1,
'text-align': 'start | end | left | right | center | justify | match-parent | justify-all', 'text-align': '<text-align> | justify-all',
'text-align-all': 'start | end | left | right | center | justify | match-parent', 'text-align-all': '<text-align>',
'text-align-last': 'auto | start | end | left | right | center | justify', 'text-align-last': '<text-align> | auto',
'text-anchor': 'start | middle | end', 'text-anchor': 'start | middle | end',
'text-decoration': '<text-decoration-line> || <text-decoration-style> || <color>', 'text-decoration': '<text-decoration-line> || <text-decoration-style> || <color>',
'text-decoration-color': '<color>', 'text-decoration-color': '<color>',
@ -607,13 +618,13 @@ self.parserlib = (() => {
'text-emphasis-style': '<text-emphasis-style>', 'text-emphasis-style': '<text-emphasis-style>',
'text-emphasis-position': '[ over | under ] && [ right | left ]?', 'text-emphasis-position': '[ over | under ] && [ right | left ]?',
'text-height': 1, 'text-height': 1,
'text-indent': '<length> | <percentage>', 'text-indent': '<length-percentage> && hanging? && each-line?',
'text-justify': 'auto | none | inter-word | inter-ideograph | inter-cluster | distribute | kashida', 'text-justify': 'auto | none | inter-word | inter-character',
'text-outline': 1, 'text-outline': 1,
'text-overflow': 'clip | ellipsis', 'text-overflow': 'clip | ellipsis',
'text-rendering': 'auto | optimizeSpeed | optimizeLegibility | geometricPrecision', 'text-rendering': 'auto | optimizeSpeed | optimizeLegibility | geometricPrecision',
'text-shadow': 'none | [ <color>? && <length>{2,3} ]#', 'text-shadow': 'none | [ <color>? && <length>{2,3} ]#',
'text-transform': 'capitalize | uppercase | lowercase | none', 'text-transform': 'none | [ capitalize | uppercase | lowercase ] || full-width || full-size-kana',
'text-underline-position': 'auto | [ under || [ left | right ] ]', 'text-underline-position': 'auto | [ under || [ left | right ] ]',
'text-wrap': 'normal | none | avoid', 'text-wrap': 'normal | none | avoid',
'top': '<width>', 'top': '<width>',
@ -650,15 +661,14 @@ self.parserlib = (() => {
'volume': 1, 'volume': 1,
// W // W
'white-space': 'normal | pre | nowrap | pre-wrap | pre-line | -pre-wrap |' + 'white-space': 'normal | pre | nowrap | pre-wrap | break-spaces | pre-line',
' -o-pre-wrap | -moz-pre-wrap | -hp-pre-wrap',
'white-space-collapse': 1, 'white-space-collapse': 1,
'widows': '<integer>', 'widows': '<integer>',
'width': 'auto | <width-height>', 'width': 'auto | <width-height>',
'will-change': '<will-change>', 'will-change': '<will-change>',
'word-break': 'normal | keep-all | break-all', 'word-break': 'normal | keep-all | break-all | break-word',
'word-spacing': '<length> | normal', 'word-spacing': '<length> | normal',
'word-wrap': 'normal | break-word', 'word-wrap': 'normal | break-word | anywhere',
'writing-mode': 'horizontal-tb | vertical-rl | vertical-lr | lr-tb | rl-tb | tb-rl | ' + 'writing-mode': 'horizontal-tb | vertical-rl | vertical-lr | lr-tb | rl-tb | tb-rl | ' +
'bt-rl | tb-lr | bt-lr | lr-bt | rl-bt | lr | rl | tb', 'bt-rl | tb-lr | bt-lr | lr-bt | rl-bt | lr | rl | tb',
@ -711,7 +721,7 @@ self.parserlib = (() => {
'<clip-source>': '<uri>', '<clip-source>': '<uri>',
'<column-gap>': 'normal | <length> | <percentage>', '<column-gap>': 'normal | <length-percentage>',
'<content-distribution>': 'space-between | space-around | space-evenly | stretch', '<content-distribution>': 'space-between | space-around | space-evenly | stretch',
'<content-position>': 'center | start | end | flex-start | flex-end', '<content-position>': 'center | start | end | flex-start | flex-end',
@ -747,17 +757,17 @@ self.parserlib = (() => {
'<flex-shrink>': '<number>', '<flex-shrink>': '<number>',
'<flex-wrap>': 'nowrap | wrap | wrap-reverse', '<flex-wrap>': 'nowrap | wrap | wrap-reverse',
'<font-size>': '<absolute-size> | <relative-size> | <length> | <percentage>', '<font-size>': '<absolute-size> | <relative-size> | <length-percentage>',
'<font-stretch>': 'normal | ultra-condensed | extra-condensed | condensed | semi-condensed | ' + '<font-stretch>': 'normal | <percentage> | ultra-condensed | extra-condensed | condensed | semi-condensed | ' +
'semi-expanded | expanded | extra-expanded | ultra-expanded', 'semi-expanded | expanded | extra-expanded | ultra-expanded',
'<font-style>': 'normal | italic | oblique', '<font-style>': 'normal | italic | oblique <angle>?',
'<font-variant-caps>': 'small-caps | all-small-caps | petite-caps | all-petite-caps | ' + '<font-variant-caps>': 'small-caps | all-small-caps | petite-caps | all-petite-caps | ' +
'unicase | titling-caps', 'unicase | titling-caps',
'<font-variant-css21>': 'normal | small-caps', '<font-variant-css21>': 'normal | small-caps',
'<font-weight>': 'normal | bold | bolder | lighter | ' + '<font-weight>': 'normal | bold | bolder | lighter | <number>',
'100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900',
'<generic-family>': 'serif | sans-serif | cursive | fantasy | monospace', '<generic-family>': 'serif | sans-serif | cursive | fantasy | monospace | system-ui | emoji | ' +
'math | fangsong | ui-serif | ui-sans-serif | ui-monospace | ui-rounded',
'<geometry-box>': '<shape-box> | fill-box | stroke-box | view-box', '<geometry-box>': '<shape-box> | fill-box | stroke-box | view-box',
@ -798,7 +808,7 @@ self.parserlib = (() => {
'<line>': part => part.type === 'integer', '<line>': part => part.type === 'integer',
'<line-height>': '<number> | <length> | <percentage> | normal', '<line-height>': '<number> | <length-percentage> | normal',
'<line-names>': function (part) { '<line-names>': function (part) {
// eslint-disable-next-line no-use-before-define // eslint-disable-next-line no-use-before-define
@ -868,6 +878,8 @@ self.parserlib = (() => {
'<string>': part => part.type === 'string', '<string>': part => part.type === 'string',
'<text-align>': 'start | end | left | right | center | justify | match-parent',
'<text-decoration-style>': 'solid | double | dotted | dashed | wavy', '<text-decoration-style>': 'solid | double | dotted | dashed | wavy',
'<time>': part => part.type === 'time', '<time>': part => part.type === 'time',
@ -901,7 +913,7 @@ self.parserlib = (() => {
); );
}, },
'<width>': '<length> | <percentage> | auto', '<width>': '<length-percentage> | auto',
}, },
complex: { complex: {
@ -929,7 +941,7 @@ self.parserlib = (() => {
'[ left | center | right | <length-percentage> ] [ top | center | bottom | <length-percentage> ] | ' + '[ left | center | right | <length-percentage> ] [ top | center | bottom | <length-percentage> ] | ' +
'[ left | center | right | top | bottom | <length-percentage> ]', '[ left | center | right | top | bottom | <length-percentage> ]',
'<bg-size>': '[ <length> | <percentage> | auto ]{1,2} | cover | contain', '<bg-size>': '[ <length-percentage> | auto ]{1,2} | cover | contain',
'<border-image-outset>': '[ <length> | <number> ]{1,4}', '<border-image-outset>': '[ <length> | <number> ]{1,4}',
'<border-image-repeat>': '[ stretch | repeat | round | space ]{1,2}', '<border-image-repeat>': '[ stretch | repeat | round | space ]{1,2}',
@ -943,7 +955,7 @@ self.parserlib = (() => {
Matcher.cast('<nonnegative-number-or-percentage>'), Matcher.cast('<nonnegative-number-or-percentage>'),
Matcher.cast('<nonnegative-number-or-percentage>'), Matcher.cast('<nonnegative-number-or-percentage>'),
'fill'), 'fill'),
'<border-image-width>': '[ <length> | <percentage> | <number> | auto ]{1,4}', '<border-image-width>': '[ <length-percentage> | <number> | auto ]{1,4}',
'<border-radius>': '<nonnegative-length-or-percentage>{1,4} [ / <nonnegative-length-or-percentage>{1,4} ]?', '<border-radius>': '<nonnegative-length-or-percentage>{1,4} [ / <nonnegative-length-or-percentage>{1,4} ]?',
'<border-shorthand>': '<border-width> || <border-style> || <color>', '<border-shorthand>': '<border-width> || <border-style> || <color>',
@ -1076,7 +1088,7 @@ self.parserlib = (() => {
'<will-change>': 'auto | <animateable-feature>#', '<will-change>': 'auto | <animateable-feature>#',
'<x-one-radius>': '[ <length> | <percentage> ]{1,2}', '<x-one-radius>': '<length-percentage>{1,2}',
}, },
functions: { functions: {
@ -1345,165 +1357,154 @@ self.parserlib = (() => {
* The following token names are defined in CSS3 Grammar: * The following token names are defined in CSS3 Grammar:
* https://www.w3.org/TR/css3-syntax/#lexical * https://www.w3.org/TR/css3-syntax/#lexical
*/ */
const Tokens = [ const Tokens = Object.assign([], {
EOF: {}, // must be the first token
}, {
// HTML-style comments // HTML-style comments
{name: 'CDO'}, CDO: {},
{name: 'CDC'}, CDC: {},
// ignorables // ignorables
{name: 'S', whitespace: true}, S: {whitespace: true},
{name: 'COMMENT', whitespace: true, comment: true, hide: true}, COMMENT: {whitespace: true, comment: true, hide: true},
// attribute equality // attribute equality
{name: 'INCLUDES', text: '~='}, INCLUDES: {text: '~='},
{name: 'DASHMATCH', text: '|='}, DASHMATCH: {text: '|='},
{name: 'PREFIXMATCH', text: '^='}, PREFIXMATCH: {text: '^='},
{name: 'SUFFIXMATCH', text: '$='}, SUFFIXMATCH: {text: '$='},
{name: 'SUBSTRINGMATCH', text: '*='}, SUBSTRINGMATCH: {text: '*='},
// identifier types // identifier types
{name: 'STRING'}, STRING: {},
{name: 'IDENT'}, IDENT: {},
{name: 'HASH'}, HASH: {},
// at-keywords // at-keywords
{name: 'IMPORT_SYM', text: '@import'}, IMPORT_SYM: {text: '@import'},
{name: 'PAGE_SYM', text: '@page'}, PAGE_SYM: {text: '@page'},
{name: 'MEDIA_SYM', text: '@media'}, MEDIA_SYM: {text: '@media'},
{name: 'FONT_FACE_SYM', text: '@font-face'}, FONT_FACE_SYM: {text: '@font-face'},
{name: 'CHARSET_SYM', text: '@charset'}, CHARSET_SYM: {text: '@charset'},
{name: 'NAMESPACE_SYM', text: '@namespace'}, NAMESPACE_SYM: {text: '@namespace'},
{name: 'SUPPORTS_SYM', text: '@supports'}, SUPPORTS_SYM: {text: '@supports'},
{name: 'VIEWPORT_SYM', text: ['@viewport', '@-ms-viewport', '@-o-viewport']}, VIEWPORT_SYM: {text: ['@viewport', '@-ms-viewport', '@-o-viewport']},
{name: 'DOCUMENT_SYM', text: ['@document', '@-moz-document']}, DOCUMENT_SYM: {text: ['@document', '@-moz-document']},
{name: 'UNKNOWN_SYM'}, //{ name: "ATKEYWORD"}, UNKNOWN_SYM: {}, //{ name: "ATKEYWORD"},
// CSS3 animations // CSS3 animations
{name: 'KEYFRAMES_SYM', text: ['@keyframes', '@-webkit-keyframes', '@-moz-keyframes', '@-o-keyframes']}, KEYFRAMES_SYM: {text: ['@keyframes', '@-webkit-keyframes', '@-moz-keyframes', '@-o-keyframes']},
// important symbol // important symbol
{name: 'IMPORTANT_SYM'}, IMPORTANT_SYM: {},
// measurements // measurements
{name: 'LENGTH'}, LENGTH: {},
{name: 'ANGLE'}, ANGLE: {},
{name: 'TIME'}, TIME: {},
{name: 'FREQ'}, FREQ: {},
{name: 'DIMENSION'}, DIMENSION: {},
{name: 'PERCENTAGE'}, PERCENTAGE: {},
{name: 'NUMBER'}, NUMBER: {},
// functions // functions
{name: 'URI'}, URI: {},
{name: 'FUNCTION'}, FUNCTION: {},
// Unicode ranges // Unicode ranges
{name: 'UNICODE_RANGE'}, UNICODE_RANGE: {},
/* /*
* The following token names are defined in CSS3 Selectors: https://www.w3.org/TR/css3-selectors/#selector-syntax * The following token names are defined in CSS3 Selectors: https://www.w3.org/TR/css3-selectors/#selector-syntax
*/ */
// invalid string // invalid string
{name: 'INVALID'}, INVALID: {},
// combinators // combinators
{name: 'PLUS', text: '+'}, PLUS: {text: '+'},
{name: 'GREATER', text: '>'}, GREATER: {text: '>'},
{name: 'COMMA', text: ','}, COMMA: {text: ','},
{name: 'TILDE', text: '~'}, TILDE: {text: '~'},
// modifier // modifier
{name: 'NOT'}, NOT: {},
{name: 'ANY', text: ['any', '-webkit-any', '-moz-any']}, ANY: {text: ['any', '-webkit-any', '-moz-any']},
{name: 'MATCHES'}, MATCHES: {},
{name: 'IS'}, IS: {},
/* /*
* Defined in CSS3 Paged Media * Defined in CSS3 Paged Media
*/ */
{name: 'TOPLEFTCORNER_SYM', text: '@top-left-corner'}, TOPLEFTCORNER_SYM: {text: '@top-left-corner'},
{name: 'TOPLEFT_SYM', text: '@top-left'}, TOPLEFT_SYM: {text: '@top-left'},
{name: 'TOPCENTER_SYM', text: '@top-center'}, TOPCENTER_SYM: {text: '@top-center'},
{name: 'TOPRIGHT_SYM', text: '@top-right'}, TOPRIGHT_SYM: {text: '@top-right'},
{name: 'TOPRIGHTCORNER_SYM', text: '@top-right-corner'}, TOPRIGHTCORNER_SYM: {text: '@top-right-corner'},
{name: 'BOTTOMLEFTCORNER_SYM', text: '@bottom-left-corner'}, BOTTOMLEFTCORNER_SYM: {text: '@bottom-left-corner'},
{name: 'BOTTOMLEFT_SYM', text: '@bottom-left'}, BOTTOMLEFT_SYM: {text: '@bottom-left'},
{name: 'BOTTOMCENTER_SYM', text: '@bottom-center'}, BOTTOMCENTER_SYM: {text: '@bottom-center'},
{name: 'BOTTOMRIGHT_SYM', text: '@bottom-right'}, BOTTOMRIGHT_SYM: {text: '@bottom-right'},
{name: 'BOTTOMRIGHTCORNER_SYM', text: '@bottom-right-corner'}, BOTTOMRIGHTCORNER_SYM: {text: '@bottom-right-corner'},
{name: 'LEFTTOP_SYM', text: '@left-top'}, LEFTTOP_SYM: {text: '@left-top'},
{name: 'LEFTMIDDLE_SYM', text: '@left-middle'}, LEFTMIDDLE_SYM: {text: '@left-middle'},
{name: 'LEFTBOTTOM_SYM', text: '@left-bottom'}, LEFTBOTTOM_SYM: {text: '@left-bottom'},
{name: 'RIGHTTOP_SYM', text: '@right-top'}, RIGHTTOP_SYM: {text: '@right-top'},
{name: 'RIGHTMIDDLE_SYM', text: '@right-middle'}, RIGHTMIDDLE_SYM: {text: '@right-middle'},
{name: 'RIGHTBOTTOM_SYM', text: '@right-bottom'}, RIGHTBOTTOM_SYM: {text: '@right-bottom'},
/* /*
* The following token names are defined in CSS3 Media Queries: https://www.w3.org/TR/css3-mediaqueries/#syntax * The following token names are defined in CSS3 Media Queries: https://www.w3.org/TR/css3-mediaqueries/#syntax
*/ */
{name: 'RESOLUTION', state: 'media'}, RESOLUTION: {state: 'media'},
/* /*
* The following token names are not defined in any CSS specification but are used by the lexer. * The following token names are not defined in any CSS specification but are used by the lexer.
*/ */
// not a real token, but useful for stupid IE filters // not a real token, but useful for stupid IE filters
{name: 'IE_FUNCTION'}, IE_FUNCTION: {},
// part of CSS3 grammar but not the Flex code // part of CSS3 grammar but not the Flex code
{name: 'CHAR'}, CHAR: {},
// TODO: Needed? // TODO: Needed?
// Not defined as tokens, but might as well be // Not defined as tokens, but might as well be
{name: 'PIPE', text: '|'}, PIPE: {text: '|'},
{name: 'SLASH', text: '/'}, SLASH: {text: '/'},
{name: 'MINUS', text: '-'}, MINUS: {text: '-'},
{name: 'STAR', text: '*'}, STAR: {text: '*'},
{name: 'LBRACE', text: '{', endChar: '}'}, LBRACE: {text: '{', endChar: '}'},
{name: 'RBRACE', text: '}'}, RBRACE: {text: '}'},
{name: 'LBRACKET', text: '[', endChar: ']'}, LBRACKET: {text: '[', endChar: ']'},
{name: 'RBRACKET', text: ']'}, RBRACKET: {text: ']'},
{name: 'EQUALS', text: '='}, EQUALS: {text: '='},
{name: 'COLON', text: ':'}, COLON: {text: ':'},
{name: 'SEMICOLON', text: ';'}, SEMICOLON: {text: ';'},
{name: 'LPAREN', text: '(', endChar: ')'}, LPAREN: {text: '(', endChar: ')'},
{name: 'RPAREN', text: ')'}, RPAREN: {text: ')'},
{name: 'DOT', text: '.'}, DOT: {text: '.'},
{name: 'USO_VAR', comment: true}, USO_VAR: {comment: true},
{name: 'CUSTOM_PROP'}, CUSTOM_PROP: {},
]; });
// make Tokens an array of tokens, store the index in original prop, add 'name' to each token
{ const typeMap = new Map();
Tokens.UNKNOWN = -1; for (const [k, val] of Object.entries(Tokens)) {
Tokens.unshift({name: 'EOF'}); const index = Tokens[k] = Tokens.length;
val.name = k;
const nameMap = []; Tokens.push(val);
const typeMap = new Map(); const {text} = val;
for (let i = 0, len = Tokens.length; i < len; i++) { if (text) {
nameMap.push(Tokens[i].name); for (const item of Array.isArray(text) ? text : [text]) {
Tokens[Tokens[i].name] = i; typeMap.set(item, index);
if (Tokens[i].text) {
if (Tokens[i].text instanceof Array) {
for (let j = 0; j < Tokens[i].text.length; j++) {
typeMap.set(Tokens[i].text[j], i);
}
} else {
typeMap.set(Tokens[i].text, i);
}
} }
} }
Tokens.name = function (tt) {
return nameMap[tt];
};
Tokens.type = function (c) {
return typeMap.get(c) || -1;
};
} }
Tokens.UNKNOWN = -1;
Tokens.name = index => (Tokens[index] || {}).name;
Tokens.type = text => typeMap.get(text) || -1;
//endregion //endregion
//region lowerCase helper //region lowerCase helper
@ -2603,9 +2604,11 @@ self.parserlib = (() => {
if (expression._i < expression._parts.length - 1) { if (expression._i < expression._parts.length - 1) {
expression.mark(); expression.mark();
expression._i++; expression._i++;
result = ValidationTypes.isType(expression, type); if (ValidationTypes.isType(expression, type)) {
expression.restore(); expression.drop();
expression._i += result ? 1 : 0; } else {
expression.restore();
}
} }
result = true; result = true;