sinwan 1.1.0 → 1.1.2

package/dist/cjs/server/index.development.js

@@ -500,7 +500,7 @@ function resetDOMOps() {
 
 // src/renderer/events.ts
 function isEventProp(key) {
-  return key.length > 2 && key[0] === "o" && key[1] === "n" && key[2] >= "A" && key[2] <= "Z";
+  return key.length > 2 && key.startsWith("on");
 }
 function toEventName(key) {
   return key.slice(2).toLowerCase();
@@ -537,6 +537,19 @@ function batch(fn) {
     }
   }
 }
+// src/reactivity/normalization.ts
+function isReactive(value) {
+  return isSignal(value) || isComputed(value) || typeof value === "function";
+}
+function resolve(value) {
+  if (isSignal(value) || isComputed(value)) {
+    return value.value;
+  }
+  if (typeof value === "function") {
+    return value();
+  }
+  return value;
+}
 // src/component/control-flow.ts
 var SHOW_TYPE = Symbol.for("Sinwan.Show");
 var FOR_TYPE = Symbol.for("Sinwan.For");
@@ -630,6 +643,9 @@ function Portal(props) {
     children: []
   };
 }
+function isElementLike(value) {
+  return value != null && typeof value === "object" && "tag" in value;
+}
 function isShowElement(element) {
   return element.tag === SHOW_TYPE;
 }
