@vesk/vesk-cli 0.2.32 → 0.2.34

package/dist/cli.js

@@ -2139,15 +2139,27 @@ var init_resource = __esm({
     isServer = () => !!g().__vsk_ssr;
     ssrSink = null;
     DEFAULT_FAILURE_TTL = 1e4;
-    useFetch.text = (url, options) => useFetch(() => doFetch(resolveFetchUrl(url), buildRequestInit(options ?? {})).then((r) => r.text()), {
+    useFetch.text = (url, options) => useFetch(async () => {
+      const res = await doFetch(resolveFetchUrl(url), buildRequestInit(options ?? {}));
+      if (!res.ok) throw new HttpError(res.status, res.statusText);
+      return res.text();
+    }, {
       ...options,
       key: options?.key ?? url
     });
-    useFetch.json = (url, options) => useFetch(() => doFetch(resolveFetchUrl(url), buildRequestInit(options ?? {})).then((r) => r.json()), {
+    useFetch.json = (url, options) => useFetch(async () => {
+      const res = await doFetch(resolveFetchUrl(url), buildRequestInit(options ?? {}));
+      if (!res.ok) throw new HttpError(res.status, res.statusText);
+      return res.json();
+    }, {
       ...options,
       key: options?.key ?? url
     });
-    useFetch.arrayBuffer = (url, options) => useFetch(() => doFetch(resolveFetchUrl(url), buildRequestInit(options ?? {})).then((r) => r.arrayBuffer()), {
+    useFetch.arrayBuffer = (url, options) => useFetch(async () => {
+      const res = await doFetch(resolveFetchUrl(url), buildRequestInit(options ?? {}));
+      if (!res.ok) throw new HttpError(res.status, res.statusText);
+      return res.arrayBuffer();
+    }, {
       ...options,
       key: options?.key ?? url
     });
@@ -36275,6 +36287,23 @@ function getJSXTagName2(el) {
   if (name.type === "JSXNamespacedName") return name.namespace.name + ":" + name.name.name;
   return null;
 }
+function emitJSXText(g2, text, start, end) {
+  if (text.indexOf("<") === -1 && text.indexOf(">") === -1 && text.indexOf("&") === -1 && text.indexOf("{") === -1 && text.indexOf("}") === -1) {
+    g2.add(text, start, end);
+    return;
+  }
+  let out = "";
+  for (let i = 0; i < text.length; i++) {
+    const c = text[i];
+    if (c === "<") out += "&lt;";
+    else if (c === ">") out += "&gt;";
+    else if (c === "&") out += "&amp;";
+    else if (c === "{") out += "&#123;";
+    else if (c === "}") out += "&#125;";
+    else out += c;
+  }
+  g2.add(out, start, end);
+}
 function collapseWithMap(value) {
   let out = "";
   const map = [];
@@ -36493,7 +36522,7 @@ function emitJSXAttr(g2, source, attr) {
     g2.add(source.slice(v.start, v.end), v.start, v.end);
   }
 }
-function emitJSXElement(g2, source, el, opts) {
+function emitJSXElement(g2, source, el, opts, hoist) {
   const op = el.openingElement;
   const name = op.name;
   let prev;
@@ -36519,7 +36548,7 @@ function emitJSXElement(g2, source, el, opts) {
     g2.add(tail, prev, op.end);
   }
   if (op.selfClosing) return;
-  emitJSXChildren(g2, source, el.children ?? [], opts);
+  emitJSXChildren(g2, source, el.children ?? [], opts, hoist);
   if (el.closingElement) {
     g2.add(source.slice(el.closingElement.start, el.closingElement.end), el.closingElement.start, el.closingElement.end);
   }
@@ -36529,9 +36558,9 @@ function emitJSXExprBody(g2, source, expr, opts) {
   if (expr.type === "JSXFragment") return emitJSXFragment(g2, source, expr, opts);
   g2.add(source.slice(expr.start, expr.end), expr.start, expr.end);
 }
-function emitJSXFragment(g2, source, frag, opts) {
+function emitJSXFragment(g2, source, frag, opts, hoist) {
   g2.addRaw("<>");
-  emitJSXChildren(g2, source, frag.children ?? [], opts);
+  emitJSXChildren(g2, source, frag.children ?? [], opts, hoist);
   g2.addRaw("</>");
 }
 function emitForClauseMap(g2, source, child, text, map, clauseStart, bodyEmit, emptyEmit) {
@@ -36582,7 +36611,7 @@ function emitForClauseMap(g2, source, child, text, map, clauseStart, bodyEmit, e
   }
   return true;
 }
-function emitJSXChildren(g2, source, children, opts) {
+function emitJSXChildren(g2, source, children, opts, hoist) {
   let i = 0;
   let forPending = false;
   while (i < children.length) {
@@ -36664,7 +36693,7 @@ function emitJSXChildren(g2, source, children, opts) {
         continue;
       }
       forPending = false;
-      g2.add(text, child.start, child.end);
+      emitJSXText(g2, text, child.start, child.end);
       i++;
     } else if (child.type === "JSXExpressionContainer") {
       if (child.expression.type === "JSXEmptyExpression") {
@@ -36683,12 +36712,16 @@ function emitJSXChildren(g2, source, children, opts) {
         i++;
         continue;
       }
-      emitJSXElement(g2, source, child, opts);
+      emitJSXElement(g2, source, child, opts, hoist);
       i++;
     } else if (child.type === "JSXFragment") {
-      emitJSXFragment(g2, source, child, opts);
+      emitJSXFragment(g2, source, child, opts, hoist);
       i++;
     } else if (child.type === "IfStatement" || child.type === "ForOfStatement" || child.type === "ForStatement" || child.type === "ForInStatement" || child.type === "WhileStatement" || child.type === "DoWhileStatement" || child.type === "SwitchStatement" || child.type === "TryStatement" || child.type === "VariableDeclaration" || child.type === "ExpressionStatement") {
+      if (hoist && hoist.set.has(child)) {
+        i++;
+        continue;
+      }
       g2.addRaw("{(() => { ");
       emitBody(g2, source, [child], "", opts);
       g2.addRaw(" })()}");
@@ -36805,7 +36838,7 @@ function emitPlainStatement(g2, source, stmt, indent4, isLast) {
   g2.add(text, stmt.start, stmt.end);
   if (!text.endsWith("}") && !isLast) g2.addRaw(";");
 }
-function emitStatement(g2, source, stmt, indent4, isLast, opts) {
+function emitStatement(g2, source, stmt, indent4, isLast, opts, hoist) {
   switch (stmt.type) {
     case "JSXElement":
       if (getJSXTagName2(stmt) === "style") {
@@ -36815,12 +36848,12 @@ function emitStatement(g2, source, stmt, indent4, isLast, opts) {
         return;
       }
       g2.add(indent4);
-      emitJSXElement(g2, source, stmt, opts);
+      emitJSXElement(g2, source, stmt, opts, hoist);
       if (!isLast) g2.addRaw(";");
       return;
     case "JSXFragment":
       g2.add(indent4);
-      emitJSXFragment(g2, source, stmt, opts);
+      emitJSXFragment(g2, source, stmt, opts, hoist);
       if (!isLast) g2.addRaw(";");
       return;
     case "JSXExpressionContainer": {
@@ -36838,7 +36871,7 @@ function emitStatement(g2, source, stmt, indent4, isLast, opts) {
       let firstLine = true;
       for (let i = 0; i < innerStmts.length; i++) {
         const before = g2.code.length;
-        emitStatement(g2, source, innerStmts[i], indent4, isLast && i === innerStmts.length - 1, opts);
+        emitStatement(g2, source, innerStmts[i], indent4, isLast && i === innerStmts.length - 1, opts, hoist);
         if (g2.code.length > before) {
           if (!firstLine) g2.addRaw("\n");
           firstLine = false;
@@ -36879,7 +36912,7 @@ function emitStatement(g2, source, stmt, indent4, isLast, opts) {
       return emitPlainStatement(g2, source, stmt, indent4, isLast);
   }
 }
-function emitBody(g2, source, stmts, indent4, opts) {
+function emitBody(g2, source, stmts, indent4, opts, hoist) {
   let firstLine = true;
   let i = 0;
   while (i < stmts.length) {
@@ -36906,7 +36939,7 @@ function emitBody(g2, source, stmts, indent4, opts) {
       continue;
     }
     const before = g2.code.length;
-    emitStatement(g2, source, stmt, indent4, isLast, opts);
+    emitStatement(g2, source, stmt, indent4, isLast, opts, hoist);
     if (g2.code.length > before) {
       if (!firstLine) g2.addRaw("\n");
       firstLine = false;
@@ -36952,8 +36985,108 @@ function emitReturn(g2, source, stmt, opts) {
   else emitChunkMapped(g2, source, arg.start, arg.end);
   emitChunkMapped(g2, source, arg.end, stmt.end);
 }
+function collectHoistEligible(children, set2, list) {
+  for (const child of children ?? []) {
+    if (child.type === "JSXElement") {
+      if (getJSXTagName2(child) === "style") continue;
+      collectHoistEligible(child.children ?? [], set2, list);
+      continue;
+    }
+    if (child.type === "JSXFragment") {
+      collectHoistEligible(child.children ?? [], set2, list);
+      continue;
+    }
+    if (child.type === "VariableDeclaration" || child.type === "ExpressionStatement") {
+      set2.add(child);
+      if (list) list.push(child);
+      continue;
+    }
+  }
+}
 function emitBodyCore(g2, source, stmts, opts) {
-  emitBody(g2, source, stmts, "", opts);
+  const hoistSet = /* @__PURE__ */ new Set();
+  const byRoot = /* @__PURE__ */ new Map();
+  const collectRoot = (root3) => {
+    const list = [];
+    collectHoistEligible(root3.children ?? [], hoistSet, list);
+    if (list.length > 0) byRoot.set(root3, list);
+  };
+  const scanRoots = (list) => {
+    for (const s of list) {
+      if (!s) continue;
+      if (s.type === "JSXElement" && getJSXTagName2(s) !== "style") {
+        collectRoot(s);
+      } else if (s.type === "JSXFragment") {
+        collectRoot(s);
+      } else if (s.type === "VeskBlock") {
+        scanRoots(s.body ?? []);
+      }
+    }
+  };
+  scanRoots(stmts);
+  const ctx2 = { set: hoistSet };
+  const isRoot = (st) => st.type === "JSXElement" && getJSXTagName2(st) !== "style" || st.type === "JSXFragment";
+  const units = [];
+  const pushStmts = (list) => {
+    for (let i = 0; i < list.length; i++) {
+      const s = list[i];
+      if (!s) continue;
+      if (s.type === "ForOfStatement" && list[i + 1] && list[i + 1].type === "VeskBlock" && list[i + 1].tag === "empty") {
+        units.push({ node: s, isHoisted: false, empty: list[i + 1] });
+        i++;
+        continue;
+      }
+      units.push({ node: s, isHoisted: isRoot(s) });
+    }
+  };
+  for (const s of stmts) {
+    if (!s) continue;
+    if (s.type === "VeskBlock") {
+      pushStmts(s.body ?? []);
+      continue;
+    }
+    pushStmts([s]);
+  }
+  const emitUnit = (u, isLast) => {
+    if (u.isHoisted) {
+      const list = byRoot.get(u.node);
+      if (list) {
+        byRoot.delete(u.node);
+        const n = list.length;
+        for (let k = 0; k < n; k++) {
+          const before2 = g2.code.length;
+          emitStatement(g2, source, list[k], "", false, opts, ctx2);
+          if (g2.code.length > before2) g2.addRaw("\n");
+        }
+      }
+    }
+    if (u.empty !== void 0) {
+      emitForOf(g2, source, u.node, "", opts);
+      const inner = u.empty.body ?? [];
+      if (inner.length > 0) {
+        g2.addRaw("\n");
+        g2.add("");
+        g2.add(
+          source.slice(u.node.right.start, u.node.right.end),
+          u.node.right.start,
+          u.node.right.end
+        );
+        g2.addRaw(".length === 0 && (() => {");
+        g2.addRaw("\n");
+        emitBody(g2, source, inner, "  ", opts);
+        g2.addRaw("\n");
+        g2.add("");
+        g2.addRaw("})();");
+      }
+      return;
+    }
+    const before = g2.code.length;
+    emitStatement(g2, source, u.node, "", isLast, opts, ctx2);
+    if (g2.code.length > before && !isLast) g2.addRaw("\n");
+  };
+  for (let i = 0; i < units.length; i++) {
+    emitUnit(units[i], i === units.length - 1);
+  }
 }
 function emitExpressionBody(g2, source, coreStart, coreEnd, stmts, opts) {
   let pos = coreStart;
@@ -37757,7 +37890,16 @@ declare namespace JSX {
     noscript?: VeskGlobalAttributes;
     template?: VeskGlobalAttributes;
     slot?: VeskGlobalAttributes & { name?: string };
-    meta?: VeskGlobalAttributes & { name?: string; content?: string; charSet?: string; httpEquiv?: string };
+    meta?: VeskGlobalAttributes & {
+      name?: string;
+      content?: string;
+      charSet?: string;
+      httpEquiv?: string;
+      // Lowercase aliases \u2014 HTML attribute names are case-insensitive and
+      // real code (and SSR output) writes charset. Keep in sync with the
+      // camelCase members.
+      charset?: string;
+    };
     title?: VeskGlobalAttributes;
     base?: VeskGlobalAttributes & { href?: string; target?: string };
     link?: VeskGlobalAttributes & {
@@ -37769,6 +37911,8 @@ declare namespace JSX {
       crossOrigin?: string;
       integrity?: string;
       type?: string;
+      // Lowercase alias \u2014 see the meta note above.
+      crossorigin?: string | boolean;
     };
     style?: VeskGlobalAttributes & { media?: string };
     script?: VeskGlobalAttributes & {
@@ -37780,6 +37924,8 @@ declare namespace JSX {
       integrity?: string;
       nonce?: string;
       noModule?: boolean | string;
+      // Lowercase aliases \u2014 see the meta note above.
+      crossorigin?: boolean | string;
     };
     svg?: VeskGlobalAttributes & {
       viewBox?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.32",
+  "version": "0.2.34",
   "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.32",
-    "@vesk/compiler": "^0.2.32",
-    "@vesk/plugin-tailwind": "^0.2.32",
-    "@vesk/runtime": "^0.2.32",
+    "@vesk/adapter": "^0.2.34",
+    "@vesk/compiler": "^0.2.34",
+    "@vesk/plugin-tailwind": "^0.2.34",
+    "@vesk/runtime": "^0.2.34",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",