@markuplint/types 2.0.0 → 2.2.0

package/lib/whatwg/check-autocomplete.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAutoComplete = void 0;
+const debug_1 = require("../debug");
 const get_candicate_1 = require("../get-candicate");
 const match_result_1 = require("../match-result");
 const token_1 = require("../token");
+const acLog = debug_1.log.extend('autocomplete');
 /**
  * https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-section
  */
@@ -80,6 +82,10 @@ const contactableFieldNames = [
     'email',
     'impp',
 ];
+/**
+ * @see https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-webauthn
+ */
+const webauthnFieldNames = ['webauthn'];
 const URL_AUTOCOMPLET = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete';
 const URL_ON_OFF = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofilling-form-controls:-the-autocomplete-attribute:attr-fe-autocomplete-on-2';
 const URL_NAMED_GROUP = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-section';
@@ -110,6 +116,7 @@ const checkAutoComplete = () => value => {
         ref: URL_AUTOCOMPLET,
     });
     if (!listingChecked.matched) {
+        acLog('Unmatch: %s', listingChecked.reason);
         return listingChecked;
     }
     const idents = tokens.getIdentTokens();
@@ -126,6 +133,7 @@ const checkAutoComplete = () => value => {
     // > (i.e. the "on" and "off" keywords are not allowed).
     if (head.match(['on', 'off'], true)) {
         if (tail.length) {
+            acLog('[Unmatched ("%s")] Unexpected pair with "on" or "off": "%s"', value, tail.value);
             return tail[0].unmatched({
                 reason: 'extra-token',
                 expects: [
@@ -146,6 +154,7 @@ const checkAutoComplete = () => value => {
         hasNamedGroup = true;
         const sectionToken = tail.search(namedGroup);
         if (sectionToken) {
+            acLog('[Unmatched ("%s")] Deprecated in autofill named group: "%s"', value, sectionToken.value);
             return sectionToken.unmatched({
                 partName: 'autofill named group',
                 reason: 'duplicated',
@@ -168,6 +177,7 @@ const checkAutoComplete = () => value => {
         hasPartOfAddress = true;
         const partToken = tail.search(partOfAddress);
         if (partToken) {
+            acLog('[Unmatched ("%s")] Duplicated values: "%s"', value, partToken.value);
             return partToken.unmatched({
                 reason: 'duplicated',
                 expects: [
@@ -196,6 +206,7 @@ const checkAutoComplete = () => value => {
         }
         if (!contactableFiledToken.match(contactableFieldNames, true)) {
             const candicate = (0, get_candicate_1.getCandicate)(contactableFiledToken.value, contactableFieldNames);
+            acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, contactableFiledToken.value);
             return contactableFiledToken.unmatched({
                 reason: 'unexpected-token',
                 expects: contactableFieldNames.slice().map(token => ({
@@ -207,6 +218,16 @@ const checkAutoComplete = () => value => {
             });
         }
         if (tail[1]) {
+            if (tail[1].match(webauthnFieldNames)) {
+                return (0, match_result_1.matched)();
+            }
+            const candicate = (0, get_candicate_1.getCandicate)(tail[1].value, webauthnFieldNames);
+            if (candicate) {
+                acLog('[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ', value, tail[1].value, candicate);
+            }
+            else {
+                acLog('[Unmatched ("%s")] Unnecessarily token: "%s"', value, tail[1].value);
+            }
             return tail[1].unmatched({
                 reason: 'extra-token',
                 expects: [
@@ -222,6 +243,16 @@ const checkAutoComplete = () => value => {
     }
     if (head.match([...autofillFieldNames, ...contactableFieldNames], true)) {
         if (tail.length) {
+            if (tail[0].match(webauthnFieldNames)) {
+                return (0, match_result_1.matched)();
+            }
+            const candicate = (0, get_candicate_1.getCandicate)(tail[0].value, webauthnFieldNames);
+            if (candicate) {
+                acLog('[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ', value, tail[0].value, candicate);
+            }
+            else {
+                acLog('[Unmatched ("%s")] Unnecessarily token: "%s"', value, tail[0].value);
+            }
             return tail[0].unmatched({
                 reason: 'extra-token',
                 expects: [
@@ -235,6 +266,9 @@ const checkAutoComplete = () => value => {
         }
         return (0, match_result_1.matched)();
     }
+    if (head.match(webauthnFieldNames)) {
+        return (0, match_result_1.matched)();
+    }
     const expects = [
         {
             type: 'common',
@@ -272,6 +306,12 @@ const checkAutoComplete = () => value => {
         candicate = (0, get_candicate_1.getCandicate)(head.value, autofillFieldNames, contactingTokens, contactableFieldNames);
     }
     candicate = candicate || (0, get_candicate_1.getCandicate)(head.value, autofillFieldNames);
+    if (candicate) {
+        acLog('[Unmatched ("%s")] Unexpected token: "%s", Do you mean "%s"? ', value, head.value, candicate);
+    }
+    else {
+        acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, head.value);
+    }
     return head.unmatched({
         reason: 'unexpected-token',
         expects,

package/lib/whatwg/check-autocomplete.spec.js

@@ -2,28 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const check_autocomplete_1 = require("./check-autocomplete");
 const check = (0, check_autocomplete_1.checkAutoComplete)();
-test('valid', () => {
+test('basic', () => {
     expect(check('on').matched).toBe(true);
+    expect(check('on webauthn').matched).toBe(false);
     expect(check('off').matched).toBe(true);
+    expect(check('off webauthn').matched).toBe(false);
     expect(check('name').matched).toBe(true);
     expect(check('given-name').matched).toBe(true);
+    expect(check('given-name webauthn').matched).toBe(true);
+    expect(check('given-name webauthun').matched).toBe(false);
     expect(check('section-').matched).toBe(true);
     expect(check('section-foo').matched).toBe(true);
+    expect(check('section-foo webauthn').matched).toBe(true);
     expect(check('section-foo name').matched).toBe(true);
+    expect(check('section-foo name webauthn').matched).toBe(true);
     expect(check('section-foo shipping name').matched).toBe(true);
     expect(check('section-foo billing name').matched).toBe(true);
     expect(check('section-foo billing home').matched).toBe(true);
     expect(check('section-foo billing work').matched).toBe(true);
     expect(check('section-foo billing home tel').matched).toBe(true);
     expect(check('section-foo billing work email').matched).toBe(true);
+    expect(check('section-foo billing work email webauthn').matched).toBe(true);
     expect(check('shipping name').matched).toBe(true);
     expect(check('billing name').matched).toBe(true);
     expect(check('billing home').matched).toBe(true);
     expect(check('billing work').matched).toBe(true);
     expect(check('billing home tel').matched).toBe(true);
     expect(check('billing work email').matched).toBe(true);
+    expect(check('billing work email webauthn').matched).toBe(true);
     expect(check('home tel').matched).toBe(true);
     expect(check('work email').matched).toBe(true);
+    expect(check('work email webauthn').matched).toBe(true);
 });
 test('unexpected-token', () => {
     expect(check('section-foo , name')).toStrictEqual({

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'
-	| 'coron'
-	| 'extra'
-	| 'coronOrEnd'
-	| 'decimalPointOrEnd'
-	| 'localDateTimeSeparator'
-	| 'normalizedlocalDateTimeSeparator'
-	| 'plusOrMinusSign'
-	| 'weekSign',
-	TokenEachCheck
-> &
-	Record<'_year' | '_month', number | null>;
+export declare const datetimeTokenCheck: Record<'year' | 'month' | 'date' | 'hour' | 'minute' | 'second' | 'secondFractionalPart' | 'week' | 'hyphen' | 'coron' | 'extra' | 'coronOrEnd' | 'decimalPointOrEnd' | 'localDateTimeSeparator' | 'normalizedlocalDateTimeSeparator' | 'plusOrMinusSign' | 'weekSign', TokenEachCheck> & Record<'_year' | '_month', number | null>;
 export declare function getMaxWeekNum(year: number): number;

package/lib/whatwg/check-datetime/time-zone-offset-string.d.ts

@@ -4,4 +4,4 @@ import type { CustomSyntaxChecker } from '../../types';
  * @see https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#time-zones
  */
 export declare const checkTimeZoneOffsetString: CustomSyntaxChecker;
-export declare function parseTimeZone(zone: string | Token): import('../../types').Result;
+export declare function parseTimeZone(zone: string | Token): import("../../types").Result;

package/lib/whatwg/check-mime-type.d.ts

@@ -4,8 +4,8 @@ import type { CustomSyntaxChecker } from '../types';
  * @see https://mimesniff.spec.whatwg.org/#valid-mime-type
  */
 export declare const checkMIMEType: CustomSyntaxChecker<{
-	/**
-	 * @see https://mimesniff.spec.whatwg.org/#valid-mime-type-with-no-parameters
-	 */
-	withoutParameters?: boolean;
+    /**
+     * @see https://mimesniff.spec.whatwg.org/#valid-mime-type-with-no-parameters
+     */
+    withoutParameters?: boolean;
 }>;

package/lib/whatwg/check-mime-type.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkMIMEType = void 0;
 const tslib_1 = require("tslib");
 // @ts-ignore
-const whatwg_mimetype_1 = (0, tslib_1.__importDefault)(require("whatwg-mimetype"));
+const whatwg_mimetype_1 = tslib_1.__importDefault(require("whatwg-mimetype"));
 const match_result_1 = require("../match-result");
 const token_1 = require("../token");
 const expects = (withoutParameters) => [

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/types",
-	"version": "2.0.0",
+	"version": "2.2.0",
 	"description": "Types of attributes and properties and more",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -19,7 +19,7 @@
 	"dependencies": {
 		"bcp-47": "1",
 		"css-tree": "1",
-		"debug": "^4.3.3",
+		"debug": "^4.3.4",
 		"leven": "3",
 		"whatwg-mimetype": "2"
 	},
@@ -29,5 +29,5 @@
 		"@types/debug": "^4.1.7",
 		"@types/whatwg-mimetype": "^2.1.1"
 	},
-	"gitHead": "de81fc514acdf472f87184e3499e9364258f9b66"
+	"gitHead": "c28258b756d8c42890698e26c03cdc02c6833489"
 }

package/src/whatwg/check-autocomplete.spec.ts

@@ -2,28 +2,37 @@ import { checkAutoComplete } from './check-autocomplete';
 
 const check = checkAutoComplete();
 
-test('valid', () => {
+test('basic', () => {
 	expect(check('on').matched).toBe(true);
+	expect(check('on webauthn').matched).toBe(false);
 	expect(check('off').matched).toBe(true);
+	expect(check('off webauthn').matched).toBe(false);
 	expect(check('name').matched).toBe(true);
 	expect(check('given-name').matched).toBe(true);
+	expect(check('given-name webauthn').matched).toBe(true);
+	expect(check('given-name webauthun').matched).toBe(false);
 	expect(check('section-').matched).toBe(true);
 	expect(check('section-foo').matched).toBe(true);
+	expect(check('section-foo webauthn').matched).toBe(true);
 	expect(check('section-foo name').matched).toBe(true);
+	expect(check('section-foo name webauthn').matched).toBe(true);
 	expect(check('section-foo shipping name').matched).toBe(true);
 	expect(check('section-foo billing name').matched).toBe(true);
 	expect(check('section-foo billing home').matched).toBe(true);
 	expect(check('section-foo billing work').matched).toBe(true);
 	expect(check('section-foo billing home tel').matched).toBe(true);
 	expect(check('section-foo billing work email').matched).toBe(true);
+	expect(check('section-foo billing work email webauthn').matched).toBe(true);
 	expect(check('shipping name').matched).toBe(true);
 	expect(check('billing name').matched).toBe(true);
 	expect(check('billing home').matched).toBe(true);
 	expect(check('billing work').matched).toBe(true);
 	expect(check('billing home tel').matched).toBe(true);
 	expect(check('billing work email').matched).toBe(true);
+	expect(check('billing work email webauthn').matched).toBe(true);
 	expect(check('home tel').matched).toBe(true);
 	expect(check('work email').matched).toBe(true);
+	expect(check('work email webauthn').matched).toBe(true);
 });
 
 test('unexpected-token', () => {

package/src/whatwg/check-autocomplete.ts

@@ -1,10 +1,13 @@
 import type { Expect } from '..';
 import type { CustomSyntaxChecker } from '../types';
 
+import { log } from '../debug';
 import { getCandicate } from '../get-candicate';
 import { matched } from '../match-result';
 import { TokenCollection } from '../token';
 
+const acLog = log.extend('autocomplete');
+
 /**
  * https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-section
  */
@@ -86,6 +89,11 @@ const contactableFieldNames = [
 	'impp',
 ];
 
+/**
+ * @see https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete-webauthn
+ */
+const webauthnFieldNames = ['webauthn'];
+
 const URL_AUTOCOMPLET = 'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fe-autocomplete';
 const URL_ON_OFF =
 	'https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofilling-form-controls:-the-autocomplete-attribute:attr-fe-autocomplete-on-2';
@@ -123,6 +131,7 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 		ref: URL_AUTOCOMPLET,
 	});
 	if (!listingChecked.matched) {
+		acLog('Unmatch: %s', listingChecked.reason);
 		return listingChecked;
 	}
 
@@ -141,6 +150,7 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 	// > (i.e. the "on" and "off" keywords are not allowed).
 	if (head.match(['on', 'off'], true)) {
 		if (tail.length) {
+			acLog('[Unmatched ("%s")] Unexpected pair with "on" or "off": "%s"', value, tail.value);
 			return tail[0].unmatched({
 				reason: 'extra-token',
 				expects: [
@@ -163,6 +173,7 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 		hasNamedGroup = true;
 		const sectionToken = tail.search(namedGroup);
 		if (sectionToken) {
+			acLog('[Unmatched ("%s")] Deprecated in autofill named group: "%s"', value, sectionToken.value);
 			return sectionToken.unmatched({
 				partName: 'autofill named group',
 				reason: 'duplicated',
@@ -188,6 +199,7 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 		hasPartOfAddress = true;
 		const partToken = tail.search(partOfAddress);
 		if (partToken) {
+			acLog('[Unmatched ("%s")] Duplicated values: "%s"', value, partToken.value);
 			return partToken.unmatched({
 				reason: 'duplicated',
 				expects: [
@@ -220,6 +232,7 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 
 		if (!contactableFiledToken.match(contactableFieldNames, true)) {
 			const candicate = getCandicate(contactableFiledToken.value, contactableFieldNames);
+			acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, contactableFiledToken.value);
 			return contactableFiledToken.unmatched({
 				reason: 'unexpected-token',
 				expects: contactableFieldNames.slice().map(token => ({
@@ -232,6 +245,23 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 		}
 
 		if (tail[1]) {
+			if (tail[1].match(webauthnFieldNames)) {
+				return matched();
+			}
+
+			const candicate = getCandicate(tail[1].value, webauthnFieldNames);
+
+			if (candicate) {
+				acLog(
+					'[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ',
+					value,
+					tail[1].value,
+					candicate,
+				);
+			} else {
+				acLog('[Unmatched ("%s")] Unnecessarily token: "%s"', value, tail[1].value);
+			}
+
 			return tail[1].unmatched({
 				reason: 'extra-token',
 				expects: [
@@ -249,6 +279,23 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 
 	if (head.match([...autofillFieldNames, ...contactableFieldNames], true)) {
 		if (tail.length) {
+			if (tail[0].match(webauthnFieldNames)) {
+				return matched();
+			}
+
+			const candicate = getCandicate(tail[0].value, webauthnFieldNames);
+
+			if (candicate) {
+				acLog(
+					'[Unmatched ("%s")] Unnecessarily token: "%s", Do you mean "%s"? ',
+					value,
+					tail[0].value,
+					candicate,
+				);
+			} else {
+				acLog('[Unmatched ("%s")] Unnecessarily token: "%s"', value, tail[0].value);
+			}
+
 			return tail[0].unmatched({
 				reason: 'extra-token',
 				expects: [
@@ -264,6 +311,10 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 		return matched();
 	}
 
+	if (head.match(webauthnFieldNames)) {
+		return matched();
+	}
+
 	const expects: Expect[] = [
 		{
 			type: 'common',
@@ -315,6 +366,11 @@ export const checkAutoComplete: CustomSyntaxChecker = () => value => {
 
 	candicate = candicate || getCandicate(head.value, autofillFieldNames);
 
+	if (candicate) {
+		acLog('[Unmatched ("%s")] Unexpected token: "%s", Do you mean "%s"? ', value, head.value, candicate);
+	} else {
+		acLog('[Unmatched ("%s")] Unexpected token: "%s"', value, head.value);
+	}
 	return head.unmatched({
 		reason: 'unexpected-token',
 		expects,