@unchainedshop/api 1.2.46 → 1.2.48

package/lib/api-index.js

@@ -1,17 +1,23 @@
 import fs from 'fs';
+import path from 'path';
 import createBulkImportServer from './createBulkImportServer';
 import createGraphQLServer from './createGraphQLServer';
 import { createContextResolver, getCurrentContextResolver, setCurrentContextResolver } from './context';
-// import packageJson from '../package.json';
 export * from './context';
 export * as acl from './acl';
 export * as errors from './errors';
 export { hashPassword } from './hashPassword';
 export * as roles from './roles';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
-const loadJSON = (path) => {
+const loadJSON = (filename) => {
     try {
-        const data = JSON.parse(fs.readFileSync(new URL(path, import.meta.url), 'utf-8'));
+        const base = typeof __filename !== 'undefined' && __filename;
+        if (!base)
+            return {
+                version: process.env.npm_package_version,
+            };
+        const absolutePath = path.resolve(path.dirname(base), filename);
+        const data = JSON.parse(fs.readFileSync(absolutePath, 'utf-8'));
         return data;
     }
     catch (e) {
@@ -19,7 +25,7 @@ const loadJSON = (path) => {
     }
 };
 const packageJson = loadJSON('../package.json');
-const UNCHAINED_API_VERSION = process.env.UNCHAINED_API_VERSION || packageJson?.version || '2.x';
+const UNCHAINED_API_VERSION = process.env.UNCHAINED_API_VERSION || packageJson?.version || '1.2.x';
 export const startAPIServer = (options) => {
     const { unchainedAPI, roles, expressApp, context: customContext, ...apolloServerOptions } = options || {};
     const contextResolver = createContextResolver(unchainedAPI, roles, UNCHAINED_API_VERSION);

package/lib/api-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-index.js","sourceRoot":"","sources":["../src/api-index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AACxG,6CAA6C;AAE7C,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;AACjC,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAEvF,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,EAAE;IACxB,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AACF,MAAM,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAEhD,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,WAAW,EAAE,OAAO,IAAI,KAAK,CAAC;AAEjG,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,OAA+B,EAI/B,EAAE;IACF,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"}
+{"version":3,"file":"api-index.js","sourceRoot":"","sources":["../src/api-index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,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;AACjC,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAEvF,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,EAAE;IAC5B,IAAI;QACF,MAAM,IAAI,GAAG,OAAO,UAAU,KAAK,WAAW,IAAI,UAAU,CAAC;QAC7D,IAAI,CAAC,IAAI;YACP,OAAO;gBACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;aACzC,CAAC;QACJ,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AACF,MAAM,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAEhD,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,WAAW,EAAE,OAAO,IAAI,OAAO,CAAC;AAEnG,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,OAA+B,EAI/B,EAAE;IACF,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "1.2.46",
+  "version": "1.2.48",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -34,11 +34,11 @@
     "graphql": "^15.x"
   },
   "dependencies": {
-    "@unchainedshop/core": "^1.2.46",
-    "@unchainedshop/events": "^1.2.46",
-    "@unchainedshop/logger": "^1.2.46",
-    "@unchainedshop/roles": "^1.2.46",
-    "@unchainedshop/utils": "^1.2.46",
+    "@unchainedshop/core": "^1.2.48",
+    "@unchainedshop/events": "^1.2.48",
+    "@unchainedshop/logger": "^1.2.48",
+    "@unchainedshop/roles": "^1.2.48",
+    "@unchainedshop/utils": "^1.2.48",
     "accounting": "0.4.1",
     "dataloader": "^2.1.0",
     "graphql-scalars": "^1.20.0",
@@ -51,7 +51,7 @@
     "@types/graphql-upload": "^8.0.12",
     "@types/locale": "^0.1.1",
     "@types/node": "^16.18.3",
-    "@unchainedshop/types": "^1.2.46",
+    "@unchainedshop/types": "^1.2.48",
     "apollo-server-express": "^2.26.0",
     "graphql": "^15.8.0",
     "jest": "^29.3.1",

package/src/api-index.ts

@@ -1,10 +1,10 @@
 import { UnchainedServerOptions } from '@unchainedshop/types/api';
 import { ApolloServer } from 'apollo-server-express';
 import fs from 'fs';
+import path from 'path';
 import createBulkImportServer from './createBulkImportServer';
 import createGraphQLServer from './createGraphQLServer';
 import { createContextResolver, getCurrentContextResolver, setCurrentContextResolver } from './context';
-// import packageJson from '../package.json';
 
 export * from './context';
 export * as acl from './acl';
@@ -13,9 +13,15 @@ export { hashPassword } from './hashPassword';
 export * as roles from './roles';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
 
-const loadJSON = (path) => {
+const loadJSON = (filename) => {
   try {
-    const data = JSON.parse(fs.readFileSync(new URL(path, import.meta.url), 'utf-8'));
+    const base = typeof __filename !== 'undefined' && __filename;
+    if (!base)
+      return {
+        version: process.env.npm_package_version,
+      };
+    const absolutePath = path.resolve(path.dirname(base), filename);
+    const data = JSON.parse(fs.readFileSync(absolutePath, 'utf-8'));
     return data;
   } catch (e) {
     return null;
@@ -23,7 +29,7 @@ const loadJSON = (path) => {
 };
 const packageJson = loadJSON('../package.json');
 
-const UNCHAINED_API_VERSION = process.env.UNCHAINED_API_VERSION || packageJson?.version || '2.x';
+const UNCHAINED_API_VERSION = process.env.UNCHAINED_API_VERSION || packageJson?.version || '1.2.x';
 
 export const startAPIServer = (
   options: UnchainedServerOptions,