@unchainedshop/api 5.0.0-alpha.2 → 5.0.0-alpha.3

package/lib/mcp/tools/system/index.js

@@ -1,5 +1,8 @@
 import { systemManagement } from "./systemManagement.js";
 import { SystemManagementSchema } from "./schemas.js";
 export const registerSystemTools = (server, context) => {
-    server.tool('system_management', 'Comprehensive system management with unified system information, worker queue, and event operations. System actions: SHOP_INFO (returns shop configuration including default locale settings). Worker actions: WORKER_ADD (add work items), WORKER_REMOVE (delete work items), WORKER_GET (retrieve work item), WORKER_LIST (search work items), WORKER_COUNT (count work items), WORKER_ALLOCATE (allocate work to workers), WORKER_FINISH_WORK (mark work complete), WORKER_PROCESS_NEXT (get next work item), WORKER_STATISTICS (work queue statistics), WORKER_ACTIVE_WORK_TYPES (get active work types). Event actions: EVENT_GET (retrieve event), EVENT_LIST (search events), EVENT_COUNT (count events), EVENT_STATISTICS (event analytics).', SystemManagementSchema, async (params) => systemManagement(context, params));
+    server.registerTool('system_management', {
+        description: 'Comprehensive system management with unified system information, worker queue, and event operations. System actions: SHOP_INFO (returns shop configuration including default locale settings). Worker actions: WORKER_ADD (add work items), WORKER_REMOVE (delete work items), WORKER_GET (retrieve work item), WORKER_LIST (search work items), WORKER_COUNT (count work items), WORKER_ALLOCATE (allocate work to workers), WORKER_FINISH_WORK (mark work complete), WORKER_PROCESS_NEXT (get next work item), WORKER_STATISTICS (work queue statistics), WORKER_ACTIVE_WORK_TYPES (get active work types). Event actions: EVENT_GET (retrieve event), EVENT_LIST (search events), EVENT_COUNT (count events), EVENT_STATISTICS (event analytics).',
+        inputSchema: SystemManagementSchema,
+    }, async (params) => systemManagement(context, params));
 };

package/lib/mcp/tools/users/index.d.ts

@@ -1,3 +1,3 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type { Context } from '../../../context.ts';
 export declare const registerUsersTools: (server: McpServer, context: Context) => void;

package/lib/mcp/tools/users/index.js

@@ -1,4 +1,7 @@
 import { usersManagement, UsersManagementSchema } from "./usersManagement.js";
 export const registerUsersTools = (server, context) => {
-    server.tool('users_management', 'Comprehensive user management system for Unchained e-commerce platform. Core operations: LIST (paginated user listing with filters for guests, email verification, last login dates), COUNT (user count with same filters), GET (retrieve user by ID), CREATE (new user with optional profile), UPDATE (profile/metadata updates), REMOVE (soft delete with optional review cleanup), ENROLL (create user + send enrollment email). User administration: SET_ROLES (assign admin/editor roles), SET_TAGS (categorization tags), SET_PASSWORD (admin password reset), SET_USERNAME (username changes). Email management: ADD_EMAIL/REMOVE_EMAIL (multi-email support), SEND_ENROLLMENT_EMAIL (trigger enrollment), SEND_VERIFICATION_EMAIL (email verification). Data access: GET_ORDERS (user order history with cart inclusion), GET_ENROLLMENTS (subscription enrollments), GET_QUOTATIONS (price quotes), GET_BOOKMARKS (saved products), GET_CART (active user cart), GET_PAYMENT_CREDENTIALS (stored payment methods), GET_AVATAR (profile image), GET_REVIEWS/GET_REVIEWS_COUNT (product reviews), REMOVE_PRODUCT_REVIEWS (bulk review cleanup), GET_CURRENT_USER (current session logged in user). Supports pagination, sorting, filtering, date ranges, and proper validation for all operations.', UsersManagementSchema, async (params) => usersManagement(context, params));
+    server.registerTool('users_management', {
+        description: 'Comprehensive user management system for Unchained e-commerce platform. Core operations: LIST (paginated user listing with filters for guests, email verification, last login dates), COUNT (user count with same filters), GET (retrieve user by ID), CREATE (new user with optional profile), UPDATE (profile/metadata updates), REMOVE (soft delete with optional review cleanup), ENROLL (create user + send enrollment email). User administration: SET_ROLES (assign admin/editor roles), SET_TAGS (categorization tags), SET_PASSWORD (admin password reset), SET_USERNAME (username changes). Email management: ADD_EMAIL/REMOVE_EMAIL (multi-email support), SEND_ENROLLMENT_EMAIL (trigger enrollment), SEND_VERIFICATION_EMAIL (email verification). Data access: GET_ORDERS (user order history with cart inclusion), GET_ENROLLMENTS (subscription enrollments), GET_QUOTATIONS (price quotes), GET_BOOKMARKS (saved products), GET_CART (active user cart), GET_PAYMENT_CREDENTIALS (stored payment methods), GET_AVATAR (profile image), GET_REVIEWS/GET_REVIEWS_COUNT (product reviews), REMOVE_PRODUCT_REVIEWS (bulk review cleanup), GET_CURRENT_USER (current session logged in user). Supports pagination, sorting, filtering, date ranges, and proper validation for all operations.',
+        inputSchema: UsersManagementSchema,
+    }, async (params) => usersManagement(context, params));
 };

