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

package/lib/token/token-collection.js

@@ -5,12 +5,13 @@ 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;
+        var _c;
+        const originalValue = typeof value === 'string' ? value : value.originalValue;
         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);
+            const token = new token_1.Token(tokenValue, cumulativeOffset, originalValue);
             tokens.push(token);
             strings = strings.slice(tokenValue.length);
             cumulativeOffset += tokenValue.length;
@@ -31,7 +32,7 @@ class TokenCollection extends Array {
                         value = strings.slice(res.index + res[0].length);
                     }
                     else {
-                        value = res[0] || '';
+                        value = (_c = res[0]) !== null && _c !== void 0 ? _c : '';
                     }
                 }
                 const token = addToken(value);
@@ -51,14 +52,15 @@ class TokenCollection extends Array {
         return Array;
     }
     constructor(value, typeOptions) {
+        var _c, _d, _e, _f, _g, _h;
         super();
-        this.disallowToSurroundBySpaces = (typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.disallowToSurroundBySpaces) || false;
-        this.allowEmpty = (typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.allowEmpty) || true;
-        this.ordered = (typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.ordered) || false;
-        this.unique = (typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.unique) || false;
-        this.caseInsensitive = (typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.caseInsensitive) || true;
+        this.disallowToSurroundBySpaces = (_c = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.disallowToSurroundBySpaces) !== null && _c !== void 0 ? _c : false;
+        this.allowEmpty = (_d = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.allowEmpty) !== null && _d !== void 0 ? _d : true;
+        this.ordered = (_e = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.ordered) !== null && _e !== void 0 ? _e : false;
+        this.unique = (_f = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.unique) !== null && _f !== void 0 ? _f : false;
+        this.caseInsensitive = (_g = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.caseInsensitive) !== null && _g !== void 0 ? _g : true;
         this.number = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.number;
-        this.separator = (typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.separator) || 'space';
+        this.separator = (_h = typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.separator) !== null && _h !== void 0 ? _h : 'space';
         if (typeof value === 'number') {
             this.length = value;
             return;
@@ -70,12 +72,12 @@ class TokenCollection extends Array {
         if (this.separator === 'comma') {
             separators.push(',');
         }
-        if (typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.specificSeparator) {
-            if (Array.isArray(typeOptions.specificSeparator)) {
-                separators.push(...typeOptions.specificSeparator);
+        if ((typeOptions === null || typeOptions === void 0 ? void 0 : typeOptions.specificSeparator) != null) {
+            if (typeof typeOptions.specificSeparator === 'string') {
+                separators.push(typeOptions.specificSeparator);
             }
             else {
-                separators.push(typeOptions.specificSeparator);
+                separators.push(...typeOptions.specificSeparator);
             }
         }
         const chars = value.split('');
@@ -88,8 +90,9 @@ class TokenCollection extends Array {
                 continue;
             }
             const lastChar = last[0];
-            if (!separators.includes(char) &&
-                !separators.includes(last[0]) &&
+            if (lastChar &&
+                !separators.includes(char) &&
+                !separators.includes(lastChar) &&
                 ((token_1.Token.whitespace.includes(lastChar) && token_1.Token.whitespace.includes(char)) ||
                     (!token_1.Token.whitespace.includes(lastChar) && !token_1.Token.whitespace.includes(char)))) {
                 values.push(last + char);
@@ -190,7 +193,7 @@ class TokenCollection extends Array {
     chunk(split) {
         const chunks = [];
         const tokens = this.slice();
-        while (tokens.length) {
+        while (tokens.length > 0) {
             const chunkTokens = tokens.splice(0, split);
             const chunk = TokenCollection._new(chunkTokens, this);
             chunks.push(chunk);
@@ -221,6 +224,7 @@ class TokenCollection extends Array {
         return [a, b];
     }
     eachCheck(...callbacks) {
+        var _c, _d;
         let headAndTail = this.headAndTail();
         let head = headAndTail.head;
         let tail = headAndTail.tail;
@@ -233,10 +237,10 @@ class TokenCollection extends Array {
             wait--;
             const result = callback.call(this, head, tail);
             if (result && !result.matched) {
-                passCount += result.passCount || 0;
+                passCount += (_c = result.passCount) !== null && _c !== void 0 ? _c : 0;
                 if (prev && result.offset === 0 && result.length === 0) {
                     const { offset, line, column } = token_1.Token.shiftLocation(prev, cumulativeOffset);
-                    firstUnmatched = firstUnmatched || {
+                    firstUnmatched = firstUnmatched !== null && firstUnmatched !== void 0 ? firstUnmatched : {
                         ...result,
                         offset,
                         line,
@@ -244,7 +248,7 @@ class TokenCollection extends Array {
                     };
                 }
                 if (!prev && this.value.length === 0) {
-                    firstUnmatched = firstUnmatched || {
+                    firstUnmatched = firstUnmatched !== null && firstUnmatched !== void 0 ? firstUnmatched : {
                         ...result,
                         reason: 'empty-token',
                         expects: undefined,
@@ -261,7 +265,7 @@ class TokenCollection extends Array {
                         }
                     }
                 }
-                firstUnmatched = firstUnmatched || result;
+                firstUnmatched = firstUnmatched !== null && firstUnmatched !== void 0 ? firstUnmatched : result;
             }
             else if (result && !firstUnmatched && result.matched) {
                 return result;
@@ -271,7 +275,7 @@ class TokenCollection extends Array {
                     passCount += 4 * wait;
                 }
             }
-            cumulativeOffset = (head === null || head === void 0 ? void 0 : head.length) || 0;
+            cumulativeOffset = (_d = head === null || head === void 0 ? void 0 : head.length) !== null && _d !== void 0 ? _d : 0;
             headAndTail = tail.headAndTail();
             prev = head;
             head = headAndTail.head;
@@ -295,7 +299,7 @@ class TokenCollection extends Array {
                 return current;
             }
         });
-        return resultToken || null;
+        return resultToken !== null && resultToken !== void 0 ? resultToken : null;
     }
     getDuplicated() {
         const aList = this.slice();
@@ -332,7 +336,7 @@ class TokenCollection extends Array {
         const copy = this.slice();
         const head = copy.shift();
         if (!head) {
-            return { head: head || null, tail: TokenCollection._new([], this) };
+            return { head: head !== null && head !== void 0 ? head : null, tail: TokenCollection._new([], this) };
         }
         const tail = TokenCollection._new(copy, this);
         return { head, tail };
@@ -353,6 +357,9 @@ class TokenCollection extends Array {
         const tokens = this.slice();
         for (let i = 0; i < tokens.length; i++) {
             const token = tokens[i];
+            if (!token) {
+                continue;
+            }
             const expectedTokenNumber = tokenNumbers[i % tokenNumbers.length];
             if (token.type !== expectedTokenNumber) {
                 return {

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

@@ -1,144 +1,166 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const token_collection_1 = require("./token-collection");
-const _1 = require(".");
+'use strict';
+// @ts-nocheck
+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

@@ -1,6 +1,6 @@
+import type { TokenValue } from './types';
 import type { UnmatchedResult, UnmatchedResultOptions, UnmatchedResultReason } from '../types';
 export declare class Token {
-	#private;
 	/**
 	 * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
 	 */
@@ -20,9 +20,9 @@ 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?: string[]): 1 | 13 | 18;
+	static getType(value: string, separators?: readonly string[]): 1 | 13 | 18;
 	static shiftLocation(
-		token: Token,
+		token: Readonly<Token>,
 		offset: number,
 	): {
 		offset: number;
@@ -30,21 +30,22 @@ export declare class Token {
 		column: number;
 	};
 	readonly offset: number;
+	readonly originalValue: string;
 	readonly type: number;
 	readonly value: string;
-	constructor(value: string, offset: number, originalValue: string, separators?: string[]);
+	constructor(value: string, offset: number, originalValue: string, separators?: readonly string[]);
 	get length(): number;
-	get origin(): string;
+	clone(): Token;
 	/**
 	 *
 	 * @param value The token value or the token type or its list
 	 */
-	includes(value: string | RegExp | number | (string | RegExp | number)[], caseInsensitive?: boolean): boolean;
+	includes(value: TokenValue, 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;
+	match(value: TokenValue, caseInsensitive?: boolean): boolean;
 	toJSON(): {
 		type: number;
 		value: string;
@@ -53,8 +54,8 @@ export declare class Token {
 	toNumber(): number;
 	unmatched(
 		options?: UnmatchedResultOptions & {
-			ref?: string;
-			reason?: UnmatchedResultReason;
+			readonly ref?: string;
+			readonly reason?: UnmatchedResultReason;
 		},
 	): UnmatchedResult;
 }

package/lib/token/token.js

@@ -1,21 +1,21 @@
 "use strict";
-var _Token_originalValue;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Token = void 0;
-const tslib_1 = require("tslib");
 class Token {
     static getCol(value, offset) {
+        var _a;
         const lines = value.slice(0, offset).split(/\n/g);
-        return lines[lines.length - 1].length + 1;
+        return ((_a = lines[lines.length - 1]) !== null && _a !== void 0 ? _a : '').length + 1;
     }
     static getLine(value, offset) {
         return value.slice(0, offset).split(/\n/g).length;
     }
     static getType(value, separators) {
-        if (Token.whitespace.includes(value[0])) {
+        var _a, _b;
+        if (Token.whitespace.includes((_a = value[0]) !== null && _a !== void 0 ? _a : '')) {
             return Token.WhiteSpace;
         }
-        if (separators === null || separators === void 0 ? void 0 : separators.includes(value[0])) {
+        if (separators === null || separators === void 0 ? void 0 : separators.includes((_b = value[0]) !== null && _b !== void 0 ? _b : '')) {
             switch (value[0]) {
                 case ',':
                     return Token.Comma;
@@ -27,22 +27,21 @@ class Token {
         const shifted = token.offset + offset;
         return {
             offset: shifted,
-            line: Token.getLine(tslib_1.__classPrivateFieldGet(token, _Token_originalValue, "f"), shifted),
-            column: Token.getCol(tslib_1.__classPrivateFieldGet(token, _Token_originalValue, "f"), shifted),
+            line: Token.getLine(token.originalValue, shifted),
+            column: Token.getCol(token.originalValue, 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");
+        this.originalValue = originalValue;
     }
     get length() {
         return this.value.length;
     }
-    get origin() {
-        return tslib_1.__classPrivateFieldGet(this, _Token_originalValue, "f");
+    clone() {
+        return new Token(this.value, this.offset, this.originalValue);
     }
     /**
      *
@@ -55,7 +54,7 @@ class Token {
         if (typeof value === 'string') {
             const a = caseInsensitive ? this.value.toLowerCase() : this.value;
             const b = caseInsensitive ? value.toLowerCase() : value;
-            return a.indexOf(b) !== -1;
+            return a.includes(b);
         }
         if (value instanceof RegExp) {
             const pattern = new RegExp(value, caseInsensitive ? 'i' : '');
@@ -90,25 +89,24 @@ class Token {
         };
     }
     toNumber() {
-        return parseFloat(this.value);
+        const num = parseFloat(this.value);
+        return isNaN(num) ? 0 : num;
     }
     unmatched(options) {
-        var _a;
+        var _a, _b;
         return {
             ...options,
             matched: false,
-            ref: (options === null || options === void 0 ? void 0 : options.ref) || null,
+            ref: (_a = options === null || options === void 0 ? void 0 : options.ref) !== null && _a !== void 0 ? _a : null,
             raw: this.value,
             offset: this.offset,
             length: this.value.length,
-            line: Token.getLine(tslib_1.__classPrivateFieldGet(this, _Token_originalValue, "f"), this.offset),
-            column: Token.getCol(tslib_1.__classPrivateFieldGet(this, _Token_originalValue, "f"), this.offset),
-            reason: (_a = options === null || options === void 0 ? void 0 : options.reason) !== null && _a !== void 0 ? _a : 'syntax-error',
+            line: Token.getLine(this.originalValue, this.offset),
+            column: Token.getCol(this.originalValue, this.offset),
+            reason: (_b = options === null || options === void 0 ? void 0 : options.reason) !== null && _b !== void 0 ? _b : 'syntax-error',
         };
     }
 }
-exports.Token = Token;
-_Token_originalValue = new WeakMap();
 /**
  * @see https://github.com/csstree/csstree/blob/master/lib/tokenizer/types.js
  */
@@ -126,3 +124,4 @@ Token.WhiteSpace = 13;
  * @see https://infra.spec.whatwg.org/#ascii-whitespace
  */
 Token.whitespace = ['\u0009', '\u000A', '\u000C', '\u000D', '\u0020'];
+exports.Token = Token;

package/lib/token/types.d.ts

@@ -0,0 +1,3 @@
+export type TokenValueScalar = string | Readonly<RegExp> | number;
+export type TokenValueArray = readonly TokenValue[];
+export type TokenValue = TokenValueScalar | TokenValueArray;

package/lib/token/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });