@markuplint/types 3.0.0-alpha.6 → 3.0.0-dev.176

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

@@ -95,6 +95,7 @@ exports.datetimeTokenCheck = {
      * > then the day can be 29, as if the year was a leap year.
      */
     date(date) {
+        var _a, _b, _c;
         (0, debug_1.log)('Parsing Datetime Date: "%s"', date === null || date === void 0 ? void 0 : date.value);
         if (!date || !date.value) {
             return (0, match_result_1.unmatched)('', 'missing-token', {
@@ -117,10 +118,10 @@ exports.datetimeTokenCheck = {
             });
         }
         // Set the leap year if _year is null
-        const year = this._year || 2000;
+        const year = (_a = this._year) !== null && _a !== void 0 ? _a : 2000;
         const isLeap = (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-        const month = this._month || 1;
-        const dayOfMonth = daysOfMonth[month] + (month === 2 && isLeap ? 1 : 0);
+        const month = (_b = this._month) !== null && _b !== void 0 ? _b : 1;
+        const dayOfMonth = ((_c = daysOfMonth[month]) !== null && _c !== void 0 ? _c : 0) + (month === 2 && isLeap ? 1 : 0);
         const _date = date.toNumber();
         (0, debug_1.log)('Temporary Year and Month: %s, %s', this._year, this._month);
         (0, debug_1.log)('Computed Year, Month, and Day of Month: %s, %s, %s', year, month, dayOfMonth);
@@ -264,6 +265,7 @@ exports.datetimeTokenCheck = {
      * > Two ASCII digits, representing the week week, in the range 1 ≤ week ≤ maxweek, where maxweek is the week number of the last day of week-year year
      */
     week(week) {
+        var _a;
         (0, debug_1.log)('Parsing Datetime Week: "%s"', week === null || week === void 0 ? void 0 : week.value);
         if (!week || !week.value) {
             return (0, match_result_1.unmatched)('', 'missing-token', {
@@ -285,7 +287,7 @@ exports.datetimeTokenCheck = {
                 partName: 'week',
             });
         }
-        const maxweek = getMaxWeekNum(this._year || 0);
+        const maxweek = getMaxWeekNum((_a = this._year) !== null && _a !== void 0 ? _a : 0);
         const _week = week.toNumber();
         if (!(1 <= _week && _week <= maxweek)) {
             return week.unmatched({
@@ -494,9 +496,10 @@ const daysOfMonth = [
 ];
 function getMaxWeekNum(year) {
     let date = 31;
-    while (date) {
+    while (date > 0) {
         const d = new Date(Date.UTC(year, 11, date, 0, 0, 0, 0));
-        d.setDate(d.getDate() + 4 - (d.getDay() || 7));
+        const day = d.getDay();
+        d.setDate(d.getDate() + 4 - (day > 0 ? day : 7));
         const yearStart = new Date(d.getFullYear(), 0, 1);
         const weekNo = Math.ceil(((d.valueOf() - yearStart.valueOf()) / 86400000 + 1) / 7);
         if (weekNo !== 1) {

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

@@ -41,6 +41,9 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
             return;
         }
         const [num, sign, extra] = token_1.TokenCollection.fromPatterns(d, [/[0-9]+/, /./]);
+        if (!num) {
+            return;
+        }
         (0, debug_1.log)('Date part: "%s" => %O', d.value, { num, sign });
         if (!num.match(/^[0-9]+$/)) {
             return num.unmatched({
@@ -81,6 +84,7 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
             });
         }
     }, time => {
+        var _a, _b, _c;
         if (!time) {
             return (0, match_result_1.unmatched)('', 'missing-token', {
                 expects: [
@@ -101,7 +105,7 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
         ]);
         (0, debug_1.log)('Time part: "%s" => %O', timeTokens.value, timeTokens);
         const [h, m, s] = timeTokens;
-        if (((h === null || h === void 0 ? void 0 : h.value) || '') + ((m === null || m === void 0 ? void 0 : m.value) || '') + ((s === null || s === void 0 ? void 0 : s.value) || '') === '') {
+        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', {
                 expects: [
                     { type: 'common', value: 'hour' },
@@ -112,7 +116,7 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
         }
         const specified = new Set();
         for (const t of timeTokens) {
-            if (!t || !t.value) {
+            if (!t.value) {
                 continue;
             }
             if (specified.has('S')) {
@@ -121,6 +125,9 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
                 });
             }
             const [num, dpfp, sign] = token_1.TokenCollection.fromPatterns(t, [/[0-9]+/, /(\.[0-9]*)?/, /[^0-9]+/]);
+            if (!num) {
+                continue;
+            }
             (0, debug_1.log)('Time part (h|m|s): "%s" => %O', t.value, { num, dpfp, sign });
             if (!num.match(/^[0-9]+$/)) {
                 return num.unmatched({
@@ -131,6 +138,9 @@ const checkDurationISO8601LikeString = () => function checkDurationISO8601LikeSt
             }
             if (dpfp && dpfp.value) {
                 const [dp, fp] = token_1.TokenCollection.fromPatterns(dpfp, [/\./, /[0-9]+/]);
+                if (!dp) {
+                    continue;
+                }
                 (0, debug_1.log)('Second fractional part (h|m|s): "%s" => %O', dpfp.value, { dp, fp });
                 if (!dp.match('.')) {
                     return dp.unmatched({