@growth-labs/push 0.4.3 → 0.4.7

package/README.md

@@ -13,7 +13,6 @@ import push from '@growth-labs/push'
 
 push({
   vapidPublicKey: 'BDd8...',                     // URL-safe base64
-  vapidPrivateKey: '...',                        // JWK JSON string (via Cloudflare Secrets)
   vapidSubject: 'mailto:admin@fedweek.com',
   d1Binding: 'SITE_DB',
   queueBinding: 'PUSH_QUEUE',

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAC7C,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,cAAc,CAAA;AAYlE,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,gBAAgB,CA0DnE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAC7C,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,cAAc,CAAA;AAYlE,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,gBAAgB,CA4DnE"}

package/dist/index.js

@@ -11,7 +11,9 @@ export default function push(options) {
     const resolved = pushOptionsSchema.parse(options);
     const virtualConfig = {
         vapidPublicKey: resolved.vapidPublicKey,
+        siteId: resolved.siteId,
         d1Binding: resolved.d1Binding,
+        subscriptionsD1Binding: resolved.subscriptionsD1Binding,
         queueBinding: resolved.queueBinding,
         defaults: resolved.defaults,
         queue: resolved.queue,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAoB,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAElE,SAAS,kBAAkB;IAC1B,OAAO,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC9E,CAAC;AAED,MAAM,oBAAoB,GAAG,kBAAkB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;AAEjE,SAAS,iBAAiB,CAAC,IAAY;IACtC,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,oBAAoB,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AACjF,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,OAAoB;IAChD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAEjD,MAAM,aAAa,GAAG;QACrB,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;KACzB,CAAA;IAED,MAAM,eAAe,GAAG,iCAAiC,CAAA;IACzD,MAAM,uBAAuB,GAAG,KAAK,eAAe,EAAE,CAAA;IAEtD,OAAO;QACN,IAAI,EAAE,mBAAmB;QACzB,KAAK,EAAE;YACN,oBAAoB,EAAE,CAAC,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,EAAE;gBACtE,YAAY,CAAC;oBACZ,IAAI,EAAE;wBACL,OAAO,EAAE;4BACR;gCACC,IAAI,EAAE,yBAAyB;gCAC/B,SAAS,CAAC,EAAE;oCACX,IAAI,EAAE,KAAK,eAAe;wCAAE,OAAO,uBAAuB,CAAA;gCAC3D,CAAC;gCACD,IAAI,CAAC,EAAE;oCACN,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;wCACpC,OAAO,kBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAA;oCACzD,CAAC;gCACF,CAAC;6BACD;yBACD;qBACD;iBACD,CAAC,CAAA;gBAEF,aAAa,CAAC;oBACb,UAAU,EAAE,iBAAiB,CAAC,mBAAmB,CAAC;oBAClD,KAAK,EAAE,KAAK;iBACZ,CAAC,CAAA;gBAEF,WAAW,CAAC;oBACX,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;oBAClC,UAAU,EAAE,iBAAiB,CAAC,oBAAoB,CAAC;oBACnD,SAAS,EAAE,KAAK;iBAChB,CAAC,CAAA;gBAEF,WAAW,CAAC;oBACX,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW;oBACpC,UAAU,EAAE,iBAAiB,CAAC,sBAAsB,CAAC;oBACrD,SAAS,EAAE,KAAK;iBAChB,CAAC,CAAA;YACH,CAAC;SACD;KACD,CAAA;AACF,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAoB,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAElE,SAAS,kBAAkB;IAC1B,OAAO,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC9E,CAAC;AAED,MAAM,oBAAoB,GAAG,kBAAkB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;AAEjE,SAAS,iBAAiB,CAAC,IAAY;IACtC,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,oBAAoB,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AACjF,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,OAAoB;IAChD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAEjD,MAAM,aAAa,GAAG;QACrB,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,sBAAsB,EAAE,QAAQ,CAAC,sBAAsB;QACvD,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,KAAK,EAAE,QAAQ,CAAC,KAAK;QACrB,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,OAAO,EAAE,QAAQ,CAAC,OAAO;KACzB,CAAA;IAED,MAAM,eAAe,GAAG,iCAAiC,CAAA;IACzD,MAAM,uBAAuB,GAAG,KAAK,eAAe,EAAE,CAAA;IAEtD,OAAO;QACN,IAAI,EAAE,mBAAmB;QACzB,KAAK,EAAE;YACN,oBAAoB,EAAE,CAAC,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,EAAE;gBACtE,YAAY,CAAC;oBACZ,IAAI,EAAE;wBACL,OAAO,EAAE;4BACR;gCACC,IAAI,EAAE,yBAAyB;gCAC/B,SAAS,CAAC,EAAE;oCACX,IAAI,EAAE,KAAK,eAAe;wCAAE,OAAO,uBAAuB,CAAA;gCAC3D,CAAC;gCACD,IAAI,CAAC,EAAE;oCACN,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;wCACpC,OAAO,kBAAkB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAA;oCACzD,CAAC;gCACF,CAAC;6BACD;yBACD;qBACD;iBACD,CAAC,CAAA;gBAEF,aAAa,CAAC;oBACb,UAAU,EAAE,iBAAiB,CAAC,mBAAmB,CAAC;oBAClD,KAAK,EAAE,KAAK;iBACZ,CAAC,CAAA;gBAEF,WAAW,CAAC;oBACX,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;oBAClC,UAAU,EAAE,iBAAiB,CAAC,oBAAoB,CAAC;oBACnD,SAAS,EAAE,KAAK;iBAChB,CAAC,CAAA;gBAEF,WAAW,CAAC;oBACX,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW;oBACpC,UAAU,EAAE,iBAAiB,CAAC,sBAAsB,CAAC;oBACrD,SAAS,EAAE,KAAK;iBAChB,CAAC,CAAA;YACH,CAAC;SACD;KACD,CAAA;AACF,CAAC"}

package/dist/options.d.ts

@@ -1,114 +1,37 @@
 import { z } from 'zod';
 export declare const pushOptionsSchema: z.ZodObject<{
     vapidPublicKey: z.ZodString;
-    vapidPrivateKey: z.ZodString;
+    vapidPrivateKey: z.ZodOptional<z.ZodString>;
     vapidSubject: z.ZodString;
     siteId: z.ZodString;
     d1Binding: z.ZodDefault<z.ZodString>;
     subscriptionsD1Binding: z.ZodOptional<z.ZodString>;
     queueBinding: z.ZodDefault<z.ZodString>;
-    defaults: z.ZodDefault<z.ZodObject<{
+    defaults: z.ZodPrefault<z.ZodObject<{
         icon: z.ZodOptional<z.ZodString>;
         ttl: z.ZodDefault<z.ZodNumber>;
-        urgency: z.ZodDefault<z.ZodEnum<["very-low", "low", "normal", "high"]>>;
-    }, "strip", z.ZodTypeAny, {
-        ttl: number;
-        urgency: "very-low" | "low" | "normal" | "high";
-        icon?: string | undefined;
-    }, {
-        icon?: string | undefined;
-        ttl?: number | undefined;
-        urgency?: "very-low" | "low" | "normal" | "high" | undefined;
-    }>>;
-    queue: z.ZodDefault<z.ZodObject<{
+        urgency: z.ZodDefault<z.ZodEnum<{
+            "very-low": "very-low";
+            low: "low";
+            normal: "normal";
+            high: "high";
+        }>>;
+    }, z.core.$strip>>;
+    queue: z.ZodPrefault<z.ZodObject<{
         batchSize: z.ZodDefault<z.ZodNumber>;
         maxRetries: z.ZodDefault<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
-        batchSize: number;
-        maxRetries: number;
-    }, {
-        batchSize?: number | undefined;
-        maxRetries?: number | undefined;
-    }>>;
+    }, z.core.$strip>>;
     turnstile: z.ZodObject<{
         secretKey: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        secretKey: string;
-    }, {
-        secretKey: string;
-    }>;
-    routes: z.ZodDefault<z.ZodObject<{
+    }, z.core.$strip>;
+    routes: z.ZodPrefault<z.ZodObject<{
         subscribe: z.ZodDefault<z.ZodString>;
         unsubscribe: z.ZodDefault<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        subscribe: string;
-        unsubscribe: string;
-    }, {
-        subscribe?: string | undefined;
-        unsubscribe?: string | undefined;
-    }>>;
-    cleanup: z.ZodDefault<z.ZodObject<{
+    }, z.core.$strip>>;
+    cleanup: z.ZodPrefault<z.ZodObject<{
         staleAfterDays: z.ZodDefault<z.ZodNumber>;
-    }, "strip", z.ZodTypeAny, {
-        staleAfterDays: number;
-    }, {
-        staleAfterDays?: number | undefined;
-    }>>;
-}, "strip", z.ZodTypeAny, {
-    vapidPublicKey: string;
-    vapidPrivateKey: string;
-    vapidSubject: string;
-    siteId: string;
-    d1Binding: string;
-    queueBinding: string;
-    defaults: {
-        ttl: number;
-        urgency: "very-low" | "low" | "normal" | "high";
-        icon?: string | undefined;
-    };
-    queue: {
-        batchSize: number;
-        maxRetries: number;
-    };
-    turnstile: {
-        secretKey: string;
-    };
-    routes: {
-        subscribe: string;
-        unsubscribe: string;
-    };
-    cleanup: {
-        staleAfterDays: number;
-    };
-    subscriptionsD1Binding?: string | undefined;
-}, {
-    vapidPublicKey: string;
-    vapidPrivateKey: string;
-    vapidSubject: string;
-    siteId: string;
-    turnstile: {
-        secretKey: string;
-    };
-    d1Binding?: string | undefined;
-    subscriptionsD1Binding?: string | undefined;
-    queueBinding?: string | undefined;
-    defaults?: {
-        icon?: string | undefined;
-        ttl?: number | undefined;
-        urgency?: "very-low" | "low" | "normal" | "high" | undefined;
-    } | undefined;
-    queue?: {
-        batchSize?: number | undefined;
-        maxRetries?: number | undefined;
-    } | undefined;
-    routes?: {
-        subscribe?: string | undefined;
-        unsubscribe?: string | undefined;
-    } | undefined;
-    cleanup?: {
-        staleAfterDays?: number | undefined;
-    } | undefined;
-}>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 export type PushOptions = z.input<typeof pushOptionsSchema>;
 export type ResolvedPushOptions = z.output<typeof pushOptionsSchema>;
 //# sourceMappingURL=options.d.ts.map

package/dist/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8C5B,CAAA;AAEF,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAC3D,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAA"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA2D5B,CAAA;AAEF,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAC3D,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAA"}

package/dist/options.js

@@ -1,7 +1,9 @@
 import { z } from 'zod';
 export const pushOptionsSchema = z.object({
     vapidPublicKey: z.string().min(1),
-    vapidPrivateKey: z.string().min(1),
+    // Legacy callers may supply this, but the integration never consumes it.
+    // Signing credentials belong to the runtime consumer, not the build.
+    vapidPrivateKey: z.string().min(1).optional(),
     vapidSubject: z.string().min(1),
     siteId: z.string().min(1),
     d1Binding: z.string().default('SITE_DB'),
@@ -11,19 +13,30 @@ export const pushOptionsSchema = z.object({
     // consumer's status writeback and the site's subscribe/produce share one DB.
     subscriptionsD1Binding: z.string().optional(),
     queueBinding: z.string().default('PUSH_QUEUE'),
+    // NOTE: nested defaulted objects use `.prefault({})`, not `.default({})`.
+    // Under zod v3 (and the `.default()` docs' intuitive reading), defaulting
+    // an object schema to `{}` still ran that `{}` through the object schema,
+    // so its own field-level `.default(...)` values were filled in. zod v4
+    // changed `.default()` to substitute the default value verbatim without
+    // re-parsing it, which silently dropped every nested default (e.g.
+    // `routes.subscribe` resolved to `undefined` instead of
+    // `/api/push/subscribe` — caught by the packages#196 zod-bump test
+    // suite). `.prefault()` is zod v4's opt-in for the old "apply default,
+    // then still parse/default the result" behavior. See
+    // https://zod.dev/v4/changelog (defaults section).
     defaults: z
         .object({
         icon: z.string().optional(),
         ttl: z.number().int().positive().default(86400),
         urgency: z.enum(['very-low', 'low', 'normal', 'high']).default('normal'),
     })
-        .default({}),
+        .prefault({}),
     queue: z
         .object({
         batchSize: z.number().int().positive().default(100),
         maxRetries: z.number().int().nonnegative().default(3),
     })
-        .default({}),
+        .prefault({}),
     turnstile: z.object({
         secretKey: z.string().min(1),
     }),
@@ -32,11 +45,11 @@ export const pushOptionsSchema = z.object({
         subscribe: z.string().default('/api/push/subscribe'),
         unsubscribe: z.string().default('/api/push/unsubscribe'),
     })
-        .default({}),
+        .prefault({}),
     cleanup: z
         .object({
         staleAfterDays: z.number().int().positive().default(90),
     })
-        .default({}),
+        .prefault({}),
 });
 //# sourceMappingURL=options.js.map

package/dist/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACjC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAClC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAE/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAEzB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;IACxC,6EAA6E;IAC7E,6EAA6E;IAC7E,8EAA8E;IAC9E,6EAA6E;IAC7E,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7C,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC;IAE9C,QAAQ,EAAE,CAAC;SACT,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/C,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;KACxE,CAAC;SACD,OAAO,CAAC,EAAE,CAAC;IAEb,KAAK,EAAE,CAAC;SACN,MAAM,CAAC;QACP,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC;QACnD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;KACrD,CAAC;SACD,OAAO,CAAC,EAAE,CAAC;IAEb,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC;QACnB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC5B,CAAC;IAEF,MAAM,EAAE,CAAC;SACP,MAAM,CAAC;QACP,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC;QACpD,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC;KACxD,CAAC;SACD,OAAO,CAAC,EAAE,CAAC;IAEb,OAAO,EAAE,CAAC;SACR,MAAM,CAAC;QACP,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;KACvD,CAAC;SACD,OAAO,CAAC,EAAE,CAAC;CACb,CAAC,CAAA"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACjC,yEAAyE;IACzE,qEAAqE;IACrE,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7C,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAE/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAEzB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC;IACxC,6EAA6E;IAC7E,6EAA6E;IAC7E,8EAA8E;IAC9E,6EAA6E;IAC7E,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7C,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC;IAE9C,0EAA0E;IAC1E,0EAA0E;IAC1E,0EAA0E;IAC1E,uEAAuE;IACvE,wEAAwE;IACxE,mEAAmE;IACnE,wDAAwD;IACxD,mEAAmE;IACnE,uEAAuE;IACvE,qDAAqD;IACrD,mDAAmD;IACnD,QAAQ,EAAE,CAAC;SACT,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/C,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;KACxE,CAAC;SACD,QAAQ,CAAC,EAAE,CAAC;IAEd,KAAK,EAAE,CAAC;SACN,MAAM,CAAC;QACP,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC;QACnD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;KACrD,CAAC;SACD,QAAQ,CAAC,EAAE,CAAC;IAEd,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC;QACnB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC5B,CAAC;IAEF,MAAM,EAAE,CAAC;SACP,MAAM,CAAC;QACP,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC;QACpD,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC;KACxD,CAAC;SACD,QAAQ,CAAC,EAAE,CAAC;IAEd,OAAO,EAAE,CAAC;SACR,MAAM,CAAC;QACP,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;KACvD,CAAC;SACD,QAAQ,CAAC,EAAE,CAAC;CACd,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growth-labs/push",
-  "version": "0.4.3",
+  "version": "0.4.7",
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -64,16 +64,16 @@
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
-    "astro": "^6.1.10"
+    "astro": "^6.1.10 || ^7.0.0"
   },
   "dependencies": {
     "@block65/webcrypto-web-push": "^1.0.0",
     "drizzle-orm": "^0.45.2",
-    "zod": "^3.23.0"
+    "zod": "^4"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.0.0",
-    "astro": "^6.1.10",
+    "astro": "7.3.1",
     "typescript": "^5.7.0",
     "vitest": "^4.1.8"
   },

package/src/index.ts

@@ -17,7 +17,9 @@ export default function push(options: PushOptions): AstroIntegration {
 
 	const virtualConfig = {
 		vapidPublicKey: resolved.vapidPublicKey,
+		siteId: resolved.siteId,
 		d1Binding: resolved.d1Binding,
+		subscriptionsD1Binding: resolved.subscriptionsD1Binding,
 		queueBinding: resolved.queueBinding,
 		defaults: resolved.defaults,
 		queue: resolved.queue,

package/src/options.ts

@@ -2,7 +2,9 @@ import { z } from 'zod'
 
 export const pushOptionsSchema = z.object({
 	vapidPublicKey: z.string().min(1),
-	vapidPrivateKey: z.string().min(1),
+	// Legacy callers may supply this, but the integration never consumes it.
+	// Signing credentials belong to the runtime consumer, not the build.
+	vapidPrivateKey: z.string().min(1).optional(),
 	vapidSubject: z.string().min(1),
 
 	siteId: z.string().min(1),
@@ -15,20 +17,31 @@ export const pushOptionsSchema = z.object({
 	subscriptionsD1Binding: z.string().optional(),
 	queueBinding: z.string().default('PUSH_QUEUE'),
 
+	// NOTE: nested defaulted objects use `.prefault({})`, not `.default({})`.
+	// Under zod v3 (and the `.default()` docs' intuitive reading), defaulting
+	// an object schema to `{}` still ran that `{}` through the object schema,
+	// so its own field-level `.default(...)` values were filled in. zod v4
+	// changed `.default()` to substitute the default value verbatim without
+	// re-parsing it, which silently dropped every nested default (e.g.
+	// `routes.subscribe` resolved to `undefined` instead of
+	// `/api/push/subscribe` — caught by the packages#196 zod-bump test
+	// suite). `.prefault()` is zod v4's opt-in for the old "apply default,
+	// then still parse/default the result" behavior. See
+	// https://zod.dev/v4/changelog (defaults section).
 	defaults: z
 		.object({
 			icon: z.string().optional(),
 			ttl: z.number().int().positive().default(86400),
 			urgency: z.enum(['very-low', 'low', 'normal', 'high']).default('normal'),
 		})
-		.default({}),
+		.prefault({}),
 
 	queue: z
 		.object({
 			batchSize: z.number().int().positive().default(100),
 			maxRetries: z.number().int().nonnegative().default(3),
 		})
-		.default({}),
+		.prefault({}),
 
 	turnstile: z.object({
 		secretKey: z.string().min(1),
@@ -39,13 +52,13 @@ export const pushOptionsSchema = z.object({
 			subscribe: z.string().default('/api/push/subscribe'),
 			unsubscribe: z.string().default('/api/push/unsubscribe'),
 		})
-		.default({}),
+		.prefault({}),
 
 	cleanup: z
 		.object({
 			staleAfterDays: z.number().int().positive().default(90),
 		})
-		.default({}),
+		.prefault({}),
 })
 
 export type PushOptions = z.input<typeof pushOptionsSchema>