unwinds 'features' (isEnabled) but hits a cycle

CONTRIBUTING.md

@@ -82,11 +82,11 @@ production builds automatically.
 
   Give it a default of `null` so it will not be used in production builds.
 
-2. Import `isEnabled` from `ember-data/-private/features`, wrapping any new
+2. Import `isEnabled` from `ember-data/-private`, wrapping any new
   code with your feature:
 
   ```js
-  import isEnabled from 'ember-data/-private/features';
+  import { isEnabled } from 'ember-data/-private';
 
   if (isEnabled('ds-mynew-feature')) {
     // ... any additional code
@@ -99,7 +99,7 @@ production builds automatically.
   feature flag.
 
   ```js
-  import isEnabled from 'ember-data/-private/features';
+  import { isEnabled } from 'ember-data/-private';
 
   if (isEnabled('ds-mynew-feature')) {
     test('test for new feature', function(assert) {

addon/-private/index.js

@@ -3,13 +3,45 @@ export { default as Model } from './system/model/model';
 export { default as Errors } from './system/model/errors';
 export { default as Store }  from './system/store';
 export { default as DS } from './core';
+export { default as belongsTo } from './system/relationships/belongs-to';
+export { default as hasMany } from './system/relationships/has-many';
+export { default as BuildURLMixin } from './adapters/build-url-mixin';
+export { default as Snapshot } from './system/snapshot';
 
-// should be moved into public
+// maybe public ?
+export { default as normalizeModelName } from './system/normalize-model-name';
+export { modelHasAttributeOrRelationshipNamedType } from './utils';
+export { default as coerceId } from './system/coerce-id';
+export { default as parseResponseHeaders } from './utils/parse-response-headers';
+
+// should be moved into public ?
 export { default as NumberTransform } from './transforms/number';
 export { default as DateTransform } from './transforms/date';
 export { default as StringTransform } from './transforms/string';
 export { default as BooleanTransform } from './transforms/boolean';
 
-// should be private
+// should be private ?
 export { default as RootState } from './system/model/states';
 export { default as global } from './global';
+export { default as isEnabled } from './features';
+export { default as InternalModel } from './system/model/internal-model';
+
+export {
+  PromiseArray,
+  PromiseObject,
+  PromiseManyArray
+} from './system/promise-proxies';
+
+export {
+  RecordArray,
+  FilteredRecordArray,
+  AdapterPopulatedRecordArray
+} from './system/record-arrays';
+
+export { default as ManyArray } from './system/many-array';
+export { default as RecordArrayManager } from './system/record-array-manager';
+export { default as initializeStoreService } from './instance-initializers/initialize-store-service';
+export { default as Relationship } from './system/relationships/state/relationship';
+
+// Should be a different Repo ?
+export { default as DebugAdapter } from './system/debug/debug-adapter';

addon/-private/system/debug/debug-adapter.js

@@ -2,7 +2,7 @@
   @module ember-data
 */
 import Ember from 'ember';
-import Model from "../../../model";
+import Model from '../model/model';
 const capitalize = Ember.String.capitalize;
 const underscore = Ember.String.underscore;
 const { assert, get } = Ember;

addon/adapters/json-api.js

@@ -5,7 +5,7 @@
 
 import Ember from 'ember';
 import RESTAdapter from "./rest";
-import isEnabled from '../-private/features';
+import { isEnabled } from '../-private';
 import { instrument, deprecate } from 'ember-data/-debug';
 
 /**

addon/adapters/rest.js

@@ -16,10 +16,8 @@ import {
   TimeoutError,
   AbortError
 } from './errors';
-import BuildURLMixin from "../-private/adapters/build-url-mixin";
-import isEnabled from '../-private/features';
+import { parseResponseHeaders, BuildURLMixin, isEnabled } from '../-private';
 import { instrument, runInDebug, warn, deprecate } from 'ember-data/-debug';
-import parseResponseHeaders from '../-private/utils/parse-response-headers';
 
 const {
   MapWithDefault,

addon/index.js

@@ -13,34 +13,38 @@ if (Ember.VERSION.match(/^1\.([0-9]|1[0-2])\./)) {
                         ". Please upgrade your version of Ember, then upgrade Ember Data.");
 }
 
-import normalizeModelName from "./-private/system/normalize-model-name";
-import Snapshot from "./-private/system/snapshot";
 import InternalModel from "./-private/system/model/internal-model";
-import DebugAdapter from './-private/system/debug/debug-adapter';
-import isEnabled from "./-private/features";
-
-import {
-  PromiseArray,
-  PromiseObject,
-  PromiseManyArray
-} from "./-private/system/promise-proxies";
 
 import {
+  Snapshot,
+  DebugAdapter,
   DS,
+  BuildURLMixin,
+  belongsTo,
+  hasMany,
   global,
+  isEnabled,
   Errors,
   RootState,
   Model,
   Store,
+  normalizeModelName,
   DateTransform,
   NumberTransform,
   StringTransform,
-  BooleanTransform
+  BooleanTransform,
+  PromiseArray,
+  PromiseObject,
+  PromiseManyArray,
+  RecordArray,
+  FilteredRecordArray,
+  AdapterPopulatedRecordArray,
+  ManyArray,
+  RecordArrayManager,
+  Relationship,
+  initializeStoreService
 } from './-private';
 
-import Adapter from "./adapter";
-import Serializer from "./serializer";
-
 import {
   AdapterError,
   InvalidError,
@@ -56,28 +60,20 @@ import {
 } from "./adapters/errors";
 
 import "ember-inflector";
+import setupContainer from "./setup-container";
+
+import Adapter from "./adapter";
 import JSONAPIAdapter from './adapters/json-api';
 import RESTAdapter from './adapters/rest';
+
+import Serializer from "./serializer";
 import JSONAPISerializer from './serializers/json-api';
 import JSONSerializer from './serializers/json';
 import RESTSerializer from './serializers/rest';
-import EmbeddedRecordsMixin from "./serializers/embedded-records-mixin";
 
-import {
-  RecordArray,
-  FilteredRecordArray,
-  AdapterPopulatedRecordArray
-} from "./-private/system/record-arrays";
-import ManyArray from "./-private/system/many-array";
-import RecordArrayManager from "./-private/system/record-array-manager";
-import BuildURLMixin from "./-private/adapters/build-url-mixin";
+import EmbeddedRecordsMixin from "./serializers/embedded-records-mixin";
 
 import Transform from './transform';
-import { hasMany, belongsTo } from "./relationships";
-import setupContainer from "./setup-container";
-import initializeStoreService from './-private/instance-initializers/initialize-store-service';
-
-import Relationship from "./-private/system/relationships/state/relationship";
 import attr from './attr';
 
 DS.Store         = Store;

addon/relationships.js

@@ -1,12 +1,4 @@
 /**
   @module ember-data
 */
-
-import belongsTo from "./-private/system/relationships/belongs-to";
-import hasMany from "./-private/system/relationships/has-many";
-
-export {
-  belongsTo,
-  hasMany
-};
-
+export { belongsTo, hasMany } from './-private';

addon/serializers/json-api.js

@@ -6,8 +6,7 @@ import Ember from 'ember';
 import { pluralize, singularize } from 'ember-inflector';
 import { assert, deprecate, runInDebug, warn } from 'ember-data/-debug';
 import JSONSerializer from './json';
-import normalizeModelName from '../-private/system/normalize-model-name';
-import isEnabled from '../-private/features';
+import { normalizeModelName, isEnabled } from '../-private';
 
 const dasherize = Ember.String.dasherize;
 

addon/serializers/json.js

@@ -1,10 +1,7 @@
 import Ember from 'ember';
 import { assert, deprecate, warn } from 'ember-data/-debug';
 import Serializer from "../serializer";
-import coerceId from "../-private/system/coerce-id";
-import normalizeModelName from "../-private/system/normalize-model-name";
-import { modelHasAttributeOrRelationshipNamedType } from "../-private/utils";
-import isEnabled from '../-private/features';
+import { coerceId, modelHasAttributeOrRelationshipNamedType, normalizeModelName, isEnabled } from '../-private';
 
 import {
   getOwner

addon/serializers/rest.js

@@ -6,10 +6,7 @@ import Ember from 'ember';
 import { singularize } from "ember-inflector";
 import { assert, deprecate, runInDebug, warn } from 'ember-data/-debug';
 import JSONSerializer from "../serializers/json";
-import normalizeModelName from "../-private/system/normalize-model-name";
-import coerceId from "../-private/system/coerce-id";
-import { modelHasAttributeOrRelationshipNamedType } from "../-private/utils";
-import isEnabled from '../-private/features';
+import { coerceId, modelHasAttributeOrRelationshipNamedType, normalizeModelName, isEnabled } from '../-private';
 
 let camelize = Ember.String.camelize;
 

tests/integration/adapter/build-url-mixin-test.js

@@ -1,6 +1,6 @@
 import setupStore from 'dummy/tests/helpers/store';
 import Ember from 'ember';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 import {module, test} from 'qunit';
 

tests/integration/adapter/json-api-adapter-test.js

@@ -5,7 +5,7 @@ import {module, test} from 'qunit';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 var env, store, adapter;
 var passedUrl, passedVerb, passedHash;

tests/integration/adapter/rest-adapter-test.js

@@ -7,7 +7,7 @@ import {module, test} from 'qunit';
 import Pretender from "pretender";
 
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 var env, store, adapter, Post, Comment, SuperUser;
 var passedUrl, passedVerb, passedHash;

tests/integration/references/belongs-to-test.js

@@ -2,7 +2,7 @@ import DS from 'ember-data';
 import Ember from 'ember';
 import setupStore from 'dummy/tests/helpers/store';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 import { module, test } from 'qunit';
 
 var get = Ember.get;

tests/integration/references/has-many-test.js

@@ -1,7 +1,7 @@
 import DS from 'ember-data';
 import Ember from 'ember';
 import setupStore from 'dummy/tests/helpers/store';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import { module, test } from 'qunit';
 

tests/integration/serializers/json-api-serializer-test.js

@@ -4,7 +4,7 @@ import Ember from 'ember';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import {module, test} from 'qunit';
 
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 import DS from 'ember-data';
 

tests/integration/serializers/json-serializer-test.js

@@ -1,6 +1,6 @@
 import setupStore from 'dummy/tests/helpers/store';
 import Ember from 'ember';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import {module, test} from 'qunit';

tests/integration/serializers/rest-serializer-test.js

@@ -3,8 +3,7 @@ import Ember from 'ember';
 
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import {module, test} from 'qunit';
-
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 import DS from 'ember-data';
 

tests/integration/store-test.js

@@ -5,7 +5,7 @@ import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import {module, test} from 'qunit';
 
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 var store, env;
 

tests/unit/adapter-errors-test.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import {module, test} from 'qunit';
 

tests/unit/adapters/rest-adapter/ajax-test.js

@@ -4,7 +4,7 @@ import Ember from 'ember';
 import {module, test} from 'qunit';
 
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 var Person, Place, store, adapter, env;
 const { run } = Ember;

tests/unit/adapters/rest-adapter/group-records-for-find-many-test.js

@@ -4,7 +4,7 @@ import Ember from 'ember';
 import {module, test} from 'qunit';
 
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 let GroupsAdapter, store, requests;
 let maxLength;

tests/unit/model-test.js

@@ -4,7 +4,7 @@ import Ember from 'ember';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import {module, test} from 'qunit';
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 import { parseDate } from "ember-data/-private/ext/date";
 
 const { get, set, run } = Ember;

tests/unit/model/rollback-attributes-test.js

@@ -4,7 +4,7 @@ import Ember from 'ember';
 import {module, test} from 'qunit';
 
 import DS from 'ember-data';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 let env, store, Person;
 const { run  } = Ember;

tests/unit/store/push-test.js

@@ -6,7 +6,7 @@ import {module, test} from 'qunit';
 
 import DS from 'ember-data';
 
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 let env, store, Person, PhoneNumber, Post;
 const { attr, hasMany, belongsTo } = DS;

tests/unit/store/serialize-test.js

@@ -4,7 +4,7 @@ import attr from 'ember-data/attr';
 import Model from 'ember-data/model';
 import { createStore } from 'dummy/tests/helpers/store';
 import Ember from 'ember';
-import isEnabled from 'ember-data/-private/features';
+import { isEnabled } from 'ember-data/-private';
 
 const { run } = Ember;