ember-source 4.3.0-alpha.2 → 4.4.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. package/CHANGELOG.md +6 -2
  2. package/build-metadata.json +3 -3
  3. package/dist/dependencies/router_js.js +66 -31
  4. package/dist/ember-template-compiler.js +1169 -779
  5. package/dist/ember-template-compiler.map +1 -1
  6. package/dist/ember-testing.js +74 -43
  7. package/dist/ember-testing.map +1 -1
  8. package/dist/ember.debug.js +3290 -2760
  9. package/dist/ember.debug.map +1 -1
  10. package/dist/header/license.js +1 -1
  11. package/dist/packages/@ember/-internals/container/index.js +15 -11
  12. package/dist/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js +3 -3
  13. package/dist/packages/@ember/-internals/extension-support/lib/data_adapter.js +52 -52
  14. package/dist/packages/@ember/-internals/glimmer/index.js +139 -103
  15. package/dist/packages/@ember/-internals/meta/lib/meta.js +8 -9
  16. package/dist/packages/@ember/-internals/metal/index.js +44 -45
  17. package/dist/packages/@ember/-internals/routing/lib/ext/controller.js +10 -8
  18. package/dist/packages/@ember/-internals/routing/lib/location/auto_location.js +3 -1
  19. package/dist/packages/@ember/-internals/routing/lib/services/router.js +155 -190
  20. package/dist/packages/@ember/-internals/routing/lib/services/routing.js +3 -1
  21. package/dist/packages/@ember/-internals/routing/lib/system/route-info.js +2 -2
  22. package/dist/packages/@ember/-internals/routing/lib/system/route.js +110 -378
  23. package/dist/packages/@ember/-internals/routing/lib/system/router.js +74 -36
  24. package/dist/packages/@ember/-internals/routing/lib/utils.js +33 -21
  25. package/dist/packages/@ember/-internals/runtime/lib/mixins/-proxy.js +1 -1
  26. package/dist/packages/@ember/-internals/runtime/lib/mixins/array.js +1 -0
  27. package/dist/packages/@ember/-internals/runtime/lib/mixins/comparable.js +4 -4
  28. package/dist/packages/@ember/-internals/runtime/lib/mixins/container_proxy.js +29 -29
  29. package/dist/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.js +16 -16
  30. package/dist/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js +48 -48
  31. package/dist/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js +8 -8
  32. package/dist/packages/@ember/-internals/runtime/lib/system/namespace.js +1 -2
  33. package/dist/packages/@ember/-internals/runtime/lib/type-of.js +1 -1
  34. package/dist/packages/@ember/-internals/utils/index.js +10 -8
  35. package/dist/packages/@ember/-internals/views/lib/system/utils.js +2 -0
  36. package/dist/packages/@ember/array/index.js +1 -1
  37. package/dist/packages/@ember/controller/index.js +3 -54
  38. package/dist/packages/@ember/instrumentation/index.js +9 -13
  39. package/dist/packages/@ember/object/compat.js +16 -7
  40. package/dist/packages/@ember/routing/router-service.js +1 -0
  41. package/dist/packages/@ember/service/index.js +6 -73
  42. package/dist/packages/ember/version.js +1 -1
  43. package/docs/data.json +571 -521
  44. package/package.json +13 -13
