Update to latest spec - 2021-03-29

ampproject · Mar 29, 2021 · b284a31 · b284a31
1 parent 4d9c7ae
commit b284a31
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 2 deletions.
diff --git a/src/Extension.php b/src/Extension.php
@@ -146,6 +146,7 @@ interface Extension
     const STORY_PAGE_ATTACHMENT                  = 'amp-story-page-attachment';
     const STORY_PANNING_MEDIA                    = 'amp-story-panning-media';
     const STORY_PLAYER                           = 'amp-story-player';
+    const STORY_SOCIAL_SHARE                     = 'amp-story-social-share';
     const SUBSCRIPTIONS                          = 'amp-subscriptions';
     const SUBSCRIPTIONS_GOOGLE                   = 'amp-subscriptions-google';
     const TIMEAGO                                = 'amp-timeago';

diff --git a/src/Validator/Spec.php b/src/Validator/Spec.php
@@ -16,7 +16,7 @@ final class Spec
     private $minValidatorRevisionRequired = 475;
 
     /** @var int */
-    private $specFileRevision = 1160;
+    private $specFileRevision = 1162;
 
     /** @var string */
     private $templateSpecUrl = 'https://amp.dev/documentation/components/amp-mustache';

diff --git a/src/Validator/Spec/Section/DescendantTagList.php b/src/Validator/Spec/Section/DescendantTagList.php
@@ -130,6 +130,10 @@ final class DescendantTagList
         Element::SCRIPT,
     ];
 
+    const AMP_STORY_SOCIAL_SHARE_ALLOWED_DESCENDANTS = [
+        Element::SCRIPT,
+    ];
+
     const AMP_STORY_CTA_LAYER_ALLOWED_DESCENDANTS = [
         Element::A,
         Element::ABBR,

diff --git a/src/Validator/Spec/Tag/AmpStory.php b/src/Validator/Spec/Tag/AmpStory.php
@@ -134,6 +134,7 @@ final class AmpStory extends Tag
                 'AMP-STORY-AUTO-ANALYTICS',
                 'AMP-STORY-BOOKEND',
                 'AMP-STORY-PAGE',
+                'AMP-STORY-SOCIAL-SHARE',
             ],
             SpecRule::MANDATORY_MIN_NUM_CHILD_TAGS => 1,
         ],

