@webqit/oohtml 1.9.10 → 1.9.13

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "1.9.10",
+  "version": "1.9.13",
   "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.18",
+    "@webqit/subscript": "^2.0.19",
     "@webqit/util": "^0.8.7",
     "acorn": "^8.7.0"
   },

package/src/index.js

@@ -3,13 +3,12 @@
  * @imports
  */
 import Observer from '@webqit/observer';
-import * as Subscript from '@webqit/subscript';
 import domInit from '@webqit/browser-pie/src/dom/index.js';
 import HTMLModules from './html-modules/index.js';
 import HTMLImports from './html-imports/index.js';
 import NamespacedHTML from './namespaced-html/index.js';
 import StateAPI from './state-api/index.js';
-import HTMLSubscript from './subscript/index.js';
+import Subscript from './subscript/index.js';
 
 /**
  * @init
@@ -26,10 +25,9 @@ export default function init(config = null, onDomReady = false) {
     HTMLImports.call(this, config, onDomReady);
     NamespacedHTML.call(this, config, onDomReady);
     StateAPI.call(this, config, onDomReady);
-    HTMLSubscript.call(this, config, onDomReady);
+    Subscript.call(this, config, onDomReady);
     // --------------
     WebQit.Observer = Observer;
-    WebQit.Subscript = Subscript;
 
 }
 
@@ -38,5 +36,4 @@ export default function init(config = null, onDomReady = false) {
  */
 export {
     Observer,
-    Subscript,
 }

package/src/subscript/Element.js

@@ -2,8 +2,8 @@
 /**
  * @imports
  */
+import { SubscriptFunction, SubscriptClass } from '@webqit/subscript';
 import { _internals, _isNumeric, _isFunction } from '@webqit/util/js/index.js';
-import Subscript from '@webqit/subscript';
 
 /**
  * ---------------------------
@@ -11,7 +11,7 @@ import Subscript from '@webqit/subscript';
  * ---------------------------
  */
 
-export const Element  = BaseElement => class extends BaseElement {
+export const Element  = BaseElement => class extends SubscriptClass( BaseElement ) {
 
     /**
      * @subscript Element
@@ -22,10 +22,10 @@ export const Element  = BaseElement => class extends BaseElement {
     }
 
     static get subscriptMethods() {
-        return [ 'render' ];
+        return [];
     }
 
-    static implement( element, subscriptFunction ) {
+    static expose( element, subscriptFunction ) {
         let subscripts = _internals( element, 'oohtml', 'subscripts' );
         let id = subscriptFunction.name;
         if ( !id ) {
@@ -35,16 +35,15 @@ export const Element  = BaseElement => class extends BaseElement {
         return subscriptFunction;
     }
     
-    static implementScript( element, script ) {
-        let source = ( script.textContent || '' ).trim();
-        return this.implement( element, Subscript.call( element, source ) );
+
+    static implementMethod( method, element ) {
+        let subscriptFunction = super.implementMethod( method, element );
+        return this.expose( element, subscriptFunction );
     }
-    
-    static implementMethod( element, method ) {
-        if ( method.name === 'constructor' ) {
-            throw new Error(`Constructors cannot be subscript methods.`);
-        }
-       return this.implement( element, Subscript.clone( method, element ) );
+
+    static implementScript( script, element ) {
+        let source = ( script.textContent || '' ).trim();
+        return this.expose( element, SubscriptFunction.call( element, source ) );
     }
 
     /**
@@ -81,19 +80,6 @@ export const Element  = BaseElement => class extends BaseElement {
         } );
     }
 
-    /**
-     * @constructor()
-     */
-    constructor() {
-        super();
-        const subscriptConstructor = this.constructor;
-        subscriptConstructor.subscriptMethods.forEach( methodName => {
-            if ( !this[ methodName ] ) return;
-            let proxy = subscriptConstructor.implementMethod( this, this[ methodName ] );
-            this[ methodName ] = proxy;
-        } );
-    }
-
     /**
      * @connectedCallback()
      */
@@ -118,10 +104,4 @@ export const Element  = BaseElement => class extends BaseElement {
         return _internals( this, 'oohtml', 'subscripts' );
     }
 
-    /**
-     * @render()
-     */
-
-    render() {}
-
 }

package/src/subscript/index.js

@@ -53,6 +53,9 @@ export default function init( _config = null, onDomReady = false ) {
 
     } );
 
-    WebQit.SubscriptElement = Element;
+    if (!WebQit.OOHTML) {
+        WebQit.OOHTML = {};
+    }
+    WebQit.OOHTML.SubscriptElement = Element;
 
 }