♻️ Migrate Style and DOM helpers into core/DOM + type-checking

3p/3d-gltf/viewer.js

@@ -16,7 +16,7 @@
 
 /* global THREE */
 
-import {setStyle} from '../../src/style';
+import {setStyle} from '../../src/core/dom/style';
 import AnimationLoop from './animation-loop';
 
 const CAMERA_DISTANCE_FACTOR = 1;

3p/beopinion.js

@@ -15,7 +15,7 @@
  */
 
 import {loadScript} from './3p';
-import {setStyles} from '../src/style';
+import {setStyles} from '../src/core/dom/style';
 
 /**
  * Produces the Twitter API object for the passed in callback. If the current

3p/bodymovinanimation.js

@@ -18,7 +18,7 @@ import {dict} from '../src/core/types/object';
 import {getData} from '../src/event-helper';
 import {loadScript} from './3p';
 import {parseJson} from '../src/core/types/object/json';
-import {setStyles} from '../src/style';
+import {setStyles} from '../src/core/dom/style';
 
 const libSourceUrl = dict({
   'canvas':

3p/embedly.js

@@ -16,7 +16,7 @@
 
 import {hasOwn} from '../src/core/types/object';
 import {loadScript} from './3p';
-import {setStyle} from '../src/style';
+import {setStyle} from '../src/core/dom/style';
 
 /**
  * Embedly platform library url to create cards.

3p/facebook.js

@@ -19,7 +19,7 @@ import {devAssert} from '../src/log';
 import {dict} from '../src/core/types/object';
 import {isEnumValue} from '../src/core/types/enum';
 import {loadScript} from './3p';
-import {setStyle} from '../src/style';
+import {setStyle} from '../src/core/dom/style';
 
 /** @const @enum {string} */
 export const FacebookEmbedType = {

3p/mathml.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {setStyle} from '../src/style';
+import {setStyle} from '../src/core/dom/style';
 import {userAssert} from '../src/log';
 import {writeScript} from './3p';
 

3p/twitter.js

@@ -17,7 +17,7 @@
 // TODO(malteubl) Move somewhere else since this is not an ad.
 
 import {loadScript} from './3p';
-import {setStyles} from '../src/style';
+import {setStyles} from '../src/core/dom/style';
 
 /**
  * Produces the Twitter API object for the passed in callback. If the current

ads/alp/handler.js

@@ -23,7 +23,7 @@ import {
 import {closest} from '../../src/core/dom/query';
 import {dev} from '../../src/log';
 import {dict} from '../../src/core/types/object';
-import {openWindowDialog} from '../../src/dom';
+import {openWindowDialog} from '../../src/open-window-dialog';
 import {parseQueryString} from '../../src/core/types/string/url';
 import {urls} from '../../src/config';
 

ads/google/a4a/test/test-utils.js

@@ -43,7 +43,7 @@ import {GEO_IN_GROUP} from '../../../../extensions/amp-geo/0.1/amp-geo-in-group'
 import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils';
 import {Services} from '../../../../src/services';
 import {buildUrl} from '../shared/url-builder';
-import {createElementWithAttributes} from '../../../../src/dom';
+import {createElementWithAttributes} from '../../../../src/core/dom';
 import {createIframePromise} from '../../../../testing/iframe';
 import {installDocService} from '../../../../src/service/ampdoc-impl';
 import {installExtensionsService} from '../../../../src/service/extensions-impl';

ads/google/a4a/utils.js

@@ -34,7 +34,7 @@ import {getPageLayoutBoxBlocking} from '../../../src/core/dom/page-layout-box';
 import {getTimingDataSync} from '../../../src/service/variable-source';
 import {internalRuntimeVersion} from '../../../src/internal-version';
 import {parseJson} from '../../../src/core/types/object/json';
-import {whenUpgradedToCustomElement} from '../../../src/dom';
+import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
 
 /** @type {string}  */
 const AMP_ANALYTICS_HEADER = 'X-AmpAnalytics';

ads/google/ima/ima-video.js

@@ -16,9 +16,13 @@
 
 import {CONSENT_POLICY_STATE} from '../../../src/core/constants/consent-state';
 import {ImaPlayerData} from './ima-player-data';
-import {camelCaseToTitleCase, setStyle, toggle} from '../../../src/style';
+import {
+  camelCaseToTitleCase,
+  setStyle,
+  toggle,
+} from '../../../src/core/dom/style';
 import {getData} from '../../../src/event-helper';
-import {htmlFor, htmlRefs, svgFor} from '../../../src/static-template';
+import {htmlFor, htmlRefs, svgFor} from '../../../src/core/dom/static-template';
 import {isArray, isObject} from '../../../src/core/types';
 import {loadScript} from '../../../3p/3p';
 import {throttle} from '../../../src/core/types/function';

ads/inabox/frame-overlay-helper.js

@@ -22,8 +22,8 @@ import {
   centerFrameUnderVsyncMutate,
   collapseFrameUnderVsyncMutate,
   expandFrameUnderVsyncMutate,
-} from '../../src/full-overlay-frame-helper';
-import {resetStyles, setImportantStyles} from '../../src/style';
+} from './full-overlay-frame-helper';
+import {resetStyles, setImportantStyles} from '../../src/core/dom/style';
 import {restrictedVsync, timer} from './util';
 
 const CENTER_TRANSITION_TIME_MS = 150;

