v2.0.0-beta.3

Author: DylanBulmer

.swcrc

@@ -5,7 +5,7 @@
       "syntax": "typescript",
       "dynamicImport": true
     },
-    "target": "es2021",
+    "target": "es2015",
     "keepClassNames": false,
     "baseUrl": "./src",
     "paths": {

bin/post-build.sh

@@ -0,0 +1,15 @@
+cp package.json README.md dist/
+rm -rf ./dist/types/__tests__
+rm -rf ./dist/esm/__tests__
+
+cat >dist/cjs/package.json <<!EOF
+{
+    "type": "commonjs"
+}
+!EOF
+
+cat >dist/esm/package.json <<!EOF
+{
+    "type": "module"
+}
+!EOF

package.json

@@ -1,16 +1,26 @@
 {
   "name": "@dylanbulmer/api",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "main": "index.js",
   "author": "Dylan Bulmer <dylan@dylanbulmer.com>",
   "license": "MIT",
   "bin": {
-    "api": "dist/index.js"
+    "api": "dist/cjs/index.js"
   },
-  "type": "commonjs",
+  "exports": {
+    ".": {
+      "require": "./cjs/index.js",
+      "import": "./esm/index.js",
+      "types": "./types/index.d.ts"
+    }
+  },
+  "type": "module",
   "scripts": {
     "test": "jest --config jest.config.json --passWithNoTests --coverage",
-    "build": "yarn clean && swc src -d dist && tsc --emitDeclarationOnly && cp package.json dist/ && chmod +x dist/index.js",
+    "build:esm": "tsc --project tsconfig.esm.json && tsc-alias -p tsconfig.esm.json",
+    "build:cjs": "tsc --project tsconfig.cjs.json && tsc-alias -p tsconfig.cjs.json",
+    "build": "yarn build:cjs && yarn build:esm && ./bin/post-build.sh",
+    "build-old": "yarn clean && swc src -d dist && tsc --emitDeclarationOnly && cp package.json dist/ && chmod +x dist/index.js",
     "clean": "rm -rf ./dist/*",
     "format": "prettier --write \"src/**/*.(ts|js)\"",
     "lint": "eslint -c .eslintrc.json --ignore-path .eslintignore --ext .ts src",
@@ -21,13 +31,16 @@
     "node": ">=16"
   },
   "dependencies": {
+    "@swc/core": "^1.3.50",
     "chalk": "^4.1.2",
     "commander": "^11.0.0",
     "express": "^4.18.2"
   },
+  "peerDependencies": {
+    "@swc/core": "^1.3.50"
+  },
   "devDependencies": {
     "@swc/cli": "^0.1.62",
-    "@swc/core": "^1.3.50",
     "@swc/jest": "^0.2.26",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.0",
@@ -40,6 +53,7 @@
     "jest": "^29.5.0",
     "openapi-types": "^11.0.0",
     "prettier": "^2.7.1",
+    "tsc-alias": "^1.8.7",
     "typescript": "^4.6.4"
   }
 }

src/__tests__/DirectoryIndexRoute/routes/get.ts

@@ -0,0 +1,12 @@
+import { Responses, Route } from "../../../";
+
+const route = new Route()
+  .summary("Index route")
+  .description("Testing route")
+  .tags("TEST")
+  .response("200", Responses.Response200)
+  .operation((req, res) => {
+    res.status(200).json({ detail: { message: "OK" } });
+  });
+
+export default route;

src/__tests__/DirectoryIndexRoute/routes/index.ts

@@ -0,0 +1,12 @@
+import { Responses, Route } from "../../../../";
+
+const route = new Route()
+  .summary("Static route")
+  .description("Testing route")
+  .tags("TEST")
+  .response("200", Responses.Response200)
+  .operation((req, res) => {
+    res.status(200).json({ detail: { message: "OK" } });
+  });
+
+export default route;

src/__tests__/DirectoryIndexRoute/routes/test/get.ts

@@ -0,0 +1,15 @@
+import { Responses, Route, Parameter } from "../../../../";
+
+const route = new Route<"test2">()
+  .params(new Parameter().in("path").name("test2"))
+  .summary("Static route")
+  .description("Testing dynamic routes")
+  .tags("TEST")
+  .response("200", Responses.Response200)
+  .operation((req, res) => {
+    res
+      .status(200)
+      .json({ detail: { message: "OK", param: req.params.test2 } });
+  });
+
+export default route;

src/__tests__/DirectoryIndexRoute/routes/test/index.ts

@@ -0,0 +1,12 @@
+import { Responses, Route } from "../../../../";
+
+const route = new Route()
+  .summary("Static route")
+  .description("Testing dynamic routes")
+  .tags("TEST")
+  .response("200", Responses.Response200)
+  .operation((req, res) => {
+    res.status(200).json({ detail: { message: "OK" } });
+  });
+
+export default route;

src/__tests__/DynamicRoutes/routes/[test2]/get.ts

@@ -1,5 +1,5 @@
 import { OpenAPIV3_1 } from "openapi-types";
-import { R200, R201, R204, R400, R401, R403, R404, R418, R500, R503 } from "../classes/responses";
+import * as Responses from "../classes/responses";
 
 const settings: OpenAPIV3_1.Document = {
   openapi: "3.1.0",
@@ -32,16 +32,16 @@ const settings: OpenAPIV3_1.Document = {
 
   components: {
     responses: {
-      "200": R200,
-      "201": R201,
-      "204": R204,
-      "400": R400,
-      "401": R401,
-      "403": R403,
-      "404": R404,
-      "418": R418,
-      "500": R500,
-      "503": R503,
+      "200": Responses.Response200.doc(),
+      "201": Responses.Response201.doc(),
+      "204": Responses.Response204.doc(),
+      "400": Responses.Response400.doc(),
+      "401": Responses.Response401.doc(),
+      "403": Responses.Response403.doc(),
+      "404": Responses.Response404.doc(),
+      "418": Responses.Response418.doc(),
+      "500": Responses.Response500.doc(),
+      "503": Responses.Response503.doc(),
     },
   },
 };

src/__tests__/DynamicRoutes/routes/[test2]/index.ts

@@ -7,7 +7,10 @@ import getFiles from "@/utils/getFiles";
 const build = async function build() {
   const config = await getConfig();
   const buildDir = path.join(process.cwd(), ".api");
-  const routesDir = path.join(process.cwd(), config.file.routes);
+  const routesDir = path.join(
+    process.cwd(),
+    config.file.useSrcDir ? `src/${config.file.routes}` : config.file.routes,
+  );
 
   // clean the repository
   if (fs.existsSync(buildDir)) {