@markuplint/types 3.8.0 → 4.0.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/check-multi-types.d.ts +2 -2
- package/lib/check-multi-types.js +9 -14
- package/lib/check.d.ts +1 -1
- package/lib/check.js +20 -30
- package/lib/css-syntax.d.ts +1 -1
- package/lib/css-syntax.js +18 -23
- package/lib/debug.js +2 -6
- package/lib/defs.d.ts +1 -1
- package/lib/defs.js +82 -85
- package/lib/enum.d.ts +2 -2
- package/lib/enum.js +6 -11
- package/lib/get-candidate.js +3 -8
- package/lib/index.d.ts +3 -3
- package/lib/index.js +3 -6
- package/lib/keyword-type.d.ts +2 -2
- package/lib/keyword-type.js +17 -22
- package/lib/list.d.ts +2 -2
- package/lib/list.js +9 -14
- package/lib/match-result.d.ts +1 -1
- package/lib/match-result.js +6 -13
- package/lib/number.d.ts +2 -2
- package/lib/number.js +11 -15
- package/lib/primitive/index.d.ts +7 -7
- package/lib/primitive/index.js +7 -17
- package/lib/primitive/is-float.js +1 -5
- package/lib/primitive/is-int.js +1 -5
- package/lib/primitive/is-non-zero-uint.js +1 -5
- package/lib/primitive/is-quantity.js +9 -13
- package/lib/primitive/is-uint.js +1 -5
- package/lib/primitive/range.js +1 -5
- package/lib/primitive/split-unit.js +3 -7
- package/lib/rfc/is-bcp-47.d.ts +1 -1
- package/lib/rfc/is-bcp-47.js +3 -7
- package/lib/token/index.d.ts +2 -2
- package/lib/token/index.js +2 -7
- package/lib/token/token-collection.d.ts +4 -5
- package/lib/token/token-collection.js +35 -43
- package/lib/token/token.d.ts +2 -2
- package/lib/token/token.js +6 -13
- package/lib/token/types.js +1 -2
- package/lib/types.d.ts +2 -2
- package/lib/types.js +1 -2
- package/lib/types.schema.js +1 -2
- package/lib/w3c/check-serialized-permissions-policy.d.ts +1 -1
- package/lib/w3c/check-serialized-permissions-policy.js +16 -20
- package/lib/whatwg/check-autocomplete.d.ts +1 -1
- package/lib/whatwg/check-autocomplete.js +24 -28
- package/lib/whatwg/check-datetime/date-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/date-string.js +9 -13
- package/lib/whatwg/check-datetime/datetime-tokens.d.ts +1 -1
- package/lib/whatwg/check-datetime/datetime-tokens.js +40 -46
- package/lib/whatwg/check-datetime/duration-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/duration-string.js +38 -44
- package/lib/whatwg/check-datetime/global-date-and-time-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/global-date-and-time-string.js +17 -21
- package/lib/whatwg/check-datetime/index.d.ts +1 -1
- package/lib/whatwg/check-datetime/index.js +25 -29
- package/lib/whatwg/check-datetime/local-date-and-time-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/local-date-and-time-string.js +20 -25
- package/lib/whatwg/check-datetime/month-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/month-string.js +9 -13
- package/lib/whatwg/check-datetime/time-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/time-string.js +9 -13
- package/lib/whatwg/check-datetime/time-zone-offset-string.d.ts +3 -3
- package/lib/whatwg/check-datetime/time-zone-offset-string.js +16 -22
- package/lib/whatwg/check-datetime/week-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/week-string.js +9 -13
- package/lib/whatwg/check-datetime/year-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/year-string.js +9 -13
- package/lib/whatwg/check-datetime/yearless-date-string.d.ts +1 -1
- package/lib/whatwg/check-datetime/yearless-date-string.js +9 -13
- package/lib/whatwg/check-mime-type.d.ts +1 -1
- package/lib/whatwg/check-mime-type.js +11 -17
- package/lib/whatwg/is-abs-url.d.ts +1 -1
- package/lib/whatwg/is-abs-url.js +1 -5
- package/lib/whatwg/is-browser-context-name.d.ts +1 -1
- package/lib/whatwg/is-browser-context-name.js +1 -5
- package/lib/whatwg/is-custom-element-name.d.ts +1 -1
- package/lib/whatwg/is-custom-element-name.js +1 -5
- package/lib/whatwg/is-itemprop-name.d.ts +1 -1
- package/lib/whatwg/is-itemprop-name.js +1 -5
- package/package.json +13 -8
- package/test/check.spec.js +0 -89
- package/test/css-syntax.spec.js +0 -170
- package/test/list.spec.js +0 -133
- package/test/primitive/index.spec.js +0 -65
- package/test/rfc/is-bcp-47.spec.js +0 -23
- package/test/token/token-collection.spec.js +0 -146
- package/test/w3c/check-serialized-permissions-policy.spec.js +0 -36
- package/test/whatwg/check-autocomplete.spec.js +0 -387
- package/test/whatwg/check-datetime/index.spec.js +0 -336
- package/test/whatwg/check-mime-type.spec.js +0 -59
- package/test/whatwg/is-abs-url.spec.js +0 -8
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const debug_1 = require("../../debug");
|
|
5
|
-
const token_1 = require("../../token");
|
|
6
|
-
const datetime_tokens_1 = require("./datetime-tokens");
|
|
1
|
+
import { log } from '../../debug.js';
|
|
2
|
+
import { TokenCollection } from '../../token/index.js';
|
|
3
|
+
import { datetimeTokenCheck } from './datetime-tokens.js';
|
|
7
4
|
/**
|
|
8
5
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-local-date-and-time-string
|
|
9
6
|
*/
|
|
10
|
-
const checkLocalDateAndTimeString = () => function checkLocalDateAndTimeString(value) {
|
|
11
|
-
|
|
12
|
-
const tokens =
|
|
7
|
+
export const checkLocalDateAndTimeString = () => function checkLocalDateAndTimeString(value) {
|
|
8
|
+
log('CHECK: local-date-and-time-string');
|
|
9
|
+
const tokens = TokenCollection.fromPatterns(value, [
|
|
13
10
|
// YYYY
|
|
14
11
|
/[^-]*/,
|
|
15
12
|
// -
|
|
@@ -37,20 +34,19 @@ const checkLocalDateAndTimeString = () => function checkLocalDateAndTimeString(v
|
|
|
37
34
|
// sss
|
|
38
35
|
/.[0-9]*/,
|
|
39
36
|
]);
|
|
40
|
-
|
|
41
|
-
const res = tokens.eachCheck(
|
|
37
|
+
log('Local Date and Time: "%s" => %O', tokens.value, tokens);
|
|
38
|
+
const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.month, datetimeTokenCheck.hyphen, datetimeTokenCheck.date, datetimeTokenCheck.localDateTimeSeparator, datetimeTokenCheck.hour, datetimeTokenCheck.colon, datetimeTokenCheck.minute, datetimeTokenCheck.colonOrEnd, datetimeTokenCheck.second, datetimeTokenCheck.decimalPointOrEnd, datetimeTokenCheck.secondFractionalPart, datetimeTokenCheck.extra);
|
|
42
39
|
if (!res.matched) {
|
|
43
|
-
|
|
40
|
+
log('Failed: %O', res);
|
|
44
41
|
}
|
|
45
42
|
return res;
|
|
46
43
|
};
|
|
47
|
-
exports.checkLocalDateAndTimeString = checkLocalDateAndTimeString;
|
|
48
44
|
/**
|
|
49
45
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-normalised-local-date-and-time-string
|
|
50
46
|
*/
|
|
51
|
-
const checkNormalizedLocalDateAndTimeString = () => function checkNormalizedLocalDateAndTimeString(value) {
|
|
52
|
-
|
|
53
|
-
const tokens =
|
|
47
|
+
export const checkNormalizedLocalDateAndTimeString = () => function checkNormalizedLocalDateAndTimeString(value) {
|
|
48
|
+
log('CHECK: normalized-local-date-and-time-string');
|
|
49
|
+
const tokens = TokenCollection.fromPatterns(value, [
|
|
54
50
|
// YYYY
|
|
55
51
|
/[^-]*/,
|
|
56
52
|
// -
|
|
@@ -78,10 +74,10 @@ const checkNormalizedLocalDateAndTimeString = () => function checkNormalizedLoca
|
|
|
78
74
|
// sss
|
|
79
75
|
/.[0-9]*/,
|
|
80
76
|
]);
|
|
81
|
-
|
|
82
|
-
const res = tokens.eachCheck(
|
|
77
|
+
log('Normalized Local Date and Time: "%s" => %O', tokens.value, tokens);
|
|
78
|
+
const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.month, datetimeTokenCheck.hyphen, datetimeTokenCheck.date, datetimeTokenCheck.normalizedlocalDateTimeSeparator, datetimeTokenCheck.hour, datetimeTokenCheck.colon, datetimeTokenCheck.minute, datetimeTokenCheck.colonOrEnd, datetimeTokenCheck.second, datetimeTokenCheck.decimalPointOrEnd, datetimeTokenCheck.secondFractionalPart, datetimeTokenCheck.extra);
|
|
83
79
|
if (!res.matched) {
|
|
84
|
-
|
|
80
|
+
log('Failed: %O', res);
|
|
85
81
|
return res;
|
|
86
82
|
}
|
|
87
83
|
/**
|
|
@@ -92,18 +88,18 @@ const checkNormalizedLocalDateAndTimeString = () => function checkNormalizedLoca
|
|
|
92
88
|
*/
|
|
93
89
|
const [, , , , , , , , , , second, , fp] = tokens;
|
|
94
90
|
if (!second || !fp) {
|
|
95
|
-
|
|
91
|
+
log('Failed: %O', res);
|
|
96
92
|
return res;
|
|
97
93
|
}
|
|
98
94
|
const _second = second.toNumber();
|
|
99
95
|
const _fp = fp.toNumber();
|
|
100
|
-
|
|
96
|
+
log('Omitting the seconds component: "%s.%s" => %d, %d', second?.value, fp?.value, _second, _fp);
|
|
101
97
|
if (second.value && _second === 0 && (!fp.value || (fp.value && _fp === 0))) {
|
|
102
98
|
const res = second.unmatched({
|
|
103
99
|
partName: 'second',
|
|
104
100
|
reason: 'extra-token',
|
|
105
101
|
});
|
|
106
|
-
|
|
102
|
+
log('Failed: %O', res);
|
|
107
103
|
return res;
|
|
108
104
|
}
|
|
109
105
|
if (fp.value && _fp === 0) {
|
|
@@ -111,10 +107,9 @@ const checkNormalizedLocalDateAndTimeString = () => function checkNormalizedLoca
|
|
|
111
107
|
partName: 'fractional part',
|
|
112
108
|
reason: 'extra-token',
|
|
113
109
|
});
|
|
114
|
-
|
|
110
|
+
log('Failed: %O', res);
|
|
115
111
|
return res;
|
|
116
112
|
}
|
|
117
|
-
|
|
113
|
+
log('Failed: %O', res);
|
|
118
114
|
return res;
|
|
119
115
|
};
|
|
120
|
-
exports.checkNormalizedLocalDateAndTimeString = checkNormalizedLocalDateAndTimeString;
|
|
@@ -1,20 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const debug_1 = require("../../debug");
|
|
5
|
-
const token_1 = require("../../token");
|
|
6
|
-
const datetime_tokens_1 = require("./datetime-tokens");
|
|
1
|
+
import { log } from '../../debug.js';
|
|
2
|
+
import { TokenCollection } from '../../token/index.js';
|
|
3
|
+
import { datetimeTokenCheck } from './datetime-tokens.js';
|
|
7
4
|
/**
|
|
8
5
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-month-string
|
|
9
6
|
*/
|
|
10
|
-
const checkMonthString = () => function checkMonthString(value) {
|
|
11
|
-
|
|
12
|
-
const tokens =
|
|
13
|
-
|
|
14
|
-
const res = tokens.eachCheck(
|
|
7
|
+
export const checkMonthString = () => function checkMonthString(value) {
|
|
8
|
+
log('CHECK: month-string');
|
|
9
|
+
const tokens = TokenCollection.fromPatterns(value, [/[^-]*/, /[^0-9]?/, /.[0-9]*/]);
|
|
10
|
+
log('Month: "%s" => %O', tokens.value, tokens);
|
|
11
|
+
const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.month, datetimeTokenCheck.extra);
|
|
15
12
|
if (!res.matched) {
|
|
16
|
-
|
|
13
|
+
log('Failed: %O', res);
|
|
17
14
|
}
|
|
18
15
|
return res;
|
|
19
16
|
};
|
|
20
|
-
exports.checkMonthString = checkMonthString;
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const debug_1 = require("../../debug");
|
|
5
|
-
const token_1 = require("../../token");
|
|
6
|
-
const datetime_tokens_1 = require("./datetime-tokens");
|
|
1
|
+
import { log } from '../../debug.js';
|
|
2
|
+
import { TokenCollection } from '../../token/index.js';
|
|
3
|
+
import { datetimeTokenCheck } from './datetime-tokens.js';
|
|
7
4
|
/**
|
|
8
5
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#times
|
|
9
6
|
*/
|
|
10
|
-
const checkTimeString = () => function checkTimeString(value) {
|
|
11
|
-
|
|
12
|
-
const tokens =
|
|
7
|
+
export const checkTimeString = () => function checkTimeString(value) {
|
|
8
|
+
log('CHECK: time-string');
|
|
9
|
+
const tokens = TokenCollection.fromPatterns(value, [
|
|
13
10
|
// hh
|
|
14
11
|
/[^:]*/,
|
|
15
12
|
// :
|
|
@@ -25,11 +22,10 @@ const checkTimeString = () => function checkTimeString(value) {
|
|
|
25
22
|
// sss
|
|
26
23
|
/.[0-9]*/,
|
|
27
24
|
]);
|
|
28
|
-
|
|
29
|
-
const res = tokens.eachCheck(
|
|
25
|
+
log('Time: "%s" => %O', tokens.value, tokens);
|
|
26
|
+
const res = tokens.eachCheck(datetimeTokenCheck.hour, datetimeTokenCheck.colon, datetimeTokenCheck.minute, datetimeTokenCheck.colonOrEnd, datetimeTokenCheck.second, datetimeTokenCheck.decimalPointOrEnd, datetimeTokenCheck.secondFractionalPart);
|
|
30
27
|
if (!res.matched) {
|
|
31
|
-
|
|
28
|
+
log('Failed: %O', res);
|
|
32
29
|
}
|
|
33
30
|
return res;
|
|
34
31
|
};
|
|
35
|
-
exports.checkTimeString = checkTimeString;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { Token } from '../../token';
|
|
2
|
-
import type { CustomSyntaxChecker } from '../../types';
|
|
1
|
+
import type { Token } from '../../token/index.js';
|
|
2
|
+
import type { CustomSyntaxChecker } from '../../types.js';
|
|
3
3
|
/**
|
|
4
4
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#time-zones
|
|
5
5
|
*/
|
|
6
6
|
export declare const checkTimeZoneOffsetString: CustomSyntaxChecker;
|
|
7
|
-
export declare function parseTimeZone(zone: string | Readonly<Token>): import("../../types").Result;
|
|
7
|
+
export declare function parseTimeZone(zone: string | Readonly<Token>): import("../../types.js").Result;
|
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const match_result_1 = require("../../match-result");
|
|
6
|
-
const token_1 = require("../../token");
|
|
7
|
-
const datetime_tokens_1 = require("./datetime-tokens");
|
|
1
|
+
import { log } from '../../debug.js';
|
|
2
|
+
import { matched, unmatched } from '../../match-result.js';
|
|
3
|
+
import { TokenCollection } from '../../token/index.js';
|
|
4
|
+
import { datetimeTokenCheck } from './datetime-tokens.js';
|
|
8
5
|
/**
|
|
9
6
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#time-zones
|
|
10
7
|
*/
|
|
11
|
-
const checkTimeZoneOffsetString = () => function checkTimeZoneOffsetString(value) {
|
|
12
|
-
|
|
8
|
+
export const checkTimeZoneOffsetString = () => function checkTimeZoneOffsetString(value) {
|
|
9
|
+
log('CHECK: time-zone-offset-string');
|
|
13
10
|
return parseTimeZone(value);
|
|
14
11
|
};
|
|
15
|
-
|
|
16
|
-
function parseTimeZone(zone) {
|
|
12
|
+
export function parseTimeZone(zone) {
|
|
17
13
|
const value = typeof zone === 'string' ? zone : zone.value;
|
|
18
|
-
const zoneTokens =
|
|
14
|
+
const zoneTokens = TokenCollection.fromPatterns(zone, [
|
|
19
15
|
// Z + -
|
|
20
16
|
/[^0-9]?/,
|
|
21
17
|
// hh
|
|
@@ -25,11 +21,10 @@ function parseTimeZone(zone) {
|
|
|
25
21
|
// mm
|
|
26
22
|
/.[0-9]*/,
|
|
27
23
|
]);
|
|
28
|
-
|
|
24
|
+
log('Time-zone Part: "%s" => %O', value, zoneTokens);
|
|
29
25
|
const res = zoneTokens.eachCheck((sign, tail) => {
|
|
30
|
-
var _a, _b;
|
|
31
26
|
if (!sign || !sign.value) {
|
|
32
|
-
return
|
|
27
|
+
return unmatched(value, 'missing-token', {
|
|
33
28
|
expects: [
|
|
34
29
|
{ type: 'const', value: 'Z' },
|
|
35
30
|
{ type: 'const', value: '+' },
|
|
@@ -40,11 +35,11 @@ function parseTimeZone(zone) {
|
|
|
40
35
|
}
|
|
41
36
|
if (sign.match('Z')) {
|
|
42
37
|
if (tail.value) {
|
|
43
|
-
return (
|
|
38
|
+
return (tail[0]?.unmatched({
|
|
44
39
|
reason: 'extra-token',
|
|
45
|
-
})
|
|
40
|
+
}) ?? unmatched(tail.value, 'extra-token'));
|
|
46
41
|
}
|
|
47
|
-
return
|
|
42
|
+
return matched();
|
|
48
43
|
}
|
|
49
44
|
if (!sign.match(['+', '-'])) {
|
|
50
45
|
return sign.unmatched({
|
|
@@ -56,7 +51,7 @@ function parseTimeZone(zone) {
|
|
|
56
51
|
partName: 'time-zone',
|
|
57
52
|
});
|
|
58
53
|
}
|
|
59
|
-
},
|
|
54
|
+
}, datetimeTokenCheck.hour, colon => {
|
|
60
55
|
if (!colon || !colon.value) {
|
|
61
56
|
return;
|
|
62
57
|
}
|
|
@@ -67,10 +62,9 @@ function parseTimeZone(zone) {
|
|
|
67
62
|
partName: 'time-zone',
|
|
68
63
|
});
|
|
69
64
|
}
|
|
70
|
-
},
|
|
65
|
+
}, datetimeTokenCheck.minute, datetimeTokenCheck.extra);
|
|
71
66
|
if (!res.matched) {
|
|
72
|
-
|
|
67
|
+
log('Failed: %O', res);
|
|
73
68
|
}
|
|
74
69
|
return res;
|
|
75
70
|
}
|
|
76
|
-
exports.parseTimeZone = parseTimeZone;
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const debug_1 = require("../../debug");
|
|
5
|
-
const token_1 = require("../../token");
|
|
6
|
-
const datetime_tokens_1 = require("./datetime-tokens");
|
|
1
|
+
import { log } from '../../debug.js';
|
|
2
|
+
import { TokenCollection } from '../../token/index.js';
|
|
3
|
+
import { datetimeTokenCheck } from './datetime-tokens.js';
|
|
7
4
|
/**
|
|
8
5
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#weeks
|
|
9
6
|
*/
|
|
10
|
-
const checkWeekString = () => function checkWeekString(value) {
|
|
11
|
-
|
|
12
|
-
const tokens =
|
|
7
|
+
export const checkWeekString = () => function checkWeekString(value) {
|
|
8
|
+
log('CHECK: week-string');
|
|
9
|
+
const tokens = TokenCollection.fromPatterns(value, [
|
|
13
10
|
// YYYY
|
|
14
11
|
/[^-]+/,
|
|
15
12
|
// -
|
|
@@ -19,11 +16,10 @@ const checkWeekString = () => function checkWeekString(value) {
|
|
|
19
16
|
// ww
|
|
20
17
|
/.[0-9]*/,
|
|
21
18
|
]);
|
|
22
|
-
|
|
23
|
-
const res = tokens.eachCheck(
|
|
19
|
+
log('Week: "%s" => %O', tokens.value, tokens);
|
|
20
|
+
const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.hyphen, datetimeTokenCheck.weekSign, datetimeTokenCheck.week, datetimeTokenCheck.extra);
|
|
24
21
|
if (!res.matched) {
|
|
25
|
-
|
|
22
|
+
log('Failed: %O', res);
|
|
26
23
|
}
|
|
27
24
|
return res;
|
|
28
25
|
};
|
|
29
|
-
exports.checkWeekString = checkWeekString;
|
|
@@ -1,20 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const debug_1 = require("../../debug");
|
|
5
|
-
const token_1 = require("../../token");
|
|
6
|
-
const datetime_tokens_1 = require("./datetime-tokens");
|
|
1
|
+
import { log } from '../../debug.js';
|
|
2
|
+
import { TokenCollection } from '../../token/index.js';
|
|
3
|
+
import { datetimeTokenCheck } from './datetime-tokens.js';
|
|
7
4
|
/**
|
|
8
5
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html
|
|
9
6
|
*/
|
|
10
|
-
const checkYearString = () => function checkYearString(value) {
|
|
11
|
-
|
|
12
|
-
const tokens =
|
|
13
|
-
|
|
14
|
-
const res = tokens.eachCheck(
|
|
7
|
+
export const checkYearString = () => function checkYearString(value) {
|
|
8
|
+
log('CHECK: year-string');
|
|
9
|
+
const tokens = TokenCollection.fromPatterns(value, [/.*/]);
|
|
10
|
+
log('Year: "%s" => %O', tokens.value, tokens);
|
|
11
|
+
const res = tokens.eachCheck(datetimeTokenCheck.year, datetimeTokenCheck.extra);
|
|
15
12
|
if (!res.matched) {
|
|
16
|
-
|
|
13
|
+
log('Failed: %O', res);
|
|
17
14
|
}
|
|
18
15
|
return res;
|
|
19
16
|
};
|
|
20
|
-
exports.checkYearString = checkYearString;
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const debug_1 = require("../../debug");
|
|
5
|
-
const token_1 = require("../../token");
|
|
6
|
-
const datetime_tokens_1 = require("./datetime-tokens");
|
|
1
|
+
import { log } from '../../debug.js';
|
|
2
|
+
import { TokenCollection } from '../../token/index.js';
|
|
3
|
+
import { datetimeTokenCheck } from './datetime-tokens.js';
|
|
7
4
|
/**
|
|
8
5
|
* @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#yearless-dates
|
|
9
6
|
*/
|
|
10
|
-
const checkYearlessDateString = () => function checkYearlessDateString(value) {
|
|
11
|
-
|
|
12
|
-
const tokens =
|
|
7
|
+
export const checkYearlessDateString = () => function checkYearlessDateString(value) {
|
|
8
|
+
log('CHECK: yearless-date-string');
|
|
9
|
+
const tokens = TokenCollection.fromPatterns(value, [
|
|
13
10
|
// MM
|
|
14
11
|
/[^-]*/,
|
|
15
12
|
// -
|
|
@@ -17,11 +14,10 @@ const checkYearlessDateString = () => function checkYearlessDateString(value) {
|
|
|
17
14
|
// DD
|
|
18
15
|
/.[0-9]*/,
|
|
19
16
|
]);
|
|
20
|
-
|
|
21
|
-
const res = tokens.eachCheck(
|
|
17
|
+
log('Yearless Date: "%s" => %O', tokens.value, tokens);
|
|
18
|
+
const res = tokens.eachCheck(datetimeTokenCheck.month, datetimeTokenCheck.hyphen, datetimeTokenCheck.date, datetimeTokenCheck.extra);
|
|
22
19
|
if (!res.matched) {
|
|
23
|
-
|
|
20
|
+
log('Failed: %O', res);
|
|
24
21
|
}
|
|
25
22
|
return res;
|
|
26
23
|
};
|
|
27
|
-
exports.checkYearlessDateString = checkYearlessDateString;
|
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.checkMIMEType = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
1
|
// @ts-ignore
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
import MIMEType from 'whatwg-mimetype';
|
|
3
|
+
import { matched, unmatched } from '../match-result.js';
|
|
4
|
+
import { Token } from '../token/index.js';
|
|
9
5
|
const expects = (withoutParameters) => [
|
|
10
6
|
{
|
|
11
7
|
type: 'format',
|
|
@@ -16,27 +12,25 @@ const expects = (withoutParameters) => [
|
|
|
16
12
|
* MIME Type
|
|
17
13
|
* @see https://mimesniff.spec.whatwg.org/#valid-mime-type
|
|
18
14
|
*/
|
|
19
|
-
const checkMIMEType = options => value => {
|
|
20
|
-
|
|
21
|
-
const withoutParameters = (_a = options === null || options === void 0 ? void 0 : options.withoutParameters) !== null && _a !== void 0 ? _a : false;
|
|
15
|
+
export const checkMIMEType = options => value => {
|
|
16
|
+
const withoutParameters = options?.withoutParameters ?? false;
|
|
22
17
|
if (!value) {
|
|
23
|
-
return
|
|
18
|
+
return unmatched(value, 'empty-token', { expects: expects(withoutParameters) });
|
|
24
19
|
}
|
|
25
|
-
const mimeType =
|
|
20
|
+
const mimeType = MIMEType.parse(value);
|
|
26
21
|
if (mimeType) {
|
|
27
22
|
if (value.toLowerCase() === mimeType.essence) {
|
|
28
|
-
return
|
|
23
|
+
return matched();
|
|
29
24
|
}
|
|
30
25
|
if (!withoutParameters && mimeType.parameters.size > 0) {
|
|
31
|
-
return
|
|
26
|
+
return matched();
|
|
32
27
|
}
|
|
33
28
|
const extraToken = value.slice(mimeType.essence.length);
|
|
34
|
-
return new
|
|
29
|
+
return new Token(extraToken, mimeType.essence.length, value).unmatched({
|
|
35
30
|
reason: 'extra-token',
|
|
36
31
|
expects: expects(withoutParameters),
|
|
37
32
|
candidate: mimeType.essence,
|
|
38
33
|
});
|
|
39
34
|
}
|
|
40
|
-
return
|
|
35
|
+
return unmatched(value, 'syntax-error', { expects: expects(withoutParameters) });
|
|
41
36
|
};
|
|
42
|
-
exports.checkMIMEType = checkMIMEType;
|
package/lib/whatwg/is-abs-url.js
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isAbsURL = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* @see https://url.spec.whatwg.org/#syntax-url-absolute
|
|
6
3
|
*
|
|
@@ -14,7 +11,7 @@ exports.isAbsURL = void 0;
|
|
|
14
11
|
* > followed by U+003A (:) and a scheme-relative-file-URL string
|
|
15
12
|
*
|
|
16
13
|
*/
|
|
17
|
-
const isAbsURL = () => {
|
|
14
|
+
export const isAbsURL = () => {
|
|
18
15
|
return value => {
|
|
19
16
|
try {
|
|
20
17
|
new URL(value);
|
|
@@ -31,4 +28,3 @@ const isAbsURL = () => {
|
|
|
31
28
|
return true;
|
|
32
29
|
};
|
|
33
30
|
};
|
|
34
|
-
exports.isAbsURL = isAbsURL;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isBrowserContextName = void 0;
|
|
4
1
|
/**
|
|
5
2
|
*
|
|
6
3
|
* @see https://html.spec.whatwg.org/multipage/browsers.html#valid-browsing-context-name
|
|
@@ -10,9 +7,8 @@ exports.isBrowserContextName = void 0;
|
|
|
10
7
|
* > (Names starting with an underscore are reserved for special keywords.)
|
|
11
8
|
*
|
|
12
9
|
*/
|
|
13
|
-
const isBrowserContextName = () => {
|
|
10
|
+
export const isBrowserContextName = () => {
|
|
14
11
|
return value => {
|
|
15
12
|
return !!value && value[0] !== '_';
|
|
16
13
|
};
|
|
17
14
|
};
|
|
18
|
-
exports.isBrowserContextName = isBrowserContextName;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isCustomElementName = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* PotentialCustomElementName
|
|
6
3
|
*
|
|
@@ -57,7 +54,7 @@ const rePCEN = new RegExp(`^[a-z](?:${rePCENChar})*\\-(?:${rePCENChar})*$`, 'i')
|
|
|
57
54
|
* Originally, it is not possible to define a name including ASCII upper alphas in the custom element, but it is not treated as illegal by the HTML parser.
|
|
58
55
|
*
|
|
59
56
|
*/
|
|
60
|
-
const isCustomElementName = () => {
|
|
57
|
+
export const isCustomElementName = () => {
|
|
61
58
|
return tagName => {
|
|
62
59
|
switch (tagName) {
|
|
63
60
|
case 'annotation-xml':
|
|
@@ -74,4 +71,3 @@ const isCustomElementName = () => {
|
|
|
74
71
|
return rePCEN.test(tagName);
|
|
75
72
|
};
|
|
76
73
|
};
|
|
77
|
-
exports.isCustomElementName = isCustomElementName;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isItempropName = void 0;
|
|
4
1
|
/**
|
|
5
2
|
*
|
|
6
3
|
* @see https://html.spec.whatwg.org/multipage/microdata.html#defined-property-name
|
|
@@ -11,9 +8,8 @@ exports.isItempropName = void 0;
|
|
|
11
8
|
* > ASCII whitespace are disallowed because otherwise the values would be parsed as multiple tokens.
|
|
12
9
|
*
|
|
13
10
|
*/
|
|
14
|
-
const isItempropName = () => {
|
|
11
|
+
export const isItempropName = () => {
|
|
15
12
|
return value => {
|
|
16
13
|
return !value.includes(':') && !value.includes('.') && !value.includes(' ');
|
|
17
14
|
};
|
|
18
15
|
};
|
|
19
|
-
exports.isItempropName = isItempropName;
|
package/package.json
CHANGED
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@markuplint/types",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0-alpha.1",
|
|
4
4
|
"description": "Type declaration and value checker",
|
|
5
5
|
"repository": "git@github.com:markuplint/markuplint.git",
|
|
6
6
|
"author": "Yusuke Hirao <yusukehirao@me.com>",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"private": false,
|
|
9
|
-
"
|
|
9
|
+
"type": "module",
|
|
10
|
+
"exports": {
|
|
11
|
+
".": {
|
|
12
|
+
"import": "./lib/index.js"
|
|
13
|
+
}
|
|
14
|
+
},
|
|
10
15
|
"types": "lib/index.d.ts",
|
|
11
16
|
"publishConfig": {
|
|
12
17
|
"access": "public"
|
|
@@ -20,16 +25,16 @@
|
|
|
20
25
|
"schema": "ts-node './gen/types.ts'; json2ts './types.schema.json' > './src/types.schema.ts'; prettier './src/types.schema.ts' './types.schema.json' --write; eslint './src/types.schema.ts' --fix; tsc;"
|
|
21
26
|
},
|
|
22
27
|
"dependencies": {
|
|
23
|
-
"@types/bcp-47": "
|
|
24
|
-
"@types/css-tree": "^2.
|
|
28
|
+
"@types/bcp-47": "^2.0.0",
|
|
29
|
+
"@types/css-tree": "^2.3.1",
|
|
25
30
|
"@types/debug": "^4.1.8",
|
|
26
31
|
"@types/whatwg-mimetype": "3.0.0",
|
|
27
|
-
"bcp-47": "1",
|
|
32
|
+
"bcp-47": "^2.1.0",
|
|
28
33
|
"css-tree": "^2.3.1",
|
|
29
34
|
"debug": "^4.3.4",
|
|
30
|
-
"leven": "
|
|
31
|
-
"type-fest": "^
|
|
35
|
+
"leven": "^4.0.0",
|
|
36
|
+
"type-fest": "^4.1.0",
|
|
32
37
|
"whatwg-mimetype": "^3.0.0"
|
|
33
38
|
},
|
|
34
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "22502ee22a378ae766033d687dbc0443e5ed35dc"
|
|
35
40
|
}
|