@raideno/convex-stripe 0.3.9 → 0.3.10

package/dist/server.js

@@ -5501,7 +5501,7 @@ const stripeTables = {
     stripe: v.object(CustomerSchema),
     lastSyncedAt: v.number(),
     accountId: v.optional(v.string())
-  }).index("byEntityId", ["entityId"]).index("byAccountId", ["accountId"]).index(BY_STRIPE_ID_INDEX_NAME, ["customerId"]),
+  }).index("byEntityId", ["entityId"]).index("byAccountId", ["accountId"]).index("byAccountIdAndEntityid", ["accountId", "entityId"]).index(BY_STRIPE_ID_INDEX_NAME, ["customerId"]),
   stripeSubscriptions: defineTable({
     subscriptionId: v.union(v.string(), v.null()),
     customerId: v.string(),
@@ -5800,8 +5800,14 @@ const normalizeOptions = (options) => {
 const defineActionCallableFunction = (spec) => spec;
 const defineActionImplementation = (spec) => spec;
 const defineMutationImplementation = (spec) => spec;
-async function deleteById(context, table, indexName, idField, idValue) {
-  const existing = await context.db.query(table).withIndex(indexName, (q) => q.eq(idField, idValue)).unique();
+async function deleteById(context, table, indexName, indexValues) {
+  const existing = await context.db.query(table).withIndex(indexName, (q) => {
+    let query = q;
+    for (const [field, value] of Object.entries(indexValues)) {
+      query = query.eq(field, value);
+    }
+    return query;
+  }).unique();
   if (existing) {
     await context.db.delete(existing._id);
     return existing._id;
@@ -5814,11 +5820,23 @@ async function selectAll(context, table) {
 async function selectById(context, table, id) {
   return await context.db.get(id);
 }
-async function selectOne(context, table, indexName, field, value) {
-  return await context.db.query(table).withIndex(indexName, (q) => q.eq(field, value)).unique();
+async function selectOne(context, table, indexName, indexValues) {
+  return await context.db.query(table).withIndex(indexName, (q) => {
+    let query = q;
+    for (const [field, value] of Object.entries(indexValues)) {
+      query = query.eq(field, value);
+    }
+    return query;
+  }).unique();
 }
-async function upsert(context, table, indexName, idField, data) {
-  const existing = await context.db.query(table).withIndex(indexName, (q) => q.eq(idField, data[idField])).unique();
+async function upsert(context, table, indexName, indexValues, data) {
+  const existing = await context.db.query(table).withIndex(indexName, (q) => {
+    let query = q;
+    for (const [field, value] of Object.entries(indexValues)) {
+      query = query.eq(field, value);
+    }
+    return query;
+  }).unique();
   if (existing) {
     await context.db.patch(existing._id, {
       ...data,
@@ -5865,11 +5883,8 @@ const StoreImplementation = defineMutationImplementation({
     operation: v.string(),
     table: v.string(),
     indexName: v.optional(v.string()),
-    idField: v.optional(v.string()),
+    indexValues: v.optional(v.any()),
     data: v.optional(v.any()),
-    idValue: v.optional(v.any()),
-    field: v.optional(v.string()),
-    value: v.optional(v.any()),
     id: v.optional(v.any())
   },
   handler: async (context, args, configuration) => {
@@ -5890,21 +5905,21 @@ const StoreImplementation = defineMutationImplementation({
         if (!args.indexName) {
           throw new Error('Missing "indexName" for upsert');
         }
-        if (!args.idField) {
-          throw new Error('Missing "idField" for upsert');
+        if (!args.indexValues || typeof args.indexValues !== "object") {
+          throw new Error('Missing "indexValues" for upsert');
         }
         if (args.data == null) {
           throw new Error('Missing "data" for upsert');
         }
         const upsertIndexName = args.indexName;
-        const upsertIdField = args.idField;
+        const upsertIndexValues = args.indexValues;
         const upsertData = args.data;
         const _id = await wrapStoreOperation(
           upsert(
             context,
             table,
             upsertIndexName,
-            upsertIdField,
+            upsertIndexValues,
             upsertData
           ),
           table
@@ -5920,14 +5935,17 @@ const StoreImplementation = defineMutationImplementation({
           } catch (error) {
             console.error("[afterChange]:", error);
           }
-        return { _id };
+        return _id;
       }
       case "insert": {
         if (args.data == null) {
           throw new Error('Missing "data" for insert');
         }
         const insertData = args.data;
-        const _id = await wrapStoreOperation(insert(context, table, insertData), table);
+        const _id = await wrapStoreOperation(
+          insert(context, table, insertData),
+          table
+        );
         if (configuration.callbacks && configuration.callbacks.afterChange)
           try {
             await configuration.callbacks.afterChange(
@@ -5939,28 +5957,23 @@ const StoreImplementation = defineMutationImplementation({
           } catch (error) {
             console.error("[afterChange]:", error);
           }
-        return { _id };
+        return _id;
       }
       case "deleteById": {
         if (!args.indexName) {
           throw new Error('Missing "indexName" for deleteById');
         }
-        if (!args.idField) {
-          throw new Error('Missing "idField" for deleteById');
-        }
-        if (typeof args.idValue === "undefined") {
-          throw new Error('Missing "idValue" for deleteById');
+        if (!args.indexValues || typeof args.indexValues !== "object") {
+          throw new Error('Missing "indexValues" for deleteById');
         }
         const deleteByIdIndexName = args.indexName;
-        const deleteByIdIdField = args.idField;
-        const deleteByIdIdValue = args.idValue;
+        const deleteByIdIndexValues = args.indexValues;
         const _id = await wrapStoreOperation(
           deleteById(
             context,
             table,
             deleteByIdIndexName,
-            deleteByIdIdField,
-            deleteByIdIdValue
+            deleteByIdIndexValues
           ),
           table
         );
@@ -5975,43 +5988,36 @@ const StoreImplementation = defineMutationImplementation({
           } catch (error) {
             console.error("[afterChange]:", error);
           }
-        return { _id };
+        return _id;
       }
       case "selectOne": {
         if (!args.indexName) {
           throw new Error('Missing "indexName" for selectOne');
         }
-        if (!args.field) {
-          throw new Error('Missing "field" for selectOne');
-        }
-        if (typeof args.value === "undefined") {
-          throw new Error('Missing "value" for selectOne');
+        if (!args.indexValues || typeof args.indexValues !== "object") {
+          throw new Error('Missing "indexValues" for selectOne');
         }
         const selectOneIndexName = args.indexName;
-        const selectOneField = args.field;
-        const selectOneValue = args.value;
+        const selectOneIndexValues = args.indexValues;
         const doc = await wrapStoreOperation(
-          selectOne(
-            context,
-            table,
-            selectOneIndexName,
-            selectOneField,
-            selectOneValue
-          ),
+          selectOne(context, table, selectOneIndexName, selectOneIndexValues),
           table
         );
-        return { doc };
+        return doc;
       }
       case "selectById": {
         if (args.id == null) {
           throw new Error('Missing "id" for selectById');
         }
-        const doc = await wrapStoreOperation(selectById(context, table, args.id), table);
-        return { doc };
+        const doc = await wrapStoreOperation(
+          selectById(context, table, args.id),
+          table
+        );
+        return doc;
       }
       case "selectAll": {
         const docs = await wrapStoreOperation(selectAll(context, table), table);
-        return { docs };
+        return docs;
       }
     }
   }
@@ -6028,18 +6034,17 @@ const CreateAccountImplementation = defineActionCallableFunction({
     const stripe = new Stripe(configuration.stripe.secret_key, {
       apiVersion: configuration.stripe.version
     });
-    const stripeAccount = (await storeDispatchTyped(
+    const stripeAccount = await storeDispatchTyped(
       {
         operation: "selectOne",
         table: "stripeAccounts",
         indexName: "byEntityId",
-        field: "entityId",
-        value: args.entityId
+        indexValues: { entityId: args.entityId }
       },
       context,
       configuration,
       options
-    )).doc;
+    );
     if (stripeAccount) {
       return stripeAccount;
     } else {
@@ -6086,12 +6091,10 @@ const CreateAccountImplementation = defineActionCallableFunction({
         },
         lastSyncedAt: Date.now()
       };
-      const response = await storeDispatchTyped(
+      const _id = await storeDispatchTyped(
         {
-          operation: "upsert",
+          operation: "insert",
           table: "stripeAccounts",
-          indexName: "byEntityId",
-          idField: "entityId",
           data
         },
         context,
@@ -6099,7 +6102,7 @@ const CreateAccountImplementation = defineActionCallableFunction({
         options
       );
       return {
-        _id: response.id,
+        _id,
         ...data,
         _creationTime: (/* @__PURE__ */ new Date()).getTime()
       };
@@ -6143,7 +6146,7 @@ const SubscriptionSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeSubscriptions",
           indexName: "byCustomerId",
-          idField: "customerId",
+          indexValues: { customerId },
           data: {
             subscriptionId: null,
             customerId,
@@ -6164,7 +6167,7 @@ const SubscriptionSyncImplementation = defineActionImplementation({
         operation: "upsert",
         table: "stripeSubscriptions",
         indexName: "byCustomerId",
-        idField: "customerId",
+        indexValues: { customerId },
         data: {
           accountId: args.accountId,
           subscriptionId: subscription.id,
@@ -6194,14 +6197,13 @@ const PayReturnImplementation = defineRedirectHandler({
         operation: "selectOne",
         table: "stripeCustomers",
         indexName: "byEntityId",
-        field: "entityId",
-        value: data.entityId
+        indexValues: { entityId: data.entityId }
       },
       context,
       configuration,
       options
     );
-    const customerId = customer?.doc?.customerId || null;
+    const customerId = customer?.customerId || null;
     if (customerId) {
       await SubscriptionSyncImplementation.handler(
         context,
@@ -6228,14 +6230,13 @@ const PortalReturnImplementation = defineRedirectHandler({
         operation: "selectOne",
         table: "stripeCustomers",
         indexName: "byEntityId",
-        field: "entityId",
-        value: data.entityId
+        indexValues: { entityId: data.entityId }
       },
       context,
       configuration,
       options
     );
-    const customerId = customer?.doc?.customerId || null;
+    const customerId = customer?.customerId || null;
     if (customerId) {
       await SubscriptionSyncImplementation.handler(
         context,
@@ -6262,14 +6263,13 @@ const SubscribeReturnImplementation = defineRedirectHandler({
         operation: "selectOne",
         table: "stripeCustomers",
         indexName: "byEntityId",
-        field: "entityId",
-        value: data.entityId
+        indexValues: { entityId: data.entityId }
       },
       context,
       configuration,
       options
     );
-    const customerId = customer?.doc?.customerId || null;
+    const customerId = customer?.customerId || null;
     if (customerId) {
       await SubscriptionSyncImplementation.handler(
         context,
@@ -6533,18 +6533,20 @@ const CreateCustomerImplementation = defineActionCallableFunction({
     const stripe = new Stripe(configuration.stripe.secret_key, {
       apiVersion: configuration.stripe.version
     });
-    const stripeCustomer = (await storeDispatchTyped(
+    const stripeCustomer = await storeDispatchTyped(
       {
         operation: "selectOne",
         table: "stripeCustomers",
-        indexName: "byEntityId",
-        field: "entityId",
-        value: args.entityId
+        indexName: "byAccountIdAndEntityid",
+        indexValues: {
+          entityId: args.entityId,
+          accountId: stripeOptions.stripeAccount
+        }
       },
       context,
       configuration,
       options
-    )).doc;
+    );
     if (stripeCustomer) {
       return stripeCustomer;
     } else {
@@ -6594,14 +6596,13 @@ const CreateCustomerImplementation = defineActionCallableFunction({
           tax_ids: customer.tax_ids,
           test_clock: typeof customer.test_clock === "string" ? customer.test_clock : customer.test_clock?.id
         },
-        lastSyncedAt: Date.now()
+        lastSyncedAt: Date.now(),
+        accountId: stripeOptions.stripeAccount
       };
-      const response = await storeDispatchTyped(
+      const _id = await storeDispatchTyped(
         {
-          operation: "upsert",
+          operation: "insert",
           table: "stripeCustomers",
-          indexName: "byEntityId",
-          idField: "entityId",
           data
         },
         context,
@@ -6609,7 +6610,7 @@ const CreateCustomerImplementation = defineActionCallableFunction({
         options
       );
       return {
-        _id: response.id,
+        _id,
         ...data,
         _creationTime: (/* @__PURE__ */ new Date()).getTime()
       };
@@ -6628,15 +6629,17 @@ const PayImplementation = defineActionCallableFunction({
       {
         operation: "selectOne",
         table: "stripeCustomers",
-        indexName: "byEntityId",
-        field: "entityId",
-        value: args.entityId
+        indexName: "byAccountIdAndEntityid",
+        indexValues: {
+          entityId: args.entityId,
+          accountId: stripeOptions.stripeAccount
+        }
       },
       context,
       configuration,
       options
     );
-    let customerId = stripeCustomer?.doc?.customerId || null;
+    let customerId = stripeCustomer?.customerId || null;
     if (!customerId) {
       if (!createStripeCustomerIfMissing) {
         throw new Error(
@@ -6650,7 +6653,7 @@ const PayImplementation = defineActionCallableFunction({
             email: void 0,
             metadata: void 0
           },
-          {},
+          stripeOptions,
           configuration,
           options
         )).customerId;
@@ -6719,14 +6722,13 @@ const PayImplementation = defineActionCallableFunction({
     );
     await storeDispatchTyped(
       {
-        operation: "upsert",
+        operation: "insert",
         table: "stripeCheckoutSessions",
-        indexName: BY_STRIPE_ID_INDEX_NAME,
-        idField: "checkoutSessionId",
         data: {
           checkoutSessionId: checkout.id,
           stripe: CheckoutSessionStripeToConvex(checkout),
-          lastSyncedAt: Date.now()
+          lastSyncedAt: Date.now(),
+          accountId: stripeOptions.stripeAccount
         }
       },
       context,
@@ -6737,14 +6739,13 @@ const PayImplementation = defineActionCallableFunction({
     if (paymentIntent && paymentIntent !== null && typeof paymentIntent !== "string") {
       await storeDispatchTyped(
         {
-          operation: "upsert",
+          operation: "insert",
           table: "stripePaymentIntents",
-          indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "paymentIntentId",
           data: {
             paymentIntentId: paymentIntent.id,
             stripe: PaymentIntentStripeToConvex(paymentIntent),
-            lastSyncedAt: Date.now()
+            lastSyncedAt: Date.now(),
+            accountId: stripeOptions.stripeAccount
           }
         },
         context,
@@ -6767,15 +6768,17 @@ const PortalImplementation = defineActionCallableFunction({
       {
         operation: "selectOne",
         table: "stripeCustomers",
-        indexName: "byEntityId",
-        field: "entityId",
-        value: args.entityId
+        indexName: "byAccountIdAndEntityid",
+        indexValues: {
+          entityId: args.entityId,
+          accountId: stripeOptions.stripeAccount
+        }
       },
       context,
       configuration,
       options
     );
-    let customerId = stripeCustomer?.doc?.customerId || null;
+    let customerId = stripeCustomer?.customerId || null;
     if (!customerId) {
       if (!createStripeCustomerIfMissing) {
         throw new Error(
@@ -6789,7 +6792,7 @@ const PortalImplementation = defineActionCallableFunction({
             email: void 0,
             metadata: void 0
           },
-          {},
+          stripeOptions,
           configuration,
           options
         )).customerId;
@@ -6833,15 +6836,17 @@ const SubscribeImplementation = defineActionCallableFunction({
       {
         operation: "selectOne",
         table: "stripeCustomers",
-        indexName: "byEntityId",
-        field: "entityId",
-        value: args.entityId
+        indexName: "byAccountIdAndEntityid",
+        indexValues: {
+          entityId: args.entityId,
+          accountId: stripeOptions.stripeAccount
+        }
       },
       context,
       configuration,
       options
     );
-    let customerId = stripeCustomer?.doc?.customerId || null;
+    let customerId = stripeCustomer?.customerId || null;
     if (!customerId) {
       if (!createStripeCustomerIfMissing) {
         throw new Error(
@@ -6855,7 +6860,7 @@ const SubscribeImplementation = defineActionCallableFunction({
             email: void 0,
             metadata: void 0
           },
-          {},
+          stripeOptions,
           configuration,
           options
         )).customerId;
@@ -6923,14 +6928,13 @@ const SubscribeImplementation = defineActionCallableFunction({
     );
     await storeDispatchTyped(
       {
-        operation: "upsert",
+        operation: "insert",
         table: "stripeCheckoutSessions",
-        indexName: BY_STRIPE_ID_INDEX_NAME,
-        idField: "checkoutSessionId",
         data: {
           checkoutSessionId: checkout.id,
           stripe: CheckoutSessionStripeToConvex(checkout),
-          lastSyncedAt: Date.now()
+          lastSyncedAt: Date.now(),
+          accountId: stripeOptions.stripeAccount
         }
       },
       context,
@@ -6941,14 +6945,13 @@ const SubscribeImplementation = defineActionCallableFunction({
     if (subscription && subscription !== null && typeof subscription !== "string") {
       await storeDispatchTyped(
         {
-          operation: "upsert",
+          operation: "insert",
           table: "stripeSubscriptions",
-          indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "subscriptionId",
           data: {
             subscriptionId: subscription.id,
             customerId,
             stripe: SubscriptionStripeToConvex(subscription),
+            accountId: stripeOptions.stripeAccount,
             lastSyncedAt: Date.now()
           }
         },
@@ -7289,7 +7292,7 @@ const AccountsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeAccounts",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "accountId",
+          indexValues: { accountId: account.id },
           data: {
             accountId: account.id,
             entityId,
@@ -7323,7 +7326,7 @@ const BillingPortalConfigurationsSyncImplementation = defineActionImplementation
         {
           operation: "upsert",
           table: "stripeBillingPortalConfigurations",
-          idField: "billingPortalConfigurationId",
+          indexValues: { billingPortalConfigurationId: billingPortalConfiguration.id },
           indexName: BY_STRIPE_ID_INDEX_NAME,
           data: {
             billingPortalConfigurationId: billingPortalConfiguration.id,
@@ -7362,7 +7365,7 @@ const CapabilitiesSyncImplementation = defineActionImplementation({
             operation: "upsert",
             table: "stripeCapabilities",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "capabilityId",
+            indexValues: { capabilityId: capability.id },
             data: {
               capabilityId: capability.id,
               stripe: CapabilityStripeToConvex(capability),
@@ -7397,7 +7400,7 @@ const ChargesSyncImplementation = defineActionImplementation({
           operation: "upsert",
           indexName: BY_STRIPE_ID_INDEX_NAME,
           table: "stripeCharges",
-          idField: "chargeId",
+          indexValues: { chargeId: charge.id },
           data: {
             chargeId: charge.id,
             stripe: ChargeStripeToConvex(charge),
@@ -7430,7 +7433,7 @@ const CheckoutSessionsSyncImplementation = defineActionImplementation({
         {
           operation: "upsert",
           table: "stripeCheckoutSessions",
-          idField: "checkoutSessionId",
+          indexValues: { checkoutSessionId: checkoutSession.id },
           indexName: BY_STRIPE_ID_INDEX_NAME,
           data: {
             checkoutSessionId: checkoutSession.id,
@@ -7465,7 +7468,7 @@ const CouponsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeCoupons",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "couponId",
+          indexValues: { couponId: coupon.id },
           data: {
             couponId: coupon.id,
             stripe: CouponStripeToConvex(coupon),
@@ -7499,7 +7502,7 @@ const CreditNotesSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeCreditNotes",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "creditNoteId",
+          indexValues: { creditNoteId: creditNote.id },
           data: {
             creditNoteId: creditNote.id,
             stripe: CreditNoteStripeToConvex(creditNote),
@@ -7538,7 +7541,7 @@ const CustomersSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeCustomers",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "customerId",
+          indexValues: { customerId: customer.id },
           data: {
             customerId: customer.id,
             entityId,
@@ -7573,7 +7576,7 @@ const DisputesSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeDisputes",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "disputeId",
+          indexValues: { disputeId: dispute.id },
           data: {
             disputeId: dispute.id,
             stripe: DisputeStripeToConvex(dispute),
@@ -7607,7 +7610,7 @@ const EarlyFraudWarningsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeEarlyFraudWarnings",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "earlyFraudWarningId",
+          indexValues: { earlyFraudWarningId: early_fraud_warning.id },
           data: {
             earlyFraudWarningId: early_fraud_warning.id,
             stripe: EarlyFraudWarningStripeToConvex(early_fraud_warning),
@@ -7644,7 +7647,7 @@ const InvoicesSyncImplementation = defineActionImplementation({
         {
           operation: "upsert",
           table: "stripeInvoices",
-          idField: "invoiceId",
+          indexValues: { invoiceId: invoice.id },
           indexName: BY_STRIPE_ID_INDEX_NAME,
           data: {
             invoiceId: invoice.id,
@@ -7682,7 +7685,7 @@ const PaymentIntentsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripePaymentIntents",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "paymentIntentId",
+          indexValues: { paymentIntentId: paymentIntent.id },
           data: {
             paymentIntentId: paymentIntent.id,
             stripe: PaymentIntentStripeToConvex(paymentIntent),
@@ -7716,7 +7719,7 @@ const PaymentMethodsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripePaymentMethods",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "paymentMethodId",
+          indexValues: { paymentMethodId: paymentMethod.id },
           data: {
             paymentMethodId: paymentMethod.id,
             stripe: PaymentMethodStripeToConvex(paymentMethod),
@@ -7750,7 +7753,7 @@ const PayoutsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripePayouts",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "payoutId",
+          indexValues: { payoutId: payout.id },
           data: {
             payoutId: payout.id,
             stripe: PayoutStripeToConvex(payout),
@@ -7787,7 +7790,7 @@ const PlansSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripePlans",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "planId",
+          indexValues: { planId: plan.id },
           data: {
             planId: plan.id,
             stripe: PlanStripeToConvex(plan),
@@ -7824,7 +7827,7 @@ const PricesSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripePrices",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "priceId",
+          indexValues: { priceId: price.id },
           data: {
             priceId: price.id,
             stripe: PriceStripeToConvex(price),
@@ -7859,7 +7862,7 @@ const ProductsSyncImplementation = defineActionImplementation({
       options
     );
     const localProductsById = new Map(
-      (localProductsResponse.docs || []).map((p) => [p.productId, p])
+      (localProductsResponse || []).map((p) => [p.productId, p])
     );
     const products = await stripe.products.list({ limit: 100 }, { stripeAccount: args.accountId }).autoPagingToArray({ limit: 1e4 });
     const stripeProductIds = /* @__PURE__ */ new Set();
@@ -7874,7 +7877,7 @@ const ProductsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeProducts",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "productId",
+          indexValues: { productId: product.id },
           data: {
             productId: product.id,
             stripe: ProductStripeToConvex(product),
@@ -7908,7 +7911,7 @@ const PromotionCodesSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripePromotionCodes",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "promotionCodeId",
+          indexValues: { promotionCodeId: promotionCode.id },
           data: {
             promotionCodeId: promotionCode.id,
             stripe: PromotionCodeStripeToConvex(promotionCode),
@@ -7942,7 +7945,7 @@ const RefundsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeRefunds",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "refundId",
+          indexValues: { refundId: refund.id },
           data: {
             refundId: refund.id,
             stripe: RefundStripeToConvex(refund),
@@ -7976,7 +7979,7 @@ const ReviewsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeReviews",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "reviewId",
+          indexValues: { reviewId: review.id },
           data: {
             reviewId: review.id,
             stripe: ReviewStripeToConvex(review),
@@ -8010,7 +8013,7 @@ const SetupIntentsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeSetupIntents",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "setupIntentId",
+          indexValues: { setupIntentId: setupIntent.id },
           data: {
             setupIntentId: setupIntent.id,
             stripe: SetupIntentStripeToConvex(setupIntent),
@@ -8044,7 +8047,7 @@ const SubscriptionSchedulesSyncImplementation = defineActionImplementation({
         {
           operation: "upsert",
           table: "stripeSubscriptionSchedules",
-          idField: "subscriptionScheduleId",
+          indexValues: { subscriptionScheduleId: subscriptionSchedule.id },
           indexName: BY_STRIPE_ID_INDEX_NAME,
           data: {
             subscriptionScheduleId: subscriptionSchedule.id,
@@ -8091,7 +8094,7 @@ const SubscriptionsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeSubscriptions",
           indexName: "byCustomerId",
-          idField: "customerId",
+          indexValues: { customerId },
           data: {
             customerId,
             subscriptionId: subscription.id,
@@ -8116,14 +8119,14 @@ const SubscriptionsSyncImplementation = defineActionImplementation({
         (s) => typeof s.customer === "string" ? s.customer : s.customer.id
       )
     );
-    for (const sub of localSubsResponse.docs || []) {
+    for (const sub of localSubsResponse || []) {
       if (!hasSub.has(sub.customerId)) {
         await storeDispatchTyped(
           {
             operation: "upsert",
             table: "stripeSubscriptions",
             indexName: "byCustomerId",
-            idField: "customerId",
+            indexValues: { customerId: sub.customerId },
             data: {
               customerId: sub.customerId,
               subscriptionId: null,
@@ -8158,7 +8161,7 @@ const TaxIdsSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeTaxIds",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "taxIdId",
+          indexValues: { taxIdId: taxId.id },
           data: {
             taxIdId: taxId.id,
             stripe: TaxIdStripeToConvex(taxId),
@@ -8192,7 +8195,7 @@ const TransfersSyncImplementation = defineActionImplementation({
           operation: "upsert",
           table: "stripeTransfers",
           indexName: BY_STRIPE_ID_INDEX_NAME,
-          idField: "transferId",
+          indexValues: { transferId: transfer.id },
           data: {
             transferId: transfer.id,
             stripe: TransferStripeToConvex(transfer),
@@ -8359,7 +8362,7 @@ const AccountsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeAccounts",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "accountId",
+            indexValues: { accountId: account.id },
             data: {
               accountId: account.id,
               entityId,
@@ -8391,7 +8394,7 @@ const BillingPortalConfigurationHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeBillingPortalConfigurations",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "billingPortalConfigurationId",
+            indexValues: { billingPortalConfigurationId: billingPortalConfiguration.id },
             data: {
               billingPortalConfigurationId: billingPortalConfiguration.id,
               stripe: BillingPortalConfigurationStripeToConvex(
@@ -8421,7 +8424,7 @@ const CapabilitiesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeCapabilities",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "capabilityId",
+            indexValues: { capabilityId: capability.id },
             data: {
               capabilityId: capability.id,
               stripe: CapabilityStripeToConvex(capability),
@@ -8463,7 +8466,7 @@ const ChargesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeCharges",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "chargeId",
+            indexValues: { chargeId: charge.id },
             data: {
               chargeId: charge.id,
               stripe: ChargeStripeToConvex(charge),
@@ -8499,7 +8502,7 @@ const CheckoutSessionsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeCheckoutSessions",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "checkoutSessionId",
+            indexValues: { checkoutSessionId: checkoutSession.id },
             data: {
               checkoutSessionId: checkoutSession.id,
               stripe: CheckoutSessionStripeToConvex(checkoutSession),
@@ -8528,7 +8531,7 @@ const CouponsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeCoupons",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "couponId",
+            indexValues: { couponId: coupon.id },
             data: {
               couponId: coupon.id,
               stripe: CouponStripeToConvex(coupon),
@@ -8547,8 +8550,7 @@ const CouponsHandlerImplementation = defineWebhookHandler({
             operation: "deleteById",
             table: "stripeCoupons",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "couponId",
-            idValue: coupon.id
+            indexValues: { couponId: coupon.id }
           },
           context,
           configuration,
@@ -8572,7 +8574,7 @@ const CreditNotesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeCreditNotes",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "creditNoteId",
+            indexValues: { creditNoteId: creditNote.id },
             data: {
               creditNoteId: creditNote.id,
               stripe: CreditNoteStripeToConvex(creditNote),
@@ -8608,7 +8610,7 @@ const CustomersHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeCustomers",
             indexName: "byEntityId",
-            idField: "entityId",
+            indexValues: { entityId },
             data: {
               customerId: customer.id,
               entityId,
@@ -8628,8 +8630,7 @@ const CustomersHandlerImplementation = defineWebhookHandler({
             operation: "deleteById",
             table: "stripeCustomers",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "customerId",
-            idValue: customer.id
+            indexValues: { customerId: customer.id }
           },
           context,
           configuration,
@@ -8661,7 +8662,7 @@ const DisputesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeDisputes",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "disputeId",
+            indexValues: { disputeId: dispute.id },
             data: {
               disputeId: dispute.id,
               stripe: DisputeStripeToConvex(dispute),
@@ -8693,7 +8694,7 @@ const EarlyFraudWarningsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeEarlyFraudWarnings",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "earlyFraudWarningId",
+            indexValues: { earlyFraudWarningId: earlyFraudWarning.id },
             data: {
               earlyFraudWarningId: earlyFraudWarning.id,
               stripe: EarlyFraudWarningStripeToConvex(earlyFraudWarning),
@@ -8757,7 +8758,7 @@ const InvoicesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeInvoices",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "invoiceId",
+            indexValues: { invoiceId: invoice.id },
             data: {
               invoiceId: invoice.id,
               stripe: InvoiceStripeToConvex({
@@ -8788,7 +8789,7 @@ const MandatesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeMandates",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "mandateId",
+            indexValues: { mandateId: mandate.id },
             data: {
               mandateId: mandate.id,
               stripe: MandateStripeToConvex(mandate),
@@ -8832,7 +8833,7 @@ const PaymentIntentsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripePaymentIntents",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "paymentIntentId",
+            indexValues: { paymentIntentId: paymentIntent.id },
             data: {
               paymentIntentId: paymentIntent.id,
               stripe: PaymentIntentStripeToConvex(paymentIntent),
@@ -8868,7 +8869,7 @@ const PaymentMethodsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripePaymentMethods",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "paymentMethodId",
+            indexValues: { paymentMethodId: paymentMethod.id },
             data: {
               paymentMethodId: paymentMethod.id,
               stripe: PaymentMethodStripeToConvex(paymentMethod),
@@ -8908,7 +8909,7 @@ const PayoutsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripePayouts",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "payoutId",
+            indexValues: { payoutId: payout.id },
             data: {
               payoutId: payout.id,
               stripe: PayoutStripeToConvex(payout),
@@ -8938,7 +8939,7 @@ const PlansHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripePlans",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "planId",
+            indexValues: { planId: plan.id },
             data: {
               planId: plan.id,
               stripe: PlanStripeToConvex(plan),
@@ -8967,7 +8968,7 @@ const PricesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripePrices",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "priceId",
+            indexValues: { priceId: price.id },
             data: {
               priceId: price.id,
               stripe: PriceStripeToConvex(price),
@@ -8986,8 +8987,7 @@ const PricesHandlerImplementation = defineWebhookHandler({
             operation: "deleteById",
             table: "stripePrices",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "priceId",
-            idValue: price.id
+            indexValues: { priceId: price.id }
           },
           context,
           configuration,
@@ -9010,7 +9010,7 @@ const ProductsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeProducts",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "productId",
+            indexValues: { productId: product.id },
             data: {
               productId: product.id,
               stripe: ProductStripeToConvex(product),
@@ -9029,8 +9029,7 @@ const ProductsHandlerImplementation = defineWebhookHandler({
             operation: "deleteById",
             table: "stripeProducts",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "productId",
-            idValue: product.id
+            indexValues: { productId: product.id }
           },
           context,
           configuration,
@@ -9053,7 +9052,7 @@ const PromotionCodesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripePromotionCodes",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "promotionCodeId",
+            indexValues: { promotionCodeId: promotionCode.id },
             data: {
               promotionCodeId: promotionCode.id,
               stripe: PromotionCodeStripeToConvex(promotionCode),
@@ -9088,7 +9087,7 @@ const RefundsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeRefunds",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "refundId",
+            indexValues: { refundId: refund.id },
             data: {
               refundId: refund.id,
               stripe: RefundStripeToConvex(refund),
@@ -9117,7 +9116,7 @@ const ReviewsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeReviews",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "reviewId",
+            indexValues: { reviewId: review.id },
             data: {
               reviewId: review.id,
               stripe: ReviewStripeToConvex(review),
@@ -9159,7 +9158,7 @@ const SetupIntentHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeSetupIntents",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "setupIntentId",
+            indexValues: { setupIntentId: setupIntent.id },
             data: {
               setupIntentId: setupIntent.id,
               stripe: SetupIntentStripeToConvex(setupIntent),
@@ -9201,7 +9200,7 @@ const SubscriptionSchedulesHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeSubscriptionSchedules",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "subscriptionScheduleId",
+            indexValues: { subscriptionScheduleId: subscriptionSchedule.id },
             data: {
               subscriptionScheduleId: subscriptionSchedule.id,
               stripe: SubscriptionScheduleStripeToConvex(subscriptionSchedule),
@@ -9245,7 +9244,7 @@ const SubscriptionsHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeSubscriptions",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "subscriptionId",
+            indexValues: { subscriptionId: subscription.id },
             data: {
               subscriptionId: subscription.id,
               customerId: typeof subscription.customer === "string" ? subscription.customer : subscription.customer.id,
@@ -9280,7 +9279,7 @@ const TaxIdHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeTaxIds",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "taxIdId",
+            indexValues: { taxIdId: taxId.id },
             data: {
               taxIdId: taxId.id,
               stripe: TaxIdStripeToConvex(taxId),
@@ -9316,7 +9315,7 @@ const TransfersHandlerImplementation = defineWebhookHandler({
             operation: "upsert",
             table: "stripeTransfers",
             indexName: BY_STRIPE_ID_INDEX_NAME,
-            idField: "transferId",
+            indexValues: { transferId: transfer.id },
             data: {
               accountId: event.account,
               transferId: transfer.id,