@markuplint/types 4.0.0-alpha.3 → 4.0.0-dev.28

package/lib/css-syntax.js

@@ -30,7 +30,7 @@ export function cssSyntaxMatch(value, type) {
             ...tokenizers,
             ...type.syntax.def,
         };
-        Object.keys(types).forEach(key => {
+        for (const key of Object.keys(types)) {
             const valueOrChecker = types[key];
             if (typeof valueOrChecker === 'string') {
                 typesExtended[key] = valueOrChecker;
@@ -38,12 +38,14 @@ export function cssSyntaxMatch(value, type) {
             else if (valueOrChecker) {
                 typesCheckers[key] = valueOrChecker;
             }
-        });
+        }
         propsExtended = { ...type.syntax.properties };
         if (type.caseSensitive) {
             caseSensitive = true;
-            Object.keys(typesExtended).forEach(key => eachMimicCases(key, typesExtended));
-            Object.keys(propsExtended).forEach(key => eachMimicCases(key, propsExtended));
+            for (const key of Object.keys(typesExtended))
+                eachMimicCases(key, typesExtended);
+            for (const key of Object.keys(propsExtended))
+                eachMimicCases(key, propsExtended);
             value = mimicCases(value);
         }
         ref = type.ref;
@@ -53,11 +55,11 @@ export function cssSyntaxMatch(value, type) {
         types: typesExtended,
         properties: propsExtended,
     }).lexer;
-    Object.keys(typesCheckers).forEach(key => {
+    for (const key of Object.keys(typesCheckers)) {
         const checker = typesCheckers[key];
         // @ts-ignore
         lexer.addType_(key, (token, getNextToken) => checker?.(token, getNextToken, cssSyntaxMatch));
-    });
+    }
     const { isProp, name } = detectName(defName);
     // @ts-ignore
     const matcher = isProp ? lexer.properties[name] : lexer.types[name];
@@ -116,7 +118,7 @@ export function cssSyntaxMatch(value, type) {
 }
 function detectName(def) {
     const isProp = def.search("<'") === 0;
-    const name = def.replace(/^<'?|'?>$/g, '');
+    const name = def.replaceAll(/^<'?|'?>$/g, '');
     return {
         isProp,
         name,
@@ -140,8 +142,8 @@ obj) {
     obj[key] = mimicCases(value);
 }
 function mimicCases(value) {
-    return value.replace(/[A-Z]/g, $0 => `${MIMIC_TAG_L}${$0}${MIMIC_TAG_R}`);
+    return value.replaceAll(/[A-Z]/g, $0 => `${MIMIC_TAG_L}${$0}${MIMIC_TAG_R}`);
 }
 function deMimicCases(value) {
-    return value.replace(new RegExp(`${MIMIC_TAG_L}([A-Z])${MIMIC_TAG_R}`, 'g'), (_, $1) => $1);
+    return value.replaceAll(new RegExp(`${MIMIC_TAG_L}([A-Z])${MIMIC_TAG_R}`, 'g'), (_, $1) => $1);
 }

package/lib/defs.js

@@ -20,7 +20,7 @@ export const types = {
     },
     NoEmptyAny: {
         ref: '',
-        is: value => (0 < value.length ? matched() : unmatched(value, 'empty-token')),
+        is: value => (value.length > 0 ? matched() : unmatched(value, 'empty-token')),
     },
     OneLineAny: {
         ref: '',
@@ -91,9 +91,9 @@ export const types = {
             // NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
             const nameStartChar = /[:A-Z_a-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u{10000}-\u{EFFFF}]/u;
             // NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
-            const nameCharTail = /-|[.0-9\u00B7]|[\u0300-\u036F\u203F-\u2040]/;
+            const nameCharTail = /-|[\d.\u00B7]|[\u0300-\u036F\u203F\u2040]/;
             // Name ::= NameStartChar (NameChar)*
-            const name = RegExp(`(?:${nameStartChar.source})(?:${nameCharTail})*`, 'u');
+            const name = new RegExp(`(?:${nameStartChar.source})(?:${nameCharTail})*`, 'u');
             return name.test(value) ? matched() : unmatched(value, 'unexpected-token');
         },
     },

package/lib/enum.js

@@ -5,7 +5,7 @@ export function checkEnum(value, type, ref) {
     if (!disallowToSurroundBySpaces) {
         value = value.trim();
     }
-    let values = type.enum.slice();
+    let values = [...type.enum];
     if (caseInsensitive) {
         value = value.toLowerCase();
         values = type.enum.map(v => v.toLowerCase());

package/lib/get-candidate.js

@@ -6,14 +6,14 @@ export function getCandidate(value, ...candidates) {
     const list = candidates.flat(2).filter((s) => !!s);
     let candidate;
     let maxRatio = 0;
-    list.forEach(word => {
+    for (const word of list) {
         const dist = leven(value.trim().toLowerCase(), word.trim().toLowerCase());
         const ratio = 1 - dist / word.length;
         if (0.5 <= ratio && maxRatio < ratio) {
             candidate = word;
         }
         maxRatio = Math.max(ratio, maxRatio);
-    });
+    }
     if (value === candidate) {
         return;
     }

package/lib/keyword-type.js

@@ -35,12 +35,12 @@ function _checkKeywordType(value, type) {
         try {
             return cssSyntaxMatch(value, type);
         }
-        catch (e) {
-            if (e instanceof Error && e.message === 'MARKUPLINT_TYPE_NO_EXIST') {
+        catch (error) {
+            if (error instanceof Error && error.message === 'MARKUPLINT_TYPE_NO_EXIST') {
                 log("Allow all of any value because the type doesn't exist");
                 return matched();
             }
-            throw e;
+            throw error;
         }
     }
     const matches = isCSSSyntax(def) ? cssSyntaxMatch(value, def) : def.is(value);

package/lib/number.d.ts

@@ -1,3 +1,3 @@
 import type { Result } from './types.js';
-import type { Number } from './types.schema.js';
-export declare function checkNumber(value: string, type: Readonly<Number>, ref?: string): Result;
+import type { Number as TypeNumber } from './types.schema.js';
+export declare function checkNumber(value: string, type: Readonly<TypeNumber>, ref?: string): Result;

package/lib/number.js

@@ -6,8 +6,8 @@ export function checkNumber(value, type, ref) {
     }
     const syntaxMatched = type.type === 'float' ? isFloat(value) : isInt(value);
     if (syntaxMatched) {
-        const n = parseFloat(value);
-        if (!isFinite(n)) {
+        const n = Number.parseFloat(value);
+        if (!Number.isFinite(n)) {
             return unmatched(value, 'unexpected-token');
         }
         const clampable = type.clampable;

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.js

@@ -21,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;
@@ -79,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())) {
@@ -97,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('');
@@ -268,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;
                 }
             }
@@ -327,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();

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,7 +1,7 @@
 export class Token {
     static getCol(value, offset) {
         const lines = value.slice(0, offset).split(/\n/g);
-        return (lines[lines.length - 1] ?? '').length + 1;
+        return (lines.at(-1) ?? '').length + 1;
     }
     static getLine(value, offset) {
         return value.slice(0, offset).split(/\n/g).length;
@@ -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/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);

package/lib/whatwg/check-datetime/datetime-tokens.js

@@ -21,7 +21,7 @@ export const datetimeTokenCheck = {
                 partName: 'year',
             });
         }
-        if (!year.match(/^[0-9]+$/)) {
+        if (!year.matches(/^\d+$/)) {
             return year.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -56,7 +56,7 @@ export const datetimeTokenCheck = {
                 partName: 'month',
             });
         }
-        if (!month.match(/^[0-9]+$/)) {
+        if (!month.matches(/^\d+$/)) {
             return month.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -99,7 +99,7 @@ export const datetimeTokenCheck = {
                 partName: 'date',
             });
         }
-        if (!date.match(/^[0-9]+$/)) {
+        if (!date.matches(/^\d+$/)) {
             return date.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -140,7 +140,7 @@ export const datetimeTokenCheck = {
                 partName: 'hour',
             });
         }
-        if (!hour.match(/^[0-9]+$/)) {
+        if (!hour.matches(/^\d+$/)) {
             return hour.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -174,7 +174,7 @@ export const datetimeTokenCheck = {
                 partName: 'minute',
             });
         }
-        if (!minute.match(/^[0-9]+$/)) {
+        if (!minute.matches(/^\d+$/)) {
             return minute.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -208,7 +208,7 @@ export const datetimeTokenCheck = {
                 partName: 'second',
             });
         }
-        if (!second.match(/^[0-9]+$/)) {
+        if (!second.matches(/^\d+$/)) {
             return second.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -242,14 +242,14 @@ export const datetimeTokenCheck = {
                 partName: 'fractional part',
             });
         }
-        if (!secondFP.match(/^[0-9]+$/)) {
+        if (!secondFP.matches(/^\d+$/)) {
             return secondFP.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
                 partName: 'fractional part',
             });
         }
-        if (!(1 <= secondFP.length && secondFP.length <= 3)) {
+        if (!(secondFP.length > 0 && secondFP.length <= 3)) {
             return secondFP.unmatched({
                 reason: { type: 'out-of-range-length-digit', gte: 1, lte: 3 },
                 expects: [],
@@ -268,7 +268,7 @@ export const datetimeTokenCheck = {
                 partName: 'week',
             });
         }
-        if (!week.match(/^[0-9]+$/)) {
+        if (!week.matches(/^\d+$/)) {
             return week.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -303,7 +303,7 @@ export const datetimeTokenCheck = {
                 partName: 'datetime',
             });
         }
-        if (!hyphen.match('-')) {
+        if (!hyphen.matches('-')) {
             return hyphen.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'common', value: 'hyphen' }],
@@ -322,7 +322,7 @@ export const datetimeTokenCheck = {
                 partName: 'time',
             });
         }
-        if (!colon.match(':')) {
+        if (!colon.matches(':')) {
             return colon.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'common', value: 'colon' }],
@@ -339,7 +339,7 @@ export const datetimeTokenCheck = {
         if (!colon || !colon.value) {
             return matched();
         }
-        if (!colon.match(':')) {
+        if (!colon.matches(':')) {
             return colon.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'common', value: 'colon' }],
@@ -356,7 +356,7 @@ export const datetimeTokenCheck = {
         if (!dot || !dot.value) {
             return matched();
         }
-        if (!dot.match('.')) {
+        if (!dot.matches('.')) {
             return dot.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'common', value: 'decimal point' }],
@@ -377,7 +377,7 @@ export const datetimeTokenCheck = {
                 ],
             });
         }
-        if (!sep.match(['T', ' '])) {
+        if (!sep.matches(['T', ' '])) {
             return sep.unmatched({
                 reason: 'unexpected-token',
                 expects: [
@@ -397,7 +397,7 @@ export const datetimeTokenCheck = {
                 expects: [{ type: 'const', value: 'T' }],
             });
         }
-        if (!sep.match('T')) {
+        if (!sep.matches('T')) {
             return sep.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: 'T' }],
@@ -420,7 +420,7 @@ export const datetimeTokenCheck = {
                 partName: 'time-zone',
             });
         }
-        if (!colon.match(['+', '-'])) {
+        if (!colon.matches(['+', '-'])) {
             return colon.unmatched({
                 reason: 'unexpected-token',
                 expects: [
@@ -442,7 +442,7 @@ export const datetimeTokenCheck = {
                 partName: 'time-zone',
             });
         }
-        if (!weekSign.match('W')) {
+        if (!weekSign.matches('W')) {
             return weekSign.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: 'W' }],
@@ -502,5 +502,5 @@ export function getMaxWeekNum(year) {
         }
         date--;
     }
-    return NaN;
+    return Number.NaN;
 }

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

@@ -10,11 +10,11 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
     // PnDTnHnMnS
     const tokens = TokenCollection.fromPatterns(value, [
         // Start sign P
-        /[^0-9T]?/,
+        /[^\dT]?/,
         // date part
         /[^T]*/,
         // Time sign T
-        /[^0-9]?/,
+        /\D?/,
         // Time part
         /.*/,
     ]);
@@ -26,7 +26,7 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
                 partName: 'duration',
             });
         }
-        if (!p.match('P', false)) {
+        if (!p.matches('P', false)) {
             return p.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: 'P' }],
@@ -37,12 +37,12 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
         if (!d || !d.value) {
             return;
         }
-        const [num, sign, extra] = TokenCollection.fromPatterns(d, [/[0-9]+/, /./]);
+        const [num, sign, extra] = TokenCollection.fromPatterns(d, [/\d+/, /./]);
         if (!num) {
             return;
         }
         log('Date part: "%s" => %O', d.value, { num, sign });
-        if (!num.match(/^[0-9]+$/)) {
+        if (!num.matches(/^\d+$/)) {
             return num.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -55,7 +55,7 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
                 partName: 'date',
             });
         }
-        if (!sign.match('D', false)) {
+        if (!sign.matches('D', false)) {
             return sign.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: 'D' }],
@@ -74,7 +74,7 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
                 expects: [{ type: 'const', value: 'T' }],
             });
         }
