@storm-software/eslint 0.144.2 → 0.145.0

package/dist/types.d.ts

@@ -3742,19 +3742,29 @@ Backward pagination arguments
   'perfectionist/sort-variable-declarations'?: Linter.RuleEntry<PerfectionistSortVariableDeclarations>
   /**
    * Enforce using "catalog:" in `package.json`
-   * @see https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/enforce-catalog.test.ts
+   * @see https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/json-enforce-catalog.test.ts
    */
-  'pnpm/enforce-catalog'?: Linter.RuleEntry<PnpmEnforceCatalog>
+  'pnpm/json-enforce-catalog'?: Linter.RuleEntry<PnpmJsonEnforceCatalog>
   /**
    * Prefer having pnpm settings in `pnpm-workspace.yaml` instead of `package.json`. This would requires pnpm v10.6+, see https://github.com/orgs/pnpm/discussions/9037.
-   * @see https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/prefer-workspace-settings.test.ts
+   * @see https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/json-prefer-workspace-settings.test.ts
    */
-  'pnpm/prefer-workspace-settings'?: Linter.RuleEntry<PnpmPreferWorkspaceSettings>
+  'pnpm/json-prefer-workspace-settings'?: Linter.RuleEntry<PnpmJsonPreferWorkspaceSettings>
   /**
    * Enforce using valid catalog in `package.json`
-   * @see https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/valid-catalog.test.ts
+   * @see https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/json-valid-catalog.test.ts
    */
