@vesk/vesk-cli 0.2.61 → 0.2.62

package/dist/cli.js

@@ -30533,6 +30533,53 @@ function transformTrackedInit(init, tracked2) {
   if (!expr) return init;
   return transformTracked({ raw: init, ast: expr }, tracked2);
 }
+function runtimeDeclaredNames(node) {
+  if (!(node instanceof RuntimeStatement)) return [];
+  const stmt = node.ast;
+  if (!stmt || stmt.type !== "VariableDeclaration" || !stmt.declarations) return [];
+  const out = [];
+  for (const d of stmt.declarations) {
+    if (d.id && d.id.type === "Identifier" && typeof d.id.name === "string") out.push(d.id.name);
+  }
+  return out;
+}
+function initReadsAnyOf(init, names) {
+  if (!init || names.size === 0) return false;
+  let expr = null;
+  try {
+    const prog = parse4(`(${init})`);
+    expr = prog.body?.[0]?.type === "ExpressionStatement" ? prog.body[0].expression ?? null : null;
+  } catch {
+    return false;
+  }
+  if (!expr) return false;
+  let found = false;
+  const walk9 = (n) => {
+    if (found || !n || typeof n !== "object") return;
+    if (Array.isArray(n)) {
+      for (const c of n) walk9(c);
+      return;
+    }
+    const t = n.type;
+    if (typeof t !== "string") return;
+    if (t === "Identifier") {
+      if (names.has(n.name)) found = true;
+      return;
+    }
+    if (t === "MemberExpression") {
+      const m = n;
+      walk9(m.object);
+      if (m.computed) walk9(m.property);
+      return;
+    }
+    for (const key of Object.keys(n)) {
+      if (key === "loc" || key === "range" || key === "start" || key === "end") continue;
+      walk9(n[key]);
+    }
+  };
+  walk9(expr);
+  return found;
+}
 function indent2(code, level = 1) {
   const pad = "	".repeat(level);
   return code.split("\n").map((l) => l ? pad + l : "").join("\n");
@@ -31918,8 +31965,19 @@ function generateComponent(comp, importedNames = /* @__PURE__ */ new Set(), hydr
   ctx2.push(indent2(`let __pendingChild = null;`));
   const paramInit = buildParamInit2(comp.paramNames, comp.propsAlias);
   if (paramInit) ctx2.push(indent2(paramInit));
+  const deferredTrackDecls = /* @__PURE__ */ new Set();
+  {
+    const declaredSoFar = /* @__PURE__ */ new Set();
+    for (const node of comp.body) {
+      if (node instanceof TrackDecl) {
+        if (initReadsAnyOf(node.init, declaredSoFar)) deferredTrackDecls.add(node);
+        continue;
+      }
+      for (const name of runtimeDeclaredNames(node)) declaredSoFar.add(name);
+    }
+  }
   for (const node of comp.body) {
-    if (node instanceof TrackDecl) {
+    if (node instanceof TrackDecl && !deferredTrackDecls.has(node)) {
       emitNode(ctx2, node, tracked2, null);
     }
   }
@@ -31946,7 +32004,10 @@ function generateComponent(comp, importedNames = /* @__PURE__ */ new Set(), hydr
     }
   }
   for (const node of comp.body) {
-    if (node instanceof TrackDecl) continue;
+    if (node instanceof TrackDecl) {
+      if (deferredTrackDecls.has(node)) emitNode(ctx2, node, tracked2, null);
+      continue;
+    }
     const v = emitNode(ctx2, node, tracked2, null, void 0, "__components", topPendingSkip, topBudget || void 0);
     if (v) {
       if (ctx2.hydrate) {
@@ -52738,6 +52799,64 @@ function transformTrackedInit2(init, tracked2) {
     return init;
   return transformTracked2({ raw: init, ast: expr }, tracked2);
 }
+function runtimeDeclaredNames2(node) {
+  if (!(node instanceof RuntimeStatement))
+    return [];
+  const stmt = node.ast;
+  if (!stmt || stmt.type !== "VariableDeclaration" || !stmt.declarations)
+    return [];
+  const out = [];
+  for (const d of stmt.declarations) {
+    if (d.id && d.id.type === "Identifier" && typeof d.id.name === "string")
+      out.push(d.id.name);
+  }
+  return out;
+}
+function initReadsAnyOf2(init, names) {
+  if (!init || names.size === 0)
+    return false;
+  let expr = null;
+  try {
+    const prog = parse4(`(${init})`);
+    expr = prog.body?.[0]?.type === "ExpressionStatement" ? prog.body[0].expression ?? null : null;
+  } catch {
+    return false;
+  }
+  if (!expr)
+    return false;
+  let found = false;
+  const walk9 = (n) => {
+    if (found || !n || typeof n !== "object")
+      return;
+    if (Array.isArray(n)) {
+      for (const c of n)
+        walk9(c);
+      return;
+    }
+    const t = n.type;
+    if (typeof t !== "string")
+      return;
+    if (t === "Identifier") {
+      if (names.has(n.name))
+        found = true;
+      return;
+    }
+    if (t === "MemberExpression") {
+      const m = n;
+      walk9(m.object);
+      if (m.computed)
+        walk9(m.property);
+      return;
+    }
+    for (const key of Object.keys(n)) {
+      if (key === "loc" || key === "range" || key === "start" || key === "end")
+        continue;
+      walk9(n[key]);
+    }
+  };
+  walk9(expr);
+  return found;
+}
 var NON_BUBBLING_EVENTS2 = /* @__PURE__ */ new Set([
   "focus",
   "blur",
@@ -54415,8 +54534,21 @@ function generateComponent2(comp, importedNames = /* @__PURE__ */ new Set(), hyd
   const paramInit = buildParamInit3(comp.paramNames, comp.propsAlias);
   if (paramInit)
     ctx2.push(indent3(paramInit));
+  const deferredTrackDecls = /* @__PURE__ */ new Set();
+  {
+    const declaredSoFar = /* @__PURE__ */ new Set();
+    for (const node of comp.body) {
+      if (node instanceof TrackDecl) {
+        if (initReadsAnyOf2(node.init, declaredSoFar))
+          deferredTrackDecls.add(node);
+        continue;
+      }
+      for (const name of runtimeDeclaredNames2(node))
+        declaredSoFar.add(name);
+    }
+  }
   for (const node of comp.body) {
-    if (node instanceof TrackDecl) {
+    if (node instanceof TrackDecl && !deferredTrackDecls.has(node)) {
       emitNode2(ctx2, node, tracked2, null);
     }
   }
@@ -54439,8 +54571,11 @@ function generateComponent2(comp, importedNames = /* @__PURE__ */ new Set(), hyd
     }
   }
   for (const node of comp.body) {
-    if (node instanceof TrackDecl)
+    if (node instanceof TrackDecl) {
+      if (deferredTrackDecls.has(node))
+        emitNode2(ctx2, node, tracked2, null);
       continue;
+    }
     const v = emitNode2(ctx2, node, tracked2, null, void 0, "__components", topPendingSkip, topBudget || void 0);
     if (v) {
       if (ctx2.hydrate) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.61",
+  "version": "0.2.62",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -8,10 +8,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.2.61",
-    "@vesk/compiler": "^0.2.61",
-    "@vesk/plugin-tailwind": "^0.2.61",
-    "@vesk/runtime": "^0.2.61",
+    "@vesk/adapter": "^0.2.62",
+    "@vesk/compiler": "^0.2.62",
+    "@vesk/plugin-tailwind": "^0.2.62",
+    "@vesk/runtime": "^0.2.62",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",