@markuplint/types 3.12.0 → 4.0.0-alpha.10

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

@@ -1,35 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkDurationComponentListString = exports.checkDurationISO8601LikeString = void 0;
-const debug_1 = require("../../debug");
-const match_result_1 = require("../../match-result");
-const token_1 = require("../../token");
-const datetime_tokens_1 = require("./datetime-tokens");
+import { log } from '../../debug.js';
+import { matched, unmatched } from '../../match-result.js';
+import { TokenCollection } from '../../token/index.js';
+import { datetimeTokenCheck } from './datetime-tokens.js';
 /**
  * @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#durations
  */
-const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeString(value) {
-    (0, debug_1.log)('CHECK: duration-string (ISO8601 like)');
+export const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeString(value) {
+    log('CHECK: duration-string (ISO8601 like)');
     // PnDTnHnMnS
-    const tokens = token_1.TokenCollection.fromPatterns(value, [
+    const tokens = TokenCollection.fromPatterns(value, [
         // Start sign P
-        /[^0-9T]?/,
+        /[^\dT]?/,
         // date part
         /[^T]*/,
         // Time sign T
-        /[^0-9]?/,
+        /\D?/,
         // Time part
         /.*/,
     ]);
-    (0, debug_1.log)('Duration ISO8601: "%s" => %O', tokens.value, tokens);
+    log('Duration ISO8601: "%s" => %O', tokens.value, tokens);
     const res = tokens.eachCheck(p => {
         if (!p || !p.value) {
-            return (0, match_result_1.unmatched)('', 'missing-token', {
+            return unmatched('', 'missing-token', {
                 expects: [{ type: 'const', value: 'P' }],
                 partName: 'duration',
             });
         }
-        if (!p.match('P', false)) {
+        if (!p.matches('P', false)) {
             return p.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: 'P' }],
@@ -40,12 +37,12 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
         if (!d || !d.value) {
             return;
         }
-        const [num, sign, extra] = token_1.TokenCollection.fromPatterns(d, [/[0-9]+/, /./]);
+        const [num, sign, extra] = TokenCollection.fromPatterns(d, [/\d+/, /./]);
         if (!num) {
             return;
         }
-        (0, debug_1.log)('Date part: "%s" => %O', d.value, { num, sign });
-        if (!num.match(/^[0-9]+$/)) {
+        log('Date part: "%s" => %O', d.value, { num, sign });
+        if (!num.matches(/^\d+$/)) {
             return num.unmatched({
                 reason: 'unexpected-token',
                 expects: [],
@@ -53,12 +50,12 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
             });
         }
         if (!sign || !sign.value) {
-            return (0, match_result_1.unmatched)('', 'missing-token', {
+            return unmatched('', 'missing-token', {
                 expects: [{ type: 'const', value: 'D' }],
                 partName: 'date',
             });
         }
-        if (!sign.match('D', false)) {
+        if (!sign.matches('D', false)) {
             return sign.unmatched({
                 reason: 'unexpected-token',
                 expects: [{ type: 'const', value: 'D' }],
@@ -73,20 +70,19 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
         }
     }, t => {
         if (!t || !t.value) {
-            return (0, match_result_1.unmatched)('', 'missing-token', {
+            return unmatched('', 'missing-token', {
                 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' }],
             });
         }
     }, time => {
-        var _a, _b, _c;
         if (!time) {
-            return (0, match_result_1.unmatched)('', 'missing-token', {
+            return unmatched('', 'missing-token', {
                 expects: [
                     { type: 'common', value: 'hour' },
                     { type: 'common', value: 'minute' },
@@ -95,18 +91,18 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
                 partName: 'time',
             });
         }
-        const timeTokens = token_1.TokenCollection.fromPatterns(time, [
+        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?/,
         ]);
-        (0, debug_1.log)('Time part: "%s" => %O', timeTokens.value, timeTokens);
+        log('Time part: "%s" => %O', timeTokens.value, timeTokens);
         const [h, m, s] = timeTokens;
-        if (((_a = h === null || h === void 0 ? void 0 : h.value) !== null && _a !== void 0 ? _a : '') + ((_b = m === null || m === void 0 ? void 0 : m.value) !== null && _b !== void 0 ? _b : '') + ((_c = s === null || s === void 0 ? void 0 : s.value) !== null && _c !== void 0 ? _c : '') === '') {
-            return (0, match_result_1.unmatched)('', 'missing-token', {
+        if ((h?.value ?? '') + (m?.value ?? '') + (s?.value ?? '') === '') {
+            return unmatched('', 'missing-token', {
                 expects: [
                     { type: 'common', value: 'hour' },
                     { type: 'common', value: 'minute' },
@@ -124,12 +120,12 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
                     reason: 'extra-token',
                 });
             }
-            const [num, dpfp, sign] = token_1.TokenCollection.fromPatterns(t, [/[0-9]+/, /(\.[0-9]*)?/, /[^0-9]+/]);
+            const [num, dpfp, sign] = TokenCollection.fromPatterns(t, [/\d+/, /(\.\d*)?/, /\D+/]);
             if (!num) {
                 continue;
             }
-            (0, debug_1.log)('Time part (h|m|s): "%s" => %O', t.value, { num, dpfp, sign });
-            if (!num.match(/^[0-9]+$/)) {
+            log('Time part (h|m|s): "%s" => %O', t.value, { num, dpfp, sign });
+            if (!num.matches(/^\d+$/)) {
                 return num.unmatched({
                     reason: 'unexpected-token',
                     expects: [{ type: 'common', value: 'number' }],
@@ -137,12 +133,12 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
                 });
             }
             if (dpfp && dpfp.value) {
-                const [dp, fp] = token_1.TokenCollection.fromPatterns(dpfp, [/\./, /[0-9]+/]);
+                const [dp, fp] = TokenCollection.fromPatterns(dpfp, [/\./, /\d+/]);
                 if (!dp) {
                     continue;
                 }
-                (0, debug_1.log)('Second fractional part (h|m|s): "%s" => %O', dpfp.value, { dp, fp });
-                if (!dp.match('.')) {
+                log('Second fractional part (h|m|s): "%s" => %O', dpfp.value, { dp, fp });
+                if (!dp.matches('.')) {
                     return dp.unmatched({
                         reason: 'unexpected-token',
                         expects: [],
@@ -150,19 +146,19 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
                     });
                 }
                 if (!fp || !fp.value) {
-                    return (0, match_result_1.unmatched)('', 'missing-token', {
+                    return unmatched('', 'missing-token', {
                         expects: [{ type: 'common', value: 'fractional part' }],
                         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: [],
@@ -176,21 +172,21 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
                 { type: 'const', value: 'S' },
             ];
             if (!sign || !sign.value) {
-                return (0, match_result_1.unmatched)('', 'missing-token', {
+                return unmatched('', 'missing-token', {
                     expects: expects.filter(e => !specified.has(e.value)),
                     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)),
@@ -199,17 +195,16 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
             }
             specified.add(sign.value);
         }
-    }, datetime_tokens_1.datetimeTokenCheck.extra);
+    }, datetimeTokenCheck.extra);
     if (!res.matched) {
-        (0, debug_1.log)('Failed: %O', res);
+        log('Failed: %O', res);
     }
     return res;
 };
-exports.checkDurationISO8601LikeString = checkDurationISO8601LikeString;
-const checkDurationComponentListString = () => function checkDurationComponentListString(value) {
-    (0, debug_1.log)('CHECK: duration-string (duration component list)');
+export const checkDurationComponentListString = () => function checkDurationComponentListString(value) {
+    log('CHECK: duration-string (duration component list)');
     if (!value) {
-        return (0, match_result_1.unmatched)('', 'empty-token', {
+        return unmatched('', 'empty-token', {
             expects: [{ type: 'common', value: 'time' }],
         });
     }
@@ -219,29 +214,30 @@ const checkDurationComponentListString = () => function checkDurationComponentLi
         // 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*/,
     ];
-    const tokens = token_1.TokenCollection.fromPatterns(value, patterns, { repeat: true });
+    const tokens = TokenCollection.fromPatterns(value, patterns, { repeat: true });
     const components = tokens.chunk(patterns.length);
     const specified = new Set();
     for (const component of components) {
-        (0, debug_1.log)('Duration Component: "%s" => %O', component.value, component);
-        const [, , dpfp, , unit] = component;
+        log('Duration Component: "%s" => %O', component.value, component);
+        const dpfp = component[2];
+        const unit = component[4];
         const res = component.eachCheck(ws => { }, num => {
             if (!num || !num.value) {
-                const reason = (dpfp === null || dpfp === void 0 ? void 0 : dpfp.value) || (unit === null || unit === void 0 ? void 0 : unit.value) ? 'unexpected-token' : 'missing-token';
-                return (0, match_result_1.unmatched)('', reason, {
+                const reason = dpfp?.value || unit?.value ? 'unexpected-token' : 'missing-token';
+                return unmatched('', reason, {
                     expects: [{ type: 'common', value: 'time' }],
                 });
             }
@@ -263,21 +259,21 @@ const checkDurationComponentListString = () => function checkDurationComponentLi
                     partName: 'unit',
                 });
             }
-            const [, fp] = token_1.TokenCollection.fromPatterns(dpfp, [/\./, /[0-9]+/]);
+            const [, fp] = TokenCollection.fromPatterns(dpfp, [/\./, /\d+/]);
             if (!fp || !fp.value) {
-                return (0, match_result_1.unmatched)('', 'missing-token', {
+                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: [],
@@ -293,7 +289,7 @@ const checkDurationComponentListString = () => function checkDurationComponentLi
                 { type: 'const', value: 's' },
             ].filter(e => !specified.has(e.value));
             if (!unit || !unit.value) {
-                return (0, match_result_1.unmatched)('', 'missing-token', {
+                return unmatched('', 'missing-token', {
                     expects,
                     partName: 'unit',
                 });
@@ -306,14 +302,14 @@ const checkDurationComponentListString = () => function checkDurationComponentLi
                     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,
@@ -323,10 +319,9 @@ const checkDurationComponentListString = () => function checkDurationComponentLi
             specified.add(unitVal);
         }, ws => { });
         if (!res.matched) {
-            (0, debug_1.log)('Failed: %O', res);
+            log('Failed: %O', res);
             return res;
         }
     }
-    return (0, match_result_1.matched)();
+    return matched();
 };
-exports.checkDurationComponentListString = checkDurationComponentListString;

package/lib/whatwg/check-datetime/global-date-and-time-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#global-dates-and-times
  */

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

@@ -1,66 +1,62 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkGlobalDateAndTimeString = void 0;
-const debug_1 = require("../../debug");
-const match_result_1 = require("../../match-result");
-const token_1 = require("../../token");
-const datetime_tokens_1 = require("./datetime-tokens");
-const time_zone_offset_string_1 = require("./time-zone-offset-string");
+import { log } from '../../debug.js';
+import { unmatched } from '../../match-result.js';
+import { TokenCollection } from '../../token/index.js';
+import { datetimeTokenCheck } from './datetime-tokens.js';
+import { parseTimeZone } from './time-zone-offset-string.js';
 /**
  * @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#global-dates-and-times
  */
-const checkGlobalDateAndTimeString = () => function checkGlobalDateAndTimeString(value) {
-    (0, debug_1.log)('CHECK: global-date-and-time-string');
-    const tokens = token_1.TokenCollection.fromPatterns(value, [
+export const checkGlobalDateAndTimeString = () => function checkGlobalDateAndTimeString(value) {
+    log('CHECK: global-date-and-time-string');
+    const tokens = TokenCollection.fromPatterns(value, [
         // 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
         /.*/,
     ]);
-    (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.colon, datetime_tokens_1.datetimeTokenCheck.minute, second => {
+    log('Global 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, second => {
         if (!second || !second.value) {
             return;
         }
-        const secondTokens = token_1.TokenCollection.fromPatterns(second, [/:?/, /[0-9]*/, /\.?/, /[0-9]*/]);
-        (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);
+        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) {
             return res;
         }
     }, zone => {
         if (!zone || !zone.value) {
-            return (0, match_result_1.unmatched)(value, 'missing-token', {
+            return unmatched(value, 'missing-token', {
                 expects: [{ type: 'common', value: 'time-zone' }],
                 partName: 'time-zone',
             });
         }
-        const res = (0, time_zone_offset_string_1.parseTimeZone)(zone);
+        const res = parseTimeZone(zone);
         if (!res.matched) {
             return res;
         }
-    }, datetime_tokens_1.datetimeTokenCheck.extra);
+    }, datetimeTokenCheck.extra);
     if (!res.matched) {
-        (0, debug_1.log)('Failed: %O', res);
+        log('Failed: %O', res);
     }
     return res;
 };
-exports.checkGlobalDateAndTimeString = checkGlobalDateAndTimeString;

package/lib/whatwg/check-datetime/index.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-and-times
  */

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

@@ -1,35 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkDateTime = void 0;
-const check_multi_types_1 = require("../../check-multi-types");
-const date_string_1 = require("./date-string");
-const duration_string_1 = require("./duration-string");
-const global_date_and_time_string_1 = require("./global-date-and-time-string");
-const local_date_and_time_string_1 = require("./local-date-and-time-string");
-const month_string_1 = require("./month-string");
-const time_string_1 = require("./time-string");
-const time_zone_offset_string_1 = require("./time-zone-offset-string");
-const week_string_1 = require("./week-string");
-const year_string_1 = require("./year-string");
-const yearless_date_string_1 = require("./yearless-date-string");
+import { checkMultiTypes } from '../../check-multi-types.js';
+import { checkDateString } from './date-string.js';
+import { checkDurationComponentListString, checkDurationISO8601LikeString } from './duration-string.js';
+import { checkGlobalDateAndTimeString } from './global-date-and-time-string.js';
+import { checkLocalDateAndTimeString, checkNormalizedLocalDateAndTimeString } from './local-date-and-time-string.js';
+import { checkMonthString } from './month-string.js';
+import { checkTimeString } from './time-string.js';
+import { checkTimeZoneOffsetString } from './time-zone-offset-string.js';
+import { checkWeekString } from './week-string.js';
+import { checkYearString } from './year-string.js';
+import { checkYearlessDateString } from './yearless-date-string.js';
 const checks = [
-    (0, date_string_1.checkDateString)(),
-    (0, time_string_1.checkTimeString)(),
-    (0, month_string_1.checkMonthString)(),
-    (0, yearless_date_string_1.checkYearlessDateString)(),
-    (0, local_date_and_time_string_1.checkLocalDateAndTimeString)(),
-    (0, local_date_and_time_string_1.checkNormalizedLocalDateAndTimeString)(),
-    (0, time_zone_offset_string_1.checkTimeZoneOffsetString)(),
-    (0, global_date_and_time_string_1.checkGlobalDateAndTimeString)(),
-    (0, week_string_1.checkWeekString)(),
-    (0, year_string_1.checkYearString)(),
-    (0, duration_string_1.checkDurationISO8601LikeString)(),
-    (0, duration_string_1.checkDurationComponentListString)(),
+    checkDateString(),
+    checkTimeString(),
+    checkMonthString(),
+    checkYearlessDateString(),
+    checkLocalDateAndTimeString(),
+    checkNormalizedLocalDateAndTimeString(),
+    checkTimeZoneOffsetString(),
+    checkGlobalDateAndTimeString(),
+    checkWeekString(),
+    checkYearString(),
+    checkDurationISO8601LikeString(),
+    checkDurationComponentListString(),
 ];
 /**
  * @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#dates-and-times
  */
-const checkDateTime = () => value => {
-    return (0, check_multi_types_1.checkMultiTypes)(value, checks);
+export const checkDateTime = () => value => {
+    return checkMultiTypes(value, checks);
 };
-exports.checkDateTime = checkDateTime;

package/lib/whatwg/check-datetime/local-date-and-time-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#valid-local-date-and-time-string
  */