ig-types 6.15.0 → 6.15.1

package/Promise.js

@@ -5,8 +5,7 @@
 * 	Promise.iter(seq)
 * 	<promise>.iter()
 * 		Iterable promise object.
-* 		Similar to Promise.all(..) but adds basic iterator/generator
-* 		API and will resolve the items as they are ready (resolved).
+* 		Similar to Promise.all(..) but adds basic iterator API.
 *
 * 	Promise.interactive(handler)
 * 		Interactive promise object.
@@ -39,16 +38,6 @@ var object = require('ig-object')
 // Like Promise.all(..) but adds ability to iterate through results
 // via generators .map(..)/.reduce(..) and friends...
 // 
-// NOTE: it would be nice to support throwing STOP from the iterable 
-// 		promise but...
-// 		- this is more complicated than simply using .smap(..) instead 
-// 			of .map(..) because the list can contain async promises...
-// 			...would need to wrap each .then(..) call in try-catch and
-// 			manually handle the stop...
-// 			...then there's a question of derivative iterators etc.
-// 		- another issue here is that the stop would happen in order of 
-// 			execution and not order of elements...
-// 		XXX EXPEREMENTAL: STOP...
 // NOTE: the following can not be implemented here:
 // 			.splice(..)				- can't both modify and return
 // 									  a result...
@@ -68,18 +57,18 @@ var object = require('ig-object')
 // 		back to the complex IterablePromise...
 // 		
 // XXX how do we handle errors/rejections???
+// 		...mostly the current state is OK, but need more testing...
 // 		
 
-// XXX should these be exported???
 var iterPromiseProxy = 
-//module.iterPromiseProxy = 
+module.iterPromiseProxy = 
 function(name){
 	return function(...args){
 		return this.constructor(
 			this.then(function(lst){
 				return lst[name](...args) })) } }
 var promiseProxy =
-//module.promiseProxy =
+module.promiseProxy =
 function(name){
 	return async function(...args){
 		return (await this)[name](...args) } }
@@ -87,7 +76,6 @@ function(name){
 var IterablePromise =
 module.IterablePromise =
 object.Constructor('IterablePromise', Promise, {
-	// XXX EXPEREMENTAL: STOP...
 	get STOP(){
 		return Array.STOP },
 
@@ -210,6 +198,20 @@ object.Constructor('IterablePromise', Promise, {
 					: handler(elem) }) },
 		//*/
 	// transform/handle packed array (sync)...
+	//
+	// XXX BUG:
+	// 			await Promise.iter(['a', Promise.resolve(222), ['c']])
+	// 					.map(async e => e)
+	// 				-> ['a', <promise>, ['c']]
+	// 		is not the same as:
+	// 			await Promise.iter(['a', Promise.resolve(222), ['c']])
+	// 					.map(e => e)
+	// 				-> ['a', 222, ['c']]
+	// 		...and these works as expected:
+	// 			await Promise.iter(['a', Promise.resolve(222), ['c']], async e => [e])
+	// 				-> ['a', 222, ['c']]
+	// 			await Promise.iter(['a', Promise.resolve(222), ['c']], e => [e])
+	// 				-> ['a', 222, ['c']]
 	__handle: function(list, handler=undefined){
 		var that = this
 		if(typeof(list) == 'function'){
@@ -237,8 +239,9 @@ object.Constructor('IterablePromise', Promise, {
 					that.__pack(elem, handler)
 				: elem instanceof Promise ?
 					that.__pack(elem, handler)
-						.then(function(elem){
-							return elem.flat() })
+						//.then(function(elem){
+						.then(function([elem]){
+							return elem })
 				: [handler(elem)] })
    			.flat() },
 	// unpack array (async)...
@@ -367,6 +370,7 @@ object.Constructor('IterablePromise', Promise, {
 		var list = this.__packed
 		return ((i != 0 && i != -1)
 					|| list instanceof Promise
+					// XXX not sure if this is correct...
 					|| list.at(i) instanceof Promise) ?
 				(await this).at(i)
 			// NOTE: we can only reason about first/last explicit elements, 
@@ -384,7 +388,6 @@ object.Constructor('IterablePromise', Promise, {
 	// NOTE: unlike .reduce(..) this needs the parent fully resolved 
 	// 		to be able to iterate from the end.
 	// XXX is it faster to do .reverse().reduce(..) ???
-	// XXX ???
 	reduceRight: promiseProxy('reduceRight'),
 
 	// NOTE: there is no way we can do a sync generator returning 
@@ -465,6 +468,12 @@ object.Constructor('IterablePromise', Promise, {
 	every: promiseProxy('every'),
 
 
+	// this is defined globally as Promise.prototype.iter(..)
+	//
+	// for details see: PromiseMixin(..) below...
+	//iter: function(handler=undefined){ ... },
+
+
 	// promise api...
 	//
 	// Overload .then(..), .catch(..) and .finally(..) to return a plain 
@@ -492,12 +501,6 @@ object.Constructor('IterablePromise', Promise, {
 			: p },
 
 
-	// this is defined globally as Promise.prototype.iter(.,)
-	//
-	// for details see: PromiseMixin(..) below...
-	//iter: function(handler=undefined){ ... },
-
-
 	// constructor...
 	//
 	//	Promise.iter([ .. ])
@@ -518,6 +521,7 @@ object.Constructor('IterablePromise', Promise, {
 	// 		items...
 	// 		XXX we can make the index a promise, then if the client needs
 	// 			the value they can wait for it...
+	// 			...this may be quite an overhead...
 	//
 	//
 	// Special cases useful for extending this constructor...
@@ -654,6 +658,7 @@ object.Constructor('InteractivePromise', Promise, {
 // Cooperative promise...
 // 
 // A promise that can be resolved/rejected externally.
+//
 // NOTE: normally this has no internal resolver logic...
 // 
 

package/generator.js

@@ -66,6 +66,14 @@ module.Generator =
 	(function*(){}).constructor
 
 
+var AsyncGeneratorPrototype =
+	(async function*(){}).constructor.prototype
+
+var AsyncGenerator =
+module.AsyncGenerator =
+	(async function*(){}).constructor
+
+
 // base iterator prototypes...
 var ITERATOR_PROTOTYPES = [
 	Array,
@@ -428,6 +436,41 @@ ITERATOR_PROTOTYPES
 		GeneratorProtoMixin(proto) })
 
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// XXX EXPERIMENTAL...
+
+var makeAsyncGenerator = function(name, pre){
+	return function(...args){
+		var that = this
+		return Object.assign(
+			async function*(){
+				var a = pre ? 
+					pre.call(this, args, ...arguments)
+					: args
+				for await (var e of that(...arguments)[name](...a)){
+					yield e } }, 
+			{ toString: function(){
+				return [
+					that.toString(), 
+					// XXX need to normalize args better...
+					`.${ name }(${ args.join(', ') })`,
+				].join('\n    ') }, }) } }
+
+var AsyncGeneratorMixin =
+module.AsyncGeneratorMixin =
+object.Mixin('AsyncGeneratorMixin', 'soft', {
+	map: makeAsyncGenerator('map'),
+})
+
+var AsyncGeneratorProtoMixin =
+module.AsyncGeneratorProtoMixin =
+object.Mixin('AsyncGeneratorProtoMixin', 'soft', {
+})
+
+//AsyncGeneratorMixin(AsyncGeneratorPrototype)
+//AsyncGeneratorProtoMixin(AsyncGeneratorPrototype.prototype)
+
+
 
 //---------------------------------------------------------------------
 // Generators...

package/package.json

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