feat: improve module import compress (#1953)

* feat: improve module import compress

* fix: update test case & jsx for module concatenation example

crates/compiler/tests/fixtures/bundle/concatenate_module/circle/config.json

@@ -0,0 +1,8 @@
+{
+  "concatenateModules": true,
+  "output": {
+    "targetEnv": "browser"
+  },
+  "comments": true,
+  "minify": false
+}

crates/compiler/tests/fixtures/bundle/concatenate_module/circle/foo.ts

@@ -0,0 +1,4 @@
+import { reexport } from './reexport';
+
+
+export const foo = reexport + 'foo';

crates/compiler/tests/fixtures/bundle/concatenate_module/circle/index.ts

@@ -0,0 +1,3 @@
+import * as ns from './reexport';
+
+console.log(ns);

crates/compiler/tests/fixtures/bundle/concatenate_module/circle/output.js

@@ -0,0 +1,53 @@
+//index.js:
+ window['__farm_default_namespace__'] = {__FARM_TARGET_ENV__: 'browser'};;((function(){// module_id: ../../../_internal/runtime/index.js.farm-runtime
+function __commonJs(mod) {
+    var module;
+    return ()=>{
+        if (module) {
+            return module.exports;
+        }
+        module = {
+            exports: {}
+        };
+        if (typeof mod === "function") {
+            mod(module, module.exports);
+        } else {
+            mod[Object.keys(mod)[0]](module, module.exports);
+        }
+        return module.exports;
+    };
+}
+var index_js_cjs = __commonJs({
+    "../../../_internal/runtime/index.js.farm-runtime": (module, exports)=>{
+        "use strict";
+        console.log('runtime/index.js');
+        window['__farm_default_namespace__'].__farm_module_system__.setPlugins([]);
+    }
+});
+index_js_cjs();
+})());(function(_){for(var r in _){_[r].__farm_resource_pot__='index_830e.js';window['__farm_default_namespace__'].__farm_module_system__.register(r,_[r])}})({"foo.ts":function  (module, exports, farmRequire, farmDynamicRequire) {
+    module._m(exports);
+    module.o(exports, "foo", function() {
+        return foo;
+    });
+    var _f_reexport = farmRequire("reexport.ts");
+    var foo = _f_reexport.reexport + 'foo';
+}
+,
+"index.ts":function  (module, exports, farmRequire, farmDynamicRequire) {
+    module._m(exports);
+    var _f_reexport = module.w(farmRequire("reexport.ts"));
+    var ns = _f_reexport;
+    console.log(ns);
+}
+,
+"reexport.ts":function  (module, exports, farmRequire, farmDynamicRequire) {
+    module._m(exports);
+    module.o(exports, "reexport", function() {
+        return reexport;
+    });
+    var reexport = 'reexport';
+    var _f_foo = farmRequire("foo.ts");
+    module._e(exports, _f_foo);
+}
+,});window['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);window['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = window['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("index.ts");

crates/compiler/tests/fixtures/bundle/concatenate_module/circle/reexport.ts

@@ -0,0 +1,3 @@
+
+export const reexport = 'reexport';
+export * from './foo';

crates/compiler/tests/fixtures/bundle/concatenate_module/export/config.json

@@ -0,0 +1,6 @@
+{
+  "concatenateModules": true,
+  "output": {
+    "targetEnv": "browser"
+  }
+}

crates/compiler/tests/fixtures/bundle/concatenate_module/export/index.ts

@@ -0,0 +1,3 @@
+import { createEmotion } from './reexport';
+
+console.log(createEmotion);

crates/compiler/tests/fixtures/bundle/concatenate_module/export/output.js

@@ -0,0 +1,33 @@
+//index.js:
+ window['__farm_default_namespace__'] = {__FARM_TARGET_ENV__: 'browser'};;((function(){// module_id: ../../../_internal/runtime/index.js.farm-runtime
+function __commonJs(mod) {
+    var module;
+    return ()=>{
+        if (module) {
+            return module.exports;
+        }
+        module = {
+            exports: {}
+        };
+        if (typeof mod === "function") {
+            mod(module, module.exports);
+        } else {
+            mod[Object.keys(mod)[0]](module, module.exports);
+        }
+        return module.exports;
+    };
+}
+var index_js_cjs = __commonJs({
+    "../../../_internal/runtime/index.js.farm-runtime": (module, exports)=>{
+        "use strict";
+        console.log('runtime/index.js');
+        window['__farm_default_namespace__'].__farm_module_system__.setPlugins([]);
+    }
+});
+index_js_cjs();
+})());(function(_){for(var r in _){_[r].__farm_resource_pot__='index_b752.js';window['__farm_default_namespace__'].__farm_module_system__.register(r,_[r])}})({"index.ts":function  (module, exports, farmRequire, farmDynamicRequire) {
+    module._m(exports);
+    var _f_xxx = farmRequire("xxx");
+    console.log(_f_xxx.default);
+}
+,});window['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);window['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = window['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("index.ts");

crates/compiler/tests/fixtures/bundle/concatenate_module/export/reexport.ts

@@ -0,0 +1,2 @@
+// @ts-ignore
+export { default as createEmotion } from 'xxx';

crates/compiler/tests/fixtures/bundle/export/doubleReexportAll/config.cjs.json

@@ -0,0 +1,5 @@
+{
+  "output": {
+    "format": "cjs"
+  }
+}

crates/compiler/tests/fixtures/bundle/export/doubleReexportAll/foo.ts

@@ -0,0 +1 @@
+export { Worker } from './reexport';

crates/compiler/tests/fixtures/bundle/export/doubleReexportAll/index.ts

@@ -0,0 +1,7 @@
+
+import { readFile } from './reexport';
+import { Worker } from './foo'
+
+console.log({ readFile, Worker });
+
+export * from './reexport';

crates/compiler/tests/fixtures/bundle/export/doubleReexportAll/output.cjs.js

@@ -0,0 +1,96 @@
+//farm_runtime.js:
+ // module_id: __FARM_BUNDLE_POLYFILL_SLOT__
+function __commonJs(mod) {
+    var module;
+    return ()=>{
+        if (module) {
+            return module.exports;
+        }
+        module = {
+            exports: {}
+        };
+        if (typeof mod === "function") {
+            mod(module, module.exports);
+        } else {
+            mod[Object.keys(mod)[0]](module, module.exports);
+        }
+        return module.exports;
+    };
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) return obj;
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") return {
+        default: obj
+    };
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) return cache.get(obj);
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) Object.defineProperty(newObj, key, desc);
+            else newObj[key] = obj[key];
+        }
+    }
+    newObj.default = obj;
+    if (cache) cache.set(obj, newObj);
+    return newObj;
+}
+function _export_star(from, to) {
+    Object.keys(from).forEach(function(k) {
+        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+            Object.defineProperty(to, k, {
+                enumerable: true,
+                get: function() {
+                    return from[k];
+                }
+            });
+        }
+    });
+    return from;
+}
+module.exports.__commonJs = __commonJs;
+module.exports._export_star = _export_star;
+module.exports._interop_require_wildcard = _interop_require_wildcard;
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+
+//index.js:
+ // module_id: reexport.ts
+var farm_runtime_js_ns = require("./farm_runtime.js");
+var __commonJs = farm_runtime_js_ns.__commonJs, _export_star = farm_runtime_js_ns._export_star, _interop_require_wildcard = farm_runtime_js_ns._interop_require_wildcard;
+var reexport_cjs = __commonJs({
+    "reexport.ts": (module, exports)=>{
+        "use strict";
+        Object.defineProperty(exports, "__esModule", {
+            value: true
+        });
+        _export_star(require("node:fs"), exports);
+        _export_star(require("node:cluster"), exports);
+        const readFile = 123;
+        module.exports.name = 123;
+    }
+});
+var reexport_ns = _interop_require_wildcard(reexport_cjs()), Worker = reexport_cjs()["Worker"], readFile = reexport_cjs()["readFile"];
+
+// module_id: foo.ts
+
+// module_id: index.ts
+console.log({
+    readFile: readFile,
+    Worker: Worker
+});
+_export_star(reexport_ns, module.exports);

