@forklaunch/implementation-billing-stripe 1.1.32 → 1.1.33

package/lib/eject/services/webhook.service.ts

@@ -36,6 +36,19 @@ import { StripeSubscriptionService } from './subscription.service';
  * `@forklaunch/implementation-billing-stripe/persistence`.
  */
 type StripeWebhookEventEntity = InferEntity<typeof StripeWebhookEvent>;
+
+/**
+ * Structural constraint for injectable webhook event entities — the fields
+ * the idempotency flow reads and writes. Applications inject their own
+ * (typically richer, sqlBaseProperties-based) entity; the generic infers
+ * from the injected schema exactly like the mapper entity generics do.
+ */
+export type StripeWebhookEventShape = {
+  stripeId: string;
+  idempotencyKey?: string | null;
+  eventType: string;
+  eventData: unknown;
+};
 // mikro-orm 7 narrowed EntityName's type to exclude strings, but the runtime
 // resolves registered entity names as it always has — and name resolution is
 // exactly what we need by default (see above).
@@ -54,10 +67,11 @@ export class StripeWebhookService<
     StripePaymentLinkEntities<StatusEnum> = StripePaymentLinkEntities<StatusEnum>,
   PlanEntities extends StripePlanEntities = StripePlanEntities,
   SubscriptionEntities extends
