@markuplint/file-resolver 3.5.0 → 3.6.1

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

@@ -1,6 +1,7 @@
 import type { MLFile } from './ml-file';
-import type { ConfigSet, Nullable } from './types';
+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>;

package/lib/config-provider.js

@@ -6,6 +6,7 @@ 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 shared_1 = require("@markuplint/shared");
 const cosmiconfig_1 = require("./cosmiconfig");
 const resolve_plugins_1 = require("./resolve-plugins");
 const utils_1 = require("./utils");
@@ -18,13 +19,13 @@ class ConfigProvider {
         _ConfigProvider_store.set(this, new Map());
     }
     async resolve(targetFile, names, cache = true) {
-        var _a;
+        var _a, _b;
         if (!cache) {
             tslib_1.__classPrivateFieldGet(this, _ConfigProvider_store, "f").clear();
             tslib_1.__classPrivateFieldGet(this, _ConfigProvider_cache, "f").clear();
             (0, resolve_plugins_1.cacheClear)();
         }
-        const keys = names.filter(utils_1.nonNullableFilter);
+        const keys = names.filter(shared_1.nonNullableFilter);
         const key = keys.join(KEY_SEPARATOR);
         const currentConfig = tslib_1.__classPrivateFieldGet(this, _ConfigProvider_cache, "f").get(key);
         if (currentConfig) {
@@ -32,14 +33,14 @@ class ConfigProvider {
         }
         let configSet = await this._mergeConfigs(keys, cache);
         const plugins = await (0, resolve_plugins_1.resolvePlugins)(configSet.config.plugins);
-        if (tslib_1.__classPrivateFieldGet(this, _ConfigProvider_held, "f").size) {
+        if (tslib_1.__classPrivateFieldGet(this, _ConfigProvider_held, "f").size > 0) {
             const extendHelds = Array.from(tslib_1.__classPrivateFieldGet(this, _ConfigProvider_held, "f").values());
             for (const held of extendHelds) {
-                const [, prefix, namespace, name] = held.match(/^([a-z]+:)([^/]+)(?:\/(.+))?$/) || [];
+                const [, prefix, namespace, name] = (_a = held.match(/^([a-z]+:)([^/]+)(?:\/(.+))?$/)) !== null && _a !== void 0 ? _a : [];
                 switch (prefix) {
                     case 'plugin:': {
                         const plugin = plugins.find(plugin => plugin.name === namespace);
-                        const config = name && ((_a = plugin === null || plugin === void 0 ? void 0 : plugin.configs) === null || _a === void 0 ? void 0 : _a[name]);
+                        const config = (_b = plugin === null || plugin === void 0 ? void 0 : plugin.configs) === null || _b === void 0 ? void 0 : _b[name !== null && name !== void 0 ? name : ''];
                         if (config) {
                             this.set(config, held);
                         }
@@ -84,17 +85,18 @@ class ConfigProvider {
         return filePath;
     }
     set(config, key) {
-        key = key || (0, utils_1.uuid)();
+        key = key !== null && key !== void 0 ? key : (0, utils_1.uuid)();
         tslib_1.__classPrivateFieldGet(this, _ConfigProvider_store, "f").set(key, config);
         return key;
     }
     async _load(filePath, cache) {
+        var _a;
         const entity = tslib_1.__classPrivateFieldGet(this, _ConfigProvider_store, "f").get(filePath);
         if (entity) {
             return entity;
         }
         if (isPreset(filePath)) {
-            const [, name] = filePath.match(/^markuplint:(.+)$/i) || [];
+            const [, name] = (_a = filePath.match(/^markuplint:(.+)$/i)) !== null && _a !== void 0 ? _a : [];
             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);
@@ -130,7 +132,7 @@ class ConfigProvider {
         }
         const configs = Array.from(resolvedKeys)
             .map(name => tslib_1.__classPrivateFieldGet(this, _ConfigProvider_store, "f").get(name))
-            .filter(utils_1.nonNullableFilter);
+            .filter(shared_1.nonNullableFilter);
         let resultConfig = {};
         for (const config of configs) {
             resultConfig = (0, ml_config_1.mergeConfig)(resultConfig, config);
@@ -154,6 +156,7 @@ class ConfigProvider {
         };
     }
     async _recursiveLoad(key, cache, depth = 1) {
+        var _a;
         const stack = new Set();
         const errs = [];
         const ancestorDepth = tslib_1.__classPrivateFieldGet(this, _ConfigProvider_recursiveLoadKeyAndDepth, "f").get(key);
@@ -164,14 +167,14 @@ class ConfigProvider {
             };
         }
         tslib_1.__classPrivateFieldGet(this, _ConfigProvider_recursiveLoadKeyAndDepth, "f").set(key, depth);
-        let config = tslib_1.__classPrivateFieldGet(this, _ConfigProvider_store, "f").get(key) || null;
+        let config = (_a = tslib_1.__classPrivateFieldGet(this, _ConfigProvider_store, "f").get(key)) !== null && _a !== void 0 ? _a : null;
         if (!config) {
             config = await this._load(key, cache);
         }
         if (!config) {
             return { stack, errs: null };
         }
-        const depKeys = config.extends ? (Array.isArray(config.extends) ? config.extends : [config.extends]) : null;
+        const depKeys = config.extends !== null ? (0, shared_1.toNoEmptyStringArrayFromStringOrArray)(config.extends) : null;
         if (depKeys) {
             for (const depKey of depKeys) {
                 const keys = await this._recursiveLoad(depKey, cache, depth + 1);
@@ -190,9 +193,10 @@ class ConfigProvider {
 exports.ConfigProvider = ConfigProvider;
 _ConfigProvider_cache = new WeakMap(), _ConfigProvider_held = new WeakMap(), _ConfigProvider_recursiveLoadKeyAndDepth = new WeakMap(), _ConfigProvider_store = new WeakMap();
 async function load(filePath, cache) {
+    var _a;
     if (!(0, utils_1.fileExists)(filePath) && moduleExists(filePath)) {
         const mod = await Promise.resolve(`${filePath}`).then(s => tslib_1.__importStar(require(s)));
-        const config = (mod === null || mod === void 0 ? void 0 : mod.default) || null;
+        const config = (_a = mod === null || mod === void 0 ? void 0 : mod.default) !== null && _a !== void 0 ? _a : null;
         return config;
     }
     const res = await (0, cosmiconfig_1.load)(filePath, !cache);

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/ml-file/ml-file.js

@@ -8,6 +8,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const minimatch_1 = tslib_1.__importDefault(require("minimatch"));
 class MLFile {
     constructor(target) {
+        var _a, _b;
         _MLFile_basename.set(this, void 0);
         _MLFile_code.set(this, void 0);
         _MLFile_dirname.set(this, void 0);
@@ -30,8 +31,8 @@ class MLFile {
             tslib_1.__classPrivateFieldSet(this, _MLFile_dirname, path_1.default.dirname(target.name), "f");
         }
         else {
-            tslib_1.__classPrivateFieldSet(this, _MLFile_basename, target.name || '<AnonymousFile>', "f");
-            tslib_1.__classPrivateFieldSet(this, _MLFile_dirname, target.workspace || process.cwd(), "f");
+            tslib_1.__classPrivateFieldSet(this, _MLFile_basename, (_a = target.name) !== null && _a !== void 0 ? _a : '<AnonymousFile>', "f");
+            tslib_1.__classPrivateFieldSet(this, _MLFile_dirname, (_b = target.workspace) !== null && _b !== void 0 ? _b : process.cwd(), "f");
         }
         tslib_1.__classPrivateFieldSet(this, _MLFile_code, target.sourceCode, "f");
         tslib_1.__classPrivateFieldSet(this, _MLFile_type, 'code-base', "f");

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: 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-parser.js

@@ -10,20 +10,18 @@ async function resolveParser(file, parserConfig, parserOptions) {
         ...parserConfig,
         '/\\.html?$/i': '@markuplint/html-parser',
     };
-    parserOptions = parserOptions || {};
+    parserOptions = parserOptions !== null && parserOptions !== void 0 ? parserOptions : {};
     let parserModName = '@markuplint/html-parser';
     let matched = false;
-    if (parserConfig) {
-        for (const pattern of Object.keys(parserConfig)) {
-            if (path_1.default.basename(file.path).match((0, utils_1.toRegexp)(pattern))) {
-                const modName = parserConfig[pattern];
-                if (!modName) {
-                    continue;
-                }
-                parserModName = modName;
-                matched = true;
-                break;
+    for (const pattern of Object.keys(parserConfig)) {
+        if (path_1.default.basename(file.path).match((0, utils_1.toRegexp)(pattern))) {
+            const modName = parserConfig[pattern];
+            if (!modName) {
+                continue;
             }
+            parserModName = modName;
+            matched = true;
+            break;
         }
     }
     const parser = await importParser(parserModName);

package/lib/resolve-rules.d.ts

@@ -1,6 +1,10 @@
 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,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/types.d.ts

@@ -1,6 +1,5 @@
 import type { Config } from '@markuplint/ml-config';
 import type { Plugin } from '@markuplint/ml-core';
-export type Nullable<T> = T | null | undefined;
 export interface ConfigSet {
     readonly config: Config;
     readonly plugins: readonly Plugin[];

package/lib/utils.d.ts

@@ -1,5 +1,3 @@
-import type { Nullable } from './types';
-export declare function nonNullableFilter<T>(item: Nullable<T>): item is T;
 export declare function uuid(): string;
 export declare function fileExists(filePath: string): boolean;
 export declare function toRegexp(pattern: string): string | RegExp;

package/lib/utils.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toRegexp = exports.fileExists = exports.uuid = exports.nonNullableFilter = void 0;
+exports.toRegexp = exports.fileExists = exports.uuid = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = tslib_1.__importDefault(require("fs"));
-function nonNullableFilter(item) {
-    return !!item;
-}
-exports.nonNullableFilter = nonNullableFilter;
 let uuidNum = 0;
 function uuid() {
     const out = `${uuidNum}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "3.5.0",
+	"version": "3.6.1",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -24,16 +24,17 @@
 		"@types/node": "latest"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.5.0",
+		"@markuplint/html-parser": "3.6.1",
 		"@markuplint/ml-ast": "3.1.0",
-		"@markuplint/ml-config": "3.5.0",
-		"@markuplint/ml-core": "3.5.0",
-		"@markuplint/ml-spec": "3.5.0",
+		"@markuplint/ml-config": "3.6.1",
+		"@markuplint/ml-core": "3.6.1",
+		"@markuplint/ml-spec": "3.6.1",
+		"@markuplint/shared": "3.5.0",
 		"cosmiconfig": "^8.0.0",
 		"glob": "^8.0.3",
 		"jsonc": "^2.0.0",
 		"minimatch": "^5.1.1",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
+	"gitHead": "3cdf5a088b2da03773d5d4461d0e65ec32290a00"
 }