Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(injector): invoke config blocks for module after all providers #7147

Closed
wants to merge 1 commit into from
Closed

fix(injector): invoke config blocks for module after all providers #7147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions src/auto/injector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,22 +693,27 @@ function createInjector(modulesToLoad, strictDi) {
// Module Loading
////////////////////////////////////
function loadModules(modulesToLoad){
var runBlocks = [], moduleFn, invokeQueue, i, ii;
var runBlocks = [], moduleFn, invokeQueue;
forEach(modulesToLoad, function(module) {
if (loadedModules.get(module)) return;
loadedModules.put(module, true);

function runInvokeQueue(queue) {
var i, ii;
for(i = 0, ii = queue.length; i < ii; i++) {
var invokeArgs = queue[i],
provider = providerInjector.get(invokeArgs[0]);

provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
}
}

try {
if (isString(module)) {
moduleFn = angularModule(module);
runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);

for(invokeQueue = moduleFn._invokeQueue, i = 0, ii = invokeQueue.length; i < ii; i++) {
var invokeArgs = invokeQueue[i],
provider = providerInjector.get(invokeArgs[0]);

provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
}
runInvokeQueue(moduleFn._invokeQueue);
runInvokeQueue(moduleFn._configBlocks);
} else if (isFunction(module)) {
runBlocks.push(providerInjector.invoke(module));
} else if (isArray(module)) {
Expand Down
11 changes: 8 additions & 3 deletions src/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,19 @@ function setupModuleLoader(window) {
/** @type {!Array.<Array.<*>>} */
var invokeQueue = [];

/** @type {!Array.<Function>} */
var configBlocks = [];

/** @type {!Array.<Function>} */
var runBlocks = [];

var config = invokeLater('$injector', 'invoke');
var config = invokeLater('$injector', 'invoke', 'push', configBlocks);

/** @type {angular.Module} */
var moduleInstance = {
// Private state
_invokeQueue: invokeQueue,
_configBlocks: configBlocks,
_runBlocks: runBlocks,

/**
Expand Down Expand Up @@ -297,9 +301,10 @@ function setupModuleLoader(window) {
* @param {String=} insertMethod
* @returns {angular.Module}
*/
function invokeLater(provider, method, insertMethod) {
function invokeLater(provider, method, insertMethod, queue) {
if (!queue) queue = invokeQueue;
return function() {
invokeQueue[insertMethod || 'push']([provider, method, arguments]);
queue[insertMethod || 'push']([provider, method, arguments]);
return moduleInstance;
};
}
Expand Down
23 changes: 23 additions & 0 deletions test/auto/injectorSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,29 @@ describe('injector', function() {
expect(log).toEqual('abABCD');
});

it('should execute own config blocks after all own providers are invoked', function() {
Copy link
Contributor

Choose a reason for hiding this comment

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

This test actually will not fail without your fix. :)
You should move the config blocks to be before the provider registration

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Misunderstood what you were saying originally, yes you're right, the test is broken because of that :) fixes

var log = '';
angular.module('a', ['b'])
.config(function($aProvider) {
log += 'aConfig;';
})
.provider('$a', function() {
log += '$aProvider;';
this.$get = function() {};
});
angular.module('b', [])
.config(function($bProvider) {
log += 'bConfig;';
})
.provider('$b', function() {
log += '$bProvider;';
this.$get = function() {};
});

createInjector(['a']);
expect(log).toBe('$bProvider;bConfig;$aProvider;aConfig;');
});

describe('$provide', function() {

it('should throw an exception if we try to register a service called "hasOwnProperty"', function() {
Expand Down
4 changes: 3 additions & 1 deletion test/loaderSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@ describe('module loader', function() {
expect(myModule.requires).toEqual(['other']);
expect(myModule._invokeQueue).toEqual([
['$provide', 'constant', ['abc', 123] ],
['$injector', 'invoke', ['config'] ],
['$provide', 'provider', ['sk', 'sv'] ],
['$provide', 'factory', ['fk', 'fv'] ],
['$provide', 'service', ['a', 'aa'] ],
['$provide', 'value', ['k', 'v'] ],
['$filterProvider', 'register', ['f', 'ff'] ],
['$compileProvider', 'directive', ['d', 'dd'] ],
['$controllerProvider', 'register', ['ctrl', 'ccc']],
]);
expect(myModule._configBlocks).toEqual([
['$injector', 'invoke', ['config'] ],
['$injector', 'invoke', ['init2'] ]
]);
expect(myModule._runBlocks).toEqual(['runBlock']);
Expand Down