@webqit/oohtml 2.1.15 → 2.1.17

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "2.1.15",
+  "version": "2.1.17",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -38,10 +38,10 @@
     "postpublish": "git push && git push --tags"
   },
   "dependencies": {
-    "@webqit/dom": "^2.0.5",
-    "@webqit/observer": "^2.0.6",
+    "@webqit/dom": "^2.0.8",
+    "@webqit/observer": "^2.0.7",
     "@webqit/subscript": "^2.1.39",
-    "@webqit/util": "^0.8.10"
+    "@webqit/util": "^0.8.11"
   },
   "devDependencies": {
     "chai": "^4.3.4",

package/src/html-imports/index.js

@@ -34,10 +34,10 @@ export default function init( $config = {} ) {
  */
 function realtime( config ) {
     const window = this, { dom, HTMLImportElement } = window.webqit;
-    dom.realtime( window.document ).observe( config.import.tagName, record => {
+    dom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.import.tagName, record => {
         record.entrants.forEach( node => handleRealtime( node, true, record ) );
         record.exits.forEach( node => handleRealtime( node, false, record ) );
-    }, { subtree: true, timing: 'sync' } );
+    }, { live: true, timing: 'sync' } );
     function handleRealtime( entry, connectedState, record ) {
         const elInstance = HTMLImportElement.instance( entry );
         if ( connectedState ) { elInstance[ '#' ].connectedCallback(); }

package/src/html-modules/index.js

@@ -101,7 +101,7 @@ function realtime( config ) {
         } );
     };
     // ------------
-    dom.realtime( window.document ).observe( [ config.templateSelector, config.ownerContextSelector ], record => {
+    dom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( [ config.templateSelector, config.ownerContextSelector ], record => {
         record.entrants.forEach( entry => {
             if ( entry.matches( config.templateSelector ) ) {
                 Object.defineProperty( entry, 'scoped', { value: entry.hasAttribute( 'scoped' ) } ); 
@@ -127,5 +127,5 @@ function realtime( config ) {
                 detachImportsContext( entry, true );
             }
         } );
-    }, { subtree: true, timing: 'sync', staticSensitivity: config.staticsensitivity } );
+    }, { live: true, timing: 'sync', staticSensitivity: config.staticsensitivity } );
 }

package/src/index.js

@@ -16,9 +16,9 @@ import ScopedJS from './scoped-js/index.js';
 export default function init( configs = {} ) {
     if ( !this.webqit ) { this.webqit = {}; }
     // --------------
-    BindingsAPI.call(this, ( configs.BINDINGS_API || {} ) );
+    BindingsAPI.call( this, ( configs.BINDINGS_API || {} ) );
     ContextAPI.call( this, ( configs.CONTEXT_API || {} ) );
-    NamespaceAPI.call(this, ( configs.NAMESPACE_API || {} ) );
+    NamespaceAPI.call( this, ( configs.NAMESPACE_API || {} ) );
     HTMLModules.call( this, ( configs.HTML_MODULES || {} ) );
     HTMLImports.call( this, ( configs.HTML_IMPORTS || {} ) );
     ScopedJS.call( this, ( configs.SCOPED_JS || {} ) );

package/src/namespace-api/index.js

@@ -101,10 +101,10 @@ function realtime( config ) {
 			Observer.deleteProperty( namespaceObj, identifier );
 		}
 	};
-	dom.realtime( window.document ).observe( config.idSelector, record => {
+	dom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.idSelector, record => {
         record.entrants.forEach( entry => handle( record.target, entry, true ) );
         record.exits.forEach( entry => handle( record.target, entry, false ) );
-	}, { subtree: true, timing: 'sync', staticSensitivity: config.staticsensitivity } );
+	}, { live: true, timing: 'sync', staticSensitivity: config.staticsensitivity } );
 	// ----------------
 	if ( config.staticsensitivity ) {
 		dom.realtime( window.document, 'attr' ).observe( config.namespaceSelector, record => {

package/src/scoped-js/Compiler.js

@@ -29,7 +29,7 @@ export default class Compiler {
         this.window = window;
         this.config = config;
         // This is a global function
-        window.webqit.oohtml.Script.run = ( execHash ) => {
+        window.webqit.oohtml.Script.run = execHash => {
             const exec = this.constructor.fromHash( execHash );
             if ( !exec ) throw new Error( `Argument must be a valid exec hash.` );
             const { script, compiledScript, thisContext } = exec;
@@ -93,7 +93,11 @@ export default class Compiler {
             cache.set( sourceHash, compiledScript );
         }
         const execHash = _static.toHash( { script, compiledScript, thisContext } );
-        script.textContent = `webqit.oohtml.Script.run('${ execHash }');`;
+        if ( script.handling === 'manual' ) {
+            webqit.oohtml.Script.run( execHash );
+        } else {
+            script.textContent = `webqit.oohtml.Script.run( '${ execHash }' );`;
+        }
     }
 
     // Match import statements

package/src/scoped-js/index.js

@@ -27,7 +27,7 @@ export default function init( { advanced = {}, ...$config } ) {
         return selector.concat( `script${ qualifier }[scoped],script${ qualifier }[contract]` );
     }, [] ).join( ',' );
     window.webqit.oohtml.Script = { compileCache: [ new Map, new Map, ] };
-    window.webqit.SubscriptFunction = $config.SubscriptFunction/* allow for injection, e.g. from test runner */ || SubscriptFunction;
+    window.webqit.SubscriptFunction = config.SubscriptFunction/* allow for injection, e.g. from test runner */ || SubscriptFunction;
     window.webqit.Observer = Observer;
     realtime.call( window, config );
 }
@@ -83,18 +83,22 @@ export function execute( compiledScript, thisContext, script ) {
  */
 function realtime( config ) {
 	const window = this, { dom } = window.webqit;
+    if ( !window.HTMLScriptElement.supports ) { window.HTMLScriptElement.supports = () => false; }
+    const potentialManualTypes = [ 'module' ].concat( config.script.mimeType || [] );
     const compiler = new Compiler( window, config, execute ), handled = () => {};
-	dom.realtime( window.document ).observe( config.scriptSelector, record => {
+	dom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.scriptSelector, record => {
         record.entrants.forEach( script => {
             if ( 'contract' in script ) return handled( script );
             Object.defineProperty( script, 'contract', { value: script.hasAttribute( 'contract' ) } ); 
             if ( 'scoped' in script ) return handled( script );
             Object.defineProperty( script, 'scoped', { value: script.hasAttribute( 'scoped' ) } ); 
-            // ---
+            if ( record.type === 'query' || ( potentialManualTypes.includes( script.type ) && !window.HTMLScriptElement.supports( script.type ) ) ) {
+                Object.defineProperty( script, 'handling', { value: 'manual' } ); 
+            }
             const thisContext = script.scoped ? record.target : ( script.type === 'module' ? undefined : window );
             compiler.compile( script, thisContext );
         } );
-	}, { subtree: true, timing: 'intercept', generation: 'entrants' } );
+	}, { live: true, timing: 'intercept', generation: 'entrants' } );
     // ---
 }