Move document-state to services (#6336)

* Move document-state to services * fixes * fixes
ampproject · Nov 29, 2016 · 2ae68aa · 2ae68aa
1 parent b652d1c
commit 2ae68aa
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 14 deletions.
diff --git a/ads/google/a4a/test/test-google-ads-a4a-config.js b/ads/google/a4a/test/test-google-ads-a4a-config.js
@@ -24,7 +24,7 @@ import {resetExperimentToggles_} from '../../../../src/experiments';
 import {installPlatformService} from '../../../../src/service/platform-impl';
 import {installViewerServiceForDoc} from '../../../../src/service/viewer-impl';
 import {resetServiceForTesting} from '../../../../src/service';
-import {documentStateFor} from '../../../../src/document-state';
+import {documentStateFor} from '../../../../src/service/document-state';
 import * as sinon from 'sinon';
 
 const EXP_ID = 'EXP_ID';

diff --git a/build-system/tasks/presubmit-checks.js b/build-system/tasks/presubmit-checks.js
@@ -108,6 +108,16 @@ var forbiddenTerms = {
   '\\.prefetch\\(': {
     message: 'Do not use preconnect.prefetch, use preconnect.preload instead.'
   },
+  'documentStateFor': {
+    message: privateServiceFactory,
+    whitelist: [
+      'src/custom-element.js',
+      'src/style-installer.js',
+      'src/service/document-state.js',
+      'src/service/viewer-impl.js',
+      'src/service/vsync-impl.js',
+    ],
+  },
   'iframePing': {
     message: 'This is only available in vendor config for ' +
         'temporary workarounds.',

diff --git a/extensions/amp-analytics/0.1/test/test-instrumentation.js b/extensions/amp-analytics/0.1/test/test-instrumentation.js
@@ -28,7 +28,7 @@ import {installPlatformService} from '../../../../src/service/platform-impl';
 import {
     installResourcesServiceForDoc,
 } from '../../../../src/service/resources-impl';
-import {documentStateFor} from '../../../../src/document-state';
+import {documentStateFor} from '../../../../src/service/document-state';
 
 
 adopt(window);

diff --git a/extensions/amp-analytics/0.1/test/test-visibility-impl.js b/extensions/amp-analytics/0.1/test/test-visibility-impl.js
@@ -36,7 +36,7 @@ import {installPlatformService} from '../../../../src/service/platform-impl';
 import {
   installResourcesServiceForDoc,
 } from '../../../../src/service/resources-impl';
-import {documentStateFor} from '../../../../src/document-state';
+import {documentStateFor} from '../../../../src/service/document-state';
 
 adopt(window);
 

diff --git a/src/custom-element.js b/src/custom-element.js
@@ -22,7 +22,7 @@ import {ElementStub, stubbedElements} from './element-stub';
 import {ampdocServiceFor} from './ampdoc';
 import {createLoaderElement} from '../src/loader';
 import {dev, rethrowAsync, user} from './log';
-import {documentStateFor} from './document-state';
+import {documentStateFor} from './service/document-state';
 import {
   getIntersectionChangeEntry,
 } from '../src/intersection-observer-polyfill';

diff --git a/src/document-state.js → src/service/document-state.js b/src/document-state.js → src/service/document-state.js
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import {Observable} from './observable';
-import {fromClass} from './service';
-import {getVendorJsPropertyName} from './style';
-import {waitForChild} from './dom';
+import {Observable} from '../observable';
+import {fromClass} from '../service';
+import {getVendorJsPropertyName} from '../style';
+import {waitForChild} from '../dom';
 
 
 /**

diff --git a/src/service/viewer-impl.js b/src/service/viewer-impl.js
@@ -16,7 +16,7 @@
 
 import {Observable} from '../observable';
 import {findIndex} from '../utils/array';
-import {documentStateFor} from '../document-state';
+import {documentStateFor} from './document-state';
 import {getServiceForDoc} from '../service';
 import {dev} from '../log';
 import {
@@ -94,7 +94,7 @@ export class Viewer {
     /** @private @const {boolean} */
     this.isIframed_ = (this.win.parent && this.win.parent != this.win);
 
-    /** @const {!../document-state.DocumentState} */
+    /** @const {!./document-state.DocumentState} */
     this.docState_ = documentStateFor(this.win);
 
     /** @private {boolean} */

diff --git a/src/service/vsync-impl.js b/src/service/vsync-impl.js
@@ -18,7 +18,7 @@ import {Pass} from '../pass';
 import {ampdocServiceFor} from '../ampdoc';
 import {cancellation} from '../error';
 import {dev, rethrowAsync} from '../log';
-import {documentStateFor} from '../document-state';
+import {documentStateFor} from './document-state';
 import {getService} from '../service';
 import {installTimerService} from './timer-impl';
 import {viewerForDoc, viewerPromiseForDoc} from '../viewer';
@@ -62,7 +62,7 @@ export class Vsync {
     /** @private @const {!./ampdoc-impl.AmpDocService} */
     this.ampdocService_ = ampdocServiceFor(this.win);
 
-    /** @private @const {!../document-state.DocumentState} */
+    /** @private @const {!./document-state.DocumentState} */
     this.docState_ = documentStateFor(this.win);
 
     /** @private @const {function(function())}  */

diff --git a/src/style-installer.js b/src/style-installer.js
@@ -15,7 +15,7 @@
  */
 
 import {dev, rethrowAsync} from './log';
-import {documentStateFor} from './document-state';
+import {documentStateFor} from './service/document-state';
 import {performanceFor} from './performance';
 import {setStyles} from './style';
 import {waitForServices} from './render-delaying-services';

diff --git a/test/functional/test-document-state.js b/test/functional/test-document-state.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {DocumentState} from '../../src/document-state';
+import {DocumentState} from '../../src/service/document-state';
 import * as dom from '../../src/dom';
 import * as sinon from 'sinon';