ensure properties are quoted when the safari10 output option is enabled

fabiosantoscode · fabiosantoscode · commit d51b6b9c22e8 · 2020-11-27T12:00:34.000Z
diff --git a/lib/output.js b/lib/output.js
@@ -239,7 +239,7 @@ function OutputStream(options) {
     let printed_comments = new Set();
 
     var to_utf8 = options.ascii_only ? function(str, identifier) {
-        if (options.ecma >= 2015) {
+        if (options.ecma >= 2015 && !options.safari10) {
             str = str.replace(/[\ud800-\udbff][\udc00-\udfff]/g, function(ch) {
                 var code = get_full_char_code(ch, 0).toString(16);
                 return "\\u{" + code + "}";
@@ -1779,7 +1779,10 @@ function OutputStream(options) {
         var prop = self.property;
         var print_computed = RESERVED_WORDS.has(prop)
             ? output.option("ie8")
-            : !is_identifier_string(prop, output.option("ecma") >= 2015);
+            : !is_identifier_string(
+                prop,
+                output.option("ecma") >= 2015 || output.option("safari10")
+            );
 
         if (self.optional) output.print("?.");
 
@@ -1949,7 +1952,7 @@ function OutputStream(options) {
         var print_string = RESERVED_WORDS.has(key)
             ? output.option("ie8")
             : (
-                output.option("ecma") < 2015
+                output.option("ecma") < 2015 || output.option("safari10")
                     ? !is_basic_identifier_string(key)
                     : !is_identifier_string(key, true)
             );
@@ -1968,7 +1971,10 @@ function OutputStream(options) {
         var allowShortHand = output.option("shorthand");
         if (allowShortHand &&
             self.value instanceof AST_Symbol &&
-            is_identifier_string(self.key, output.option("ecma") >= 2015) &&
+            is_identifier_string(
+                self.key,
+                output.option("ecma") >= 2015 || output.option("safari10")
+            ) &&
             get_name(self.value) === self.key &&
             !RESERVED_WORDS.has(self.key)
         ) {
@@ -1977,7 +1983,10 @@ function OutputStream(options) {
         } else if (allowShortHand &&
             self.value instanceof AST_DefaultAssign &&
             self.value.left instanceof AST_Symbol &&
-            is_identifier_string(self.key, output.option("ecma") >= 2015) &&
+            is_identifier_string(
+                self.key,
+                output.option("ecma") >= 2015 || output.option("safari10")
+            ) &&
             get_name(self.value.left) === self.key
         ) {
             print_property_name(self.key, self.quote, output);
diff --git a/lib/parse.js b/lib/parse.js
@@ -315,12 +315,14 @@ function is_identifier_char(ch) {
     return UNICODE.ID_Continue.test(ch);
 }
 
+const BASIC_IDENT = /^[a-z_$][a-z0-9_$]*$/i;
+
 function is_basic_identifier_string(str) {
-    return /^[a-z_$][a-z0-9_$]*$/i.test(str);
+    return BASIC_IDENT.test(str);
 }
 
 function is_identifier_string(str, allow_surrogates) {
-    if (/^[a-z_$][a-z0-9_$]*$/i.test(str)) {
+    if (BASIC_IDENT.test(str)) {
         return true;
     }
     if (!allow_surrogates && /[\ud800-\udfff]/.test(str)) {
diff --git a/test/compress/unicode.js b/test/compress/unicode.js
@@ -24,6 +24,22 @@ keep_quoted_unicode_props_es5: {
     expect_exact: 'console.log({"&#42912;":"2139"});'
 }
 
+keep_quoted_unicode_props_safari: {
+    beautify = { safari10: true, ecma: 2020 }
+    input: {
+        console.log({ "\uA7A0": "2139" });
+    }
+    expect_exact: 'console.log({"&#42912;":"2139"});'
+}
+
+unicode_props_safari: {
+    beautify = { safari10: true, ecma: 2020 }
+    input: {
+        console.log({ &#119990;: "foo" })
+    }
+    expect_exact: 'console.log({"&#119990;":"foo"});'
+}
+
 unicode_escaped_identifier_2015: {
     beautify = {ecma: 2015}
     input: {
@@ -33,6 +49,14 @@ unicode_escaped_identifier_2015: {
     expect_exact: 'var a="foo";var \u{10000}="bar";';
 }
 
+unicode_escaped_identifier_safari: {
+    beautify = {ecma: 2020, safari10: true}
+    input: {
+        var \u{61} = "foo";
+    }
+    expect_exact: 'var a="foo";';
+}
+
 unicode_escaped_identifier_es5_as_is: {
     beautify = {ecma: 5}
     input: `

Original file line number	Diff line number	Diff line change
`@@ -315,12 +315,14 @@ function is_identifier_char(ch) {`
`315`	`315`	`return UNICODE.ID_Continue.test(ch);`
`316`	`316`	`}`
`317`	`317`
	`318`	`+const BASIC_IDENT = /^[a-z_$][a-z0-9_$]*$/i;`
	`319`	`+`
`318`	`320`	`function is_basic_identifier_string(str) {`
`319`		`- return /^[a-z_$][a-z0-9_$]*$/i.test(str);`
	`321`	`+ return BASIC_IDENT.test(str);`
`320`	`322`	`}`
`321`	`323`
`322`	`324`	`function is_identifier_string(str, allow_surrogates) {`
`323`		`- if (/^[a-z_$][a-z0-9_$]*$/i.test(str)) {`
	`325`	`+ if (BASIC_IDENT.test(str)) {`
`324`	`326`	`return true;`
`325`	`327`	`}`
`326`	`328`	`if (!allow_surrogates && /[\ud800-\udfff]/.test(str)) {`