ig-types 6.15.6 → 6.16.2

package/Array.js

@@ -12,6 +12,7 @@
 /*********************************************************************/
 
 var object = require('ig-object')
+var stoppable = require('ig-stoppable')
 
 var generator = require('./generator')
 
@@ -22,11 +23,7 @@ var generator = require('./generator')
 // NOTE: this is used in a similar fashion to Python's StopIteration...
 var STOP =
 module.STOP =
-	object.STOP
-
-var stoppable =
-module.stoppable =
-	generator.stoppable
+	stoppable.STOP
 
 
 //---------------------------------------------------------------------
@@ -215,9 +212,12 @@ object.Mixin('ArrayMixin', 'soft', {
 			// done...
 			: [] },
 
-	// XXX add handler function support -- a-la generator.js'
-	iter: function*(lst=[]){
-		yield* lst.iter() },
+	// XXX not sure about the handler API here yet... 
+	iter: function*(lst=[], handler=undefined){
+		yield* lst.iter(
+			...(handler ? 
+				[handler] 
+				: [])) },
 })
 
 

package/Function.js

@@ -0,0 +1,18 @@
+/**********************************************************************
+* 
+*
+*
+**********************************************/  /* c8 ignore next 2 */
+((typeof define)[0]=='u'?function(f){module.exports=f(require)}:define)
+(function(require){ var module={} // make module AMD/node compatible...
+/*********************************************************************/
+
+
+var AsyncFunction =
+module.AsyncFunction =
+	(async function(){}).constructor
+
+
+
+/**********************************************************************
+* vim:set ts=4 sw=4 :                               */ return module })

package/Promise.js