-        if (!t.match('T', false)) {
+        if (!t.matches('T', false)) {
             return t.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: 'T' }],
@@ -93,11 +93,11 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
         }
         const timeTokens = TokenCollection.fromPatterns(time, [
             // Hour part
-            /[0-9]+(\.[0-9]*)?[^0-9]?/,
+            /\d+(\.\d*)?\D?/,
             // Minute part
-            /[0-9]+(\.[0-9]*)?[^0-9]?/,
+            /\d+(\.\d*)?\D?/,
             // Second part
-            /[0-9]+(\.[0-9]*)?[^0-9]?/,
+            /\d+(\.\d*)?\D?/,
         ]);
         log('Time part: "%s" => %O', timeTokens.value, timeTokens);
         const [h, m, s] = timeTokens;
@@ -120,12 +120,12 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
                     reason: 'extra-token',
                 });
             }
-            const [num, dpfp, sign] = TokenCollection.fromPatterns(t, [/[0-9]+/, /(\.[0-9]*)?/, /[^0-9]+/]);
+            const [num, dpfp, sign] = TokenCollection.fromPatterns(t, [/\d+/, /(\.\d*)?/, /\D+/]);
             if (!num) {
                 continue;
             }
             log('Time part (h|m|s): "%s" => %O', t.value, { num, dpfp, sign });