src/full-overlay-frame-helper.js → ads/inabox/full-overlay-frame-helper.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {px, resetStyles, setStyles, translate} from './style';
+import {px, resetStyles, setStyles, translate} from '../../src/core/dom/style';
 
 /**
  * Centers a frame with a translate transition.

ads/vendors/_fakedelayed_.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {setStyles} from '../../src/style';
+import {setStyles} from '../../src/core/dom/style';
 import {validateData, writeScript} from '../../3p/3p';
 
 /**

ads/vendors/adspirit.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {setStyles} from '../../src/style';
+import {setStyles} from '../../src/core/dom/style';
 import {validateData} from '../../3p/3p';
 
 /**

ads/vendors/adverticum.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {setStyle} from '../../src/style';
+import {setStyle} from '../../src/core/dom/style';
 import {validateData, writeScript} from '../../3p/3p';
 /**
  * @param {!Window} global

ads/vendors/appnexus.js

@@ -15,7 +15,7 @@
  */
 
 import {loadScript, validateData, writeScript} from '../../3p/3p';
-import {setStyles} from '../../src/style';
+import {setStyles} from '../../src/core/dom/style';
 
 const APPNEXUS_AST_URL = 'https://acdn.adnxs.com/ast/ast.js';
 

ads/vendors/cedato.js

@@ -15,7 +15,7 @@
  */
 
 import {parseUrlDeprecated} from '../../src/url';
-import {setStyles} from '../../src/style';
+import {setStyles} from '../../src/core/dom/style';
 import {validateData} from '../../3p/3p';
 
 /**

ads/vendors/csa.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import {devAssert} from '../../src/log';
-import {getStyle, setStyle, setStyles} from '../../src/style';
+import {getStyle, setStyle, setStyles} from '../../src/core/dom/style';
 import {loadScript, validateData} from '../../3p/3p';
 import {tryParseJson} from '../../src/core/types/object/json';
 

ads/vendors/feedad.js

@@ -15,7 +15,7 @@
  */
 
 import {loadScript, validateData} from '../../3p/3p';
-import {setStyle} from '../../src/style';
+import {setStyle} from '../../src/core/dom/style';
 
 /**
  * @typedef FeedAdGlobal

ads/vendors/gumgum.js

@@ -15,7 +15,7 @@
  */
 
 import {loadScript, validateData} from '../../3p/3p';
