@webqit/oohtml 4.5.7 → 4.5.9

package/package.json

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

package/src/html-imports/HTMLModule.js

@@ -31,8 +31,8 @@ export default class HTMLModule {
         this.validateDefId( this.defId );
         // ----------
         this.realtimeA = realdom.realtime( this.host.content ).children( record => {
+            this.expose( record.exits, false ); // Must come first
             this.expose( record.entrants, true );
-            this.expose( record.exits, false );
         }, { live: true, timing: 'sync' } );
         // ----------
         this.realtimeB = realdom.realtime( this.host ).attr( [ 'src', 'loading' ], ( ...args ) => this.evaluateLoading( ...args ), {
@@ -71,7 +71,7 @@ export default class HTMLModule {
         const { window } = env, { webqit: { Observer } } = window;
         let dirty, allFragments = this.defs[ '#' ] || [];
         entries.forEach( entry => {
-            if ( entry.nodeType !== 1 ) return;
+            if ( !entry || entry.nodeType !== 1 ) return;
             const isTemplate = entry.matches( this.config.templateSelector );
             const defId = ( entry.getAttribute( isTemplate ? this.config.attr.def : this.config.attr.fragmentdef ) || '' ).trim();
             if ( isConnected ) {
@@ -133,13 +133,20 @@ export default class HTMLModule {
      *
      * @return Promise
      */
+    #fetchedURLs = new Set;
+    #fetchInFlight;
     load( src ) {
         const { window } = env;
-        if ( this.host.content.children.length ) return Promise.resolve();
+        if ( this.#fetchedURLs.has( src ) ) {
+            // Cache busting is needed to 
+            return Promise.resolve();
+        }
+        this.#fetchedURLs.add( src );
+        if ( this.#fetchedURLs.size === 1 && this.host.content.children.length ) {
+            return Promise.resolve();
+        }
         // Ongoing request?
-        if ( this.fetchInFlight?.src === src ) return this.fetchInFlight.request;
-        this.fetchInFlight?.controller.abort();
-
+        this.#fetchInFlight?.controller.abort();
         // The promise
         const controller = new AbortController();
         const fire = ( type, detail ) => this.host.dispatchEvent( new window.CustomEvent( type, { detail } ) );
@@ -151,11 +158,11 @@ export default class HTMLModule {
             return this.host;
         } ).catch( e => {
             console.error( `Error fetching the bundle at "${ src }": ${ e.message }` );
-            this.fetchInFlight = null;
+            this.#fetchInFlight = null;
             fire( 'loaderror' );
             return this.host;
         } );
-        this.fetchInFlight = { src, request, controller };
+        this.#fetchInFlight = { request, controller };
         return request;
     }