feat: add indentor for inserted code (#159)

* feat: add indentor for inserted code

* snapshot

Cargo.toml

@@ -24,7 +24,7 @@ serde_json     = "1.0.87"
 insta          = "1.21.0"
 testing_macros = "0.2.7"
 scoped-tls     = "1.0.1"
-string_wizard  = { version = "0.0.11" }
+string_wizard  = { version = "0.0.12" }
 async-trait    = "0.1.62"
 futures        = "0.3.25"
 itertools      = "0.10.5"

crates/rolldown/src/bundler/renderer/mod.rs

@@ -93,11 +93,12 @@ impl RenderKind {
 pub struct AstRenderer<'r> {
   ctx: AstRenderContext<'r>,
   kind: RenderKind,
+  indentor: String,
 }
 
 impl<'r> AstRenderer<'r> {
   pub fn new(ctx: AstRenderContext<'r>, kind: RenderKind) -> Self {
-    Self { ctx, kind }
+    Self { kind, indentor: ctx.source.guessed_indentor().to_string(), ctx }
   }
 }
 
@@ -137,9 +138,10 @@ impl<'r> AstRenderer<'r> {
         let prettify_id = self.ctx.module.resource_id.prettify();
         let commonjs_ref_name = self.ctx.canonical_name_for_runtime("__commonJS");
         self.ctx.source.prepend(format!(
-          "var {wrap_ref_name} = {commonjs_ref_name}({{\n'{prettify_id}'(exports, module) {{\n",
+          "var {wrap_ref_name} = {commonjs_ref_name}({{\n{}'{prettify_id}'(exports, module) {{\n",
+          self.indentor,
         ));
-        self.ctx.source.append("\n}\n});");
+        self.ctx.source.append(format!("\n{}}}\n}});", self.indentor));
         assert!(!self.ctx.module.is_namespace_referenced());
       }
       RenderKind::Esm => {

crates/rolldown/tests/esbuild/default/es6_from_common_js/artifacts.snap

@@ -12,19 +12,19 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.foo = function() {
 	return 'foo'
 }
-}
+	}
 });
 // bar.js
 var require_bar = __commonJS({
-'bar.js'(exports, module) {
+	'bar.js'(exports, module) {
 exports.bar = function() {
 	return 'bar'
 }
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/default/import_missing_common_js/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.x = 123
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/default/nested_common_js/artifacts.snap

@@ -12,11 +12,11 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 module.exports = function() {
 	return 123
 }
-}
+	}
 });
 // entry.js
 function nestedScope() {

crates/rolldown/tests/esbuild/default/nested_es6_from_common_js/artifacts.snap

@@ -12,11 +12,11 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.fn = function() {
 	return 123
 }
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/default/new_expression_common_js/artifacts.snap

@@ -12,10 +12,10 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 class Foo {}
 module.exports = {Foo};
-}
+	}
 });
 // entry.js
 new (require_foo()).Foo();

crates/rolldown/tests/esbuild/default/re_export_common_js_as_es6/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.bar = 123
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/default/require_child_dir_common_js/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // dir/index.js
 var require_dir_index = __commonJS({
-'dir/index.js'(exports, module) {
+	'dir/index.js'(exports, module) {
 module.exports = 123
-}
+	}
 });
 // entry.js
 console.log(require_dir_index())

crates/rolldown/tests/esbuild/default/require_main_cache_common_js/artifacts.snap

@@ -12,16 +12,16 @@ import { __commonJS } from "./_rolldown_runtime.mjs";
 
 // is-main.js
 var require_is_main = __commonJS({
-'is-main.js'(exports, module) {
+	'is-main.js'(exports, module) {
 module.exports = require.main === module
-}
+	}
 });
 // entry.js
 var require_entry = __commonJS({
-'entry.js'(exports, module) {
+	'entry.js'(exports, module) {
 console.log('is main:', require.main === module)
 console.log(require_is_main())
 console.log('cache:', require.cache);
-}
+	}
 });
 ```

crates/rolldown/tests/esbuild/default/require_parent_dir_common_js/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // index.js
 var require_require_parent_dir_common_js_index = __commonJS({
-'index.js'(exports, module) {
+	'index.js'(exports, module) {
 module.exports = 123
-}
+	}
 });
 // dir/entry.js
 console.log(require_require_parent_dir_common_js_index())

crates/rolldown/tests/esbuild/default/require_with_call_inside_try/artifacts.snap

@@ -12,14 +12,14 @@ import { __commonJS } from "./_rolldown_runtime.mjs";
 
 // entry.js
 var require_entry = __commonJS({
-'entry.js'(exports, module) {
+	'entry.js'(exports, module) {
 try {
 	const supportsColor = require('supports-color');
 	if (supportsColor && (supportsColor.stderr || supportsColor).level >= 2) {
 		exports.colors = [];
 	}
 } catch (error) {
 }
-}
+	}
 });
 ```

