@webqit/oohtml 2.1.34 → 2.1.35

package/package.json

@@ -1,76 +1,76 @@
-{
-  "name": "@webqit/oohtml",
-  "title": "CHTML",
-  "description": "A suite of new DOM features that brings language support for modern UI development paradigms: a component-based architecture, data binding, and reactivity.",
-  "keywords": [
-    "namespaced-HTML",
-    "html-modules",
-    "ui-bindings",
-    "html-imports",
-    "reflex",
-    "subscript",
-    "scoped-js",
-    "UI",
-    "wicg-proposal"
-  ],
-  "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "2.1.34",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/webqit/oohtml.git"
-  },
-  "bugs": {
-    "url": "https://github.com/webqit/oohtml/issues"
-  },
-  "type": "module",
-  "sideEffects": false,
-  "browser": {
-    "fs": false
-  },
-  "main": "./src/index.js",
-  "scripts": {
-    "test": "mocha --extension .test.js --exit",
-    "test:coverage": "c8 --reporter=text-lcov npm run test | coveralls",
-    "build": "esbuild main=src/targets.browser.js bindings-api=src/bindings-api/targets.browser.js context-api=src/context-api/targets.browser.js namespace-api=src/namespace-api/targets.browser.js html-modules=src/html-modules/targets.browser.js html-imports=src/html-imports/targets.browser.js scoped-js=src/scoped-js/targets.browser.js scoped-css=src/scoped-css/targets.browser.js --bundle --minify --sourcemap --outdir=dist",
-    "preversion": "npm run test && npm run build && git add -A dist",
-    "postversion": "npm publish",
-    "postpublish": "git push && git push --tags"
-  },
-  "dependencies": {
-    "@webqit/observer": "^2.0.7",
-    "@webqit/realdom": "^2.1.6",
-    "@webqit/subscript": "^2.1.40",
-    "@webqit/util": "^0.8.11"
-  },
-  "devDependencies": {
-    "@webqit/oohtml-ssr": "^1.2.8",
-    "chai": "^4.3.4",
-    "coveralls": "^3.1.1",
-    "esbuild": "^0.14.43",
-    "mocha": "^10.0.0",
-    "mocha-lcov-reporter": "^1.3.0"
-  },
-  "author": "Oxford Harrison <oxharris.dev@gmail.com>",
-  "maintainers": [
-    "Oxford Harrison <oxharris.dev@gmail.com>"
-  ],
-  "contributors": [],
-  "funding": {
-    "type": "patreon",
-    "url": "https://patreon.com/ox_harris"
-  },
-  "badges": {
-    "list": [
-      "npmversion",
-      "npmdownloads"
-    ],
-    "config": {
-      "patreonUsername": "ox_harris",
-      "githubUsername": "webqit",
-      "githubRepository": "oohtml",
-      "githubSlug": "webqit/oohtml",
-      "npmPackageName": "@webqit/oohtml"
-    }
-  }
-}
+{
+  "name": "@webqit/oohtml",
+  "title": "CHTML",
+  "description": "A suite of new DOM features that brings language support for modern UI development paradigms: a component-based architecture, data binding, and reactivity.",
+  "keywords": [
+    "namespaced-HTML",
+    "html-modules",
+    "ui-bindings",
+    "html-imports",
+    "reflex",
+    "subscript",
+    "scoped-js",
+    "UI",
+    "wicg-proposal"
+  ],
+  "homepage": "https://webqit.io/tooling/oohtml",
+  "version": "2.1.35",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/webqit/oohtml.git"
+  },
+  "bugs": {
+    "url": "https://github.com/webqit/oohtml/issues"
+  },
+  "type": "module",
+  "sideEffects": false,
+  "browser": {
+    "fs": false
+  },
+  "main": "./src/index.js",
+  "scripts": {
+    "test": "mocha --extension .test.js --exit",
+    "test:coverage": "c8 --reporter=text-lcov npm run test | coveralls",
+    "build": "esbuild main=src/targets.browser.js bindings-api=src/bindings-api/targets.browser.js context-api=src/context-api/targets.browser.js namespace-api=src/namespace-api/targets.browser.js html-imports=src/html-imports/targets.browser.js scoped-js=src/scoped-js/targets.browser.js scoped-css=src/scoped-css/targets.browser.js --bundle --minify --sourcemap --outdir=dist",
+    "preversion": "npm run build && git add -A dist",
+    "postversion": "npm publish",
+    "postpublish": "git push && git push --tags"
+  },
+  "dependencies": {
+    "@webqit/observer": "^2.0.7",
+    "@webqit/realdom": "^2.1.10",
+    "@webqit/subscript": "^2.1.40",
+    "@webqit/util": "^0.8.11"
+  },
+  "devDependencies": {
+    "@webqit/oohtml-ssr": "^1.2.8",
+    "chai": "^4.3.4",
+    "coveralls": "^3.1.1",
+    "esbuild": "^0.14.43",
+    "mocha": "^10.0.0",
+    "mocha-lcov-reporter": "^1.3.0"
+  },
+  "author": "Oxford Harrison <oxharris.dev@gmail.com>",
+  "maintainers": [
+    "Oxford Harrison <oxharris.dev@gmail.com>"
+  ],
+  "contributors": [],
+  "funding": {
+    "type": "patreon",
+    "url": "https://patreon.com/ox_harris"
+  },
+  "badges": {
+    "list": [
+      "npmversion",
+      "npmdownloads"
+    ],
+    "config": {
+      "patreonUsername": "ox_harris",
+      "githubUsername": "webqit",
+      "githubRepository": "oohtml",
+      "githubSlug": "webqit/oohtml",
+      "npmPackageName": "@webqit/oohtml"
+    }
+  }
+}

