@markuplint/types 3.0.0-alpha.4 → 3.0.0-alpha.6

package/lib/check-multi-types.d.ts

@@ -1,2 +1,5 @@
 import type { CustomSyntaxCheck, UnmatchedResult } from './types';
-export declare function checkMultiTypes(value: string, checks: CustomSyntaxCheck[]): import("./types").MatchedResult | UnmatchedResult;
+export declare function checkMultiTypes(
+	value: string,
+	checks: CustomSyntaxCheck[],
+): import('./types').MatchedResult | UnmatchedResult;

package/lib/defs.js

@@ -506,6 +506,7 @@ exports.types = {
             },
         },
     },
+    // DO NOT USE: Issue #564
     '<class-list>': {
         ref: 'https://www.w3.org/TR/SVG/styling.html#ClassAttribute',
         syntax: {

package/lib/get-candidate.d.ts

@@ -1,3 +1,6 @@
-declare type NullableString = string | null | undefined;
-export declare function getCandidate(value: NullableString, ...candidates: (NullableString | NullableString[])[]): string | undefined;
+type NullableString = string | null | undefined;
+export declare function getCandidate(
+	value: NullableString,
+	...candidates: (NullableString | NullableString[])[]
+): string | undefined;
 export {};

package/lib/match-result.d.ts

@@ -1,9 +1,22 @@
-import type { FormattedPrimitiveTypeCheck, MatchedResult, UnmatchedResult, UnmatchedResultOptions, UnmatchedResultReason } from './types';
-export declare function matches(checker: FormattedPrimitiveTypeCheck, options?: UnmatchedResultOptions & {
-    ref?: string;
-    reason?: UnmatchedResultReason;
-}): (value: string) => MatchedResult | UnmatchedResult;
+import type {
+	FormattedPrimitiveTypeCheck,
+	MatchedResult,
+	UnmatchedResult,
+	UnmatchedResultOptions,
+	UnmatchedResultReason,
+} from './types';
+export declare function matches(
+	checker: FormattedPrimitiveTypeCheck,
+	options?: UnmatchedResultOptions & {
+		ref?: string;
+		reason?: UnmatchedResultReason;
+	},
+): (value: string) => MatchedResult | UnmatchedResult;
 export declare function matched(): MatchedResult;
-export declare function unmatched(value: string, reason?: UnmatchedResultReason, options?: UnmatchedResultOptions & {
-    ref?: string;
-}): UnmatchedResult;
+export declare function unmatched(
+	value: string,
+	reason?: UnmatchedResultReason,
+	options?: UnmatchedResultOptions & {
+		ref?: string;
+	},
+): UnmatchedResult;

package/lib/primitive/is-uint.d.ts

@@ -3,6 +3,9 @@
  *
  * @param value
  */
-export declare function isUint(value: string, options?: {
-    gt?: number;
-}): boolean;
+export declare function isUint(
+	value: string,
+	options?: {
+		gt?: number;
+	},
+): boolean;

package/lib/primitive/split-unit.d.ts

@@ -4,6 +4,6 @@
  * @returns
  */
 export declare function splitUnit(value: string): {
-    num: string;
-    unit: string;
+	num: string;
+	unit: string;
 };

package/lib/token/token-collection.d.ts

@@ -1,62 +1,71 @@
 import type { UnmatchedResult } from '..';
 import type { Expect, Result, List } from '../types';
 import { Token } from './token';
-declare type TokenCollectionOptions = Partial<Omit<List, 'token'> & {
-    specificSeparator: string | string[];
-}>;
-export declare type TokenEachCheck = (head: Token | null, tail: TokenCollection) => Result | void;
+type TokenCollectionOptions = Partial<
+	Omit<List, 'token'> & {
+		specificSeparator: string | string[];
+	}
+>;
+export type TokenEachCheck = (head: Token | null, tail: TokenCollection) => Result | void;
 export declare class TokenCollection extends Array<Token> {
-    static fromPatterns(value: Token | string, patterns: RegExp[], typeOptions?: Omit<TokenCollectionOptions, 'specificSeparator'> & {
-        repeat?: boolean;
-    }): TokenCollection;
-    static get [Symbol.species](): ArrayConstructor;
-    readonly allowEmpty: NonNullable<List['allowEmpty']>;
-    readonly caseInsensitive: NonNullable<List['caseInsensitive']>;
-    readonly disallowToSurroundBySpaces: NonNullable<List['disallowToSurroundBySpaces']>;
-    readonly number: List['number'];
-    readonly ordered: NonNullable<List['ordered']>;
-    readonly separator: NonNullable<List['separator']>;
-    readonly unique: NonNullable<List['unique']>;
-    constructor(value?: string, typeOptions?: TokenCollectionOptions);
-    constructor(value?: number);
-    get value(): string;
-    check(options?: {
-        expects?: Expect[];
-        ref?: string;
-        cache?: boolean;
-    }): import("..").MatchedResult | UnmatchedResult;
-    chunk(split: number): TokenCollection[];
-    compareTokens(callback: (prev: Token, current: Token) => Token | null | void): Token | null | undefined;
-    divide(position: number): readonly [TokenCollection, TokenCollection];
-    eachCheck(...callbacks: TokenEachCheck[]): Result;
-    filter(callback: (value: Token, index: number, array: Token[]) => boolean): TokenCollection;
-    getConsecutiveToken(tokenType: number): Token | null;
-    getDuplicated(): Token | null;
-    getIdentTokens(): TokenCollection;
-    /**
-     *
-     * @param value The token value or the token type or its list
-     */
-    has(value: string | RegExp | number | (string | RegExp | number)[]): boolean;
-    headAndTail(): {
-        head: Token | null;
-        tail: TokenCollection;
-    };
-    /**
-     *
-     * @param value The token value or the token type or its list
-     */
-    search(value: string | RegExp | number | (string | RegExp | number)[]): Token | null;
-    takeTurns(tokenNumbers: ReadonlyArray<number>, lastTokenNumber?: number): {
-        unexpectedLastToken: boolean;
-        expectedTokenNumber: number;
-        token: Token;
-    } | null;
-    toJSON(): {
-        type: number;
-        value: string;
-        offset: number;
-    }[];
-    private static _new;
+	static fromPatterns(
+		value: Token | string,
+		patterns: RegExp[],
+		typeOptions?: Omit<TokenCollectionOptions, 'specificSeparator'> & {
+			repeat?: boolean;
+		},
+	): TokenCollection;
+	static get [Symbol.species](): ArrayConstructor;
+	readonly allowEmpty: NonNullable<List['allowEmpty']>;
+	readonly caseInsensitive: NonNullable<List['caseInsensitive']>;
+	readonly disallowToSurroundBySpaces: NonNullable<List['disallowToSurroundBySpaces']>;
+	readonly number: List['number'];
+	readonly ordered: NonNullable<List['ordered']>;
+	readonly separator: NonNullable<List['separator']>;
+	readonly unique: NonNullable<List['unique']>;
+	constructor(value?: string, typeOptions?: TokenCollectionOptions);
+	constructor(value?: number);
+	get value(): string;
+	check(options?: {
+		expects?: Expect[];
+		ref?: string;
+		cache?: boolean;
+	}): import('..').MatchedResult | UnmatchedResult;
+	chunk(split: number): TokenCollection[];
+	compareTokens(callback: (prev: Token, current: Token) => Token | null | void): Token | null | undefined;
+	divide(position: number): readonly [TokenCollection, TokenCollection];
+	eachCheck(...callbacks: TokenEachCheck[]): Result;
+	filter(callback: (value: Token, index: number, array: Token[]) => boolean): TokenCollection;
+	getConsecutiveToken(tokenType: number): Token | null;
+	getDuplicated(): Token | null;
+	getIdentTokens(): TokenCollection;
+	/**
+	 *
+	 * @param value The token value or the token type or its list
+	 */
+	has(value: string | RegExp | number | (string | RegExp | number)[]): boolean;
+	headAndTail(): {
+		head: Token | null;
+		tail: TokenCollection;
+	};
+	/**
+	 *
+	 * @param value The token value or the token type or its list
+	 */
+	search(value: string | RegExp | number | (string | RegExp | number)[]): Token | null;
+	takeTurns(
+		tokenNumbers: ReadonlyArray<number>,
+		lastTokenNumber?: number,
+	): {
+		unexpectedLastToken: boolean;
+		expectedTokenNumber: number;
+		token: Token;
+	} | null;
+	toJSON(): {
+		type: number;
+		value: string;
+		offset: number;
+	}[];
+	private static _new;
 }
 export {};

package/lib/token/token-collection.js

@@ -4,6 +4,52 @@ exports.TokenCollection = void 0;
 const match_result_1 = require("../match-result");
 const token_1 = require("./token");
 class TokenCollection extends Array {
+    static fromPatterns(value, patterns, typeOptions) {
+        const origin = typeof value === 'string' ? value : value.origin;
+        let strings = typeof value === 'string' ? value : value.value;
+        let cumulativeOffset = typeof value === 'string' ? 0 : value.offset;
+        const tokens = [];
+        function addToken(tokenValue) {
+            const token = new token_1.Token(tokenValue, cumulativeOffset, origin);
+            tokens.push(token);
+            strings = strings.slice(tokenValue.length);
+            cumulativeOffset += tokenValue.length;
+            return token;
+        }
+        let isBroken = false;
+        do {
+            isBroken = false;
+            for (const pattern of patterns) {
+                const res = pattern.exec(strings);
+                let value;
+                if (!res) {
+                    isBroken = true;
+                    value = '';
+                }
+                else {
+                    if (res.index !== 0) {
+                        value = strings.slice(res.index + res[0].length);
+                    }
+                    else {
+                        value = res[0] || '';
+                    }
+                }
+                const token = addToken(value);
+                // @ts-ignore
+                token._ = pattern;
+            }
+            if (isBroken) {
+                addToken(strings);
+            }
+        } while ((typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.repeat) && strings);
+        if (strings) {
+            addToken(strings);
+        }
+        return TokenCollection._new(tokens, new TokenCollection('', typeOptions));
+    }
+    static get [Symbol.species]() {
+        return Array;
+    }
     constructor(value, typeOptions) {
         super();
         this.disallowToSurroundBySpaces = (typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.disallowToSurroundBySpaces) || false;
@@ -60,52 +106,6 @@ class TokenCollection extends Array {
             offset += v.length;
         });
     }
-    static fromPatterns(value, patterns, typeOptions) {
-        const origin = typeof value === 'string' ? value : value.origin;
-        let strings = typeof value === 'string' ? value : value.value;
-        let cumulativeOffset = typeof value === 'string' ? 0 : value.offset;
-        const tokens = [];
-        function addToken(tokenValue) {
-            const token = new token_1.Token(tokenValue, cumulativeOffset, origin);
-            tokens.push(token);
-            strings = strings.slice(tokenValue.length);
-            cumulativeOffset += tokenValue.length;
-            return token;
-        }
-        let isBroken = false;
-        do {
-            isBroken = false;
-            for (const pattern of patterns) {
-                const res = pattern.exec(strings);
-                let value;
-                if (!res) {
-                    isBroken = true;
-                    value = '';
-                }
-                else {
-                    if (res.index !== 0) {
-                        value = strings.slice(res.index + res[0].length);
-                    }
-                    else {
-                        value = res[0] || '';
-                    }
-                }
-                const token = addToken(value);
-                // @ts-ignore
-                token._ = pattern;
-            }
-            if (isBroken) {
-                addToken(strings);
-            }
-        } while ((typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.repeat) && strings);
-        if (strings) {
-            addToken(strings);
-        }
-        return TokenCollection._new(tokens, new TokenCollection('', typeOptions));
-    }
-    static get [Symbol.species]() {
-        return Array;
-    }
     get value() {
         const value = this.map(t => t.value).join('');
         return value;
@@ -151,7 +151,7 @@ class TokenCollection extends Array {
                     });
                 }
                 else if (takeTurnsError.token.type === takeTurnsError.expectedTokenNumber) {
-                    // Consecutive cammas
+                    // Consecutive commas
                     return takeTurnsError.token.unmatched({
                         reason: 'unexpected-comma',
                         ref,

package/lib/token/token.d.ts

@@ -1,55 +1,60 @@
 import type { UnmatchedResult, UnmatchedResultOptions, UnmatchedResultReason } from '../types';
 export declare class Token {
-    #private;
-    /**
-     * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
-     */
-    static readonly Comma = 18;
-    static readonly Ident = 1;
-    static readonly WhiteSpace = 13;
-    /**
-     * ASCII whitespace is
-     * - U+0009 TAB
-     * - U+000A LF
-     * - U+000C FF
-     * - U+000D CR
-     * - U+0020 SPACE.
-     *
-     * @see https://infra.spec.whatwg.org/#ascii-whitespace
-     */
-    static readonly whitespace: ReadonlyArray<string>;
-    static getCol(value: string, offset: number): number;
-    static getLine(value: string, offset: number): number;
-    static getType(value: string, separators?: string[]): 1 | 13 | 18;
-    static shiftLocation(token: Token, offset: number): {
-        offset: number;
-        line: number;
-        column: number;
-    };
-    readonly offset: number;
-    readonly type: number;
-    readonly value: string;
-    constructor(value: string, offset: number, originalValue: string, separators?: string[]);
-    get length(): number;
-    get origin(): string;
-    /**
-     *
-     * @param value The token value or the token type or its list
-     */
-    includes(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
-    /**
-     *
-     * @param value The token value or the token type or its list
-     */
-    match(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
-    toJSON(): {
-        type: number;
-        value: string;
-        offset: number;
-    };
-    toNumber(): number;
-    unmatched(options?: UnmatchedResultOptions & {
-        ref?: string;
-        reason?: UnmatchedResultReason;
-    }): UnmatchedResult;
+	#private;
+	/**
+	 * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
+	 */
+	static readonly Comma = 18;
+	static readonly Ident = 1;
+	static readonly WhiteSpace = 13;
+	/**
+	 * ASCII whitespace is
+	 * - U+0009 TAB
+	 * - U+000A LF
+	 * - U+000C FF
+	 * - U+000D CR
+	 * - U+0020 SPACE.
+	 *
+	 * @see https://infra.spec.whatwg.org/#ascii-whitespace
+	 */
+	static readonly whitespace: ReadonlyArray<string>;
+	static getCol(value: string, offset: number): number;
+	static getLine(value: string, offset: number): number;
+	static getType(value: string, separators?: string[]): 1 | 13 | 18;
+	static shiftLocation(
+		token: Token,
+		offset: number,
+	): {
+		offset: number;
+		line: number;
+		column: number;
+	};
+	readonly offset: number;
+	readonly type: number;
+	readonly value: string;
+	constructor(value: string, offset: number, originalValue: string, separators?: string[]);
+	get length(): number;
+	get origin(): string;
+	/**
+	 *
+	 * @param value The token value or the token type or its list
+	 */
+	includes(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
+	/**
+	 *
+	 * @param value The token value or the token type or its list
+	 */
+	match(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
+	toJSON(): {
+		type: number;
+		value: string;
+		offset: number;
+	};
+	toNumber(): number;
+	unmatched(
+		options?: UnmatchedResultOptions & {
+			ref?: string;
+			reason?: UnmatchedResultReason;
+		},
+	): UnmatchedResult;
 }

package/lib/token/token.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Token = void 0;
 const tslib_1 = require("tslib");
 class Token {
-    constructor(value, offset, originalValue, separators) {
-        _Token_originalValue.set(this, void 0);
-        this.type = Token.getType(value, separators);
-        this.value = value;
-        this.offset = offset;
-        tslib_1.__classPrivateFieldSet(this, _Token_originalValue, originalValue, "f");
-    }
     static getCol(value, offset) {
         const lines = value.slice(0, offset).split(/\n/g);
         return lines[lines.length - 1].length + 1;
@@ -38,6 +31,13 @@ class Token {
             column: Token.getCol(tslib_1.__classPrivateFieldGet(token, _Token_originalValue, "f"), shifted),
         };
     }
+    constructor(value, offset, originalValue, separators) {
+        _Token_originalValue.set(this, void 0);
+        this.type = Token.getType(value, separators);
+        this.value = value;
+        this.offset = offset;
+        tslib_1.__classPrivateFieldSet(this, _Token_originalValue, originalValue, "f");
+    }
     get length() {
         return this.value.length;
     }

package/lib/types.d.ts

@@ -1,78 +1,102 @@
 import type { cssSyntaxMatch } from './css-syntax';
 export type { Type, List, Enum, CssSyntax, KeywordDefinedType, Number } from './types.schema';
-export declare type Result = UnmatchedResult | MatchedResult;
-export declare type UnmatchedResult = {
-    matched: false;
-    ref: string | null;
-    raw: string;
-    length: number;
-    offset: number;
-    line: number;
-    column: number;
-    reason: UnmatchedResultReason;
-    passCount?: number;
+export type Result = UnmatchedResult | MatchedResult;
+export type UnmatchedResult = {
+	matched: false;
+	ref: string | null;
+	raw: string;
+	length: number;
+	offset: number;
+	line: number;
+	column: number;
+	reason: UnmatchedResultReason;
+	passCount?: number;
 } & UnmatchedResultOptions;
-export declare type UnmatchedResultOptions = {
-    partName?: string;
-    expects?: Expect[];
-    extra?: Expect;
-    candidate?: string;
+export type UnmatchedResultOptions = {
+	partName?: string;
+	expects?: Expect[];
+	extra?: Expect;
+	candidate?: string;
 };
-export declare type UnmatchedResultReason = 'syntax-error' | 'typo' | 'missing-token' | 'missing-comma' | 'unexpected-token' | 'unexpected-space' | 'unexpected-newline' | 'unexpected-comma' | 'empty-token' | 'out-of-range' | 'doesnt-exist-in-enum' | 'duplicated' | 'illegal-combination' | 'illegal-order' | 'extra-token' | 'must-be-percent-encoded' | 'must-be-serialized' | {
-    type: 'out-of-range';
-    gt?: number;
-    gte?: number;
-    lt?: number;
-    lte?: number;
-} | {
-    type: 'out-of-range-length-char';
-    gte: number;
-    lte?: number;
-} | {
-    type: 'out-of-range-length-digit';
-    gte: number;
-    lte?: number;
+export type UnmatchedResultReason =
+	| 'syntax-error'
+	| 'typo'
+	| 'missing-token'
+	| 'missing-comma'
+	| 'unexpected-token'
+	| 'unexpected-space'
+	| 'unexpected-newline'
+	| 'unexpected-comma'
+	| 'empty-token'
+	| 'out-of-range'
+	| 'doesnt-exist-in-enum'
+	| 'duplicated'
+	| 'illegal-combination'
+	| 'illegal-order'
+	| 'extra-token'
+	| 'must-be-percent-encoded'
+	| 'must-be-serialized'
+	| {
+			type: 'out-of-range';
+			gt?: number;
+			gte?: number;
+			lt?: number;
+			lte?: number;
+	  }
+	| {
+			type: 'out-of-range-length-char';
+			gte: number;
+			lte?: number;
+	  }
+	| {
+			type: 'out-of-range-length-digit';
+			gte: number;
+			lte?: number;
+	  };
+export type MatchedResult = {
+	matched: true;
 };
-export declare type MatchedResult = {
-    matched: true;
+export type Expect = {
+	type: 'const' | 'format' | 'syntax' | 'regexp' | 'common';
+	value: string;
 };
-export declare type Expect = {
-    type: 'const' | 'format' | 'syntax' | 'regexp' | 'common';
-    value: string;
+export type FormattedPrimitiveTypeCheck = (value: string) => boolean;
+export type FormattedPrimitiveTypeCreator<O = never> = (options?: O) => FormattedPrimitiveTypeCheck;
+export type Defs = Record<string, CustomCssSyntax | CustomSyntax>;
+export type CustomSyntax = {
+	ref: string;
+	expects?: Expect[];
+	is: CustomSyntaxCheck;
 };
-export declare type FormattedPrimitiveTypeCheck = (value: string) => boolean;
-export declare type FormattedPrimitiveTypeCreator<O = never> = (options?: O) => FormattedPrimitiveTypeCheck;
-export declare type Defs = Record<string, CustomCssSyntax | CustomSyntax>;
-export declare type CustomSyntax = {
-    ref: string;
-    expects?: Expect[];
-    is: CustomSyntaxCheck;
+export type CustomSyntaxCheck = (value: string) => Result;
+export type CustomSyntaxChecker<O = {}> = (options?: O) => CustomSyntaxCheck;
+export type CustomCssSyntax = {
+	ref: string;
+	caseSensitive?: boolean;
+	expects?: Expect[];
+	syntax: {
+		apply: `<${string}>`;
+		def: Record<string, string | CssSyntaxTokenizer>;
+		/**
+		 * @deprecated
+		 */
+		ebnf?: Record<string, string | string[]>;
+		/**
+		 * @deprecated
+		 */
+		properties?: Record<string, string>;
+	};
 };
-export declare type CustomSyntaxCheck = (value: string) => Result;
-export declare type CustomSyntaxChecker<O = {}> = (options?: O) => CustomSyntaxCheck;
-export declare type CustomCssSyntax = {
-    ref: string;
-    caseSensitive?: boolean;
-    expects?: Expect[];
-    syntax: {
-        apply: `<${string}>`;
-        def: Record<string, string | CssSyntaxTokenizer>;
-        /**
-         * @deprecated
-         */
-        ebnf?: Record<string, string | string[]>;
-        /**
-         * @deprecated
-         */
-        properties?: Record<string, string>;
-    };
+export type CSSSyntaxToken = {
+	type: number;
+	value: string;
+	index: number;
+	balance: number;
+	node?: any;
 };
-export declare type CSSSyntaxToken = {
-    type: number;
-    value: string;
-    index: number;
-    balance: number;
-    node?: any;
-};
-export declare type CssSyntaxTokenizer = (token: CSSSyntaxToken | null, getNextToken: GetNextToken, match: typeof cssSyntaxMatch) => number;
-export declare type GetNextToken = (length: number) => CSSSyntaxToken | null;
+export type CssSyntaxTokenizer = (
+	token: CSSSyntaxToken | null,
+	getNextToken: GetNextToken,
+	match: typeof cssSyntaxMatch,
+) => number;
+export type GetNextToken = (length: number) => CSSSyntaxToken | null;