refactor

Author: ota-meshi

src/parser/index.ts

@@ -44,7 +44,7 @@ import {
   resolveSvelteParseContextForSvelteScript,
   type SvelteParseContext,
 } from "./svelte-parse-context";
-import type { StaticSvelteConfig } from "../svelte-config";
+import type { StaticSvelteConfigFile } from "../svelte-config";
 import { resolveSvelteConfig } from "../svelte-config";
 
 export {
@@ -124,7 +124,7 @@ export function parseForESLint(code: string, options?: any): ParseResult {
  */
 function parseAsSvelte(
   code: string,
-  svelteConfig: StaticSvelteConfig | null,
+  svelteConfig: StaticSvelteConfigFile | null,
   parserOptions: NormalizedParserOptions,
 ): ParseResult {
   const ctx = new Context(code, parserOptions);

src/parser/svelte-parse-context.ts

@@ -2,7 +2,7 @@ import type * as Compiler from "svelte/compiler";
 import type * as SvAST from "./svelte-ast-types";
 import type { NormalizedParserOptions } from "./parser-options";
 import { compilerVersion, svelteVersion } from "./svelte-version";
-import type { StaticSvelteConfig } from "../svelte-config";
+import type { StaticSvelteConfigFile } from "../svelte-config";
 
 /** The context for parsing. */
 export type SvelteParseContext = {
@@ -15,24 +15,24 @@ export type SvelteParseContext = {
   /** The version of "svelte/compiler". */
   compilerVersion: string;
   /** The result of static analysis of `svelte.config.js`. */
-  svelteConfig: StaticSvelteConfig | null;
+  svelteConfig: StaticSvelteConfigFile | null;
 };
 
 export function isEnableRunes(
-  svelteConfig: StaticSvelteConfig | null,
+  svelteConfig: StaticSvelteConfigFile | null,
   parserOptions: NormalizedParserOptions,
 ): boolean {
   if (!svelteVersion.gte(5)) return false;
   if (parserOptions.svelteFeatures?.runes != null) {
     return Boolean(parserOptions.svelteFeatures.runes);
-  } else if (svelteConfig?.compilerOptions?.runes != null) {
-    return Boolean(svelteConfig.compilerOptions.runes);
+  } else if (svelteConfig?.config.compilerOptions?.runes != null) {
+    return Boolean(svelteConfig.config.compilerOptions.runes);
   }
   return false;
 }
 
 export function resolveSvelteParseContextForSvelte(
-  svelteConfig: StaticSvelteConfig | null,
+  svelteConfig: StaticSvelteConfigFile | null,
   parserOptions: NormalizedParserOptions,
   svelteAst: Compiler.Root | SvAST.AstLegacy,
 ): SvelteParseContext {
@@ -53,14 +53,14 @@ export function resolveSvelteParseContextForSvelte(
 }
 
 export function resolveSvelteParseContextForSvelteScript(
-  svelteConfig: StaticSvelteConfig | null,
+  svelteConfig: StaticSvelteConfigFile | null,
   parserOptions: NormalizedParserOptions,
 ): SvelteParseContext {
   return resolveSvelteParseContext(svelteConfig, parserOptions);
 }
 
 function resolveSvelteParseContext(
-  svelteConfig: StaticSvelteConfig | null,
+  svelteConfig: StaticSvelteConfigFile | null,
   parserOptions: NormalizedParserOptions,
 ): SvelteParseContext {
   return {

src/svelte-config/index.ts

@@ -4,7 +4,6 @@ import { parseConfig } from "./parser";
 
 /** The result of static analysis of `svelte.config.js`. */
 export type StaticSvelteConfig = {
-  configFilePath: string;
   compilerOptions?: {
     runes?: boolean;
   };
@@ -14,8 +13,12 @@ export type StaticSvelteConfig = {
     };
   };
 };
+export type StaticSvelteConfigFile = {
+  filePath: string;
+  config: StaticSvelteConfig;
+};
 
-const caches = new Map<string, StaticSvelteConfig | null>();
+const caches = new Map<string, StaticSvelteConfigFile | null>();
 
 /**
  * Resolves svelte.config.js.
@@ -24,7 +27,7 @@ const caches = new Map<string, StaticSvelteConfig | null>();
  */
 export function resolveSvelteConfig(
   filePath: string | undefined,
-): StaticSvelteConfig | null {
+): StaticSvelteConfigFile | null {
   const cwd =
     filePath && fs.existsSync(filePath)
       ? path.dirname(filePath)
@@ -33,12 +36,14 @@ export function resolveSvelteConfig(
   if (!configFilePath) return null;
 
   if (caches.has(configFilePath)) {
-    return caches.get(configFilePath) as StaticSvelteConfig | null;
+    return caches.get(configFilePath) || null;
   }
 
   const code = fs.readFileSync(configFilePath, "utf8");
   const config = parseConfig(code);
-  const result = config ? { ...config, configFilePath } : null;
+  const result: StaticSvelteConfigFile | null = config
+    ? { config, filePath: configFilePath }
+    : null;
   caches.set(configFilePath, result);
   return result;
 }

src/svelte-config/parser.ts

@@ -1,4 +1,4 @@
-import type { StaticSvelteConfig as StaticSvelteConfigAll } from ".";
+import type { StaticSvelteConfig } from ".";
 import { getEspree } from "../parser/espree";
 import type {
   Program,
@@ -11,8 +11,6 @@ import type { ScopeManager } from "eslint-scope";
 import { analyze } from "eslint-scope";
 import { findVariable } from "../scope";
 
-type StaticSvelteConfig = Omit<StaticSvelteConfigAll, "configFilePath">;
-
 export function parseConfig(code: string): StaticSvelteConfig | null {
   const espree = getEspree();
   const ast = espree.parse(code, {