@reactionary/provider-commercetools 0.0.83 → 0.0.85

package/core/client.js

@@ -5,7 +5,6 @@ import {
 import { randomUUID } from "crypto";
 import {
   AnonymousIdentitySchema,
-  GuestIdentitySchema,
   RegisteredIdentitySchema
 } from "@reactionary/core";
 import * as crypto from "crypto";
@@ -113,7 +112,17 @@ class CommercetoolsClient {
   }
   async logout() {
     await this.cache.set({ token: "", refreshToken: "", expirationTime: 0 });
-    return AnonymousIdentitySchema.parse({});
+    const identity = {
+      meta: {
+        cache: {
+          hit: false,
+          key: ""
+        },
+        placeholder: false
+      },
+      type: "Anonymous"
+    };
+    return identity;
   }
   // FIXME: This can fail if the short-lived access token has expired. In other words, probably missing a token refresh.
   async introspect() {
@@ -188,7 +197,16 @@ class CommercetoolsClient {
       };
       return identity;
     }
-    return AnonymousIdentitySchema.parse({});
+    return {
+      type: "Anonymous",
+      meta: {
+        cache: {
+          hit: false,
+          key: ""
+        },
+        placeholder: false
+      }
+    };
   }
   async becomeGuest() {
     const credentials = Buffer.from(

package/core/token-cache.js

@@ -21,7 +21,6 @@ class RequestContextTokenCache {
     };
   }
   async set(cache, tokenCacheOptions) {
-    console.log("TokenCache set session:", this.context.session["PROVIDER_COMMERCETOOLS"], "with token:", cache);
     const session = CommercetoolsSessionSchema.parse(
       this.context.session["PROVIDER_COMMERCETOOLS"] || {}
     );
@@ -29,7 +28,6 @@ class RequestContextTokenCache {
     session.refreshToken = cache.refreshToken;
     session.token = cache.token;
     session.expirationTime = cache.expirationTime;
-    console.log("TokenCache updated session:", this.context.session["PROVIDER_COMMERCETOOLS"]);
   }
 }
 export {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@reactionary/provider-commercetools",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "main": "index.js",
   "types": "src/index.d.ts",
   "dependencies": {
-    "@reactionary/core": "0.0.83",
+    "@reactionary/core": "0.0.85",
     "debug": "^4.4.3",
     "zod": "4.1.9",
     "@commercetools/ts-client": "^4.2.1",

package/providers/cart.provider.js

@@ -225,6 +225,44 @@ class CommercetoolsCartProvider extends CartProvider {
       orders: clientWithProject.me().orders()
     };
   }
+  parseCartItem(remoteItem) {
+    const unitPrice = remoteItem.price.value.centAmount;
+    const totalPrice = remoteItem.totalPrice.centAmount || 0;
+    const totalDiscount = remoteItem.price.discounted?.value.centAmount || 0;
+    const unitDiscount = totalDiscount / remoteItem.quantity;
+    const currency = remoteItem.price.value.currencyCode.toUpperCase();
+    const item = {
+      identifier: {
+        key: remoteItem.id
+      },
+      product: {
+        key: remoteItem.productId
+      },
+      variant: {
+        sku: remoteItem.variant.sku || ""
+      },
+      quantity: remoteItem.quantity,
+      price: {
+        unitPrice: {
+          value: unitPrice / 100,
+          currency
+        },
+        unitDiscount: {
+          value: unitDiscount / 100,
+          currency
+        },
+        totalPrice: {
+          value: (totalPrice || 0) / 100,
+          currency
+        },
+        totalDiscount: {
+          value: totalDiscount / 100,
+          currency
+        }
+      }
+    };
+    return CartItemSchema.parse(item);
+  }
   parseSingle(remote) {
     const identifier = {
       key: remote.id,
@@ -252,7 +290,7 @@ class CommercetoolsCartProvider extends CartProvider {
       },
       totalShipping: {
         value: shippingTotal / 100,
-        currency: remote.shippingInfo?.price.currencyCode
+        currency
       },
       totalProductPrice: {
         value: productTotal / 100,
@@ -265,33 +303,7 @@ class CommercetoolsCartProvider extends CartProvider {
     };
     const items = new Array();
     for (const remoteItem of remote.lineItems) {
-      const item = CartItemSchema.parse({});
-      item.identifier.key = remoteItem.id;
-      item.product.key = remoteItem.productId;
-      item.variant.sku = remoteItem.variant.sku || "";
-      item.quantity = remoteItem.quantity;
-      const unitPrice = remoteItem.price.value.centAmount;
-      const totalPrice = remoteItem.totalPrice.centAmount || 0;
-      const totalDiscount = remoteItem.price.discounted?.value.centAmount || 0;
-      const unitDiscount = totalDiscount / remoteItem.quantity;
-      item.price = {
-        unitPrice: {
-          value: unitPrice / 100,
-          currency
-        },
-        unitDiscount: {
-          value: unitDiscount / 100,
-          currency
-        },
-        totalPrice: {
-          value: (totalPrice || 0) / 100,
-          currency
-        },
-        totalDiscount: {
-          value: totalDiscount / 100,
-          currency
-        }
-      };
+      const item = this.parseCartItem(remoteItem);
       items.push(item);
     }
     const cart = {

package/providers/category.provider.js

@@ -50,7 +50,7 @@ class CommercetoolsCategoryProvider extends CategoryProvider {
             hit: false,
             key: ""
           },
-          placeholder: false
+          placeholder: true
         }
       };
       return dummyCategory;

package/providers/checkout.provider.js

@@ -22,12 +22,8 @@ import {
   CheckoutQueryForAvailablePaymentMethodsSchema,
   CheckoutQueryForAvailableShippingMethodsSchema,
   CheckoutSchema,
-  PaymentInstructionIdentifierSchema,
-  PaymentInstructionSchema,
-  PaymentMethodIdentifierSchema,
   PaymentMethodSchema,
   Reactionary,
-  ShippingInstructionSchema,
   ShippingMethodSchema
 } from "@reactionary/core";
 import z from "zod";
@@ -170,17 +166,21 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
     const result = [];
     const inputShippingMethods = shippingMethodsResponse.body.results;
     for (const sm of inputShippingMethods) {
-      const shippingMethod = ShippingMethodSchema.parse({
-        identifier: {
-          key: sm.key
-        },
-        name: sm.name,
-        description: sm.localizedDescription?.[this.context.languageContext.locale] || "",
+      const identifier = {
+        key: sm.key
+      };
+      const name = sm.name;
+      const description = sm.localizedDescription?.[this.context.languageContext.locale] || "";
+      const shippingMethod = {
+        deliveryTime: "",
+        description,
+        identifier,
+        name,
         price: sm.zoneRates[0].shippingRates[0].price ? {
           value: (sm.zoneRates[0].shippingRates[0].price.centAmount || 0) / 100,
           currency: sm.zoneRates[0].shippingRates[0].price.currencyCode || this.context.languageContext.currencyCode
         } : { value: 0, currency: this.context.languageContext.currencyCode }
-      });
+      };
       result.push(shippingMethod);
     }
     return result;
@@ -316,6 +316,41 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
   getStaticPaymentMethods(_checkout) {
     return this.config.paymentMethods || [];
   }
+  parseCheckoutItem(remoteItem) {
+    const unitPrice = remoteItem.price.value.centAmount;
+    const totalPrice = remoteItem.totalPrice.centAmount || 0;
+    const totalDiscount = remoteItem.price.discounted?.value.centAmount || 0;
+    const unitDiscount = totalDiscount / remoteItem.quantity;
+    const currency = remoteItem.price.value.currencyCode.toUpperCase();
+    const item = {
+      identifier: {
+        key: remoteItem.id
+      },
+      variant: {
+        sku: remoteItem.variant.sku || ""
+      },
+      quantity: remoteItem.quantity,
+      price: {
+        unitPrice: {
+          value: unitPrice / 100,
+          currency
+        },
+        unitDiscount: {
+          value: unitDiscount / 100,
+          currency
+        },
+        totalPrice: {
+          value: (totalPrice || 0) / 100,
+          currency
+        },
+        totalDiscount: {
+          value: totalDiscount / 100,
+          currency
+        }
+      }
+    };
+    return CheckoutItemSchema.parse(item);
+  }
   parseSingle(remote) {
     const identifier = {
       key: remote.id,
@@ -361,7 +396,7 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
       },
       totalShipping: {
         value: shippingTotal / 100,
-        currency: remote.shippingInfo?.price.currencyCode
+        currency
       },
       totalProductPrice: {
         value: productTotal / 100,
@@ -374,36 +409,17 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
     };
     const items = new Array();
     for (const remoteItem of remote.lineItems) {
-      const item = CheckoutItemSchema.parse({});
-      item.identifier.key = remoteItem.id;
-      item.variant.sku = remoteItem.variant.sku || "";
-      item.quantity = remoteItem.quantity;
-      const unitPrice = remoteItem.price.value.centAmount;
-      const totalPrice = remoteItem.totalPrice.centAmount || 0;
-      const totalDiscount = remoteItem.price.discounted?.value.centAmount || 0;
-      const unitDiscount = totalDiscount / remoteItem.quantity;
-      item.price = {
-        unitPrice: {
-          value: unitPrice / 100,
-          currency
-        },
-        unitDiscount: {
-          value: unitDiscount / 100,
-          currency
-        },
-        totalPrice: {
-          value: (totalPrice || 0) / 100,
-          currency
-        },
-        totalDiscount: {
-          value: totalDiscount / 100,
-          currency
-        }
-      };
+      const item = this.parseCheckoutItem(remoteItem);
       items.push(item);
     }
     const shippingInstruction = this.parseShippingInstruction(remote);
-    const readyForFinalization = this.isReadyForFinalization(price, paymentInstructions, billingAddress, shippingAddress, shippingInstruction);
+    const readyForFinalization = this.isReadyForFinalization(
+      price,
+      paymentInstructions,
+      billingAddress,
+      shippingAddress,
+      shippingInstruction
+    );
     const result = {
       identifier,
       originalCartReference,
@@ -441,35 +457,50 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
     return true;
   }
   parsePaymentInstruction(remote) {
-    const newModel = PaymentInstructionSchema.parse({});
-    newModel.identifier = PaymentInstructionIdentifierSchema.parse({
-      key: remote.id || ""
-    });
-    newModel.amount = {
+    const identifier = {
+      key: remote.id
+    };
+    const amount = {
       value: remote.amountPlanned.centAmount / 100,
       currency: remote.amountPlanned.currencyCode
     };
     const method = remote.paymentMethodInfo?.method || "unknown";
     const paymentProcessor = remote.paymentMethodInfo?.paymentInterface || method;
     const paymentName = remote.paymentMethodInfo.name[this.context.languageContext.locale];
-    newModel.paymentMethod = PaymentMethodIdentifierSchema.parse({
+    const paymentMethod = {
       method,
       paymentProcessor,
       name: paymentName || method || "Unknown"
-    });
+    };
     const customData = remote.custom?.fields || {};
-    newModel.protocolData = Object.keys(customData).map((x) => ({ key: x, value: customData[x] })) || [];
+    const protocolData = Object.keys(customData).map((x) => ({ key: x, value: customData[x] })) || [];
+    let status = "pending";
     if (remote.transactions && remote.transactions.length > 0) {
       const lastTransaction = remote.transactions[remote.transactions.length - 1];
       if (lastTransaction.type === "Authorization" && lastTransaction.state === "Pending") {
-        newModel.status = "pending";
+        status = "pending";
       } else if (lastTransaction.type === "Authorization" && lastTransaction.state === "Success") {
-        newModel.status = "authorized";
+        status = "authorized";
       }
     } else {
-      newModel.status = "pending";
+      status = "pending";
     }
-    return PaymentInstructionSchema.parse(newModel);
+    const meta = {
+      cache: {
+        hit: false,
+        key: ""
+      },
+      placeholder: false
+    };
+    const result = {
+      amount,
+      identifier,
+      meta,
+      paymentMethod,
+      protocolData,
+      status
+    };
+    return result;
   }
   parseAddress(remote) {
     return {
@@ -499,18 +530,21 @@ class CommercetoolsCheckoutProvider extends CheckoutProvider {
     const instructions = remote.custom?.fields["shippingInstruction"] || "";
     const consentForUnattendedDelivery = remote.custom?.fields["consentForUnattendedDelivery"] === "true" || false;
     const pickupPoint = remote.custom?.fields["pickupPointId"] || "";
-    const shippingInstruction = ShippingInstructionSchema.parse({
-      amount: {
-        value: (remote.shippingInfo.price.centAmount || 0) / 100,
-        currency: remote.shippingInfo.price.currencyCode
-      },
+    const shippingInstruction = {
       shippingMethod: {
         key: remote.shippingInfo.shippingMethod?.obj?.key || ""
       },
       pickupPoint: pickupPoint || "",
       instructions: instructions || "",
-      consentForUnattendedDelivery: consentForUnattendedDelivery || false
-    });
+      consentForUnattendedDelivery: consentForUnattendedDelivery || false,
+      meta: {
+        cache: {
+          hit: false,
+          key: ""
+        },
+        placeholder: false
+      }
+    };
     return shippingInstruction;
   }
 }

package/providers/product.provider.js

@@ -20,8 +20,6 @@ import {
   ProductQueryBySKUSchema,
   ProductQueryBySlugSchema,
   ProductSchema,
-  ProductVariantIdentifierSchema,
-  ProductVariantSchema,
   Reactionary
 } from "@reactionary/core";
 class CommercetoolsProductProvider extends ProductProvider {
@@ -79,7 +77,10 @@ class CommercetoolsProductProvider extends ProductProvider {
     }
     const variantLevelAttributes = data.masterVariant.attributes?.map((x) => this.parseAttribute(x)) || [];
     const productLevelAttributes = data.attributes.map((x) => this.parseAttribute(x)) || [];
-    const sharedAttributes = [...productLevelAttributes, ...variantLevelAttributes];
+    const sharedAttributes = [
+      ...productLevelAttributes,
+      ...variantLevelAttributes
+    ];
     const mainVariant = this.parseVariant(data.masterVariant, data);
     const meta = {
       cache: { hit: false, key: this.generateCacheKeySingle(identifier) },
@@ -102,22 +103,58 @@ class CommercetoolsProductProvider extends ProductProvider {
     };
     return result;
   }
+  /**
+   * Return true, if the attribute is a defining attribute (ie an option)
+   * @param attr a variant attribute
+   * @returns true if the attribute is an option
+   */
+  isVariantAttributeAnOption(attr) {
+    return true;
+  }
   parseVariant(variant, product) {
-    const result = ProductVariantSchema.parse({
-      identifier: ProductVariantIdentifierSchema.parse({
-        sku: variant.sku
-      }),
-      images: [
-        ...(variant.images || []).map(
-          (img) => ImageSchema.parse({
-            sourceUrl: img.url,
-            altText: img.label || "",
-            width: img.dimensions?.w,
-            height: img.dimensions?.h
-          })
-        )
-      ]
-    });
+    const identifier = {
+      sku: variant.sku
+    };
+    const images = [
+      ...(variant.images || []).map(
+        (img) => ImageSchema.parse({
+          sourceUrl: img.url,
+          altText: img.label || "",
+          width: img.dimensions?.w,
+          height: img.dimensions?.h
+        })
+      )
+    ];
+    const options = (variant.attributes ?? []).filter((attr) => this.isVariantAttributeAnOption(attr)).map(
+      (attr) => {
+        const attrVal = this.parseAttributeValue(attr);
+        const optionIdentifier = {
+          key: attr.name
+        };
+        const option = {
+          identifier: optionIdentifier,
+          name: attr.name,
+          value: {
+            identifier: {
+              key: attrVal.value,
+              option: optionIdentifier
+            },
+            label: attrVal.label
+          }
+        };
+        return option;
+      }
+    ) || [];
+    const result = {
+      identifier,
+      images,
+      barcode: "",
+      ean: "",
+      gtin: "",
+      name: "",
+      options,
+      upc: ""
+    };
     return result;
   }
   parseAttribute(attr) {

package/src/core/client.d.ts

@@ -49,15 +49,12 @@ export declare class CommercetoolsClient {
         type: "Registered";
     }>;
     logout(): Promise<{
-        [x: string]: unknown;
         meta: {
-            [x: string]: unknown;
             cache: {
-                [x: string]: unknown;
-                hit: boolean;
+                hit: false;
                 key: string;
             };
-            placeholder: boolean;
+            placeholder: false;
         };
         type: "Anonymous";
     }>;

package/src/providers/cart.provider.d.ts

@@ -1,7 +1,7 @@
 import { CartProvider } from '@reactionary/core';
-import type { CartMutationItemAdd, CartMutationItemQuantityChange, CartMutationItemRemove, CartQueryById, CartIdentifier, CartMutationApplyCoupon, CartMutationDeleteCart, CartMutationRemoveCoupon, CartMutationChangeCurrency, RequestContext, Cart, Cache } from '@reactionary/core';
+import type { CartItem, CartMutationItemAdd, CartMutationItemQuantityChange, CartMutationItemRemove, CartQueryById, CartIdentifier, CartMutationApplyCoupon, CartMutationDeleteCart, CartMutationRemoveCoupon, CartMutationChangeCurrency, RequestContext, Cart, Cache } from '@reactionary/core';
 import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
-import type { Cart as CTCart, MyCartUpdateAction } from '@commercetools/platform-sdk';
+import type { Cart as CTCart, LineItem, MyCartUpdateAction } from '@commercetools/platform-sdk';
 import type { CommercetoolsClient } from '../core/client.js';
 export declare class CommercetoolsCartProvider extends CartProvider {
     protected config: CommercetoolsConfiguration;
@@ -28,5 +28,6 @@ export declare class CommercetoolsCartProvider extends CartProvider {
         activeCart: import("@commercetools/platform-sdk").ByProjectKeyMeActiveCartRequestBuilder;
         orders: import("@commercetools/platform-sdk").ByProjectKeyMeOrdersRequestBuilder;
     }>;
+    protected parseCartItem(remoteItem: LineItem): CartItem;
     protected parseSingle(remote: CTCart): Cart;
 }

package/src/providers/checkout.provider.d.ts

@@ -1,9 +1,8 @@
-import type { Cache, Checkout, RequestContext, PaymentMethod, ShippingMethod, CheckoutMutationInitiateCheckout, CheckoutMutationSetShippingAddress, CheckoutMutationFinalizeCheckout, CheckoutMutationAddPaymentInstruction, CheckoutMutationRemovePaymentInstruction, CheckoutMutationSetShippingInstruction, CheckoutQueryById, CheckoutQueryForAvailablePaymentMethods, CheckoutQueryForAvailableShippingMethods, CheckoutIdentifier, ShippingInstruction, PaymentInstruction, Address, CostBreakDown } from '@reactionary/core';
+import type { Address as CTAddress, Cart as CTCart, Payment as CTPayment, LineItem, MyCartUpdateAction } from '@commercetools/platform-sdk';
+import type { Address, Cache, Checkout, CheckoutIdentifier, CheckoutItem, CheckoutMutationAddPaymentInstruction, CheckoutMutationFinalizeCheckout, CheckoutMutationInitiateCheckout, CheckoutMutationRemovePaymentInstruction, CheckoutMutationSetShippingAddress, CheckoutMutationSetShippingInstruction, CheckoutQueryById, CheckoutQueryForAvailablePaymentMethods, CheckoutQueryForAvailableShippingMethods, CostBreakDown, PaymentInstruction, PaymentMethod, RequestContext, ShippingInstruction, ShippingMethod } from '@reactionary/core';
 import { CheckoutProvider } from '@reactionary/core';
-import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
-import type { MyCartUpdateAction } from '@commercetools/platform-sdk';
-import type { Address as CTAddress, Payment as CTPayment, Cart as CTCart } from '@commercetools/platform-sdk';
 import type { CommercetoolsClient } from '../core/client.js';
+import type { CommercetoolsConfiguration } from '../schema/configuration.schema.js';
 export declare class CheckoutNotReadyForFinalizationError extends Error {
     checkoutIdentifier: CheckoutIdentifier;
     constructor(checkoutIdentifier: CheckoutIdentifier);
@@ -35,6 +34,7 @@ export declare class CommercetoolsCheckoutProvider extends CheckoutProvider {
      * @returns
      */
     protected getStaticPaymentMethods(_checkout: CheckoutIdentifier): PaymentMethod[];
+    protected parseCheckoutItem(remoteItem: LineItem): CheckoutItem;
     protected parseSingle(remote: CTCart): Checkout;
     protected isReadyForFinalization(price: CostBreakDown, paymentInstructions: Array<PaymentInstruction>, billingAddress?: Address, shippingAddress?: Address, shippingInstruction?: ShippingInstruction): boolean;
     protected parsePaymentInstruction(remote: CTPayment): PaymentInstruction;

package/src/providers/product.provider.d.ts

@@ -13,6 +13,12 @@ export declare class CommercetoolsProductProvider extends ProductProvider {
     getBySlug(payload: ProductQueryBySlug): Promise<Product | null>;
     getBySKU(payload: ProductQueryBySKU): Promise<Product>;
     protected parseSingle(data: ProductProjection): Product;
+    /**
+     * Return true, if the attribute is a defining attribute (ie an option)
+     * @param attr a variant attribute
+     * @returns true if the attribute is an option
+     */
+    protected isVariantAttributeAnOption(attr: CTAttribute): boolean;
     protected parseVariant(variant: CTProductVariant, product: ProductProjection): ProductVariant;
     protected parseAttribute(attr: CTAttribute): ProductAttribute;
     protected parseAttributeValue(attr: CTAttribute): ProductAttributeValue;