@twobirds/microcomponents 0.0.82 → 0.0.83

package/assets/documentation/MC.md

@@ -480,7 +480,6 @@ import { DC, LooseObject } from '../microcomponents.js';
 export default class myMC extends DC {
     constructor(target: HTMLElement) {
         super(target);
-        delete this._mc; // not needed
     }
 
     oneInit() {

package/dist/MC.d.ts

@@ -7,20 +7,20 @@ declare function addListener(domNode: Node, eventName: string, handler: EventLis
 declare function removeListener(domNode: Node, eventName: string, handler: EventListenerOrEventListenerObject | null): void;
 declare function trigger(target: HTMLElement, ev: McEvent | string, data?: any, bubble?: string): void;
 declare class McBase {
-    #private;
+    private _target;
+    private __mc;
     constructor(target?: {
         [key: string]: any;
     }, debug?: boolean);
     get target(): any;
+    get _mc(): any;
 }
 declare class MC extends McBase {
-    _mc?: LooseObject;
     constructor(target?: any);
     static trigger: typeof trigger;
     trigger(ev: McEvent | string, data?: any, bubble?: string): this | undefined;
 }
 declare class DC extends McBase {
-    _mc?: LooseObject;
     constructor(target: HTMLElement, debug?: boolean);
     static add: Function;
     static remove: Function;

package/dist/MC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MC.d.ts","sourceRoot":"","sources":["../src/MC.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAevC,MAAM,WAAW,aAAc,SAAQ,WAAW;IACjD,GAAG,EAAE,WAAW,CAAC;CACjB;AA8CD,iBAAS,WAAW,CACnB,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kCAAkC,GAAG,IAAI,EAClD,OAAO,GAAE,OAAe,EACxB,IAAI,GAAE,OAAe,QAarB;AAED,iBAAS,cAAc,CACtB,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kCAAkC,GAAG,IAAI,QAGlD;AAmDD,iBAAS,OAAO,CACf,MAAM,EAAE,WAAW,EACnB,EAAE,EAAE,OAAO,GAAG,MAAM,EACpB,IAAI,GAAE,GAAQ,EACd,MAAM,GAAE,MAAY,QAwBpB;AAiGD,cAAM,MAAM;;gBAGC,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,KAAK,GAAE,OAAe;IAWnE,IAAI,MAAM,IAAI,GAAG,CAEhB;CACD;AAED,cAAM,EAAG,SAAQ,MAAM;IACtB,GAAG,CAAC,EAAE,WAAW,CAAM;gBAEX,MAAM,CAAC,EAAE,GAAG;IAIxB,MAAM,CAAC,OAAO,iBAAW;IAEzB,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,EAAE,IAAI,GAAE,GAAQ,EAAE,MAAM,GAAE,MAAY;CAmElE;AAED,cAAM,EAAG,SAAQ,MAAM;IACtB,GAAG,CAAC,EAAE,WAAW,CAAM;gBAEX,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,OAAe;IAIvD,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAO;IAC3B,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAU;IACjC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAW;IAEnC,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,EAAE,IAAI,GAAE,GAAQ,EAAE,MAAM,CAAC,EAAE,MAAM;IAI7D,MAAM,CAAC,MAAM,GAAE,MAAW,GAAG,GAAG,EAAE;IAMlC,SAAS,CAAC,MAAM,GAAE,MAAW,GAAG,GAAG,EAAE;IAMrC,QAAQ,CAAC,MAAM,GAAE,MAAW,GAAG,GAAG,EAAE;IAYpC,WAAW,CAAC,MAAM,GAAE,MAAW,GAAG,GAAG,EAAE;CAMvC;AA6KD,iBAAS,QAAQ,CAAC,MAAM,GAAE,OAAc,GAAG,OAAO,CAmBjD;AAID,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"MC.d.ts","sourceRoot":"","sources":["../src/MC.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAevC,MAAM,WAAW,aAAc,SAAQ,WAAW;IACjD,GAAG,EAAE,WAAW,CAAC;CACjB;AA8CD,iBAAS,WAAW,CACnB,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kCAAkC,GAAG,IAAI,EAClD,OAAO,GAAE,OAAe,EACxB,IAAI,GAAE,OAAe,QAarB;AAED,iBAAS,cAAc,CACtB,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,kCAAkC,GAAG,IAAI,QAGlD;AAmDD,iBAAS,OAAO,CACf,MAAM,EAAE,WAAW,EACnB,EAAE,EAAE,OAAO,GAAG,MAAM,EACpB,IAAI,GAAE,GAAQ,EACd,MAAM,GAAE,MAAY,QAwBpB;AAiGD,cAAM,MAAM;IACX,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,IAAI,CAAmB;gBAEnB,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,KAAK,GAAE,OAAe;IAWnE,IAAI,MAAM,IAAI,GAAG,CAEhB;IAED,IAAI,GAAG,IAAI,GAAG,CAEb;CACD;AAED,cAAM,EAAG,SAAQ,MAAM;gBACV,MAAM,CAAC,EAAE,GAAG;IAIxB,MAAM,CAAC,OAAO,iBAAW;IAEzB,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,EAAE,IAAI,GAAE,GAAQ,EAAE,MAAM,GAAE,MAAY;CAmElE;AAED,cAAM,EAAG,SAAQ,MAAM;gBACV,MAAM,EAAE,WAAW,EAAE,KAAK,GAAE,OAAe;IAIvD,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAO;IAC3B,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAU;IACjC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAW;IAEnC,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM,EAAE,IAAI,GAAE,GAAQ,EAAE,MAAM,CAAC,EAAE,MAAM;IAI7D,MAAM,CAAC,MAAM,GAAE,MAAW,GAAG,GAAG,EAAE;IAMlC,SAAS,CAAC,MAAM,GAAE,MAAW,GAAG,GAAG,EAAE;IAMrC,QAAQ,CAAC,MAAM,GAAE,MAAW,GAAG,GAAG,EAAE;IAYpC,WAAW,CAAC,MAAM,GAAE,MAAW,GAAG,GAAG,EAAE;CAMvC;AAgGD,iBAAS,QAAQ,CAAC,MAAM,GAAE,OAAc,GAAG,OAAO,CAmBjD;AAID,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/dist/MC.js

@@ -166,19 +166,22 @@ function bubbleEvent(target, ev) {
     }
 }
 class McBase {
-    #target;
+    _target;
+    __mc = {};
     constructor(target, debug = false) {
         let that = this, element = that;
-        this.#target = new WeakRef(target || {});
+        this._target = new WeakRef(target || {});
         init(element);
         autoAttachListeners(element);
     }
     get target() {
-        return this.#target.deref();
+        return this._target.deref();
+    }
+    get _mc() {
+        return this.__mc;
     }
 }
 class MC extends McBase {
-    _mc = {};
     constructor(target) {
         super(target);
     }
@@ -225,7 +228,6 @@ class MC extends McBase {
     }
 }
 class DC extends McBase {
-    _mc = {};
     constructor(target, debug = false) {
         super(target);
     }
@@ -267,93 +269,60 @@ class DC extends McBase {
         return getMicroComponents([...myDomElements], search);
     }
 }
-const CEs = new Map();
-const MCs = new Map();
+const loadingMCs = new Set();
 function makeLoadScript(element) {
+    if (loadingMCs.has(element))
+        return;
+    loadingMCs.add(element);
     const fileName = './' + element.split('-').join('/') + '.js';
     const se = document.createElement('script');
     se.setAttribute('src', fileName);
     se.setAttribute('blocking', 'render');
     se.async = true;
     se.setAttribute('type', 'module');
-    se.setAttribute('name', element);
+    se.setAttribute('data-name', element);
     se.setAttribute('loading', '');
+    const loadedPromise = customElements.whenDefined(element);
+    loadedPromise.then(() => {
+        const elements = Array
+            .from(document.querySelectorAll(`[_mc*="${element}"]`))
+            .filter(element => element instanceof HTMLElement);
+        if (elements.length === 0)
+            return;
+        const klass = customElements.get(element);
+        elements.forEach((node) => {
+            DC.add(node, klass.name, new klass(node));
+            const new_mc = node
+                .getAttribute('_mc')
+                .split(' ')
+                .filter((name) => name !== element && name !== '')
+                .join(' ');
+            node.setAttribute('_mc', new_mc);
+        });
+        document.head.querySelector('script[data-name="${elementName}]"')?.remove();
+    });
     addListener(se, 'load', (ev) => {
-        se.removeAttribute('loading');
-        se.setAttribute('loaded', '');
+        loadingMCs.delete(element);
     });
     addListener(se, 'error', (ev) => {
-        console.error('could not load Custom Element code from', fileName);
+        console.error('could not load MC code from', fileName);
     });
-    return se;
+    document.head.append(se);
 }
-function onLoadCallback(script) {
-    setTimeout(function () {
-        const importFileName = script.getAttribute('src');
-        const elementName = script.getAttribute('name');
-        const se = document.createElement('script');
-        se.async = true;
-        se.setAttribute('type', 'module');
-        const code = `
-
-			import _ from "${importFileName}";
-			import { DC } from "./microcomponents.js";
-
-			const elements = Array.from(document.querySelectorAll('[_mc*="${elementName}"]')).filter( element => element instanceof HTMLElement );
-
-			elements.forEach((element) => {
-				// add class to MCs repository
-				autoload.state.MCs.set( '${elementName}', _ );
-				// add instance to HTMLElement 
-				DC.add(element, _.name, new _(element));
-				// remove instance name from elements "_mc" attribute
-				element.setAttribute('_mc', element.getAttribute('_mc').replace('${elementName}', '').replace( /\w\w/g, ' ').trim()); 
-			});
-
-			setTimeout( () => {
-				document.body.querySelector('script[name="${elementName}]"')?.remove();
-			},0);
-
-		`;
-        se.innerHTML = code;
-        document.body.append(se);
-    }, 0);
-}
-function loadUndefinedMicroComponents() {
+function loadUndefinedMCs() {
     [...document.querySelectorAll(':not(:defined)')]
         .filter((element) => !!element
         && !customElements.get(element.tagName.toLowerCase())
-        && !CEs.has(element.tagName.toLowerCase()))
+        && !loadingMCs.has(element.tagName.toLowerCase()))
         .forEach((el) => {
-        const elementName = el.tagName.toLowerCase(), fileName = './' + elementName.split('-').join('/') + '.js';
-        const se = makeLoadScript(elementName);
-        addListener(se, 'load', () => {
-            CEs.set(elementName, customElements.get(el.tagName.toLowerCase()));
-        });
-        CEs.set(elementName, 'loading');
-        document.head.append(se);
+        makeLoadScript(el.tagName.toLowerCase());
     });
     [...document.querySelectorAll('[_mc]:not([_mc=""]')]
         .filter((element) => !!element)
         .forEach((el) => {
-        const elements = el.getAttribute('_mc')?.split(' ').filter(m => !!m) || [];
-        const elementsToBeLoaded = elements.filter(m => !MCs.has(m));
-        elementsToBeLoaded?.forEach(elementName => {
-            const se = makeLoadScript(elementName);
-            addListener(se, 'load', () => onLoadCallback(document.head.querySelector(`script[name="${elementName}"]`)));
-            MCs.set(elementName, 'loading');
-            document.head.append(se);
-        });
-        const elementsAlreadyLoaded = elements.filter(m => MCs.has(m) && !MCs.get(m).length);
-        elementsAlreadyLoaded?.forEach(elementName => {
-            setTimeout(() => {
-                DC.add(el, elementName, new (autoload.state.MCs.get(elementName))(el));
-                const newAttribute = el.getAttribute('_mc')
-                    .replace('${elementName}', '')
-                    .replace(/\w\w/g, ' ')
-                    .trim() || '_mc';
-                el.setAttribute('_mc');
-            }, 5);
+        const _mc = el.getAttribute('_mc')?.split(' ').filter(name => name !== '');
+        _mc?.forEach(dc => {
+            makeLoadScript(dc);
         });
     });
 }
@@ -366,14 +335,14 @@ function autoload(enable = true) {
         return autoloadEnabled;
     }
     autoloadEnabled = enable;
-    observer = new MutationObserver(loadUndefinedMicroComponents);
+    observer = new MutationObserver(loadUndefinedMCs);
     setTimeout(() => {
         observer.observe(document.body, { childList: true, subtree: true });
-        loadUndefinedMicroComponents();
+        loadUndefinedMCs();
     }, 5);
     window.autoload = window.autoload || autoload;
     return autoloadEnabled;
 }
-autoload.state = { CEs, MCs };
+autoload.state = { loadingMCs };
 export { addListener, removeListener, McBase, MC, DC, McEvent, autoload };
 //# sourceMappingURL=MC.js.map

package/dist/MC.min.js

@@ -299,19 +299,22 @@ function bubbleEvent(target, ev) {
     }
 }
 class McBase {
-    #target;
+    _target;
+    __mc = {};
     constructor(target, debug = false) {
         let that = this, element = that;
-        this.#target = new WeakRef(target || {});
+        this._target = new WeakRef(target || {});
         init(element);
         autoAttachListeners(element);
     }
     get target() {
-        return this.#target.deref();
+        return this._target.deref();
+    }
+    get _mc() {
+        return this.__mc;
     }
 }
 class MC extends McBase {
-    _mc = {};
     constructor(target) {
         super(target);
     }
@@ -358,7 +361,6 @@ class MC extends McBase {
     }
 }
 class DC extends McBase {
-    _mc = {};
     constructor(target, debug = false) {
         super(target);
     }
@@ -400,93 +402,60 @@ class DC extends McBase {
         return MC_getMicroComponents([...myDomElements], search);
     }
 }
-const CEs = new Map();
-const MCs = new Map();
+const loadingMCs = new Set();
 function makeLoadScript(element) {
+    if (loadingMCs.has(element))
+        return;
+    loadingMCs.add(element);
     const fileName = './' + element.split('-').join('/') + '.js';
     const se = document.createElement('script');
     se.setAttribute('src', fileName);
     se.setAttribute('blocking', 'render');
     se.async = true;
     se.setAttribute('type', 'module');
-    se.setAttribute('name', element);
+    se.setAttribute('data-name', element);
     se.setAttribute('loading', '');
+    const loadedPromise = customElements.whenDefined(element);
+    loadedPromise.then(() => {
+        const elements = Array
+            .from(document.querySelectorAll(`[_mc*="${element}"]`))
+            .filter(element => element instanceof HTMLElement);
+        if (elements.length === 0)
+            return;
+        const klass = customElements.get(element);
+        elements.forEach((node) => {
+            DC.add(node, klass.name, new klass(node));
+            const new_mc = node
+                .getAttribute('_mc')
+                .split(' ')
+                .filter((name) => name !== element && name !== '')
+                .join(' ');
+            node.setAttribute('_mc', new_mc);
+        });
+        document.head.querySelector('script[data-name="${elementName}]"')?.remove();
+    });
     addListener(se, 'load', (ev) => {
-        se.removeAttribute('loading');
-        se.setAttribute('loaded', '');
+        loadingMCs.delete(element);
     });
     addListener(se, 'error', (ev) => {
-        console.error('could not load Custom Element code from', fileName);
+        console.error('could not load MC code from', fileName);
     });
-    return se;
-}
-function onLoadCallback(script) {
-    setTimeout(function () {
-        const importFileName = script.getAttribute('src');
-        const elementName = script.getAttribute('name');
-        const se = document.createElement('script');
-        se.async = true;
-        se.setAttribute('type', 'module');
-        const code = `
-
-			import _ from "${importFileName}";
-			import { DC } from "./microcomponents.js";
-
-			const elements = Array.from(document.querySelectorAll('[_mc*="${elementName}"]')).filter( element => element instanceof HTMLElement );
-
-			elements.forEach((element) => {
-				// add class to MCs repository
-				autoload.state.MCs.set( '${elementName}', _ );
-				// add instance to HTMLElement 
-				DC.add(element, _.name, new _(element));
-				// remove instance name from elements "_mc" attribute
-				element.setAttribute('_mc', element.getAttribute('_mc').replace('${elementName}', '').replace( /\w\w/g, ' ').trim()); 
-			});
-
-			setTimeout( () => {
-				document.body.querySelector('script[name="${elementName}]"')?.remove();
-			},0);
-
-		`;
-        se.innerHTML = code;
-        document.body.append(se);
-    }, 0);
+    document.head.append(se);
 }
-function loadUndefinedMicroComponents() {
+function loadUndefinedMCs() {
     [...document.querySelectorAll(':not(:defined)')]
         .filter((element) => !!element
         && !customElements.get(element.tagName.toLowerCase())
-        && !CEs.has(element.tagName.toLowerCase()))
+        && !loadingMCs.has(element.tagName.toLowerCase()))
         .forEach((el) => {
-        const elementName = el.tagName.toLowerCase(), fileName = './' + elementName.split('-').join('/') + '.js';
-        const se = makeLoadScript(elementName);
-        addListener(se, 'load', () => {
-            CEs.set(elementName, customElements.get(el.tagName.toLowerCase()));
-        });
-        CEs.set(elementName, 'loading');
-        document.head.append(se);
+        makeLoadScript(el.tagName.toLowerCase());
     });
     [...document.querySelectorAll('[_mc]:not([_mc=""]')]
         .filter((element) => !!element)
         .forEach((el) => {
-        const elements = el.getAttribute('_mc')?.split(' ').filter(m => !!m) || [];
-        const elementsToBeLoaded = elements.filter(m => !MCs.has(m));
-        elementsToBeLoaded?.forEach(elementName => {
-            const se = makeLoadScript(elementName);
-            addListener(se, 'load', () => onLoadCallback(document.head.querySelector(`script[name="${elementName}"]`)));
-            MCs.set(elementName, 'loading');
-            document.head.append(se);
-        });
-        const elementsAlreadyLoaded = elements.filter(m => MCs.has(m) && !MCs.get(m).length);
-        elementsAlreadyLoaded?.forEach(elementName => {
-            setTimeout(() => {
-                DC.add(el, elementName, new (autoload.state.MCs.get(elementName))(el));
-                const newAttribute = el.getAttribute('_mc')
-                    .replace('${elementName}', '')
-                    .replace(/\w\w/g, ' ')
-                    .trim() || '_mc';
-                el.setAttribute('_mc');
-            }, 5);
+        const _mc = el.getAttribute('_mc')?.split(' ').filter(name => name !== '');
+        _mc?.forEach(dc => {
+            makeLoadScript(dc);
         });
     });
 }
@@ -499,15 +468,15 @@ function autoload(enable = true) {
         return autoloadEnabled;
     }
     autoloadEnabled = enable;
-    observer = new MutationObserver(loadUndefinedMicroComponents);
+    observer = new MutationObserver(loadUndefinedMCs);
     setTimeout(() => {
         observer.observe(document.body, { childList: true, subtree: true });
-        loadUndefinedMicroComponents();
+        loadUndefinedMCs();
     }, 5);
     window.autoload = window.autoload || autoload;
     return autoloadEnabled;
 }
-autoload.state = { CEs, MCs };
+autoload.state = { loadingMCs };
 
 
 /******/ 	return __webpack_exports__;