@sealcode/sealgen 0.18.6 → 0.18.7

package/lib/esbuild-plugins/rewrite-asset-imports.js

@@ -1,7 +1,6 @@
 import { promises as fs } from "fs";
 import { extname, resolve } from "node:path";
 import { embeddable_file_extensions } from "../embeddable-file-extensions.js";
-import { compile } from "@sealcode/tempstream-esbuild";
 const rewrite_asset_imports_plugin = (project_dir) => ({
   name: "sealgen-rewrite-asset-imports",
   setup(build) {
@@ -31,9 +30,6 @@ const rewrite_asset_imports_plugin = (project_dir) => ({
           return replaced;
         }
       );
-      if (extname(args.path) === ".tsx") {
-        contents = compile(contents, args.path);
-      }
       return {
         contents,
         loader: extname(args.path) === ".tsx" ? "tsx" : "ts"

package/lib/generate-routes.js

@@ -34,9 +34,21 @@ function generateURL(actionName, url) {
         ${actionName}URL.rawURL = "${encodeURI(url)}";`;
 }
 function sortRoutes(urls) {
-  return urls.sort(
-    ({ url: url1 }, { url: url2 }) => url1.includes(":") ? 1 : url2.includes(":") ? -1 : url1 < url2 ? -1 : 1
-  );
+  return urls.sort(({ url: url1 }, { url: url2 }) => {
+    const [segments1, segments2] = [url1, url2].map(
+      (url) => url.split("/")
+    );
+    if (segments1.length < segments2.length) {
+      return -1;
+    }
+    if (segments1.length > segments2.length) {
+      return 1;
+    }
+    const [encoded1, encoded2] = [url1, url2].map(
+      (url) => url.split("/").map((e) => e.startsWith(":") ? "1" : "0")
+    );
+    return encoded1 < encoded2 ? -1 : 1;
+  });
 }
 async function generateRoutes() {
   const files = await Promise.all(

package/lib/generate-routes.test.js

@@ -1,4 +1,4 @@
-import { generateURL } from "./generate-routes.js";
+import { generateURL, sortRoutes } from "./generate-routes.js";
 import * as prettier from "prettier";
 import { getPrettierConfig } from "./utils/prettier.js";
 import assert from "node:assert";
@@ -37,5 +37,29 @@ EditUserURL.rawURL = "/admin/u%C5%BCytkownicy/:id/edit/";`,
       )
     );
   });
+  it("sorts routes from most specific first to least specific last, considering directory structure", () => {
+    assert.deepStrictEqual(
+      sortRoutes(
+        [
+          "/home",
+          "/foo/:bar/:baz",
+          "/:param1/:param2/:param3",
+          "/foo/bar/baz",
+          "/foo/:bar",
+          "/:param1"
+        ].map((url) => ({
+          url
+        }))
+      ).map(({ url }) => url),
+      [
+        "/home",
+        "/:param1",
+        "/foo/:bar",
+        "/foo/bar/baz",
+        "/foo/:bar/:baz",
+        "/:param1/:param2/:param3"
+      ]
+    );
+  });
 });
 //# sourceMappingURL=generate-routes.test.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.18.6",
+	"version": "0.18.7",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",
@@ -62,7 +62,6 @@
 	"dependencies": {
 		"@koa/router": "^12.0.1",
 		"@sealcode/file-manager": "^1.0.2",
-		"@sealcode/tempstream-esbuild": "^0.1.0",
 		"@sealcode/ts-predicates": "^0.4.3",
 		"chokidar": "^3.6.0",
 		"colord": "^2.9.3",

package/src/esbuild-plugins/rewrite-asset-imports.ts

@@ -2,7 +2,6 @@ import { promises as fs } from "fs";
 import { extname, resolve } from "node:path";
 import { embeddable_file_extensions } from "../embeddable-file-extensions.js";
 import { PluginBuild } from "esbuild";
-import { compile } from "@sealcode/tempstream-esbuild";
 
 export const rewrite_asset_imports_plugin = (project_dir: string) => ({
 	name: "sealgen-rewrite-asset-imports",
@@ -34,9 +33,6 @@ export const rewrite_asset_imports_plugin = (project_dir: string) => ({
 				}
 			);
 
-			if (extname(args.path) === ".tsx") {
-				contents = compile(contents, args.path);
-			}
 			return {
 				contents,
 				loader: extname(args.path) === ".tsx" ? "tsx" : "ts",

package/src/generate-routes.test.ts

@@ -1,4 +1,4 @@
-import { generateURL } from "./generate-routes.js";
+import { generateURL, sortRoutes } from "./generate-routes.js";
 import * as prettier from "prettier";
 import { getPrettierConfig } from "./utils/prettier.js";
 import assert from "node:assert";
@@ -40,4 +40,29 @@ EditUserURL.rawURL = "/admin/u%C5%BCytkownicy/:id/edit/";`,
 			)
 		);
 	});
+
+	it("sorts routes from most specific first to least specific last, considering directory structure", () => {
+		assert.deepStrictEqual(
+			sortRoutes(
+				[
+					"/home",
+					"/foo/:bar/:baz",
+					"/:param1/:param2/:param3",
+					"/foo/bar/baz",
+					"/foo/:bar",
+					"/:param1",
+				].map((url) => ({
+					url,
+				}))
+			).map(({ url }: { url: string }) => url),
+			[
+				"/home",
+				"/:param1",
+				"/foo/:bar",
+				"/foo/bar/baz",
+				"/foo/:bar/:baz",
+				"/:param1/:param2/:param3",
+			]
+		);
+	});
 });

package/src/generate-routes.ts

@@ -48,15 +48,24 @@ export function generateURL(actionName: string, url: string) {
 }
 
 export function sortRoutes<T extends { url: string }>(urls: T[]): T[] {
-	return urls.sort(({ url: url1 }, { url: url2 }) =>
-		url1.includes(":") // make sure the parametrized ones come later, so the more concrete ones show up first. This is not a full solution, but works for single-parameter urls
-			? 1
-			: url2.includes(":")
-			? -1
-			: url1 < url2
-			? -1
-			: 1
-	);
+	return urls.sort(({ url: url1 }, { url: url2 }) => {
+		const [segments1, segments2] = [url1, url2].map((url) =>
+			url.split("/")
+		);
+		if (segments1.length < segments2.length) {
+			return -1;
+		}
+		if (segments1.length > segments2.length) {
+			return 1;
+		}
+		// if they are the same length, map each url to a string like 00010
+		// where "0" is for static (so should be sorted earlier, and "1" is for
+		// dynamic parts
+		const [encoded1, encoded2] = [url1, url2].map((url) =>
+			url.split("/").map((e) => (e.startsWith(":") ? "1" : "0"))
+		);
+		return encoded1 < encoded2 ? -1 : 1;
+	});
 }
 
 export async function generateRoutes(): Promise<void> {