@markuplint/types 3.5.1 → 3.7.0

package/lib/token/token-collection.spec.js

@@ -1,145 +1,166 @@
-"use strict";
+'use strict';
 // @ts-nocheck
-Object.defineProperty(exports, "__esModule", { value: true });
-const token_collection_1 = require("./token-collection");
-const _1 = require(".");
+Object.defineProperty(exports, '__esModule', { value: true });
+const token_collection_1 = require('./token-collection');
+
+const _1 = require('.');
 test('parse', () => {
-    expect(new token_collection_1.TokenCollection(' a  b   c    ').toJSON()).toStrictEqual([
-        {
-            offset: 0,
-            type: 13,
-            value: ' ',
-        },
-        {
-            offset: 1,
-            type: 1,
-            value: 'a',
-        },
-        {
-            offset: 2,
-            type: 13,
-            value: '  ',
-        },
-        {
-            offset: 4,
-            type: 1,
-            value: 'b',
-        },
-        {
-            offset: 5,
-            type: 13,
-            value: '   ',
-        },
-        {
-            offset: 8,
-            type: 1,
-            value: 'c',
-        },
-        {
-            offset: 9,
-            type: 13,
-            value: '    ',
-        },
-    ]);
+	expect(new token_collection_1.TokenCollection(' a  b   c    ').toJSON()).toStrictEqual([
+		{
+			offset: 0,
+			type: 13,
+			value: ' ',
+		},
+		{
+			offset: 1,
+			type: 1,
+			value: 'a',
+		},
+		{
+			offset: 2,
+			type: 13,
+			value: '  ',
+		},
+		{
+			offset: 4,
+			type: 1,
+			value: 'b',
+		},
+		{
+			offset: 5,
+			type: 13,
+			value: '   ',
+		},
+		{
+			offset: 8,
+			type: 1,
+			value: 'c',
+		},
+		{
+			offset: 9,
+			type: 13,
+			value: '    ',
+		},
+	]);
 });
 test('parse comma separator', () => {
-    expect(new token_collection_1.TokenCollection('a,, ,b,cde', { separator: 'comma' }).toJSON()).toStrictEqual([
-        {
-            offset: 0,
-            type: 1,
-            value: 'a',
-        },
-        {
-            offset: 1,
-            type: 18,
-            value: ',',
-        },
-        {
-            offset: 2,
-            type: 18,
-            value: ',',
-        },
-        {
-            offset: 3,
-            type: 13,
-            value: ' ',
-        },
-        {
-            offset: 4,
-            type: 18,
-            value: ',',
-        },
-        {
-            offset: 5,
-            type: 1,
-            value: 'b',
-        },
-        {
-            offset: 6,
-            type: 18,
-            value: ',',
-        },
-        {
-            offset: 7,
-            type: 1,
-            value: 'cde',
-        },
-    ]);
+	expect(new token_collection_1.TokenCollection('a,, ,b,cde', { separator: 'comma' }).toJSON()).toStrictEqual([
+		{
+			offset: 0,
+			type: 1,
+			value: 'a',
+		},
+		{
+			offset: 1,
+			type: 18,
+			value: ',',
+		},
+		{
+			offset: 2,
+			type: 18,
+			value: ',',
+		},
+		{
+			offset: 3,
+			type: 13,
+			value: ' ',
+		},
+		{
+			offset: 4,
+			type: 18,
+			value: ',',
+		},
+		{
+			offset: 5,
+			type: 1,
+			value: 'b',
+		},
+		{
+			offset: 6,
+			type: 18,
+			value: ',',
+		},
+		{
+			offset: 7,
+			type: 1,
+			value: 'cde',
+		},
+	]);
 });
 test('A comma is an ident if the comma is not a separator', () => {
-    expect(new token_collection_1.TokenCollection('a ,cde , f').toJSON()).toStrictEqual([
-        {
-            offset: 0,
-            type: 1,
-            value: 'a',
-        },
-        {
-            offset: 1,
-            type: 13,
-            value: ' ',
-        },
-        {
-            offset: 2,
-            type: 1,
-            value: ',cde',
-        },
-        {
-            offset: 6,
-            type: 13,
-            value: ' ',
-        },
-        {
-            offset: 7,
-            type: 1,
-            value: ',',
-        },
-        {
-            offset: 8,
-            type: 13,
-            value: ' ',
-        },
-        {
-            offset: 9,
-            type: 1,
-            value: 'f',
-        },
-    ]);
+	expect(new token_collection_1.TokenCollection('a ,cde , f').toJSON()).toStrictEqual([
+		{
+			offset: 0,
+			type: 1,
+			value: 'a',
+		},
+		{
+			offset: 1,
+			type: 13,
+			value: ' ',
+		},
+		{
+			offset: 2,
+			type: 1,
+			value: ',cde',
+		},
+		{
+			offset: 6,
+			type: 13,
+			value: ' ',
+		},
+		{
+			offset: 7,
+			type: 1,
+			value: ',',
+		},
+		{
+			offset: 8,
+			type: 13,
+			value: ' ',
+		},
+		{
+			offset: 9,
+			type: 1,
+			value: 'f',
+		},
+	]);
 });
 test('getConsecutiveToken', () => {
-    var _a;
-    expect(new token_collection_1.TokenCollection('a,b,c', { separator: 'comma' }).getConsecutiveToken(_1.Token.Comma)).toBeFalsy();
-    expect(new token_collection_1.TokenCollection('a,,b', { separator: 'comma' }).getConsecutiveToken(_1.Token.Comma)).toBeTruthy();
-    expect((_a = new token_collection_1.TokenCollection('a,,b', { separator: 'comma' }).getConsecutiveToken(_1.Token.Comma)) === null || _a === void 0 ? void 0 : _a.offset).toBe(2);
+	let _a;
+	expect(
+		new token_collection_1.TokenCollection('a,b,c', { separator: 'comma' }).getConsecutiveToken(_1.Token.Comma),
+	).toBeFalsy();
+	expect(
+		new token_collection_1.TokenCollection('a,,b', { separator: 'comma' }).getConsecutiveToken(_1.Token.Comma),
+	).toBeTruthy();
+	expect(
+		(_a = new token_collection_1.TokenCollection('a,,b', { separator: 'comma' }).getConsecutiveToken(
+			_1.Token.Comma,
+		)) === null || _a === void 0
+			? void 0
+			: _a.offset,
+	).toBe(2);
 });
 test('fromPatterns', () => {
-    const patterns = [/\+|-/, /[0-9]{2}/, /:?/, /[0-9]{2}/];
-    expect(token_collection_1.TokenCollection.fromPatterns('+00:00', patterns).map(t => t.value)).toStrictEqual(['+', '00', ':', '00']);
-    expect(token_collection_1.TokenCollection.fromPatterns('+0000', patterns).map(t => t.value)).toStrictEqual(['+', '00', '', '00']);
-    expect(token_collection_1.TokenCollection.fromPatterns('+00/00', patterns).map(t => t.value)).toStrictEqual([
-        '+',
-        '00',
-        '',
-        '',
-        '/00',
-    ]);
+	const patterns = [/\+|-/, /[0-9]{2}/, /:?/, /[0-9]{2}/];
+	expect(token_collection_1.TokenCollection.fromPatterns('+00:00', patterns).map(t => t.value)).toStrictEqual([
+		'+',
+		'00',
+		':',
+		'00',
+	]);
+	expect(token_collection_1.TokenCollection.fromPatterns('+0000', patterns).map(t => t.value)).toStrictEqual([
+		'+',
+		'00',
+		'',
+		'00',
+	]);
+	expect(token_collection_1.TokenCollection.fromPatterns('+00/00', patterns).map(t => t.value)).toStrictEqual([
+		'+',
+		'00',
+		'',
+		'',
+		'/00',
+	]);
 });

