@webqit/oohtml 4.0.0 → 4.0.2

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -29,18 +29,18 @@
   "scripts": {
     "test": "mocha --extension .test.js --exit",
     "test:coverage": "c8 --reporter=text-lcov npm run test | coveralls",
-    "build": "esbuild main=src/api.global.js main.lite=src/api.global.lite.js context-api=src/context-api/targets.browser.js bindings-api=src/bindings-api/targets.browser.js namespaced-html=src/namespaced-html/targets.browser.js html-imports=src/html-imports/targets.browser.js data-binding=src/data-binding/targets.browser.js scoped-css=src/scoped-css/targets.browser.js scoped-js=src/scoped-js/targets.browser.js --bundle --minify --sourcemap --outdir=dist",
+    "build": "esbuild main=src/index.js main.lite=src/index.lite.js context-api=src/context-api/targets.browser.js bindings-api=src/bindings-api/targets.browser.js namespaced-html=src/namespaced-html/targets.browser.js html-imports=src/html-imports/targets.browser.js data-binding=src/data-binding/targets.browser.js scoped-css=src/scoped-css/targets.browser.js scoped-js=src/scoped-js/targets.browser.js --bundle --minify --sourcemap --outdir=dist",
     "preversion": "npm test && npm run build && git add -A dist",
     "postversion": "npm publish",
     "postpublish": "git push && git push --tags"
   },
   "dependencies": {
-    "@webqit/quantum-js": "^4.3.0",
+    "@webqit/quantum-js": "^4.5.2",
     "@webqit/realdom": "^2.1.23",
     "@webqit/util": "^0.8.11"
   },
   "devDependencies": {
-    "@webqit/oohtml-ssr": "^2.0.0",
+    "@webqit/oohtml-ssr": "^2.1.1",
     "chai": "^4.3.4",
     "coveralls": "^3.1.1",
     "esbuild": "^0.14.43",

package/src/data-binding/index.js

@@ -90,7 +90,7 @@ function cleanup( ...entries ) {
 }
 
 async function mountDiscreteBindings( config, ...entries ) {
-    const window = this, { webqit: { QuantumAsyncFunction } } = window;
+    const window = this;
     const patternMatch = str => {
         const tagStart = config.tokens.tagStart.split( '' ).map( x => `\\${ x }` ).join( '' );
         const tagEnd = config.tokens.tagEnd.split( '' ).map( x => `\\${ x }` ).join( '' );

package/src/index.js

@@ -1,28 +1,10 @@
-
 /**
  * @imports
  */
-import NamespacedHTML from './namespaced-html/index.js';
-import ScopedCSS from './scoped-css/index.js';
-import ScopedJS from './scoped-js/index.js';
-import ContextAPI from './context-api/index.js';
-import BindingsAPI from './bindings-api/index.js';
-import HTMLImports from './html-imports/index.js';
-import DataBinding from './data-binding/index.js';
+import * as QuantumJS from `@webqit/quantum-js`;
+import init from './init.js';
 
 /**
  * @init
  */
-export default function init( QuantumJS, configs = {} ) {
-    if ( !this.webqit ) { this.webqit = {}; }
-    Object.assign( this.webqit, QuantumJS );
-    // --------------
-    ContextAPI.call( this, ( configs.CONTEXT_API || {} ) );
-    BindingsAPI.call( this, ( configs.BINDINGS_API || {} ) ); // Depends on ContextAPI
-    NamespacedHTML.call( this, ( configs.NAMESPACED_HTML || {} ) ); // Depends on ContextAPI
-    HTMLImports.call( this, ( configs.HTML_IMPORTS || {} ) ); // Depends on ContextAPI
-    DataBinding.call( this, ( configs.DATA_BINDING || {} ) ); // Depends on ContextAPI, BindingsAPI, HTMLImports
-    ScopedCSS.call( this, ( configs.SCOPED_CSS || {} ) ); // Depends on NamespacedHTML
-    ScopedJS.call( this, ( configs.SCOPED_JS || {} ) );
-    // --------------
-}
+init.call( window, QuantumJS );

package/src/{api.global.lite.js → index.lite.js}

@@ -3,7 +3,7 @@
  * @imports
  */
 import * as QuantumJS from `@webqit/quantum-js/lite`;
-import init from './index.js';
+import init from './init.js';
 
 /**
  * @init

package/src/init.js

@@ -0,0 +1,28 @@
+
+/**
+ * @imports
+ */
+import NamespacedHTML from './namespaced-html/index.js';
+import ScopedCSS from './scoped-css/index.js';
+import ScopedJS from './scoped-js/index.js';
+import ContextAPI from './context-api/index.js';
+import BindingsAPI from './bindings-api/index.js';
+import HTMLImports from './html-imports/index.js';
+import DataBinding from './data-binding/index.js';
+
+/**
+ * @init
+ */
+export default function init( QuantumJS, configs = {} ) {
+    if ( !this.webqit ) { this.webqit = {}; }
+    Object.assign( this.webqit, QuantumJS );
+    // --------------
+    ContextAPI.call( this, ( configs.CONTEXT_API || {} ) );
+    BindingsAPI.call( this, ( configs.BINDINGS_API || {} ) ); // Depends on ContextAPI
+    NamespacedHTML.call( this, ( configs.NAMESPACED_HTML || {} ) ); // Depends on ContextAPI
+    HTMLImports.call( this, ( configs.HTML_IMPORTS || {} ) ); // Depends on ContextAPI
+    DataBinding.call( this, ( configs.DATA_BINDING || {} ) ); // Depends on ContextAPI, BindingsAPI, HTMLImports
+    ScopedCSS.call( this, ( configs.SCOPED_CSS || {} ) ); // Depends on NamespacedHTML
+    ScopedJS.call( this, ( configs.SCOPED_JS || {} ) );
+    // --------------
+}

package/src/scoped-js/index.js

@@ -3,7 +3,7 @@
  * @imports
  */
 import { resolveParams } from '@webqit/quantum-js/params';
-import { _init, _toHash, _fromHash } from '../util.js';
+import { _, _init, _toHash, _fromHash } from '../util.js';
 
 /**
  * @init
@@ -71,9 +71,13 @@ async function execute( config, execHash ) {
         script.textContent = await compiledScript.toString();
     }
     // Execute and save state
-    const state = ( await compiledScript.bind( thisContext ) ).execute();
+    const documentRoot = script.getRootNode();
+    if ( !_( documentRoot ).has( 'scriptEnv' ) ) {
+        _( documentRoot ).set( 'scriptEnv', Object.create( null ) );
+    }
+    const state = ( await compiledScript.bind( thisContext, _( documentRoot ).get( 'scriptEnv' ) ) ).execute();
     if ( script.quantum ) { Object.defineProperty( script, 'state', { value: state } ); }
-    realdom.realtime( window.document ).observe( script, () => {
+    realdom.realtime( documentRoot ).observe( script, () => {
         if ( script.quantum ) { state.dispose(); }
         if ( script.scoped ) { thisContext[ config.api.scripts ].splice( thisContext[ config.api.scripts ].indexOf( script, 1 ) ); }
     }, { subtree: true, timing: 'sync', generation: 'exits' } );
@@ -87,7 +91,7 @@ async function execute( config, execHash ) {
  * @return Void
  */
 function realtime( config ) {
-    const window = this, { webqit: { oohtml, realdom, QuantumScript, QuantumAsyncScript, QuantumModule } } = window;
+    const window = this, { webqit: { oohtml, realdom, QuantumScript, AsyncQuantumScript, QuantumModule } } = window;
     if ( !window.HTMLScriptElement.supports ) { window.HTMLScriptElement.supports = type => [ 'text/javascript', 'application/javascript' ].includes( type ); }
     const handled = new WeakSet;
     realdom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.scriptSelector, record => {
@@ -102,7 +106,7 @@ function realtime( config ) {
             let compiledScript;
             if ( !( compiledScript = compileCache.get( sourceHash ) ) ) {
                 const { parserParams, compilerParams, runtimeParams } = config.advanced;
-                compiledScript = new ( script.type === 'module' ? QuantumModule : ( QuantumScript || QuantumAsyncScript ) )( textContent, {
+                compiledScript = new ( script.type === 'module' ? QuantumModule : ( QuantumScript || AsyncQuantumScript ) )( textContent, {
                     exportNamespace: `#${ script.id }`,
                     fileName: `${ window.document.url?.split( '#' )?.[ 0 ] || '' }#${ script.id }`,
                     parserParams: { ...parserParams, quantumMode: script.quantum },

package/src/api.global.js

@@ -1,11 +0,0 @@
-
-/**
- * @imports
- */
-import * as QuantumJS from `@webqit/quantum-js`;
-import init from './index.js';
-
-/**
- * @init
- */
-init.call( window, QuantumJS );