@markuplint/file-resolver 3.3.0 → 3.4.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

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

package/lib/config-provider.js

@@ -39,7 +39,7 @@ class ConfigProvider {
                 switch (prefix) {
                     case 'plugin:': {
                         const plugin = plugins.find(plugin => plugin.name === namespace);
-                        const config = (_a = plugin === null || plugin === void 0 ? void 0 : plugin.configs) === null || _a === void 0 ? void 0 : _a[name];
+                        const config = name && ((_a = plugin === null || plugin === void 0 ? void 0 : plugin.configs) === null || _a === void 0 ? void 0 : _a[name]);
                         if (config) {
                             this.set(config, held);
                         }
@@ -56,9 +56,10 @@ class ConfigProvider {
             const globs = Object.keys(overrides);
             for (const glob of globs) {
                 const isMatched = targetFile.matches(glob);
-                if (isMatched) {
+                const config = overrides[glob];
+                if (isMatched && config) {
                     // Note: Original config disappears
-                    configSet.config = overrides[glob];
+                    configSet.config = config;
                 }
             }
         }
@@ -94,7 +95,7 @@ class ConfigProvider {
         }
         if (isPreset(filePath)) {
             const [, name] = filePath.match(/^markuplint:(.+)$/i) || [];
-            const config = await (0, ml_core_1.getPreset)(name);
+            const config = await (0, ml_core_1.getPreset)(name !== null && name !== void 0 ? name : filePath);
             const pathResolvedConfig = this._pathResolve(config, filePath);
             tslib_1.__classPrivateFieldGet(this, _ConfigProvider_store, "f").set(filePath, pathResolvedConfig);
             return pathResolvedConfig;

package/lib/cosmiconfig.d.ts

@@ -1,11 +1,17 @@
 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/ml-file/ml-file.d.ts

@@ -1,23 +1,23 @@
 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>;
+	isExist(): Promise<boolean>;
+	isFile(): Promise<boolean>;
+	matches(globPath: string): boolean;
+	setCode(code: string): void;
+	private _fetch;
+	private _stat;
 }

package/lib/resolve-parser.d.ts

@@ -1,9 +1,13 @@
 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: MLFile, parserConfig?: ParserConfig, parserOptions?: ParserOptions): Promise<{
-    parserModName: string;
-    parser: MLMarkupLanguageParser;
-    parserOptions: ParserOptions;
-    matched: boolean;
+export declare function resolveParser(
+	file: MLFile,
+	parserConfig?: ParserConfig,
+	parserOptions?: ParserOptions,
+): Promise<{
+	parserModName: string;
+	parser: MLMarkupLanguageParser;
+	parserOptions: ParserOptions;
+	matched: boolean;
 }>;

package/lib/resolve-parser.js

@@ -16,7 +16,11 @@ async function resolveParser(file, parserConfig, parserOptions) {
     if (parserConfig) {
         for (const pattern of Object.keys(parserConfig)) {
             if (path_1.default.basename(file.path).match((0, utils_1.toRegexp)(pattern))) {
-                parserModName = parserConfig[pattern];
+                const modName = parserConfig[pattern];
+                if (!modName) {
+                    continue;
+                }
+                parserModName = modName;
                 matched = true;
                 break;
             }

package/lib/resolve-rules.d.ts

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

package/lib/resolve-specs.d.ts

@@ -30,6 +30,9 @@ 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/resolve-specs.js

@@ -53,6 +53,9 @@ async function resolveSpecs(filePath, specConfig) {
             for (const pattern of Object.keys(specConfig)) {
                 if (path_1.default.basename(filePath).match((0, utils_1.toRegexp)(pattern))) {
                     const specModName = specConfig[pattern];
+                    if (!specModName) {
+                        continue;
+                    }
                     const spec = await importSpecs(specModName);
                     extendedSpecs.push(spec);
                 }

package/lib/types.d.ts

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

package/lib/utils.js

@@ -20,7 +20,7 @@ function fileExists(filePath) {
 exports.fileExists = fileExists;
 function toRegexp(pattern) {
     const matched = pattern.match(/^\/(.+)\/([ig]*)$/i);
-    if (matched) {
+    if (matched && matched[1]) {
         return new RegExp(matched[1], matched[2]);
     }
     return pattern;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "3.3.0",
+	"version": "3.4.0",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -24,16 +24,16 @@
 		"@types/node": "latest"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.3.0",
+		"@markuplint/html-parser": "3.4.0",
 		"@markuplint/ml-ast": "3.0.0",
-		"@markuplint/ml-config": "3.3.0",
-		"@markuplint/ml-core": "3.3.0",
-		"@markuplint/ml-spec": "3.3.0",
+		"@markuplint/ml-config": "3.4.0",
+		"@markuplint/ml-core": "3.4.0",
+		"@markuplint/ml-spec": "3.4.0",
 		"cosmiconfig": "^8.0.0",
 		"glob": "^8.0.3",
 		"jsonc": "^2.0.0",
 		"minimatch": "^5.1.1",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "791fb22a4df7acb985ced3808923fba0cd95c28a"
+	"gitHead": "a83e0f5f214a9bbcc0286b9e269074ddca6189e7"
 }