package/lib/mcp/tools/users/schemas.d.ts

@@ -222,11 +222,11 @@ export declare const UsersManagementSchema: {
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
+        LIST: "LIST";
         GET: "GET";
         CREATE: "CREATE";
         UPDATE: "UPDATE";
         REMOVE: "REMOVE";
-        LIST: "LIST";
         COUNT: "COUNT";
         GET_REVIEWS: "GET_REVIEWS";
         ENROLL: "ENROLL";
@@ -290,11 +290,11 @@ export declare const UsersManagementZodSchema: z.ZodObject<{
     limit: z.ZodOptional<z.ZodNumber>;
     offset: z.ZodOptional<z.ZodNumber>;
     action: z.ZodEnum<{
+        LIST: "LIST";
         GET: "GET";
         CREATE: "CREATE";
         UPDATE: "UPDATE";
         REMOVE: "REMOVE";
-        LIST: "LIST";
         COUNT: "COUNT";
         GET_REVIEWS: "GET_REVIEWS";
         ENROLL: "ENROLL";

package/lib/mcp/utils/sharedSchemas.d.ts

@@ -63,6 +63,7 @@ export declare function createMcpResponse(response: any): {
     }[];
 };
 export declare function createMcpErrorResponse(action: string, error: Error): {
+    isError: boolean;
     content: {
         type: "text";
         text: string;

package/lib/mcp/utils/sharedSchemas.js

@@ -69,6 +69,7 @@ export function createMcpResponse(response) {
 }
 export function createMcpErrorResponse(action, error) {
     return {
+        isError: true,
         content: [
             {
                 type: 'text',

package/lib/resolvers/index.js

@@ -1,4 +1,4 @@
-import { GraphQLJSON, GraphQLTimestamp, GraphQLDateTimeISO, GraphQLDate, GraphQLLocale, } from 'graphql-scalars';
+import { GraphQLJSON, GraphQLTimestamp, GraphQLDateTimeISO, GraphQLDate, GraphQLLocale, GraphQLPhoneNumber, } from 'graphql-scalars';
 import Query from "./queries/index.js";
 import Mutation from "./mutations/index.js";
 import Types from "./type/index.js";
@@ -13,4 +13,5 @@ export default {
     Date: GraphQLDate,
     Timestamp: GraphQLTimestamp,
     Locale: GraphQLLocale,
+    PhoneNumber: GraphQLPhoneNumber,
 };

package/lib/resolvers/mutations/bookmarks/createBookmark.d.ts

@@ -1,6 +1,6 @@
 import type { Context } from '../../../context.ts';
 export default function createBookmark(root: never, { productId, userId, meta }: {
     productId: string;
-    userId: string;
+    userId?: string;
     meta?: any;
 }, { modules, userId: currentUserId }: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-bookmarks").Bookmark> | null>;

package/lib/resolvers/mutations/bookmarks/createBookmark.js

@@ -1,7 +1,8 @@
 import { log } from '@unchainedshop/logger';
 import { BookmarkAlreadyExistsError, InvalidIdError, ProductNotFoundError } from "../../../errors.js";
 export default async function createBookmark(root, { productId, userId, meta }, { modules, userId: currentUserId }) {
-    log(`mutation createBookmark for ${userId}`, {
+    const targetUserId = userId || currentUserId;
+    log(`mutation createBookmark for ${targetUserId}`, {
         productId,
         userId: currentUserId,
     });
@@ -11,13 +12,13 @@ export default async function createBookmark(root, { productId, userId, meta },
         throw new ProductNotFoundError({ productId });
     const [bookmark] = await modules.bookmarks.findBookmarks({
         productId,
-        userId,
+        userId: targetUserId,
         meta,
     });
     if (bookmark)
         throw new BookmarkAlreadyExistsError({ bookmarkId: bookmark._id });
     const bookmarkId = await modules.bookmarks.create({
-        userId,
+        userId: targetUserId,
         productId,
         meta,
     });

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

@@ -1,12 +1,11 @@
 import { log } from '@unchainedshop/logger';
-import { FilterDirector } from '@unchainedshop/core';
+import {} from '@unchainedshop/core';
 import { DuplicateFilterKeyError } from "../../../errors.js";
 export default async function createFilter(root, { filter, texts }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log('mutation createFilter', { userId });
     try {
-        const newFilter = await modules.filters.create(filter);
-        await FilterDirector.invalidateProductIdCache(newFilter, context);
+        const newFilter = await services.filters.createFilter(filter);
         if (texts) {
             await modules.filters.texts.updateTexts({ filterId: newFilter._id }, texts);
         }

package/lib/resolvers/mutations/filters/createFilterOption.d.ts

@@ -4,4 +4,4 @@ export default function createFilterOption(root: never, params: {
     filterId: string;
     option: string;
     texts?: FilterInputText[];
-}, context: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-filters").Filter> | null>;
+}, context: Context): Promise<import("@unchainedshop/core-filters").Filter | null>;

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

@@ -1,16 +1,15 @@
 import { log } from '@unchainedshop/logger';
-import { FilterDirector } from '@unchainedshop/core';
+import {} from '@unchainedshop/core';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
 export default async function createFilterOption(root, params, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     const { filterId, option, texts } = params;
     log(`mutation createFilterOption ${filterId}`, { userId });
     if (!filterId)
         throw new InvalidIdError({ filterId });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const filter = await modules.filters.createFilterOption(filterId, { value: option });
-    await FilterDirector.invalidateProductIdCache(filter, context);
+    const filter = await services.filters.createFilterOption(filterId, { value: option });
     if (texts) {
         await modules.filters.texts.updateTexts({ filterId, filterOptionValue: option }, texts);
     }

package/lib/resolvers/mutations/filters/removeFilterOption.d.ts

@@ -2,4 +2,4 @@ import type { Context } from '../../../context.ts';
 export default function removeFilterOption(root: never, { filterId, filterOptionValue }: {
     filterId: string;
     filterOptionValue: string;
-}, context: Context): Promise<import("mongodb").WithId<import("@unchainedshop/core-filters").Filter> | null>;
+}, context: Context): Promise<import("@unchainedshop/core-filters").Filter | null>;

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

@@ -1,17 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
-import { FilterDirector } from '@unchainedshop/core';
 export default async function removeFilterOption(root, { filterId, filterOptionValue }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log(`mutation removeFilterOption ${filterId}`, { userId });
     if (!filterId || !filterOptionValue)
         throw new InvalidIdError({ filterId, filterOptionValue });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const filter = await modules.filters.removeFilterOption({
-        filterId,
-        filterOptionValue,
-    });
-    await FilterDirector.invalidateProductIdCache(filter, context);
-    return filter;
+    return services.filters.removeFilterOption({ filterId, filterOptionValue });
 }

package/lib/resolvers/mutations/filters/updateFilter.d.ts

@@ -3,4 +3,4 @@ import type { Context } from '../../../context.ts';
 export default function updateFilter(root: never, { filter, filterId }: {
     filter: Filter;
     filterId: string;
-}, context: Context): Promise<import("mongodb").WithId<Filter> | null>;
+}, context: Context): Promise<Filter | null>;

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

@@ -1,14 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { FilterNotFoundError, InvalidIdError } from "../../../errors.js";
-import { FilterDirector } from '@unchainedshop/core';
 export default async function updateFilter(root, { filter, filterId }, context) {
-    const { modules, userId } = context;
+    const { modules, services, userId } = context;
     log(`mutation updateFilter ${filterId}`, { userId });
     if (!filterId)
         throw new InvalidIdError({ filterId });
     if (!(await modules.filters.filterExists({ filterId })))
         throw new FilterNotFoundError({ filterId });
-    const updatedFilter = await modules.filters.update(filterId, filter);
-    await FilterDirector.invalidateProductIdCache(updatedFilter, context);
-    return updatedFilter;
+    return services.filters.updateFilter(filterId, filter);
 }

package/lib/resolvers/mutations/index.js

@@ -227,7 +227,7 @@ export default {
     addCartProduct: acl(actions.updateCart)(addCartProduct),
     addMultipleCartProducts: acl(actions.updateCart)(addMultipleCartProducts),
     addCartDiscount: acl(actions.updateCart)(addCartDiscount),
-    addCartQuotation: acl(actions.updateCart)(addCartQuotation),
+    addCartQuotation: acl(actions.addCartQuotation)(addCartQuotation),
     updateCart: acl(actions.updateCart)(updateCart),
     emptyCart: acl(actions.updateCart)(emptyCart),
     checkoutCart: acl(actions.checkoutCart)(checkoutCart),
@@ -291,7 +291,7 @@ export default {
     verifyQuotation: acl(actions.manageQuotations)(verifyQuotation),
     makeQuotationProposal: acl(actions.manageQuotations)(makeQuotationProposal),
     bookmark: acl(actions.bookmarkProduct)(bookmark),
-    createBookmark: acl(actions.manageBookmarks)(createBookmark),
+    createBookmark: acl(actions.createBookmark)(createBookmark),
     removeBookmark: acl(actions.manageBookmarks)(removeBookmark),
     addWork: acl(actions.manageWorker)(addWork),
     allocateWork: acl(actions.manageWorker)(allocateWork),
@@ -299,6 +299,6 @@ export default {
     removeWork: acl(actions.manageWorker)(removeWork),
     processNextWork: acl(actions.manageWorker)(processNextWork),
     signPaymentProviderForCredentialRegistration: acl(actions.registerPaymentCredentials)(signPaymentProviderForCredentialRegistration),
-    signPaymentProviderForCheckout: acl(actions.registerPaymentCredentials)(signPaymentProviderForCheckout),
+    signPaymentProviderForCheckout: acl(actions.updateOrderPayment)(signPaymentProviderForCheckout),
     removeUserProductReviews: acl(actions.updateUser)(removeUserProductReviews),
 };

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

@@ -15,6 +15,15 @@ export default async function updateProductCommerce(root, { commerce, productId
             required: { not: ProductType.CONFIGURABLE_PRODUCT },
         });
     }
-    await modules.products.update(productId, { commerce });
+    const normalizedCommerce = {
+        ...commerce,
+        pricing: commerce?.pricing?.map((priceLevel) => {
+            if (priceLevel.minQuantity != null && priceLevel.minQuantity < 0) {
+                throw new Error('minQuantity must be greater than or equal to 0');
+            }
+            return { ...priceLevel, minQuantity: priceLevel.minQuantity ?? 0 };
+        }),
+    };
+    await modules.products.update(productId, { commerce: normalizedCommerce });
     return modules.products.findProduct({ productId });
 }

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

@@ -1,3 +1,3 @@
 import { GraphQLScalarType } from 'graphql';
-declare const LowerCaseString: GraphQLScalarType<string | null, any>;
+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<string | null, any>;
+    LowerCaseString: import("graphql").GraphQLScalarType<string, any>;
 };
 export default _default;

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

@@ -10,7 +10,7 @@ export interface LoadedFilterData {
 }
 export declare const LoadedFilter: {
     definition: ({ filter }: LoadedFilterData) => Filter;
-    isSelected: ({ searchQuery, filter }: LoadedFilterData) => boolean | undefined;
+    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<({

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

@@ -4,7 +4,7 @@ export const LoadedFilter = {
         return filter;
     },
     isSelected: ({ searchQuery, filter }) => {
-        return searchQuery?.filterQuery?.some((q) => q.key === filter.key);
+        return Boolean(searchQuery?.filterQuery?.some((q) => q.key === filter.key));
     },
     filteredProductsCount: async ({ filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }, _, context) => {
         const filterActions = await FilterDirector.actions({ searchQuery }, context);

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

@@ -64,7 +64,7 @@ declare const types: {
             currencyCode?: string;
         }, requestContext: import("../../context.ts").Context): Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("@unchainedshop/core-products").ProductPrice;
         }[]>;
         salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;
@@ -279,7 +279,7 @@ declare const types: {
     Language: import("./language-types.ts").LanguageHelperTypes;
     LoadedFilter: {
         definition: ({ filter }: import("./filter/loaded-filter-types.ts").LoadedFilterData) => import("@unchainedshop/core-filters").Filter;
-        isSelected: ({ searchQuery, filter }: import("./filter/loaded-filter-types.ts").LoadedFilterData) => boolean | undefined;
+        isSelected: ({ searchQuery, filter }: import("./filter/loaded-filter-types.ts").LoadedFilterData) => boolean;
         filteredProductsCount: ({ filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }: import("./filter/loaded-filter-types.ts").LoadedFilterData, _: never, context: import("../../context.ts").Context) => Promise<number>;
         productsCount: ({ examinedProductIdSet, searchQuery }: import("./filter/loaded-filter-types.ts").LoadedFilterData, _: never, context: import("../../context.ts").Context) => Promise<number>;
         options: ({ filter, filteredByOtherFiltersSet, forceLiveCollection, searchQuery }: import("./filter/loaded-filter-types.ts").LoadedFilterData, _: never, context: import("../../context.ts").Context) => Promise<({
@@ -498,7 +498,7 @@ declare const types: {
             currencyCode?: string;
         }, requestContext: import("../../context.ts").Context): Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("@unchainedshop/core-products").ProductPrice;
         }[]>;
         salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;
@@ -622,6 +622,10 @@ declare const types: {
         isExpired: (obj: import("@unchainedshop/core-quotations").Quotation, { referenceDate }: {
             referenceDate: Date;
         }, { modules }: import("../../context.ts").Context) => boolean;
+        price: (obj: import("@unchainedshop/core-quotations").Quotation) => {
+            amount: number;
+            currencyCode: string;
+        } | null;
         product: (obj: import("@unchainedshop/core-quotations").Quotation, _: never, { loaders }: import("../../context.ts").Context) => Promise<import("@unchainedshop/core-products").Product>;
         status: (obj: import("@unchainedshop/core-quotations").Quotation, _: never, { modules }: import("../../context.ts").Context) => import("@unchainedshop/core-quotations").QuotationStatus;
         user: (obj: import("@unchainedshop/core-quotations").Quotation, _: never, { loaders }: import("../../context.ts").Context) => Promise<import("@unchainedshop/core-users").User>;
@@ -669,7 +673,7 @@ declare const types: {
             currencyCode?: string;
         }, requestContext: import("../../context.ts").Context): Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("@unchainedshop/core-products").ProductPrice;
         }[]>;
         salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;
@@ -734,7 +738,7 @@ declare const types: {
             currencyCode?: string;
         }, requestContext: import("../../context.ts").Context): Promise<{
             minQuantity: number;
-            maxQuantity: number;
+            maxQuantity: number | null;
             price: import("@unchainedshop/core-products").ProductPrice;
         }[]>;
         salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;

package/lib/resolvers/type/product/product-bundle-types.d.ts

@@ -15,7 +15,7 @@ export declare const BundleProduct: {
         currencyCode?: string;
     }, requestContext: import("../../../context.ts").Context): Promise<{
         minQuantity: number;
-        maxQuantity: number;
+        maxQuantity: number | null;
         price: import("@unchainedshop/core-products").ProductPrice;
     }[]>;
     salesUnit({ commerce }: import("@unchainedshop/core-products").Product): string | null;

package/lib/resolvers/type/product/product-plan-types.d.ts

@@ -15,7 +15,7 @@ export declare const PlanProduct: {
         currencyCode?: string;
     }, requestContext: Context): Promise<{
         minQuantity: number;
-        maxQuantity: number;
+        maxQuantity: number | null;
         price: ProductPrice;
     }[]>;
     salesUnit({ commerce }: ProductType): string | null;

package/lib/resolvers/type/product/product-simple-types.d.ts

@@ -45,7 +45,7 @@ export declare const SimpleProduct: {
         currencyCode?: string;
     }, requestContext: Context): Promise<{
         minQuantity: number;
-        maxQuantity: number;
+        maxQuantity: number | null;
         price: import("@unchainedshop/core-products").ProductPrice;
     }[]>;
     salesUnit({ commerce }: Product): string | null;

package/lib/resolvers/type/product/product-tokenized-types.d.ts

@@ -29,7 +29,7 @@ export declare const TokenizedProduct: {
         currencyCode?: string;
     }, requestContext: Context): Promise<{
         minQuantity: number;
-        maxQuantity: number;
+        maxQuantity: number | null;
         price: import("@unchainedshop/core-products").ProductPrice;
     }[]>;
     salesUnit({ commerce }: Product): string | null;

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

@@ -6,6 +6,10 @@ export declare const Quotation: {
     isExpired: (obj: QuotationType, { referenceDate }: {
         referenceDate: Date;
     }, { modules }: Context) => boolean;
+    price: (obj: QuotationType) => {
+        amount: number;
+        currencyCode: string;
+    } | null;
     product: (obj: QuotationType, _: never, { loaders }: Context) => Promise<import("@unchainedshop/core-products").Product>;
     status: (obj: QuotationType, _: never, { modules }: Context) => import("@unchainedshop/core-quotations").QuotationStatus;
     user: (obj: QuotationType, _: never, { loaders }: Context) => Promise<import("@unchainedshop/core-users").User>;

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

@@ -2,6 +2,7 @@ export const Quotation = {
     country: async (obj, _, { loaders }) => obj.countryCode ? loaders.countryLoader.load({ isoCode: obj.countryCode }) : null,
     currency: async (obj, _, { loaders }) => obj.currencyCode ? loaders.currencyLoader.load({ isoCode: obj.currencyCode }) : null,
     isExpired: (obj, { referenceDate }, { modules }) => modules.quotations.isExpired(obj, { referenceDate }),
+    price: (obj) => obj.price != null && obj.currencyCode ? { amount: obj.price, currencyCode: obj.currencyCode } : null,
     product: async (obj, _, { loaders }) => {
         const product = await loaders.productLoader.load({
             productId: obj.productId,

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

@@ -49,9 +49,9 @@ export const User = {
         return context.modules.bookmarks.findBookmarksByUserId(user._id);
     },
     async cart(user, params, context) {
-        const { modules, countryCode } = context;
+        const { loaders, countryCode } = context;
         await checkAction(context, viewUserOrders, [user, params]);
-        return modules.orders.cart({
+        return loaders.cartLoader.load({
             countryCode,
             orderNumber: params.orderNumber,
             userId: user._id,

package/lib/roles/index.js

@@ -60,6 +60,7 @@ const actions = [
     'createEnrollment',
     'updateEnrollment',
     'updateCart',
+    'addCartQuotation',
     'checkoutCart',
     'updateOrder',
     'updateOrderDelivery',
@@ -84,6 +85,7 @@ const actions = [
     'manageQuotations',
     'answerQuotation',
     'bookmarkProduct',
+    'createBookmark',
     'manageBookmarks',
     'search',
     'manageWorker',

package/lib/roles/loggedIn.js

@@ -116,6 +116,14 @@ export const loggedIn = (role, actions) => {
             return true;
         return bookmark.userId === userId;
     };
+    const isOwnBookmarkUser = (obj, { userId: bookmarkUserId }, { userId }) => {
+        return !bookmarkUserId || bookmarkUserId === userId;
+    };
+    const isOwnedCartAndQuotation = async (obj, params, context) => {
+        if (!(await isOwnedOrderOrCart(obj, params, context)))
+            return false;
+        return isOwnedQuotation(obj, params, context);
+    };
     const isOwnedPaymentCredential = async (obj, { paymentCredentialsId }, { modules, userId }) => {
         const credentials = await modules.payment.paymentCredentials.findPaymentCredential({
             paymentCredentialsId,
@@ -155,6 +163,7 @@ export const loggedIn = (role, actions) => {
     role.allow(actions.updateOrderPayment, isOwnedOrderPayment);
     role.allow(actions.checkoutCart, isOwnedOrderOrCart);
     role.allow(actions.updateCart, isOwnedOrderOrCart);
+    role.allow(actions.addCartQuotation, isOwnedCartAndQuotation);
     role.allow(actions.createCart, () => true);
     role.allow(actions.viewEnrollment, isOwnedEnrollment);
     role.allow(actions.updateEnrollment, isOwnedEnrollment);
@@ -163,7 +172,9 @@ export const loggedIn = (role, actions) => {
     role.allow(actions.updateProductReview, isOwnedProductReview);
     role.allow(actions.requestQuotation, () => true);
     role.allow(actions.answerQuotation, isOwnedQuotation);
+    role.allow(actions.viewQuotation, isOwnedQuotation);
     role.allow(actions.manageBookmarks, isOwnedBookmark);
+    role.allow(actions.createBookmark, isOwnBookmarkUser);
     role.allow(actions.bookmarkProduct, () => true);
     role.allow(actions.voteProductReview, () => true);
     role.allow(actions.registerPaymentCredentials, () => true);

package/lib/schema/inputTypes.js

@@ -8,7 +8,7 @@ export default [
     input UserProfileInput {
       displayName: String
       birthday: Timestamp
-      phoneMobile: String
+      phoneMobile: PhoneNumber
       gender: String
       address: AddressInput
     }
@@ -27,7 +27,7 @@ export default [
 
     input ContactInput {
       emailAddress: String
-      telNumber: String
+      telNumber: PhoneNumber
     }
 
     input CreateLanguageInput {
@@ -105,7 +105,7 @@ export default [
 
     input UpdateProductCommercePricingInput {
       amount: Int!
-      maxQuantity: Int
+      minQuantity: Int
       isTaxable: Boolean
       isNetPrice: Boolean
       currencyCode: String!

package/lib/schema/scalars.js

@@ -6,5 +6,6 @@ export default [
     scalar Timestamp
     scalar LowerCaseString
     scalar Locale
+    scalar PhoneNumber
   `,
 ];

package/lib/schema/types/filter.js

@@ -49,14 +49,14 @@ export default [
     type LoadedFilterOption @cacheControl(maxAge: 180) {
       filteredProductsCount: Int!
       definition: FilterOption!
-      isSelected: Boolean
+      isSelected: Boolean!
     }
 
     type LoadedFilter @cacheControl(maxAge: 180) {
       productsCount: Int!
       filteredProductsCount: Int!
       definition: Filter!
-      isSelected: Boolean
+      isSelected: Boolean!
       options: [LoadedFilterOption!]
     }
   `,

package/lib/schema/types/product/product.js

@@ -139,7 +139,7 @@ export default [
       country: Country!
       currency: Currency!
       amount: Int!
-      maxQuantity: Int
+      minQuantity: Int
     }
 
     union ConfigurableOrBundleProduct = BundleProduct | ConfigurableProduct

package/lib/schema/types/quotation.js

@@ -57,6 +57,11 @@ export default [
       country: Country
       currency: Currency
       configuration: [ProductConfigurationParameter!]
+
+      """
+      Proposed unit price (minor units of the quotation's currency), set when the quotation reaches PROPOSED
+      """
+      price: Price
     }
   `,
 ];

package/lib/utils/optionalPeerError.d.ts

@@ -0,0 +1 @@
+export declare function isPeerNotInstalledError(packageName: string, error: unknown): boolean;

package/lib/utils/optionalPeerError.js

@@ -0,0 +1,6 @@
+export function isPeerNotInstalledError(packageName, error) {
+    if (error?.code !== 'ERR_MODULE_NOT_FOUND')
+        return false;
+    const match = String(error?.message || '').match(/^Cannot find (?:package|module) '([^']+)'/);
+    return !!match && (match[1] === packageName || match[1].startsWith(`${packageName}/`));
+}