@unchainedshop/api 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -34,8 +34,8 @@
     "graphql-scalars": "^1.x"
   },
   "dependencies": {
-    "@unchainedshop/logger": "^1.1.7",
-    "@unchainedshop/utils": "^1.1.7",
+    "@unchainedshop/logger": "^1.1.9",
+    "@unchainedshop/utils": "^1.1.9",
     "accounting": "0.4.1",
     "dataloader": "^2.1.0",
     "locale": "0.1.0",
@@ -45,10 +45,10 @@
   "devDependencies": {
     "@types/graphql-upload": "^8.0.11",
     "@types/locale": "^0.1.1",
-    "@unchainedshop/core": "^1.1.7",
-    "@unchainedshop/events": "^1.1.7",
-    "@unchainedshop/roles": "^1.1.7",
-    "@unchainedshop/types": "^1.1.7",
+    "@unchainedshop/core": "^1.1.9",
+    "@unchainedshop/events": "^1.1.9",
+    "@unchainedshop/roles": "^1.1.9",
+    "@unchainedshop/types": "^1.1.9",
     "apollo-server-express": "*",
     "chai": "^4.3.6",
     "cross-env": "^7.0.3",
@@ -56,5 +56,5 @@
     "graphql-scalars": "^1.17.0",
     "typescript": "^4.7.4"
   },
-  "gitHead": "06cd41a39f57481555c743836481b9190b2ec2b5"
+  "gitHead": "5395cd35169a1fd13bb83ff7d11cc8a162b27b09"
 }

package/src/api-index.ts