@@ -16,7 +16,7 @@ export default Mixin.create({
16
16
 
17
17
  /**
18
18
  Given a fullName return the corresponding factory.
19
- @public
19
+ @public
20
20
  @method resolveRegistration
21
21
  @param {String} fullName
22
22
  @return {Function} fullName's factory
@@ -30,48 +30,48 @@ export default Mixin.create({
30
30
  Registers a factory that can be used for dependency injection (with
31
31
  `inject`) or for service lookup. Each factory is registered with
32
32
  a full name including two parts: `type:name`.
33
- A simple example:
34
- ```javascript
33
+ A simple example:
34
+ ```javascript
35
35
  import Application from '@ember/application';
36
36
  import EmberObject from '@ember/object';
37
- let App = Application.create();
38
- App.Orange = EmberObject.extend();
37
+ let App = Application.create();
38
+ App.Orange = EmberObject.extend();
39
39
  App.register('fruit:favorite', App.Orange);
40
40
  ```
41
- Ember will resolve factories from the `App` namespace automatically.
41
+ Ember will resolve factories from the `App` namespace automatically.
42
42
  For example `App.CarsController` will be discovered and returned if
43
43
  an application requests `controller:cars`.
44
- An example of registering a controller with a non-standard name:
45
- ```javascript
44
+ An example of registering a controller with a non-standard name:
45
+ ```javascript
46
46
  import Application from '@ember/application';
47
47
  import Controller from '@ember/controller';
48
- let App = Application.create();
48
+ let App = Application.create();
49
49
  let Session = Controller.extend();
50
- App.register('controller:session', Session);
51
- // The Session controller can now be treated like a normal controller,
50
+ App.register('controller:session', Session);
51
+ // The Session controller can now be treated like a normal controller,
52
52
  // despite its non-standard name.
53
53
  App.ApplicationController = Controller.extend({
54
54
  needs: ['session']
55
55
  });
56
56
  ```
57
- Registered factories are **instantiated** by having `create`
57
+ Registered factories are **instantiated** by having `create`
58
58
  called on them. Additionally they are **singletons**, each time
59
59
  they are looked up they return the same instance.
60
- Some examples modifying that default behavior:
61
- ```javascript
60
+ Some examples modifying that default behavior:
61
+ ```javascript
62
62
  import Application from '@ember/application';
63
63
  import EmberObject from '@ember/object';
64
- let App = Application.create();
65
- App.Person = EmberObject.extend();
64
+ let App = Application.create();
65
+ App.Person = EmberObject.extend();
66
66
  App.Orange = EmberObject.extend();
67
67
  App.Email = EmberObject.extend();
68
68
  App.session = EmberObject.create();
69
- App.register('model:user', App.Person, { singleton: false });
69
+ App.register('model:user', App.Person, { singleton: false });
70
70
  App.register('fruit:favorite', App.Orange);
71
71
  App.register('communication:main', App.Email, { singleton: false });
72
72
  App.register('session', App.session, { instantiate: false });
73
73
  ```
74
- @method register
74
+ @method register
75
75
  @param fullName {String} type:name (e.g., 'model:user')
76
76
  @param factory {any} (e.g., App.Person)
77
77
  @param options {Object} (optional) disable instantiation or singleton usage
@@ -81,17 +81,17 @@ export default Mixin.create({
81
81
 
82
82
  /**
83
83
  Unregister a factory.
84
- ```javascript
84
+ ```javascript
85
85
  import Application from '@ember/application';
86
86
  import EmberObject from '@ember/object';
87
- let App = Application.create();
87
+ let App = Application.create();
88
88
  let User = EmberObject.extend();
89
89
  App.register('model:user', User);
90
- App.resolveRegistration('model:user').create() instanceof User //=> true
91
- App.unregister('model:user')
90
+ App.resolveRegistration('model:user').create() instanceof User //=> true
91
+ App.unregister('model:user')
92
92
  App.resolveRegistration('model:user') === undefined //=> true
93
93
  ```
94
- @public
94
+ @public
95
95
  @method unregister
96
96
  @param {String} fullName
97
97
  */
@@ -99,7 +99,7 @@ export default Mixin.create({
99
99
 
100
100
  /**
101
101
  Check if a factory is registered.
102
- @public
102
+ @public
103
103
  @method hasRegistration
104
104
  @param {String} fullName
105
105
  @return {Boolean}
@@ -108,7 +108,7 @@ export default Mixin.create({
108
108
 
109
109
  /**
110
110
  Return a specific registered option for a particular factory.
111
- @public
111
+ @public
112
112
  @method registeredOption
113
113
  @param {String} fullName
114
114
  @param {String} optionName
@@ -118,7 +118,7 @@ export default Mixin.create({
118
118
 
119
119
  /**
120
120
  Register options for a particular factory.
121
- @public
121
+ @public
122
122
  @method registerOptions
123
123
  @param {String} fullName
124
124
  @param {Object} options
@@ -127,7 +127,7 @@ export default Mixin.create({
127
127
 
128
128
  /**
129
129
  Return registered options for a particular factory.
130
- @public
130
+ @public
131
131
  @method registeredOptions
132
132
  @param {String} fullName
133
133
  @return {Object} options
@@ -136,22 +136,22 @@ export default Mixin.create({
136
136
 
137
137
  /**
138
138
  Allow registering options for all factories of a type.
139
- ```javascript
139
+ ```javascript
140
140
  import Application from '@ember/application';
141
- let App = Application.create();
141
+ let App = Application.create();
142
142
  let appInstance = App.buildInstance();
143
- // if all of type `connection` must not be singletons
143
+ // if all of type `connection` must not be singletons
144
144
  appInstance.registerOptionsForType('connection', { singleton: false });
145
- appInstance.register('connection:twitter', TwitterConnection);
145
+ appInstance.register('connection:twitter', TwitterConnection);
146
146
  appInstance.register('connection:facebook', FacebookConnection);
147
- let twitter = appInstance.lookup('connection:twitter');
147
+ let twitter = appInstance.lookup('connection:twitter');
148
148
  let twitter2 = appInstance.lookup('connection:twitter');
149
- twitter === twitter2; // => false
150
- let facebook = appInstance.lookup('connection:facebook');
149
+ twitter === twitter2; // => false
150
+ let facebook = appInstance.lookup('connection:facebook');
151
151
  let facebook2 = appInstance.lookup('connection:facebook');
152
- facebook === facebook2; // => false
152
+ facebook === facebook2; // => false
153
153
  ```
154
- @public
154
+ @public
155
155
  @method registerOptionsForType
156
156
  @param {String} type
157
157
  @param {Object} options
@@ -160,7 +160,7 @@ export default Mixin.create({
160
160
 
161
161
  /**
162
162
  Return the registered options for all factories of a type.
163
- @public
163
+ @public
164
164
  @method registeredOptionsForType
165
165
  @param {String} type
166
166
  @return {Object} options
@@ -170,37 +170,37 @@ export default Mixin.create({
170
170
  /**
171
171
  Define a dependency injection onto a specific factory or all factories
172
172
  of a type.
173
- When Ember instantiates a controller, view, or other framework component
173
+ When Ember instantiates a controller, view, or other framework component
174
174
  it can attach a dependency to that component. This is often used to
175
175
  provide services to a set of framework components.
176
- An example of providing a session object to all controllers:
177
- ```javascript
176
+ An example of providing a session object to all controllers:
177
+ ```javascript
178
178
  import { alias } from '@ember/object/computed';
179
179
  import Application from '@ember/application';
180
180
  import Controller from '@ember/controller';
181
181
  import EmberObject from '@ember/object';
182
- let App = Application.create();
182
+ let App = Application.create();
183
183
  let Session = EmberObject.extend({ isAuthenticated: false });
184
- // A factory must be registered before it can be injected
184
+ // A factory must be registered before it can be injected
185
185
  App.register('session:main', Session);
186
- // Inject 'session:main' onto all factories of the type 'controller'
186
+ // Inject 'session:main' onto all factories of the type 'controller'
187
187
  // with the name 'session'
188
188
  App.inject('controller', 'session', 'session:main');
189
- App.IndexController = Controller.extend({
189
+ App.IndexController = Controller.extend({
190
190
  isLoggedIn: alias('session.isAuthenticated')
191
191
  });
192
192
  ```
193
- Injections can also be performed on specific factories.
194
- ```javascript
193
+ Injections can also be performed on specific factories.
194
+ ```javascript
195
195
  App.inject(<full_name or type>, <property name>, <full_name>)
196
196
  App.inject('route', 'source', 'source:main')
197
197
  App.inject('route:application', 'email', 'model:email')
198
198
  ```
199
- It is important to note that injections can only be performed on
199
+ It is important to note that injections can only be performed on
200
200
  classes that are instantiated by Ember itself. Instantiating a class
201
201
  directly (via `create` or `new`) bypasses the dependency injection
202
202
  system.
203
- @public
203
+ @public
204
204
  @method inject
205
205
  @param factoryNameOrType {String}
206
206
  @param property {String}
@@ -41,9 +41,9 @@ const TargetActionSupport = Mixin.create({
41
41
  /**
42
42
  Send an `action` with an `actionContext` to a `target`. The action, actionContext
43
43
  and target will be retrieved from properties of the object. For example:
44
- ```javascript
44
+ ```javascript
45
45
  import { alias } from '@ember/object/computed';
46
- App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
46
+ App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
47
47
  target: alias('controller'),
48
48
  action: 'save',
49
49
  actionContext: alias('context'),
@@ -53,9 +53,9 @@ const TargetActionSupport = Mixin.create({
53
53
  }
54
54
  });
55
55
  ```
56
- The `target`, `action`, and `actionContext` can be provided as properties of
56
+ The `target`, `action`, and `actionContext` can be provided as properties of
57
57
  an optional object argument to `triggerAction` as well.
58
- ```javascript
58
+ ```javascript
59
59
  App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
60
60
  click() {
61
61
  this.triggerAction({
@@ -67,12 +67,12 @@ const TargetActionSupport = Mixin.create({
67
67
  }
68
68
  });
69
69
  ```
70
- The `actionContext` defaults to the object you are mixing `TargetActionSupport` into.
70
+ The `actionContext` defaults to the object you are mixing `TargetActionSupport` into.
71
71
  But `target` and `action` must be specified either as properties or with the argument
72
72
  to `triggerAction`, or a combination:
73
- ```javascript
73
+ ```javascript
74
74
  import { alias } from '@ember/object/computed';
75
- App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
75
+ App.SaveButtonView = Ember.View.extend(Ember.TargetActionSupport, {
76
76
  target: alias('controller'),
77
77
  click() {
78
78
  this.triggerAction({
@@ -82,7 +82,7 @@ const TargetActionSupport = Mixin.create({
82
82
  }
83
83
  });
84
84
  ```
85
- @method triggerAction
85
+ @method triggerAction
86
86
  @param opts {Object} (optional, with the optional keys action, target and/or actionContext)
87
87
  @return {Boolean} true if the action was sent successfully and did not return false
88
88
  @private
@@ -1,5 +1,5 @@
1
1
  /**
2
- @module ember
2
+ @module @ember/application
3
3
  */
4
4
  import { NAMESPACES, NAMESPACES_BY_ID, addNamespace, findNamespace, findNamespaces, get, processNamespace, processAllNamespaces, removeNamespace } from '@ember/-internals/metal'; // Preloaded into namespaces
5
5
 
@@ -19,7 +19,6 @@ import EmberObject from './object';
19
19
  ```
20
20
 
21
21
  @class Namespace
22
- @namespace Ember
23
22
  @extends EmberObject
24
23
  @public
25
24
  */
@@ -77,7 +77,7 @@ const {
77
77
 
78
78
  @method typeOf
79
79
  @for @ember/utils
80
- @param {Object} item the item to check
80
+ @param item the item to check
81
81
  @return {String} the type
82
82
  @public
83
83
  @static
@@ -140,7 +140,7 @@ const GUID_KEY = intern(`__ember${Date.now()}`);
140
140
  */
141
141
 
142
142
  function generateGuid(obj, prefix = GUID_PREFIX) {
143
- let guid = prefix + uuid();
143
+ let guid = prefix + uuid().toString();
144
144
 
145
145
  if (isObject(obj)) {
146
146
  OBJECT_GUIDS.set(obj, guid);
@@ -170,7 +170,7 @@ function guidFor(value) {
170
170
  guid = OBJECT_GUIDS.get(value);
171
171
 
172
172
  if (guid === undefined) {
173
- guid = GUID_PREFIX + uuid();
173
+ guid = `${GUID_PREFIX}${uuid()}`;
174
174
  OBJECT_GUIDS.set(value, guid);
175
175
  }
176
176
  } else {
@@ -180,13 +180,13 @@ function guidFor(value) {
180
180
  let type = typeof value;
181
181
 
182
182
  if (type === 'string') {
183
- guid = 'st' + uuid();
183
+ guid = `st${uuid()}`;
184
184
  } else if (type === 'number') {
185
- guid = 'nu' + uuid();
185
+ guid = `nu${uuid()}`;
186
186
  } else if (type === 'symbol') {
187
- guid = 'sy' + uuid();
187
+ guid = `sy${uuid()}`;
188
188
  } else {
189
- guid = '(' + value + ')';
189
+ guid = `(${value})`;
190
190
  }
191
191
 
192
192
  NON_OBJECT_GUIDS.set(value, guid);
@@ -207,7 +207,7 @@ function enumerableSymbol(debugName) {
207
207
  // TODO: Investigate using platform symbols, but we do not
208
208
  // want to require non-enumerability for this API, which
209
209
  // would introduce a large cost.
210
- let id = GUID_KEY + Math.floor(Math.random() * Date.now());
210
+ let id = GUID_KEY + Math.floor(Math.random() * Date.now()).toString();
211
211
  let symbol = intern(`__${debugName}${id}__`);
212
212
 
213
213
  if (DEBUG) {
@@ -507,7 +507,9 @@ function inspectObject(obj, depth, seen) {
507
507
  }
508
508
 
509
509
  let key = keys[i];
510
- s += inspectKey(key) + ': ' + inspectValue(obj[key], depth, seen);
510
+ assert('has key', key); // Looping over array
511
+
512
+ s += `${inspectKey(key)}: ${inspectValue(obj[key], depth, seen)}`;
511
513
  }
512
514
 
513
515
  s += ' }';
@@ -27,6 +27,7 @@ export function getRootViews(owner) {
27
27
  let rootViews = [];
28
28
  Object.keys(registry).forEach(id => {
29
29
  let view = registry[id];
30
+ assert('expected view', view);
30
31
 
31
32
  if (view.parentView === null) {
32
33
  rootViews.push(view);
@@ -86,6 +87,7 @@ const CHILD_VIEW_IDS = new WeakMap();
86
87
 
87
88
  export function getChildViews(view) {
88
89
  let owner = getOwner(view);
90
+ assert('View is unexpectedly missing an owner', owner);
89
91
  let registry = owner.lookup('-view-registry:main');
90
92
  return collectChildViews(view, registry);
91
93
  }
@@ -1,2 +1,2 @@
1
- export { Array as default, isArray, A } from '@ember/-internals/runtime';
1
+ export { Array as default, NativeArray, isArray, A } from '@ember/-internals/runtime';
2
2
  export { makeArray } from '@ember/-internals/utils';
@@ -1,61 +1,10 @@
1
1
  import { FrameworkObject } from '@ember/-internals/runtime';
2
2
  import { inject as metalInject } from '@ember/-internals/metal';
3
3
  import ControllerMixin from './lib/controller_mixin';
4
- /**
5
- @module @ember/controller
6
- */
7
4
 
8
- /**
9
- @class Controller
10
- @extends EmberObject
11
- @uses Ember.ControllerMixin
12
- @public
13
- */
5
+ class Controller extends FrameworkObject.extend(ControllerMixin) {}
14
6
 
15
- const Controller = FrameworkObject.extend(ControllerMixin);
16
- /**
17
- Creates a property that lazily looks up another controller in the container.
18
- Can only be used when defining another controller.
19
-
20
- Example:
21
-
22
- ```app/controllers/post.js
23
- import Controller, {
24
- inject as controller
25
- } from '@ember/controller';
26
-
27
- export default class PostController extends Controller {
28
- @controller posts;
29
- }
30
- ```
31
-
32
- Classic Class Example:
33
-
34
- ```app/controllers/post.js
35
- import Controller, {
36
- inject as controller
37
- } from '@ember/controller';
38
-
39
- export default Controller.extend({
40
- posts: controller()
41
- });
42
- ```
43
-
44
- This example will create a `posts` property on the `post` controller that
45
- looks up the `posts` controller in the container, making it easy to reference
46
- other controllers.
47
-
48
- @method inject
49
- @static
50
- @for @ember/controller
51
- @since 1.10.0
52
- @param {String} name (optional) name of the controller to inject, defaults to
53
- the property's name
54
- @return {ComputedDecorator} injection decorator instance
55
- @public
56
- */
57
-
58
- export function inject() {
59
- return metalInject('controller', ...arguments);
7
+ export function inject(...args) {
8
+ return metalInject('controller', ...args);
60
9
  }
61
10
  export default Controller;
@@ -2,7 +2,7 @@
2
2
 
3
3
  /* global console */
4
4
  import { ENV } from '@ember/-internals/environment';
5
-
5
+ import { assert } from '@ember/debug';
6
6
  /**
7
7
  @module @ember/instrumentation
8
8
  @private
@@ -58,16 +58,14 @@ import { ENV } from '@ember/-internals/environment';
58
58
  @static
59
59
  @private
60
60
  */
61
+
61
62
  export let subscribers = [];
62
63
  let cache = {};
63
64
 
64
65
  function populateListeners(name) {
65
66
  let listeners = [];
66
- let subscriber;
67
-
68
- for (let i = 0; i < subscribers.length; i++) {
69
- subscriber = subscribers[i];
70
67
 
68
+ for (let subscriber of subscribers) {
71
69
  if (subscriber.regex.test(name)) {
72
70
  listeners.push(subscriber.object);
73
71
  }
@@ -172,16 +170,17 @@ export function _instrumentStart(name, payloadFunc, payloadArg) {
172
170
  let beforeValues = [];
173
171
  let timestamp = time();
174
172
 
175
- for (let i = 0; i < listeners.length; i++) {
176
- let listener = listeners[i];
173
+ for (let listener of listeners) {
177
174
  beforeValues.push(listener.before(name, timestamp, payload));
178
175
  }
179
176
 
177
+ const constListeners = listeners;
180
178
  return function _instrumentEnd() {
181
179
  let timestamp = time();
182
180
 
183
- for (let i = 0; i < listeners.length; i++) {
184
- let listener = listeners[i];
181
+ for (let i = 0; i < constListeners.length; i++) {
182
+ let listener = constListeners[i];
183
+ assert('has listener', listener); // Iterating over values
185
184
 
186
185
  if (typeof listener.after === 'function') {
187
186
  listener.after(name, timestamp, payload, beforeValues[i]);
@@ -209,12 +208,9 @@ export function _instrumentStart(name, payloadFunc, payloadArg) {
209
208
 
210
209
  export function subscribe(pattern, object) {
211
210
  let paths = pattern.split('.');
212
- let path;
213
211
  let regexes = [];
214
212
 
215
- for (let i = 0; i < paths.length; i++) {
216
- path = paths[i];
217
-
213
+ for (let path of paths) {
218
214
  if (path === '*') {
219
215
  regexes.push('[^\\.]*');
220
216
  } else {
@@ -24,21 +24,30 @@ let wrapGetterSetter = function (target, key, desc) {
24
24
  return desc;
25
25
  };
26
26
 
27
- export function dependentKeyCompat(target, key, desc) {
28
- if (!isElementDescriptor([target, key, desc])) {
29
- desc = target;
27
+ export function dependentKeyCompat(...args) {
28
+ if (isElementDescriptor(args)) {
29
+ let [target, key, desc] = args;
30
+ assert('The @dependentKeyCompat decorator must be applied to getters/setters when used in native classes', desc != null && (typeof desc.get === 'function' || typeof desc.set === 'function'));
31
+ return wrapGetterSetter(target, key, desc);
32
+ } else {
33
+ const desc = args[0];
34
+ assert('expected valid PropertyDescriptor', (value => {
35
+ if (value && typeof value === 'object') {
36
+ let cast = value;
37
+ return (cast.configurable === undefined || cast.configurable === false || cast.configurable === true) && (cast.enumerable === undefined || cast.enumerable === false || cast.enumerable === true) && (cast.writable === undefined || cast.writable === false || cast.writable === true) && (cast.get === undefined || typeof cast.get === 'function') && (cast.set === undefined || typeof cast.set === 'function');
38
+ }
39
+
40
+ return false;
41
+ })(desc));
30
42
 
31
43
  let decorator = function (target, key, _desc, _meta, isClassicDecorator) {
32
44
  assert('The @dependentKeyCompat decorator may only be passed a method when used in classic classes. You should decorate getters/setters directly in native classes', isClassicDecorator);
33
- assert('The dependentKeyCompat() decorator must be passed a getter or setter when used in classic classes', desc !== null && typeof desc === 'object' && (typeof desc.get === 'function' || typeof desc.set === 'function'));
45
+ assert('The dependentKeyCompat() decorator must be passed a getter or setter when used in classic classes', typeof desc.get === 'function' || typeof desc.set === 'function');
34
46
  return wrapGetterSetter(target, key, desc);
35
47
  };
36
48
 
37
49
  setClassicDecorator(decorator);
38
50
  return decorator;
39
51
  }
40
-
41
- assert('The @dependentKeyCompat decorator must be applied to getters/setters when used in native classes', desc !== null && typeof desc.get === 'function' || typeof desc.set === 'function');
42
- return wrapGetterSetter(target, key, desc);
43
52
  }
44
53
  setClassicDecorator(dependentKeyCompat);
@@ -0,0 +1 @@
1
+ export { RouterService as default } from '@ember/-internals/routing';
@@ -1,74 +1,10 @@
1
1
  import { FrameworkObject } from '@ember/-internals/runtime';
2
2
  import { inject as metalInject } from '@ember/-internals/metal';
3
- /**
4
- @module @ember/service
5
- @public
6
- */
7
-
8
- /**
9
- @method inject
10
- @static
11
- @since 1.10.0
12
- @for @ember/service
13
- @param {String} name (optional) name of the service to inject, defaults to
14
- the property's name
15
- @return {ComputedDecorator} injection decorator instance
16
- @public
17
- */
18
-
19
- export function inject() {
20
- return metalInject('service', ...arguments);
3
+ export function inject(...args) {
4
+ return metalInject('service', ...args);
21
5
  }
22
- /**
23
- Creates a property that lazily looks up a service in the container. There are
24
- no restrictions as to what objects a service can be injected into.
25
-
26
- Example:
27
-
28
- ```app/routes/application.js
29
- import Route from '@ember/routing/route';
30
- import { service } from '@ember/service';
31
-
32
- export default class ApplicationRoute extends Route {
33
- @service('auth') authManager;
34
-
35
- model() {
36
- return this.authManager.findCurrentUser();
37
- }
38
- }
39
- ```
40
-
41
- Classic Class Example:
42
-
43
- ```app/routes/application.js
44
- import Route from '@ember/routing/route';
45
- import { service } from '@ember/service';
46
-
47
- export default Route.extend({
48
- authManager: service('auth'),
49
-
50
- model() {
51
- return this.get('authManager').findCurrentUser();
52
- }
53
- });
54
- ```
55
-
56
- This example will create an `authManager` property on the application route
57
- that looks up the `auth` service in the container, making it easily accessible
58
- in the `model` hook.
59
-
60
- @method service
61
- @static
62
- @since 4.1.0
63
- @for @ember/service
64
- @param {String} name (optional) name of the service to inject, defaults to
65
- the property's name
66
- @return {ComputedDecorator} injection decorator instance
67
- @public
68
- */
69
-
70
- export function service() {
71
- return metalInject('service', ...arguments);
6
+ export function service(...args) {
7
+ return metalInject('service', ...args);
72
8
  }
73
9
  /**
74
10
  @class Service
@@ -77,8 +13,5 @@ export function service() {
77
13
  @public
78
14
  */
79
15
 
80
- const Service = FrameworkObject.extend();
81
- Service.reopenClass({
82
- isServiceFactory: true
83
- });
84
- export default Service;
16
+ export default class Service extends FrameworkObject {}
17
+ Service.isServiceFactory = true;
@@ -1 +1 @@
1
- export default "4.3.0-alpha.2";
1
+ export default "4.4.0-alpha.1";