ig-types 6.24.8 → 6.24.10

package/Promise.js

@@ -133,25 +133,18 @@ object.Constructor('IterablePromise', Promise, {
 			if(!onerror){
 				list = [...list]
 			// handle errors in input generator...
+			// NOTE: this does not offer the most control because semantically 
+			// 		we bust behave in the same manner as <generator>.iter(..)
 			} else {
 				var res = []
 				try{
 					for(var e of list){
 						res.push(e) }
-					list = res
 				}catch(err){
 					var r = onerror(err)
-					if(r === this.constructor.STOP
-							|| r instanceof this.constructor.STOP){
-						r instanceof this.constructor.STOP
-							&& res.push(r.value)
-						list = res 
-					} else {
-						list = r instanceof Array ?
-								r
-							: r ?
-								[r]
-							: [] } } } }
+					r !== undefined
+						&& res.push(r) } 
+				list = res } } 
 		// handle iterable promise...
 		if(list instanceof IterablePromise){
 			return this.__handle(list.__packed, handler, onerror) }
@@ -162,8 +155,8 @@ object.Constructor('IterablePromise', Promise, {
 			return list
 				.iter(handler, onerror) 
 				.then(function(list){
-					return that.__pack(list) }) 
-		} else if(list instanceof Promise){
+					return that.__pack(list) }) } 
+		if(list instanceof Promise){
 			return list
 				.then(function(list){
 					return that.__pack(list, handler, onerror) }) }
@@ -1055,37 +1048,39 @@ object.Mixin('PromiseMixin', 'soft', {
 	cooperative: CooperativePromise,
 	sync: SyncPromise,
 	// XXX should this be implemented via SyncPromise??? 
+	// XXX not sure if we need to expand async generators...
 	awaitOrRun: function(data, func, error){
 		data = [...arguments]
 		func = data.pop()
 		if(typeof(data.at(-1)) == 'function'){
 			error = func
 			func = data.pop() }
-		// ceck if we need to await...
-		return data
-				.reduce(function(res, e){
+		error = error ? 
+			[error] 
+			: []
+		// check if we need to await...
+		return data.reduce(function(res, e){
 					return res 
 						|| e instanceof Promise }, false) ?
-			// NOTE: we will not reach this on empty data...
-			(data.length > 1 ?
-				Promise.all(data)
-					.then(
-						function(res){ 
-							return func(...res) }, 
-						...(error ? 
-							[error] 
-							: []))
-				: data[0].then(
-					func, 
-					...(error ? 
-						[error] 
-						: [])))
-			: error ?
+				// NOTE: we will not reach this on empty data...
+				(data.length > 1 ?
+					Promise.all(data)
+						.then(
+							function(res){ 
+								return func(...res) }, 
+							...error)
+					: data[0].then(func, ...error))
+			// XXX not sure if we need to expand async generators...
+			: (data.length == 1 
+					&& Symbol.asyncIterator in data[0]
+					&& 'then' in data[0]) ?
+				data[0].then(func, ...error)
+			: error.length > 0 ?
 				function(){
 					try{
 						return func(...data)
 					}catch(err){
-						return error(err) } }()
+						return error[0](err) } }()
 			: func(...data) },
 })
 

package/generator.js

@@ -583,8 +583,10 @@ object.Mixin('AsyncGeneratorProtoMixin', 'soft', {
 			if(onerror){
 				if(!(err === STOP || err instanceof STOP)){
 					var res = onerror(err) 
-					if(res){
-						yield res } 
+					if(res !== undefined){
+						yield handler ?
+							handler(res)
+				   			: res } 
 					return } }
 			throw err } }),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ig-types",
-  "version": "6.24.8",
+  "version": "6.24.10",
   "description": "Generic JavaScript types and type extensions...",
   "main": "main.js",
   "scripts": {