@bhsd/common 0.10.1 → 0.10.2

package/dist/stylelint.d.ts

@@ -1,4 +1,4 @@
-import type { PublicApi, Warning } from 'stylelint';
+import type { PublicApi, Warning, Config } from 'stylelint';
 /**
  * 使用Stylelint检查CSS代码
  * @param stylelint Stylelint实例
@@ -6,5 +6,5 @@ import type { PublicApi, Warning } from 'stylelint';
  * @param additionalRules 额外的规则
  * @param fix 是否修正
  */
-export declare function styleLint(stylelint: PublicApi, code: string, additionalRules?: Record<string, unknown>, fix: true): Promise<string>;
-export declare function styleLint(stylelint: PublicApi, code: string, additionalRules?: Record<string, unknown>): Promise<Warning[]>;
+export declare function styleLint(stylelint: PublicApi, code: string, additionalRules?: Config | Config['rules'] | null, fix: true): Promise<string>;
+export declare function styleLint(stylelint: PublicApi, code: string, additionalRules?: Config | Config['rules'] | null): Promise<Warning[]>;

package/dist/stylelint.js

@@ -22,12 +22,15 @@ __export(stylelint_exports, {
 });
 module.exports = __toCommonJS(stylelint_exports);
 var import_stylelint_config_recommended = require("stylelint-config-recommended");
-async function styleLint(stylelint, code, additionalRules, fix) {
-  const config = {
-    rules: { ...import_stylelint_config_recommended.rules, ...additionalRules },
+async function styleLint(stylelint, code, additionalConfig, fix) {
+  const isConfig = additionalConfig && ("extends" in additionalConfig || "rules" in additionalConfig), additionalRules = isConfig ? additionalConfig.rules : additionalConfig, rules = isConfig && "extends" in additionalConfig && additionalConfig.extends !== "stylelint-config-recommended" && !(Array.isArray(additionalConfig.extends) && additionalConfig.extends.includes("stylelint-config-recommended")) ? additionalRules ?? {} : { ...import_stylelint_config_recommended.rules, ...additionalRules }, config = {
+    rules,
     computeEditInfo: true,
     fix: fix || false
   };
+  if (isConfig) {
+    additionalConfig.rules = rules;
+  }
   if (fix) {
     return (await stylelint.lint({ code, config })).code;
   }

package/dist/stylelint.mjs

@@ -1,10 +1,13 @@
-import { rules } from "stylelint-config-recommended";
-async function styleLint(stylelint, code, additionalRules, fix) {
-  const config = {
-    rules: { ...rules, ...additionalRules },
+import { rules as recommended } from "stylelint-config-recommended";
+async function styleLint(stylelint, code, additionalConfig, fix) {
+  const isConfig = additionalConfig && ("extends" in additionalConfig || "rules" in additionalConfig), additionalRules = isConfig ? additionalConfig.rules : additionalConfig, rules = isConfig && "extends" in additionalConfig && additionalConfig.extends !== "stylelint-config-recommended" && !(Array.isArray(additionalConfig.extends) && additionalConfig.extends.includes("stylelint-config-recommended")) ? additionalRules ?? {} : { ...recommended, ...additionalRules }, config = {
+    rules,
     computeEditInfo: true,
     fix: fix || false
   };
+  if (isConfig) {
+    additionalConfig.rules = rules;
+  }
   if (fix) {
     return (await stylelint.lint({ code, config })).code;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/common",
-	"version": "0.10.1",
+	"version": "0.10.2",
 	"license": "MIT",
 	"author": "Bhsd",
 	"files": [