@twobirds/microcomponents 0.0.82 → 0.0.83

package/public/test/observables.js

@@ -6,12 +6,11 @@ function isObservableObject(value) {
 }
 function getPlaceholders(target) {
     let placeholders = new Set(), regEx = /\{[^\{\}]*\}/g;
-    target
-        .getAttributeNames()
+    (!!target.getAttributeNames ? target.getAttributeNames() : [])
         .filter((attr) => target.getAttribute(attr)?.match(regEx))
         .forEach((attr) => {
-        let phs = new Set(target.getAttribute(attr)?.match(regEx));
-        phs.forEach((placeholder) => placeholders.add(placeholder.replace(/[\{\}]/g, '')));
+        let placeholders = new Set(target.getAttribute(attr)?.match(regEx));
+        placeholders.forEach((placeholder) => placeholders.add(placeholder.replace(/[\{\}]/g, '')));
     });
     [...target.childNodes]
         .filter((childNode) => {
@@ -33,22 +32,19 @@ class Placeholders extends DC {
     oldDisplay = '';
     constructor(target) {
         super(target);
-        let that = this;
-        getPlaceholders(target).forEach((property) => (that.data[property] = ''));
-        observe(that);
-        that.#attachCallbacks();
-        delete that._mc;
+        getPlaceholders(target).forEach((property) => (this.data[property] = ''));
+        observe(this);
+        this.#attachCallbacks();
     }
     #attachCallbacks() {
-        let that = this, target = that.target, hide = false;
-        target
-            .getAttributeNames()
+        let target = this.target, hide = false;
+        (!!target.getAttributeNames ? target.getAttributeNames() : [])
             .filter((attr) => target.getAttribute(attr)?.match(/\{[^\{\}]*\}/g))
             .forEach((attr) => {
-            let phs = new Set(target.getAttribute(attr)?.match(/\{[^\{\}]*\}/g));
-            that.data.observe(((template) => (data) => {
+            let placeholders = new Set(target.getAttribute(attr)?.match(/\{[^\{\}]*\}/g));
+            this.data.observe(((template) => (data) => {
                 let result = template;
-                phs.forEach((placeholder) => {
+                placeholders.forEach((placeholder) => {
                     result = result.replace(placeholder, data[placeholder.replace(/[\{\}]/g, '')]);
                 });
                 target.setAttribute(attr, result);
@@ -61,26 +57,22 @@ class Placeholders extends DC {
         })
             .forEach((childNode) => {
             hide = true;
-            let phs = new Set(childNode.nodeValue.match(/\{[^\{\}]*\}/g));
-            that.data.observe(((template) => (data) => {
+            let placeholders = new Set(childNode.nodeValue.match(/\{[^\{\}]*\}/g));
+            this.data.observe(((template) => (data) => {
                 let result = template;
-                phs.forEach((placeholder) => {
+                placeholders.forEach((placeholder) => {
                     result = result.replace(placeholder, data[placeholder.replace(/[\{\}]/g, '')]);
                 });
-                if (Object.keys(data).some((key) => {
-                    return !!data[key];
-                })) {
-                    if (!!that.oldDisplay) {
-                        target.style = that.oldDisplay;
-                    }
-                    else {
-                        target.removeAttribute('style');
-                    }
-                    delete that.oldDisplay;
+                if (!!this.oldDisplay) {
+                    target.style = this.oldDisplay;
                 }
+                else {
+                    target.removeAttribute('style');
+                }
+                delete this.oldDisplay;
                 childNode.nodeValue = result;
             })(childNode.nodeValue));
-            that.oldDisplay = target.getAttribute('style)') || '';
+            this.oldDisplay = target.getAttribute('style)') || '';
             if (hide &&
                 !inputs.includes(target.constructor) &&
                 target.tagName !== 'FIELDSET') {
@@ -89,20 +81,21 @@ class Placeholders extends DC {
         });
     }
     onData(ev) {
-        let that = this, data = {};
+        let data = {};
         Object.keys(ev.data).forEach((key) => {
-            if (that.data.hasOwnProperty(key))
+            if (this.data.hasOwnProperty(key))
                 data[key] = ev.data[key];
         });
-        if (JSON.stringify(data) !== JSON.stringify(that.data))
-            Object.assign(that.data, data);
+        if (JSON.stringify(data) !== JSON.stringify(this.data))
+            Object.assign(this.data, data);
     }
 }
 function getPlaceholderElements(target) {
-    let elements = (target instanceof HTMLElement ? [target] : [])
+    let elements = [target]
         .concat([...target.querySelectorAll('*')])
         .filter((e) => !!getPlaceholders(e).length)
-        .filter((e) => e.tagName !== 'STYLE');
+        .filter((e) => e?.tagName !== 'STYLE')
+        .reverse();
     return elements;
 }
 function makePlaceholders(element) {
@@ -138,11 +131,11 @@ function makeObservable(val) {
             return this;
         }
         bind(target) {
-            const that = this, iso = isObservableObject(that.valueOf());
+            const iso = isObservableObject(this.valueOf());
             if (iso) {
                 makePlaceholders(target);
                 const placeholders = [
-                    ...target.querySelectorAll('[_mc]'),
+                    target, ...target.querySelectorAll('[_mc]'),
                 ].filter((e) => !!e?._mc?._placeholders);
                 const func = function callback(data) {
                     let d = flattenObject(data);
@@ -152,26 +145,26 @@ function makeObservable(val) {
                         e._mc.trigger('data', d);
                     });
                 };
-                that.#callbacks.push(func);
-                that.notify();
+                this.#callbacks.push(func);
+                this.notify();
             }
             else {
-                console.warn('IGNORED - cannot bind a non-Object to the dom, IS:', typeof that.valueOf(), that);
+                console.warn('IGNORED - cannot bind a non-Object to the dom, IS:', typeof this.valueOf(), this);
             }
             return this;
         }
         notify(notify) {
-            let that = this, data = isObservableObject(that.valueOf()) &&
-                that.valueOf() instanceof Array === false
-                ? structuredClone(Object.assign({}, that))
-                : that.valueOf();
+            let data = isObservableObject(this.valueOf()) &&
+                this.valueOf() instanceof Array === false
+                ? structuredClone(Object.assign({}, this))
+                : this.valueOf();
             if (notify !== undefined) {
-                that.#notify = notify;
+                this.#notify = notify;
             }
-            that.#callbacks.forEach((f) => {
+            this.#callbacks.forEach((f) => {
                 f(data);
             });
-            return that;
+            return this;
         }
     };
     classRepo[ConstructorName] = ObservableClass;

package/public/test/observables.min.js

@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.observables=e():t.observables=e()}(this,(()=>(()=>{"use strict";var t={d:(e,r)=>{for(var n in r)t.o(r,n)&&!t.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:r[n]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};function r(t){let e={};return[...Object.keys(t)].sort().forEach((n=>{var o;(o=t[n])&&o.constructor&&o.constructor===Object?e[n]=r(t[n]):e[n]=t[n]})),e}function n(t,e=!0){let o={};return[...Object.getOwnPropertyNames(t)].forEach((e=>{if(t[e]&&t[e].constructor&&t[e].constructor===Object){const r=n(t[e],!1);for(const t in r)o[e+"."+t]=r[t]}else o[e]=t[e]})),e?r(o):o}function o(t,e){return JSON.stringify(n(t))===JSON.stringify(n(e))}function c(t,e){let r;return()=>{clearTimeout(r),r=setTimeout((function(){t(...arguments)}),e)}}t.r(e),t.d(e,{observe:()=>N});var s=new Function("try {return this===window;}catch(e){ return false;}");let a=new Set;s()&&Object.keys(HTMLElement.prototype).filter((t=>/^on/.test(t))).forEach((t=>a.add(t)));class i{#t;#e=!1;#r=!1;constructor(t,e={},r="l"){this.#t=t,this.data=e,this.bubble=r}get type(){return this.#t}get stopped(){return this.#e}get immediateStopped(){return this.#r}stopPropagation(){this.#e=!0}stopImmediatePropagation(){this.stopPropagation(),this.#r=!0}}var l=new Function("try {return this===window;}catch(e){ return false;}");let u=new Set;function f(t,e){let r=[];return t.forEach((t=>{if(t&&t instanceof HTMLElement){const n=t?._mc;!e&&n?r=r.concat(Object.values(t._mc)):e&&n&&n[e]&&r.push(n[e])}})),r}function p(t,e,r=!0){let n=[];for(;t;){if(t._mc&&(e?e&&t._mc[e]&&n.push(t._mc[e]):n=n.concat(Object.values(t._mc)),r))return n;t=t.parentNode}return n}function d(t){return t&&t instanceof HTMLElement}function b(t,e,r={}){let n=t;if(!n._mc){let e=v?.debug;v.debug=!1,n._mc=new v(t),v.debug=e,delete n._mc._mc}const o=n._mc;return e.length&&!o[e]&&(o[e]=r,t instanceof HTMLElement&&!t.getAttribute("_mc")&&t.setAttribute("_mc","")),r}function g(t,e){if(!e)return;const r=t?._mc||{};r&&r[e]&&delete r[e],!Object.keys(r).length&&t instanceof HTMLElement&&t.hasAttribute("_mc")&&t.removeAttribute("_mc")}function h(t,e,r={},n="l"){let o=t?._mc;if(!o)return;let c=e instanceof i?new i(e.type,e.data,"l"):new i(e,r,"l"),s="string"!=typeof e?e:new i(e,r,n);[...Object.values(o)].forEach((t=>{t?.trigger&&"function"==typeof t?.trigger&&t?.trigger(c)})),/[ud]/.test(s.bubble)&&m(t,s)}function m(t,e){/[ud]/.test(e.bubble)&&setTimeout((()=>{if(-1===e.bubble.indexOf("l")&&(e.bubble+="l"),e.bubble.indexOf("u")>-1){let r=p(t,"",!0)?.[0].target;r&&v.trigger(r,e)}e.bubble.indexOf("d")>-1&&new Set(t._mc.children().map((t=>t?.target))).forEach((t=>{t&&v.trigger(t,e)}))}),0)}l()&&Object.keys(HTMLElement.prototype).filter((t=>/^on/.test(t))).forEach((t=>u.add(t)));class y{_target;__mc={};constructor(t,e=!1){var r;this._target=new WeakRef(t||{}),(r=this).constructor!==v&&setTimeout((()=>{r.trigger("Init")}),0),function(t){if(!l()||t.constructor===v)return;const e=t.target;if(e instanceof HTMLElement){let r=t;Object.getOwnPropertyNames(r.constructor.prototype).filter((t=>/^on[A-Z]|one[A-Z]/.test(t)&&"function"==typeof r.constructor.prototype[t])).forEach((n=>{let o=/^one/.test(n),c=n.replace(/^on[e]{0,1}/,""),s=c.toLowerCase();o&&Object.defineProperty(t,"on"+c,{configurable:!0,enumerable:!1,writable:!0,value:t=>{r.constructor.prototype[n].bind(r)(t)}}),u.has("on"+s)&&function(t,e,r,n=!1,o=!1){let c={once:!1};n&&(c.capture=n),o&&(c.once=o),t.addEventListener(e,r,c)}(e,s,(t=>{r.trigger(c,t)}),!1,o)}))}}(this)}get target(){return this._target.deref()}get _mc(){return this.__mc}}class O extends y{constructor(t){super(t)}static trigger=h;trigger(t,e={},r="l"){let n=this;if(n.constructor===O||n.constructor===v){let o=t instanceof i?new i(t.type,t.data,"l"):new i(t,e,"l"),c="string"!=typeof t?t:new i(t,e,r);return[...Object.getOwnPropertyNames(n)].forEach((t=>{n[t]?.trigger&&"function"==typeof n[t]?.trigger&&n[t]?.trigger(o)})),void(/[ud]/.test(c.bubble)&&m(n.target,c))}if(n instanceof O||n instanceof v){const n=this,o="string"!=typeof t?t:new i(t,e,r),c="on"+o.type[0].toUpperCase()+o.type.slice(1);if(o.bubble.indexOf("l")>-1&&(o.immediateStopped||"function"!=typeof n[c]||(n[c](o),n.hasOwnProperty(c)&&delete n[c])),o.stopped||"l"===o.bubble)return n;/[ud]/.test(o.bubble)&&m(n.target,o)}}}class v extends y{constructor(t,e=!1){super(t)}static add=b;static remove=g;static trigger=h;trigger(t,e={},r){O.prototype.trigger.call(this,t,e,r)}parent(t=""){let e=this.target;return d(e)?p(e.parentNode,t,!0):[]}ancestors(t=""){let e=this?.target;return d(e)?p(this.target.parentNode,t,!1):[]}children(t=""){let e=this?.target;if(!d(e))return[];const r=Math.random().toString().replace(".",""),n='[_mc]:not([temp_id="'+r+'"] [_mc] [_mc])';e.setAttribute("temp_id",r);const o=f([...e.querySelectorAll(n)],t);return e.removeAttribute("temp_id"),o}descendants(t=""){let e=this?.target;return d(e)?f([...e.querySelectorAll("*[_mc]")],t):[]}}function _(t){return null!=t&&"object"==typeof t}function E(t){let e=new Set,r=/\{[^\{\}]*\}/g;return(t.getAttributeNames?t.getAttributeNames():[]).filter((e=>t.getAttribute(e)?.match(r))).forEach((e=>{let n=new Set(t.getAttribute(e)?.match(r));n.forEach((t=>n.add(t.replace(/[\{\}]/g,""))))})),[...t.childNodes].filter((t=>3===t.nodeType&&(t.nodeValue||"").match(r))).forEach((t=>{(t.nodeValue||"").match(r).forEach((t=>{e.add(t.replace(/[\{\}]/g,""))}))})),[...e].map((t=>t.replace(/[\{\}]/g,"")))}new Set;const w=[HTMLInputElement,HTMLSelectElement,HTMLTextAreaElement];class j extends v{data={};oldDisplay="";constructor(t){super(t),E(t).forEach((t=>this.data[t]="")),N(this),this.#n()}#n(){let t=this.target,e=!1;(t.getAttributeNames?t.getAttributeNames():[]).filter((e=>t.getAttribute(e)?.match(/\{[^\{\}]*\}/g))).forEach((e=>{let r=new Set(t.getAttribute(e)?.match(/\{[^\{\}]*\}/g));var n;this.data.observe((n=t.getAttribute(e),o=>{let c=n;r.forEach((t=>{c=c.replace(t,o[t.replace(/[\{\}]/g,"")])})),t.setAttribute(e,c)}))})),[...t.childNodes].filter((t=>3===t.nodeType&&(t.nodeValue||"").match(/\{[^\{\}]*\}/g))).forEach((r=>{e=!0;let n=new Set(r.nodeValue.match(/\{[^\{\}]*\}/g));this.data.observe((e=>o=>{let c=e;n.forEach((t=>{c=c.replace(t,o[t.replace(/[\{\}]/g,"")])})),this.oldDisplay?t.style=this.oldDisplay:t.removeAttribute("style"),delete this.oldDisplay,r.nodeValue=c})(r.nodeValue)),this.oldDisplay=t.getAttribute("style)")||"",e&&!w.includes(t.constructor)&&"FIELDSET"!==t.tagName&&(t.style.display="none")}))}onData(t){let e={};Object.keys(t.data).forEach((r=>{this.data.hasOwnProperty(r)&&(e[r]=t.data[r])})),JSON.stringify(e)!==JSON.stringify(this.data)&&Object.assign(this.data,e)}}const S={};function A(t){let e=t.constructor.name;return S[e]||function(t){const e=t.constructor,r=e.name;let o=class extends e{#o=!0;#c=[];constructor(t){super(t),this.constructor.callbacks=[],_(t)&&Object.getOwnPropertyNames(t).forEach((e=>{this[e]=t[e]}))}get callbacks(){return this.#c}set callbacks(t){this.#c=t}observe(t){return this.#c.push(t),this}bind(t){if(_(this.valueOf())){!function(t){var e;(e=t,[e].concat([...e.querySelectorAll("*")]).filter((t=>!!E(t).length)).filter((t=>"STYLE"!==t?.tagName)).reverse()).forEach((t=>{t?._mc?._placeholders||v.add(t,"_placeholders",new j(t))}))}(t);const e=[t,...t.querySelectorAll("[_mc]")].filter((t=>!!t?._mc?._placeholders)),r=function(t){let r=n(t);e.forEach((t=>{t&&t._mc.trigger("data",r)}))};this.#c.push(r),this.notify()}else console.warn("IGNORED - cannot bind a non-Object to the dom, IS:",typeof this.valueOf(),this);return this}notify(t){let e=_(this.valueOf())&&this.valueOf()instanceof Array==0?structuredClone(Object.assign({},this)):this.valueOf();return void 0!==t&&(this.#o=t),this.#c.forEach((t=>{t(e)})),this}};return S[r]=o,o}(t)}const N=(t,e)=>((e?[e]:[...Object.getOwnPropertyNames(t)]).forEach((e=>{if(t.hasOwnProperty(e)&&"function"!=typeof t[e]&&!t?.[e]?.constructor?.prototype?.observe){if("_"===e[0]||void 0===t?.[e])return t;let r=t[e],n=new(A(r))(r);Object.defineProperty(t,e,{enumerable:!0,get(){if(_(n.valueOf())){let t=structuredClone(Object.assign({},n));setTimeout(c((function(){o(structuredClone(Object.assign({},n)),t)||n.notify()}),0),0)}return n},set(t){if(typeof t==typeof n.valueOf())if(_(n.valueOf())&&n.valueOf()instanceof Array==0){let e=structuredClone(Object.assign({},n));void 0===n?.constructor?.prototype?.observe&&(n=new(A(t))(structuredClone(Object.assign({},t))),function(t,e){const r=Object.getOwnPropertyDescriptors(t);for(const[t,n]of Object.entries(r))("get"in n||"set"in n)&&Object.defineProperty(e,t,n)}(t,n),n.seal()),Object.assign(n,t),setTimeout(c((function(){o(structuredClone(Object.assign({},n)),e)||n.notify()}),0),0)}else{let e=n.valueOf(),r=n.callbacks;t!==e&&(n=new(A(t))(t),n.callbacks=r,n.notify())}else console.warn("IGNORED - cannot change observable types, IS:",typeof n.valueOf(),n,"- CANNOT BECOME:",typeof t)}}),t[e]=r}})),t);return e})()));

package/public/test/observables.ts

@@ -21,12 +21,11 @@ function getPlaceholders(target: HTMLElement): string[] {
 		regEx = /\{[^\{\}]*\}/g;
 
 	// scan attributes
-	target
-		.getAttributeNames()
+	( !!target.getAttributeNames ? target.getAttributeNames() : [] )
 		.filter((attr) => target.getAttribute(attr)?.match(regEx)) // extract placeholder(s)
 		.forEach((attr) => {
-			let phs: Set<string> = new Set(target.getAttribute(attr)?.match(regEx));
-			phs.forEach((placeholder) =>
+			let placeholders: Set<string> = new Set(target.getAttribute(attr)?.match(regEx));
+			placeholders.forEach((placeholder) =>
 				placeholders.add(placeholder.replace(/[\{\}]/g, ''))
 			);
 		});
@@ -62,35 +61,31 @@ class Placeholders extends DC {
 
 	constructor(target: HTMLElement) {
 		super(target);
-		let that = this;
-		getPlaceholders(target).forEach((property) => (that.data[property] = ''));
-		observe(that);
-		that.#attachCallbacks();
-		delete that._mc; // cleanup, not needed
+		getPlaceholders(target).forEach((property) => (this.data[property] = ''));
+		observe(this);
+		this.#attachCallbacks();
 	}
 
 	#attachCallbacks() {
-		let that = this,
-			target = that.target,
+		let target = this.target,
 			hide: boolean = false;
 
-		//console.log('attachCallbacks', that.target);
+		//console.log('attachCallbacks', this.target);
 
 		// scan attributes
-		target
-			.getAttributeNames()
+		( !!target.getAttributeNames ? target.getAttributeNames() : [] )
 			.filter((attr: string) =>
 				target.getAttribute(attr)?.match(/\{[^\{\}]*\}/g)
 			) // extract placeholder(s)
 			.forEach((attr: string) => {
-				let phs: Set<string> = new Set(
+				let placeholders: Set<string> = new Set(
 					target.getAttribute(attr)?.match(/\{[^\{\}]*\}/g)
 				);
 				// attach callback
-				that.data.observe(
+				this.data.observe(
 					((template: string) => (data: LooseObject) => {
 						let result: string = template;
-						phs.forEach((placeholder) => {
+						placeholders.forEach((placeholder) => {
 							result = result.replace(
 								placeholder,
 								data[placeholder.replace(/[\{\}]/g, '')]
@@ -108,44 +103,48 @@ class Placeholders extends DC {
 				return (
 					// is text node and has placeholders
 					childNode.nodeType === 3 &&
-					((childNode as any).nodeValue || '').match(/\{[^\{\}]*\}/g)
+					((childNode as Node).nodeValue || '').match(/\{[^\{\}]*\}/g)
 				);
 			})
 			.forEach((childNode) => {
 				hide = true;
-				let phs: Set<string> = new Set(
+				let placeholders: Set<string> = new Set(
 					childNode.nodeValue.match(/\{[^\{\}]*\}/g)
 				);
 
 				// attach callback
-				that.data.observe(
+				this.data.observe(
 					((template: string) => (data: LooseObject) => {
 						let result: string = template;
-						//console.log('text node "', template, '" callbach data:', data);
-						phs.forEach((placeholder) => {
+						//console.log('text node "', template, '" callback data:', data);
+						placeholders.forEach((placeholder) => {
 							result = result.replace(
 								placeholder,
 								data[placeholder.replace(/[\{\}]/g, '')]
 							);
 						});
-						if (
-							Object.keys(data).some((key) => {
-								return !!data[key];
-							})
-						) {
-							if (!!that.oldDisplay) {
-								target.style = that.oldDisplay;
+						// TODO: find out why this doesnt work correctly ... maybe completely overhaul the whole thing
+						// TODO: check overlap with inner web components, possibly firewall them
+						// TODO: maybe include convention for plain DOM / ShadowDom handling
+
+						// if (
+						// 	Object.keys(data).some((key) => {
+						// 		return !!data[key];
+						// 	})
+						// ) {
+							if (!!this.oldDisplay) {
+								target.style = this.oldDisplay;
 							} else {
 								target.removeAttribute('style');
 							}
-							delete that.oldDisplay;
-						}
+							delete this.oldDisplay;
+						// }
 						childNode.nodeValue = result;
 					})(childNode.nodeValue)
 				);
 
 				// hide for now
-				that.oldDisplay = target.getAttribute('style)') || '';
+				this.oldDisplay = target.getAttribute('style)') || '';
 				if (
 					hide &&
 					!inputs.includes((target as any).constructor) &&
@@ -157,26 +156,24 @@ class Placeholders extends DC {
 	}
 
 	onData(ev: McEvent) {
-		let that = this,
-			data: LooseObject = {};
+		let data: LooseObject = {};
 		Object.keys(ev.data).forEach((key) => {
-			if (that.data.hasOwnProperty(key)) data[key] = ev.data[key];
+			if (this.data.hasOwnProperty(key)) data[key] = ev.data[key];
 		});
-		//console.log('onData()', ev, data, that.data);
-		if (JSON.stringify(data) !== JSON.stringify(that.data))
-			Object.assign(that.data, data); // will trigger callbacks
+		//console.log('onData()', ev, data, this.data);
+		if (JSON.stringify(data) !== JSON.stringify(this.data))
+			Object.assign(this.data, data); // will trigger callbacks
 	}
 }
 
 function getPlaceholderElements(
 	target: HTMLElement | DocumentFragment | ShadowRoot
 ): HTMLElement[] {
-	let elements: Array<HTMLElement> = (
-		target instanceof HTMLElement ? [target] : []
-	)
+	let elements: Array<Node> = [target]
 		.concat([...(target.querySelectorAll('*') as unknown as HTMLElement[])])
 		.filter((e) => !!getPlaceholders(e as HTMLElement).length)
-		.filter((e) => e.tagName !== 'STYLE');
+		.filter((e) => (e as HTMLElement)?.tagName !== 'STYLE')
+		.reverse(); // to start with inner elements
 	//console.log('getPlaceholderElements', elements);
 	return elements as HTMLElement[];
 }
@@ -239,14 +236,13 @@ function makeObservable(val: any): Class<typeof val>{
 		}
 
 		bind(target: HTMLElement | DocumentFragment | ShadowRoot) {
-			const that = this,
-				iso = isObservableObject(that.valueOf());
+			const iso = isObservableObject(this.valueOf());
 			//console.log('bind', iso, target);
 
 			if (iso) {
 				makePlaceholders(target);
 				const placeholders: unknown = [
-					...target.querySelectorAll('[_mc]'),
+					target, ...target.querySelectorAll('[_mc]'), 
 				].filter((e) => !!(e as LooseObject)?._mc?._placeholders);
 				//console.log('placeholders:', target, placeholders);
 				const func = function callback(data: LooseObject) {
@@ -259,13 +255,13 @@ function makeObservable(val: any): Class<typeof val>{
 						(e as any)._mc.trigger('data', d);
 					});
 				};
-				(that as any).#callbacks.push(func);
-				that.notify();
+				(this as any).#callbacks.push(func);
+				this.notify();
 			} else {
 				console.warn(
 					'IGNORED - cannot bind a non-Object to the dom, IS:',
-					typeof that.valueOf(),
-					that
+					typeof this.valueOf(),
+					this
 				);
 			}
 
@@ -273,20 +269,19 @@ function makeObservable(val: any): Class<typeof val>{
 		}
 
 		notify(notify?: boolean) {
-			let that = this,
-				data =
-					isObservableObject(that.valueOf()) &&
-					that.valueOf() instanceof Array === false
-						? structuredClone(Object.assign({}, that))
-						: that.valueOf();
+			let data =
+					isObservableObject(this.valueOf()) &&
+					this.valueOf() instanceof Array === false
+						? structuredClone(Object.assign({}, this))
+						: this.valueOf();
 
 			if (notify !== undefined) {
-				that.#notify = notify;
+				this.#notify = notify;
 				// return;
 			}
 
-			//if (that.#notify) console.log('notify', this, data);
-			(that as any).#callbacks.forEach((f: Function) => {
+			//if (this.#notify) console.log('notify', this, data);
+			(this as any).#callbacks.forEach((f: Function) => {
 				// console.log(
 				// 	(this.constructor as any).callbacks,
 				// 	'notify: exec callback',
@@ -296,7 +291,7 @@ function makeObservable(val: any): Class<typeof val>{
 				f(data);
 			});
 
-			return that;
+			return this;
 		}
 	};
 

package/public/test/selectors.d.ts

@@ -32,15 +32,13 @@ declare class DomSelector {
     on(eventName: string, cb: Function, capture?: boolean, once?: boolean): Function;
     one(eventName: string, cb: Function, capture?: boolean): Function;
     parent(selection?: selection, rootNode?: HTMLElement): DSelector;
-    parents(selection?: selection, rootNode?: HTMLElement): DSelector;
+    ancestors(selection?: selection, rootNode?: HTMLElement): DSelector;
     prepend(selection: selection, target?: HTMLElement): DSelector;
     prev(selection?: selection, rootNode?: HTMLElement): DSelector;
     removeClass(...classes: string[]): DSelector;
     text(text?: string): string | DSelector;
     toggleClass(...classes: string[]): DSelector;
     trigger(eventName: string, data?: any, bubbles?: boolean, cancelable?: boolean, composed?: boolean): DSelector;
-    val(p1?: any, p2?: any): any;
-    values(values?: LooseObject): LooseObject;
     at(index: number): DSelector;
     concat(items: DSelector | any[]): DSelector;
     entries(): IterableIterator<[number, any]>;
@@ -79,7 +77,7 @@ declare class TbSelector {
     on(name: string, cb: Function, once?: boolean): Function;
     one(name: string, cb: Function): Function;
     parent(nameSpace?: string): TSelector;
-    parents(nameSpace?: string): TSelector;
+    ancestors(nameSpace?: string): TSelector;
     prev(nameSpace?: string): TSelector;
     trigger(ev: string, data?: any, bubble?: string): TSelector;
     at(index: number): TSelector;

package/public/test/selectors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.d.ts","sourceRoot":"","sources":["../src/selectors.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"selectors.d.ts","sourceRoot":"","sources":["../src/selectors.ts"],"names":[],"mappings":"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"}