ig-types 6.24.3 → 6.24.5

package/Promise.js

@@ -70,12 +70,15 @@ function(name){
 		return this.constructor(
 			this.then(function(lst){
 				return lst[name](...args) })) } }
+
+// XXX ASYNC should this be async or simply return a SyncPromise/Promise???
 var promiseProxy =
 module.promiseProxy =
 function(name){
 	return async function(...args){
 		return (await this)[name](...args) } }
 
+
 var IterablePromise =
 module.IterablePromise =
 object.Constructor('IterablePromise', Promise, {
@@ -149,7 +152,19 @@ object.Constructor('IterablePromise', Promise, {
 		var pack = function(){
 			return [list].flat()
 				[map](function(elem){
+					// XXX EXPEREMENTAL...
+					return elem instanceof IterablePromise ?
+							(elem.isSync() ?
+								handler(elem.sync())
+								// XXX need to handle this but keep it IterablePromise...
+								: elem.iterthen(handler))
+						: (elem instanceof SyncPromise
+								&& !(elem.sync() instanceof Promise)) ?
+							handler(elem.sync())
+						: elem && elem.then ?
+					/*/
 					return elem && elem.then ?
+					//*/
 							(stoppable ?
 								// stoppable -- need to handle stop async...
 								elem
@@ -238,6 +253,35 @@ object.Constructor('IterablePromise', Promise, {
 							return elem })
 				: [handler(elem)] })
    			.flat() },
+	// XXX EXPEREMENTAL...
+	// XXX this should return IterablePromise if .__packed is partially sync (???)
+	// unpack array (sync/async)...
+	__unpack: function(list){
+		list = list 
+			?? this.__packed
+		// handle promise list...
+		if(list instanceof IterablePromise){
+			return list.__unpack() }
+		if(list instanceof Promise){
+			return list
+				.then(this.__unpack.bind(this)) }
+		var res = []
+		for(var e of list){
+			if(e instanceof IterablePromise){
+				e = e.__unpack() }
+			if(e instanceof SyncPromise){
+				e = e.sync() }
+			// give up on a sync solution...
+			if(e instanceof Promise){
+				// XXX can we return an IterablePromise???
+				// XXX these will cause infinite recursion....
+				//return Promise.iter(list).flat() }
+				return Promise.all(list)
+					.then(function(list){ 
+						return list.flat() }) }
+			res.push(e) }
+		return res.flat() },
+	/*/
 	// unpack array (async)...
 	__unpack: async function(list){
 		list = list 
@@ -248,11 +292,12 @@ object.Constructor('IterablePromise', Promise, {
 			// do the work...
 			: (await Promise.all(list))
 				.flat() },
-
+	//*/
+	
 	[Symbol.asyncIterator]: async function*(){
 		var list = this.__packed
 		if(list instanceof Promise){
-			yield this.__unpack(await list) 
+			yield* await this.__unpack(list) 
 			return }
 		for await(var elem of list){
 			yield* elem instanceof Array ?
@@ -387,6 +432,7 @@ object.Constructor('IterablePromise', Promise, {
 	// NOTE: methods that are guaranteed to return an array will return
 	// 		an iterable promise (created with iterPromiseProxy(..))...
 	//
+	// XXX ASYNC should this be async or simply return a SyncPromise/Promise???
 	at: async function(i){
 		var list = this.__packed
 		return ((i != 0 && i != -1)
@@ -453,6 +499,8 @@ object.Constructor('IterablePromise', Promise, {
 	// 			to resolve...
 	// 		- if no clients are available this can lead to wasted 
 	// 			CPU time...
+	//
+	// XXX ASYNC should this be async or simply return a SyncPromise/Promise???
 	find: async function(func, result='value'){
 		var that = this
 		// NOTE: not using pure await here as this is simpler to actually 
@@ -484,11 +532,13 @@ object.Constructor('IterablePromise', Promise, {
 	findIndex: promiseProxy('findIndex'),
 
 	// NOTE: this is just a special-case of .find(..)
+	// XXX ASYNC should this be async or simply return a SyncPromise/Promise???
 	some: async function(func){
 		return this.find(func, 'bool') },
 	every: promiseProxy('every'),
 
 
+	// XXX ASYNC should this be async or simply return a SyncPromise/Promise???
 	join: async function(){
 		return [...(await this)]
 			.join(...arguments) },
@@ -510,7 +560,10 @@ object.Constructor('IterablePromise', Promise, {
 	// NOTE: this is slightly different from .then(..) in that it can be 
 	// 		called without arguments and return a promise wrapper. This can
 	// 		be useful to hide special promise functionality...
-	then: function (onfulfilled, onrejected){
+	//
+	// NOTE: this is internally linked to the actual (via: ..then.call(this, ..)) 
+	// 		state and will be resolved in .__new__(..) below.
+	then: function(onfulfilled, onrejected){
 		var p = new Promise(
 			function(resolve, reject){
 				Promise.prototype.then.call(this,
@@ -525,6 +578,47 @@ object.Constructor('IterablePromise', Promise, {
 		return arguments.length > 0 ?
 			p.then(...arguments) 
 			: p },
+	// XXX EXPEREMENTAL revise...
+	// Like .then(..) but returns an IterablePromise instance...
+	iterthen: function(onfulfilled, onrejected){
+		if(this.isSync()){
+			var res = onfulfilled ?
+				this.constructor(onfulfilled(this.__unpack()))
+				: this.constructor(this.__unpack()) 
+			onrejected
+				&& res.catch(onrejected) 
+			return res }
+		// XXX we need to feed the output of onfulfilled to the value of 
+		// 		res, but to this without wrapping the whole thing in a 
+		// 		promise (possible???)...
+		return arguments.length > 0 ?
+			this.constructor(this.then(...arguments))
+			: this.constructor(this.__packed, 'raw') },
+
+	// XXX EXPEREMENTAL
+	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) },
+	sync: function(error=false){
+		try{
+			var res = this.__unpack()
+		}catch(err){
+			if(error == false){
+				return }
+			if(typeof(error) == 'function'){
+				return error(err) }
+			throw err }
+		return error !== false 
+				&& res instanceof Promise ?
+			// XXX should this be an IterablePromise???
+			res.catch(error)
+			: res },
 
 
 	// constructor...
@@ -584,18 +678,37 @@ object.Constructor('IterablePromise', Promise, {
 			// handle/pack input data...
 			if(handler != 'raw'){
 				list = list instanceof IterablePromise ?
-					this.__handle(list.__packed, handler)
-					: this.__pack(list, handler) }
+					obj.__handle(list.__packed, handler)
+					: obj.__pack(list, handler) }
 			Object.defineProperty(obj, '__packed', {
 				value: list,
 				enumerable: false,
+				// NOTE: this is needed for self-resolve...
+				writable: true,
 			})
 			// handle promise state...
-			this.__unpack(list)
-				.then(function(list){
-					promise.resolve(list) })
-				.catch(promise.reject) }
-
+			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 })
+				: list.forEach(function(elem, i){
+					elem instanceof Promise
+						&& elem.then(function(elem){
+							lst = obj.__packed.slice()
+							lst[i] = elem
+							obj.__packed = lst }) }) }
 		return obj },
 })
 
@@ -795,6 +908,7 @@ object.Constructor('ProxyPromise', Promise, {
 
 //---------------------------------------------------------------------
 
+// XXX should this support async generators???
 var syncAllProxy = 
 function(name){
 	return function(lst){
@@ -809,6 +923,7 @@ function(name){
 			: Promise[name](lst) } }
 
 // XXX REVISE/TEST...
+// XXX should this support async generators???
 var syncAnyProxy =
 function(name){
 	return function(lst){
@@ -837,6 +952,8 @@ object.Constructor('SyncPromise', Promise, {
 		return new this(function(resolve){ resolve(value) }) },
 	reject: function(error){
 		return new this(function(_, reject){ reject(error) }) },
+	// NOTE: these essentially add a special case where the inputs are
+	// 		either not promises or SyncPromise instances...
 	all: syncAllProxy('all'),
 	allSettled: syncAllProxy('allSettled'),
 	any: syncAnyProxy('any'),
@@ -859,6 +976,13 @@ object.Constructor('SyncPromise', Promise, {
 					resolve(this.value)) 
 			// XXX should we return a copy???
 			: this },
+	sync: function(error='throw'){
+		if(error !== false 
+				&& 'error' in this){
+			if(typeof(error) != 'function'){
+				throw this.error }
+			return error(this.error) }
+		return this.value },
 
 	// NOTE: if func calls resolve(..) with a promise then this will return
 	// 		that promise...
@@ -890,6 +1014,7 @@ object.Constructor('SyncPromise', Promise, {
 })
 
 
+
 //---------------------------------------------------------------------
 
 var PromiseMixin =
@@ -944,13 +1069,7 @@ object.Mixin('PromiseProtoMixin', 'soft', {
 	as: ProxyPromise,
 	iter: function(handler=undefined){
 		return IterablePromise(this, handler) },
-	sync: function(error='throw'){
-		if(this instanceof SyncPromise){
-			if('error' in this){
-				if(typeof(error) != 'function'){
-					throw this.error }
-				return error(this.error) }
-			return this.value }
+	sync: function(){
 		return this },
 })
 

package/README.md

@@ -77,7 +77,7 @@ Library of JavaScript type extensions, types and utilities.
       - [`<promise>.iter()`](#promiseiter)
       - [`<promise-iter>.iter()`](#promise-iteriter)
       - [`<promise-iter>.map(..)` / `<promise-iter>.filter(..)` / `<promise-iter>.reduce(..)`](#promise-itermap--promise-iterfilter--promise-iterreduce)
-    - [`<promise-iter>.between(..)`](#promise-iterbetween)
+      - [`<promise-iter>.between(..)`](#promise-iterbetween)
       - [`<promise-iter>.flat(..)`](#promise-iterflat)
       - [`<promise-iter>.reverse()`](#promise-iterreverse)
       - [`<promise-iter>.concat(..)`](#promise-iterconcat)
@@ -95,7 +95,7 @@ Library of JavaScript type extensions, types and utilities.
       - [`<promise>.as(..)`](#promiseas)
       - [`<promise-proxy>.<method>(..)`](#promise-proxymethod)
     - [Sync/async promise](#syncasync-promise)
-      - [`Promise.sync(..)` / `promise.SyncPromice(..)`](#promisesync--promisesyncpromice)
+      - [`Promise.sync(..)` / `promise.SyncPromise(..)`](#promisesync--promisesyncpromise)
       - [`<promise>.sync(..)`](#promisesync)
       - [`<sync-promise>.value` / `<sync-promise>.error`](#sync-promisevalue--sync-promiseerror)
       - [`Promise.sync.all(..)` / `Promise.sync.allSettled(..)` / `Promise.sync.any(..)` / `Promise.sync.race(..)`](promisesyncall--promisesyncallsettled--promisesyncany--promisesyncrace`)
@@ -1706,7 +1706,7 @@ Note that since `.reduce(..)` handler's execution order can not be known,
 there is no point in implementing `.reduceRigth(..)`.
 
 
-### `<promise-iter>.between(..)`
+#### `<promise-iter>.between(..)`
 
 ```bnf
 <promise-iter>.between(<value>)
@@ -2009,7 +2009,7 @@ the main `<promise>` is resolved.
 ### Sync/async promise
 
 
-#### `Promise.sync(..)` / `promise.SyncPromice(..)`
+#### `Promise.sync(..)` / `promise.SyncPromise(..)`
 
 ```dnf
 Promise.sync(<func>)
@@ -2034,10 +2034,29 @@ Example:
 -->
 
 
-#### `<promise>.sync()`
+#### `<promise>.sync(..)`
 
 Synchronously return the resolved value if `<sync-promise>` resolved, and
-if it _rejected_ then re-throw the `<error>`.
+if it _rejected_ then re-throw the `<error>`. Normal promises will return self.
+
+```bnf
+<promise>.sync()
+	-> <value>
+	-> <promise>
+```
+
+To suppress errors pass `false` to `.sync(..)` and to handle them differently 
+pass an error handler function.
+```bnf
+<promise>.sync(false)
+	-> <value>
+
+<promise>.sync(<onerror>)
+	-> <value>
+
+<onerror>(<error>)
+	-> <value>
+```
 
 
 #### `<sync-promise>.value` / `<sync-promise>.error`
@@ -2048,8 +2067,8 @@ rejection `.error`.
 
 #### `Promise.sync.all(..)` / `Promise.sync.allSettled(..)` / `Promise.sync.any(..)` / `Promise.sync.race(..)`
 
-Equivalents to `Promise`'s version but will run sync if the relevant 
-items in the input are either non-promises or `<sync-promise>`s.
+Equivalents to `Promise`'s respective versions but will run sync if the 
+relevant items in the input are either non-promises or `<sync-promise>`s.
 
 
 

package/package.json

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