@reactionary/commercetools 0.7.5 → 0.7.6

package/capabilities/cart.capability.js

@@ -30,6 +30,7 @@ import {
   Reactionary,
   success
 } from "@reactionary/core";
+import { getLanguageCodeFromLocale } from "../core/locale-utils.js";
 class CommercetoolsCartCapability extends CartCapability {
   config;
   commercetools;
@@ -95,7 +96,7 @@ class CommercetoolsCartCapability extends CartCapability {
     const body = {
       currency: this.context.languageContext.currencyCode || "EUR",
       country: this.context.taxJurisdiction.countryCode || "DK",
-      locale: this.context.languageContext.locale,
+      locale: getLanguageCodeFromLocale(this.context.languageContext.locale),
       businessUnit: businessUnitReference,
       ...customerReference ? { customerId: customerReference.id } : {},
       custom: customFields
@@ -273,7 +274,7 @@ class CommercetoolsCartCapability extends CartCapability {
     const newCart = await client.carts.post({
       body: {
         currency: payload.newCurrency,
-        locale: this.context.languageContext.locale,
+        locale: getLanguageCodeFromLocale(this.context.languageContext.locale),
         country: currentCart.body.country,
         ...company && {
           businessUnit: {

package/capabilities/category.capability.js

@@ -23,6 +23,7 @@ import {
   error
 } from "@reactionary/core";
 import * as z from "zod";
+import { getLanguageCodeFromLocale } from "../core/locale-utils.js";
 class CommercetoolsCategoryCapability extends CategoryCapability {
   config;
   commercetools;
@@ -54,7 +55,7 @@ class CommercetoolsCategoryCapability extends CategoryCapability {
     try {
       const response = await client.get({
         queryArgs: {
-          where: `slug(${this.context.languageContext.locale}=:slug)`,
+          where: `slug(${getLanguageCodeFromLocale(this.context.languageContext.locale)}=:slug)`,
           "var.slug": payload.slug,
           storeProjection: this.context.storeIdentifier.key,
           limit: 1,

package/capabilities/checkout.capability.js

@@ -30,6 +30,7 @@ import {
 } from "@reactionary/core";
 import * as z from "zod";
 import {} from "../schema/commercetools.schema.js";
+import { getLanguageCodeFromLocale } from "../core/locale-utils.js";
 class CheckoutNotReadyForFinalizationError extends Error {
   constructor(checkoutIdentifier) {
     super(
@@ -194,7 +195,7 @@ class CommercetoolsCheckoutCapability extends CheckoutCapability {
         paymentMethodInfo: {
           method: payload.paymentInstruction.paymentMethod.method,
           name: {
-            [this.context.languageContext.locale]: payload.paymentInstruction.paymentMethod.name
+            [getLanguageCodeFromLocale(this.context.languageContext.locale)]: payload.paymentInstruction.paymentMethod.name
           },
           paymentInterface: payload.paymentInstruction.paymentMethod.paymentProcessor
         },

package/capabilities/product-reviews.capability.js

@@ -18,6 +18,7 @@ import {
   ProductRatingSummarySchema,
   ProductReviewPaginatedResultSchema
 } from "@reactionary/core";
+import { getLanguageCodeFromLocale } from "../core/locale-utils.js";
 class CommercetoolsProductReviewsCapability extends ProductReviewsCapability {
   config;
   commercetools;
@@ -135,7 +136,7 @@ class CommercetoolsProductReviewsCapability extends ProductReviewsCapability {
           typeId: "product",
           id: mutation.product.key
         },
-        locale: this.context.languageContext.locale
+        locale: getLanguageCodeFromLocale(this.context.languageContext.locale)
       }
     }).execute();
     const review = this.parseSingle(response.body, mutation.product.key);

package/capabilities/product-search.capability.js

@@ -20,11 +20,16 @@ import {
 } from "@reactionary/core";
 import createDebug from "debug";
 import { CommercetoolsCategoryLookupSchema, CommercetoolsResolveCategoryQueryByKeySchema } from "../schema/commercetools.schema.js";
+import { getLanguageCodeFromLocale } from "../core/locale-utils.js";
 const debug = createDebug("reactionary:commercetools:search");
 class CommercetoolsProductSearchCapability extends ProductSearchCapability {
   config;
   commercetools;
   factory;
+  /**
+   * We assume all commercetools data is indexed on the language level, not the country subdivision
+   */
+  languageCode = getLanguageCodeFromLocale(this.context.languageContext.locale);
   constructor(config, cache, context, commercetools, factory) {
     super(cache, context);
     this.config = config;
@@ -48,7 +53,8 @@ class CommercetoolsProductSearchCapability extends ProductSearchCapability {
     return {
       exact: {
         field: selectedFacetValue.facet.key,
-        fieldType: "text",
+        fieldType: "ltext",
+        language: `${this.languageCode}`,
         value: selectedFacetValue.key
       }
     };
@@ -117,21 +123,21 @@ class CommercetoolsProductSearchCapability extends ProductSearchCapability {
         {
           fullText: {
             field: "name",
-            language: `${this.context.languageContext.locale}`,
+            language: `${this.languageCode}`,
             value: payload.search.term
           }
         },
         {
           fullText: {
             field: "description",
-            language: `${this.context.languageContext.locale}`,
+            language: `${this.languageCode}`,
             value: payload.search.term
           }
         },
         {
           fullText: {
             field: "searchKeywords",
-            language: `${this.context.languageContext.locale}`,
+            language: `${this.languageCode}`,
             value: payload.search.term
           }
         }
@@ -163,7 +169,8 @@ class CommercetoolsProductSearchCapability extends ProductSearchCapability {
         distinct: {
           name: facet,
           field: facet,
-          fieldType: "text",
+          fieldType: "ltext",
+          language: `${this.languageCode}`,
           limit: 50
         }
       });
@@ -261,7 +268,7 @@ class CommercetoolsProductSearchCapability extends ProductSearchCapability {
         if (!category) {
           continue;
         }
-        facetValue.name = category.name[this.context.languageContext.locale] || category.id;
+        facetValue.name = category.name[this.languageCode] || category.id;
       } catch (error) {
         if (debug.enabled) {
           debug(`Error resolving category key for id ${facetValue.identifier.key}:`, error);

package/core/locale-utils.js

@@ -0,0 +1,6 @@
+function getLanguageCodeFromLocale(locale) {
+  return locale.split("-")[0];
+}
+export {
+  getLanguageCodeFromLocale
+};

package/factories/cart/cart.factory.js

@@ -1,6 +1,7 @@
 import {
   CartItemSchema
 } from "@reactionary/core";
+import { getLanguageCodeFromLocale } from "../../core/locale-utils.js";
 class CommercetoolsCartFactory {
   cartSchema;
   cartIdentifierSchema;
@@ -102,7 +103,7 @@ class CommercetoolsCartFactory {
         currency
       }
     };
-    const localeString = context.languageContext.locale || "en";
+    const localeString = getLanguageCodeFromLocale(context.languageContext.locale) || "en";
     const appliedPromotions = [];
     if (data.discountCodes) {
       for (const promo of data.discountCodes) {

package/factories/category/category.factory.js

@@ -1,5 +1,6 @@
 import {
 } from "@reactionary/core";
+import { getLanguageCodeFromLocale } from "../../core/locale-utils.js";
 class CommercetoolsCategoryFactory {
   categorySchema;
   categoryPaginatedResultSchema;
@@ -9,15 +10,16 @@ class CommercetoolsCategoryFactory {
   }
   parseCategory(context, data) {
     const identifier = { key: data.key || "" };
+    const localeStr = getLanguageCodeFromLocale(context.languageContext.locale) || "en";
     const result = {
       identifier,
-      name: data.name[context.languageContext.locale] || "No Name",
-      slug: data.slug ? data.slug[context.languageContext.locale] || "" : "",
-      text: data.description ? data.description[context.languageContext.locale] || "" : "",
+      name: data.name[localeStr] || "No Name",
+      slug: data.slug ? data.slug[localeStr] || "" : "",
+      text: data.description ? data.description[localeStr] || "" : "",
       parentCategory: data.parent && data.parent.obj && data.parent.obj?.key ? { key: data.parent.obj.key } : void 0,
       images: (data.assets || []).filter((asset) => asset.sources.length > 0).filter((asset) => asset.sources[0].contentType?.startsWith("image/")).map((asset) => ({
         sourceUrl: asset.sources[0].uri,
-        altText: asset.description?.[context.languageContext.locale] || asset.name[context.languageContext.locale] || "",
+        altText: asset.description?.[localeStr] || asset.name[localeStr] || "",
         height: asset.sources[0].dimensions?.h || 0,
         width: asset.sources[0].dimensions?.w || 0
       }))

package/factories/checkout/checkout.factory.js

@@ -1,6 +1,7 @@
 import {
   CheckoutItemSchema
 } from "@reactionary/core";
+import { getLanguageCodeFromLocale } from "../../core/locale-utils.js";
 class CommercetoolsCheckoutFactory {
   checkoutSchema;
   shippingMethodSchema;
@@ -104,7 +105,7 @@ class CommercetoolsCheckoutFactory {
     };
     const result = {
       deliveryTime: "",
-      description: data.localizedDescription?.[context.languageContext.locale] || "",
+      description: data.localizedDescription?.[getLanguageCodeFromLocale(context.languageContext.locale)] || "",
       identifier,
       name: data.name,
       price: data.zoneRates[0].shippingRates[0].price ? {
@@ -176,7 +177,7 @@ class CommercetoolsCheckoutFactory {
     };
     const method = data.paymentMethodInfo?.method || "unknown";
     const paymentProcessor = data.paymentMethodInfo?.paymentInterface || method;
-    const paymentName = data.paymentMethodInfo.name?.[context.languageContext.locale];
+    const paymentName = data.paymentMethodInfo.name?.[getLanguageCodeFromLocale(context.languageContext.locale)];
     const paymentMethod = {
       method,
       paymentProcessor,

package/factories/product/product.factory.js

@@ -5,6 +5,7 @@ import {
   ProductAttributeValueIdentifierSchema,
   ProductAttributeValueSchema
 } from "@reactionary/core";
+import { getLanguageCodeFromLocale } from "../../core/locale-utils.js";
 class CommercetoolsProductFactory {
   productSchema;
   // PAIN: not being able to assign a default for productSchema (productSchema: TProductSchema = ProductSchema)
@@ -15,11 +16,12 @@ class CommercetoolsProductFactory {
   }
   parseProduct(context, data) {
     const identifier = { key: data.key || data.id };
-    const name = data.name[context.languageContext.locale];
-    const slug = data.slug[context.languageContext.locale];
+    const localeStr = getLanguageCodeFromLocale(context.languageContext.locale) || "en";
+    const name = data.name[localeStr];
+    const slug = data.slug[localeStr];
     let description = "";
     if (data.description) {
-      description = data.description[context.languageContext.locale];
+      description = data.description[localeStr];
     }
     const variantLevelAttributes = data.masterVariant.attributes?.map(
       (x) => this.parseAttribute(context, x)
@@ -70,6 +72,7 @@ class CommercetoolsProductFactory {
     const identifier = {
       sku: variant.sku
     };
+    const localeStr = getLanguageCodeFromLocale(context.languageContext.locale) || "en";
     const images = [
       ...(variant.images || []).map(
         (img) => ImageSchema.parse({
@@ -104,7 +107,7 @@ class CommercetoolsProductFactory {
       barcode: "",
       ean: "",
       gtin: "",
-      name: product.name[context.languageContext.locale],
+      name: product.name[localeStr],
       options,
       upc: ""
     };
@@ -126,9 +129,10 @@ class CommercetoolsProductFactory {
     if (attr.value && Array.isArray(attr.value)) {
       attrValue = attr.value[0];
     }
+    const localeStr = getLanguageCodeFromLocale(context.languageContext.locale) || "en";
     if (attr.value && typeof attr.value === "object") {
-      if (context.languageContext.locale in attr.value) {
-        attrValue = attr.value[context.languageContext.locale];
+      if (localeStr in attr.value) {
+        attrValue = attr.value[localeStr];
       } else {
         attrValue = "-";
       }

package/factories/product-associations/product-associations.factory.js

@@ -5,6 +5,7 @@ import {
   ProductVariantIdentifierSchema,
   ProductVariantOptionSchema
 } from "@reactionary/core";
+import { getLanguageCodeFromLocale } from "../../core/locale-utils.js";
 class CommercetoolsProductAssociationsFactory {
   productAssociationSchema;
   constructor(productAssociationSchema) {
@@ -25,10 +26,11 @@ class CommercetoolsProductAssociationsFactory {
     const variants = [data.masterVariant, ...data.variants].map(
       (variant) => this.parseVariant(context, variant, data)
     );
+    const localeStr = getLanguageCodeFromLocale(context.languageContext.locale) || "en";
     return {
       identifier: { key: data.id },
-      name: data.name[context.languageContext.locale] || data.id,
-      slug: data.slug?.[context.languageContext.locale] || data.id,
+      name: data.name[localeStr] || data.id,
+      slug: data.slug?.[localeStr] || data.id,
       variants
     };
   }
@@ -38,7 +40,7 @@ class CommercetoolsProductAssociationsFactory {
       sourceUrl: sourceImage?.url || "",
       height: sourceImage?.dimensions.h || void 0,
       width: sourceImage?.dimensions.w || void 0,
-      altText: sourceImage?.label || product.name[context.languageContext.locale] || void 0
+      altText: sourceImage?.label || product.name[getLanguageCodeFromLocale(context.languageContext.locale)] || void 0
     });
     const mappedOptions = variant.attributes?.filter((attribute) => attribute.name === "Color").map(
       (option) => ProductVariantOptionSchema.parse({

package/factories/product-search/product-search.factory.js

@@ -9,6 +9,7 @@ import {
   ProductVariantIdentifierSchema,
   ProductVariantOptionSchema
 } from "@reactionary/core";
+import { getLanguageCodeFromLocale } from "../../core/locale-utils.js";
 class CommercetoolsProductSearchFactory {
   productSearchResultSchema;
   constructor(productSearchResultSchema) {
@@ -43,9 +44,10 @@ class CommercetoolsProductSearchFactory {
     return this.productSearchResultSchema.parse(result);
   }
   parseSingle(context, data) {
+    const localeStr = getLanguageCodeFromLocale(context.languageContext.locale) || "en";
     const identifier = { key: data.key || data.id };
-    const name = data.name[context.languageContext.locale] || data.id;
-    const slug = data.slug?.[context.languageContext.locale] || data.id;
+    const name = data.name[localeStr] || data.id;
+    const slug = data.slug?.[localeStr] || data.id;
     const variants = [data.masterVariant, ...data.variants].map(
       (variant) => this.parseVariant(context, variant, data)
     );
@@ -84,12 +86,13 @@ class CommercetoolsProductSearchFactory {
     });
   }
   parseVariant(context, variant, product) {
+    const localeStr = getLanguageCodeFromLocale(context.languageContext.locale);
     const sourceImage = variant.images?.[0];
     const image = ImageSchema.parse({
       sourceUrl: sourceImage?.url || "",
       height: sourceImage?.dimensions.h || void 0,
       width: sourceImage?.dimensions.w || void 0,
-      altText: sourceImage?.label || product.name[context.languageContext.locale] || void 0
+      altText: sourceImage?.label || product.name[localeStr] || void 0
     });
     const mappedOptions = variant.attributes?.filter((attribute) => attribute.name === "Color").map(
       (option) => ProductVariantOptionSchema.parse({

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@reactionary/commercetools",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "type": "module",
   "main": "./index.js",
   "types": "./src/index.d.ts",
   "dependencies": {
     "vitest": "^4.0.9",
     "@nx/vite": "22.4.5",
-    "@reactionary/core": "0.7.5",
+    "@reactionary/core": "0.7.6",
     "zod": "4.1.9",
     "@commercetools/ts-client": "^4.9.1",
     "@commercetools/platform-sdk": "^8.25.0",

package/src/capabilities/product-search.capability.d.ts

@@ -9,6 +9,10 @@ export declare class CommercetoolsProductSearchCapability<TFactory extends Produ
     protected config: CommercetoolsConfiguration;
     protected commercetools: CommercetoolsAPI;
     protected factory: ProductSearchFactoryWithOutput<TFactory>;
+    /**
+     * We assume all commercetools data is indexed on the language level, not the country subdivision
+     */
+    protected languageCode: string;
     constructor(config: CommercetoolsConfiguration, cache: Cache, context: RequestContext, commercetools: CommercetoolsAPI, factory: ProductSearchFactoryWithOutput<TFactory>);
     protected getClient(): Promise<import("@commercetools/platform-sdk").ByProjectKeyProductsRequestBuilder>;
     protected getFacetQuery(payload: ProductSearchQueryByTerm, selectedFacetValue: FacetValueIdentifier): Promise<{
@@ -16,12 +20,14 @@ export declare class CommercetoolsProductSearchCapability<TFactory extends Produ
             field: string;
             values: string[];
             fieldType: string;
+            language?: undefined;
             value?: undefined;
         };
     } | {
         exact: {
             field: string;
             fieldType: string;
+            language: string;
             value: string;
             values?: undefined;
         };
@@ -49,12 +55,14 @@ export declare class CommercetoolsProductSearchCapability<TFactory extends Produ
             field: string;
             values: string[];
             fieldType: string;
+            language?: undefined;
             value?: undefined;
         };
     } | {
         exact: {
             field: string;
             fieldType: string;
+            language: string;
             value: string;
             values?: undefined;
         };
@@ -64,12 +72,14 @@ export declare class CommercetoolsProductSearchCapability<TFactory extends Produ
                 field: string;
                 values: string[];
                 fieldType: string;
+                language?: undefined;
                 value?: undefined;
             };
         } | {
             exact: {
                 field: string;
                 fieldType: string;
+                language: string;
                 value: string;
                 values?: undefined;
             };

package/src/core/locale-utils.d.ts

@@ -0,0 +1 @@
+export declare function getLanguageCodeFromLocale(locale: string): string;