@q2devel/q2-core 1.0.16 → 1.0.18

package/dist/api/products/getProducts.d.ts

@@ -1,6 +1,7 @@
 import { CoreContext } from '../../context';
 import { Product } from '../../types/products/Product';
 type GetProductsParams = {
+    locale?: string;
     categoryId?: string[];
     productId?: string;
     searchTerm?: string;
@@ -17,12 +18,12 @@ type GetProductsParams = {
     cache?: boolean;
     mapFnVariations?: (base: Product, raw: any) => Product | Promise<Product>;
 };
-export declare const getProducts: (ctx: CoreContext, { categoryId, productId, searchTerm, limit, offset, filters, sort, tag, include, cache, mapFnVariations, }: GetProductsParams) => Promise<Product[]>;
+export declare const getProducts: (ctx: CoreContext, { locale, categoryId, productId, searchTerm, limit, offset, filters, sort, tag, include, cache, mapFnVariations, }: GetProductsParams) => Promise<Product[]>;
 type GetProductCountParams = {
     categoryId?: string[];
     tag?: string;
     cache?: boolean;
 };
-export declare const getProductCount: (ctx: CoreContext, { categoryId, tag, cache, }: GetProductCountParams) => Promise<number>;
+export declare const getProductCount: (ctx: CoreContext, { categoryId, tag, cache }: GetProductCountParams) => Promise<number>;
 export {};
 //# sourceMappingURL=getProducts.d.ts.map

package/dist/api/products/getProducts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getProducts.d.ts","sourceRoot":"","sources":["../../../api/products/getProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAGvD,KAAK,iBAAiB,GAAG;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3E,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,KAAK,WAAW,EAChB,4GAkBG,iBAAiB,KACnB,OAAO,CAAC,OAAO,EAAE,CAuDnB,CAAC;AAGF,KAAK,qBAAqB,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,KAAK,WAAW,EAChB,6BAIG,qBAAqB,KACvB,OAAO,CAAC,MAAM,CAkChB,CAAC"}
+{"version":3,"file":"getProducts.d.ts","sourceRoot":"","sources":["../../../api/products/getProducts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAKtD,KAAK,iBAAiB,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;IACF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5E,CAAA;AAED,eAAO,MAAM,WAAW,GACpB,KAAK,WAAW,EAChB,oHAmBG,iBAAiB,KACrB,OAAO,CAAC,OAAO,EAAE,CA8DnB,CAAA;AAED,KAAK,qBAAqB,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,eAAe,GACxB,KAAK,WAAW,EAChB,4BAA6C,qBAAqB,KACnE,OAAO,CAAC,MAAM,CAqChB,CAAA"}

package/dist/api/products/getProducts.js

@@ -1,15 +1,18 @@
 import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
-import mapIncludedResources from '../../utils/mapIncludedResources';
 import { handleSortChange } from '../../utils/generalHelper';
+import mapIncludedResources from '../../utils/mapIncludedResources';
 import { mapProduct } from '../../utils/mapProducts';
-export const getProducts = async (ctx, { categoryId, productId, searchTerm, limit, offset, filters = [], sort = '', tag = '', include = [
+export const getProducts = async (ctx, { locale, categoryId, productId, searchTerm, limit, offset, filters = [], sort = '', tag = '', include = [
     'product_id',
     'product_id.field_category',
     'product_id.field_image',
     'product_id.field_image.field_media_image',
     'field_image.field_media_image',
 ], cache = true, mapFnVariations, }) => {
-    const cacheKey = ['products', ctx.locale,
+    const currentLocale = locale || ctx.locale;
+    const cacheKey = [
+        'products',
+        currentLocale,
         categoryId?.length ? `cat:${categoryId.join(',')}` : '',
         productId ? `id:${productId}` : '',
         searchTerm ? `search:${searchTerm}` : '',
@@ -17,8 +20,10 @@ export const getProducts = async (ctx, { categoryId, productId, searchTerm, limi
         offset ? `offset:${offset}` : '',
         filters.length ? `filters:${JSON.stringify(filters)}` : '',
         sort ? `sort:${sort}` : '',
-        // tag ? `tag:${tag}` : '',
-    ].filter(Boolean).join(':');
+        tag ? `tag:${tag}` : '',
+    ]
+        .filter(Boolean)
+        .join(':');
     if (cache && ctx.getCache) {
         const cached = await ctx.getCache(cacheKey);
         if (cached)
@@ -26,7 +31,7 @@ export const getProducts = async (ctx, { categoryId, productId, searchTerm, limi
     }
     const params = new DrupalJsonApiParams()
         .addInclude(include)
-        .addFilter('langcode', ctx.locale);
+        .addFilter('langcode', currentLocale);
     if (tag)
         params.addFilter(`product_id.${tag}`, '1');
     if (categoryId)
@@ -45,9 +50,9 @@ export const getProducts = async (ctx, { categoryId, productId, searchTerm, limi
             params.addSort(sortData.title, sortData.direction);
         }
     }
-    const url = ctx.locale === ctx.defaultLocale
+    const url = currentLocale === ctx.defaultLocale
         ? `/jsonapi/index/variation`
-        : `/${ctx.locale}/jsonapi/index/variation`;
+        : `/${currentLocale}/jsonapi/index/variation`;
     const { data } = await ctx.axios.get(`${url}?${params.getQueryString()}`);
     const resolvedProducts = mapIncludedResources(data, 5);
     const mappedProducts = await Promise.all(resolvedProducts.map(async (item) => {
@@ -62,11 +67,15 @@ export const getProducts = async (ctx, { categoryId, productId, searchTerm, limi
     }
     return mappedProducts;
 };
-export const getProductCount = async (ctx, { categoryId = [], tag = '', cache = true, }) => {
-    const cacheKey = ['productCount', ctx.locale,
+export const getProductCount = async (ctx, { categoryId = [], tag = '', cache = true }) => {
+    const cacheKey = [
+        'productCount',
+        ctx.locale,
         categoryId?.length ? `cat:${categoryId.join(',')}` : '',
         tag ? `tag:${tag}` : '',
-    ].filter(Boolean).join(':');
+    ]
+        .filter(Boolean)
+        .join(':');
     // if (cache && ctx.getCache) {
     //   const cached = await ctx.getCache<number>(cacheKey);
     //   if (cached !== null) return cached;
@@ -78,9 +87,7 @@ export const getProductCount = async (ctx, { categoryId = [], tag = '', cache =
     if (tag) {
         params.addFilter(`product_id.${tag}`, '1');
     }
-    params
-        .addFilter('langcode', ctx.locale)
-        .addPageLimit(1);
+    params.addFilter('langcode', ctx.locale).addPageLimit(1);
     const url = ctx.locale === ctx.defaultLocale
         ? `/jsonapi/index/variation`
         : `/${ctx.locale}/jsonapi/index/variation`;

package/dist/hooks/products/useGetProducts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGetProducts.d.ts","sourceRoot":"","sources":["../../../hooks/products/useGetProducts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,KAAK,qBAAqB,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;IACF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,GAAG,CAAA;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,cAAc,GACvB,KAAK,WAAW,EAChB,QAAQ,MAAM,EACd,UAAU,qBAAqB,qFA+ClC,CAAA"}
+{"version":3,"file":"useGetProducts.d.ts","sourceRoot":"","sources":["../../../hooks/products/useGetProducts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,KAAK,qBAAqB,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;QAC/B,QAAQ,CAAC,EAAE,MAAM,CAAA;KACpB,CAAC,CAAA;IACF,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,GAAG,CAAA;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,cAAc,GACvB,KAAK,WAAW,EAChB,QAAQ,MAAM,EACd,UAAU,qBAAqB,qFAgDlC,CAAA"}

package/dist/hooks/products/useGetProducts.js

@@ -17,6 +17,7 @@ export const useGetProducts = (ctx, locale, options) => {
             include,
         ],
         queryFn: () => getProducts(ctx, {
+            locale,
             categoryId,
             productId,
             searchTerm,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@q2devel/q2-core",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {