@unchainedshop/api 2.0.0-beta6 → 2.0.0-beta8

package/lib/loaders/index.js

@@ -1,9 +1,28 @@
 import DataLoader from 'dataloader';
 import { systemLocale } from '@unchainedshop/utils';
 import localePkg from 'locale';
+import { ProductStatus } from '@unchainedshop/core-products';
 const { Locale } = localePkg;
 export default async (req, res, unchainedAPI) => {
     return {
+        assortmentLoader: new DataLoader(async (queries) => {
+            const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+            const assortments = await unchainedAPI.modules.assortments.findAssortments({
+                assortmentIds,
+                includeInactive: true,
+                includeLeaves: true,
+            });
+            return queries.map(({ assortmentId, includeInactive }) => {
+                return assortments.find((assortment) => {
+                    if (assortment._id !== assortmentId)
+                        return false;
+                    if (!includeInactive) {
+                        return assortment.isActive === true;
+                    }
+                    return true;
+                });
+            });
+        }),
         assortmentTextLoader: new DataLoader(async (queries) => {
             const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
             const texts = await unchainedAPI.modules.assortments.texts.findTexts({ assortmentId: { $in: assortmentIds } }, {
@@ -26,6 +45,20 @@ export default async (req, res, unchainedAPI) => {
                 return assortmentText || assortmentTexts[0];
             });
         }),
+        filterLoader: new DataLoader(async (queries) => {
+            const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
+            const filters = await unchainedAPI.modules.filters.findFilters({
+                filterIds,
+                includeInactive: true,
+            });
+            return queries.map(({ filterId }) => {
+                return filters.find((product) => {
+                    if (product._id !== filterId)
+                        return false;
+                    return true;
+                });
+            });
+        }),
         filterTextLoader: new DataLoader(async (queries) => {
             const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
             const texts = await unchainedAPI.modules.filters.texts.findTexts({ filterId: { $in: filterIds } }, {
@@ -48,6 +81,23 @@ export default async (req, res, unchainedAPI) => {
                 return filterText || filterTexts[0];
             });
         }),
+        productLoader: new DataLoader(async (queries) => {
+            const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
+            const products = await unchainedAPI.modules.products.findProducts({
+                productIds,
+                includeDrafts: true,
+            });
+            return queries.map(({ productId, includeDrafts }) => {
+                return products.find((product) => {
+                    if (product._id !== productId)
+                        return false;
+                    if (!includeDrafts) {
+                        return product.status === ProductStatus.ACTIVE;
+                    }
+                    return true;
+                });
+            });
+        }),
         productTextLoader: new DataLoader(async (queries) => {
             const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
             const texts = await unchainedAPI.modules.products.texts.findTexts({ productId: { $in: productIds } }, {

package/lib/loaders/index.js.map

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

package/lib/resolvers/index.js

@@ -1,4 +1,4 @@
-import { GraphQLUpload } from 'graphql-upload';
+import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
 import { JSONResolver, TimestampResolver, DateTimeResolver, DateResolver } from 'graphql-scalars';
 import Query from './queries';
 import Mutation from './mutations';

package/lib/resolvers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClG,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,QAAQ,CAAC;AAC3B,OAAO,aAAa,MAAM,WAAW,CAAC;AAEtC,eAAe;IACb,GAAG,KAAK;IACR,GAAG,aAAa;IAChB,MAAM,EAAE,aAAa;IACrB,IAAI,EAAE,YAAY;IAClB,KAAK;IACL,QAAQ;IACR,QAAQ,EAAE,gBAAgB;IAC1B,IAAI,EAAE,YAAY;IAClB,SAAS,EAAE,iBAAiB;CACK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClG,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,KAAK,MAAM,QAAQ,CAAC;AAC3B,OAAO,aAAa,MAAM,WAAW,CAAC;AAEtC,eAAe;IACb,GAAG,KAAK;IACR,GAAG,aAAa;IAChB,MAAM,EAAE,aAAa;IACrB,IAAI,EAAE,YAAY;IAClB,KAAK;IACL,QAAQ;IACR,QAAQ,EAAE,gBAAgB;IAC1B,IAAI,EAAE,YAAY;IAClB,SAAS,EAAE,iBAAiB;CACK,CAAC"}

package/lib/resolvers/mutations/accounts/changePassword.d.ts

@@ -1,8 +1,6 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function changePassword(root: Root, params: {
-    oldPassword?: string;
     oldPlainPassword?: string;
-    newPassword?: string;
     newPlainPassword?: string;
 }, { modules, userId }: Context): Promise<{
     success: boolean;

package/lib/resolvers/mutations/accounts/changePassword.js

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
 export default async function changePassword(root, params, { modules, userId }) {
     log('mutation changePassword', { userId });
-    if (!params.newPassword && !params.newPlainPassword) {
+    if (!params.newPlainPassword) {
         throw new Error('New password is required');
     }
-    if (!params.oldPassword && !params.oldPlainPassword) {
+    if (!params.oldPlainPassword) {
         throw new Error('Old password is required');
     }
     const success = await modules.accounts.changePassword(userId, params);

package/lib/resolvers/mutations/accounts/changePassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"changePassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAKC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IACD,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtE,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}
+{"version":3,"file":"changePassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAGC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IACD,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtE,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}

package/lib/resolvers/mutations/accounts/createUser.js

@@ -3,11 +3,11 @@ import { hashPassword } from '../../../hashPassword';
 export default async function createUser(root, params, context) {
     const { modules, userId } = context;
     log('mutation createUser', { email: params.email, username: params.username, userId });
-    if (!params.password && !params.plainPassword && !params.webAuthnPublicKeyCredentials) {
+    if (!params.plainPassword && !params.webAuthnPublicKeyCredentials) {
         throw new Error('Password or Public Key is required');
     }
     const mappedUser = { ...params };
-    if (!mappedUser.password && mappedUser.plainPassword) {
+    if (mappedUser.plainPassword) {
         mappedUser.password = hashPassword(mappedUser.plainPassword);
     }
     delete mappedUser.plainPassword;

package/lib/resolvers/mutations/accounts/createUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"createUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createUser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE;QACrF,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACjC,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,aAAa,EAAE;QACpD,UAAU,CAAC,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KAC9D;IACD,OAAO,UAAU,CAAC,aAAa,CAAC;IAChC,OAAO,UAAU,CAAC,4BAA4B,CAAC;IAE/C,MAAM,eAAe,GACnB,MAAM,CAAC,4BAA4B;QACnC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CACvD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,4BAA4B,CACpC,CAAC,CAAC;IAEL,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE;QAC9D,sBAAsB,EAAE,CAAC,CAAC,eAAe;KAC1C,CAAC,CAAC;IAEH,IAAI,SAAS,IAAI,eAAe,EAAE;QAChC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,SAAS,EAAE,EAClB;YACE,KAAK,EAAE;gBACL,mBAAmB,EAAE,eAAe;aACrC;SACF,EACD,EAAE,CACH,CAAC;KACH;IAED,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"createUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createUser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE;QACjE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACjC,IAAI,UAAU,CAAC,aAAa,EAAE;QAC5B,UAAU,CAAC,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KAC9D;IACD,OAAO,UAAU,CAAC,aAAa,CAAC;IAChC,OAAO,UAAU,CAAC,4BAA4B,CAAC;IAE/C,MAAM,eAAe,GACnB,MAAM,CAAC,4BAA4B;QACnC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CACvD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,4BAA4B,CACpC,CAAC,CAAC;IAEL,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE;QAC9D,sBAAsB,EAAE,CAAC,CAAC,eAAe;KAC1C,CAAC,CAAC;IAEH,IAAI,SAAS,IAAI,eAAe,EAAE;QAChC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,SAAS,EAAE,EAClB;YACE,KAAK,EAAE;gBACL,mBAAmB,EAAE,eAAe;aACrC;SACF,EACD,EAAE,CACH,CAAC;KACH;IAED,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC"}

package/lib/resolvers/mutations/accounts/enrollUser.js

@@ -5,7 +5,7 @@ export default async function enrollUser(root, params, context) {
     log('mutation enrollUser', { email: params.email, userId: context.userId });
     const mappedUserData = params;
     mappedUserData.initialPassword = true;
-    if (!mappedUserData.password && mappedUserData.plainPassword) {
+    if (mappedUserData.plainPassword) {
         mappedUserData.password = hashPassword(mappedUserData.plainPassword);
     }
     delete mappedUserData.plainPassword;

package/lib/resolvers/mutations/accounts/enrollUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"enrollUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE5E,MAAM,cAAc,GAAG,MAAM,CAAC;IAC9B,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,aAAa,EAAE;QAC5D,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;KACtE;IACD,OAAO,cAAc,CAAC,aAAa,CAAC;IAEpC,4CAA4C;IAC5C,oDAAoD;IACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;QAC/D,aAAa,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ;KACzC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"enrollUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE5E,MAAM,cAAc,GAAG,MAAM,CAAC;IAC9B,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,IAAI,cAAc,CAAC,aAAa,EAAE;QAChC,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;KACtE;IACD,OAAO,cAAc,CAAC,aAAa,CAAC;IAEpC,4CAA4C;IAC5C,oDAAoD;IACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;QAC/D,aAAa,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ;KACzC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}

package/lib/resolvers/mutations/accounts/loginWithPassword.d.ts

@@ -2,7 +2,6 @@ import { Context, Root } from '@unchainedshop/types/api';
 export default function loginWithPassword(root: Root, params: {
     username?: string;
     email?: string;
-    password?: string;
     plainPassword?: string;
     totpCode?: string;
 }, context: Context): Promise<{

package/lib/resolvers/mutations/accounts/loginWithPassword.js

@@ -2,14 +2,14 @@ import { log } from '@unchainedshop/logger';
 import { hashPassword } from '../../../hashPassword';
 export default async function loginWithPassword(root, params, context) {
     const { modules } = context;
-    const { username, email, password: hashedPassword, plainPassword, totpCode } = params;
+    const { username, email, plainPassword, totpCode } = params;
     log('mutation loginWithPassword', { username, email });
-    if (!hashedPassword && !plainPassword) {
+    if (!plainPassword) {
         throw new Error('Password is required');
     }
     const mappedUserLoginParams = {
         user: email ? { email } : { username },
-        password: hashedPassword || hashPassword(plainPassword),
+        password: hashPassword(plainPassword),
         code: totpCode,
     };
     return modules.accounts.loginWithService({ service: 'password', ...mappedUserLoginParams }, context);

package/lib/resolvers/mutations/accounts/loginWithPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"loginWithPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAMC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEtF,GAAG,CAAC,4BAA4B,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,cAAc,IAAI,CAAC,aAAa,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,MAAM,qBAAqB,GAAG;QAC5B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE;QACtC,QAAQ,EAAE,cAAc,IAAI,YAAY,CAAC,aAAa,CAAC;QACvD,IAAI,EAAE,QAAQ;KACf,CAAC;IAEF,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,qBAAqB,EAAE,EAAE,OAAO,CAAC,CAAC;AACvG,CAAC"}
+{"version":3,"file":"loginWithPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5D,GAAG,CAAC,4BAA4B,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,MAAM,qBAAqB,GAAG;QAC5B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE;QACtC,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC;QACrC,IAAI,EAAE,QAAQ;KACf,CAAC;IAEF,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,qBAAqB,EAAE,EAAE,OAAO,CAAC,CAAC;AACvG,CAAC"}

package/lib/resolvers/mutations/accounts/resetPassword.d.ts

@@ -1,6 +1,5 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function resetPassword(root: Root, params: {
-    newPassword?: string;
     newPlainPassword?: string;
     token: string;
 }, context: Context): Promise<{

package/lib/resolvers/mutations/accounts/resetPassword.js

@@ -2,7 +2,7 @@ import { log } from '@unchainedshop/logger';
 export default async function resetPassword(root, params, context) {
     const { modules, userId } = context;
     log('mutation resetPassword', { userId });
-    if (!params.newPassword && !params.newPlainPassword) {
+    if (!params.newPlainPassword) {
         throw new Error('Password is required');
     }
     const userWithNewPassword = await modules.accounts.resetPassword(params, context);

package/lib/resolvers/mutations/accounts/resetPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"resetPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/resetPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAU,EACV,MAA0E,EAC1E,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1C,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElF,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;AAC5E,CAAC"}
+{"version":3,"file":"resetPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/resetPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAU,EACV,MAAoD,EACpD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1C,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElF,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;AAC5E,CAAC"}

package/lib/resolvers/mutations/accounts/setPassword.d.ts

@@ -1,6 +1,5 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function setPassword(root: Root, params: {
-    newPassword: string;
     newPlainPassword: string;
     userId: string;
 }, { modules, userId }: Context): Promise<import("@unchainedshop/types/user").User>;

package/lib/resolvers/mutations/accounts/setPassword.js

@@ -5,7 +5,7 @@ export default async function setPassword(root, params, { modules, userId }) {
     log(`mutation setPassword ${normalizedUserId}`, { userId });
     if (!normalizedUserId)
         throw new InvalidIdError({ userId: normalizedUserId });
-    if (!params.newPassword && !params.newPlainPassword) {
+    if (!params.newPlainPassword) {
         throw new Error('Password is required');
     }
     if (!(await modules.users.userExists({ userId: normalizedUserId })))

package/lib/resolvers/mutations/accounts/setPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"setPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/setPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAAyE,EACzE,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAEjD,GAAG,CAAC,wBAAwB,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE5D,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC9E,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IACD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjE,MAAM,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAE5D,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAE7D,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"setPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/setPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAAoD,EACpD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAEjD,GAAG,CAAC,wBAAwB,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE5D,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC9E,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IACD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjE,MAAM,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAE5D,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAE7D,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;AACtD,CAAC"}

package/lib/resolvers/mutations/assortments/removeAssortment.js

@@ -7,7 +7,7 @@ export default async function removeAssortment(root, { assortmentId }, { modules
     const assortment = await modules.assortments.findAssortment({ assortmentId });
     if (!assortment)
         throw new AssortmentNotFoundError({ assortmentId });
-    await modules.assortments.delete(assortmentId, { skipInvalidation: false }, userId);
+    await modules.assortments.delete(assortmentId, { skipInvalidation: false });
     return assortment;
 }
 //# sourceMappingURL=removeAssortment.js.map

package/lib/resolvers/mutations/assortments/removeAssortment.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeAssortment.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/assortments/removeAssortment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE1E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,EAAE,YAAY,EAA4B,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,6BAA6B,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE7D,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IAE9D,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IAC9E,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IAErE,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IAEpF,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"removeAssortment.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/assortments/removeAssortment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE1E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,EAAE,YAAY,EAA4B,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,6BAA6B,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE7D,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IAE9D,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IAC9E,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;IAErE,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;IAE5E,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/lib/resolvers/mutations/assortments/removeAssortmentFilter.js

@@ -11,7 +11,7 @@ export default async function removeAssortmentFilter(root, { assortmentFilterId
     });
     if (!assortmentFilter)
         throw new AssortmentFilterNotFoundError({ assortmentFilterId });
-    await modules.assortments.filters.delete(assortmentFilterId, userId);
+    await modules.assortments.filters.delete(assortmentFilterId);
     return assortmentFilter;
 }
 //# sourceMappingURL=removeAssortmentFilter.js.map

package/lib/resolvers/mutations/assortments/removeAssortmentFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeAssortmentFilter.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/assortments/removeAssortmentFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,6BAA6B,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEhF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sBAAsB,CAClD,IAAU,EACV,EAAE,kBAAkB,EAAkC,EACtD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,mCAAmC,kBAAkB,EAAE,EAAE;QAC3D,MAAM;KACP,CAAC,CAAC;IACH,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAE1E,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC;QACpE,kBAAkB;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,6BAA6B,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAEvF,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IAErE,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"removeAssortmentFilter.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/assortments/removeAssortmentFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,6BAA6B,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEhF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sBAAsB,CAClD,IAAU,EACV,EAAE,kBAAkB,EAAkC,EACtD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,mCAAmC,kBAAkB,EAAE,EAAE;QAC3D,MAAM;KACP,CAAC,CAAC;IACH,IAAI,CAAC,kBAAkB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAE1E,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC;QACpE,kBAAkB;KACnB,CAAC,CAAC;IAEH,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,6BAA6B,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAEvF,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAE7D,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}

package/lib/resolvers/mutations/assortments/removeAssortmentLink.js

@@ -9,7 +9,7 @@ export default async function removeAssortmentLink(root, { assortmentLinkId }, {
     });
     if (!assortmentLink)
         throw new AssortmentLinkNotFoundError({ assortmentLinkId });
-    await modules.assortments.links.delete(assortmentLinkId, { skipInvalidation: false }, userId);
+    await modules.assortments.links.delete(assortmentLinkId, { skipInvalidation: false });
     return assortmentLink;
 }
 //# sourceMappingURL=removeAssortmentLink.js.map

package/lib/resolvers/mutations/assortments/removeAssortmentLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeAssortmentLink.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/assortments/removeAssortmentLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE9E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAChD,IAAU,EACV,EAAE,gBAAgB,EAAgC,EAClD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,iCAAiC,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEtE,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC9D,gBAAgB;KACjB,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,2BAA2B,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEjF,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IAE9F,OAAO,cAAc,CAAC;AACxB,CAAC"}
+{"version":3,"file":"removeAssortmentLink.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/assortments/removeAssortmentLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,2BAA2B,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE9E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAChD,IAAU,EACV,EAAE,gBAAgB,EAAgC,EAClD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,iCAAiC,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrE,IAAI,CAAC,gBAAgB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEtE,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC9D,gBAAgB;KACjB,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,2BAA2B,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAEjF,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;IAEtF,OAAO,cAAc,CAAC;AACxB,CAAC"}

package/lib/resolvers/mutations/assortments/removeAssortmentProduct.js

@@ -11,7 +11,7 @@ export default async function removeAssortmentProduct(root, { assortmentProductI
     });
     if (!assortmentProduct)
         throw new AssortmentProductNotFoundError({ assortmentProductId });
-    await modules.assortments.products.delete(assortmentProductId, { skipInvalidation: false }, userId);
+    await modules.assortments.products.delete(assortmentProductId, { skipInvalidation: false });
     return assortmentProduct;
 }
 //# sourceMappingURL=removeAssortmentProduct.js.map

package/lib/resolvers/mutations/assortments/removeAssortmentProduct.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeAssortmentProduct.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/assortments/removeAssortmentProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,8BAA8B,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CACnD,IAAU,EACV,EAAE,mBAAmB,EAAmC,EACxD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,oCAAoC,mBAAmB,EAAE,EAAE;QAC7D,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,mBAAmB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE5E,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvE,mBAAmB;KACpB,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB;QAAE,MAAM,IAAI,8BAA8B,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE1F,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IAEpG,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"removeAssortmentProduct.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/assortments/removeAssortmentProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,8BAA8B,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CACnD,IAAU,EACV,EAAE,mBAAmB,EAAmC,EACxD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,oCAAoC,mBAAmB,EAAE,EAAE;QAC7D,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,mBAAmB;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE5E,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvE,mBAAmB;KACpB,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB;QAAE,MAAM,IAAI,8BAA8B,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE1F,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;IAE5F,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}

package/lib/resolvers/mutations/enrollments/updateEnrollment.d.ts

@@ -1,7 +1,7 @@
 import { Context, Root } from '@unchainedshop/types/api';
 import { EnrollmentPlan, Enrollment } from '@unchainedshop/types/enrollments';
 import { Address, Contact } from '@unchainedshop/types/common';
-declare type UpdateEnrollmentParams = {
+type UpdateEnrollmentParams = {
     enrollmentId: string;
     contact?: Contact;
     plan: EnrollmentPlan;

package/lib/resolvers/mutations/filters/removeFilter.js

@@ -8,7 +8,7 @@ export default async function removeFilter(root, { filterId }, requestContext) {
     const filter = await modules.filters.findFilter({ filterId });
     if (!filter)
         throw new FilterNotFoundError({ filterId });
-    await modules.assortments.filters.deleteMany({ filterId }, userId);
+    await modules.assortments.filters.deleteMany({ filterId });
     await modules.filters.delete(filterId, userId);
     return filter;
 }

package/lib/resolvers/mutations/filters/removeFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeFilter.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/filters/removeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,EAAE,QAAQ,EAAwB,EAClC,cAAuB;IAEvB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAC3C,GAAG,CAAC,yBAAyB,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAErD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEzD,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;IACnE,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE/C,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"removeFilter.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/filters/removeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,EAAE,QAAQ,EAAwB,EAClC,cAAuB;IAEvB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAC3C,GAAG,CAAC,yBAAyB,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAErD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEzD,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3D,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE/C,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/lib/resolvers/mutations/filters/updateFilter.js

@@ -7,6 +7,7 @@ export default async function updateFilter(root, { filter, filterId }, context)
         throw new InvalidIdError({ filterId });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    return modules.filters.update(filterId, filter, context, { skipInvalidation: false }, userId);
+    await modules.filters.update(filterId, filter, context, { skipInvalidation: false }, userId);
+    return modules.filters.findFilter({ filterId });
 }
 //# sourceMappingURL=updateFilter.js.map

package/lib/resolvers/mutations/filters/updateFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateFilter.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/filters/updateFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,EAAE,MAAM,EAAE,QAAQ,EAAwC,EAC1D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,yBAAyB,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAErD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAErG,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;AAChG,CAAC"}
+{"version":3,"file":"updateFilter.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/filters/updateFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,EAAE,MAAM,EAAE,QAAQ,EAAwC,EAC1D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,yBAAyB,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAErD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAAE,MAAM,IAAI,mBAAmB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAErG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IAE7F,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;AAClD,CAAC"}

package/lib/resolvers/mutations/index.d.ts

@@ -34,7 +34,7 @@ declare const _default: {
         referrer: any;
     }, { userId }: {
         userId: any;
-    }) => any;
+    }) => Promise<any>;
     createUser: typeof createUser;
     forgotPassword: typeof forgotPassword;
     resetPassword: typeof resetPassword;

package/lib/resolvers/mutations/pageView.d.ts

@@ -3,5 +3,5 @@ declare const _default: (root: any, { path, referrer }: {
     referrer: any;
 }, { userId }: {
     userId: any;
-}) => any;
+}) => Promise<any>;
 export default _default;

package/lib/resolvers/mutations/pageView.js

@@ -1,8 +1,8 @@
 import { log } from '@unchainedshop/logger';
 import { emit } from '@unchainedshop/events';
-export default (root, { path, referrer }, { userId }) => {
+export default async (root, { path, referrer }, { userId }) => {
     log(`mutation pageView ${path} ${referrer}`, { userId });
-    emit('PAGE_VIEW', {
+    await emit('PAGE_VIEW', {
         path,
         referrer,
     });

package/lib/resolvers/mutations/pageView.js.map

@@ -1 +1 @@
-{"version":3,"file":"pageView.js","sourceRoot":"","sources":["../../../src/resolvers/mutations/pageView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C,eAAe,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACtD,GAAG,CAAC,qBAAqB,IAAI,IAAI,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEzD,IAAI,CAAC,WAAW,EAAE;QAChB,IAAI;QACJ,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
+{"version":3,"file":"pageView.js","sourceRoot":"","sources":["../../../src/resolvers/mutations/pageView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C,eAAe,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IAC5D,GAAG,CAAC,qBAAqB,IAAI,IAAI,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEzD,MAAM,IAAI,CAAC,WAAW,EAAE;QACtB,IAAI;QACJ,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

package/lib/resolvers/mutations/products/removeProduct.d.ts

@@ -1,4 +1,4 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function removeProduct(root: Root, { productId }: {
     productId: string;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/products").Product>;
+}, context: Context): Promise<import("@unchainedshop/types/products").Product>;

package/lib/resolvers/mutations/products/removeProduct.js

@@ -1,16 +1,13 @@
 import { log } from '@unchainedshop/logger';
-import { ProductNotFoundError, ProductWrongStatusError, InvalidIdError } from '../../../errors';
-export default async function removeProduct(root, { productId }, { modules, userId }) {
+import { ProductNotFoundError, InvalidIdError } from '../../../errors';
+export default async function removeProduct(root, { productId }, context) {
+    const { modules, services, userId } = context;
     log(`mutation removeProduct ${productId}`, { userId });
     if (!productId)
         throw new InvalidIdError({ productId });
-    const product = await modules.products.findProduct({ productId });
-    if (!product)
+    if (!(await modules.products.productExists({ productId })))
         throw new ProductNotFoundError({ productId });
-    if (!modules.products.isDraft(product))
-        throw new ProductWrongStatusError({ status: product.status });
-    await modules.assortments.products.delete(productId, {}, userId);
-    await modules.products.delete(productId, userId);
+    await services.products.removeProduct({ productId, userId: context.userId }, context);
     return modules.products.findProduct({ productId });
 }
 //# sourceMappingURL=removeProduct.js.map

package/lib/resolvers/mutations/products/removeProduct.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeProduct.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/products/removeProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEhG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAU,EACV,EAAE,SAAS,EAAyB,EACpC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,0BAA0B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAE5D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEtG,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAmB,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3E,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAEjD,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"removeProduct.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/products/removeProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEvE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAU,EACV,EAAE,SAAS,EAAyB,EACpC,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC9C,GAAG,CAAC,0BAA0B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhD,MAAM,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAEtF,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AACrD,CAAC"}

package/lib/resolvers/queries/products/product.js

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors';
 export default async function product(root, { productId, slug }, { modules, userId }) {
-    log(`query product ${productId} ${slug}`, { userId });
+    log(`query product ${productId || slug}`, { userId });
     if (!productId === !slug)
         throw new InvalidIdError({ productId, slug });
     return modules.products.findProduct({ productId, slug });

package/lib/resolvers/queries/products/productCatalogPrices.d.ts

@@ -1,4 +1,4 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function productCatalogPrices(root: Root, { productId }: {
     productId: string;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/products").ProductPrice[]>;
+}, { modules, loaders, userId }: Context): Promise<import("@unchainedshop/types/products").ProductPrice[]>;

package/lib/resolvers/queries/products/productCatalogPrices.js

@@ -1,10 +1,13 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors';
-export default async function productCatalogPrices(root, { productId }, { modules, userId }) {
+export default async function productCatalogPrices(root, { productId }, { modules, loaders, userId }) {
     log(`query productCatalogPrices ${productId}`, { userId });
     if (!productId)
         throw new InvalidIdError({ productId });
-    const product = await modules.products.findProduct({ productId });
+    const product = await loaders.productLoader.load({
+        productId,
+        includeDrafts: true,
+    });
     if (!product)
         return null;
     return modules.products.prices.catalogPrices(product);

package/lib/resolvers/queries/products/productCatalogPrices.js.map

@@ -1 +1 @@
-{"version":3,"file":"productCatalogPrices.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/products/productCatalogPrices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAChD,IAAU,EACV,EAAE,SAAS,EAAyB,EACpC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,8BAA8B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3D,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAE1B,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"productCatalogPrices.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/products/productCatalogPrices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAChD,IAAU,EACV,EAAE,SAAS,EAAyB,EACpC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAW;IAErC,GAAG,CAAC,8BAA8B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3D,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;QAC/C,SAAS;QACT,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;IACH,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAE1B,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC"}

package/lib/resolvers/queries/products/products.js

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
 export default async function products(root, params, { modules, userId }) {
-    log(`query products: ${params.limit} ${params.offset} ${params.includeDrafts ? 'includeDrafts' : ''} ${params.slugs?.join(',')}`, { userId });
+    log(`query products: ${params.limit || 0} ${params.offset || 0} ${params.includeDrafts ? 'includeDrafts' : ''} ${params.slugs?.join(',')}`, { userId });
     return modules.products.findProducts(params);
 }
 //# sourceMappingURL=products.js.map

package/lib/resolvers/queries/products/products.js.map

@@ -1 +1 @@
-{"version":3,"file":"products.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/products/products.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,QAAQ,CACpC,IAAU,EACV,MAIC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CACD,mBAAmB,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,IAC9C,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAC3C,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAC7B,EAAE,MAAM,EAAE,CACX,CAAC;IACF,OAAO,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"products.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/products/products.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,QAAQ,CACpC,IAAU,EACV,MAIC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CACD,mBAAmB,MAAM,CAAC,KAAK,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IACxD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAC3C,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAC7B,EAAE,MAAM,EAAE,CACX,CAAC;IACF,OAAO,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC"}

package/lib/resolvers/scalars/LowerCaseString.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLScalarType } from 'graphql';
-declare const LowerCaseString: GraphQLScalarType;
+declare const LowerCaseString: GraphQLScalarType<string, any>;
 export default LowerCaseString;

package/lib/resolvers/scalars/index.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    LowerCaseString: import("graphql").GraphQLScalarType;
+    LowerCaseString: import("graphql").GraphQLScalarType<string, any>;
 };
 export default _default;

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

@@ -1,8 +1,8 @@
 import { Context } from '@unchainedshop/types/api';
 import { Assortment, AssortmentFilter as AssortmentFilterType } from '@unchainedshop/types/assortments';
 import { Filter } from '@unchainedshop/types/filters';
-declare type HelperType<T> = (assortmentFilter: AssortmentFilterType, _: never, context: Context) => T;
-export declare type AssortmentFilterHelperTypes = {
+type HelperType<T> = (assortmentFilter: AssortmentFilterType, _: never, context: Context) => T;
+export type AssortmentFilterHelperTypes = {
     assortment: HelperType<Promise<Assortment>>;
     filter: HelperType<Promise<Filter>>;
 };

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

@@ -1,9 +1,16 @@
 export const AssortmentFilter = {
-    assortment: (obj, _, { modules }) => modules.assortments.findAssortment({
-        assortmentId: obj.assortmentId,
-    }),
-    filter: (obj, _, { modules }) => modules.filters.findFilter({
-        filterId: obj.filterId,
-    }),
+    assortment: async (obj, _, { loaders }) => {
+        const assortment = await loaders.assortmentLoader.load({
+            assortmentId: obj.assortmentId,
+            includeInactive: true,
+        });
+        return assortment;
+    },
+    filter: async (obj, _, { loaders }) => {
+        const filter = await loaders.filterLoader.load({
+            filterId: obj.filterId,
+        });
+        return filter;
+    },
 };
 //# sourceMappingURL=assortment-filter-types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"assortment-filter-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-filter-types.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAClC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;QACjC,YAAY,EAAE,GAAG,CAAC,YAAY;KAC/B,CAAC;IAEJ,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC9B,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;QACzB,QAAQ,EAAE,GAAG,CAAC,QAAQ;KACvB,CAAC;CACL,CAAC"}
+{"version":3,"file":"assortment-filter-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-filter-types.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACxC,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACrD,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC;YAC7C,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAC"}

package/lib/resolvers/type/assortment/assortment-link-types.d.ts

@@ -1,7 +1,7 @@
 import { Context } from '@unchainedshop/types/api';
 import { Assortment, AssortmentLink as AssortmentLinkType } from '@unchainedshop/types/assortments';
-declare type HelperType<T> = (assortmentLink: AssortmentLinkType, _: never, context: Context) => T;
-export declare type AssortmentLinkHelperTypes = {
+type HelperType<T> = (assortmentLink: AssortmentLinkType, _: never, context: Context) => T;
+export type AssortmentLinkHelperTypes = {
     child: HelperType<Promise<Assortment>>;
     parent: HelperType<Promise<Assortment>>;
 };