be-hive 0.0.221 → 0.0.223

package/Registry.js

@@ -1,4 +1,4 @@
-import { registeredHandlers, scopedHandlers } from './be-hive.js';
+import { registeredHandlers } from './be-hive.js';
 export class Registry {
     static register(emc, handlerName, handler) {
         const cluster = registeredHandlers.get(emc);
@@ -8,12 +8,4 @@ export class Registry {
         }
         customHandlers.set(handlerName, handler);
     }
-    static within(emc, q, handlerName, handler) {
-        const scopedCluster = scopedHandlers.get(emc);
-        const scopedCustomHandlers = scopedCluster.get(emc.handlerKey);
-        if (!scopedCustomHandlers.has(handlerName)) {
-            scopedCustomHandlers.set(handlerName, []);
-        }
-        scopedCustomHandlers.get(handlerName).push([q, handler]);
-    }
 }

package/Registry.ts

@@ -1,5 +1,5 @@
-import {EMC, EventListenerOrFn} from './ts-refs/trans-render/be/types';
-import {registeredHandlers, scopedHandlers} from './be-hive.js';
+import {EMC, EventListenerOrFn, OnOptions} from './ts-refs/trans-render/be/types';
+import {registeredHandlers} from './be-hive.js';
 import { CSSQuery } from './ts-refs/trans-render/types';
 
 export class Registry{
@@ -12,13 +12,4 @@ export class Registry{
         customHandlers.set(handlerName, handler);
     }
 
-    static within(emc: EMC, q: CSSQuery,  handlerName: string, handler: EventListenerOrFn){
-        const scopedCluster = scopedHandlers.get(emc)!;
-        const scopedCustomHandlers = scopedCluster.get(emc.handlerKey!)!;
-        if(!scopedCustomHandlers.has(handlerName)){
-            scopedCustomHandlers.set(handlerName, []);
-        }
-        scopedCustomHandlers!.get(handlerName)!.push([q, handler]);
-    }
-
 }

package/be-hive.js

@@ -25,7 +25,7 @@ export const defaultObsAttrs = {
     enhancedElementInstanceOf: [Element]
 };
 export const registeredHandlers = new Map();
