@restorecommerce/facade 1.1.6 → 1.3.0

package/generate.ts

@@ -1,45 +1,45 @@
-import { generateSchemaTypings } from "./src_codegen/index";
-import { schema as facadeStatusSchema } from "./src/modules/facade-status/gql/schema";
+import { generateSchemaTypings } from './src_codegen/index.js';
+import { schema as facadeStatusSchema } from './src/modules/facade-status/gql/schema.js';
 
-import { schema as orderingSchema } from "./src/modules/ordering/gql/schema";
-import { namespace as orderingNamespace } from "./src/modules/ordering/interfaces";
+import { schema as orderingSchema } from './src/modules/ordering/gql/schema.js';
+import { namespace as orderingNamespace } from './src/modules/ordering/interfaces.js';
 
-import { schema as paymentSchema } from "./src/modules/payment/gql/schema";
-import { namespace as paymentNamespace } from "./src/modules/payment/interfaces";
+import { schema as paymentSchema } from './src/modules/payment/gql/schema.js';
+import { namespace as paymentNamespace } from './src/modules/payment/interfaces.js';
 
-import { schema as resourceSchema } from "./src/modules/resource/gql/schema";
-import { namespace as resourceNamespace } from "./src/modules/resource/interfaces";
+import { schema as resourceSchema } from './src/modules/resource/gql/schema.js';
+import { namespace as resourceNamespace } from './src/modules/resource/interfaces.js';
 
-import { schema as catalogSchema } from "./src/modules/catalog/gql/schema";
-import { namespace as catalogNamespace } from "./src/modules/catalog/interfaces";
+import { schema as catalogSchema } from './src/modules/catalog/gql/schema.js';
+import { namespace as catalogNamespace } from './src/modules/catalog/interfaces.js';
 
-import { schema as invoicingSchema } from "./src/modules/invoicing/gql/schema";
-import { namespace as invoicingNamespace } from "./src/modules/invoicing/interfaces";
+import { schema as invoicingSchema } from './src/modules/invoicing/gql/schema.js';
+import { namespace as invoicingNamespace } from './src/modules/invoicing/interfaces.js';
 
-import { schema as fulfillmentSchema } from "./src/modules/fulfillment/gql/schema";
-import { namespace as fulfillmentNamespace } from "./src/modules/fulfillment/interfaces";
+import { schema as fulfillmentSchema } from './src/modules/fulfillment/gql/schema.js';
+import { namespace as fulfillmentNamespace } from './src/modules/fulfillment/interfaces.js';
 
-import { schema as indexingSchema } from "./src/modules/indexing/gql/schema";
-import { namespace as indexingNamespace } from "./src/modules/indexing/interfaces";
+import { schema as indexingSchema } from './src/modules/indexing/gql/schema.js';
+import { namespace as indexingNamespace } from './src/modules/indexing/interfaces.js';
 
-import { schema as schedulingSchema } from "./src/modules/scheduling/gql/schema";
-import { namespace as schedulingNamespace } from "./src/modules/scheduling/interfaces";
+import { schema as schedulingSchema } from './src/modules/scheduling/gql/schema.js';
+import { namespace as schedulingNamespace } from './src/modules/scheduling/interfaces.js';
 
-import { schema as notificationSchema } from "./src/modules/notification/gql/schema";
-import { namespace as notificationNamespace } from "./src/modules/notification/interfaces";
+import { schema as notificationSchema } from './src/modules/notification/gql/schema.js';
+import { namespace as notificationNamespace } from './src/modules/notification/interfaces.js';
 
-import { schema as accessControlSchema } from "./src/modules/access-control/gql/schema";
-import { namespace as accessControlNamespace } from "./src/modules/access-control/interfaces";
+import { schema as accessControlSchema } from './src/modules/access-control/gql/schema.js';
+import { namespace as accessControlNamespace } from './src/modules/access-control/interfaces.js';
 
-import { schema as ostorageSchema } from "./src/modules/ostorage/gql/schema";
-import { namespace as ostorageNamespace } from "./src/modules/ostorage/interfaces";
+import { schema as ostorageSchema } from './src/modules/ostorage/gql/schema.js';
+import { namespace as ostorageNamespace } from './src/modules/ostorage/interfaces.js';
 
-import { schema as identitySchema } from "./src/modules/identity/gql/schema";
-import { namespace as identityNamespace } from "./src/modules/identity/interfaces";
+import { schema as identitySchema } from './src/modules/identity/gql/schema.js';
+import { namespace as identityNamespace } from './src/modules/identity/interfaces.js';
 
-import { createServiceConfig } from "@restorecommerce/service-config";
-import { join } from "path";
-import { setUseSubscriptions } from './src/gql/protos/utils';
+import { createServiceConfig } from '@restorecommerce/service-config';
+import { join } from 'node:path';
+import { setUseSubscriptions } from './src/gql/protos/utils.js';
 
 // TODO Configurable
 const cfg = createServiceConfig(join(process.cwd(), 'tests'));
