ig-types 6.25.0 → 6.25.3

package/Promise.js

@@ -117,11 +117,6 @@ module.packed =
 					&& Symbol.asyncIterator in list)){
 			return list
 				.then(this.pack.bind(this)) }
-		// list: generator...
-		if(typeof(list) == 'object' 
-				&& !list.map
-				&& Symbol.iterator in list){
-			list = [...list] }
 		/* XXX on one hand this should be here and on the other I'm not 
 		// 		sure how are we going to thread handler and onerror to 
 		// 		here...
@@ -380,6 +375,11 @@ function(name){
 		return (await this)[name](...args) } }
 
 
+// XXX if onerror(..) is triggered, does it write it's return value to 
+// 		.__packed and in what format???
+// XXX should .__packed be undefined if something breaks???
+// XXX revise how .__packed is handled by metods...
+// XXX might be a good idea to use Symbols for .__value and .__packed...
 var IterablePromise =
 module.IterablePromise =
 object.Constructor('IterablePromise', Promise, {
@@ -419,6 +419,17 @@ object.Constructor('IterablePromise', Promise, {
 		// handle iterable promise...
 		if(list instanceof IterablePromise){
 			return this.__handle(list.__packed, handler, onerror) }
+		// list: generator...
+		if(typeof(list) == 'object' 
+				// XXX this will cause a break later on...
+				//&& !list.map
+				&& Symbol.iterator in list){
+			try{
+				list = [...list] 
+			} catch(err){
+				if(typeof(onerror) == 'function'){
+					return onerror(err) }
+				throw err } }
 		// handle promise / async-iterator...
 		if(typeof(list) == 'object' 
 					&& Symbol.asyncIterator in list){
@@ -429,6 +440,7 @@ object.Constructor('IterablePromise', Promise, {
 
 		// do the packing...
 		var packed = module.packed.pack(list)
+
 		// handle if needed...
 		return handler ?
 			this.__handle(packed, handler, onerror)
@@ -753,16 +765,28 @@ object.Constructor('IterablePromise', Promise, {
 			: this.constructor(this.__packed, 'raw') },
 
 	// XXX EXPEREMENTAL
+	// XXX handle rejected state...
 	isSync: function(){
-		return !(this.__packed instanceof Promise
-			|| this.__packed
-				.filter(function(e){
-					return e instanceof IterablePromise ?
-							!e.isSync()
-						: e instanceof Promise 
-								&& !(e instanceof SyncPromise) })
-				.length > 0) },
+		return '__value' in this
+			|| (this.__packed instanceof Array 
+				&& !(this.__packed
+					.filter(function(e){
+						return e instanceof IterablePromise ?
+								!e.isSync()
+							: e instanceof Promise 
+									&& !(e instanceof SyncPromise) })
+					.length > 0)) },
+	// XXX BUG: if sync is called before .__handle(..) is done it will
+	// 		do things that we do not want yet like unwinding generators 
+	// 		etc...
 	sync: function(error=false){
+		if('__value' in this){
+			return this.__value }
+		if(!this.isSync()){
+			return error ?
+				this.catch(error)
+				: this }
+		// try and unpack...
 		try{
 			var res = this.__unpack()
 		}catch(err){
@@ -834,11 +858,26 @@ object.Constructor('IterablePromise', Promise, {
 
 		// populate new instance...
 		if(promise){
+			// XXX EXPEREMENTAL...
+			obj.then(function(value){
+				Object.defineProperty(obj, '__value', {
+					value,
+					enumerable: false,
+				}) })
+
 			// handle onerror(..)
+			var error = false
 			var handleError = function(err){
-				onerror ?
-					promise.resolve(onerror(err))
-					: promise.reject(err) }
+				error = true
+				if(onerror){
+					var res = onerror(err)
+					// XXX do we use .__pack(..) here???
+					//obj.__packed = undefined
+					// XXX this is wrong -- need to store the value as-is...
+					obj.__packed = [res]
+					promise.resolve(res)
+				} else {
+					promise.reject(err) } }
 			// handle/pack input data...
 			if(handler != 'raw'){
 				//list = list instanceof IterablePromise ?
@@ -851,33 +890,33 @@ object.Constructor('IterablePromise', Promise, {
 				// NOTE: this is needed for self-resolve...
 				writable: true,
 			})
+
+			// list generator broke...
+			if(error){
+				return obj }
+
 			// handle promise state...
 			try{
 				var res = obj.__unpack(list)
 			}catch(err){
 				promise.reject(err) }
-			res instanceof Promise ?
-				res
-					.then(function(list){
-						promise.resolve(list) })
-					.catch(promise.reject) 
-				: promise.resolve(res) 
-			// XXX EXPEREMENTAL
-			// XXX do we handle errors here???
-			// self-resolve state...
-			list instanceof Promise ?
-				list.then(function(list){
-					obj.__packed = list })
-				/*/ XXX use selfResolve(..)
-				: selfResolve(list) }
-				/*/
-				: list.forEach(function(elem, i){
+
+			if(res instanceof Promise){
+				res.then(
+					function(list){
+						promise.resolve(list) 
+						// self-resolve...
+						obj.__packed = list },
+					handleError) 
+			} else {
+				promise.resolve(res) 
+				// self-resolve...
+				res.forEach(function(elem, i){
 					elem instanceof Promise
 						&& elem.then(function(elem){
 							lst = obj.__packed.slice()
 							lst[i] = elem
-							obj.__packed = lst }) }) }
-				//*/
+							obj.__packed = lst }) }) } }
 		return obj },
 })
 
