@unchainedshop/api 3.0.0-alpha7 → 3.0.0-rc10

package/lib/resolvers/type/assortment/assortment-types.js

@@ -1,4 +1,4 @@
-export const Assortment = {
+export const AssortmentTypes = {
     assortmentPaths: (obj, _, { modules }) => {
         return modules.assortments.breadcrumbs({
             assortmentId: obj._id,
@@ -34,12 +34,14 @@ export const Assortment = {
             assortmentId: assortment._id,
         });
     },
-    // TODO: Use a loader!
-    async media(obj, params, { modules }) {
-        return modules.assortments.media.findAssortmentMedias({
-            assortmentId: obj._id,
-            ...params,
-        });
+    async media(obj, params, { modules, loaders }) {
+        if (params.offset || params.tags) {
+            return modules.assortments.media.findAssortmentMedias({
+                assortmentId: obj._id,
+                ...params,
+            });
+        }
+        return (await loaders.assortmentMediasLoader.load({ assortmentId: obj._id })).slice(params.offset, params.offset + params.limit);
     },
     async productAssignments(obj, _, { modules }) {
         // TODO: Loader & move default sort to core module
@@ -56,15 +58,16 @@ export const Assortment = {
             locale: forceLocale || localeContext.baseName,
         });
     },
-    searchProducts: async (obj, query, context) => {
-        const productIds = await context.modules.assortments.findProductIds({
+    searchProducts: async (obj, query, requestContext) => {
+        const { modules, services } = requestContext;
+        const productIds = await modules.assortments.findProductIds({
             assortmentId: obj._id,
             ignoreChildAssortments: query.ignoreChildAssortments,
         });
-        const filterIds = await context.modules.assortments.filters.findFilterIds({
+        const filterIds = await modules.assortments.filters.findFilterIds({
             assortmentId: obj._id,
         });
-        return context.modules.filters.search.searchProducts({ ...query, productIds, filterIds }, {}, context);
+        return services.filters.searchProducts({ ...query, productIds, filterIds }, {});
     },
 };
 //# sourceMappingURL=assortment-types.js.map

package/lib/resolvers/type/assortment/assortment-types.js.map

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

package/lib/resolvers/type/bookmark-types.d.ts

@@ -1,7 +1,7 @@
-import type { Bookmark as BookmarkType } from '@unchainedshop/core-bookmarks';
-import type { Product } from '@unchainedshop/core-products';
-import type { User } from '@unchainedshop/core-users';
-import { Context } from '@unchainedshop/api';
+import { Bookmark as BookmarkType } from '@unchainedshop/core-bookmarks';
+import { Product } from '@unchainedshop/core-products';
+import { User } from '@unchainedshop/core-users';
+import { Context } from '../../context.js';
 export type HelperType<T> = (bookmark: BookmarkType, _: never, context: Context) => T;
 export interface BookmarkHelperTypes {
     product: HelperType<Promise<Product>>;

package/lib/resolvers/type/bookmark-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bookmark-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/bookmark-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEtF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACtC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,QAAQ,EAAE,mBAWtB,CAAC"}
+{"version":3,"file":"bookmark-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/bookmark-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEtF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACtC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,QAAQ,EAAE,mBAWtB,CAAC"}

package/lib/resolvers/type/country-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../context.js';
 import { Country as CountryType } from '@unchainedshop/core-countries';
 import { Currency } from '@unchainedshop/core-currencies';
 export type HelperType<P, T> = (country: CountryType, params: P, context: Context) => T;

package/lib/resolvers/type/country-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"country-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/country-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAExF,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,IAAI,EAAE,UAAU,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,EAAE,MAAM,CAAC,CAAC;IAClD,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;CACvD;AAED,eAAO,MAAM,OAAO,EAAE,kBAmBrB,CAAC"}
+{"version":3,"file":"country-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/country-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAExF,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,IAAI,EAAE,UAAU,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,EAAE,MAAM,CAAC,CAAC;IAClD,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;CACvD;AAED,eAAO,MAAM,OAAO,EAAE,kBAmBrB,CAAC"}

package/lib/resolvers/type/delivery-provider-types.d.ts

@@ -1,5 +1,6 @@
-import { Context } from '@unchainedshop/api';
-import { DeliveryError, DeliveryProvider as DeliveryProviderType } from '@unchainedshop/core-delivery';
+import { Context } from '../../context.js';
+import { DeliveryProvider as DeliveryProviderType } from '@unchainedshop/core-delivery';
+import { DeliveryError } from '@unchainedshop/core';
 export type HelperType<P, T> = (provider: DeliveryProviderType, params: P, context: Context) => T;
 export interface DeliveryProviderHelperTypes {
     interface: HelperType<never, {
@@ -15,7 +16,6 @@ export interface DeliveryProviderHelperTypes {
         useNetPrice?: boolean;
         context: any;
     }, Promise<{
-        _id: string;
         amount: number;
         currencyCode: string;
         countryCode: string;

package/lib/resolvers/type/delivery-provider-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delivery-provider-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGvG,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAElG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CACnB,KAAK,EACL;QACE,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CACF,CAAC;IACF,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,kBAAkB,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IAC9D,cAAc,EAAE,UAAU,CACxB;QACE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,CAAC;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CACH,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,EAAE,2BA4D9B,CAAC"}
+{"version":3,"file":"delivery-provider-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAoB,aAAa,EAA2B,MAAM,qBAAqB,CAAC;AAE/F,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAElG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CACnB,KAAK,EACL;QACE,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CACF,CAAC;IACF,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,kBAAkB,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IAC9D,cAAc,EAAE,UAAU,CACxB;QACE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,CAAC;QACN,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CACH,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,EAAE,2BAyD9B,CAAC"}

package/lib/resolvers/type/delivery-provider-types.js

@@ -1,42 +1,41 @@
-import crypto from 'crypto';
-import { DeliveryPricingDirector } from '@unchainedshop/core-delivery';
+import { DeliveryDirector, DeliveryPricingDirector } from '@unchainedshop/core';
 export const DeliveryProvider = {
-    interface(obj, _, { modules }) {
-        const Interface = modules.delivery.findInterface(obj);
-        if (!Interface)
+    interface(deliveryProvider) {
+        const Adapter = DeliveryDirector.getAdapter(deliveryProvider.adapterKey);
+        if (!Adapter)
             return null;
-        return Interface;
+        return {
+            _id: Adapter.key,
+            label: Adapter.label,
+            version: Adapter.version,
+        };
     },
     async isActive(deliveryProvider, _, requestContext) {
-        const { modules } = requestContext;
-        return modules.delivery.isActive(deliveryProvider, requestContext);
+        const director = await DeliveryDirector.actions(deliveryProvider, {}, requestContext);
+        return Boolean(director.isActive());
     },
     async configurationError(deliveryProvider, _, requestContext) {
-        const { modules } = requestContext;
-        return modules.delivery.configurationError(deliveryProvider, requestContext);
+        const director = await DeliveryDirector.actions(deliveryProvider, {}, requestContext);
+        return director.configurationError();
     },
     async simulatedPrice(deliveryProvider, { currency: currencyCode, orderId, useNetPrice, context: providerContext }, requestContext) {
         const { modules, countryContext: country, user } = requestContext;
         const order = await modules.orders.findOrder({ orderId });
-        const currency = currencyCode || requestContext.currencyContext;
-        const pricingDirector = await DeliveryPricingDirector.actions({
+        const currency = currencyCode || order?.currency || requestContext.currencyContext;
+        const pricingContext = {
             country,
             currency,
             provider: deliveryProvider,
             order,
             providerContext,
             user,
-        }, requestContext);
-        const calculated = await pricingDirector.calculate();
+        };
+        const calculated = await DeliveryPricingDirector.rebuildCalculation(pricingContext, requestContext);
         if (!calculated || !calculated.length)
             return null;
-        const pricing = pricingDirector.calculationSheet();
+        const pricing = DeliveryPricingDirector.calculationSheet(pricingContext, calculated);
         const orderPrice = pricing.total({ useNetPrice });
         return {
-            _id: crypto
-                .createHash('sha256')
-                .update([deliveryProvider._id, country, useNetPrice, order ? order._id : ''].join(''))
-                .digest('hex'),
             amount: orderPrice.amount,
             currencyCode: orderPrice.currency,
             countryCode: country,

package/lib/resolvers/type/delivery-provider-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"delivery-provider-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAiCvE,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAC1D,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,gBAAgB,EAChB,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,EAC1E,cAAc;QAEd,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;QAClE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,YAAY,IAAI,cAAc,CAAC,eAAe,CAAC;QAEhE,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAC3D;YACE,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,gBAAgB;YAC1B,KAAK;YACL,eAAe;YACf,IAAI;SACL,EACD,cAAc,CACf,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC;QACrD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEnD,MAAM,OAAO,GAAG,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAEnD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAG/C,CAAC;QAEF,OAAO;YACL,GAAG,EAAE,MAAM;iBACR,UAAU,CAAC,QAAQ,CAAC;iBACpB,MAAM,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACrF,MAAM,CAAC,KAAK,CAAC;YAChB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;YACjC,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"delivery-provider-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAiB,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAgC/F,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,SAAS,CAAC,gBAAgB;QACxB,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAC1B,OAAO;YACL,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAChD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QACtF,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAC1D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QACtF,OAAO,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,gBAAgB,EAChB,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,EAC1E,cAAc;QAEd,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;QAClE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,YAAY,IAAI,KAAK,EAAE,QAAQ,IAAI,cAAc,CAAC,eAAe,CAAC;QACnF,MAAM,cAAc,GAAG;YACrB,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,gBAAgB;YAC1B,KAAK;YACL,eAAe;YACf,IAAI;SACL,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,uBAAuB,CAAC,kBAAkB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAEpG,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEnD,MAAM,OAAO,GAAG,uBAAuB,CAAC,gBAAgB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAErF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAG/C,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;YACjC,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/enrollment/enrollment-delivery-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { Enrollment } from '@unchainedshop/core-enrollments';
 type HelperType<T> = (enrollmentDelivery: Enrollment['delivery'], _: never, context: Context) => T;

package/lib/resolvers/type/enrollment/enrollment-delivery-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-delivery-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-delivery-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnG,KAAK,6BAA6B,GAAG;IACnC,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,6BAIhC,CAAC"}
+{"version":3,"file":"enrollment-delivery-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-delivery-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnG,KAAK,6BAA6B,GAAG;IACnC,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,6BAIhC,CAAC"}

package/lib/resolvers/type/enrollment/enrollment-payment-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 import { Enrollment } from '@unchainedshop/core-enrollments';
 type HelperType<T> = (enrollmentPayment: Enrollment['payment'], _: never, context: Context) => T;

package/lib/resolvers/type/enrollment/enrollment-payment-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-payment-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-payment-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEjG,KAAK,4BAA4B,GAAG;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,4BAM/B,CAAC"}
+{"version":3,"file":"enrollment-payment-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-payment-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEjG,KAAK,4BAA4B,GAAG;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,4BAM/B,CAAC"}

package/lib/resolvers/type/enrollment/enrollment-period-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { EnrollmentPeriod as EnrollmentPeriodType } from '@unchainedshop/core-enrollments';
 import { Order } from '@unchainedshop/core-orders';
 type HelperType<T> = (enrollmentPeriod: EnrollmentPeriodType, _: never, context: Context) => T;

package/lib/resolvers/type/enrollment/enrollment-period-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-period-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-period-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAEnD,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAE/F,KAAK,2BAA2B,GAAG;IACjC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,2BAI9B,CAAC"}
+{"version":3,"file":"enrollment-period-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-period-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAEnD,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAE/F,KAAK,2BAA2B,GAAG;IACjC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,2BAI9B,CAAC"}

package/lib/resolvers/type/enrollment/enrollment-plan-tyes.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { EnrollmentPlan as EnrollmentPlanType } from '@unchainedshop/core-enrollments';
 import { Product } from '@unchainedshop/core-products';
 type HelperType<T> = (enrollmentPlan: EnrollmentPlanType, _: never, context: Context) => T;

package/lib/resolvers/type/enrollment/enrollment-plan-tyes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-plan-tyes.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-plan-tyes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,cAAc,IAAI,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAE3F,KAAK,yBAAyB,GAAG;IAC/B,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CACvC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,yBAO5B,CAAC"}
+{"version":3,"file":"enrollment-plan-tyes.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-plan-tyes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,IAAI,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAE3F,KAAK,yBAAyB,GAAG;IAC/B,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CACvC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,yBAO5B,CAAC"}

package/lib/resolvers/type/enrollment/enrollment-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { Country } from '@unchainedshop/core-countries';
 import { Currency } from '@unchainedshop/core-currencies';
 import { Enrollment as EnrollmentType, EnrollmentPlan } from '@unchainedshop/core-enrollments';

package/lib/resolvers/type/enrollment/enrollment-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAC/F,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvF,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,UAAU,CAAC;QAAE,aAAa,CAAC,EAAE,IAAI,CAAA;KAAE,EAAE,OAAO,CAAC,CAAC;IACzD,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACxC,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,qBAkBxB,CAAC"}
+{"version":3,"file":"enrollment-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAC/F,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvF,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,UAAU,CAAC;QAAE,aAAa,CAAC,EAAE,IAAI,CAAA;KAAE,EAAE,OAAO,CAAC,CAAC;IACzD,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACxC,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,qBAkBxB,CAAC"}

package/lib/resolvers/type/event-types.d.ts

@@ -1,5 +1,5 @@
-import { Context } from '@unchainedshop/api';
-import type { Event as EventType } from '@unchainedshop/core-events';
+import { Context } from '../../context.js';
+import { Event as EventType } from '@unchainedshop/core-events';
 export type HelperType<P, T> = (work: EventType, params: P, context: Context) => T;
 export interface EventHelperTypes {
     type: HelperType<never, string>;

package/lib/resolvers/type/event-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/event-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAErE,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,KAAK,EAAE,gBAInB,CAAC"}
+{"version":3,"file":"event-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/event-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEhE,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,eAAO,MAAM,KAAK,EAAE,gBAInB,CAAC"}

package/lib/resolvers/type/filter/filter-option-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { FilterOption as FilterOptionType, FilterText } from '@unchainedshop/core-filters';
 type HelperType<P, T> = (filterOption: FilterOptionType, params: P, context: Context) => T;
 type FilterOptionHelperTypes = {

package/lib/resolvers/type/filter/filter-option-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-option-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/filter-option-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE3F,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAE3F,KAAK,uBAAuB,GAAG;IAC7B,GAAG,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,UAAU,CAAC;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,uBAiB1B,CAAC"}
+{"version":3,"file":"filter-option-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/filter-option-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE3F,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAE3F,KAAK,uBAAuB,GAAG;IAC7B,GAAG,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,UAAU,CAAC;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACjE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,uBAiB1B,CAAC"}

package/lib/resolvers/type/filter/filter-types.d.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { Filter as FilterType, FilterOption, FilterText } from '@unchainedshop/core-filters';
 type HelperType<P, T> = (filter: FilterType, params: P, context: Context) => T;
 type FilterHelperTypes = {

package/lib/resolvers/type/filter/filter-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/filter-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE7F,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAE/E,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IAChD,KAAK,EAAE,UAAU,CAAC;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;CAClE,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,iBAgBpB,CAAC"}
+{"version":3,"file":"filter-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/filter-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE7F,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAE/E,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IAChD,KAAK,EAAE,UAAU,CAAC;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;CAClE,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,iBAgBpB,CAAC"}

package/lib/resolvers/type/filter/loaded-filter-option-types.d.ts

@@ -1,2 +1,12 @@
-export declare const LoadedFilterOption: {};
+import { Context } from '../../../context.js';
+export declare const LoadedFilterOption: {
+    filteredProductsCount: ({ filteredProductIdSet, searchQuery }: {
+        filteredProductIdSet: any;
+        searchQuery: any;
+    }, _: never, context: Context) => Promise<number>;
+    definition: ({ filter, value }: {
+        filter: any;
+        value: any;
+    }) => any;
+};
 //# sourceMappingURL=loaded-filter-option-types.d.ts.map

package/lib/resolvers/type/filter/loaded-filter-option-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loaded-filter-option-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-option-types.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,IAAK,CAAC"}
+{"version":3,"file":"loaded-filter-option-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-option-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,eAAO,MAAM,kBAAkB;;;;UAC2C,KAAK,WAAW,OAAO;;;;;CAahG,CAAC"}

package/lib/resolvers/type/filter/loaded-filter-option-types.js

@@ -1,2 +1,16 @@
-export const LoadedFilterOption = {};
+import { FilterDirector } from '@unchainedshop/core';
+export const LoadedFilterOption = {
+    filteredProductsCount: async ({ filteredProductIdSet, searchQuery }, _, context) => {
+        if (!filteredProductIdSet?.size) {
+            return 0;
+        }
+        const filterActions = await FilterDirector.actions({ searchQuery }, context);
+        return filterActions.aggregateProductIds({
+            productIds: Array.from(filteredProductIdSet),
+        }).length;
+    },
+    definition: ({ filter, value }) => {
+        return { filterOption: value, ...filter };
+    },
+};
 //# sourceMappingURL=loaded-filter-option-types.js.map

package/lib/resolvers/type/filter/loaded-filter-option-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"loaded-filter-option-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-option-types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAC"}
+{"version":3,"file":"loaded-filter-option-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-option-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,qBAAqB,EAAE,KAAK,EAAE,EAAE,oBAAoB,EAAE,WAAW,EAAE,EAAE,CAAQ,EAAE,OAAgB,EAAE,EAAE;QACjG,IAAI,CAAC,oBAAoB,EAAE,IAAI,EAAE,CAAC;YAChC,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,aAAa,CAAC,mBAAmB,CAAC;YACvC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;SAC7C,CAAC,CAAC,MAAM,CAAC;IACZ,CAAC;IAED,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;QAChC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,CAAC;IAC5C,CAAC;CACF,CAAC"}

package/lib/resolvers/type/filter/loaded-filter-types.d.ts

@@ -1,2 +1,25 @@
-export declare const LoadedFilter: {};
+import { Context } from '../../../context.js';
+import { Filter, SearchQuery } from '@unchainedshop/core-filters';
+type LoadedFilterData = {
+    forceLiveCollection: boolean;
+    searchQuery: SearchQuery;
+    filter: Filter;
+    examinedProductIdSet: Set<string>;
+    filteredByOtherFiltersSet: Set<string>;
+    filteredByThisFilterSet: Set<string>;
+};
+export declare const LoadedFilter: {
+    definition: ({ filter }: LoadedFilterData) => Filter;
+    isSelected: ({ searchQuery, filter }: LoadedFilterData) => boolean;
+    filteredProductsCount: ({ filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }: LoadedFilterData, _: never, context: Context) => Promise<number>;
+    productsCount: ({ examinedProductIdSet, searchQuery }: LoadedFilterData, _: never, context: Context) => Promise<number>;
+    options: ({ filter, filteredByOtherFiltersSet, forceLiveCollection, searchQuery }: LoadedFilterData, _: never, context: Context) => Promise<{
+        filteredProductIdSet: Set<string>;
+        searchQuery: SearchQuery;
+        value: string;
+        filter: Filter;
+        isSelected: boolean;
+    }[]>;
+};
+export {};
 //# sourceMappingURL=loaded-filter-types.d.ts.map

package/lib/resolvers/type/filter/loaded-filter-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loaded-filter-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-types.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,IAAK,CAAC"}
+{"version":3,"file":"loaded-filter-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAGlE,KAAK,gBAAgB,GAAG;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,yBAAyB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvC,uBAAuB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,YAAY;6BACE,gBAAgB;0CAGH,gBAAgB;iGAIiB,gBAAgB,KAClF,KAAK,WACC,OAAO;2DAQuB,gBAAgB,KACpD,KAAK,WACC,OAAO;uFAQyD,gBAAgB,KACtF,KAAK,WACC,OAAO;;;;;;;CAcnB,CAAC"}

package/lib/resolvers/type/filter/loaded-filter-types.js

@@ -1,2 +1,35 @@
-export const LoadedFilter = {};
+import { FilterDirector } from '@unchainedshop/core';
+export const LoadedFilter = {
+    definition: ({ filter }) => {
+        return filter;
+    },
+    isSelected: ({ searchQuery, filter }) => {
+        return searchQuery?.filterQuery?.some((q) => q.key === filter.key);
+    },
+    filteredProductsCount: async ({ filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }, _, context) => {
+        const filterActions = await FilterDirector.actions({ searchQuery }, context);
+        return filterActions.aggregateProductIds({
+            productIds: Array.from(filteredByOtherFiltersSet.intersection(filteredByThisFilterSet)),
+        }).length;
+    },
+    productsCount: async ({ examinedProductIdSet, searchQuery }, _, context) => {
+        const filterActions = await FilterDirector.actions({ searchQuery }, context);
+        return filterActions.aggregateProductIds({
+            productIds: Array.from(examinedProductIdSet),
+        }).length;
+    },
+    options: async ({ filter, filteredByOtherFiltersSet, forceLiveCollection, searchQuery }, _, context) => {
+        const { services } = context;
+        // The current base for options should be an array of product id's that:
+        // - Are part of the preselected product id array
+        // - Fit this filter generally
+        // - Are filtered by all other filters
+        // - Are not filtered by the currently selected value of this filter
+        return services.filters.loadFilterOptions(filter, {
+            searchQuery,
+            forceLiveCollection,
+            productIdSet: filteredByOtherFiltersSet,
+        });
+    },
+};
 //# sourceMappingURL=loaded-filter-types.js.map

package/lib/resolvers/type/filter/loaded-filter-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"loaded-filter-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,EAAE,CAAC"}
+{"version":3,"file":"loaded-filter-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/filter/loaded-filter-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWrD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,UAAU,EAAE,CAAC,EAAE,MAAM,EAAoB,EAAE,EAAE;QAC3C,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,EAAoB,EAAE,EAAE;QACxD,OAAO,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IACD,qBAAqB,EAAE,KAAK,EAC1B,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,WAAW,EAAoB,EACrF,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,aAAa,CAAC,mBAAmB,CAAC;YACvC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC;SACxF,CAAC,CAAC,MAAM,CAAC;IACZ,CAAC;IACD,aAAa,EAAE,KAAK,EAClB,EAAE,oBAAoB,EAAE,WAAW,EAAoB,EACvD,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,aAAa,CAAC,mBAAmB,CAAC;YACvC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;SAC7C,CAAC,CAAC,MAAM,CAAC;IACZ,CAAC;IACD,OAAO,EAAE,KAAK,EACZ,EAAE,MAAM,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,WAAW,EAAoB,EACzF,CAAQ,EACR,OAAgB,EAChB,EAAE;QACF,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,wEAAwE;QACxE,iDAAiD;QACjD,8BAA8B;QAC9B,sCAAsC;QACtC,oEAAoE;QACpE,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE;YAChD,WAAW;YACX,mBAAmB;YACnB,YAAY,EAAE,yBAAyB;SACxC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}