♻️ Extract CSS module (ampproject#21007)

* Extract CSS module Extracts CSS specific functions from `src/dom.js` into `src/css.js`. * Fix build * Move assertIsName into css module * Move test
noranazmy · Mar 22, 2019 · f99eb3b · f99eb3b
1 parent 13db695
commit f99eb3b
Show file tree

Hide file tree

Showing 29 changed files with 236 additions and 188 deletions.
diff --git a/build-system/dep-check-config.js b/build-system/dep-check-config.js
@@ -86,7 +86,7 @@ exports.rules = [
       'src/sanitizer.js->third_party/caja/html-sanitizer.js',
       'extensions/amp-viz-vega/**->third_party/vega/vega.js',
       'extensions/amp-viz-vega/**->third_party/d3/d3.js',
-      'src/dom.js->third_party/css-escape/css-escape.js',
+      'src/css.js->third_party/css-escape/css-escape.js',
       'src/shadow-embed.js->third_party/webcomponentsjs/ShadowCSS.js',
       'third_party/timeagojs/timeago.js->' +
           'third_party/timeagojs/timeago-locales.js',

diff --git a/build-system/eslint-rules/no-import-rename.js b/build-system/eslint-rules/no-import-rename.js
@@ -44,9 +44,11 @@ const imports = {
     'setStyle',
     'setStyles',
   ],
-  'src/dom': [
+  'src/css': [
     'escapeCssSelectorIdent',
     'escapeCssSelectorNth',
+  ],
+  'src/dom': [
     'scopedQuerySelector',
     'scopedQuerySelectorAll',
   ],

diff --git a/build-system/eslint-rules/query-selector.js b/build-system/eslint-rules/query-selector.js
@@ -146,7 +146,7 @@ module.exports = function(context) {
         context.report({
           node: expression,
           message: 'Each selector value must be escaped by ' +
-              'escapeCssSelectorIdent in src/dom.js',
+              'escapeCssSelectorIdent in src/css.js',
         });
       }
 

diff --git a/build-system/tasks/presubmit-checks.js b/build-system/tasks/presubmit-checks.js
@@ -816,12 +816,6 @@ const forbiddenTermsSrcInclusive = {
       'extensions/amp-bind/0.1/bind-expr-impl.js',
     ],
   },
-  'scopeSelectorForTesting': {
-    message: 'scopeSelector is not intended to be used outside of dom.js',
-    whitelist: [
-      'src/dom.js',
-    ],
-  },
   '[^.]loadPromise': {
     message: 'Most users should use BaseElement…loadPromise.',
     whitelist: [

diff --git a/extensions/amp-access/0.1/amp-access-server-jwt.js b/extensions/amp-access/0.1/amp-access-server-jwt.js
@@ -25,7 +25,7 @@ import {
 } from '../../../src/url';
 import {dev, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
-import {escapeCssSelectorIdent} from '../../../src/dom';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {fetchDocument} from '../../../src/document-fetcher';
 import {getMode} from '../../../src/mode';
 import {isArray} from '../../../src/types';

diff --git a/extensions/amp-access/0.1/amp-access-server.js b/extensions/amp-access/0.1/amp-access-server.js
@@ -18,7 +18,7 @@ import {AccessClientAdapter} from './amp-access-client';
 import {Services} from '../../../src/services';
 import {dev, devAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
-import {escapeCssSelectorIdent} from '../../../src/dom';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {fetchDocument} from '../../../src/document-fetcher';
 import {isExperimentOn} from '../../../src/experiments';
 import {isProxyOrigin, removeFragment} from '../../../src/url';

diff --git a/extensions/amp-date-picker/0.1/amp-date-picker.js b/extensions/amp-date-picker/0.1/amp-date-picker.js
@@ -27,7 +27,6 @@ import {Services} from '../../../src/services';
 import {batchFetchJsonFor} from '../../../src/batched-json';
 import {
   closestAncestorElementBySelector,
-  escapeCssSelectorIdent,
   isRTL,
   iterateCursor,
   scopedQuerySelector,
@@ -40,6 +39,7 @@ import {createSingleDatePicker} from './single-date-picker';
 import {dashToCamelCase} from '../../../src/string';
 import {dev, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {once} from '../../../src/utils/function';
 import {requireExternal} from '../../../src/module';
 

diff --git a/extensions/amp-form/0.1/amp-form.js b/extensions/amp-form/0.1/amp-form.js
@@ -37,7 +37,6 @@ import {
   ancestorElementsByTag,
   childElementByAttr,
   createElementWithAttributes,
-  escapeCssSelectorIdent,
   iterateCursor,
   removeElement,
   tryFocus,
@@ -46,6 +45,7 @@ import {createCustomEvent} from '../../../src/event-helper';
 import {createFormDataWrapper} from '../../../src/form-data-wrapper';
 import {deepMerge, dict} from '../../../src/utils/object';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {
   formOrNullForElement,
   getFormAsObject,

diff --git a/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js b/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js
@@ -16,13 +16,13 @@
 import {createCustomEvent} from '../../../src/event-helper';
 import {dev, user} from '../../../src/log';
 import {dict, hasOwn} from '../../../src/utils/object';
+import {escapeCssSelectorIdent} from '../../../src/css';
+import {installServiceInEmbedScope} from '../../../src/service';
 import {
-  escapeCssSelectorIdent,
   scopedQuerySelector,
   waitForBodyPromise,
   waitForChild,
 } from '../../../src/dom';
-import {installServiceInEmbedScope} from '../../../src/service';
 import {toArray} from '../../../src/types';
 
 /**

diff --git a/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js
@@ -33,13 +33,13 @@ import {
   closest,
   closestAncestorElementBySelector,
   elementByTag,
-  escapeCssSelectorIdent,
   scopedQuerySelector,
   scopedQuerySelectorAll,
 } from '../../../src/dom';
 import {clamp} from '../../../src/utils/math';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {getData, isLoaded, listen} from '../../../src/event-helper';
 import {
   getElementServiceForDoc,

diff --git a/extensions/amp-story/0.1/amp-story.js b/extensions/amp-story/0.1/amp-story.js
@@ -75,7 +75,6 @@ import {
   childElementByTag,
   childElements,
   closest,
-  escapeCssSelectorIdent,
   matches,
   removeElement,
   scopedQuerySelectorAll,
@@ -89,6 +88,7 @@ import {
 import {debounce} from '../../../src/utils/rate-limit';
 import {dev, devAssert, user} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {findIndex} from '../../../src/utils/array';
 import {getDetail} from '../../../src/event-helper';
 import {getMode} from '../../../src/mode';

diff --git a/extensions/amp-story/0.1/animation.js b/extensions/amp-story/0.1/animation.js
@@ -29,12 +29,12 @@ import {
 } from '../../amp-animation/0.1/web-animation-types';
 import {assertDoesNotContainDisplay, setStyles} from '../../../src/style';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
+import {escapeCssSelectorIdent} from '../../../src/css';
+import {map, omit} from '../../../src/utils/object';
 import {
-  escapeCssSelectorIdent,
   scopedQuerySelector,
   scopedQuerySelectorAll,
 } from '../../../src/dom';
-import {map, omit} from '../../../src/utils/object';
 import {timeStrToMillis, unscaledClientRect} from './utils';
 
 /** const {string} */

diff --git a/extensions/amp-story/0.1/page-advancement.js b/extensions/amp-story/0.1/page-advancement.js
@@ -15,8 +15,9 @@
  */
 import {Services} from '../../../src/services';
 import {VideoEvents} from '../../../src/video-interface';
-import {closest, escapeCssSelectorIdent} from '../../../src/dom';
+import {closest} from '../../../src/dom';
 import {dev, user} from '../../../src/log';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {hasTapAction, timeStrToMillis} from './utils';
 import {listenOnce} from '../../../src/event-helper';
 import {map} from '../../../src/utils/object';

diff --git a/extensions/amp-story/0.1/progress-bar.js b/extensions/amp-story/0.1/progress-bar.js
@@ -16,9 +16,10 @@
 import {POLL_INTERVAL_MS} from './page-advancement';
 import {Services} from '../../../src/services';
 import {dev, devAssert} from '../../../src/log';
-import {escapeCssSelectorNth, scopedQuerySelector} from '../../../src/dom';
+import {escapeCssSelectorNth} from '../../../src/css';
 import {hasOwn, map} from '../../../src/utils/object';
 import {scale, setImportantStyles} from '../../../src/style';
+import {scopedQuerySelector} from '../../../src/dom';
 
 
 /**

diff --git a/extensions/amp-story/1.0/amp-story.js b/extensions/amp-story/1.0/amp-story.js
@@ -85,7 +85,6 @@ import {
   childElements,
   closest,
   createElementWithAttributes,
-  escapeCssSelectorIdent,
   isRTL,
   scopedQuerySelectorAll,
 } from '../../../src/dom';
@@ -99,6 +98,7 @@ import {
 import {debounce} from '../../../src/utils/rate-limit';
 import {dev, devAssert, user} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {findIndex} from '../../../src/utils/array';
 import {getConsentPolicyState} from '../../../src/consent';
 import {getDetail} from '../../../src/event-helper';

diff --git a/extensions/amp-story/1.0/animation.js b/extensions/amp-story/1.0/animation.js
@@ -28,13 +28,13 @@ import {
 } from '../../amp-animation/0.1/web-animation-types';
 import {assertDoesNotContainDisplay, setStyles} from '../../../src/style';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
+import {escapeCssSelectorIdent} from '../../../src/css';
+import {getPresetDef, setStyleForPreset} from './animation-presets';
+import {map, omit} from '../../../src/utils/object';
 import {
-  escapeCssSelectorIdent,
   scopedQuerySelector,
   scopedQuerySelectorAll,
 } from '../../../src/dom';
-import {getPresetDef, setStyleForPreset} from './animation-presets';
-import {map, omit} from '../../../src/utils/object';
 import {timeStrToMillis, unscaledClientRect} from './utils';
 
 /** const {string} */

diff --git a/extensions/amp-story/1.0/page-advancement.js b/extensions/amp-story/1.0/page-advancement.js
@@ -24,11 +24,12 @@ import {AdvancementMode} from './story-analytics';
 import {Services} from '../../../src/services';
 import {TAPPABLE_ARIA_ROLES} from '../../../src/service/action-impl';
 import {VideoEvents} from '../../../src/video-interface';
-import {closest, escapeCssSelectorIdent, matches} from '../../../src/dom';
+import {closest, matches} from '../../../src/dom';
 import {dev, user} from '../../../src/log';
 import {
   embeddedComponentSelectors,
 } from './amp-story-embedded-component';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {hasTapAction, timeStrToMillis} from './utils';
 import {listenOnce} from '../../../src/event-helper';
 

diff --git a/extensions/amp-story/1.0/progress-bar.js b/extensions/amp-story/1.0/progress-bar.js
@@ -16,9 +16,10 @@
 import {POLL_INTERVAL_MS} from './page-advancement';
 import {Services} from '../../../src/services';
 import {dev, devAssert} from '../../../src/log';
-import {escapeCssSelectorNth, scopedQuerySelector} from '../../../src/dom';
+import {escapeCssSelectorNth} from '../../../src/css';
 import {hasOwn, map} from '../../../src/utils/object';
 import {scale, setImportantStyles} from '../../../src/style';
+import {scopedQuerySelector} from '../../../src/dom';
 
 
 /**

diff --git a/extensions/amp-video-docking/0.1/amp-video-docking.js b/extensions/amp-video-docking/0.1/amp-video-docking.js
@@ -41,17 +41,17 @@ import {
 } from '../../../src/event-helper';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
-import {
-  escapeCssSelectorIdent,
-  isRTL,
-  removeElement,
-  scopedQuerySelector,
-} from '../../../src/dom';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {getInternalVideoElementFor} from '../../../src/utils/video';
 import {getServiceForDoc} from '../../../src/service';
 import {htmlFor, htmlRefs} from '../../../src/static-template';
 import {installStylesForDoc} from '../../../src/style-installer';
 import {isFiniteNumber} from '../../../src/types';
+import {
+  isRTL,
+  removeElement,
+  scopedQuerySelector,
+} from '../../../src/dom';
 import {layoutRectLtwh, moveLayoutRect} from '../../../src/layout-rect';
 import {mapRange} from '../../../src/utils/math';
 import {once} from '../../../src/utils/function';

diff --git a/extensions/amp-web-push/0.1/amp-web-push-config.js b/extensions/amp-web-push/0.1/amp-web-push-config.js
@@ -16,7 +16,7 @@
 
 import {CONFIG_TAG, SERVICE_TAG, TAG} from './vars';
 import {dev, user, userAssert} from '../../../src/log';
-import {escapeCssSelectorIdent} from '../../../src/dom';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {getServiceForDoc} from '../../../src/service';
 import {parseUrlDeprecated} from '../../../src/url';
 

diff --git a/extensions/amp-web-push/0.1/amp-web-push-permission-dialog.js b/extensions/amp-web-push/0.1/amp-web-push-permission-dialog.js
@@ -16,7 +16,7 @@
 
 import {NotificationPermission, StorageKeys} from './vars';
 import {WindowMessenger} from './window-messenger';
-import {escapeCssSelectorIdent} from '../../../src/dom';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {getMode} from '../../../src/mode';
 import {
   parseQueryString,

diff --git a/extensions/amp-web-push/0.1/web-push-service.js b/extensions/amp-web-push/0.1/web-push-service.js
@@ -21,9 +21,10 @@ import {Services} from '../../../src/services';
 import {WebPushWidgetVisibilities} from './amp-web-push-widget';
 import {WindowMessenger} from './window-messenger';
 import {dev, user} from '../../../src/log';
-import {escapeCssSelectorIdent, openWindowDialog} from '../../../src/dom';
+import {escapeCssSelectorIdent} from '../../../src/css';
 import {getMode} from '../../../src/mode';
 import {installStylesForDoc} from '../../../src/style-installer';
+import {openWindowDialog} from '../../../src/dom';
 import {parseQueryString, parseUrlDeprecated} from '../../../src/url';
 
 /** @typedef {{