feat: Support ESM

Author: oliverbutler

.changeset/new-carrots-worry.md

@@ -0,0 +1,11 @@
+---
+'@ts-rest/core': minor
+'@ts-rest/express': minor
+'@ts-rest/nest': minor
+'@ts-rest/next': minor
+'@ts-rest/open-api': minor
+'@ts-rest/react-query': minor
+'@ts-rest/solid-query': minor
+---
+
+Build ESM and CommonJS for improved compatibility

libs/ts-rest/core/package.json

@@ -2,7 +2,6 @@
   "name": "@ts-rest/core",
   "version": "3.5.0",
   "description": "RPC-like experience over a regular REST API, with type safe server implementations 🪄",
-  "type": "commonjs",
   "license": "MIT",
   "keywords": [
     "rpc",
@@ -18,5 +17,16 @@
     "type": "git",
     "url": "https://github.com/ts-rest/ts-rest.git",
     "directory": "libs/ts-rest/core"
+  },
+  "peerDependenciesMeta": {
+    "zod": {
+      "optional": true
+    },
+    "tslib": {
+      "optional": true
+    }
+  },
+  "peerDependencies": {
+    "zod": "^3.0.0"
   }
 }

libs/ts-rest/core/project.json

@@ -4,13 +4,15 @@
   "projectType": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nrwl/rollup:rollup",
       "outputs": ["{options.outputPath}"],
       "options": {
+        "project": "libs/ts-rest/core/package.json",
         "outputPath": "dist/libs/ts-rest/core",
         "main": "libs/ts-rest/core/src/index.ts",
         "tsConfig": "libs/ts-rest/core/tsconfig.lib.json",
-        "assets": ["libs/ts-rest/core/*.md"]
+        "format": ["esm", "cjs"],
+        "compiler": "tsc"
       }
     },
     "publish": {

libs/ts-rest/core/src/lib/client.ts

@@ -8,6 +8,8 @@ import {
 import { HTTPStatusCode } from './status-codes';
 import { Without, ZodInferOrType } from './type-utils';
 
+
+
 type RecursiveProxyObj<T extends AppRouter> = {
   [TKey in keyof T]: T[TKey] extends AppRoute
     ? DataReturn<T[TKey]>

libs/ts-rest/express/package.json

@@ -1,5 +1,16 @@
 {
   "name": "@ts-rest/express",
   "version": "3.5.0",
-  "type": "commonjs"
+  "peerDependenciesMeta": {
+    "zod": {
+      "optional": true
+    },
+    "@swc/helpers": {
+      "optional": true
+    }
+  },
+  "peerDependencies": {
+    "express": "^4.17.0",
+    "zod": "^3.0.0"
+  }
 }

libs/ts-rest/express/src/lib/ts-rest-express.ts

@@ -1,4 +1,4 @@
-import { IRouter, RequestHandler } from 'express';
+import { IRouter, Request, Response } from 'express';
 import { IncomingHttpHeaders } from 'http';
 import {
   AppRoute,
@@ -110,12 +110,10 @@ const transformAppRouteQueryImplementation = (
       });
     }
 
-    const result = await route({
+    const result = await route({    // @ts-ignore
       params: req.params,
       query: req.query,
       headers: req.headers,
-
-      // @ts-expect-error because the decorator shape is any
       req: req,
     });
 
@@ -133,7 +131,7 @@ const transformAppRouteMutationImplementation = (
 
   const method = schema.method;
 
-  const callback: RequestHandler = async (req, res) => {
+  const callback = async (req: Request, res: Response) => {
     try {
       const zodBodyIssues = returnZodErrorsIfZodSchema(schema.body, req.body);
 
@@ -155,6 +153,8 @@ const transformAppRouteMutationImplementation = (
       }
 
       const result = await route({
+
+        // @ts-ignore
         params: req.params,
         body: req.body,
         query: req.query,
@@ -165,7 +165,6 @@ const transformAppRouteMutationImplementation = (
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         file: req.file,
-        // @ts-expect-error because the decorator shape is any
         req: req,
       });
 
@@ -189,9 +188,6 @@ const transformAppRouteMutationImplementation = (
     case 'PATCH':
       app.patch(schema.path, callback);
       break;
-    default:
-      // eslint-disable-next-line no-case-declarations, @typescript-eslint/no-unused-vars
-      const _exhaustiveCheck: never = method;
   }
 };
 

libs/ts-rest/nest/.lib.swcrc

@@ -2,7 +2,6 @@
   "name": "@ts-rest/nest",
   "version": "3.5.0",
   "description": "Nest server integration for @ts-rest",
-  "type": "commonjs",
   "license": "MIT",
   "keywords": [
     "rpc",
@@ -19,5 +18,17 @@
     "type": "git",
     "url": "https://github.com/ts-rest/ts-rest.git",
     "directory": "libs/ts-rest/nest"
+  },
+  "peerDependenciesMeta": {
+    "zod": {
+      "optional": true
+    },
+    "rxjs": {
+      "optional": true
+    }
+  },
+  "peerDependencies": {
+    "@nestjs/common": "^9.0.0",
+    "rxjs": "^7.0.0"
   }
 }

libs/ts-rest/nest/package.json

@@ -4,13 +4,15 @@
   "projectType": "library",
   "targets": {
     "build": {
-      "executor": "@nrwl/js:swc",
+      "executor": "@nrwl/rollup:rollup",
       "outputs": ["{options.outputPath}"],
       "options": {
+        "project": "libs/ts-rest/nest/package.json",
         "outputPath": "dist/libs/ts-rest/nest",
         "main": "libs/ts-rest/nest/src/index.ts",
         "tsConfig": "libs/ts-rest/nest/tsconfig.lib.json",
-        "assets": ["libs/ts-rest/nest/*.md"]
+        "format": ["esm", "cjs"],
+        "compiler": "tsc"
       }
     },
     "publish": {

libs/ts-rest/nest/project.json

@@ -1,5 +1,15 @@
 {
   "name": "@ts-rest/next",
   "version": "3.5.0",
-  "type": "commonjs"
+  "peerDependenciesMeta": {
+    "zod": {
+      "optional": true
+    },
+    "@swc/helpers": {
+      "optional": true
+    }
+  },
+  "peerDependencies": {
+    "next": "^12.0.0"
+  }
 }