Merge pull request #3986 from bmac/private-modules

Move private modules into the `-private` directory

addon/-private/adapters.js

@@ -0,0 +1,11 @@
+/**
+  @module ember-data
+*/
+
+import JSONAPIAdapter from "ember-data/-private/adapters/json-api-adapter";
+import RESTAdapter from "ember-data/-private/adapters/rest-adapter";
+
+export {
+  JSONAPIAdapter,
+  RESTAdapter
+};

addon/adapters/errors.js → addon/-private/adapters/errors.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import {assert} from 'ember-data/debug';
+import {assert} from 'ember-data/-private/debug';
 
 const EmberError = Ember.Error;
 

addon/adapters/json-api-adapter.js → addon/-private/adapters/json-api-adapter.js

@@ -3,7 +3,7 @@
 */
 
 import Ember from 'ember';
-import RESTAdapter from "ember-data/adapters/rest-adapter";
+import RESTAdapter from "ember-data/-private/adapters/rest-adapter";
 
 /**
   @class JSONAPIAdapter

addon/adapters/rest-adapter.js → addon/-private/adapters/rest-adapter.js

@@ -3,18 +3,18 @@
 */
 
 import Ember from 'ember';
-import Adapter from "ember-data/system/adapter";
+import Adapter from "ember-data/-private/system/adapter";
 import {
   AdapterError,
   InvalidError,
   TimeoutError,
   AbortError
-} from 'ember-data/adapters/errors';
-import EmptyObject from "ember-data/system/empty-object";
+} from 'ember-data/-private/adapters/errors';
+import EmptyObject from "ember-data/-private/system/empty-object";
 var get = Ember.get;
 var MapWithDefault = Ember.MapWithDefault;
 
-import BuildURLMixin from "ember-data/adapters/build-url-mixin";
+import BuildURLMixin from "ember-data/-private/adapters/build-url-mixin";
 
 /**
   The REST adapter allows your store to communicate with an HTTP server by

addon/debug.js → addon/-private/debug.js

@@ -27,4 +27,3 @@ export function warn() {
 export function debugSeal() {
   return Ember.debugSeal(...arguments);
 }
-

addon/ember-initializer.js → addon/-private/ember-initializer.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import setupContainer from 'ember-data/setup-container';
-import initializeStoreService from 'ember-data/instance-initializers/initialize-store-service';
+import setupContainer from 'ember-data/-private/setup-container';
+import initializeStoreService from 'ember-data/-private/instance-initializers/initialize-store-service';
 
 
 var K = Ember.K;

addon/initializers/data-adapter.js → addon/-private/initializers/data-adapter.js

@@ -1,4 +1,4 @@
-import DebugAdapter from "ember-data/system/debug/debug-adapter";
+import DebugAdapter from "ember-data/-private/system/debug/debug-adapter";
 
 /**
   Configures a registry with injections on Ember applications

addon/initializers/store.js → addon/-private/initializers/store.js

@@ -1,6 +1,6 @@
-import Store from "ember-data/system/store";
-import { JSONAPISerializer, JSONSerializer, RESTSerializer } from "ember-data/serializers";
-import { JSONAPIAdapter, RESTAdapter } from "ember-data/adapters";
+import Store from "ember-data/-private/system/store";
+import { JSONAPISerializer, JSONSerializer, RESTSerializer } from "ember-data/-private/serializers";
+import { JSONAPIAdapter, RESTAdapter } from "ember-data/-private/adapters";
 
 function has(applicationOrRegistry, fullName) {
   if (applicationOrRegistry.has) {

addon/initializers/transforms.js → addon/-private/initializers/transforms.js

@@ -3,7 +3,7 @@ import {
   DateTransform,
   StringTransform,
   NumberTransform
-} from "ember-data/transforms";
+} from "ember-data/-private/transforms";
 
 /**
   Configures a registry for use with Ember-Data

addon/-private/serializers.js

@@ -0,0 +1,13 @@
+/**
+  @module ember-data
+*/
+
+import JSONAPISerializer from "ember-data/-private/serializers/json-api-serializer";
+import JSONSerializer from "ember-data/-private/serializers/json-serializer";
+import RESTSerializer from "ember-data/-private/serializers/rest-serializer";
+
+export {
+  JSONAPISerializer,
+  JSONSerializer,
+  RESTSerializer
+};