@@ -943,18 +982,20 @@ object.Constructor('IterableSequentialStartPromise', IterablePromise, {
 				res.push(e) }
 			return res }
 
-		// NOTE: we are not handling the list here...
-		list = object.parentCall(IterableSequentialStartPromise.prototype.__pack, this, list) 
+		// NOTE: we are not handling the list here yet...
+		// NOTE: if packing breaks but the error is handled this will return undefined...
+		list = object.parentCall(IterableSequentialStartPromise.prototype.__pack, this, 
+			list, undefined, onerror) 
 		list = list instanceof SyncPromise ?
 			list.sync()
 			: list
 		// repack...
 		list = list instanceof Array ?
 				repack(list)
-			: list.then ?
+			: list && list.then ?
 				list.then(repack)
 			: list 
-		return handler ?
+		return list && handler ?
 			this.__handle(list, handler, onerror)
 			: list },
 })

package/generator.js

@@ -236,6 +236,14 @@ object.Mixin('GeneratorMixin', 'soft', {
 	reduce: makeGenerator('reduce'),
 	reduceRight: makeGenerator('reduceRight'),
 
+	// XXX
+	smap: makeGenerator('smap'),
+	sfilter: makeGenerator('sfilter'),
+	sreduce: makeGenerator('sreduce'),
+	sreduceRight: makeGenerator('sreduceRight'),
+	sforEach: makeGenerator('sforEach'),
+	//*/
+
 	between: makeGenerator('between'),
 
 	// XXX EXPERIMENTAL
@@ -413,6 +421,8 @@ object.Mixin('GeneratorProtoMixin', 'soft', {
 				for(var e of this){
 					yield func(e, i++, this) } } },
 		__onstop),
+	smap: function*(func){
+		yield* this.map(...arguments) },
 	filter: stoppable(
 		function*(func){
 			var i = 0
@@ -428,6 +438,8 @@ object.Mixin('GeneratorProtoMixin', 'soft', {
 					err.value = e }
 				throw err } },
 		__onstop),
+	sfilter: function*(func){
+		yield* this.filter(...arguments) },
 
 	reduce: stoppable(
 		function(func, res){
@@ -439,6 +451,8 @@ object.Mixin('GeneratorProtoMixin', 'soft', {
 		// 		was passed a function from ever being treated as onstop(..)...
 		function(res, f, _, onstop){
 			return __onstop.call(this, res, onstop) }),
+	sreduce: function*(func, res){
+		yield* this.reduce(...arguments) },
 	greduce: function*(func, res){
 		yield this.reduce(...arguments) },
 
@@ -463,6 +477,8 @@ object.Mixin('GeneratorProtoMixin', 'soft', {
 	// XXX EXPERIMENTAL
 	forEach: function(func){
 		return [...this].map(func) },
+	sforEach: function(func){
+		return this.forEach(func) },
 
 	pop: function(){
 		return [...this].pop() },

package/package.json

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

package/test.js

@@ -304,7 +304,7 @@ var cases = test.Cases({
 				'promises as elements')
 
 		// XXX split this into separate cases...
-		for(var meth of ['iter', 'seqiter']){
+		for(var meth of ['iter', 'seqiter', 'seqstartiter']){
 			// XXX need a recursive assert...
 			var should_be = [ [1], [2], [3], [4], [5], [6] ]
 			var got = await Promise[meth]([
@@ -336,6 +336,12 @@ var cases = test.Cases({
 				await Promise[meth]([1, Promise.resolve(2), Promise.resolve(3)]),
 				[1,2,3],
 					'flat unpack', meth)
+
+			assert.array(
+				await Promise[meth](
+					(function*(){ yield* [1, Promise.resolve(2), Promise.resolve(3)] })()),
+				[1,2,3],
+					'generator input', meth)
 		}
 
 		var order = []
@@ -457,7 +463,8 @@ var cases = test.Cases({
 		// error...
 		for(var iter of ['iter', 'seqiter', 'seqstartiter']){
 			assert(
-				await Promise[iter]([1,2,Promise.resolve(3),4,5], 
+				await Promise[iter](
+						[1,2,Promise.resolve(3),4,5], 
 						function(e){
 							if(e == 2){
 								throw 'ERROR' }
@@ -467,7 +474,8 @@ var cases = test.Cases({
 				== 'done',
 				`.${iter}(..): .catch(..)`)
 			assert(
-				await Promise[iter]([1,2,Promise.resolve(3),4,5], 
+				await Promise[iter](
+					[1,2,Promise.resolve(3),4,5], 
 					function(e){
 						if(e == 2){
 							throw 'ERROR' }
@@ -477,7 +485,8 @@ var cases = test.Cases({
 				== 'done',
 				`.${iter}(..): onerror(..)`)
 			assert(
-				await Promise[iter]([1,2,Promise.resolve(3),4,5], 
+				await Promise[iter](
+					[1,2,Promise.resolve(3),4,5], 
 					function(e){
 						if(e == 3){
 							throw 'ERROR' }
@@ -487,7 +496,8 @@ var cases = test.Cases({
 				== 'done',
 				`.${iter}(..): edge onerror(..)`)
 			assert(
-				await Promise[iter]([1,2,Promise.resolve(3),4,5], 
+				await Promise[iter](
+					[1,2,Promise.resolve(3),4,5], 
 					function(e){
 						if(e == 4){
 							throw 'ERROR' }
@@ -495,7 +505,60 @@ var cases = test.Cases({
 					function(err){
 						return 'done' })
 				== 'done',
-				`.${iter}(..): late onerror(..)`) }
+				`.${iter}(..): late onerror(..)`) 
+			assert(
+				await Promise[iter](
+					(function*(){
+						yield* [1,2,3] })(),
+					function(e){
+						if(e == 2){
+							throw 'ERROR' }
+						return e },
+					function(err){
+						return 'done' })
+				== 'done',
+				`.${iter}(..): input generator, onerror(..) in handler`) 
+			assert(
+				(pr = await Promise[iter](
+					(function*(){
+						yield* [1,2,3]
+						throw 'ERROR' })(),
+					function(e){
+						return e },
+					function(err){
+						return 'done' }))
+				== 'done',
+				`.${iter}(..): onerror(..) in input generator`, pr) 
+			assert(
+				await (pr = Promise[iter](
+						(function*(){
+							yield* [1,2,3]
+							throw 'ERROR' })(),
+						function(e){
+							if(e == 4){
+								throw 'ERROR' }
+							return e },
+						function(err){
+							return 'done' })
+					.sync())
+				=== 'done',
+				`.${iter}(..): onerror(..) on input generator + .sync()`, pr) 
+			assert(
+				await Promise.iter(
+					(function*(){ 
+						yield* [1,2,3]
+						throw 'ERROR' })(), 
+					function(e){ 
+						return new Promise(function(ok, err){ 
+							if(e == 2){ 
+								err('moo!') }
+							ok(e) })}, 
+					function(err){ 
+						return 333 })
+				== 333,
+				`.${iter}(..): onerror(..) with promise handler`) 
+		}
+
 	},
 
 	// Date.js