fix: export without specifier (#2421)

underfin · web-flow · commit eb7051f0a693 · 2023-03-22T18:56:30.000+08:00
* fix: export without specifier

* fix: test
diff --git a/.changeset/cyan-emus-love.md b/.changeset/cyan-emus-love.md
@@ -0,0 +1,5 @@
+---
+"@rspack/core": patch
+---
+
+fix: export without specifier
diff --git a/crates/rspack_plugin_javascript/src/visitors/dependency/scanner.rs b/crates/rspack_plugin_javascript/src/visitors/dependency/scanner.rs
@@ -7,7 +7,7 @@ use rspack_regex::RspackRegex;
 use sugar_path::SugarPath;
 use swc_core::common::{pass::AstNodePath, Mark, SyntaxContext};
 use swc_core::ecma::ast::{
-  BinExpr, BinaryOp, CallExpr, Callee, ExportSpecifier, Expr, Lit, MemberProp, ModuleDecl, Tpl,
+  BinExpr, BinaryOp, CallExpr, Callee, Expr, Lit, MemberProp, ModuleDecl, Tpl,
 };
 use swc_core::ecma::utils::{quote_ident, quote_str};
 use swc_core::ecma::visit::{AstParentNodeRef, VisitAstPath, VisitWithPath};
@@ -131,39 +131,14 @@ impl DependencyScanner<'_> {
   ) -> Result<(), anyhow::Error> {
     match module_decl {
       ModuleDecl::ExportNamed(node) => {
-        node.specifiers.iter().for_each(|specifier| {
-          match specifier {
-            ExportSpecifier::Named(_s) => {
-              if let Some(source_node) = &node.src {
-                // export { name } from './other'
-                // TODO: this should ignore from code generation or use a new dependency instead
-                self.add_dependency(box EsmExportDependency::new(
-                  source_node.value.clone(),
-                  Some(node.span.into()),
-                  as_parent_path(ast_path),
-                ));
-              }
-            }
-            ExportSpecifier::Namespace(_s) => {
-              // export * as name from './other'
-              let source = node
-                .src
-                .as_ref()
-                .map(|str| str.value.clone())
-                .expect("TODO:");
-              // TODO: this should ignore from code generation or use a new dependency instead
-              self.add_dependency(box EsmExportDependency::new(
-                source,
-                Some(node.span.into()),
-                as_parent_path(ast_path),
-              ));
-            }
-            ExportSpecifier::Default(_) => {
-              // export v from 'mod';
-              // Rollup doesn't support it.
-            }
-          };
-        });
+        if let Some(src) = &node.src {
+          // TODO: this should ignore from code generation or use a new dependency instead
+          self.add_dependency(box EsmExportDependency::new(
+            src.value.clone(),
+            Some(node.span.into()),
+            as_parent_path(ast_path),
+          ));
+        }
       }
       ModuleDecl::ExportAll(node) => {
         // export * from './other'
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/a.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/a.js
@@ -0,0 +1,2 @@
+export var x = 1;
+export * from "./cjs";
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/b.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/b.js
@@ -0,0 +1,9 @@
+import { c } from "./c.js";
+
+const b2 = 3;
+const b3 = c;
+export { c as b1, c as b4, b2, b3 };
+// export const usedB1 = __webpack_exports_info__.b1.used;
+// export const usedB2 = __webpack_exports_info__.b2.used;
+// export const usedB3 = __webpack_exports_info__.b3.used;
+// export const usedB4 = __webpack_exports_info__.b4.used;
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/c.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/c.js
@@ -0,0 +1 @@
+export * as c from "./d.js";
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/cjs.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/cjs.js
@@ -0,0 +1 @@
+module.exports = { x: 2, y: 3 };
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/cjs1.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/cjs1.js
@@ -0,0 +1,2 @@
+exports.a = 2;
+exports.b = 3;
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/cjs2.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/cjs2.js
@@ -0,0 +1 @@
+module.exports = require("./cjs1");
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/d.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/d.js
@@ -0,0 +1,4 @@
+export const d1 = 1;
+export const d2 = 2;
+// export const usedD1 = __webpack_exports_info__.d1.used;
+// export const usedD2 = __webpack_exports_info__.d2.used;
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/e.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/e.js
@@ -0,0 +1,4 @@
+export const e1 = 10;
+export const e2 = 20;
+// export const usedE1 = __webpack_exports_info__.e1.used;
+// export const usedE2 = __webpack_exports_info__.e2.used;
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/e1.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/e1.js
@@ -0,0 +1 @@
+export * as e from "./e.js";
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/f.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/f.js
@@ -0,0 +1,2 @@
+export * as f1 from "./e1.js";
+export * as f2 from "./e.js";
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/g.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/g.js
@@ -0,0 +1,3 @@
+import { f1, f2 } from "./f.js";
+
+export { f1, f2 as g1 };
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/h.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/h.js
@@ -0,0 +1 @@
+export * as h from "./g.js";
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/index.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/index.js
@@ -0,0 +1,92 @@
+"use strict";
+
+import { x, y } from "./a";
+import { d2 /* usedD1, usedD2 */ } from "./d.js";
+import { b1 /* usedB1, usedB2, usedB3, usedB4 */ } from "./b.js";
+// import { usedE1, usedE2 } from "./e.js";
+import { h } from "./h.js";
+import * as m from "./m";
+import { object as obj } from "./m";
+import cjs from "./cjs2";
+import * as o from "./o";
+import * as p from "./p";
+import * as q from "./q";
+import * as so from "./side-effect-free/o";
+import * as sm from "./side-effect-free/m";
+import json1 from "./some.json";
+import json2 from "./some1.json";
+import weirdCjs from "./weird-cjs";
+
+// TODO support __webpack_exports_info__
+
+it("namespace export as from commonjs should override named export", function () {
+	expect(x).toBe(1);
+	expect(y).toBe(3);
+});
+
+it("named namespace export should work correctly", function () {
+	expect(d2).toBe(2);
+	// if (process.env.NODE_ENV === "production") {
+	// 	expect(usedD1).toBe(false);
+	// }
+	// expect(usedD2).toBe(true);
+
+	expect(b1.d2).toBe(2);
+	// expect(usedB1).toBe(true);
+	// if (process.env.NODE_ENV === "production") {
+	// 	expect(usedB2).toBe(false);
+	// 	expect(usedB3).toBe(false);
+	// 	expect(usedB4).toBe(false);
+	// }
+});
+
+it("complex case should work correctly", () => {
+	expect(h.f1.e.e1).toBe(10);
+	expect(h.g1.e1).toBe(10);
+	// expect(usedE1).toBe(true);
+	// if (process.env.NODE_ENV === "production") {
+	// 	expect(usedE2).toBe(false);
+	// }
+});
+
+it("should handle 'm in n' case", () => {
+	const obj = { aaa: "aaa" in m };
+	expect(obj.aaa).toBe(true);
+	expect("not_here" in m.object).toBe(false);
+	expect("not_here" in obj).toBe(false);
+	expect("__esModule" in q).toBe(true);
+	expect(() => "value" in q.__esModule).toThrow();
+	expect(() => "not_here" in json1).toThrow();
+	expect("not_here" in json2).toBe(false);
+	expect("a" in json2).toBe(true);
+	expect("a" in cjs).toBe(true);
+	expect("not_here" in cjs).toBe(false);
+	expect("not_here" in weirdCjs).toBe(false);
+	expect("a" in weirdCjs).toBe(true);
+	expect(() => "a" in weirdCjs.a).toThrow();
+	expect("aaa" in o).toBe(true);
+	expect("aaa" in p).toBe(false);
+	expect("ccc" in m).toBe(false);
+	expect("aaa" in q).toBe(true);
+	expect("aaa" in so).toBe(true);
+	expect("ccc" in sm).toBe(false);
+	expect("ccc" in (false ? {} : m.ddd)).toBe(true);
+	expect("ccc" in (false ? {} : sm.ddd)).toBe(true);
+	expect("ddd" in m.ddd).toBe(false);
+	expect("ddd" in sm.ddd).toBe(false);
+	// if (process.env.NODE_ENV === "production") {
+	// 	expect(m.ddd.usedA).toBe(false);
+	// 	expect(m.usedB).toBe(false);
+	// 	expect(m.usedA).toBe(true);
+	// 	expect(m.canMangleA).toBe(true);
+	// }
+});
+
+it("issue-15759", () => {
+	// function foo() {
+	// 	// PLEASE CONFIRM there is no space after return
+	// 	// prettier-ignore
+	// 	return"usedA"in m;
+	// }
+	// expect(foo.call()).toBe(true);
+});
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/m.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/m.js
@@ -0,0 +1,7 @@
+export const aaa = 1;
+export const bbb = 2;
+export const object = {};
+export * as ddd from "./n";
+// export const usedA = __webpack_exports_info__.aaa.used;
+// export const canMangleA = __webpack_exports_info__.ccc.canMangle;
+// export const usedB = __webpack_exports_info__.bbb.used;
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/n.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/n.js
@@ -0,0 +1,5 @@
+export const ccc = 3;
+export const mmm = () => ({});
+export const aaa = 1;
+// export const usedA = __webpack_exports_info__.a.used;
+// export const canMangleC = __webpack_exports_info__.c.canMangle;
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/o.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/o.js
@@ -0,0 +1,2 @@
+const exports_ = { aaa: 1, bbb: 2 };
+module.exports = exports_;
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/p.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/p.js
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/q.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/q.js
@@ -0,0 +1 @@
+export * from "./o";
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/side-effect-free/m.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/side-effect-free/m.js
@@ -0,0 +1 @@
+export * from "../m";
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/side-effect-free/o.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/side-effect-free/o.js
@@ -0,0 +1 @@
+export * from "../o";
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/side-effect-free/package.json b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/side-effect-free/package.json
@@ -0,0 +1,3 @@
+{
+  "sideEffects": false
+}
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/some.json b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/some.json
@@ -0,0 +1 @@
+true
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/some1.json b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/some1.json
@@ -0,0 +1,3 @@
+{
+  "a": 1
+}
diff --git a/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/weird-cjs.js b/packages/rspack/tests/cases/parsing/harmony-export-import-specifier/weird-cjs.js
@@ -0,0 +1,7 @@
+exports.__esModule = false;
+
+function dynamic(exports) {
+	exports.a = 1;
+}
+
+dynamic(exports);
diff --git a/packages/rspack/tests/cases/parsing/harmony-reexport/a.js b/packages/rspack/tests/cases/parsing/harmony-reexport/a.js
@@ -0,0 +1,11 @@
+import { b } from "./b";
+
+export function a() {
+	return b();
+}
+export const obj = {};
+// export const aUsed = __webpack_exports_info__.a.used;
+// export const aProvided = __webpack_exports_info__.a.provideInfo;
+// export const objUsed = __webpack_exports_info__.obj.used;
+// export const objAProvided = __webpack_exports_info__.obj.A.provideInfo;
+// export const aToStringProvided = __webpack_exports_info__.a.toString.provideInfo;
diff --git a/packages/rspack/tests/cases/parsing/harmony-reexport/b.js b/packages/rspack/tests/cases/parsing/harmony-reexport/b.js
@@ -0,0 +1 @@
+export function b() {}
diff --git a/packages/rspack/tests/cases/parsing/harmony-reexport/c.js b/packages/rspack/tests/cases/parsing/harmony-reexport/c.js
@@ -0,0 +1 @@
+export const value = "c";
diff --git a/packages/rspack/tests/cases/parsing/harmony-reexport/empty.js b/packages/rspack/tests/cases/parsing/harmony-reexport/empty.js
diff --git a/packages/rspack/tests/cases/parsing/harmony-reexport/index.js b/packages/rspack/tests/cases/parsing/harmony-reexport/index.js
@@ -0,0 +1,14 @@
+import {
+	a /* aUsed, aCanBeMangled, aProvided, aToStringProvided, obj, objUsed, objAProvided */
+} from "./reexport";
+
+if (a()) console.log("a", obj);
+
+it("should not allow mangle if some exports are unknown", () => {
+	// expect(aUsed).toBe(true);
+	// expect(aProvided).toBe(true);
+	// expect(aCanBeMangled).toBe(false);
+	// expect(objUsed).toBe(true);
+	// expect(objAProvided).toBe(undefined);
+	// expect(aToStringProvided).toBe(undefined);
+});
diff --git a/packages/rspack/tests/cases/parsing/harmony-reexport/reexport.js b/packages/rspack/tests/cases/parsing/harmony-reexport/reexport.js
@@ -0,0 +1,4 @@
+export * from "./a";
+export * from "./empty";
+export {} from "./c";
+// export const aCanBeMangled = __webpack_exports_info__.a.canMangle;
diff --git a/packages/rspack/tests/cases/parsing/harmony/.gitignore b/packages/rspack/tests/cases/parsing/harmony/.gitignore
@@ -0,0 +1 @@
+!node_modules
diff --git a/packages/rspack/tests/cases/parsing/harmony/index.js b/packages/rspack/tests/cases/parsing/harmony/index.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/abc.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/abc.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/abc_c.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/abc_c.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/circularEven.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/circularEven.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/circularOdd.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/circularOdd.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/commonjs-trans.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/commonjs-trans.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/commonjs.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/commonjs.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/def.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/def.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/exportKinds.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/exportKinds.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/exports-specifier.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/exports-specifier.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/reexport.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/reexport.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/reexport2.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/reexport2.js
diff --git a/packages/rspack/tests/cases/parsing/harmony/node_modules/unused.js b/packages/rspack/tests/cases/parsing/harmony/node_modules/unused.js

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@rspack/core": patch
 +---
++
 +fix: export without specifier
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export var x = 1;`
	`2`	`+export * from "./cjs";`