valyrian.js 6.0.4 → 6.0.5

package/dist/@types/lib/index.d.ts

@@ -1,4 +1,5 @@
 /*** Vnode ***/
 import { Valyrian } from "./interfaces";
 /*** Hyperscript ***/
-export declare const v: Valyrian;
+declare const v: Valyrian;
+export default v;

package/dist/@types/lib/interfaces.d.ts

@@ -4,7 +4,7 @@ export interface DomElement extends Element {
 }
 export interface Props {
     key?: string | number;
-    data?: string;
+    state?: any;
     oncreate?: {
         (vnode: IVnode): never;
     };
@@ -29,12 +29,12 @@ export interface IVnode {
     dom?: DomElement;
     isSVG?: boolean;
     processed?: boolean;
-    component?: Component | POJOComponent;
+    component?: ValyrianComponent;
     nodeValue?: string;
     [key: string | number | symbol]: any;
 }
 export interface Component {
-    (props?: Record<string, any> | null, children?: Children): IVnode | Children;
+    (props?: Record<string, any> | null, children?: Children): any | IVnode | Children;
     [key: string | number | symbol]: any;
 }
 export interface POJOComponent {
@@ -52,25 +52,7 @@ export interface VnodeWithDom extends IVnode {
 export interface Directive {
     (value: any, vnode: VnodeWithDom, oldVnode?: VnodeWithDom): void;
 }
-export interface ValyrianApp {
-    isMounted: boolean;
-    eventListenerNames: Record<string, true>;
-    onCleanup: Function[];
-    onUnmount: Function[];
-    onMount: Function[];
-    onUpdate: Function[];
-    eventListener?: EventListener;
-    mainVnode?: VnodeWithDom;
-    container?: DomElement;
-    [key: string | number | symbol]: any;
-}
-export interface MountedValyrianApp extends ValyrianApp {
-    eventListener: EventListener;
-    mainVnode: VnodeWithDom;
-    container: DomElement;
-}
 export interface Current {
-    app?: ValyrianApp;
     component?: ValyrianComponent;
     vnode?: VnodeWithDom;
     oldVnode?: VnodeWithDom;
@@ -87,21 +69,25 @@ export interface Plugin {
 export interface Valyrian {
     (tagOrComponent: string | ValyrianComponent, props: Props, ...children: Children): IVnode | VnodeComponent;
     fragment: (props: Props, ...children: Children) => Children;
+    isNodeJs: boolean;
+    isMounted: boolean;
     current: Current;
+    container?: DomElement;
+    mainVnode?: VnodeWithDom;
+    component?: null | VnodeComponent;
     directives: Directives;
     reservedProps: ReservedProps;
     isVnode: (object?: unknown | IVnode) => object is IVnode;
     isComponent: (component?: unknown | ValyrianComponent) => component is ValyrianComponent;
     isVnodeComponent: (vnode?: unknown | VnodeComponent) => vnode is VnodeComponent;
-    isNodeJs: boolean;
     trust: (htmlString: string) => Children;
     onCleanup: (fn: Function) => void;
     onUnmount: (fn: Function) => void;
     onMount: (fn: Function) => void;
     onUpdate: (fn: Function) => void;
     mount: (container: DomElement | string, component: ValyrianComponent | IVnode) => void | string;
-    update: (component: ValyrianComponent | IVnode) => void | string;
-    unmount: (component: ValyrianComponent | IVnode) => void | string;
+    update: () => void | string;
+    unmount: () => void | string;
     setAttribute: (name: string, value: any, vnode: VnodeWithDom, oldVnode?: VnodeWithDom) => void;
     directive: (name: string, directive: Directive) => void;
     use: (plugin: Plugin, options?: Record<string | number | symbol, any>) => void | any;

package/dist/index.cjs

@@ -24,12 +24,11 @@ var __toCommonJS = /* @__PURE__ */ ((cache) => {
 // lib/index.ts
 var lib_exports = {};
 __export(lib_exports, {
-  v: () => v
+  default: () => lib_default
 });
 var ComponentString = "__component__";
 var TextString = "#text";
 var isNodeJs = Boolean(typeof process !== "undefined" && process.versions && process.versions.node);
-var ValyrianSymbol = Symbol("Valyrian");
 var Und = void 0;
 var Vnode = function Vnode2(tag, props, children) {
   this.props = props;
@@ -49,19 +48,23 @@ function createDomElement(tag, isSVG = false) {
   return isSVG ? document.createElementNS("http://www.w3.org/2000/svg", tag) : document.createElement(tag);
 }
 function domToVnode(dom) {
-  if (dom.nodeType === 1 || dom.nodeType === 3) {
-    let vnode = v(dom.tagName.toLowerCase(), {}, ...Array.from(dom.childNodes).filter((child) => child.nodeType === 1 || child.nodeType === 3).map((child) => {
-      if (child.nodeType === 1) {
-        return domToVnode(child);
+  if (dom.nodeType === 3) {
+    let vnode = v(TextString, {}, []);
+    vnode.nodeValue = dom.nodeValue;
+    vnode.dom = dom;
+    return vnode;
+  }
+  if (dom.nodeType === 1) {
+    let children = [];
+    for (let i = 0; i < dom.childNodes.length; i++) {
+      let child = domToVnode(dom.childNodes[i]);
+      if (child) {
+        children.push(child);
       }
-      let text = new Vnode(TextString, {}, []);
-      text.nodeValue = String(child.nodeValue);
-      text.dom = child;
-      return text;
-    }));
-    if (dom.nodeType === 1) {
-      [].forEach.call(dom.attributes, (prop) => vnode.props[prop.nodeName] = prop.nodeValue);
     }
+    let props = {};
+    [].forEach.call(dom.attributes, (prop) => props[prop.nodeName] = prop.nodeValue);
+    let vnode = v(dom.tagName.toLowerCase(), props, ...children);
     vnode.dom = dom;
     return vnode;
   }
@@ -86,25 +89,44 @@ var reservedProps = {
   "v-class": true,
   "v-html": true
 };
+var eventListenerNames = {};
+var onCleanupList = [];
+var onMountList = [];
+var onUpdateList = [];
+var onUnmountList = [];
 var current = {};
+function eventListener(e) {
+  let dom = e.target;
+  let name = `v-on${e.type}`;
+  while (dom) {
+    if (dom[name]) {
+      dom[name](e, dom);
+      if (!e.defaultPrevented) {
+        update();
+      }
+      return;
+    }
+    dom = dom.parentNode;
+  }
+}
 function onCleanup(callback) {
-  if (current.app?.onCleanup.indexOf(callback) === -1) {
-    current.app?.onCleanup.push(callback);
+  if (onCleanupList.indexOf(callback) === -1) {
+    onCleanupList.push(callback);
   }
 }
 function onUnmount(callback) {
-  if (current.app?.onUnmount.indexOf(callback) === -1) {
-    current.app?.onUnmount.push(callback);
+  if (onUnmountList.indexOf(callback) === -1) {
+    onUnmountList.push(callback);
   }
 }
 function onMount(callback) {
-  if (current.app?.onMount.indexOf(callback) === -1) {
-    current.app?.onMount.push(callback);
+  if (onMountList.indexOf(callback) === -1) {
+    onMountList.push(callback);
   }
 }
 function onUpdate(callback) {
-  if (current.app?.onUpdate.indexOf(callback) === -1) {
-    current.app?.onUpdate.push(callback);
+  if (onUpdateList.indexOf(callback) === -1) {
+    onUpdateList.push(callback);
   }
 }
 function mount(container, component) {
@@ -125,102 +147,54 @@ function mount(container, component) {
   } else {
     throw new Error("Component must be a Valyrian Component or a Vnode component");
   }
-  if (component[ValyrianSymbol]) {
-    unmount(component);
-  } else {
-    let eventListener = function(e) {
-      let dom = e.target;
-      let name = `v-on${e.type}`;
-      while (dom) {
-        if (dom[name]) {
-          dom[name](e, dom);
-          if (!e.defaultPrevented) {
-            update(component);
-          }
-          return;
-        }
-        dom = dom.parentNode;
-      }
-    };
-    component[ValyrianSymbol] = {
-      isMounted: false,
-      eventListenerNames: {},
-      onCleanup: [],
-      onMount: [],
-      onUpdate: [],
-      onUnmount: []
-    };
-    component[ValyrianSymbol].eventListener = eventListener;
-  }
-  component[ValyrianSymbol].component = vnodeComponent;
-  component[ValyrianSymbol].container = appContainer;
-  component[ValyrianSymbol].mainVnode = domToVnode(appContainer);
-  return update(component);
-}
-function callCleanup(valyrianApp) {
-  for (let i = 0; i < valyrianApp.onCleanup.length; i++) {
-    valyrianApp.onCleanup[i]();
-  }
-  valyrianApp.onCleanup = [];
-}
-function callUnmount(valyrianApp) {
-  for (let i = 0; i < valyrianApp.onUnmount.length; i++) {
-    valyrianApp.onUnmount[i]();
-  }
-  valyrianApp.onUnmount = [];
-}
-function callMount(valyrianApp) {
-  for (let i = 0; i < valyrianApp.onMount.length; i++) {
-    valyrianApp.onMount[i]();
+  if (v.isMounted) {
+    unmount();
   }
-  valyrianApp.onMount = [];
+  v.component = vnodeComponent;
+  v.container = appContainer;
+  v.mainVnode = domToVnode(appContainer);
+  return update();
 }
-function callUpdate(valyrianApp) {
-  for (let i = 0; i < valyrianApp.onUpdate.length; i++) {
-    valyrianApp.onUpdate[i]();
+function callCallbackList(list) {
+  for (let i = 0; i < list.length; i++) {
+    list[i]();
   }
-  valyrianApp.onUpdate = [];
+  list = [];
 }
-function update(component) {
-  if (component && component[ValyrianSymbol]) {
-    let valyrianApp = component[ValyrianSymbol];
-    current.app = valyrianApp;
-    valyrianApp.onCleanup.length && callCleanup(valyrianApp);
-    let oldVnode = valyrianApp.mainVnode;
-    valyrianApp.mainVnode = new Vnode(valyrianApp.mainVnode.tag, valyrianApp.mainVnode.props, [valyrianApp.component]);
-    valyrianApp.mainVnode.dom = oldVnode.dom;
-    patch(valyrianApp.mainVnode, oldVnode, valyrianApp);
+function update() {
+  if (v.component && v.mainVnode) {
+    onCleanupList.length && callCallbackList(onCleanupList);
+    let oldVnode = v.mainVnode;
+    v.mainVnode = new Vnode(v.mainVnode.tag, v.mainVnode.props, [v.component]);
+    v.mainVnode.dom = oldVnode.dom;
+    patch(v.mainVnode, oldVnode);
     oldVnode = null;
-    if (valyrianApp.isMounted === false) {
-      valyrianApp.onMount.length && callMount(valyrianApp);
-      valyrianApp.isMounted = true;
+    if (v.isMounted === false) {
+      onMountList.length && callCallbackList(onMountList);
+      v.isMounted = true;
     } else {
-      valyrianApp.onUpdate.length && callUpdate(valyrianApp);
+      onUpdateList.length && callCallbackList(onUpdateList);
     }
     if (isNodeJs) {
-      return valyrianApp.mainVnode.dom.innerHTML;
+      return v.mainVnode.dom.innerHTML;
     }
   }
 }
-function unmount(component) {
-  if (!component || !component[ValyrianSymbol]) {
-    return;
-  }
-  let valyrianApp = component[ValyrianSymbol];
-  if (valyrianApp.isMounted) {
-    valyrianApp.onCleanup.length && callCleanup(valyrianApp);
-    valyrianApp.onUnmount.length && callUnmount(valyrianApp);
-    let oldVnode = valyrianApp.mainVnode;
-    valyrianApp.mainVnode = new Vnode(valyrianApp.mainVnode.tag, valyrianApp.mainVnode.props, []);
-    valyrianApp.mainVnode.dom = oldVnode.dom;
-    valyrianApp.mainVnode.isSVG = oldVnode.isSVG;
-    patch(valyrianApp.mainVnode, oldVnode, valyrianApp);
+function unmount() {
+  if (v.isMounted && v.mainVnode && v.component) {
+    onCleanupList.length && callCallbackList(onCleanupList);
+    onUnmountList.length && callCallbackList(onUnmountList);
+    let oldVnode = v.mainVnode;
+    v.mainVnode = new Vnode(v.mainVnode.tag, v.mainVnode.props, []);
+    v.mainVnode.dom = oldVnode.dom;
+    v.mainVnode.isSVG = oldVnode.isSVG;
+    patch(v.mainVnode, oldVnode);
     oldVnode = null;
+    v.component = null;
+    v.isMounted = false;
     if (isNodeJs) {
-      return valyrianApp.mainVnode.dom.innerHTML;
+      return v.mainVnode.dom.innerHTML;
     }
-    valyrianApp = null;
-    Reflect.deleteProperty(component, ValyrianSymbol);
   }
 }
 var emptyVnode = new Vnode("__empty__", {}, []);
@@ -238,10 +212,9 @@ function sharedSetAttribute(prop, value, vnode, oldVnode) {
     return;
   }
   if (typeof value === "function") {
-    let valyrianApp = current.app;
-    if (prop in valyrianApp.eventListenerNames === false) {
-      valyrianApp.eventListenerNames[prop] = true;
-      valyrianApp.container.addEventListener(prop.slice(2), valyrianApp.eventListener);
+    if (prop in eventListenerNames === false) {
+      eventListenerNames[prop] = true;
+      v.container.addEventListener(prop.slice(2), eventListener);
     }
     vnode.dom[`v-${prop}`] = value;
     return;
@@ -282,7 +255,7 @@ function setAttributes(vnode, oldVnode) {
     }
   }
 }
-function patch(newVnode, oldVnode = emptyVnode, valyrianApp) {
+function patch(newVnode, oldVnode = emptyVnode) {
   current.vnode = newVnode;
   current.oldVnode = oldVnode === emptyVnode ? Und : oldVnode;
   let newTree = newVnode.children;
@@ -338,7 +311,7 @@ function patch(newVnode, oldVnode = emptyVnode, valyrianApp) {
           shouldPatch = false;
         } else {
           setAttributes(childVnode, oldChildVnode);
-          if (valyrianApp.isMounted) {
+          if (v.isMounted) {
             childVnode.props.onupdate && childVnode.props.onupdate(childVnode, oldChildVnode);
           } else {
             childVnode.props.oncreate && childVnode.props.oncreate(childVnode);
@@ -355,7 +328,7 @@ function patch(newVnode, oldVnode = emptyVnode, valyrianApp) {
         oldTree[i] && newKeyedList[oldTree[i].props.key] === Und && onremove(oldTree[i]);
         newVnode.dom.replaceChild(childVnode.dom, newVnode.dom.childNodes[i]);
       }
-      shouldPatch && patch(childVnode, oldChildVnode, valyrianApp);
+      shouldPatch && patch(childVnode, oldChildVnode);
     }
     for (let i = newTreeLength; i < oldTreeLength; i++) {
       if (newKeyedList[oldTree[i].props.key] === Und) {
@@ -390,12 +363,12 @@ function patch(newVnode, oldVnode = emptyVnode, valyrianApp) {
           continue;
         }
         setAttributes(newChildVnode, oldChildVnode);
-        if (valyrianApp.isMounted) {
+        if (v.isMounted) {
           newChildVnode.props.onupdate && newChildVnode.props.onupdate(newChildVnode, oldChildVnode);
         } else {
           newChildVnode.props.oncreate && newChildVnode.props.oncreate(newChildVnode);
         }
-        patch(newChildVnode, oldChildVnode, valyrianApp);
+        patch(newChildVnode, oldChildVnode);
         continue;
       }
       newChildVnode.dom = createDomElement(newChildVnode.tag, newChildVnode.isSVG);
@@ -403,7 +376,7 @@ function patch(newVnode, oldVnode = emptyVnode, valyrianApp) {
       oldChildVnode.tag !== TextString && onremove(oldChildVnode);
       newChildVnode.props.oncreate && newChildVnode.props.oncreate(newChildVnode);
       newVnode.dom.replaceChild(newChildVnode.dom, oldChildVnode.dom);
-      patch(newChildVnode, emptyVnode, valyrianApp);
+      patch(newChildVnode, emptyVnode);
       continue;
     }
     if (newChildVnode.tag === TextString) {
@@ -415,7 +388,7 @@ function patch(newVnode, oldVnode = emptyVnode, valyrianApp) {
     setAttributes(newChildVnode);
     newVnode.dom.appendChild(newChildVnode.dom);
     newChildVnode.props.oncreate && newChildVnode.props.oncreate(newChildVnode);
-    patch(newChildVnode, emptyVnode, valyrianApp);
+    patch(newChildVnode, emptyVnode);
   }
   for (let i = newTreeLength; i < oldTreeLength; i++) {
     let oldChildVnode = oldTree[i];
@@ -573,6 +546,7 @@ v.reservedProps = reservedProps;
 v.isVnode = isVnode;
 v.isComponent = isComponent;
 v.isVnodeComponent = isVnodeComponent;
+v.isMounted = false;
 v.isNodeJs = isNodeJs;
 v.trust = trust;
 v.onCleanup = onCleanup;
@@ -585,4 +559,5 @@ v.update = update;
 v.setAttribute = setAttribute;
 v.directive = directive;
 v.use = use;
+var lib_default = v;
 module.exports = __toCommonJS(lib_exports);