-    StripeSubscriptionEntities<PartyEnum> = StripeSubscriptionEntities<PartyEnum>
+    StripeSubscriptionEntities<PartyEnum> = StripeSubscriptionEntities<PartyEnum>,
+  WebhookEventEntity extends StripeWebhookEventShape = StripeWebhookEventEntity
 > {
   protected readonly partyEnum: PartyEnum;
-  protected readonly webhookEventEntity: EntityName<StripeWebhookEventEntity>;
+  protected readonly webhookEventEntity: EntityName<WebhookEventEntity>;
   protected readonly stripeClient: Stripe;
   protected readonly em: EntityManager;
   protected readonly schemaValidator: SchemaValidator;
@@ -118,7 +132,7 @@ export class StripeWebhookService<
      * 'StripeWebhookEvent'; inject your own entity (mapper-style) to use a
      * different one.
      */
-    webhookEventEntity: EntityName<StripeWebhookEventEntity> = DEFAULT_STRIPE_WEBHOOK_EVENT_ENTITY
+    webhookEventEntity: EntityName<WebhookEventEntity> = DEFAULT_STRIPE_WEBHOOK_EVENT_ENTITY as EntityName<WebhookEventEntity>
   ) {
     this.webhookEventEntity = webhookEventEntity;
     this.partyEnum = partyEnum;
@@ -182,8 +196,10 @@ export class StripeWebhookService<
     }
 
     if (
-      await this.em.findOne<StripeWebhookEventEntity>(
-        this.webhookEventEntity,
+      // querying through the structural shape with an internal cast, the same
+      // way the mapper services do (`mapper.entity as typeof Plan`)
+      await this.em.findOne<StripeWebhookEventShape>(
+        this.webhookEventEntity as EntityName<StripeWebhookEventShape>,
         {
           idempotencyKey: event.request?.idempotency_key
         }
@@ -506,7 +522,8 @@ export class StripeWebhookService<
     // em.create (not native em.insert): the app's entity generates its id and
     // timestamps via onCreate hooks, which native inserts bypass — a native
     // insert fails NOT NULL on id for sqlBaseProperties-style entities.
-    this.em.create<StripeWebhookEventEntity>(this.webhookEventEntity, {
+    this.em.create<StripeWebhookEventShape>(
+      this.webhookEventEntity as EntityName<StripeWebhookEventShape>, {
       stripeId: event.id,
       idempotencyKey: event.request?.idempotency_key,
       eventType: event.type,

package/lib/services/index.js

@@ -687,12 +687,16 @@ var StripeWebhookService = class {
     if (this.openTelemetryCollector) {
       this.openTelemetryCollector.info("Handling webhook event", event);
     }
-    if (await this.em.findOne(
-      this.webhookEventEntity,
-      {
-        idempotencyKey: event.request?.idempotency_key
-      }
-    )) {
+    if (
+      // querying through the structural shape with an internal cast, the same
+      // way the mapper services do (`mapper.entity as typeof Plan`)
+      await this.em.findOne(
+        this.webhookEventEntity,
+        {
+          idempotencyKey: event.request?.idempotency_key
+        }
+      )
+    ) {
       this.openTelemetryCollector.info(
         "Webhook event already processed",
         event
@@ -935,12 +939,15 @@ var StripeWebhookService = class {
         );
         break;
     }
-    this.em.create(this.webhookEventEntity, {
-      stripeId: event.id,
-      idempotencyKey: event.request?.idempotency_key,
-      eventType: event.type,
-      eventData: event.data
-    });
+    this.em.create(
+      this.webhookEventEntity,
+      {
+        stripeId: event.id,
+        idempotencyKey: event.request?.idempotency_key,
+        eventType: event.type,
+        eventData: event.data
+      }
+    );
     await this.em.flush();
   }
 };

package/lib/services/index.mjs

@@ -655,12 +655,16 @@ var StripeWebhookService = class {
     if (this.openTelemetryCollector) {
       this.openTelemetryCollector.info("Handling webhook event", event);
     }
-    if (await this.em.findOne(
-      this.webhookEventEntity,
-      {
-        idempotencyKey: event.request?.idempotency_key
-      }
-    )) {
+    if (
+      // querying through the structural shape with an internal cast, the same
+      // way the mapper services do (`mapper.entity as typeof Plan`)
+      await this.em.findOne(
+        this.webhookEventEntity,
+        {
+          idempotencyKey: event.request?.idempotency_key
+        }
+      )
+    ) {
       this.openTelemetryCollector.info(
         "Webhook event already processed",
         event
@@ -903,12 +907,15 @@ var StripeWebhookService = class {
         );
         break;
     }
-    this.em.create(this.webhookEventEntity, {
-      stripeId: event.id,
-      idempotencyKey: event.request?.idempotency_key,
-      eventType: event.type,
-      eventData: event.data
-    });
+    this.em.create(
+      this.webhookEventEntity,
+      {
+        stripeId: event.id,
+        idempotencyKey: event.request?.idempotency_key,
+        eventType: event.type,
+        eventData: event.data
+      }
+    );
     await this.em.flush();
   }
 };

package/lib/services/webhook.service.d.ts

@@ -21,9 +21,21 @@ import { StripeSubscriptionService } from './subscription.service';
  * `@forklaunch/implementation-billing-stripe/persistence`.
  */
 type StripeWebhookEventEntity = InferEntity<typeof StripeWebhookEvent>;
-export declare class StripeWebhookService<SchemaValidator extends AnySchemaValidator, StatusEnum, PartyEnum, BillingPortalEntities extends StripeBillingPortalEntities = StripeBillingPortalEntities, CheckoutSessionEntities extends StripeCheckoutSessionEntities<StatusEnum> = StripeCheckoutSessionEntities<StatusEnum>, PaymentLinkEntities extends StripePaymentLinkEntities<StatusEnum> = StripePaymentLinkEntities<StatusEnum>, PlanEntities extends StripePlanEntities = StripePlanEntities, SubscriptionEntities extends StripeSubscriptionEntities<PartyEnum> = StripeSubscriptionEntities<PartyEnum>> {
+/**
+ * Structural constraint for injectable webhook event entities — the fields
+ * the idempotency flow reads and writes. Applications inject their own
+ * (typically richer, sqlBaseProperties-based) entity; the generic infers
+ * from the injected schema exactly like the mapper entity generics do.
+ */
+export type StripeWebhookEventShape = {
+    stripeId: string;
+    idempotencyKey?: string | null;
+    eventType: string;
+    eventData: unknown;
+};
+export declare class StripeWebhookService<SchemaValidator extends AnySchemaValidator, StatusEnum, PartyEnum, BillingPortalEntities extends StripeBillingPortalEntities = StripeBillingPortalEntities, CheckoutSessionEntities extends StripeCheckoutSessionEntities<StatusEnum> = StripeCheckoutSessionEntities<StatusEnum>, PaymentLinkEntities extends StripePaymentLinkEntities<StatusEnum> = StripePaymentLinkEntities<StatusEnum>, PlanEntities extends StripePlanEntities = StripePlanEntities, SubscriptionEntities extends StripeSubscriptionEntities<PartyEnum> = StripeSubscriptionEntities<PartyEnum>, WebhookEventEntity extends StripeWebhookEventShape = StripeWebhookEventEntity> {
     protected readonly partyEnum: PartyEnum;
-    protected readonly webhookEventEntity: EntityName<StripeWebhookEventEntity>;
+    protected readonly webhookEventEntity: EntityName<WebhookEventEntity>;
     protected readonly stripeClient: Stripe;
     protected readonly em: EntityManager;
     protected readonly schemaValidator: SchemaValidator;
@@ -40,7 +52,7 @@ export declare class StripeWebhookService<SchemaValidator extends AnySchemaValid
      * 'StripeWebhookEvent'; inject your own entity (mapper-style) to use a
      * different one.
      */
-    webhookEventEntity?: EntityName<StripeWebhookEventEntity>);
+    webhookEventEntity?: EntityName<WebhookEventEntity>);
     /**
      * Resolve the party type for a subscription event.
      * Stripe subscriptions are customer-scoped — customers map to users

package/lib/services/webhook.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.service.d.ts","sourceRoot":"","sources":["../../services/webhook.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webhook.service.d.ts","sourceRoot":"","sources":["../../services/webhook.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forklaunch/implementation-billing-stripe",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "description": "Stripe implementation for forklaunch billing",
   "homepage": "https://github.com/forklaunch/forklaunch-js#readme",
   "bugs": {