diff --git a/src/Validator/Spec/Tag/AmpStorySocialShare.php b/src/Validator/Spec/Tag/AmpStorySocialShare.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * DO NOT EDIT!
+ * This file was automatically generated via bin/generate-validator-spec.php.
+ */
+
+namespace AmpProject\Validator\Spec\Tag;
+
+use AmpProject\Attribute;
+use AmpProject\Extension;
+use AmpProject\Format;
+use AmpProject\Protocol;
+use AmpProject\Validator\Spec\Section\DescendantTagList;
+use AmpProject\Validator\Spec\SpecRule;
+use AmpProject\Validator\Spec\Tag;
+
+final class AmpStorySocialShare extends Tag
+{
+    const SPEC = [
+        SpecRule::TAG_NAME => Extension::STORY_SOCIAL_SHARE,
+        SpecRule::ATTRS => [
+            [
+                SpecRule::NAME => Attribute::LAYOUT,
+                SpecRule::MANDATORY => true,
+                SpecRule::VALUE => [
+                    'nodisplay',
+                ],
+            ],
+            [
+                SpecRule::NAME => Attribute::SRC,
+                SpecRule::VALUE_URL => [
+                    SpecRule::PROTOCOL => [
+                        Protocol::HTTP,
+                        Protocol::HTTPS,
+                    ],
+                ],
+            ],
+        ],
+        SpecRule::MANDATORY_ANCESTOR => Extension::STORY,
+        SpecRule::HTML_FORMAT => [
+            Format::AMP,
+        ],
+        SpecRule::DESCENDANT_TAG_LIST => DescendantTagList::AMP_STORY_SOCIAL_SHARE_ALLOWED_DESCENDANTS,
+        SpecRule::MANDATORY_LAST_CHILD => true,
+    ];
+}
diff --git a/src/Validator/Spec/Tag/AmpStorySocialShareExtensionJsonScript.php b/src/Validator/Spec/Tag/AmpStorySocialShareExtensionJsonScript.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * DO NOT EDIT!
+ * This file was automatically generated via bin/generate-validator-spec.php.
+ */
+
+namespace AmpProject\Validator\Spec\Tag;
+
+use AmpProject\Attribute;
+use AmpProject\Extension;
+use AmpProject\Format;
+use AmpProject\Tag as Element;
+use AmpProject\Validator\Spec\SpecRule;
+use AmpProject\Validator\Spec\Tag;
+
+final class AmpStorySocialShareExtensionJsonScript extends Tag
+{
+    const SPEC = [
+        SpecRule::TAG_NAME => Element::SCRIPT,
+        SpecRule::SPEC_NAME => 'amp-story-social-share extension .json script',
+        SpecRule::UNIQUE => true,
+        SpecRule::MANDATORY_PARENT => Extension::STORY_SOCIAL_SHARE,
+        SpecRule::ATTRS => [
+            [
+                SpecRule::NAME => Attribute::TYPE,
+                SpecRule::MANDATORY => true,
+                SpecRule::DISPATCH_KEY => 'NAME_VALUE_PARENT_DISPATCH',
+                SpecRule::VALUE_CASEI => [
+                    'application/json',
+                ],
+            ],
+        ],
+        SpecRule::ATTR_LISTS => [
+            'nonce-attr',
+        ],
+        SpecRule::HTML_FORMAT => [
+            Format::AMP,
+        ],
+        SpecRule::REQUIRES_EXTENSION => [
+            Extension::STORY,
+        ],
+        SpecRule::SIBLINGS_DISALLOWED => true,
+        SpecRule::MANDATORY_LAST_CHILD => true,
+    ];
+}
diff --git a/src/Validator/Spec/Tag/LinkRel.php b/src/Validator/Spec/Tag/LinkRel.php
@@ -25,7 +25,7 @@ final class LinkRel extends Tag
             [
                 SpecRule::NAME => Attribute::REL,
                 SpecRule::MANDATORY => true,
-                SpecRule::DISALLOWED_VALUE_REGEX => '(^|\s)(canonical|components|import|manifest|preload|serviceworker|stylesheet|subresource)(\s|$)',
+                SpecRule::DISALLOWED_VALUE_REGEX => '(^|\s)(canonical|components|import|manifest|modulepreload|preload|serviceworker|stylesheet|subresource)(\s|$)',
             ],
         ],
         SpecRule::ATTR_LISTS => [

diff --git a/src/Validator/Spec/Tag/LinkRelModulepreload.php b/src/Validator/Spec/Tag/LinkRelModulepreload.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * DO NOT EDIT!
+ * This file was automatically generated via bin/generate-validator-spec.php.
+ */
+
+namespace AmpProject\Validator\Spec\Tag;
+
+use AmpProject\Attribute;
+use AmpProject\Format;
+use AmpProject\Tag as Element;
+use AmpProject\Validator\Spec\SpecRule;
+use AmpProject\Validator\Spec\Tag;
+
+final class LinkRelModulepreload extends Tag
+{
+    const SPEC = [
+        SpecRule::TAG_NAME => Element::LINK,
+        SpecRule::SPEC_NAME => 'link rel=modulepreload',
+        SpecRule::MANDATORY_PARENT => Element::HEAD,
+        SpecRule::ATTRS => [
+            [
+                SpecRule::NAME => Attribute::AS_,
+                SpecRule::MANDATORY => true,
+                SpecRule::VALUE => [
+                    'script',
+                ],
+            ],
+            [
+                SpecRule::NAME => Attribute::CROSSORIGIN,
+                SpecRule::MANDATORY => true,
+                SpecRule::VALUE => [
+                    'anonymous',
+                ],
+            ],
+            [
+                SpecRule::NAME => Attribute::HREF,
+                SpecRule::MANDATORY => true,
+                SpecRule::VALUE_REGEX => '.*\.mjs$',
+            ],
+            [
+                SpecRule::NAME => Attribute::REL,
+                SpecRule::MANDATORY => true,
+                SpecRule::DISPATCH_KEY => 'NAME_VALUE_DISPATCH',
+                SpecRule::VALUE_CASEI => [
+                    'modulepreload',
+                ],
+            ],
+        ],
+        SpecRule::SPEC_URL => 'https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/#html-tags',
+        SpecRule::HTML_FORMAT => [
+            Format::AMP,
+        ],
+        SpecRule::DESCRIPTIVE_NAME => 'link rel=modulepreload',
+    ];
+}