@@ -464,6 +464,11 @@ object.Constructor('IterablePromise', Promise, {
 	every: promiseProxy('every'),
 
 
+	join: async function(){
+		return [...(await this)]
+			.join(...arguments) },
+
+
 	// this is defined globally as Promise.prototype.iter(..)
 	//
 	// for details see: PromiseMixin(..) below...

package/README.md

@@ -13,6 +13,8 @@ Library of JavaScript type extensions, types and utilities.
     - [`Object.matchPartial(..)`](#objectmatchpartial)
     - [`<object>.run(..)`](#objectrun)
     - [`Object.sort(..)`](#objectsort)
+  - [`Function`](#function)
+    - [`func.AsyncFunction`](#funcasyncfunction)
   - [`Array`](#array)
     - [`<array>.first(..)` / `<array>.last(..)`](#arrayfirst--arraylast)
     - [`<array>.rol(..)`](#arrayrol)
@@ -78,6 +80,7 @@ Library of JavaScript type extensions, types and utilities.
       - [`<promise-iter>.concat(..)`](#promise-iterconcat)
       - [`<promise-iter>.push(..)` / `<promise-iter>.unshift(..)`](#promise-iterpush--promise-iterunshift)
       - [`<promise-iter>.at(..)` / `<promise-iter>.first()` / `<promise-iter>.last()`](#promise-iterat--promise-iterfirst--promise-iterlast)
+      - [`<promise-iter>.join(..)`](#promise-iterjoin)
       - [`<promise-iter>.some(..)` / `<promise-iter>.find(..)`](#promise-itersome--promise-iterfind)
       - [Array proxy methods returning `<promise-iter>`](#array-proxy-methods-returning-promise-iter)
       - [Array proxy methods returning a `<promise>`](#array-proxy-methods-returning-a-promise)
@@ -102,6 +105,7 @@ Library of JavaScript type extensions, types and utilities.
       - [`<generator>.flat(..)`](#generatorflat)
       - [`<generator>.shift()` / `<generator>.pop()` / `<generator>.gshift()` / `<generator>.gpop()`](#generatorshift--generatorpop--generatorgshift--generatorgpop)
       - [`<generator>.unshift(..)` / `<generator>.push(..)`](#generatorunshift--generatorpush)
+      - [`<generator>.join(..)`](#generatorjoin)
       - [`<generator>.then(..)` / `<generator>.catch(..)` / `<generator>.finally(..)`](#generatorthen--generatorcatch--generatorfinally)
       - [`<generator>.toArray()`](#generatortoarray)
     - [Treating iterators the same as generators](#treating-iterators-the-same-as-generators)
@@ -113,6 +117,7 @@ Library of JavaScript type extensions, types and utilities.
       - [`<Generator>.slice(..)`](#generatorslice-1)
       - [`<Generator>.map(..)` / `<Generator>.filter(..)` / `<Generator>.reduce(..)` / `<Generator>.flat()`](#generatormap--generatorfilter--generatorreduce--generatorflat)
       - [`<Generator>.toArray()`](#generatortoarray-1)
+      - [`<Generator>.join(..)`](#generatorjoin-1)
       - [`<Generator>.then(..)` / `<Generator>.catch(..)` / `<Generator>.finally(..)`](#generatorthen--generatorcatch--generatorfinally-1)
     - [Generator combinators](#generator-combinators)
       - [`<Generator>.chain(..)` / `<generator>.chain(..)`](#generatorchain--generatorchain)
@@ -454,6 +459,30 @@ Object.keys(Object.sort(o, ['x', 'a', '100']))
 This is similar to [`<map>.sort(..)`](#mapsort) and [`<ser>.sort(..)`](#setsort).
 
 
+## `Function`
+
+```javascript
+var func = require('ig-types/Function')
+```
+
+### `func.AsyncFunction`
+
+The async function constructor.
+
+This enables us to test if an object is an instance of an async function. 
+
+```javascript
+var a = async function(){
+    // ...
+}
+
+a instanceof func.AsyncFunction // -> true
+```
+
+This is hidden by JavaScript by default.
+
+
+
 ## `Array`
 
 ```javascript
@@ -1685,6 +1714,12 @@ parent `<promise-iter>`.
 
 XXX
 
+
+#### `<promise-iter>.join(..)`
+
+XXX
+
+
 #### `<promise-iter>.some(..)` / `<promise-iter>.find(..)`
 
 ```bnf
@@ -2181,6 +2216,11 @@ Value added by `.unshift(..)` will be yielded by `<generator>` "first", i.e. on
 _next_ call to `.next()`, regardless of the current generator state.
 
 
+#### `<generator>.join(..)`
+
+XXX
+
+
 #### `<generator>.then(..)` / `<generator>.catch(..)` / `<generator>.finally(..)`
 
 Return a promise and resolve it with the generator value.
@@ -2384,6 +2424,10 @@ Return a function that will return a `<generator>` output as an `Array`.
     -> <function>
 ```
 
+#### `<Generator>.join(..)`
+
+XXX
+
 
 #### `<Generator>.then(..)` / `<Generator>.catch(..)` / `<Generator>.finally(..)`
 

package/event.js

@@ -116,14 +116,17 @@ object.Constructor('Eventful', {
 			this.handlerLocation == 'method' ?
 				(this.__event_handlers__ = this.__event_handlers__ || [])
 			// context (default)...
-			: (context.__event_handlers__ == null ?
+			//: (context.__event_handlers__ == null ?
+			: !context.hasOwnProperty('__event_handlers__') ?
 				Object.defineProperty(context, '__event_handlers__', {
 						value: {[this.name]: (handlers = [])},
 						enumerable: false,
+						configurable: true,
+						writable: true,
 					}) 
 					&& handlers
-				: (context.__event_handlers__[this.name] = 
-					context.__event_handlers__[this.name] || []))
+			: (context.__event_handlers__[this.name] = 
+				context.__event_handlers__[this.name] || [])
 		// add handler...
 		handlers.push(handler)
 		return this },
@@ -289,10 +292,13 @@ module.EventHandlerMixin = object.Mixin('EventHandlerMixin', {
 			this[evt].bind(this, func)
 		// non-event...
 		} else {
-			this.__event_handlers__ == null
+			//this.__event_handlers__ == null
+			!this.hasOwnProperty('__event_handlers__')
 				&& Object.defineProperty(this, '__event_handlers__', {
 					value: {},
 					enumerable: false,
+					configurable: true,
+					writable: true,
 				})
 			;(this.__event_handlers__[evt] = 
 					this.__event_handlers__[evt] || [])
@@ -343,14 +349,14 @@ module.EventDocMixin = object.Mixin('EventDocMixin', {
 		return object.deepKeys(this)
 			.filter(function(n){ 
 				// avoid triggering props...
-				return !object.values(this, n, function(){ return object.STOP }, true)[0].get
+				return !object.values(this, n, true).next().value.get
 					// XXX this is too strict...
 					&& (this[n] || {}).constructor === Eventful}.bind(this)) },
 	get events(){
 		return object.deepKeys(this)
 			.filter(function(n){ 
 				// avoid triggering props...
-				return !object.values(this, n, function(){ return object.STOP }, true)[0].get
+				return !object.values(this, n, true).next().value.get
 					// XXX this is too strict...
 					&& (this[n] || {}).constructor === Event }.bind(this)) },
 })

package/generator.js

@@ -8,6 +8,7 @@
 /*********************************************************************/
 
 var object = require('ig-object')
+var stoppable = require('ig-stoppable')
 
 
 
@@ -16,7 +17,7 @@ var object = require('ig-object')
 // NOTE: this is used in a similar fashion to Python's StopIteration...
 var STOP =
 module.STOP =
-	object.STOP
+	stoppable.STOP
 
 
 //---------------------------------------------------------------------
@@ -38,11 +39,11 @@ module.STOP =
 // of each of them.
 // So, below we will define:
 //
-// 	GeneratorPrototype 
+// 	Generator.prototype 
 // 		prototype of the generator constructors (i.e. Iter(..) from the 
 // 		above example)
 //
-// 	GeneratorPrototype.prototype
+// 	Generator.prototype.prototype
 // 		generator instance prototype (i.e. iter for the above code)
 //
 //
@@ -58,17 +59,10 @@ module.STOP =
 //
 //---------------------------------------------------------------------
 
-var GeneratorPrototype =
-	(function*(){}).constructor.prototype
-
 var Generator = 
 module.Generator =
 	(function*(){}).constructor
 
-
-var AsyncGeneratorPrototype =
-	(async function*(){}).constructor.prototype
-
 var AsyncGenerator =
 module.AsyncGenerator =
 	(async function*(){}).constructor
@@ -84,54 +78,6 @@ var ITERATOR_PROTOTYPES = [
 
 
 
-//---------------------------------------------------------------------
-
-// XXX should this be part of object???
-var stoppable = 
-module.stoppable =
-function(func){
-	return Object.assign(
-		func instanceof Generator ?
-			// NOTE: the only difference between Generator/AsyncGenerator 
-			// 		versions of this is the async keyword -- keep them 
-			// 		in sync...
-			function*(){
-				try{
-					yield* func.call(this, ...arguments)
-				} catch(err){
-					if(err === STOP){
-						return
-					} else if(err instanceof STOP){
-						yield err.value
-						return }
-					throw err } }
-		: func instanceof AsyncGenerator ?
-			// NOTE: the only difference between Generator/AsyncGenerator 
-			// 		versions of this is the async keyword -- keep them 
-			// 		in sync...
-			async function*(){
-				try{
-					yield* func.call(this, ...arguments)
-				} catch(err){
-					if(err === STOP){
-						return
-					} else if(err instanceof STOP){
-						yield err.value
-						return }
-					throw err } }
-		: function(){
-			try{
-				return func.call(this, ...arguments)
-			} catch(err){
-				if(err === STOP){
-					return
-				} else if(err instanceof STOP){
-					return err.value }
-				throw err } },
-		{ toString: function(){
-			return func.toString() }, }) }
-
-
 //---------------------------------------------------------------------
 // generic generator wrapper...
 
@@ -165,12 +111,12 @@ Generator.iter =
 
 // NOTE: we need .iter(..) to both return generators if passed an iterable
 // 		and genereator constructos if passed a function...
-iter.__proto__ = GeneratorPrototype
+iter.__proto__ = Generator.prototype
 
 
 
 //---------------------------------------------------------------------
-// GeneratorPrototype "class" methods...
+// Generator.prototype "class" methods...
 //
 // the following are effectively the same:
 // 	1) Wrapper
@@ -286,7 +232,7 @@ object.Mixin('GeneratorMixin', 'soft', {
 				return that(...arguments).toArray() },
 			{ toString: function(){
 				return that.toString() 
-					+ '\n    .toString()'}, }) },
+					+ '\n    .toArray()'}, }) },
 	gpop: makeGenerator('gpop'),
 	pop: function(){
 		var that = this
@@ -296,7 +242,7 @@ object.Mixin('GeneratorMixin', 'soft', {
 				return that(...arguments).pop() },
 			{ toString: function(){
 				return that.toString() 
-					+ '\n    .gpop()'}, }) },
+					+ '\n    .pop()'}, }) },
 	push: makeGenerator('push'),
 	gshift: makeGenerator('gshift'),
 	shift: function(){
@@ -307,7 +253,7 @@ object.Mixin('GeneratorMixin', 'soft', {
 				return that(...arguments).shift() }, 
 			{ toString: function(){
 				return that.toString() 
-					+ '\n    .gshift()'}, }) },
+					+ '\n    .shift()'}, }) },
 	unshift: makeGenerator('unshift'),
 
 	// promises...
@@ -331,6 +277,18 @@ object.Mixin('GeneratorMixin', 'soft', {
 	//zip: makeGenerator('zip'),
 	
 	enumerate: makeGenerator('enumerate'),
+
+	// XXX should this have a .gjoin(..) companion...
+	join: function(){
+		var args = [...arguments]
+		var that = this
+		return Object.assign(
+			function(){
+				//return that(...arguments).toArray().shift() }, 
+				return that(...arguments).join(...args) }, 
+			{ toString: function(){
+				return that.toString() 
+					+ '\n    .join()'}, }) },
 })
 
 
@@ -503,11 +461,15 @@ object.Mixin('GeneratorProtoMixin', 'soft', {
 		var i = 0
 		for(var e of this){
 			yield [i++, e] } },
+
+	join: function(){
+		return [...this]
+			.join(...arguments) },
 })
 
 
-GeneratorMixin(GeneratorPrototype)
-GeneratorProtoMixin(GeneratorPrototype.prototype)
+GeneratorMixin(Generator.prototype)
+GeneratorProtoMixin(Generator.prototype.prototype)
 
 
 // Extend base iterators...
@@ -608,13 +570,17 @@ object.Mixin('AsyncGeneratorProtoMixin', 'soft', {
 		yield elem 
 		yield* this },
 
+	join: async function(){
+		return [...(await this)]
+			.join(...arguments) },
+
 	// XXX
 	// 	slice -- not sure if we need this...
 	// 	...
 })
 
-AsyncGeneratorMixin(AsyncGeneratorPrototype)
-AsyncGeneratorProtoMixin(AsyncGeneratorPrototype.prototype)
+AsyncGeneratorMixin(AsyncGenerator.prototype)
+AsyncGeneratorProtoMixin(AsyncGenerator.prototype.prototype)
 
 
 

package/main.js

@@ -22,6 +22,7 @@ module.patchDate = require('./Date').patchDate
 
 // Additional types...
 module.containers = require('./containers')
+module.func = require('./Function')
 module.generator = require('./generator')
 module.event = require('./event')
 module.runner = require('./runner')
@@ -31,7 +32,9 @@ module.runner = require('./runner')
 module.STOP = object.STOP
 
 // frequently used stuff...
+module.AsyncFunction = module.func.AsyncFunction
 module.Generator = module.generator.Generator
+module.AsyncGenerator = module.generator.AsyncGenerator
 // XXX doc...
 module.iter = module.generator.iter
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ig-types",
-  "version": "6.15.6",
+  "version": "6.16.2",
   "description": "Generic JavaScript types and type extensions...",
   "main": "main.js",
   "scripts": {
@@ -23,7 +23,8 @@
   },
   "homepage": "https://github.com/flynx/types.js#readme",
   "dependencies": {
-    "ig-object": "^5.4.16",
+    "ig-object": "^6.0.0",
+    "ig-stoppable": "^2.0.0",
     "object-run": "^1.0.1"
   },
   "devDependencies": {