markuplint 4.0.0-dev.20 → 4.0.0-dev.23

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2023 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/api/ml-engine.js

@@ -81,7 +81,7 @@ export class MLEngine extends Emitter {
             throw error;
         });
         const sourceCode = await __classPrivateFieldGet(this, _MLEngine_file, "f").getCode();
-        const fixedCode = core.document.toString();
+        const fixedCode = core.document.toString(true);
         if (violations instanceof Error) {
             this.emit('lint-error', __classPrivateFieldGet(this, _MLEngine_file, "f").path, sourceCode, violations);
             const errMessage = violations.stack ?? violations.message;

package/lib/cli/command.js

@@ -50,19 +50,16 @@ export async function command(files, options, apiOptions) {
         if (fix) {
             log('Overwrite file: %s', result.filePath);
             await fs.writeFile(result.filePath, result.fixedCode, { encoding: 'utf8' });
-            process.stdout.write(`markuplint: Fix "${result.filePath}"\n`);
         }
-        else {
-            if (format === 'json') {
-                jsonOutput.push(...result.violations.map(v => ({
-                    ...v,
-                    filePath: result.filePath,
-                })));
-                continue;
-            }
-            log('Output reports');
-            output(result, options);
+        if (format === 'json') {
+            jsonOutput.push(...result.violations.map(v => ({
+                ...v,
+                filePath: result.filePath,
+            })));
+            continue;
         }
+        log('Output reports');
+        output(result, options);
     }
     if (format === 'json') {
         process.stdout.write(JSON.stringify(jsonOutput, null, 2) + '\n');

package/lib/cli/init/create-config.js

@@ -2,6 +2,7 @@ const extRExp = {
     jsx: '\\.[jt]sx?$',
     vue: '\\.vue$',
     svelte: '\\.svelte$',
+    sveltekit: '\\.html$',
     astro: '\\.astro$',
     pug: '\\.pug$',
     php: '\\.php$',
@@ -16,6 +17,7 @@ export const langs = {
     jsx: 'React (JSX)',
     vue: 'Vue',
     svelte: 'Svelte',
+    sveltekit: 'SvelteKit',
     astro: 'Astro',
     pug: 'Pug',
     php: 'PHP',
@@ -34,7 +36,15 @@ export function createConfig(langs, mode, defaultRules) {
         if (!ext) {
             continue;
         }
-        parser[ext] = `@markuplint/${lang}-parser`;
+        switch (lang) {
+            case 'sveltekit': {
+                parser[ext] = '@markuplint/svelte-parser/kit';
+                break;
+            }
+            default: {
+                parser[ext] = `@markuplint/${lang}-parser`;
+            }
+        }
         if (lang === 'vue') {
             config = {
                 ...config,

package/lib/cli/init/get-default-rules.d.ts

@@ -1,3 +1,3 @@
-export declare function getDefaultRules(version: string): Promise<{
+export declare function getDefaultRules(): {
     [x: string]: import("./types.js").Rule;
-}>;
+};

package/lib/cli/init/get-default-rules.js

@@ -1,52 +1,16 @@
-import matter from 'gray-matter';
-import fetch from 'node-fetch';
-const RULES_SCHEMA_URL = 'https://raw.githubusercontent.com/markuplint/markuplint/[VERSION]/packages/@markuplint/rules/schema.json';
-const RULES_README_URL = 'https://raw.githubusercontent.com/markuplint/markuplint/[VERSION]/packages/@markuplint/rules/src/[NAME]/README.md';
-export async function getDefaultRules(version) {
-    const json = await safeFetch(RULES_SCHEMA_URL, version);
+import builtinRules from '@markuplint/rules';
+export function getDefaultRules() {
     const rules = {};
-    await Promise.all(Object.entries(json.definitions.rules.properties).map(async ([name, rule]) => {
-        const json = await safeFetch(rule.$ref.replace('/main/', '/[VERSION]/'), version);
-        let severity = (Array.isArray(json.oneOf) ? json.oneOf : []).find((val) => val.properties)?.properties
-            ?.severity?.default;
-        let category = json._category;
-        if (severity == null || category == null) {
-            const data = await getCatAndSeverityFromLegacy(version, name);
-            severity = data.severity;
-            category = data.category;
+    for (const [ruleName, rule] of Object.entries(builtinRules)) {
+        const defaultSeverity = rule.defaultSeverity;
+        const defaultValue = defaultSeverity === 'warning' ? false : rule.defaultValue ?? true;
+        const category = rule.meta?.category;
+        if (category) {
+            rules[ruleName] = {
+                defaultValue,
+                category,
+            };
         }
-        const defaultValue = severity === 'warning' ? false : json.definitions.value.default ?? true;
-        rules[name] = {
-            defaultValue,
-            category,
-        };
-    }));
-    return rules;
-}
-async function safeFetch(baseUrl, version, type = 'json') {
-    const url = baseUrl.replace('[VERSION]', `v${version}`);
-    const res = await fetch(url);
-    if (!res.ok) {
-        return safeFetch(baseUrl, '3.0.0', type);
-    }
-    if (type === 'json') {
-        return (await res.json());
     }
-    const md = await res.text();
-    const { data } = matter(md);
-    return data;
-}
-/**
- * Fallback fetching until 3.0.x
- *
- * @param version
- * @param name
- * @returns
- */
-async function getCatAndSeverityFromLegacy(version, name) {
-    const data = await safeFetch(RULES_README_URL.replace('[NAME]', name), version, 'md');
-    return {
-        category: data.category,
-        severity: data.severity,
-    };
+    return rules;
 }

package/lib/cli/init/index.js

@@ -1,11 +1,9 @@
 import fs from 'node:fs/promises';
-import module from 'node:module';
 import path from 'node:path';
 import { installModule, multiSelect, confirm, confirmSequence, header } from '@markuplint/cli-utils';
 import { createConfig, langs } from './create-config.js';
 import { getDefaultRules } from './get-default-rules.js';
 import { selectModules } from './select-modules.js';
-const require = module.createRequire(import.meta.url);
 const ruleCategories = {
     validation: {
         message: 'Are you going to conformance check according to HTML standard?',
@@ -52,8 +50,7 @@ export async function initialize() {
     }
     let defaultRules = {};
     if (ruleSettingMode !== 'recommended') {
-        const rulesVersion = require('../../../package.json').version;
-        defaultRules = await getDefaultRules(rulesVersion);
+        defaultRules = getDefaultRules();
     }
     const config = createConfig(selectedLangs, ruleSettingMode, defaultRules);
     const filePath = path.resolve(process.cwd(), '.markuplintrc');

package/lib/cli/init/types.d.ts

@@ -1,8 +1,9 @@
-export type Langs = 'jsx' | 'vue' | 'svelte' | 'astro' | 'pug' | 'php' | 'smarty' | 'erb' | 'ejs' | 'mustache' | 'nunjucks' | 'liquid';
+import type { RuleConfigValue } from '@markuplint/ml-config';
+export type Langs = 'jsx' | 'vue' | 'svelte' | 'sveltekit' | 'astro' | 'pug' | 'php' | 'smarty' | 'erb' | 'ejs' | 'mustache' | 'nunjucks' | 'liquid';
 export type Category = 'validation' | 'a11y' | 'naming-convention' | 'style' | 'maintainability';
 export type RuleSettingMode = readonly Category[] | 'recommended' | 'none';
 export type DefaultRules = Readonly<Record<string, Rule>>;
 export type Rule = {
     readonly category: Category;
-    readonly defaultValue: boolean | string | number;
+    readonly defaultValue: RuleConfigValue;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "markuplint",
-	"version": "4.0.0-dev.20+6b35da16",
+	"version": "4.0.0-dev.23+d6f2aa9bc",
 	"description": "An HTML linter for all markup developers",
 	"author": "Yusuke Hirao",
 	"license": "MIT",
@@ -25,28 +25,26 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/cli-utils": "4.0.0-dev.3937+6b35da16",
-		"@markuplint/file-resolver": "4.0.0-dev.20+6b35da16",
-		"@markuplint/html-parser": "4.0.0-dev.20+6b35da16",
-		"@markuplint/html-spec": "4.0.0-dev.20+6b35da16",
-		"@markuplint/i18n": "4.0.0-dev.20+6b35da16",
-		"@markuplint/ml-ast": "4.0.0-dev.20+6b35da16",
-		"@markuplint/ml-config": "4.0.0-dev.20+6b35da16",
-		"@markuplint/ml-core": "4.0.0-dev.20+6b35da16",
-		"@markuplint/ml-spec": "4.0.0-dev.20+6b35da16",
-		"@markuplint/rules": "4.0.0-dev.20+6b35da16",
-		"@markuplint/shared": "4.0.0-dev.20+6b35da16",
+		"@markuplint/cli-utils": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/file-resolver": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/html-parser": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/html-spec": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/i18n": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/ml-ast": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/ml-config": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/ml-core": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/ml-spec": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/rules": "4.0.0-dev.23+d6f2aa9bc",
+		"@markuplint/shared": "4.0.0-dev.23+d6f2aa9bc",
 		"@types/debug": "^4.1.12",
 		"chokidar": "^3.5.3",
 		"debug": "^4.3.4",
 		"get-stdin": "^9.0.0",
-		"gray-matter": "^4.0.3",
-		"meow": "^13.0.0",
-		"node-fetch": "^3.3.2",
+		"meow": "^13.1.0",
 		"os-locale": "^6.0.2",
 		"strict-event-emitter": "^0.5.1",
 		"strip-ansi": "^7.1.0",
-		"type-fest": "^4.8.3"
+		"type-fest": "^4.9.0"
 	},
-	"gitHead": "6b35da161d94f784953d0adecc2d28502052d92a"
+	"gitHead": "d6f2aa9bc287768466f23b5340e4e0eecfa30d59"
 }