[_refactored] observables into own folder

Reviewers: O3 Material JavaScript platform reviewers, #material_motion, O2 Material Motion, featherless Reviewed By: #material_motion, O2 Material Motion, featherless Tags: #material_motion Differential Revision: http://codereview.cc/D2494
material-motion · Jan 12, 2017 · 6e0b7e0 · 6e0b7e0
1 parent 6682bae
commit 6e0b7e0
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 10 deletions.
diff --git a/packages/streams/src/MotionRuntime.ts b/packages/streams/src/MotionRuntime.ts
@@ -21,7 +21,7 @@ import {
 import {
   MotionObservable,
   State,
-} from './MotionObservable';
+} from './observables/MotionObservable';
 
 import {
   MotionObserver,

diff --git a/packages/streams/src/index.ts b/packages/streams/src/index.ts
@@ -16,12 +16,7 @@
 
 export * from './types';
 export * from './properties';
-
-export * from './IndefiniteSubject';
-export { default as IndefiniteSubject } from './IndefiniteSubject';
-
-export * from './MotionObservable';
-export { default as MotionObservable } from './MotionObservable';
+export * from './observables';
 
 export * from './MotionRuntime';
 export { default as MotionRuntime } from './MotionRuntime';
diff --git a/packages/streams/src/IndefiniteSubject.ts → ...eams/src/observables/IndefiniteSubject.ts b/packages/streams/src/IndefiniteSubject.ts → ...eams/src/observables/IndefiniteSubject.ts
diff --git a/packages/streams/src/MotionObservable.ts → ...reams/src/observables/MotionObservable.ts b/packages/streams/src/MotionObservable.ts → ...reams/src/observables/MotionObservable.ts
@@ -26,7 +26,7 @@ import {
   MotionObserverOrNext,
   NextOperation,
   StateChannel,
-} from './types';
+} from '../types';
 
 export enum State {
   AT_REST = 0,

diff --git a/...s/src/__tests__/IndefiniteSubject.test.ts → ...ables/__tests__/IndefiniteSubject.test.ts b/...s/src/__tests__/IndefiniteSubject.test.ts → ...ables/__tests__/IndefiniteSubject.test.ts
diff --git a/...tests__/MotionObservable-debounce.test.ts → ...tests__/MotionObservable-debounce.test.ts b/...tests__/MotionObservable-debounce.test.ts → ...tests__/MotionObservable-debounce.test.ts
diff --git a/...__tests__/MotionObservable-filter.test.ts → ...__tests__/MotionObservable-filter.test.ts b/...__tests__/MotionObservable-filter.test.ts → ...__tests__/MotionObservable-filter.test.ts
diff --git a/...rc/__tests__/MotionObservable-map.test.ts → ...es/__tests__/MotionObservable-map.test.ts b/...rc/__tests__/MotionObservable-map.test.ts → ...es/__tests__/MotionObservable-map.test.ts
diff --git a/...s__/MotionObservable-nextOperator.test.ts → ...s__/MotionObservable-nextOperator.test.ts b/...s__/MotionObservable-nextOperator.test.ts → ...s__/MotionObservable-nextOperator.test.ts
diff --git a/...ms/src/__tests__/MotionObservable.test.ts → ...vables/__tests__/MotionObservable.test.ts b/...ms/src/__tests__/MotionObservable.test.ts → ...vables/__tests__/MotionObservable.test.ts
diff --git a/packages/streams/src/observables/index.ts b/packages/streams/src/observables/index.ts
@@ -0,0 +1,21 @@
+/** @license
+ *  Copyright 2016 - present The Material Motion 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 * from './IndefiniteSubject';
+export { default as IndefiniteSubject } from './IndefiniteSubject';
+
+export * from './MotionObservable';
+export { default as MotionObservable } from './MotionObservable';
diff --git a/packages/streams/src/properties/ReactiveProperty.ts b/packages/streams/src/properties/ReactiveProperty.ts
@@ -22,7 +22,7 @@ import {
 
 import {
   IndefiniteSubject,
-} from '../IndefiniteSubject';
+} from '../observables/IndefiniteSubject';
 
 import {
   ScopedReadable,

diff --git a/packages/streams/src/sources/__tests__/scrollSource.test.ts b/packages/streams/src/sources/__tests__/scrollSource.test.ts
@@ -39,7 +39,7 @@ require('chai').use(
   require('sinon-chai')
 );
 
-import MotionObservable from '../../MotionObservable';
+import MotionObservable from '../../observables/MotionObservable';
 import scrollSource from '../scrollSource';
 
 describe('scrollSource',