@storm-software/eslint 0.170.91 → 0.170.93

package/dist/preset.cjs

@@ -5867,7 +5867,9 @@ function excludeShebangs(comments) {
 function getLeadingComments(context, node2) {
   const firstBodyNode = Array.isArray(node2.body) && node2.body.length ? node2.body[0] : node2;
   const all = excludeShebangs(
-    context.getSourceCode().getAllComments(firstBodyNode)
+    (context.sourceCode || context.getSourceCode()).getAllComments(
+      firstBodyNode
+    )
   );
   if (!all.length) {
     return [];
@@ -5882,7 +5884,7 @@ function getLeadingComments(context, node2) {
     if (!prev || !current) {
       break;
     }
-    const txt = context.getSourceCode().getText().slice(prev.range[1], current.range[0]);
+    const txt = (context.sourceCode || context.getSourceCode()).getText().slice(prev.range[1], current.range[0]);
     if (!txt.match(/^(\r\n|\r|\n)$/)) {
       break;
     }
@@ -5903,7 +5905,7 @@ function genCommentsRange(context, comments, eol) {
   }
   const start = comments[0].range[0];
   let end = comments.slice(-1)[0]?.range[1] ?? start;
-  if (context.getSourceCode().text[end] === eol) {
+  if ((context.sourceCode || context.getSourceCode()).text[end] === eol) {
     end += eol.length;
   }
   return [start, end];
@@ -6063,7 +6065,11 @@ var banner_default = createRule({
     return {
       Program(node2) {
         const normalizedNewlines = newlines ?? 1;
-        if (!hasBanner(normalizedCommentStyle, context.sourceCode.getText(), eol)) {
+        if (!hasBanner(
+          normalizedCommentStyle,
+          (context.sourceCode || context.getSourceCode()).getText(),
+          eol
+        )) {
           context.report({
             loc: node2.loc,
             messageId: "missingBanner",
@@ -6164,7 +6170,7 @@ var banner_default = createRule({
                 if (!lastLeadingComment) {
                   return;
                 }
-                const postLineBanner = context.sourceCode.text.substr(
+                const postLineBanner = (context.sourceCode || context.getSourceCode()).text.substr(
                   lastLeadingComment.range[1],
                   normalizedNewlines * 2
                 );
@@ -6217,7 +6223,7 @@ var banner_default = createRule({
                     ) 
                   });
                 } else {
-                  const postBlockBanner = context.sourceCode.text.substr(
+                  const postBlockBanner = (context.sourceCode || context.getSourceCode()).text.substr(
                     firstLeadingComment2.range[1],
                     normalizedNewlines * 2
                   );
@@ -20796,7 +20802,7 @@ async function typescript(options = {}) {
               allowDefaultProject: [GLOB_SRC_FILE],
               defaultProject: tsconfigPath
             },
-            tsconfigRootDir: findWorkspaceRoot2()
+            tsconfigRootDir: !tsconfigPath ? findWorkspaceRoot2() : path16.dirname(tsconfigPath)
           } : {},
           ...parserOptions
         }
@@ -21289,13 +21295,6 @@ function preset(options, ...userConfigs) {
       );
     }
   }
-  const typescriptOptions = resolveSubOptions(options, "typescript");
-  if (typescriptOptions.tsconfigPath !== false) {
-    typescriptOptions.tsconfigPath = getTsConfigPath(
-      typescriptOptions.tsconfigPath,
-      options.type
-    );
-  }
   configs6.push(
     ignores(options.ignores),
     javascript({
@@ -21310,6 +21309,27 @@ function preset(options, ...userConfigs) {
     perfectionist(),
     secrets({ json: options.jsonc !== false })
   );
+  let typescriptOptions = {};
+  if (enableTypeScript) {
+    typescriptOptions = resolveSubOptions(options, "typescript");
+    if (typescriptOptions.tsconfigPath !== false) {
+      typescriptOptions.tsconfigPath = getTsConfigPath(
+        typescriptOptions.tsconfigPath,
+        options.type
+      );
+    }
+  }
+  if (enableTypeScript) {
+    configs6.push(
+      typescript({
+        ...typescriptOptions,
+        tsconfigPath: typescriptOptions.tsconfigPath === false ? void 0 : typescriptOptions.tsconfigPath,
+        componentExts,
+        overrides: getOverrides(options, "typescript"),
+        type: options.type
+      })
+    );
+  }
   if (enableBanner) {
     configs6.push(
       banner({
@@ -21347,17 +21367,6 @@ function preset(options, ...userConfigs) {
   if (enableJsx) {
     configs6.push(jsx());
   }
-  if (enableTypeScript) {
-    configs6.push(
-      typescript({
-        ...typescriptOptions,
-        tsconfigPath: typescriptOptions.tsconfigPath === false ? void 0 : typescriptOptions.tsconfigPath,
-        componentExts,
-        overrides: getOverrides(options, "typescript"),
-        type: options.type
-      })
-    );
-  }
   if (enableZod) {
     configs6.push(
       zod({

package/dist/preset.js

@@ -14,7 +14,7 @@ import { loadConfig } from 'c12';
 import defu from 'defu';
 import chalk from 'chalk';
 import fs3, { existsSync, readFileSync } from 'node:fs';
-import path16, { join } from 'node:path';
+import path16, { dirname as dirname$1, join } from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { EOL } from 'node:os';
 import cspellConfig from '@cspell/eslint-plugin/recommended';
@@ -5726,7 +5726,9 @@ function excludeShebangs(comments) {
 function getLeadingComments(context, node2) {
   const firstBodyNode = Array.isArray(node2.body) && node2.body.length ? node2.body[0] : node2;
   const all = excludeShebangs(
-    context.getSourceCode().getAllComments(firstBodyNode)
+    (context.sourceCode || context.getSourceCode()).getAllComments(
+      firstBodyNode
+    )
   );
   if (!all.length) {
     return [];
@@ -5741,7 +5743,7 @@ function getLeadingComments(context, node2) {
     if (!prev || !current) {
       break;
     }
-    const txt = context.getSourceCode().getText().slice(prev.range[1], current.range[0]);
+    const txt = (context.sourceCode || context.getSourceCode()).getText().slice(prev.range[1], current.range[0]);
     if (!txt.match(/^(\r\n|\r|\n)$/)) {
       break;
     }
@@ -5762,7 +5764,7 @@ function genCommentsRange(context, comments, eol) {
   }
   const start = comments[0].range[0];
   let end = comments.slice(-1)[0]?.range[1] ?? start;
-  if (context.getSourceCode().text[end] === eol) {
+  if ((context.sourceCode || context.getSourceCode()).text[end] === eol) {
     end += eol.length;
   }
   return [start, end];
@@ -5922,7 +5924,11 @@ var banner_default = createRule({
     return {
       Program(node2) {
         const normalizedNewlines = newlines ?? 1;
-        if (!hasBanner(normalizedCommentStyle, context.sourceCode.getText(), eol)) {
+        if (!hasBanner(
+          normalizedCommentStyle,
+          (context.sourceCode || context.getSourceCode()).getText(),
+          eol
+        )) {
           context.report({
             loc: node2.loc,
             messageId: "missingBanner",
@@ -6023,7 +6029,7 @@ var banner_default = createRule({
                 if (!lastLeadingComment) {
                   return;
                 }
-                const postLineBanner = context.sourceCode.text.substr(
+                const postLineBanner = (context.sourceCode || context.getSourceCode()).text.substr(
                   lastLeadingComment.range[1],
                   normalizedNewlines * 2
                 );
@@ -6076,7 +6082,7 @@ var banner_default = createRule({
                     ) 
                   });
                 } else {
-                  const postBlockBanner = context.sourceCode.text.substr(
+                  const postBlockBanner = (context.sourceCode || context.getSourceCode()).text.substr(
                     firstLeadingComment2.range[1],
                     normalizedNewlines * 2
                   );
@@ -20397,7 +20403,7 @@ async function typescript(options = {}) {
               allowDefaultProject: [GLOB_SRC_FILE],
               defaultProject: tsconfigPath
             },
-            tsconfigRootDir: findWorkspaceRoot()
+            tsconfigRootDir: !tsconfigPath ? findWorkspaceRoot() : dirname$1(tsconfigPath)
           } : {},
           ...parserOptions
         }
@@ -20853,13 +20859,6 @@ function preset(options, ...userConfigs) {
       );
     }
   }
-  const typescriptOptions = resolveSubOptions(options, "typescript");
-  if (typescriptOptions.tsconfigPath !== false) {
-    typescriptOptions.tsconfigPath = getTsConfigPath(
-      typescriptOptions.tsconfigPath,
-      options.type
-    );
-  }
   configs6.push(
     ignores(options.ignores),
     javascript({
@@ -20874,6 +20873,27 @@ function preset(options, ...userConfigs) {
     perfectionist(),
     secrets({ json: options.jsonc !== false })
   );
+  let typescriptOptions = {};
+  if (enableTypeScript) {
+    typescriptOptions = resolveSubOptions(options, "typescript");
+    if (typescriptOptions.tsconfigPath !== false) {
+      typescriptOptions.tsconfigPath = getTsConfigPath(
+        typescriptOptions.tsconfigPath,
+        options.type
+      );
+    }
+  }
+  if (enableTypeScript) {
+    configs6.push(
+      typescript({
+        ...typescriptOptions,
+        tsconfigPath: typescriptOptions.tsconfigPath === false ? void 0 : typescriptOptions.tsconfigPath,
+        componentExts,
+        overrides: getOverrides(options, "typescript"),
+        type: options.type
+      })
+    );
+  }
   if (enableBanner) {
     configs6.push(
       banner({
@@ -20911,17 +20931,6 @@ function preset(options, ...userConfigs) {
   if (enableJsx) {
     configs6.push(jsx());
   }
-  if (enableTypeScript) {
-    configs6.push(
-      typescript({
-        ...typescriptOptions,
-        tsconfigPath: typescriptOptions.tsconfigPath === false ? void 0 : typescriptOptions.tsconfigPath,
-        componentExts,
-        overrides: getOverrides(options, "typescript"),
-        type: options.type
-      })
-    );
-  }
   if (enableZod) {
     configs6.push(
       zod({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/eslint",
-  "version": "0.170.91",
+  "version": "0.170.93",
   "private": false,
   "description": "A package containing the base ESLint configuration used by Storm Software across many projects.",
   "keywords": [
@@ -196,7 +196,7 @@
     "@next/eslint-plugin-next": "^15.5.19",
     "@nx/eslint": "22.7.5",
     "@prettier/plugin-xml": "^3.4.2",
-    "@storm-software/eslint-plugin-banner": "^0.0.25",
+    "@storm-software/eslint-plugin-banner": "0.0.26",
     "@storm-software/eslint-plugin-pnpm": "^0.0.24",
     "@storm-software/eslint-plugin-tsdoc": "^0.0.24",
     "@stylistic/eslint-plugin-migrate": "^4.4.1",
@@ -271,5 +271,5 @@
     "zod": { "optional": true }
   },
   "publishConfig": { "access": "public" },
-  "gitHead": "68cf7b0a3e91562c05d5b4fb909326e65066c262"
+  "gitHead": "679dea48cf6192e6df471e5d9b810c7828a96b89"
 }