@estjs/template 0.0.14-beta.1 → 0.0.14-beta.12

package/dist/template.dev.esm.js

@@ -1,46 +1,41 @@
-import { isString, isFunction, isArray, isSymbol, escape, startsWith, isPrimitive, capitalizeFirstLetter, isNil, isHTMLElement, coerceArray, isFalsy, kebabCase } from '@estjs/shared';
-import { shallowSignal, isSignal, useReactive, useEffect, useSignal } from '@estjs/signal';
+import { isString, isFunction, isArray, isSymbol, escape, startsWith, capitalize, isNil, isPlainObject, isHTMLElement, coerceArray, isFalsy, kebabCase } from '@estjs/shared';
+import { shallowSignal, isSignal, signalObject, reactive, signal, effect } from '@estjs/signal';
 
 /**
-* @estjs/template v0.0.14-beta.1
+* @estjs/template v0.0.14-beta.12
 * (c) 2023-Present jiangxd <jiangxd2016@gmail.com>
 * @license MIT
 **/
 
 
-// src/shared-config.ts
+// src/sharedConfig.ts
 var EVENT_PREFIX = "on";
 var UPDATE_PREFIX = "update";
 var CHILDREN_PROP = "children";
 var EMPTY_TEMPLATE = "";
 var FRAGMENT_PROP_KEY = "0";
 var SINGLE_PROP_KEY = "1";
