Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move private modules into the -private directory #3986

Merged
merged 1 commit into from
Dec 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions addon/-private/adapters.js
Original file line number Diff line number Diff line change
@@ -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
};
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
*/

import Ember from 'ember';
import Adapter from "ember-data/system/adapter";
import Adapter from "ember-data/-private/system/adapter";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RESTAdapter is public API though right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now in Ember Data 2.2.0 the public api to access any Ember Data module is:

import DS from 'ember-data';

// then do something with `DS.RESTAdapter`

Instead of trying to make a judgement call about what we should allow users to import and what we should keep hidden I decided to move everything into the -private module path. After this is merged we can open new prs to move things like the RESTAdapter to a public path. That way we can be more deliberate and discerning about what gets exposed publicly.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another way of putting this: to date Ember Data's public API has been strictly the globals output (which seems unchanged by this PR). This PR helps ensure that we are not inadvertently making many more of our internals "public" because the modules are importable and not marked as private.

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
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion addon/debug.js → addon/-private/debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ export function warn() {
export function debugSeal() {
return Ember.debugSeal(...arguments);
}

Original file line number Diff line number Diff line change
@@ -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;
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions addon/-private/serializers.js
Original file line number Diff line number Diff line change
@@ -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
};
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
11 changes: 11 additions & 0 deletions addon/-private/setup-container.js
Original file line number Diff line number Diff line change
@@ -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);
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 8 additions & 0 deletions addon/-private/system/debug.js
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Model from "ember-data/system/model";
import Model from "ember-data/-private/system/model";

Model.reopen({

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
File renamed without changes.
16 changes: 16 additions & 0 deletions addon/-private/system/model.js
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
/*
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
13 changes: 13 additions & 0 deletions addon/-private/system/record-arrays.js
Original file line number Diff line number Diff line change
@@ -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
};
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading