WIP

Author: mischnic

turbopack/crates/turbopack-ecmascript/src/lib.rs

@@ -1871,6 +1871,14 @@ async fn emit_content(
         scope_hoisting_syntax_contexts: _,
     } = content;
 
+    let generate_source_map = false;
+
+    println!(
+        "{:#?} {}",
+        program,
+        swc_core::ecma::codegen::to_code(&program)
+    );
+
     let mut bytes: Vec<u8> = vec![];
     // TODO: Insert this as a sourceless segment so that sourcemaps aren't affected.
     // = format!("/* {} */\n", self.module.path().to_string().await?).into_bytes();
@@ -2089,8 +2097,12 @@ impl Files for CodeGenResultSourceMap {
                 modules_width,
                 source_maps,
             } => {
-                let (module, pos) = CodeGenResultComments::decode_bytepos(*modules_width, pos);
-                source_maps[module].try_lookup_source_file(pos)
+                let (module, pos2) = CodeGenResultComments::decode_bytepos(*modules_width, pos);
+                println!(
+                    "decode {pos:?} : {modules_width} ({module},{pos2:?}) {:?}",
+                    source_maps[module].try_lookup_source_file(pos2)
+                );
+                source_maps[module].try_lookup_source_file(pos2)
             }
         }
     }
@@ -2301,6 +2313,11 @@ impl CodeGenResultComments {
     }
 
     fn encode_bytepos(modules_width: u32, module: u32, pos: BytePos) -> BytePos {
+        let x = Self::encode_bytepos0(modules_width, module, pos);
+        println!("encode {modules_width} {module} {pos:?} {x:?}");
+        Self::encode_bytepos0(modules_width, module, pos)
+    }
+    fn encode_bytepos0(modules_width: u32, module: u32, pos: BytePos) -> BytePos {
         if pos.is_dummy() {
             // nothing to encode
             return pos;
@@ -2342,6 +2359,11 @@ impl CodeGenResultComments {
     }
 
     fn decode_bytepos(modules_width: u32, pos: BytePos) -> (usize, BytePos) {
+        let x = Self::decode_bytepos0(modules_width, pos);
+        // println!("decode {modules_width} {pos:?} {x:?}");
+        Self::decode_bytepos0(modules_width, pos)
+    }
+    fn decode_bytepos0(modules_width: u32, pos: BytePos) -> (usize, BytePos) {
         if pos.is_dummy() {
             // nothing to decode
             panic!("Cannot decode dummy BytePos");

turbopack/crates/turbopack-tests/tests/execution/turbopack/side-effects-optimization/mui-utils/input/index.js

@@ -1,6 +1,2 @@
 import * as NS2 from 'mui-utils'
-it('should import renamed exports correctly', () => {
-  const ns = Object(NS2)
-  expect(typeof ns.default).toBe('function')
-  expect(ns.default()).toBe('ok')
-})
+console.log(Object(NS2).default)

turbopack/crates/turbopack-tests/tests/execution/turbopack/side-effects-optimization/mui-utils/node_modules/mui-material/generateUtilityClass/index.js

@@ -1,4 +1,4 @@
 {
   "treeShakingMode": "reexports-only",
-  "scopeHoisting": true
+  "scopeHoisting": false
 }

turbopack/crates/turbopack-tests/tests/execution/turbopack/side-effects-optimization/mui-utils/node_modules/mui-material/package.json

@@ -0,0 +1,52 @@
+(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/4e721_crates_turbopack-tests_tests_snapshot_scope-hoisting_mui-utils_d7f0b7e2._.js", {
+
+"[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/input/index.js [test] (ecmascript)": ((__turbopack_context__) => {
+"use strict";
+
+__turbopack_context__.s({});
+var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript)");
+;
+console.log(Object(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__).default);
+}),
+"[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript) <locals>": ((__turbopack_context__) => {
+"use strict";
+
+__turbopack_context__.s({});
+;
+;
+}),
+"[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript) <module evaluation>": ((__turbopack_context__) => {
+"use strict";
+
+__turbopack_context__.s({});
+var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__$3c$locals$3e$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript) <locals>");
+}),
+"[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/generateUtilityClass/generateUtilityClass.js [test] (ecmascript)": ((__turbopack_context__) => {
+"use strict";
+
+__turbopack_context__.s({
+    "default": ()=>generateUtilityClass
+});
+function generateUtilityClass() {
+    return 'ok';
+}
+}),
+"[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript) <exports>": ((__turbopack_context__) => {
+"use strict";
+
+__turbopack_context__.s({
+    "default": ()=>__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$generateUtilityClass$2f$generateUtilityClass$2e$js__$5b$test$5d$__$28$ecmascript$29$__["default"]
+});
+var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$generateUtilityClass$2f$generateUtilityClass$2e$js__$5b$test$5d$__$28$ecmascript$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/generateUtilityClass/generateUtilityClass.js [test] (ecmascript)");
+var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__$3c$locals$3e$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript) <locals>");
+}),
+"[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript)": ((__turbopack_context__) => {
+"use strict";
+
+__turbopack_context__.s({
+    "default": ()=>__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__$3c$exports$3e$__["default"]
+});
+var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__$3c$module__evaluation$3e$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript) <module evaluation>");
+var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$scope$2d$hoisting$2f$mui$2d$utils$2f$node_modules$2f$mui$2d$utils$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__$3c$exports$3e$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/node_modules/mui-utils/index.js [test] (ecmascript) <exports>");
+}),
+}]);

turbopack/crates/turbopack-tests/tests/execution/turbopack/side-effects-optimization/mui-utils/node_modules/mui-utils/generateUtilityClass/index.js

@@ -0,0 +1,6 @@
+(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
+    "output/b1abf_turbopack-tests_tests_snapshot_scope-hoisting_mui-utils_input_index_1700916f.js",
+    {},
+    {"otherChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_scope-hoisting_mui-utils_d7f0b7e2._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/scope-hoisting/mui-utils/input/index.js [test] (ecmascript)"]}
+]);
+// Dummy runtime