@askrjs/askr 0.0.6 → 0.0.8

package/dist/router/index.js

@@ -324,6 +324,9 @@ function isSchedulerExecuting() {
   return globalScheduler.isExecuting();
 }
 
+// src/common/jsx.ts
+var Fragment = /* @__PURE__ */ Symbol.for("askr.fragment");
+
 // src/runtime/context.ts
 var CONTEXT_FRAME_SYMBOL = /* @__PURE__ */ Symbol("__tempoContextFrame__");
 var currentContextFrame = null;
@@ -340,7 +343,7 @@ function getCurrentContextFrame() {
   return currentContextFrame;
 }
 
-// src/renderer/diag/index.ts
+// src/renderer/diag.ts
 function getDiagMap() {
   try {
     const root = globalThis;
@@ -432,7 +435,7 @@ function createWrappedHandler(handler, flushAfter = false) {
   };
 }
 function isSkippedProp(key) {
-  return key === "children" || key === "key";
+  return key === "children" || key === "key" || key === "ref";
 }
 function isIgnoredForPropChanges(key) {
   if (key === "children" || key === "key") return true;
@@ -642,9 +645,6 @@ function isKeyedReorderFastPathEligible(parent, newChildren, oldKeyMap) {
   };
 }
 
-// src/common/jsx.ts
-var Fragment = /* @__PURE__ */ Symbol.for("askr.fragment");
-
 // src/runtime/dev-namespace.ts
 function getDevNamespace() {
   if (process.env.NODE_ENV === "production") return {};
@@ -1008,6 +1008,20 @@ function removeAllListeners(root) {
 
 // src/renderer/dom.ts
 var IS_DOM_AVAILABLE = typeof document !== "undefined";
+var fallbackComponentInstanceId = 0;
+function nextComponentInstanceId() {
+  const key = "__COMPONENT_INSTANCE_ID";
+  try {
+    __ASKR_incCounter(key);
+    const root = globalThis;
+    const diag = root.__ASKR_DIAG;
+    const n = diag ? diag[key] : void 0;
+    if (typeof n === "number" && Number.isFinite(n)) return `comp-${n}`;
+  } catch {
+  }
+  fallbackComponentInstanceId++;
+  return `comp-${fallbackComponentInstanceId}`;
+}
 function addTrackedListener(el, eventName, handler) {
   const wrappedHandler = createWrappedHandler(handler, true);
   const options = getPassiveOptions(eventName);
@@ -1030,6 +1044,10 @@ function applyPropsToElement(el, props, tagName) {
     const value = props[key];
     if (isSkippedProp(key)) continue;
     if (value === void 0 || value === null || value === false) continue;
+    if (key === "ref") {
+      applyRef(el, value);
+      continue;
+    }
     const eventName = parseEventName(key);
     if (eventName) {
       addTrackedListener(el, eventName, value);
@@ -1044,6 +1062,18 @@ function applyPropsToElement(el, props, tagName) {
     }
   }
 }
+function applyRef(el, ref) {
+  const r = ref;
+  if (!r) return;
+  if (typeof r === "function") {
+    r(el);
+    return;
+  }
+  try {
+    r.current = el;
+  } catch {
+  }
+}
 function applyFormControlProp(el, key, value, tagName) {
   if (key === "value") {
     if (tagNamesEqualIgnoreCase(tagName, "input") || tagNamesEqualIgnoreCase(tagName, "textarea") || tagNamesEqualIgnoreCase(tagName, "select")) {
@@ -1169,7 +1199,7 @@ function createComponentElement(node, type, props) {
   let childInstance = node.__instance;
   if (!childInstance) {
     childInstance = createComponentInstance(
-      `comp-${Math.random().toString(36).slice(2, 7)}`,
+      nextComponentInstanceId(),
       componentFn,
       props || {},
       null
@@ -2411,6 +2441,10 @@ function applyPropsToElement2(el, props) {
   for (const [key, value] of Object.entries(props)) {
     if (key === "children" || key === "key") continue;
     if (value === void 0 || value === null || value === false) continue;
+    if (key === "ref") {
+      applyRef2(el, value);
+      continue;
+    }
     const eventName = parseEventName(key);
     if (eventName) {
       const wrappedHandler = createWrappedHandler(
@@ -2438,6 +2472,18 @@ function applyPropsToElement2(el, props) {
     }
   }
 }
+function applyRef2(el, ref) {
+  const r = ref;
+  if (!r) return;
+  if (typeof r === "function") {
+    r(el);
+    return;
+  }
+  try {
+    r.current = el;
+  } catch {
+  }
+}
 function tryFirstRenderKeyedChildren(target, vnode) {
   const children = vnode.children;
   if (!Array.isArray(children) || !hasKeyedChildren(children)) {
@@ -3135,9 +3181,12 @@ function Link({ href, children }) {
   };
 }
 
-// src/foundations/layout.tsx
+// src/foundations/structures/layout.tsx
 function layout(Layout) {
-  return (children, props) => Layout({ ...props, children });
+  return (children, props) => {
+    const mergedProps = { ...props, children };
+    return Layout(mergedProps);
+  };
 }
 
 export { Link, clearRoutes, getRoutes, layout, navigate, route };