-  'pnpm/valid-catalog'?: Linter.RuleEntry<PnpmValidCatalog>
+  'pnpm/json-valid-catalog'?: Linter.RuleEntry<PnpmJsonValidCatalog>
+  /**
+   * Disallow unused catalogs in `pnpm-workspace.yaml`
+   * @see https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/yaml-no-duplicate-catalog-item.test.ts
+   */
+  'pnpm/yaml-no-duplicate-catalog-item'?: Linter.RuleEntry<PnpmYamlNoDuplicateCatalogItem>
+  /**
+   * Disallow unused catalogs in `pnpm-workspace.yaml`
+   * @see https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/yaml-no-unused-catalog-item.test.ts
+   */
+  'pnpm/yaml-no-unused-catalog-item'?: Linter.RuleEntry<[]>
   /**
    * Require using arrow functions for callbacks
    * @see https://eslint.org/docs/latest/rules/prefer-arrow-callback
@@ -12707,8 +12717,8 @@ type PerfectionistSortVariableDeclarations = []|[{
   
   partitionByNewLine?: boolean
 }]
-// ----- pnpm/enforce-catalog -----
-type PnpmEnforceCatalog = []|[{
+// ----- pnpm/json-enforce-catalog -----
+type PnpmJsonEnforceCatalog = []|[{
   
   allowedProtocols?: string[]
   
@@ -12718,20 +12728,33 @@ type PnpmEnforceCatalog = []|[{
   
   reuseExistingCatalog?: boolean
   
-  skipPackages?: string[]
+  conflicts?: ("new-catalog" | "overrides" | "error")
+  
+  fields?: string[]
+  
+  ignore?: string[]
 }]
-// ----- pnpm/prefer-workspace-settings -----
-type PnpmPreferWorkspaceSettings = []|[{
+// ----- pnpm/json-prefer-workspace-settings -----
+type PnpmJsonPreferWorkspaceSettings = []|[{
+  
   autofix?: boolean
 }]
-// ----- pnpm/valid-catalog -----
-type PnpmValidCatalog = []|[{
+// ----- pnpm/json-valid-catalog -----
+type PnpmJsonValidCatalog = []|[{
   
   autoInsert?: boolean
   
   autoInsertDefaultSpecifier?: string
   
   autofix?: boolean
+  
+  enforceNoConflict?: boolean
+  
+  fields?: unknown[]
+}]
+// ----- pnpm/yaml-no-duplicate-catalog-item -----
+type PnpmYamlNoDuplicateCatalogItem = []|[{
+  allow?: string[]
 }]
 // ----- prefer-arrow-callback -----
 type PreferArrowCallback = []|[{
@@ -16331,7 +16354,7 @@ type Yoda = []|[("always" | "never")]|[("always" | "never"), {
   onlyEquality?: boolean
 }]
 // Names of all the configs
-type ConfigNames = 'storm/cspell/rules' | 'storm/astro/setup' | 'storm/astro/rules' | 'storm/formatter/setup' | 'storm/imports/rules' | 'storm/graphql/setup' | 'storm/graphql/rules' | 'storm/graphql/relay' | 'storm/javascript/setup' | 'storm/javascript/banner' | 'storm/javascript/rules' | 'storm/jsx/rules' | 'storm/jsdoc/rules' | 'storm/jsonc/setup' | 'storm/jsonc/rules' | 'storm/markdown/setup' | 'storm/markdown/processor' | 'storm/markdown/parser' | 'storm/markdown/disables' | 'storm/mdx/setup' | 'storm/node/rules' | 'storm/nx/setup' | 'storm/nx/schema' | 'storm/nx/dependency-check' | 'storm/nx/module-boundaries' | 'storm/next/rules' | 'storm/prettier/rules' | 'storm/perfectionist/rules' | 'storm/pnpm' | 'storm/react/setup' | 'storm/react/rules' | 'storm/react-native/rules' | 'storm/sort/package-json' | 'storm/stylistic/rules' | 'storm/secrets/rules' | 'storm/storybook/setup' | 'storm/storybook/rules' | 'storm/storybook/main' | 'storm/test/setup' | 'storm/test/rules' | 'storm/toml/setup' | 'storm/toml/rules' | 'storm/regexp/rules' | 'storm/typescript/setup' | 'storm/typescript/parser' | 'storm/typescript/type-aware-parser' | 'storm/typescript/rules' | 'storm/typescript/rules-tsdoc' | 'storm/typescript/rules-type-aware' | 'storm/unicorn/rules' | 'storm/unocss' | 'storm/yaml/setup' | 'storm/yaml/rules'
+type ConfigNames = 'storm/cspell/rules' | 'storm/astro/setup' | 'storm/astro/rules' | 'storm/formatter/setup' | 'storm/imports/rules' | 'storm/graphql/setup' | 'storm/graphql/rules' | 'storm/graphql/relay' | 'storm/javascript/setup' | 'storm/javascript/banner' | 'storm/javascript/rules' | 'storm/jsx/rules' | 'storm/jsdoc/rules' | 'storm/jsonc/setup' | 'storm/jsonc/rules' | 'storm/markdown/setup' | 'storm/markdown/processor' | 'storm/markdown/parser' | 'storm/markdown/disables' | 'storm/mdx/setup' | 'storm/node/rules' | 'storm/nx/setup' | 'storm/nx/schema' | 'storm/nx/dependency-check' | 'storm/nx/module-boundaries' | 'storm/next/rules' | 'storm/prettier/rules' | 'storm/perfectionist/rules' | 'storm/pnpm/setup' | 'storm/pnpm/package-json' | 'storm/pnpm/pnpm-workspace-yaml' | 'storm/react/setup' | 'storm/react/rules' | 'storm/react-native/rules' | 'storm/sort/package-json' | 'storm/stylistic/rules' | 'storm/secrets/rules' | 'storm/storybook/setup' | 'storm/storybook/rules' | 'storm/storybook/main' | 'storm/test/setup' | 'storm/test/rules' | 'storm/toml/setup' | 'storm/toml/rules' | 'storm/regexp/rules' | 'storm/typescript/setup' | 'storm/typescript/parser' | 'storm/typescript/type-aware-parser' | 'storm/typescript/rules' | 'storm/typescript/rules-tsdoc' | 'storm/typescript/rules-type-aware' | 'storm/unicorn/rules' | 'storm/unocss' | 'storm/yaml/setup' | 'storm/yaml/rules'
 
 /**
  * Vendor types from Prettier so we don't rely on the dependency.
@@ -16812,11 +16835,11 @@ interface OptionsNx extends OptionsOverrides {
 }
 interface OptionsPnpm extends OptionsOverrides {
     /**
-     * A list of dependencies to ignore for the `pnpm/enforce-catalog` rule.
+     * A list of dependencies to ignore for the `pnpm/json-enforce-catalog` rule.
      *
      * @defaultValue ["typescript"]
      */
