@zuplo/cli 7.6.8 → 7.6.9

package/node_modules/hono/dist/jsx/components.js

@@ -1,7 +1,7 @@
 // src/jsx/components.ts
 import { raw } from "../helper/html/index.js";
 import { HtmlEscapedCallbackPhase, resolveCallback } from "../utils/html.js";
-import { jsx, Fragment } from "./base.js";
+import { jsx, Fragment, isUntrustedObject, renderChildren, renderUntrustedObject } from "./base.js";
 import { DOM_RENDERER } from "./constants.js";
 import { captureRenderContext, useContext } from "./context.js";
 import { ErrorBoundary as ErrorBoundaryDomRenderer } from "./dom/components.js";
@@ -9,7 +9,7 @@ import { StreamingContext } from "./streaming.js";
 var errorBoundaryCounter = 0;
 var childrenToString = async (children) => {
   try {
-    return children.flat().map((c) => c == null || typeof c === "boolean" ? "" : c.toString());
+    return children.flat().map(resolveChildEarly);
   } catch (e) {
     if (e instanceof Promise) {
       const resume = captureRenderContext();
@@ -20,18 +20,16 @@ var childrenToString = async (children) => {
     }
   }
 };
-var resolveChildEarly = (c) => {
-  if (c == null || typeof c === "boolean") {
+var resolveChildEarly = (child) => {
+  if (child == null || typeof child === "boolean") {
     return "";
-  } else if (typeof c === "string") {
-    return c;
+  } else if (typeof child === "string" || Array.isArray(child)) {
+    return renderChildren([child]);
+  } else if (isUntrustedObject(child)) {
+    return renderUntrustedObject(child);
   } else {
-    const str = c.toString();
-    if (!(str instanceof Promise)) {
-      return raw(str);
-    } else {
-      return str;
-    }
+    const str = child.toString();
+    return str instanceof Promise ? str : raw(str);
   }
 };
 var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
@@ -47,26 +45,27 @@ var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
   let fallbackStrPromise;
   const resolveFallbackStr = () => fallbackStrPromise ||= (async () => {
     const awaitedFallback = await fallback;
-    if (typeof awaitedFallback === "string") {
-      return awaitedFallback;
-    } else {
-      const fallbackResult = await getResume()(() => awaitedFallback?.toString());
-      if (typeof fallbackResult === "string") {
-        return raw(
-          fallbackResult,
-          fallbackResult.callbacks || awaitedFallback?.callbacks
-        );
-      }
+    if (awaitedFallback === null || awaitedFallback === void 0) {
+      return;
+    }
+    if (typeof awaitedFallback === "string" || Array.isArray(awaitedFallback)) {
+      return getResume()(() => renderChildren([awaitedFallback]));
+    }
+    if (isUntrustedObject(awaitedFallback)) {
+      return getResume()(() => renderUntrustedObject(awaitedFallback));
     }
+    const fallbackResult = await getResume()(() => awaitedFallback.toString());
+    return raw(
+      fallbackResult,
+      fallbackResult.callbacks || awaitedFallback.callbacks
+    );
   })();
   const renderFallback = async (error) => {
     const fallbackStr = await resolveFallbackStr();
     return getResume()(async () => {
       onError?.(error);
       const fallbackRes = fallbackStr !== void 0 ? fallbackStr : fallbackRender && jsx(Fragment, {}, fallbackRender(error)) || "";
-      const fallbackResString = await Fragment({
-        children: fallbackRes
-      }).toString();
+      const fallbackResString = await Fragment({ children: fallbackRes }).toString();
       return raw(
         fallbackResString,
         fallbackResString.callbacks || fallbackRes.callbacks
@@ -99,7 +98,7 @@ var ErrorBoundary = async ({ children, fallback, fallbackRender, onError }) => {
       const fallbackResString = await renderFallback(error2);
       const fallbackCallbacks = fallbackResString.callbacks;
       if (buffer) {
-        buffer[0] = buffer[0].replace(replaceRe, fallbackResString);
+        buffer[0] = buffer[0].replace(replaceRe, () => fallbackResString);
         return fallbackCallbacks?.length ? raw("", fallbackCallbacks) : "";
       }
       return raw(
@@ -138,7 +137,7 @@ d.parentElement.insertBefore(c.content,d.nextSibling)
 </script>`;
           if (htmlArray.every((html2) => !html2.callbacks?.length)) {
             if (buffer) {
-              buffer[0] = buffer[0].replace(replaceRe, content);
+              buffer[0] = buffer[0].replace(replaceRe, () => content);
             }
             return html;
           }

package/node_modules/hono/dist/jsx/context.js

@@ -1,6 +1,6 @@
 // src/jsx/context.ts
 import { raw } from "../helper/html/index.js";
-import { JSXFragmentNode } from "./base.js";
+import { isUntrustedObject, JSXFragmentNode, renderChildren, renderUntrustedObject } from "./base.js";
 import { DOM_RENDERER } from "./constants.js";
 import { createContextProviderFunction } from "./dom/context.js";
 var globalContexts = [];
@@ -130,18 +130,18 @@ var createContext = (defaultValue) => {
   const context = ((props) => {
     const contextValues = getContextValuesIn(getCurrentStore(), context);
     contextValues.push(props.value);
-    let string;
+    let rendered;
     try {
-      string = props.children ? (Array.isArray(props.children) ? new JSXFragmentNode("", {}, props.children) : props.children).toString() : "";
+      rendered = typeof props.children === "string" ? renderChildren([props.children]) : isUntrustedObject(props.children) ? renderUntrustedObject(props.children) : props.children ? (Array.isArray(props.children) ? new JSXFragmentNode("", {}, props.children) : props.children).toString() : raw("");
     } catch (e) {
       contextValues.pop();
       throw e;
     }
-    if (string instanceof Promise) {
-      return string.finally(() => contextValues.pop()).then((resString) => raw(resString, resString.callbacks));
+    if (rendered instanceof Promise) {
+      return rendered.finally(() => contextValues.pop()).then((resString) => raw(resString, resString.callbacks));
     } else {
       contextValues.pop();
-      return raw(string);
+      return raw(rendered);
     }
   });
   context.values = values;

package/node_modules/hono/dist/jsx/dom/server.js

@@ -1,11 +1,14 @@
 // src/jsx/dom/server.ts
+import { renderChildren } from "../base.js";
 import { renderToReadableStream as renderToReadableStreamHono } from "../streaming.js";
 import version from "./index.js";
+var prepareRoot = (element) => typeof element === "string" || Array.isArray(element) ? renderChildren([element]) : element;
 var renderToString = (element, options = {}) => {
   if (Object.keys(options).length > 0) {
     console.warn("options are not supported yet");
   }
-  const res = element?.toString() ?? "";
+  element = prepareRoot(element);
+  const res = element instanceof Promise ? element : element?.toString() ?? "";
   if (typeof res !== "string") {
     throw new Error("Async component is not supported in renderToString");
   }
@@ -15,6 +18,7 @@ var renderToReadableStream = async (element, options = {}) => {
   if (Object.keys(options).some((key) => key !== "onError")) {
     console.warn("options are not supported yet, except onError");
   }
+  element = prepareRoot(element);
   if (!element || typeof element !== "object") {
     element = element?.toString() ?? "";
   }

package/node_modules/hono/dist/jsx/intrinsic-element/components.js

@@ -1,6 +1,6 @@
 // src/jsx/intrinsic-element/components.ts
 import { raw } from "../../helper/html/index.js";
-import { JSXNode, getNameSpaceContext } from "../base.js";
+import { JSXNode, getNameSpaceContext, renderChildren } from "../base.js";
 import { toArray } from "../children.js";
 import { PERMALINK } from "../constants.js";
 import { useContext } from "../context.js";
@@ -62,10 +62,10 @@ var insertIntoHead = (tagName, tag, props, precedence) => ({ buffer, context })
     insertTags.forEach((tag2) => {
       buffer[0] = buffer[0].replaceAll(tag2, "");
     });
-    buffer[0] = buffer[0].replace(/(?=<\/head>)/, insertTags.join(""));
+    buffer[0] = buffer[0].replace(/(?=<\/head>)/, () => insertTags.join(""));
   }
 };
-var returnWithoutSpecialBehavior = (tag, children, props) => raw(new JSXNode(tag, props, toArray(children ?? [])).toString());
+var returnWithoutSpecialBehavior = (tag, children, props) => renderChildren([new JSXNode(tag, props, toArray(children ?? []))]);
 var documentMetadataTag = (tag, children, props, sort) => {
   if ("itemProp" in props) {
     return returnWithoutSpecialBehavior(tag, children, props);

package/node_modules/hono/dist/jsx/streaming.js

@@ -1,7 +1,7 @@
 // src/jsx/streaming.ts
 import { raw } from "../helper/html/index.js";
 import { HtmlEscapedCallbackPhase, resolveCallback } from "../utils/html.js";
-import { JSXNode } from "./base.js";
+import { isUntrustedObject, JSXNode, renderChildren, renderUntrustedObject } from "./base.js";
 import { childrenToString } from "./components.js";
 import { DOM_RENDERER, DOM_STASH } from "./constants.js";
 import { captureRenderContext, createContext, useContext } from "./context.js";
@@ -9,6 +9,7 @@ import { Suspense as SuspenseDomRenderer } from "./dom/components.js";
 import { buildDataStack } from "./dom/render.js";
 var StreamingContext = createContext(null);
 var suspenseCounter = 0;
+var serializeBoundaryChild = (child) => typeof child === "string" || Array.isArray(child) ? renderChildren([child]) : child == null || typeof child === "boolean" ? "" : isUntrustedObject(child) ? renderUntrustedObject(child) : child.toString();
 var Suspense = async ({
   children,
   fallback
@@ -25,9 +26,7 @@ var Suspense = async ({
   try {
     stackNode[DOM_STASH][0] = 0;
     buildDataStack.push([[], stackNode]);
-    resArray = children.map(
-      (c) => c == null || typeof c === "boolean" ? "" : c.toString()
-    );
+    resArray = children.map(serializeBoundaryChild);
   } catch (e) {
     if (e instanceof Promise) {
       const resume = captureRenderContext();
@@ -48,7 +47,7 @@ var Suspense = async ({
   }
   if (resArray.some((res) => res instanceof Promise)) {
     const index = suspenseCounter++;
-    const fallbackStr = await fallback.toString();
+    const fallbackStr = await (typeof fallback === "string" || Array.isArray(fallback) ? renderChildren([fallback]) : isUntrustedObject(fallback) ? renderUntrustedObject(fallback) : fallback.toString());
     return raw(`<template id="H:${index}"></template>${fallbackStr}<!--/$-->`, [
       ...fallbackStr.callbacks || [],
       ({ phase, buffer, context }) => {
@@ -61,7 +60,7 @@ var Suspense = async ({
           if (buffer) {
             buffer[0] = buffer[0].replace(
               new RegExp(`<template id="H:${index}"></template>.*?<!--/\\$-->`),
-              content
+              () => content
             );
           }
           let html = buffer ? "" : `<template data-hono-target="H:${index}">${content}</template><script${nonce ? ` nonce="${nonce}"` : ""}>

package/node_modules/hono/dist/types/context.d.ts

@@ -347,7 +347,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
      * ```
      */
     set: Set<IsAny<E> extends true ? {
-        Variables: ContextVariableMap & Record<string, any>;
+        Variables: ContextVariableMap & Record<PropertyKey, any>;
     } : E>;
     /**
      * `.get()` can use the value specified by the key.
@@ -363,7 +363,7 @@ export declare class Context<E extends Env = any, P extends string = any, I exte
      * ```
      */
     get: Get<IsAny<E> extends true ? {
-        Variables: ContextVariableMap & Record<string, any>;
+        Variables: ContextVariableMap & Record<PropertyKey, any>;
     } : E>;
     /**
      * `.var` can access the value of a variable.

package/node_modules/hono/dist/types/jsx/base.d.ts

@@ -26,6 +26,9 @@ export declare namespace JSX {
 export declare const getNameSpaceContext: () => Context<string> | undefined;
 export declare const booleanAttributes: string[];
 export type Child = string | Promise<string> | number | JSXNode | null | undefined | boolean | Child[];
+export declare const renderChildren: (children: Child[]) => HtmlEscapedString | Promise<HtmlEscapedString>;
+export declare const isUntrustedObject: (value: unknown) => boolean;
+export declare const renderUntrustedObject: (value: unknown) => HtmlEscapedString | Promise<HtmlEscapedString>;
 export declare class JSXNode implements HtmlEscaped {
     tag: string | Function;
     props: Props;

package/node_modules/hono/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "4.13.5",
+  "version": "4.13.7",
   "description": "Web framework built on Web Standards",
   "main": "dist/cjs/index.js",
   "type": "module",
@@ -682,7 +682,7 @@
     "@typescript/native-preview": "7.0.0-dev.20260210.1",
     "@vitest/coverage-v8": "^4.1.7",
     "bun-types": "^1.2.20",
-    "editorconfig-checker": "6.1.1",
+    "editorconfig-checker": "6.2.0",
     "esbuild": "^0.27.1",
     "eslint": "^9.39.3",
     "jsdom": "22.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "7.6.8",
+  "version": "7.6.9",
   "repository": "https://github.com/zuplo/zuplo",
   "author": "Zuplo, Inc.",
   "type": "module",
@@ -28,10 +28,10 @@
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/api-logs": "0.220.0",
     "@swc/core": "1.10.18",
-    "@zuplo/core": "7.6.8",
+    "@zuplo/core": "7.6.9",
     "@zuplo/editor": "1.0.33162667821",
-    "@zuplo/openapi-tools": "7.6.8",
-    "@zuplo/runtime": "7.6.8",
+    "@zuplo/openapi-tools": "7.6.9",
+    "@zuplo/runtime": "7.6.9",
     "chalk": "5.4.1",
     "chokidar": "3.5.3",
     "cookie": "1.0.2",
@@ -62,15 +62,15 @@
     "workerd": "1.20241230.0",
     "yargs": "17.7.2",
     "zod": "4.4.3",
-    "@zuplo/graphql": "7.6.8",
-    "@zuplo/otel": "7.6.8"
+    "@zuplo/graphql": "7.6.9",
+    "@zuplo/otel": "7.6.9"
   },
   "optionalDependencies": {
-    "@zuplo/lint-darwin-arm64": "7.6.8",
-    "@zuplo/lint-darwin-x64": "7.6.8",
-    "@zuplo/lint-linux-x64": "7.6.8",
-    "@zuplo/lint-linux-arm64": "7.6.8",
-    "@zuplo/lint-win32-x64": "7.6.8"
+    "@zuplo/lint-darwin-arm64": "7.6.9",
+    "@zuplo/lint-darwin-x64": "7.6.9",
+    "@zuplo/lint-linux-x64": "7.6.9",
+    "@zuplo/lint-linux-arm64": "7.6.9",
+    "@zuplo/lint-win32-x64": "7.6.9"
   },
   "bundleDependencies": [
     "@inquirer/prompts",