-export const scopedHandlers = new Map();
+//export const scopedHandlers = new Map<EMC, ScopedCustomHandlerCluster>();
 export function seed(emc) {
     if (emc.handlerKey === undefined)
         emc.handlerKey = emc.enhPropKey;
@@ -38,13 +38,6 @@ export function seed(emc) {
     if (!cluster?.has(handlerKey)) {
         cluster.set(handlerKey, new Map());
     }
-    if (!scopedHandlers.has(emc)) {
-        scopedHandlers.set(emc, new Map());
-    }
-    const scopedCluster = scopedHandlers.get(emc);
-    if (!scopedCluster?.has(handlerKey)) {
-        scopedCluster.set(handlerKey, new Map());
-    }
     try {
         Enhancers.define(emc);
     }
@@ -63,7 +56,7 @@ export class BeHive extends Synthesizer {
         const mergeWithDefaults = { ...defaultObsAttrs, ...synConfig };
         //TODO allow for programmatic adjustments in load event
         //this.dispatchEvent(new RegistryEventImpl(mergeWithDefaults));
-        const { base, block, branches, enhancedElementInstanceOf, enhancedElementMatches, hostInstanceOf, hostMatches, leaves, preBaseDelimiter, preBranchDelimiter, importEnh, preLeafDelimiter, hasRootIn, map, osotas, mapLocalNameTo } = mergeWithDefaults;
+        const { base, block, branches, enhancedElementInstanceOf, enhancedElementMatches, hostInstanceOf, hostMatches, leaves, preBaseDelimiter, preBranchDelimiter, importEnh, preLeafDelimiter, hasRootIn, map, osotas, mapLocalNameTo, ws } = mergeWithDefaults;
         const mi = {
             on: enhancedElementMatches,
             whereInstanceOf: enhancedElementInstanceOf,
@@ -83,6 +76,7 @@ export class BeHive extends Synthesizer {
         super.activate(mose);
         const mo = mose.observer;
         mo.addEventListener('mount', async (e) => {
+            const observedAttrs = await mo.observedAttrs();
             const { mountedElement } = e;
             const { beEnhanced } = mountedElement;
             const enhancementConstructor = await importEnh();
@@ -133,12 +127,16 @@ export class BeHive extends Synthesizer {
                 initialPropValues[mapLocalNameTo] = mountedElement.localName;
             }
             initialPropValues.customHandlers = registeredHandlers.get(synConfig.top)?.get(enhPropKey);
-            const tbd = initialPropValues.scopedCustomHandlers = scopedHandlers.get(synConfig.top)?.get(enhPropKey);
+            if (ws !== undefined) {
+                (await import('./e.js')).e(mountedElement, ws);
+            }
+            //initialPropValues.scopedCustomHandlers = scopedHandlers.get(synConfig.top)?.get(enhPropKey);
             enhancementInstance.attach(mountedElement, {
                 initialAttrInfo,
                 initialPropValues,
                 mountCnfg: mergeWithDefaults,
-                synConfig
+                synConfig,
+                observedAttrs
             });
         });
     }

package/be-hive.ts

@@ -2,7 +2,10 @@ import {Synthesizer} from 'mount-observer/Synthesizer.js';
 import { AddMountEventListener, MountInit, MOSE, MOSEAddedProps} from './ts-refs/mount-observer/types';
 export {EMC} from './ts-refs/trans-render/be/types';
 export {MountObserver, MOSE} from 'mount-observer/MountObserver.js';
-import {AttrMapPoint, CustomHandlerCluster, EMC, EventListenerOrFn, HandlerKey, ScopedCustomHandlerCluster} from './ts-refs/trans-render/be/types';
+import {
+    AttrMapPoint, CustomHandlerCluster, EMC, EventListenerOrFn,  
+    HandlerKey, 
+} from './ts-refs/trans-render/be/types';
 import { MountEvent } from 'mount-observer/MountObserver';
 import 'be-enhanced/beEnhanced.js';
 import { BeEnhanced, Enhancers } from 'be-enhanced/beEnhanced.js';
@@ -37,7 +40,8 @@ export const defaultObsAttrs: Partial<EMC> = {
 
 export const registeredHandlers = new Map<EMC, CustomHandlerCluster>();
 
-export const scopedHandlers = new Map<EMC, ScopedCustomHandlerCluster>();
+//export const scopedHandlers = new Map<EMC, ScopedCustomHandlerCluster>();
+
 
 export function seed(emc: EMC){
     if(emc.handlerKey === undefined) emc.handlerKey = emc.enhPropKey;
@@ -50,13 +54,8 @@ export function seed(emc: EMC){
     if(!cluster?.has(handlerKey)){
         cluster!.set(handlerKey, new Map());
     }
-    if(!scopedHandlers.has(emc)){
-        scopedHandlers.set(emc, new Map());
-    }
-    const scopedCluster = scopedHandlers.get(emc);
-    if(!scopedCluster?.has(handlerKey)){
-        scopedCluster!.set(handlerKey, new Map())
-    }
+
+
     try{
         Enhancers.define(emc);
     }catch(e){}
@@ -80,7 +79,7 @@ export class BeHive extends Synthesizer {
             enhancedElementMatches, hostInstanceOf, hostMatches,
             leaves, preBaseDelimiter, preBranchDelimiter, importEnh,
             preLeafDelimiter, hasRootIn, map, osotas,
-            mapLocalNameTo
+            mapLocalNameTo, ws
             
         } = mergeWithDefaults;
         const mi: MountInit = {
@@ -103,6 +102,7 @@ export class BeHive extends Synthesizer {
         super.activate(mose);
         const mo = mose.observer;
         (mo as any as AddMountEventListener).addEventListener('mount', async e => {
+            const observedAttrs = await mo.observedAttrs();
             const {mountedElement} = (e as MountEvent);
             const {beEnhanced} : {beEnhanced: BeEnhanced} = (<any>mountedElement);
             const enhancementConstructor = await importEnh!();
@@ -148,12 +148,17 @@ export class BeHive extends Synthesizer {
                 initialPropValues[mapLocalNameTo] = mountedElement.localName;
             }
             initialPropValues.customHandlers = registeredHandlers.get(synConfig.top)?.get(enhPropKey);
-            const tbd = initialPropValues.scopedCustomHandlers = scopedHandlers.get(synConfig.top)?.get(enhPropKey);
+
+            if(ws !== undefined){
+                (await import('./e.js')).e(mountedElement, ws);
+            }
+            //initialPropValues.scopedCustomHandlers = scopedHandlers.get(synConfig.top)?.get(enhPropKey);
             enhancementInstance.attach(mountedElement, {
                 initialAttrInfo,
                 initialPropValues,
                 mountCnfg: mergeWithDefaults,
-                synConfig
+                synConfig,
+                observedAttrs
             });
         });
     }

package/e.js

@@ -0,0 +1,14 @@
+export function e(matchingElement, ws, ac) {
+    for (const w of ws) {
+        if (!matchingElement.matches(w.q))
+            continue;
+        const { listeners } = w;
+        for (const key in listeners) {
+            let listener = listeners[key];
+            if (listener.toString().substring(0, 5) === 'class') {
+                listener = new listener();
+            }
+            matchingElement.addEventListener(key, listener, { signal: ac?.signal });
+        }
+    }
+}

package/e.ts

@@ -0,0 +1,16 @@
+import { EventListenerClass, EventListenerOrFn, IW } from "./ts-refs/trans-render/be/types";
+
+export function e(matchingElement: Element, ws: Array<IW>, ac?: AbortController){
+    for(const w of ws){
+        if(!matchingElement.matches(w.q)) continue;
+        const {listeners} = w;
+        for(const key in listeners){
+            let listener = listeners[key] as any;
+            if(listener.toString().substring(0, 5) === 'class'){
+                listener = new (<EventListenerClass>listener)() as any as EventListenerOrFn;
+            }
+            matchingElement.addEventListener(key, listener, {signal: ac?.signal});
+            
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "be-hive",
-  "version": "0.0.221",
+  "version": "0.0.223",
   "keywords": [
     "web-components",
     "web-component",
@@ -29,7 +29,11 @@
     },
     "./Registry.js": {
       "default": "./Registry.js",
-      "types": "./Registry.js"
+      "types": "./Registry.Ts"
+    },
+    "./w.js": {
+      "default": "./w.js",
+      "types": "./w.ts"
     }
   },
   "files": [
@@ -41,9 +45,9 @@
     "update": "ncu -u && npm install"
   },
   "dependencies": {
-    "be-enhanced": "0.0.144",
-    "mount-observer": "0.0.36",
-    "trans-render": "0.0.843"
+    "be-enhanced": "0.0.146",
+    "mount-observer": "0.0.38",
+    "trans-render": "0.0.847"
   },
   "devDependencies": {
     "may-it-serve": "0.0.8"

package/w.js

@@ -0,0 +1,19 @@
+export function w(q, ws) {
+    const returnObj = new W(q);
+    ws.push(returnObj);
+    return returnObj;
+}
+export class W {
+    q;
+    constructor(q) {
+        this.q = q;
+    }
+    #listeners = {};
+    get listeners() {
+        return this.#listeners;
+    }
+    a(eventsToAdd) {
+        this.#listeners = { ...this.#listeners, ...eventsToAdd };
+        return this;
+    }
+}

package/w.ts

@@ -0,0 +1,20 @@
+import { EventListenerOrFn, OnOptions, IW, MappedListeners } from './ts-refs/trans-render/be/types';
+import { CSSQuery } from './ts-refs/trans-render/types';
+export function w(q: CSSQuery, ws: Array<IW>){
+    const returnObj = new W(q);
+    ws.push(returnObj);
+    return returnObj;
+}
+
+export class W implements IW{
+    constructor(public q: CSSQuery){}
+    #listeners:  MappedListeners = {};
+    get listeners(){
+        return this.#listeners;
+    }
+    a(eventsToAdd: {[key: string]: EventListenerOrFn}){
+        this.#listeners = {...this.#listeners, ...eventsToAdd};
+        return this;
+    }
+
+}