@webqit/oohtml 4.3.17 → 4.4.0

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "4.3.17",
+  "version": "4.4.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,9 +39,9 @@
     "postpublish": "git push && git push --tags"
   },
   "dependencies": {
-    "@webqit/quantum-js": "^4.5.28",
-    "@webqit/realdom": "^2.1.33",
-    "@webqit/util": "^0.8.11"
+    "@webqit/quantum-js": "^4.5.30",
+    "@webqit/realdom": "^2.1.34",
+    "@webqit/util": "^0.8.16"
   },
   "devDependencies": {
     "@webqit/oohtml-ssr": "^2.1.1",

package/src/bindings-api/index.js

@@ -3,7 +3,7 @@
  * @imports
  */
 import DOMBindingsContext from './DOMBindingsContext.js';
-import { _, _init, _splitOuter } from '../util.js';
+import { _wq, _init, _splitOuter } from '../util.js';
 
 /**
  * @init
@@ -28,9 +28,9 @@ export default function init( $config = {} ) {
  */
 function getBindings( config, node ) {
     const window = this, { webqit: { Observer, oohtml: { configs: { CONTEXT_API: ctxConfig } } } } = window;
-	if ( !_( node ).has( 'bindings' ) ) {
+	if ( !_wq( node ).has( 'bindings' ) ) {
 		const bindingsObj = Object.create( null );
-		_( node ).set( 'bindings', bindingsObj );
+		_wq( node ).set( 'bindings', bindingsObj );
         Observer.observe( bindingsObj, mutations => {
             if ( node instanceof window.Element ) {
                 const bindingsParse = parseBindingsAttr( node.getAttribute( config.attr.bindingsreflection ) || '' );
@@ -57,7 +57,7 @@ function getBindings( config, node ) {
             }
         } );
 	}
-	return _( node ).get( 'bindings' );
+	return _wq( node ).get( 'bindings' );
 }
 
 /**

package/src/context-api/DOMContexts.js

@@ -15,15 +15,15 @@ export default class DOMContexts {
      * @instance
      */
     static instance( host ) {
-        return _( host ).get( 'contexts::instance' ) || new this( host );;
+        return _wq( host ).get( 'contexts::instance' ) || new this( host );;
     }
 
     /**
      * @constructor
      */
     constructor( host ) {
-        _( host ).get( `contexts::instance` )?.dispose();
-        _( host ).set( `contexts::instance`, this );
+        _wq( host ).get( `contexts::instance` )?.dispose();
+        _wq( host ).set( `contexts::instance`, this );
         const priv = { host, contexts: new Set };
         Object.defineProperty( this, '#', { get: () => priv } );
     }

package/src/data-binding/index.js

@@ -1,6 +1,6 @@
 import { resolveParams } from '@webqit/quantum-js/params';
 import { xpathQuery } from '@webqit/realdom/src/realtime/Util.js';
-import { _, _init, _splitOuter } from '../util.js';
+import { _wq, _init, _splitOuter } from '../util.js';
 
 /**
  * Initializes DOM Parts.
@@ -58,7 +58,7 @@ function realtime( config ) {
 
 function createDynamicScope( config, root ) {
     const { webqit: { realdom, Observer, DOMBindingsContext } } = this;
-    if ( _( root ).has( 'data-binding' ) ) return _( root ).get( 'data-binding' );
+    if ( _wq( root ).has( 'data-binding' ) ) return _wq( root ).get( 'data-binding' );
     const scope = Object.create( null ), abortController = new AbortController;
     scope[ '$exec__' ] = ( target, prop, ...args ) => {
         const exec = () => {
@@ -87,21 +87,21 @@ function createDynamicScope( config, root ) {
         has: ( e, recieved, next ) => { return next( true ); }
     } );
     const instance = { scope, abortController, bindings: new Map };
-    _( root ).set( 'data-binding', instance );
+    _wq( root ).set( 'data-binding', instance );
     return instance;
 }
 
 function cleanup( ...entries ) {
     for ( const node of entries ) {
         const root = node.nodeName  === '#text' ? node.parentNode : node;
-        const { bindings, abortController } = _( root ).get( 'data-binding' ) || {};
+        const { bindings, abortController } = _wq( root ).get( 'data-binding' ) || {};
         if ( !bindings?.has( node ) ) return;
         bindings.get( node ).state.dispose();
         bindings.get( node ).signals?.forEach( s => s.abort() );
         bindings.delete( node );
         if ( !bindings.size ) {
             abortController.abort();
-            _( root ).delete( 'data-binding' );
+            _wq( root ).delete( 'data-binding' );
         }
     }
 }
@@ -155,8 +155,8 @@ const discreteParseCache = new Map;
 function compileDiscreteBindings( config, str ) {
     if ( discreteParseCache.has( str ) ) return discreteParseCache.get( str );
     let source = `let content = ((${ str }) ?? '') + '';`;
-    source += `$assign__(this, 'nodeValue', content);`;
-    source += `if ( this.$oohtml_internal_databinding_anchorNode ) { $assign__(this.$oohtml_internal_databinding_anchorNode, 'nodeValue', "${ config.tokens.tagStart }${ escDouble( str ) }${ config.tokens.stateStart }" + content.length + "${ config.tokens.stateEnd } ${ config.tokens.tagEnd }"); }`;
+    source += `$assign__wq(this, 'nodeValue', content);`;
+    source += `if ( this.$oohtml_internal_databinding_anchorNode ) { $assign__wq(this.$oohtml_internal_databinding_anchorNode, 'nodeValue', "${ config.tokens.tagStart }${ escDouble( str ) }${ config.tokens.stateStart }" + content.length + "${ config.tokens.stateEnd } ${ config.tokens.tagEnd }"); }`;
     const { webqit: { QuantumModule } } = this;
     const { parserParams, compilerParams, runtimeParams } = config.advanced;
     const compiled = new QuantumModule( source, { parserParams, compilerParams, runtimeParams } );
@@ -189,22 +189,22 @@ function compileInlineBindings( config, str ) {
         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 });`;
+            if ( param.startsWith( '--' ) ) return `$exec__wq(this.style, 'setProperty', "${ escDouble( param ) }", ${ $arg });`;
+            return `$assign__wq(this.style, "${ escDouble( param ) }", ${ $arg });`;
         }
         // Class list
-        if ( directive === '%' ) return `$exec__(this.classList, 'toggle', "${ escDouble( param ) }", !!${ arg });`;
+        if ( directive === '%' ) return `$exec__wq(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 ( param.startsWith( '?' ) ) return `$exec__wq(this, 'toggleAttribute', "${ escDouble( param.substring( 1 ).trim() ) }", !!${ arg });`;
+            return `$exec__wq(this, 'setAttribute', "${ escDouble( param ) }", ${ $arg });`;
         }
         // 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 `$assign__(this, 'innerHTML', ${ $arg });`;
+            if ( param === 'text' ) return `$assign__wq(this, 'textContent', ${ $arg });`;
+            if ( param === 'html' ) return `$assign__wq(this, 'innerHTML', ${ $arg });`;
             if ( param === 'items' ) {
                 const [ iterationSpec, importSpec ] = _splitOuter( right, '/' );
                 if ( !importSpec ) throw new Error( `Invalid ${ directive }items spec: ${ str }; no import specifier.` );
@@ -235,12 +235,12 @@ function compileInlineBindings( config, str ) {
                         let $itemNode__ = $existing__.get( $key___ );
                         if ( $itemNode__ ) {
                             $existing__.delete( $key___ );
-                            $exec__($itemNode__, '${ config.BINDINGS_API.api.bind }', $itemBinding__ );
+                            $exec__wq($itemNode__, '${ config.BINDINGS_API.api.bind }', $itemBinding__ );
                         } else {
                             $itemNode__ = ( Array.isArray( $import__.value ) ? $import__.value[ 0 ] : ( $import__.value instanceof window.HTMLTemplateElement ? $import__.value.content.firstElementChild : $import__.value ) ).cloneNode( true );
                             $itemNode__.setAttribute( "${ config.attr.itemIndex }", $key___ );
-                            $exec__($itemNode__, '${ config.BINDINGS_API.api.bind }', $itemBinding__ );
-                            $exec__(this, 'appendChild', $itemNode__ );
+                            $exec__wq($itemNode__, '${ config.BINDINGS_API.api.bind }', $itemBinding__ );
+                            $exec__wq(this, 'appendChild', $itemNode__ );
                         }
 
                         if ( ${ kind === 'in' ? `!( ${ production[ 0 ] } in $iteratee__ )` : `typeof ${ production[ 0 ] } === 'undefined'` } ) { $itemNode__.remove(); }
@@ -262,7 +262,7 @@ function compileInlineBindings( config, str ) {
         }
         // Functions
         if ( directive === '$' ) {
-            return `$exec__(this, '${ param }', ${ arg });`;
+            return `$exec__wq(this, '${ param }', ${ arg });`;
         }
         if ( str.trim() ) throw new Error( `Invalid binding: ${ str }.` );
     } ).join( `\n` );

package/src/html-imports/HTMLImportsContext.js

@@ -4,7 +4,7 @@
  */
 import DOMContext from '../context-api/DOMContext.js';
 import { getDefs } from './index.js';
-import { _, env } from '../util.js';
+import { _wq, env } from '../util.js';
 
 export default class HTMLImportsContext extends DOMContext {
 

package/src/html-imports/HTMLModule.js

@@ -3,7 +3,7 @@
  * @imports
  */
 import { getDefs } from './index.js';
-import { _, env } from '../util.js';
+import { _wq, env } from '../util.js';
 
 export default class HTMLModule {
 
@@ -11,7 +11,7 @@ export default class HTMLModule {
      * @instance
      */
     static instance( host ) {
-        return _( host ).get( 'defsmanager::instance' ) || new this( host );
+        return _wq( host ).get( 'defsmanager::instance' ) || new this( host );
     }
 
     /**
@@ -19,8 +19,8 @@ export default class HTMLModule {
      */
     constructor( host, parent = null, level = 0 ) {
         const { window } = env, { webqit: { realdom, oohtml: { configs } } } = window;
-        _( host ).get( `defsmanager::instance` )?.dispose();
-        _( host ).set( `defsmanager::instance`, this );
+        _wq( host ).get( `defsmanager::instance` )?.dispose();
+        _wq( host ).set( `defsmanager::instance`, this );
         this.window = window;
         this.host = host;
         this.config = configs.HTML_IMPORTS;

package/src/html-imports/_HTMLImportElement.js

@@ -3,7 +3,7 @@
  * @imports
  */
 import HTMLImportsContext from './HTMLImportsContext.js';
-import { _, env } from '../util.js';
+import { _wq, env } from '../util.js';
 
 /**
  * Creates the HTMLImportElement class.
@@ -27,7 +27,7 @@ export default function() {
          */
         static instance( node ) {
             if ( configs.HTML_IMPORTS.elements.import.includes( '-' ) && ( node instanceof this ) )  return node;
-            return _( node ).get( 'import::instance' ) || new this( node );
+            return _wq( node ).get( 'import::instance' ) || new this( node );
         }
 
         /**
@@ -37,7 +37,7 @@ export default function() {
             super();
             // --------
             const el = args[ 0 ] || this;
-            _( el ).set( 'import::instance', this );
+            _wq( el ).set( 'import::instance', this );
             Object.defineProperty( this, 'el', { get: () => el, configurable: false } );
 
             const priv = {};
@@ -83,8 +83,8 @@ export default function() {
                     slottedElements.forEach( ( slottedElement, i ) => {
                         const tagName = slottedElement.tagName, fragmentDef = slottedElement.getAttribute( configs.HTML_IMPORTS.attr.fragmentdef ) || '';
                         const originalsMatch = ( i ++, identifiersMap.find( fragmentIdentifiers => fragmentIdentifiers.tagName === tagName && fragmentIdentifiers.fragmentDef === fragmentDef && fragmentIdentifiers.i === i ) );
-                        if ( originalsMatch ) _( slottedElement ).set( 'original@imports', originalsMatch.el ); // Or should we throw integrity error here?
-                        _( slottedElement ).set( 'slot@imports', this.el );
+                        if ( originalsMatch ) _wq( slottedElement ).set( 'original@imports', originalsMatch.el ); // Or should we throw integrity error here?
+                        _wq( slottedElement ).set( 'slot@imports', this.el );
                         priv.slottedElements.add( slottedElement );
                     } );
                     priv.originalsRemapped = true;
@@ -105,7 +105,7 @@ export default function() {
                 if ( !priv.slottedElements.size ) return restore();
                 const autoRestoreRealtime = realdom.realtime( priv.anchorNode.parentNode ).observe( [ ...priv.slottedElements ], record => {
                     record.exits.forEach( outgoingNode => {
-                        _( outgoingNode ).delete( 'slot@imports' );
+                        _wq( outgoingNode ).delete( 'slot@imports' );
                         priv.slottedElements.delete( outgoingNode );
                     } );
                     if ( !priv.slottedElements.size ) {
@@ -139,7 +139,7 @@ export default function() {
             const escapeElement = window.document.createElement( 'div' );
             escapeElement.textContent = this.el.outerHTML;
             const anchorNode = window.document.createComment( escapeElement.innerHTML );
-            _( anchorNode ).set( 'isAnchorNode', true );
+            _wq( anchorNode ).set( 'isAnchorNode', true );
             return anchorNode;
         }
 
@@ -160,7 +160,7 @@ export default function() {
             this.el.setAttribute( 'data-nodecount', slottableElements.size );
             this[ '#' ].autoRestore( () => {
                 this[ '#' ].slottedElements.forEach( slottedElement => {
-                    const slottedElementOriginal = _( slottedElement ).get( 'original@imports' );
+                    const slottedElementOriginal = _wq( slottedElement ).get( 'original@imports' );
                     // If still available in source, simply leave unchanged
                     // otherwise remove it from slot... to reflect this change
                     if ( slottableElements.has( slottedElementOriginal ) ) {
@@ -187,8 +187,8 @@ export default function() {
                     if ( !slottableElementClone.hasAttribute( configs.HTML_IMPORTS.attr.fragmentdef ) ) {
                         slottableElementClone.toggleAttribute( configs.HTML_IMPORTS.attr.fragmentdef, true );
                     }
-                    _( slottableElementClone ).set( 'original@imports', slottableElement );
-                    _( slottableElementClone ).set( 'slot@imports', this.el );
+                    _wq( slottableElementClone ).set( 'original@imports', slottableElement );
+                    _wq( slottableElementClone ).set( 'slot@imports', this.el );
                     this[ '#' ].slottedElements.add( slottableElementClone );
                     this[ '#' ].anchorNode.before( slottableElementClone );
                 } );

package/src/html-imports/index.js

@@ -5,7 +5,7 @@
 import HTMLModule from './HTMLModule.js';
 import HTMLImportsContext from './HTMLImportsContext.js';
 import _HTMLImportElement from './_HTMLImportElement.js';
-import { _, _init } from '../util.js';
+import { _wq, _init } from '../util.js';
 
 /**
  * Initializes HTML Modules.
@@ -45,11 +45,11 @@ export default function init($config = {}) {
  * @return Object
  */
 export function getDefs(node, autoCreate = true) {
-    if (!_(node).has('defs') && autoCreate) {
+    if (!_wq(node).has('defs') && autoCreate) {
         const defs = Object.create(null);
-        _(node).set('defs', defs);
+        _wq(node).set('defs', defs);
     }
-    return _(node).get('defs');
+    return _wq(node).get('defs');
 }
 
 /**
@@ -180,7 +180,7 @@ function realtime(config) {
     if (window.webqit.env === 'server') return;
     realdom.realtime(window.document).query(`(${config.anchorNodeSelector})`, record => {
         record.entrants.forEach(anchorNode => {
-            if (_(anchorNode).get('isAnchorNode')) return; // Doubling up on the early return above! Ignoring every just created anchorNode
+            if (_wq(anchorNode).get('isAnchorNode')) return; // Doubling up on the early return above! Ignoring every just created anchorNode
             const reviver = window.document.createElement('div');
             reviver.innerHTML = anchorNode.nodeValue;
             reviver.innerHTML = reviver.firstChild.textContent;

package/src/namespaced-html/index.js

@@ -3,7 +3,7 @@
  * @imports
  */
 import DOMNamingContext from './DOMNamingContext.js';
-import { _, _init, _splitOuter, _fromHash, _toHash, getInternalAttrInteraction, internalAttrInteraction } from '../util.js';
+import { _wq, _init, _splitOuter, _fromHash, _toHash, getInternalAttrInteraction, internalAttrInteraction } from '../util.js';
 
 /**
  * @init
@@ -119,15 +119,15 @@ export function rewriteSelector( selectorText, namespaceUUID, scopeSelector = nu
  */
 export function getOwnNamespaceObject( node ) {
 	const window = this;
-	if ( !_( node ).has( 'namespace' ) ) {
+	if ( !_wq( node ).has( 'namespace' ) ) {
 		const namespaceObj = Object.create( null );
-		_( node ).set( 'namespace', namespaceObj );
+		_wq( node ).set( 'namespace', namespaceObj );
 		const isDocumentRoot = [ window.Document, window.ShadowRoot ].some( x => node instanceof x );
 		Object.defineProperty( namespaceObj, Symbol.toStringTag, { get() {
 			return isDocumentRoot ? 'RootNamespaceRegistry' : 'NamespaceRegistry';
 		} } );
 	}
-	return _( node ).get( 'namespace' );
+	return _wq( node ).get( 'namespace' );
 }
 
 /**
@@ -194,8 +194,8 @@ function realtime( config ) {
 	const relMap = { id: 'id'/* just in case it's in attrList */, for: 'htmlFor', 'aria-owns': 'ariaOwns', 'aria-controls': 'ariaControls', 'aria-labelledby': 'ariaLabelledBy', 'aria-describedby': 'ariaDescribedBy', 'aria-flowto': 'ariaFlowto', 'aria-activedescendant': 'ariaActiveDescendant', 'aria-details': 'ariaDetails', 'aria-errormessage': 'ariaErrorMessage' };
 	const $lidUtil = lidUtil( config );
 	const uuidsToLidrefs = ( node, attrName, getter ) => {
-		if ( !getInternalAttrInteraction( node, attrName ) && _( node, 'attrOriginals' ).has( attrName ) ) {
-			return _( node, 'attrOriginals' ).get( attrName );
+		if ( !getInternalAttrInteraction( node, attrName ) && _wq( node, 'attrOriginals' ).has( attrName ) ) {
+			return _wq( node, 'attrOriginals' ).get( attrName );
 		}
 		const value = getter();
 		if ( getInternalAttrInteraction( node, attrName ) ) return value;
@@ -220,7 +220,7 @@ function realtime( config ) {
 	const getAttributeDescr = Object.getOwnPropertyDescriptor( window.Element.prototype, 'getAttribute' );
 	Object.defineProperty( window.Element.prototype, 'getAttribute', { ...getAttributeDescr, value( attrName ) {
 		const getter = () => getAttributeDescr.value.call( this, attrName );
-		return attrList.includes( attrName ) && !_( this, 'lock' ).get( attrName ) ? uuidsToLidrefs( this, attrName, getter ) : getter();
+		return attrList.includes( attrName ) && !_wq( this, 'lock' ).get( attrName ) ? uuidsToLidrefs( this, attrName, getter ) : getter();
 	} } );
 	// Hide implementation details on the Attr node too.
 	const propertyDescr = Object.getOwnPropertyDescriptor( window.Attr.prototype, 'value' );
@@ -277,11 +277,11 @@ function realtime( config ) {
 					Observer.set( namespaceObj, id, entry );
 				}
 			} else {
-				_( entry, 'attrOriginals' ).set( attrName, value ); // Save original before rewrite
+				_wq( entry, 'attrOriginals' ).set( attrName, value ); // Save original before rewrite
 				const newAttrValue = value.split( ' ' ).map( idref => ( idref = idref.trim() ) && $lidUtil.isUuid( idref ) ? idref : $lidUtil.toUuid( namespaceUUID, idref ) ).join( ' ' );
 				entry.setAttribute( attrName, newAttrValue );
-				_( namespaceObj ).set( 'idrefs', _( namespaceObj ).get( 'idrefs' ) || new Set );
-				_( namespaceObj ).get( 'idrefs' ).add( entry );
+				_wq( namespaceObj ).set( 'idrefs', _wq( namespaceObj ).get( 'idrefs' ) || new Set );
+				_wq( namespaceObj ).get( 'idrefs' ).add( entry );
 			}
 		} );
 	};
@@ -295,9 +295,9 @@ function realtime( config ) {
 					Observer.deleteProperty( namespaceObj, id );
 				}
 			} else {
-				const newAttrValue = _( entry, 'attrOriginals' ).get( attrName );// oldValue.split( ' ' ).map( lid => ( lid = lid.trim() ) && $lidUtil.uuidToLidref( lid ) ).join( ' ' );
+				const newAttrValue = _wq( entry, 'attrOriginals' ).get( attrName );// oldValue.split( ' ' ).map( lid => ( lid = lid.trim() ) && $lidUtil.uuidToLidref( lid ) ).join( ' ' );
 				if ( entry.hasAttribute( attrName ) ) entry.setAttribute( attrName, newAttrValue );
-				_( namespaceObj ).get( 'idrefs' )?.delete( entry );
+				_wq( namespaceObj ).get( 'idrefs' )?.delete( entry );
 			}
 		} );
 	};
@@ -310,13 +310,13 @@ function realtime( config ) {
 			if ( !entry.hasAttribute( attrName ) ) return;
 			const attrValue = () => entry.getAttribute( attrName );
 			cleanupBinding( entry, attrName, attrValue/* Current resolved value as-is */, oldNamespaceObj );
-			if ( entry.isConnected ) { setupBinding( entry, attrName, _( entry, 'attrOriginals' ).get( attrName )/* Saved original value */ || attrValue/* Lest it's ID */, newNamespaceObj ); }
+			if ( entry.isConnected ) { setupBinding( entry, attrName, _wq( entry, 'attrOriginals' ).get( attrName )/* Saved original value */ || attrValue/* Lest it's ID */, newNamespaceObj ); }
 		};
         record.exits.forEach( entry => {
 			if ( entry.isConnected ) {
 				const namespaceObj = getOwnNamespaceObject.call( window, entry );
 				// Detach ID and IDREF associations
-				for ( const node of new Set( [ ...Object.values( namespaceObj ), ...( _( namespaceObj ).get( 'idrefs' ) || [] ) ] ) ) {
+				for ( const node of new Set( [ ...Object.values( namespaceObj ), ...( _wq( namespaceObj ).get( 'idrefs' ) || [] ) ] ) ) {
 					for ( const attrName of attrList ) { reAssociate( node, attrName, namespaceObj ); }
 				}
 			}
@@ -330,7 +330,7 @@ function realtime( config ) {
 			// Claim ID and IDREF associations
 			let newSuperNamespaceObj;
 			const superNamespaceObj = getOwnerNamespaceObject.call( window, entry, true );
-			for ( const node of new Set( [ ...Object.values( superNamespaceObj ), ...( _( superNamespaceObj ).get( 'idrefs' ) || [] ) ] ) ) {
+			for ( const node of new Set( [ ...Object.values( superNamespaceObj ), ...( _wq( superNamespaceObj ).get( 'idrefs' ) || [] ) ] ) ) {
 				if ( ( newSuperNamespaceObj = getOwnerNamespaceObject.call( window, node, true ) ) === superNamespaceObj ) continue;
 				for ( const attrName of attrList ) { reAssociate( node, attrName, superNamespaceObj, newSuperNamespaceObj ); }
 			}

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 { _wq, _init, _toHash, _fromHash } from '../util.js';
 
 /**
  * @init
@@ -72,10 +72,10 @@ async function execute( config, execHash ) {
     }
     // Execute and save state
     const varScope = script.scoped ? thisContext : script.getRootNode();
-    if ( !_( varScope ).has( 'scriptEnv' ) ) {
-        _( varScope ).set( 'scriptEnv', Object.create( null ) );
+    if ( !_wq( varScope ).has( 'scriptEnv' ) ) {
+        _wq( varScope ).set( 'scriptEnv', Object.create( null ) );
     }
-    const state = await ( await compiledScript.bind( thisContext, _( varScope ).get( 'scriptEnv' ) ) ).execute();
+    const state = await ( await compiledScript.bind( thisContext, _wq( varScope ).get( 'scriptEnv' ) ) ).execute();
     if ( script.quantum ) { Object.defineProperty( script, 'state', { value: state } ); }
     realdom.realtime( window.document ).observe( script, () => {
         if ( script.quantum ) { state.dispose(); }

package/src/util.js

@@ -3,11 +3,11 @@
  * @imports
  */
 import realdomInit from '@webqit/realdom';
-import { _internals } from '@webqit/util/js/index.js';
+import { _wq as __wq } from '@webqit/util/js/index.js';
 import { _merge } from '@webqit/util/obj/index.js';
 import { _toTitle } from '@webqit/util/str/index.js';
 
-export const _ = ( ...args ) => _internals( 'oohtml', ...args );
+export const _wq = ( target, ...args ) => __wq( target, 'oohtml', ...args );
 
 export const env = {};
 
@@ -43,13 +43,13 @@ export function _init( name, $config, $defaults ) {
 }
 
 export function getInternalAttrInteraction( node, attrName ) {
-	return _internals( node, 'internalAttrInteractions' ).get( attrName );
+	return _wq( node, 'internalAttrInteractions' ).get( attrName );
 }
 export function internalAttrInteraction( node, attrName, callback ) {
-	const savedAttrLocking = _internals( node, 'internalAttrInteractions' ).get( attrName );
-	_internals( node, 'internalAttrInteractions' ).set( attrName, true );
+	const savedAttrLocking = _wq( node, 'internalAttrInteractions' ).get( attrName );
+	_wq( node, 'internalAttrInteractions' ).set( attrName, true );
 	const value = callback();
-	_internals( node, 'internalAttrInteractions' ).set( attrName, savedAttrLocking );
+	_wq( node, 'internalAttrInteractions' ).set( attrName, savedAttrLocking );
 	return value;
 }