@markuplint/file-resolver 3.10.0 → 3.12.0

package/lib/auto-load-rules.d.ts

@@ -3,6 +3,6 @@ import type { Ruleset, AnyMLRule } from '@markuplint/ml-core';
  * @deprecated
  */
 export declare function autoLoadRules(ruleset: Ruleset): Promise<{
-	rules: AnyMLRule[];
-	errors: unknown[];
+    rules: AnyMLRule[];
+    errors: unknown[];
 }>;

package/lib/config-provider.d.ts

@@ -3,12 +3,13 @@ import type { ConfigSet } from './types';
 import type { Config } from '@markuplint/ml-config';
 import type { Nullable } from '@markuplint/shared';
 export declare class ConfigProvider {
-	#private;
-	resolve(targetFile: Readonly<MLFile>, names: readonly Nullable<string>[], cache?: boolean): Promise<ConfigSet>;
-	search(targetFile: Readonly<MLFile>): Promise<string | null>;
-	set(config: Config, key?: string): string;
-	private _load;
-	private _mergeConfigs;
-	private _pathResolve;
-	private _recursiveLoad;
+    #private;
+    resolve(targetFile: Readonly<MLFile>, names: readonly Nullable<string>[], cache?: boolean): Promise<ConfigSet>;
+    search(targetFile: Readonly<MLFile>): Promise<string | null>;
+    set(config: Config, key?: string): string;
+    private _load;
+    private _mergeConfigs;
+    private _pathResolve;
+    private _recursiveLoad;
+    private _validateConfig;
 }

package/lib/config-provider.js

@@ -6,6 +6,8 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const ml_config_1 = require("@markuplint/ml-config");
 const ml_core_1 = require("@markuplint/ml-core");
+const parser_utils_1 = require("@markuplint/parser-utils");
+const selector_1 = require("@markuplint/selector");
 const shared_1 = require("@markuplint/shared");
 const cosmiconfig_1 = require("./cosmiconfig");
 const resolve_plugins_1 = require("./resolve-plugins");
@@ -32,6 +34,14 @@ class ConfigProvider {
             return currentConfig;
         }
         let configSet = await this._mergeConfigs(keys, cache);
+        const filePath = Array.from(configSet.files).reverse()[0];
+        if (!filePath) {
+            throw new parser_utils_1.ConfigParserError('Config file not found', {
+                filePath: targetFile.path,
+            });
+        }
+        const errors = this._validateConfig(configSet.config, filePath);
+        configSet.errs.push(...errors);
         const plugins = await (0, resolve_plugins_1.resolvePlugins)(configSet.config.plugins);
         if (tslib_1.__classPrivateFieldGet(this, _ConfigProvider_held, "f").size > 0) {
             const extendHelds = Array.from(tslib_1.__classPrivateFieldGet(this, _ConfigProvider_held, "f").values());
@@ -189,6 +199,26 @@ class ConfigProvider {
         stack.add(key);
         return { stack, errs };
     }
+    _validateConfig(config, filePath) {
+        var _a;
+        const errors = [];
+        (_a = config.nodeRules) === null || _a === void 0 ? void 0 : _a.forEach(rule => {
+            if (rule.selector) {
+                try {
+                    (0, selector_1.createSelector)(rule.selector);
+                }
+                catch (error) {
+                    if (error instanceof selector_1.InvalidSelectorError) {
+                        errors.push(new parser_utils_1.ConfigParserError(error.message, {
+                            filePath,
+                            raw: rule.selector,
+                        }));
+                    }
+                }
+            }
+        });
+        return errors;
+    }
 }
 exports.ConfigProvider = ConfigProvider;
 _ConfigProvider_cache = new WeakMap(), _ConfigProvider_held = new WeakMap(), _ConfigProvider_recursiveLoadKeyAndDepth = new WeakMap(), _ConfigProvider_store = new WeakMap();
