@webqit/oohtml 4.1.14 → 4.2.0

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "4.1.14",
+  "version": "4.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,8 +39,8 @@
     "postpublish": "git push && git push --tags"
   },
   "dependencies": {
-    "@webqit/quantum-js": "^4.5.8",
-    "@webqit/realdom": "^2.1.28",
+    "@webqit/quantum-js": "^4.5.11",
+    "@webqit/realdom": "^2.1.30",
     "@webqit/util": "^0.8.11"
   },
   "devDependencies": {

package/src/data-binding/index.js

@@ -54,8 +54,8 @@ function createDynamicScope( config, root ) {
     const scope = Object.create( null ), abortController = new AbortController;
     scope[ '$exec__' ] = ( target, prop, ...args ) => {
         const exec = () => {
-            try { target[ prop ]( ...args ); }
-            catch( e ) { console.error( `${ e.message } at ${ e.cause }` ); }
+            target[ prop ]( ...args );
+            try { } catch( e ) { console.error( `${ e.message } at ${ e.cause }` ); }
         };
         realdom.schedule( 'write', exec );
     };
@@ -177,20 +177,24 @@ function compileInlineBindings( config, str ) {
         const [ left, right ] = _splitOuter( str, ':' ).map( x => x.trim() );
         const directive = left[ 0 ], param = left.slice( 1 ).trim();
         const arg = `(${ right })`, $arg = `(${ arg } ?? '')`;
+        // CSS
         if ( directive === '&' ) {
             if ( param.startsWith( '--' ) ) return `$exec__(this.style, 'setProperty', "${ escDouble( param ) }", ${ $arg });`;
             return `$assign__(this.style, "${ escDouble( param ) }", ${ $arg });`;
         }
+        // Class list
         if ( directive === '%' ) return `$exec__(this.classList, 'toggle', "${ escDouble( param ) }", !!${ arg });`;
+        // Attribute
         if ( directive === '~' ) {
             if ( param.startsWith( '?' ) ) return `$exec__(this, 'toggleAttribute', "${ escDouble( param.substring( 1 ).trim() ) }", !!${ arg });`;
             return `$exec__(this, 'setAttribute', "${ escDouble( param ) }", ${ $arg });`;
         }
-        if ( directive === '@' ) {
+        // Structure
+        if ( directive === '#' ) {
             if ( validation[ param ] ) throw new Error( `Duplicate binding: ${ left }.` );
             validation[ param ] = true;
             if ( param === 'text' ) return `$assign__(this, 'textContent', ${ $arg });`;
-            if ( param === 'html' ) return `$exec__(this, 'setHTML', ${ $arg });`;
+            if ( param === 'html' ) return `$exec__(this, 'setHTMLUnsafe', ${ $arg });`;
             if ( param === 'items' ) {
                 const [ iterationSpec, importSpec ] = _splitOuter( right, '/' );
                 if ( !importSpec ) throw new Error( `Invalid ${ directive }items spec: ${ str }; no import specifier.` );
@@ -235,14 +239,20 @@ function compileInlineBindings( config, str ) {
                     $existing__.clear();
                 }`;
             }
-            // Treat other "@" directives as events
+        }
+        // Events
+        if ( directive === '@' ) {
             return `
-                const handler = () => ${ arg };
+                const handler = event => ${ right.startsWith('{') ? right : arg };
                 this.addEventListener( '${ param }', handler );
                 const abort = () => this.removeEventListener( '${ param }', handler );
                 this.$oohtml_internal_databinding_signals?.push( { abort } );
             `;
         }
+        // Functions
+        if ( directive === '$' ) {
+            return `$exec__(this, '${ param }', ${ arg });`;
+        }
         if ( str.trim() ) throw new Error( `Invalid binding: ${ str }.` );
     } ).join( `\n` );
     const { webqit: { QuantumModule } } = this;

package/src/namespaced-html/index.js

@@ -297,7 +297,7 @@ function realtime( config ) {
 			} else {
 				const newAttrValue = _( entry, 'attrOriginals' ).get( attrName );// oldValue.split( ' ' ).map( lid => ( lid = lid.trim() ) && $lidUtil.uuidToLidref( lid ) ).join( ' ' );
 				entry.setAttribute( attrName, newAttrValue );
-				_( namespaceObj ).get( 'idrefs' ).delete( entry );
+				_( namespaceObj ).get( 'idrefs' )?.delete( entry );
 			}
 		} );
 	};

package/src/scoped-js/index.js

@@ -75,7 +75,7 @@ async function execute( config, execHash ) {
     if ( !_( varScope ).has( 'scriptEnv' ) ) {
         _( varScope ).set( 'scriptEnv', Object.create( null ) );
     }
-    const state = ( await compiledScript.bind( thisContext, _( varScope ).get( 'scriptEnv' ) ) ).execute();
+    const state = await ( 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(); }
@@ -117,7 +117,7 @@ function realtime( config ) {
 function compileScript( config, script ) {
     const window = this, { webqit: { oohtml, QuantumScript, AsyncQuantumScript, QuantumModule } } = window;
     const textContent = ( script._ = script.textContent.trim() ) && script._.startsWith( '/*@oohtml*/if(false){' ) && script._.endsWith( '}/*@oohtml*/' ) ? script._.slice( 21, -12 ) : script.textContent;
-    if ( !script.scoped && !script.quantum && !textContent.includes( 'quantum' ) ) return;
+    if ( !textContent.trim().length ) return;
     const sourceHash = _toHash( textContent );
     const compileCache = oohtml.Script.compileCache[ script.quantum ? 0 : 1 ];
     let compiledScript;