-import {setStyles} from '../../src/style';
+import {setStyles} from '../../src/core/dom/style';
 
 /**
  * @param {!Window} global

ads/vendors/inmobi.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {setStyle} from '../../src/style';
+import {setStyle} from '../../src/core/dom/style';
 import {validateData, writeScript} from '../../3p/3p';
 
 /**

ads/vendors/medyanet.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {setStyles} from '../../src/style';
+import {setStyles} from '../../src/core/dom/style';
 import {validateData} from '../../3p/3p';
 
 /**

ads/vendors/mytarget.js

@@ -15,7 +15,7 @@
  */
 
 import {loadScript, validateData} from '../../3p/3p';
-import {setStyles} from '../../src/style';
+import {setStyles} from '../../src/core/dom/style';
 
 /**
  * @param {!Window} global

ads/vendors/ssp.js

@@ -16,7 +16,7 @@
 
 import {computeInMasterFrame, loadScript, validateData} from '../../3p/3p';
 import {parseJson} from '../../src/core/types/object/json';
-import {setStyle, setStyles} from '../../src/style';
+import {setStyle, setStyles} from '../../src/core/dom/style';
 
 /*
  * How to develop:

ads/vendors/uas.js

@@ -16,7 +16,7 @@
 
 import {hasOwn} from '../../src/core/types/object';
 import {loadScript, validateData} from '../../3p/3p';
-import {setStyles} from '../../src/style';
+import {setStyles} from '../../src/core/dom/style';
 
 /**
  * @param {!Object} theObject

build-system/eslint-rules/no-import-rename.js

@@ -33,19 +33,18 @@ const path = require('path');
 // otherName()
 
 const imports = {
+  'src/assert-display': ['assertDoesNotContainDisplay', 'assertNotDisplay'],
   'src/core/types/object': ['dict'],
-  'src/static-template': ['htmlFor'],
-  'src/experiments': ['isExperimentOn'],
-  'src/style': [
-    'assertDoesNotContainDisplay',
-    'assertNotDisplay',
+  'src/core/dom/css': ['escapeCssSelectorIdent', 'escapeCssSelectorNth'],
+  'src/core/dom/query': ['scopedQuerySelector', 'scopedQuerySelectorAll'],
+  'src/core/dom/static-template': ['htmlFor'],
+  'src/core/dom/style': [
     'resetStyles',
     'setImportantStyles',
     'setStyle',
     'setStyles',
   ],
-  'src/core/dom/css': ['escapeCssSelectorIdent', 'escapeCssSelectorNth'],
-  'src/dom': ['scopedQuerySelector', 'scopedQuerySelectorAll'],
+  'src/experiments': ['isExperimentOn'],
   'src/log': ['user', 'dev'],
   'src/mode': ['getMode'],
 };

build-system/eslint-rules/no-style-display.js

@@ -23,14 +23,14 @@ module.exports = function (context) {
 
   const displayMessage = [
     'Do not set the display property using setStyle.',
-    'Only the `toggle` helper in `src/style.js` is permitted to change the `display: none` style of an element.',
+    'Only the `toggle` helper in `src/core/dom/style.js` is permitted to change the `display: none` style of an element.',
     'Or use `setInitialDisplay` to setup an initial `display: block`, `inline-block`, etc., if it is not possible to do so in CSS.',
   ].join('\n\t');
 
   return {
     [setStyleCall]: function (node) {
       const filePath = context.getFilename();
-      if (filePath.endsWith('src/style.js')) {
+      if (filePath.endsWith('src/core/dom/style.js')) {
         return;
       }
 

build-system/eslint-rules/query-selector.js

@@ -78,7 +78,7 @@ module.exports = function (context) {
         'globally and filtered to just the elements inside the element. ' +
         'This leads to obscure bugs if you attempt to match a descendant ' +
         'of a descendant (ie querySelector("div div")). Instead, use the ' +
-        'scopedQuerySelector in src/dom.js',
+        'scopedQuerySelector in src/core/dom/query.js',
     });
   }
 

build-system/externs/amp.extern.js

@@ -1093,9 +1093,6 @@ class FeaturePolicy {
   getAllowlistForFeature(feature) {}
 }
 
-/** @type {boolean} */
-HTMLVideoElement.prototype.playsInline;
-
 /**
  * Going through the standardization process now.
  *
@@ -1105,9 +1102,6 @@ HTMLVideoElement.prototype.playsInline;
  */
 CSSStyleSheet.prototype.replaceSync = function (cssText) {};
 
