Add AutoExtensionImporter (#569)

* Add AutoExtensionImporter

* addressed comments

* Adressed comments:

- Support multiple formats
- Add validador-rules dependency to optimizer

* renamed method

* array restructuring ftw

* use configured format instead of default

packages/optimizer/lib/AmpConstants.js

@@ -24,5 +24,6 @@ module.exports = {
     'custom-element': ['amp-geo'],
     'custom-template': [],
   },
+  AMP_FORMATS: ['AMP', 'AMP4EMAIL', 'AMP4ADS'],
   appendRuntimeVersion: (prefix, version) => prefix + '/rtv/' + version,
 };

packages/optimizer/lib/DomTransformer.js

@@ -18,12 +18,15 @@
 const treeParser = require('./TreeParser.js');
 const log = require('./log.js');
 const {oneBehindFetch} = require('@ampproject/toolbox-core');
+const validatorRules = require('@ampproject/toolbox-validator-rules');
 const runtimeVersion = require('@ampproject/toolbox-runtime-version');
 
 /**
  * AMP Optimizer Configuration only applying AMP validity perserving transformations.
  */
 const TRANSFORMATIONS_AMP_FIRST = [
+  // Adds missing AMP extensions
+  'AutoExtensionImporter',
   // Applies server-side-rendering optimizations
   'ServerSideRendering',
   // Removes the boilerplate
@@ -47,6 +50,8 @@ const TRANSFORMATIONS_AMP_FIRST = [
  * @deprecated
  */
 const TRANSFORMATIONS_PAIRED_AMP = [
+  // Adds missing AMP extensions
+  'AutoExtensionImporter',
   // Adds a link to the valid AMP version
   'AddAmpLink',
   // Applies server-side-rendering optimizations
@@ -71,10 +76,11 @@ const TRANSFORMATIONS_PAIRED_AMP = [
 
 const DEFAULT_CONFIG = {
   fetch: oneBehindFetch,
+  log,
   runtimeVersion,
-  log: log,
-  verbose: false,
   transformations: TRANSFORMATIONS_AMP_FIRST,
+  validatorRules,
+  verbose: false,
 };
 
 /**

packages/optimizer/lib/RuntimeHostHelper.js

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2020 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+'use strict';
+
+const {
+  AMP_CACHE_HOST,
+  appendRuntimeVersion,
+} = require('./AmpConstants.js');
+
+function calculateHost({
+  ampUrlPrefix = AMP_CACHE_HOST,
+  ampRuntimeVersion,
+  rewriteDynamicComponents,
+}) {
+  if (ampRuntimeVersion && ampUrlPrefix === AMP_CACHE_HOST) {
+    ampUrlPrefix = appendRuntimeVersion(ampUrlPrefix, ampRuntimeVersion);
+  }
+  let dynamicAmpUrlPrefix = ampUrlPrefix;
+  if (rewriteDynamicComponents === false) {
+    dynamicAmpUrlPrefix = AMP_CACHE_HOST;
+    if (ampRuntimeVersion) {
+      dynamicAmpUrlPrefix = appendRuntimeVersion(dynamicAmpUrlPrefix, ampRuntimeVersion);
+    }
+  }
+  return {
+    dynamicAmpUrlPrefix,
+    ampUrlPrefix,
+  };
+}
+
+module.exports = {
+  calculateHost,
+};
+