@@ -243,10 +273,15 @@ function pathResolve(dir, filePath, resolveProps, resolveKey = false) {
     return res;
 }
 function resolve(dir, pathOrModName) {
+    var _a, _b, _c;
     if (moduleExists(pathOrModName) || isPreset(pathOrModName) || isPlugin(pathOrModName)) {
         return pathOrModName;
     }
-    return path_1.default.resolve(dir, pathOrModName);
+    const bangAndPath = (_a = /^(!)(.*)/.exec(pathOrModName)) !== null && _a !== void 0 ? _a : [];
+    const bang = (_b = bangAndPath[1]) !== null && _b !== void 0 ? _b : '';
+    const pathname = (_c = bangAndPath[2]) !== null && _c !== void 0 ? _c : pathOrModName;
+    const absPath = path_1.default.resolve(dir, pathname);
+    return bang + absPath;
 }
 function moduleExists(name) {
     try {

package/lib/cosmiconfig.d.ts

@@ -1,17 +1,11 @@
 import type { LoaderSync } from 'cosmiconfig';
 type CosmiConfig = ReturnType<LoaderSync>;
-export declare function search<T = CosmiConfig>(
-	dir: string,
-	cacheClear: boolean,
-): Promise<{
-	filePath: string;
-	config: T;
+export declare function search<T = CosmiConfig>(dir: string, cacheClear: boolean): Promise<{
+    filePath: string;
+    config: T;
 } | null>;
-export declare function load<T = CosmiConfig>(
-	filePath: string,
-	cacheClear: boolean,
-): Promise<{
-	filePath: string;
-	config: T;
+export declare function load<T = CosmiConfig>(filePath: string, cacheClear: boolean): Promise<{
+    filePath: string;
+    config: T;
 } | null>;
 export {};

package/lib/cosmiconfig.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.load = exports.search = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
+const parser_utils_1 = require("@markuplint/parser-utils");
 const cosmiconfig_1 = require("cosmiconfig");
 const cosmiconfig_typescript_loader_1 = require("cosmiconfig-typescript-loader");
 const jsonc_1 = require("jsonc");
@@ -27,7 +28,7 @@ async function search(dir, cacheClear) {
         explorer.clearCaches();
     }
     dir = path_1.default.dirname(dir);
-    const result = await explorer.search(dir);
+    const result = await explorer.search(dir).catch(cacheConfigError(dir));
     if (!result || result.isEmpty) {
         return null;
     }
@@ -41,7 +42,7 @@ async function load(filePath, cacheClear) {
     if (cacheClear) {
         explorer.clearCaches();
     }
-    const result = await explorer.load(filePath);
+    const result = await explorer.load(filePath).catch(cacheConfigError(filePath));
     if (!result || result.isEmpty) {
         return null;
     }
@@ -51,3 +52,25 @@ async function load(filePath, cacheClear) {
     };
 }
 exports.load = load;
+class ConfigLoadError extends Error {
+    constructor(message, filePath) {
+        super(message + ` in ${filePath}`);
+        this.name = 'ConfigLoadError';
+    }
+}
+function cacheConfigError(fileOrDirPath) {
+    return (reason) => {
+        var _a;
+        if (reason instanceof Error) {
+            switch (reason.name) {
+                case 'YAMLException':
+                    throw new parser_utils_1.ConfigParserError(reason.message, {
+                        // @ts-ignore
+                        filePath: (_a = reason.filepath) !== null && _a !== void 0 ? _a : fileOrDirPath,
+                    });
+            }
+            throw new ConfigLoadError(reason.message, fileOrDirPath);
+        }
+        throw reason;
+    };
+}

package/lib/ml-file/ml-file.d.ts

@@ -1,23 +1,24 @@
 import type { Target } from '../types';
 export declare class MLFile {
-	#private;
-	constructor(target: Target);
-	get dirname(): string;
-	/**
-	 * Normalized `MLFile.dirname`
-	 */
-	get nDirname(): string;
-	/**
-	 * Normalized `MLFile.path`
-	 */
-	get nPath(): string;
-	get path(): string;
-	dirExists(): Promise<boolean>;
-	getCode(): Promise<string>;
-	isExist(): Promise<boolean>;
-	isFile(): Promise<boolean>;
-	matches(globPath: string): boolean;
-	setCode(code: string): void;
-	private _fetch;
-	private _stat;
+    #private;
+    constructor(target: Target);
+    get dirname(): string;
+    /**
+     * Normalized `MLFile.dirname`
+     */
+    get nDirname(): string;
+    /**
+     * Normalized `MLFile.path`
+     */
+    get nPath(): string;
+    get path(): string;
+    dirExists(): Promise<boolean>;
+    getCode(): Promise<string>;
+    ignored(globPath: string | readonly string[]): boolean;
+    isExist(): Promise<boolean>;
+    isFile(): Promise<boolean>;
+    matches(globPath: string): boolean;
+    setCode(code: string): void;
+    private _fetch;
+    private _stat;
 }

package/lib/ml-file/ml-file.js

@@ -5,6 +5,7 @@ exports.MLFile = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const path_1 = tslib_1.__importDefault(require("path"));
+const ignore_1 = tslib_1.__importDefault(require("ignore"));
 const minimatch_1 = require("minimatch");
 class MLFile {
     constructor(target) {
@@ -67,6 +68,13 @@ class MLFile {
         }
         return '';
     }
+    ignored(globPath) {
+        globPath = typeof globPath === 'string' ? [globPath] : globPath;
+        const normalizedPaths = globPath.map(p => pathNormalize(p, true));
+        const ig = (0, ignore_1.default)().add(normalizedPaths);
+        const ignored = ig.ignores(pathNormalize(this.nPath, true));
+        return ignored;
+    }
     async isExist() {
         if (tslib_1.__classPrivateFieldGet(this, _MLFile_type, "f") === 'code-base') {
             return true;
@@ -120,12 +128,22 @@ async function stat(filePath) {
         throw err;
     }
 }
-function pathNormalize(filePath) {
+function pathNormalize(filePath, relative = false) {
+    const hasBang = filePath.startsWith('!');
+    if (hasBang) {
+        filePath = filePath.slice(1);
+    }
     // Remove the local disk scheme of Windows OS
     if (path_1.default.isAbsolute(filePath)) {
         filePath = filePath.replace(/^[a-z]+:/i, '');
+        if (relative) {
+            filePath = path_1.default.relative(path_1.default.sep, filePath);
+        }
     }
     // Replace the separator of Windows OS
     filePath = filePath.split(path_1.default.sep).join('/');
+    if (hasBang) {
+        filePath = `!${filePath}`;
+    }
     return filePath;
 }

package/lib/resolve-parser.d.ts

@@ -1,13 +1,9 @@
 import type { MLFile } from './ml-file';
 import type { MLMarkupLanguageParser, ParserOptions } from '@markuplint/ml-ast';
 import type { ParserConfig } from '@markuplint/ml-config';
-export declare function resolveParser(
-	file: Readonly<MLFile>,
-	parserConfig?: ParserConfig,
-	parserOptions?: ParserOptions,
-): Promise<{
-	parserModName: string;
-	parser: MLMarkupLanguageParser;
-	parserOptions: ParserOptions;
-	matched: boolean;
+export declare function resolveParser(file: Readonly<MLFile>, parserConfig?: ParserConfig, parserOptions?: ParserOptions): Promise<{
+    parserModName: string;
+    parser: MLMarkupLanguageParser;
+    parserOptions: ParserOptions;
+    matched: boolean;
 }>;

package/lib/resolve-rules.d.ts

@@ -1,10 +1,6 @@
 import type { AnyMLRule, Ruleset, Plugin } from '@markuplint/ml-core';
-export declare function resolveRules(
-	plugins: readonly Plugin[],
-	ruleset: Ruleset,
-	importPreset: boolean,
-	/**
-	 * @deprecated
-	 */
-	autoLoad: boolean,
-): Promise<Readonly<AnyMLRule>[]>;
+export declare function resolveRules(plugins: readonly Plugin[], ruleset: Ruleset, importPreset: boolean, 
+/**
+ * @deprecated
+ */
+autoLoad: boolean): Promise<Readonly<AnyMLRule>[]>;

package/lib/resolve-specs.d.ts

@@ -30,9 +30,6 @@ import type { ExtendedSpec, MLMLSpec } from '@markuplint/ml-spec';
  * @param specConfig The `spec` property part of the config
  * @returns
  */
-export declare function resolveSpecs(
-	filePath: string,
-	specConfig?: SpecConfig,
-): Promise<{
-	schemas: readonly [MLMLSpec, ...ExtendedSpec[]];
+export declare function resolveSpecs(filePath: string, specConfig?: SpecConfig): Promise<{
+    schemas: readonly [MLMLSpec, ...ExtendedSpec[]];
 }>;

package/lib/types.d.ts

@@ -1,24 +1,22 @@
 import type { Config } from '@markuplint/ml-config';
 import type { Plugin } from '@markuplint/ml-core';
 export interface ConfigSet {
-	readonly config: Config;
-	readonly plugins: readonly Plugin[];
-	readonly files: ReadonlySet<string>;
-	readonly errs: readonly Readonly<Error>[];
+    readonly config: Config;
+    readonly plugins: readonly Plugin[];
+    readonly files: ReadonlySet<string>;
+    readonly errs: readonly Readonly<Error>[];
 }
-export type Target =
-	| string
-	| {
-			/**
-			 * Target source code of evaluation
-			 */
-			readonly sourceCode: string;
-			/**
-			 * File names when `sourceCodes`
-			 */
-			readonly name?: string;
-			/**
-			 * Workspace path when `sourceCodes`
-			 */
-			readonly workspace?: string;
-	  };
+export type Target = string | {
+    /**
+     * Target source code of evaluation
+     */
+    readonly sourceCode: string;
+    /**
+     * File names when `sourceCodes`
+     */
+    readonly name?: string;
+    /**
+     * Workspace path when `sourceCodes`
+     */
+    readonly workspace?: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "3.10.0",
+	"version": "3.12.0",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -19,21 +19,24 @@
 		"clean": "tsc --build --clean"
 	},
 	"devDependencies": {
-		"@types/node": "20.0.0"
+		"@types/node": "20.4.1"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.8.0",
-		"@markuplint/ml-ast": "3.1.0",
-		"@markuplint/ml-config": "3.9.0",
-		"@markuplint/ml-core": "3.10.0",
-		"@markuplint/ml-spec": "3.9.0",
-		"@markuplint/shared": "3.6.0",
-		"cosmiconfig": "^8.1.3",
+		"@markuplint/html-parser": "3.10.0",
+		"@markuplint/ml-ast": "3.2.0",
+		"@markuplint/ml-config": "3.11.0",
+		"@markuplint/ml-core": "3.12.0",
+		"@markuplint/ml-spec": "3.11.0",
+		"@markuplint/parser-utils": "3.10.0",
+		"@markuplint/selector": "3.11.0",
+		"@markuplint/shared": "3.8.0",
+		"cosmiconfig": "^8.2.0",
 		"cosmiconfig-typescript-loader": "^4.3.0",
-		"glob": "^10.2.2",
+		"glob": "^10.3.2",
+		"ignore": "^5.2.4",
 		"jsonc": "^2.0.0",
-		"minimatch": "^9.0.0",
-		"tslib": "^2.5.0"
+		"minimatch": "^9.0.3",
+		"tslib": "^2.6.0"
 	},
-	"gitHead": "af370797bfc887e5a5a2ff57fbaa8392ac98ead2"
+	"gitHead": "4ab20276db48a6acb29a923ea8666890ca853442"
 }