@webqit/oohtml 1.9.16 → 1.9.19

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "1.9.16",
+  "version": "1.9.19",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -40,7 +40,7 @@
   "dependencies": {
     "@webqit/browser-pie": "^0.0.17",
     "@webqit/observer": "^1.7.5",
-    "@webqit/subscript": "^2.0.26",
+    "@webqit/subscript": "^2.1.4",
     "@webqit/util": "^0.8.7",
     "acorn": "^8.7.0"
   },

package/src/html-imports/browser-entry.js

@@ -7,4 +7,4 @@ import init from './index.js';
 /**
  * @init
  */
-init.call(window);
+init.call( window );

package/src/html-imports/index.js

@@ -21,13 +21,13 @@ import { config, scopeQuery,
  *  
  * @param Object config
  */
-export default function init(_config = null, onDomReady = false) {
+export default function init( _config = {} ) {
 
-    const WebQit = domInit.call(this);
-    if (onDomReady) {
-        WebQit.DOM.ready(() => {
-            init.call(this, _config, false);
-        });
+    const WebQit = domInit.call( this );
+    if ( _config.onDomReady ) {
+        WebQit.DOM.ready( () => {
+            init.call( this, { ..._config, onDomReady: false } );
+        } );
         return;
     }
 
@@ -44,7 +44,7 @@ export default function init(_config = null, onDomReady = false) {
             importid: 'name',
             exportsearch: 'exportsearch',
         },
-    }, _config);
+    }, _config.params );
 
     _defaultNoInherits.push(_meta.get('attr.importid'), _meta.get('attr.moduleref'));
     const modulerefSelector = '[' + window.CSS.escape(_meta.get('attr.moduleref')) + ']';

package/src/html-modules/browser-entry.js

@@ -7,4 +7,4 @@ import init from './index.js';
 /**
  * @init
  */
-init.call(window);
+init.call( window );

package/src/html-modules/index.js

@@ -19,13 +19,13 @@ import { config, scopeQuery } from '../util.js';
  * 
  * @param Object config
  */
-export default function init(_config = null, onDomReady = false) {
+export default function init( _config = {} ) {
 
-    const WebQit = domInit.call(this);
-    if (onDomReady) {
-        WebQit.DOM.ready(() => {
-            init.call(this, _config, false);
-        });
+    const WebQit = domInit.call( this );
+    if ( _config.onDomReady ) {
+        WebQit.DOM.ready( () => {
+            init.call( this, { ..._config, onDomReady: false } );
+        } );
         return;
     }
 
@@ -51,7 +51,7 @@ export default function init(_config = null, onDomReady = false) {
             exports: 'exports',
             moduleref: 'template',
         },
-    }, _config);
+    }, _config.params );
 
     const templateSelector = 'template' + (_meta.get('element.template') ? '[is="' + _meta.get('element.template') + '"]' : '') + '[' + window.CSS.escape(_meta.get('attr.moduleid')) + ']';
     var TemplateElementClass = window.HTMLTemplateElement;

package/src/index.js

@@ -13,7 +13,7 @@ import Subscript from './subscript/index.js';
 /**
  * @init
  */
