feat($injector) better locals passing

joshrtay · joshrtay · commit 309ec340a04d · 2013-04-23T15:53:49.000-07:00
- $locals service added
- passes locals to instantiated service
diff --git a/src/auto/injector.js b/src/auto/injector.js
@@ -416,9 +416,9 @@ function createInjector(modulesToLoad) {
           })),
       instanceCache = {},
       instanceInjector = (instanceCache.$injector =
-          createInternalInjector(instanceCache, function(servicename) {
+          createInternalInjector(instanceCache, function(servicename, locals) {
             var provider = providerInjector.get(servicename + providerSuffix);
-            return instanceInjector.invoke(provider.$get, provider);
+            return instanceInjector.invoke(provider.$get, provider, locals);
           }));
 
 
@@ -453,8 +453,8 @@ function createInjector(modulesToLoad) {
   function factory(name, factoryFn) { return provider(name, { $get: factoryFn }); }
 
   function service(name, constructor) {
-    return factory(name, ['$injector', function($injector) {
-      return $injector.instantiate(constructor);
+    return factory(name, ['$injector', '$locals', function($injector, $locals) {
+      return $injector.instantiate(constructor, $locals);
     }]);
   }
 
@@ -525,7 +525,7 @@ function createInjector(modulesToLoad) {
 
   function createInternalInjector(cache, factory) {
 
-    function getService(serviceName) {
+    function getService(serviceName, locals) {
       if (typeof serviceName !== 'string') {
         throw Error('Service name expected');
       }
@@ -538,7 +538,7 @@ function createInjector(modulesToLoad) {
         try {
           path.unshift(serviceName);
           cache[serviceName] = INSTANTIATING;
-          return cache[serviceName] = factory(serviceName);
+          return cache[serviceName] = factory(serviceName, locals);
         } finally {
           path.shift();
         }
@@ -549,15 +549,17 @@ function createInjector(modulesToLoad) {
       var args = [],
           $inject = annotate(fn),
           length, i,
-          key;
+          key, val;
 
       for(i = 0, length = $inject.length; i < length; i++) {
         key = $inject[i];
-        args.push(
-          locals && locals.hasOwnProperty(key)
-          ? locals[key]
-          : getService(key)
-        );
+        if (locals && locals.hasOwnProperty(key))
+          val = locals[key];
+        else if (key === '$locals')
+          val = locals;
+        else
+          val = getService(key, locals);
+        args.push(val);
       }
       if (!fn.$inject) {
         // this means that we must be an array.
diff --git a/test/auto/injectorSpec.js b/test/auto/injectorSpec.js
@@ -123,6 +123,12 @@ describe('injector', function() {
         injector.invoke(['a', 123], {});
       }).toThrow("Argument 'fn' is not a function, got number");
     });
+
+    it('should provide locals as service', function() {
+      fn.$inject = ['a', 'b', 'c', '$locals'];
+      injector.invoke(fn, {name: "this"}, {c:3});
+      expect(args).toEqual([{name: 'this'}, 1, 2, 3, {c: 3}]);
+    });
   });
 
 
@@ -369,6 +375,19 @@ describe('injector', function() {
           expect(injector.get('foo') instanceof Type).toBe(true);
           expect(injector.get('bar') instanceof Type).toBe(true);
         });
+
+
+        it('should receive locals', function() {
+          var Type = function(value) {
+            this.value = value;
+          };
+
+          var instance = createInjector([function($provide) {
+            $provide.service('foo', Type);
+          }]).get('foo', {value: 123});
+
+          expect(instance.value).toBe(123);
+        });
       });
 
 
diff --git a/test/ng/controllerSpec.js b/test/ng/controllerSpec.js
@@ -1,10 +1,11 @@
 'use strict';
 
 describe('$controller', function() {
-  var $controllerProvider, $controller;
+  var $controllerProvider, $controller, $provide;
 
-  beforeEach(module(function(_$controllerProvider_) {
+  beforeEach(module(function(_$controllerProvider_, _$provide_) {
     $controllerProvider = _$controllerProvider_;
+    $provide = _$provide_;
   }));
 
 
@@ -57,6 +58,7 @@ describe('$controller', function() {
       expect(scope.foo).toBe('bar');
       expect(ctrl instanceof FooCtrl).toBe(true);
     });
+
   });
 
 
@@ -99,4 +101,14 @@ describe('$controller', function() {
     expect(scope.foo).toBe(foo);
     expect(scope.foo.mark).toBe('foo');
   });
+
+  it('should give services current scope', function() {
+    $provide.service('bar', ['$scope', function($scope) {$scope.bar = 123; }])
+
+    var Foo = function($scope, bar) {};
+
+    var scope = {};
+    var ctrl = $controller(Foo, {$scope: scope});
+    expect(scope.bar).toBe(123);
+  });
 });
