refactor: move collectTypescriptInfo out of rspackExperiments (#12535)

Author: ahabhgk

crates/rspack_loader_swc/src/lib.rs

@@ -125,11 +125,7 @@ impl SwcLoader {
         if !is_typescript {
           return;
         }
-        let Some(options) = &self
-          .options_with_additional
-          .rspack_experiments
-          .collect_typescript_info
-        else {
+        let Some(options) = &self.options_with_additional.collect_typescript_info else {
           return;
         };
         collected_ts_info = Some(collect_typescript_info(

crates/rspack_loader_swc/src/options.rs

@@ -14,7 +14,6 @@ use swc_core::base::config::{
 #[serde(rename_all = "camelCase", default)]
 pub struct RawRspackExperiments {
   pub import: Option<Vec<RawImportOptions>>,
-  pub collect_type_script_info: Option<RawCollectTypeScriptInfoOptions>,
 }
 
 #[derive(Default, Deserialize, Debug)]
@@ -27,7 +26,6 @@ pub struct RawCollectTypeScriptInfoOptions {
 #[derive(Default, Debug)]
 pub(crate) struct RspackExperiments {
   pub(crate) import: Option<Vec<ImportOptions>>,
-  pub(crate) collect_typescript_info: Option<CollectTypeScriptInfoOptions>,
 }
 
 #[derive(Default, Debug)]
@@ -49,7 +47,6 @@ impl From<RawRspackExperiments> for RspackExperiments {
       import: value
         .import
         .map(|i| i.into_iter().map(|v| v.into()).collect()),
-      collect_typescript_info: value.collect_type_script_info.map(|v| v.into()),
     }
   }
 }
@@ -113,6 +110,9 @@ pub struct SwcLoaderJsOptions {
   #[serde(default)]
   pub source_map_ignore_list: Option<FilePattern>,
 
+  #[serde(default)]
+  pub collect_type_script_info: Option<RawCollectTypeScriptInfoOptions>,
+
   #[serde(default)]
   pub rspack_experiments: Option<RawRspackExperiments>,
 }
@@ -123,6 +123,7 @@ pub(crate) struct SwcCompilerOptionsWithAdditional {
   raw_options: String,
   pub(crate) swc_options: Options,
   pub(crate) rspack_experiments: RspackExperiments,
+  pub(crate) collect_typescript_info: Option<CollectTypeScriptInfoOptions>,
 }
 
 impl AsRefStrConverter for SwcCompilerOptionsWithAdditional {
@@ -156,6 +157,7 @@ impl TryFrom<&str> for SwcCompilerOptionsWithAdditional {
       error,
       is_module,
       schema,
+      collect_type_script_info,
       rspack_experiments,
       source_map_ignore_list,
     } = option;
@@ -191,6 +193,7 @@ impl TryFrom<&str> for SwcCompilerOptionsWithAdditional {
         ..serde_json::from_value(serde_json::Value::Object(Default::default()))?
       },
       rspack_experiments: rspack_experiments.unwrap_or_default().into(),
+      collect_typescript_info: collect_type_script_info.map(|v| v.into()),
     })
   }
 }

packages/rspack/etc/core.api.md

@@ -7907,6 +7907,7 @@ export type SwcLoaderModuleConfig = ModuleConfig;
 // @public (undocumented)
 export type SwcLoaderOptions = Config_2 & {
     isModule?: boolean | "unknown";
+    collectTypeScriptInfo?: CollectTypeScriptInfoOptions;
     rspackExperiments?: {
         import?: PluginImportOptions;
         collectTypeScriptInfo?: CollectTypeScriptInfoOptions;

packages/rspack/src/builtin-loader/swc/types.ts

@@ -20,13 +20,19 @@ export type SwcLoaderTsParserConfig = TsParserConfig;
 export type SwcLoaderTransformConfig = TransformConfig;
 export type SwcLoaderOptions = Config & {
 	isModule?: boolean | "unknown";
+	/**
+	 * Collects information from TypeScript's AST for consumption by subsequent Rspack processes,
+	 * providing better TypeScript development experience and smaller output bundle size.
+	 */
+	collectTypeScriptInfo?: CollectTypeScriptInfoOptions;
 	/**
 	 * Experimental features provided by Rspack.
 	 * @experimental
 	 */
 	rspackExperiments?: {
 		import?: PluginImportOptions;
 		/**
+		 * @deprecated Use top-level `collectTypeScriptInfo` instead.
 		 * Collects information from TypeScript's AST for consumption by subsequent Rspack processes,
 		 * providing better TypeScript development experience and smaller output bundle size.
 		 */

packages/rspack/src/config/adapterRuleUse.ts

@@ -13,7 +13,7 @@ import { type LoaderObject, parsePathQueryFragment } from "../loader-runner";
 import type { Logger } from "../logging/Logger";
 import type { Module } from "../Module";
 import type { ResolveRequest } from "../Resolver";
-import { isNil } from "../util";
+import { deprecate, isNil } from "../util";
 import type Hash from "../util/hash";
 import type { RspackOptionsNormalized } from "./normalization";
 import type {
@@ -499,6 +499,13 @@ const getSwcLoaderOptions: GetLoaderOptions = (options, _) => {
 		options.jsc.experimental ??= {};
 		options.jsc.experimental.disableAllLints ??= true;
 
+		// resolve top-level `collectTypeScriptInfo` options (stable API)
+		if (options.collectTypeScriptInfo) {
+			options.collectTypeScriptInfo = resolveCollectTypeScriptInfo(
+				options.collectTypeScriptInfo
+			);
+		}
+
 		// resolve `rspackExperiments.import` options
 		const { rspackExperiments } = options;
 		if (rspackExperiments) {
@@ -508,9 +515,17 @@ const getSwcLoaderOptions: GetLoaderOptions = (options, _) => {
 				);
 			}
 			if (rspackExperiments.collectTypeScriptInfo) {
-				rspackExperiments.collectTypeScriptInfo = resolveCollectTypeScriptInfo(
-					rspackExperiments.collectTypeScriptInfo
+				deprecate(
+					"`rspackExperiments.collectTypeScriptInfo` is deprecated and will be removed in Rspack v2.0. Use top-level `collectTypeScriptInfo` instead."
 				);
+				// If top-level is not set, use rspackExperiments config
+				if (!options.collectTypeScriptInfo) {
+					options.collectTypeScriptInfo = resolveCollectTypeScriptInfo(
+						rspackExperiments.collectTypeScriptInfo
+					);
+				}
+				// Remove from rspackExperiments to avoid duplication
+				delete rspackExperiments.collectTypeScriptInfo;
 			}
 		}
 	}

tests/rspack-test/configCases/inline-enum/basic/rspack.config.js

@@ -25,10 +25,8 @@ function config(index, { concatenateModules } = {}) {
 									},
 									target: "esnext"
 								},
-								rspackExperiments: {
-									collectTypeScriptInfo: {
-										exportedEnum: true
-									}
+								collectTypeScriptInfo: {
+									exportedEnum: true
 								}
 							}
 						}

tests/rspack-test/configCases/inline-enum/cjs/rspack.config.js

@@ -18,10 +18,8 @@ module.exports = {
 								},
 								target: "esnext"
 							},
-							rspackExperiments: {
-								collectTypeScriptInfo: {
-									exportedEnum: true
-								}
+							collectTypeScriptInfo: {
+								exportedEnum: true
 							}
 						}
 					}

tests/rspack-test/configCases/inline-enum/const-enum-only/rspack.config.js

@@ -17,10 +17,8 @@ module.exports = {
 								},
 								target: "esnext"
 							},
-							rspackExperiments: {
-								collectTypeScriptInfo: {
-									exportedEnum: "const-only"
-								}
+							collectTypeScriptInfo: {
+								exportedEnum: "const-only"
 							}
 						}
 					}

tests/rspack-test/configCases/inline-enum/enum-dynamically-defined/rspack.config.js

@@ -17,10 +17,8 @@ module.exports = {
 								},
 								target: "esnext"
 							},
-							rspackExperiments: {
-								collectTypeScriptInfo: {
-									exportedEnum: true
-								}
+							collectTypeScriptInfo: {
+								exportedEnum: true
 							}
 						}
 					}

tests/rspack-test/configCases/inline-enum/enum-expression/rspack.config.js

@@ -18,10 +18,8 @@ module.exports = {
 								},
 								target: "esnext"
 							},
-							rspackExperiments: {
-								collectTypeScriptInfo: {
-									exportedEnum: true
-								}
+							collectTypeScriptInfo: {
+								exportedEnum: true
 							}
 						}
 					}