addon/serializers/embedded-records-mixin.js → addon/-private/serializers/embedded-records-mixin.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { warn } from "ember-data/debug";
+import { warn } from "ember-data/-private/debug";
 
 var get = Ember.get;
 var set = Ember.set;

addon/serializers/json-api-serializer.js → addon/-private/serializers/json-api-serializer.js

@@ -3,9 +3,9 @@
 */
 
 import Ember from 'ember';
-import { assert, runInDebug, warn } from 'ember-data/debug';
-import JSONSerializer from 'ember-data/serializers/json-serializer';
-import normalizeModelName from 'ember-data/system/normalize-model-name';
+import { assert, runInDebug, warn } from 'ember-data/-private/debug';
+import JSONSerializer from 'ember-data/-private/serializers/json-serializer';
+import normalizeModelName from 'ember-data/-private/system/normalize-model-name';
 import { pluralize, singularize } from 'ember-inflector';
 
 var dasherize = Ember.String.dasherize;

addon/serializers/json-serializer.js → addon/-private/serializers/json-serializer.js

@@ -1,15 +1,15 @@
 import Ember from 'ember';
-import { assert, warn } from 'ember-data/debug';
-import Serializer from "ember-data/system/serializer";
-import coerceId from "ember-data/system/coerce-id";
-import normalizeModelName from "ember-data/system/normalize-model-name";
-import { modelHasAttributeOrRelationshipNamedType } from "ember-data/utils";
+import { assert, warn } from 'ember-data/-private/debug';
+import Serializer from "ember-data/-private/system/serializer";
+import coerceId from "ember-data/-private/system/coerce-id";
+import normalizeModelName from "ember-data/-private/system/normalize-model-name";
+import { modelHasAttributeOrRelationshipNamedType } from "ember-data/-private/utils";
 
 import {
   getOwner
-} from 'ember-data/utils';
+} from 'ember-data/-private/utils';
 
-import { errorsArrayToHash } from "ember-data/adapters/errors";
+import { errorsArrayToHash } from "ember-data/-private/adapters/errors";
 
 var get = Ember.get;
 var isNone = Ember.isNone;

addon/serializers/rest-serializer.js → addon/-private/serializers/rest-serializer.js

@@ -3,12 +3,12 @@
 */
 
 import Ember from 'ember';
-import { assert, deprecate, runInDebug, warn } from "ember-data/debug";
-import JSONSerializer from "ember-data/serializers/json-serializer";
-import normalizeModelName from "ember-data/system/normalize-model-name";
+import { assert, deprecate, runInDebug, warn } from "ember-data/-private/debug";
+import JSONSerializer from "ember-data/-private/serializers/json-serializer";
+import normalizeModelName from "ember-data/-private/system/normalize-model-name";
 import {singularize} from "ember-inflector";
-import coerceId from "ember-data/system/coerce-id";
-import { modelHasAttributeOrRelationshipNamedType } from "ember-data/utils";
+import coerceId from "ember-data/-private/system/coerce-id";
+import { modelHasAttributeOrRelationshipNamedType } from "ember-data/-private/utils";
 
 var camelize = Ember.String.camelize;
 

addon/-private/setup-container.js

@@ -0,0 +1,11 @@
+import initializeStore from 'ember-data/-private/initializers/store';
+import initializeTransforms from 'ember-data/-private/initializers/transforms';
+import initializeStoreInjections from 'ember-data/-private/initializers/store-injections';
+import initializeDataAdapter from 'ember-data/-private/initializers/data-adapter';
+
+export default function setupContainer(application) {
+  initializeDataAdapter(application);
+  initializeTransforms(application);
+  initializeStoreInjections(application);
+  initializeStore(application);
+}

addon/system/clone-null.js → addon/-private/system/clone-null.js