@@ -14,7 +14,13 @@ export { createContextResolver, getCurrentContextResolver, setCurrentContextReso
 const UNCHAINED_API_VERSION = '1.1.3'; // eslint-disable-line
 
 export const startAPIServer = (options: UnchainedServerOptions) => {
-  const { unchainedAPI, roles, context: customContext, ...apolloServerOptions } = options || {};
+  const {
+    unchainedAPI,
+    roles,
+    expressApp,
+    context: customContext,
+    ...apolloServerOptions
+  } = options || {};
 
   const contextResolver = createContextResolver(unchainedAPI, roles, UNCHAINED_API_VERSION);
 
@@ -26,8 +32,8 @@ export const startAPIServer = (options: UnchainedServerOptions) => {
       : contextResolver,
   );
 
-  const apolloGraphQLServer = createGraphQLServer(apolloServerOptions);
-  const bulkImportServer = createBulkImportServer();
+  const apolloGraphQLServer = createGraphQLServer(expressApp, apolloServerOptions);
+  const bulkImportServer = createBulkImportServer(expressApp);
 
   return {
     apolloGraphQLServer,

package/src/context.ts

@@ -1,5 +1,4 @@
 import { UnchainedAPI, UnchainedContextResolver } from '@unchainedshop/types/api';
-import { WebApp } from 'meteor/webapp';
 import { IncomingMessage } from 'http';
 import instantiateLoaders from './loaders';
 import { getLocaleContext } from './locale-context';
@@ -33,8 +32,8 @@ export const createContextResolver =
     };
   };
 
-export const useMiddlewareWithCurrentContext = (path, middleware) => {
-  WebApp.connectHandlers.use(
+export const useMiddlewareWithCurrentContext = (expressApp, path, middleware) => {
+  expressApp.use(
     path,
     async (req: IncomingMessage & { unchainedContext?: UnchainedAPI }, res, ...rest) => {
       req.unchainedContext = await context({ req, res });

package/src/createBulkImportServer.ts

@@ -90,6 +90,6 @@ const bulkImportMiddleware = async (req, res) => {
   }
 };
 
-export default () => {
-  useMiddlewareWithCurrentContext(BULK_IMPORT_API_PATH, bulkImportMiddleware);
+export default (expressApp) => {
+  useMiddlewareWithCurrentContext(expressApp, BULK_IMPORT_API_PATH, bulkImportMiddleware);
 };

package/src/createGraphQLServer.ts

@@ -1,6 +1,5 @@
 import { ApolloServer, ApolloError } from 'apollo-server-express';
 import { processRequest } from 'graphql-upload';
-import { WebApp } from 'meteor/webapp';
 import { log, LogLevel } from '@unchainedshop/logger';
 import typeDefs from './schema';
 import resolvers from './resolvers';
@@ -36,7 +35,7 @@ const logGraphQLServerError = (error) => {
   } catch (e) {} // eslint-disable-line
 };
 
-export default (options) => {
+export default (expressApp, options) => {
   const {
     corsOrigins = null, // no cookie handling
     typeDefs: additionalTypeDefs = [],
@@ -103,7 +102,7 @@ export default (options) => {
     },
   });
 
-  WebApp.connectHandlers.use(handleUploads({ maxFileSize: 10000000, maxFiles: 10 }));
-  WebApp.connectHandlers.use(middleware);
+  expressApp.use(handleUploads({ maxFileSize: 10000000, maxFiles: 10 }));
+  expressApp.use(middleware);
   return server;
 };

package/src/loaders/index.ts

@@ -2,7 +2,9 @@ import { UnchainedAPI, UnchainedLoaders } from '@unchainedshop/types/api';
 import DataLoader from 'dataloader';
 import { IncomingMessage } from 'http';
 import { systemLocale } from '@unchainedshop/utils';
-import { Locale } from 'locale';
+import localePkg from 'locale';
+
+const { Locale } = localePkg;
 
 export default async (
   req: IncomingMessage,

package/src/locale-context.ts

@@ -1,6 +1,6 @@
 import { UnchainedAPI, UnchainedLocaleContext } from '@unchainedshop/types/api';
 import { IncomingMessage } from 'http';
-import { Locales } from 'locale';
+import localePkg from 'locale';
 import 'abort-controller/polyfill';
 import LRU from 'lru-cache';
 import { log, LogLevel } from '@unchainedshop/logger';
@@ -11,6 +11,8 @@ import {
   systemLocale,
 } from '@unchainedshop/utils';
 
+const { Locales } = localePkg;
+
 const { NODE_ENV } = process.env;
 
 const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // minute or second

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

@@ -9,7 +9,7 @@ import { Order } from '@unchainedshop/types/orders';
 import { PaymentCredentials } from '@unchainedshop/types/payments';
 import { Quotation } from '@unchainedshop/types/quotations';
 import { Email, User as UserType, UserProfile } from '@unchainedshop/types/user';
-import { Locale } from 'locale';
+import type { Locale } from 'locale';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { checkAction, checkTypeResolver } from '../../acl';
 import { actions } from '../../roles';

package/tsconfig.build.json

@@ -6,7 +6,9 @@
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,
-    "lib": ["esnext"],
+    "lib": [
+      "esnext"
+    ],
     "module": "esnext",
     "moduleResolution": "node",
     "noImplicitReturns": true,
@@ -16,11 +18,17 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "target": "esnext",
-    "types": ["node"],
+    "types": [
+      "node"
+    ],
     "baseUrl": ".", // This must be specified if "paths" is.
     "paths": {
-      "meteor/unchained:*": ["node_modules/@unchainedshop/types/index.d.ts"]
+      "@unchainedshop/*": [
+        "node_modules/@unchainedshop/types/index.d.ts"
+      ]
     }
   },
-  "include": ["src"]
-}
+  "include": [
+    "src"
+  ]
+}

package/lib/resolvers/queries/delivery/deliveryInterfaces.d.ts

@@ -1,5 +0,0 @@
-import { Context, Root } from '@unchainedshop/types/api';
-import { DeliveryProviderType } from '@unchainedshop/types/delivery';
-export default function deliveryInterfaces(root: Root, { type }: {
-    type: DeliveryProviderType;
-}, { modules, userId }: Context): import("@unchainedshop/types/delivery").DeliveryInterface[];

package/lib/resolvers/queries/payment/paymentInterfaces.d.ts

@@ -1,5 +0,0 @@
-import { PaymentProviderType } from '@unchainedshop/types/payments';
-import { Context, Root } from '@unchainedshop/types/api';
-export default function paymentInterfaces(root: Root, { type }: {
-    type: PaymentProviderType;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/payments").PaymentInterface[]>;

package/lib/resolvers/queries/warehousing/warehousingInterfaces.d.ts

@@ -1,5 +0,0 @@
-import { Context, Root } from '@unchainedshop/types/api';
-import { WarehousingProviderType } from '@unchainedshop/types/warehousing';
-export default function warehousingInterfaces(root: Root, params: {
-    type: WarehousingProviderType;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/warehousing").WarehousingInterface[]>;

package/lib/resolvers/queries/worker/workQueue.d.ts

@@ -1,14 +0,0 @@
-import { Root, Context, SortOption } from '@unchainedshop/types/api';
-import { WorkStatus } from '@unchainedshop/types/worker';
-export default function workers(root: Root, { limit, offset, status, types, created, queryString, sort, }: {
-    limit?: number;
-    offset?: number;
-    queryString?: string;
-    status?: Array<WorkStatus>;
-    types?: Array<string>;
-    created?: {
-        start: Date;
-        end: Date;
-    };
-    sort?: Array<SortOption>;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/worker").Work[]>;

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

@@ -1,27 +0,0 @@
-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 interface DeliveryProviderHelperTypes {
-    interface: HelperType<never, {
-        _id: string;
-        label: string;
-        version: string;
-    }>;
-    isActive: HelperType<void, Promise<boolean>>;
-    configurationError: HelperType<never, Promise<DeliveryError>>;
-    simulatedPrice: HelperType<{
-        currency?: string;
-        orderId: string;
-        useNetPrice?: boolean;
-        context: any;
-    }, Promise<{
-        _id: string;
-        amount: number;
-        currencyCode: string;
-        countryCode: string;
-        isTaxable: boolean;
-        isNetPrice: boolean;
-    }>>;
-}
-export declare const DeliveryProvider: DeliveryProviderHelperTypes;
-export {};

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

@@ -1,12 +0,0 @@
-import { Context } from '@unchainedshop/types/api';
-import { PaymentError, PaymentProvider as PaymentProviderType } from '@unchainedshop/types/payments';
-export interface PaymentProviderHelperTypes {
-    interface: (provider: PaymentProviderType, _: never, context: Context) => {
-        _id: string;
-        label: string;
-        version: string;
-    };
-    isActive: (provider: PaymentProviderType, _: never, context: Context) => Promise<boolean>;
-    configurationError: (provider: PaymentProviderType, _: never, context: Context) => Promise<PaymentError>;
-}
-export declare const PaymentProvider: PaymentProviderHelperTypes;