@markuplint/types 2.2.0 → 3.0.0-alpha.1

package/lib/token/token.d.ts

@@ -1,14 +1,12 @@
 import type { UnmatchedResult, UnmatchedResultOptions, UnmatchedResultReason } from '../types';
 export declare class Token {
     #private;
-    static getType(value: string, separators?: string[]): 1 | 13 | 18;
-    static getLine(value: string, offset: number): number;
-    static getCol(value: string, offset: number): number;
-    static shiftLocation(token: Token, offset: number): {
-        offset: number;
-        line: number;
-        column: number;
-    };
+    /**
+     * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
+     */
+    static readonly Comma = 18;
+    static readonly Ident = 1;
+    static readonly WhiteSpace = 13;
     /**
      * ASCII whitespace is
      * - U+0009 TAB
@@ -20,36 +18,38 @@ export declare class Token {
      * @see https://infra.spec.whatwg.org/#ascii-whitespace
      */
     static readonly whitespace: ReadonlyArray<string>;
-    /**
-     * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
-     */
-    static readonly Ident = 1;
-    static readonly WhiteSpace = 13;
-    static readonly Comma = 18;
+    static getCol(value: string, offset: number): number;
+    static getLine(value: string, offset: number): number;
+    static getType(value: string, separators?: string[]): 1 | 18 | 13;
+    static shiftLocation(token: Token, offset: number): {
+        offset: number;
+        line: number;
+        column: number;
+    };
+    readonly offset: number;
     readonly type: number;
     readonly value: string;
-    readonly offset: number;
     constructor(value: string, offset: number, originalValue: string, separators?: string[]);
     get length(): number;
     get origin(): string;
-    unmatched(options?: UnmatchedResultOptions & {
-        ref?: string;
-        reason?: UnmatchedResultReason;
-    }): UnmatchedResult;
     /**
      *
      * @param value The token value or the token type or its list
      */
-    match(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
+    includes(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
     /**
      *
      * @param value The token value or the token type or its list
      */
-    includes(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
-    toNumber(): number;
+    match(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
     toJSON(): {
         type: number;
         value: string;
         offset: number;
     };
+    toNumber(): number;
+    unmatched(options?: UnmatchedResultOptions & {
+        ref?: string;
+        reason?: UnmatchedResultReason;
+    }): UnmatchedResult;
 }

package/lib/token/token.js

@@ -11,6 +11,13 @@ class Token {
         this.offset = offset;
         tslib_1.__classPrivateFieldSet(this, _Token_originalValue, originalValue, "f");
     }
+    static getCol(value, offset) {
+        const lines = value.slice(0, offset).split(/\n/g);
+        return lines[lines.length - 1].length + 1;
+    }
+    static getLine(value, offset) {
+        return value.slice(0, offset).split(/\n/g).length;
+    }
     static getType(value, separators) {
         if (Token.whitespace.includes(value[0])) {
             return Token.WhiteSpace;
@@ -23,13 +30,6 @@ class Token {
         }
         return Token.Ident;
     }
-    static getLine(value, offset) {
-        return value.slice(0, offset).split(/\n/g).length;
-    }
-    static getCol(value, offset) {
-        const lines = value.slice(0, offset).split(/\n/g);
-        return lines[lines.length - 1].length + 1;
-    }
     static shiftLocation(token, offset) {
         const shifted = token.offset + offset;
         return {
@@ -44,32 +44,18 @@ class Token {
     get origin() {
         return tslib_1.__classPrivateFieldGet(this, _Token_originalValue, "f");
     }
-    unmatched(options) {
-        var _a;
-        return {
-            ...options,
-            matched: false,
-            ref: (options === null || options === void 0 ? void 0 : options.ref) || null,
-            raw: this.value,
-            offset: this.offset,
-            length: this.value.length,
-            line: Token.getLine(tslib_1.__classPrivateFieldGet(this, _Token_originalValue, "f"), this.offset),
-            column: Token.getCol(tslib_1.__classPrivateFieldGet(this, _Token_originalValue, "f"), this.offset),
-            reason: (_a = options === null || options === void 0 ? void 0 : options.reason) !== null && _a !== void 0 ? _a : 'syntax-error',
-        };
-    }
     /**
      *
      * @param value The token value or the token type or its list
      */
-    match(value, caseInsensitive) {
+    includes(value, caseInsensitive) {
         if (Array.isArray(value)) {
-            return value.some(v => this.match(v));
+            return value.some(v => this.includes(v));
         }
         if (typeof value === 'string') {
             const a = caseInsensitive ? this.value.toLowerCase() : this.value;
             const b = caseInsensitive ? value.toLowerCase() : value;
-            return a === b;
+            return a.indexOf(b) !== -1;
         }
         if (value instanceof RegExp) {
             const pattern = new RegExp(value, caseInsensitive ? 'i' : '');
@@ -81,14 +67,14 @@ class Token {
      *
      * @param value The token value or the token type or its list
      */
-    includes(value, caseInsensitive) {
+    match(value, caseInsensitive) {
         if (Array.isArray(value)) {
-            return value.some(v => this.includes(v));
+            return value.some(v => this.match(v));
         }
         if (typeof value === 'string') {
             const a = caseInsensitive ? this.value.toLowerCase() : this.value;
             const b = caseInsensitive ? value.toLowerCase() : value;
-            return a.indexOf(b) !== -1;
+            return a === b;
         }
         if (value instanceof RegExp) {
             const pattern = new RegExp(value, caseInsensitive ? 'i' : '');
@@ -96,9 +82,6 @@ class Token {
         }
         return this.type === value;
     }
-    toNumber() {
-        return parseFloat(this.value);
-    }
     toJSON() {
         return {
             type: this.type,
@@ -106,9 +89,32 @@ class Token {
             offset: this.offset,
         };
     }
+    toNumber() {
+        return parseFloat(this.value);
+    }
+    unmatched(options) {
+        var _a;
+        return {
+            ...options,
+            matched: false,
+            ref: (options === null || options === void 0 ? void 0 : options.ref) || null,
+            raw: this.value,
+            offset: this.offset,
+            length: this.value.length,
+            line: Token.getLine(tslib_1.__classPrivateFieldGet(this, _Token_originalValue, "f"), this.offset),
+            column: Token.getCol(tslib_1.__classPrivateFieldGet(this, _Token_originalValue, "f"), this.offset),
+            reason: (_a = options === null || options === void 0 ? void 0 : options.reason) !== null && _a !== void 0 ? _a : 'syntax-error',
+        };
+    }
 }
 exports.Token = Token;
 _Token_originalValue = new WeakMap();
+/**
+ * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
+ */
+Token.Comma = 18;
+Token.Ident = 1;
+Token.WhiteSpace = 13;
 /**
  * ASCII whitespace is
  * - U+0009 TAB
@@ -120,9 +126,3 @@ _Token_originalValue = new WeakMap();
  * @see https://infra.spec.whatwg.org/#ascii-whitespace
  */
 Token.whitespace = ['\u0009', '\u000A', '\u000C', '\u000D', '\u0020'];
-/**
- * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
- */
-Token.Ident = 1;
-Token.WhiteSpace = 13;
-Token.Comma = 18;

package/lib/types.d.ts

@@ -16,7 +16,7 @@ export declare type UnmatchedResultOptions = {
     partName?: string;
     expects?: Expect[];
     extra?: Expect;
-    candicate?: string;
+    candidate?: string;
 };
 export declare 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' | {
     type: 'out-of-range';
@@ -37,7 +37,7 @@ export declare type MatchedResult = {
     matched: true;
 };
 export declare type Expect = {
-    type: 'const' | 'format' | 'syntax' | 'regxp' | 'common';
+    type: 'const' | 'format' | 'syntax' | 'regexp' | 'common';
     value: string;
 };
 export declare type FormattedPrimitiveTypeCheck = (value: string) => boolean;

package/lib/types.schema.d.ts

@@ -32,6 +32,9 @@ export interface List {
  * [Enumerated attributes](https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#enumerated-attribute)
  */
 export interface Enum {
+    /**
+     * @minItems 1
+     */
     enum: [string, ...string[]];
     disallowToSurroundBySpaces?: boolean;
     caseInsensitive?: boolean;

package/lib/whatwg/check-autocomplete.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAutoComplete = void 0;
 const debug_1 = require("../debug");
-const get_candicate_1 = require("../get-candicate");
+const get_candidate_1 = require("../get-candidate");
 const match_result_1 = require("../match-result");
 const token_1 = require("../token");
 const acLog = debug_1.log.extend('autocomplete');
@@ -86,7 +86,7 @@ const contactableFieldNames = [
  * @see https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-webauthn
  */
 const webauthnFieldNames = ['webauthn'];
-const URL_AUTOCOMPLET = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete';
+const URL_AUTOCOMPLETE = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete';
 const URL_ON_OFF = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofilling-form-controls:-the-autocomplete-attribute:attr-fe-autocomplete-on-2';
 const URL_NAMED_GROUP = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-section';
 const URL_PART_OF_ADDRESS = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-shipping';
@@ -113,14 +113,14 @@ const checkAutoComplete = () => value => {
                 value: 'autocomplete',
             },
         ],
-        ref: URL_AUTOCOMPLET,
+        ref: URL_AUTOCOMPLETE,
     });
     if (!listingChecked.matched) {
         acLog('Unmatch: %s', listingChecked.reason);
         return listingChecked;
     }
-    const idents = tokens.getIdentTokens();
-    const headAndTail1 = idents.headAndTail();
+    const identTokens = tokens.getIdentTokens();
+    const headAndTail1 = identTokens.headAndTail();
     let { head, tail } = headAndTail1;
     if (!head) {
         // Never
@@ -205,7 +205,7 @@ const checkAutoComplete = () => value => {
             return (0, match_result_1.matched)();
         }
         if (!contactableFiledToken.match(contactableFieldNames, true)) {
-            const candicate = (0, get_candicate_1.getCandicate)(contactableFiledToken.value, contactableFieldNames);
+            const candidate = (0, get_candidate_1.getCandidate)(contactableFiledToken.value, contactableFieldNames);
             acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, contactableFiledToken.value);
             return contactableFiledToken.unmatched({
                 reason: 'unexpected-token',
@@ -213,7 +213,7 @@ const checkAutoComplete = () => value => {
                     type: 'const',
                     value: token,
                 })),
-                candicate,
+                candidate,
                 ref: URL_CONTACTABLE_FIELD,
             });
         }
@@ -221,9 +221,9 @@ const checkAutoComplete = () => value => {
             if (tail[1].match(webauthnFieldNames)) {
                 return (0, match_result_1.matched)();
             }
-            const candicate = (0, get_candicate_1.getCandicate)(tail[1].value, webauthnFieldNames);
-            if (candicate) {
-                acLog('[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ', value, tail[1].value, candicate);
+            const candidate = (0, get_candidate_1.getCandidate)(tail[1].value, webauthnFieldNames);
+            if (candidate) {
+                acLog('[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ', value, tail[1].value, candidate);
             }
             else {
                 acLog('[Unmatched ("%s")] Unnecessarily token: "%s"', value, tail[1].value);
@@ -246,9 +246,9 @@ const checkAutoComplete = () => value => {
             if (tail[0].match(webauthnFieldNames)) {
                 return (0, match_result_1.matched)();
             }
-            const candicate = (0, get_candicate_1.getCandicate)(tail[0].value, webauthnFieldNames);
-            if (candicate) {
-                acLog('[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ', value, tail[0].value, candicate);
+            const candidate = (0, get_candidate_1.getCandidate)(tail[0].value, webauthnFieldNames);
+            if (candidate) {
+                acLog('[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ', value, tail[0].value, candidate);
             }
             else {
                 acLog('[Unmatched ("%s")] Unnecessarily token: "%s"', value, tail[0].value);
@@ -275,7 +275,7 @@ const checkAutoComplete = () => value => {
             value: 'autofill field name',
         },
     ];
-    let candicate;
+    let candidate;
     if (!hasNamedGroup) {
         expects.unshift({
             type: 'common',
@@ -283,9 +283,9 @@ const checkAutoComplete = () => value => {
         });
         // Potentially typo a named group
         const [prefix, namedGroupStr] = head.value.split('-');
-        const candicatePrefix = (0, get_candicate_1.getCandicate)(prefix, 'section');
-        if (candicatePrefix) {
-            candicate = `${candicatePrefix}-${namedGroupStr || ''}`;
+        const candidatePrefix = (0, get_candidate_1.getCandidate)(prefix, 'section');
+        if (candidatePrefix) {
+            candidate = `${candidatePrefix}-${namedGroupStr || ''}`;
         }
     }
     else if (!hasPartOfAddress) {
@@ -296,18 +296,18 @@ const checkAutoComplete = () => value => {
             type: 'const',
             value: token,
         })));
-        candicate = (0, get_candicate_1.getCandicate)(head.value, partOfAddress, autofillFieldNames, contactingTokens, contactableFieldNames);
+        candidate = (0, get_candidate_1.getCandidate)(head.value, partOfAddress, autofillFieldNames, contactingTokens, contactableFieldNames);
     }
     else if (!hasContactingToken) {
         expects.push(...contactingTokens.slice().map(token => ({
             type: 'const',
             value: token,
         })));
-        candicate = (0, get_candicate_1.getCandicate)(head.value, autofillFieldNames, contactingTokens, contactableFieldNames);
+        candidate = (0, get_candidate_1.getCandidate)(head.value, autofillFieldNames, contactingTokens, contactableFieldNames);
     }
-    candicate = candicate || (0, get_candicate_1.getCandicate)(head.value, autofillFieldNames);
-    if (candicate) {
-        acLog('[Unmatched ("%s")] Unexpected token: "%s", Do you mean "%s"? ', value, head.value, candicate);
+    candidate = candidate || (0, get_candidate_1.getCandidate)(head.value, autofillFieldNames);
+    if (candidate) {
+        acLog('[Unmatched ("%s")] Unexpected token: "%s", Do you mean "%s"? ', value, head.value, candidate);
     }
     else {
         acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, head.value);
@@ -315,7 +315,7 @@ const checkAutoComplete = () => value => {
     return head.unmatched({
         reason: 'unexpected-token',
         expects,
-        candicate,
+        candidate,
         ref: URL_AUTOFILL_FIELD,
     });
 };

package/lib/whatwg/check-autocomplete.spec.js

@@ -48,7 +48,7 @@ test('unexpected-token', () => {
             { type: 'const', value: 'shipping' },
             { type: 'common', value: 'autofill field name' },
         ],
-        candicate: undefined,
+        candidate: undefined,
         ref: 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill-field',
     });
 });
@@ -65,7 +65,7 @@ test('unexpected-token', () => {
             { type: 'common', value: 'autofill named group' },
             { type: 'common', value: 'autofill field name' },
         ],
-        candicate: undefined,
+        candidate: undefined,
         ref: 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill-field',
     });
 });
@@ -83,7 +83,7 @@ test('unexpected-token', () => {
             { type: 'const', value: 'shipping' },
             { type: 'common', value: 'autofill field name' },
         ],
-        candicate: 'name',
+        candidate: 'name',
         ref: 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill-field',
     });
     expect(check('section-foo shipping neme')).toStrictEqual({
@@ -102,12 +102,12 @@ test('unexpected-token', () => {
             { type: 'const', value: 'fax' },
             { type: 'const', value: 'pager' },
         ],
-        candicate: 'name',
+        candidate: 'name',
         ref: 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill-field',
     });
-    expect(check('section-foo shipping home neme')).toStrictEqual({
+    expect(check('section-foo shipping home name')).toStrictEqual({
         matched: false,
-        raw: 'neme',
+        raw: 'name',
         offset: 26,
         length: 4,
         line: 1,
@@ -125,7 +125,7 @@ test('unexpected-token', () => {
             { type: 'const', value: 'email' },
             { type: 'const', value: 'impp' },
         ],
-        candicate: undefined,
+        candidate: undefined,
         ref: 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofilling-form-controls:-the-autocomplete-attribute:attr-fe-autocomplete-tel',
     });
     expect(check('section-foo shipping home emall')).toStrictEqual({
@@ -148,7 +148,7 @@ test('unexpected-token', () => {
             { type: 'const', value: 'email' },
             { type: 'const', value: 'impp' },
         ],
-        candicate: 'email',
+        candidate: 'email',
         ref: 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofilling-form-controls:-the-autocomplete-attribute:attr-fe-autocomplete-tel',
     });
 });
@@ -373,7 +373,7 @@ test('typo', () => {
             { type: 'common', value: 'autofill named group' },
             { type: 'common', value: 'autofill field name' },
         ],
-        candicate: 'section-foo',
+        candidate: 'section-foo',
         ref: 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill-field',
     });
 });

package/lib/whatwg/check-datetime/datetime-tokens.d.ts

@@ -1,3 +1,3 @@
 import type { TokenEachCheck } from '../../token/token-collection';
-export declare const datetimeTokenCheck: Record<'year' | 'month' | 'date' | 'hour' | 'minute' | 'second' | 'secondFractionalPart' | 'week' | 'hyphen' | 'coron' | 'extra' | 'coronOrEnd' | 'decimalPointOrEnd' | 'localDateTimeSeparator' | 'normalizedlocalDateTimeSeparator' | 'plusOrMinusSign' | 'weekSign', TokenEachCheck> & Record<'_year' | '_month', number | null>;
+export declare const datetimeTokenCheck: Record<'year' | 'month' | 'date' | 'hour' | 'minute' | 'second' | 'secondFractionalPart' | 'week' | 'hyphen' | 'colon' | 'extra' | 'colonOrEnd' | 'decimalPointOrEnd' | 'localDateTimeSeparator' | 'normalizedlocalDateTimeSeparator' | 'plusOrMinusSign' | 'weekSign', TokenEachCheck> & Record<'_year' | '_month', number | null>;
 export declare function getMaxWeekNum(year: number): number;

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

@@ -317,18 +317,18 @@ exports.datetimeTokenCheck = {
     /**
      * > A U+003A COLON character (:)
      */
-    coron(coron) {
-        (0, debug_1.log)('Parsing Datetime coron: "%s"', coron === null || coron === void 0 ? void 0 : coron.value);
-        if (!coron || !coron.value) {
+    colon(colon) {
+        (0, debug_1.log)('Parsing Datetime colon: "%s"', colon === null || colon === void 0 ? void 0 : colon.value);
+        if (!colon || !colon.value) {
             return (0, match_result_1.unmatched)('', 'missing-token', {
-                expects: [{ type: 'common', value: 'coron' }],
+                expects: [{ type: 'common', value: 'colon' }],
                 partName: 'time',
             });
         }
-        if (!coron.match(':')) {
-            return coron.unmatched({
+        if (!colon.match(':')) {
+            return colon.unmatched({
                 reason: 'unexpected-token',
-                expects: [{ type: 'common', value: 'coron' }],
+                expects: [{ type: 'common', value: 'colon' }],
                 partName: 'time',
             });
         }
@@ -338,14 +338,14 @@ exports.datetimeTokenCheck = {
      * or
      * End of token
      */
-    coronOrEnd(coron) {
-        if (!coron || !coron.value) {
+    colonOrEnd(colon) {
+        if (!colon || !colon.value) {
             return (0, match_result_1.matched)();
         }
-        if (!coron.match(':')) {
-            return coron.unmatched({
+        if (!colon.match(':')) {
+            return colon.unmatched({
                 reason: 'unexpected-token',
-                expects: [{ type: 'common', value: 'coron' }],
+                expects: [{ type: 'common', value: 'colon' }],
                 partName: 'time',
             });
         }
@@ -413,8 +413,8 @@ exports.datetimeTokenCheck = {
      * > a U+002D HYPHEN-MINUS character (-),
      * > representing the sign of the time-zone offset
      */
-    plusOrMinusSign(coron) {
-        if (!coron) {
+    plusOrMinusSign(colon) {
+        if (!colon) {
             return (0, match_result_1.unmatched)('', 'missing-token', {
                 expects: [
                     { type: 'const', value: '+' },
@@ -423,8 +423,8 @@ exports.datetimeTokenCheck = {
                 partName: 'time-zone',
             });
         }
-        if (!coron.match(['+', '-'])) {
-            return coron.unmatched({
+        if (!colon.match(['+', '-'])) {
+            return colon.unmatched({
                 reason: 'unexpected-token',
                 expects: [
                     { type: 'const', value: '+' },

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

@@ -36,13 +36,13 @@ const checkGlobalDateAndTimeString = () => function checkGlobalDateAndTimeString
         /.*/,
     ]);
     (0, debug_1.log)('Global Date and Time "%s" => %O', tokens.value, tokens);
-    const res = tokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.year, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.month, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.date, datetime_tokens_1.datetimeTokenCheck.localDateTimeSeparator, datetime_tokens_1.datetimeTokenCheck.hour, datetime_tokens_1.datetimeTokenCheck.coron, datetime_tokens_1.datetimeTokenCheck.minute, second => {
+    const res = tokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.year, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.month, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.date, datetime_tokens_1.datetimeTokenCheck.localDateTimeSeparator, datetime_tokens_1.datetimeTokenCheck.hour, datetime_tokens_1.datetimeTokenCheck.colon, datetime_tokens_1.datetimeTokenCheck.minute, second => {
         if (!second || !second.value) {
             return;
         }
         const secondTokens = token_1.TokenCollection.fromPatterns(second, [/:?/, /[0-9]*/, /\.?/, /[0-9]*/]);
-        (0, debug_1.log)('Scond Part: "%s" => %O', secondTokens.value, secondTokens);
-        const res = secondTokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.coron, datetime_tokens_1.datetimeTokenCheck.second, datetime_tokens_1.datetimeTokenCheck.decimalPointOrEnd, datetime_tokens_1.datetimeTokenCheck.secondFractionalPart);
+        (0, debug_1.log)('Second Part: "%s" => %O', secondTokens.value, secondTokens);
+        const res = secondTokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.colon, datetime_tokens_1.datetimeTokenCheck.second, datetime_tokens_1.datetimeTokenCheck.decimalPointOrEnd, datetime_tokens_1.datetimeTokenCheck.secondFractionalPart);
         if (!res.matched) {
             return res;
         }

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

@@ -38,7 +38,7 @@ const checkLocalDateAndTimeString = () => function checkLocalDateAndTimeString(v
         /.[0-9]*/,
     ]);
     (0, debug_1.log)('Local Date and Time: "%s" => %O', tokens.value, tokens);
-    const res = tokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.year, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.month, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.date, datetime_tokens_1.datetimeTokenCheck.localDateTimeSeparator, datetime_tokens_1.datetimeTokenCheck.hour, datetime_tokens_1.datetimeTokenCheck.coron, datetime_tokens_1.datetimeTokenCheck.minute, datetime_tokens_1.datetimeTokenCheck.coronOrEnd, datetime_tokens_1.datetimeTokenCheck.second, datetime_tokens_1.datetimeTokenCheck.decimalPointOrEnd, datetime_tokens_1.datetimeTokenCheck.secondFractionalPart, datetime_tokens_1.datetimeTokenCheck.extra);
+    const res = tokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.year, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.month, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.date, datetime_tokens_1.datetimeTokenCheck.localDateTimeSeparator, datetime_tokens_1.datetimeTokenCheck.hour, datetime_tokens_1.datetimeTokenCheck.colon, datetime_tokens_1.datetimeTokenCheck.minute, datetime_tokens_1.datetimeTokenCheck.colonOrEnd, datetime_tokens_1.datetimeTokenCheck.second, datetime_tokens_1.datetimeTokenCheck.decimalPointOrEnd, datetime_tokens_1.datetimeTokenCheck.secondFractionalPart, datetime_tokens_1.datetimeTokenCheck.extra);
     if (!res.matched) {
         (0, debug_1.log)('Failed: %O', res);
     }
@@ -79,7 +79,7 @@ const checkNormalizedLocalDateAndTimeString = () => function checkNormalizedLoca
         /.[0-9]*/,
     ]);
     (0, debug_1.log)('Normalized Local Date and Time: "%s" => %O', tokens.value, tokens);
-    const res = tokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.year, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.month, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.date, datetime_tokens_1.datetimeTokenCheck.normalizedlocalDateTimeSeparator, datetime_tokens_1.datetimeTokenCheck.hour, datetime_tokens_1.datetimeTokenCheck.coron, datetime_tokens_1.datetimeTokenCheck.minute, datetime_tokens_1.datetimeTokenCheck.coronOrEnd, datetime_tokens_1.datetimeTokenCheck.second, datetime_tokens_1.datetimeTokenCheck.decimalPointOrEnd, datetime_tokens_1.datetimeTokenCheck.secondFractionalPart, datetime_tokens_1.datetimeTokenCheck.extra);
+    const res = tokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.year, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.month, datetime_tokens_1.datetimeTokenCheck.hyphen, datetime_tokens_1.datetimeTokenCheck.date, datetime_tokens_1.datetimeTokenCheck.normalizedlocalDateTimeSeparator, datetime_tokens_1.datetimeTokenCheck.hour, datetime_tokens_1.datetimeTokenCheck.colon, datetime_tokens_1.datetimeTokenCheck.minute, datetime_tokens_1.datetimeTokenCheck.colonOrEnd, datetime_tokens_1.datetimeTokenCheck.second, datetime_tokens_1.datetimeTokenCheck.decimalPointOrEnd, datetime_tokens_1.datetimeTokenCheck.secondFractionalPart, datetime_tokens_1.datetimeTokenCheck.extra);
     if (!res.matched) {
         (0, debug_1.log)('Failed: %O', res);
         return res;

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

@@ -26,7 +26,7 @@ const checkTimeString = () => function checkTimeString(value) {
         /.[0-9]*/,
     ]);
     (0, debug_1.log)('Time: "%s" => %O', tokens.value, tokens);
-    const res = tokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.hour, datetime_tokens_1.datetimeTokenCheck.coron, datetime_tokens_1.datetimeTokenCheck.minute, datetime_tokens_1.datetimeTokenCheck.coronOrEnd, datetime_tokens_1.datetimeTokenCheck.second, datetime_tokens_1.datetimeTokenCheck.decimalPointOrEnd, datetime_tokens_1.datetimeTokenCheck.secondFractionalPart);
+    const res = tokens.eachCheck(datetime_tokens_1.datetimeTokenCheck.hour, datetime_tokens_1.datetimeTokenCheck.colon, datetime_tokens_1.datetimeTokenCheck.minute, datetime_tokens_1.datetimeTokenCheck.colonOrEnd, datetime_tokens_1.datetimeTokenCheck.second, datetime_tokens_1.datetimeTokenCheck.decimalPointOrEnd, datetime_tokens_1.datetimeTokenCheck.secondFractionalPart);
     if (!res.matched) {
         (0, debug_1.log)('Failed: %O', res);
     }

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

@@ -55,12 +55,12 @@ function parseTimeZone(zone) {
                 partName: 'time-zone',
             });
         }
-    }, datetime_tokens_1.datetimeTokenCheck.hour, coron => {
-        if (!coron || !coron.value) {
+    }, datetime_tokens_1.datetimeTokenCheck.hour, colon => {
+        if (!colon || !colon.value) {
             return;
         }
-        if (!coron.match(':')) {
-            return coron.unmatched({
+        if (!colon.match(':')) {
+            return colon.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: ':' }],
                 partName: 'time-zone',

package/lib/whatwg/check-mime-type.js

@@ -34,7 +34,7 @@ const checkMIMEType = options => value => {
         return new token_1.Token(extraToken, mimeType.essence.length, value).unmatched({
             reason: 'extra-token',
             expects: expects(withoutParameters),
-            candicate: mimeType.essence,
+            candidate: mimeType.essence,
         });
     }
     return (0, match_result_1.unmatched)(value, 'syntax-error', { expects: expects(withoutParameters) });

package/lib/whatwg/check-mime-type.spec.js

@@ -20,7 +20,7 @@ test('excrescence-token', () => {
         ref: null,
     });
     expect(check('x/y;')).toStrictEqual({
-        candicate: 'x/y',
+        candidate: 'x/y',
         column: 4,
         expects: [{ type: 'format', value: 'MIME Type' }],
         length: 1,
@@ -32,7 +32,7 @@ test('excrescence-token', () => {
         ref: null,
     });
     expect(checkNoParam('x/y;')).toStrictEqual({
-        candicate: 'x/y',
+        candidate: 'x/y',
         column: 4,
         expects: [{ type: 'format', value: 'MIME Type with no parameters' }],
         length: 1,
@@ -44,7 +44,7 @@ test('excrescence-token', () => {
         ref: null,
     });
     expect(checkNoParam('x/y;a=b;c=D;E="F"')).toStrictEqual({
-        candicate: 'x/y',
+        candidate: 'x/y',
         column: 4,
         expects: [{ type: 'format', value: 'MIME Type with no parameters' }],
         length: 14,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/types",
-	"version": "2.2.0",
+	"version": "3.0.0-alpha.1",
 	"description": "Types of attributes and properties and more",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,9 +25,9 @@
 	},
 	"devDependencies": {
 		"@types/bcp-47": "1",
-		"@types/css-tree": "^1.0.7",
+		"@types/css-tree": "1",
 		"@types/debug": "^4.1.7",
-		"@types/whatwg-mimetype": "^2.1.1"
+		"@types/whatwg-mimetype": "2"
 	},
-	"gitHead": "c28258b756d8c42890698e26c03cdc02c6833489"
+	"gitHead": "56de89456146a06777eb5b6d4e8ba456147dd18b"
 }