package/lib/token/token.d.ts

@@ -20,7 +20,7 @@ export declare class Token {
     static readonly whitespace: ReadonlyArray<string>;
     static getCol(value: string, offset: number): number;
     static getLine(value: string, offset: number): number;
-    static getType(value: string, separators?: readonly string[]): 18 | 1 | 13;
+    static getType(value: string, separators?: readonly string[]): 1 | 13 | 18;
     static shiftLocation(token: Readonly<Token>, offset: number): {
         offset: number;
         line: number;

package/lib/types.d.ts

@@ -2,101 +2,77 @@ import type { cssSyntaxMatch } from './css-syntax';
 export type { Type, List, Enum, CssSyntax, KeywordDefinedType, Number } from './types.schema';
 export type Result = UnmatchedResult | MatchedResult;
 export type UnmatchedResult = {
-	readonly matched: false;
-	readonly ref: string | null;
-	readonly raw: string;
-	readonly length: number;
-	readonly offset: number;
-	readonly line: number;
-	readonly column: number;
-	readonly reason: UnmatchedResultReason;
-	readonly passCount?: number;
+    readonly matched: false;
+    readonly ref: string | null;
+    readonly raw: string;
+    readonly length: number;
+    readonly offset: number;
+    readonly line: number;
+    readonly column: number;
+    readonly reason: UnmatchedResultReason;
+    readonly passCount?: number;
 } & UnmatchedResultOptions;
 export type UnmatchedResultOptions = {
-	readonly partName?: string;
-	readonly expects?: readonly Expect[];
-	readonly extra?: Expect;
-	readonly candidate?: string;
+    readonly partName?: string;
+    readonly expects?: readonly Expect[];
+    readonly extra?: Expect;
+    readonly candidate?: string;
+};
+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' | {
+    readonly type: 'out-of-range';
+    readonly gt?: number;
+    readonly gte?: number;
+    readonly lt?: number;
+    readonly lte?: number;
+} | {
+    readonly type: 'out-of-range-length-char';
+    readonly gte: number;
+    readonly lte?: number;
+} | {
+    readonly type: 'out-of-range-length-digit';
+    readonly gte: number;
+    readonly 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'
-	| {
-			readonly type: 'out-of-range';
-			readonly gt?: number;
-			readonly gte?: number;
-			readonly lt?: number;
-			readonly lte?: number;
-	  }
-	| {
-			readonly type: 'out-of-range-length-char';
-			readonly gte: number;
-			readonly lte?: number;
-	  }
-	| {
-			readonly type: 'out-of-range-length-digit';
-			readonly gte: number;
-			readonly lte?: number;
-	  };
 export type MatchedResult = {
-	readonly matched: true;
+    readonly matched: true;
 };
 export type Expect = {
-	readonly type: 'const' | 'format' | 'syntax' | 'regexp' | 'common';
-	readonly value: string;
+    readonly type: 'const' | 'format' | 'syntax' | 'regexp' | 'common';
+    readonly 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 = {
-	readonly ref: string;
-	readonly expects?: readonly Expect[];
-	readonly is: CustomSyntaxCheck;
+    readonly ref: string;
+    readonly expects?: readonly Expect[];
+    readonly is: CustomSyntaxCheck;
 };
 export type CustomSyntaxCheck = (value: string) => Result;
 export type CustomSyntaxChecker<O = {}> = (options?: O) => CustomSyntaxCheck;
 export type CustomCssSyntax = {
-	readonly ref: string;
-	readonly caseSensitive?: boolean;
-	readonly expects?: readonly Expect[];
-	readonly syntax: {
-		readonly apply: `<${string}>`;
-		readonly def: Readonly<Record<string, string | CssSyntaxTokenizer>>;
-		/**
-		 * @deprecated
-		 */
-		readonly ebnf?: Readonly<Record<string, string | readonly string[]>>;
-		/**
-		 * @deprecated
-		 */
-		readonly properties?: Readonly<Record<string, string>>;
-	};
+    readonly ref: string;
+    readonly caseSensitive?: boolean;
+    readonly expects?: readonly Expect[];
+    readonly syntax: {
+        readonly apply: `<${string}>`;
+        readonly def: Readonly<Record<string, string | CssSyntaxTokenizer>>;
+        /**
+         * @deprecated
+         */
+        readonly ebnf?: Readonly<Record<string, string | readonly string[]>>;
+        /**
+         * @deprecated
+         */
+        readonly properties?: Readonly<Record<string, string>>;
+    };
 };
 export type CSSSyntaxToken = {
-	readonly type: number;
-	readonly value: string;
-	readonly index: number;
-	readonly balance: number;
-	readonly node?: any;
+    readonly type: number;
+    readonly value: string;
+    readonly index: number;
+    readonly balance: number;
+    readonly node?: any;
 };
-export type CssSyntaxTokenizer = (
-	token: Readonly<CSSSyntaxToken> | null,
-	getNextToken: GetNextToken,
-	match: typeof cssSyntaxMatch,
-) => number;
+export type CssSyntaxTokenizer = (token: Readonly<CSSSyntaxToken> | null, getNextToken: GetNextToken, match: typeof cssSyntaxMatch) => number;
 export type GetNextToken = (length: number) => CSSSyntaxToken | null;