@storm-software/eslint 0.125.0 → 0.126.0

package/dist/{chunk-QX5WDYBX.js → chunk-BXVDD33Y.js}

@@ -45,9 +45,9 @@ __name(getLeadingComments, "getLeadingComments");
 function genCommentBody(commentType, textArray, eol, numNewlines) {
   const eols = eol.repeat(numNewlines);
   if (commentType === "block") {
-    return "/* " + textArray.join(eol) + " */" + eols;
+    return "/*" + textArray.join(eol) + "*/" + eols;
   } else {
-    return "// " + textArray.join(eol + " //") + eols;
+    return "//" + textArray.join(eol + "//") + eols;
   }
 }
 __name(genCommentBody, "genCommentBody");
@@ -85,22 +85,22 @@ function getEOL(options) {
   return os.EOL;
 }
 __name(getEOL, "getEOL");
-function hasBanner(commentType, src) {
+function hasBanner(commentType = "block", src, eol) {
   if (src.startsWith("#!")) {
-    const bannerLines = src.split(/\r?\n/);
+    const bannerLines = src.split(eol);
     if (bannerLines && bannerLines.length > 1) {
       bannerLines.shift();
-      while (bannerLines.length && bannerLines[0] && !bannerLines[0].replace(/\s+/, "")) {
+      while (bannerLines.length && bannerLines[0] && !bannerLines[0].trim()) {
         bannerLines.shift();
       }
       if (bannerLines.length) {
-        src = bannerLines.join("\n");
+        src = bannerLines.join(eol);
       } else {
         return false;
       }
     }
   }
-  return commentType === "block" && src.startsWith("/*") || commentType === "lint" && src.startsWith("//") || commentType !== "block" && commentType !== "lint" && commentType && src.startsWith(commentType);
+  return commentType === "block" && src.startsWith("/*") || commentType === "line" && src.startsWith("//") || commentType !== "block" && commentType !== "line" && commentType && src.startsWith(commentType);
 }
 __name(hasBanner, "hasBanner");
 function matchesLineEndings(src, num) {
@@ -119,7 +119,7 @@ var bannerRule = ESLintUtils.RuleCreator(() => `https://docs.stormsoftware.com/e
   name: "banner",
   meta: {
     docs: {
-      description: "Ensures the file has a Storm Software banner"
+      description: "Ensures the file has a organization specific banner at the top of source code files"
     },
     schema: [
       {
@@ -139,7 +139,15 @@ var bannerRule = ESLintUtils.RuleCreator(() => `https://docs.stormsoftware.com/e
           },
           numNewlines: {
             type: "number",
-            description: "The number of newlines to use after the banner. Defaults to 2"
+            description: "The number of newlines to use after the banner. Defaults to 1"
+          },
+          lineEndings: {
+            type: "string",
+            enum: [
+              "unix",
+              "windows"
+            ],
+            description: "The type of line endings to use. Defaults to the system default"
           }
         },
         additionalProperties: false
@@ -158,21 +166,25 @@ var bannerRule = ESLintUtils.RuleCreator(() => `https://docs.stormsoftware.com/e
     {
       repositoryName: "",
       commentType: "block",
-      numNewlines: 2
+      numNewlines: 1,
+      lineEndings: "unix"
     }
   ],
-  create(context, [{ banner, repositoryName = "", commentType = "block", numNewlines = 2 }]) {
+  create(context, [{ banner, repositoryName = "", commentType = "block", numNewlines = 1, lineEndings = "unix" }]) {
     if (!banner) {
       banner = getFileBanner(repositoryName);
     }
     const options = context.options;
-    const eol = getEOL(options);
+    const eol = getEOL({
+      lineEndings,
+      ...options
+    });
     const canFix = true;
     const bannerLines = banner.split(/\r?\n/);
     let fixLines = bannerLines;
     return {
       Program: /* @__PURE__ */ __name(function(node) {
-        if (!hasBanner(commentType, context.sourceCode.getText())) {
+        if (!hasBanner(commentType, context.sourceCode.getText(), eol)) {
           context.report({
             loc: node.loc,
             messageId: "missingBanner",

package/dist/chunk-GXNMSXDL.js

@@ -0,0 +1,24 @@
+import {
+  __name
+} from "./chunk-SHUYVCID.js";
+
+// src/utils/tsconfig-path.ts
+import { existsSync } from "node:fs";
+function getTsConfigPath() {
+  let tsconfigPath = "tsconfig.json";
+  if (existsSync("tsconfig.base.json")) {
+    tsconfigPath = "tsconfig.base.json";
+  } else if (existsSync("tsconfig.app.json")) {
+    tsconfigPath = "tsconfig.app.json";
+  } else if (existsSync("tsconfig.lib.json")) {
+    tsconfigPath = "tsconfig.lib.json";
+  } else {
+    console.warn("No tsconfig.json found. Consider adding a tsconfig.json file to your project's ESLint configuration.");
+  }
+  return tsconfigPath;
+}
+__name(getTsConfigPath, "getTsConfigPath");
+
+export {
+  getTsConfigPath
+};

package/dist/preset.d.ts

@@ -1,6 +1,6 @@
 import { Linter } from 'eslint';
 import { FlatConfigComposer } from 'eslint-flat-config-utils';
-import { O as OptionsConfig, R as RuleOptions, T as TypedFlatConfigItem, A as Awaitable, C as ConfigNames } from './types-Bz2mGFHi.js';
+import { O as OptionsConfig, R as RuleOptions, T as TypedFlatConfigItem, A as Awaitable, C as ConfigNames } from './types-oCxTBmlp.js';
 import '@nx/eslint-plugin/src/utils/runtime-lint-utils';
 import '@stylistic/eslint-plugin';
 import '@typescript-eslint/parser';

package/dist/preset.js

@@ -1,6 +1,9 @@
+import {
+  getTsConfigPath
+} from "./chunk-GXNMSXDL.js";
 import {
   banner_plugin_default
-} from "./chunk-QX5WDYBX.js";
+} from "./chunk-BXVDD33Y.js";
 import "./chunk-KDHZD7SF.js";
 import {
   GLOB_ASTRO,
@@ -163,6 +166,9 @@ async function disables() {
 }
 __name(disables, "disables");
 
+// src/configs/formatters.ts
+import defu from "defu";
+
 // src/configs/stylistic.ts
 var StylisticConfigDefaults = {
   indent: 2,
@@ -171,7 +177,7 @@ var StylisticConfigDefaults = {
   semi: true
 };
 async function stylistic(options = {}) {
-  const { indent, jsx: jsx2, overrides = {}, quotes, semi } = {
+  const { indent = 2, jsx: jsx2 = true, overrides = {}, quotes = "double", semi = true, lineEndings = "unix" } = {
     ...StylisticConfigDefaults,
     ...options
   };
@@ -192,6 +198,10 @@ async function stylistic(options = {}) {
       rules: {
         ...config.rules,
         "style/lines-around-comment": "off",
+        "style/linebreak-style": [
+          "error",
+          lineEndings
+        ],
         // "style/padding-line-between-statements": [
         //   "error",
         //   { blankLine: "always", prev: ["const", "let", "var"], next: "*" },
@@ -238,30 +248,35 @@ async function formatters(options = {}, stylistic2 = {}) {
     options.astro ? "prettier-plugin-astro" : void 0,
     options.xml || options.svg ? "@prettier/plugin-xml" : void 0
   ]);
-  const { indent, quotes, semi } = {
+  const { indent = 2, quotes = "double", semi = true } = {
     ...StylisticConfigDefaults,
     ...stylistic2
   };
-  const prettierOptions = Object.assign({
-    endOfLine: "auto",
+  const prettierOptions = defu({
+    proseWrap: "always",
+    quoteProps: "preserve",
+    bracketSameLine: true,
+    bracketSpacing: true,
+    arrowParens: "avoid",
+    endOfLine: "lf",
     printWidth: 120,
     semi,
     singleQuote: quotes === "single",
     tabWidth: typeof indent === "number" ? indent : 2,
-    trailingComma: "all",
+    trailingComma: "none",
     useTabs: indent === "tab"
-  }, options.prettierOptions || {});
+  }, options.prettierOptions ?? {});
   const prettierXmlOptions = {
     xmlQuoteAttributes: "double",
     xmlSelfClosingSpace: true,
     xmlSortAttributesByKey: false,
     xmlWhitespaceSensitivity: "ignore"
   };
-  const dprintOptions = Object.assign({
+  const dprintOptions = defu({
     indentWidth: typeof indent === "number" ? indent : 2,
     quoteStyle: quotes === "single" ? "preferSingle" : "preferDouble",
     useTabs: indent === "tab"
-  }, options.dprintOptions || {});
+  }, options.dprintOptions ?? {});
   const pluginFormat = await interopDefault(import("eslint-plugin-format"));
   const configs2 = [
     {
@@ -767,16 +782,16 @@ async function imports(options = {}) {
 __name(imports, "imports");
 
 // src/configs/javascript.ts
-import defu from "defu";
+import defu2 from "defu";
 import globalsLib from "globals";
 async function javascript(options = {}) {
-  const { isInEditor = false, overrides = {}, name = "storm", globals = {} } = options;
+  const { isInEditor = false, lineEndings = "unix", overrides = {}, name = "", globals = {} } = options;
   return [
     {
       name: "storm/javascript/setup",
       languageOptions: {
         ecmaVersion: 2022,
-        globals: defu(globals, {
+        globals: defu2(globals, {
           ...globalsLib.browser,
           ...globalsLib.es2021,
           ...globalsLib.node,
@@ -809,8 +824,9 @@ async function javascript(options = {}) {
           "error",
           {
             commentType: "block",
-            numNewlines: 2,
-            repositoryName: name
+            numNewlines: 1,
+            repositoryName: name,
+            lineEndings
           }
         ]
       }
@@ -2459,7 +2475,7 @@ async function node() {
 __name(node, "node");
 
 // src/configs/nx.ts
-import defu2 from "defu";
+import defu3 from "defu";
 async function nx(options = {}) {
   const { depsCheck, moduleBoundaries } = options;
   return [
@@ -2487,7 +2503,7 @@ async function nx(options = {}) {
       rules: {
         "@nx/dependency-checks": [
           "error",
-          defu2(depsCheck ?? {}, {
+          defu3(depsCheck ?? {}, {
             buildTargets: [
               "build-base",
               "build"
@@ -3223,7 +3239,6 @@ async function toml(options = {}) {
 __name(toml, "toml");
 
 // src/configs/typescript.ts
-import { existsSync } from "node:fs";
 import process from "node:process";
 async function typescript(options = {}) {
   const { componentExts = [], overrides = {}, overridesTypeAware = {}, parserOptions = {}, type = "app" } = options;
@@ -3240,19 +3255,9 @@ async function typescript(options = {}) {
     `${GLOB_MARKDOWN}/**`,
     GLOB_ASTRO_TS
   ];
-  let tsconfigPath = options?.tsconfigPath ? options.tsconfigPath : void 0;
+  let tsconfigPath = options?.tsconfigPath;
   if (!tsconfigPath) {
-    if (existsSync("tsconfig.json")) {
-      tsconfigPath = "tsconfig.json";
-    } else if (existsSync("tsconfig.base.json")) {
-      tsconfigPath = "tsconfig.base.json";
-    } else if (existsSync("tsconfig.app.json")) {
-      tsconfigPath = "tsconfig.app.json";
-    } else if (existsSync("tsconfig.lib.json")) {
-      tsconfigPath = "tsconfig.lib.json";
-    } else {
-      console.warn("No tsconfig.json found. Consider adding a tsconfig.json file to your project's ESLint configuration.");
-    }
+    tsconfigPath = getTsConfigPath();
   }
   const isTypeAware = !!tsconfigPath;
   const typeAwareRules = {
@@ -3342,10 +3347,10 @@ async function typescript(options = {}) {
       files,
       name: "storm/typescript/rules",
       rules: {
-        ...renameRules(pluginTs.configs["eslint-recommended"].overrides[0].rules, {
+        ...renameRules(pluginTs.configs["eslint-recommended"]?.overrides?.[0]?.rules, {
           "@typescript-eslint": "ts"
         }),
-        ...renameRules(pluginTs.configs.strict.rules, {
+        ...renameRules(pluginTs.configs.strict?.rules, {
           "@typescript-eslint": "ts"
         }),
         /*************************************************************
@@ -3727,12 +3732,12 @@ function getOverrides(options, key) {
 }
 __name(getOverrides, "getOverrides");
 function getStormConfig(options, ...userConfigs) {
-  const { name, globals = {}, astro: enableAstro = false, autoRenamePlugins = true, componentExts = [], gitignore: enableGitignore = true, jsx: enableJsx = true, cspell: enableCSpell = true, react: enableReact = false, regexp: enableRegexp = true, next: enableNext = false, graphql: enableGraphQL = false, storybook: enableStorybook = false, typescript: enableTypeScript = isPackageExists2("typescript"), unicorn: enableUnicorn = true, unocss: enableUnoCSS = false } = options;
+  const { name = "", globals = {}, lineEndings = "unix", astro: enableAstro = false, autoRenamePlugins = true, componentExts = [], gitignore: enableGitignore = true, jsx: enableJsx = true, cspell: enableCSpell = true, react: enableReact = false, regexp: enableRegexp = true, next: enableNext = false, graphql: enableGraphQL = false, storybook: enableStorybook = false, typescript: enableTypeScript = isPackageExists2("typescript"), unicorn: enableUnicorn = true, unocss: enableUnoCSS = false } = options;
   let isInEditor = options.isInEditor;
   if (isInEditor == null) {
     isInEditor = isInEditorEnv();
     if (isInEditor)
-      console.log("[@antfu/eslint-config] Detected running in editor, some rules are disabled.");
+      console.log("[@storm-software/eslint] Detected running in editor, some rules are disabled.");
   }
   const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
   if (stylisticOptions && !("jsx" in stylisticOptions)) stylisticOptions.jsx = enableJsx;
@@ -3755,10 +3760,14 @@ function getStormConfig(options, ...userConfigs) {
     }
   }
   const typescriptOptions = resolveSubOptions(options, "typescript");
-  const tsconfigPath = "tsconfigPath" in typescriptOptions ? typescriptOptions.tsconfigPath : void 0;
+  let tsconfigPath = "tsconfigPath" in typescriptOptions ? typescriptOptions.tsconfigPath : void 0;
+  if (!tsconfigPath) {
+    tsconfigPath = getTsConfigPath();
+  }
   configs2.push(ignores(options.ignores), javascript({
     name,
     globals,
+    lineEndings,
     isInEditor,
     overrides: getOverrides(options, "javascript")
   }), node(), jsdoc({
@@ -3786,6 +3795,7 @@ function getStormConfig(options, ...userConfigs) {
   if (stylisticOptions) {
     configs2.push(stylistic({
       ...stylisticOptions,
+      lineEndings,
       lessOpinionated: options.lessOpinionated,
       overrides: getOverrides(options, "stylistic")
     }));

package/dist/{types-Bz2mGFHi.d.ts → types-oCxTBmlp.d.ts}

@@ -320,7 +320,7 @@ interface RuleOptions {
    */
   'astro/valid-compile'?: Linter.RuleEntry<[]>
   /**
-   * Ensures the file has a Storm Software banner
+   * Ensures the file has a organization specific banner at the top of source code files
    * @see https://docs.stormsoftware.com/eslint/rules/banner
    */
   'banner/banner'?: Linter.RuleEntry<BannerBanner>
@@ -6740,6 +6740,8 @@ type BannerBanner = []|[{
   commentType?: string
   
   numNewlines?: number
+  
+  lineEndings?: ("unix" | "windows")
 }]
 // ----- block-spacing -----
 type BlockSpacing = []|[("always" | "never")]
@@ -14870,7 +14872,9 @@ interface OptionsTypeScriptWithTypes {
      */
     overridesTypeAware?: TypedFlatConfigItem["rules"];
 }
-type StylisticConfig = Pick<StylisticCustomizeOptions, "indent" | "quotes" | "jsx" | "semi">;
+type StylisticConfig = Pick<StylisticCustomizeOptions, "indent" | "quotes" | "jsx" | "semi"> & {
+    lineEndings?: "unix" | "windows";
+};
 interface OptionsOverrides {
     overrides?: TypedFlatConfigItem["rules"];
 }
@@ -15089,6 +15093,12 @@ interface OptionsJavascript {
      * An object containing a list of extra global variables to include in the configuration.
      */
     globals?: Record<string, ESLintGlobalsPropValue>;
+    /**
+     * The style of line endings to use.
+     *
+     * @default "unix"
+     */
+    lineEndings?: "unix" | "windows";
 }
 interface OptionsConfig extends OptionsComponentExts, OptionsJavascript, OptionsProjectType {
     /**

package/dist/utils/banner-plugin.js

@@ -1,6 +1,6 @@
 import {
   banner_plugin_default
-} from "../chunk-QX5WDYBX.js";
+} from "../chunk-BXVDD33Y.js";
 import "../chunk-KDHZD7SF.js";
 import "../chunk-AIKLBIPC.js";
 import "../chunk-SHUYVCID.js";

package/dist/utils/combine.d.ts

@@ -1,5 +1,5 @@
 import { Awaitable } from 'eslint-flat-config-utils';
-import { T as TypedFlatConfigItem } from '../types-Bz2mGFHi.js';
+import { T as TypedFlatConfigItem } from '../types-oCxTBmlp.js';
 import '@nx/eslint-plugin/src/utils/runtime-lint-utils';
 import '@stylistic/eslint-plugin';
 import '@typescript-eslint/parser';

package/dist/utils/tsconfig-path.d.ts

@@ -0,0 +1,3 @@
+declare function getTsConfigPath(): string;
+
+export { getTsConfigPath };

package/dist/utils/tsconfig-path.js

@@ -0,0 +1,7 @@
+import {
+  getTsConfigPath
+} from "../chunk-GXNMSXDL.js";
+import "../chunk-SHUYVCID.js";
+export {
+  getTsConfigPath
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/eslint",
-  "version": "0.125.0",
+  "version": "0.126.0",
   "type": "module",
   "description": "⚡ A package containing the base ESLint configuration used by Storm Software across many projects.",
   "repository": {