@estjs/template 0.0.14-beta.6 → 0.0.14

package/dist/template.dev.cjs.js

@@ -4,7 +4,7 @@ var shared = require('@estjs/shared');
 var signal = require('@estjs/signal');
 
 /**
-* @estjs/template v0.0.14-beta.6
+* @estjs/template v0.0.14
 * (c) 2023-Present jiangxd <jiangxd2016@gmail.com>
 * @license MIT
 **/
@@ -17,6 +17,7 @@ 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() {
@@ -163,7 +164,7 @@ var SSGNode = class extends LifecycleContext {
   }
   normalizeProps(props) {
     Object.entries(props).forEach(([key, value]) => {
-      if (key === "children") {
+      if (key === CHILDREN_PROP) {
         delete props[key];
       } else if (shared.isFunction(value)) {
         delete props[key];
@@ -173,7 +174,7 @@ var SSGNode = class extends LifecycleContext {
     });
   }
   generateAttributes(props) {
-    return Object.entries(props).filter(([key, value]) => key !== "children" && !shared.isFunction(value)).map(([key, value]) => `${key}="${shared.escape(String(value))}"`).join(" ");
+    return Object.entries(props).filter(([key, value]) => key !== CHILDREN_PROP && !shared.isFunction(value)).map(([key, value]) => `${key}="${shared.escape(String(value))}"`).join(" ");
   }
   renderChildren(children, findIndex) {
     children.forEach(([child]) => {
@@ -183,10 +184,10 @@ var SSGNode = class extends LifecycleContext {
     });
   }
   renderChild(child) {
-    if (shared.isFunction(child)) {
-      return this.renderChild(child(this.props));
-    } else if (signal.isSignal(child)) {
+    if (signal.isSignal(child)) {
       return `<!--${1 /* TEXT_COMPONENT */}-${componentIndex}-->${child.value}<!$>`;
+    } else if (shared.isFunction(child)) {
+      return this.renderChild(child(this.props));
     } else if (isSSGNode(child)) {
       const childResult = child.mount();
       return shared.isFunction(childResult) ? childResult(this.props) : extractSignal(childResult);
@@ -198,9 +199,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;
@@ -317,50 +315,10 @@ function bindNode(node, setter) {
     });
   }
 }
-Promise.resolve();
 function addEventListener(node, eventName, handler) {
   node.addEventListener(eventName, handler);
   return () => node.removeEventListener(eventName, handler);
 }
-function closeHtmlTags(input) {
-  const tagStack = [];
-  const output = [];
-  const tagPattern = /<\/?([\da-z-]+)([^>]*)>/gi;
-  let lastIndex = 0;
-  while (true) {
-    const match = tagPattern.exec(input);
-    if (!match) break;
-    const [fullMatch, tagName] = match;
-    const isEndTag = fullMatch[1] === "/";
-    output.push(input.slice(lastIndex, match.index));
-    lastIndex = match.index + fullMatch.length;
-    if (isEndTag) {
-      while (tagStack.length > 0 && tagStack[tagStack.length - 1] !== tagName) {
-        const unclosedTag = tagStack.pop();
-        if (unclosedTag) {
-          output.push(`</${unclosedTag}>`);
-        }
-      }
-      if (tagStack.length > 0) {
-        tagStack.pop();
-      }
-    } else if (!SELF_CLOSING_TAGS.includes(tagName)) {
-      tagStack.push(tagName);
-    }
-    output.push(fullMatch);
-  }
-  output.push(input.slice(lastIndex));
-  while (tagStack.length > 0) {
-    const unclosedTag = tagStack.pop();
-    if (unclosedTag) {
-      output.push(`</${unclosedTag}>`);
-    }
-  }
-  return output.join("");
-}
-function isHtmlTagName(tagName) {
-  return HTML_TAGS.includes(tagName);
-}
 function convertToHtmlTag(tagName) {
   return SELF_CLOSING_TAGS.includes(tagName) ? `<${tagName}/>` : `<${tagName}></${tagName}>`;
 }
@@ -380,15 +338,11 @@ 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.proxyProps = this.createProxyProps(props);
-  }
-  createProxyProps(props) {
-    if (!props) return {};
-    return signal.signalObject(
-      props,
-      (key) => shared.startsWith(key, EVENT_PREFIX) || shared.startsWith(key, UPDATE_PREFIX) || key === CHILDREN_PROP
-    );
+    this.nodes = [];
+    this.parent = null;
+    this.before = null;
+    this.key || (this.key = props && props.key);
+    this.proxyProps || (this.proxyProps = signal.shallowReactive(props || {}));
   }
   get firstChild() {
     var _a, _b;
@@ -400,6 +354,7 @@ var ComponentNode = class extends LifecycleContext {
   }
   mount(parent, before) {
     var _a, _b, _c, _d;
+    this.parent = parent;
     if (!shared.isFunction(this.template)) {
       throw new Error("Template must be a function");
     }
@@ -407,21 +362,31 @@ 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(signal.useReactive(this.proxyProps, ["children"]));
-    const mountedNode = (_d = (_c = this.rootNode) == null ? void 0 : _c.mount(parent, before)) != null ? _d : [];
+    this.rootNode = this.template(signal.useReactive(this.proxyProps, [CHILDREN_PROP]));
+    this.nodes = (_d = (_c = this.rootNode) == null ? void 0 : _c.mount(parent, before)) != null ? _d : [];
     this.callMountHooks();
     this.patchProps(this.props);
     this.removeRef();
-    return mountedNode;
+    return this.nodes;
   }
   unmount() {
     var _a;
-    this.callDestroyHooks();
-    this.clearHooks();
+    this.callLifecycleHooks("destroy");
+    this.cleanup();
     (_a = this.rootNode) == null ? void 0 : _a.unmount();
+    this.resetState();
+    if (this.key) {
+      componentCache.delete(this.key);
+    }
+  }
+  resetState() {
     this.rootNode = null;
     this.proxyProps = {};
-    this.clearEmitter();
+    this.nodes = [];
+    this.parent = null;
+  }
+  callLifecycleHooks(type) {
+    this.hooks[type].forEach((handler) => handler());
   }
   callMountHooks() {
     this.hooks.mounted.forEach((handler) => handler());
@@ -440,9 +405,11 @@ var ComponentNode = class extends LifecycleContext {
     this.rootNode = node.rootNode;
     this.trackMap = node.trackMap;
     this.hooks = node.hooks;
-    const props = this.props;
-    this.props = node.props;
-    this.patchProps(props);
+    if (shared.hasChanged(node.props, this.props)) {
+      const props = this.props;
+      this.props = node.props;
+      this.patchProps(props);
+    }
   }
   getNodeTrack(trackKey) {
     let track = this.trackMap.get(trackKey);
@@ -462,7 +429,7 @@ var ComponentNode = class extends LifecycleContext {
     for (const [key, prop] of Object.entries(props)) {
       if (shared.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 (shared.startsWith(key, UPDATE_PREFIX)) {
         this.patchUpdateHandler(key, prop);
@@ -482,22 +449,25 @@ var ComponentNode = class extends LifecycleContext {
     prop.value = (_b = (_a = this.rootNode) == null ? void 0 : _a.firstChild) != null ? _b : null;
   }
   patchUpdateHandler(key, prop) {
-    this.props[key] = extractSignal(prop);
+    this.proxyProps[key] = extractSignal(prop);
   }
   patchNormalProp(key, prop) {
-    var _a, _b;
-    const newValue = (_b = (_a = this.proxyProps)[key]) != null ? _b : _a[key] = signal.useSignal(prop);
     const track = this.getNodeTrack(key);
     track.cleanup = signal.useEffect(() => {
-      newValue.value = shared.isFunction(prop) ? prop() : prop;
+      this.proxyProps[key] = shared.isFunction(prop) ? prop() : prop;
     });
   }
+  cleanup() {
+    this.trackMap.forEach((track) => {
+      var _a;
+      return (_a = track.cleanup) == null ? void 0 : _a.call(track);
+    });
+    this.trackMap.clear();
+    this.emitter.forEach((cleanup) => cleanup());
+    this.emitter.clear();
+  }
 };
 
-// ../shared/src/comm.ts
-var _toString = Object.prototype.toString;
-var isPlainObject = (val) => _toString.call(val) === "[object Object]";
-
 // src/patch.ts
 function patchChildren(parent, childrenMap, nextChildren, before) {
   const result = /* @__PURE__ */ new Map();
@@ -611,14 +581,12 @@ var TemplateNode = class {
     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);
     }
@@ -648,7 +616,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);
       });
     }
@@ -664,40 +632,16 @@ var TemplateNode = class {
     return this.nodes;
   }
   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 (shared.isArray(children)) {
-          children.forEach((child) => {
-            this.deleteFragmentTextNode(child);
-          });
-        } else {
-          this.deleteFragmentTextNode(children);
-        }
-      }
-    }
     this.nodes = [];
     this.mounted = false;
-  }
-  deleteFragmentTextNode(child) {
-    var _a;
-    if (shared.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);
+    if (this.key) {
+      componentCache.delete(this.key);
     }
   }
   inheritNode(node) {
@@ -713,7 +657,7 @@ var TemplateNode = class {
     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);
@@ -765,9 +709,9 @@ var TemplateNode = class {
     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 (shared.startsWith(attr, "on")) {
+      } else if (shared.startsWith(attr, EVENT_PREFIX)) {
         this.patchEventListener(key, node, attr, value);
       } else {
         if (this.bindValueKeys.includes(attr)) return;
@@ -777,8 +721,7 @@ var TemplateNode = class {
     });
   }
   getBindUpdateValue(props, key, attr) {
-    const UPDATE_PREFIX2 = "update";
-    const updateKey = `${UPDATE_PREFIX2}${shared.capitalize(attr)}`;
+    const updateKey = `${UPDATE_PREFIX}${shared.capitalize(attr)}`;
     if (updateKey && props[updateKey] && shared.isFunction(props[updateKey])) {
       this.bindValueKeys.push(updateKey);
       return props[updateKey];
@@ -807,14 +750,9 @@ var TemplateNode = class {
   }
   patchAttribute(key, element, attr, value, updateFn) {
     const track = this.getNodeTrack(`${key}:${attr}`);
-    const val = shared.isFunction(value) ? value() : value;
-    const triggerValue = signal.isSignal(val) ? val : signal.shallowSignal(val);
-    setAttribute(element, attr, triggerValue.value);
+    const triggerValue = signal.shallowSignal();
     const cleanup = signal.useEffect(() => {
-      const val2 = shared.isFunction(value) ? value() : value;
-      if (isPlainObject(val2) && isPlainObject(triggerValue.peek()) && JSON.stringify(triggerValue.value) === JSON.stringify(val2))
-        return;
-      triggerValue.value = signal.isSignal(val2) ? val2.value : val2;
+      triggerValue.value = signal.isSignal(value) || signal.isComputed(value) ? value.value : value;
       setAttribute(element, attr, triggerValue.value);
     });
     let cleanupBind;
@@ -829,7 +767,6 @@ var TemplateNode = class {
     };
   }
   getNodeTrack(trackKey, trackLastNodes, isRoot) {
-    var _a;
     let track = this.trackMap.get(trackKey);
     if (!track) {
       track = { cleanup: () => {
@@ -842,7 +779,7 @@ var TemplateNode = class {
       }
       this.trackMap.set(trackKey, track);
     }
-    (_a = track.cleanup) == null ? void 0 : _a.call(track);
+    track.cleanup && track.cleanup();
     return track;
   }
   patchChild(track, parent, child, before) {
@@ -894,18 +831,36 @@ var TemplateNode = class {
 };
 
 // src/jsxRenderer.ts
-function h(template, props, key) {
-  if (shared.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);
+var componentCache = /* @__PURE__ */ new Map();
+function createNodeCache(NodeConstructor, template, props = {}, key) {
+  if (key) {
+    const cached = componentCache.get(key);
+    if (cached) {
+      return cached;
     }
   }
-  return shared.isFunction(template) ? new ComponentNode(template, props, key) : new TemplateNode(template, props, key);
+  if (typeof template === "string") {
+    template = createTemplate(template);
+  }
+  const newNode = new NodeConstructor(template, props, key);
+  if (key && newNode instanceof ComponentNode) {
+    componentCache.set(key, newNode);
+  }
+  return newNode;
+}
+function h(template, props = {}, key) {
+  if (template === EMPTY_TEMPLATE) {
+    return Fragment(template, props);
+  }
+  if (shared.isString(template)) {
+    const htmlTemplate = convertToHtmlTag(template);
+    const wrappedProps = { [SINGLE_PROP_KEY]: props };
+    return createNodeCache(TemplateNode, htmlTemplate, wrappedProps, key);
+  }
+  if (shared.isFunction(template)) {
+    return createNodeCache(ComponentNode, template, props, key);
+  }
+  return createNodeCache(TemplateNode, template, props, key);
 }
 function isComponent(node) {
   return node instanceof ComponentNode;
@@ -915,13 +870,17 @@ function isJsxElement(node) {
 }
 function createTemplate(html) {
   const template = document.createElement("template");
-  template.innerHTML = closeHtmlTags(html);
+  template.innerHTML = html;
   return template;
 }
-function Fragment(props) {
-  return h(EMPTY_TEMPLATE, {
-    children: shared.isArray(props.children) ? props.children.filter(Boolean) : [props.children]
-  });
+function Fragment(template, props) {
+  const processedProps = props.children ? {
+    [FRAGMENT_PROP_KEY]: {
+      children: Array.isArray(props.children) ? props.children.filter(Boolean) : [props.children]
+    }
+  } : props;
+  const templateElement = template === EMPTY_TEMPLATE ? createTemplate(EMPTY_TEMPLATE) : template;
+  return createNodeCache(TemplateNode, templateElement, processedProps);
 }
 function onMount(cb) {
   assertInsideComponent("onMounted");
@@ -939,18 +898,15 @@ function assertInsideComponent(hookName, key) {
     );
   }
 }
-function useProvide(key, value) {
-  assertInsideComponent("useProvide", key);
+function provide(key, value) {
+  assertInsideComponent("provide", key);
   LifecycleContext.ref && LifecycleContext.ref.setContext(key, value);
 }
-function useInject(key, defaultValue) {
+function inject(key, defaultValue) {
   var _a;
-  assertInsideComponent("useInject", key);
+  assertInsideComponent("inject", key);
   return (_a = LifecycleContext.ref && LifecycleContext.ref.getContext(key)) != null ? _a : defaultValue;
 }
-function useRef() {
-  return signal.shallowSignal(null);
-}
 
 // src/server.ts
 function renderToString(component, props) {
@@ -979,13 +935,12 @@ function ssg(component, props) {
 exports.Fragment = Fragment;
 exports.h = h;
 exports.hydrate = hydrate;
+exports.inject = inject;
 exports.isComponent = isComponent;
 exports.isJsxElement = isJsxElement;
 exports.onDestroy = onDestroy;
 exports.onMount = onMount;
+exports.provide = provide;
 exports.renderToString = renderToString;
 exports.ssg = ssg;
 exports.template = createTemplate;
-exports.useInject = useInject;
-exports.useProvide = useProvide;
-exports.useRef = useRef;