components will now resolve with a single object

dlueth · Feb 28, 2020 · 855c4d0 · 855c4d0
1 parent 4004c03
commit 855c4d0
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 22 deletions.
diff --git a/dist/cache/dispose.js b/dist/cache/dispose.js
diff --git a/dist/cache/states.js b/dist/cache/states.js
diff --git a/dist/demand.js b/dist/demand.js
diff --git a/dist/demand.js.map b/dist/demand.js.map
diff --git a/dist/handler/css.js b/dist/handler/css.js
diff --git a/dist/handler/html.js b/dist/handler/html.js
diff --git a/dist/handler/json.js b/dist/handler/json.js
diff --git a/dist/handler/legacy.js b/dist/handler/legacy.js
diff --git a/dist/handler/text.js b/dist/handler/text.js
diff --git a/dist/plugin/cookie.js b/dist/plugin/cookie.js
diff --git a/dist/plugin/lzstring.js b/dist/plugin/lzstring.js
diff --git a/dist/plugin/sri.js b/dist/plugin/sri.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "qoopido.demand",
   "title": "Qoopido.demand",
   "description": "Promise like module loader using XHR requests and localStorage caching to dynamically load JavaScript and CSS + dynamic dependency resolution + support for custom handlers",
-  "version": "5.2.7",
+  "version": "5.2.8",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "author": {
     "name": "Dirk Lueth",

diff --git a/src/handler/component.js b/src/handler/component.js
@@ -74,21 +74,33 @@ var handlerComponent = (function() {
 
 			ClassPledge.all(pledges).then(
 				function() {
-					var i = 0, module, dependency;
+					var components = [],
+						i, module, component;
 
 					pledges.length = 0;
 
-					for(; (module = modules[i]); i++) {
-						dependency         = ClassDependency.get(module.uri) || new ClassDependency(module.uri);
-						dependency.source  = functionResolveSourcemaps(dependency.url, module.source);
-						dependency.handler = arguments[i];
+					for(i = 0; (module = modules[i]); i++) {
+						component         = ClassDependency.get(module.uri) || new ClassDependency(module.uri);
+						component.source  = functionResolveSourcemaps(component.url, module.source);
+						component.handler = arguments[i];
 
-						pledges.push(dependency.pledge);
+						components.push(component);
+						pledges.push(component.pledge);
 
-						queue.enqueue(dependency);
+						queue.enqueue(component);
 					}
 
-					ClassPledge.all(pledges).then(dfd.resolve, reject);
+					ClassPledge.all(pledges)
+						.then(function() {
+							var offset    = dependency.path.length + 1,
+								component = {};
+
+							for(i = 0; (module = arguments[i]); i++) {
+								component[components[i].path.substr(offset) || 'main'] = module;
+							}
+
+							dfd.resolve(component);
+						}, reject);
 				},
 				reject
 			);