ig-types 6.20.0 → 6.20.3

package/event.js

@@ -51,6 +51,8 @@ module.TRIGGER = module.EventCommand('TRIGGER')
 //	Trigger the event...
 //	method(...args)
 //		-> ..
+//		NOTE: if func(..) returns undefined this will return undefined 
+//			when called without a context and the call context otherwise
 //
 //
 // 	func(handle, ...args)
@@ -99,6 +101,14 @@ object.Constructor('Eventful', {
 
 	handlerLocation: 'context',
 
+	// Sets the default return mode for .__call__(..) if either .func(..)
+	// is not set or returns undefined...
+	//
+	// Can be:
+	// 		'context'
+	// 		undefined
+	defaultReturn: 'context',
+
 	name: null,
 	func: null,
 
@@ -190,7 +200,11 @@ object.Constructor('Eventful', {
 		// or explicitly called handle(false)...
 		!did_handle
 			&& handle()
-		return res },
+
+		return res 
+			?? (this.defaultReturn == 'context' ?
+   				context
+				: res ) },
 
 	__init__: function(name, func, options={}){
 		options = func && typeof(func) != 'function' ?
@@ -251,16 +265,15 @@ object.Constructor('Event', Eventful, {
 					.replace(/^(function[^(]*\()[^,)]*, ?/, '$1')
 			: `Event function ${this.name}(){}`},
 	__call__: function(context, ...args){
+		// add handler...
 		// NOTE: when the first arg is an event command this will
 		// 		fall through to calling the action...
-		typeof(args[0]) == 'function' ?
-			// add handler...
-			this.bind(context, args[0])
-			// call the action...
-			: object.parentCall(Event.prototype.__call__, this, context, ...args)
-			// XXX workaround for above line -- remove when fully tested...
-			//: Eventful.prototype.__call__.call(this, context, ...args)
-		return context }, 
+		if(typeof(args[0]) == 'function'){
+			this.bind(context, args[0]) 
+			return context
+		// call the action...
+		} else {
+			return object.parentCall(Event.prototype.__call__, this, context, ...args) } }, 
 })
 
 
@@ -271,12 +284,16 @@ module.PureEvent =
 object.Constructor('PureEvent', Event, {
 	toString: function(){
 		return `PureEvent ${this.name}(){}`},
-	__init__: function(name, options={}){
+	__init__: function(name, func, options={}){
+		if(typeof(func) != 'function'){
+			options = func
+			func = undefined }
 		object.parentCall(PureEvent.prototype.__init__, this,
 			name, 
-			function(handle, trigger){ 
-				trigger === module.TRIGGER 
-					|| handle(false) }, options) },
+			function(handle, trigger, args){ 
+				trigger === module.TRIGGER ?
+					func && func.call(this, handle, ...args)
+					: handle(false) }, options) },
 })
 
 

package/package.json

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