@webqit/oohtml 4.3.10 → 4.3.12

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "4.3.10",
+  "version": "4.3.12",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/context-api/index.js

@@ -18,15 +18,16 @@ import { _init } from '../util.js';
  */
 export default function init( $config = {} ) {
     const { config, window } = _init.call( this, 'context-api', $config, {
+        elements: { roots: 'root,webflo-embedded', },
         attr: { contextname: 'contextname', },
         api: { contexts: 'contexts', },
     } );
     const waitListMappings = new Map, dispatchEvent = window.EventTarget.prototype.dispatchEvent;
     Object.defineProperty( window.EventTarget.prototype, 'dispatchEvent', { value: function( ...args ) {
-        const event = args[0], rootNode = this.getRootNode?.();
+        const event = args[0], rootNode = this?.closest?.(config.elements.roots) || this.getRootNode?.();
         if ( [ 'contextclaim', 'contextrequest' ].includes( event.type ) && rootNode ) {
             if ( event.meta ) event.meta.target = this;
-            const temp = event => {
+            const temp = (event) => {
                 event.stopImmediatePropagation();
                 // Always set this whether answered or not
                 if ( event.meta ) event.meta.target = event.target;

package/src/html-imports/HTMLImportsContext.js

@@ -52,11 +52,17 @@ export default class HTMLImportsContext extends DOMContext {
         const options = { live: event.live, signal: event.signal, descripted: true };
         event.meta.controller = Observer.reduce( this.#modules, path, Observer.get, ( m ) => {
             if ( Array.isArray( m ) ) {
+                if ( !m.length ) {
+                    event.respondWith( undefined );
+                    return;
+                }
                 // Paths with wildcard
                 for ( const n of m ) {
                     event.respondWith( n );
                 }
-            } else event.respondWith( m.value );
+            } else {
+                event.respondWith( m.value );
+            }
         }, options );
     }
 
@@ -101,16 +107,24 @@ export default class HTMLImportsContext extends DOMContext {
                 // This superModules contextrequest is automatically aborted by the injected signal below
                 const request = { ...this.constructor.createRequest( moduleRef ? `${moduleRef}/*` : '*' ), live: true, signal, diff: true };
                 this.host.parentNode[ this.configs.CONTEXT_API.api.contexts ].request( request, ( m ) => {
-                    if ( m.type === 'delete' ) {
-                        Reflect.deleteProperty( this.inheritedModules, m.key );
-                        if ( !Observer.has( this.localModules, m.key ) ) {
-                            Observer.deleteProperty( this.#modules, m.key );
+                    const _delete = ( key ) => {
+                        Reflect.deleteProperty( this.inheritedModules, key );
+                        if ( !Observer.has( this.localModules, key ) ) {
+                            Observer.deleteProperty( this.#modules, key );
                         }
-                    } else {
-                        Reflect.set( this.inheritedModules, m.key, m.value );
-                        if ( !Observer.has( this.localModules, m.key ) ) {
-                            Observer.set( this.#modules, m.key, m.value );
+                    };
+                    const _set = ( key, value ) => {
+                        Reflect.set( this.inheritedModules, key, value );
+                        if ( !Observer.has( this.localModules, key ) ) {
+                            Observer.set( this.#modules, key, value );
                         }
+                    };
+                    if ( !m ) {
+                        Object.keys( this.inheritedModules ).forEach( _delete );
+                    } else {
+                        if ( m.type === 'delete' ) {
+                            _delete( m.key );
+                        } else _set( m.key, m.value );
                     }
                 } );
             }, { live: true, timing: 'sync', oldValue: true, lifecycleSignals: true } );

package/src/html-imports/HTMLModule.js

@@ -168,7 +168,7 @@ export default class HTMLModule {
         if ( !this.parent ) return [];
         const { window: { webqit: { Observer } } } = env;
         let extendedId = ( this.host.getAttribute( this.config.attr.extends ) || '' ).trim();
-        let inheritedIds = ( this.host.getAttribute( this.config.attr.inherits ) || '' ).trim();
+        let inheritedIds = ( this.host.getAttribute( this.config.attr.inherits ) || '' ).trim().split( ' ' ).map( id => id.trim() ).filter( x => x );
         const handleInherited = records => {
             records.forEach( record => {
                 if ( Observer.get( this.defs, record.key ) !== record.oldValue ) return;
@@ -184,8 +184,8 @@ export default class HTMLModule {
         if ( extendedId ) {
             realtimes.push( Observer.reduce( parentDefsObj, [ extendedId, this.config.api.defs, Infinity ], Observer.get, handleInherited, { live: true } ) );
         }
-        if ( ( inheritedIds = inheritedIds.split( ' ' ).map( id => id.trim() ).filter( x => x ) ).length ) {
-            realtimes.push( Observer.get( parentDefsObj, inheritedIds, handleInherited, { live: true } ) );
+        if ( inheritedIds.length ) {
+            realtimes.push( Observer.get( parentDefsObj, inheritedIds.includes( '*' ) ? Infinity : inheritedIds, handleInherited, { live: true } ) );
         }
         return realtimes;
     }