enable pledge to also handle thenables

dlueth · Sep 3, 2020 · 184bca6 · 184bca6
1 parent 24ef2bc
commit 184bca6
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 20 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": "7.1.1",
+  "version": "7.1.2",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "author": {
     "name": "Dirk Lueth",

diff --git a/src/class/pledge.js b/src/class/pledge.js
@@ -2,14 +2,14 @@
 	global, document, demand, provide, queue, processor, settings, setTimeout, clearTimeout, log,
  	ERROR_UNHANDLED_PLEDGE_REJECTION, FUNCTION_EMPTY, UNDEFINED, STRING_UNDEFINED, NULL,
 	arrayPrototypeConcat,
-	validatorIsInstanceOf, validatorIsTypeOf,
+	validatorIsThenable, validatorIsTypeOf,
 	functionDefer, functionToArray,
 	ClassWeakmap, ClassFailure
 */
 
 //=require constants.js
 //=require shortcuts.js
-//=require validator/isInstanceOf.js
+//=require validator/IsThenable.js
 //=require validator/isTypeOf.js
 //=require function/defer.js
 //=require function/toArray.js
@@ -53,7 +53,7 @@ var ClassPledge = (function() {
 			try {
 				result = pointer.handler.apply(NULL, properties.value);
 
-				if(validatorIsInstanceOf(result, ClassPledge)) {
+				if(validatorIsThenable(result)) {
 					result.then(pointer.dfd.resolve, pointer.dfd.reject);
 
 					continue;

diff --git a/src/demand.js b/src/demand.js
@@ -31,6 +31,7 @@
 		options && options.settings && demand.configure(options.settings);
 
 	// include additional components
+		//=require validator/IsInstanceOf.js
 		//=require function/hash.js
 		//=require class/queue.js
 		//=require class/processor.js

diff --git a/src/function/demand.js b/src/function/demand.js
@@ -1,7 +1,7 @@
 /* global
 	global, document, demand, provide, queue, processor, settings, setTimeout, clearTimeout,
 	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,
+	validatorIsTypeOf, validatorIsObject, validatorIsPositive, validatorIsThenable, validatorIsSemver,
 	functionIterate, functionMerge, functionDefer, functionIdle, functionToArray,
 	ClassPledge, ClassDependency, ClassPattern, ClassLoader,
 	singletonEvent, singletonCache
@@ -11,7 +11,7 @@
 //=require validator/isTypeOf.js
 //=require validator/isObject.js
 //=require validator/isPositive.js
-//=require validator/isInstanceOf.js
+//=require validator/isThenable.js
 //=require validator/isSemver.js
 //=require function/iterate.js
 //=require function/merge.js
@@ -170,7 +170,7 @@ demand = (function() {
 
 			if(dependency.enqueue === true) {
 				queue.enqueue(dependency);
-			} else if(validatorIsInstanceOf(dependency.enqueue, ClassPledge)) {
+			} else if(validatorIsThenable(dependency.enqueue)) {
 				dependency.enqueue.then(function() { queue.enqueue(dependency); });
 			}
 		});