@unchainedshop/api 1.1.4 → 1.2.0

package/jest.config.js

@@ -0,0 +1,5 @@
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+export default {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+};

package/lib/api-index.js

@@ -9,15 +9,15 @@ export * as roles from './roles';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
 const UNCHAINED_API_VERSION = '1.1.3'; // eslint-disable-line
 export const startAPIServer = (options) => {
-    const { unchainedAPI, roles, context: customContext, ...apolloServerOptions } = options || {};
+    const { unchainedAPI, roles, expressApp, context: customContext, ...apolloServerOptions } = options || {};
     const contextResolver = createContextResolver(unchainedAPI, roles, UNCHAINED_API_VERSION);
     setCurrentContextResolver(customContext
         ? ({ req, res }) => {
             return customContext({ req, res }, contextResolver);
         }
         : contextResolver);
-    const apolloGraphQLServer = createGraphQLServer(apolloServerOptions);
-    const bulkImportServer = createBulkImportServer();
+    const apolloGraphQLServer = createGraphQLServer(expressApp, apolloServerOptions);
+    const bulkImportServer = createBulkImportServer(expressApp);
     return {
         apolloGraphQLServer,
         bulkImportServer,

package/lib/api-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-index.js","sourceRoot":"","sources":["../src/api-index.ts"],"names":[],"mappings":"AACA,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAExG,cAAc,WAAW,CAAC;AAC1B,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAEvF,MAAM,qBAAqB,GAAG,OAAO,CAAC,CAAC,sBAAsB;AAE7D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAA+B,EAAE,EAAE;IAChE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAE9F,MAAM,eAAe,GAAG,qBAAqB,CAAC,YAAY,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAE1F,yBAAyB,CACvB,aAAa;QACX,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;YACf,OAAO,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;QACtD,CAAC;QACH,CAAC,CAAC,eAAe,CACpB,CAAC;IAEF,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IACrE,MAAM,gBAAgB,GAAG,sBAAsB,EAAE,CAAC;IAElD,OAAO;QACL,mBAAmB;QACnB,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"api-index.js","sourceRoot":"","sources":["../src/api-index.ts"],"names":[],"mappings":"AACA,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAExG,cAAc,WAAW,CAAC;AAC1B,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAEvF,MAAM,qBAAqB,GAAG,OAAO,CAAC,CAAC,sBAAsB;AAE7D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAA+B,EAAE,EAAE;IAChE,MAAM,EACJ,YAAY,EACZ,KAAK,EACL,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,GAAG,mBAAmB,EACvB,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,MAAM,eAAe,GAAG,qBAAqB,CAAC,YAAY,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAE1F,yBAAyB,CACvB,aAAa;QACX,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;YACf,OAAO,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;QACtD,CAAC;QACH,CAAC,CAAC,eAAe,CACpB,CAAC;IAEF,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IACjF,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAE5D,OAAO;QACL,mBAAmB;QACnB,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC"}

package/lib/context.d.ts

@@ -2,4 +2,4 @@ import { UnchainedAPI, UnchainedContextResolver } from '@unchainedshop/types/api
 export declare const getCurrentContextResolver: () => UnchainedContextResolver;
 export declare const setCurrentContextResolver: (newContext: UnchainedContextResolver) => void;
 export declare const createContextResolver: (unchainedAPI: UnchainedAPI, roles: any, version: string) => UnchainedContextResolver;
-export declare const useMiddlewareWithCurrentContext: (path: any, middleware: any) => void;
+export declare const useMiddlewareWithCurrentContext: (expressApp: any, path: any, middleware: any) => void;

package/lib/context.js

@@ -1,4 +1,3 @@
-import { WebApp } from 'meteor/webapp';
 import instantiateLoaders from './loaders';
 import { getLocaleContext } from './locale-context';
 import { getUserContext } from './user-context';
@@ -23,10 +22,15 @@ export const createContextResolver = (unchainedAPI, roles, version) => async ({
         version,
     };
 };
-export const useMiddlewareWithCurrentContext = (path, middleware) => {
-    WebApp.connectHandlers.use(path, async (req, res, ...rest) => {
-        req.unchainedContext = await context({ req, res });
-        return middleware(req, res, ...rest);
+export const useMiddlewareWithCurrentContext = (expressApp, path, middleware) => {
+    expressApp.use(path, async function middlewareWithContext(req, res, next) {
+        try {
+            req.unchainedContext = await context({ req, res });
+            await middleware(req, res, next);
+        }
+        catch (error) {
+            next(error);
+        }
     });
 };
 //# sourceMappingURL=context.js.map

package/lib/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,kBAAkB,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,IAAI,OAAO,CAAC;AAEZ,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAA6B,EAAE,CAAC,OAAO,CAAC;AAEjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,UAAoC,EAAE,EAAE;IAChF,OAAO,GAAG,UAAU,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAChC,CAAC,YAA0B,EAAE,KAAU,EAAE,OAAe,EAA4B,EAAE,CACtF,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,aAAa,EAAE,EAAE,EAAE;IACvC,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC5D,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAEhE,OAAO;QACL,GAAG;QACH,GAAG;QACH,GAAG,aAAa;QAChB,GAAG,YAAY;QACf,GAAG,WAAW;QACd,GAAG,aAAa;QAChB,OAAO;QACP,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE;IAClE,MAAM,CAAC,eAAe,CAAC,GAAG,CACxB,IAAI,EACJ,KAAK,EAAE,GAA0D,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE;QACjF,GAAG,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,OAAO,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC,CACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,IAAI,OAAO,CAAC;AAEZ,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAA6B,EAAE,CAAC,OAAO,CAAC;AAEjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,UAAoC,EAAE,EAAE;IAChF,OAAO,GAAG,UAAU,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAChC,CAAC,YAA0B,EAAE,KAAU,EAAE,OAAe,EAA4B,EAAE,CACtF,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,aAAa,EAAE,EAAE,EAAE;IACvC,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC5D,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAEhE,OAAO;QACL,GAAG;QACH,GAAG;QACH,GAAG,aAAa;QAChB,GAAG,YAAY;QACf,GAAG,WAAW;QACd,GAAG,aAAa;QAChB,OAAO;QACP,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;IAC9E,UAAU,CAAC,GAAG,CACZ,IAAI,EACJ,KAAK,UAAU,qBAAqB,CAClC,GAA0D,EAC1D,GAAoB,EACpB,IAAI;QAEJ,IAAI;YACF,GAAG,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACnD,MAAM,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;SAClC;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CACF,CAAC;AACJ,CAAC,CAAC"}

package/lib/createBulkImportServer.d.ts

@@ -1,2 +1,2 @@
-declare const _default: () => void;
+declare const _default: (expressApp: any) => void;
 export default _default;

package/lib/createBulkImportServer.js

@@ -75,7 +75,7 @@ const bulkImportMiddleware = async (req, res) => {
         errorHandler(res)(e);
     }
 };
-export default () => {
-    useMiddlewareWithCurrentContext(BULK_IMPORT_API_PATH, bulkImportMiddleware);
+export default (expressApp) => {
+    useMiddlewareWithCurrentContext(expressApp, BULK_IMPORT_API_PATH, bulkImportMiddleware);
 };
 //# sourceMappingURL=createBulkImportServer.js.map

package/lib/createBulkImportServer.js.map

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

package/lib/createGraphQLServer.d.ts

@@ -1,3 +1,3 @@
 import { ApolloServer } from 'apollo-server-express';
-declare const _default: (options: any) => ApolloServer;
+declare const _default: (expressApp: any, options: any) => ApolloServer;
 export default _default;

package/lib/createGraphQLServer.js

@@ -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';
@@ -26,7 +25,7 @@ const logGraphQLServerError = (error) => {
     }
     catch (e) { } // eslint-disable-line
 };
-export default (options) => {
+export default (expressApp, options) => {
     const { corsOrigins = null, // no cookie handling
     typeDefs: additionalTypeDefs = [], resolvers: additionalResolvers = [], engine = {}, ...apolloServerOptions } = options || {};
     const context = getCurrentContextResolver();
@@ -69,6 +68,9 @@ export default (options) => {
             }
         }
         : corsOrigins;
+    // server.start().then(() => {
+    //
+    // });
     const middleware = server.getMiddleware({
         path: '/graphql',
         cors: !originFn
@@ -81,8 +83,8 @@ export default (options) => {
             limit: '5mb',
         },
     });
-    WebApp.connectHandlers.use(handleUploads({ maxFileSize: 10000000, maxFiles: 10 }));
-    WebApp.connectHandlers.use(middleware);
+    expressApp.use(handleUploads({ maxFileSize: 10000000, maxFiles: 10 }));
+    expressApp.use(middleware);
     return server;
 };
 //# sourceMappingURL=createGraphQLServer.js.map

package/lib/createGraphQLServer.js.map

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

package/lib/loaders/index.js

@@ -1,6 +1,7 @@
 import DataLoader from 'dataloader';
 import { systemLocale } from '@unchainedshop/utils';
-import { Locale } from 'locale';
+import localePkg from 'locale';
+const { Locale } = localePkg;
 export default async (req, unchainedAPI) => {
     return {
         assortmentTextLoader: new DataLoader(async (queries) => {

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/locale-context.js

@@ -1,8 +1,9 @@
-import { Locales } from 'locale';
+import localePkg from 'locale';
 import 'abort-controller/polyfill';
 import LRU from 'lru-cache';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { resolveBestCountry, resolveBestSupported, resolveUserRemoteAddress, systemLocale, } from '@unchainedshop/utils';
+const { Locales } = localePkg;
 const { NODE_ENV } = process.env;
 const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // minute or second
 const localeContextCache = new LRU({

package/lib/locale-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"locale-context.js","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"locale-context.js","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,QAAQ,CAAC;AAC/B,OAAO,2BAA2B,CAAC;AACnC,OAAO,GAAG,MAAM,WAAW,CAAC;AAC5B,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,wBAAwB,EACxB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAE9B,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;AAE9B,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,GAAG,GAAG,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB;AAE1E,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACjC,GAAG,EAAE,GAAG;IACR,GAAG;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,GAAoB,EACpB,YAA0B,EACO,EAAE;IACnC,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;IACtF,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAEvD,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAEpE,IAAI,aAAa;QAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAAC;IAErF,wCAAwC;IACxC,8FAA8F;IAC9F,gDAAgD;IAEhD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAClE,EAAE,eAAe,EAAE,KAAK,EAAE,EAC1B,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAClE,EAAE,eAAe,EAAE,KAAK,EAAE,EAC1B,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC;IAEF,MAAM,sBAAsB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;QACxE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,sBAAsB,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAEhF,MAAM,aAAa,GAAG,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC7F,MAAM,cAAc,GAAG,kBAAkB,CACvC,aAAa,CAAC,OAAO,EACrB,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC7B,SAAS,CACV,CAAC;IACF,GAAG,CAAC,4BAA4B,aAAa,CAAC,UAAU,IAAI,cAAc,EAAE,EAAE;QAC5E,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IACH,MAAM,UAAU,GAA2B;QACzC,aAAa;QACb,cAAc;KACf,CAAC;IACF,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAE7C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAC;AACjE,CAAC,CAAC"}

package/lib/resolvers/type/user-types.d.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';
 declare type HelperType<P, T> = (user: UserType, params: P, context: Context) => Promise<T>;
 export interface UserHelperTypes {
     _id: HelperType<any, boolean>;

package/lib/schema/types/worker.js

@@ -9,7 +9,7 @@ export default [
     }
 
     # This is just a placeholder. Extend WorkType with the active plugins on
-    # startup. See /examples/minimal/boot.js:92
+    # startup. See /examples/kitchensink/boot.js:92
     enum WorkType {
       UNKNOWN
     }

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@unchainedshop/api",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "main": "lib/api-index.js",
+  "exports": {
+    ".": "./lib/api-index.js",
+    "./*": "./lib/*"
+  },
   "types": "lib/api-index.d.ts",
   "type": "module",
   "scripts": {
+    "prepublishOnly": "npm install && npm run build || :",
     "clean": "rm -rf lib",
-    "build": "npm run clean && tsc -p tsconfig.build.json",
-    "watch": "tsc --watch",
-    "link:core": "npm link @unchainedshop/types",
-    "test": "cross-env METEOR_PACKAGE_DIRS=../ TEST_WATCH=1 meteor test-packages ./ --driver-package meteortesting:mocha --port 4200"
+    "build": "npm run clean && tsc",
+    "watch": "tsc -w",
+    "test": "jest --watch"
   },
   "repository": {
     "type": "git",
@@ -27,34 +31,33 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@unchainedshop/roles": "1.1.x",
-    "@unchainedshop/events": "1.1.x",
-    "@unchainedshop/core": "1.1.x",
     "apollo-server-express": "2.x",
-    "graphql-scalars": "^1.x",
-    "graphql": "^15.x"
+    "graphql": "^15.x",
+    "graphql-scalars": "^1.x"
   },
   "dependencies": {
-    "@unchainedshop/logger": "1.1.3",
-    "@unchainedshop/utils": "^1.1.4",
+    "@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",
     "accounting": "0.4.1",
     "dataloader": "^2.1.0",
     "locale": "0.1.0",
     "lodash.isnumber": "3.0.3",
-    "lru-cache": "^7.10.2"
+    "lru-cache": "^7.10.2",
+    "graphql-upload": "^13.0.0"
   },
   "devDependencies": {
     "@types/graphql-upload": "^8.0.11",
     "@types/locale": "^0.1.1",
-    "@unchainedshop/events": "1.1.x",
-    "@unchainedshop/roles": "1.1.x",
-    "@unchainedshop/types": "1.1.x",
-    "@unchainedshop/core": "1.1.x",
-    "apollo-server-express": "^2.25.4",
-    "chai": "^4.3.6",
-    "cross-env": "^7.0.3",
+    "@types/node": "^16.11.44",
+    "@unchainedshop/types": "^1.1.9",
+    "apollo-server-express": "2.x",
     "graphql": "^15.8.0",
     "graphql-scalars": "^1.17.0",
+    "jest": "^28.1.2",
+    "ts-jest": "^28.0.5",
     "typescript": "^4.7.4"
   }
 }

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,6 +1,5 @@
 import { UnchainedAPI, UnchainedContextResolver } from '@unchainedshop/types/api';
-import { WebApp } from 'meteor/webapp';
-import { IncomingMessage } from 'http';
+import { IncomingMessage, OutgoingMessage } from 'http';
 import instantiateLoaders from './loaders';
 import { getLocaleContext } from './locale-context';
 import { getUserContext } from './user-context';
@@ -33,12 +32,20 @@ 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 });
-      return middleware(req, res, ...rest);
+    async function middlewareWithContext(
+      req: IncomingMessage & { unchainedContext?: UnchainedAPI },
+      res: OutgoingMessage,
+      next,
+    ) {
+      try {
+        req.unchainedContext = await context({ req, res });
+        await middleware(req, res, next);
+      } catch (error) {
+        next(error);
+      }
     },
   );
 };

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 = [],
@@ -90,6 +89,10 @@ export default (options) => {
         }
       : corsOrigins;
 
+  // server.start().then(() => {
+  //
+  // });
+
   const middleware = server.getMiddleware({
     path: '/graphql',
     cors: !originFn
@@ -103,7 +106,8 @@ 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/src/schema/types/worker.js

@@ -9,7 +9,7 @@ export default [
     }
 
     # This is just a placeholder. Extend WorkType with the active plugins on
-    # startup. See /examples/minimal/boot.js:92
+    # startup. See /examples/kitchensink/boot.js:92
     enum WorkType {
       UNKNOWN
     }

package/tsconfig.json

@@ -1,8 +1,29 @@
 {
-  "extends": "./tsconfig.build.json",
   "compilerOptions": {
-    "noEmit": true,
-    "types": ["node", "express"]
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "declaration": true,
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "forceConsistentCasingInFileNames": true,
+    "lib": [
+      "esnext"
+    ],
+    "module": "esnext",
+    "moduleResolution": "node",
+    "noImplicitReturns": true,
+    "noUnusedLocals": false,
+    "outDir": "lib",
+    "preserveWatchOutput": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "target": "esnext",
+    "types": [
+      "node",
+      "jest"
+    ]
   },
-  "include": ["src"]
-}
+  "include": [
+    "src"
+  ]
+}

package/tsconfig.build.json

@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "allowJs": true,
-    "allowSyntheticDefaultImports": true,
-    "declaration": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "forceConsistentCasingInFileNames": true,
-    "lib": ["esnext"],
-    "module": "esnext",
-    "moduleResolution": "node",
-    "noImplicitReturns": true,
-    "noUnusedLocals": false,
-    "outDir": "lib",
-    "preserveWatchOutput": true,
-    "skipLibCheck": true,
-    "sourceMap": true,
-    "target": "esnext",
-    "types": ["node"],
-    "baseUrl": ".", // This must be specified if "paths" is.
-    "paths": {
-      "meteor/unchained:*": ["node_modules/@unchainedshop/types/index.d.ts"]
-    }
-  },
-  "include": ["src"]
-}