@@ -654,6 +670,107 @@ function isDynamicElement(element) {
 function isPortalElement(element) {
   return element.tag === PORTAL_TYPE;
 }
+function resolveSwitchContent(element) {
+  const props = element.props;
+  const children = normalizeContent(props.children ?? element.children);
+  const match = findTruthyMatch(children);
+  return match !== undefined ? match : props.fallback;
+}
+function findTruthyMatch(nodes) {
+  for (const node of nodes) {
+    if (node == null || typeof node === "boolean")
+      continue;
+    if (Array.isArray(node)) {
+      const match = findTruthyMatch(node);
+      if (match !== undefined)
+        return match;
+      continue;
+    }
+    if (isElementLike(node)) {
+      let element = node;
+      if (typeof element.tag === "function") {
+        const tag = element.tag;
+        if (tag === Match || tag === Show || tag === For || tag === Index || tag === Key || tag === Switch) {
+          element = tag(element.props);
+        }
+      }
+      if (isMatchElement(element)) {
+        const when = readReactive(element.props.when);
+        if (when) {
+          return resolveMatchChildren(element, when);
+        }
+      } else if (isShowElement(element)) {
+        const when = readReactive(element.props.when);
+        if (when) {
+          const content = resolveShowChildren(element, when);
+          const match = findTruthyMatch(normalizeContent(content));
+          if (match !== undefined)
+            return match;
+        } else if (element.props.fallback) {
+          const match = findTruthyMatch(normalizeContent(element.props.fallback));
+          if (match !== undefined)
+            return match;
+        }
+      } else if (isForElement(element)) {
+        const props = element.props;
+        const items = readReactive(props.each);
+        if (Array.isArray(items)) {
+          for (let i = 0;i < items.length; i++) {
+            const child = props.children(items[i], () => i);
+            const match = findTruthyMatch(normalizeContent(child));
+            if (match !== undefined)
+              return match;
+          }
+        }
+      } else if (isIndexElement(element)) {
+        const props = element.props;
+        const items = readReactive(props.each);
+        if (Array.isArray(items)) {
+          for (let i = 0;i < items.length; i++) {
+            const child = props.children(() => items[i], i);
+            const match = findTruthyMatch(normalizeContent(child));
+            if (match !== undefined)
+              return match;
+          }
+        }
+      } else if (isKeyElement(element)) {
+        const key = readReactive(element.props.when);
+        const child = resolveKeyChildren(element, key);
+        const match = findTruthyMatch(normalizeContent(child));
+        if (match !== undefined)
+          return match;
+      }
+    }
+  }
+  return;
+}
+function resolveMatchChildren(element, value) {
+  const children = element.props.children ?? element.children;
+  if (typeof children === "function") {
+    return children(value);
+  }
+  return children;
+}
+function resolveShowChildren(element, value) {
+  const children = element.props.children ?? element.children;
+  if (typeof children === "function") {
+    return children(value);
+  }
+  return children;
+}
+function resolveKeyChildren(element, value) {
+  const children = element.props.children ?? element.children;
+  if (typeof children === "function") {
+    return children(value);
+  }
+  return children;
+}
+function normalizeContent(content) {
+  if (content == null || typeof content === "boolean") {
+    return [];
+  }
+  return Array.isArray(content) ? content : [content];
+}
 function normalizeChildren2(children) {
   if (children == null || typeof children === "boolean") {
     return [];
@@ -661,7 +778,7 @@ function normalizeChildren2(children) {
   return Array.isArray(children) ? children : [children];
 }
 function readReactive(value) {
-  return isSignal(value) || isComputed(value) ? value.value : value;
+  return resolve(value);
 }
 function appendHiddenDisplay(style) {
   const trimmed = style.trim();
@@ -831,75 +948,27 @@ async function renderIndexElement(element) {
   const rendered = await Promise.all(each.map((item, index) => renderToString(props.children(() => item, index))));
   return rendered.join("");
 }
-function resolveSwitchContent(element) {
-  const props = element.props;
-  const children = normalizeContent(props.children ?? element.children);
-  for (const child of children) {
-    const match = getMatchElement(child);
-    if (!match) {
-      continue;
-    }
-    const when = readReactive2(match.props.when);
-    if (when) {
-      return resolveMatchChildren(match, when);
-    }
-  }
-  return props.fallback;
-}
-function resolveMatchChildren(element, value) {
-  const children = element.props.children ?? element.children;
-  if (typeof children === "function") {
-    return children(value);
-  }
-  return children;
-}
-function resolveKeyChildren(element, value) {
-  const children = element.props.children ?? element.children;
-  if (typeof children === "function") {
-    return children(value);
-  }
-  return children;
-}
 function createDynamicElement(element, tag) {
   if (typeof tag !== "string" && typeof tag !== "function") {
     return null;
   }
   const { component, ...props } = element.props;
-  const children = normalizeContent(props.children ?? element.children);
+  const children = normalizeContent2(props.children ?? element.children);
   return {
     tag,
     props,
     children
   };
 }
-function resolveShowChildren(element, value) {
-  const children = element.props.children ?? element.children;
-  if (typeof children === "function") {
-    return children(value);
-  }
-  return children;
-}
 function readReactive2(value) {
   return isSignal(value) || isComputed(value) ? value.value : value;
 }
-function normalizeContent(content) {
+function normalizeContent2(content) {
   if (content == null || typeof content === "boolean") {
     return [];
   }
   return Array.isArray(content) ? content : [content];
 }
-function isElementLike(value) {
-  return value != null && typeof value === "object" && "tag" in value;
-}
-function getMatchElement(value) {
-  if (!isElementLike(value)) {
-    return null;
-  }
-  if (isMatchElement(value)) {
-    return value;
-  }
-  return value.tag === Match ? Match(value.props) : null;
-}
 // src/component/instance.ts
 var uidCounter = 0;
 function createComponentInstance(component, props, parent) {
@@ -952,19 +1021,28 @@ function fireMountedHooks(instance) {
   }
 }
 function fireUnmountedHooks(instance) {
-  for (const child of instance.children) {
+  const children = [...instance.children];
+  for (const child of children) {
     fireUnmountedHooks(child);
   }
-  if (instance.isMounted && !instance.isUnmounted) {
+  if (!instance.isUnmounted) {
     instance.isUnmounted = true;
-    instance.isMounted = false;
-    for (const hook of instance._unmountedHooks) {
-      hook();
+    if (instance.isMounted) {
+      instance.isMounted = false;
+      for (const hook of instance._unmountedHooks) {
+        hook();
+      }
     }
     for (const dispose of instance.effects) {
       dispose();
     }
     instance.effects.length = 0;
+    if (instance.parent) {
+      const idx = instance.parent.children.indexOf(instance);
+      if (idx !== -1) {
+        instance.parent.children.splice(idx, 1);
+      }
+    }
   }
 }
 function fireUpdatedHooks(instance) {
@@ -1449,9 +1527,9 @@ function resolveShowChildren2(element, value) {
 }
 function resolveSwitchContent2(element) {
   const props = element.props;
-  const children = normalizeContent2(props.children ?? element.children);
+  const children = normalizeContent3(props.children ?? element.children);
   for (const child of children) {
-    const match = getMatchElement2(child);
+    const match = getMatchElement(child);
     if (!match) {
       continue;
     }
@@ -1481,7 +1559,7 @@ function createDynamicElement2(element, tag) {
     return null;
   }
   const { component, ...props } = element.props;
-  const children = normalizeContent2(props.children ?? element.children);
+  const children = normalizeContent3(props.children ?? element.children);
   return {
     tag,
     props,
@@ -1491,7 +1569,7 @@ function createDynamicElement2(element, tag) {
 function readReactive3(value) {
   return isSignal(value) || isComputed(value) ? value.value : value;
 }
-function normalizeContent2(content) {
+function normalizeContent3(content) {
   if (content == null || typeof content === "boolean") {
     return [];
   }
@@ -1500,7 +1578,7 @@ function normalizeContent2(content) {
 function isElementLike2(value) {
   return value != null && typeof value === "object" && "tag" in value;
 }
-function getMatchElement2(value) {
+function getMatchElement(value) {
   if (!isElementLike2(value)) {
     return null;
   }
@@ -1712,9 +1790,9 @@ function resolveShowChildren3(element, value) {
 }
 function resolveSwitchContent3(element) {
   const props = element.props;
-  const children = normalizeContent3(props.children ?? element.children);
+  const children = normalizeContent4(props.children ?? element.children);
   for (const child of children) {
-    const match = getMatchElement3(child);
+    const match = getMatchElement2(child);
     if (!match) {
       continue;
     }
@@ -1744,7 +1822,7 @@ function createDynamicElement3(element, tag) {
     return null;
   }
   const { component, ...props } = element.props;
-  const children = normalizeContent3(props.children ?? element.children);
+  const children = normalizeContent4(props.children ?? element.children);
   return {
     tag,
     props,
@@ -1754,7 +1832,7 @@ function createDynamicElement3(element, tag) {
 function readReactive4(value) {
   return isSignal(value) || isComputed(value) ? value.value : value;
 }
-function normalizeContent3(content) {
+function normalizeContent4(content) {
   if (content == null || typeof content === "boolean") {
     return [];
   }
@@ -1763,7 +1841,7 @@ function normalizeContent3(content) {
 function isElementLike3(value) {
   return value != null && typeof value === "object" && "tag" in value;
 }
-function getMatchElement3(value) {
+function getMatchElement2(value) {
   if (!isElementLike3(value)) {
     return null;
   }
@@ -1773,5 +1851,5 @@ function getMatchElement3(value) {
   return value.tag === Match ? Match(value.props) : null;
 }
 
-//# debugId=B6B29A838DF26EA964756E2164756E21
+//# debugId=E58B3ECE3457B48064756E2164756E21
 //# sourceMappingURL=index.development.js.map