crates/rolldown/tests/esbuild/default/simple_common_js/artifacts.snap

@@ -12,11 +12,11 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 module.exports = function() {
 	return 123
 }
-}
+	}
 });
 // entry.js
 const fn = require_foo()

crates/rolldown/tests/esbuild/default/use_strict_directive_bundle_issue1837/artifacts.snap

@@ -12,10 +12,10 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // cjs.js
 var require_cjs = __commonJS({
-'cjs.js'(exports, module) {
+	'cjs.js'(exports, module) {
 'use strict'
 exports.foo = process
-}
+	}
 });
 // entry.js
 console.log(require_cjs())

crates/rolldown/tests/esbuild/import_star/import_star_common_js_capture/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.foo = 123
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/import_star/import_star_common_js_no_capture/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.foo = 123
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/import_star/import_star_common_js_unused/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.foo = 123
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/import_star/namespace_import_missing_common_js/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.x = 123
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/import_star/namespace_import_unused_missing_common_js/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // foo.js
 var require_foo = __commonJS({
-'foo.js'(exports, module) {
+	'foo.js'(exports, module) {
 exports.x = 123
-}
+	}
 });
 // entry.js
 var import_foo = __toESM(require_foo());

crates/rolldown/tests/esbuild/splitting/shared-commonjs-into-es6/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS } from "./_rolldown_runtime.mjs";
 
 // shared.js
 var require_shared = __commonJS({
-'shared.js'(exports, module) {
+	'shared.js'(exports, module) {
 exports.foo = 123
-}
+	}
 });
 export { require_shared };
 ```

crates/rolldown/tests/fixtures/basic_commonjs/artifacts.snap

@@ -31,10 +31,10 @@ esm_named_class = class esm_named_class {}
 });
 // commonjs.js
 var require_commonjs$1 = __commonJS({
-'commonjs.js'(exports, module) {
+	'commonjs.js'(exports, module) {
 var value = (init_esm(), __toCommonJS(esm_ns));
 module.exports = value;
-}
+	}
 });
 // main.js
 var import_commonjs = __toESM(require_commonjs$1());

crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_import_star_as/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // commonjs.js
 var require_commonjs = __commonJS({
-'commonjs.js'(exports, module) {
+	'commonjs.js'(exports, module) {
 exports.a = 1
-}
+	}
 });
 // main.js
 var import_commonjs = __toESM(require_commonjs());

crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_cjs_named_import/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // commonjs.js
 var require_commonjs = __commonJS({
-'commonjs.js'(exports, module) {
+	'commonjs.js'(exports, module) {
 exports.a = 1
-}
+	}
 });
 // main.js
 var import_commonjs = __toESM(require_commonjs());

crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_cjs_named_import/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __reExport, __toESM } from "./_rolldown_runtime.mjs";
 
 // commonjs.js
 var require_commonjs = __commonJS({
-'commonjs.js'(exports, module) {
+	'commonjs.js'(exports, module) {
 exports.a = 1
-}
+	}
 });
 // proxy.js
 var proxy_ns = {

crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_import_esm_which_export_all_from_multiple_cjs_named_import/artifacts.snap

@@ -12,15 +12,15 @@ import { __commonJS, __reExport, __toESM } from "./_rolldown_runtime.mjs";
 
 // commonjs.js
 var require_commonjs = __commonJS({
-'commonjs.js'(exports, module) {
+	'commonjs.js'(exports, module) {
 exports.a = 1
-}
+	}
 });
 // commonjs2.js
 var require_commonjs2 = __commonJS({
-'commonjs2.js'(exports, module) {
+	'commonjs2.js'(exports, module) {
 exports.a = 2
-}
+	}
 });
 // proxy.js
 var proxy_ns = {

crates/rolldown/tests/fixtures/import_reexport_between_esm_and_cjs/esm_reexport_cjs_named_reexport/artifacts.snap

@@ -12,9 +12,9 @@ import { __commonJS, __toESM } from "./_rolldown_runtime.mjs";
 
 // commonjs.js
 var require_commonjs = __commonJS({
-'commonjs.js'(exports, module) {
+	'commonjs.js'(exports, module) {
 exports.a = 1
-}
+	}
 });
 // main.js
 var import_commonjs = __toESM(require_commonjs());