Merge remote-tracking branch 'origin/main' into chenjiahan/fix-type-aware-lint

Author: chenjiahan

.github/workflows/test.yml

@@ -12,6 +12,7 @@ on:
 
 permissions:
   contents: read
+  pull-requests: read
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -26,28 +27,47 @@ jobs:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
 
+      - uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        id: changes
+        with:
+          predicate-quantifier: 'every'
+          filters: |
+            changed:
+              - "!**/*.md"
+              - "!**/*.mdx"
+              - "!**/_meta.json"
+              - "!**/_nav.json"
+              - "!**/dictionary.txt"
+
       - name: Setup Node.js
+        if: steps.changes.outputs.changed == 'true'
         uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7
         with:
           node-version: 24.18.1
           package-manager-cache: false
 
       - name: Install Pnpm
+        if: steps.changes.outputs.changed == 'true'
         uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10
         with:
           run_install: true
 
       - name: Build Packages
+        if: steps.changes.outputs.changed == 'true'
         run: node --run build
 
       - name: Run Rust Tests
+        if: steps.changes.outputs.changed == 'true'
         run: cargo test --profile ci --workspace --locked
 
       - name: Build Native Binding
+        if: steps.changes.outputs.changed == 'true'
         run: pnpm --filter rstack build:native:ci
 
       - name: Check Generated Native Files
+        if: steps.changes.outputs.changed == 'true'
         run: git diff --exit-code -- packages/rstack/binding.cjs packages/rstack/binding.d.cts
 
       - name: Run Test
+        if: steps.changes.outputs.changed == 'true'
         run: node --run test

packages/rstack/src/fmt/config.ts

@@ -17,6 +17,20 @@ type ResolveFmtConfigOptions = {
 type PathMatcher = (filePath: string) => boolean;
 type FmtOptionsResolver = (filePath: string) => ResolvedFmtOptions;
 
+/**
+ * Each path from the root represents an ordered sequence of matching overrides.
+ * A node stores the options merged along that path.
+ */
+type OptionsCacheNode = {
+  children: WeakMap<ResolvedFmtOptions, OptionsCacheNode>;
+  options: ResolvedFmtOptions;
+};
+
+const createOptionsCacheNode = (options: ResolvedFmtOptions): OptionsCacheNode => ({
+  children: new WeakMap(),
+  options,
+});
+
 const neverMatches: PathMatcher = () => false;
 
 const compileMatchers = (
@@ -96,22 +110,27 @@ const createOptionsResolver = (config: ResolvedFmtConfig): FmtOptionsResolver =>
   }
 
   const resolveRelativePath = createRelativePathResolver(config.rootPath);
+  const rootCacheNode = createOptionsCacheNode(config.baseOptions);
 
   return (filePath) => {
-    let options = config.baseOptions;
+    let cacheNode = rootCacheNode;
     const relativeFilePath = resolveRelativePath(filePath);
 
     for (const override of config.overrides) {
       if (!override.options || !override.matches(relativeFilePath)) {
         continue;
       }
-      if (options === config.baseOptions) {
-        options = { ...options };
+
+      // Reuse the merged result for this override after the current matched sequence.
+      let nextCacheNode = cacheNode.children.get(override.options);
+      if (!nextCacheNode) {
+        nextCacheNode = createOptionsCacheNode({ ...cacheNode.options, ...override.options });
+        cacheNode.children.set(override.options, nextCacheNode);
       }
-      Object.assign(options, override.options);
+      cacheNode = nextCacheNode;
     }
 
-    return options;
+    return cacheNode.options;
   };
 };
 

packages/rstack/src/fmt/plugins.ts

@@ -94,11 +94,12 @@ const createFingerprintResolver = (): FingerprintResolver => {
 /** Creates a project-root resolver for plugins in final per-file options. */
 const createPluginResolver = (rootPath: string): FmtPluginResolver => {
   const parentUrl = pathToFileURL(join(rootPath, 'index.js'));
-  const cache = new Map<string, string>();
+  const pluginCache = new Map<string, string>();
+  const optionsCache = new WeakMap<ResolvedFmtOptions, ResolvedFmtOptions>();
 
   const resolvePlugin = (plugin: FmtPluginSpecifier): string => {
     const specifier = plugin instanceof URL ? plugin.href : plugin;
-    const cached = cache.get(specifier);
+    const cached = pluginCache.get(specifier);
     if (cached !== undefined) {
       return cached;
     }
@@ -119,11 +120,16 @@ const createPluginResolver = (rootPath: string): FmtPluginResolver => {
       }
     }
 
-    cache.set(specifier, resolved);
+    pluginCache.set(specifier, resolved);
     return resolved;
   };
 
   return (options) => {
+    const cached = optionsCache.get(options);
+    if (cached !== undefined) {
+      return cached;
+    }
+
     const { plugins } = options;
     if (!plugins?.length) {
       return options;
@@ -136,10 +142,11 @@ const createPluginResolver = (rootPath: string): FmtPluginResolver => {
     }
 
     const resolvedPlugins = plugins.map(resolvePlugin);
-
-    return resolvedPlugins.every((plugin, index) => plugin === plugins[index])
+    const resolvedOptions = resolvedPlugins.every((plugin, index) => plugin === plugins[index])
       ? options
       : { ...options, plugins: resolvedPlugins };
+    optionsCache.set(options, resolvedOptions);
+    return resolvedOptions;
   };
 };
 

packages/rstack/tests/fmt/config.test.ts

@@ -50,6 +50,29 @@ test('applies basename and path overrides in declaration order', () => {
   expect(config.baseOptions).toEqual({ singleQuote: false });
 });
 
+test('reuses options for the same override combination', () => {
+  const config = normalizeFmtConfig(
+    {
+      singleQuote: false,
+      overrides: [
+        { files: '*.ts', options: { semi: false } },
+        { files: 'src/**/*.ts', options: { singleQuote: true } },
+      ],
+    },
+    rootPath,
+  );
+  const resolveOptions = createOptionsResolver(config);
+
+  const first = resolveOptions(path.join(rootPath, 'src/first.ts'));
+  const second = resolveOptions(path.join(rootPath, 'src/second.ts'));
+  const outside = resolveOptions(path.join(rootPath, 'outside.ts'));
+
+  expect(first).toBe(second);
+  expect(first).not.toBe(outside);
+  expect(first).toEqual({ semi: false, singleQuote: true });
+  expect(outside).toEqual({ semi: false, singleQuote: false });
+});
+
 test('applies overrides outside the config root', () => {
   const config = normalizeFmtConfig(
     {

packages/rstack/tests/fmt/plugins.test.ts

@@ -40,7 +40,8 @@ test('resolves plugin specifiers from the config root', async () => {
       ],
     };
 
-    const resolved = createPluginResolver(rootPath)(options);
+    const resolvePlugins = createPluginResolver(rootPath);
+    const resolved = resolvePlugins(options);
 
     expect(resolved.plugins).toEqual([
       pathToFileURL(packageEntry).href,
@@ -50,6 +51,7 @@ test('resolves plugin specifiers from the config root', async () => {
       'data:text/javascript,export default {}',
     ]);
     expect(options.plugins[0]).toBe('prettier-plugin-packagejson');
+    expect(resolvePlugins(options)).toBe(resolved);
   });
 });