@webqit/oohtml 2.1.49 → 2.1.51-0

package/package.json

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

package/src/html-imports/_HTMLExportsManager.js

@@ -70,7 +70,7 @@ export default class _HTMLExportsManager {
      * @returns Void
      */
     export( entries, isConnected ) {
-        let dirty, allFragments = Observer.get( this.modules, '#' ) || [];
+        let dirty, allFragments = this.modules[ '#' ] || [];
         Observer.batch( this.modules, () => {
             entries.forEach( entry => {
                 if ( entry.nodeType !== 1 ) return;
@@ -139,7 +139,7 @@ export default class _HTMLExportsManager {
         const fire = ( type, detail ) => this.host.dispatchEvent( new this.window.CustomEvent( type, { detail } ) );
         const request = this.window.fetch( src, { signal: controller.signal, element: this.host } ).then( response => {
             return response.ok ? response.text() : Promise.reject( response.statusText );
-        }).then( content => {
+        } ).then( content => {
             this.host.innerHTML = content.trim(); // IMPORTANT: .trim()
             fire( 'load' );
             return this.host;

package/src/html-imports/_HTMLImportElement.js

@@ -16,7 +16,7 @@ import { _ } from '../util.js';
 export default function( config ) {
     const window = this, { realdom } = window.webqit;
     const BaseElement = config.import.tagName.includes( '-' ) ? window.HTMLElement : class {};
-    return class HTMLImportElement extends BaseElement {
+    class HTMLImportElement extends BaseElement {
         
         /**
          * @instance
@@ -27,7 +27,7 @@ export default function( config ) {
          */
         static instance( node ) {
             if ( config.import.tagName.includes( '-' ) && ( node instanceof this ) )  return node;
-            return _( node ).get( 'import::instance' ) || new this( node );;
+            return _( node ).get( 'import::instance' ) || new this( node );
         }
 
         /**
@@ -211,4 +211,8 @@ export default function( config ) {
          */
         get slottedElements() { return this[ '#' ].slottedElements; }
     }
+    if ( config.import.tagName.includes( '-' ) ) {
+        customElements.define( config.import.tagName, HTMLImportElement );
+    }
+    return HTMLImportElement;
 }

package/src/scoped-js/Compiler.js

@@ -45,7 +45,10 @@ export default class Compiler {
                     script.textContent = `"source hidden"`;
                     break;
                 default:
-                    script.textContent = compiledScript.function.originalSource;
+                    script.textContent = ' ';
+                    setTimeout( () => {
+                        //script.textContent = compiledScript.function.originalSource;
+                    }, 10 );
             }
             return executeCallback.call( window, compiledScript, thisContext, script );
         };    
@@ -56,9 +59,10 @@ export default class Compiler {
         const _static = this.constructor;
         const { webqit: { oohtml, ReflexFunction } } = this.window;
         const cache = oohtml.Script.compileCache[ script.reflex ? 0 : 1 ];
-        const sourceHash = _static.toHash( script.textContent );
+        const textContent = ( script._ = script.textContent.trim() ) && script._.startsWith( '/*@oohtml*/if(false){' ) && script._.endsWith( '}/*@oohtml*/' ) ? script._.slice( 21, -12 ) : script.textContent;
+        const sourceHash = _static.toHash( textContent );
         // Script instances are parsed only once
-        let source = script.textContent, compiledScript;
+        let source = textContent, compiledScript;
         if ( !( compiledScript = cache.get( sourceHash ) ) ) {
             // Are there "import" (and "await") statements? Then, we need to rewrite that
             let imports = [], meta = {};
@@ -85,7 +89,7 @@ export default class Compiler {
                     ? runtimeParams.compileFunction( source )
                     : new _FunctionConstructor( source );
             }
-            Object.defineProperty( _Function, 'originalSource', { configurable: true, value: script.textContent } );
+            Object.defineProperty( _Function, 'originalSource', { configurable: true, value: textContent } );
             // Save material function to compile cache
             compiledScript = Object.defineProperty( script.cloneNode(), 'function', { value: _Function } );
             script.scoped && Object.defineProperty( compiledScript, 'scoped', Object.getOwnPropertyDescriptor( script, 'scoped') );

package/src/scoped-js/index.js

@@ -95,6 +95,7 @@ function realtime( config ) {
     const compiler = new Compiler( window, config, execute ), handled = () => {};
 	realdom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.scriptSelector, record => {
         record.entrants.forEach( script => {
+            if ( script.cloned ) return;
             if ( 'reflex' in script ) return handled( script );
             Object.defineProperty( script, 'reflex', { value: script.hasAttribute( 'reflex' ) } ); 
             if ( 'scoped' in script ) return handled( script );

package/test/modules.test.js

@@ -102,7 +102,7 @@ describe(`HTML Modules`, function() {
                 const timeout = 1000;
                 mockRemoteFetch( window, { '/temp0.html': contents0, '/temp1.html': contents1, '/temp2.html': contents2 }, timeout );
             } );
-            await delay( 20 );
+            await delay( 50 );
             const { webqit: { Observer } } = window;
             // -------
             // Add a remote module
@@ -153,7 +153,7 @@ describe(`HTML Modules`, function() {
             const body = `
             <div></div>`;
             const { document, window } = createDocument( head, body );
-            await delay( 20 );
+            await delay( 50 );
 
             // -------
             const addScopedModules = () => {