Merge pull request #13 from Eliav2:dev

Dev
Eliav2 · Jun 8, 2024 · bad3f96 · bad3f96
2 parents 8b90108 + d29e791
commit bad3f96
Show file tree

Hide file tree

Showing 8 changed files with 917 additions and 31 deletions.
diff --git a/examples/express-typed-prisma/src/app.ts b/examples/express-typed-prisma/src/app.ts
@@ -1,7 +1,7 @@
 import express from "express";
 import logger from "morgan";
-import typedRouter from "./routes/typed.routes";
-import notTypedRouter from "./routes/not-typed.routes";
+import typedRouter from "./routes/typed.routes.js";
+import notTypedRouter from "./routes/not-typed.routes.js";
 
 // Create Express server
 export const app = express();

diff --git a/packages/express-typed/index.ts b/packages/express-typed/index.ts
@@ -0,0 +1 @@
+export * from "./src/express-typed"
diff --git a/packages/express-typed/package.json b/packages/express-typed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "express-typed",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "end-to-end typesafe TypeScript wrapper for Express.js",
   "repository": {
     "type": "git",
@@ -9,12 +9,12 @@
   "homepage": "https://github.com/Eliav2/express-typed",
   "bugs": "https://github.com/Eliav2/express-typed/issues",
   "type": "module",
-  "main": "dist/express-typed.js",
-  "module": "dist/express-typed.js",
-  "types": "dist/express-typed.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "dev": "tsc -w",
+    "build": "tsup",
+    "dev": "tsup --watch",
     "prepublishOnly": "pnpm build",
     "test": "vitest",
     "version": "auto-changelog -p && git add CHANGELOG.md"
@@ -30,6 +30,7 @@
     "@vitest/coverage-v8": "^1.5.2",
     "express": "^4.19.2",
     "supertest": "^7.0.0",
+    "tsup": "^8.1.0",
     "typescript": "^5.4.2"
   },
   "peerDependencies": {

diff --git a/packages/express-typed/tests/demo.test-d.ts b/packages/express-typed/tests/demo.test-d.ts
@@ -53,8 +53,7 @@ test("TypedRouter", () => {
       },
     }),
   });
-
-
+
   type AppRoutes = ParseRoutes<typeof typedRouter>;
 
   type HomeGetResponse = GetRouteResponseInfo<AppRoutes, "/", "get">;

diff --git a/packages/express-typed/tests/express-typed.test-d.ts b/packages/express-typed/tests/express-typed.test-d.ts
@@ -58,7 +58,7 @@ export type AppRoutes = ParseRoutes<typeof typedRouter>;
 export type RouteResResolver<
   Path extends keyof AppRoutes,
   Method extends keyof AppRoutes[Path],
-  Info extends keyof GetRouteResponseInfoHelper<AppRoutes, Path, Method> | "body" = "body",
+  Info extends keyof GetRouteResponseInfoHelper<AppRoutes, Path, Method> | "body" = "body"
 > = GetRouteResponseInfo<AppRoutes, Path, Method, Info>;
 
 // example usage

diff --git a/packages/express-typed/tsconfig.json b/packages/express-typed/tsconfig.json
@@ -3,13 +3,14 @@
     "esModuleInterop": true,
     "target": "esnext",
     "noImplicitAny": true,
-    "moduleResolution": "node",
+    "moduleResolution": "Node",
     "sourceMap": true,
     "outDir": "dist",
     "baseUrl": ".",
     "skipLibCheck": true,
     "strict": true,
     "declaration": true,
+    // "emitDeclarationOnly": true
   },
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules"]

diff --git a/packages/express-typed/tsup.config.ts b/packages/express-typed/tsup.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["index.ts"],
+  dts: true,
+  splitting: false,
+  sourcemap: true,
+  clean: true,
+  format: ["cjs", "esm"],
+});