-/** @type {?function(!MediaQueryListEvent)} */
-MediaQueryList.prototype.onchange;
-
 /** @type {!Array<!CSSStyleSheet>|undefined} */
 ShadowRoot.prototype.adoptedStyleSheets;
 

build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-amp-__component_name_hyphenated__.js

@@ -15,7 +15,7 @@
  */
 
 import '../amp-__component_name_hyphenated__';
-import {htmlFor} from '../../../../src/static-template';
+import {htmlFor} from '../../../../src/core/dom/static-template';
 import {toggleExperiment} from '../../../../src/experiments';
 import {waitFor} from '../../../../testing/test-helper';
 

build-system/tasks/make-extension/template/classic/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-amp-__component_name_hyphenated__.js

@@ -15,7 +15,7 @@
  */
 
 import '../amp-__component_name_hyphenated__';
-import {htmlFor} from '../../../../src/static-template';
+import {htmlFor} from '../../../../src/core/dom/static-template';
 
 describes.realWin(
   'amp-__component_name_hyphenated__-v__component_version__',

build-system/test-configs/conformance-config.textproto

@@ -11,9 +11,9 @@ requirement: {
 
 requirement: {
   type: BANNED_PROPERTY_READ
-  error_message: 'Use getStyle, setStyle, or setStyles in src/style.js'
+  error_message: 'Use getStyle, setStyle, or setStyles in src/core/dom/style.js'
   value: 'Element.prototype.style'
-  allowlist: 'src/style.js'
+  allowlist: 'src/core/dom/style.js'
   allowlist: 'src/layout.js'
 }
 
@@ -34,9 +34,9 @@ requirement: {
 
 requirement: {
   type: BANNED_PROPERTY_CALL
-  error_message: 'Use setStyle or setStyles in src/style.js'
+  error_message: 'Use setStyle or setStyles in src/core/dom/style.js'
   value: 'CSSStyleDeclaration.prototype.setProperty'
-  allowlist: 'src/style.js'
+  allowlist: 'src/core/dom/style.js'
 }
 
 # History

build-system/test-configs/dep-check-config.js

@@ -94,7 +94,7 @@ exports.rules = [
       '3p/**->src/core/types/string/index.js',
       '3p/**->src/core/types/string/url.js',
       '3p/**->src/log.js',
-      '3p/**->src/style.js',
+      '3p/**->src/core/dom/style.js',
       '3p/**->src/url.js',
       '3p/**->src/config.js',
       '3p/**->src/mode.js',
@@ -133,14 +133,14 @@ exports.rules = [
       'ads/**->src/log.js',
       'ads/**->src/mode.js',
       'ads/**->src/url.js',
-      'ads/**->src/static-template.js',
-      'ads/**->src/style.js',
+      'ads/**->src/core/dom/static-template.js',
+      'ads/**->src/core/dom/style.js',
       'ads/**->src/internal-version.js',
       // ads/google/a4a doesn't contain 3P ad code and should probably move
       // somewhere else at some point
       'ads/google/a4a/**->src/ad-cid.js',
       'ads/google/a4a/**->src/consent.js',
-      'ads/google/a4a/**->src/dom.js',
+      'ads/google/a4a/**->src/amp-element-helpers.js',
       'ads/google/a4a/**->src/experiments/index.js',
       'ads/google/a4a/**->src/services.js',
       'ads/google/a4a/utils.js->src/service/variable-source.js',