convex-helpers 0.1.115 → 0.1.116

package/bin.cjs

@@ -4507,9 +4507,11 @@ ${requiredPropertiesStr}${propertiesStr}`;
         (v) => v.type !== "null"
       );
       if (nonNullMembers.length === 1 && nullMember !== void 0) {
-        return `${generateSchemaFromValidator(
-          nonNullMembers[0]
-        )}
+        const innerSchema = generateSchemaFromValidator(nonNullMembers[0]);
+        if (innerSchema === "{}") {
+          return "{}";
+        }
+        return `${innerSchema}
 nullable: true`;
       }
       const members = nonNullMembers.map(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "convex-helpers",
-  "version": "0.1.115",
+  "version": "0.1.116",
   "description": "A collection of useful code to complement the official convex package.",
   "type": "module",
   "bin": {

package/server/hono.d.ts

@@ -35,11 +35,16 @@ declare global {
 /**
  * A type representing a Hono app with `c.env` containing Convex's
  * `HttpEndpointCtx` (e.g. `c.env.runQuery` is valid).
+ *
+ * Optionally accepts a `Variables` type parameter so consumers can use
+ * middleware-driven typed context state (`c.var` / `c.set` / `c.get`) without
+ * casting when passing the app to `HttpRouterWithHono`.
  */
-export type HonoWithConvex<ActionCtx extends GenericActionCtx<any>> = Hono<{
+export type HonoWithConvex<ActionCtx extends GenericActionCtx<any>, Variables extends Record<string, unknown> = Record<string, never>> = Hono<{
     Bindings: {
         [Name in keyof ActionCtx]: ActionCtx[Name];
     };
+    Variables: Variables;
 }>;
 /**
  * An implementation of the Convex `HttpRouter` that integrates with Hono by
@@ -65,11 +70,11 @@ export type HonoWithConvex<ActionCtx extends GenericActionCtx<any>> = Hono<{
  * export default http;
  * ```
  */
-export declare class HttpRouterWithHono<ActionCtx extends GenericActionCtx<any>> extends HttpRouter {
+export declare class HttpRouterWithHono<ActionCtx extends GenericActionCtx<any>, Variables extends Record<string, unknown> = Record<string, never>> extends HttpRouter {
     private _app;
     private _handler;
     private _handlerInfoCache;
-    constructor(app: HonoWithConvex<ActionCtx>);
+    constructor(app: HonoWithConvex<ActionCtx, Variables>);
     /**
      * Get routes from the Hono app.
      */

package/server/hono.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hono.d.ts","sourceRoot":"","sources":["hono.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,EAEV,cAAc,EACd,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAEL,UAAU,EAEX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,CAAC;AAEhB;;;;;GAKG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,KAAK,UAAU,GAAG,GAAG,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,cAAc,CAAC,SAAS,SAAS,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IACzE,QAAQ,EAAE;SACP,IAAI,IAAI,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC;KAC3C,CAAC;CACH,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,kBAAkB,CAC7B,SAAS,SAAS,gBAAgB,CAAC,GAAG,CAAC,CACvC,SAAQ,UAAU;IAClB,OAAO,CAAC,IAAI,CAA4B;IACxC,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,iBAAiB,CAAqD;gBAElE,GAAG,EAAE,cAAc,CAAC,SAAS,CAAC;IA+B1C;;OAEG;IACH,OAAO,CAAC,aAAa;IA0CrB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,eAAe;CAkCxB;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,cAAc,GAAG,MAAM,GAC9B,cAAc,CAIhB"}
+{"version":3,"file":"hono.d.ts","sourceRoot":"","sources":["hono.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,KAAK,EAEV,cAAc,EACd,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAEL,UAAU,EAEX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,CAAC;AAEhB;;;;;GAKG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,KAAK,UAAU,GAAG,GAAG,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,cAAc,CACxB,SAAS,SAAS,gBAAgB,CAAC,GAAG,CAAC,EACvC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAC/D,IAAI,CAAC;IACP,QAAQ,EAAE;SACP,IAAI,IAAI,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC;KAC3C,CAAC;IACF,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,kBAAkB,CAC7B,SAAS,SAAS,gBAAgB,CAAC,GAAG,CAAC,EACvC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CACjE,SAAQ,UAAU;IAClB,OAAO,CAAC,IAAI,CAAuC;IACnD,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,iBAAiB,CAAqD;gBAElE,GAAG,EAAE,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC;IA+BrD;;OAEG;IACH,OAAO,CAAC,aAAa;IA0CrB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,eAAe;CAkCxB;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,cAAc,GAAG,MAAM,GAC9B,cAAc,CAIhB"}

package/server/hono.ts

@@ -45,11 +45,19 @@ declare global {
 /**
  * A type representing a Hono app with `c.env` containing Convex's
  * `HttpEndpointCtx` (e.g. `c.env.runQuery` is valid).
+ *
+ * Optionally accepts a `Variables` type parameter so consumers can use
+ * middleware-driven typed context state (`c.var` / `c.set` / `c.get`) without
+ * casting when passing the app to `HttpRouterWithHono`.
  */
-export type HonoWithConvex<ActionCtx extends GenericActionCtx<any>> = Hono<{
+export type HonoWithConvex<
+  ActionCtx extends GenericActionCtx<any>,
+  Variables extends Record<string, unknown> = Record<string, never>,
+> = Hono<{
   Bindings: {
     [Name in keyof ActionCtx]: ActionCtx[Name];
   };
+  Variables: Variables;
 }>;
 
 /**
@@ -78,12 +86,13 @@ export type HonoWithConvex<ActionCtx extends GenericActionCtx<any>> = Hono<{
  */
 export class HttpRouterWithHono<
   ActionCtx extends GenericActionCtx<any>,
+  Variables extends Record<string, unknown> = Record<string, never>,
 > extends HttpRouter {
-  private _app: HonoWithConvex<ActionCtx>;
+  private _app: HonoWithConvex<ActionCtx, Variables>;
   private _handler: PublicHttpAction;
   private _handlerInfoCache: Map<any, { method: RoutableMethod; path: string }>;
 
-  constructor(app: HonoWithConvex<ActionCtx>) {
+  constructor(app: HonoWithConvex<ActionCtx, Variables>) {
     super();
     this._app = app;
     // Single Convex httpEndpoint handler that just forwards the request to the