crates/compiler/tests/fixtures/bundle/export/doubleReexportAll/output.js

@@ -0,0 +1,53 @@
+//farm_runtime.js:
+ // module_id: __FARM_BUNDLE_POLYFILL_SLOT__
+function __commonJs(mod) {
+    var module;
+    return ()=>{
+        if (module) {
+            return module.exports;
+        }
+        module = {
+            exports: {}
+        };
+        if (typeof mod === "function") {
+            mod(module, module.exports);
+        } else {
+            mod[Object.keys(mod)[0]](module, module.exports);
+        }
+        return module.exports;
+    };
+}
+import __farmNodeModule from 'module';
+var __nodeRequireInstance = __farmNodeModule.createRequire(import.meta.url);
+function _nodeRequire() {
+    return __nodeRequireInstance.apply(null, arguments);
+}
+export { __commonJs, _nodeRequire };
+
+
+//index.js:
+ // module_id: reexport.ts
+import { __commonJs, _nodeRequire } from "./farm_runtime.js";
+var reexport_cjs = __commonJs({
+    "reexport.ts": (module, exports)=>{
+        "use strict";
+        Object.defineProperty(exports, "__esModule", {
+            value: true
+        });
+        _export_star(_nodeRequire("node:fs"), exports);
+        _export_star(_nodeRequire("node:cluster"), exports);
+        const readFile = 123;
+        module.exports.name = 123;
+    }
+});
+var Worker = reexport_cjs()["Worker"], readFile = reexport_cjs()["readFile"];
+
+// module_id: foo.ts
+
+// module_id: index.ts
+console.log({
+    readFile: readFile,
+    Worker: Worker
+});
+export * from "node:cluster";
+export * from "node:fs";