@@ -50,7 +50,7 @@ generateSchemaTypings({
   schema: facadeStatusSchema,
   outputFile: './src/modules/facade-status/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#FacadeStatusContext'
+    contextType: '../interfaces.js#FacadeStatusContext'
   }
 });
 
@@ -58,7 +58,7 @@ generateSchemaTypings({
   schema: orderingSchema(cfg.get(orderingNamespace)),
   outputFile: './src/modules/ordering/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#OrderingContext'
+    contextType: '../interfaces.js#OrderingContext'
   }
 });
 
@@ -66,7 +66,7 @@ generateSchemaTypings({
   schema: paymentSchema(cfg.get(paymentNamespace)),
   outputFile: './src/modules/payment/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#PaymentContext'
+    contextType: '../interfaces.js#PaymentContext'
   }
 });
 
@@ -74,7 +74,7 @@ generateSchemaTypings({
   schema: resourceSchema(cfg.get(resourceNamespace)),
   outputFile: './src/modules/resource/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#ResourceContext'
+    contextType: '../interfaces.js#ResourceContext'
   }
 });
 
@@ -82,7 +82,7 @@ generateSchemaTypings({
   schema: catalogSchema(cfg.get(catalogNamespace)),
   outputFile: './src/modules/catalog/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#CatalogContext'
+    contextType: '../interfaces.js#CatalogContext'
   }
 });
 
@@ -90,7 +90,7 @@ generateSchemaTypings({
   schema: invoicingSchema(cfg.get(invoicingNamespace)),
   outputFile: './src/modules/invoicing/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#InvoicingContext'
+    contextType: '../interfaces.js#InvoicingContext'
   }
 });
 
@@ -98,7 +98,7 @@ generateSchemaTypings({
   schema: fulfillmentSchema(cfg.get(fulfillmentNamespace)),
   outputFile: './src/modules/fulfillment/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#FulfillmentContext'
+    contextType: '../interfaces.js#FulfillmentContext'
   }
 });
 
@@ -106,7 +106,7 @@ generateSchemaTypings({
   schema: indexingSchema(cfg.get(indexingNamespace)),
   outputFile: './src/modules/indexing/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#IndexingContext'
+    contextType: '../interfaces.js#IndexingContext'
   }
 });
 
@@ -114,7 +114,7 @@ generateSchemaTypings({
   schema: schedulingSchema(cfg.get(schedulingNamespace)),
   outputFile: './src/modules/scheduling/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#SchedulingContext'
+    contextType: '../interfaces.js#SchedulingContext'
   }
 });
 
@@ -122,7 +122,7 @@ generateSchemaTypings({
   schema: notificationSchema(cfg.get(notificationNamespace)),
   outputFile: './src/modules/notification/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#NotificationContext'
+    contextType: '../interfaces.js#NotificationContext'
   }
 });
 
@@ -130,7 +130,7 @@ generateSchemaTypings({
   schema: accessControlSchema(cfg.get(accessControlNamespace)),
   outputFile: './src/modules/access-control/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#AccessControlContext'
+    contextType: '../interfaces.js#AccessControlContext'
   }
 });
 
@@ -138,7 +138,7 @@ generateSchemaTypings({
   schema: ostorageSchema(cfg.get(ostorageNamespace)),
   outputFile: './src/modules/ostorage/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#OstorageContext'
+    contextType: '../interfaces.js#OstorageContext'
   }
 });
 
@@ -146,6 +146,6 @@ generateSchemaTypings({
   schema: identitySchema(cfg.get(identityNamespace)),
   outputFile: './src/modules/identity/gql/schema.generated.ts',
   typescriptResolvers: {
-    contextType: '../interfaces#IdentityContext'
+    contextType: '../interfaces.js#IdentityContext'
   }
 });

package/jest.config.cjs

@@ -0,0 +1,23 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'ts-jest/presets/default-esm',
+  resolver: 'ts-jest-resolver',
+  verbose: true,
+  testEnvironment: 'node',
+  collectCoverage: true,
+  coverageReporters: ["json", "html"],
+  moduleNameMapper: {
+    "^jose/(.*)$": "<rootDir>/node_modules/jose/dist/node/cjs/$1"
+  },
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    '^.+\\.[tj]sx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+        tsconfig: 'tsconfig.test.json',
+        isolatedModules: true
+      },
+    ],
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "1.1.6",
+  "version": "1.3.0",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -15,6 +15,7 @@
     "commerce",
     "facade"
   ],