-            if (!num.match(/^[0-9]+$/)) {
+            if (!num.matches(/^\d+$/)) {
                 return num.unmatched({
                     reason: 'unexpected-token',
                     expects: [{ type: 'common', value: 'number' }],
@@ -133,12 +133,12 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
                 });
             }
             if (dpfp && dpfp.value) {
-                const [dp, fp] = TokenCollection.fromPatterns(dpfp, [/\./, /[0-9]+/]);
+                const [dp, fp] = TokenCollection.fromPatterns(dpfp, [/\./, /\d+/]);
                 if (!dp) {
                     continue;
                 }
                 log('Second fractional part (h|m|s): "%s" => %O', dpfp.value, { dp, fp });
-                if (!dp.match('.')) {
+                if (!dp.matches('.')) {
                     return dp.unmatched({
                         reason: 'unexpected-token',
                         expects: [],
@@ -151,14 +151,14 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
                         partName: 'second',
                     });
                 }
-                if (!fp.match(/^[0-9]+$/)) {
+                if (!fp.matches(/^\d+$/)) {
                     return fp.unmatched({
                         reason: 'unexpected-token',
                         expects: [],
                         partName: 'fractional part',
                     });
                 }
-                if (!(1 <= fp.length && fp.length <= 3)) {
+                if (!(fp.length > 0 && fp.length <= 3)) {
                     return fp.unmatched({
                         reason: { type: 'out-of-range-length-digit', gte: 1, lte: 3 },
                         expects: [],
@@ -177,16 +177,16 @@ export const checkDurationISO8601LikeString = () => function checkDurationISO860
                     partName: 'time',
                 });
             }
-            if (specified.has('M') && sign.match('H', false)) {
+            if (specified.has('M') && sign.matches('H', false)) {
                 return sign.unmatched({
                     reason: 'unexpected-token',
                     expects: [{ type: 'const', value: 'S' }],
                     partName: 'time',
                 });
             }
-            if (!sign.match(['H', 'M', 'S'], false) ||
-                (sign.match('H', false) && specified.has('H')) ||
-                (sign.match('M', false) && specified.has('M'))) {
+            if (!sign.matches(['H', 'M', 'S'], false) ||
+                (sign.matches('H', false) && specified.has('H')) ||
+                (sign.matches('M', false) && specified.has('M'))) {
                 return sign.unmatched({
                     reason: 'unexpected-token',
                     expects: expects.filter(e => !specified.has(e.value)),
@@ -214,16 +214,16 @@ export const checkDurationComponentListString = () => function checkDurationComp
         // 2. One or more ASCII digits, representing a number of time units,
         // scaled by the duration time component scale specified (see below)
         // to represent a number of seconds.
-        /[0-9]+/,
+        /\d+/,
         // 3. If the duration time component scale specified is 1 (i.e. the units are seconds),
         // then, optionally, a U+002E FULL STOP character (.) followed by
         // one, two, or three ASCII digits, representing a fraction of a second.
-        /(\.[0-9]*)?/,
+        /(\.\d*)?/,
         // 4. Zero or more ASCII whitespace.
         /\s*/,
         // 5. One of the following characters, representing the duration time component scale
         // of the time unit used in the numeric part of the duration time component:
-        /[^0-9]/,
+        /\D/,
         // 6. Zero or more ASCII whitespace.
         /\s*/,
     ];
@@ -232,7 +232,8 @@ export const checkDurationComponentListString = () => function checkDurationComp
     const specified = new Set();
     for (const component of components) {
         log('Duration Component: "%s" => %O', component.value, component);
-        const [, , dpfp, , unit] = component;
+        const dpfp = component[2];
+        const unit = component[4];
         const res = component.eachCheck(ws => { }, num => {
             if (!num || !num.value) {
                 const reason = dpfp?.value || unit?.value ? 'unexpected-token' : 'missing-token';
@@ -258,21 +259,21 @@ export const checkDurationComponentListString = () => function checkDurationComp
                     partName: 'unit',
                 });
             }
-            const [, fp] = TokenCollection.fromPatterns(dpfp, [/\./, /[0-9]+/]);
+            const [, fp] = TokenCollection.fromPatterns(dpfp, [/\./, /\d+/]);
             if (!fp || !fp.value) {
                 return unmatched('', 'missing-token', {
                     expects: [{ type: 'common', value: 'fractional part' }],
                     partName: 'fractional part',
                 });
             }
-            if (!fp.match(/[0-9]+/)) {
+            if (!fp.matches(/\d+/)) {
                 return fp.unmatched({
                     reason: 'unexpected-token',
                     expects: [{ type: 'common', value: 'fractional part' }],
                     partName: 'fractional part',
                 });
             }
-            if (!(1 <= fp.length && fp.length <= 3)) {
+            if (!(fp.length > 0 && fp.length <= 3)) {
                 return fp.unmatched({
                     reason: { type: 'out-of-range-length-digit', gte: 1, lte: 3 },
                     expects: [],
@@ -301,14 +302,14 @@ export const checkDurationComponentListString = () => function checkDurationComp
                     partName: 'unit',
                 });
             }
-            if (dpfp && dpfp.value && unit.match(['w', 'd', 'h', 'm'])) {
+            if (dpfp && dpfp.value && unit.matches(['w', 'd', 'h', 'm'])) {
                 return unit.unmatched({
                     reason: 'unexpected-token',
                     expects: [{ type: 'const', value: 's' }],
                     partName: 'unit',
                 });
             }
-            if (!unit.match(['w', 'd', 'h', 'm', 's'])) {
+            if (!unit.matches(['w', 'd', 'h', 'm', 's'])) {
                 return unit.unmatched({
                     reason: 'unexpected-token',
                     expects,

package/lib/whatwg/check-datetime/global-date-and-time-string.js

@@ -12,23 +12,23 @@ export const checkGlobalDateAndTimeString = () => function checkGlobalDateAndTim
         // YYYY
         /[^-]*/,
         // -
-        /[^0-9]?/,
+        /\D?/,
         // MM
         /[^-]*/,
         // -
-        /[^0-9]?/,
+        /\D?/,
         // DD
-        /[^T\s]*/,
+        /[^\sT]*/,
         // T \s
-        /[^0-9]?/,
+        /\D?/,
         // hh
         /[^:]*/,
         // :
-        /[^0-9]?/,
+        /\D?/,
         // mm
-        /[^:Z+-]*/,
+        /[^+:Z-]*/,
         // :ss.sss
-        /(:[^Z+-]*)?/,
+        /(:[^+Z-]*)?/,
         // time-zone
         /.*/,
     ]);
@@ -37,7 +37,7 @@ export const checkGlobalDateAndTimeString = () => function checkGlobalDateAndTim
         if (!second || !second.value) {
             return;
         }
-        const secondTokens = TokenCollection.fromPatterns(second, [/:?/, /[0-9]*/, /\.?/, /[0-9]*/]);
+        const secondTokens = TokenCollection.fromPatterns(second, [/:?/, /\d*/, /\.?/, /\d*/]);
         log('Second Part: "%s" => %O', secondTokens.value, secondTokens);
         const res = secondTokens.eachCheck(datetimeTokenCheck.colon, datetimeTokenCheck.second, datetimeTokenCheck.decimalPointOrEnd, datetimeTokenCheck.secondFractionalPart);
         if (!res.matched) {

package/lib/whatwg/check-datetime/local-date-and-time-string.js

@@ -10,29 +10,29 @@ export const checkLocalDateAndTimeString = () => function checkLocalDateAndTimeS
         // YYYY
         /[^-]*/,
         // -
-        /[^0-9]?/,
+        /\D?/,
         // MM
         /[^-]*/,
         // -
-        /[^0-9]?/,
+        /\D?/,
         // DD
-        /[^T\s]*/,
+        /[^\sT]*/,
         // T
-        /[^0-9]?/,
+        /\D?/,
         // hh
         /[^:]*/,
         // :
-        /[^0-9]?/,
+        /\D?/,
         // mm
         /[^:]*/,
         // :
-        /[^0-9]?/,
+        /\D?/,
         // ss
         /[^.]*/,
         // .
-        /[^0-9]?/,
+        /\D?/,
         // sss
-        /.[0-9]*/,
+        /.\d*/,
     ]);
     log('Local Date and Time: "%s" => %O', tokens.value, tokens);
     const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.month, datetimeTokenCheck.hyphen, datetimeTokenCheck.date, datetimeTokenCheck.localDateTimeSeparator, datetimeTokenCheck.hour, datetimeTokenCheck.colon, datetimeTokenCheck.minute, datetimeTokenCheck.colonOrEnd, datetimeTokenCheck.second, datetimeTokenCheck.decimalPointOrEnd, datetimeTokenCheck.secondFractionalPart, datetimeTokenCheck.extra);
@@ -50,29 +50,29 @@ export const checkNormalizedLocalDateAndTimeString = () => function checkNormali
         // YYYY
         /[^-]*/,
         // -
-        /[^0-9]?/,
+        /\D?/,
         // MM
         /[^-]*/,
         // -
-        /[^0-9]?/,
+        /\D?/,
         // DD
         /[^T]*/,
         // T
-        /[^0-9]?/,
+        /\D?/,
         // hh
         /[^:]*/,
         // :
-        /[^0-9]?/,
+        /\D?/,
         // mm
         /[^:]*/,
         // :
-        /[^0-9]?/,
+        /\D?/,
         // ss
         /[^.]*/,
         // .
-        /[^0-9]?/,
+        /\D?/,
         // sss
-        /.[0-9]*/,
+        /.\d*/,
     ]);
     log('Normalized Local Date and Time: "%s" => %O', tokens.value, tokens);
     const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.month, datetimeTokenCheck.hyphen, datetimeTokenCheck.date, datetimeTokenCheck.normalizedlocalDateTimeSeparator, datetimeTokenCheck.hour, datetimeTokenCheck.colon, datetimeTokenCheck.minute, datetimeTokenCheck.colonOrEnd, datetimeTokenCheck.second, datetimeTokenCheck.decimalPointOrEnd, datetimeTokenCheck.secondFractionalPart, datetimeTokenCheck.extra);
@@ -86,7 +86,8 @@ export const checkNormalizedLocalDateAndTimeString = () => function checkNormali
      * > (e.g. omitting the seconds component entirely
      * > if the given time is zero seconds past the minute)
      */
-    const [, , , , , , , , , , second, , fp] = tokens;
+    const second = tokens[10];
+    const fp = tokens[12];
     if (!second || !fp) {
         log('Failed: %O', res);
         return res;

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

@@ -6,7 +6,7 @@ import { datetimeTokenCheck } from './datetime-tokens.js';
  */
 export const checkMonthString = () => function checkMonthString(value) {
     log('CHECK: month-string');
-    const tokens = TokenCollection.fromPatterns(value, [/[^-]*/, /[^0-9]?/, /.[0-9]*/]);
+    const tokens = TokenCollection.fromPatterns(value, [/[^-]*/, /\D?/, /.\d*/]);
     log('Month: "%s" => %O', tokens.value, tokens);
     const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.month, datetimeTokenCheck.extra);
     if (!res.matched) {

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

@@ -10,17 +10,17 @@ export const checkTimeString = () => function checkTimeString(value) {
         // hh
         /[^:]*/,
         // :
-        /[^0-9]?/,
+        /\D?/,
         // mm
         /[^:]*/,
         // :
-        /[^0-9]?/,
+        /\D?/,
         // ss
         /[^.]*/,
         // .
-        /[^0-9]?/,
+        /\D?/,
         // sss
-        /.[0-9]*/,
+        /.\d*/,
     ]);
     log('Time: "%s" => %O', tokens.value, tokens);
     const res = tokens.eachCheck(datetimeTokenCheck.hour, datetimeTokenCheck.colon, datetimeTokenCheck.minute, datetimeTokenCheck.colonOrEnd, datetimeTokenCheck.second, datetimeTokenCheck.decimalPointOrEnd, datetimeTokenCheck.secondFractionalPart);

package/lib/whatwg/check-datetime/time-zone-offset-string.js

@@ -13,13 +13,13 @@ export function parseTimeZone(zone) {
     const value = typeof zone === 'string' ? zone : zone.value;
     const zoneTokens = TokenCollection.fromPatterns(zone, [
         // Z + -
-        /[^0-9]?/,
+        /\D?/,
         // hh
         /[^:]{0,2}/,
         // :
-        /[^0-9]?/,
+        /\D?/,
         // mm
-        /.[0-9]*/,
+        /.\d*/,
     ]);
     log('Time-zone Part: "%s" => %O', value, zoneTokens);
     const res = zoneTokens.eachCheck((sign, tail) => {
@@ -33,7 +33,7 @@ export function parseTimeZone(zone) {
                 partName: 'time-zone',
             });
         }
-        if (sign.match('Z')) {
+        if (sign.matches('Z')) {
             if (tail.value) {
                 return (tail[0]?.unmatched({
                     reason: 'extra-token',
@@ -41,7 +41,7 @@ export function parseTimeZone(zone) {
             }
             return matched();
         }
-        if (!sign.match(['+', '-'])) {
+        if (!sign.matches(['+', '-'])) {
             return sign.unmatched({
                 reason: 'unexpected-token',
                 expects: [
@@ -55,7 +55,7 @@ export function parseTimeZone(zone) {
         if (!colon || !colon.value) {
             return;
         }
-        if (!colon.match(':')) {
+        if (!colon.matches(':')) {
             return colon.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: ':' }],

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

@@ -12,9 +12,9 @@ export const checkWeekString = () => function checkWeekString(value) {
         // -
         /[^W]?/,
         // W
-        /[^0-9]?/,
+        /\D?/,
         // ww
-        /.[0-9]*/,
+        /.\d*/,
     ]);
     log('Week: "%s" => %O', tokens.value, tokens);
     const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.weekSign, datetimeTokenCheck.week, datetimeTokenCheck.extra);

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

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

package/lib/whatwg/is-abs-url.js

@@ -16,14 +16,14 @@ export const isAbsURL = () => {
         try {
             new URL(value);
         }
-        catch (e) {
-            if (e && typeof e === 'object' && 'code' in e) {
-                // @ts-ignore
-                if (e.code === 'ERR_INVALID_URL') {
-                    return false;
-                }
+        catch (error) {
+            if (error &&
+                typeof error === 'object' &&
+                'code' in error && // @ts-ignore
+                error.code === 'ERR_INVALID_URL') {
+                return false;
             }
-            throw e;
+            throw error;
         }
         return true;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/types",
-	"version": "4.0.0-alpha.3",
+	"version": "4.0.0-dev.28+0131de5e",
 	"description": "Type declaration and value checker",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,16 +25,15 @@
 		"schema": "ts-node './gen/types.ts'; json2ts './types.schema.json' > './src/types.schema.ts'; prettier './src/types.schema.ts' './types.schema.json' --write; eslint './src/types.schema.ts' --fix; tsc;"
 	},
 	"dependencies": {
-		"@types/bcp-47": "^2.0.0",
-		"@types/css-tree": "^2.3.2",
-		"@types/debug": "^4.1.9",
-		"@types/whatwg-mimetype": "3.0.0",
+		"@types/css-tree": "^2.3.3",
+		"@types/debug": "^4.1.10",
+		"@types/whatwg-mimetype": "3.0.1",
 		"bcp-47": "^2.1.0",
 		"css-tree": "^2.3.1",
 		"debug": "^4.3.4",
 		"leven": "^4.0.0",
-		"type-fest": "^4.3.1",
+		"type-fest": "^4.5.0",
 		"whatwg-mimetype": "^3.0.0"
 	},
-	"gitHead": "380836f7adc1ff7e8eaf9d869e68d29eee8f3b7e"
+	"gitHead": "0131de5ea9dd6d3fd5472d7b414b66644c758881"
 }