-export default function init(config = null, onDomReady = false) {
+export default function init(configs = {}) {
 
     const WebQit = domInit.call(this);
     if (WebQit.OOHTML) {
@@ -21,11 +21,11 @@ export default function init(config = null, onDomReady = false) {
     }
     WebQit.OOHTML = {};
     // --------------
-    HTMLModules.call(this, config, onDomReady);
-    HTMLImports.call(this, config, onDomReady);
-    NamespacedHTML.call(this, config, onDomReady);
-    StateAPI.call(this, config, onDomReady);
-    Subscript.call(this, config, onDomReady);
+    HTMLModules.call(this, (configs.HTMLModules || {}));
+    HTMLImports.call(this, (configs.HTMLImports || {}));
+    NamespacedHTML.call(this, (configs.NamespacedHTML || {}));
+    StateAPI.call(this, (configs.StateAPI || {}));
+    Subscript.call(this, (configs.Subscript || {}));
     // --------------
     WebQit.Observer = Observer;
 

package/src/namespaced-html/browser-entry.js

@@ -7,4 +7,4 @@ import init from './index.js';
 /**
  * @init
  */
-init.call(window);
+init.call( window );

package/src/namespaced-html/index.js

@@ -19,13 +19,13 @@ import { config } from '../util.js';
  * 
  * @param Object config
  */
-export default function init(_config = null, onDomReady = false) {
+export default function init( _config = {} ) {
 
-    const WebQit = domInit.call(this);
-    if (onDomReady) {
-        WebQit.DOM.ready(() => {
-            init.call(this, _config, false);
-        });
+    const WebQit = domInit.call( this );
+    if ( _config.onDomReady ) {
+        WebQit.DOM.ready( () => {
+            init.call( this, { ..._config, onDomReady: false } );
+        } );
         return;
     }
 
@@ -43,7 +43,7 @@ export default function init(_config = null, onDomReady = false) {
             namespace: 'namespace',
         },
 		eagermode: true,
-    }, _config);
+    }, _config.params );
 	
     const getNamespaceObject = function(subject) {
         if (!_internals(subject, 'oohtml').has('namespace')) {

package/src/state-api/browser-entry.js

@@ -7,4 +7,4 @@ import init from './index.js';
 /**
  * @init
  */
-init.call(window);
+init.call( window );

package/src/state-api/index.js

@@ -19,13 +19,13 @@ import { config } from '../util.js';
  * 
  * @param Object config
  */
-export default function init(_config = null, onDomReady = false) {
+export default function init( _config = {} ) {
 
-    const WebQit = domInit.call(this);
-    if (onDomReady) {
-        WebQit.DOM.ready(() => {
-            init.call(this, _config, false);
-        });
+    const WebQit = domInit.call( this );
+    if ( _config.onDomReady ) {
+        WebQit.DOM.ready( () => {
+            init.call( this, { ..._config, onDomReady: false } );
+        } );
         return;
     }
 
@@ -34,7 +34,7 @@ export default function init(_config = null, onDomReady = false) {
 
     const _meta = config.call(this, {
         api: {state: 'state', setState: 'setState', clearState: 'clearState',},
-    }, _config);
+    }, _config.params );
 
     const getOrCreateState = function(subject, newStateObject = null) {
         if (!_internals(subject, 'oohtml').has('state') || newStateObject) {

package/src/subscript/Element.js

@@ -21,17 +21,13 @@ export const Element  = BaseElement => class extends SubscriptClass( BaseElement
         return { globalsAutoObserve: [ 'document' ] };
     }
 
-    static get subscriptMethods() {
-        return [];
-    }
-
     static expose( element, subscriptFunction ) {
-        let subscripts = _internals( element, 'oohtml', 'subscripts' );
+        let subscriptInstances = _internals( element, 'oohtml', 'subscript', 'instances' );
         let id = subscriptFunction.name;
         if ( !id ) {
-            id = [ ...subscripts.keys() ].filter( k => _isNumeric( k ) ).length;
+            id = [ ...subscriptInstances.keys() ].filter( k => _isNumeric( k ) ).length;
         }
-        subscripts.set( id, subscriptFunction );
+        subscriptInstances.set( id, subscriptFunction );
         return subscriptFunction;
     }
     
@@ -43,7 +39,7 @@ export const Element  = BaseElement => class extends SubscriptClass( BaseElement
 
     static implementScript( script, element ) {
         let source = ( script.textContent || '' ).trim();
-        return this.expose( element, SubscriptFunction.call( element, source ) );
+        return this.expose( element, SubscriptFunction.call( element, source, { compilerParams: this.compilerParams, runtimeParams: this.runtimeParams } ) );
     }
 
     /**
@@ -51,9 +47,9 @@ export const Element  = BaseElement => class extends SubscriptClass( BaseElement
      */
     static doConnectedCallback( instance ) {
         if ( ( typeof WebQit === 'undefined' ) || !WebQit.Observer ) return;
-        const subscripts = _internals( instance, 'oohtml', 'subscripts' );
+        const subscriptInstances = _internals( instance, 'oohtml', 'subscript', 'instances' );
         const signals = ( mutations, evt, namespace = [] ) => {
-            subscripts.forEach( api => api.thread( ...mutations.map( mu => namespace.concat( mu.path ) ) ) );
+            subscriptInstances.forEach( api => api.thread( ...mutations.map( mu => namespace.concat( mu.path ) ) ) );
         };
         ( this.subscriptParams.globalsAutoObserve || [] ).forEach( identifier => {
             WebQit.Observer.observe( globalThis[ identifier ], mutations => signals( mutations, null, [ identifier ] ), { 
@@ -100,8 +96,8 @@ export const Element  = BaseElement => class extends SubscriptClass( BaseElement
         }
     }
 
-    get subscripts() {
-        return _internals( this, 'oohtml', 'subscripts' );
+    get subscript() {
+        return _internals( this, 'oohtml', 'subscript', 'instances' );
     }
 
 }

package/src/subscript/index.js

@@ -12,12 +12,12 @@ import { config } from '../util.js';
  * 
  * @param Object config
  */
-export default function init( _config = null, onDomReady = false ) {
+export default function init( _config = {} ) {
 
     const WebQit = domInit.call( this );
-    if ( onDomReady ) {
+    if ( _config.onDomReady ) {
         WebQit.DOM.ready( () => {
-            init.call( this, _config, false );
+            init.call( this, { ..._config, onDomReady: false } );
         } );
         return;
     }
@@ -27,27 +27,36 @@ export default function init( _config = null, onDomReady = false ) {
         selectors: { script: 'script[type="subscript"]', },
         api: { bind: 'bind', unbind: 'unbind', },
         script: {},
-    }, _config );
+    }, _config.params );
 
-    const subscriptElement = Element( class {} );
+    const ContextifiableElement = BaseElement => class extends Element( BaseElement ) {
+        static get compilerParams() {
+            return _config.compilerParams || {};
+        }
+        static get runtimeParams() {
+            return _config.runtimeParams || {};
+        }
+    };
+    
+    const SubscriptElement = ContextifiableElement();
     mutations.onPresent( _meta.get('selectors.script'), scriptElement => {
 
         let ownerNode = scriptElement.parentNode;
         if ( !ownerNode ) return;
-        let embeds = _internals( ownerNode, 'oohtml', 'subscript' ).get( 'embeds' );
-        if ( !embeds ) {
-            embeds = new WeakSet;
-            _internals( ownerNode, 'oohtml', 'subscript' ).set( 'embeds', embeds );
+        let scriptTags = _internals( ownerNode, 'oohtml', 'subscript' ).get( 'script-tags' );
+        if ( !scriptTags ) {
+            scriptTags = new WeakSet;
+            _internals( ownerNode, 'oohtml', 'subscript' ).set( 'script-tags', scriptTags );
         }
-        if ( embeds.has( scriptElement ) ) return;
+        if ( scriptTags.has( scriptElement ) ) return;
 
-        subscriptElement.implementScript( scriptElement, ownerNode )();
-        subscriptElement.doConnectedCallback( ownerNode );
-        embeds.add( scriptElement );
+        SubscriptElement.implementScript( scriptElement, ownerNode )();
+        SubscriptElement.doConnectedCallback( ownerNode );
+        scriptTags.add( scriptElement );
 
         let mo = mutations.onRemoved( ownerNode, () => {
-            subscriptElement.doDisconnectedCallback( ownerNode );
-            embeds.delete( scriptElement );
+            SubscriptElement.doDisconnectedCallback( ownerNode );
+            scriptTags.delete( scriptElement );
             mo.disconnect();
         }, { ignoreTransients: true });
 
@@ -56,6 +65,6 @@ export default function init( _config = null, onDomReady = false ) {
     if (!WebQit.OOHTML) {
         WebQit.OOHTML = {};
     }
-    WebQit.OOHTML.SubscriptElement = Element;
+    WebQit.OOHTML.SubscriptElement = ContextifiableElement;
 
 }