@reactionary/feeds 0.12.2 → 0.12.4

package/cli.cjs

@@ -37455,92 +37455,6 @@ var init_cart_model = __esm({
   }
 });
 
-// packages/core/src/schemas/models/employee.model.ts
-var EmployeeSchema, EmployeePaginatedListSchema;
-var init_employee_model = __esm({
-  "packages/core/src/schemas/models/employee.model.ts"() {
-    "use strict";
-    init_zod();
-    init_base_model();
-    init_identifiers_model();
-    init_price_model();
-    EmployeeSchema = looseObject({
-      identifier: IdentityIdentifierSchema,
-      company: CompanyIdentifierSchema,
-      firstName: string2().optional().meta({ description: "The first name of the employee. This is the human readable name that will be displayed in the UI." }),
-      lastName: string2().optional().meta({ description: "The last name of the employee. This is the human readable name that will be displayed in the UI." }),
-      email: email2().meta({ description: "The email of the employee. This is the email that the employee uses to log in and access the storefront." }),
-      role: EmployeeRoleSchema.meta({ description: "The role of the employee in the company. This can be used to determine what permissions and access the employee has in the storefront." }),
-      spendingLimit: MonetaryAmountSchema.optional().meta({ description: "The spending limit for the employee. This can be used to restrict the amount of money the employee can spend when placing orders on behalf of the company." })
-    });
-    EmployeePaginatedListSchema = createPaginatedResponseSchema(EmployeeSchema).extend({
-      identifier: EmployeeSearchIdentifierSchema
-    });
-  }
-});
-
-// packages/core/src/schemas/models/company.model.ts
-var CompanyStatusSchema, CompanySchema, CompanyPaginatedListSchema;
-var init_company_model = __esm({
-  "packages/core/src/schemas/models/company.model.ts"() {
-    "use strict";
-    init_zod();
-    init_identifiers_model();
-    init_base_model();
-    init_profile_model();
-    CompanyStatusSchema = _enum(["active", "blocked"]);
-    CompanySchema = looseObject({
-      identifier: CompanyIdentifierSchema,
-      /**
-       * DUN and Bradstreet identifier. Useful for doing automated credit checks
-       */
-      dunsIdentifier: string2().optional().meta({ description: "The DUNS number of the company. This is a unique identifier for businesses that can be used for credit reporting and other purposes." }),
-      /**
-       * EU Tax identifier. Useful for reporting and printing
-       */
-      tinIdentifier: string2().optional().meta({ description: "The TIN (Tax Identification Number) of the company. This is a unique identifier for tax purposes." }),
-      name: string2().meta({ description: "The name of the company. This is the human readable name that will be displayed in the UI." }),
-      logo: ImageSchema.optional().meta({ description: "The logo of the company. This is the image that will be displayed in the UI to represent the company." }),
-      /**
-       * future
-      parentCompany: CompanyIdentifierSchema.optional(),
-      childOrganizationalEntities: z.array(CompanyIdentifierSchema).optional()
-       */
-      status: CompanyStatusSchema.default("blocked").meta({ description: "The current status of the company in the system. This can be used to determine if the company is active and allowed to perform certain actions, or if it is pending approval or blocked due to violations of terms of service or other issues." }),
-      /**
-       * The legal contact point for this company. Might not be someone with an actual profile on the site.
-       */
-      pointOfContact: PointOfContactSchema.meta({ description: "Email and optional phone for the CFO / signatory of the company" }),
-      /**
-       * Default shipping address if different from default billing address
-       */
-      shippingAddress: AddressSchema.optional().meta({ description: "The default shipping address for the company. This can be used as the default shipping address for orders placed by this company." }),
-      /**
-       * The billing address for this company.
-       */
-      billingAddress: AddressSchema.meta({ description: "The billing address for this company. Not user editable." }),
-      /**
-       * Other allowed shipping addresses
-       */
-      alternateShippingAddresses: array(AddressSchema).default(() => []).meta({ description: "Other approved shipping addresses for this company" }),
-      /**
-       * Various indicators the merchant can use to indicate what the company can self-manage.
-       */
-      /**
-       * Can user type in a different shipping address at checkout?
-       */
-      isCustomAddressesAllowed: boolean2().default(false).meta({ description: "Whether the company allows using custom shipping addresses that are not in the address book. If false, the user must select from the address book when placing an order." }),
-      /**
-       * Can admin users manage the address book of the company, adding and removing shipping addresses as needed?
-       */
-      isSelfManagementOfShippingAddressesAllowed: boolean2().default(false).meta({ description: "Whether the company allows users to manage their own shipping addresses in an address book. If false, the user must contact support to add or update shipping addresses." })
-    });
-    CompanyPaginatedListSchema = createPaginatedResponseSchema(CompanySchema).extend({
-      identifier: CompanySearchIdentifierSchema
-    });
-  }
-});
-
 // packages/core/src/schemas/models/shipping-method.model.ts
 var ShippingFulfillmentTypeSchema, ShippingProtocolDataSchema, SHIPPING_PROTOCOL_DATA_KEYS, PickupPointSchema, ShippingMethodSchema, ShippingInstructionSchema;
 var init_shipping_method_model = __esm({
@@ -37627,6 +37541,141 @@ var init_payment_model = __esm({
   }
 });
 
+// packages/core/src/schemas/models/checkout.model.ts
+var CheckoutItemSchema, CheckoutSchema;
+var init_checkout_model = __esm({
+  "packages/core/src/schemas/models/checkout.model.ts"() {
+    "use strict";
+    init_zod();
+    init_base_model();
+    init_identifiers_model();
+    init_cost_model();
+    init_profile_model();
+    init_shipping_method_model();
+    init_payment_model();
+    CheckoutItemSchema = looseObject({
+      identifier: CheckoutItemIdentifierSchema.default(() => CheckoutItemIdentifierSchema.parse({})),
+      variant: ProductVariantIdentifierSchema.default(() => ProductVariantIdentifierSchema.parse({})),
+      quantity: number2().default(0),
+      price: ItemCostBreakdownSchema.default(() => ItemCostBreakdownSchema.parse({}))
+    });
+    CheckoutSchema = BaseModelSchema.extend({
+      identifier: CheckoutIdentifierSchema.default(() => CheckoutIdentifierSchema.parse({})),
+      /**
+       * Do we need this?
+       */
+      originalCartReference: CartIdentifierSchema.default(() => CartIdentifierSchema.parse({})),
+      /**
+       * If the checkout has been completed, this will point to the resulting order.
+       */
+      resultingOrder: OrderIdentifierSchema.optional(),
+      items: array(CheckoutItemSchema).default(() => []),
+      price: CostBreakDownSchema.default(() => CostBreakDownSchema.parse({})),
+      name: string2().default(""),
+      description: string2().default(""),
+      pointOfContact: PointOfContactSchema,
+      billingAddress: AddressSchema.optional().nullable(),
+      /**
+       * Shipping and billing details can be changed on the checkout, but not items or quantities.
+       */
+      shippingAddress: AddressSchema.optional(),
+      shippingInstruction: ShippingInstructionSchema.optional(),
+      paymentInstructions: array(PaymentInstructionSchema).default(() => []),
+      /**
+       * Indicates if the checkout has all the required information to be finalized into an order.
+       * This does not mean it will succeed, as there may be issues with payment or shipping, but all required information is present.
+       */
+      readyForFinalization: boolean2().default(false).meta({ description: "Indicates if the checkout has all the required information to be finalized into an order. This does not mean it will succeed, as there may be issues with payment or shipping, but all required information is present." })
+    });
+  }
+});
+
+// packages/core/src/schemas/models/employee.model.ts
+var EmployeeSchema, EmployeePaginatedListSchema;
+var init_employee_model = __esm({
+  "packages/core/src/schemas/models/employee.model.ts"() {
+    "use strict";
+    init_zod();
+    init_base_model();
+    init_identifiers_model();
+    init_price_model();
+    EmployeeSchema = looseObject({
+      identifier: IdentityIdentifierSchema,
+      company: CompanyIdentifierSchema,
+      firstName: string2().optional().meta({ description: "The first name of the employee. This is the human readable name that will be displayed in the UI." }),
+      lastName: string2().optional().meta({ description: "The last name of the employee. This is the human readable name that will be displayed in the UI." }),
+      email: email2().meta({ description: "The email of the employee. This is the email that the employee uses to log in and access the storefront." }),
+      role: EmployeeRoleSchema.meta({ description: "The role of the employee in the company. This can be used to determine what permissions and access the employee has in the storefront." }),
+      spendingLimit: MonetaryAmountSchema.optional().meta({ description: "The spending limit for the employee. This can be used to restrict the amount of money the employee can spend when placing orders on behalf of the company." })
+    });
+    EmployeePaginatedListSchema = createPaginatedResponseSchema(EmployeeSchema).extend({
+      identifier: EmployeeSearchIdentifierSchema
+    });
+  }
+});
+
+// packages/core/src/schemas/models/company.model.ts
+var CompanyStatusSchema, CompanySchema, CompanyPaginatedListSchema;
+var init_company_model = __esm({
+  "packages/core/src/schemas/models/company.model.ts"() {
+    "use strict";
+    init_zod();
+    init_identifiers_model();
+    init_base_model();
+    init_profile_model();
+    CompanyStatusSchema = _enum(["active", "blocked"]);
+    CompanySchema = looseObject({
+      identifier: CompanyIdentifierSchema,
+      /**
+       * DUN and Bradstreet identifier. Useful for doing automated credit checks
+       */
+      dunsIdentifier: string2().optional().meta({ description: "The DUNS number of the company. This is a unique identifier for businesses that can be used for credit reporting and other purposes." }),
+      /**
+       * EU Tax identifier. Useful for reporting and printing
+       */
+      tinIdentifier: string2().optional().meta({ description: "The TIN (Tax Identification Number) of the company. This is a unique identifier for tax purposes." }),
+      name: string2().meta({ description: "The name of the company. This is the human readable name that will be displayed in the UI." }),
+      logo: ImageSchema.optional().meta({ description: "The logo of the company. This is the image that will be displayed in the UI to represent the company." }),
+      /**
+       * future
+      parentCompany: CompanyIdentifierSchema.optional(),
+      childOrganizationalEntities: z.array(CompanyIdentifierSchema).optional()
+       */
+      status: CompanyStatusSchema.default("blocked").meta({ description: "The current status of the company in the system. This can be used to determine if the company is active and allowed to perform certain actions, or if it is pending approval or blocked due to violations of terms of service or other issues." }),
+      /**
+       * The legal contact point for this company. Might not be someone with an actual profile on the site.
+       */
+      pointOfContact: PointOfContactSchema.meta({ description: "Email and optional phone for the CFO / signatory of the company" }),
+      /**
+       * Default shipping address if different from default billing address
+       */
+      shippingAddress: AddressSchema.optional().meta({ description: "The default shipping address for the company. This can be used as the default shipping address for orders placed by this company." }),
+      /**
+       * The billing address for this company.
+       */
+      billingAddress: AddressSchema.meta({ description: "The billing address for this company. Not user editable." }),
+      /**
+       * Other allowed shipping addresses
+       */
+      alternateShippingAddresses: array(AddressSchema).default(() => []).meta({ description: "Other approved shipping addresses for this company" }),
+      /**
+       * Various indicators the merchant can use to indicate what the company can self-manage.
+       */
+      /**
+       * Can user type in a different shipping address at checkout?
+       */
+      isCustomAddressesAllowed: boolean2().default(false).meta({ description: "Whether the company allows using custom shipping addresses that are not in the address book. If false, the user must select from the address book when placing an order." }),
+      /**
+       * Can admin users manage the address book of the company, adding and removing shipping addresses as needed?
+       */
+      isSelfManagementOfShippingAddressesAllowed: boolean2().default(false).meta({ description: "Whether the company allows users to manage their own shipping addresses in an address book. If false, the user must contact support to add or update shipping addresses." })
+    });
+    CompanyPaginatedListSchema = createPaginatedResponseSchema(CompanySchema).extend({
+      identifier: CompanySearchIdentifierSchema
+    });
+  }
+});
+
 // packages/core/src/schemas/models/order.model.ts
 var OrderItemSchema, OrderSchema;
 var init_order_model = __esm({
@@ -37673,6 +37722,7 @@ var init_commerce_mutation = __esm({
     init_zod();
     init_event_parts_model();
     init_cart_model();
+    init_checkout_model();
     init_company_model();
     init_identifiers_model();
     init_order_model();
@@ -37722,7 +37772,8 @@ var init_commerce_mutation = __esm({
       paymentMethod: PaymentMethodSchema
     });
     AnalyticsMutationOrderPlacedSchema = AnalyticsEventMutationBaseSchema.extend({
-      order: OrderSchema
+      checkout: CheckoutSchema.optional().meta({ description: "The finalized checkout: what the customer placed. Preferred over order, as the order may not exist yet when the OMS is the order source. Either checkout or order is required." }),
+      order: OrderSchema.optional().meta({ description: "Deprecated: pass the checkout instead. Either checkout or order is required.", deprecated: true })
     });
     AnalyticsMutationQuoteRequestedSchema = AnalyticsEventMutationBaseSchema.extend({
       cart: CartSchema
@@ -38156,55 +38207,6 @@ var init_product_reviews_model = __esm({
   }
 });
 
-// packages/core/src/schemas/models/checkout.model.ts
-var CheckoutItemSchema, CheckoutSchema;
-var init_checkout_model = __esm({
-  "packages/core/src/schemas/models/checkout.model.ts"() {
-    "use strict";
-    init_zod();
-    init_base_model();
-    init_identifiers_model();
-    init_cost_model();
-    init_profile_model();
-    init_shipping_method_model();
-    init_payment_model();
-    CheckoutItemSchema = looseObject({
-      identifier: CheckoutItemIdentifierSchema.default(() => CheckoutItemIdentifierSchema.parse({})),
-      variant: ProductVariantIdentifierSchema.default(() => ProductVariantIdentifierSchema.parse({})),
-      quantity: number2().default(0),
-      price: ItemCostBreakdownSchema.default(() => ItemCostBreakdownSchema.parse({}))
-    });
-    CheckoutSchema = BaseModelSchema.extend({
-      identifier: CheckoutIdentifierSchema.default(() => CheckoutIdentifierSchema.parse({})),
-      /**
-       * Do we need this?
-       */
-      originalCartReference: CartIdentifierSchema.default(() => CartIdentifierSchema.parse({})),
-      /**
-       * If the checkout has been completed, this will point to the resulting order.
-       */
-      resultingOrder: OrderIdentifierSchema.optional(),
-      items: array(CheckoutItemSchema).default(() => []),
-      price: CostBreakDownSchema.default(() => CostBreakDownSchema.parse({})),
-      name: string2().default(""),
-      description: string2().default(""),
-      pointOfContact: PointOfContactSchema,
-      billingAddress: AddressSchema.optional().nullable(),
-      /**
-       * Shipping and billing details can be changed on the checkout, but not items or quantities.
-       */
-      shippingAddress: AddressSchema.optional(),
-      shippingInstruction: ShippingInstructionSchema.optional(),
-      paymentInstructions: array(PaymentInstructionSchema).default(() => []),
-      /**
-       * Indicates if the checkout has all the required information to be finalized into an order.
-       * This does not mean it will succeed, as there may be issues with payment or shipping, but all required information is present.
-       */
-      readyForFinalization: boolean2().default(false).meta({ description: "Indicates if the checkout has all the required information to be finalized into an order. This does not mean it will succeed, as there may be issues with payment or shipping, but all required information is present." })
-    });
-  }
-});
-
 // packages/core/src/schemas/models/order-search.model.ts
 var OrderSearchResultItemSchema, OrderSearchResultSchema;
 var init_order_search_model = __esm({
@@ -39958,6 +39960,7 @@ var init_analytics_capability = __esm({
     init_legacy_adapter();
     init_reactionary_decorator();
     init_schemas3();
+    init_result();
     init_base_capability();
     AnalyticsCapability = class extends BaseCapability {
       dispatcher;
@@ -40034,6 +40037,9 @@ var init_analytics_capability = __esm({
         return this.dispatcher.emit("payment-info-added", payload);
       }
       async orderPlaced(payload) {
+        if (!payload.checkout && !payload.order) {
+          return error({ type: "Generic", message: "orderPlaced needs a checkout (or the deprecated order)" });
+        }
         return this.dispatcher.emit("order-placed", payload);
       }
       async quoteRequested(payload) {
@@ -41562,6 +41568,25 @@ var init_capabilities = __esm({
   }
 });
 
+// packages/core/src/analytics/placed-order.ts
+function summarizePlacedOrder(payload) {
+  const { checkout, order } = payload;
+  const source = checkout ?? order;
+  if (!source) {
+    return void 0;
+  }
+  return {
+    transactionId: order?.identifier.key ?? checkout?.resultingOrder?.key ?? source.identifier.key,
+    items: source.items,
+    price: source.price
+  };
+}
+var init_placed_order = __esm({
+  "packages/core/src/analytics/placed-order.ts"() {
+    "use strict";
+  }
+});
+
 // packages/core/src/analytics/recording-subscriber.ts
 var init_recording_subscriber = __esm({
   "packages/core/src/analytics/recording-subscriber.ts"() {
@@ -41587,6 +41612,7 @@ var init_analytics3 = __esm({
     init_dispatcher();
     init_legacy_adapter();
     init_origins();
+    init_placed_order();
     init_recording_subscriber();
     init_refs();
   }
@@ -72559,8 +72585,12 @@ var init_analytics_capability2 = __esm({
         return "accepted";
       }
       async orderPlaced(event, ctx) {
+        const placed = summarizePlacedOrder(event.payload);
+        if (!placed) {
+          return "ignored";
+        }
         const lines = await Promise.all(
-          event.payload.order.items.map(async (item) => {
+          placed.items.map(async (item) => {
             const product = await ctx.products.bySku(item.variant);
             return product.success ? { objectID: product.value.identifier.key, item } : void 0;
           })
@@ -72570,7 +72600,7 @@ var init_analytics_capability2 = __esm({
           return "ignored";
         }
         const search = this.searchFor(event);
-        const total = event.payload.order.price.grandTotal;
+        const total = placed.price.grandTotal;
         const common = {
           eventName: "purchase",
           eventType: "conversion",
@@ -116852,6 +116882,17 @@ var init_checkout_capability2 = __esm({
         if (!result.success) {
           throw new Error("Unable to fetch checkout after finalization.");
         }
+        const originalCartId = result.value.originalCartReference?.key;
+        if (originalCartId && originalCartId !== ctId.key) {
+          try {
+            const originalCart = await client.carts.withId({ ID: originalCartId }).get().execute();
+            await client.carts.withId({ ID: originalCartId }).delete({
+              queryArgs: { version: originalCart.body.version, dataErasure: false }
+            }).execute();
+          } catch (e2) {
+            console.error(`Unable to delete original cart ${originalCartId} after finalizing checkout`, e2);
+          }
+        }
         return success(result.value);
       }
       async applyActions(checkout, actions) {
@@ -160944,6 +160985,9 @@ var init_category_capability5 = __esm({
 });
 
 // packages/medusa/src/capabilities/checkout.capability.ts
+function isCartAlreadyCompleted(error5) {
+  return error5 instanceof Error && /is already completed/i.test(error5.message);
+}
 var import_debug24, debug24, CheckoutNotReadyForFinalizationError3, MedusaCheckoutCapability;
 var init_checkout_capability5 = __esm({
   "packages/medusa/src/capabilities/checkout.capability.ts"() {
@@ -161299,11 +161343,17 @@ var init_checkout_capability5 = __esm({
         if (!checkout.value.resultingOrder) {
           const client = await this.medusaApi.getClient();
           const medusaId = payload.checkout;
-          await client.store.cart.update(medusaId.key, {
-            metadata: {
-              cart_id: medusaId.key
+          try {
+            await client.store.cart.update(medusaId.key, {
+              metadata: {
+                cart_id: medusaId.key
+              }
+            });
+          } catch (error5) {
+            if (!isCartAlreadyCompleted(error5)) {
+              throw error5;
             }
-          });
+          }
           const response = await client.store.cart.complete(medusaId.key);
           if (response.type === "order") {
             const resultingOrder = this.parseCompletedOrderIdentifier(response.order);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactionary/feeds",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "type": "module",
   "main": "./index.js",
   "types": "./src/index.d.ts",
@@ -12,14 +12,14 @@
     "url": "git+https://github.com/Solteq/reactionary.git"
   },
   "dependencies": {
-    "@reactionary/algolia": "0.12.2",
-    "@reactionary/commercetools": "0.12.2",
-    "@reactionary/core": "0.12.2",
-    "@reactionary/fake": "0.12.2",
-    "@reactionary/magento": "0.12.2",
-    "@reactionary/medusa": "0.12.2",
-    "@reactionary/meilisearch": "0.12.2",
-    "@reactionary/unomi": "0.12.2",
+    "@reactionary/algolia": "0.12.4",
+    "@reactionary/commercetools": "0.12.4",
+    "@reactionary/core": "0.12.4",
+    "@reactionary/fake": "0.12.4",
+    "@reactionary/magento": "0.12.4",
+    "@reactionary/medusa": "0.12.4",
+    "@reactionary/meilisearch": "0.12.4",
+    "@reactionary/unomi": "0.12.4",
     "commander": "^15.0.0",
     "dotenv": "^17.2.2",
     "sitemap": "^9.0.1",