-    skipPackages?: string[];
+    ignore?: string[];
 }
 interface OptionsCSpell extends OptionsOverrides {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/eslint",
-  "version": "0.144.2",
+  "version": "0.145.0",
   "type": "module",
   "description": "⚡ A package containing the base ESLint configuration used by Storm Software across many projects.",
   "repository": {
@@ -186,7 +186,7 @@
     "eslint-plugin-no-secrets": "^2.2.1",
     "eslint-plugin-paths": "^1.1.0",
     "eslint-plugin-perfectionist": "^4.9.0",
-    "eslint-plugin-pnpm": "0.1.2",
+    "eslint-plugin-pnpm": "0.3.0",
     "eslint-plugin-prettier": "^5.2.3",
     "eslint-plugin-regexp": "^2.7.0",
     "eslint-plugin-toml": "^0.12.0",

package/dist/dist-JAA754SN.js

@@ -1,415 +0,0 @@
-import {
-  __name
-} from "./chunk-SHUYVCID.js";
-
-// ../../node_modules/.pnpm/eslint-plugin-pnpm@0.1.2_patch_hash=fc4ee4a7237efb5ba14023278092ac74b27d4e63c5770dc1217_74126a20697f606656d92d86401c9c8d/node_modules/eslint-plugin-pnpm/dist/index.mjs
-import * as jsoncParser from "jsonc-eslint-parser";
-import fs from "node:fs";
-import process from "node:process";
-import { findUpSync } from "find-up-simple";
-import { parsePnpmWorkspaceYaml } from "pnpm-workspace-yaml";
-var blobUrl = "https://github.com/antfu/eslint-plugin-pnpm/blob/main/src/rules/";
-function RuleCreator(urlCreator) {
-  return /* @__PURE__ */ __name(function createNamedRule({
-    name,
-    meta,
-    ...rule
-  }) {
-    return createRule({
-      meta: {
-        ...meta,
-        docs: {
-          ...meta.docs,
-          url: urlCreator(name)
-        }
-      },
-      ...rule
-    });
-  }, "createNamedRule");
-}
-__name(RuleCreator, "RuleCreator");
-function createRule({
-  create,
-  defaultOptions,
-  meta
-}) {
-  return {
-    create: /* @__PURE__ */ __name((context) => {
-      const optionsWithDefault = context.options.map((options, index) => {
-        return {
-          ...defaultOptions[index] || {},
-          ...options || {}
-        };
-      });
-      return create(context, optionsWithDefault);
-    }, "create"),
-    defaultOptions,
-    meta
-  };
-}
-__name(createRule, "createRule");
-var createEslintRule = RuleCreator(
-  (ruleName) => `${blobUrl}${ruleName}.test.ts`
-);
-function getPackageJsonRootNode(context) {
-  if (!context.filename.endsWith("package.json"))
-    return;
-  const ast = context.sourceCode.ast;
-  const root = ast.body[0];
-  if (root.expression.type === "JSONObjectExpression")
-    return root.expression;
-}
-__name(getPackageJsonRootNode, "getPackageJsonRootNode");
-function* iterateDependencies(context) {
-  const root = getPackageJsonRootNode(context);
-  if (!root)
-    return;
-  for (const type of ["dependencies", "devDependencies"]) {
-    const node = root.properties.find((property) => property.key.type === "JSONLiteral" && property.key.value === type);
-    if (!node)
-      continue;
-    if (node.value.type !== "JSONObjectExpression")
-      continue;
-    for (const property of node.value.properties) {
-      if (property.value.type !== "JSONLiteral" || property.key.type !== "JSONLiteral")
-        continue;
-      if (typeof property.value.value !== "string")
-        continue;
-      const packageName = String(property.key.value);
-      const specifier = String(property.value.value);
-      yield {
-        packageName,
-        specifier,
-        property
-      };
-    }
-  }
-}
-__name(iterateDependencies, "iterateDependencies");
-function readPnpmWorkspace() {
-  const filepath = findUpSync("pnpm-workspace.yaml", { cwd: process.cwd() });
-  if (!filepath)
-    throw new Error("pnpm-workspace.yaml not found");
-  const content = fs.readFileSync(filepath, "utf-8");
-  const workspace2 = parsePnpmWorkspaceYaml(content);
-  let queueTimer;
-  const queue = [];
-  const write = /* @__PURE__ */ __name(() => {
-    fs.writeFileSync(filepath, workspace2.toString());
-  }, "write");
-  const hasQueue = /* @__PURE__ */ __name(() => queueTimer != null, "hasQueue");
-  const queueChange = /* @__PURE__ */ __name((fn, order) => {
-    if (order === "pre")
-      queue.unshift(fn);
-    else
-      queue.push(fn);
-    if (queueTimer != null)
-      clearTimeout(queueTimer);
-    queueTimer = setTimeout(() => {
-      queueTimer = void 0;
-      const clone = [...queue];
-      queue.length = 0;
-      for (const fn2 of clone)
-        fn2(workspace2);
-      if (workspace2.hasChanged())
-        write();
-    }, 1e3);
-  }, "queueChange");
-  return {
-    ...workspace2,
-    hasQueue,
-    queueChange
-  };
-}
-__name(readPnpmWorkspace, "readPnpmWorkspace");
-var WORKSPACE_CACHE_TIME = 1e4;
-var workspaceLastRead;
-var workspace;
-function getPnpmWorkspace() {
-  if (workspaceLastRead && workspace && !workspace.hasQueue() && Date.now() - workspaceLastRead > WORKSPACE_CACHE_TIME) {
-    workspace = void 0;
-  }
-  if (!workspace) {
-    workspace = readPnpmWorkspace();
-    workspaceLastRead = Date.now();
-  }
-  return workspace;
-}
-__name(getPnpmWorkspace, "getPnpmWorkspace");
-var RULE_NAME$2 = "enforce-catalog";
-var enforceCatalog = createEslintRule({
-  name: RULE_NAME$2,
-  meta: {
-    type: "layout",
-    docs: {
-      description: 'Enforce using "catalog:" in `package.json`'
-    },
-    fixable: "code",
-    schema: [
-      {
-        type: "object",
-        properties: {
-          allowedProtocols: {
-            type: "array",
-            description: "Allowed protocols in specifier to not be converted to catalog",
-            items: {
-              type: "string"
-            }
-          },
-          autofix: {
-            type: "boolean",
-            description: "Whether to autofix the linting error",
-            default: false
-          },
-          defaultCatalog: {
-            type: "string",
-            description: "Default catalog to use when moving version to catalog with autofix"
-          },
-          reuseExistingCatalog: {
-            type: "boolean",
-            description: "Whether to reuse existing catalog when moving version to catalog with autofix",
-            default: true
-          },
-          skipPackages: {
-            type: "array",
-            description: "A list of packages to skip when enforcing the catalog",
-            items: {
-              type: "string"
-            }
-          }
-        },
-        additionalProperties: false
-      }
-    ],
-    messages: {
-      expectCatalog: 'Expect to use catalog instead of plain specifier, got "{{specifier}}" for package "{{packageName}}".'
-    }
-  },
-  defaultOptions: [{}],
-  create(context, [options = {}]) {
-    const {
-      allowedProtocols = ["workspace", "link", "file"],
-      defaultCatalog = "default",
-      autofix = true,
-      reuseExistingCatalog = true,
-      skipPackages = []
-    } = options || {};
-    for (const { packageName, specifier, property } of iterateDependencies(context)) {
-      if (skipPackages.includes(packageName))
-        continue;
-      if (specifier.startsWith("catalog:"))
-        continue;
-      if (allowedProtocols?.some((p) => specifier.startsWith(p)))
-        continue;
-      const workspace2 = getPnpmWorkspace();
-      if (!workspace2)
-        return {};
-      context.report({
-        node: property.value,
-        messageId: "expectCatalog",
-        data: {
-          specifier,
-          packageName
-        },
-        fix: autofix ? (fixer) => {
-          const catalog = reuseExistingCatalog ? workspace2.getPackageCatalogs(packageName)[0] || defaultCatalog : defaultCatalog;
-          workspace2.queueChange(() => {
-            workspace2.setPackage(catalog, packageName, specifier);
-          });
-          return fixer.replaceText(
-            property.value,
-            catalog === "default" ? JSON.stringify("catalog:") : JSON.stringify(`catalog:${catalog}`)
-          );
-        } : void 0
-      });
-    }
-    return {};
-  }
-});
-var RULE_NAME$1 = "prefer-workspace-settings";
-var preferWorkspaceSettings = createEslintRule({
-  name: RULE_NAME$1,
-  meta: {
-    type: "layout",
-    docs: {
-      description: "Prefer having pnpm settings in `pnpm-workspace.yaml` instead of `package.json`. This would requires pnpm v10.6+, see https://github.com/orgs/pnpm/discussions/9037."
-    },
-    fixable: "code",
-    schema: [
-      {
-        type: "object",
-        properties: {
-          autofix: { type: "boolean" }
-        },
-        additionalProperties: false
-      }
-    ],
-    messages: {
-      unexpectedPnpmSettings: "Unexpected pnpm settings in package.json, should move to pnpm-workspace.yaml"
-    }
-  },
-  defaultOptions: [{}],
-  create(context, [options = {}]) {
-    const {
-      autofix = true
-    } = options || {};
-    const root = getPackageJsonRootNode(context);
-    if (!root)
-      return {};
-    const pnpmNode = root.properties.find((property) => property.key.type === "JSONLiteral" && property.key.value === "pnpm");
-    if (!pnpmNode)
-      return {};
-    const workspace2 = getPnpmWorkspace();
-    if (!workspace2)
-      return {};
-    context.report({
-      node: pnpmNode,
-      messageId: "unexpectedPnpmSettings",
-      fix: autofix ? (fixer) => {
-        const json = JSON.parse(context.sourceCode.text);
-        const pnpmSettings = json.pnpm;
-        const flatValueParis = [];
-        function traverse(value, paths) {
-          if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-            for (const key in value) {
-              traverse(value[key], [...paths, key]);
-            }
-          } else {
-            flatValueParis.push([paths, value]);
-          }
-        }
-        __name(traverse, "traverse");
-        traverse(pnpmSettings, []);
-        workspace2.queueChange(() => {
-          for (const [paths, value] of flatValueParis) {
-            workspace2.setPath(paths, value);
-          }
-        });
-        let start = pnpmNode.range[0];
-        let end = pnpmNode.range[1];
-        const before = context.sourceCode.getTokenBefore(pnpmNode);
-        if (before)
-          start = before.range[1];
-        const after = context.sourceCode.getTokenAfter(pnpmNode);
-        if (after?.type === "Punctuator" && after.value === ",")
-          end = after.range[1];
-        return fixer.removeRange([start, end]);
-      } : void 0
-    });
-    return {};
-  }
-});
-var RULE_NAME = "valid-catalog";
-var validCatalog = createEslintRule({
-  name: RULE_NAME,
-  meta: {
-    type: "layout",
-    docs: {
-      description: "Enforce using valid catalog in `package.json`"
-    },
-    fixable: "code",
-    schema: [
-      {
-        type: "object",
-        properties: {
-          autoInsert: {
-            type: "boolean",
-            description: "Whether to auto insert to catalog if missing",
-            default: true
-          },
-          autoInsertDefaultSpecifier: {
-            type: "string",
-            description: "Default specifier to use when auto inserting to catalog",
-            default: "^0.0.0"
-          },
-          autofix: {
-            type: "boolean",
-            description: "Whether to autofix the linting error",
-            default: true
-          }
-        },
-        additionalProperties: false
-      }
-    ],
-    messages: {
-      invalidCatalog: 'Catalog "{{specifier}}" for package "{{packageName}}" is not defined in `pnpm-workspace.yaml`.'
-    }
-  },
-  defaultOptions: [{}],
-  create(context, [options = {}]) {
-    const {
-      autoInsert = true,
-      autofix = true,
-      autoInsertDefaultSpecifier = "^0.0.0"
-    } = options || {};
-    for (const { packageName, specifier, property } of iterateDependencies(context)) {
-      if (!specifier.startsWith("catalog:"))
-        continue;
-      const workspace2 = getPnpmWorkspace();
-      if (!workspace2)
-        return {};
-      const currentCatalog = specifier.replace(/^catalog:/, "").trim() || "default";
-      const existingCatalogs = workspace2.getPackageCatalogs(packageName);
-      if (!existingCatalogs.includes(currentCatalog)) {
-        context.report({
-          node: property.value,
-          messageId: "invalidCatalog",
-          data: {
-            specifier,
-            packageName
-          },
-          fix: !autofix || !autoInsert && !existingCatalogs.length ? void 0 : (fixer) => {
-            let catalog = existingCatalogs[0];
-            if (!catalog && autoInsert) {
-              catalog = currentCatalog;
-              workspace2.queueChange(() => {
-                workspace2.setPackage(catalog, packageName, autoInsertDefaultSpecifier);
-              }, "pre");
-            }
-            return fixer.replaceText(
-              property.value,
-              catalog === "default" ? JSON.stringify("catalog:") : JSON.stringify(`catalog:${catalog}`)
-            );
-          }
-        });
-      }
-    }
-    return {};
-  }
-});
-var rules = {
-  "enforce-catalog": enforceCatalog,
-  "valid-catalog": validCatalog,
-  "prefer-workspace-settings": preferWorkspaceSettings
-};
-var plugin = {
-  rules
-};
-var configs = {
-  recommended: [
-    {
-      name: "pnpm/package.json",
-      files: [
-        "package.json",
-        "**/package.json"
-      ],
-      languageOptions: {
-        parser: jsoncParser
-      },
-      plugins: {
-        pnpm: plugin
-      },
-      rules: {
-        "pnpm/enforce-catalog": "error",
-        "pnpm/valid-catalog": "error",
-        "pnpm/prefer-workspace-settings": "error"
-      }
-    }
-  ]
-};
-plugin.configs = configs;
-export {
-  configs,
-  plugin as default,
-  plugin
-};