@markuplint/types 3.8.0 → 4.0.0-alpha.1

package/lib/token/token-collection.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TokenCollection = void 0;
-const match_result_1 = require("../match-result");
-const token_1 = require("./token");
-class TokenCollection extends Array {
+import { matched, unmatched } from '../match-result.js';
+import { Token } from './token.js';
+export class TokenCollection extends Array {
     static fromPatterns(value, patterns, typeOptions) {
-        var _c;
         const originalValue = typeof value === 'string' ? value : value.originalValue;
         let strings = typeof value === 'string' ? value : value.value;
         let cumulativeOffset = typeof value === 'string' ? 0 : value.offset;
         const tokens = [];
         function addToken(tokenValue) {
-            const token = new token_1.Token(tokenValue, cumulativeOffset, originalValue);
+            const token = new Token(tokenValue, cumulativeOffset, originalValue);
             tokens.push(token);
             strings = strings.slice(tokenValue.length);
             cumulativeOffset += tokenValue.length;
@@ -32,7 +28,7 @@ class TokenCollection extends Array {
                         value = strings.slice(res.index + res[0].length);
                     }
                     else {
-                        value = (_c = res[0]) !== null && _c !== void 0 ? _c : '';
+                        value = res[0] ?? '';
                     }
                 }
                 const token = addToken(value);
@@ -42,7 +38,7 @@ class TokenCollection extends Array {
             if (isBroken) {
                 addToken(strings);
             }
-        } while ((typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.repeat) && strings);
+        } while (typeOptions?.repeat && strings);
         if (strings) {
             addToken(strings);
         }
@@ -52,15 +48,14 @@ class TokenCollection extends Array {
         return Array;
     }
     constructor(value, typeOptions) {
-        var _c, _d, _e, _f, _g, _h;
         super();
-        this.disallowToSurroundBySpaces = (_c = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.disallowToSurroundBySpaces) !== null && _c !== void 0 ? _c : false;
-        this.allowEmpty = (_d = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.allowEmpty) !== null && _d !== void 0 ? _d : true;
-        this.ordered = (_e = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.ordered) !== null && _e !== void 0 ? _e : false;
-        this.unique = (_f = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.unique) !== null && _f !== void 0 ? _f : false;
-        this.caseInsensitive = (_g = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.caseInsensitive) !== null && _g !== void 0 ? _g : true;
-        this.number = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.number;
-        this.separator = (_h = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.separator) !== null && _h !== void 0 ? _h : 'space';
+        this.disallowToSurroundBySpaces = typeOptions?.disallowToSurroundBySpaces ?? false;
+        this.allowEmpty = typeOptions?.allowEmpty ?? true;
+        this.ordered = typeOptions?.ordered ?? false;
+        this.unique = typeOptions?.unique ?? false;
+        this.caseInsensitive = typeOptions?.caseInsensitive ?? true;
+        this.number = typeOptions?.number;
+        this.separator = typeOptions?.separator ?? 'space';
         if (typeof value === 'number') {
             this.length = value;
             return;
@@ -72,7 +67,7 @@ class TokenCollection extends Array {
         if (this.separator === 'comma') {
             separators.push(',');
         }
-        if ((typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.specificSeparator) != null) {
+        if (typeOptions?.specificSeparator != null) {
             if (typeof typeOptions.specificSeparator === 'string') {
                 separators.push(typeOptions.specificSeparator);
             }
@@ -93,8 +88,8 @@ class TokenCollection extends Array {
             if (lastChar &&
                 !separators.includes(char) &&
                 !separators.includes(lastChar) &&
-                ((token_1.Token.whitespace.includes(lastChar) && token_1.Token.whitespace.includes(char)) ||
-                    (!token_1.Token.whitespace.includes(lastChar) && !token_1.Token.whitespace.includes(char)))) {
+                ((Token.whitespace.includes(lastChar) && Token.whitespace.includes(char)) ||
+                    (!Token.whitespace.includes(lastChar) && !Token.whitespace.includes(char)))) {
                 values.push(last + char);
             }
             else {
@@ -104,7 +99,7 @@ class TokenCollection extends Array {
         }
         let offset = 0;
         values.forEach(v => {
-            const token = new token_1.Token(v, offset, value, separators);
+            const token = new Token(v, offset, value, separators);
             this.push(token);
             offset += v.length;
         });
@@ -114,7 +109,6 @@ class TokenCollection extends Array {
         return value;
     }
     check(options = {}) {
-        var _c;
         const { expects, ref } = options;
         if (this.disallowToSurroundBySpaces) {
             for (const token of this) {
@@ -128,8 +122,8 @@ class TokenCollection extends Array {
             }
         }
         if (this.separator === 'comma') {
-            const tokensWithoutWP = this.filter(token => token.type !== token_1.Token.WhiteSpace);
-            const consecutiveComma = tokensWithoutWP.getConsecutiveToken(token_1.Token.Comma);
+            const tokensWithoutWP = this.filter(token => token.type !== Token.WhiteSpace);
+            const consecutiveComma = tokensWithoutWP.getConsecutiveToken(Token.Comma);
             if (consecutiveComma) {
                 return consecutiveComma.unmatched({
                     reason: 'unexpected-comma',
@@ -137,14 +131,14 @@ class TokenCollection extends Array {
                     expects,
                 });
             }
-            if (tokensWithoutWP[0] && tokensWithoutWP[0].type === token_1.Token.Comma) {
+            if (tokensWithoutWP[0] && tokensWithoutWP[0].type === Token.Comma) {
                 return tokensWithoutWP[0].unmatched({
                     reason: 'unexpected-comma',
                     ref,
                     expects,
                 });
             }
-            const takeTurnsError = tokensWithoutWP.takeTurns([token_1.Token.Ident, token_1.Token.Comma], token_1.Token.Ident);
+            const takeTurnsError = tokensWithoutWP.takeTurns([Token.Ident, Token.Comma], Token.Ident);
             if (takeTurnsError) {
                 if (takeTurnsError.unexpectedLastToken) {
                     return takeTurnsError.token.unmatched({
@@ -170,9 +164,9 @@ class TokenCollection extends Array {
             }
         }
         const identTokens = this.getIdentTokens();
-        const allowEmpty = (_c = this.allowEmpty) !== null && _c !== void 0 ? _c : true;
+        const allowEmpty = this.allowEmpty ?? true;
         if (!allowEmpty && identTokens.length === 0) {
-            return (0, match_result_1.unmatched)(this.value, 'empty-token', {
+            return unmatched(this.value, 'empty-token', {
                 ref,
                 expects,
             });
@@ -188,7 +182,7 @@ class TokenCollection extends Array {
                 });
             }
         }
-        return (0, match_result_1.matched)();
+        return matched();
     }
     chunk(split) {
         const chunks = [];
@@ -224,7 +218,6 @@ class TokenCollection extends Array {
         return [a, b];
     }
     eachCheck(...callbacks) {
-        var _c, _d;
         let headAndTail = this.headAndTail();
         let head = headAndTail.head;
         let tail = headAndTail.tail;
@@ -237,10 +230,10 @@ class TokenCollection extends Array {
             wait--;
             const result = callback.call(this, head, tail);
             if (result && !result.matched) {
-                passCount += (_c = result.passCount) !== null && _c !== void 0 ? _c : 0;
+                passCount += result.passCount ?? 0;
                 if (prev && result.offset === 0 && result.length === 0) {
-                    const { offset, line, column } = token_1.Token.shiftLocation(prev, cumulativeOffset);
-                    firstUnmatched = firstUnmatched !== null && firstUnmatched !== void 0 ? firstUnmatched : {
+                    const { offset, line, column } = Token.shiftLocation(prev, cumulativeOffset);
+                    firstUnmatched = firstUnmatched ?? {
                         ...result,
                         offset,
                         line,
@@ -248,7 +241,7 @@ class TokenCollection extends Array {
                     };
                 }
                 if (!prev && this.value.length === 0) {
-                    firstUnmatched = firstUnmatched !== null && firstUnmatched !== void 0 ? firstUnmatched : {
+                    firstUnmatched = firstUnmatched ?? {
                         ...result,
                         reason: 'empty-token',
                         expects: undefined,
@@ -265,17 +258,17 @@ class TokenCollection extends Array {
                         }
                     }
                 }
-                firstUnmatched = firstUnmatched !== null && firstUnmatched !== void 0 ? firstUnmatched : result;
+                firstUnmatched = firstUnmatched ?? result;
             }
             else if (result && !firstUnmatched && result.matched) {
                 return result;
             }
             else {
-                if ((head === null || head === void 0 ? void 0 : head.value) && !head.match(/^\s*$/)) {
+                if (head?.value && !head.match(/^\s*$/)) {
                     passCount += 4 * wait;
                 }
             }
-            cumulativeOffset = (_d = head === null || head === void 0 ? void 0 : head.length) !== null && _d !== void 0 ? _d : 0;
+            cumulativeOffset = head?.length ?? 0;
             headAndTail = tail.headAndTail();
             prev = head;
             head = headAndTail.head;
@@ -288,7 +281,7 @@ class TokenCollection extends Array {
             };
             return res;
         }
-        return (0, match_result_1.matched)();
+        return matched();
     }
     filter(callback) {
         return TokenCollection._new(super.filter(callback), this);
@@ -299,7 +292,7 @@ class TokenCollection extends Array {
                 return current;
             }
         });
-        return resultToken !== null && resultToken !== void 0 ? resultToken : null;
+        return resultToken ?? null;
     }
     getDuplicated() {
         const aList = this.slice();
@@ -323,7 +316,7 @@ class TokenCollection extends Array {
         return null;
     }
     getIdentTokens() {
-        return this.filter(token => token.type === token_1.Token.Ident);
+        return this.filter(token => token.type === Token.Ident);
     }
     /**
      *
@@ -336,7 +329,7 @@ class TokenCollection extends Array {
         const copy = this.slice();
         const head = copy.shift();
         if (!head) {
-            return { head: head !== null && head !== void 0 ? head : null, tail: TokenCollection._new([], this) };
+            return { head: head ?? null, tail: TokenCollection._new([], this) };
         }
         const tail = TokenCollection._new(copy, this);
         return { head, tail };
@@ -387,4 +380,3 @@ class TokenCollection extends Array {
         return newCollection;
     }
 }
-exports.TokenCollection = TokenCollection;

package/lib/token/token.d.ts

@@ -1,5 +1,5 @@
-import type { TokenValue } from './types';
-import type { UnmatchedResult, UnmatchedResultOptions, UnmatchedResultReason } from '../types';
+import type { TokenValue } from './types.js';
+import type { UnmatchedResult, UnmatchedResultOptions, UnmatchedResultReason } from '../types.js';
 export declare class Token {
     /**
      * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js

package/lib/token/token.js

@@ -1,21 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Token = void 0;
-class Token {
+export class Token {
     static getCol(value, offset) {
-        var _a;
         const lines = value.slice(0, offset).split(/\n/g);
-        return ((_a = lines[lines.length - 1]) !== null && _a !== void 0 ? _a : '').length + 1;
+        return (lines[lines.length - 1] ?? '').length + 1;
     }
     static getLine(value, offset) {
         return value.slice(0, offset).split(/\n/g).length;
     }
     static getType(value, separators) {
-        var _a, _b;
-        if (Token.whitespace.includes((_a = value[0]) !== null && _a !== void 0 ? _a : '')) {
+        if (Token.whitespace.includes(value[0] ?? '')) {
             return Token.WhiteSpace;
         }
-        if (separators === null || separators === void 0 ? void 0 : separators.includes((_b = value[0]) !== null && _b !== void 0 ? _b : '')) {
+        if (separators?.includes(value[0] ?? '')) {
             switch (value[0]) {
                 case ',':
                     return Token.Comma;
@@ -93,21 +88,19 @@ class Token {
         return isNaN(num) ? 0 : num;
     }
     unmatched(options) {
-        var _a, _b;
         return {
             ...options,
             matched: false,
-            ref: (_a = options === null || options === void 0 ? void 0 : options.ref) !== null && _a !== void 0 ? _a : null,
+            ref: options?.ref ?? null,
             raw: this.value,
             offset: this.offset,
             length: this.value.length,
             line: Token.getLine(this.originalValue, this.offset),
             column: Token.getCol(this.originalValue, this.offset),
-            reason: (_b = options === null || options === void 0 ? void 0 : options.reason) !== null && _b !== void 0 ? _b : 'syntax-error',
+            reason: options?.reason ?? 'syntax-error',
         };
     }
 }
-exports.Token = Token;
 /**
  * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
  */

package/lib/token/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/types.d.ts

@@ -1,5 +1,5 @@
-import type { cssSyntaxMatch } from './css-syntax';
-export type { Type, List, Enum, CssSyntax, KeywordDefinedType, Number } from './types.schema';
+import type { cssSyntaxMatch } from './css-syntax.js';
+export type { Type, List, Enum, CssSyntax, KeywordDefinedType, Number } from './types.schema.js';
 export type Result = UnmatchedResult | MatchedResult;
 export type UnmatchedResult = {
     readonly matched: false;

package/lib/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/types.schema.js

@@ -1,7 +1,6 @@
-"use strict";
 /**
  * This file was automatically generated by json-schema-to-typescript.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and run json-schema-to-typescript to regenerate this file.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/lib/w3c/check-serialized-permissions-policy.d.ts

@@ -1,4 +1,4 @@
-import type { CustomSyntaxChecker } from '../types';
+import type { CustomSyntaxChecker } from '../types.js';
 /**
  * @see https://w3c.github.io/webappsec-permissions-policy/#serialized-permissions-policy
  *

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

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkSerializedPermissionsPolicy = void 0;
-const debug_1 = require("../debug");
-const match_result_1 = require("../match-result");
-const token_1 = require("../token");
+import { log } from '../debug.js';
+import { matched, unmatched } from '../match-result.js';
+import { TokenCollection } from '../token/index.js';
 /**
  * @see https://w3c.github.io/webappsec-permissions-policy/#serialized-permissions-policy
  *
@@ -25,14 +22,13 @@ const token_1 = require("../token");
  *
  * `allow-list` is optional.
  */
-const checkSerializedPermissionsPolicy = () => value => {
+export const checkSerializedPermissionsPolicy = () => value => {
     const res = _checkSerializedPermissionsPolicy(value);
     if (!res.matched) {
-        (0, debug_1.log)('Failed: %O', res);
+        log('Failed: %O', res);
     }
     return res;
 };
-exports.checkSerializedPermissionsPolicy = checkSerializedPermissionsPolicy;
 function _checkSerializedPermissionsPolicy(value) {
     /**
      * The list of serialized-policy-directive
@@ -51,14 +47,14 @@ function _checkSerializedPermissionsPolicy(value) {
          */
         /;?/,
     ];
-    const tokens = token_1.TokenCollection.fromPatterns(value, patterns, { repeat: true });
+    const tokens = TokenCollection.fromPatterns(value, patterns, { repeat: true });
     const serializedPolicyDirectives = tokens.chunk(patterns.length);
-    (0, debug_1.log)('Serialized Permissions Policy: %s => %O', value, serializedPolicyDirectives);
+    log('Serialized Permissions Policy: %s => %O', value, serializedPolicyDirectives);
     for (const [serializedPolicyDirective] of serializedPolicyDirectives) {
         if (!serializedPolicyDirective || !serializedPolicyDirective.value) {
-            return (0, match_result_1.unmatched)('', 'empty-token');
+            return unmatched('', 'empty-token');
         }
-        const [aw, featureIdentifier, rws, allowListValue] = token_1.TokenCollection.fromPatterns(serializedPolicyDirective, [
+        const [aw, featureIdentifier, rws, allowListValue] = TokenCollection.fromPatterns(serializedPolicyDirective, [
             /**
              * Any whitespace
              */
@@ -82,7 +78,7 @@ function _checkSerializedPermissionsPolicy(value) {
              */
             /.*/,
         ]);
-        (0, debug_1.log)('Serialized Policy Directive: %s => %O', serializedPolicyDirective.value, {
+        log('Serialized Policy Directive: %s => %O', serializedPolicyDirective.value, {
             aw,
             featureIdentifier,
             rws,
@@ -120,12 +116,12 @@ function _checkSerializedPermissionsPolicy(value) {
             // Separator
             /\s*/,
         ];
-        const allowListTokens = token_1.TokenCollection.fromPatterns(allowListValue, allowListPatterns, { repeat: true });
+        const allowListTokens = TokenCollection.fromPatterns(allowListValue, allowListPatterns, { repeat: true });
         const allowList = allowListTokens.chunk(allowListPatterns.length);
-        (0, debug_1.log)('Allow List: %s => %O', allowListTokens.value, allowList);
+        log('Allow List: %s => %O', allowListTokens.value, allowList);
         for (const [allow] of allowList) {
             if (!allow || !allow.value) {
-                return (0, match_result_1.unmatched)('', 'missing-token', {
+                return unmatched('', 'missing-token', {
                     expects: [
                         { type: 'const', value: '*' },
                         { type: 'const', value: "'self'" },
@@ -166,7 +162,7 @@ function _checkSerializedPermissionsPolicy(value) {
             });
         }
     }
-    return (0, match_result_1.matched)();
+    return matched();
 }
 /**
  * serialized-origin
@@ -179,7 +175,7 @@ function _checkSerializedPermissionsPolicy(value) {
  */
 function checkSerializedOrigin(token) {
     const url = parseUrl(token.value);
-    (0, debug_1.log)('Parse URL: "%s" => %O', token.value, url);
+    log('Parse URL: "%s" => %O', token.value, url);
     if (!url) {
         return token.unmatched({
             expects: [{ type: 'common', value: 'serialized-origin' }],
@@ -254,7 +250,7 @@ function checkSerializedOrigin(token) {
             partName: 'serialized-origin',
         });
     }
-    return (0, match_result_1.matched)();
+    return matched();
 }
 function parseUrl(value) {
     try {

package/lib/whatwg/check-autocomplete.d.ts

@@ -1,4 +1,4 @@
-import type { CustomSyntaxChecker } from '../types';
+import type { CustomSyntaxChecker } from '../types.js';
 /**
  * @see https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete
  */

package/lib/whatwg/check-autocomplete.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAutoComplete = void 0;
-const debug_1 = require("../debug");
-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');
+import { log } from '../debug.js';
+import { getCandidate } from '../get-candidate.js';
+import { matched } from '../match-result.js';
+import { TokenCollection } from '../token/index.js';
+const acLog = log.extend('autocomplete');
 /**
  * https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-section
  */
@@ -95,11 +92,11 @@ const URL_CONTACTABLE_FIELD = 'https://html.spec.whatwg.org/multipage/form-contr
 /**
  * @see https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete
  */
-const checkAutoComplete = () => value => {
+export const checkAutoComplete = () => value => {
     let hasNamedGroup = false;
     let hasPartOfAddress = false;
     let hasContactingToken = false;
-    const tokens = new token_1.TokenCollection(value, {
+    const tokens = new TokenCollection(value, {
         disallowToSurroundBySpaces: false,
         allowEmpty: false,
         ordered: true,
@@ -145,7 +142,7 @@ const checkAutoComplete = () => value => {
                 ref: URL_ON_OFF,
             });
         }
-        return (0, match_result_1.matched)();
+        return matched();
     }
     // > Optionally, a token whose first eight characters are
     // > an ASCII case-insensitive match for the string "section-",
@@ -166,7 +163,7 @@ const checkAutoComplete = () => value => {
         tail = headAndTail2.tail;
         if (!head) {
             // Missing autofill field name but it is valid
-            return (0, match_result_1.matched)();
+            return matched();
         }
     }
     // > Optionally, a token that is an ASCII case-insensitive match for
@@ -194,7 +191,7 @@ const checkAutoComplete = () => value => {
         tail = headAndTail3.tail;
         if (!head) {
             // Missing autofill field name but it is valid
-            return (0, match_result_1.matched)();
+            return matched();
         }
     }
     if (head.match(contactingTokens, true)) {
@@ -202,10 +199,10 @@ const checkAutoComplete = () => value => {
         const contactableFiledToken = tail[0];
         if (!contactableFiledToken) {
             // Missing autofill field name but it is valid
-            return (0, match_result_1.matched)();
+            return matched();
         }
         if (!contactableFiledToken.match(contactableFieldNames, true)) {
-            const candidate = (0, get_candidate_1.getCandidate)(contactableFiledToken.value, contactableFieldNames);
+            const candidate = getCandidate(contactableFiledToken.value, contactableFieldNames);
             acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, contactableFiledToken.value);
             return contactableFiledToken.unmatched({
                 reason: 'unexpected-token',
@@ -219,9 +216,9 @@ const checkAutoComplete = () => value => {
         }
         if (tail[1]) {
             if (tail[1].match(webauthnFieldNames)) {
-                return (0, match_result_1.matched)();
+                return matched();
             }
-            const candidate = (0, get_candidate_1.getCandidate)(tail[1].value, webauthnFieldNames);
+            const candidate = getCandidate(tail[1].value, webauthnFieldNames);
             if (candidate) {
                 acLog('[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ', value, tail[1].value, candidate);
             }
@@ -239,14 +236,14 @@ const checkAutoComplete = () => value => {
                 ref: URL_AUTOFILL_FIELD,
             });
         }
-        return (0, match_result_1.matched)();
+        return matched();
     }
     if (head.match([...autofillFieldNames, ...contactableFieldNames], true)) {
         if (tail[0]) {
             if (tail[0].match(webauthnFieldNames)) {
-                return (0, match_result_1.matched)();
+                return matched();
             }
-            const candidate = (0, get_candidate_1.getCandidate)(tail[0].value, webauthnFieldNames);
+            const candidate = getCandidate(tail[0].value, webauthnFieldNames);
             if (candidate) {
                 acLog('[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ', value, tail[0].value, candidate);
             }
@@ -264,10 +261,10 @@ const checkAutoComplete = () => value => {
                 ref: URL_AUTOFILL_FIELD,
             });
         }
-        return (0, match_result_1.matched)();
+        return matched();
     }
     if (head.match(webauthnFieldNames)) {
-        return (0, match_result_1.matched)();
+        return matched();
     }
     const expects = [
         {
@@ -283,9 +280,9 @@ const checkAutoComplete = () => value => {
         });
         // Potentially typo a named group
         const [prefix, namedGroupStr] = head.value.split('-');
-        const candidatePrefix = (0, get_candidate_1.getCandidate)(prefix, 'section');
+        const candidatePrefix = getCandidate(prefix, 'section');
         if (candidatePrefix) {
-            candidate = `${candidatePrefix}-${namedGroupStr !== null && namedGroupStr !== void 0 ? namedGroupStr : ''}`;
+            candidate = `${candidatePrefix}-${namedGroupStr ?? ''}`;
         }
     }
     else if (!hasPartOfAddress) {
@@ -296,16 +293,16 @@ const checkAutoComplete = () => value => {
             type: 'const',
             value: token,
         })));
-        candidate = (0, get_candidate_1.getCandidate)(head.value, partOfAddress, autofillFieldNames, contactingTokens, contactableFieldNames);
+        candidate = getCandidate(head.value, partOfAddress, autofillFieldNames, contactingTokens, contactableFieldNames);
     }
     else if (!hasContactingToken) {
         expects.push(...contactingTokens.map(token => ({
             type: 'const',
             value: token,
         })));
-        candidate = (0, get_candidate_1.getCandidate)(head.value, autofillFieldNames, contactingTokens, contactableFieldNames);
+        candidate = getCandidate(head.value, autofillFieldNames, contactingTokens, contactableFieldNames);
     }
-    candidate = candidate !== null && candidate !== void 0 ? candidate : (0, get_candidate_1.getCandidate)(head.value, autofillFieldNames);
+    candidate = candidate ?? getCandidate(head.value, autofillFieldNames);
     if (candidate) {
         acLog('[Unmatched ("%s")] Unexpected token: "%s", Do you mean "%s"? ', value, head.value, candidate);
     }
@@ -319,4 +316,3 @@ const checkAutoComplete = () => value => {
         ref: URL_AUTOFILL_FIELD,
     });
 };
-exports.checkAutoComplete = checkAutoComplete;

package/lib/whatwg/check-datetime/date-string.d.ts

@@ -1,4 +1,4 @@
-import type { CustomSyntaxChecker } from '../../types';
+import type { CustomSyntaxChecker } from '../../types.js';
 /**
  * @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#dates
  */

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

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkDateString = void 0;
-const debug_1 = require("../../debug");
-const token_1 = require("../../token");
-const datetime_tokens_1 = require("./datetime-tokens");
+import { log } from '../../debug.js';
+import { TokenCollection } from '../../token/index.js';
+import { datetimeTokenCheck } from './datetime-tokens.js';
 /**
  * @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#dates
  */
-const checkDateString = () => function checkDateString(value) {
-    (0, debug_1.log)('CHECK: date-string');
-    const tokens = token_1.TokenCollection.fromPatterns(value, [
+export const checkDateString = () => function checkDateString(value) {
+    log('CHECK: date-string');
+    const tokens = TokenCollection.fromPatterns(value, [
         // YYYY
         /[^-]*/,
         // -
@@ -21,11 +18,10 @@ const checkDateString = () => function checkDateString(value) {
         // DD
         /.[0-9]*/,
     ]);
-    (0, debug_1.log)('Date: "%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.extra);
+    log('Date: "%s" => %O', tokens.value, tokens);
+    const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.month, datetimeTokenCheck.hyphen, datetimeTokenCheck.date, datetimeTokenCheck.extra);
     if (!res.matched) {
-        (0, debug_1.log)('Failed: %O', res);
+        log('Failed: %O', res);
     }
     return res;
 };
-exports.checkDateString = checkDateString;

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

@@ -1,3 +1,3 @@
-import type { TokenEachCheck } from '../../token/token-collection';
+import type { TokenEachCheck } from '../../token/token-collection.js';
 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;