No public description

PiperOrigin-RevId: 971772017

Author: jscat-oss-bot-external

maldoca/js/ast/ast_util.cc

@@ -123,7 +123,7 @@ BabelAstString GetAstStringFromFileAst(const JsFile& file) {
 
   BabelAstString result;
   result.set_value(ast_json_str);
-  result.set_string_literals_base64_encoded(false);
+  result.set_string_values_base64_encoded(false);
   return result;
 }
 

maldoca/js/babel/babel.proto

@@ -69,9 +69,9 @@ message BabelParseRequest {
   // ```
   optional bool replace_invalid_surrogate_pairs = 2;
 
-  // Whether string literals will be base64-encoded in the AST.
+  // Whether string values will be base64-encoded in the AST.
   //
-  // base64_encode_string_literals == false:
+  // base64_encode_string_values == false:
   // ```
   // Node {
   //   type: 'StringLiteral',
@@ -80,15 +80,15 @@ message BabelParseRequest {
   // }
   // ```
   //
-  // base64_encode_string_literals == true:
+  // base64_encode_string_values == true:
   // ```
   // Node {
   //   type: 'StringLiteral',
   //   extra: { rawValue: 'YQ==', raw: '"\u0041"' },
   //   value: 'YQ=='
   // }
   // ```
-  optional bool base64_encode_string_literals = 5 [default = false];
+  optional bool base64_encode_string_values = 5 [default = false];
 
   // The mode in which source code should be parsed. "unspecified" defaults to
   // "script". "unambiguous" will make @babel/parser attempt to guess, based on
@@ -148,8 +148,8 @@ message BabelAstString {
   // The actual string.
   optional string value = 1;
 
-  // Whether string literals have been base64-encoded.
-  optional bool string_literals_base64_encoded = 2;
+  // Whether string values have been base64-encoded.
+  optional bool string_values_base64_encoded = 2;
 
   optional BabelScopes scopes = 3;
 }

maldoca/js/babel/babel_internal.cc

@@ -49,7 +49,7 @@ nlohmann::json BabelParseOptionsToJson(const BabelParseRequest &request) {
 
   nlohmann::json options{
       // Our custom options:
-      {"base64EncodeStringLiterals", request.base64_encode_string_literals()},
+      {"base64EncodeStringValues", request.base64_encode_string_values()},
       {"replaceInvalidSurrogatePairs",
        request.replace_invalid_surrogate_pairs()},
       {"computeScopes", request.compute_scopes()},
@@ -70,11 +70,11 @@ nlohmann::json BabelParseOptionsToJson(const BabelParseRequest &request) {
 }
 
 nlohmann::json BabelGenerateOptionsToJson(const BabelGenerateOptions &options,
-                                          bool string_literals_base64_encoded) {
+                                          bool string_values_base64_encoded) {
   nlohmann::json json{
       {"comments", options.include_comments()},
       {"compact", options.compact()},
-      {"base64DecodeStringLiterals", string_literals_base64_encoded},
+      {"base64DecodeStringValues", string_values_base64_encoded},
       {"sourceMaps", options.source_maps()},
   };
 

maldoca/js/babel/babel_internal.h

@@ -23,7 +23,7 @@ namespace maldoca {
 nlohmann::json BabelParseOptionsToJson(const BabelParseRequest &request);
 
 nlohmann::json BabelGenerateOptionsToJson(const BabelGenerateOptions &options,
-                                          bool string_literals_base64_encoded);
+                                          bool string_values_base64_encoded);
 
 }  // namespace maldoca
 

maldoca/js/babel/babel_internal.proto

@@ -33,8 +33,8 @@ message BabelGenerateRequest {
   // Should comments be included in output?
   optional bool include_comments = 1 [default = true];
 
-  // Whether we should base64-decode string literals.
-  optional bool base64_decode_string_literals = 2 [default = false];
+  // Whether we should base64-decode string values.
+  optional bool base64_decode_string_values = 2 [default = false];
 
   // Whether to minify the generated source.
   optional bool compact = 3 [default = false];

maldoca/js/babel/babel_test.cc

@@ -38,6 +38,7 @@ namespace maldoca {
 using ::absl_testing::StatusIs;
 using ::maldoca::testing::EqualsProto;
 using ::testing::ElementsAre;
+using ::testing::HasSubstr;
 using ::testing::IsEmpty;
 using ::testing::StrEq;
 using ::testing::StrNe;
@@ -80,6 +81,38 @@ TEST_P(BabelTest, ParseSimpleCode) {
   EXPECT_THAT(result.errors, EqualsProto(""));
 }
 
+static constexpr char kInvalidSurrogate[] =
+    "var i = \"\\udf06\\ud834\";\n"
+    "var j = `\\udf06\\ud834`;";
+
+TEST_P(BabelTest, ParseInvalidSurrogate) {
+  std::unique_ptr<Babel> babel = GetParam().babel_factory();
+  BabelParseRequest request;
+  request.set_base64_encode_string_values(true);
+  MALDOCA_ASSERT_OK_AND_ASSIGN(
+      BabelParseResult parse_result,
+      babel->Parse(kInvalidSurrogate, request, absl::InfiniteDuration()));
+
+  EXPECT_THAT(parse_result.ast_string.value(), StrNe(""));
+  EXPECT_THAT(parse_result.errors, EqualsProto(""));
+  EXPECT_TRUE(parse_result.ast_string.string_values_base64_encoded());
+  // Base64 encoding for "\udf06\ud834" (UTF-16LE: 0x06, 0xdf, 0x34, 0xd8).
+  EXPECT_THAT(parse_result.ast_string.value(), HasSubstr("Bt802A=="));
+  // Base64 encoding for identifier name "i" (UTF-16LE: 0x69, 0x00).
+  EXPECT_THAT(parse_result.ast_string.value(), HasSubstr("aQA="));
+  // Base64 encoding for identifier name "j" (UTF-16LE: 0x6a, 0x00).
+  EXPECT_THAT(parse_result.ast_string.value(), HasSubstr("agA="));
+
+  BabelGenerateOptions generate_options;
+  MALDOCA_ASSERT_OK_AND_ASSIGN(
+      BabelGenerateResult generate_result,
+      babel->Generate(parse_result.ast_string, generate_options,
+                      absl::InfiniteDuration()));
+
+  EXPECT_EQ(generate_result.source_code, kInvalidSurrogate);
+  EXPECT_EQ(generate_result.error, std::nullopt);
+}
+
 TEST_P(BabelTest, ParseVarDef) {
   std::unique_ptr<Babel> babel = GetParam().babel_factory();
   BabelParseRequest request;

maldoca/js/driver/conversion_test.cc

@@ -106,7 +106,7 @@ absl::StatusOr<TestCase> GetTestCase() {
 
   BabelAstString babel_ast_string;
   babel_ast_string.set_value(CompactJsonString(parsed_ast_json_str));
-  babel_ast_string.set_string_literals_base64_encoded(false);
+  babel_ast_string.set_string_values_base64_encoded(false);
   *babel_ast_string.mutable_scopes() = scopes;
 
   ABSL_ASSIGN_OR_RETURN(std::string serialized_ast_json_str,
@@ -126,7 +126,7 @@ absl::StatusOr<TestCase> GetTestCase() {
 
   BabelAstString lifted_babel_ast_string;
   lifted_babel_ast_string.set_value(CompactJsonString(serialized_ast_json_str));
-  lifted_babel_ast_string.set_string_literals_base64_encoded(false);
+  lifted_babel_ast_string.set_string_values_base64_encoded(false);
   *lifted_babel_ast_string.mutable_scopes() = scopes;
 
   return TestCase{