ks-fwork 3.0.2 → 3.0.4

package/dist/ks-fwork.js

@@ -238,40 +238,6 @@ function removeFragmentNode(vNode) {
     children.forEach(destroyDOM);
 }
 
-class Dispatcher {
-    #handlersByCommand = new Map();
-    #afterHandlers = [];
-    subscribe(commandName, handler) {
-        if (!this.#handlersByCommand.has(commandName)) {
-            this.#handlersByCommand.set(commandName, []);
-        }
-        const handlers = this.#handlersByCommand.get(commandName);
-        if (handlers.includes(handler)) {
-            return () => {}
-        }
-        handlers.push(handler);
-        return () => {
-            const index = handlers.indexOf(handler);
-            handlers.splice(index, 1);
-        }
-    }
-    afterEveryCommand(handler) {
-        this.#afterHandlers.push(handler);
-        return () => {
-            const index = this.#afterHandlers.indexOf(handler);
-            this.#afterHandlers.splice(index, 1);
-        }
-    }
-    dispatch(commandName, payload) {
-        if (this.#handlersByCommand.has(commandName)) {
-            this.#handlersByCommand.get(commandName).forEach((handler) => handler(payload));
-        } else {
-            console.warn(`No handlers for command: ${commandName}`);
-        }
-        this.#afterHandlers.forEach((handler) => handler());
-    }
-}
-
 function setAttributes(el, attrs) {
     const { class: className, style, ...otherAttrs } = attrs;
     if (className) {
@@ -321,7 +287,7 @@ function extractPropsAndEvents(vNode) {
     return { props, events }
 }
 
-function mountDOM(vNode, parentEl, index, hostComponent = null) {
+function mountDOM(vNode, parentEl, index = undefined, hostComponent = null) {
     switch (vNode.type) {
         case DOM_TYPES.TEXT: {
             createTextNode(vNode, parentEl, index);
@@ -393,6 +359,31 @@ function insert(el, parentEl, index) {
     }
 }
 
+function createApp(RootComponent, props = {}) {
+    let parentEl = null;
+    let rootNode = null;
+    let isMounted = false;
+    function reset() {
+        parentEl = null;
+        rootNode = null;
+        isMounted = false;
+    }
+    return {
+        mount(_parentEl) {
+            if (isMounted) throw new Error('The application is already mounted');
+            parentEl = _parentEl;
+            rootNode = h(RootComponent, props);
+            mountDOM(rootNode, parentEl);
+            isMounted = true;
+        },
+        unmount() {
+            if (!isMounted) throw new Error('The application is not mounted');
+            destroyDOM(rootNode);
+            reset();
+        },
+    }
+}
+
 function areNodesEqual(nodeOne, nodeTwo) {
     if (nodeOne.type !== nodeTwo.type) return false;
     if (nodeOne.type === DOM_TYPES.ELEMENT) {
@@ -572,33 +563,6 @@ function patchChildren(oldVNode, newVNode, hostComponent) {
     }
 }
 
-function createApp(RootComponent, props = {}) {
-    let parentEl = null;
-    let rootNode = null;
-    let isMounted = false;
-    const dispatcher = new Dispatcher();
-    [dispatcher.afterEveryCommand(renderApp)];
-    function reset() {
-        parentEl = null;
-        rootNode = null;
-        isMounted = false;
-    }
-    return {
-        mount(_parentEl) {
-            if (isMounted) throw new Error('The application is already mounted');
-            parentEl = _parentEl;
-            rootNode = h(RootComponent, props);
-            mountDOM(rootNode, parentEl);
-            isMounted = true;
-        },
-        unmount() {
-            if (!isMounted) throw new Error('The application is not mounted');
-            destroyDOM(rootNode);
-            reset();
-        },
-    }
-}
-
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -642,6 +606,40 @@ function requireFastDeepEqual () {
 var fastDeepEqualExports = requireFastDeepEqual();
 var equal = /*@__PURE__*/getDefaultExportFromCjs(fastDeepEqualExports);
 
+class Dispatcher {
+    #handlersByCommand = new Map();
+    #afterHandlers = [];
+    subscribe(commandName, handler) {
+        if (!this.#handlersByCommand.has(commandName)) {
+            this.#handlersByCommand.set(commandName, []);
+        }
+        const handlers = this.#handlersByCommand.get(commandName);
+        if (handlers.includes(handler)) {
+            return () => {}
+        }
+        handlers.push(handler);
+        return () => {
+            const index = handlers.indexOf(handler);
+            handlers.splice(index, 1);
+        }
+    }
+    afterEveryCommand(handler) {
+        this.#afterHandlers.push(handler);
+        return () => {
+            const index = this.#afterHandlers.indexOf(handler);
+            this.#afterHandlers.splice(index, 1);
+        }
+    }
+    dispatch(commandName, payload) {
+        if (this.#handlersByCommand.has(commandName)) {
+            this.#handlersByCommand.get(commandName).forEach((handler) => handler(payload));
+        } else {
+            console.warn(`No handlers for command: ${commandName}`);
+        }
+        this.#afterHandlers.forEach((handler) => handler());
+    }
+}
+
 function defineComponent({ render, state, ...methods }) {
     class Component {
         #isMounted = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ks-fwork",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Demo Frontend Framework",
   "license": "ISC",
   "author": "",

package/src/app.js

@@ -1,7 +1,5 @@
 import { destroyDOM } from "./destroy-dom.js";
-import { Dispatcher } from "./dispatcher.js";
 import { mountDOM } from "./mount-dom.js";
-import { patchDOM } from "./patch-dom.js";
 import { h } from "./h.js";
 
 export function createApp(RootComponent, props = {}) {
@@ -9,9 +7,6 @@ export function createApp(RootComponent, props = {}) {
     let rootNode = null;
     let isMounted = false;
 
-    const dispatcher = new Dispatcher();
-    const unsubscribers = [dispatcher.afterEveryCommand(renderApp)];
-
     function reset() {
         parentEl = null;
         rootNode = null;

package/src/mount-dom.js

@@ -4,7 +4,7 @@ import { addEventListeners } from "./events.js";
 import { extractPropsAndEvents } from "./utils/props.js";
 
 // Recursively mount a virtual node (and its subtree) into a real parent DOM element.
-export function mountDOM(vNode, parentEl, index, hostComponent = null) {
+export function mountDOM(vNode, parentEl, index = undefined, hostComponent = null) {
     switch (vNode.type) {
         case DOM_TYPES.TEXT: {
             createTextNode(vNode, parentEl, index);