+  "type": "module",
   "dependencies": {
     "@apollo/federation": "^0.38.1",
     "@apollo/gateway": "^2.3.2",
@@ -25,9 +26,9 @@
     "@grpc/proto-loader": "^0.7.5",
     "@koa/cors": "^4.0.0",
     "@restorecommerce/grpc-client": "^2.0.1",
-    "@restorecommerce/kafka-client": "^1.0.7",
+    "@restorecommerce/kafka-client": "^1.0.8",
     "@restorecommerce/logger": "^1.2.3",
-    "@restorecommerce/rc-grpc-clients": "^3.0.1",
+    "@restorecommerce/rc-grpc-clients": "^3.1.0",
     "@restorecommerce/service-config": "^1.0.5",
     "array.prototype.flat": "^1.3.1",
     "co": "^4.6.0",
@@ -62,9 +63,9 @@
     "ws": "^8.12.1"
   },
   "devDependencies": {
-    "@graphql-codegen/core": "^2.6.2",
-    "@graphql-codegen/typescript": "^2.7.4",
-    "@graphql-codegen/typescript-resolvers": "^2.7.4",
+    "@graphql-codegen/core": "^4.0.0",
+    "@graphql-codegen/typescript": "^4.0.0",
+    "@graphql-codegen/typescript-resolvers": "^4.0.0",
     "@types/array.prototype.flat": "^1.2.1",
     "@types/co": "^4.6.3",
     "@types/debug": "^4.1.7",
@@ -90,12 +91,14 @@
     "@types/useragent": "^2.3.1",
     "@types/uuid": "^9.0.1",
     "@types/ws": "^8.5.4",
-    "jest": "^29.4.3",
+    "eslint": "^8.42.0",
+    "jest": "^29.5.0",
     "nodemon": "^2.0.20",
     "npm-run-all": "^4.1.5",
     "rimraf": "^4.1.2",
     "supertest": "^6.3.3",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "~29.1.0",
+    "ts-jest-resolver": "^2.0.1",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.2",
     "typescript": "^4.9.5"
@@ -108,16 +111,18 @@
     "build:codegen:compile": "tsc -p tsconfig.codegen.json",
     "dev": "npm-run-all build:clean dev:compile",
     "dev:compile": "tsc -w -p tsconfig.json",
-    "test": "jest --runInBand --testTimeout=30000",
+    "pretest": "rm -rf ./node_modules/@josephg/resolvable/index.ts",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --runInBand --testTimeout=30000",
     "test:watch": "jest --watch",
     "dev:serve": "TS_NODE_PROJECT=tsconfig.test.json nodemon -e ts,hbs -w ./tests -w ./src -x node --inspect=7000 -r ts-node/register tests/server.ts",
-    "generate": "ts-node --project tsconfig.generate.json -r tsconfig-paths/register generate.ts",
+    "generate": "ts-node-esm --project tsconfig.generate.json -r tsconfig-paths/register generate.ts",
     "prepublishOnly": "npm run build",
-    "debug-run": "ts-node --project tsconfig.debug.json debug-run.ts",
-    "copyhbs": "sh copy-hbs.sh"
+    "debug-run": "ts-node-esm --project tsconfig.debug.json debug-run.ts",
+    "copyhbs": "sh copy-hbs.sh",
+    "lint": "eslint './**/*.ts'"
   },
   "engines": {
-    "node": ">= 12.18.0"
+    "node": ">=16"
   },
   "publishConfig": {
     "access": "public"
@@ -131,5 +136,5 @@
       }
     }
   },
-  "gitHead": "1c4ac0aaccaa55439930b96256d6db3884690cb0"
+  "gitHead": "18bb61bb70fbf8a8e5908edb3332ae015c7f5e54"
 }

package/tsconfig-base.json

@@ -8,6 +8,14 @@
     "allowSyntheticDefaultImports": true,
     "declaration": true,
     "strict": true,
+    "target": "ES6",
+    "module": "ESNext",
+    "moduleResolution": "Node16",
     "skipLibCheck": true // temp work around for kafka-client typings
+  },
+  "ts-node": {
+    "transpileOnly": true,
+    "files": true,
+    "experimentalResolver": true
   }
 }

package/tsconfig.debug.json

@@ -7,5 +7,9 @@
     "strict": true,
     "esModuleInterop": true
   },
-  "include": ["./src/**/*.ts", "./src/**/*.d.ts"]
+  "include": [
+    "./src/**/*.ts",
+    "./src/**/*.d.ts",
+    "./debug-run.ts"
+  ]
 }

package/tsconfig.test.json

@@ -8,9 +8,24 @@
       "@gql": ["src/gql/index"],
       "@gql/*": ["src/gql/*"]
     },
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "allowJs": true,
+
+    "rootDirs": ["src"],
+    "outDir": "dist",
+    "lib": ["ES2022"],
+    "target": "ES2022",
+    "module": "ES2022",
+    "composite": true,
+    "moduleResolution": "node",
+    "declaration": true,
+    "declarationMap": true,
+    "incremental": true,
+    "types": ["jest", "node", "@types/jest"],
+    "sourceMap": true
   },
   "include": [
-    "./tests/**/*.ts", "tests/generate-keysjts"
+    "./tests/**/*.ts",
+    "tests/generate-keys.js"
   ]
 }

package/jest.config.js

@@ -1,14 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  collectCoverage: true,
-  coverageReporters: ["json", "html"],
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.test.json'
-    }
-  },
-  moduleNameMapper: {
-    "^jose/(.*)$": "<rootDir>/node_modules/jose/dist/node/cjs/$1"
-  }
-};