@jetshop/core 5.17.0-alpha.45b8368d → 5.17.0-alpha.46941505

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/core",
-  "version": "5.17.0-alpha.45b8368d",
+  "version": "5.17.0-alpha.46941505",
   "license": "MIT",
   "files": [
     "**/*.js",
@@ -33,7 +33,7 @@
     }
   },
   "dependencies": {
-    "@apollo/react-ssr": "^3.1.5",
+    "@apollo/client": "^3.7.15",
     "@graphql-tools/delegate": "^7.1.2",
     "@graphql-tools/stitch": "^7.5.1",
     "@graphql-tools/wrap": "^7.0.5",
@@ -42,7 +42,7 @@
     "@sentry/browser": "^6.15.0",
     "@sentry/core": "^6.15.0",
     "@sentry/node": "^6.15.0",
-    "@tanem/react-nprogress": "^1.1.0",
+    "@tanem/react-nprogress": "^5.0.44",
     "@types/accept-language-parser": "^1.5.1",
     "@types/gtag.js": "^0.0.10",
     "@types/loadable__component": "^5.10.0",
@@ -50,19 +50,9 @@
     "@types/react-router-dom": "^5.1.8",
     "@xstate/react": "^0.8.1",
     "accept-language-parser": "^1.5.0",
-    "apollo-cache": "^1.3.2",
-    "apollo-cache-inmemory": "^1.6.5",
-    "apollo-client": "~2.6.8",
-    "apollo-link": "^1.2.14",
-    "apollo-link-context": "^1.0.20",
-    "apollo-link-error": "^1.1.13",
-    "apollo-link-http": "^1.5.17",
-    "apollo-link-persisted-queries": "^0.2.1",
-    "apollo-link-schema": "^1.2.5",
     "apollo-server": "~2.6.9",
     "apollo-server-caching": "^0.4.0",
     "apollo-server-express": "~2.6.9",
-    "apollo-utilities": "^1.3.2",
     "compression": "^1.7.2",
     "dnscache": "^1.0.2",
     "esm": "^3.0.84",
@@ -70,10 +60,9 @@
     "express": "^4.16.3",
     "express-graphql": "^0.12.0",
     "fontfaceobserver": "^2.1.0",
-    "format-message": "^6.2.3",
-    "graphql": "^14.5.8",
-    "graphql-tag": "^2.10.1",
-    "immer": "^6.0.8",
+    "format-message": "^6.2.4",
+    "graphql": "^15.3.0",
+    "immer": "^10.0.2",
     "intl": "^1.2.5",
     "isbot": "^2.2.1",
     "lodash.merge": "^4.6.1",
@@ -82,19 +71,15 @@
     "node-fetch": "^2.2.0",
     "prop-types": "^15.6.2",
     "qs": "^6.5.2",
-    "react-apollo": "^3.1.5",
-    "react-apollo-network-status": "^4.0.0",
+    "react-apollo-network-status": "^5.2.1",
     "react-cookie": "^4.1.1",
     "react-helmet-async": "^1.0.2",
     "react-media": "^1.10.0",
     "react-router-dom": "^5.2.1",
     "request-ip": "^2.1.3",
     "schema-dts": "^0.8.2",
-    "store-css": "^0.3.0",
-    "svg-react-loader": "^0.4.5",
     "ts-node": "^7.0.1",
     "typed-emitter": "^0.1.0",
-    "typescript": "^4.8.3",
     "universal-cookie-express": "^4.0.3",
     "uuid": "^8.3.2",
     "web-vitals": "^0.2.3",
@@ -102,7 +87,6 @@
     "xstate": "^4.13.0"
   },
   "devDependencies": {
-    "@apollo/react-testing": "^3.0.1",
     "@graphql-codegen/typescript": "^1.21.0",
     "@react-mock/localstorage": "^0.1.2",
     "@types/compression": "^0.0.36",
@@ -123,12 +107,12 @@
     "@types/react-router-dom": "^5.1.8",
     "@types/request-ip": "^0.0.36",
     "@types/uuid": "^8.3.0",
-    "apollo-link-mock": "^1.0.1",
     "chalk": "^4.1.2",
     "jest-dom": "^3.4.0",
     "lint-staged": "^8.1.5",
     "nock": "^10.0.6",
-    "prettier": "^2.3.2"
+    "prettier": "^2.3.2",
+    "typescript": "^4.8.3"
   },
   "peerDependencies": {
     "react": "^18",

package/polyfills.js

@@ -1,5 +1,3 @@
-import { enableES5 } from 'immer';
-enableES5();
 const polyfills = (locale) => [
     'es6',
     'Object.values',

package/polyfills.js.map

@@ -1 +1 @@
-{"version":3,"file":"polyfills.js","sourceRoot":"","sources":["polyfills.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,SAAS,EAAE,CAAC;AAEZ,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC;IACpC,KAAK;IACL,eAAe;IACf,gBAAgB;IAChB,aAAa;IACb,eAAe;IACf,sBAAsB;IACtB,2BAA2B;IAC3B,yBAAyB;IACzB,0BAA0B;IAC1B,sBAAsB;IACtB,YAAY;IACZ,sBAAsB;IACtB,2BAA2B;IAC3B,6BAA6B;IAC7B,KAAK;IACL,sBAAsB;IACtB,gBAAgB,MAAM,EAAE;IACxB,SAAS;IACT,OAAO;IACP,QAAQ;IACR,gBAAgB;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,EAAE;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,6YAA6Y;IAC7Y,OAAO;;;;;;;gEAQL,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EACnD,kCAAkC,QAAQ,yBAAyB,CAAC;AACtE,CAAC,CAAC"}
+{"version":3,"file":"polyfills.js","sourceRoot":"","sources":["polyfills.ts"],"names":[],"mappings":"AAAA,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC;IACpC,KAAK;IACL,eAAe;IACf,gBAAgB;IAChB,aAAa;IACb,eAAe;IACf,sBAAsB;IACtB,2BAA2B;IAC3B,yBAAyB;IACzB,0BAA0B;IAC1B,sBAAsB;IACtB,YAAY;IACZ,sBAAsB;IACtB,2BAA2B;IAC3B,6BAA6B;IAC7B,KAAK;IACL,sBAAsB;IACtB,gBAAgB,MAAM,EAAE;IACxB,SAAS;IACT,OAAO;IACP,QAAQ;IACR,gBAAgB;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,EAAE;IAC/C,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,6YAA6Y;IAC7Y,OAAO;;;;;;;gEAQL,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EACnD,kCAAkC,QAAQ,yBAAyB,CAAC;AACtE,CAAC,CAAC"}

package/resolvers/filters/boolFilter.js

@@ -1,7 +1,8 @@
-import produce from 'immer';
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
+import { produce } from 'immer';
 import { updateBooleanQueryString } from './updateQueryString';
 import { parse } from 'qs';
+import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
 // QUERY
 export const boolFilterValue = function boolFilterValue(parent) {
     return (searchParams) => {
@@ -27,17 +28,18 @@ export const setBoolFilter = (_, { value, id }, { cache, getCacheKey }) => {
         id,
         __typename: 'BooleanFilter'
     });
+    const boolFilterFragment = gql `
+    fragment BoolFilterState on BooleanFilter {
+      id
+      default
+      value @client
+    }
+  `;
     const boolFilter = cache.readFragment({
-        fragment: gql `
-      fragment BoolFilterState on BooleanFilter {
-        id
-        default
-        value @client
-      }
-    `,
+        fragment: boolFilterFragment,
         id: fragmentId
     });
-    const data = produce(boolFilter, draft => {
+    const data = produce(boolFilter, (draft) => {
         if (draft.default !== null) {
             draft.value = value === draft.default ? null : value;
         }
@@ -45,7 +47,8 @@ export const setBoolFilter = (_, { value, id }, { cache, getCacheKey }) => {
             draft.value = value === false ? null : value;
         }
     });
-    cache.writeData({
+    cache.writeFragment({
+        fragment: boolFilterFragment,
         id: fragmentId,
         data
     });
@@ -55,31 +58,25 @@ export const setBoolFilter = (_, { value, id }, { cache, getCacheKey }) => {
     return data;
 };
 function updateActiveFilters(cache, data) {
-    const activeBoolFilterQuery = gql `
-    query GetActiveBoolFilters {
-      activeFilters @client {
-        booleanFilters {
-          id
-          value @client
-        }
-      }
-    }
-  `;
-    const currentActiveFilters = cache.readQuery({ query: activeBoolFilterQuery });
-    const { activeFilters } = produce(currentActiveFilters, draft => {
+    const currentActiveFilters = cache.readQuery({ query: ActiveFiltersQuery });
+    const { activeFilters } = produce(currentActiveFilters, (draft) => {
         // Clear this filter from active filters
         if (data.value === null) {
-            draft.activeFilters.booleanFilters = draft.activeFilters.booleanFilters.filter(boolFilter => boolFilter.id !== data.id);
+            draft.activeFilters.booleanFilters =
+                draft.activeFilters.booleanFilters.filter((boolFilter) => boolFilter.id !== data.id);
         }
         else {
             draft.activeFilters.booleanFilters.push({
                 id: data.id,
-                value: data.value,
-                __typename: 'BooleanFilterInput'
+                value: data.value
+                // __typename: 'BooleanFilterInput'
             });
         }
     });
-    cache.writeData({ data: { activeFilters } });
+    cache.writeQuery({
+        query: ActiveFiltersQuery,
+        data: { activeFilters }
+    });
     return activeFilters;
 }
 //# sourceMappingURL=boolFilter.js.map

package/resolvers/filters/boolFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"boolFilter.js","sourceRoot":"","sources":["boolFilter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"boolFilter.js","sourceRoot":"","sources":["boolFilter.ts"],"names":[],"mappings":"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"}

package/resolvers/filters/filterParams.js

@@ -45,8 +45,8 @@ function convertFilterQueryToActiveFilter({ initialSearchParams, filter, activeF
             return (activeFilters['listFilters'] = Object.keys(filter.list).map((id) => {
                 const filter = {
                     id,
-                    values: initialSearchParams.list[id],
-                    __typename: 'ListFilterInput'
+                    values: initialSearchParams.list[id]
+                    // __typename: 'ListFilterInput' as const
                 };
                 return filter;
             }));
@@ -55,8 +55,8 @@ function convertFilterQueryToActiveFilter({ initialSearchParams, filter, activeF
                 const filter = {
                     id,
                     min: +initialSearchParams.range[id][0],
-                    max: +initialSearchParams.range[id][1],
-                    __typename: 'RangeFilterInput'
+                    max: +initialSearchParams.range[id][1]
+                    // __typename: 'RangeFilterInput' as const
                 };
                 return filter;
             }));
@@ -64,8 +64,8 @@ function convertFilterQueryToActiveFilter({ initialSearchParams, filter, activeF
             return (activeFilters['booleanFilters'] = Object.keys(filter.boolean).map((id) => {
                 const filter = {
                     id,
-                    value: JSON.parse(initialSearchParams.boolean[id]),
-                    __typename: 'BooleanFilterInput'
+                    value: JSON.parse(initialSearchParams.boolean[id])
+                    // __typename: 'BooleanFilterInput' as const
                 };
                 return filter;
             }));
@@ -73,8 +73,8 @@ function convertFilterQueryToActiveFilter({ initialSearchParams, filter, activeF
             return (activeFilters['multiListFilters'] = Object.keys(filter.multiList).map((id) => {
                 const filter = {
                     id,
-                    values: initialSearchParams.multiList[id],
-                    __typename: 'MultiListFilterInput'
+                    values: initialSearchParams.multiList[id]
+                    // __typename: 'MultiListFilterInput' as const
                 };
                 return filter;
             }));

package/resolvers/filters/filterParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterParams.js","sourceRoot":"","sources":["filterParams.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filterParams.js","sourceRoot":"","sources":["filterParams.ts"],"names":[],"mappings":"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"}

package/resolvers/filters/filters.js

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@apollo/client';
 ////////////////////////////////////////////////////////////////////////////////
 // Mutations
 /**
@@ -26,7 +26,7 @@ export const clearAllFilters = (_, __, { client, cache }) => {
     const { activeFilters } = cache.readQuery({
         query: activeFiltersQuery
     });
-    activeFilters.listFilters.forEach(listFilter => {
+    activeFilters.listFilters.forEach((listFilter) => {
         client.mutate({
             mutation: gql `
         mutation ClearListFilter($id: String!) {
@@ -38,7 +38,7 @@ export const clearAllFilters = (_, __, { client, cache }) => {
             }
         });
     });
-    activeFilters.rangeFilters.forEach(rangeFilter => {
+    activeFilters.rangeFilters.forEach((rangeFilter) => {
         client.mutate({
             mutation: gql `
         mutation ClearRangeFilter($id: String!) {
@@ -50,7 +50,7 @@ export const clearAllFilters = (_, __, { client, cache }) => {
             }
         });
     });
-    activeFilters.booleanFilters.forEach(boolFilter => {
+    activeFilters.booleanFilters.forEach((boolFilter) => {
         client.mutate({
             mutation: gql `
         mutation ClearBoolFilter($id: String!) {
@@ -62,7 +62,7 @@ export const clearAllFilters = (_, __, { client, cache }) => {
             }
         });
     });
-    activeFilters.multiListFilters.forEach(multiFilter => {
+    activeFilters.multiListFilters.forEach((multiFilter) => {
         client.mutate({
             mutation: gql `
         mutation ClearMultiFilter($id: String!) {

package/resolvers/filters/filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["filters.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,aAAa,CAAC;AAI9B,gFAAgF;AAChF,YAAY;AAEZ;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAa,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;IACpE,MAAM,kBAAkB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;GAiB7B,CAAC;IAEF,MAAM,EAAE,aAAa,EAAE,GAAqC,KAAK,CAAC,SAAS,CAAC;QAC1E,KAAK,EAAE,kBAAkB;KAC1B,CAAC,CAAC;IAEH,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7C,MAAM,CAAC,MAAM,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAA;;;;OAIZ;YACD,SAAS,EAAE;gBACT,EAAE,EAAE,UAAU,CAAC,EAAE;aAClB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC/C,MAAM,CAAC,MAAM,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAA;;;;OAIZ;YACD,SAAS,EAAE;gBACT,EAAE,EAAE,WAAW,CAAC,EAAE;aACnB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAChD,MAAM,CAAC,MAAM,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAA;;;;OAIZ;YACD,SAAS,EAAE;gBACT,EAAE,EAAE,UAAU,CAAC,EAAE;aAClB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACnD,MAAM,CAAC,MAAM,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAA;;;;OAIZ;YACD,SAAS,EAAE;gBACT,EAAE,EAAE,WAAW,CAAC,EAAE;aACnB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAIrC,gFAAgF;AAChF,YAAY;AAEZ;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAa,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;IACpE,MAAM,kBAAkB,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;GAiB7B,CAAC;IAEF,MAAM,EAAE,aAAa,EAAE,GAAqC,KAAK,CAAC,SAAS,CAAC;QAC1E,KAAK,EAAE,kBAAkB;KAC1B,CAAC,CAAC;IAEH,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC/C,MAAM,CAAC,MAAM,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAA;;;;OAIZ;YACD,SAAS,EAAE;gBACT,EAAE,EAAE,UAAU,CAAC,EAAE;aAClB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACjD,MAAM,CAAC,MAAM,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAA;;;;OAIZ;YACD,SAAS,EAAE;gBACT,EAAE,EAAE,WAAW,CAAC,EAAE;aACnB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAClD,MAAM,CAAC,MAAM,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAA;;;;OAIZ;YACD,SAAS,EAAE;gBACT,EAAE,EAAE,UAAU,CAAC,EAAE;aAClB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACrD,MAAM,CAAC,MAAM,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAA;;;;OAIZ;YACD,SAAS,EAAE;gBACT,EAAE,EAAE,WAAW,CAAC,EAAE;aACnB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

package/resolvers/filters/index.d.ts

@@ -14,14 +14,10 @@ export interface ActiveFilters extends FilterInput {
     multiListFilters?: ActiveMultiListFilter[];
 }
 export interface ActiveListFilter extends ListFilterInput {
-    __typename: 'ListFilterInput';
 }
 export interface ActiveRangeFilter extends RangeFilterInput {
-    __typename: 'RangeFilterInput';
 }
 export interface ActiveBooleanFilter extends BooleanFilterInput {
-    __typename: 'BooleanFilterInput';
 }
 export interface ActiveMultiListFilter extends MultiListFilterInput {
-    __typename: 'MultiListFilterInput';
 }

package/resolvers/filters/listFilter.js

@@ -1,6 +1,7 @@
-import gql from 'graphql-tag';
-import produce from 'immer';
+import { gql } from '@apollo/client';
+import { produce } from 'immer';
 import { updateListFilterQueryString } from './updateQueryString';
+import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
 export const listFilterHasActiveItems = function listFilterHasActiveItems(parent) {
     return (searchParams) => {
         // During SSR, search params are passed in when instantiating Apollo Client.
@@ -17,25 +18,28 @@ export const listFilterHasActiveItems = function listFilterHasActiveItems(parent
  */
 export const clearListFilter = (_, { id }, { cache, getCacheKey }) => {
     const fragmentId = getCacheKey({ id, __typename: 'ListFilter' });
-    const filter = cache.readFragment({
-        id: fragmentId,
-        fragment: gql `
-      fragment listFilterItems on ListFilter {
-        hasActiveItems @client
+    const c = cache;
+    const fragment = gql `
+    fragment listFilterItems on ListFilter {
+      hasActiveItems @client
+      id
+      items {
         id
-        items {
-          id
-          isActive @client
-        }
+        isActive @client
       }
-    `
+    }
+  `;
+    const filter = c.readFragment({
+        id: fragmentId,
+        fragment
     });
-    const data = produce(filter, draft => {
+    const data = produce(filter, (draft) => {
         draft.hasActiveItems = false;
-        draft.items.forEach(item => (item.isActive = false));
+        draft.items.forEach((item) => (item.isActive = false));
     });
-    cache.writeData({
+    c.writeFragment({
         id: fragmentId,
+        fragment,
         data
     });
     const activeFilters = updateActiveFilters(cache, id);
@@ -50,23 +54,14 @@ export const clearListFilter = (_, { id }, { cache, getCacheKey }) => {
  * @returns All active filters
  */
 function updateActiveFilters(cache, id) {
-    const activeListFilterQuery = gql `
-    query GetActiveListFilters {
-      activeFilters @client {
-        listFilters {
-          id
-          values
-        }
-      }
-    }
-  `;
     const { activeFilters } = cache.readQuery({
-        query: activeListFilterQuery
+        query: ActiveFiltersQuery
     });
-    const data = produce(activeFilters, draft => {
-        draft.listFilters = draft.listFilters.filter(listFilter => listFilter.id !== id);
+    const data = produce(activeFilters, (draft) => {
+        draft.listFilters = draft.listFilters.filter((listFilter) => listFilter.id !== id);
     });
-    cache.writeData({
+    cache.writeQuery({
+        query: ActiveFiltersQuery,
         data: { activeFilters: data }
     });
     return data;

package/resolvers/filters/listFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"listFilter.js","sourceRoot":"","sources":["listFilter.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,aAAa,CAAC;AAC9B,OAAO,OAAO,MAAM,OAAO,CAAC;AAI5B,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,MAAM,CAAC,MAAM,wBAAwB,GAAa,SAAS,wBAAwB,CACjF,MAAM;IAEN,OAAO,CAAC,YAAoB,EAAE,EAAE;QAC9B,4EAA4E;QAC5E,iDAAiD;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAEtE,qEAAqE;QACrE,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,gFAAgF;AAChF;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAa,CACvC,CAAC,EACD,EAAE,EAAE,EAAE,EACN,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,WAAW,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;IAEjE,MAAM,MAAM,GAAe,KAAK,CAAC,YAAY,CAAC;QAC5C,EAAE,EAAE,UAAU;QACd,QAAQ,EAAE,GAAG,CAAA;;;;;;;;;KASZ;KACF,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;QACnC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;QAC7B,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,EAAE,EAAE,UAAU;QACd,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,2BAA2B,CAAC,aAAa,CAAC,CAAC;IAErE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,gFAAgF;AAChF;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,KAAoB,EAAE,EAAU;IAC3D,MAAM,qBAAqB,GAAG,GAAG,CAAA;;;;;;;;;GAShC,CAAC;IAEF,MAAM,EACJ,aAAa,EACd,GAEG,KAAK,CAAC,SAAS,CAAC;QAClB,KAAK,EAAE,qBAAqB;KAC7B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,EAAE;QAC1C,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAC1C,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CACnC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,SAAS,CAAC;QACd,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;KAC9B,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"listFilter.js","sourceRoot":"","sources":["listFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAIhC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAE9F,MAAM,CAAC,MAAM,wBAAwB,GACnC,SAAS,wBAAwB,CAAC,MAAM;IACtC,OAAO,CAAC,YAAoB,EAAE,EAAE;QAC9B,4EAA4E;QAC5E,iDAAiD;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAEtE,qEAAqE;QACrE,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEJ,gFAAgF;AAChF;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAa,CACvC,CAAC,EACD,EAAE,EAAE,EAAE,EACN,EAAE,KAAK,EAAE,WAAW,EAAE,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,WAAW,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;IACjE,MAAM,CAAC,GAAG,KAAsB,CAAC;IAEjC,MAAM,QAAQ,GAAG,GAAG,CAAA;;;;;;;;;GASnB,CAAC;IAEF,MAAM,MAAM,GAAe,CAAC,CAAC,YAAY,CAAC;QACxC,EAAE,EAAE,UAAU;QACd,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QACrC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;QAC7B,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,aAAa,CAAC;QACd,EAAE,EAAE,UAAU;QACd,QAAQ;QACR,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,2BAA2B,CAAC,aAAa,CAAC,CAAC;IAErE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,gFAAgF;AAChF;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,KAAoB,EAAE,EAAU;IAC3D,MAAM,EACJ,aAAa,EACd,GAEG,KAAK,CAAC,SAAS,CAAC;QAClB,KAAK,EAAE,kBAAkB;KAC1B,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;QAC5C,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAC1C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CACrC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,UAAU,CAAC;QACf,KAAK,EAAE,kBAAkB;QACzB,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;KAC9B,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC"}

package/resolvers/filters/listFilterItem.js

@@ -1,14 +1,16 @@
-import gql from 'graphql-tag';
-import produce from 'immer';
+import { gql } from '@apollo/client';
+import { produce } from 'immer';
 import { updateListFilterQueryString } from './updateQueryString';
 import qs from 'qs';
+import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
 // QUERY
 export const isListFilterActive = function isListFilterActive(parent) {
     return (searchParams) => {
         var _a, _b, _c;
         const query = __IN_SERVER__ ? searchParams : document.location.search;
         // e.g. Armchair:product-type:151
-        const [, name, category] = parent.id.split(':');
+        // We reverse this to allow ':' in the filter value
+        const [category, name] = parent.id.split(':').reverse();
         // Get the list filters from the search params
         // e.g.
         // {
@@ -32,35 +34,38 @@ export const isListFilterActive = function isListFilterActive(parent) {
 ////////////////////////////////////////////////////////////////////////////////
 // MUTATIONS
 export const toggleListFilterItem = function toggleListFilterItem(_, { value, parentId, set }, { cache, getCacheKey }) {
+    const c = cache;
     const fragmentId = getCacheKey({
         id: parentId,
         __typename: 'ListFilter'
     });
-    const listItem = cache.readFragment({
-        fragment: gql `
-      fragment listFilter on ListFilter {
-        hasActiveItems @client
+    const fragment = gql `
+    fragment listFilter on ListFilter {
+      hasActiveItems @client
+      id
+      items {
         id
-        items {
-          id
-          value
-          isActive @client
-        }
+        value
+        isActive @client
       }
-    `,
+    }
+  `;
+    const listItem = cache.readFragment({
+        fragment,
         id: fragmentId
     });
-    const data = produce(listItem, draft => {
+    const data = produce(listItem, (draft) => {
         const { items } = draft;
         // Find the item matching the value passed in as an arg
-        const item = items.find(item => item.value === value);
+        const item = items.find((item) => item.value === value);
         // If `set` was passed, set the active state to it. Otherwise, toggle
         item.isActive = typeof set === 'boolean' ? set : !item.isActive;
         // If there are any active items, set hasActiveItems to true on the ListFilter
-        draft.hasActiveItems = items.some(item => item.isActive);
+        draft.hasActiveItems = items.some((item) => item.isActive);
     });
-    cache.writeData({
+    c.writeFragment({
         id: fragmentId,
+        fragment,
         data
     });
     // Write changes to the active filters list
@@ -77,29 +82,19 @@ export const toggleListFilterItem = function toggleListFilterItem(_, { value, pa
  * @returns All active filters
  */
 function updateActiveListFilters(cache, data) {
-    const activeListFilterQuery = gql `
-    query GetActiveListFilters {
-      activeFilters @client {
-        listFilters {
-          id
-          values
-        }
-      }
-    }
-  `;
     const currentActiveFilters = cache.readQuery({
-        query: activeListFilterQuery
+        query: ActiveFiltersQuery
     });
-    const activeFilters = produce(currentActiveFilters, draft => {
+    const activeFilters = produce(currentActiveFilters, (draft) => {
         // Check if the filter that was just toggled is already in activeFilters
-        const existingListFilter = draft.activeFilters.listFilters.find(filter => filter.id === data.id);
+        const existingListFilter = draft.activeFilters.listFilters.find((filter) => filter.id === data.id);
         // Get an array of ListFilterItem values
         const activeListFilters = data.items
-            .filter(item => item.isActive)
-            .map(item => item.value);
+            .filter((item) => item.isActive)
+            .map((item) => item.value);
         // If there are no active ListFilterItems, remove this ListFilter from ActiveFilters
         if (activeListFilters.length === 0) {
-            draft.activeFilters.listFilters = draft.activeFilters.listFilters.filter(listFilter => listFilter.id !== existingListFilter.id);
+            draft.activeFilters.listFilters = draft.activeFilters.listFilters.filter((listFilter) => listFilter.id !== existingListFilter.id);
             return;
         }
         if (existingListFilter) {
@@ -110,12 +105,12 @@ function updateActiveListFilters(cache, data) {
             // Otherwise push it to the list of active filters
             draft.activeFilters.listFilters.push({
                 id: data.id,
-                values: activeListFilters,
-                __typename: 'ListFilterInput'
+                values: activeListFilters
             });
         }
     });
-    cache.writeData({
+    cache.writeQuery({
+        query: ActiveFiltersQuery,
         data: activeFilters
     });
     return activeFilters;

package/resolvers/filters/listFilterItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"listFilterItem.js","sourceRoot":"","sources":["listFilterItem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"listFilterItem.js","sourceRoot":"","sources":["listFilterItem.ts"],"names":[],"mappings":"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"}