@@ -1,4 +1,4 @@
-import EmptyObject from "ember-data/system/empty-object";
+import EmptyObject from "ember-data/-private/system/empty-object";
 export default function cloneNull(source) {
   var clone = new EmptyObject();
   for (var key in source) {

addon/system/container-proxy.js → addon/-private/system/container-proxy.js

@@ -1,4 +1,4 @@
-import { deprecate } from "ember-data/debug";
+import { deprecate } from "ember-data/-private/debug";
 
 /**
   This is used internally to enable deprecation of container paths and provide

addon/-private/system/debug.js

@@ -0,0 +1,8 @@
+/**
+  @module ember-data
+*/
+
+import "ember-data/-private/system/debug/debug-info";
+import DebugAdapter from "ember-data/-private/system/debug/debug-adapter";
+
+export default DebugAdapter;

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

@@ -2,7 +2,7 @@
   @module ember-data
 */
 import Ember from 'ember';
-import Model from "ember-data/system/model";
+import Model from "ember-data/-private/system/model";
 var get = Ember.get;
 var capitalize = Ember.String.capitalize;
 var underscore = Ember.String.underscore;

addon/system/debug/debug-info.js → addon/-private/system/debug/debug-info.js

@@ -1,4 +1,4 @@
-import Model from "ember-data/system/model";
+import Model from "ember-data/-private/system/model";
 
 Model.reopen({
 

addon/system/many-array.js → addon/-private/system/many-array.js

@@ -2,8 +2,8 @@
   @module ember-data
 */
 import Ember from 'ember';
-import { assert } from "ember-data/debug";
-import { PromiseArray } from "ember-data/system/promise-proxies";
+import { assert } from "ember-data/-private/debug";
+import { PromiseArray } from "ember-data/-private/system/promise-proxies";
 
 var get = Ember.get;
 var set = Ember.set;

addon/-private/system/model.js

@@ -0,0 +1,16 @@
+/**
+  @module ember-data
+*/
+
+import Model from "ember-data/-private/system/model/model";
+import attr from "ember-data/-private/system/model/attributes";
+import RootState from "ember-data/-private/system/model/states";
+import Errors from "ember-data/-private/system/model/errors";
+
+export {
+  RootState,
+  attr,
+  Errors
+};
+
+export default Model;

addon/system/model/attributes.js → addon/-private/system/model/attributes.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Model from "ember-data/system/model/model";
-import { assert, deprecate } from "ember-data/debug";
+import Model from "ember-data/-private/system/model/model";
+import { assert, deprecate } from "ember-data/-private/debug";
 
 /**
   @module ember-data

addon/system/model/errors.js → addon/-private/system/model/errors.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { deprecate, warn } from "ember-data/debug";
+import { deprecate, warn } from "ember-data/-private/debug";
 
 var get = Ember.get;
 var set = Ember.set;

addon/system/model/internal-model.js → addon/-private/system/model/internal-model.js

@@ -1,14 +1,14 @@
 import Ember from 'ember';
-import { assert } from "ember-data/debug";
-import merge from "ember-data/system/merge";
-import RootState from "ember-data/system/model/states";
-import Relationships from "ember-data/system/relationships/state/create";
-import Snapshot from "ember-data/system/snapshot";
-import EmptyObject from "ember-data/system/empty-object";
+import { assert } from "ember-data/-private/debug";
+import merge from "ember-data/-private/system/merge";
+import RootState from "ember-data/-private/system/model/states";
+import Relationships from "ember-data/-private/system/relationships/state/create";
+import Snapshot from "ember-data/-private/system/snapshot";
+import EmptyObject from "ember-data/-private/system/empty-object";
 
 import {
   getOwner
-} from 'ember-data/utils';
+} from 'ember-data/-private/utils';
 
 var Promise = Ember.RSVP.Promise;
 var get = Ember.get;

addon/system/model/model.js → addon/-private/system/model/model.js

@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import { assert, deprecate } from "ember-data/debug";
-import { PromiseObject } from "ember-data/system/promise-proxies";
-import Errors from "ember-data/system/model/errors";
+import { assert, deprecate } from "ember-data/-private/debug";
+import { PromiseObject } from "ember-data/-private/system/promise-proxies";
+import Errors from "ember-data/-private/system/model/errors";
 
 /**
   @module ember-data

addon/system/model/states.js → addon/-private/system/model/states.js

@@ -2,7 +2,7 @@
   @module ember-data
 */
 import Ember from 'ember';
-import { assert } from "ember-data/debug";
+import { assert } from "ember-data/-private/debug";
 
 var get = Ember.get;
 /*

addon/system/promise-proxies.js → addon/-private/system/promise-proxies.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { assert } from "ember-data/debug";
+import { assert } from "ember-data/-private/debug";
 
 var Promise = Ember.RSVP.Promise;
 var get = Ember.get;

addon/system/record-array-manager.js → addon/-private/system/record-array-manager.js

@@ -7,9 +7,9 @@ import {
   RecordArray,
   FilteredRecordArray,
   AdapterPopulatedRecordArray
-} from "ember-data/system/record-arrays";
+} from "ember-data/-private/system/record-arrays";
 var  MapWithDefault = Ember.MapWithDefault;
-import OrderedSet from "ember-data/system/ordered-set";
+import OrderedSet from "ember-data/-private/system/ordered-set";
 var get = Ember.get;
 
 /**

addon/-private/system/record-arrays.js

@@ -0,0 +1,13 @@
+/**
+  @module ember-data
+*/
+
+import RecordArray from "ember-data/-private/system/record-arrays/record-array";
+import FilteredRecordArray from "ember-data/-private/system/record-arrays/filtered-record-array";
+import AdapterPopulatedRecordArray from "ember-data/-private/system/record-arrays/adapter-populated-record-array";
+
+export {
+  RecordArray,
+  FilteredRecordArray,
+  AdapterPopulatedRecordArray
+};

addon/system/record-arrays/adapter-populated-record-array.js → addon/-private/system/record-arrays/adapter-populated-record-array.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import RecordArray from "ember-data/system/record-arrays/record-array";
-import cloneNull from "ember-data/system/clone-null";
+import RecordArray from "ember-data/-private/system/record-arrays/record-array";
+import cloneNull from "ember-data/-private/system/clone-null";
 
 /**
   @module ember-data

addon/system/record-arrays/filtered-record-array.js → addon/-private/system/record-arrays/filtered-record-array.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import RecordArray from "ember-data/system/record-arrays/record-array";
+import RecordArray from "ember-data/-private/system/record-arrays/record-array";
 
 /**
   @module ember-data

addon/system/record-arrays/record-array.js → addon/-private/system/record-arrays/record-array.js

@@ -3,8 +3,8 @@
 */
 
 import Ember from 'ember';
-import { PromiseArray } from "ember-data/system/promise-proxies";
-import SnapshotRecordArray from "ember-data/system/snapshot-record-array";
+import { PromiseArray } from "ember-data/-private/system/promise-proxies";
+import SnapshotRecordArray from "ember-data/-private/system/snapshot-record-array";
 
 var get = Ember.get;
 var set = Ember.set;

addon/system/relationship-meta.js → addon/-private/system/relationship-meta.js

@@ -1,5 +1,5 @@
 import {singularize} from 'ember-inflector';
-import normalizeModelName from 'ember-data/system/normalize-model-name';
+import normalizeModelName from 'ember-data/-private/system/normalize-model-name';
 
 export function typeForRelationshipMeta(meta) {
   var modelName;

addon/system/relationships.js → addon/-private/system/relationships.js

@@ -5,7 +5,7 @@
 import belongsTo from "./relationships/belongs-to";
 import hasMany from "./relationships/has-many";
 
-import "ember-data/system/relationships/ext";
+import "ember-data/-private/system/relationships/ext";
 
 export {
   belongsTo,

addon/system/relationships/belongs-to.js → addon/-private/system/relationships/belongs-to.js

@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import { assert, warn } from "ember-data/debug";
-import Model from 'ember-data/system/model';
-import normalizeModelName from "ember-data/system/normalize-model-name";
+import { assert, warn } from "ember-data/-private/debug";
+import Model from 'ember-data/-private/system/model';
+import normalizeModelName from "ember-data/-private/system/normalize-model-name";
 
 /**
   `DS.belongsTo` is used to define One-To-One and One-To-Many