mount-observer 0.0.62 → 0.0.64

package/Newish.js

@@ -2,6 +2,7 @@ export { waitForEvent } from './waitForEvent.js';
 import { ObsAttr } from './ObsAttr.js';
 import { splitRefs } from './refid/splitRefs.js';
 import { getIsh } from './refid/getIsh.js';
+import { arr } from './refid/secretKeys.js';
 export const attached = Symbol.for('xyyspnstnU+CDrNVa0VnxA');
 export class Newish {
     queue = [];
@@ -25,19 +26,29 @@ export class Newish {
         if (enhancedElement[attached] === true)
             return;
         enhancedElement[attached] = true;
-        const ctr = await getIsh(enhancedElement.isConnected ? enhancedElement : target, itemscope);
-        const initPropVals = enhancedElement['ish'];
-        if (enhancedElement instanceof HTMLElement) {
-            if (enhancedElement.dataset.ish) {
-                const parsedHostProps = JSON.parse(enhancedElement.dataset.ish);
-                this.queue.push(parsedHostProps);
-            }
+        const options = this.#options;
+        const { initPropVals, ctr } = options;
+        let ce;
+        if (ctr === undefined) {
+            const foundCtr = await getIsh(enhancedElement.isConnected ? enhancedElement : target, itemscope);
+            const initPropVals = enhancedElement['ish'];
+            // if(enhancedElement instanceof HTMLElement){
+            //     if(enhancedElement.dataset.ish){
+            //         const parsedHostProps = JSON.parse(enhancedElement.dataset.ish);
+            //         this.queue.push(parsedHostProps);
+            //     }
+            // }
+            const resolvedConstructor = foundCtr.constructor.name === 'AsyncFunction' ? await foundCtr() : foundCtr;
+            const isInstance = initPropVals instanceof resolvedConstructor;
+            ce = isInstance ? initPropVals : new resolvedConstructor();
+            if (initPropVals !== undefined && !isInstance)
+                this.queue.push(initPropVals);
+        }
+        else {
+            ce = new ctr();
+            if (initPropVals !== undefined)
+                this.queue.push(initPropVals);
         }
-        const resolvedConstructor = ctr.constructor.name === 'AsyncFunction' ? await ctr() : ctr;
-        const isInstance = initPropVals instanceof resolvedConstructor;
-        const ce = isInstance ? initPropVals : new resolvedConstructor();
-        if (initPropVals !== undefined && !isInstance)
-            this.queue.push(initPropVals);
         if ('<mount>' in ce && typeof ce['<mount>'] === 'function') {
             await ce['<mount>'](ce, enhancedElement, this.#options);
         }
@@ -96,8 +107,13 @@ export class Newish {
         while (this.queue.length > 0) {
             const fi = this.queue.shift();
             //TODO: Provide support for a virtual slice of a very large list
+            //TODO:  Maybe should check if iterable rather than an array?
             if (Array.isArray(fi)) {
-                ce.ishList = fi;
+                let filtered = fi;
+                if ('arr=>' in ce && typeof ce['arr=>'] === 'function') {
+                    filtered = await ce['arr=>'](ce, fi, this.#options);
+                }
+                ce[arr] = filtered;
                 actions.add('ishListAssigned');
             }
             else {

package/Newish.ts

@@ -1,14 +1,15 @@
-import { Assigner, BindishOptions } from './ts-refs/mount-observer/types.js';
+import { BindishOptions, Ishcycle } from './ts-refs/mount-observer/types.js';
 
 export {waitForEvent} from './waitForEvent.js';
 import {ObsAttr} from './ObsAttr.js';
 import {splitRefs} from './refid/splitRefs.js';
 import {getIsh} from './refid/getIsh.js';
+import {arr} from './refid/secretKeys.js';
 export const attached = Symbol.for('xyyspnstnU+CDrNVa0VnxA');
 export class Newish implements EventListenerObject {
     queue: Array<any> = [];
     isResolved = false;
-    #ce: HTMLElement | undefined;
+    #ce: Ishcycle | undefined;
     #ref: WeakRef<Element>;
 
     //#assigner: undefined | Assigner = undefined;
@@ -34,21 +35,31 @@ export class Newish implements EventListenerObject {
     ){
         if((<any>enhancedElement)[attached] === true) return;
         (<any>enhancedElement)[attached] = true;
-        const ctr = await getIsh(enhancedElement.isConnected ? enhancedElement :target, itemscope)! as any;
-
-        const initPropVals = (<any>enhancedElement)['ish'];
-        if(enhancedElement instanceof HTMLElement){
-            if(enhancedElement.dataset.ish){
-                const parsedHostProps = JSON.parse(enhancedElement.dataset.ish);
-                this.queue.push(parsedHostProps);
-            }
+        const options = this.#options;
+        const {initPropVals, ctr} = options;
+        let ce: Ishcycle;
+        if(ctr === undefined){
+            const foundCtr = await getIsh(enhancedElement.isConnected ? enhancedElement :target, itemscope)! as any;
+
+            const initPropVals =  (<any>enhancedElement)['ish'];
+            // if(enhancedElement instanceof HTMLElement){
+            //     if(enhancedElement.dataset.ish){
+            //         const parsedHostProps = JSON.parse(enhancedElement.dataset.ish);
+            //         this.queue.push(parsedHostProps);
+            //     }
+            // }
+            
+            
+            const resolvedConstructor = foundCtr.constructor.name === 'AsyncFunction' ? await foundCtr() : foundCtr;
+            const isInstance = initPropVals instanceof resolvedConstructor
+            ce = isInstance ? initPropVals : new resolvedConstructor() as Ishcycle;
+            if(initPropVals !== undefined && !isInstance) this.queue.push(initPropVals);
+        }else{
+            ce = new ctr();
+            if(initPropVals !== undefined) this.queue.push(initPropVals);
         }
-        
-        
-        const resolvedConstructor = ctr.constructor.name === 'AsyncFunction' ? await ctr() : ctr;
-        const isInstance = initPropVals instanceof resolvedConstructor
-        const ce = isInstance ? initPropVals : new resolvedConstructor();
-        if(initPropVals !== undefined && !isInstance) this.queue.push(initPropVals);
+
+       
 
         if('<mount>' in ce && typeof ce['<mount>'] === 'function'){
             await ce['<mount>'](ce, enhancedElement, this.#options)
@@ -112,8 +123,13 @@ export class Newish implements EventListenerObject {
         while(this.queue.length > 0 ){
             const fi = this.queue.shift();
             //TODO: Provide support for a virtual slice of a very large list
+            //TODO:  Maybe should check if iterable rather than an array?
             if(Array.isArray(fi)){
-                (<any>ce).ishList = fi;
+                let filtered = fi;
+                if('arr=>' in ce && typeof ce['arr=>'] === 'function'){
+                    filtered = await ce['arr=>'](ce, fi, this.#options);
+                }
+                (<any>ce)[arr] = filtered;
                 actions.add('ishListAssigned');
             }else{
                 const {assigner} = this.#options;

package/package.json

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

package/refid/regIsh.js

@@ -1,5 +1,6 @@
 export const guid = 'La8Cx9vHsUOd03WomqdnPw';
 export const sym = Symbol.for(guid);
+import { arr } from './secretKeys.js';
 export function regIsh(scope, name, ctr) {
     let map = scope[sym];
     if (map === undefined) {
@@ -10,5 +11,17 @@ export function regIsh(scope, name, ctr) {
         throw 403;
     }
     map.set(name, ctr);
+    ctr.prototype[Symbol.iterator] = function () {
+        var index = -1;
+        var data = this[arr];
+        return {
+            next: function () {
+                return {
+                    value: data === undefined ? undefined : data[++index],
+                    done: data === undefined || !(index in data)
+                };
+            }
+        };
+    };
     document.dispatchEvent(new Event(guid));
 }

package/refid/regIsh.ts

@@ -1,6 +1,7 @@
 import {IshCtr} from '../ts-refs/mount-observer/types';
 export const guid = 'La8Cx9vHsUOd03WomqdnPw'
 export const sym = Symbol.for(guid);
+import {arr} from './secretKeys.js';
 
 export function regIsh(scope: Element | ShadowRoot | Document, name: string, ctr:IshCtr){
     let map = (<any>scope)[sym] as Map<string, IshCtr>;
@@ -12,5 +13,18 @@ export function regIsh(scope: Element | ShadowRoot | Document, name: string, ctr
         throw 403;
     }
     map.set(name, ctr);
+    ctr.prototype[Symbol.iterator] = function() {
+        var index = -1;
+        var data  = this[arr];
+
+        return {
+            next: function() {
+                return { 
+                    value: data === undefined ? undefined : data[++index], 
+                    done: data ===  undefined || !(index in data) 
+                }
+            }
+        };
+    };
     document.dispatchEvent(new Event(guid));
 }

package/refid/secretKeys.js

@@ -0,0 +1,5 @@
+//using Symbol.for, which is easily hackaable, because if two different entry points 
+//come from different versions of mount-observer, things could get out of sync.
+//Not an issue if this was built into the browser, but it is an issue for a custom a library.
+//Do not make this file exportable, it is only for internal use.
+export const arr = Symbol.for('MHtiI353KU+aKBDlz/jR+A');

package/refid/secretKeys.ts

@@ -0,0 +1,5 @@
+//using Symbol.for, which is easily hackaable, because if two different entry points 
+//come from different versions of mount-observer, things could get out of sync.
+//Not an issue if this was built into the browser, but it is an issue for a custom a library.
+//Do not make this file exportable, it is only for internal use.
+export const arr = Symbol.for('MHtiI353KU+aKBDlz/jR+A');

package/ts-refs/mount-observer/types.d.ts

@@ -216,6 +216,8 @@ export interface BindishOptions{
      * to indicate that the initial 
      */
     csr?: boolean,
+    ctr?: {new() : Ishcycle},
+    initPropVals?: any,
 }
 
 export interface Ishcycle{

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

@@ -190,6 +190,7 @@ export interface IshConfig<TProps = any, TActions = TProps, ETProps = TProps>{
     isSleepless?: boolean;
     xform?: XForm<TProps, TActions>;
     inScopeXForms?: {[key: CSSQuery]: XForm<TProps, TActions>};
+    ishListCountProp?: keyof TProps & string;
 }
 export interface OConfig<TProps = any, TActions = TProps, ETProps = TProps> extends IshConfig<TProps, TActions, ETProps>{
     mainTemplate?: string | HTMLTemplateElement;