@unchainedshop/api 1.2.1 → 1.2.11

package/lib/resolvers/queries/orders/orders.d.ts

@@ -1,6 +1,7 @@
-import { Root, Context } from '@unchainedshop/types/api';
+import { Root, Context, SortOption } from '@unchainedshop/types/api';
 import { OrderQuery } from '@unchainedshop/types/orders';
 export default function orders(root: Root, params: OrderQuery & {
     limit?: number;
     offset?: number;
+    sort?: Array<SortOption>;
 }, { modules, userId }: Context): Promise<import("@unchainedshop/types/orders").Order[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"orders.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAClC,IAAU,EACV,MAAwD,EACxD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAE5D,GAAG,CAAC,iBAAiB,KAAK,IAAI,MAAM,IAAI,YAAY,IAAI,WAAW,EAAE,EAAE;QACrE,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"orders.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAClC,IAAU,EACV,MAAkF,EAClF,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAE5D,GAAG,CAAC,iBAAiB,KAAK,IAAI,MAAM,IAAI,YAAY,IAAI,WAAW,EAAE,EAAE;QACrE,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC"}

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

@@ -2,10 +2,9 @@ import { Context } from '@unchainedshop/types/api';
 import { Bookmark as BookmarkType } from '@unchainedshop/types/bookmarks';
 import { Product } from '@unchainedshop/types/products';
 import { User } from '@unchainedshop/types/user';
-declare type HelperType<T> = (bookmark: BookmarkType, _: never, context: Context) => T;
-interface BookmarkHelperTypes {
+export declare type HelperType<T> = (bookmark: BookmarkType, _: never, context: Context) => T;
+export interface BookmarkHelperTypes {
     product: HelperType<Promise<Product>>;
     user: HelperType<Promise<User>>;
 }
 export declare const Bookmark: BookmarkHelperTypes;
-export {};

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

@@ -1,7 +1,7 @@
 import { Context } from '@unchainedshop/types/api';
 import { Country as CountryType } from '@unchainedshop/types/countries';
 import { Currency } from '@unchainedshop/types/currencies';
-declare type HelperType<P, T> = (country: CountryType, params: P, context: Context) => T;
+export declare type HelperType<P, T> = (country: CountryType, params: P, context: Context) => T;
 export interface CountryHelperTypes {
     flagEmoji: HelperType<never, string>;
     isBase: HelperType<never, boolean>;
@@ -11,4 +11,3 @@ export interface CountryHelperTypes {
     defaultCurrency: HelperType<never, Promise<Currency>>;
 }
 export declare const Country: CountryHelperTypes;
-export {};

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

@@ -1,6 +1,6 @@
 import { Context } from '@unchainedshop/types/api';
 import { DeliveryError, DeliveryProvider as DeliveryProviderType } from '@unchainedshop/types/delivery';
-declare type HelperType<P, T> = (provider: DeliveryProviderType, params: P, context: Context) => T;
+export declare type HelperType<P, T> = (provider: DeliveryProviderType, params: P, context: Context) => T;
 export interface DeliveryProviderHelperTypes {
     interface: HelperType<never, {
         _id: string;
@@ -24,4 +24,3 @@ export interface DeliveryProviderHelperTypes {
     }>>;
 }
 export declare const DeliveryProvider: DeliveryProviderHelperTypes;
-export {};

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

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

package/lib/resolvers/type/order/order-delivery-pickup-types.d.ts

@@ -2,7 +2,7 @@ import { Context } from '@unchainedshop/types/api';
 import { DeliveryLocation, DeliveryProvider } from '@unchainedshop/types/delivery';
 import { OrderDelivery, OrderDeliveryDiscount } from '@unchainedshop/types/orders.deliveries';
 declare type HelperType<T> = (orderDelivery: OrderDelivery, _: never, context: Context) => T;
-interface OrderDeliveryPickupHelperTypes {
+export interface OrderDeliveryPickupHelperTypes {
     activePickUpLocation: HelperType<Promise<DeliveryLocation>>;
     discounts: HelperType<Promise<Array<OrderDeliveryDiscount>>>;
     pickUpLocations: HelperType<Promise<Array<DeliveryLocation>>>;

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

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api';
+import { Context, SortOption } from '@unchainedshop/types/api';
 import { Bookmark } from '@unchainedshop/types/bookmarks';
 import { Contact } from '@unchainedshop/types/common';
 import { Country } from '@unchainedshop/types/countries';
@@ -25,7 +25,10 @@ export interface UserHelperTypes {
     }, Country>;
     email: HelperType<any, string>;
     emails: HelperType<any, Array<string>>;
-    enrollments: HelperType<any, Array<Enrollment>>;
+    enrollments: HelperType<{
+        sort?: Array<SortOption>;
+        queryString?: string;
+    }, Array<Enrollment>>;
     isEmailVerified: HelperType<any, boolean>;
     isGuest: HelperType<any, boolean>;
     isInitialPassword: HelperType<any, boolean>;
@@ -40,11 +43,16 @@ export interface UserHelperTypes {
     name: HelperType<any, string>;
     orders: HelperType<{
         includeCarts: boolean;
+        sort?: Array<SortOption>;
+        queryString?: string;
     }, Array<Order>>;
     paymentCredentials: HelperType<any, Array<PaymentCredentials>>;
     primaryEmail: HelperType<any, Email>;
     profile: HelperType<any, UserProfile>;
-    quotations: HelperType<any, Array<Quotation>>;
+    quotations: HelperType<{
+        sort?: Array<SortOption>;
+        queryString?: string;
+    }, Array<Quotation>>;
     roles: HelperType<any, Array<string>>;
     tags: HelperType<any, Array<string>>;
     username: HelperType<any, string>;

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

@@ -91,10 +91,11 @@ export const User = {
     // },
     orders: async (user, params, context) => {
         await checkAction(context, viewUserOrders, [user, params]);
-        return context.modules.orders.findOrders({ userId: user._id, includeCarts: params.includeCarts }, {
-            sort: {
-                updated: -1,
-            },
+        return context.modules.orders.findOrders({
+            userId: user._id,
+            includeCarts: params.includeCarts,
+            sort: params.sort,
+            queryString: params.queryString,
         });
     },
     paymentCredentials: async (user, params, context) => {
@@ -107,10 +108,10 @@ export const User = {
     },
     quotations: async (user, params, context) => {
         await checkAction(context, viewUserQuotations, [user, params]);
-        return context.modules.quotations.findQuotations({ userId: user._id }, {
-            sort: {
-                created: -1,
-            },
+        return context.modules.quotations.findQuotations({
+            userId: user._id,
+            sort: params.sort,
+            queryString: params.queryString,
         });
     },
 };

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

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

package/lib/schema/query.js

@@ -215,6 +215,7 @@ export default [
         offset: Int = 0
         includeCarts: Boolean = false
         queryString: String
+        sort: [SortOptionInput!]
       ): [Order!]!
 
       """

package/lib/schema/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/schema/query.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+ab;CACF,CAAC"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/schema/query.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgbb;CACF,CAAC"}

package/lib/schema/types/user.js

@@ -70,11 +70,11 @@ export default [
       roles: [String!]
       tags: [String!]
       cart(orderNumber: String): Order
-      orders(includeCarts: Boolean = false): [Order!]!
-      quotations: [Quotation!]!
+      orders(includeCarts: Boolean = false, sort: [SortOptionInput!], queryString: String): [Order!]!
+      quotations(sort: [SortOptionInput!], queryString: String): [Quotation!]!
       bookmarks: [Bookmark!]!
       paymentCredentials: [PaymentCredentials!]!
-      enrollments: [Enrollment!]!
+      enrollments(sort: [SortOptionInput!], queryString: String): [Enrollment!]!
       allowedActions: [RoleAction!]!
     }
   `,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "1.2.1",
+  "version": "1.2.11",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -9,7 +9,6 @@
   "types": "lib/api-index.d.ts",
   "type": "module",
   "scripts": {
-    "prepublishOnly": "npm install && npm run build || :",
     "clean": "rm -rf lib",
     "build": "npm run clean && tsc",
     "watch": "tsc -w",
@@ -36,11 +35,11 @@
     "graphql-scalars": "^1.x"
   },
   "dependencies": {
-    "@unchainedshop/core": "^1.1.9",
-    "@unchainedshop/events": "^1.1.9",
-    "@unchainedshop/logger": "^1.1.9",
-    "@unchainedshop/roles": "^1.1.9",
-    "@unchainedshop/utils": "^1.1.9",
+    "@unchainedshop/core": "1.x",
+    "@unchainedshop/events": "1.x",
+    "@unchainedshop/logger": "1.x",
+    "@unchainedshop/roles": "1.x",
+    "@unchainedshop/utils": "1.x",
     "accounting": "0.4.1",
     "dataloader": "^2.1.0",
     "locale": "0.1.0",
@@ -52,7 +51,7 @@
     "@types/graphql-upload": "^8.0.11",
     "@types/locale": "^0.1.1",
     "@types/node": "^16.11.44",
-    "@unchainedshop/types": "^1.1.9",
+    "@unchainedshop/types": "1.x",
     "apollo-server-express": "2.x",
     "graphql": "^15.8.0",
     "graphql-scalars": "^1.17.0",

package/src/resolvers/queries/orders/orders.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api';
+import { Root, Context, SortOption } from '@unchainedshop/types/api';
 import { OrderQuery } from '@unchainedshop/types/orders';
 
 export default async function orders(
   root: Root,
-  params: OrderQuery & { limit?: number; offset?: number },
+  params: OrderQuery & { limit?: number; offset?: number; sort?: Array<SortOption> },
   { modules, userId }: Context,
 ) {
   const { includeCarts, limit, offset, queryString } = params;

package/src/resolvers/type/bookmark-types.ts

@@ -3,9 +3,9 @@ import { Bookmark as BookmarkType } from '@unchainedshop/types/bookmarks';
 import { Product } from '@unchainedshop/types/products';
 import { User } from '@unchainedshop/types/user';
 
-type HelperType<T> = (bookmark: BookmarkType, _: never, context: Context) => T;
+export type HelperType<T> = (bookmark: BookmarkType, _: never, context: Context) => T;
 
-interface BookmarkHelperTypes {
+export interface BookmarkHelperTypes {
   product: HelperType<Promise<Product>>;
   user: HelperType<Promise<User>>;
 }

package/src/resolvers/type/country-types.ts

@@ -2,7 +2,7 @@ import { Context } from '@unchainedshop/types/api';
 import { Country as CountryType } from '@unchainedshop/types/countries';
 import { Currency } from '@unchainedshop/types/currencies';
 
-type HelperType<P, T> = (country: CountryType, params: P, context: Context) => T;
+export type HelperType<P, T> = (country: CountryType, params: P, context: Context) => T;
 
 export interface CountryHelperTypes {
   flagEmoji: HelperType<never, string>;

package/src/resolvers/type/delivery-provider-types.ts

@@ -3,7 +3,7 @@ import { DeliveryError, DeliveryProvider as DeliveryProviderType } from '@unchai
 import crypto from 'crypto';
 import { DeliveryPricingDirector } from '@unchainedshop/core-delivery';
 
-type HelperType<P, T> = (provider: DeliveryProviderType, params: P, context: Context) => T;
+export type HelperType<P, T> = (provider: DeliveryProviderType, params: P, context: Context) => T;
 
 export interface DeliveryProviderHelperTypes {
   interface: HelperType<

package/src/resolvers/type/event-types.ts

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

package/src/resolvers/type/order/order-delivery-pickup-types.ts

@@ -5,7 +5,7 @@ import { DeliveryDirector } from '@unchainedshop/core-delivery';
 
 type HelperType<T> = (orderDelivery: OrderDelivery, _: never, context: Context) => T;
 
-interface OrderDeliveryPickupHelperTypes {
+export interface OrderDeliveryPickupHelperTypes {
   activePickUpLocation: HelperType<Promise<DeliveryLocation>>;
   discounts: HelperType<Promise<Array<OrderDeliveryDiscount>>>;
   pickUpLocations: HelperType<Promise<Array<DeliveryLocation>>>;

package/src/resolvers/type/user-types.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api';
+import { Context, SortOption } from '@unchainedshop/types/api';
 import { Bookmark } from '@unchainedshop/types/bookmarks';
 import { Contact } from '@unchainedshop/types/common';
 import { Country } from '@unchainedshop/types/countries';
@@ -24,7 +24,7 @@ export interface UserHelperTypes {
   country: HelperType<{ localeContext: Locale }, Country>;
   email: HelperType<any, string>;
   emails: HelperType<any, Array<string>>;
-  enrollments: HelperType<any, Array<Enrollment>>;
+  enrollments: HelperType<{ sort?: Array<SortOption>; queryString?: string }, Array<Enrollment>>;
   isEmailVerified: HelperType<any, boolean>;
   isGuest: HelperType<any, boolean>;
   isInitialPassword: HelperType<any, boolean>;
@@ -36,11 +36,14 @@ export interface UserHelperTypes {
   allowedActions: HelperType<any, Array<string>>;
   // locale: HelperType<{ localeContext: Locale }, Locale>;
   name: HelperType<any, string>;
-  orders: HelperType<{ includeCarts: boolean }, Array<Order>>;
+  orders: HelperType<
+    { includeCarts: boolean; sort?: Array<SortOption>; queryString?: string },
+    Array<Order>
+  >;
   paymentCredentials: HelperType<any, Array<PaymentCredentials>>;
   primaryEmail: HelperType<any, Email>;
   profile: HelperType<any, UserProfile>;
-  quotations: HelperType<any, Array<Quotation>>;
+  quotations: HelperType<{ sort?: Array<SortOption>; queryString?: string }, Array<Quotation>>;
   roles: HelperType<any, Array<string>>;
   tags: HelperType<any, Array<string>>;
   username: HelperType<any, string>;
@@ -158,14 +161,12 @@ export const User: UserHelperTypes = {
 
   orders: async (user, params, context) => {
     await checkAction(context, viewUserOrders, [user, params]);
-    return context.modules.orders.findOrders(
-      { userId: user._id, includeCarts: params.includeCarts },
-      {
-        sort: {
-          updated: -1,
-        },
-      },
-    );
+    return context.modules.orders.findOrders({
+      userId: user._id,
+      includeCarts: params.includeCarts,
+      sort: params.sort,
+      queryString: params.queryString,
+    });
   },
 
   paymentCredentials: async (user, params, context) => {
@@ -182,13 +183,10 @@ export const User: UserHelperTypes = {
 
   quotations: async (user, params, context) => {
     await checkAction(context, viewUserQuotations, [user, params]);
-    return context.modules.quotations.findQuotations(
-      { userId: user._id },
-      {
-        sort: {
-          created: -1,
-        },
-      },
-    );
+    return context.modules.quotations.findQuotations({
+      userId: user._id,
+      sort: params.sort,
+      queryString: params.queryString,
+    });
   },
 };

package/src/schema/query.js

@@ -215,6 +215,7 @@ export default [
         offset: Int = 0
         includeCarts: Boolean = false
         queryString: String
+        sort: [SortOptionInput!]
       ): [Order!]!
 
       """

package/src/schema/types/user.js

@@ -70,11 +70,11 @@ export default [
       roles: [String!]
       tags: [String!]
       cart(orderNumber: String): Order
-      orders(includeCarts: Boolean = false): [Order!]!
-      quotations: [Quotation!]!
+      orders(includeCarts: Boolean = false, sort: [SortOptionInput!], queryString: String): [Order!]!
+      quotations(sort: [SortOptionInput!], queryString: String): [Quotation!]!
       bookmarks: [Bookmark!]!
       paymentCredentials: [PaymentCredentials!]!
-      enrollments: [Enrollment!]!
+      enrollments(sort: [SortOptionInput!], queryString: String): [Enrollment!]!
       allowedActions: [RoleAction!]!
     }
   `,