@markuplint/types 4.0.0-alpha.1 → 4.0.0-alpha.10

package/lib/primitive/is-float.js

@@ -4,5 +4,5 @@
  * @param value
  */
 export function isFloat(value) {
-    return value === value.trim() && Number.isFinite(parseFloat(value));
+    return value === value.trim() && Number.isFinite(Number.parseFloat(value));
 }

package/lib/primitive/is-int.js

@@ -4,5 +4,5 @@
  * @param value
  */
 export function isInt(value) {
-    return /^-?[0-9]+$/.test(value);
+    return /^-?\d+$/.test(value);
 }

package/lib/primitive/is-non-zero-uint.js

@@ -4,5 +4,5 @@
  * @param value
  */
 export function isNonZeroUint(value) {
-    return /^[0-9]+$/.test(value) && !/^0+$/.test(value);
+    return /^\d+$/.test(value) && !/^0+$/.test(value);
 }

package/lib/primitive/is-uint.js

@@ -4,11 +4,11 @@
  * @param value
  */
 export function isUint(value, options) {
-    const matched = /^[0-9]+$/.test(value);
+    const matched = /^\d+$/.test(value);
     if (matched && options) {
-        const n = parseInt(value, 10);
+        const n = Number.parseInt(value, 10);
         if (options.gt != null) {
-            return isFinite(n) && options.gt < n;
+            return Number.isFinite(n) && options.gt < n;
         }
     }
     return matched;

package/lib/primitive/range.js

@@ -6,8 +6,8 @@
  * @param to
  */
 export function range(value, from, to) {
-    const num = parseFloat(value);
-    if (isNaN(num)) {
+    const num = Number.parseFloat(value);
+    if (Number.isNaN(num)) {
         return false;
     }
     return from <= num && num <= to;

package/lib/primitive/split-unit.js

@@ -5,7 +5,7 @@
  */
 export function splitUnit(value) {
     value = value.trim().toLowerCase();
-    const matched = value.match(/(^-?\.[0-9]+|^-?[0-9]+(?:\.[0-9]+(?:e[+-][0-9]+)?)?)([a-z]+$)/i);
+    const matched = value.match(/(^-?\.\d+|^-?\d+(?:\.\d+(?:e[+-]\d+)?)?)([a-z]+$)/i);
     if (!matched) {
         return {
             num: value,

package/lib/token/token-collection.d.ts

@@ -1,15 +1,14 @@
 import type { TokenValue } from './types.js';
 import type { Expect, Result, List, UnmatchedResult } from '../types.js';
-import type { ReadonlyDeep } from 'type-fest';
 import { Token } from './token.js';
 type TokenCollectionOptions = Partial<Omit<List, 'token'> & {
     specificSeparator: string | string[];
 }>;
-export type TokenEachCheck = (head: Readonly<Token> | null, tail: ReadonlyDeep<TokenCollection>) => Result | void;
+export type TokenEachCheck = (head: Readonly<Token> | null, tail: TokenCollection) => Result | void;
 export declare class TokenCollection extends Array<Token> {
-    static fromPatterns(value: Readonly<Token> | string, patterns: readonly Readonly<RegExp>[], typeOptions?: ReadonlyDeep<Omit<TokenCollectionOptions, 'specificSeparator'> & {
+    static fromPatterns(value: Readonly<Token> | string, patterns: readonly Readonly<RegExp>[], typeOptions?: Omit<TokenCollectionOptions, 'specificSeparator'> & {
         repeat?: boolean;
-    }>): TokenCollection;
+    }): TokenCollection;
     static get [Symbol.species](): ArrayConstructor;
     readonly allowEmpty: NonNullable<List['allowEmpty']>;
     readonly caseInsensitive: NonNullable<List['caseInsensitive']>;
@@ -18,7 +17,7 @@ export declare class TokenCollection extends Array<Token> {
     readonly ordered: NonNullable<List['ordered']>;
     readonly separator: NonNullable<List['separator']>;
     readonly unique: NonNullable<List['unique']>;
-    constructor(value?: string, typeOptions?: ReadonlyDeep<TokenCollectionOptions>);
+    constructor(value?: string, typeOptions?: TokenCollectionOptions);
     constructor(value?: number);
     get value(): string;
     check(options?: {

package/lib/token/token-collection.js

@@ -1,7 +1,9 @@
 import { matched, unmatched } from '../match-result.js';
 import { Token } from './token.js';
 export class TokenCollection extends Array {
-    static fromPatterns(value, patterns, typeOptions) {
+    static fromPatterns(value, patterns, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    typeOptions) {
         const originalValue = typeof value === 'string' ? value : value.originalValue;
         let strings = typeof value === 'string' ? value : value.value;
         let cumulativeOffset = typeof value === 'string' ? 0 : value.offset;
@@ -19,18 +21,18 @@ export class TokenCollection extends Array {
             for (const pattern of patterns) {
                 const res = pattern.exec(strings);
                 let value;
-                if (!res) {
-                    isBroken = true;
-                    value = '';
-                }
-                else {
-                    if (res.index !== 0) {
-                        value = strings.slice(res.index + res[0].length);
+                if (res) {
+                    if (res.index === 0) {
+                        value = res[0] ?? '';
                     }
                     else {
-                        value = res[0] ?? '';
+                        value = strings.slice(res.index + res[0].length);
                     }
                 }
+                else {
+                    isBroken = true;
+                    value = '';
+                }
                 const token = addToken(value);
                 // @ts-ignore
                 token._ = pattern;
@@ -47,7 +49,9 @@ export class TokenCollection extends Array {
     static get [Symbol.species]() {
         return Array;
     }
-    constructor(value, typeOptions) {
+    constructor(value, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    typeOptions) {
         super();
         this.disallowToSurroundBySpaces = typeOptions?.disallowToSurroundBySpaces ?? false;
         this.allowEmpty = typeOptions?.allowEmpty ?? true;
@@ -75,7 +79,7 @@ export class TokenCollection extends Array {
                 separators.push(...typeOptions.specificSeparator);
             }
         }
-        const chars = value.split('');
+        const chars = [...value];
         const values = [];
         let char;
         while ((char = chars.shift())) {
@@ -93,16 +97,15 @@ export class TokenCollection extends Array {
                 values.push(last + char);
             }
             else {
-                values.push(last);
-                values.push(char);
+                values.push(last, char);
             }
         }
         let offset = 0;
-        values.forEach(v => {
+        for (const v of values) {
             const token = new Token(v, offset, value, separators);
             this.push(token);
             offset += v.length;
-        });
+        }
     }
     get value() {
         const value = this.map(t => t.value).join('');
@@ -264,7 +267,7 @@ export class TokenCollection extends Array {
                 return result;
             }
             else {
-                if (head?.value && !head.match(/^\s*$/)) {
+                if (head?.value && !head.matches(/^\s*$/)) {
                     passCount += 4 * wait;
                 }
             }
@@ -323,7 +326,7 @@ export class TokenCollection extends Array {
      * @param value The token value or the token type or its list
      */
     has(value) {
-        return this.some(t => t.match(value));
+        return this.some(t => t.matches(value));
     }
     headAndTail() {
         const copy = this.slice();
@@ -374,7 +377,9 @@ export class TokenCollection extends Array {
     toJSON() {
         return this.map(t => t.toJSON());
     }
-    static _new(tokens, old) {
+    static _new(tokens, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    old) {
         const newCollection = new TokenCollection('', old);
         newCollection.push(...tokens);
         return newCollection;

package/lib/token/token.d.ts

@@ -42,7 +42,7 @@ export declare class Token {
      *
      * @param value The token value or the token type or its list
      */
-    match(value: TokenValue, caseInsensitive?: boolean): boolean;
+    matches(value: TokenValue, caseInsensitive?: boolean): boolean;
     toJSON(): {
         type: number;
         value: string;

package/lib/token/token.js

@@ -1,10 +1,10 @@
 export class Token {
     static getCol(value, offset) {
-        const lines = value.slice(0, offset).split(/\n/g);
-        return (lines[lines.length - 1] ?? '').length + 1;
+        const lines = value.slice(0, offset).split(/\n/);
+        return (lines.at(-1) ?? '').length + 1;
     }
     static getLine(value, offset) {
-        return value.slice(0, offset).split(/\n/g).length;
+        return value.slice(0, offset).split(/\n/).length;
     }
     static getType(value, separators) {
         if (Token.whitespace.includes(value[0] ?? '')) {
@@ -12,8 +12,9 @@ export class Token {
         }
         if (separators?.includes(value[0] ?? '')) {
             switch (value[0]) {
-                case ',':
+                case ',': {
                     return Token.Comma;
+                }
             }
         }
         return Token.Ident;
@@ -61,9 +62,9 @@ export class Token {
      *
      * @param value The token value or the token type or its list
      */
-    match(value, caseInsensitive) {
+    matches(value, caseInsensitive) {
         if (Array.isArray(value)) {
-            return value.some(v => this.match(v));
+            return value.some(v => this.matches(v));
         }
         if (typeof value === 'string') {
             const a = caseInsensitive ? this.value.toLowerCase() : this.value;
@@ -84,8 +85,8 @@ export class Token {
         };
     }
     toNumber() {
-        const num = parseFloat(this.value);
-        return isNaN(num) ? 0 : num;
+        const num = Number.parseFloat(this.value);
+        return Number.isNaN(num) ? 0 : num;
     }
     unmatched(options) {
         return {

package/lib/types.d.ts

@@ -17,6 +17,7 @@ export type UnmatchedResultOptions = {
     readonly expects?: readonly Expect[];
     readonly extra?: Expect;
     readonly candidate?: string;
+    readonly fallbackTo?: string;
 };
 export type UnmatchedResultReason = 'syntax-error' | 'typo' | 'missing-token' | 'missing-comma' | 'unexpected-token' | 'unexpected-space' | 'unexpected-newline' | 'unexpected-comma' | 'empty-token' | 'out-of-range' | 'doesnt-exist-in-enum' | 'duplicated' | 'illegal-combination' | 'illegal-order' | 'extra-token' | 'must-be-percent-encoded' | 'must-be-serialized' | {
     readonly type: 'out-of-range';

package/lib/types.schema.d.ts

@@ -6,7 +6,7 @@
 export type Type = KeywordDefinedType | List | Enum | Number;
 export type KeywordDefinedType = CssSyntax | ExtendedType | HtmlAttrRequirement;
 export type CssSyntax = "<'--*'>" | "<'-moz-appearance'>" | "<'-moz-background-clip'>" | "<'-moz-binding'>" | "<'-moz-border-bottom-colors'>" | "<'-moz-border-left-colors'>" | "<'-moz-border-radius-bottomleft'>" | "<'-moz-border-radius-bottomright'>" | "<'-moz-border-radius-topleft'>" | "<'-moz-border-radius-topright'>" | "<'-moz-border-right-colors'>" | "<'-moz-border-top-colors'>" | "<'-moz-context-properties'>" | "<'-moz-control-character-visibility'>" | "<'-moz-float-edge'>" | "<'-moz-force-broken-image-icon'>" | "<'-moz-image-region'>" | "<'-moz-orient'>" | "<'-moz-osx-font-smoothing'>" | "<'-moz-outline-radius'>" | "<'-moz-outline-radius-bottomleft'>" | "<'-moz-outline-radius-bottomright'>" | "<'-moz-outline-radius-topleft'>" | "<'-moz-outline-radius-topright'>" | "<'-moz-stack-sizing'>" | "<'-moz-text-blink'>" | "<'-moz-user-focus'>" | "<'-moz-user-input'>" | "<'-moz-user-modify'>" | "<'-moz-user-select'>" | "<'-moz-window-dragging'>" | "<'-moz-window-shadow'>" | "<'-ms-accelerator'>" | "<'-ms-block-progression'>" | "<'-ms-content-zoom-chaining'>" | "<'-ms-content-zoom-limit'>" | "<'-ms-content-zoom-limit-max'>" | "<'-ms-content-zoom-limit-min'>" | "<'-ms-content-zoom-snap'>" | "<'-ms-content-zoom-snap-points'>" | "<'-ms-content-zoom-snap-type'>" | "<'-ms-content-zooming'>" | "<'-ms-filter'>" | "<'-ms-flex-align'>" | "<'-ms-flex-item-align'>" | "<'-ms-flex-line-pack'>" | "<'-ms-flex-negative'>" | "<'-ms-flex-order'>" | "<'-ms-flex-pack'>" | "<'-ms-flex-positive'>" | "<'-ms-flex-preferred-size'>" | "<'-ms-flow-from'>" | "<'-ms-flow-into'>" | "<'-ms-grid-column-align'>" | "<'-ms-grid-columns'>" | "<'-ms-grid-row-align'>" | "<'-ms-grid-rows'>" | "<'-ms-high-contrast-adjust'>" | "<'-ms-hyphenate-limit-chars'>" | "<'-ms-hyphenate-limit-last'>" | "<'-ms-hyphenate-limit-lines'>" | "<'-ms-hyphenate-limit-zone'>" | "<'-ms-ime-align'>" | "<'-ms-interpolation-mode'>" | "<'-ms-overflow-style'>" | "<'-ms-scroll-chaining'>" | "<'-ms-scroll-limit'>" | "<'-ms-scroll-limit-x-max'>" | "<'-ms-scroll-limit-x-min'>" | "<'-ms-scroll-limit-y-max'>" | "<'-ms-scroll-limit-y-min'>" | "<'-ms-scroll-rails'>" | "<'-ms-scroll-snap-points-x'>" | "<'-ms-scroll-snap-points-y'>" | "<'-ms-scroll-snap-type'>" | "<'-ms-scroll-snap-x'>" | "<'-ms-scroll-snap-y'>" | "<'-ms-scroll-translation'>" | "<'-ms-scrollbar-3dlight-color'>" | "<'-ms-scrollbar-arrow-color'>" | "<'-ms-scrollbar-base-color'>" | "<'-ms-scrollbar-darkshadow-color'>" | "<'-ms-scrollbar-face-color'>" | "<'-ms-scrollbar-highlight-color'>" | "<'-ms-scrollbar-shadow-color'>" | "<'-ms-scrollbar-track-color'>" | "<'-ms-text-autospace'>" | "<'-ms-touch-select'>" | "<'-ms-user-select'>" | "<'-ms-wrap-flow'>" | "<'-ms-wrap-margin'>" | "<'-ms-wrap-through'>" | "<'-webkit-appearance'>" | "<'-webkit-background-clip'>" | "<'-webkit-border-before'>" | "<'-webkit-border-before-color'>" | "<'-webkit-border-before-style'>" | "<'-webkit-border-before-width'>" | "<'-webkit-box-reflect'>" | "<'-webkit-column-break-after'>" | "<'-webkit-column-break-before'>" | "<'-webkit-column-break-inside'>" | "<'-webkit-font-smoothing'>" | "<'-webkit-line-clamp'>" | "<'-webkit-mask'>" | "<'-webkit-mask-attachment'>" | "<'-webkit-mask-box-image'>" | "<'-webkit-mask-clip'>" | "<'-webkit-mask-composite'>" | "<'-webkit-mask-image'>" | "<'-webkit-mask-origin'>" | "<'-webkit-mask-position'>" | "<'-webkit-mask-position-x'>" | "<'-webkit-mask-position-y'>" | "<'-webkit-mask-repeat'>" | "<'-webkit-mask-repeat-x'>" | "<'-webkit-mask-repeat-y'>" | "<'-webkit-mask-size'>" | "<'-webkit-overflow-scrolling'>" | "<'-webkit-print-color-adjust'>" | "<'-webkit-tap-highlight-color'>" | "<'-webkit-text-fill-color'>" | "<'-webkit-text-security'>" | "<'-webkit-text-stroke'>" | "<'-webkit-text-stroke-color'>" | "<'-webkit-text-stroke-width'>" | "<'-webkit-touch-callout'>" | "<'-webkit-user-drag'>" | "<'-webkit-user-modify'>" | "<'-webkit-user-select'>" | "<'accent-color'>" | "<'align-content'>" | "<'align-items'>" | "<'align-self'>" | "<'align-tracks'>" | "<'alignment-baseline'>" | "<'all'>" | "<'animation'>" | "<'animation-composition'>" | "<'animation-delay'>" | "<'animation-direction'>" | "<'animation-duration'>" | "<'animation-fill-mode'>" | "<'animation-iteration-count'>" | "<'animation-name'>" | "<'animation-play-state'>" | "<'animation-timeline'>" | "<'animation-timing-function'>" | "<'appearance'>" | "<'aspect-ratio'>" | "<'azimuth'>" | "<'backdrop-filter'>" | "<'backface-visibility'>" | "<'background'>" | "<'background-attachment'>" | "<'background-blend-mode'>" | "<'background-clip'>" | "<'background-color'>" | "<'background-image'>" | "<'background-origin'>" | "<'background-position'>" | "<'background-position-x'>" | "<'background-position-y'>" | "<'background-repeat'>" | "<'background-size'>" | "<'baseline-shift'>" | "<'behavior'>" | "<'block-overflow'>" | "<'block-size'>" | "<'border'>" | "<'border-block'>" | "<'border-block-color'>" | "<'border-block-end'>" | "<'border-block-end-color'>" | "<'border-block-end-style'>" | "<'border-block-end-width'>" | "<'border-block-start'>" | "<'border-block-start-color'>" | "<'border-block-start-style'>" | "<'border-block-start-width'>" | "<'border-block-style'>" | "<'border-block-width'>" | "<'border-bottom'>" | "<'border-bottom-color'>" | "<'border-bottom-left-radius'>" | "<'border-bottom-right-radius'>" | "<'border-bottom-style'>" | "<'border-bottom-width'>" | "<'border-collapse'>" | "<'border-color'>" | "<'border-end-end-radius'>" | "<'border-end-start-radius'>" | "<'border-image'>" | "<'border-image-outset'>" | "<'border-image-repeat'>" | "<'border-image-slice'>" | "<'border-image-source'>" | "<'border-image-width'>" | "<'border-inline'>" | "<'border-inline-color'>" | "<'border-inline-end'>" | "<'border-inline-end-color'>" | "<'border-inline-end-style'>" | "<'border-inline-end-width'>" | "<'border-inline-start'>" | "<'border-inline-start-color'>" | "<'border-inline-start-style'>" | "<'border-inline-start-width'>" | "<'border-inline-style'>" | "<'border-inline-width'>" | "<'border-left'>" | "<'border-left-color'>" | "<'border-left-style'>" | "<'border-left-width'>" | "<'border-radius'>" | "<'border-right'>" | "<'border-right-color'>" | "<'border-right-style'>" | "<'border-right-width'>" | "<'border-spacing'>" | "<'border-start-end-radius'>" | "<'border-start-start-radius'>" | "<'border-style'>" | "<'border-top'>" | "<'border-top-color'>" | "<'border-top-left-radius'>" | "<'border-top-right-radius'>" | "<'border-top-style'>" | "<'border-top-width'>" | "<'border-width'>" | "<'bottom'>" | "<'box-align'>" | "<'box-decoration-break'>" | "<'box-direction'>" | "<'box-flex'>" | "<'box-flex-group'>" | "<'box-lines'>" | "<'box-ordinal-group'>" | "<'box-orient'>" | "<'box-pack'>" | "<'box-shadow'>" | "<'box-sizing'>" | "<'break-after'>" | "<'break-before'>" | "<'break-inside'>" | "<'caption-side'>" | "<'caret'>" | "<'caret-color'>" | "<'caret-shape'>" | "<'clear'>" | "<'clip'>" | "<'clip-path'>" | "<'clip-rule'>" | "<'color'>" | "<'color-scheme'>" | "<'column-count'>" | "<'column-fill'>" | "<'column-gap'>" | "<'column-rule'>" | "<'column-rule-color'>" | "<'column-rule-style'>" | "<'column-rule-width'>" | "<'column-span'>" | "<'column-width'>" | "<'columns'>" | "<'contain'>" | "<'contain-intrinsic-block-size'>" | "<'contain-intrinsic-height'>" | "<'contain-intrinsic-inline-size'>" | "<'contain-intrinsic-size'>" | "<'contain-intrinsic-width'>" | "<'content'>" | "<'content-visibility'>" | "<'counter-increment'>" | "<'counter-reset'>" | "<'counter-set'>" | "<'cue'>" | "<'cue-after'>" | "<'cue-before'>" | "<'cursor'>" | "<'direction'>" | "<'display'>" | "<'dominant-baseline'>" | "<'empty-cells'>" | "<'fill'>" | "<'fill-opacity'>" | "<'fill-rule'>" | "<'filter'>" | "<'flex'>" | "<'flex-basis'>" | "<'flex-direction'>" | "<'flex-flow'>" | "<'flex-grow'>" | "<'flex-shrink'>" | "<'flex-wrap'>" | "<'float'>" | "<'font'>" | "<'font-family'>" | "<'font-feature-settings'>" | "<'font-kerning'>" | "<'font-language-override'>" | "<'font-optical-sizing'>" | "<'font-size'>" | "<'font-size-adjust'>" | "<'font-smooth'>" | "<'font-stretch'>" | "<'font-style'>" | "<'font-synthesis'>" | "<'font-variant'>" | "<'font-variant-alternates'>" | "<'font-variant-caps'>" | "<'font-variant-east-asian'>" | "<'font-variant-ligatures'>" | "<'font-variant-numeric'>" | "<'font-variant-position'>" | "<'font-variation-settings'>" | "<'font-weight'>" | "<'forced-color-adjust'>" | "<'gap'>" | "<'glyph-orientation-horizontal'>" | "<'glyph-orientation-vertical'>" | "<'grid'>" | "<'grid-area'>" | "<'grid-auto-columns'>" | "<'grid-auto-flow'>" | "<'grid-auto-rows'>" | "<'grid-column'>" | "<'grid-column-end'>" | "<'grid-column-gap'>" | "<'grid-column-start'>" | "<'grid-gap'>" | "<'grid-row'>" | "<'grid-row-end'>" | "<'grid-row-gap'>" | "<'grid-row-start'>" | "<'grid-template'>" | "<'grid-template-areas'>" | "<'grid-template-columns'>" | "<'grid-template-rows'>" | "<'hanging-punctuation'>" | "<'height'>" | "<'hyphenate-character'>" | "<'hyphens'>" | "<'image-orientation'>" | "<'image-rendering'>" | "<'image-resolution'>" | "<'ime-mode'>" | "<'initial-letter'>" | "<'initial-letter-align'>" | "<'inline-size'>" | "<'input-security'>" | "<'inset'>" | "<'inset-block'>" | "<'inset-block-end'>" | "<'inset-block-start'>" | "<'inset-inline'>" | "<'inset-inline-end'>" | "<'inset-inline-start'>" | "<'isolation'>" | "<'justify-content'>" | "<'justify-items'>" | "<'justify-self'>" | "<'justify-tracks'>" | "<'kerning'>" | "<'left'>" | "<'letter-spacing'>" | "<'line-break'>" | "<'line-clamp'>" | "<'line-height'>" | "<'line-height-step'>" | "<'list-style'>" | "<'list-style-image'>" | "<'list-style-position'>" | "<'list-style-type'>" | "<'margin'>" | "<'margin-block'>" | "<'margin-block-end'>" | "<'margin-block-start'>" | "<'margin-bottom'>" | "<'margin-inline'>" | "<'margin-inline-end'>" | "<'margin-inline-start'>" | "<'margin-left'>" | "<'margin-right'>" | "<'margin-top'>" | "<'margin-trim'>" | "<'marker'>" | "<'marker-end'>" | "<'marker-mid'>" | "<'marker-start'>" | "<'mask'>" | "<'mask-border'>" | "<'mask-border-mode'>" | "<'mask-border-outset'>" | "<'mask-border-repeat'>" | "<'mask-border-slice'>" | "<'mask-border-source'>" | "<'mask-border-width'>" | "<'mask-clip'>" | "<'mask-composite'>" | "<'mask-image'>" | "<'mask-mode'>" | "<'mask-origin'>" | "<'mask-position'>" | "<'mask-repeat'>" | "<'mask-size'>" | "<'mask-type'>" | "<'masonry-auto-flow'>" | "<'math-depth'>" | "<'math-shift'>" | "<'math-style'>" | "<'max-block-size'>" | "<'max-height'>" | "<'max-inline-size'>" | "<'max-lines'>" | "<'max-width'>" | "<'min-block-size'>" | "<'min-height'>" | "<'min-inline-size'>" | "<'min-width'>" | "<'mix-blend-mode'>" | "<'object-fit'>" | "<'object-position'>" | "<'offset'>" | "<'offset-anchor'>" | "<'offset-distance'>" | "<'offset-path'>" | "<'offset-position'>" | "<'offset-rotate'>" | "<'opacity'>" | "<'order'>" | "<'orphans'>" | "<'outline'>" | "<'outline-color'>" | "<'outline-offset'>" | "<'outline-style'>" | "<'outline-width'>" | "<'overflow'>" | "<'overflow-anchor'>" | "<'overflow-block'>" | "<'overflow-clip-box'>" | "<'overflow-clip-margin'>" | "<'overflow-inline'>" | "<'overflow-wrap'>" | "<'overflow-x'>" | "<'overflow-y'>" | "<'overscroll-behavior'>" | "<'overscroll-behavior-block'>" | "<'overscroll-behavior-inline'>" | "<'overscroll-behavior-x'>" | "<'overscroll-behavior-y'>" | "<'padding'>" | "<'padding-block'>" | "<'padding-block-end'>" | "<'padding-block-start'>" | "<'padding-bottom'>" | "<'padding-inline'>" | "<'padding-inline-end'>" | "<'padding-inline-start'>" | "<'padding-left'>" | "<'padding-right'>" | "<'padding-top'>" | "<'page-break-after'>" | "<'page-break-before'>" | "<'page-break-inside'>" | "<'paint-order'>" | "<'pause'>" | "<'pause-after'>" | "<'pause-before'>" | "<'perspective'>" | "<'perspective-origin'>" | "<'place-content'>" | "<'place-items'>" | "<'place-self'>" | "<'pointer-events'>" | "<'position'>" | "<'print-color-adjust'>" | "<'quotes'>" | "<'resize'>" | "<'rest'>" | "<'rest-after'>" | "<'rest-before'>" | "<'right'>" | "<'rotate'>" | "<'row-gap'>" | "<'ruby-align'>" | "<'ruby-merge'>" | "<'ruby-position'>" | "<'scale'>" | "<'scroll-behavior'>" | "<'scroll-margin'>" | "<'scroll-margin-block'>" | "<'scroll-margin-block-end'>" | "<'scroll-margin-block-start'>" | "<'scroll-margin-bottom'>" | "<'scroll-margin-inline'>" | "<'scroll-margin-inline-end'>" | "<'scroll-margin-inline-start'>" | "<'scroll-margin-left'>" | "<'scroll-margin-right'>" | "<'scroll-margin-top'>" | "<'scroll-padding'>" | "<'scroll-padding-block'>" | "<'scroll-padding-block-end'>" | "<'scroll-padding-block-start'>" | "<'scroll-padding-bottom'>" | "<'scroll-padding-inline'>" | "<'scroll-padding-inline-end'>" | "<'scroll-padding-inline-start'>" | "<'scroll-padding-left'>" | "<'scroll-padding-right'>" | "<'scroll-padding-top'>" | "<'scroll-snap-align'>" | "<'scroll-snap-coordinate'>" | "<'scroll-snap-destination'>" | "<'scroll-snap-points-x'>" | "<'scroll-snap-points-y'>" | "<'scroll-snap-stop'>" | "<'scroll-snap-type'>" | "<'scroll-snap-type-x'>" | "<'scroll-snap-type-y'>" | "<'scroll-timeline'>" | "<'scroll-timeline-axis'>" | "<'scroll-timeline-name'>" | "<'scrollbar-color'>" | "<'scrollbar-gutter'>" | "<'scrollbar-width'>" | "<'shape-image-threshold'>" | "<'shape-margin'>" | "<'shape-outside'>" | "<'shape-rendering'>" | "<'speak'>" | "<'speak-as'>" | "<'src'>" | "<'stroke'>" | "<'stroke-dasharray'>" | "<'stroke-dashoffset'>" | "<'stroke-linecap'>" | "<'stroke-linejoin'>" | "<'stroke-miterlimit'>" | "<'stroke-opacity'>" | "<'stroke-width'>" | "<'tab-size'>" | "<'table-layout'>" | "<'text-align'>" | "<'text-align-last'>" | "<'text-anchor'>" | "<'text-combine-upright'>" | "<'text-decoration'>" | "<'text-decoration-color'>" | "<'text-decoration-line'>" | "<'text-decoration-skip'>" | "<'text-decoration-skip-ink'>" | "<'text-decoration-style'>" | "<'text-decoration-thickness'>" | "<'text-emphasis'>" | "<'text-emphasis-color'>" | "<'text-emphasis-position'>" | "<'text-emphasis-style'>" | "<'text-indent'>" | "<'text-justify'>" | "<'text-orientation'>" | "<'text-overflow'>" | "<'text-rendering'>" | "<'text-shadow'>" | "<'text-size-adjust'>" | "<'text-transform'>" | "<'text-underline-offset'>" | "<'text-underline-position'>" | "<'top'>" | "<'touch-action'>" | "<'transform'>" | "<'transform-box'>" | "<'transform-origin'>" | "<'transform-style'>" | "<'transition'>" | "<'transition-delay'>" | "<'transition-duration'>" | "<'transition-property'>" | "<'transition-timing-function'>" | "<'translate'>" | "<'unicode-bidi'>" | "<'unicode-range'>" | "<'user-select'>" | "<'vertical-align'>" | "<'visibility'>" | "<'voice-balance'>" | "<'voice-duration'>" | "<'voice-family'>" | "<'voice-pitch'>" | "<'voice-range'>" | "<'voice-rate'>" | "<'voice-stress'>" | "<'voice-volume'>" | "<'white-space'>" | "<'widows'>" | "<'width'>" | "<'will-change'>" | "<'word-break'>" | "<'word-spacing'>" | "<'word-wrap'>" | "<'writing-mode'>" | "<'z-index'>" | "<'zoom'>" | '<(-token>' | '<)-token>' | '<-legacy-gradient>' | '<-legacy-linear-gradient-arguments>' | '<-legacy-linear-gradient>' | '<-legacy-radial-gradient-arguments>' | '<-legacy-radial-gradient-shape>' | '<-legacy-radial-gradient-size>' | '<-legacy-radial-gradient>' | '<-legacy-repeating-linear-gradient>' | '<-legacy-repeating-radial-gradient>' | '<-ms-filter-function-legacy>' | '<-ms-filter-function-list>' | '<-ms-filter-function-progid>' | '<-ms-filter-function>' | '<-ms-filter>' | '<-non-standard-color>' | '<-non-standard-display>' | '<-non-standard-font>' | '<-non-standard-image-rendering>' | '<-non-standard-overflow>' | '<-non-standard-width>' | '<-webkit-gradient()>' | '<-webkit-gradient-color-stop>' | '<-webkit-gradient-point>' | '<-webkit-gradient-radius>' | '<-webkit-gradient-type>' | '<-webkit-mask-box-repeat>' | '<-webkit-mask-clip-style>' | '<CDC-token>' | '<CDO-token>' | '<[-token>' | '<]-token>' | '<abs()>' | '<absolute-size>' | '<acos()>' | '<age>' | '<alpha-value>' | '<an-plus-b>' | '<angle-percentage>' | '<angle>' | '<angular-color-hint>' | '<angular-color-stop-list>' | '<angular-color-stop>' | '<animateable-feature>' | '<any-value>' | '<asin()>' | '<at-keyword-token>' | '<atan()>' | '<atan2()>' | '<attachment>' | '<attr()>' | '<attr-fallback>' | '<attr-matcher>' | '<attr-modifier>' | '<attr-name>' | '<attribute-selector>' | '<auto-repeat>' | '<auto-track-list>' | '<axis>' | '<bad-string-token>' | '<bad-url-token>' | '<baseline-position>' | '<basic-shape>' | '<bcp-47>' | '<bg-clip>' | '<bg-image>' | '<bg-layer>' | '<bg-position>' | '<bg-size>' | '<blend-mode>' | '<blur()>' | '<bottom>' | '<box>' | '<brightness()>' | '<calc()>' | '<calc-constant>' | '<calc-product>' | '<calc-sum>' | '<calc-value>' | '<cf-final-image>' | '<cf-mixing-image>' | '<circle()>' | '<clamp()>' | '<class-selector>' | '<clip-source>' | '<colon-token>' | '<color-stop-angle>' | '<color-stop-length>' | '<color-stop-list>' | '<color-stop>' | '<color>' | '<combinator>' | '<comma-token>' | '<common-lig-values>' | '<compat-auto>' | '<complex-selector-list>' | '<complex-selector>' | '<composite-style>' | '<compositing-operator>' | '<compound-selector-list>' | '<compound-selector>' | '<conic-gradient()>' | '<content-distribution>' | '<content-list>' | '<content-position>' | '<content-replacement>' | '<contextual-alt-values>' | '<contrast()>' | '<cos()>' | '<counter()>' | '<counter-name>' | '<counter-style-name>' | '<counter-style>' | '<counter>' | '<counters()>' | '<cross-fade()>' | '<cubic-bezier-timing-function>' | '<custom-ident>' | '<custom-property-name>' | '<decibel>' | '<declaration-list>' | '<declaration-value>' | '<declaration>' | '<delim-token>' | '<deprecated-system-color>' | '<dimension-token>' | '<dimension>' | '<discretionary-lig-values>' | '<display-box>' | '<display-inside>' | '<display-internal>' | '<display-legacy>' | '<display-listitem>' | '<display-outside>' | '<drop-shadow()>' | '<easing-function>' | '<east-asian-variant-values>' | '<east-asian-width-values>' | '<element()>' | '<ellipse()>' | '<ending-shape>' | '<env()>' | '<exp()>' | '<explicit-track-list>' | '<family-name>' | '<feature-tag-value>' | '<feature-type>' | '<feature-value-block-list>' | '<feature-value-block>' | '<feature-value-declaration-list>' | '<feature-value-declaration>' | '<feature-value-name>' | '<fill-rule>' | '<filter-function-list>' | '<filter-function>' | '<final-bg-layer>' | '<fixed-breadth>' | '<fixed-repeat>' | '<fixed-size>' | '<flex>' | '<font-stretch-absolute>' | '<font-variant-css21>' | '<font-weight-absolute>' | '<frequency-percentage>' | '<frequency>' | '<function-token>' | '<gender>' | '<general-enclosed>' | '<generic-family>' | '<generic-name>' | '<generic-voice>' | '<geometry-box>' | '<gradient>' | '<grayscale()>' | '<grid-line>' | '<hash-token>' | '<hex-color>' | '<historical-lig-values>' | '<hsl()>' | '<hsla()>' | '<hue-rotate()>' | '<hue>' | '<hwb()>' | '<hypot()>' | '<id-selector>' | '<ident-token>' | '<ident>' | '<image()>' | '<image-set()>' | '<image-set-option>' | '<image-src>' | '<image-tags>' | '<image>' | '<inflexible-breadth>' | '<inset()>' | '<integer>' | '<invert()>' | '<keyframe-block-list>' | '<keyframe-block>' | '<keyframe-selector>' | '<keyframes-name>' | '<lab()>' | '<layer()>' | '<layer-name>' | '<lch()>' | '<leader()>' | '<leader-type>' | '<left>' | '<length-percentage>' | '<length>' | '<line-name-list>' | '<line-names>' | '<line-style>' | '<line-width>' | '<linear-color-hint>' | '<linear-color-stop>' | '<linear-gradient()>' | '<log()>' | '<mask-image>' | '<mask-layer>' | '<mask-position>' | '<mask-reference>' | '<mask-source>' | '<masking-mode>' | '<matrix()>' | '<matrix3d()>' | '<max()>' | '<media-and>' | '<media-condition-without-or>' | '<media-condition>' | '<media-feature>' | '<media-in-parens>' | '<media-not>' | '<media-or>' | '<media-query-list>' | '<media-query>' | '<media-type>' | '<mf-boolean>' | '<mf-name>' | '<mf-plain>' | '<mf-range>' | '<mf-value>' | '<min()>' | '<minmax()>' | '<mod()>' | '<name-repeat>' | '<named-color>' | '<namespace-prefix>' | '<ns-prefix>' | '<nth>' | '<number-one-or-greater>' | '<number-percentage>' | '<number-token>' | '<number-zero-one>' | '<number>' | '<numeric-figure-values>' | '<numeric-fraction-values>' | '<numeric-spacing-values>' | '<opacity()>' | '<outline-radius>' | '<overflow-position>' | '<page-body>' | '<page-margin-box-type>' | '<page-margin-box>' | '<page-selector-list>' | '<page-selector>' | '<page-size>' | '<paint()>' | '<paint>' | '<path()>' | '<percentage-token>' | '<percentage>' | '<perspective()>' | '<polygon()>' | '<position>' | '<pow()>' | '<pseudo-class-selector>' | '<pseudo-element-selector>' | '<pseudo-page>' | '<quote>' | '<radial-gradient()>' | '<ratio>' | '<relative-selector-list>' | '<relative-selector>' | '<relative-size>' | '<rem()>' | '<repeat-style>' | '<repeating-conic-gradient()>' | '<repeating-linear-gradient()>' | '<repeating-radial-gradient()>' | '<resolution>' | '<reversed-counter-name>' | '<rgb()>' | '<rgba()>' | '<right>' | '<rotate()>' | '<rotate3d()>' | '<rotateX()>' | '<rotateY()>' | '<rotateZ()>' | '<round()>' | '<rounding-strategy>' | '<saturate()>' | '<scale()>' | '<scale3d()>' | '<scaleX()>' | '<scaleY()>' | '<scaleZ()>' | '<scroll-timeline-axis>' | '<scroll-timeline-name>' | '<scroller>' | '<self-position>' | '<semicolon-token>' | '<semitones>' | '<sepia()>' | '<shadow-t>' | '<shadow>' | '<shape-box>' | '<shape-radius>' | '<shape>' | '<side-or-corner>' | '<sign()>' | '<sin()>' | '<single-animation-composition>' | '<single-animation-direction>' | '<single-animation-fill-mode>' | '<single-animation-iteration-count>' | '<single-animation-play-state>' | '<single-animation-timeline>' | '<single-animation>' | '<single-transition-property>' | '<single-transition>' | '<size>' | '<skew()>' | '<skewX()>' | '<skewY()>' | '<sqrt()>' | '<step-position>' | '<step-timing-function>' | '<string-token>' | '<string>' | '<subclass-selector>' | '<supports-condition>' | '<supports-decl>' | '<supports-feature>' | '<supports-in-parens>' | '<supports-selector-fn>' | '<svg-length>' | '<svg-writing-mode>' | '<symbol>' | '<tan()>' | '<target-counter()>' | '<target-counters()>' | '<target-text()>' | '<target>' | '<time-percentage>' | '<time>' | '<timeline-name>' | '<top>' | '<track-breadth>' | '<track-list>' | '<track-repeat>' | '<track-size>' | '<transform-function>' | '<transform-list>' | '<translate()>' | '<translate3d()>' | '<translateX()>' | '<translateY()>' | '<translateZ()>' | '<type-or-unit>' | '<type-selector>' | '<urange>' | '<url-modifier>' | '<url-token>' | '<url>' | '<var()>' | '<viewport-length>' | '<visual-box>' | '<whitespace-token>' | '<wq-name>' | '<x>' | '<y>' | '<zero>' | '<{-token>' | '<}-token>';
-export type ExtendedType = "<'color-profile'>" | "<'color-rendering'>" | "<'enable-background'>" | '<animatable-value>' | '<begin-value-list>' | '<class-list>' | '<clock-value>' | '<color-matrix>' | '<css-declaration-list>' | '<dasharray>' | '<end-value-list>' | '<key-points>' | '<key-splines>' | '<key-times>' | '<list-of-lengths>' | '<list-of-numbers>' | '<list-of-percentages>' | '<list-of-svg-feature-string>' | '<list-of-value>' | '<number-optional-number>' | '<origin>' | '<points>' | '<preserve-aspect-ratio>' | '<rotate>' | '<svg-font-size-adjust>' | '<svg-font-size>' | '<svg-path>' | '<system-language>' | '<text-coordinate>' | '<view-box>' | 'AbsoluteURL' | 'Accept' | 'Any' | 'AutoComplete' | 'BCP47' | 'BrowsingContextName' | 'BrowsingContextNameOrKeyword' | 'CustomElementName' | 'DOMID' | 'DateTime' | 'FunctionBody' | 'HTTPSchemaURL' | 'HashName' | 'IconSize' | 'Int' | 'ItemProp' | 'MIMEType' | 'NoEmptyAny' | 'Number' | 'OneCodePointChar' | 'OneLineAny' | 'Pattern' | 'SerializedPermissionsPolicy' | 'SourceSizeList' | 'Srcset' | 'TabIndex' | 'URL' | 'Uint' | 'XMLName' | 'Zero';
+export type ExtendedType = "<'color-profile'>" | "<'color-rendering'>" | "<'enable-background'>" | '<animatable-value>' | '<begin-value-list>' | '<class-list>' | '<clock-value>' | '<color-matrix>' | '<css-declaration-list>' | '<dasharray>' | '<end-value-list>' | '<key-points>' | '<key-splines>' | '<key-times>' | '<list-of-lengths>' | '<list-of-numbers>' | '<list-of-percentages>' | '<list-of-svg-feature-string>' | '<list-of-value>' | '<number-optional-number>' | '<origin>' | '<points>' | '<preserve-aspect-ratio>' | '<rotate>' | '<svg-font-size-adjust>' | '<svg-font-size>' | '<svg-path>' | '<system-language>' | '<text-coordinate>' | '<view-box>' | 'AbsoluteURL' | 'Accept' | 'Any' | 'AutoComplete' | 'BCP47' | 'BaseURL' | 'BrowsingContextName' | 'BrowsingContextNameOrKeyword' | 'CustomElementName' | 'DOMID' | 'DateTime' | 'FunctionBody' | 'HTTPSchemaURL' | 'HashName' | 'IconSize' | 'Int' | 'ItemProp' | 'MIMEType' | 'NavigableTargetName' | 'NavigableTargetNameOrKeyword' | 'NoEmptyAny' | 'Number' | 'OneCodePointChar' | 'OneLineAny' | 'Pattern' | 'SerializedPermissionsPolicy' | 'SourceSizeList' | 'Srcset' | 'TabIndex' | 'URL' | 'Uint' | 'XMLName' | 'Zero';
 export type HtmlAttrRequirement = 'Boolean';
 export interface TypesSchema {
     type?: Type;

package/lib/w3c/check-serialized-permissions-policy.js

@@ -66,7 +66,7 @@ function _checkSerializedPermissionsPolicy(value) {
              * > feature-identifier = 1*( ALPHA / DIGIT / "-")
              * > ```
              */
-            /[^\s]*/,
+            /\S*/,
             /**
              * RWS (Required whitespace)
              *
@@ -89,7 +89,7 @@ function _checkSerializedPermissionsPolicy(value) {
          * > feature-identifier = 1*( ALPHA / DIGIT / "-")
          * > ```
          */
-        if (!featureIdentifier || !featureIdentifier.match(/^[a-z0-9-]+$/i)) {
+        if (!featureIdentifier || !featureIdentifier.matches(/^[\da-z-]+$/i)) {
             return featureIdentifier.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'common', value: 'feature-identifier' }],
@@ -112,7 +112,7 @@ function _checkSerializedPermissionsPolicy(value) {
         }
         const allowListPatterns = [
             // Value
-            /[^\s]*/,
+            /\S*/,
             // Separator
             /\s*/,
         ];
@@ -139,10 +139,10 @@ function _checkSerializedPermissionsPolicy(value) {
             if (origin.reason !== 'syntax-error') {
                 return origin;
             }
-            if (allow.match(['*', "'self'", "'src'", "'none'"], true)) {
+            if (allow.matches(['*', "'self'", "'src'", "'none'"], true)) {
                 continue;
             }
-            if (allow.match(['self', 'src', 'none'], true)) {
+            if (allow.matches(['self', 'src', 'none'], true)) {
                 return allow.unmatched({
                     reason: 'missing-token',
                     expects: [{ type: 'common', value: 'single-quote' }],

package/lib/whatwg/check-autocomplete.js

@@ -128,7 +128,7 @@ export const checkAutoComplete = () => value => {
     // > an ordered set of space-separated tokens consisting of
     // > just autofill detail tokens
     // > (i.e. the "on" and "off" keywords are not allowed).
-    if (head.match(['on', 'off'], true)) {
+    if (head.matches(['on', 'off'], true)) {
         if (tail[0]) {
             acLog('[Unmatched ("%s")] Unexpected pair with "on" or "off": "%s"', value, tail.value);
             return tail[0].unmatched({
@@ -147,7 +147,7 @@ export const checkAutoComplete = () => value => {
     // > Optionally, a token whose first eight characters are
     // > an ASCII case-insensitive match for the string "section-",
     // > meaning that the field belongs to the named group.
-    if (head.match(namedGroup, true)) {
+    if (head.matches(namedGroup, true)) {
         hasNamedGroup = true;
         const sectionToken = tail.search(namedGroup);
         if (sectionToken) {
@@ -170,7 +170,7 @@ export const checkAutoComplete = () => value => {
     // > one of the following strings:
     // > - "shipping", meaning the field is part of the shipping address or contact information
     // > - "billing", meaning the field is part of the billing address or contact information
-    if (head.match(partOfAddress, true)) {
+    if (head.matches(partOfAddress, true)) {
         hasPartOfAddress = true;
         const partToken = tail.search(partOfAddress);
         if (partToken) {
@@ -194,14 +194,14 @@ export const checkAutoComplete = () => value => {
             return matched();
         }
     }
-    if (head.match(contactingTokens, true)) {
+    if (head.matches(contactingTokens, true)) {
         hasContactingToken = true;
         const contactableFiledToken = tail[0];
         if (!contactableFiledToken) {
             // Missing autofill field name but it is valid
             return matched();
         }
-        if (!contactableFiledToken.match(contactableFieldNames, true)) {
+        if (!contactableFiledToken.matches(contactableFieldNames, true)) {
             const candidate = getCandidate(contactableFiledToken.value, contactableFieldNames);
             acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, contactableFiledToken.value);
             return contactableFiledToken.unmatched({
@@ -215,7 +215,7 @@ export const checkAutoComplete = () => value => {
             });
         }
         if (tail[1]) {
-            if (tail[1].match(webauthnFieldNames)) {
+            if (tail[1].matches(webauthnFieldNames)) {
                 return matched();
             }
             const candidate = getCandidate(tail[1].value, webauthnFieldNames);
@@ -238,9 +238,9 @@ export const checkAutoComplete = () => value => {
         }
         return matched();
     }
-    if (head.match([...autofillFieldNames, ...contactableFieldNames], true)) {
+    if (head.matches([...autofillFieldNames, ...contactableFieldNames], true)) {
         if (tail[0]) {
-            if (tail[0].match(webauthnFieldNames)) {
+            if (tail[0].matches(webauthnFieldNames)) {
                 return matched();
             }
             const candidate = getCandidate(tail[0].value, webauthnFieldNames);
@@ -263,7 +263,7 @@ export const checkAutoComplete = () => value => {
         }
         return matched();
     }
-    if (head.match(webauthnFieldNames)) {
+    if (head.matches(webauthnFieldNames)) {
         return matched();
     }
     const expects = [
@@ -286,10 +286,7 @@ export const checkAutoComplete = () => value => {
         }
     }
     else if (!hasPartOfAddress) {
-        expects.unshift(...partOfAddress
-            .slice()
-            .reverse()
-            .map(token => ({
+        expects.unshift(...[...partOfAddress].reverse().map(token => ({
             type: 'const',
             value: token,
         })));

package/lib/whatwg/check-datetime/date-string.js

@@ -10,13 +10,13 @@ export const checkDateString = () => function checkDateString(value) {
         // YYYY
         /[^-]*/,
         // -
-        /[^0-9]?/,
+        /\D?/,
         // MM
         /[^-]*/,
         // -
-        /[^0-9]/,
+        /\D/,
         // DD
-        /.[0-9]*/,
+        /.\d*/,
     ]);
     log('Date: "%s" => %O', tokens.value, tokens);
     const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.month, datetimeTokenCheck.hyphen, datetimeTokenCheck.date, datetimeTokenCheck.extra);