@unchainedshop/api 2.0.0-beta9 → 2.0.0-rc.2

package/lib/createGraphQLServer.js

@@ -1,7 +1,8 @@
 import { ApolloServer } from '@apollo/server';
 import { log, LogLevel } from '@unchainedshop/logger';
-import typeDefs from './schema';
+import { buildDefaultTypeDefs } from './schema';
 import resolvers from './resolvers';
+import { actions } from './roles';
 const { APOLLO_ENGINE_KEY } = process.env;
 const logGraphQLServerError = (error) => {
     try {
@@ -22,9 +23,16 @@ const logGraphQLServerError = (error) => {
     catch (e) { } // eslint-disable-line
 };
 export default async (options) => {
-    const { typeDefs: additionalTypeDefs = [], resolvers: additionalResolvers = [], engine = {}, ...apolloServerOptions } = options || {};
+    const { typeDefs: additionalTypeDefs = [], resolvers: additionalResolvers = [], engine = {}, events = [], workTypes = [], ...apolloServerOptions } = options || {};
     const server = new ApolloServer({
-        typeDefs: [...typeDefs, ...additionalTypeDefs],
+        typeDefs: [
+            ...buildDefaultTypeDefs({
+                actions: Object.keys(actions),
+                events,
+                workTypes,
+            }),
+            ...additionalTypeDefs,
+        ],
         resolvers: [resolvers, ...additionalResolvers],
         formatError: (error) => {
             logGraphQLServerError(error);
@@ -39,7 +47,6 @@ export default async (options) => {
             : undefined,
         ...apolloServerOptions,
     });
-    await server.start();
     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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1C,MAAM,qBAAqB,GAAG,CAAC,KAA4B,EAAE,EAAE;IAC7D,IAAI;QACF,MAAM,EACJ,OAAO,EACP,UAAU,EAAE,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,EACzC,GAAG,IAAI,EACR,GAAG,KAAK,CAAC;QACV,GAAG,CAAC,GAAG,OAAO,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,EAAE;YACjD,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,GAAG,UAAU;YACb,GAAG,IAAI;SACR,CAAC,CAAC;QACH,IAAI,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;YAC1F,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;YACvC,WAAW,CAAC,KAAK,GAAI,UAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxD,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,IAAc,CAAC;YAC7C,2BAA2B;YAC3B,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;SAC5B;KACF;IAAC,OAAO,CAAC,EAAE,GAAE,CAAC,sBAAsB;AACvC,CAAC,CAAC;AAEF,eAAe,KAAK,EAAE,OAAO,EAAE,EAAE;IAC/B,MAAM,EACJ,QAAQ,EAAE,kBAAkB,GAAG,EAAE,EACjC,SAAS,EAAE,mBAAmB,GAAG,EAAE,EACnC,MAAM,GAAG,EAAE,EACX,GAAG,mBAAmB,EACvB,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,QAAQ,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,kBAAkB,CAAC;QAC9C,SAAS,EAAE,CAAC,SAAS,EAAE,GAAG,mBAAmB,CAAC;QAC9C,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;YACrB,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,EAAE,iBAAiB;YACvB,CAAC,CAAC;gBACE,GAAG,EAAE,iBAAiB;gBACtB,gBAAgB,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;gBACpF,GAAG,MAAM;aACV;YACH,CAAC,CAAC,SAAS;QACb,GAAG,mBAAmB;KACvB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IAErB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"createGraphQLServer.js","sourceRoot":"","sources":["../src/createGraphQLServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1C,MAAM,qBAAqB,GAAG,CAAC,KAA4B,EAAE,EAAE;IAC7D,IAAI;QACF,MAAM,EACJ,OAAO,EACP,UAAU,EAAE,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,EACzC,GAAG,IAAI,EACR,GAAG,KAAK,CAAC;QACV,GAAG,CAAC,GAAG,OAAO,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,EAAE;YACjD,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,GAAG,UAAU;YACb,GAAG,IAAI;SACR,CAAC,CAAC;QACH,IAAI,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;YAC1F,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;YACvC,WAAW,CAAC,KAAK,GAAI,UAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxD,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,IAAc,CAAC;YAC7C,2BAA2B;YAC3B,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;SAC5B;KACF;IAAC,OAAO,CAAC,EAAE,GAAE,CAAC,sBAAsB;AACvC,CAAC,CAAC;AAEF,eAAe,KAAK,EAAE,OAAO,EAAE,EAAE;IAC/B,MAAM,EACJ,QAAQ,EAAE,kBAAkB,GAAG,EAAE,EACjC,SAAS,EAAE,mBAAmB,GAAG,EAAE,EACnC,MAAM,GAAG,EAAE,EACX,MAAM,GAAG,EAAE,EACX,SAAS,GAAG,EAAE,EACd,GAAG,mBAAmB,EACvB,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,QAAQ,EAAE;YACR,GAAG,oBAAoB,CAAC;gBACtB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC7B,MAAM;gBACN,SAAS;aACV,CAAC;YACF,GAAG,kBAAkB;SACtB;QACD,SAAS,EAAE,CAAC,SAAS,EAAE,GAAG,mBAAmB,CAAC;QAC9C,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;YACrB,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,EAAE,iBAAiB;YACvB,CAAC,CAAC;gBACE,GAAG,EAAE,iBAAiB;gBACtB,gBAAgB,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;gBACpF,GAAG,MAAM;aACV;YACH,CAAC,CAAC,SAAS;QACb,GAAG,mBAAmB;KACvB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/lib/schema/index.d.ts

@@ -1,2 +1,5 @@
-declare const _default: string[];
-export default _default;
+export function buildDefaultTypeDefs({ actions, events, workTypes }: {
+    actions?: any[];
+    events?: any[];
+    workTypes?: any[];
+}): string[];

package/lib/schema/index.js

@@ -4,5 +4,18 @@ import types from './types';
 import inputTypes from './inputTypes';
 import query from './query';
 import mutation from './mutation';
-export default [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation];
+export const buildDefaultTypeDefs = ({ actions = [], events = [], workTypes = [] }) => {
+    const dynamicTypeDefs = `
+    extend enum RoleAction {
+        ${actions.join(',')}
+    }
+    extend enum EventType {
+        ${events.join(',')}
+    }
+    extend enum WorkType {
+        ${workTypes.join(',')}
+    }
+  `;
+    return [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation, dynamicTypeDefs];
+};
 //# sourceMappingURL=index.js.map

package/lib/schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.js"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC,eAAe,CAAC,GAAG,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.js"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,EAAE;IACpF,MAAM,eAAe,GAAG;;UAEhB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;;;UAGjB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;;;UAGhB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;;GAE1B,CAAC;IAEF,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,QAAQ,EAAE,eAAe,CAAC,CAAC;AACtG,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.0.0-beta9",
+  "version": "2.0.0-rc.2",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@apollo/server": "^4.2.2",
+    "@apollo/server": "^4.3.0",
     "cookie": "^0.5.0",
     "graphql": "^16.6.0"
   },
@@ -49,11 +49,11 @@
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^5.0.2",
-    "@unchainedshop/core": "^2.0.0-beta9",
-    "@unchainedshop/events": "^2.0.0-beta9",
-    "@unchainedshop/logger": "^2.0.0-beta9",
-    "@unchainedshop/roles": "^2.0.0-beta9",
-    "@unchainedshop/utils": "^2.0.0-beta9",
+    "@unchainedshop/core": "^2.0.0-rc.2",
+    "@unchainedshop/events": "^2.0.0-rc.2",
+    "@unchainedshop/logger": "^2.0.0-rc.2",
+    "@unchainedshop/roles": "^2.0.0-rc.2",
+    "@unchainedshop/utils": "^2.0.0-rc.2",
     "accounting": "0.4.1",
     "dataloader": "^2.1.0",
     "graphql-scalars": "^1.20.1",
@@ -65,8 +65,8 @@
   "devDependencies": {
     "@types/graphql-upload": "^8.0.12",
     "@types/locale": "^0.1.1",
-    "@types/node": "^18.11.12",
-    "@unchainedshop/types": "^2.0.0-beta9",
+    "@types/node": "^18.11.18",
+    "@unchainedshop/types": "^2.0.0-rc.2",
     "express": "^4.18.2",
     "graphql": "^16.6.0",
     "jest": "^29.3.1",

package/src/createGraphQLServer.ts

@@ -1,8 +1,9 @@
 import { ApolloServer } from '@apollo/server';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { GraphQLFormattedError } from 'graphql';
-import typeDefs from './schema';
+import { buildDefaultTypeDefs } from './schema';
 import resolvers from './resolvers';
+import { actions } from './roles';
 
 const { APOLLO_ENGINE_KEY } = process.env;
 
@@ -33,11 +34,20 @@ export default async (options) => {
     typeDefs: additionalTypeDefs = [],
     resolvers: additionalResolvers = [],
     engine = {},
+    events = [],
+    workTypes = [],
     ...apolloServerOptions
   } = options || {};
 
   const server = new ApolloServer({
-    typeDefs: [...typeDefs, ...additionalTypeDefs],
+    typeDefs: [
+      ...buildDefaultTypeDefs({
+        actions: Object.keys(actions),
+        events,
+        workTypes,
+      }),
+      ...additionalTypeDefs,
+    ],
     resolvers: [resolvers, ...additionalResolvers],
     formatError: (error) => {
       logGraphQLServerError(error);
@@ -53,7 +63,5 @@ export default async (options) => {
     ...apolloServerOptions,
   });
 
-  await server.start();
-
   return server;
 };

package/src/schema/index.js

@@ -5,4 +5,18 @@ import inputTypes from './inputTypes';
 import query from './query';
 import mutation from './mutation';
 
-export default [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation];
+export const buildDefaultTypeDefs = ({ actions = [], events = [], workTypes = [] }) => {
+  const dynamicTypeDefs = `
+    extend enum RoleAction {
+        ${actions.join(',')}
+    }
+    extend enum EventType {
+        ${events.join(',')}
+    }
+    extend enum WorkType {
+        ${workTypes.join(',')}
+    }
+  `;
+
+  return [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation, dynamicTypeDefs];
+};