From 47c10ea0b11c4d4df12df4854f40fd6bf2998530 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 29 Dec 2022 02:24:31 +0300
Subject: [PATCH] Promise.iter(..) now mostly works, still need spec and
 testing (experimental)...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 Promise.js   | 68 +++++++++-------------------------------------------
 package.json |  2 +-
 2 files changed, 12 insertions(+), 58 deletions(-)

diff --git a/Promise.js b/Promise.js
index 77b9fd1..ea37c09 100644
--- a/Promise.js
+++ b/Promise.js
@@ -335,32 +335,6 @@ object.Constructor('IterablePromise', Promise, {
 			: 'map'
 		return list
 			[map](function(elem){
-				//* XXX migrate code from old .__pack(..)...
-				// XXX examples...
-				// 		correct:
-				// 			await Promise.iter(
-				// 					['a','b','c', [3,2,1], Promise.all([1,2,3])])
-				// 				-> ['a','b','c', [3,2,1], [1,2,3]]
-				// 		correct:
-				// 			await Promise.iter(
-				// 					['a','b','c', [3,2,1], Promise.all([1,2,3])], 
-				// 					'raw')
-				// 				-> ['a','b','c', 3,2,1, 1,2,3]
-				// 		should be the same as above (should expand promise):
-				// 			await Promise.iter(
-				// 					['a','b','c', [3,2,1], Promise.all([1,2,3])], 
-				// 					e => e)
-				// 				-> ['a','b','c', 3,2,1, [1,2,3]]
-				// 		should be the same as above:
-				// 			await Promise.iter(
-				// 						['a','b','c', [3,2,1], Promise.all([1,2,3])])
-				// 					.flat()
-				// 				-> ['a','b','c', 3,2,1, [1,2,3]]
-				// 		correct:
-				// 			await Promise.iter(
-				// 					['a','b','c', [3,2,1], Promise.all([1,2,3])], 
-				// 					e => [e])
-				// 				-> ['a','b','c', [3,2,1], [1,2,3]]
 				// XXX need a strict spec...
 				return elem instanceof IterablePromise ?
 						(elem.isSync() ?
@@ -370,39 +344,19 @@ object.Constructor('IterablePromise', Promise, {
 					: (elem instanceof SyncPromise
 							&& !(elem.sync() instanceof Promise)) ?
 						handler(elem.sync())
-					//: elem && elem.then ?
-					//	(handleSTOP ?
-					//		// stoppable -- need to handle stop async...
-					//		elem
-					//			.then(function(res){
-					//				return !stop ?
-					//					handler(res)
-					//					: [] }) 
-					//			// NOTE: we are using .catch(..) here
-					//			// 		instead of directly passing the
-					//			// 		error handler to be able to catch
-					//			// 		the STOP from the handler...
-					//			.catch(handleSTOP)
-					//		// non-stoppable...
-					//		: elem.then(handler))
+					: elem && elem.then ?
+						// XXX handle STOP...
+						elem.then(function(elem){
+							return handler(
+								elem.length == 1 ?
+									elem[0]
+									:elem) })
 					: elem instanceof Array ?
-						handler(elem)
-					// NOTE: we keep things that do not need protecting 
-					// 		from .flat() as-is...
-					//: !handle ?
-					//	elem
+						[handler(
+							elem.length == 1 ?
+								elem[0]
+								: elem)]
 					: handler(elem) })
-				/*/
-				elem = elem instanceof Array 
-						|| elem instanceof Promise ?
-					that.__handle(elem, handler, onerror)
-					: [handler(elem)]
-				elem = elem instanceof Promise ?
-					elem.then(function([e]){
-						return e })
-					: elem
-				return elem })
-				//*/
    			.flat() },
 	//*/
 	// XXX this should return IterablePromise if .__packed is partially sync (???)
diff --git a/package.json b/package.json
index 866e694..8315b90 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ig-types",
-  "version": "6.24.10",
+  "version": "6.24.11",
   "description": "Generic JavaScript types and type extensions...",
   "main": "main.js",
   "scripts": {