mount-observer 0.0.94 → 0.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mount-observer",
-  "version": "0.0.94",
+  "version": "0.0.95",
   "description": "Observe and act on css matches.",
   "main": "MountObserver.js",
   "module": "MountObserver.js",

package/refid/genIds.js

@@ -4,12 +4,23 @@ const attrMap = {
     '@': 'name',
     '|': 'itemprop',
 };
+const scopeMatches = '[itemscope],fieldset';
+export function inScope(scopeFragment, el) {
+    const closest = el.closest(scopeMatches); //TODO account for itemref?
+    if (closest === null)
+        return true;
+    if (scopeFragment === closest)
+        return true;
+    if (scopeFragment.contains(closest))
+        return false;
+    return true;
+}
 export function genIds(enhancedElement) {
-    const { parentElement } = enhancedElement;
-    if (parentElement === null)
-        throw 404;
+    // const {parentElement} = enhancedElement;
+    // if(parentElement === null) throw 404;
+    const scopeFragment = (enhancedElement.closest(scopeMatches) || enhancedElement.getRootNode());
     //first find all elements with attribute #
-    const hashIds = Array.from(parentElement.querySelectorAll('[\\#]'));
+    const hashIds = Array.from(scopeFragment.querySelectorAll('[\\#]')).filter(x => inScope(scopeFragment, x));
     const uniqueCheck = new Set();
     for (const hi of hashIds) {
         if (!(hi instanceof HTMLElement))
@@ -26,7 +37,7 @@ export function genIds(enhancedElement) {
         hi.dataset.id = `{{${sideEffects}${localName}}}`;
         hi.removeAttribute('#');
     }
-    const dataIds = Array.from(parentElement.querySelectorAll('[data-id^="{{"][data-id$="}}"]'));
+    const dataIds = Array.from(scopeFragment.querySelectorAll('[data-id^="{{"][data-id$="}}"]')).filter(x => inScope(scopeFragment, x));
     const ids = [];
     for (const di of dataIds) {
         if (!(di instanceof HTMLElement))
@@ -41,8 +52,9 @@ export function genIds(enhancedElement) {
             throw 500;
         ids.push(id);
     }
-    const allChildren = Array.from(parentElement.querySelectorAll('*'));
-    allChildren.push(parentElement);
+    const allChildren = Array.from(scopeFragment.querySelectorAll('*')).filter(x => inScope(scopeFragment, x));
+    if (scopeFragment instanceof Element)
+        allChildren.push(scopeFragment);
     const idLookup = {};
     const base = 'gid';
     for (const child of allChildren) {
@@ -124,7 +136,7 @@ export function genIds(enhancedElement) {
             nudge(child, name);
         }
     }
-    if ('disabled' in parentElement) {
-        nudge(parentElement);
+    if (scopeFragment instanceof Element && 'disabled' in scopeFragment) {
+        nudge(scopeFragment);
     }
 }

package/refid/genIds.ts

@@ -6,12 +6,23 @@ const attrMap = {
     '|': 'itemprop',
 };
 
+const scopeMatches = '[itemscope],fieldset';
+
+export function inScope(scopeFragment: DocumentFragment | Element, el: Element){
+    const closest = el.closest(scopeMatches);//TODO account for itemref?
+    if(closest === null) return true;
+    if(scopeFragment === closest) return true;
+    if(scopeFragment.contains(closest)) return false;
+    return true;
+}
+
 export function genIds(enhancedElement: Element){
-    const {parentElement} = enhancedElement;
-    if(parentElement === null) throw 404;
+    // const {parentElement} = enhancedElement;
+    // if(parentElement === null) throw 404;
+    const scopeFragment = (enhancedElement.closest(scopeMatches) || enhancedElement.getRootNode()) as DocumentFragment | Element;
 
     //first find all elements with attribute #
-    const hashIds = Array.from(parentElement.querySelectorAll('[\\#]'));
+    const hashIds = Array.from(scopeFragment.querySelectorAll('[\\#]')).filter(x => inScope(scopeFragment, x));
     const uniqueCheck = new Set();
     for(const hi of hashIds){
         if(!(hi instanceof HTMLElement)) continue;
@@ -27,7 +38,7 @@ export function genIds(enhancedElement: Element){
         hi.removeAttribute('#');
     }
 
-    const dataIds = Array.from(parentElement.querySelectorAll('[data-id^="{{"][data-id$="}}"]'));
+    const dataIds = Array.from(scopeFragment.querySelectorAll('[data-id^="{{"][data-id$="}}"]')).filter(x => inScope(scopeFragment, x));
     const ids: Array<string> = [];
     for(const di of dataIds){
         if(!(di instanceof HTMLElement)) continue;
@@ -40,8 +51,8 @@ export function genIds(enhancedElement: Element){
         ids.push(id);
     }
 
-    const allChildren = Array.from(parentElement.querySelectorAll('*'));
-    allChildren.push(parentElement);
+    const allChildren = Array.from(scopeFragment.querySelectorAll('*')).filter(x => inScope(scopeFragment, x));
+    if(scopeFragment instanceof Element) allChildren.push(scopeFragment);
 
     const idLookup: {[key: string]: string}  = {};
     const base = 'gid';
@@ -120,7 +131,7 @@ export function genIds(enhancedElement: Element){
             nudge(child, name);
         }
     }
-    if('disabled' in parentElement){
-        nudge(parentElement);
+    if(scopeFragment instanceof Element && 'disabled' in scopeFragment){
+        nudge(scopeFragment);
     }
 }

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

@@ -4,7 +4,7 @@ import {BEAllProps, EMC, IEnhancement} from '../trans-render/be/types';
 //import {AP as BPAP, ISignal, Actions as BPActions} from 'be-propagating/types';
 //import {ElTypes, SignalRefType} from 'be-linked/types';
 //import { Propagator } from "../trans-render/froop/PropSvc";
-import {IPE, Specifier} from '../trans-render/dss/types';
+import {Specifier} from '../trans-render/dss/types';
 
 export interface Element{
     hostish(): Promise<any>
@@ -62,7 +62,7 @@ export type SwitchStatement = string;
 
 export interface OneValueSwitch{
     ifPart: string,
-    ipe: IPE,
+    specifier: Specifier,
     req?: boolean,
 }
 
@@ -76,8 +76,8 @@ export interface TwoPartOpStatement{
 }
 
 export interface TwoValueSwitch{
-    lhsIPE: IPE,
-    rhsIPE: IPE,
+    lhsSpecifier: Specifier,
+    rhsSpecifier: Specifier,
     req?: boolean,
     op?: Op,
     lhs?: ISide,
@@ -90,7 +90,7 @@ export interface TwoValueSwitch{
 
 }
 
-export interface Dependency extends IPE{}
+export interface Dependency extends Specifier{}
 
 export interface CanBeSwitchedOn {
     switchedOn?: boolean,

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

@@ -1,6 +1,3 @@
-import { Scope } from '../lib/types'
-import { CSSQuery } from '../types';
-
 export type ID = `#${string}`;
 export type Host = `:host()`;
 export type Hostish = ``;
@@ -20,22 +17,22 @@ export type asOptions =
     | 'boolean|number'
 ;
 export type MindReadType = ``;
-export type TypeQualifier = `as ${asOptions}`;
+export type TypeQualifier = `-as-${asOptions}`;
 
 export type ValExpression = `${PropPath | ConstVal | MindReadProp}${TypeQualifier | MindReadType}`;
 
 export type MindReadEvent = ``;
 
-export type EvtName = `::${string}`;
+export type EventPart = `::${string}`;
 
-export type DSS = `${Target}${ValExpression}${EvtName}`;
+export type DSS = `${Target}${ValExpression}${EventPart}`;
 
 
 export interface Specifier {
     id?: string,
     prop?: string,
     path?: SubPropPath,
-    evtName?: string,
+    evtName?: EventName,
     as?: asOptions,
     constVal?: any;
     enhKey?: string;

package/ts-refs/trans-render/lib/prs/types.d.ts

@@ -28,8 +28,7 @@ export interface RegExpExt<TStatementGroup = any>{
     dssKeys?: [string, string][],
     dssArrayKeys?: [string, string][],
     statementPartParser?: StatementPartParser,
-    //ipeKeys?: [string, string][];
-   // ipeArrayKeys?: [string, string][];
+
 }
 
 export interface StatementPartParser {