Migrate from cfg = "host" to cfg = "exec"

PiperOrigin-RevId: 488423550

Author: Googler

validator/cpp/engine/embed_data.bzl

@@ -39,7 +39,7 @@ embed_data = rule(
         ),
         "header_generator": attr.label(
             executable = True,
-            cfg = "host",
+            cfg = "exec",
             allow_files = True,
             default = Label(
                 "//cpp/engine/scripts:filecontents_to_cpp_header",

validator/cpp/engine/parse-layout-sizes.h

@@ -9,7 +9,7 @@ namespace amp::validator::parse_layout_sizes {
 
 // WARNING: This code is still in development and not ready to be used.
 
-// This is a single representation for the CssSizes object.
+// This is a single represenation for the CssSizes object.
 // It consists of at least a valid size and a possible media condition.
 // See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#Attributes
 struct CssSize {

validator/cpp/engine/parse-srcset_test.cc

@@ -150,7 +150,7 @@ TEST(ParseSrcsetTest, LeadingAndTrailingCommasAndCommasInUrl) {
               EqCandidates({{"example.com/,/,/,/,50w", "1x"}}));
 }
 
-TEST(ParseSrcsetTest, NoWhitespace) {
+TEST(ParseSrcsetTest, NoWhitepsace) {
   SrcsetParsingResult result = ParseSourceSet("image 100w,image 50w");
   EXPECT_TRUE(result.success);
   EXPECT_THAT(result.srcset_images,

validator/cpp/engine/testing-utils.cc

@@ -97,8 +97,6 @@ const std::map<std::string, TestCase>& TestCases() {
            "external/amphtml-extensions/*/*/test/*.html",
             &html_files)) << "Test cases file pattern not found.";
 
-    CHECK(!html_files.empty()) << "Validator test cases are empty. Will not proceed.";
-    
     std::sort(html_files.begin(), html_files.end());
     for (const std::string& html_file : html_files) {
       if (html_file.find("/js_only/") != std::string::npos) continue;

validator/cpp/engine/utf8-util_test.cc

@@ -14,7 +14,7 @@ TEST(Utf8UtilTest, Utf16StrLen) {
   // It's 34 bytes long and 22 utf-8 characters long. Javascript uses UTF16
   // strings and string lengths.
   // The chars in Iñtërnâtiônàlizætiøn vary between 1 and 2 byte lengths, all
-  // javascript 1-char lengths. The ⚡ is a 3-byte length character, with a
+  // javascript 1-char lenghts. The ⚡ is a 3-byte length character, with a
   // 1-char javascript length. Finally the 💩 is a 4-byte length character with
   // a 2-char javascript length.
   EXPECT_EQ(Utf16StrLen("Iñtërnâtiônàlizætiøn☃💩"), 23);

validator/cpp/engine/validator-internal.cc

@@ -311,62 +311,42 @@ ScriptTag ParseScriptTag(htmlparser::Node* node) {
     }
   }
 
-  if (src.empty()) {
-    return script_tag;
-  }
-
-  std::string src_str{src};
   // Determine if this has a valid AMP domain and separate the path from the
   // attribute 'src'. Consumes the domain making src just the path.
   if (absl::ConsumePrefix(&src, kAmpProjectDomain)) {
     script_tag.is_amp_domain = true;
-    script_tag.path = src_str;
-  } else {
-    script_tag.is_amp_domain = false;
-    htmlparser::URL url(src_str);
-    // Error cases, early exit:
-    if (!url.is_valid()) return script_tag;
-    if (!url.has_protocol()) return script_tag;
-    if (url.protocol() != "https" && url.protocol() != "http")
-      return script_tag;
-    if (url.hostname().empty()) return script_tag;
-
-    src = url.path_params_fragment().data();
-    // Trim the "/" prefix as this is what kExtensionPathRe expects.
-    if (!src.empty() && src[0] == '/') src = src.substr(1);
-    std::string src_str{src};
-    script_tag.path = src_str;
-  }
-
-  // Only look at script tags that have attribute 'async'.
-  if (has_async_attr) {
-    // Determine if this is the AMP Runtime.
-    if (!script_tag.is_extension &&
-        RE2::FullMatch(src, *kRuntimeScriptPathRe)) {
-      script_tag.is_runtime = true;
-      script_tag.has_valid_path = true;
-    }
-
-    // For AMP Extensions, validate path and extract name and version.
-    if (script_tag.is_extension &&
-        RE2::FullMatch(src, *kExtensionPathRe, &script_tag.extension_name,
-                       &script_tag.extension_version)) {
-      script_tag.has_valid_path = true;
-    }
-
-    // Determine the release version (LTS, module, standard, etc).
-    if ((has_module_attr && RE2::FullMatch(src, *kModuleLtsScriptPathRe)) ||
-        (has_nomodule_attr && RE2::FullMatch(src, *kLtsScriptPathRe))) {
-      script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE_LTS;
-    } else if ((has_module_attr &&
-                RE2::FullMatch(src, *kModuleScriptPathRe)) ||
-               (has_nomodule_attr &&
-                RE2::FullMatch(src, *kStandardScriptPathRe))) {
-      script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE;
-    } else if (RE2::FullMatch(src, *kLtsScriptPathRe)) {
-      script_tag.release_version = ScriptReleaseVersion::LTS;
-    } else if (RE2::FullMatch(src, *kStandardScriptPathRe)) {
-      script_tag.release_version = ScriptReleaseVersion::STANDARD;
+    script_tag.path = std::string(src);
+
+    // Only look at script tags that have attribute 'async'.
+    if (has_async_attr) {
+      // Determine if this is the AMP Runtime.
+      if (!script_tag.is_extension &&
+          RE2::FullMatch(src, *kRuntimeScriptPathRe)) {
+        script_tag.is_runtime = true;
+        script_tag.has_valid_path = true;
+      }
+
+      // For AMP Extensions, validate path and extract name and version.
+      if (script_tag.is_extension &&
+          RE2::FullMatch(src, *kExtensionPathRe, &script_tag.extension_name,
+                         &script_tag.extension_version)) {
+        script_tag.has_valid_path = true;
+      }
+
+      // Determine the release version (LTS, module, standard, etc).
+      if ((has_module_attr && RE2::FullMatch(src, *kModuleLtsScriptPathRe)) ||
+          (has_nomodule_attr && RE2::FullMatch(src, *kLtsScriptPathRe))) {
+        script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE_LTS;
+      } else if ((has_module_attr &&
+                  RE2::FullMatch(src, *kModuleScriptPathRe)) ||
+                 (has_nomodule_attr &&
+                  RE2::FullMatch(src, *kStandardScriptPathRe))) {
+        script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE;
+      } else if (RE2::FullMatch(src, *kLtsScriptPathRe)) {
+        script_tag.release_version = ScriptReleaseVersion::LTS;
+      } else if (RE2::FullMatch(src, *kStandardScriptPathRe)) {
+        script_tag.release_version = ScriptReleaseVersion::STANDARD;
+      }
     }
   }
   return script_tag;
@@ -1192,7 +1172,7 @@ class ParsedTagSpec {
 
   // Whether or not the tag should be recorded via
   // Context->RecordTagspecValidated if it was validated
-  // successfully. For performance, this is only done for tags that
+  // successfullly. For performance, this is only done for tags that
   // are mandatory, unique, or possibly required by some other tag.
   RecordValidated ShouldRecordTagspecValidated() const {
     return should_record_tagspec_validated_;
@@ -1284,7 +1264,7 @@ std::string TagSpecUrl(const TagSpec& spec) {
     return StrCat(extension_spec_url_prefix, spec.extension_spec().name());
   if (spec.requires_extension_size() > 0)
     // Return the first |requires_extension|, which should be the most
-    // representative.
+    // representitive.
     return StrCat(extension_spec_url_prefix, spec.requires_extension(0));
 
   return "";
@@ -2834,11 +2814,11 @@ class InvalidRuleVisitor : public htmlparser::css::RuleVisitor {
 class InvalidDeclVisitor : public htmlparser::css::RuleVisitor {
  public:
   InvalidDeclVisitor(const ParsedDocCssSpec& css_spec, Context* context,
-                     const std::string& tag_descriptive_name,
+                     const std::string& tag_decriptive_name,
                      ValidationResult* result)
       : css_spec_(css_spec),
         context_(context),
-        tag_descriptive_name_(tag_descriptive_name),
+        tag_descriptive_name_(tag_decriptive_name),
         result_(result) {}
 
   void VisitDeclaration(
@@ -3996,14 +3976,8 @@ void ValidateAmpScriptSrcAttr(const ParsedHtmlTag& tag,
                               const TagSpec& tag_spec, const Context& context,
                               ValidationResult* result) {
   if (!tag.IsAmpDomain()) {
-    bool is_amp_format =
-        c_find(context.type_identifiers(), TypeIdentifier::kAmp) !=
-        context.type_identifiers().end();
-    if (!is_amp_format || context.is_transformed()) {
-      context.AddError(ValidationError::DISALLOWED_AMP_DOMAIN,
-                       context.line_col(),
-                       /*params=*/{}, /*spec_url=*/"", result);
-    }
+    context.AddError(ValidationError::DISALLOWED_AMP_DOMAIN, context.line_col(),
+                     /*params=*/{}, /*spec_url=*/"", result);
   }
 
   if (tag.IsExtensionScript() && tag_spec.has_extension_spec()) {
@@ -5686,7 +5660,9 @@ class ParsedValidatorRulesProvider {
 class Validator {
  public:
   Validator(const ParsedValidatorRules* rules, int max_errors = -1)
-      : rules_(rules), max_errors_(max_errors), context_(rules_, max_errors_) {}
+      : rules_(rules),
+        max_errors_(max_errors),
+        context_(rules_, max_errors_) {}
 
   ValidationResult Validate(const htmlparser::Document& doc) {
     doc_metadata_ = doc.Metadata();

validator/cpp/engine/validator_test.cc

@@ -481,8 +481,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":13:2 The author stylesheet specified in tag 'style amp-custom' "
         "is too long - document contains 75001 bytes whereas the "
         "limit is 75000 "
-        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/"
-        "spec/amphtml#maximum-size)");
+        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/"
+        "spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -527,7 +527,7 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":19:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75010 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size)");
+        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -555,7 +555,7 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":7519:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75014 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size)");
+        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -601,8 +601,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         test_case_name,
         ":17:2 The inline style specified in tag 'div' is too long - it "
         "contains 1001 bytes whereas the limit is 1000 bytes. (see "
-        "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/"
-        "amphtml#maximum-size)");
+        "https://amp.dev/documentation/guides-and-tutorials/learn/spec/"
+        "amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 }
@@ -649,8 +649,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":13:2 The author stylesheet specified in tag 'style amp-custom' "
         "is too long - document contains 75001 bytes whereas the "
         "limit is 75000 "
-        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/"
-        "spec/amphtml#maximum-size)");
+        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/"
+        "spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -681,7 +681,7 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":19:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75010 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size)");
+        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -701,7 +701,7 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":3769:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75014 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size)");
+        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -734,8 +734,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         StrCat("FAIL\n", test_case_name,
                ":17:2 The inline style specified in tag 'div' is too long - it "
                "contains 1001 bytes whereas the limit is 1000 bytes. (see "
-               "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/"
-               "amphtml#maximum-size)");
+               "https://amp.dev/documentation/guides-and-tutorials/learn/spec/"
+               "amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 }

validator/cpp/engine/wasm/BUILD

@@ -1,7 +1,6 @@
 # Wraps AMP Validator into a WebAssembly library,
 # which can be used by javascript files.
 
-load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_js_library")
 
@@ -73,8 +72,3 @@ closure_js_binary(
         ":validator_js_lib",
     ],
 )
-
-build_test(
-    name = "validator_js_test",
-    targets = [":validator_js_bin"],
-)

validator/cpp/engine/wasm/validator.js

@@ -83,7 +83,7 @@ function digitizeValidationErrorFields(error) {
 /**
  * When transforming validation errors and validation results from jspb to plain
  * objects, the protobuf base64 string is also attached to the output.
- * Hence when a plain object needs to be transformed back to protobuf,
+ * Hence when a plain object neeeds to be transformed back to protobuf,
  * the attached base64 could be directly used.
  */
 const PB_BASE64 = '_PB_BASE64';

validator/cpp/htmlparser/BUILD

@@ -71,7 +71,7 @@ cc_test(
 )
 
 # Similar to go lang's defer statement. Defers the execution of statement
-# until in which it is declared goes out of scope.
+# until in which it is decalred goes out of scope.
 cc_library(
     name = "defer",
     hdrs = [
@@ -80,7 +80,7 @@ cc_library(
     copts = ["-std=c++17"],
 )
 
-# Helper library declares various doctype constants and a utility function to
+# Helper library decalres various doctype constants and a utility function to
 # parse doctype string and extract various components in it.
 cc_library(
     name = "doctype",