feat: use u32 + Number.MAX_SAFE_INTEGER

web-infra-dev · Dec 23, 2024 · 610aaf0 · 610aaf0
1 parent 3a0de8f
commit 610aaf0
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 14 deletions.
diff --git a/crates/rspack_binding_values/src/raw_options/raw_module/mod.rs b/crates/rspack_binding_values/src/raw_options/raw_module/mod.rs
@@ -435,7 +435,7 @@ impl From<RawCssModuleParserOptions> for CssModuleParserOptions {
 #[derive(Debug, Default)]
 #[napi(object)]
 pub struct RawJsonParserOptions {
-  pub exports_depth: Option<f64>,
+  pub exports_depth: Option<u32>,
 }
 
 impl From<RawJsonParserOptions> for JsonParserOptions {

diff --git a/crates/rspack_core/src/options/module.rs b/crates/rspack_core/src/options/module.rs
@@ -292,7 +292,7 @@ pub struct CssModuleParserOptions {
 #[cacheable]
 #[derive(Debug, Clone, MergeFrom)]
 pub struct JsonParserOptions {
-  pub exports_depth: Option<f64>,
+  pub exports_depth: Option<u32>,
 }
 
 #[derive(Debug)]

diff --git a/crates/rspack_plugin_json/src/json_exports_dependency.rs b/crates/rspack_plugin_json/src/json_exports_dependency.rs
@@ -13,11 +13,11 @@ pub struct JsonExportsDependency {
   id: DependencyId,
   #[cacheable(with=AsPreset)]
   data: JsonValue,
-  exports_depth: f64,
+  exports_depth: u32,
 }
 
 impl JsonExportsDependency {
-  pub fn new(data: JsonValue, exports_depth: f64) -> Self {
+  pub fn new(data: JsonValue, exports_depth: u32) -> Self {
     Self {
       data,
       id: DependencyId::new(),
@@ -33,9 +33,8 @@ impl Dependency for JsonExportsDependency {
   }
 
   fn get_exports(&self, _mg: &ModuleGraph) -> Option<ExportsSpec> {
-    let exports_depth: u64 = self.exports_depth as u64;
     Some(ExportsSpec {
-      exports: get_exports_from_data(&self.data, exports_depth, 1)
+      exports: get_exports_from_data(&self.data, self.exports_depth, 1)
         .unwrap_or(ExportsOfExportsSpec::Null),
       ..Default::default()
     })
@@ -74,8 +73,8 @@ impl DependencyTemplate for JsonExportsDependency {
 
 fn get_exports_from_data(
   data: &JsonValue,
-  exports_depth: u64,
-  cur_depth: u64,
+  exports_depth: u32,
+  cur_depth: u32,
 ) -> Option<ExportsOfExportsSpec> {
   if cur_depth > exports_depth {
     return None;

diff --git a/crates/rspack_plugin_json/src/lib.rs b/crates/rspack_plugin_json/src/lib.rs
@@ -33,7 +33,7 @@ mod utils;
 #[cacheable]
 #[derive(Debug)]
 struct JsonParserAndGenerator {
-  pub exports_depth: f64,
+  pub exports_depth: u32,
 }
 
 #[cacheable_dyn]

diff --git a/packages/rspack-test-tools/tests/__snapshots__/Defaults.test.js.snap b/packages/rspack-test-tools/tests/__snapshots__/Defaults.test.js.snap
@@ -193,7 +193,7 @@ Object {
         wrappedContextRegExp: /\\.\\*/,
       },
       json: Object {
-        exportsDepth: Infinity,
+        exportsDepth: 9007199254740991,
       },
     },
     rules: Array [],

diff --git a/packages/rspack-test-tools/tests/defaultsCases/cache/cache-filesystem-dev.js b/packages/rspack-test-tools/tests/defaultsCases/cache/cache-filesystem-dev.js
@@ -22,7 +22,7 @@ module.exports = {
 		-   "mode": "none",
 		+   "mode": "development",
 		@@ ... @@
-		-         "exportsDepth": Infinity,
+		-         "exportsDepth": 9007199254740991,
 		+         "exportsDepth": 1,
 		@@ ... @@
 		-     "chunkIds": "natural",

diff --git a/packages/rspack-test-tools/tests/defaultsCases/mode/development.js b/packages/rspack-test-tools/tests/defaultsCases/mode/development.js
@@ -20,7 +20,7 @@ module.exports = {
 		-   "mode": "none",
 		+   "mode": "development",
 		@@ ... @@
-		-         "exportsDepth": Infinity,
+		-         "exportsDepth": 9007199254740991,
 		+         "exportsDepth": 1,
 		@@ ... @@
 		-     "chunkIds": "natural",

diff --git a/packages/rspack/src/config/defaults.ts b/packages/rspack/src/config/defaults.ts
@@ -315,7 +315,7 @@ const applyModuleDefaults = (
 	D(
 		module.parser[JSON_MODULE_TYPE],
 		"exportsDepth",
-		mode === "development" ? 1 : Number.POSITIVE_INFINITY
+		mode === "development" ? 1 : Number.MAX_SAFE_INTEGER
 	);
 
 	if (css) {

diff --git a/tests/webpack-test/configCases/json/bailout-flag-dep-export-perf/webpack.config.js b/tests/webpack-test/configCases/json/bailout-flag-dep-export-perf/webpack.config.js
@@ -4,7 +4,7 @@ module.exports = {
 	module: {
 		parser: {
 			json: {
-				exportsDepth: Infinity
+				exportsDepth: Number.MAX_SAFE_INTEGER
 			}
 		}
 	}