@markuplint/types 3.12.0 → 4.0.0-alpha.10

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
              */
@@ -70,7 +66,7 @@ function _checkSerializedPermissionsPolicy(value) {
              * > feature-identifier = 1*( ALPHA / DIGIT / "-")
              * > ```
              */
-            /[^\s]*/,
+            /\S*/,
             /**
              * RWS (Required 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,
@@ -93,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' }],
@@ -116,16 +112,16 @@ function _checkSerializedPermissionsPolicy(value) {
         }
         const allowListPatterns = [
             // Value
-            /[^\s]*/,
+            /\S*/,
             // 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'" },
@@ -143,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' }],
@@ -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,
@@ -131,7 +128,7 @@ 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({
@@ -145,12 +142,12 @@ 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-",
     // > 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) {
@@ -166,14 +163,14 @@ 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
     // > 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,18 +191,18 @@ 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)) {
+    if (head.matches(contactingTokens, true)) {
         hasContactingToken = true;
         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);
+        if (!contactableFiledToken.matches(contactableFieldNames, true)) {
+            const candidate = getCandidate(contactableFiledToken.value, contactableFieldNames);
             acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, contactableFiledToken.value);
             return contactableFiledToken.unmatched({
                 reason: 'unexpected-token',
@@ -218,10 +215,10 @@ const checkAutoComplete = () => value => {
             });
         }
         if (tail[1]) {
-            if (tail[1].match(webauthnFieldNames)) {
-                return (0, match_result_1.matched)();
+            if (tail[1].matches(webauthnFieldNames)) {
+                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 (head.matches([...autofillFieldNames, ...contactableFieldNames], true)) {
         if (tail[0]) {
-            if (tail[0].match(webauthnFieldNames)) {
-                return (0, match_result_1.matched)();
+            if (tail[0].matches(webauthnFieldNames)) {
+                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)();
+    if (head.matches(webauthnFieldNames)) {
+        return matched();
     }
     const expects = [
         {
@@ -283,29 +280,26 @@ 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) {
-        expects.unshift(...partOfAddress
-            .slice()
-            .reverse()
-            .map(token => ({
+        expects.unshift(...[...partOfAddress].reverse().map(token => ({
             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 +313,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,31 +1,27 @@
-"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
         /[^-]*/,
         // -
-        /[^0-9]?/,
+        /\D?/,
         // MM
         /[^-]*/,
         // -
-        /[^0-9]/,
+        /\D/,
         // DD
-        /.[0-9]*/,
+        /.\d*/,
     ]);
-    (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,23 +1,3 @@
-import type { TokenEachCheck } from '../../token/token-collection';
-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>;
+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;