@twobirds/microcomponents 0.0.72 → 0.0.75

package/src/observables.ts

@@ -194,207 +194,215 @@ function makePlaceholders(
 export type Observable = {
 	observe: (cb: Callback) => void;
 	notify: () => void;
-	bind: (target: HTMLElement | DocumentFragment | ShadowRoot) => void;
+	bind: (target: HTMLElement | DocumentFragment | ShadowRoot ) => void;
 };
 
-export const observe = (
-	target: LooseObject,
-	propertyName?: string
-): LooseObject => {
-	let keys = !propertyName
-		? [...Object.getOwnPropertyNames(target)]
-		: [propertyName];
+type Class<T> = new (...args: any[]) => T;
 
-	keys.forEach((key) => {
-		// console.log( 'co propname', key, typeof target[key], target[key] );
-		if (key[0] === '_' || target?.[key] === undefined) return target;
-		let val: any = target[key],
-			Constructor: any;
-
-		if (!val.prototype) {
-			switch (typeof val) {
-				case 'string':
-					Constructor = String;
-					break;
-				case 'number':
-					Constructor = Number;
-					break;
-				case 'boolean':
-					Constructor = Boolean;
-					break;
-				case 'object':
-					if (val instanceof Array) {
-						Constructor = Array;
-					} else {
-						Constructor = Object;
-					}
-					break;
-				default:
-					return;
+// repository for observable class wrappers
+const classRepo: LooseObject = {};
+
+// creates a new observable class wrapper
+function makeObservable(val: any): Class<typeof val>{
+
+	const Constructor = val.constructor,
+		ConstructorName: string = Constructor.name;
+
+	let ObservableClass = class extends Constructor {
+		#notify: boolean = true;
+		#callbacks: Array<Function> = [];
+
+		constructor(val: any) {
+			super(val);
+			(this.constructor as LooseObject).callbacks = [];
+			if (isObservableObject(val)) {
+				// you cannot bind native values to the dom
+				Object.getOwnPropertyNames(val).forEach((key) => {
+					this[key] = val[key];
+				});
 			}
 		}
 
-		let Observable = class extends Constructor {
-			#notify: boolean = true;
+		observe(f: Function) {
+			//console.log('observe');
+			this.#callbacks.push(f);
+			return this;
+		}
 
-			constructor(val: any) {
-				super(val);
-				(this.constructor as LooseObject).callbacks = [];
-				if (isObservableObject(val)) {
-					// you cannot bind native values to the dom
-					Object.getOwnPropertyNames(val).forEach((key) => {
-						this[key] = val[key];
+		bind(target: HTMLElement | DocumentFragment | ShadowRoot) {
+			const that = this,
+				iso = isObservableObject(that.valueOf());
+			//console.log('bind', iso, target);
+
+			if (iso) {
+				makePlaceholders(target);
+				const placeholders: unknown = [
+					...target.querySelectorAll('[_mc]'),
+				].filter((e) => !!(e as LooseObject)?._mc?._placeholders);
+				//console.log('placeholders:', target, placeholders);
+				const func = function callback(data: LooseObject) {
+					// avoid bubbling for speed
+					let d = flattenObject(data);
+					//console.log('inside callback', target, d);
+					(placeholders as DC[]).forEach((e) => {
+						// console.log('trigger callback', e);
+						if (!e) return;
+						(e as any)._mc.trigger('data', d);
 					});
-				}
+				};
+				(that as any).#callbacks.push(func);
+				that.notify();
+			} else {
+				console.warn(
+					'IGNORED - cannot bind a non-Object to the dom, IS:',
+					typeof that.valueOf(),
+					that
+				);
 			}
 
-			observe(f: Function) {
-				//console.log('observe');
-				(this.constructor as any).callbacks.push(f);
-				return this;
+			return this;
+		}
+
+		notify(notify?: boolean) {
+			let that = this,
+				data =
+					isObservableObject(that.valueOf()) &&
+					that.valueOf() instanceof Array === false
+						? structuredClone(Object.assign({}, that))
+						: that.valueOf();
+
+			if (notify !== undefined) {
+				that.#notify = notify;
+				// return;
 			}
 
-			bind(target: HTMLElement | DocumentFragment | ShadowRoot) {
-				const that = this,
-					iso = isObservableObject(that.valueOf());
-				//console.log('bind', iso, target);
-
-				if (iso) {
-					makePlaceholders(target);
-					const placeholders: unknown = [
-						...target.querySelectorAll('[_mc]'),
-					].filter((e) => !!(e as LooseObject)?._mc?._placeholders);
-					//console.log('placeholders:', target, placeholders);
-					const func = function callback(data: LooseObject) {
-						// avoid bubbling for speed
-						let d = flattenObject(data);
-						//console.log('inside callback', target, d);
-						(placeholders as DC[]).forEach((e) => {
-							// console.log('trigger callback', e);
-							if (!e) return;
-							(e as any)._mc.trigger('data', d);
-						});
-					};
-					(that.constructor as any).callbacks.push(func);
-					that.notify();
-				} else {
-					console.warn(
-						'IGNORED - cannot bind a non-Object to the dom, IS:',
-						typeof that.valueOf(),
-						that
-					);
-				}
+			//if (that.#notify) console.log('notify', this, data);
+			(that as any).#callbacks.forEach((f: Function) => {
+				// console.log(
+				// 	(this.constructor as any).callbacks,
+				// 	'notify: exec callback',
+				// 	f,
+				// 	data
+				// );
+				f(data);
+			});
 
-				return this;
-			}
+			return that;
+		}
+	};
 
-			notify(notify?: boolean) {
-				let that = this,
-					data =
-						isObservableObject(that.valueOf()) &&
-						that.valueOf() instanceof Array === false
-							? structuredClone(Object.assign({}, that))
-							: that.valueOf();
-
-				if (notify !== undefined) {
-					that.#notify = notify;
-					// return;
-				}
+	(classRepo as any)[ConstructorName] = ObservableClass;
 
-				//if (that.#notify) console.log('notify', this, data);
-				(that.constructor as any).callbacks.forEach((f: Function) => {
-					// console.log(
-					// 	(this.constructor as any).callbacks,
-					// 	'notify: exec callback',
-					// 	f,
-					// 	data
-					// );
-					f(data);
-				});
+	// console.log( 'classRepo:', classRepo );
 
-				return that;
-			}
-		};
+	return ObservableClass;
+}
 
-		let o = new Observable(val);
-
-		Object.defineProperty(target, key, {
-			enumerable: true,
-			get() {
-				if (isObservableObject(o.valueOf())) {
-					let check = structuredClone(Object.assign({}, o));
-					setTimeout(
-						debounce(function checkChanges() {
-							let state = structuredClone(Object.assign({}, o));
-							//console.log( 'check changes', state, check );
-							if (!deepEqual(state, check)) {
-								//console.log( '-> not equal!' );
-								o.notify();
-							}
-						}, 0),
-						0
-					);
-				}
-				return o;
-			},
-			set(val: any) {
-				//console.log( 'SET:', isObservableObject( val.valueOf() ), 'set:', val, 'to', isObservableObject( o.valueOf() ), o, );
-				if (typeof val === typeof o.valueOf()) {
-					let iso =
-						isObservableObject(o.valueOf()) &&
-						o.valueOf() instanceof Array === false;
-					//console.log('target iso:', iso);
-					if (iso) {
-						let old = structuredClone(Object.assign({}, o));
-						//val = structuredClone(Object.assign({}, val));
-
-						//let callbacks = (o.constructor as LooseObject).callbacks;
-						if (o instanceof Observable === false) {
-							o = new Observable(structuredClone(Object.assign({}, val)));
-							copyGettersSetters(val, o);
-							o.seal();
-						}
-						Object.assign(o, val);
+function getConstructor( val: any ): Class<typeof val> { 
+	let key: string = val.constructor.name;
+	return classRepo[key] || makeObservable( val );
+}
 
-						// console.log('after set o=', o, 'check', old);
-						// (o.constructor as LooseObject).callbacks = callbacks;
+export const observe = (
+	target: LooseObject,
+	propertyName?: string
+): LooseObject => {
+	let keys = !propertyName
+		? [...Object.getOwnPropertyNames(target)]
+		: [propertyName];
 
+	keys.forEach((key) => {
+		if ( 
+			target.hasOwnProperty(key) 
+			&&  typeof target[key] !== 'function' 
+			&& !target?.[key]?.constructor?.prototype?.observe 
+		) {
+
+			// console.log( 'co propname', key, typeof target[key], target[key] );
+			if (key[0] === '_' || target?.[key] === undefined) return target;
+			let val: any = target[key];
+
+			let o = new ( getConstructor(val) as Class<typeof val> )( val );
+
+			Object.defineProperty(target, key, {
+				enumerable: true,
+				get() {
+					if (isObservableObject(o.valueOf())) {
+						let check = structuredClone(Object.assign({}, o));
 						setTimeout(
-							// check for changes
 							debounce(function checkChanges() {
 								let state = structuredClone(Object.assign({}, o));
 								//console.log( 'check changes', state, check );
-								if (!deepEqual(state, old)) {
+								if (!deepEqual(state, check)) {
 									//console.log( '-> not equal!' );
 									o.notify();
 								}
 							}, 0),
 							0
 						);
-					} else {
-						// simple native var
-						let old = o.valueOf(),
-							callbacks = (o.constructor as LooseObject).callbacks;
-						o = new Observable(val);
-						(o.constructor as LooseObject).callbacks = callbacks;
-						if (val !== old) {
-							o.notify();
+					}
+					return o;
+				},
+				set(val: any) {
+					//console.log( 'SET:', isObservableObject( val.valueOf() ), 'set:', val, 'to', isObservableObject( o.valueOf() ), o, );
+					if (typeof val === typeof o.valueOf()) {
+						let iso =
+							isObservableObject(o.valueOf()) &&
+							o.valueOf() instanceof Array === false;
+						//console.log('target iso:', iso);
+						if (iso) {
+							let old = structuredClone(Object.assign({}, o));
+							//val = structuredClone(Object.assign({}, val));
+
+							//let callbacks = (o.constructor as LooseObject).callbacks;
+							if (o?.constructor?.prototype?.observe === undefined ) {
+								o = new ( getConstructor(val) as Class<typeof val> )( structuredClone(Object.assign({}, val)) );
+								copyGettersSetters(val, o);
+								o.seal();
+							}
+							Object.assign(o, val);
+
+							// console.log('after set o=', o, 'check', old);
+							// (o.constructor as LooseObject).callbacks = callbacks;
+
+							setTimeout(
+								// check for changes
+								debounce(function checkChanges() {
+									let state = structuredClone(Object.assign({}, o));
+									//console.log( 'check changes', state, check );
+									if (!deepEqual(state, old)) {
+										//console.log( '-> not equal!' );
+										o.notify();
+									}
+								}, 0),
+								0
+							);
+						} else {
+							// simple native var
+							let old = o.valueOf(),
+								callbacks = (o.constructor as LooseObject).callbacks;
+							o = o = new ( getConstructor(val) as Class<typeof val> )( val );
+							(o.constructor as LooseObject).callbacks = callbacks;
+							if (val !== old) {
+								o.notify();
+							}
 						}
+					} else {
+						console.warn(
+							'IGNORED - cannot change observable types, IS:',
+							typeof o.valueOf(),
+							o,
+							'- CANNOT BECOME:',
+							typeof val
+						);
 					}
-				} else {
-					console.warn(
-						'IGNORED - cannot change observable types, IS:',
-						typeof o.valueOf(),
-						o,
-						'- CANNOT BECOME:',
-						typeof val
-					);
-				}
-			},
-		});
+				},
+			});
+
+			// replace old property with proxy (observable)
+			target[key] = val;
+		};
 
-		// replace old property with proxy (observable)
-		target[key] = val;
 	});
 
 	return target;

package/src/test/test/testform.ts

@@ -4,7 +4,7 @@ import { DC, defineCE, Observable, formValues, LooseObject } from './../../micro
 defineCE(
 	'test-testform',
 
-	class TestTestForm extends DC {
+	class TestForm extends DC {
 		data: unknown;
 
 		constructor(target: HTMLElement) {
@@ -20,6 +20,14 @@ defineCE(
 			formValues(that, 'data', shadow); // create this.data formdata observable
 
 			(that.data as Observable).bind(shadow); // 1 way bind formdata to the form DOM
+
+            // load and display data
+            fetch('./testform.json')
+                .then( res => res.json())
+                .then( data => {
+                    that.data = data;
+                });
+                
 		}
 
 		get template() {
@@ -124,7 +132,7 @@ form textarea {
 }
 
 input[type="radio"],
-input[type="checkbox"],{
+input[type="checkbox"] {
     margin-top: 1.3em;
 }
 

package/src/{test.ts → test/test.ts}

@@ -1,4 +1,10 @@
-'use strict';
+// 'use strict';
+
+/*
+let mc: unknown;
+import('../microcomponents.js').then( res => mc = res );
+const { LooseObject, DC, McEvent, defineCE, getCE, observe, Observable } = mc as any;
+*/
 
 import {
 	LooseObject,
@@ -8,7 +14,7 @@ import {
 	getCE,
 	observe,
 	Observable,
-} from './microcomponents.js';
+} from '../microcomponents.js';
 
 class Translator extends DC {
 	#translations: LooseObject = {};
@@ -84,6 +90,12 @@ defineCE(
 			// render
 			target.innerHTML = this.#template;
 
+			// state
+			that.Dom = { counter: 0 };
+
+			// state: convert all props defined so far into observables
+			observe(that);
+
 			// add translator
 			DC.add(
 				target,
@@ -97,12 +109,6 @@ defineCE(
 		oneInit(ev: McEvent) {
 			let that = this;
 
-			// state
-			that.Dom = { counter: 0 };
-
-			// state: convert all props defined so far into observables
-			observe(that);
-
 			// bind Dom to target
 			(that.Dom as Observable).bind(that.target);
 		}
@@ -154,7 +160,7 @@ setTimeout(() => {
 		'font-weight: bold; color: black;',
 		'font-weight: normal;',
 		max,
-		max * 3,
+		max * 2,
 		'font-weight: bold; color: blue;',
 		end - start
 	);
@@ -172,23 +178,23 @@ setTimeout(() => {
 		'\n\nLook up code in the debugger: test.js\n'
 	);
 
-		let form = ( document.querySelector('test-testform') as any);
-		let formInstance = form._mc.TestTestform;
-
-		(window as any).form = formInstance;
-		console.log(
-			"\n\n%cAttached a global variable 'form':%c \n\n %O %c %s %c %s %c %s",
-			'font-weight: bold;',
-			'font-weight: normal;',
-			formInstance,
-			'font-weight: bold;',
-			'\n\nYou can use it to change input values, e.g. \n\n',
-			'font-weight: normal;',
-			'  form.data.textInput="other value"',
-			'font-weight: bold;',
-			'\n\nChanges will be reflected in the form contents, same as vice versa.\n'
-		);
+	let form = ( document.querySelector('test-testform') as any);
+	let formInstance = form._mc.TestTestform;
+
+	(window as any).form = formInstance;
+	console.log(
+		"\n\n%cAttached a global variable 'form':%c \n\n %O %c %s %c %s %c %s",
+		'font-weight: bold;',
+		'font-weight: normal;',
+		formInstance,
+		'font-weight: bold;',
+		'\n\nYou can use it to change input values, e.g. \n\n',
+		'font-weight: normal;',
+		'  form.data.textInput="other value"',
+		'font-weight: bold;',
+		'\n\nChanges will be reflected in the form contents, same as vice versa.\n'
+	);
 
 	// will trigger the event on all micro components contained in <my-tag>
 	DC.trigger(element, 'doSomething');
-}, 500);
+}, 1000);

package/tsconfig.json

@@ -29,8 +29,8 @@
 		// "module": "commonjs",                                /* Specify what module code is generated. */
 		// "rootDir": "./",                                  /* Specify the root folder within your source files. */
 		// "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
-		"baseUrl": "/src",                                  /* Specify the base directory to resolve non-relative module names. */
-		// "paths": { "@/": ["/*"] },                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+		"baseUrl": "/src",                                      /* Specify the base directory to resolve non-relative module names. */
+		"paths": { "@/": ["/*"] },                       /* Specify a set of entries that re-map imports to additional lookup locations. */
 		// "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
 		// "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
 		// "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */

package/typedoc.json

@@ -1,5 +1,5 @@
 {
-	"entryPoints": ["src/MC.ts","src/elements.ts","src/observables.ts","src/formValues.ts","src/selectors.ts"],
+	"entryPoints": ["src/MC.ts","src/elements.ts","src/observables.ts","src/formValues.ts"],
 	"out": "./public/typedoc",
 	"readme": "README.md",
 	"name": "Micro Components",

package/checklist.md

@@ -1,93 +0,0 @@
-# MicroComponents
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.com/twoBirds/microcomponents.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.com/twoBirds/microcomponents/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.

package/dist/microcomponents.es3.d.ts

@@ -1,2 +0,0 @@
-declare function findNodesWithMcAttribute(rootNode: any, childrenOnly: any): any[];
-//# sourceMappingURL=microcomponents.es3.d.ts.map

package/dist/microcomponents.es3.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"microcomponents.es3.d.ts","sourceRoot":"","sources":["../src/microcomponents.es3.js"],"names":[],"mappings":"AAgWA,mFAwBC"}

package/dist/test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=test.d.ts.map

package/dist/test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":""}