fix dynamic route presedence bug; update deps

Author: DylanBulmer

package.json

@@ -1,8 +1,8 @@
 {
   "name": "@dylanbulmer/openapi",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "index.js",
-  "author": "Dylan Bulmer <dylan@bulmersolutions.com>",
+  "author": "Dylan Bulmer <dylan@dylanbulmer.com>",
   "license": "MIT",
   "scripts": {
     "test": "jest --config jest.config.json --passWithNoTests --coverage",
@@ -15,21 +15,21 @@
     "postversion": "git push && git push --tags"
   },
   "dependencies": {
-    "express": "^4.18.1"
+    "express": "^4.18.2"
   },
   "devDependencies": {
-    "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.2.224",
-    "@swc/jest": "^0.2.22",
-    "@types/express": "^4.17.13",
-    "@types/jest": "^28.1.4",
+    "@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",
     "@types/node": "^17.0.33",
     "@typescript-eslint/eslint-plugin": "^5.30.6",
     "@typescript-eslint/parser": "^5.30.6",
     "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-jest": "^26.5.3",
-    "jest": "^28.1.2",
+    "jest": "^29.5.0",
     "openapi-types": "^11.0.0",
     "prettier": "^2.7.1",
     "typescript": "^4.6.4"

src/__tests__/DynamicRoutes/DynamicRoutes.test.ts

@@ -21,8 +21,8 @@ test("Dynamic routes", () => {
     const paths = doc.paths as OpenAPIV3_1.PathsObject;
     const pathKeys = Object.keys(paths);
     // check if dynamic route file exists
-    expect(pathKeys).toContain("/{test}");
-    expect(paths["/{test}"]?.get?.description).toBe("Testing dynamic routes");
+    expect(pathKeys).toContain("/test");
+    expect(paths["/test"]?.get?.description).toBe("Testing dynamic routes");
     // check if dynamic route folder exists
     expect(pathKeys).toContain("/{test2}");
     expect(paths["/{test2}"]?.get?.description).toBe(

…__tests__/DynamicRoutes/routes/[test].ts …c/__tests__/DynamicRoutes/routes/test.tssrc/__tests__/DynamicRoutes/routes/[test].ts renamed to src/__tests__/DynamicRoutes/routes/test.ts src/__tests__/DynamicRoutes/routes/[test].ts renamed to src/__tests__/DynamicRoutes/routes/test.ts

@@ -75,20 +75,20 @@ export const initialize = function initialize({ app, api, ui }: IOptions) {
       }
 
       if (api.expose) {
-        app.get(api.url || "/openapi", (req, res) => {
+        app.get(api.url || "/apidocs", (_req, res) => {
           res.status(200).json(api.doc);
         });
         app.get(
-          api.url ? `${api.url}/expanded` : "/openapi/expanded",
-          (req, res) => {
+          api.url ? `${api.url}/expanded` : "/apidocs/expanded",
+          (_req, res) => {
             const readable = JSON.stringify(api.doc, undefined, 2);
             res.status(200).send(`<pre>${readable}</pre>`);
           },
         );
 
         console.log(
-          `OpenAPI spec is hosted at ${api.url || "/openapi"} and ${
-            api.url || "/openapi"
+          `OpenAPI spec is hosted at ${api.url || "/apidocs"} and ${
+            api.url || "/apidocs"
           }/expanded`,
         );
       }
@@ -115,7 +115,25 @@ const getFiles = async function* getFiles(
   path: string;
 }> {
   // get dirents from folder location.
-  const dirents = fs.readdirSync(folder, { withFileTypes: true });
+  const dirents = fs
+    .readdirSync(folder, { withFileTypes: true })
+    // .sort((a, b) => {
+    //   // sort directories to top of array
+    //   const aIsDir = a.isDirectory() ? 1 : 0;
+    //   const bIsDir = b.isDirectory() ? 1 : 0;
+    //   if (bIsDir > aIsDir) return 1;
+    //   if (bIsDir == aIsDir) return 0;
+    //   else return -1;
+    // })
+    .sort((a, b) => {
+      // sort dynamic routes to end
+      const regex = /\[(\w+)\]/i;
+      const aIsDynamic = regex.test(a.name) ? 1 : 0;
+      const bIsDynamic = regex.test(b.name) ? 1 : 0;
+      if (bIsDynamic < aIsDynamic) return 1;
+      if (bIsDynamic == aIsDynamic) return 0;
+      else return -1;
+    });
   // for each dirent, determine if it's a folder or file.
   for (const dirent of dirents) {
     const res = path.resolve(folder, dirent.name);