New Case Study:See how Anthropic automated 95% of dependency reviews with Socket.Learn More →
lfr-amd-loader
Advanced tools
lfr-amd-loader - npm Package Compare versions
Comparing version 1.2.1 to 1.2.2
@@ -1200,3 +1200,3 @@ /*! | ||
| /* istanbul ignore else */ | ||
| /* istanbul ignore else */ | ||
| } else if (typeof arguments[i] === 'function') { | ||
@@ -1213,22 +1213,43 @@ successCallback = arguments[i]; | ||
| var configParser = self._getConfigParser(); | ||
| // Map the required modules so we start with clean idea what the hell we should load. | ||
| modules = this._getConfigParser().mapModule(modules); | ||
| var mappedModules = configParser.mapModule(modules); | ||
| console.log('REQUIRE modules mapped to', modules); | ||
| console.log('REQUIRE modules mapped to', mappedModules); | ||
| var resolvedDependencies; | ||
| // Set a timeout, after which an error will be passed to the client. | ||
| // If the user set it to 0, there will be no timeout. | ||
| var config = configParser.getConfig(); | ||
| var rejectTimeout; | ||
| if (config.waitTimeout !== 0) { | ||
| rejectTimeout = setTimeout(function() { | ||
| self._raiseRequireFailure(modules, mappedModules, resolvedDependencies, failureCallback.bind(failureCallback)); | ||
| }, config.waitTimeout || 7000); | ||
| } | ||
| // Resolve the dependencies of the specified modules by the user | ||
| // then load their JS scripts | ||
| self._resolveDependencies(modules).then(function(dependencies) { | ||
| self._resolveDependencies(mappedModules).then(function(dependencies) { | ||
| console.log('REQUIRE dependencies resolved to', dependencies); | ||
| resolvedDependencies = dependencies; | ||
| return self._loadModules(dependencies); | ||
| }).then(function(loadedModules) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (successCallback) { | ||
| var moduleImplementations = self._getModuleImplementations(modules); | ||
| var moduleImplementations = self._getModuleImplementations(mappedModules); | ||
| successCallback.apply(successCallback, moduleImplementations); | ||
| } | ||
| }, function(error) { /* istanbul ignore else */ | ||
| }, function(error) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (failureCallback) { | ||
| failureCallback.call(failureCallback, error); | ||
| } | ||
@@ -1302,3 +1323,3 @@ }); | ||
| * @protected | ||
| * @param {Array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @param {array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @return {Array<string>} A list with all missing dependencies. | ||
@@ -1500,2 +1521,31 @@ */ | ||
| /** | ||
| * Constructs an error object and calls a function passing the error object. | ||
| * | ||
| * @memberof! Loader# | ||
| * @protected | ||
| * @param {array} modules The required modules. | ||
| * @param {array} mappedModules The required modules, after the mapping process. | ||
| * @param {array} resolvedDependencies The resolved dependencies of the passed modules. | ||
| * @param {Function} callback The callback which should be called, passing the constructed error object. | ||
| */ | ||
| _raiseRequireFailure: function(modules, mappedModules, resolvedDependencies, callback) { | ||
| var registeredModules = this._getConfigParser().getModules(); | ||
| var error = { | ||
| mappedModules: mappedModules, | ||
| missingDependencies: resolvedDependencies.filter(function(dep) { | ||
| return !registeredModules[dep].implementation; | ||
| }), | ||
| modules: modules, | ||
| resolvedDependecies: resolvedDependencies | ||
| }; | ||
| console.log('REQUIRE timeout', error); | ||
| if (callback) { | ||
| callback(error); | ||
| } | ||
| }, | ||
| /** | ||
| * Resolves modules dependencies. | ||
@@ -1502,0 +1552,0 @@ * |
@@ -1,1 +0,1 @@ | ||
| (function(){function e(e,t){x[C]=e,x[C+1]=t,C+=2,2===C&&P()}function t(e){return"function"==typeof e}function n(){return function(){process.nextTick(s)}}function o(){var e=0,t=new O(s),n=document.createTextNode("");return t.observe(n,{characterData:!0}),function(){n.data=e=++e%2}}function i(){var e=new MessageChannel;return e.port1.onmessage=s,function(){e.port2.postMessage(0)}}function r(){return function(){setTimeout(s,1)}}function s(){for(var e=0;C>e;e+=2)x[e](x[e+1]),x[e]=void 0,x[e+1]=void 0;C=0}function u(){}function a(e,t,n,o){try{e.call(t,n,o)}catch(i){return i}}function l(t,n,o){e(function(e){var t=!1,i=a(o,n,function(o){t||(t=!0,n!==o?f(e,o):h(e,o))},function(n){t||(t=!0,p(e,n))});!t&&i&&(t=!0,p(e,i))},t)}function c(e,t){1===t.a?h(e,t.b):2===e.a?p(e,t.b):g(t,void 0,function(t){f(e,t)},function(t){p(e,t)})}function f(e,n){if(e===n)p(e,new TypeError("You cannot resolve a promise with itself"));else if("function"==typeof n||"object"==typeof n&&null!==n)if(n.constructor===e.constructor)c(e,n);else{var o;try{o=n.then}catch(i){A.error=i,o=A}o===A?p(e,A.error):void 0===o?h(e,n):t(o)?l(e,n,o):h(e,n)}else h(e,n)}function d(e){e.f&&e.f(e.b),m(e)}function h(t,n){void 0===t.a&&(t.b=n,t.a=1,0!==t.e.length&&e(m,t))}function p(t,n){void 0===t.a&&(t.a=2,t.b=n,e(d,t))}function g(t,n,o,i){var r=t.e,s=r.length;t.f=null,r[s]=n,r[s+1]=o,r[s+2]=i,0===s&&t.a&&e(m,t)}function m(e){var t=e.e,n=e.a;if(0!==t.length){for(var o,i,r=e.b,s=0;s<t.length;s+=3)o=t[s],i=t[s+n],o?_(n,o,i,r):i(r);e.e.length=0}}function v(){this.error=null}function _(e,n,o,i){var r,s,u,a,l=t(o);if(l){try{r=o(i)}catch(c){k.error=c,r=k}if(r===k?(a=!0,s=r.error,r=null):u=!0,n===r)return void p(n,new TypeError("A promises callback cannot return that same promise."))}else r=i,u=!0;void 0===n.a&&(l&&u?f(n,r):a?p(n,s):1===e?h(n,r):2===e&&p(n,r))}function y(e,t){try{t(function(t){f(e,t)},function(t){p(e,t)})}catch(n){p(e,n)}}function b(e,t,n,o){this.n=e,this.c=new e(u,o),this.i=n,this.o(t)?(this.m=t,this.d=this.length=t.length,this.l(),0===this.length?h(this.c,this.b):(this.length=this.length||0,this.k(),0===this.d&&h(this.c,this.b))):p(this.c,this.p())}function M(e){if(q++,this.b=this.a=void 0,this.e=[],u!==e){if(!t(e))throw new TypeError("You must pass a resolver function as the first argument to the promise constructor");if(!(this instanceof M))throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");y(this,e)}}var P,w=Array.isArray?Array.isArray:function(e){return"[object Array]"===Object.prototype.toString.call(e)},C=0,j="undefined"!=typeof window?window:{},O=j.MutationObserver||j.WebKitMutationObserver,j="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,x=Array(1e3);P="undefined"!=typeof process&&"[object process]"==={}.toString.call(process)?n():O?o():j?i():r();var A=new v,k=new v;b.prototype.o=function(e){return w(e)},b.prototype.p=function(){return Error("Array Methods must be provided an Array")},b.prototype.l=function(){this.b=Array(this.length)},b.prototype.k=function(){for(var e=this.length,t=this.c,n=this.m,o=0;void 0===t.a&&e>o;o++)this.j(n[o],o)},b.prototype.j=function(e,t){var n=this.n;"object"==typeof e&&null!==e?e.constructor===n&&void 0!==e.a?(e.f=null,this.g(e.a,t,e.b)):this.q(n.resolve(e),t):(this.d--,this.b[t]=this.h(e))},b.prototype.g=function(e,t,n){var o=this.c;void 0===o.a&&(this.d--,this.i&&2===e?p(o,n):this.b[t]=this.h(n)),0===this.d&&h(o,this.b)},b.prototype.h=function(e){return e},b.prototype.q=function(e,t){var n=this;g(e,void 0,function(e){n.g(1,t,e)},function(e){n.g(2,t,e)})};var q=0;M.all=function(e,t){return new b(this,e,!0,t).c},M.race=function(e,t){function n(e){f(i,e)}function o(e){p(i,e)}var i=new this(u,t);if(!w(e))return p(i,new TypeError("You must pass an array to race.")),i;for(var r=e.length,s=0;void 0===i.a&&r>s;s++)g(this.resolve(e[s]),void 0,n,o);return i},M.resolve=function(e,t){if(e&&"object"==typeof e&&e.constructor===this)return e;var n=new this(u,t);return f(n,e),n},M.reject=function(e,t){var n=new this(u,t);return p(n,e),n},M.prototype={constructor:M,then:function(t,n){var o=this.a;if(1===o&&!t||2===o&&!n)return this;var i=new this.constructor(u),r=this.b;if(o){var s=arguments[o-1];e(function(){_(o,i,s,r)})}else g(this,i,t,n);return i},"catch":function(e){return this.then(null,e)}};var R={Promise:M,polyfill:function(){var e;e="undefined"!=typeof global?global:"undefined"!=typeof window&&window.document?window:self,"Promise"in e&&"resolve"in e.Promise&&"reject"in e.Promise&&"all"in e.Promise&&"race"in e.Promise&&function(){var n;return new e.Promise(function(e){n=e}),t(n)}()||(e.Promise=M)}};"function"==typeof define&&define.amd?define(function(){return R}):"undefined"!=typeof module&&module.exports?module.exports=R:"undefined"!=typeof this&&(this.ES6Promise=R)}).call(this),function(){var global={};global.__CONFIG__=window.__CONFIG__,function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.EventEmitter=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(){this._events={}}return t.prototype={constructor:t,on:function(e,t){var n=this._events[e]=this._events[e]||[];n.push(t)},off:function(e,t){var n=this._events[e];if(n){var o=n.indexOf(t);o>-1&&n.splice(o,1)}},emit:function(e,t){var n=this._events[e];if(n){n=n.slice(0);for(var o=0;o<n.length;o++){var i=n[o];i.call(i,t)}}}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.ConfigParser=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(e){this._config={},this._modules={},this._conditionalModules={},this._parseConfig(e)}return t.prototype={constructor:t,addModule:function(e){var t=this._modules[e.name];if(t)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);else this._modules[e.name]=e;return this._registerConditionalModule(e),this._modules[e.name]},getConfig:function(){return this._config},getConditionalModules:function(){return this._conditionalModules},getModules:function(){return this._modules},mapModule:function(e){var t;t=Array.isArray(e)?e:[e];for(var n=0;n<t.length;n++){var o=t[n];for(var i in this._config.maps)if(Object.prototype.hasOwnProperty.call(this._config.maps,i)&&(o===i||0===o.indexOf(i+"/"))){o=this._config.maps[i]+o.substring(i.length),t[n]=o;break}}return Array.isArray(e)?t:t[0]},_parseConfig:function(e){for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&("modules"===t?this._parseModules(e[t]):this._config[t]=e[t]);return this._config},_parseModules:function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t)){var n=e[t];n.name=t,this.addModule(n)}return this._modules},_registerConditionalModule:function(e){if(e.condition){var t=this._conditionalModules[e.condition.trigger];t||(this._conditionalModules[e.condition.trigger]=t=[]),t.push(e.name)}}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.DependencyBuilder=n}("undefined"!=typeof global?global:this,function(global){"use strict";function DependencyBuilder(e){this._configParser=e,this._pathResolver=new global.PathResolver,this._result=[]}var hasOwnProperty=Object.prototype.hasOwnProperty;return DependencyBuilder.prototype={constructor:DependencyBuilder,resolveDependencies:function(e){this._queue=e.slice(0);var t;try{this._resolveDependencies(),t=this._result.reverse().slice(0)}finally{this._cleanup()}return t},_cleanup:function(){var e=this._configParser.getModules();for(var t in e)if(hasOwnProperty.call(e,t)){var n=e[t];n.conditionalMark=!1,n.mark=!1,n.tmpMark=!1}this._queue.length=0,this._result.length=0},_processConditionalModules:function(e){var t=this._configParser.getConditionalModules()[e.name];if(t&&!e.conditionalMark){for(var n=this._configParser.getModules(),o=0;o<t.length;o++){var i=n[t[o]];-1===this._queue.indexOf(i.name)&&this._testConditionalModule(i.condition.test)&&this._queue.push(i.name)}e.conditionalMark=!0}},_resolveDependencies:function(){for(var e=this._configParser.getModules(),t=0;t<this._queue.length;t++){var n=e[this._queue[t]];n||(n=this._configParser.addModule({name:this._queue[t],dependencies:[]})),n.mark||this._visit(n)}},_testConditionalModule:function(testFunction){return"function"==typeof testFunction?testFunction():eval("false || "+testFunction)()},_visit:function(e){if(e.tmpMark)throw new Error("Error processing module: "+e.name+". The provided configuration is not Directed Acyclic Graph.");if(this._processConditionalModules(e),!e.mark){e.tmpMark=!0;for(var t=this._configParser.getModules(),n=0;n<e.dependencies.length;n++){var o=e.dependencies[n];if("exports"!==o&&"module"!==o){o=this._pathResolver.resolvePath(e.name,o);var i=this._configParser.mapModule(o),r=t[i];r||(r=this._configParser.addModule({name:i,dependencies:[]})),this._visit(r)}}e.mark=!0,e.tmpMark=!1,this._result.unshift(e.name)}},_queue:[]},DependencyBuilder}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.URLBuilder=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(e){this._configParser=e}var n=/^https?:\/\/|\/\/|www\./;return t.prototype={constructor:t,build:function(e){var t=[],o=[],i=[],r=this._configParser.getConfig(),s=r.basePath,u=this._configParser.getModules();"/"!==s.charAt(s.length-1)&&(s+="/");for(var a=0;a<e.length;a++){var l=u[e[a]];if(l.fullPath)i.push(l.fullPath);else{var c=this._getModulePath(l),f=0===c.indexOf("/");n.test(c)?i.push(c):r.combine?f?t.push(c):o.push(c):i.push(r.url+(f?"":s)+c)}l.requested=!0}return o.length&&(i.push(r.url+s+o.join("&"+s)),o.length=0),t.length&&(i.push(r.url+t.join("&")),t.length=0),i},_getModulePath:function(e){var t=e.path||e.name,o=this._configParser.getConfig().paths;for(var i in o)Object.prototype.hasOwnProperty.call(o,i)&&(t===i||0===t.indexOf(i+"/"))&&(t=o[i]+t.substring(i.length));return n.test(t)||t.indexOf(".js")===t.length-3||(t+=".js"),t}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.PathResolver=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(){}return t.prototype={constructor:t,resolvePath:function(e,t){if("exports"===t||"module"===t||0!==t.indexOf(".")&&0!==t.indexOf(".."))return t;var n=e.split("/");n.splice(-1,1);for(var o=t.split("/"),i=o.splice(-1,1),r=0;r<o.length;r++){var s=o[r];if("."!==s)if(".."===s){if(!n.length){n=n.concat(o.slice(r));break}n.splice(-1,1)}else n.push(s)}return n.push(i),n.join("/")}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.Loader=new n,e.require=e.Loader.require.bind(e.Loader),e.define=e.Loader.define.bind(e.Loader)}("undefined"!=typeof global?global:this,function(e){"use strict";function t(n){t.superclass.constructor.apply(this,arguments),this._config=n||e.__CONFIG__,this._modulesMap={}}t.prototype=Object.create(e.EventEmitter.prototype),t.prototype.constructor=t,t.superclass=e.EventEmitter.prototype;var n={define:function(e,t,n,o){var i=o||{},r=this._getConfigParser(),s=this._getPathResolver();t=t.map(function(t){return s.resolvePath(e,t)}),i.name=e,i.dependencies=t,i.pendingImplementation=n,r.addModule(i),this._modulesMap[i.name]||(this._modulesMap[i.name]=!0),this.emit("moduleRegister",e)},getConditionalModules:function(){return this._getConfigParser().getConditionalModules()},getModules:function(){return this._getConfigParser().getModules()},require:function(){var e,t,n,o,i=this,r=Array.isArray?Array.isArray(arguments[0]):"[object Array]"===Object.prototype.toString.call(arguments[0]);if(r)n=arguments[0],o="function"==typeof arguments[1]?arguments[1]:null,e="function"==typeof arguments[2]?arguments[2]:null;else for(n=[],t=0;t<arguments.length;++t)if("string"==typeof arguments[t])n[t]=arguments[t];else if("function"==typeof arguments[t]){o=arguments[t],e="function"==typeof arguments[++t]?arguments[t]:null;break}n=this._getConfigParser().mapModule(n),i._resolveDependencies(n).then(function(e){return i._loadModules(e)}).then(function(e){if(o){var t=i._getModuleImplementations(n);o.apply(o,t)}},function(t){e&&e.call(e,t)})},_createModulePromise:function(e){var t=this;return new Promise(function(n,o){var i=function(o){o===e&&(t.off("moduleRegister",i),t._modulesMap[e]=!0,n(e))};t.on("moduleRegister",i)})},_getConfigParser:function(){return this._configParser||(this._configParser=new e.ConfigParser(this._config)),this._configParser},_getDependencyBuilder:function(){return this._dependencyBuilder||(this._dependencyBuilder=new e.DependencyBuilder(this._getConfigParser())),this._dependencyBuilder},_getMissingDepenencies:function(e){for(var t=this._getConfigParser().getModules(),n=Object.create(null),o=0;o<e.length;o++)for(var i=t[e[o]],r=0;r<i.dependencies.length;r++){var s=i.dependencies[r],u=t[s];"exports"===s||"module"===s||u&&u.pendingImplementation||(n[s]=1)}return Object.keys(n)},_getModuleImplementations:function(e){for(var t=[],n=this._getConfigParser().getModules(),o=0;o<e.length;o++){var i=n[e[o]];t.push(i?i.implementation:void 0)}return t},_getPathResolver:function(){return this._pathResolver||(this._pathResolver=new e.PathResolver),this._pathResolver},_getURLBuilder:function(){return this._urlBuilder||(this._urlBuilder=new e.URLBuilder(this._getConfigParser())),this._urlBuilder},_filterNotRequestedModules:function(e){for(var t=[],n=this._getConfigParser().getModules(),o=0;o<e.length;o++){var i=n[e[o]];"exports"===i||"module"===i||i&&i.requested||t.push(e[o])}return t},_loadModules:function(e){var t=this;return new Promise(function(n,o){var i=t._filterNotRequestedModules(e);if(i.length){for(var r=t._getURLBuilder().build(i),s=[],u=0;u<r.length;u++)s.push(t._loadScript(r[u]));Promise.all(s).then(function(n){return t._waitForModules(e)}).then(function(e){n(e)})["catch"](function(e){o(e)})}else t._waitForModules(e).then(function(e){n(e)})["catch"](function(e){o(e)})})},_loadScript:function(e){return new Promise(function(t,n){var o=document.createElement("script");o.src=e,o.onload=o.onreadystatechange=function(){this.readyState&&"complete"!==this.readyState&&"load"!==this.readyState||(o.onload=o.onreadystatechange=null,t(o))},o.onerror=function(){document.body.removeChild(o),n(o)},document.body.appendChild(o)})},_resolveDependencies:function(e){var t=this;return new Promise(function(n,o){try{var i=t._getDependencyBuilder().resolveDependencies(e);n(i)}catch(r){o(r)}})},_setModuleImplementation:function(e){for(var t=this._getConfigParser().getModules(),n=0;n<e.length;n++){var o=e[n];if(!o.implementation){for(var i,r=[],s=this._getConfigParser(),u=0;u<o.dependencies.length;u++){var a=o.dependencies[u];if("exports"===a)i={},r.push(i);else if("module"===a)i={exports:{}},r.push(i);else{var l=t[s.mapModule(a)],c=l.implementation;r.push(c)}}var f=o.pendingImplementation.apply(o.pendingImplementation,r);f?o.implementation=f:i&&(o.implementation=i.exports||i)}}},_waitForModule:function(e){var t=this,n=t._modulesMap[e];return n||(n=t._createModulePromise(e),t._modulesMap[e]=n),n},_waitForModules:function(e){var t=this;return new Promise(function(n,o){for(var i=[],r=0;r<e.length;r++)i.push(t._waitForModule(e[r]));Promise.all(i).then(function(i){var r=t._getConfigParser().getModules(),s=function(){for(var o=[],i=0;i<e.length;i++)o.push(r[e[i]]);t._setModuleImplementation(o),n(o)},u=t._getMissingDepenencies(e);u.length?t.require(u,s,o):s()})})}};return Object.keys(n).forEach(function(e){t.prototype[e]=n[e]}),t}),window.Loader=global.Loader,window.require=global.require,window.define=global.define}(); | ||
| (function(){function e(e,t){x[C]=e,x[C+1]=t,C+=2,2===C&&P()}function t(e){return"function"==typeof e}function n(){return function(){process.nextTick(s)}}function o(){var e=0,t=new O(s),n=document.createTextNode("");return t.observe(n,{characterData:!0}),function(){n.data=e=++e%2}}function i(){var e=new MessageChannel;return e.port1.onmessage=s,function(){e.port2.postMessage(0)}}function r(){return function(){setTimeout(s,1)}}function s(){for(var e=0;C>e;e+=2)x[e](x[e+1]),x[e]=void 0,x[e+1]=void 0;C=0}function u(){}function a(e,t,n,o){try{e.call(t,n,o)}catch(i){return i}}function l(t,n,o){e(function(e){var t=!1,i=a(o,n,function(o){t||(t=!0,n!==o?f(e,o):h(e,o))},function(n){t||(t=!0,p(e,n))});!t&&i&&(t=!0,p(e,i))},t)}function c(e,t){1===t.a?h(e,t.b):2===e.a?p(e,t.b):g(t,void 0,function(t){f(e,t)},function(t){p(e,t)})}function f(e,n){if(e===n)p(e,new TypeError("You cannot resolve a promise with itself"));else if("function"==typeof n||"object"==typeof n&&null!==n)if(n.constructor===e.constructor)c(e,n);else{var o;try{o=n.then}catch(i){q.error=i,o=q}o===q?p(e,q.error):void 0===o?h(e,n):t(o)?l(e,n,o):h(e,n)}else h(e,n)}function d(e){e.f&&e.f(e.b),m(e)}function h(t,n){void 0===t.a&&(t.b=n,t.a=1,0!==t.e.length&&e(m,t))}function p(t,n){void 0===t.a&&(t.a=2,t.b=n,e(d,t))}function g(t,n,o,i){var r=t.e,s=r.length;t.f=null,r[s]=n,r[s+1]=o,r[s+2]=i,0===s&&t.a&&e(m,t)}function m(e){var t=e.e,n=e.a;if(0!==t.length){for(var o,i,r=e.b,s=0;s<t.length;s+=3)o=t[s],i=t[s+n],o?_(n,o,i,r):i(r);e.e.length=0}}function v(){this.error=null}function _(e,n,o,i){var r,s,u,a,l=t(o);if(l){try{r=o(i)}catch(c){A.error=c,r=A}if(r===A?(a=!0,s=r.error,r=null):u=!0,n===r)return void p(n,new TypeError("A promises callback cannot return that same promise."))}else r=i,u=!0;void 0===n.a&&(l&&u?f(n,r):a?p(n,s):1===e?h(n,r):2===e&&p(n,r))}function y(e,t){try{t(function(t){f(e,t)},function(t){p(e,t)})}catch(n){p(e,n)}}function b(e,t,n,o){this.n=e,this.c=new e(u,o),this.i=n,this.o(t)?(this.m=t,this.d=this.length=t.length,this.l(),0===this.length?h(this.c,this.b):(this.length=this.length||0,this.k(),0===this.d&&h(this.c,this.b))):p(this.c,this.p())}function M(e){if(R++,this.b=this.a=void 0,this.e=[],u!==e){if(!t(e))throw new TypeError("You must pass a resolver function as the first argument to the promise constructor");if(!(this instanceof M))throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.");y(this,e)}}var P,w=Array.isArray?Array.isArray:function(e){return"[object Array]"===Object.prototype.toString.call(e)},C=0,j="undefined"!=typeof window?window:{},O=j.MutationObserver||j.WebKitMutationObserver,j="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,x=Array(1e3);P="undefined"!=typeof process&&"[object process]"==={}.toString.call(process)?n():O?o():j?i():r();var q=new v,A=new v;b.prototype.o=function(e){return w(e)},b.prototype.p=function(){return Error("Array Methods must be provided an Array")},b.prototype.l=function(){this.b=Array(this.length)},b.prototype.k=function(){for(var e=this.length,t=this.c,n=this.m,o=0;void 0===t.a&&e>o;o++)this.j(n[o],o)},b.prototype.j=function(e,t){var n=this.n;"object"==typeof e&&null!==e?e.constructor===n&&void 0!==e.a?(e.f=null,this.g(e.a,t,e.b)):this.q(n.resolve(e),t):(this.d--,this.b[t]=this.h(e))},b.prototype.g=function(e,t,n){var o=this.c;void 0===o.a&&(this.d--,this.i&&2===e?p(o,n):this.b[t]=this.h(n)),0===this.d&&h(o,this.b)},b.prototype.h=function(e){return e},b.prototype.q=function(e,t){var n=this;g(e,void 0,function(e){n.g(1,t,e)},function(e){n.g(2,t,e)})};var R=0;M.all=function(e,t){return new b(this,e,!0,t).c},M.race=function(e,t){function n(e){f(i,e)}function o(e){p(i,e)}var i=new this(u,t);if(!w(e))return p(i,new TypeError("You must pass an array to race.")),i;for(var r=e.length,s=0;void 0===i.a&&r>s;s++)g(this.resolve(e[s]),void 0,n,o);return i},M.resolve=function(e,t){if(e&&"object"==typeof e&&e.constructor===this)return e;var n=new this(u,t);return f(n,e),n},M.reject=function(e,t){var n=new this(u,t);return p(n,e),n},M.prototype={constructor:M,then:function(t,n){var o=this.a;if(1===o&&!t||2===o&&!n)return this;var i=new this.constructor(u),r=this.b;if(o){var s=arguments[o-1];e(function(){_(o,i,s,r)})}else g(this,i,t,n);return i},"catch":function(e){return this.then(null,e)}};var k={Promise:M,polyfill:function(){var e;e="undefined"!=typeof global?global:"undefined"!=typeof window&&window.document?window:self,"Promise"in e&&"resolve"in e.Promise&&"reject"in e.Promise&&"all"in e.Promise&&"race"in e.Promise&&function(){var n;return new e.Promise(function(e){n=e}),t(n)}()||(e.Promise=M)}};"function"==typeof define&&define.amd?define(function(){return k}):"undefined"!=typeof module&&module.exports?module.exports=k:"undefined"!=typeof this&&(this.ES6Promise=k)}).call(this),function(){var global={};global.__CONFIG__=window.__CONFIG__,function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.EventEmitter=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(){this._events={}}return t.prototype={constructor:t,on:function(e,t){var n=this._events[e]=this._events[e]||[];n.push(t)},off:function(e,t){var n=this._events[e];if(n){var o=n.indexOf(t);o>-1&&n.splice(o,1)}},emit:function(e,t){var n=this._events[e];if(n){n=n.slice(0);for(var o=0;o<n.length;o++){var i=n[o];i.call(i,t)}}}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.ConfigParser=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(e){this._config={},this._modules={},this._conditionalModules={},this._parseConfig(e)}return t.prototype={constructor:t,addModule:function(e){var t=this._modules[e.name];if(t)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);else this._modules[e.name]=e;return this._registerConditionalModule(e),this._modules[e.name]},getConfig:function(){return this._config},getConditionalModules:function(){return this._conditionalModules},getModules:function(){return this._modules},mapModule:function(e){var t;t=Array.isArray(e)?e:[e];for(var n=0;n<t.length;n++){var o=t[n];for(var i in this._config.maps)if(Object.prototype.hasOwnProperty.call(this._config.maps,i)&&(o===i||0===o.indexOf(i+"/"))){o=this._config.maps[i]+o.substring(i.length),t[n]=o;break}}return Array.isArray(e)?t:t[0]},_parseConfig:function(e){for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&("modules"===t?this._parseModules(e[t]):this._config[t]=e[t]);return this._config},_parseModules:function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t)){var n=e[t];n.name=t,this.addModule(n)}return this._modules},_registerConditionalModule:function(e){if(e.condition){var t=this._conditionalModules[e.condition.trigger];t||(this._conditionalModules[e.condition.trigger]=t=[]),t.push(e.name)}}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.DependencyBuilder=n}("undefined"!=typeof global?global:this,function(global){"use strict";function DependencyBuilder(e){this._configParser=e,this._pathResolver=new global.PathResolver,this._result=[]}var hasOwnProperty=Object.prototype.hasOwnProperty;return DependencyBuilder.prototype={constructor:DependencyBuilder,resolveDependencies:function(e){this._queue=e.slice(0);var t;try{this._resolveDependencies(),t=this._result.reverse().slice(0)}finally{this._cleanup()}return t},_cleanup:function(){var e=this._configParser.getModules();for(var t in e)if(hasOwnProperty.call(e,t)){var n=e[t];n.conditionalMark=!1,n.mark=!1,n.tmpMark=!1}this._queue.length=0,this._result.length=0},_processConditionalModules:function(e){var t=this._configParser.getConditionalModules()[e.name];if(t&&!e.conditionalMark){for(var n=this._configParser.getModules(),o=0;o<t.length;o++){var i=n[t[o]];-1===this._queue.indexOf(i.name)&&this._testConditionalModule(i.condition.test)&&this._queue.push(i.name)}e.conditionalMark=!0}},_resolveDependencies:function(){for(var e=this._configParser.getModules(),t=0;t<this._queue.length;t++){var n=e[this._queue[t]];n||(n=this._configParser.addModule({name:this._queue[t],dependencies:[]})),n.mark||this._visit(n)}},_testConditionalModule:function(testFunction){return"function"==typeof testFunction?testFunction():eval("false || "+testFunction)()},_visit:function(e){if(e.tmpMark)throw new Error("Error processing module: "+e.name+". The provided configuration is not Directed Acyclic Graph.");if(this._processConditionalModules(e),!e.mark){e.tmpMark=!0;for(var t=this._configParser.getModules(),n=0;n<e.dependencies.length;n++){var o=e.dependencies[n];if("exports"!==o&&"module"!==o){o=this._pathResolver.resolvePath(e.name,o);var i=this._configParser.mapModule(o),r=t[i];r||(r=this._configParser.addModule({name:i,dependencies:[]})),this._visit(r)}}e.mark=!0,e.tmpMark=!1,this._result.unshift(e.name)}},_queue:[]},DependencyBuilder}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.URLBuilder=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(e){this._configParser=e}var n=/^https?:\/\/|\/\/|www\./;return t.prototype={constructor:t,build:function(e){var t=[],o=[],i=[],r=this._configParser.getConfig(),s=r.basePath,u=this._configParser.getModules();"/"!==s.charAt(s.length-1)&&(s+="/");for(var a=0;a<e.length;a++){var l=u[e[a]];if(l.fullPath)i.push(l.fullPath);else{var c=this._getModulePath(l),f=0===c.indexOf("/");n.test(c)?i.push(c):r.combine?f?t.push(c):o.push(c):i.push(r.url+(f?"":s)+c)}l.requested=!0}return o.length&&(i.push(r.url+s+o.join("&"+s)),o.length=0),t.length&&(i.push(r.url+t.join("&")),t.length=0),i},_getModulePath:function(e){var t=e.path||e.name,o=this._configParser.getConfig().paths;for(var i in o)Object.prototype.hasOwnProperty.call(o,i)&&(t===i||0===t.indexOf(i+"/"))&&(t=o[i]+t.substring(i.length));return n.test(t)||t.indexOf(".js")===t.length-3||(t+=".js"),t}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.PathResolver=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(){}return t.prototype={constructor:t,resolvePath:function(e,t){if("exports"===t||"module"===t||0!==t.indexOf(".")&&0!==t.indexOf(".."))return t;var n=e.split("/");n.splice(-1,1);for(var o=t.split("/"),i=o.splice(-1,1),r=0;r<o.length;r++){var s=o[r];if("."!==s)if(".."===s){if(!n.length){n=n.concat(o.slice(r));break}n.splice(-1,1)}else n.push(s)}return n.push(i),n.join("/")}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.Loader=new n,e.require=e.Loader.require.bind(e.Loader),e.define=e.Loader.define.bind(e.Loader)}("undefined"!=typeof global?global:this,function(e){"use strict";function t(n){t.superclass.constructor.apply(this,arguments),this._config=n||e.__CONFIG__,this._modulesMap={}}t.prototype=Object.create(e.EventEmitter.prototype),t.prototype.constructor=t,t.superclass=e.EventEmitter.prototype;var n={define:function(e,t,n,o){var i=o||{},r=this._getConfigParser(),s=this._getPathResolver();t=t.map(function(t){return s.resolvePath(e,t)}),i.name=e,i.dependencies=t,i.pendingImplementation=n,r.addModule(i),this._modulesMap[i.name]||(this._modulesMap[i.name]=!0),this.emit("moduleRegister",e)},getConditionalModules:function(){return this._getConfigParser().getConditionalModules()},getModules:function(){return this._getConfigParser().getModules()},require:function(){var e,t,n,o,i=this,r=Array.isArray?Array.isArray(arguments[0]):"[object Array]"===Object.prototype.toString.call(arguments[0]);if(r)n=arguments[0],o="function"==typeof arguments[1]?arguments[1]:null,e="function"==typeof arguments[2]?arguments[2]:null;else for(n=[],t=0;t<arguments.length;++t)if("string"==typeof arguments[t])n[t]=arguments[t];else if("function"==typeof arguments[t]){o=arguments[t],e="function"==typeof arguments[++t]?arguments[t]:null;break}var s,u,a=i._getConfigParser(),l=a.mapModule(n),c=a.getConfig();0!==c.waitTimeout&&(u=setTimeout(function(){i._raiseRequireFailure(n,l,s,e.bind(e))},c.waitTimeout||7e3)),i._resolveDependencies(l).then(function(e){return s=e,i._loadModules(e)}).then(function(e){if(clearTimeout(u),o){var t=i._getModuleImplementations(l);o.apply(o,t)}},function(t){clearTimeout(u),e&&e.call(e,t)})},_createModulePromise:function(e){var t=this;return new Promise(function(n,o){var i=function(o){o===e&&(t.off("moduleRegister",i),t._modulesMap[e]=!0,n(e))};t.on("moduleRegister",i)})},_getConfigParser:function(){return this._configParser||(this._configParser=new e.ConfigParser(this._config)),this._configParser},_getDependencyBuilder:function(){return this._dependencyBuilder||(this._dependencyBuilder=new e.DependencyBuilder(this._getConfigParser())),this._dependencyBuilder},_getMissingDepenencies:function(e){for(var t=this._getConfigParser().getModules(),n=Object.create(null),o=0;o<e.length;o++)for(var i=t[e[o]],r=0;r<i.dependencies.length;r++){var s=i.dependencies[r],u=t[s];"exports"===s||"module"===s||u&&u.pendingImplementation||(n[s]=1)}return Object.keys(n)},_getModuleImplementations:function(e){for(var t=[],n=this._getConfigParser().getModules(),o=0;o<e.length;o++){var i=n[e[o]];t.push(i?i.implementation:void 0)}return t},_getPathResolver:function(){return this._pathResolver||(this._pathResolver=new e.PathResolver),this._pathResolver},_getURLBuilder:function(){return this._urlBuilder||(this._urlBuilder=new e.URLBuilder(this._getConfigParser())),this._urlBuilder},_filterNotRequestedModules:function(e){for(var t=[],n=this._getConfigParser().getModules(),o=0;o<e.length;o++){var i=n[e[o]];"exports"===i||"module"===i||i&&i.requested||t.push(e[o])}return t},_loadModules:function(e){var t=this;return new Promise(function(n,o){var i=t._filterNotRequestedModules(e);if(i.length){for(var r=t._getURLBuilder().build(i),s=[],u=0;u<r.length;u++)s.push(t._loadScript(r[u]));Promise.all(s).then(function(n){return t._waitForModules(e)}).then(function(e){n(e)})["catch"](function(e){o(e)})}else t._waitForModules(e).then(function(e){n(e)})["catch"](function(e){o(e)})})},_loadScript:function(e){return new Promise(function(t,n){var o=document.createElement("script");o.src=e,o.onload=o.onreadystatechange=function(){this.readyState&&"complete"!==this.readyState&&"load"!==this.readyState||(o.onload=o.onreadystatechange=null,t(o))},o.onerror=function(){document.body.removeChild(o),n(o)},document.body.appendChild(o)})},_raiseRequireFailure:function(e,t,n,o){var i=this._getConfigParser().getModules(),r={mappedModules:t,missingDependencies:n.filter(function(e){return!i[e].implementation}),modules:e,resolvedDependecies:n};o&&o(r)},_resolveDependencies:function(e){var t=this;return new Promise(function(n,o){try{var i=t._getDependencyBuilder().resolveDependencies(e);n(i)}catch(r){o(r)}})},_setModuleImplementation:function(e){for(var t=this._getConfigParser().getModules(),n=0;n<e.length;n++){var o=e[n];if(!o.implementation){for(var i,r=[],s=this._getConfigParser(),u=0;u<o.dependencies.length;u++){var a=o.dependencies[u];if("exports"===a)i={},r.push(i);else if("module"===a)i={exports:{}},r.push(i);else{var l=t[s.mapModule(a)],c=l.implementation;r.push(c)}}var f=o.pendingImplementation.apply(o.pendingImplementation,r);f?o.implementation=f:i&&(o.implementation=i.exports||i)}}},_waitForModule:function(e){var t=this,n=t._modulesMap[e];return n||(n=t._createModulePromise(e),t._modulesMap[e]=n),n},_waitForModules:function(e){var t=this;return new Promise(function(n,o){for(var i=[],r=0;r<e.length;r++)i.push(t._waitForModule(e[r]));Promise.all(i).then(function(i){var r=t._getConfigParser().getModules(),s=function(){for(var o=[],i=0;i<e.length;i++)o.push(r[e[i]]);t._setModuleImplementation(o),n(o)},u=t._getMissingDepenencies(e);u.length?t.require(u,s,o):s()})})}};return Object.keys(n).forEach(function(e){t.prototype[e]=n[e]}),t}),window.Loader=global.Loader,window.require=global.require,window.define=global.define}(); |
@@ -924,3 +924,3 @@ (function() { | ||
| /* istanbul ignore else */ | ||
| /* istanbul ignore else */ | ||
| } else if (typeof arguments[i] === 'function') { | ||
@@ -937,22 +937,43 @@ successCallback = arguments[i]; | ||
| var configParser = self._getConfigParser(); | ||
| // Map the required modules so we start with clean idea what the hell we should load. | ||
| modules = this._getConfigParser().mapModule(modules); | ||
| var mappedModules = configParser.mapModule(modules); | ||
| console.log('REQUIRE modules mapped to', modules); | ||
| console.log('REQUIRE modules mapped to', mappedModules); | ||
| var resolvedDependencies; | ||
| // Set a timeout, after which an error will be passed to the client. | ||
| // If the user set it to 0, there will be no timeout. | ||
| var config = configParser.getConfig(); | ||
| var rejectTimeout; | ||
| if (config.waitTimeout !== 0) { | ||
| rejectTimeout = setTimeout(function() { | ||
| self._raiseRequireFailure(modules, mappedModules, resolvedDependencies, failureCallback.bind(failureCallback)); | ||
| }, config.waitTimeout || 7000); | ||
| } | ||
| // Resolve the dependencies of the specified modules by the user | ||
| // then load their JS scripts | ||
| self._resolveDependencies(modules).then(function(dependencies) { | ||
| self._resolveDependencies(mappedModules).then(function(dependencies) { | ||
| console.log('REQUIRE dependencies resolved to', dependencies); | ||
| resolvedDependencies = dependencies; | ||
| return self._loadModules(dependencies); | ||
| }).then(function(loadedModules) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (successCallback) { | ||
| var moduleImplementations = self._getModuleImplementations(modules); | ||
| var moduleImplementations = self._getModuleImplementations(mappedModules); | ||
| successCallback.apply(successCallback, moduleImplementations); | ||
| } | ||
| }, function(error) { /* istanbul ignore else */ | ||
| }, function(error) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (failureCallback) { | ||
| failureCallback.call(failureCallback, error); | ||
| } | ||
@@ -1026,3 +1047,3 @@ }); | ||
| * @protected | ||
| * @param {Array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @param {array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @return {Array<string>} A list with all missing dependencies. | ||
@@ -1224,2 +1245,31 @@ */ | ||
| /** | ||
| * Constructs an error object and calls a function passing the error object. | ||
| * | ||
| * @memberof! Loader# | ||
| * @protected | ||
| * @param {array} modules The required modules. | ||
| * @param {array} mappedModules The required modules, after the mapping process. | ||
| * @param {array} resolvedDependencies The resolved dependencies of the passed modules. | ||
| * @param {Function} callback The callback which should be called, passing the constructed error object. | ||
| */ | ||
| _raiseRequireFailure: function(modules, mappedModules, resolvedDependencies, callback) { | ||
| var registeredModules = this._getConfigParser().getModules(); | ||
| var error = { | ||
| mappedModules: mappedModules, | ||
| missingDependencies: resolvedDependencies.filter(function(dep) { | ||
| return !registeredModules[dep].implementation; | ||
| }), | ||
| modules: modules, | ||
| resolvedDependecies: resolvedDependencies | ||
| }; | ||
| console.log('REQUIRE timeout', error); | ||
| if (callback) { | ||
| callback(error); | ||
| } | ||
| }, | ||
| /** | ||
| * Resolves modules dependencies. | ||
@@ -1226,0 +1276,0 @@ * |
@@ -1,1 +0,1 @@ | ||
| !function(){var global={};global.__CONFIG__=window.__CONFIG__,function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.EventEmitter=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(){this._events={}}return t.prototype={constructor:t,on:function(e,t){var n=this._events[e]=this._events[e]||[];n.push(t)},off:function(e,t){var n=this._events[e];if(n){var o=n.indexOf(t);o>-1&&n.splice(o,1)}},emit:function(e,t){var n=this._events[e];if(n){n=n.slice(0);for(var o=0;o<n.length;o++){var i=n[o];i.call(i,t)}}}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.ConfigParser=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(e){this._config={},this._modules={},this._conditionalModules={},this._parseConfig(e)}return t.prototype={constructor:t,addModule:function(e){var t=this._modules[e.name];if(t)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);else this._modules[e.name]=e;return this._registerConditionalModule(e),this._modules[e.name]},getConfig:function(){return this._config},getConditionalModules:function(){return this._conditionalModules},getModules:function(){return this._modules},mapModule:function(e){var t;t=Array.isArray(e)?e:[e];for(var n=0;n<t.length;n++){var o=t[n];for(var i in this._config.maps)if(Object.prototype.hasOwnProperty.call(this._config.maps,i)&&(o===i||0===o.indexOf(i+"/"))){o=this._config.maps[i]+o.substring(i.length),t[n]=o;break}}return Array.isArray(e)?t:t[0]},_parseConfig:function(e){for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&("modules"===t?this._parseModules(e[t]):this._config[t]=e[t]);return this._config},_parseModules:function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t)){var n=e[t];n.name=t,this.addModule(n)}return this._modules},_registerConditionalModule:function(e){if(e.condition){var t=this._conditionalModules[e.condition.trigger];t||(this._conditionalModules[e.condition.trigger]=t=[]),t.push(e.name)}}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.DependencyBuilder=n}("undefined"!=typeof global?global:this,function(global){"use strict";function DependencyBuilder(e){this._configParser=e,this._pathResolver=new global.PathResolver,this._result=[]}var hasOwnProperty=Object.prototype.hasOwnProperty;return DependencyBuilder.prototype={constructor:DependencyBuilder,resolveDependencies:function(e){this._queue=e.slice(0);var t;try{this._resolveDependencies(),t=this._result.reverse().slice(0)}finally{this._cleanup()}return t},_cleanup:function(){var e=this._configParser.getModules();for(var t in e)if(hasOwnProperty.call(e,t)){var n=e[t];n.conditionalMark=!1,n.mark=!1,n.tmpMark=!1}this._queue.length=0,this._result.length=0},_processConditionalModules:function(e){var t=this._configParser.getConditionalModules()[e.name];if(t&&!e.conditionalMark){for(var n=this._configParser.getModules(),o=0;o<t.length;o++){var i=n[t[o]];-1===this._queue.indexOf(i.name)&&this._testConditionalModule(i.condition.test)&&this._queue.push(i.name)}e.conditionalMark=!0}},_resolveDependencies:function(){for(var e=this._configParser.getModules(),t=0;t<this._queue.length;t++){var n=e[this._queue[t]];n||(n=this._configParser.addModule({name:this._queue[t],dependencies:[]})),n.mark||this._visit(n)}},_testConditionalModule:function(testFunction){return"function"==typeof testFunction?testFunction():eval("false || "+testFunction)()},_visit:function(e){if(e.tmpMark)throw new Error("Error processing module: "+e.name+". The provided configuration is not Directed Acyclic Graph.");if(this._processConditionalModules(e),!e.mark){e.tmpMark=!0;for(var t=this._configParser.getModules(),n=0;n<e.dependencies.length;n++){var o=e.dependencies[n];if("exports"!==o&&"module"!==o){o=this._pathResolver.resolvePath(e.name,o);var i=this._configParser.mapModule(o),r=t[i];r||(r=this._configParser.addModule({name:i,dependencies:[]})),this._visit(r)}}e.mark=!0,e.tmpMark=!1,this._result.unshift(e.name)}},_queue:[]},DependencyBuilder}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.URLBuilder=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(e){this._configParser=e}var n=/^https?:\/\/|\/\/|www\./;return t.prototype={constructor:t,build:function(e){var t=[],o=[],i=[],r=this._configParser.getConfig(),s=r.basePath,u=this._configParser.getModules();"/"!==s.charAt(s.length-1)&&(s+="/");for(var a=0;a<e.length;a++){var l=u[e[a]];if(l.fullPath)i.push(l.fullPath);else{var d=this._getModulePath(l),c=0===d.indexOf("/");n.test(d)?i.push(d):r.combine?c?t.push(d):o.push(d):i.push(r.url+(c?"":s)+d)}l.requested=!0}return o.length&&(i.push(r.url+s+o.join("&"+s)),o.length=0),t.length&&(i.push(r.url+t.join("&")),t.length=0),i},_getModulePath:function(e){var t=e.path||e.name,o=this._configParser.getConfig().paths;for(var i in o)Object.prototype.hasOwnProperty.call(o,i)&&(t===i||0===t.indexOf(i+"/"))&&(t=o[i]+t.substring(i.length));return n.test(t)||t.indexOf(".js")===t.length-3||(t+=".js"),t}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.PathResolver=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(){}return t.prototype={constructor:t,resolvePath:function(e,t){if("exports"===t||"module"===t||0!==t.indexOf(".")&&0!==t.indexOf(".."))return t;var n=e.split("/");n.splice(-1,1);for(var o=t.split("/"),i=o.splice(-1,1),r=0;r<o.length;r++){var s=o[r];if("."!==s)if(".."===s){if(!n.length){n=n.concat(o.slice(r));break}n.splice(-1,1)}else n.push(s)}return n.push(i),n.join("/")}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.Loader=new n,e.require=e.Loader.require.bind(e.Loader),e.define=e.Loader.define.bind(e.Loader)}("undefined"!=typeof global?global:this,function(e){"use strict";function t(n){t.superclass.constructor.apply(this,arguments),this._config=n||e.__CONFIG__,this._modulesMap={}}t.prototype=Object.create(e.EventEmitter.prototype),t.prototype.constructor=t,t.superclass=e.EventEmitter.prototype;var n={define:function(e,t,n,o){var i=o||{},r=this._getConfigParser(),s=this._getPathResolver();t=t.map(function(t){return s.resolvePath(e,t)}),i.name=e,i.dependencies=t,i.pendingImplementation=n,r.addModule(i),this._modulesMap[i.name]||(this._modulesMap[i.name]=!0),this.emit("moduleRegister",e)},getConditionalModules:function(){return this._getConfigParser().getConditionalModules()},getModules:function(){return this._getConfigParser().getModules()},require:function(){var e,t,n,o,i=this,r=Array.isArray?Array.isArray(arguments[0]):"[object Array]"===Object.prototype.toString.call(arguments[0]);if(r)n=arguments[0],o="function"==typeof arguments[1]?arguments[1]:null,e="function"==typeof arguments[2]?arguments[2]:null;else for(n=[],t=0;t<arguments.length;++t)if("string"==typeof arguments[t])n[t]=arguments[t];else if("function"==typeof arguments[t]){o=arguments[t],e="function"==typeof arguments[++t]?arguments[t]:null;break}n=this._getConfigParser().mapModule(n),i._resolveDependencies(n).then(function(e){return i._loadModules(e)}).then(function(e){if(o){var t=i._getModuleImplementations(n);o.apply(o,t)}},function(t){e&&e.call(e,t)})},_createModulePromise:function(e){var t=this;return new Promise(function(n,o){var i=function(o){o===e&&(t.off("moduleRegister",i),t._modulesMap[e]=!0,n(e))};t.on("moduleRegister",i)})},_getConfigParser:function(){return this._configParser||(this._configParser=new e.ConfigParser(this._config)),this._configParser},_getDependencyBuilder:function(){return this._dependencyBuilder||(this._dependencyBuilder=new e.DependencyBuilder(this._getConfigParser())),this._dependencyBuilder},_getMissingDepenencies:function(e){for(var t=this._getConfigParser().getModules(),n=Object.create(null),o=0;o<e.length;o++)for(var i=t[e[o]],r=0;r<i.dependencies.length;r++){var s=i.dependencies[r],u=t[s];"exports"===s||"module"===s||u&&u.pendingImplementation||(n[s]=1)}return Object.keys(n)},_getModuleImplementations:function(e){for(var t=[],n=this._getConfigParser().getModules(),o=0;o<e.length;o++){var i=n[e[o]];t.push(i?i.implementation:void 0)}return t},_getPathResolver:function(){return this._pathResolver||(this._pathResolver=new e.PathResolver),this._pathResolver},_getURLBuilder:function(){return this._urlBuilder||(this._urlBuilder=new e.URLBuilder(this._getConfigParser())),this._urlBuilder},_filterNotRequestedModules:function(e){for(var t=[],n=this._getConfigParser().getModules(),o=0;o<e.length;o++){var i=n[e[o]];"exports"===i||"module"===i||i&&i.requested||t.push(e[o])}return t},_loadModules:function(e){var t=this;return new Promise(function(n,o){var i=t._filterNotRequestedModules(e);if(i.length){for(var r=t._getURLBuilder().build(i),s=[],u=0;u<r.length;u++)s.push(t._loadScript(r[u]));Promise.all(s).then(function(n){return t._waitForModules(e)}).then(function(e){n(e)})["catch"](function(e){o(e)})}else t._waitForModules(e).then(function(e){n(e)})["catch"](function(e){o(e)})})},_loadScript:function(e){return new Promise(function(t,n){var o=document.createElement("script");o.src=e,o.onload=o.onreadystatechange=function(){this.readyState&&"complete"!==this.readyState&&"load"!==this.readyState||(o.onload=o.onreadystatechange=null,t(o))},o.onerror=function(){document.body.removeChild(o),n(o)},document.body.appendChild(o)})},_resolveDependencies:function(e){var t=this;return new Promise(function(n,o){try{var i=t._getDependencyBuilder().resolveDependencies(e);n(i)}catch(r){o(r)}})},_setModuleImplementation:function(e){for(var t=this._getConfigParser().getModules(),n=0;n<e.length;n++){var o=e[n];if(!o.implementation){for(var i,r=[],s=this._getConfigParser(),u=0;u<o.dependencies.length;u++){var a=o.dependencies[u];if("exports"===a)i={},r.push(i);else if("module"===a)i={exports:{}},r.push(i);else{var l=t[s.mapModule(a)],d=l.implementation;r.push(d)}}var c=o.pendingImplementation.apply(o.pendingImplementation,r);c?o.implementation=c:i&&(o.implementation=i.exports||i)}}},_waitForModule:function(e){var t=this,n=t._modulesMap[e];return n||(n=t._createModulePromise(e),t._modulesMap[e]=n),n},_waitForModules:function(e){var t=this;return new Promise(function(n,o){for(var i=[],r=0;r<e.length;r++)i.push(t._waitForModule(e[r]));Promise.all(i).then(function(i){var r=t._getConfigParser().getModules(),s=function(){for(var o=[],i=0;i<e.length;i++)o.push(r[e[i]]);t._setModuleImplementation(o),n(o)},u=t._getMissingDepenencies(e);u.length?t.require(u,s,o):s()})})}};return Object.keys(n).forEach(function(e){t.prototype[e]=n[e]}),t}),window.Loader=global.Loader,window.require=global.require,window.define=global.define}(); | ||
| !function(){var global={};global.__CONFIG__=window.__CONFIG__,function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.EventEmitter=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(){this._events={}}return t.prototype={constructor:t,on:function(e,t){var n=this._events[e]=this._events[e]||[];n.push(t)},off:function(e,t){var n=this._events[e];if(n){var i=n.indexOf(t);i>-1&&n.splice(i,1)}},emit:function(e,t){var n=this._events[e];if(n){n=n.slice(0);for(var i=0;i<n.length;i++){var o=n[i];o.call(o,t)}}}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.ConfigParser=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(e){this._config={},this._modules={},this._conditionalModules={},this._parseConfig(e)}return t.prototype={constructor:t,addModule:function(e){var t=this._modules[e.name];if(t)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n]);else this._modules[e.name]=e;return this._registerConditionalModule(e),this._modules[e.name]},getConfig:function(){return this._config},getConditionalModules:function(){return this._conditionalModules},getModules:function(){return this._modules},mapModule:function(e){var t;t=Array.isArray(e)?e:[e];for(var n=0;n<t.length;n++){var i=t[n];for(var o in this._config.maps)if(Object.prototype.hasOwnProperty.call(this._config.maps,o)&&(i===o||0===i.indexOf(o+"/"))){i=this._config.maps[o]+i.substring(o.length),t[n]=i;break}}return Array.isArray(e)?t:t[0]},_parseConfig:function(e){for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&("modules"===t?this._parseModules(e[t]):this._config[t]=e[t]);return this._config},_parseModules:function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t)){var n=e[t];n.name=t,this.addModule(n)}return this._modules},_registerConditionalModule:function(e){if(e.condition){var t=this._conditionalModules[e.condition.trigger];t||(this._conditionalModules[e.condition.trigger]=t=[]),t.push(e.name)}}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.DependencyBuilder=n}("undefined"!=typeof global?global:this,function(global){"use strict";function DependencyBuilder(e){this._configParser=e,this._pathResolver=new global.PathResolver,this._result=[]}var hasOwnProperty=Object.prototype.hasOwnProperty;return DependencyBuilder.prototype={constructor:DependencyBuilder,resolveDependencies:function(e){this._queue=e.slice(0);var t;try{this._resolveDependencies(),t=this._result.reverse().slice(0)}finally{this._cleanup()}return t},_cleanup:function(){var e=this._configParser.getModules();for(var t in e)if(hasOwnProperty.call(e,t)){var n=e[t];n.conditionalMark=!1,n.mark=!1,n.tmpMark=!1}this._queue.length=0,this._result.length=0},_processConditionalModules:function(e){var t=this._configParser.getConditionalModules()[e.name];if(t&&!e.conditionalMark){for(var n=this._configParser.getModules(),i=0;i<t.length;i++){var o=n[t[i]];-1===this._queue.indexOf(o.name)&&this._testConditionalModule(o.condition.test)&&this._queue.push(o.name)}e.conditionalMark=!0}},_resolveDependencies:function(){for(var e=this._configParser.getModules(),t=0;t<this._queue.length;t++){var n=e[this._queue[t]];n||(n=this._configParser.addModule({name:this._queue[t],dependencies:[]})),n.mark||this._visit(n)}},_testConditionalModule:function(testFunction){return"function"==typeof testFunction?testFunction():eval("false || "+testFunction)()},_visit:function(e){if(e.tmpMark)throw new Error("Error processing module: "+e.name+". The provided configuration is not Directed Acyclic Graph.");if(this._processConditionalModules(e),!e.mark){e.tmpMark=!0;for(var t=this._configParser.getModules(),n=0;n<e.dependencies.length;n++){var i=e.dependencies[n];if("exports"!==i&&"module"!==i){i=this._pathResolver.resolvePath(e.name,i);var o=this._configParser.mapModule(i),r=t[o];r||(r=this._configParser.addModule({name:o,dependencies:[]})),this._visit(r)}}e.mark=!0,e.tmpMark=!1,this._result.unshift(e.name)}},_queue:[]},DependencyBuilder}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.URLBuilder=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(e){this._configParser=e}var n=/^https?:\/\/|\/\/|www\./;return t.prototype={constructor:t,build:function(e){var t=[],i=[],o=[],r=this._configParser.getConfig(),s=r.basePath,u=this._configParser.getModules();"/"!==s.charAt(s.length-1)&&(s+="/");for(var a=0;a<e.length;a++){var l=u[e[a]];if(l.fullPath)o.push(l.fullPath);else{var d=this._getModulePath(l),c=0===d.indexOf("/");n.test(d)?o.push(d):r.combine?c?t.push(d):i.push(d):o.push(r.url+(c?"":s)+d)}l.requested=!0}return i.length&&(o.push(r.url+s+i.join("&"+s)),i.length=0),t.length&&(o.push(r.url+t.join("&")),t.length=0),o},_getModulePath:function(e){var t=e.path||e.name,i=this._configParser.getConfig().paths;for(var o in i)Object.prototype.hasOwnProperty.call(i,o)&&(t===o||0===t.indexOf(o+"/"))&&(t=i[o]+t.substring(o.length));return n.test(t)||t.indexOf(".js")===t.length-3||(t+=".js"),t}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.PathResolver=n}("undefined"!=typeof global?global:this,function(e){"use strict";function t(){}return t.prototype={constructor:t,resolvePath:function(e,t){if("exports"===t||"module"===t||0!==t.indexOf(".")&&0!==t.indexOf(".."))return t;var n=e.split("/");n.splice(-1,1);for(var i=t.split("/"),o=i.splice(-1,1),r=0;r<i.length;r++){var s=i[r];if("."!==s)if(".."===s){if(!n.length){n=n.concat(i.slice(r));break}n.splice(-1,1)}else n.push(s)}return n.push(o),n.join("/")}},t}),function(e,t){"use strict";var n=t(e);"object"==typeof module&&module&&(module.exports=n),"function"==typeof define&&define.amd&&define(t),e.Loader=new n,e.require=e.Loader.require.bind(e.Loader),e.define=e.Loader.define.bind(e.Loader)}("undefined"!=typeof global?global:this,function(e){"use strict";function t(n){t.superclass.constructor.apply(this,arguments),this._config=n||e.__CONFIG__,this._modulesMap={}}t.prototype=Object.create(e.EventEmitter.prototype),t.prototype.constructor=t,t.superclass=e.EventEmitter.prototype;var n={define:function(e,t,n,i){var o=i||{},r=this._getConfigParser(),s=this._getPathResolver();t=t.map(function(t){return s.resolvePath(e,t)}),o.name=e,o.dependencies=t,o.pendingImplementation=n,r.addModule(o),this._modulesMap[o.name]||(this._modulesMap[o.name]=!0),this.emit("moduleRegister",e)},getConditionalModules:function(){return this._getConfigParser().getConditionalModules()},getModules:function(){return this._getConfigParser().getModules()},require:function(){var e,t,n,i,o=this,r=Array.isArray?Array.isArray(arguments[0]):"[object Array]"===Object.prototype.toString.call(arguments[0]);if(r)n=arguments[0],i="function"==typeof arguments[1]?arguments[1]:null,e="function"==typeof arguments[2]?arguments[2]:null;else for(n=[],t=0;t<arguments.length;++t)if("string"==typeof arguments[t])n[t]=arguments[t];else if("function"==typeof arguments[t]){i=arguments[t],e="function"==typeof arguments[++t]?arguments[t]:null;break}var s,u,a=o._getConfigParser(),l=a.mapModule(n),d=a.getConfig();0!==d.waitTimeout&&(u=setTimeout(function(){o._raiseRequireFailure(n,l,s,e.bind(e))},d.waitTimeout||7e3)),o._resolveDependencies(l).then(function(e){return s=e,o._loadModules(e)}).then(function(e){if(clearTimeout(u),i){var t=o._getModuleImplementations(l);i.apply(i,t)}},function(t){clearTimeout(u),e&&e.call(e,t)})},_createModulePromise:function(e){var t=this;return new Promise(function(n,i){var o=function(i){i===e&&(t.off("moduleRegister",o),t._modulesMap[e]=!0,n(e))};t.on("moduleRegister",o)})},_getConfigParser:function(){return this._configParser||(this._configParser=new e.ConfigParser(this._config)),this._configParser},_getDependencyBuilder:function(){return this._dependencyBuilder||(this._dependencyBuilder=new e.DependencyBuilder(this._getConfigParser())),this._dependencyBuilder},_getMissingDepenencies:function(e){for(var t=this._getConfigParser().getModules(),n=Object.create(null),i=0;i<e.length;i++)for(var o=t[e[i]],r=0;r<o.dependencies.length;r++){var s=o.dependencies[r],u=t[s];"exports"===s||"module"===s||u&&u.pendingImplementation||(n[s]=1)}return Object.keys(n)},_getModuleImplementations:function(e){for(var t=[],n=this._getConfigParser().getModules(),i=0;i<e.length;i++){var o=n[e[i]];t.push(o?o.implementation:void 0)}return t},_getPathResolver:function(){return this._pathResolver||(this._pathResolver=new e.PathResolver),this._pathResolver},_getURLBuilder:function(){return this._urlBuilder||(this._urlBuilder=new e.URLBuilder(this._getConfigParser())),this._urlBuilder},_filterNotRequestedModules:function(e){for(var t=[],n=this._getConfigParser().getModules(),i=0;i<e.length;i++){var o=n[e[i]];"exports"===o||"module"===o||o&&o.requested||t.push(e[i])}return t},_loadModules:function(e){var t=this;return new Promise(function(n,i){var o=t._filterNotRequestedModules(e);if(o.length){for(var r=t._getURLBuilder().build(o),s=[],u=0;u<r.length;u++)s.push(t._loadScript(r[u]));Promise.all(s).then(function(n){return t._waitForModules(e)}).then(function(e){n(e)})["catch"](function(e){i(e)})}else t._waitForModules(e).then(function(e){n(e)})["catch"](function(e){i(e)})})},_loadScript:function(e){return new Promise(function(t,n){var i=document.createElement("script");i.src=e,i.onload=i.onreadystatechange=function(){this.readyState&&"complete"!==this.readyState&&"load"!==this.readyState||(i.onload=i.onreadystatechange=null,t(i))},i.onerror=function(){document.body.removeChild(i),n(i)},document.body.appendChild(i)})},_raiseRequireFailure:function(e,t,n,i){var o=this._getConfigParser().getModules(),r={mappedModules:t,missingDependencies:n.filter(function(e){return!o[e].implementation}),modules:e,resolvedDependecies:n};i&&i(r)},_resolveDependencies:function(e){var t=this;return new Promise(function(n,i){try{var o=t._getDependencyBuilder().resolveDependencies(e);n(o)}catch(r){i(r)}})},_setModuleImplementation:function(e){for(var t=this._getConfigParser().getModules(),n=0;n<e.length;n++){var i=e[n];if(!i.implementation){for(var o,r=[],s=this._getConfigParser(),u=0;u<i.dependencies.length;u++){var a=i.dependencies[u];if("exports"===a)o={},r.push(o);else if("module"===a)o={exports:{}},r.push(o);else{var l=t[s.mapModule(a)],d=l.implementation;r.push(d)}}var c=i.pendingImplementation.apply(i.pendingImplementation,r);c?i.implementation=c:o&&(i.implementation=o.exports||o)}}},_waitForModule:function(e){var t=this,n=t._modulesMap[e];return n||(n=t._createModulePromise(e),t._modulesMap[e]=n),n},_waitForModules:function(e){var t=this;return new Promise(function(n,i){for(var o=[],r=0;r<e.length;r++)o.push(t._waitForModule(e[r]));Promise.all(o).then(function(o){var r=t._getConfigParser().getModules(),s=function(){for(var i=[],o=0;o<e.length;o++)i.push(r[e[o]]);t._setModuleImplementation(i),n(i)},u=t._getMissingDepenencies(e);u.length?t.require(u,s,i):s()})})}};return Object.keys(n).forEach(function(e){t.prototype[e]=n[e]}),t}),window.Loader=global.Loader,window.require=global.require,window.define=global.define}(); |
@@ -924,3 +924,3 @@ (function() { | ||
| /* istanbul ignore else */ | ||
| /* istanbul ignore else */ | ||
| } else if (typeof arguments[i] === 'function') { | ||
@@ -937,22 +937,43 @@ successCallback = arguments[i]; | ||
| var configParser = self._getConfigParser(); | ||
| // Map the required modules so we start with clean idea what the hell we should load. | ||
| modules = this._getConfigParser().mapModule(modules); | ||
| var mappedModules = configParser.mapModule(modules); | ||
| void 0; | ||
| var resolvedDependencies; | ||
| // Set a timeout, after which an error will be passed to the client. | ||
| // If the user set it to 0, there will be no timeout. | ||
| var config = configParser.getConfig(); | ||
| var rejectTimeout; | ||
| if (config.waitTimeout !== 0) { | ||
| rejectTimeout = setTimeout(function() { | ||
| self._raiseRequireFailure(modules, mappedModules, resolvedDependencies, failureCallback.bind(failureCallback)); | ||
| }, config.waitTimeout || 7000); | ||
| } | ||
| // Resolve the dependencies of the specified modules by the user | ||
| // then load their JS scripts | ||
| self._resolveDependencies(modules).then(function(dependencies) { | ||
| self._resolveDependencies(mappedModules).then(function(dependencies) { | ||
| void 0; | ||
| resolvedDependencies = dependencies; | ||
| return self._loadModules(dependencies); | ||
| }).then(function(loadedModules) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (successCallback) { | ||
| var moduleImplementations = self._getModuleImplementations(modules); | ||
| var moduleImplementations = self._getModuleImplementations(mappedModules); | ||
| successCallback.apply(successCallback, moduleImplementations); | ||
| } | ||
| }, function(error) { /* istanbul ignore else */ | ||
| }, function(error) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (failureCallback) { | ||
| failureCallback.call(failureCallback, error); | ||
| } | ||
@@ -1026,3 +1047,3 @@ }); | ||
| * @protected | ||
| * @param {Array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @param {array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @return {Array<string>} A list with all missing dependencies. | ||
@@ -1224,2 +1245,31 @@ */ | ||
| /** | ||
| * Constructs an error object and calls a function passing the error object. | ||
| * | ||
| * @memberof! Loader# | ||
| * @protected | ||
| * @param {array} modules The required modules. | ||
| * @param {array} mappedModules The required modules, after the mapping process. | ||
| * @param {array} resolvedDependencies The resolved dependencies of the passed modules. | ||
| * @param {Function} callback The callback which should be called, passing the constructed error object. | ||
| */ | ||
| _raiseRequireFailure: function(modules, mappedModules, resolvedDependencies, callback) { | ||
| var registeredModules = this._getConfigParser().getModules(); | ||
| var error = { | ||
| mappedModules: mappedModules, | ||
| missingDependencies: resolvedDependencies.filter(function(dep) { | ||
| return !registeredModules[dep].implementation; | ||
| }), | ||
| modules: modules, | ||
| resolvedDependecies: resolvedDependencies | ||
| }; | ||
| void 0; | ||
| if (callback) { | ||
| callback(error); | ||
| } | ||
| }, | ||
| /** | ||
| * Resolves modules dependencies. | ||
@@ -1226,0 +1276,0 @@ * |
@@ -1200,3 +1200,3 @@ /*! | ||
| /* istanbul ignore else */ | ||
| /* istanbul ignore else */ | ||
| } else if (typeof arguments[i] === 'function') { | ||
@@ -1213,22 +1213,43 @@ successCallback = arguments[i]; | ||
| var configParser = self._getConfigParser(); | ||
| // Map the required modules so we start with clean idea what the hell we should load. | ||
| modules = this._getConfigParser().mapModule(modules); | ||
| var mappedModules = configParser.mapModule(modules); | ||
| void 0; | ||
| var resolvedDependencies; | ||
| // Set a timeout, after which an error will be passed to the client. | ||
| // If the user set it to 0, there will be no timeout. | ||
| var config = configParser.getConfig(); | ||
| var rejectTimeout; | ||
| if (config.waitTimeout !== 0) { | ||
| rejectTimeout = setTimeout(function() { | ||
| self._raiseRequireFailure(modules, mappedModules, resolvedDependencies, failureCallback.bind(failureCallback)); | ||
| }, config.waitTimeout || 7000); | ||
| } | ||
| // Resolve the dependencies of the specified modules by the user | ||
| // then load their JS scripts | ||
| self._resolveDependencies(modules).then(function(dependencies) { | ||
| self._resolveDependencies(mappedModules).then(function(dependencies) { | ||
| void 0; | ||
| resolvedDependencies = dependencies; | ||
| return self._loadModules(dependencies); | ||
| }).then(function(loadedModules) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (successCallback) { | ||
| var moduleImplementations = self._getModuleImplementations(modules); | ||
| var moduleImplementations = self._getModuleImplementations(mappedModules); | ||
| successCallback.apply(successCallback, moduleImplementations); | ||
| } | ||
| }, function(error) { /* istanbul ignore else */ | ||
| }, function(error) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (failureCallback) { | ||
| failureCallback.call(failureCallback, error); | ||
| } | ||
@@ -1302,3 +1323,3 @@ }); | ||
| * @protected | ||
| * @param {Array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @param {array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @return {Array<string>} A list with all missing dependencies. | ||
@@ -1500,2 +1521,31 @@ */ | ||
| /** | ||
| * Constructs an error object and calls a function passing the error object. | ||
| * | ||
| * @memberof! Loader# | ||
| * @protected | ||
| * @param {array} modules The required modules. | ||
| * @param {array} mappedModules The required modules, after the mapping process. | ||
| * @param {array} resolvedDependencies The resolved dependencies of the passed modules. | ||
| * @param {Function} callback The callback which should be called, passing the constructed error object. | ||
| */ | ||
| _raiseRequireFailure: function(modules, mappedModules, resolvedDependencies, callback) { | ||
| var registeredModules = this._getConfigParser().getModules(); | ||
| var error = { | ||
| mappedModules: mappedModules, | ||
| missingDependencies: resolvedDependencies.filter(function(dep) { | ||
| return !registeredModules[dep].implementation; | ||
| }), | ||
| modules: modules, | ||
| resolvedDependecies: resolvedDependencies | ||
| }; | ||
| void 0; | ||
| if (callback) { | ||
| callback(error); | ||
| } | ||
| }, | ||
| /** | ||
| * Resolves modules dependencies. | ||
@@ -1502,0 +1552,0 @@ * |
| { | ||
| "name": "lfr-amd-loader", | ||
| "version": "1.2.1", | ||
| "version": "1.2.2", | ||
| "description": "AMD Loader with support for combo URL and conditional loading", | ||
@@ -5,0 +5,0 @@ "main": "main.js", |
@@ -135,3 +135,3 @@ 'use strict'; | ||
| /* istanbul ignore else */ | ||
| /* istanbul ignore else */ | ||
| } else if (typeof arguments[i] === 'function') { | ||
@@ -148,22 +148,43 @@ successCallback = arguments[i]; | ||
| var configParser = self._getConfigParser(); | ||
| // Map the required modules so we start with clean idea what the hell we should load. | ||
| modules = this._getConfigParser().mapModule(modules); | ||
| var mappedModules = configParser.mapModule(modules); | ||
| console.log('REQUIRE modules mapped to', modules); | ||
| console.log('REQUIRE modules mapped to', mappedModules); | ||
| var resolvedDependencies; | ||
| // Set a timeout, after which an error will be passed to the client. | ||
| // If the user set it to 0, there will be no timeout. | ||
| var config = configParser.getConfig(); | ||
| var rejectTimeout; | ||
| if (config.waitTimeout !== 0) { | ||
| rejectTimeout = setTimeout(function() { | ||
| self._raiseRequireFailure(modules, mappedModules, resolvedDependencies, failureCallback.bind(failureCallback)); | ||
| }, config.waitTimeout || 7000); | ||
| } | ||
| // Resolve the dependencies of the specified modules by the user | ||
| // then load their JS scripts | ||
| self._resolveDependencies(modules).then(function(dependencies) { | ||
| self._resolveDependencies(mappedModules).then(function(dependencies) { | ||
| console.log('REQUIRE dependencies resolved to', dependencies); | ||
| resolvedDependencies = dependencies; | ||
| return self._loadModules(dependencies); | ||
| }).then(function(loadedModules) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (successCallback) { | ||
| var moduleImplementations = self._getModuleImplementations(modules); | ||
| var moduleImplementations = self._getModuleImplementations(mappedModules); | ||
| successCallback.apply(successCallback, moduleImplementations); | ||
| } | ||
| }, function(error) { /* istanbul ignore else */ | ||
| }, function(error) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (failureCallback) { | ||
| failureCallback.call(failureCallback, error); | ||
| } | ||
@@ -237,3 +258,3 @@ }); | ||
| * @protected | ||
| * @param {Array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @param {array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @return {Array<string>} A list with all missing dependencies. | ||
@@ -435,2 +456,31 @@ */ | ||
| /** | ||
| * Constructs an error object and calls a function passing the error object. | ||
| * | ||
| * @memberof! Loader# | ||
| * @protected | ||
| * @param {array} modules The required modules. | ||
| * @param {array} mappedModules The required modules, after the mapping process. | ||
| * @param {array} resolvedDependencies The resolved dependencies of the passed modules. | ||
| * @param {Function} callback The callback which should be called, passing the constructed error object. | ||
| */ | ||
| _raiseRequireFailure: function(modules, mappedModules, resolvedDependencies, callback) { | ||
| var registeredModules = this._getConfigParser().getModules(); | ||
| var error = { | ||
| mappedModules: mappedModules, | ||
| missingDependencies: resolvedDependencies.filter(function(dep) { | ||
| return !registeredModules[dep].implementation; | ||
| }), | ||
| modules: modules, | ||
| resolvedDependecies: resolvedDependencies | ||
| }; | ||
| console.log('REQUIRE timeout', error); | ||
| if (callback) { | ||
| callback(error); | ||
| } | ||
| }, | ||
| /** | ||
| * Resolves modules dependencies. | ||
@@ -437,0 +487,0 @@ * |
@@ -8,3 +8,3 @@ 'use strict'; | ||
| describe('Loader', function () { | ||
| describe('Loader', function() { | ||
| beforeEach(function() { | ||
@@ -81,2 +81,6 @@ Object.keys(require.cache).forEach(function(cache) { | ||
| path: 'module-dep.js' | ||
| }, | ||
| 'liferay@1.0.0/empty': { | ||
| dependencies: [], | ||
| path: 'empty.js' | ||
| } | ||
@@ -86,2 +90,4 @@ } | ||
| global.__CONFIG__.waitTimeout = 0; | ||
| global.__CONFIG__.paths = {}; | ||
@@ -101,3 +107,3 @@ | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert(impl.notCalled); | ||
@@ -179,3 +185,3 @@ | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled); | ||
@@ -201,3 +207,3 @@ assert.isTrue(success.calledOnce); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled); | ||
@@ -217,3 +223,3 @@ assert.isTrue(success.calledOnce); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled); | ||
@@ -232,3 +238,3 @@ assert.isTrue(success.calledOnce); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.calledOnce); | ||
@@ -247,3 +253,3 @@ assert.isTrue(success.notCalled); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.calledOnce); | ||
@@ -264,3 +270,3 @@ assert.isTrue(success.notCalled); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled); | ||
@@ -273,7 +279,7 @@ assert.isTrue(success.calledThrice); | ||
| it('should ignore success and callback if not functions', function () { | ||
| it('should ignore success and callback if not functions', function() { | ||
| Loader.require(['module1'], null, null); | ||
| }); | ||
| it('should return conditional modules', function () { | ||
| it('should return conditional modules', function() { | ||
| var conditionalModules = Loader.getConditionalModules(); | ||
@@ -290,3 +296,3 @@ | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled); | ||
@@ -305,3 +311,3 @@ assert.isTrue(success.calledOnce); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled, 'Failure should be not called'); | ||
@@ -324,3 +330,3 @@ assert.isTrue(success.calledOnce, 'Success should be called'); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled, 'Failure should be not called'); | ||
@@ -348,3 +354,3 @@ assert.isTrue(success.calledOnce, 'Success should be called'); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled, 'Failure should be not called'); | ||
@@ -370,3 +376,3 @@ assert.isTrue(success.calledOnce, 'Success should be called'); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled, 'Failure should be not called'); | ||
@@ -388,3 +394,3 @@ assert.isTrue(success.calledOnce, 'Success should be called'); | ||
| setTimeout(function () { | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.notCalled, 'Failure should be not called'); | ||
@@ -397,2 +403,27 @@ assert.isTrue(success.calledOnce, 'Success should be called'); | ||
| }); | ||
| it('should cancel a require in case of failure', function(done) { | ||
| global.__CONFIG__.waitTimeout = 20; | ||
| var failureError; | ||
| var failure = sinon.spy(function(error) { | ||
| failureError = error; | ||
| }); | ||
| var success = sinon.stub(); | ||
| Loader.require(['liferay@1.0.0/empty'], success, failure); | ||
| setTimeout(function() { | ||
| assert.isTrue(failure.calledOnce, 'Failure should be called once'); | ||
| assert.isTrue(success.notCalled, 'Success should not be called'); | ||
| assert.isObject(failureError); | ||
| assert.property(failureError, 'resolvedDependecies'); | ||
| assert.property(failureError, 'mappedModules'); | ||
| assert.property(failureError, 'missingDependencies'); | ||
| assert.property(failureError, 'modules'); | ||
| done(); | ||
| }, 50); | ||
| }); | ||
| }); |
@@ -156,3 +156,3 @@ (function (global, factory) { | ||
| /* istanbul ignore else */ | ||
| /* istanbul ignore else */ | ||
| } else if (typeof arguments[i] === 'function') { | ||
@@ -169,22 +169,43 @@ successCallback = arguments[i]; | ||
| var configParser = self._getConfigParser(); | ||
| // Map the required modules so we start with clean idea what the hell we should load. | ||
| modules = this._getConfigParser().mapModule(modules); | ||
| var mappedModules = configParser.mapModule(modules); | ||
| console.log('REQUIRE modules mapped to', modules); | ||
| console.log('REQUIRE modules mapped to', mappedModules); | ||
| var resolvedDependencies; | ||
| // Set a timeout, after which an error will be passed to the client. | ||
| // If the user set it to 0, there will be no timeout. | ||
| var config = configParser.getConfig(); | ||
| var rejectTimeout; | ||
| if (config.waitTimeout !== 0) { | ||
| rejectTimeout = setTimeout(function() { | ||
| self._raiseRequireFailure(modules, mappedModules, resolvedDependencies, failureCallback.bind(failureCallback)); | ||
| }, config.waitTimeout || 7000); | ||
| } | ||
| // Resolve the dependencies of the specified modules by the user | ||
| // then load their JS scripts | ||
| self._resolveDependencies(modules).then(function(dependencies) { | ||
| self._resolveDependencies(mappedModules).then(function(dependencies) { | ||
| console.log('REQUIRE dependencies resolved to', dependencies); | ||
| resolvedDependencies = dependencies; | ||
| return self._loadModules(dependencies); | ||
| }).then(function(loadedModules) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (successCallback) { | ||
| var moduleImplementations = self._getModuleImplementations(modules); | ||
| var moduleImplementations = self._getModuleImplementations(mappedModules); | ||
| successCallback.apply(successCallback, moduleImplementations); | ||
| } | ||
| }, function(error) { /* istanbul ignore else */ | ||
| }, function(error) { | ||
| clearTimeout(rejectTimeout); | ||
| /* istanbul ignore else */ | ||
| if (failureCallback) { | ||
| failureCallback.call(failureCallback, error); | ||
| } | ||
@@ -258,3 +279,3 @@ }); | ||
| * @protected | ||
| * @param {Array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @param {array} moduleNames List of module names to be checked for missing dependencies. | ||
| * @return {Array<string>} A list with all missing dependencies. | ||
@@ -456,2 +477,31 @@ */ | ||
| /** | ||
| * Constructs an error object and calls a function passing the error object. | ||
| * | ||
| * @memberof! Loader# | ||
| * @protected | ||
| * @param {array} modules The required modules. | ||
| * @param {array} mappedModules The required modules, after the mapping process. | ||
| * @param {array} resolvedDependencies The resolved dependencies of the passed modules. | ||
| * @param {Function} callback The callback which should be called, passing the constructed error object. | ||
| */ | ||
| _raiseRequireFailure: function(modules, mappedModules, resolvedDependencies, callback) { | ||
| var registeredModules = this._getConfigParser().getModules(); | ||
| var error = { | ||
| mappedModules: mappedModules, | ||
| missingDependencies: resolvedDependencies.filter(function(dep) { | ||
| return !registeredModules[dep].implementation; | ||
| }), | ||
| modules: modules, | ||
| resolvedDependecies: resolvedDependencies | ||
| }; | ||
| console.log('REQUIRE timeout', error); | ||
| if (callback) { | ||
| callback(error); | ||
| } | ||
| }, | ||
| /** | ||
| * Resolves modules dependencies. | ||
@@ -458,0 +508,0 @@ * |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
No alert changes
Improved metrics
- Total package byte prevSize
- increased by2.87%
877681
- Number of package files
- increased by0.71%
142
- Lines of code
- increased by2.62%
10696
No dependency changes