Move dom streaming helpers to core/dom/stream

ampproject · May 26, 2021 · 6486151 · 6486151
1 parent 1b17786
commit 6486151
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/src/utils/detached-dom-stream.js → src/core/dom/stream/detached.js b/src/utils/detached-dom-stream.js → src/core/dom/stream/detached.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {devAssert} from '../core/assert';
+import {devAssert} from '../../assert';
 
 export class DetachedDomStream {
   /**

diff --git a/src/core/dom/stream/index.js b/src/core/dom/stream/index.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2021 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.
+ */
+
+export {DetachedDomStream} from './detached';
+export {streamResponseToWriter} from './response';
+// TODO(#32693): Migrate DomTransformStream into core to finish the trio
diff --git a/src/utils/stream-response.js → src/core/dom/stream/response.js b/src/utils/stream-response.js → src/core/dom/stream/response.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {Deferred} from '../core/data-structures/promise';
+import {Deferred} from '../../data-structures/promise';
 
 /**
  * Decodes readable stream from response and writes to given writeable stream.
@@ -23,7 +23,7 @@ import {Deferred} from '../core/data-structures/promise';
  * This function should be replaced with transform stream when well supported.
  * @param {!Window} win
  * @param {!Response} response
- * @param {!./detached-dom-stream.DetachedDomStream} writer
+ * @param {!./detached.DetachedDomStream} writer
  * @return {!Promise<boolean>} true if response has content, false if
  * the response is empty.
  */

diff --git a/test/unit/utils/test-detached-dom-stream.js → test/unit/core/dom/stream/test-detached.js b/test/unit/utils/test-detached-dom-stream.js → test/unit/core/dom/stream/test-detached.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import {DetachedDomStream} from '../../../src/utils/detached-dom-stream';
+import {DetachedDomStream} from '../../../../../src/utils/detached-dom-stream';
 
-describes.fakeWin('DetachedDomStream', {amp: true}, (env) => {
+describes.fakeWin('DOM - stream - DetachedDomStream', {amp: true}, (env) => {
   let win;
   let chunkSpy;
   let endSpy;

diff --git a/test/unit/utils/test-stream-response.js → test/unit/core/dom/stream/test-response.js b/test/unit/utils/test-stream-response.js → test/unit/core/dom/stream/test-response.js
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import {macroTask} from '../../../testing/yield';
-import {streamResponseToWriter} from '../../../src/utils/stream-response';
+import {macroTask} from '../../../../../testing/yield';
+import {streamResponseToWriter} from '../../../../..src/utils/stream-response';
 
 const chunk1 = `
  <!doctype html>
@@ -33,7 +33,7 @@ const chunk2 = `
  </html>
 `;
 
-describes.fakeWin('streamResponseToWriter', {}, (env) => {
+describes.fakeWin('DOM - stream - streamResponseToWriter', {}, (env) => {
   let writeSpy;
   let closeSpy;
   let mockWriter;