+var REF_KEY = "ref";
 var PLACEHOLDER = " __PLACEHOLDER__ ";
 var RenderContext = class {
   constructor() {
     this.renderMode = 0 /* CLIENT */;
   }
-  // Getter to check if the current mode is SSG
   get isSSG() {
     return this.renderMode === 1 /* SSG */;
   }
-  // Getter to check if the current mode is SSR
   get isSSR() {
     return this.renderMode === 2 /* SSR */;
   }
-  // Getter to check if the current mode is Client
   get isClient() {
     return this.renderMode === 0 /* CLIENT */;
   }
-  // Set render mode to SSR
   setSSR() {
     this.renderMode = 2 /* SSR */;
   }
-  // Set render mode to SSG
   setSSG() {
     this.renderMode = 1 /* SSG */;
   }
-  // Set render mode to Client
   setClient() {
     this.renderMode = 0 /* CLIENT */;
   }
@@ -57,7 +52,7 @@ function getComponentIndex(temp) {
   return (_a = componentMap.get(temp)) == null ? void 0 : _a.index;
 }
 
-// src/lifecycle-context.ts
+// src/lifecycleContext.ts
 var _LifecycleContext = class _LifecycleContext {
   constructor() {
     // Hooks for different lifecycle stages
@@ -83,11 +78,9 @@ var _LifecycleContext = class _LifecycleContext {
   setContext(context, value) {
     _LifecycleContext.context[context] = value;
   }
-  // Initialize the static reference
   initRef() {
     _LifecycleContext.ref = this;
   }
-  // Remove the static reference
   removeRef() {
     _LifecycleContext.ref = null;
   }
@@ -96,13 +89,11 @@ var _LifecycleContext = class _LifecycleContext {
     Object.values(this.hooks).forEach((set) => set.clear());
   }
 };
-// Static reference to the current context
 _LifecycleContext.ref = null;
-// Static context to store shared values
 _LifecycleContext.context = {};
 var LifecycleContext = _LifecycleContext;
 
-// src/ssg-node.ts
+// src/ssgNode.ts
 function isSSGNode(node) {
   return node instanceof SSGNode;
 }
@@ -116,7 +107,6 @@ var SSGNode = class extends LifecycleContext {
     enterComponent(template, componentIndex);
     this.templates = this.processTemplate();
   }
-  // Process the template and return an array of processed strings
   processTemplate() {
     if (isArray(this.template)) {
       const htmlString = this.template.join(PLACEHOLDER);
@@ -125,7 +115,6 @@ var SSGNode = class extends LifecycleContext {
     }
     return [];
   }
-  // Process HTML string by adding component index and handling text nodes
   processHtmlString(htmlString) {
     return htmlString.replaceAll(/(<[^>]+>)|([^<]+)/g, (match, p1, p2) => {
       if (p1) {
@@ -139,14 +128,12 @@ var SSGNode = class extends LifecycleContext {
       return match;
     });
   }
-  // Mount the SSGNode and return the rendered string
   mount() {
     this.initRef();
     const output = this.render();
     this.removeRef();
     return output;
   }
-  // Render the SSGNode
   render() {
     if (isFunction(this.template)) {
       const root = this.template(this.props);
@@ -158,7 +145,6 @@ var SSGNode = class extends LifecycleContext {
     }
     return this.renderTemplate();
   }
-  // Render the template by processing props and children
   renderTemplate() {
     Object.entries(this.props).forEach(([key, cur]) => {
       const children = cur.children;
@@ -174,10 +160,9 @@ var SSGNode = class extends LifecycleContext {
     });
     return this.templates.join("");
   }
-  // Normalize props by removing children and handling signals
   normalizeProps(props) {
     Object.entries(props).forEach(([key, value]) => {
-      if (key === "children") {
+      if (key === CHILDREN_PROP) {
         delete props[key];
       } else if (isFunction(value)) {
         delete props[key];
@@ -186,11 +171,9 @@ var SSGNode = class extends LifecycleContext {
       }
     });
   }
-  // Generate HTML attributes string from props
   generateAttributes(props) {
-    return Object.entries(props).filter(([key, value]) => key !== "children" && !isFunction(value)).map(([key, value]) => `${key}="${escape(String(value))}"`).join(" ");
+    return Object.entries(props).filter(([key, value]) => key !== CHILDREN_PROP && !isFunction(value)).map(([key, value]) => `${key}="${escape(String(value))}"`).join(" ");
   }
-  // Render children and append them to the template
   renderChildren(children, findIndex) {
     children.forEach(([child]) => {
       componentIndex++;
@@ -198,7 +181,6 @@ var SSGNode = class extends LifecycleContext {
       this.templates[findIndex] += renderedChild;
     });
   }
-  // Render a single child node
   renderChild(child) {
     if (isFunction(child)) {
       return this.renderChild(child(this.props));
@@ -215,9 +197,6 @@ var SSGNode = class extends LifecycleContext {
 
 // src/utils.ts
 var SELF_CLOSING_TAGS = "area,base,br,col,embed,hr,img,input,link,meta,param,source,track,wbr".split(",");
-var HTML_TAGS = "a,abbr,acronym,address,applet,area,article,aside,audio,b,base,basefont,bdi,bdo,bgsound,big,blink,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,command,content,data,datalist,dd,del,details,dfn,dialog,dir,div,dl,dt,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,kbd,keygen,label,legend,li,link,listing,main,map,mark,marquee,menu,menuitem,meta,meter,nav,nobr,noframes,noscript,object,ol,optgroup,option,output,p,param,picture,plaintext,pre,progress,q,rb,rp,rt,rtc,ruby,s,samp,script,section,select,shadow,small,source,spacer,span,strike,strong,style,sub,summary,sup,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,tt,u,ul,var,video,wbr,xmp".split(
-  ","
-);
 function coerceNode(data) {
   if (isJsxElement(data) || data instanceof Node || isSSGNode(data)) {
     return data;
@@ -334,12 +313,14 @@ function bindNode(node, setter) {
     });
   }
 }
-Promise.resolve();
 function addEventListener(node, eventName, handler) {
   node.addEventListener(eventName, handler);
   return () => node.removeEventListener(eventName, handler);
 }
 function closeHtmlTags(input) {
+  if (!input) {
+    return input;
+  }
   const tagStack = [];
   const output = [];
   const tagPattern = /<\/?([\da-z-]+)([^>]*)>/gi;
@@ -375,17 +356,14 @@ function closeHtmlTags(input) {
   }
   return output.join("");
 }
-function isHtmlTagName(tagName) {
-  return HTML_TAGS.includes(tagName);
-}
 function convertToHtmlTag(tagName) {
   return SELF_CLOSING_TAGS.includes(tagName) ? `<${tagName}/>` : `<${tagName}></${tagName}>`;
 }
-function extractSignal(signal) {
-  if (isSignal(signal)) {
-    return signal.value;
+function extractSignal(signal2) {
+  if (isSignal(signal2)) {
+    return signal2.value;
   } else {
-    return signal;
+    return signal2;
   }
 }
 var ComponentNode = class extends LifecycleContext {
@@ -397,28 +375,24 @@ var ComponentNode = class extends LifecycleContext {
     this.emitter = /* @__PURE__ */ new Set();
     this.rootNode = null;
     this.trackMap = /* @__PURE__ */ new Map();
-    this.key || (this.key = props == null ? void 0 : props.key);
+    this.key || (this.key = props && props.key);
     this.proxyProps = this.createProxyProps(props);
   }
-  // Create reactive props
   createProxyProps(props) {
     if (!props) return {};
-    return useReactive(
+    return signalObject(
       props,
       (key) => startsWith(key, EVENT_PREFIX) || startsWith(key, UPDATE_PREFIX) || key === CHILDREN_PROP
     );
   }
-  // Getter for the first child node
   get firstChild() {
     var _a, _b;
     return (_b = (_a = this.rootNode) == null ? void 0 : _a.firstChild) != null ? _b : null;
   }
-  // Getter to check if the node is connected to the DOM
   get isConnected() {
     var _a, _b;
     return (_b = (_a = this.rootNode) == null ? void 0 : _a.isConnected) != null ? _b : false;
   }
-  // Method to mount the component to the DOM
   mount(parent, before) {
     var _a, _b, _c, _d;
     if (!isFunction(this.template)) {
@@ -428,14 +402,13 @@ var ComponentNode = class extends LifecycleContext {
       return (_b = (_a = this.rootNode) == null ? void 0 : _a.mount(parent, before)) != null ? _b : [];
     }
     this.initRef();
-    this.rootNode = this.template(this.proxyProps);
+    this.rootNode = this.template(reactive(this.proxyProps, [CHILDREN_PROP]));
     const mountedNode = (_d = (_c = this.rootNode) == null ? void 0 : _c.mount(parent, before)) != null ? _d : [];
     this.callMountHooks();
     this.patchProps(this.props);
     this.removeRef();
     return mountedNode;
   }
-  // Method to unmount the component from the DOM
   unmount() {
     var _a;
     this.callDestroyHooks();
@@ -445,22 +418,18 @@ var ComponentNode = class extends LifecycleContext {
     this.proxyProps = {};
     this.clearEmitter();
   }
-  // Private method to call mount hooks
   callMountHooks() {
     this.hooks.mounted.forEach((handler) => handler());
   }
-  // Private method to call destroy hooks
   callDestroyHooks() {
     this.hooks.destroy.forEach((handler) => handler());
   }
-  // Private method to clear the event emitter
   clearEmitter() {
     for (const cleanup of this.emitter) {
       cleanup();
     }
     this.emitter.clear();
   }
-  // Method to inherit properties from another ComponentNode
   inheritNode(node) {
     Object.assign(this.proxyProps, node.proxyProps);
     this.rootNode = node.rootNode;
@@ -470,7 +439,6 @@ var ComponentNode = class extends LifecycleContext {
     this.props = node.props;
     this.patchProps(props);
   }
-  // Private method to get or create a NodeTrack
   getNodeTrack(trackKey) {
     let track = this.trackMap.get(trackKey);
     if (!track) {
@@ -481,7 +449,6 @@ var ComponentNode = class extends LifecycleContext {
     track.cleanup();
     return track;
   }
-  // Method to patch props onto the component
   patchProps(props) {
     var _a;
     if (!props) {
@@ -490,7 +457,7 @@ var ComponentNode = class extends LifecycleContext {
     for (const [key, prop] of Object.entries(props)) {
       if (startsWith(key, EVENT_PREFIX) && ((_a = this.rootNode) == null ? void 0 : _a.firstChild)) {
         this.patchEventListener(key, prop);
-      } else if (key === "ref") {
+      } else if (key === REF_KEY) {
         this.patchRef(prop);
       } else if (startsWith(key, UPDATE_PREFIX)) {
         this.patchUpdateHandler(key, prop);
@@ -500,26 +467,24 @@ var ComponentNode = class extends LifecycleContext {
     }
     this.props = props;
   }
-  // Private method to patch event listeners
   patchEventListener(key, prop) {
     const event = key.slice(2).toLowerCase();
     const cleanup = addEventListener(this.rootNode.nodes[0], event, prop);
     this.emitter.add(cleanup);
   }
-  // Private method to patch ref
   patchRef(prop) {
     var _a, _b;
     prop.value = (_b = (_a = this.rootNode) == null ? void 0 : _a.firstChild) != null ? _b : null;
   }
-  // Private method to patch update handlers
   patchUpdateHandler(key, prop) {
     this.props[key] = extractSignal(prop);
   }
-  // Private method to patch normal props
   patchNormalProp(key, prop) {
+    var _a, _b;
+    const newValue = (_b = (_a = this.proxyProps)[key]) != null ? _b : _a[key] = signal(prop);
     const track = this.getNodeTrack(key);
-    track.cleanup = useEffect(() => {
-      this.proxyProps[key] = isFunction(prop) ? prop() : prop;
+    track.cleanup = effect(() => {
+      newValue.value = isFunction(prop) ? prop() : prop;
     });
   }
 };
@@ -631,39 +596,33 @@ function getKey(node, index) {
   return `_$${index}$`;
 }
 
-// src/template-node.ts
+// src/templateNode.ts
 var TemplateNode = class {
   constructor(template, props, key) {
     this.template = template;
     this.props = props;
     this.key = key;
-    // Private properties for managing the node's state
     this.treeMap = /* @__PURE__ */ new Map();
     this.mounted = false;
     this.nodes = [];
     this.trackMap = /* @__PURE__ */ new Map();
     this.bindValueKeys = [];
     this.parent = null;
-    this.key || (this.key = props == null ? void 0 : props.key);
     if (renderContext.isSSR) {
       this.componentIndex = getComponentIndex(this.template);
     }
   }
-  // Getter for the first child node
   get firstChild() {
     var _a;
     return (_a = this.nodes[0]) != null ? _a : null;
   }
-  // Getter to check if the node is connected to the DOM
   get isConnected() {
     return this.mounted;
   }
-  // Placeholder methods for event handling
   addEventListener() {
   }
   removeEventListener() {
   }
-  // Method to mount the node to the DOM
   mount(parent, before) {
     var _a;
     this.parent = parent;
@@ -678,7 +637,7 @@ var TemplateNode = class {
     const firstChild = cloneNode.firstChild;
     if ((_a = firstChild == null ? void 0 : firstChild.hasAttribute) == null ? void 0 : _a.call(firstChild, "_svg_")) {
       firstChild.remove();
-      firstChild == null ? void 0 : firstChild.childNodes.forEach((node) => {
+      firstChild.childNodes.forEach((node) => {
         cloneNode.append(node);
       });
     }
@@ -693,45 +652,16 @@ var TemplateNode = class {
     this.mounted = true;
     return this.nodes;
   }
-  // Method to unmount the node from the DOM
   unmount() {
-    var _a, _b;
     this.trackMap.forEach((track) => {
-      var _a2;
-      (_a2 = track.cleanup) == null ? void 0 : _a2.call(track);
+      track.cleanup && track.cleanup();
     });
     this.trackMap.clear();
     this.treeMap.clear();
     this.nodes.forEach((node) => removeChild(node));
-    if (!this.template.innerHTML && !this.nodes.length) {
-      const children = (_b = (_a = this.props) == null ? void 0 : _a[FRAGMENT_PROP_KEY]) == null ? void 0 : _b.children;
-      if (children) {
-        if (isArray(children)) {
-          children.forEach((child) => {
-            this.deleteFragmentTextNode(child);
-          });
-        } else {
-          this.deleteFragmentTextNode(children);
-        }
-      }
-    }
     this.nodes = [];
     this.mounted = false;
   }
-  deleteFragmentTextNode(child) {
-    var _a;
-    if (isPrimitive(child)) {
-      (_a = this.parent) == null ? void 0 : _a.childNodes.forEach((node) => {
-        var _a2;
-        if (node.nodeType === Node.TEXT_NODE && node.textContent === `${child}`) {
-          (_a2 = this.parent) == null ? void 0 : _a2.removeChild(node);
-        }
-      });
-    } else {
-      removeChild(child);
-    }
-  }
-  // Method to inherit properties from another TemplateNode
   inheritNode(node) {
     this.mounted = node.mounted;
     this.nodes = node.nodes;
@@ -741,12 +671,11 @@ var TemplateNode = class {
     this.props = node.props;
     this.patchProps(props);
   }
-  // Private method to map SSG node tree
   mapSSGNodeTree(parent) {
     this.treeMap.set(0, parent);
     this.walkNodeTree(parent, this.handleSSGNode.bind(this));
   }
-  // Private method to map node tree
+  // protected method to map node tree
   mapNodeTree(parent, tree) {
     let index = 1;
     this.treeMap.set(0, parent);
@@ -757,7 +686,6 @@ var TemplateNode = class {
     };
     this.walkNodeTree(tree, handleNode);
   }
-  // Private method to walk through the node tree
   walkNodeTree(node, handler) {
     if (node.nodeType !== Node.DOCUMENT_FRAGMENT_NODE) {
       handler(node);
@@ -768,7 +696,6 @@ var TemplateNode = class {
       child = child.nextSibling;
     }
   }
-  // Private method to handle SSG nodes
   handleSSGNode(node) {
     var _a;
     if (node.nodeType === Node.COMMENT_NODE) {
@@ -784,7 +711,6 @@ var TemplateNode = class {
       }
     }
   }
-  // Method to patch props onto the node
   patchProps(props) {
     if (!props) return;
     Object.entries(props).forEach(([key, value]) => {
@@ -796,15 +722,14 @@ var TemplateNode = class {
     });
     this.props = props;
   }
-  // Private method to patch a single prop
   patchProp(key, node, props, isRoot) {
     if (!props) return;
     Object.entries(props).forEach(([attr, value]) => {
       if (attr === CHILDREN_PROP && value) {
         this.patchChildren(key, node, value, isRoot);
-      } else if (attr === "ref") {
+      } else if (attr === REF_KEY) {
         props[attr].value = node;
-      } else if (startsWith(attr, "on")) {
+      } else if (startsWith(attr, EVENT_PREFIX)) {
         this.patchEventListener(key, node, attr, value);
       } else {
         if (this.bindValueKeys.includes(attr)) return;
@@ -814,14 +739,12 @@ var TemplateNode = class {
     });
   }
   getBindUpdateValue(props, key, attr) {
-    const UPDATE_PREFIX2 = "update";
-    const updateKey = `${UPDATE_PREFIX2}${capitalizeFirstLetter(attr)}`;
+    const updateKey = `${UPDATE_PREFIX}${capitalize(attr)}`;
     if (updateKey && props[updateKey] && isFunction(props[updateKey])) {
       this.bindValueKeys.push(updateKey);
       return props[updateKey];
     }
   }
-  // Private method to patch children
   patchChildren(key, node, children, isRoot) {
     if (!isArray(children)) {
       const trackKey = `${key}:${CHILDREN_PROP}:0`;
@@ -838,19 +761,21 @@ var TemplateNode = class {
       });
     }
   }
-  // Private method to patch event listeners
   patchEventListener(key, node, attr, listener) {
     const eventName = attr.slice(2).toLowerCase();
     const track = this.getNodeTrack(`${key}:${attr}`);
     track.cleanup = addEventListener(node, eventName, listener);
   }
-  // Private method to patch attributes
   patchAttribute(key, element, attr, value, updateFn) {
     const track = this.getNodeTrack(`${key}:${attr}`);
-    const triggerValue = isFunction(value) ? value() : isSignal(value) ? value : useSignal(value);
+    const val = isFunction(value) ? value() : value;
+    const triggerValue = isSignal(val) ? val : shallowSignal(val);
     setAttribute(element, attr, triggerValue.value);
-    const cleanup = useEffect(() => {
-      triggerValue.value = isFunction(value) ? value() : isSignal(value) ? value.value : value;
+    const cleanup = effect(() => {
+      const val2 = isFunction(value) ? value() : value;
+      if (isPlainObject(val2) && isPlainObject(triggerValue.peek()) && JSON.stringify(triggerValue.value) === JSON.stringify(val2))
+        return;
+      triggerValue.value = isSignal(val2) ? val2.value : val2;
       setAttribute(element, attr, triggerValue.value);
     });
     let cleanupBind;
@@ -864,9 +789,7 @@ var TemplateNode = class {
       cleanupBind && cleanupBind();
     };
   }
-  // Private method to get or create a NodeTrack
   getNodeTrack(trackKey, trackLastNodes, isRoot) {
-    var _a;
     let track = this.trackMap.get(trackKey);
     if (!track) {
       track = { cleanup: () => {
@@ -879,13 +802,12 @@ var TemplateNode = class {
       }
       this.trackMap.set(trackKey, track);
     }
-    (_a = track.cleanup) == null ? void 0 : _a.call(track);
+    track.cleanup && track.cleanup();
     return track;
   }
-  // Private method to patch a child node
   patchChild(track, parent, child, before) {
     if (isFunction(child)) {
-      track.cleanup = useEffect(() => {
+      track.cleanup = effect(() => {
         const nextNodes = coerceArray(child()).map(coerceNode);
         if (renderContext.isSSR) {
           track.lastNodes = this.reconcileChildren(parent, nextNodes, before);
@@ -906,7 +828,6 @@ var TemplateNode = class {
       });
     }
   }
-  // Private method to reconcile children nodes
   reconcileChildren(parent, nextNodes, before) {
     const result = /* @__PURE__ */ new Map();
     const textNodes = Array.from(parent.childNodes).filter(
@@ -932,19 +853,41 @@ var TemplateNode = class {
   }
 };
 
-// src/jsx-renderer.ts
+// src/fragmentNode.ts
+var FragmentNode = class extends TemplateNode {
+  unmount() {
+    this.trackMap.forEach((track) => {
+      if (track.lastNodes) {
+        track.lastNodes.forEach((node) => {
+          removeChild(node);
+        });
+      }
+      track.cleanup && track.cleanup();
+    });
+    this.trackMap.clear();
+    this.treeMap.clear();
+    this.nodes.forEach((node) => {
+      removeChild(node);
+    });
+    this.nodes = [];
+    this.mounted = false;
+  }
+};
+
+// src/jsxRenderer.ts
 function h(template, props, key) {
+  if (template === EMPTY_TEMPLATE) {
+    return Fragment(template, props);
+  }
   if (isString(template)) {
-    if (isHtmlTagName(template)) {
-      const htmlTemplate = convertToHtmlTag(template);
-      props = { [SINGLE_PROP_KEY]: props };
-      return new TemplateNode(createTemplate(htmlTemplate), props, key);
-    } else if (template === EMPTY_TEMPLATE) {
-      props = { [FRAGMENT_PROP_KEY]: props };
-      return new TemplateNode(createTemplate(EMPTY_TEMPLATE), props, key);
-    }
+    const htmlTemplate = convertToHtmlTag(template);
+    props = { [SINGLE_PROP_KEY]: props };
+    return new TemplateNode(createTemplate(htmlTemplate), props, key);
   }
-  return isFunction(template) ? new ComponentNode(template, props, key) : new TemplateNode(template, props, key);
+  if (isFunction(template)) {
+    return new ComponentNode(template, props, key);
+  }
+  return new TemplateNode(template, props, key);
 }
 function isComponent(node) {
   return node instanceof ComponentNode;
@@ -957,10 +900,18 @@ function createTemplate(html) {
   template.innerHTML = closeHtmlTags(html);
   return template;
 }
-function Fragment(props) {
-  return h(EMPTY_TEMPLATE, {
-    children: isArray(props.children) ? props.children.filter(Boolean) : [props.children]
-  });
+function Fragment(template, props) {
+  if (props.children) {
+    props = {
+      [FRAGMENT_PROP_KEY]: {
+        children: isArray(props.children) ? props.children.filter(Boolean) : [props.children]
+      }
+    };
+  }
+  if (template === EMPTY_TEMPLATE) {
+    template = createTemplate(EMPTY_TEMPLATE);
+  }
+  return new FragmentNode(template, props);
 }
 function onMount(cb) {
   assertInsideComponent("onMounted");