fix(es/codegen): Do not produce octal literals (#8565)

swc-project · Jan 28, 2024 · 07634a0 · 07634a0
1 parent 2367507
commit 07634a0
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 7 deletions.
diff --git a/crates/swc/tests/fixture/issues-6xxx/6836/1/output/index.js b/crates/swc/tests/fixture/issues-6xxx/6836/1/output/index.js
@@ -1 +1 @@
-console.log("\00");
+console.log("\x000");
diff --git a/...swc/tests/fixture/next-39878/input/.swcrc → .../tests/fixture/next.js/39878/input/.swcrc b/...swc/tests/fixture/next-39878/input/.swcrc → .../tests/fixture/next.js/39878/input/.swcrc
diff --git a/...sts/fixture/next-39878/input/box-model.ts → .../fixture/next.js/39878/input/box-model.ts b/...sts/fixture/next-39878/input/box-model.ts → .../fixture/next.js/39878/input/box-model.ts
diff --git a/...s/fixture/next-39878/output/box-model.map → ...ixture/next.js/39878/output/box-model.map b/...s/fixture/next-39878/output/box-model.map → ...ixture/next.js/39878/output/box-model.map
diff --git a/...ts/fixture/next-39878/output/box-model.ts → ...fixture/next.js/39878/output/box-model.ts b/...ts/fixture/next-39878/output/box-model.ts → ...fixture/next.js/39878/output/box-model.ts
diff --git a/crates/swc/tests/fixture/next.js/octal/1/input/1.js b/crates/swc/tests/fixture/next.js/octal/1/input/1.js
@@ -0,0 +1,2 @@
+
+export const shouldNotBeOctal = '\x001'
diff --git a/crates/swc/tests/fixture/next.js/octal/1/output/1.js b/crates/swc/tests/fixture/next.js/octal/1/output/1.js
@@ -0,0 +1 @@
+export var shouldNotBeOctal = "\x001";
diff --git a/crates/swc/tests/fixture/next.js/slack-1/es5/output/index.js b/crates/swc/tests/fixture/next.js/slack-1/es5/output/index.js
@@ -1 +1 @@
-var USTAR = "ustar\000";
+var USTAR = "ustar\x0000";
diff --git a/crates/swc_ecma_codegen/src/lib.rs b/crates/swc_ecma_codegen/src/lib.rs
@@ -3998,7 +3998,7 @@ fn get_quoted_utf16(v: &str, ascii_only: bool, target: EsVersion) -> String {
     while let Some(c) = iter.next() {
         match c {
             '\x00' => {
-                if target < EsVersion::Es5 {
+                if target < EsVersion::Es5 || matches!(iter.peek(), Some('0'..='9')) {
                     buf.push_str("\\x00");
                 } else {
                     buf.push_str("\\0");

diff --git a/crates/swc_ecma_codegen/tests/fixture/string/output.min.js b/crates/swc_ecma_codegen/tests/fixture/string/output.min.js
diff --git a/..._minifier/tests/terser/compress/string_literal/octal_escape_sequence/output.mangleOnly.js b/..._minifier/tests/terser/compress/string_literal/octal_escape_sequence/output.mangleOnly.js
@@ -1,2 +1,2 @@
-var a = "\0\08?\0?Àÿ";
-var r = " 080\x000À0";
+var x = "\0\08?\0?Àÿ";
+var a = " 080\x000À0";
diff --git a/...wc_ecma_transforms_optimization/tests/__swc_snapshots__/tests/simplify.rs/issue_1619_1.js b/...wc_ecma_transforms_optimization/tests/__swc_snapshots__/tests/simplify.rs/issue_1619_1.js
@@ -1,2 +1,2 @@
 "use strict";
-console.log("\01");
+console.log("\x001");
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		var USTAR = "ustar\000";
		var USTAR = "ustar\x0000";