crates/compiler/tests/fixtures/bundle/export/doubleReexportAll/reexport.ts

@@ -0,0 +1,5 @@
+export * from 'node:fs';
+export * from 'node:cluster';
+
+const readFile = 123;
+module.exports.name = 123;

crates/compiler/tests/fixtures/bundle/export/reexportExternal/foo.ts

@@ -0,0 +1 @@
+export const foo = 'foo';

crates/compiler/tests/fixtures/bundle/export/reexportExternal/index.ts

@@ -0,0 +1 @@
+export * from './reexport';

crates/compiler/tests/fixtures/bundle/export/reexportExternal/output.js

@@ -0,0 +1,14 @@
+//farm_runtime.js:
+ // module_id: __FARM_BUNDLE_POLYFILL_SLOT__
+
+
+//index.js:
+ // module_id: foo.ts
+import { readFile } from "node:fs";
+const foo = 'foo';
+
+// module_id: reexport.ts
+
+// module_id: index.ts
+export { foo as bar };
+export { readFile as rf } from "node:fs";

crates/compiler/tests/fixtures/bundle/export/reexportExternal/reexport.ts

@@ -0,0 +1,2 @@
+export { readFile as rf } from 'node:fs';
+export { foo as bar } from './foo';

crates/compiler/tests/fixtures/bundle/library/external/importNamespace/output.cjs.js

@@ -47,7 +47,6 @@ Object.defineProperty(exports, "__esModule", {
 var farm_runtime_js_ns = require("./farm_runtime.js");
 var _interop_require_default = farm_runtime_js_ns._interop_require_default, _interop_require_wildcard = farm_runtime_js_ns._interop_require_wildcard;
 var node_fs_ns = _interop_require_wildcard(require("node:fs"));
-var node_fs_ns = require("node:fs");
 var fs$1 = _interop_require_default(node_fs_ns).default;
 const fs = 'a.ts';
 console.log(fs);

crates/compiler/tests/fixtures/bundle/library/external/importNamespace/output.js

@@ -4,8 +4,8 @@
 
 //index.js:
  // module_id: a.ts
-import * as node_fs_ns from "node:fs";
 import fs$1 from "node:fs";
+import * as node_fs_ns from "node:fs";
 const fs = 'a.ts';
 console.log(fs);
 var a_default = 'a.ts';

crates/compiler/tests/fixtures/bundle/library/reexport/esm/star/output.js

@@ -7,12 +7,6 @@
 var foo_default = 'foo';
 const foo = 'foo';
 const bar = 'bar';
-var foo_ns = {
-    bar: bar,
-    foo: foo,
-    "default": foo_default,
-    __esModule: true
-};
 
 // module_id: index.ts
 export { bar, foo, foo_default as default };

crates/compiler/tests/fixtures/bundle/library/reexport/reexport/output.js

@@ -6,11 +6,6 @@
  // module_id: reexport.ts
 import { default as Foo1 } from "foo1";
 import { default as Foo2 } from "foo2";
-var reexport_ns = {
-    Foo2: Foo2,
-    Foo1: Foo1,
-    __esModule: true
-};
 
 // module_id: index.ts
 const Foo1 = '123';

crates/compiler/tests/fixtures/bundle/library/reexport/reexport_hybrid_cjs/default/output.js

@@ -10,11 +10,6 @@ class foo {
     }
 }
 const bar = 'foo';
-var reexport_ns = {
-    bar: bar,
-    default: foo,
-    __esModule: true
-};
 
 // module_id: index.ts
 export { bar, foo as default };

crates/compiler/tests/fixtures/bundle/library/reexport/reexport_hybrid_cjs/star/config.cjs.json

@@ -0,0 +1,6 @@
+{
+  "output": {
+    "targetEnv": "library-node",
+    "format": "cjs"
+  }
+}