markuplint 4.8.1 → 4.9.1-alpha.0

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.9.1-alpha.0](https://github.com/markuplint/markuplint/compare/markuplint@4.9.0...markuplint@4.9.1-alpha.0) (2024-06-02)
+
+**Note:** Version bump only for package markuplint
+
+
+
+
+
+# [4.9.0](https://github.com/markuplint/markuplint/compare/markuplint@4.8.1...markuplint@4.9.0) (2024-05-28)
+
+### Features
+
+- **file-resolver:** add `resolve-pretenders` function ([68ba7f5](https://github.com/markuplint/markuplint/commit/68ba7f5acaba13484172bca3ea5f60e0bf3044ef))
+
 ## [4.8.1](https://github.com/markuplint/markuplint/compare/markuplint@4.8.0...markuplint@4.8.1) (2024-05-12)
 
 **Note:** Version bump only for package markuplint

package/lib/api/ml-engine.d.ts

@@ -28,6 +28,7 @@ export declare class MLEngine extends Emitter<MLEngineEventMap> {
     private provide;
     private resolveConfig;
     private resolveParser;
+    private resolvePretenders;
     private resolveRules;
     private resolveRuleset;
     private resolveSchemas;

package/lib/api/ml-engine.js

@@ -10,7 +10,8 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var _MLEngine_configProvider, _MLEngine_core, _MLEngine_file, _MLEngine_options, _MLEngine_watcher;
-import { ConfigProvider, resolveFiles, resolveParser, resolveRules, resolveSpecs } from '@markuplint/file-resolver';
+import { ConfigProvider, resolveFiles, resolveParser, resolvePretenders, resolveRules, resolveSpecs, } from '@markuplint/file-resolver';
+import { mergeConfig } from '@markuplint/ml-config';
 import { MLCore, convertRuleset } from '@markuplint/ml-core';
 import { FSWatcher } from 'chokidar';
 import { Emitter } from 'strict-event-emitter';
@@ -209,6 +210,8 @@ export class MLEngine extends Emitter {
             fileLog('Avoided linting because a file is unmatched by the extension: %s', __classPrivateFieldGet(this, _MLEngine_file, "f").path);
             return null;
         }
+        const pretenders = await this.resolvePretenders(configSet);
+        fileLog('Resolved pretenders: %O', pretenders);
         const ruleset = this.resolveRuleset(configSet);
         fileLog('Resolved ruleset: %O', ruleset);
         const schemas = await this.resolveSchemas(configSet);
@@ -233,7 +236,7 @@ export class MLEngine extends Emitter {
         return {
             parser,
             parserOptions,
-            pretenders: configSet.config.pretenders ?? [],
+            pretenders,
             ruleset,
             schemas,
             rules,
@@ -244,7 +247,7 @@ export class MLEngine extends Emitter {
     async resolveConfig(cache) {
         this.emit('log', 'resolveConfig', JSON.stringify(__classPrivateFieldGet(this, _MLEngine_configProvider, "f"), null, 2));
         configLog('configProvider: %s', __classPrivateFieldGet(this, _MLEngine_configProvider, "f"));
-        const defaultConfigKey = __classPrivateFieldGet(this, _MLEngine_options, "f")?.defaultConfig && __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set(__classPrivateFieldGet(this, _MLEngine_options, "f")?.defaultConfig);
+        const defaultConfigKey = __classPrivateFieldGet(this, _MLEngine_options, "f")?.defaultConfig && __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set(mergeConfig(__classPrivateFieldGet(this, _MLEngine_options, "f")?.defaultConfig));
         configLog('defaultConfigKey: %s', defaultConfigKey ?? 'N/A');
         this.emit('log', 'defaultConfigKey', defaultConfigKey ?? 'N/A');
         const targetConfig = await __classPrivateFieldGet(this, _MLEngine_configProvider, "f").search(__classPrivateFieldGet(this, _MLEngine_file, "f"));
@@ -254,7 +257,7 @@ export class MLEngine extends Emitter {
             : targetConfig ?? defaultConfigKey;
         configLog('configFilePathsFromTarget: %s', configFilePathsFromTarget ?? 'N/A');
         this.emit('log', 'configFilePathsFromTarget', configFilePathsFromTarget ?? 'N/A');
-        const configKey = __classPrivateFieldGet(this, _MLEngine_options, "f")?.config && __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set(__classPrivateFieldGet(this, _MLEngine_options, "f").config);
+        const configKey = __classPrivateFieldGet(this, _MLEngine_options, "f")?.config && __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set(mergeConfig(__classPrivateFieldGet(this, _MLEngine_options, "f").config));
         configLog('option.config: %s', configKey ?? 'N/A');
         this.emit('log', 'option.config', configFilePathsFromTarget ?? 'N/A');
         let defaultRecommended = null;
@@ -281,6 +284,13 @@ export class MLEngine extends Emitter {
         fileLog('Fetched Parser module: %s', parser.parserModName);
         return parser;
     }
+    async resolvePretenders(
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    configSet) {
+        const pretenders = await resolvePretenders(configSet.config.pretenders);
+        fileLog('Resolved pretenders: %O', pretenders);
+        return pretenders;
+    }
     async resolveRules(plugins, ruleset) {
         const rules = await resolveRules(plugins, ruleset, __classPrivateFieldGet(this, _MLEngine_options, "f")?.importPresetRules ?? true, __classPrivateFieldGet(this, _MLEngine_options, "f")?.autoLoad ?? true);
         if (__classPrivateFieldGet(this, _MLEngine_options, "f")?.rules) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "markuplint",
-	"version": "4.8.1",
+	"version": "4.9.1-alpha.0",
 	"description": "An HTML linter for all markup developers",
 	"author": "Yusuke Hirao",
 	"license": "MIT",
@@ -25,26 +25,26 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/cli-utils": "4.4.1",
-		"@markuplint/file-resolver": "4.7.2",
-		"@markuplint/html-parser": "4.6.2",
-		"@markuplint/html-spec": "4.7.2",
-		"@markuplint/i18n": "4.5.0",
-		"@markuplint/ml-ast": "4.3.1",
-		"@markuplint/ml-config": "4.6.2",
-		"@markuplint/ml-core": "4.7.2",
-		"@markuplint/ml-spec": "4.6.0",
-		"@markuplint/rules": "4.9.0",
-		"@markuplint/shared": "4.4.0",
+		"@markuplint/cli-utils": "4.4.2-alpha.0",
+		"@markuplint/file-resolver": "4.8.1-alpha.0",
+		"@markuplint/html-parser": "4.6.4-alpha.0",
+		"@markuplint/html-spec": "4.8.1-alpha.0",
+		"@markuplint/i18n": "4.5.1-alpha.0",
+		"@markuplint/ml-ast": "4.4.1-alpha.0",
+		"@markuplint/ml-config": "4.7.1-alpha.0",
+		"@markuplint/ml-core": "4.8.1-alpha.0",
+		"@markuplint/ml-spec": "4.6.2-alpha.0",
+		"@markuplint/rules": "4.9.2-alpha.0",
+		"@markuplint/shared": "4.4.2-alpha.0",
 		"@types/debug": "4.1.12",
 		"chokidar": "3.6.0",
-		"debug": "4.3.4",
+		"debug": "4.3.5",
 		"get-stdin": "9.0.0",
 		"meow": "13.2.0",
 		"os-locale": "6.0.2",
 		"strict-event-emitter": "0.5.1",
 		"strip-ansi": "7.1.0",
-		"type-fest": "4.18.2"
+		"type-fest": "4.18.3"
 	},
-	"gitHead": "ca7dc6bf40eac4f2813e492878f889eb77751a70"
+	"gitHead": "b1cabc178e3553fd66c7ed4357b4124eb2585327"
 }