mount-observer 0.0.95 → 0.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mount-observer",
-  "version": "0.0.95",
+  "version": "0.0.97",
   "description": "Observe and act on css matches.",
   "main": "MountObserver.js",
   "module": "MountObserver.js",
@@ -57,6 +57,10 @@
       "default": "./refid/getAdjRefs.js",
       "types": "./refid/getAdjRefs.ts"
     },
+    "./refid/getContext.js": {
+      "default": "./refid/getContext.js",
+      "types": "./refid/getContext.ts"
+    },
     "./refid/getCount.js": {
       "default": "./refid/getCount.js",
       "types": "./refid/getCount.ts"

package/refid/genIds.js

@@ -37,6 +37,23 @@ export function genIds(enhancedElement) {
         hi.dataset.id = `{{${sideEffects}${localName}}}`;
         hi.removeAttribute('#');
     }
+    //now find all elements with attribute @
+    const names = Array.from(scopeFragment.querySelectorAll('[name]:not([name=""])[\\@]')).filter(x => inScope(scopeFragment, x));
+    for (const nameEl of names) {
+        if (!(nameEl instanceof HTMLElement))
+            continue;
+        const val = nameEl.getAttribute('name');
+        if (uniqueCheck.has(val))
+            throw 500;
+        uniqueCheck.add(val);
+        let sideEffects = '';
+        const nameValue = nameEl.getAttribute('@');
+        if (nameValue) {
+            sideEffects = `${nameValue} `;
+        }
+        nameEl.dataset.id = `{{${sideEffects}${val}}}`;
+        nameEl.removeAttribute('@');
+    }
     const dataIds = Array.from(scopeFragment.querySelectorAll('[data-id^="{{"][data-id$="}}"]')).filter(x => inScope(scopeFragment, x));
     const ids = [];
     for (const di of dataIds) {

package/refid/genIds.ts

@@ -38,6 +38,22 @@ export function genIds(enhancedElement: Element){
         hi.removeAttribute('#');
     }
 
+    //now find all elements with attribute @
+    const names = Array.from(scopeFragment.querySelectorAll('[name]:not([name=""])[\\@]')).filter(x => inScope(scopeFragment, x));
+    for(const nameEl of names){
+        if(!(nameEl instanceof HTMLElement)) continue;
+        const val = nameEl.getAttribute('name');
+        if(uniqueCheck.has(val)) throw 500;
+        uniqueCheck.add(val);
+        let sideEffects = '';
+        const nameValue = nameEl.getAttribute('@');
+        if(nameValue){
+            sideEffects = `${nameValue} `;
+        }
+        nameEl.dataset.id = `{{${sideEffects}${val}}}`;
+        nameEl.removeAttribute('@');
+    }
+
     const dataIds = Array.from(scopeFragment.querySelectorAll('[data-id^="{{"][data-id$="}}"]')).filter(x => inScope(scopeFragment, x));
     const ids: Array<string> = [];
     for(const di of dataIds){

package/refid/getContext.js

@@ -0,0 +1,13 @@
+import './hostish.js';
+export function getContext(el, ctr) {
+    let hostish = el.hostish(false);
+    while (hostish && !(hostish instanceof ctr)) {
+        if ('hostish' in hostish) {
+            hostish = hostish.hostish();
+        }
+        else {
+            return null;
+        }
+    }
+    return hostish;
+}

package/refid/getContext.ts

@@ -0,0 +1,14 @@
+import './hostish.js';
+
+export function getContext<T extends Object>(el: Element, ctr: {new(): T}){
+    let hostish = (<any>el).hostish(false);
+    while(hostish && !(hostish instanceof ctr)){
+        if('hostish' in hostish){
+            hostish = hostish.hostish();
+        }else{
+            return null;
+        }
+        
+    }
+    return hostish;
+}

package/refid/hostish.js

@@ -1,7 +1,8 @@
 "use strict";
-Element.prototype.hostish = async function () {
-    const closest = this.closest('[itemscope]');
-    if (closest === null)
+Element.prototype.hostish = async function (checkSelf = true) {
+    const from = checkSelf ? this : this.hasAttribute('itemscope') ? this.parentElement : this;
+    const closest = from?.closest('[itemscope]');
+    if (closest === null || closest === undefined)
         return this.getRootNode().host;
     const { localName } = closest;
     const itemScopeAttr = closest.getAttribute('itemscope');

package/refid/hostish.ts

@@ -1,9 +1,10 @@
 interface Element{
     hostish(): Promise<any>
 }
-Element.prototype.hostish = async function(){
-    const closest = this.closest('[itemscope]') as HTMLElement;
-    if(closest === null) return (<any>this.getRootNode()).host;
+Element.prototype.hostish = async function(checkSelf = true){
+    const from = checkSelf ? this : this.hasAttribute('itemscope') ? this.parentElement : this;
+    const closest = from?.closest('[itemscope]') as HTMLElement;
+    if(closest === null || closest === undefined) return (<any>this.getRootNode()).host;
     const {localName} = closest;
     const itemScopeAttr = closest.getAttribute('itemscope');
     if(itemScopeAttr){

package/ts-refs/be-observant/types.d.ts

@@ -0,0 +1,27 @@
+import {BEAllProps, IEnhancement} from '../trans-render/be/types';
+import { Specifier } from "../trans-render/dss/types";
+
+export interface EndUserProps extends IEnhancement<HTMLElement>{
+
+}
+
+export interface AllProps extends EndUserProps{
+    parsedStatements: Array<ObservantParameters>,
+    rawStatements?: Array<string>,
+}
+
+export interface ObservantParameters{
+    remoteSpecifiers: Array<Specifier>,
+}
+
+export type AP = AllProps;
+
+export type PAP = Partial<AP>;
+
+export type ProPAP = Promise<PAP>;
+
+export type BAP = AP & BEAllProps<HTMLElement>;
+
+export interface Actions{
+    hydrate(self: BAP) : ProPAP;
+}

package/ts-refs/be-observing/types.d.ts

@@ -1,4 +1,4 @@
-import {BEAllProps, EnhancementInfo, IEnhancement, IW} from '../trans-render/be/types';
+import {BEAllProps, IEnhancement, IW} from '../trans-render/be/types';
 import { Specifier } from "../trans-render/dss/types";
 import {aggKeys, Handlers} from '../be-hive/types';
 import { StringWithAutocompleteOptions } from '../trans-render/types';

package/ts-refs/trans-render/dss/types.d.ts

@@ -23,7 +23,9 @@ export type ValExpression = `${PropPath | ConstVal | MindReadProp}${TypeQualifie
 
 export type MindReadEvent = ``;
 
-export type EventPart = `::${string}`;
+export type EventSpecifier = `::${string}`;
+
+export type EventPart = MindReadEvent | EventSpecifier;
 
 export type DSS = `${Target}${ValExpression}${EventPart}`;