@webqit/oohtml 2.1.2 → 2.1.4

package/package.json

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

package/src/context-api/index.js

@@ -15,6 +15,9 @@ import HTMLContext from './HTMLContext.js';
  */
 export default function init( $params = { }) {
     const window = this, dom = wqDom.call( window );
+    if ( !window.wq ) { window.wq = {}; }
+    window.wq.HTMLContextManager = HTMLContextManager;
+    window.wq.HTMLContext = HTMLContext;
     // -------
     const params = dom.meta( 'oohtml' ).copyWithDefaults( $params, {
         api: { context: 'context', },

package/src/html-imports/index.js

@@ -15,6 +15,7 @@ import { _ } from '../util.js';
  */
 export default function init( $params = { }) {
     const window = this, dom = wqDom.call( window );
+    if ( !window.wq ) { window.wq = {}; }
     // -------
     const params = dom.meta( 'oohtml' ).copyWithDefaults( $params, {
         import: { tagName: 'import', attr: { moduleref: 'module' }, },
@@ -22,7 +23,8 @@ export default function init( $params = { }) {
         isomorphic: true,
     } );
     params.slottedElementsSelector = `[${ window.CSS.escape( params.export.attr.exportid ) }]`;
-    params.HTMLImportElement = _HTMLImportElement.call( this, params );
+    // -------
+    window.wq.HTMLImportElement = _HTMLImportElement.call( this, params );
     // -------
     dom.ready( () => hydration.call( this, params ) );
     realtime.call( this, params );
@@ -37,13 +39,13 @@ export default function init( $params = { }) {
  * @return Void
  */
 function realtime( params ) {
-    const window = this, { dom } = window.wq;
+    const window = this, { dom, HTMLImportElement } = window.wq;
     dom.realtime( window.document ).observe( params.import.tagName, record => {
         record.entrants.forEach( node => handleRealtime( node, true, record ) );
         record.exits.forEach( node => handleRealtime( node, false, record ) );
     }, { subtree: true, timing: 'sync' } );
     function handleRealtime( entry, connectedState, record ) {
-        const elInstance = params.HTMLImportElement.instance( entry );
+        const elInstance = HTMLImportElement.instance( entry );
         if ( connectedState ) { elInstance[ '#' ].connectedCallback(); }
         else { elInstance[ '#' ].disconnectedCallback(); }
     }
@@ -57,7 +59,7 @@ function realtime( params ) {
  * @return Void
  */
 function hydration( params ) {
-    const window = this;
+    const window = this, { HTMLImportElement } = window.wq;
     function scan( context ) {
         const slottedElements = new Set;
         context.childNodes.forEach( node => {
@@ -73,7 +75,7 @@ function hydration( params ) {
                 reviver.innerHTML = nodeValue;
                 const importEl = reviver.firstChild;
                 if ( !importEl.matches( params.import.tagName ) ) return;
-                params.HTMLImportElement.instance( importEl )[ '#' ].hydrate(
+                HTMLImportElement.instance( importEl )[ '#' ].hydrate(
                     node/* the comment node */, slottedElements
                 );
                 slottedElements.clear();

package/src/html-modules/index.js

@@ -17,6 +17,10 @@ import { _ } from '../util.js';
  */
 export default function init( $params = {} ) {
     const window = this, dom = wqDom.call( window );
+    if ( !window.wq ) { window.wq = {}; }
+    window.wq.HTMLImportsContext = class extends _HTMLImportsContext {
+        static get params() { return params; }
+    };
     // -------
     const params = dom.meta( 'oohtml' ).copyWithDefaults( $params, {
         template: { attr: { exportid: 'exportid', extends: 'extends', inherits: 'inherits' }, api: { modules: 'modules', exportid: 'exportid' }, },
@@ -27,9 +31,6 @@ export default function init( $params = {} ) {
     params.window = window;
     params.templateSelector = `template[${ window.CSS.escape( params.template.attr.exportid ) }]`;
     params.ownerContextSelector = [ params.context.attr.contextname, params.context.attr.importscontext ].map( a => `[${ window.CSS.escape( a ) }]` ).join( ',' );
-    params.HTMLImportsContext = class extends _HTMLImportsContext {
-        static get params() { return params; }
-    }
     // -------
     exposeModulesObjects.call( this, params );
     realtime.call( this, params );
@@ -92,15 +93,15 @@ function exposeModulesObjects( params ) {
  * @return Void
  */
 function realtime( params ) {
-    const window = this, { dom } = window.wq;
+    const window = this, { dom, HTMLImportsContext } = window.wq;
     // ------------
     const attachImportsContext = host => {
-        const contextId = params.HTMLImportsContext.createId( host );
-        params.HTMLImportsContext.attachTo( host, contextId );
+        const contextId = HTMLImportsContext.createId( host );
+        HTMLImportsContext.attachTo( host, contextId );
     };
     const detachImportsContext = ( host, force ) => {
-        const contextId = params.HTMLImportsContext.createId( host );
-        params.HTMLImportsContext.detachFrom( host, contextId, cx => {
+        const contextId = HTMLImportsContext.createId( host );
+        HTMLImportsContext.detachFrom( host, contextId, cx => {
             return force || host.matches && !host.matches( params.ownerContextSelector ) && !Object.keys( cx.modules ).length;
         } );
     };

package/src/scoped-js/index.js

@@ -2,7 +2,7 @@
 /**
  * @imports
  */
-import { parserParams, compilerParams, runtimeParams } from '@webqit/subscript/src/params.js';
+import { resolveParams } from '@webqit/subscript/src/params.js';
 import SubscriptFunction from '@webqit/subscript/src/SubscriptFunctionLite.js';
 import Observer from '@webqit/observer';
 import wqDom from '@webqit/dom';
@@ -14,12 +14,16 @@ import wqDom from '@webqit/dom';
  */
 export default function init( $params = {} ) {
 	const window = this, dom = wqDom.call( window );
+    if ( !window.wq ) { window.wq = {}; }
+    window.wq.SubscriptFunction = SubscriptFunction;
     // -------
     const params = dom.meta( 'oohtml' ).copyWithDefaults( $params, {
         script: { retention: 'retain', mimeType: '' },
-        parserParams: { ...parserParams, allowReturnOutsideFunction: false, allowSuperOutsideMethod: false, },
-        compilerParams: { ...compilerParams, globalsNoObserve: [ ...compilerParams.globalsNoObserve, 'alert' ] },
-        runtimeParams: { ...runtimeParams, apiVersion: 2, },
+        config: resolveParams( {
+            parserParams: { allowReturnOutsideFunction: false, allowSuperOutsideMethod: false },
+            compilerParams: { globalsNoObserve: [ 'alert' ] },
+            runtimeParams: { apiVersion: 2 },
+        } ),
     } );
 	params.scriptSelector = ( Array.isArray( params.script.mimeType ) ? params.script.mimeType : [ params.script.mimeType ] ).reduce( ( selector, mm ) => {
         const qualifier = mm ? `[type=${ window.CSS.escape( mm ) }]` : '';
@@ -29,7 +33,10 @@ export default function init( $params = {} ) {
     realtime.call( this, params );
 }
 
-export { Observer }
+export {
+    SubscriptFunction,
+    Observer,
+}
 
 /**
  * Performs realtime capture of elements and builds their relationships.
@@ -136,9 +143,8 @@ export function compile( script, thisContext, params = {} ) {
             }
         }
         // Let's obtain a material functions
-        let _Function;
+        let _Function, { parserParams, compilerParams, runtimeParams } = params.config;
         if ( script.contract ) {
-            let { parserParams, compilerParams, runtimeParams } = params;
             parserParams = { ...parserParams, allowAwaitOutsideFunction: script.type === 'module' };
             runtimeParams = { ...runtimeParams, async: script.type === 'module' };
             _Function = SubscriptFunction( source, { compilerParams, parserParams, runtimeParams, } );
@@ -146,8 +152,8 @@ export function compile( script, thisContext, params = {} ) {
         } else {
             const isAsync = script.type === 'module'//meta.topLevelAwait || imports.length;
             const _FunctionConstructor = isAsync ? Object.getPrototypeOf( async function() {} ).constructor : Function;
-            _Function = params.runtimeParams?.compileFunction 
-                ? params.runtimeParams.compileFunction( source )
+            _Function = runtimeParams?.compileFunction 
+                ? runtimeParams.compileFunction( source )
                 : new _FunctionConstructor( source );
             Object.defineProperty( _Function, 'originalSource', { configurable: true, value: script.textContent } );
         }

package/src/scoped-js/targets.browser.js

@@ -8,6 +8,7 @@ import init, { Observer } from './index.js';
  * @init
  */
 init.call( window );
+
 // As globals
-if ( !window.wq ) { window.wq = {}; }
-window.wq.Observer = Observer;
+if ( !self.wq ) { self.wq = {}; }
+self.wq.Observer = Observer;

package/src/targets.browser.js

@@ -8,6 +8,7 @@ import init, { Observer } from './index.js';
  * @init
  */
 init.call( window );
+
 // As globals
-if ( !window.wq ) { window.wq = {}; }
-window.wq.Observer = Observer;
+if ( !self.wq ) { self.wq = {}; }
+self.wq.Observer = Observer;