make provide accept pledges as argument so that async provides are po…

…ssible
dlueth · Apr 15, 2020 · ff32bad · ff32bad
1 parent 09229a1
commit ff32bad
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 18 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.3.0",
+  "version": "5.3.1",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "author": {
     "name": "Dirk Lueth",

diff --git a/src/function/provide.js b/src/function/provide.js
@@ -1,25 +1,27 @@
 /* global
 	global, document, demand, provide, queue, processor, settings, setTimeout, clearTimeout,
 	EVENT_PROVIDE, EVENT_REJECT, STRING_STRING, STRING_UNDEFINED, STRING_FUNCTION, ERROR_PROVIDE, ERROR_PROVIDE_ANONYMOUS, NULL,
-	validatorIsTypeOf, validatorIsArray,
+	validatorIsTypeOf, validatorIsInstanceOf, validatorIsArray,
 	singletonEvent,
-	ClassDependency, ClassFailure
+	ClassDependency, ClassFailure, ClassPledge
 */
 
 //=require constants.js
 //=require validator/isTypeOf.js
+//=require validator/isInstanceOf.js
 //=require validator/isArray.js
 //=require singleton/event.js
 //=require class/dependency.js
 //=require class/failure.js
+//=require class/pledge.js
 
 /*eslint no-global-assign: [2, { "exceptions": ["provide"] }] */
 provide = function provide() {
 	var uri          = validatorIsTypeOf(arguments[0], STRING_STRING) ? arguments[0] : NULL,
 		context      = this !== global ? this : NULL,
 		dependencies = validatorIsArray(arguments[uri ? 1 : 0]) ? arguments[uri ? 1 : 0] : NULL,
 		definition   = dependencies ? arguments[uri ? 2 : 1] : arguments[uri ? 1 : 0],
-		module, isFunction;
+		module, isPledge, isFunction;
 
 	if(!uri && processor.current) {
 		module = processor.current;
@@ -30,6 +32,7 @@ provide = function provide() {
 
 	if(uri) {
 		module     = module || new ClassDependency(uri, context);
+		isPledge   = validatorIsInstanceOf(definition, ClassPledge);
 		isFunction = validatorIsTypeOf(definition, STRING_FUNCTION);
 
 		if(dependencies) {
@@ -40,7 +43,11 @@ provide = function provide() {
 					function() { module.dfd.reject(new ClassFailure(ERROR_PROVIDE, module.id, arguments)); }
 				);
 		} else {
-			module.dfd.resolve(isFunction ? definition() : definition);
+			if(isPledge) {
+				definition.then(module.dfd.resolve, module.dfd.reject);
+			} else {
+				module.dfd.resolve(isFunction ? definition() : definition);
+			}
 		}
 
 		module.dfd.pledge.then(