@webqit/oohtml 4.1.1 → 4.1.3

package/package.json

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

package/src/scoped-js/index.js

@@ -12,7 +12,7 @@ import { _, _init, _toHash, _fromHash } from '../util.js';
  */
 export default function init({ advanced = {}, ...$config }) {
     const { config, window } = _init.call( this, 'scoped-js', $config, {
-        script: { retention: 'retain', mimeTypes: 'module|text/javascript|application/javascript' },
+        script: { retention: 'retain', mimeTypes: 'module|text/javascript|application/javascript', timing: 'auto' },
         api: { scripts: 'scripts' },
         advanced: resolveParams(advanced),
     } );
@@ -71,11 +71,11 @@ async function execute( config, execHash ) {
         script.textContent = await compiledScript.toString();
     }
     // Execute and save state
-    const documentRoot = script.getRootNode();
-    if ( !_( documentRoot ).has( 'scriptEnv' ) ) {
-        _( documentRoot ).set( 'scriptEnv', Object.create( null ) );
+    const varScope = script.scoped ? thisContext : script.getRootNode();
+    if ( !_( varScope ).has( 'scriptEnv' ) ) {
+        _( varScope ).set( 'scriptEnv', Object.create( null ) );
     }
-    const state = ( await compiledScript.bind( thisContext, _( documentRoot ).get( 'scriptEnv' ) ) ).execute();
+    const state = ( await compiledScript.bind( thisContext, _( varScope ).get( 'scriptEnv' ) ) ).execute();
     if ( script.quantum ) { Object.defineProperty( script, 'state', { value: state } ); }
     realdom.realtime( window.document ).observe( script, () => {
         if ( script.quantum ) { state.dispose(); }
@@ -120,7 +120,7 @@ function realtime( config ) {
             if ( script.scoped ) { thisContext[ config.api.scripts ].push( script ); }
             const execHash = _toHash( { script, compiledScript, thisContext } );
             const manualHandling = record.type === 'query' || ( script.type && !window.HTMLScriptElement.supports( script.type ) );
-            if ( manualHandling || 1 ) { oohtml.Script.execute( execHash ); } else {
+            if ( manualHandling || config.script.timing === 'manual' ) { oohtml.Script.execute( execHash ); } else {
                 script.textContent = `webqit.oohtml.Script.execute( '${ execHash }' );`;
             }
         } );