From e25658db0feac1dd0efb464c71705ae92329c72e Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 19 Nov 2020 06:13:11 +0300
Subject: [PATCH] made mixin configure better + some tweaking + docs...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 README.md    |  4 ++--
 object.js    | 50 +++++++++++++++++++++++++++++++++++++++-----------
 package.json |  2 +-
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 6b48d58..00a6e61 100755
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ class B extends A {
 		- [`<object>.__init__(..)`](#object__init__)
 		- [`<object>.__call__(..)`](#object__call__)
 	- [Components](#components)
-		- [`STOP`](#stop)
+		- [`STOP` / `STOP(..)`](#stop--stop)
 		- [`sources(..)`](#sources)
 		- [`values(..)`](#values)
 		- [`parent(..)`](#parent)
@@ -554,7 +554,7 @@ var l = object.RawInstance(null, Array, 'a', 'b', 'c')
 ```
 
 
-### `STOP`
+### `STOP` / `STOP(..)`
 
 Used in [`sources(..)`](#sources), [`values(..)`](#values) and 
 [`mixins(..)`](#mixins) to stop the search before it reaches the top of 
diff --git a/object.js b/object.js
index 6c913aa..1a7eb6b 100755
--- a/object.js
+++ b/object.js
@@ -1149,42 +1149,62 @@ function(base, ...objects){
 //	Mixin(name, data, ..)
 //		-> mixin
 //
-//	Apply the mixin to an object...
+//	Create a new mixin setting the default mode...
+//	Mixin(name, mode, data, ..)
+//		-> mixin
+//
+//
+//	Apply mixin in the prototype chain (default)...
 //	mixin(obj)
+//	mixin('proto', obj)
 //		-> obj
 //
-//	mixin(mode, obj)
-//	mixin(obj, mode)
+//	Copy date from mixin into obj directly...
+//	mixin('flat', obj)
 //		-> obj
 //
 //
+//
 // Example:
 //
-// 	var BasicMixin = Mixin('BasicMixin', {
+// 		var BasicMixin = Mixin('BasicMixin', {
+// 			...
+// 		})
+//
 // 		...
-// 	})
 //
-//	var o = {
-//		...
-//	}
+//		var o = {
+//			...
+//		}
 //
-//	BasicMixin(o)
+//		BasicMixin(o)
 //
 //
+// NOTE: the constructor will allways create a new .data object but will 
+// 		not do a deep copy into it -- see mixin(..) / mixinFlat(..)
 var Mixin =
 module.Mixin =
 Constructor('Mixin', {
 	name: null,
+
+	// mixin data...
 	data: null,
 
+	// data "copy" mode...
+	//
+	// This can be:
+	// 	'proto'		- mix data into prototype chain (default)
+	// 	'flat'		- use mixinFlat(..) to copy data
 	mode: 'proto',
 
+	// base API...
+	//
 	isMixed: function(target){
 		return hasMixin(target, this.data) },
 	mixout: function(target){
 		return mixout(target, this.data) },
 
-	// mixin to target...
+	// mix into target...
 	__call__: function(_, target, mode=this.mode){
 		typeof(target) == typeof('str')
 			&& ([_, mode, target] = arguments)
@@ -1193,12 +1213,20 @@ Constructor('Mixin', {
 			: mixin(target, this.data) },
 
 	__init__: function(name, ...data){
+		// Mixin(name, mode, ...) -- handle default mode...
+		typeof(data[0]) == typeof('str')
+			&& (this.mode = data.shift())
+		// name...
 		// NOTE: .defineProperty(..) is used because this is a function
 		// 		and function's .name is not too configurable...
-		// XXX do we need to configure this prop better???
+		// NOTE: we do not need to configure this any more, .defineProperty(..)
+		// 		merges the descriptor into the original keeping any values not
+		// 		explicitly overwritten...
 		Object.defineProperty(this, 'name', { value: name })
+		// create/merge .data...
 		this.data = mixinFlat({}, 
 			...data.map(function(e){ 
+				// handle bare objects and mixins differently...
 				return e instanceof Mixin ? 
 					e.data 
 					: e })) },
diff --git a/package.json b/package.json
index c29d826..2af530b 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ig-object",
-  "version": "5.4.3",
+  "version": "5.4.4",
   "description": "",
   "main": "object.js",
   "scripts": {