@graphcommerce/algolia-products 9.0.0-canary.98 → 9.0.0

package/CHANGELOG.md

@@ -1,70 +1,70 @@
 # @graphcommerce/algolia-products
 
-## 9.0.0-canary.98
+## 9.0.0
 
-## 9.0.0-canary.97
+### Minor Changes
 
-## 9.0.0-canary.96
+- [#2336](https://github.com/graphcommerce-org/graphcommerce/pull/2336) [`95ce63c`](https://github.com/graphcommerce-org/graphcommerce/commit/95ce63cd32463835239ba959734cdaf1aa7f3f7b) - Added algolia search suggestions ([@Renzovh](https://github.com/Renzovh))
 
-## 9.0.0-canary.95
+- [#2309](https://github.com/graphcommerce-org/graphcommerce/pull/2309) [`9c1110e`](https://github.com/graphcommerce-org/graphcommerce/commit/9c1110ed018139dec7e7183f783208c158ee7ead) - Algolia Magento 2 implemented as a GraphQL Mesh resolver: Allows full integration without modying any frontend components. ([@Renzovh](https://github.com/Renzovh))
 
-## 9.0.0-canary.94
+- [#2377](https://github.com/graphcommerce-org/graphcommerce/pull/2377) [`56fcc45`](https://github.com/graphcommerce-org/graphcommerce/commit/56fcc45b60e43574c64fcdd7b02f8062d677e250) - Integrated algolia product queries into graphql-mesh. Provides fast and accurate searches, that can be personalised via magento-algolia and its algolia dashboard ([@Renzovh](https://github.com/Renzovh))
 
-## 9.0.0-canary.93
+### Patch Changes
 
-## 9.0.0-canary.92
+- [#2385](https://github.com/graphcommerce-org/graphcommerce/pull/2385) [`44f18b5`](https://github.com/graphcommerce-org/graphcommerce/commit/44f18b5a8986935728f7147d6f506dd1376fd594) - Added support for Adobe Commerce for Algolia. ([@paales](https://github.com/paales))
 
-## 9.0.0-canary.91
+- [#2334](https://github.com/graphcommerce-org/graphcommerce/pull/2334) [`3140735`](https://github.com/graphcommerce-org/graphcommerce/commit/3140735a8a49f8bebcbfde4e581515884446e05d) - Added support for customer group pricing. ([@Renzovh](https://github.com/Renzovh))
 
-## 9.0.0-canary.90
+- [#2417](https://github.com/graphcommerce-org/graphcommerce/pull/2417) [`743e7e2`](https://github.com/graphcommerce-org/graphcommerce/commit/743e7e275c8f0bfe32a5240c08eed92120085cc0) - Prevent errors by returning string instead of array ([@Renzovh](https://github.com/Renzovh))
 
-## 9.0.0-canary.89
+## 9.0.0-canary.118
 
-## 9.0.0-canary.88
+## 9.0.0-canary.117
 
-## 9.0.0-canary.87
+## 9.0.0-canary.116
 
-## 9.0.0-canary.86
+## 9.0.0-canary.115
 
-## 9.0.0-canary.85
+## 9.0.0-canary.114
 
-## 9.0.0-canary.84
+## 9.0.0-canary.113
 
-### Minor Changes
+## 9.0.0-canary.112
 
-- [#2377](https://github.com/graphcommerce-org/graphcommerce/pull/2377) [`56fcc45`](https://github.com/graphcommerce-org/graphcommerce/commit/56fcc45b60e43574c64fcdd7b02f8062d677e250) - Integrated algolia product queries into graphql-mesh. Provides fast and accurate searches, that can be personalised via magento-algolia and its algolia dashboard ([@Renzovh](https://github.com/Renzovh))
+## 9.0.0-canary.111
 
-## 9.0.0-canary.83
+## 9.0.0-canary.110
 
-## 9.0.0-canary.82
+## 9.0.0-canary.109
 
-## 9.0.0-canary.81
+## 9.0.0-canary.108
 
-## 9.0.0-canary.80
+## 9.0.0-canary.107
 
-## 9.0.0-canary.79
+## 9.0.0-canary.106
 
-## 9.0.0-canary.78
+### Patch Changes
 
-## 9.0.0-canary.77
+- [#2385](https://github.com/graphcommerce-org/graphcommerce/pull/2385) [`44f18b5`](https://github.com/graphcommerce-org/graphcommerce/commit/44f18b5a8986935728f7147d6f506dd1376fd594) - Added support for Adobe Commerce for Algolia. ([@paales](https://github.com/paales))
 
-## 9.0.0-canary.76
+## 9.0.0-canary.105
 
-## 9.0.0-canary.75
+## 9.0.0-canary.104
 
-## 9.0.0-canary.74
+## 9.0.0-canary.103
 
-## 9.0.0-canary.73
+## 9.0.0-canary.100
 
-## 9.0.0-canary.72
+### Patch Changes
 
-## 9.0.0-canary.71
+- [#2417](https://github.com/graphcommerce-org/graphcommerce/pull/2417) [`743e7e2`](https://github.com/graphcommerce-org/graphcommerce/commit/743e7e275c8f0bfe32a5240c08eed92120085cc0) - Prevent errors by returning string instead of array ([@Renzovh](https://github.com/Renzovh))
 
-## 9.0.0-canary.70
+## 9.0.0-canary.84
 
-## 9.0.0-canary.69
+### Minor Changes
 
-## 9.0.0-canary.68
+- [#2377](https://github.com/graphcommerce-org/graphcommerce/pull/2377) [`56fcc45`](https://github.com/graphcommerce-org/graphcommerce/commit/56fcc45b60e43574c64fcdd7b02f8062d677e250) - Integrated algolia product queries into graphql-mesh. Provides fast and accurate searches, that can be personalised via magento-algolia and its algolia dashboard ([@Renzovh](https://github.com/Renzovh))
 
 ## 9.0.0-canary.67
 
@@ -72,24 +72,12 @@
 
 - [#2336](https://github.com/graphcommerce-org/graphcommerce/pull/2336) [`95ce63c`](https://github.com/graphcommerce-org/graphcommerce/commit/95ce63cd32463835239ba959734cdaf1aa7f3f7b) - Added algolia search suggestions ([@Renzovh](https://github.com/Renzovh))
 
-## 9.0.0-canary.66
-
-## 9.0.0-canary.65
-
 ## 9.0.0-canary.64
 
 ### Patch Changes
 
 - [#2334](https://github.com/graphcommerce-org/graphcommerce/pull/2334) [`3140735`](https://github.com/graphcommerce-org/graphcommerce/commit/3140735a8a49f8bebcbfde4e581515884446e05d) - Added support for customer group pricing ([@Renzovh](https://github.com/Renzovh))
 
-## 9.0.0-canary.63
-
-## 9.0.0-canary.62
-
-## 9.0.0-canary.61
-
-## 9.0.0-canary.60
-
 ## 9.0.0-canary.59
 
 ### Minor Changes

package/link/customerGroupIdLink.ts

@@ -1,4 +1,5 @@
-import { ApolloCache, setContext } from '@graphcommerce/graphql'
+import type { ApolloCache } from '@graphcommerce/graphql'
+import { setContext } from '@graphcommerce/graphql'
 import { CustomerDocument } from '@graphcommerce/magento-customer'
 
 declare module '@apollo/client' {

package/mesh/algoliaFacetsToAggregations.ts

@@ -5,8 +5,8 @@ import type {
   CategoryResult,
   MeshContext,
 } from '@graphcommerce/graphql-mesh'
-import { AttributeList } from './getAttributeList'
-import { GetStoreConfigReturn } from './getStoreConfig'
+import type { AttributeList } from './getAttributeList'
+import type { GetStoreConfigReturn } from './getStoreConfig'
 
 type AlgoliaFacets = { [facetName: string]: AlgoliaFacetOption }
 type AlgoliaFacetOption = { [facetOption: string]: number }
@@ -41,6 +41,7 @@ function compare(a, b) {
   return 0
 }
 
+/** @public */
 export function algoliaPricesToPricesAggregations(pricesList: {
   [key: string]: number
 }): AggregationOption[] {
@@ -109,6 +110,7 @@ export function algoliaPricesToPricesAggregations(pricesList: {
   return Object.values(pricesBucket)
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function assertAlgoliaFacets(facets: any): facets is AlgoliaFacets {
   return true
 }
@@ -116,7 +118,8 @@ function assertAlgoliaFacets(facets: any): facets is AlgoliaFacets {
 /**
  * Map algolia facets to aggregations format
  *
- * TODO: Make sure the aggregations are sorted correctly: https://magento-247-git-canary-graphcommerce.vercel.app/men/photography, through position
+ * TODO: Make sure the aggregations are sorted correctly:
+ * https://magento-247-git-canary-graphcommerce.vercel.app/men/photography, through position
  */
 export function algoliaFacetsToAggregations(
   algoliaFacets: AlgoliasearchResponse['facets'],

package/mesh/algoliaHitToMagentoProduct.ts

@@ -11,11 +11,9 @@ import type {
   ResolversParentTypes,
   ResolversTypes,
 } from '@graphcommerce/graphql-mesh'
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { GraphQLResolveInfo } from 'graphql'
-import { GetStoreConfigReturn } from './getStoreConfig'
+import type { GetStoreConfigReturn } from './getStoreConfig'
 
-export function assertAdditional(
+function assertAdditional(
   additional: unknown,
 ): additional is AlgoliaProductHitAdditionalProperties {
   return true
@@ -122,7 +120,7 @@ export function algoliaHitToMagentoProduct(
   hit: Algoliahit,
   storeConfig: GetStoreConfigReturn,
   customerGroup: number,
-): ProductsItemsItem | null {
+): (ProductsItemsItem & { staged: boolean }) | null {
   const { objectID, additionalProperties } = hit
   if (!assertAdditional(additionalProperties)) return null
 
@@ -147,10 +145,21 @@ export function algoliaHitToMagentoProduct(
     ...rest
   } = additionalProperties
 
+  // Some custom attributes are returned as array while they need to be a string. Flatten those arrays
+  const flattenedCustomAttributes = {}
+  for (const [key, value] of Object.entries(rest)) {
+    if (value !== null && Array.isArray(value) && value?.length > 0) {
+      flattenedCustomAttributes[key] = value.toString()
+      delete rest[key]
+    }
+  }
+
   return {
+    staged: false,
     redirect_code: 0,
     __typename: algoliaTypeToTypename[type_id as keyof typeof algoliaTypeToTypename],
     uid: btoa(objectID),
+    id: Number(objectID),
     sku: Array.isArray(sku) ? sku[0] : `${sku}`,
     price_range: mapPriceRange(price, storeConfig, customerGroup),
     created_at: created_at ? new Date(created_at).toISOString() : null,
@@ -187,5 +196,6 @@ export function algoliaHitToMagentoProduct(
     url_key: algoliaUrlToUrlKey(url, storeConfig?.base_link_url),
     url_suffix: storeConfig?.product_url_suffix,
     ...rest,
+    ...flattenedCustomAttributes,
   }
 }

package/mesh/getAttributeList.ts

@@ -19,7 +19,7 @@ export async function getAttributeList(context: MeshContext): Promise<AttributeL
         entityType: 'CATALOG_PRODUCT',
         filters: {},
       },
-      selectionSet: `{ items{ code label } }`,
+      selectionSet: '{ items{ code label } }',
       context,
     }).then((res) => res?.items)) as { label?: string; code: string }[]
     attributeListCache = filterNonNullableKeys(items, ['label'])

package/mesh/getStoreConfig.ts

@@ -1,4 +1,4 @@
-import { MeshContext, Maybe, StoreConfig } from '@graphcommerce/graphql-mesh'
+import type { Maybe, MeshContext, StoreConfig } from '@graphcommerce/graphql-mesh'
 
 export type GetStoreConfigReturn =
   | Maybe<

package/mesh/productFilterInputToAlgoliafacetFiltersInput.ts

@@ -1,14 +1,14 @@
 import type {
-  ProductAttributeFilterInput,
   AlgolianumericFilters_Input,
+  ProductAttributeFilterInput,
 } from '@graphcommerce/graphql-mesh'
 import {
   isFilterTypeEqual,
-  isFilterTypeRange,
   isFilterTypeMatch,
+  isFilterTypeRange,
 } from '@graphcommerce/magento-product'
-import { InputMaybe } from '@graphcommerce/next-config'
-import { GetStoreConfigReturn } from './getStoreConfig'
+import type { InputMaybe } from '@graphcommerce/next-config'
+import type { GetStoreConfigReturn } from './getStoreConfig'
 import { nonNullable } from './utils'
 
 /**

package/mesh/resolvers.ts

@@ -1,11 +1,9 @@
-import {
-  AlgoliasearchResponse,
-  hasSelectionSetPath,
-  type Resolvers,
-} from '@graphcommerce/graphql-mesh'
+import type { AlgoliasearchResponse, Resolvers } from '@graphcommerce/graphql-mesh'
+import { hasSelectionSetPath } from '@graphcommerce/graphql-mesh'
 import type { GraphQLError, GraphQLResolveInfo } from 'graphql'
 import { algoliaFacetsToAggregations, getCategoryList } from './algoliaFacetsToAggregations'
-import { algoliaHitToMagentoProduct, ProductsItemsItem } from './algoliaHitToMagentoProduct'
+import type { ProductsItemsItem } from './algoliaHitToMagentoProduct'
+import { algoliaHitToMagentoProduct } from './algoliaHitToMagentoProduct'
 import { getAlgoliaSettings } from './getAlgoliaSettings'
 import { getAttributeList } from './getAttributeList'
 import { getGroupId } from './getGroupId'

package/mesh/sortOptions.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   AlgoliasettingsResponse,
   MeshContext,
   ProductAttributeSortInput,
@@ -6,7 +6,7 @@ import {
   SortField,
 } from '@graphcommerce/graphql-mesh'
 import { nonNullable } from '@graphcommerce/magento-customer'
-import { AttributeList } from './getAttributeList'
+import type { AttributeList } from './getAttributeList'
 import { getIndexName } from './getIndexName'
 
 export type SortingOptions = Record<string, SortField & { dirs: SortEnum[] }>

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/algolia-products",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.98",
+  "version": "9.0.0",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -15,18 +15,18 @@
     "generate": "tsx scripts/generate-spec.mts"
   },
   "peerDependencies": {
-    "@graphcommerce/google-datalayer": "^9.0.0-canary.98",
-    "@graphcommerce/graphql": "^9.0.0-canary.98",
-    "@graphcommerce/graphql-mesh": "^9.0.0-canary.98",
-    "@graphcommerce/magento-customer": "^9.0.0-canary.98",
-    "@graphcommerce/magento-product": "^9.0.0-canary.98",
-    "@graphcommerce/magento-search": "^9.0.0-canary.98",
-    "@graphcommerce/next-config": "^9.0.0-canary.98",
-    "@graphcommerce/next-ui": "^9.0.0-canary.98",
+    "@graphcommerce/google-datalayer": "^9.0.0",
+    "@graphcommerce/graphql": "^9.0.0",
+    "@graphcommerce/graphql-mesh": "^9.0.0",
+    "@graphcommerce/magento-customer": "^9.0.0",
+    "@graphcommerce/magento-product": "^9.0.0",
+    "@graphcommerce/magento-search": "^9.0.0",
+    "@graphcommerce/next-config": "^9.0.0",
+    "@graphcommerce/next-ui": "^9.0.0",
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "graphql": "^16.0.0",
-    "tsx": "^4.16.2"
+    "graphql": "^16.10.0",
+    "tsx": "^4.19.2"
   }
 }

package/plugins/GraphQLProviderAlgoliaCustomerGroupId.tsx

@@ -1,4 +1,4 @@
-import { GraphQLProviderProps } from '@graphcommerce/graphql'
+import type { GraphQLProviderProps } from '@graphcommerce/graphql'
 import type { PluginConfig, PluginProps } from '@graphcommerce/next-config'
 import { customerGroupIdLink } from '../link/customerGroupIdLink'
 

package/plugins/magentoProductApplyAlgoliaEngine.ts

@@ -1,9 +1,9 @@
 import type {
-  useProductListApplyCategoryDefaults as useProductListApplyDefaults,
-  productListApplyCategoryDefaults as productListApplyDefaults,
   categoryDefaultsToProductListFilters as defaultsToProductListFilters,
+  productListApplyCategoryDefaults as productListApplyDefaults,
+  useProductListApplyCategoryDefaults as useProductListApplyDefaults,
 } from '@graphcommerce/magento-product'
-import { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
+import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
 import { applyEngineVariables } from '../utils/applyEngineVariable'
 
 export const config: PluginConfig = {

package/plugins/magentoSearchApplyAlgoliaEngine.ts

@@ -1,9 +1,9 @@
 import type {
-  useProductListApplySearchDefaults as useProductListApplyDefaults,
-  productListApplySearchDefaults as productListApplyDefaults,
   searchDefaultsToProductListFilters as defaultsToProductListFilters,
+  productListApplySearchDefaults as productListApplyDefaults,
+  useProductListApplySearchDefaults as useProductListApplyDefaults,
 } from '@graphcommerce/magento-search'
-import { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
+import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
 import { applyEngineVariables } from '../utils/applyEngineVariable'
 
 export const config: PluginConfig = {

package/utils/applyCategoryEngineVariable.ts

@@ -1,11 +0,0 @@
-import type { ProductListQueryVariables } from '@graphcommerce/magento-product'
-
-export function applyEngineVariables(variables: ProductListQueryVariables | undefined) {
-  return {
-    ...variables,
-    filters: {
-      ...variables?.filters,
-      engine: { eq: 'algolia' },
-    },
-  }
-}