@unchainedshop/api 2.0.0-beta7 → 2.0.0-beta8

package/lib/schema/types/filter.js

@@ -22,20 +22,20 @@ export default [
       RANGE
     }
 
-    type FilterTexts {
+    type FilterTexts @cacheControl(maxAge: 180) {
       _id: ID!
       locale: String
       title: String
       subtitle: String
     }
 
-    type FilterOption {
+    type FilterOption @cacheControl(maxAge: 180) {
       _id: ID!
       texts(forceLocale: String): FilterTexts
       value: String
     }
 
-    type Filter {
+    type Filter @cacheControl(maxAge: 180) {
       _id: ID!
       updated: DateTime
       created: DateTime
@@ -46,17 +46,14 @@ export default [
       options: [FilterOption!]
     }
 
-    type LoadedFilterOption {
-      filteredProducts: Int! @deprecated(reason: "Renamed, use the filteredProductsCount field")
+    type LoadedFilterOption @cacheControl(maxAge: 180) {
       filteredProductsCount: Int!
       definition: FilterOption!
       isSelected: Boolean
     }
 
-    type LoadedFilter {
-      examinedProducts: Int! @deprecated(reason: "Renamed, use the productsCount field")
+    type LoadedFilter @cacheControl(maxAge: 180) {
       productsCount: Int!
-      filteredProducts: Int! @deprecated(reason: "Renamed, use the filteredProductsCount field")
       filteredProductsCount: Int!
       definition: Filter!
       isSelected: Boolean

package/lib/schema/types/filter.js.map

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

package/lib/schema/types/geo-position.js

@@ -1,6 +1,6 @@
 export default [
     /* GraphQL */ `
-    type GeoPosition {
+    type GeoPosition @cacheControl(maxAge: 180) {
       latitude: Float!
       longitude: Float!
       altitute: Float

package/lib/schema/types/language.js

@@ -1,6 +1,6 @@
 export default [
     /* GraphQL */ `
-    type Language {
+    type Language @cacheControl(maxAge: 180) {
       _id: ID!
       """
       ISO 639-1 alpha-2 https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes

package/lib/schema/types/media.js

@@ -1,6 +1,6 @@
 export default [
     /* GraphQL */ `
-    type Media {
+    type Media @cacheControl(maxAge: 180) {
       _id: ID!
       name: String!
       type: String!

package/lib/schema/types/payment.js

@@ -1,6 +1,6 @@
 export default [
     /* GraphQL */ `
-    type PaymentInterface {
+    type PaymentInterface @cacheControl(maxAge: 180) {
       _id: ID!
       label: String
       version: String
@@ -30,7 +30,7 @@ export default [
       WRONG_CREDENTIALS
     }
 
-    type PaymentCredentials {
+    type PaymentCredentials @cacheControl(maxAge: 0, scope: PRIVATE) {
       _id: ID!
       user: User!
       paymentProvider: PaymentProvider!
@@ -40,7 +40,7 @@ export default [
       isPreferred: Boolean!
     }
 
-    type PaymentProvider {
+    type PaymentProvider @cacheControl(maxAge: 60) {
       _id: ID!
       created: DateTime
       updated: DateTime

package/lib/schema/types/price.js

@@ -1,6 +1,6 @@
 export default [
     /* GraphQL */ `
-    type Price {
+    type Price @cacheControl(maxAge: 60) {
       _id: ID!
       isTaxable: Boolean!
       isNetPrice: Boolean!
@@ -8,7 +8,7 @@ export default [
       currency: String!
     }
 
-    type PriceRange {
+    type PriceRange @cacheControl(maxAge: 60) {
       _id: ID!
       minPrice: Price!
       maxPrice: Price!

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

@@ -3,7 +3,7 @@ export default [
     """
     A Bundle product consists of multiple configured products
     """
-    type BundleProduct implements Product {
+    type BundleProduct implements Product @cacheControl(maxAge: 180) {
       _id: ID!
       sequence: Int!
       status: ProductStatus!
@@ -20,7 +20,6 @@ export default [
         sort: [SortOptionInput!]
         queryString: String
       ): [ProductReview!]!
-
       assortmentPaths: [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID
@@ -30,7 +29,7 @@ export default [
       ): [Product!]!
     }
 
-    type ProductBundleItem {
+    type ProductBundleItem @cacheControl(maxAge: 180) {
       product: Product!
       quantity: Int!
       configuration: [ProductConfigurationParameter!]

package/lib/schema/types/product/bundle-product.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/bundle-product.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCb;CACF,CAAC"}
+{"version":3,"file":"bundle-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/bundle-product.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCb;CACF,CAAC"}

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

@@ -12,20 +12,20 @@ export default [
       TEXT
     }
 
-    type ProductVariationTexts {
+    type ProductVariationTexts @cacheControl(maxAge: 180) {
       _id: ID!
       locale: String
       title: String
       subtitle: String
     }
 
-    type ProductVariationOption {
+    type ProductVariationOption @cacheControl(maxAge: 180) {
       _id: ID!
       texts(forceLocale: String): ProductVariationTexts
       value: String
     }
 
-    type ProductVariation {
+    type ProductVariation @cacheControl(maxAge: 180) {
       _id: ID!
       texts(forceLocale: String): ProductVariationTexts
       type: ProductVariationType
@@ -36,7 +36,7 @@ export default [
     """
     Key Value Combination
     """
-    type ProductVariationAssignmentVector {
+    type ProductVariationAssignmentVector @cacheControl(maxAge: 180) {
       _id: ID!
       variation: ProductVariation
       option: ProductVariationOption
@@ -45,7 +45,7 @@ export default [
     """
     Key Value Combination to Product Assignment
     """
-    type ProductVariationAssignment {
+    type ProductVariationAssignment @cacheControl(maxAge: 180) {
       _id: ID!
 
       """
@@ -62,7 +62,7 @@ export default [
     """
     Configurable Product (Proxy)
     """
-    type ConfigurableProduct implements Product {
+    type ConfigurableProduct implements Product @cacheControl(maxAge: 180) {
       _id: ID!
       sequence: Int!
       status: ProductStatus!
@@ -97,7 +97,7 @@ export default [
         includeInactive: Boolean = false
         currency: String
         useNetPrice: Boolean = false
-      ): PriceRange
+      ): PriceRange @cacheControl(scope: PRIVATE)
 
       """
       Reduced list of possible products by key/value combinations

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

@@ -13,7 +13,7 @@ export default [
       METERED
     }
 
-    type ProductPlanConfiguration {
+    type ProductPlanConfiguration @cacheControl(maxAge: 180) {
       usageCalculationType: ProductPlanUsageCalculationType!
       billingInterval: ProductPlanConfigurationInterval!
       billingIntervalCount: Int
@@ -32,7 +32,7 @@ export default [
     """
     Plan (Virtual Product that somebody can enroll to)
     """
-    type PlanProduct implements Product {
+    type PlanProduct implements Product @cacheControl(maxAge: 180) {
       _id: ID!
       sequence: Int!
       status: ProductStatus!
@@ -45,7 +45,8 @@ export default [
       catalogPrice(quantity: Int = 1, currency: String): Price
       leveledCatalogPrices(currency: String): [PriceLevel!]!
       simulatedPrice(currency: String, useNetPrice: Boolean = false, quantity: Int = 1): Price
-      simulatedDiscounts(quantity: Int = 1): [ProductDiscount!]
+        @cacheControl(scope: PRIVATE)
+      simulatedDiscounts(quantity: Int = 1): [ProductDiscount!] @cacheControl(scope: PRIVATE)
       assortmentPaths(forceLocale: String): [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID

package/lib/schema/types/product/plan-product.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/plan-product.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiEb;CACF,CAAC"}
+{"version":3,"file":"plan-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/plan-product.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkEb;CACF,CAAC"}

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

@@ -17,20 +17,20 @@ export default [
       DELETED
     }
 
-    type ProductDiscount {
+    type ProductDiscount @cacheControl(maxAge: 0) {
       _id: ID!
       interface: DiscountInterface
       total: Price!
     }
 
-    type ProductMediaTexts {
+    type ProductMediaTexts @cacheControl(maxAge: 180) {
       _id: ID!
       locale: String
       title: String
       subtitle: String
     }
 
-    type ProductMedia {
+    type ProductMedia @cacheControl(maxAge: 180) {
       _id: ID!
       tags: [LowerCaseString!]
       file: Media!
@@ -38,7 +38,7 @@ export default [
       texts(forceLocale: String): ProductMediaTexts
     }
 
-    type ProductTexts {
+    type ProductTexts @cacheControl(maxAge: 180) {
       _id: ID!
       locale: String
       slug: String
@@ -53,7 +53,7 @@ export default [
     """
     Abstract Product
     """
-    interface Product {
+    interface Product @cacheControl(maxAge: 180) {
       _id: ID!
       sequence: Int!
       status: ProductStatus!
@@ -81,12 +81,12 @@ export default [
     """
     Directed assortment to product paths (breadcrumbs)
     """
-    type ProductAssortmentPath {
+    type ProductAssortmentPath @cacheControl(maxAge: 180) {
       assortmentProduct: AssortmentProduct!
       links: [AssortmentPathLink!]!
     }
 
-    type ProductReview {
+    type ProductReview @cacheControl(maxAge: 60) {
       _id: ID!
       created: DateTime
       updated: DateTime
@@ -97,10 +97,10 @@ export default [
       title: String
       review: String
       voteCount(type: ProductReviewVoteType): Int
-      ownVotes: [ProductReviewVote!]!
+      ownVotes: [ProductReviewVote!]! @cacheControl(scope: PRIVATE, maxAge: 60)
     }
 
-    type ProductReviewVote {
+    type ProductReviewVote @cacheControl(maxAge: 60) {
       _id: ID!
       timestamp: Timestamp!
       type: ProductReviewVoteType!
@@ -117,13 +117,13 @@ export default [
       value: String!
     }
 
-    type PriceLevel {
+    type PriceLevel @cacheControl(maxAge: 60) {
       minQuantity: Int!
       maxQuantity: Int
       price: Price!
     }
 
-    type ProductCatalogPrice {
+    type ProductCatalogPrice @cacheControl(maxAge: 60) {
       _id: ID!
       isTaxable: Boolean!
       isNetPrice: Boolean!

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

@@ -3,7 +3,7 @@ export default [
     """
     Simple Product
     """
-    type SimpleProduct implements Product {
+    type SimpleProduct implements Product @cacheControl(maxAge: 180) {
       _id: ID!
       sequence: Int!
       status: ProductStatus!
@@ -16,16 +16,17 @@ export default [
       catalogPrice(quantity: Int = 1, currency: String): Price
       leveledCatalogPrices(currency: String): [PriceLevel!]!
       simulatedPrice(currency: String, useNetPrice: Boolean = false, quantity: Int = 1): Price
-      simulatedDiscounts(quantity: Int = 1): [ProductDiscount!]
+        @cacheControl(scope: PRIVATE, maxAge: 10)
+      simulatedDiscounts(quantity: Int = 1): [ProductDiscount!] @cacheControl(scope: PRIVATE, maxAge: 10)
       simulatedDispatches(
         deliveryProviderType: DeliveryProviderType = SHIPPING
         referenceDate: Timestamp
         quantity: Int = 1
-      ): [Dispatch!]
+      ): [Dispatch!] @cacheControl(scope: PRIVATE, maxAge: 10)
       simulatedStocks(
         deliveryProviderType: DeliveryProviderType = SHIPPING
         referenceDate: Timestamp
-      ): [Stock!]
+      ): [Stock!] @cacheControl(scope: PRIVATE, maxAge: 10)
       assortmentPaths: [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID

package/lib/schema/types/product/simple-product.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/simple-product.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+Cb;CACF,CAAC"}
+{"version":3,"file":"simple-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/simple-product.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDb;CACF,CAAC"}

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

@@ -13,7 +13,7 @@ export default [
       ERC721
     }
 
-    type ContractConfiguration {
+    type ContractConfiguration @cacheControl(maxAge: 180) {
       tokenId: String
       supply: Int
       ercMetadataProperties: JSON
@@ -35,8 +35,9 @@ export default [
       catalogPrice(quantity: Int = 1, currency: String): Price
       leveledCatalogPrices(currency: String): [PriceLevel!]!
       simulatedPrice(currency: String, useNetPrice: Boolean = false, quantity: Int = 1): Price
-      simulatedDiscounts(quantity: Int = 1): [ProductDiscount!]
-      simulatedStocks(referenceDate: Timestamp): [Stock!]
+        @cacheControl(scope: PRIVATE, maxAge: 10)
+      simulatedDiscounts(quantity: Int = 1): [ProductDiscount!] @cacheControl(scope: PRIVATE, maxAge: 10)
+      simulatedStocks(referenceDate: Timestamp): [Stock!] @cacheControl(scope: PRIVATE, maxAge: 10)
       assortmentPaths(forceLocale: String): [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID

package/lib/schema/types/product/tokenized-product.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokenized-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/tokenized-product.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDb;CACF,CAAC"}
+{"version":3,"file":"tokenized-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/tokenized-product.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDb;CACF,CAAC"}

package/lib/schema/types/search.js

@@ -7,10 +7,8 @@ export default [
     """
     Search result
     """
-    type SearchResult {
-      totalProducts: Int! @deprecated(reason: "Renamed, use the productsCount field")
+    type SearchResult @cacheControl(maxAge: 180) {
       productsCount: Int!
-      filteredProducts: Int! @deprecated(reason: "Renamed, use the filteredProductsCount field")
       filteredProductsCount: Int!
       filters: [LoadedFilter!]!
       products(limit: Int = 10, offset: Int = 0): [Product!]!
@@ -19,17 +17,14 @@ export default [
     """
     Search result
     """
-    type ProductSearchResult {
-      totalProducts: Int! @deprecated(reason: "Renamed, use the productsCount field")
+    type ProductSearchResult @cacheControl(maxAge: 180) {
       productsCount: Int!
-      filteredProducts: Int! @deprecated(reason: "Renamed, use the filteredProductsCount field")
       filteredProductsCount: Int!
       filters: [LoadedFilter!]!
       products(limit: Int = 10, offset: Int = 0): [Product!]!
     }
 
-    type AssortmentSearchResult {
-      totalAssortments: Int! @deprecated(reason: "Renamed, use the assortmentsCount field")
+    type AssortmentSearchResult @cacheControl(maxAge: 180) {
       assortmentsCount: Int!
       assortments(limit: Int = 10, offset: Int = 0): [Assortment!]!
     }

package/lib/schema/types/search.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/schema/types/search.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCb;CACF,CAAC"}
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../src/schema/types/search.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6Bb;CACF,CAAC"}

package/lib/schema/types/shop.js

@@ -1,10 +1,10 @@
 export default [
     /* GraphQL */ `
-    type Link {
+    type Link @cacheControl(maxAge: 180) {
       href: String
       title: String
     }
-    type Shop {
+    type Shop @cacheControl(maxAge: 180) {
       _id: ID!
       language: Language
       country: Country

package/lib/schema/types/stock.js

@@ -1,3 +1,4 @@
+// TODO: Cache?
 export default [
     /* GraphQL */ `
     type Stock {

package/lib/schema/types/stock.js.map

@@ -1 +1 @@
-{"version":3,"file":"stock.js","sourceRoot":"","sources":["../../../src/schema/types/stock.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;GAOb;CACF,CAAC"}
+{"version":3,"file":"stock.js","sourceRoot":"","sources":["../../../src/schema/types/stock.js"],"names":[],"mappings":"AAAA,eAAe;AACf,eAAe;IACb,aAAa,CAAC;;;;;;;GAOb;CACF,CAAC"}

package/lib/schema/types/types.js

@@ -1,6 +1,6 @@
 export default [
     /* GraphQL */ `
-    type SuccessResponse {
+    type SuccessResponse @cacheControl(maxAge: 0, scope: PRIVATE) {
       success: Boolean
     }
 

package/lib/schema/types/user.js

@@ -5,7 +5,7 @@ export default [
     """
     Type returned when the user logs in
     """
-    type LoginMethodResponse {
+    type LoginMethodResponse @cacheControl(maxAge: 0, scope: PRIVATE) {
       """
       Id of the user logged in user
       """
@@ -86,9 +86,7 @@ export default [
 
     type User {
       _id: ID!
-      email: String @deprecated(reason: "Please use primaryEmail.address instead")
       username: String
-      isEmailVerified: Boolean! @deprecated(reason: "Please use primaryEmail.verified instead")
       isGuest: Boolean!
       isTwoFactorEnabled: Boolean!
       isInitialPassword: Boolean!

package/lib/schema/types/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/schema/types/user.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoHb;CACF,CAAC"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/schema/types/user.js"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkHb;CACF,CAAC"}

package/lib/schema/types/warehousing.js

@@ -1,6 +1,6 @@
 export default [
     /* GraphQL */ `
-    type WarehousingInterface {
+    type WarehousingInterface @cacheControl(maxAge: 180) {
       _id: ID!
       label: String
       version: String
@@ -24,7 +24,7 @@ export default [
       WRONG_CREDENTIALS
     }
 
-    type WarehousingProvider {
+    type WarehousingProvider @cacheControl(maxAge: 60) {
       _id: ID!
       created: DateTime
       updated: DateTime
@@ -42,7 +42,7 @@ export default [
       DECENTRALIZED
     }
 
-    type Token {
+    type Token @cacheControl(maxAge: 0, scope: PRIVATE) {
       _id: ID!
       user: User
       walletAddress: String

package/package.json

@@ -1,12 +1,21 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.0.0-beta7",
+  "version": "2.0.0-beta8",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
     "./*": "./lib/*"
   },
-  "types": "lib/api-index.d.ts",
+  "typesVersions": {
+    "*": {
+      "express": [
+        "./lib/express/index.d.ts"
+      ],
+      "express/*": [
+        "./lib/express/*"
+      ]
+    }
+  },
   "type": "module",
   "scripts": {
     "clean": "rm -rf lib",
@@ -30,17 +39,20 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@apollo/server": "^4.1.1",
+    "@apollo/server": "^4.2.1",
     "cookie": "^0.5.0",
     "graphql": "^16.6.0"
   },
+  "optionalDependencies": {
+    "express": "^4.18.2"
+  },
   "dependencies": {
     "@metamask/eth-sig-util": "^5.0.2",
-    "@unchainedshop/core": "^2.0.0-beta7",
-    "@unchainedshop/events": "^2.0.0-beta7",
-    "@unchainedshop/logger": "^2.0.0-beta7",
-    "@unchainedshop/roles": "^2.0.0-beta7",
-    "@unchainedshop/utils": "^2.0.0-beta7",
+    "@unchainedshop/core": "^2.0.0-beta8",
+    "@unchainedshop/events": "^2.0.0-beta8",
+    "@unchainedshop/logger": "^2.0.0-beta8",
+    "@unchainedshop/roles": "^2.0.0-beta8",
+    "@unchainedshop/utils": "^2.0.0-beta8",
     "accounting": "0.4.1",
     "dataloader": "^2.1.0",
     "graphql-scalars": "^1.20.1",
@@ -53,10 +65,11 @@
     "@types/graphql-upload": "^8.0.12",
     "@types/locale": "^0.1.1",
     "@types/node": "^18.11.9",
-    "@unchainedshop/types": "^2.0.0-beta7",
+    "@unchainedshop/types": "^2.0.0-beta8",
+    "express": "^4.18.2",
     "graphql": "^16.6.0",
     "jest": "^29.3.1",
     "ts-jest": "^29.0.3",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.3"
   }
 }

package/src/api-index.ts

@@ -2,14 +2,13 @@ import { UnchainedServerOptions } from '@unchainedshop/types/api';
 import type { ApolloServer } from '@apollo/server';
 import fs from 'fs';
 import path from 'path';
-import createBulkImportServer from './createBulkImportServer';
 import createGraphQLServer from './createGraphQLServer';
-import { createContextResolver, getCurrentContextResolver, setCurrentContextResolver } from './context';
-import createERCMetadataServer from './createERCMetadataServer';
+import { createContextResolver, setCurrentContextResolver, getCurrentContextResolver } from './context';
 
 export * from './context';
 export * as acl from './acl';
 export * as errors from './errors';
+export * as express from './express';
 export { hashPassword } from './hashPassword';
 export * as roles from './roles';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
@@ -32,20 +31,8 @@ const packageJson = loadJSON('../package.json');
 
 const UNCHAINED_API_VERSION = process.env.UNCHAINED_API_VERSION || packageJson?.version || '1.2.x';
 
-export const startAPIServer = async (
-  options: UnchainedServerOptions,
-): Promise<{
-  apolloGraphQLServer: ApolloServer;
-  bulkImportServer: any;
-  ercMetadataServer: any;
-}> => {
-  const {
-    unchainedAPI,
-    roles,
-    expressApp,
-    context: customContext,
-    ...apolloServerOptions
-  } = options || {};
+export const startAPIServer = async (options: UnchainedServerOptions): Promise<ApolloServer> => {
+  const { unchainedAPI, roles, context: customContext, ...apolloServerOptions } = options || {};
 
   const contextResolver = createContextResolver(unchainedAPI, roles, UNCHAINED_API_VERSION);
 
@@ -57,13 +44,5 @@ export const startAPIServer = async (
       : contextResolver,
   );
 
-  const apolloGraphQLServer = await createGraphQLServer(expressApp, apolloServerOptions);
-  const bulkImportServer = createBulkImportServer(expressApp);
-  const ercMetadataServer = createERCMetadataServer(expressApp);
-
-  return {
-    apolloGraphQLServer,
-    bulkImportServer,
-    ercMetadataServer,
-  };
+  return createGraphQLServer(apolloServerOptions);
 };

package/src/context.ts

@@ -1,6 +1,5 @@
 import { UnchainedContextResolver } from '@unchainedshop/types/api';
 import { UnchainedCore } from '@unchainedshop/types/core';
-import { IncomingMessage, OutgoingMessage } from 'http';
 import instantiateLoaders from './loaders';
 import { getLocaleContext } from './locale-context';
 import { getUserContext } from './user-context';
@@ -32,20 +31,3 @@ export const createContextResolver =
       version,
     };
   };
-
-export const useMiddlewareWithCurrentContext = (expressApp, path, ...middleware) => {
-  const addContext = async function middlewareWithContext(
-    req: IncomingMessage & { unchainedContext?: UnchainedCore },
-    res: OutgoingMessage,
-    next,
-  ) {
-    try {
-      req.unchainedContext = await context({ req, res });
-      next();
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  expressApp.use(path, addContext, ...middleware);
-};