@markuplint/types 3.12.0 → 4.0.0-alpha.10

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Yusuke Hirao
+Copyright (c) 2017-2024 Yusuke Hirao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

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

package/lib/check-multi-types.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkMultiTypes = void 0;
-const debug_1 = require("./debug");
-const match_result_1 = require("./match-result");
-function checkMultiTypes(value, checks) {
-    var _a, _b, _c;
+import { log } from './debug.js';
+import { matched } from './match-result.js';
+export function checkMultiTypes(value, checks) {
     let unmatched;
     for (const check of checks) {
         const res = check(value);
@@ -14,17 +10,16 @@ function checkMultiTypes(value, checks) {
         // @ts-ignore
         res._fn = check.name;
         // @ts-ignore
-        (0, debug_1.log)('%s(%d) vs %s(%d)', unmatched === null || unmatched === void 0 ? void 0 : unmatched._fn, unmatched === null || unmatched === void 0 ? void 0 : unmatched.passCount, res._fn, res.passCount);
-        const passedA = (_a = unmatched === null || unmatched === void 0 ? void 0 : unmatched.passCount) !== null && _a !== void 0 ? _a : 0;
-        const passedB = (_b = res.passCount) !== null && _b !== void 0 ? _b : 0;
-        const offsetA = (_c = unmatched === null || unmatched === void 0 ? void 0 : unmatched.offset) !== null && _c !== void 0 ? _c : 0;
+        log('%s(%d) vs %s(%d)', unmatched?._fn, unmatched?.passCount, res._fn, res.passCount);
+        const passedA = unmatched?.passCount ?? 0;
+        const passedB = res.passCount ?? 0;
+        const offsetA = unmatched?.offset ?? 0;
         const offsetB = res.offset;
         if (passedA < passedB || (passedA === passedB && offsetA <= offsetB)) {
             unmatched = res;
         }
     }
-    const result = unmatched !== null && unmatched !== void 0 ? unmatched : (0, match_result_1.matched)();
-    (0, debug_1.log)('%d checks result: %O', checks.length, result);
+    const result = unmatched ?? matched();
+    log('%d checks result: %O', checks.length, result);
     return result;
 }
-exports.checkMultiTypes = checkMultiTypes;

package/lib/check.d.ts

@@ -1,4 +1,4 @@
-import type { Type, Result, List, CustomSyntax, CustomCssSyntax, Enum, KeywordDefinedType, Number } from './types';
+import type { Type, Result, List, CustomSyntax, CustomCssSyntax, Enum, KeywordDefinedType, Number } from './types.js';
 import type { ReadonlyDeep } from 'type-fest';
 export declare function check(value: string, type: ReadonlyDeep<Type>, ref?: string, cache?: boolean): Result;
 export declare function isKeyword(type: ReadonlyDeep<Type>): type is ReadonlyDeep<KeywordDefinedType>;

package/lib/check.js

@@ -1,49 +1,39 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCustomSyntax = exports.isCSSSyntax = exports.isNumber = exports.isEnum = exports.isList = exports.isKeyword = exports.check = void 0;
-const debug_1 = require("./debug");
-const enum_1 = require("./enum");
-const keyword_type_1 = require("./keyword-type");
-const list_1 = require("./list");
-const number_1 = require("./number");
-function check(value, type, ref, cache = true) {
+import { log } from './debug.js';
+import { checkEnum } from './enum.js';
+import { checkKeywordType } from './keyword-type.js';
+import { checkList } from './list.js';
+import { checkNumber } from './number.js';
+export function check(value, type, ref, cache = true) {
     if (isKeyword(type)) {
-        (0, debug_1.log)('Check keyword: %s', type);
-        return (0, keyword_type_1.checkKeywordType)(value, type, cache);
+        log('Check keyword: %s', type);
+        return checkKeywordType(value, type, cache);
     }
     if (isList(type)) {
-        (0, debug_1.log)('Check list: %O', type);
-        return (0, list_1.checkList)(value, type, ref, cache);
+        log('Check list: %O', type);
+        return checkList(value, type, ref, cache);
     }
     if (isEnum(type)) {
-        (0, debug_1.log)('Check enum: %O', type);
-        return (0, enum_1.checkEnum)(value, type, ref);
+        log('Check enum: %O', type);
+        return checkEnum(value, type, ref);
     }
-    (0, debug_1.log)('Check number: %O', type);
-    return (0, number_1.checkNumber)(value, type, ref);
+    log('Check number: %O', type);
+    return checkNumber(value, type, ref);
 }
-exports.check = check;
-function isKeyword(type) {
+export function isKeyword(type) {
     return typeof type === 'string';
 }
-exports.isKeyword = isKeyword;
-function isList(type) {
+export function isList(type) {
     return typeof type !== 'string' && 'token' in type;
 }
-exports.isList = isList;
-function isEnum(type) {
+export function isEnum(type) {
     return typeof type !== 'string' && 'enum' in type;
 }
-exports.isEnum = isEnum;
-function isNumber(type) {
+export function isNumber(type) {
     return typeof type !== 'string' && 'enum' in type;
 }
-exports.isNumber = isNumber;
-function isCSSSyntax(type) {
+export function isCSSSyntax(type) {
     return typeof type === 'string' || 'syntax' in type;
 }
-exports.isCSSSyntax = isCSSSyntax;
-function isCustomSyntax(type) {
+export function isCustomSyntax(type) {
     return !isCSSSyntax(type);
 }
-exports.isCustomSyntax = isCustomSyntax;

package/lib/css-syntax.d.ts

@@ -1,2 +1,2 @@
-import type { CustomCssSyntax, Result, CssSyntax } from './types';
+import type { CustomCssSyntax, Result, CssSyntax } from './types.js';
 export declare function cssSyntaxMatch(value: string, type: CssSyntax | CustomCssSyntax): Result;

package/lib/css-syntax.js

@@ -1,16 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cssSyntaxMatch = void 0;
-const css_tree_1 = require("css-tree");
-const debug_1 = require("./debug");
-const defs_1 = require("./defs");
-const match_result_1 = require("./match-result");
+import { fork } from 'css-tree';
+import { log } from './debug.js';
+import { tokenizers, overrides } from './defs.js';
+import { matched } from './match-result.js';
 const MIMIC_TAG_L = 'mimiccases---';
 const MIMIC_TAG_R = '---mimiccases';
 const MIMIC_LENGTH = (MIMIC_TAG_L + MIMIC_TAG_R).length;
-function cssSyntaxMatch(value, type) {
-    var _a;
-    (0, debug_1.log)('Search CSS Syntax: "%s"', type);
+export function cssSyntaxMatch(value, type) {
+    log('Search CSS Syntax: "%s"', type);
     const origin = value;
     let defName;
     const typesExtended = {};
@@ -25,16 +21,16 @@ function cssSyntaxMatch(value, type) {
     }
     else {
         defName = type.syntax.apply;
-        ebnf = (_a = type.syntax.ebnf) !== null && _a !== void 0 ? _a : null;
+        ebnf = type.syntax.ebnf ?? null;
         if (ebnf) {
             // Work in progress
-            return (0, match_result_1.matched)();
+            return matched();
         }
         const types = {
-            ...defs_1.tokenizers,
+            ...tokenizers,
             ...type.syntax.def,
         };
-        Object.keys(types).forEach(key => {
+        for (const key of Object.keys(types)) {
             const valueOrChecker = types[key];
             if (typeof valueOrChecker === 'string') {
                 typesExtended[key] = valueOrChecker;
@@ -42,47 +38,52 @@ function cssSyntaxMatch(value, type) {
             else if (valueOrChecker) {
                 typesCheckers[key] = valueOrChecker;
             }
-        });
+        }
         propsExtended = { ...type.syntax.properties };
         if (type.caseSensitive) {
             caseSensitive = true;
-            Object.keys(typesExtended).forEach(key => eachMimicCases(key, typesExtended));
-            Object.keys(propsExtended).forEach(key => eachMimicCases(key, propsExtended));
+            for (const key of Object.keys(typesExtended))
+                eachMimicCases(key, typesExtended);
+            for (const key of Object.keys(propsExtended))
+                eachMimicCases(key, propsExtended);
             value = mimicCases(value);
         }
         ref = type.ref;
     }
     // @ts-ignore
-    const lexer = (0, css_tree_1.fork)({
-        types: typesExtended,
+    const lexer = fork({
+        types: {
+            ...overrides,
+            ...typesExtended,
+        },
         properties: propsExtended,
     }).lexer;
-    Object.keys(typesCheckers).forEach(key => {
+    for (const key of Object.keys(typesCheckers)) {
         const checker = typesCheckers[key];
         // @ts-ignore
-        lexer.addType_(key, (token, getNextToken) => checker === null || checker === void 0 ? void 0 : checker(token, getNextToken, cssSyntaxMatch));
-    });
+        lexer.addType_(key, (token, getNextToken) => checker?.(token, getNextToken, cssSyntaxMatch));
+    }
     const { isProp, name } = detectName(defName);
     // @ts-ignore
     const matcher = isProp ? lexer.properties[name] : lexer.types[name];
     if (!matcher) {
-        (0, debug_1.log)('"%s" CSS syntax not found', defName);
+        log('"%s" CSS syntax not found', defName);
         throw new Error('MARKUPLINT_TYPE_NO_EXIST');
     }
     const refParam = isProp ? 'Property' : 'Type';
-    ref = ref !== null && ref !== void 0 ? ref : `https://csstree.github.io/docs/syntax/#${refParam}:${name}`;
+    ref = ref ?? `https://csstree.github.io/docs/syntax/#${refParam}:${name}`;
     // eslint-disable-next-line no-console
     const _w = console.warn;
-    if (debug_1.log.enabled) {
+    if (log.enabled) {
         // eslint-disable-next-line no-console
-        console.warn = warn => (0, debug_1.log)('WARNING: %s (by %s => %s)', warn, value, type);
+        console.warn = warn => log('WARNING: %s (by %s => %s)', warn, value, type);
     }
     const result = lexer.match(defName, value);
-    (0, debug_1.log)('css-tree/result: %O', result);
+    log('css-tree/result: %O', result);
     // eslint-disable-next-line no-console
     console.warn = _w;
     if (!result.error) {
-        return (0, match_result_1.matched)();
+        return matched();
     }
     if (!('css' in result.error)) {
         throw result.error;
@@ -99,7 +100,7 @@ function cssSyntaxMatch(value, type) {
         const mismatchLength = error.mismatchLength - MIMIC_LENGTH;
         error.mismatchLength = mismatchLength < 0 ? error.mismatchLength : mismatchLength;
     }
-    (0, debug_1.log)('css-tree/SyntaxMatchError: %O', error);
+    log('css-tree/SyntaxMatchError: %O', error);
     return {
         matched: false,
         ref,
@@ -118,10 +119,9 @@ function cssSyntaxMatch(value, type) {
         reason: 'syntax-error',
     };
 }
-exports.cssSyntaxMatch = cssSyntaxMatch;
 function detectName(def) {
     const isProp = def.search("<'") === 0;
-    const name = def.replace(/^<'?|'?>$/g, '');
+    const name = def.replaceAll(/^<'?|'?>$/g, '');
     return {
         isProp,
         name,
@@ -145,8 +145,8 @@ obj) {
     obj[key] = mimicCases(value);
 }
 function mimicCases(value) {
-    return value.replace(/[A-Z]/g, $0 => `${MIMIC_TAG_L}${$0}${MIMIC_TAG_R}`);
+    return value.replaceAll(/[A-Z]/g, $0 => `${MIMIC_TAG_L}${$0}${MIMIC_TAG_R}`);
 }
 function deMimicCases(value) {
-    return value.replace(new RegExp(`${MIMIC_TAG_L}([A-Z])${MIMIC_TAG_R}`, 'g'), (_, $1) => $1);
+    return value.replaceAll(new RegExp(`${MIMIC_TAG_L}([A-Z])${MIMIC_TAG_R}`, 'g'), (_, $1) => $1);
 }

package/lib/debug.js

@@ -1,6 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.log = void 0;
-const tslib_1 = require("tslib");
-const debug_1 = tslib_1.__importDefault(require("debug"));
-exports.log = (0, debug_1.default)('@markuplint/types');
+import debug from 'debug';
+export const log = debug('@markuplint/types');

package/lib/defs.d.ts

@@ -1,3 +1,4 @@
-import type { Defs, CssSyntaxTokenizer } from './types';
+import type { Defs, CssSyntaxTokenizer } from './types.js';
 export declare const types: Defs;
+export declare const overrides: Record<string, string>;
 export declare const tokenizers: Record<string, CssSyntaxTokenizer>;