@salesforce-ux/slds-linter 1.0.2 → 1.0.4-internal

package/build/commands/emit.js

@@ -6,7 +6,41 @@ import {
   DEFAULT_ESLINT_CONFIG_PATH
 } from "../services/config.resolver.js";
 import path from "path";
-import { copyFile } from "fs/promises";
+import { writeFile, readFile } from "fs/promises";
+import sldsPlugin from "@salesforce-ux/eslint-plugin-slds";
+function extractRulesFromConfig(configToExtract) {
+  configToExtract = Array.isArray(configToExtract) ? configToExtract : [configToExtract];
+  const allRules = {};
+  configToExtract.forEach((config) => {
+    if (config.rules) Object.assign(allRules, config.rules);
+  });
+  return Object.keys(allRules).length > 0 ? allRules : null;
+}
+async function loadRuleConfigs() {
+  try {
+    const plugin = sldsPlugin;
+    const configToExtract = plugin.configs?.["flat/recommended"] || plugin.configs?.["recommended"];
+    return extractRulesFromConfig(configToExtract);
+  } catch (error) {
+    return null;
+  }
+}
+function formatRulesForConfig(rules) {
+  return JSON.stringify(rules, null, 4).replace(/\n/g, "\n    ");
+}
+async function generateEnhancedESLintConfig(sourceConfigPath) {
+  const config = await readFile(sourceConfigPath, "utf8");
+  const rules = await loadRuleConfigs();
+  if (rules) {
+    const formattedRules = formatRulesForConfig(rules);
+    return config.replace(
+      /extends:\s*\["@salesforce-ux\/slds\/recommended"\]/,
+      `extends: ["@salesforce-ux/slds/recommended"],
+    rules: ${formattedRules}`
+    );
+  }
+  return config;
+}
 function registerEmitCommand(program) {
   program.command("emit").description("Emits the configuration files used by slds-linter cli").option(
     "-d, --directory <path>",
@@ -17,14 +51,13 @@ function registerEmitCommand(program) {
       const normalizedOptions = normalizeCliOptions(options, {
         configEslint: DEFAULT_ESLINT_CONFIG_PATH
       });
-      const destESLintConfigPath = path.join(
-        normalizedOptions.directory,
-        path.basename(normalizedOptions.configEslint)
-      );
-      await copyFile(normalizedOptions.configEslint, destESLintConfigPath);
+      const enhancedConfig = await generateEnhancedESLintConfig(normalizedOptions.configEslint);
+      const destESLintConfigPath = path.join(normalizedOptions.directory, path.basename(normalizedOptions.configEslint));
+      await writeFile(destESLintConfigPath, enhancedConfig, "utf8");
       Logger.success(chalk.green(`ESLint configuration created at:
 ${destESLintConfigPath}
 `));
+      Logger.info(chalk.cyan("Rules are dynamically loaded based on extends configuration."));
     } catch (error) {
       Logger.error(
         chalk.red(`Failed to emit configuration: ${error.message}`)

package/build/index.js

@@ -19,7 +19,7 @@ process.on("uncaughtException", (error) => {
 var program = new Command();
 program.name("npx @salesforce-ux/slds-linter@latest").showHelpAfterError();
 function registerVersion() {
-  program.description("SLDS Linter CLI tool for linting styles and components").version("1.0.2");
+  program.description("SLDS Linter CLI tool for linting styles and components").version("1.0.4-internal");
 }
 registerLintCommand(program);
 registerReportCommand(program);

package/build/services/config-loader.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Config Loader - Simple import rewriter for custom configs
+ * Only rewrites imports if dependencies aren't already installed
+ */
+export declare class ConfigLoader {
+    /**
+     * Check if package is installed in user's workspace
+     */
+    private static isPackageInstalled;
+    /**
+     * Process custom .mjs config - only rewrite if dependencies not installed
+     */
+    static processConfig(configPath: string | undefined): Promise<string | undefined>;
+}

package/build/services/config-loader.js

@@ -0,0 +1,59 @@
+// src/services/config-loader.ts
+import { readFile, writeFile } from "fs/promises";
+import { createRequire } from "module";
+import { join } from "path";
+import { tmpdir } from "os";
+import { Logger } from "../utils/logger.js";
+var ConfigLoader = class {
+  /**
+   * Check if package is installed in user's workspace
+   */
+  static isPackageInstalled(packageName, fromPath) {
+    try {
+      const require2 = createRequire(fromPath);
+      require2.resolve(packageName);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Process custom .mjs config - only rewrite if dependencies not installed
+   */
+  static async processConfig(configPath) {
+    if (!configPath?.endsWith(".mjs")) {
+      return configPath;
+    }
+    try {
+      const userConfigUrl = `file://${configPath}`;
+      const pluginInstalled = this.isPackageInstalled("@salesforce-ux/eslint-plugin-slds", userConfigUrl);
+      const eslintInstalled = this.isPackageInstalled("eslint", userConfigUrl);
+      if (pluginInstalled && eslintInstalled) {
+        Logger.debug("Dependencies already installed, using config as-is");
+        return configPath;
+      }
+      Logger.debug("Dependencies not installed, rewriting imports");
+      const configContent = await readFile(configPath, "utf-8");
+      const require2 = createRequire(import.meta.url);
+      const pluginPath = require2.resolve("@salesforce-ux/eslint-plugin-slds");
+      const eslintConfigPath = require2.resolve("eslint/config");
+      const rewritten = configContent.replace(
+        /import\s+(\w+)\s+from\s+['"]@salesforce-ux\/eslint-plugin-slds['"]/g,
+        `import $1 from '${pluginPath}'`
+      ).replace(
+        /import\s+({[^}]+})\s+from\s+['"]eslint\/config['"]/g,
+        `import $1 from '${eslintConfigPath}'`
+      );
+      const tempPath = join(tmpdir(), `slds-config-${Date.now()}.mjs`);
+      await writeFile(tempPath, rewritten, "utf-8");
+      Logger.debug(`Rewritten config: ${tempPath}`);
+      return tempPath;
+    } catch (error) {
+      Logger.error(`Config processing failed: ${error.message}`);
+      throw error;
+    }
+  }
+};
+export {
+  ConfigLoader
+};

package/build/services/config.resolver.js

@@ -156,8 +156,8 @@ var rule_messages_default = {
 
 // src/services/config.resolver.ts
 var DEFAULT_ESLINT_CONFIG_PATH = resolvePath("@salesforce-ux/eslint-plugin-slds/config", import.meta);
-var ESLINT_VERSION = "9.36.0";
-var LINTER_CLI_VERSION = "1.0.2";
+var ESLINT_VERSION = "9.37.0";
+var LINTER_CLI_VERSION = "1.0.4-internal";
 var getRuleDescription = (ruleId) => {
   const ruleIdWithoutNameSpace = `${ruleId}`.replace(/\@salesforce-ux\//, "").replace(/^slds\//, "");
   return rule_messages_default[ruleIdWithoutNameSpace]?.description || "--";

package/build/services/lint-runner.js

@@ -3,6 +3,7 @@ import path from "path";
 import { BatchProcessor } from "./batch-processor.js";
 import { Logger } from "../utils/logger.js";
 import { resolveDirName } from "../utils/nodeVersionUtil.js";
+import { ConfigLoader } from "./config-loader.js";
 var LintRunner = class {
   /**
    * Run linting on batches of files
@@ -14,8 +15,9 @@ var LintRunner = class {
         "../workers",
         "eslint.worker.js"
       );
+      const configPath = await ConfigLoader.processConfig(options.configPath);
       const workerConfig = {
-        configPath: options.configPath,
+        configPath,
         fix: options.fix
       };
       const results = await BatchProcessor.processBatches(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce-ux/slds-linter",
-  "version": "1.0.2",
+  "version": "1.0.4-internal",
   "description": "SLDS Linter CLI tool for linting styles and components",
   "keywords": [
     "lightning design system linter",
@@ -29,7 +29,7 @@
   ],
   "bin": "build/index.js",
   "dependencies": {
-    "@salesforce-ux/eslint-plugin-slds": "1.0.2",
+    "@salesforce-ux/eslint-plugin-slds": "1.0.4-internal",
     "@typescript-eslint/eslint-plugin": "^8.36.0",
     "@typescript-eslint/parser": "^8.36.0",
     "chalk": "^4.1.2",