package/src/bindings-api/index.js

@@ -1,84 +1,84 @@
-
-/**
- * @imports
- */
-import Observer from '@webqit/observer';
-import { _, _init } from '../util.js';
-
-/**
- * @init
- * 
- * @param Object $config
- */
-export default function init( $config = {} ) {
-    const { config, window } = _init.call( this, 'bindings-api', $config, {
-        api: { bind: 'bind', bindings: 'bindings', },
-    } );
-    window.webqit.Observer = Observer;
-    exposeAPIs.call( window, config );
-}
-
-export { Observer }
-
-/**
- * @Exports
- * 
- * The internal bindings object
- * within elements and the document object.
- */
-function getBindingsObject( node ) {
-	if ( !_( node ).has( 'bindings' ) ) {
-		const bindingsObj = Object.create( null );
-		_( node ).set( 'bindings', bindingsObj );
-	}
-	return _( node ).get( 'bindings' );
-}
-
-/**
- * Exposes Bindings with native APIs.
- *
- * @param Object config
- *
- * @return Void
- */
-function exposeAPIs( config ) {
-	const window = this;
-    // Assertions
-    if ( config.api.bind in window.document ) { throw new Error( `document already has a "${ config.api.bind }" property!` ); }
-    if ( config.api.bindings in window.document ) { throw new Error( `document already has a "${ config.api.bindings }" property!` ); }
-    if ( config.api.bind in window.Element.prototype ) { throw new Error( `The "Element" class already has a "${ config.api.bind }" property!` ); }
-    if ( config.api.bindings in window.Element.prototype ) { throw new Error( `The "Element" class already has a "${ config.api.bindings }" property!` ); }
-    // Definitions
-    Object.defineProperty( window.document, config.api.bind, { value: function( bindings, config = {} ) {
-        return applyBindings( window.document, bindings, config );
-    } });
-    Object.defineProperty( window.document, config.api.bindings, { get: function() {
-        return Observer.proxy( getBindingsObject( window.document ) );
-    } });
-    Object.defineProperty( window.Element.prototype, config.api.bind, { value: function( bindings, config = {} ) {
-        return applyBindings( this, bindings, config );
-    } });
-    Object.defineProperty( window.Element.prototype, config.api.bindings, { get: function() {
-        return Observer.proxy( getBindingsObject( this ) );
-    } } );
-}
-
-/**
- * Exposes Bindings with native APIs.
- *
- * @param document|Element  target
- * @param Object            bindings
- * @param Object            params
- *
- * @return Void
- */
-function applyBindings( target, bindings, { merge, diff, namespace } = {} ) {
-    const bindingsObj = getBindingsObject( target );
-    const $params = { diff, namespace };
-    if ( merge ) return Observer.set( bindingsObj, bindings, $params );;
-    const exitingKeys = Observer.ownKeys( bindingsObj, $params ).filter( key => !( key in bindings ) );
-    return Observer.batch( bindingsObj, () => {
-        if ( exitingKeys.length ) { Observer.deleteProperty( bindingsObj, exitingKeys, $params ); }
-        return Observer.set( bindingsObj, bindings, $params );
-    }, $params );
+
+/**
+ * @imports
+ */
+import Observer from '@webqit/observer';
+import { _, _init } from '../util.js';
+
+/**
+ * @init
+ * 
+ * @param Object $config
+ */
+export default function init( $config = {} ) {
+    const { config, window } = _init.call( this, 'bindings-api', $config, {
+        api: { bind: 'bind', bindings: 'bindings', },
+    } );
+    window.webqit.Observer = Observer;
+    exposeAPIs.call( window, config );
+}
+
+export { Observer }
+
+/**
+ * @Exports
+ * 
+ * The internal bindings object
+ * within elements and the document object.
+ */
+function getBindingsObject( node ) {
+	if ( !_( node ).has( 'bindings' ) ) {
+		const bindingsObj = Object.create( null );
+		_( node ).set( 'bindings', bindingsObj );
+	}
+	return _( node ).get( 'bindings' );
+}
+
+/**
+ * Exposes Bindings with native APIs.
+ *
+ * @param Object config
+ *
+ * @return Void
+ */
+function exposeAPIs( config ) {
+	const window = this;
+    // Assertions
+    if ( config.api.bind in window.document ) { throw new Error( `document already has a "${ config.api.bind }" property!` ); }
+    if ( config.api.bindings in window.document ) { throw new Error( `document already has a "${ config.api.bindings }" property!` ); }
+    if ( config.api.bind in window.Element.prototype ) { throw new Error( `The "Element" class already has a "${ config.api.bind }" property!` ); }
+    if ( config.api.bindings in window.Element.prototype ) { throw new Error( `The "Element" class already has a "${ config.api.bindings }" property!` ); }
+    // Definitions
+    Object.defineProperty( window.document, config.api.bind, { value: function( bindings, config = {} ) {
+        return applyBindings( window.document, bindings, config );
+    } });
+    Object.defineProperty( window.document, config.api.bindings, { get: function() {
+        return Observer.proxy( getBindingsObject( window.document ) );
+    } });
+    Object.defineProperty( window.Element.prototype, config.api.bind, { value: function( bindings, config = {} ) {
+        return applyBindings( this, bindings, config );
+    } });
+    Object.defineProperty( window.Element.prototype, config.api.bindings, { get: function() {
+        return Observer.proxy( getBindingsObject( this ) );
+    } } );
+}
+
+/**
+ * Exposes Bindings with native APIs.
+ *
+ * @param document|Element  target
+ * @param Object            bindings
+ * @param Object            params
+ *
+ * @return Void
+ */
+function applyBindings( target, bindings, { merge, diff, namespace } = {} ) {
+    const bindingsObj = getBindingsObject( target );
+    const $params = { diff, namespace };
+    if ( merge ) return Observer.set( bindingsObj, bindings, $params );;
+    const exitingKeys = Observer.ownKeys( bindingsObj, $params ).filter( key => !( key in bindings ) );
+    return Observer.batch( bindingsObj, () => {
+        if ( exitingKeys.length ) { Observer.deleteProperty( bindingsObj, exitingKeys, $params ); }
+        return Observer.set( bindingsObj, bindings, $params );
+    }, $params );
 }

package/src/bindings-api/targets.browser.js

@@ -1,10 +1,10 @@
-
-/**
- * @imports
- */
-import init from './index.js';
-
-/**
- * @init
- */
-init.call( window );
+
+/**
+ * @imports
+ */
+import init from './index.js';
+
+/**
+ * @init
+ */
+init.call( window );

package/src/context-api/HTMLContext.js

@@ -1,158 +1,77 @@
-
-/**
- * @imports
- */
-import { _compare } from '../util.js';
-import HTMLContextManager from './HTMLContextManager.js';
-
-export default class HTMLContext {
-
-    /**
-     * @config
-     */
-    static get config() {
-        return {};
-    }
-
-    /**
-     * @attachTo
-     */
-    static attachTo( host, Id, multiple = false ) {
-        let instance, contextMgr = HTMLContextManager.instance( host );
-        if ( !multiple && ( instance = contextMgr.find( cx => this.matchRequest( cx.id, Id, true ) ) ) ) return instance;
-        return contextMgr.attach( new this( Id ) );
-    }
-
-    /**
-     * @detachFrom
-     */
-    static detachFrom( host, Id, multiple = false ) {
-        let instance, contextMgr = HTMLContextManager.instance( host );
-        for ( instance of contextMgr[ '#' ].contexts ) {
-            if ( !this.matchRequest( instance.id, Id, true ) || ( typeof multiple === 'function' && !multiple( instance ) ) ) continue;
-            contextMgr.detach( instance );
-            if ( typeof multiple !== 'function' && !multiple ) return instance;
-        }
-    }
- 
-    /**
-     * @createId
-     */
-    static createId( host, fields = {} ) {
-        const id = { type: 'HTMLModules', ...fields };
-        if ( id.name ) return id;
-        if ( host.getAttribute && !( id.name = ( host.getAttribute( this.config.context.attr.contextname ) || '' ).trim() ) ) {
-            delete id.name;
-        } else if ( !host.ownerDocument ) {
-            id.name = 'root';
-        }
-        return id;
-    }
- 
-    /**
-     * @createRequest
-     */
-    static createRequest( fields = {} ) {
-        return { ...fields };
-    }
-
-    /**
-     * @matchesRequest
-     */
-    static matchRequest( id, request, strict = false ) {
-        if ( strict ) return _compare( id, request, 1, true );
-        return request.type === id.type && !request.name || request.name === id.name;
-    }
-
-    /**
-     * @constructor
-     */
-    constructor( id ) {
-        Object.defineProperty( this, 'id', { get: () => id } );
-        Object.defineProperty( this, 'subscriptions', { value: new Set } );
-    }
-
-    /**
-     * @length()
-     */
-    get length() {
-        this.subscriptions.size;
-    }
-
-    /**
-     * @handle()
-     */
-    handle( event ) {}
-
-    /**
-     * @subscribe()
-     */
-    subscribe( event ) {
-        this.subscriptions.add( event );
-        if ( !event.request.signal ) return;
-        event.request.signal.addEventListener( 'abort', () => {
-            this.unsubscribe( event );
-        } );
-    }
-
-    /**
-     * @unsubscribe()
-     */
-    unsubscribe( event ) {
-        this.subscriptions.delete( event );
-        event.request.controller?.abort();
-    }
-
-    /**
-     * @handleEvent()
-     */
-    handleEvent( event ) {
-        if ( this.disposed || ( event.target === this.host && event.request?.superContextOnly )
-        || !event.request || typeof event.callback !== 'function' || !this.constructor.matchRequest( this.id, event.request ) ) return;
-        event.stopPropagation();
-        if ( event.type === 'contextclaim' ) {
-            const claims = new Set;
-            this.subscriptions.forEach( subscriptionEvent => {
-                if ( !event.target.contains( subscriptionEvent.request.superContextOnly ? subscriptionEvent.target.parentNode : subscriptionEvent.target ) 
-                || !this.constructor.matchRequest( event.request/*provider ID*/, subscriptionEvent.request/*request ID*/ ) ) return;
-                this.subscriptions.delete( subscriptionEvent );
-                claims.add( subscriptionEvent );
-            } );
-            event.respondWith( claims );
-        } else if ( event.type === 'contextrequest' ) {
-            if ( event.request.live ) { this.subscribe( event ); }
-            this.handle( event );
-        }
-    }
-
-    /**
-     * @initialize()
-     */
-    initialize( host ) {
-        this.host = host;
-        this.disposed = false;
-        host.addEventListener( 'contextrequest', this );
-        host.addEventListener( 'contextclaim', this );
-        HTMLContextManager.instance( host ).ask( { ...this.id, superContextOnly: true }, claims => claims.forEach( subscriptionEvent => {
-            this.subscribe( subscriptionEvent );
-            this.handle( subscriptionEvent );
-        } ), { type: 'contextclaim' } );
-        return this;
-    }
-     
-    /**
-     * @dispose()
-     */
-    dispose( host ) {
-        this.disposed = true;
-        host.removeEventListener( 'contextrequest', this );
-        host.removeEventListener( 'contextclaim', this );
-        this.subscriptions.forEach( subscriptionEvent => {
-            this.unsubscribe( subscriptionEvent );
-            const { target, request, callback, params } = subscriptionEvent;
-            HTMLContextManager.instance( target ).ask( request, callback, params );
-        } );
-        return this;
-    }
-
+
+/**
+ * @imports
+ */
+import _ContextRequestEvent from './_ContextRequestEvent.js';
+import { _ } from '../util.js';
+
+export default class HTMLContext {
+
+    /**
+     * @instance
+     */
+    static instance( host ) {
+        return _( host ).get( 'context::instance' ) || new this( host );;
+    }
+
+    /**
+     * @constructor
+     */
+    constructor( host ) {
+        _( host ).get( `context::instance` )?.dispose();
+        _( host ).set( `context::instance`, this );
+        const priv = { host, contexts: new Set };
+        Object.defineProperty( this, '#', { get: () => priv } );
+        const ContextRequestEvent = _ContextRequestEvent.call( host.ownerDocument?.defaultView || host.defaultView );
+        Object.defineProperty( this, 'ContextRequestEvent', { get: () => ContextRequestEvent } );
+        this[ Symbol.iterator ] = function*() {
+            const it = priv.contexts[ Symbol.iterator ]();
+            yield it.next().value;
+        }
+    }
+
+    /**
+     * @length()
+     */
+    get length() {
+        this[ '#' ].contexts.size;
+    }
+
+    /**
+     * @find()
+     */
+    findProvider( callback ) {
+        return [ ...this[ '#' ].contexts ].find( callback );
+    }
+
+    /**
+     * @attachProvider()
+     */
+    attachProvider( context ) {
+        this[ '#' ].contexts.add( context );
+        context.initialize( this[ '#' ].host );
+    }
+
+    /**
+     * @detachProvider()
+     */
+    detachProvider( context ) {
+        context.dispose( this[ '#' ].host );
+        this[ '#' ].contexts.delete( context );
+    }
+
+    /**
+     * @request()
+     */
+    request( request, callback, options = {} ) {
+        return this[ '#' ].host.dispatchEvent(
+            new this.ContextRequestEvent( request, callback, { bubbles: true, ...options } )
+        );
+    }
+
+    /**
+     * @dispose()
+     */
+    dispose() {}
+
 }