remove handling of unhandled pledge rejections

Fixes #5
dlueth · Aug 7, 2020 · 9c0e34c · 9c0e34c
1 parent 393f1be
commit 9c0e34c
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 46 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-lock.json b/package-lock.json
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": "7.0.7",
+  "version": "7.0.8",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "author": {
     "name": "Dirk Lueth",

diff --git a/src/class/pledge.js b/src/class/pledge.js
@@ -40,29 +40,13 @@ var ClassPledge = (function() {
 		});
 	}
 
-	function handleUncaught(values) {
-		var i = 0, value;
-
-		console.warn(ERROR_UNHANDLED_PLEDGE_REJECTION);
-
-		for(; (value = values[i]) !== undefined; i++) {
-			if(validatorIsInstanceOf(value, Error) || validatorIsInstanceOf(value, ClassFailure)) {
-				throw value;
-			}
-		}
-	}
-
 	function handle(state, parameter) {
 		var properties = storage.get(this),
 			pointer, result;
 
 		if(properties.state === PLEDGE_PENDING) {
 			properties.state = state;
 			properties.value = parameter;
-
-			if(state === PLEDGE_REJECTED && !properties[state].length) {
-				handleUncaught(parameter)
-			}
 		}
 
 		while(pointer = properties[properties.state].shift()) {

diff --git a/src/constants.js b/src/constants.js
@@ -52,5 +52,4 @@ var DEMAND_ID               = 'demand',
 	ERROR_LOAD              = 'error loading',
 	ERROR_PROVIDE           = 'error providing',
 	ERROR_RESOLVE           = 'error resolving',
-	ERROR_PROVIDE_ANONYMOUS = 'unspecified anonymous provide',
-	ERROR_UNHANDLED_PLEDGE_REJECTION = 'unhandled pledge rejection';
+	ERROR_PROVIDE_ANONYMOUS = 'unspecified anonymous provide';
diff --git a/src/function/demand.js b/src/function/demand.js
@@ -1,6 +1,6 @@
 /* global
 	global, document, demand, provide, queue, processor, settings, setTimeout, clearTimeout,
-	STRING_BOOLEAN, STRING_STRING, EVENT_PRE_RESOLVE, EVENT_POST_RESOLVE, EVENT_PRE_CONFIGURE, EVENT_POST_CONFIGURE, EVENT_CACHE_MISS, EVENT_CACHE_HIT, EVENT_PRE_REQUEST, EVENT_POST_REQUEST, EVENT_PRE_PROCESS, EVENT_POST_PROCESS, NULL, FALSE,
+	STRING_BOOLEAN, STRING_STRING, EVENT_REJECT, EVENT_PRE_RESOLVE, EVENT_POST_RESOLVE, EVENT_PRE_CONFIGURE, EVENT_POST_CONFIGURE, EVENT_CACHE_MISS, EVENT_CACHE_HIT, EVENT_PRE_REQUEST, EVENT_POST_REQUEST, EVENT_PRE_PROCESS, EVENT_POST_PROCESS, NULL, FALSE,
 	validatorIsTypeOf, validatorIsObject, validatorIsPositive, validatorIsInstanceOf, validatorIsSemver,
 	functionIterate, functionMerge, functionDefer, functionIdle, functionToArray,
 	ClassPledge, ClassDependency, ClassPattern, ClassLoader,
@@ -48,28 +48,40 @@ demand = (function() {
 	function demand() {
 		var dependencies = functionToArray(arguments),
 			context      = this !== global ? this : NULL,
-			i = 0, uri, dfd, result;
+			pledges = [], i = 0, uri, dfd, result;
 
 		singletonEvent.emit(EVENT_PRE_RESOLVE, NULL, dependencies, context);
 
 		for(; (uri = dependencies[i]); i++) {
 			if(validatorIsTypeOf(uri, STRING_STRING)) {
-				dependencies[i] = ClassDependency.resolve(uri, context).pledge;
+				dependencies[i] = ClassDependency.resolve(uri, context);
 			} else {
-				dependencies[i] = (dfd = ClassPledge.defer()).pledge;
+				dependencies[i] = (dfd = ClassPledge.defer());
 
 				dfd.resolve(uri);
 			}
+
+			pledges.push(dependencies[i].pledge);
 		}
 
 		if(dependencies.length > 1) {
-			result = ClassPledge.all(dependencies);
+			result = ClassPledge.all(pledges);
 		} else {
-			result = dependencies[0];
+			result = pledges[0];
 		}
 
 		return result.always(function() {
-			singletonEvent.emit(EVENT_POST_RESOLVE, NULL, dependencies, context);
+			singletonEvent.emit(EVENT_POST_RESOLVE, NULL, pledges, context);
+
+			if(result.isRejected()) {
+				functionIterate(dependencies, function(_, dependency) {
+					if(dependency.pledge.isRejected()) {
+						singletonEvent.emit(EVENT_REJECT, dependency.path, dependency);
+					}
+				});
+
+				return ClassPledge.reject.apply(null, arguments);
+			}
 		});
 	}
 

diff --git a/src/function/provide.js b/src/function/provide.js
@@ -1,6 +1,6 @@
 /* global
 	global, document, demand, provide, queue, processor, settings, setTimeout, clearTimeout, log,
-	EVENT_PROVIDE, EVENT_REJECT, STRING_STRING, STRING_UNDEFINED, STRING_FUNCTION, ERROR_PROVIDE, ERROR_PROVIDE_ANONYMOUS, NULL,
+	EVENT_PROVIDE, STRING_STRING, STRING_UNDEFINED, STRING_FUNCTION, ERROR_PROVIDE, ERROR_PROVIDE_ANONYMOUS, NULL,
 	validatorIsTypeOf, validatorIsInstanceOf, validatorIsArray,
 	singletonEvent,
 	ClassDependency, ClassFailure, ClassPledge
@@ -51,8 +51,7 @@ provide = function provide() {
 		}
 
 		module.dfd.pledge.then(
-			function() { singletonEvent.emit(EVENT_PROVIDE, module.path, module); },
-			function() { singletonEvent.emit(EVENT_REJECT, module.path, module); }
+			function() { singletonEvent.emit(EVENT_PROVIDE, module.path, module); }
 		);
 
 		return module.dfd.pledge;