@sealcode/sealgen 0.17.31 → 0.17.32

package/@types/src/generate-routes.d.ts

@@ -1,2 +1,5 @@
 export declare function generateURL(actionName: string, url: string): string;
+export declare function sortRoutes<T extends {
+    url: string;
+}>(urls: T[]): T[];
 export declare function generateRoutes(): Promise<void>;

package/lib/generate-routes.js

@@ -33,6 +33,11 @@ function generateURL(actionName, url) {
         ${actionName}URL.params = [${params.map((param) => `"${param}"`).join(",")}];
         ${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
+  );
+}
 async function generateRoutes() {
   const files = await Promise.all(
     (await walkDir(target_locreq.resolve("src/back/routes"))).filter(
@@ -60,7 +65,7 @@ import type Router from "@koa/router";
 import { mount } from "@sealcode/sealgen";
 import * as URLs from "./urls.js"
 
-${files.map(
+${sortRoutes(files).map(
     ({ actionName, fullpath }) => `import { default as ${actionName} } from "${importPath(
       target_locreq.resolve("src/back/routes/routes.ts"),
       fullpath
@@ -68,13 +73,11 @@ ${files.map(
   ).join("\n")}
 
 export default function mountAutoRoutes(router: Router) {
-${files.sort(
-    ({ url: url1 }, { url: url2 }) => url1.includes(":") ? 1 : url2.includes(":") ? -1 : url1 < url2 ? -1 : 1
-  ).map(
+${sortRoutes(files).map(
     ({ actionName }) => `	mount(router, URLs.${actionName}URL, ${actionName});`
   ).join("\n")}
 }`;
-  const urls_content = `${files.sort(({ url: url1 }, { url: url2 }) => url1 < url2 ? -1 : 1).map(({ actionName, url }) => generateURL(actionName, url)).join("\n")}
+  const urls_content = `${sortRoutes(files).sort(({ url: url1 }, { url: url2 }) => url1 < url2 ? -1 : 1).map(({ actionName, url }) => generateURL(actionName, url)).join("\n")}
 `;
   const prettier_config = await getPrettierConfig();
   await fs.writeFile(
@@ -91,6 +94,7 @@ ${files.sort(
 }
 export {
   generateRoutes,
-  generateURL
+  generateURL,
+  sortRoutes
 };
 //# sourceMappingURL=generate-routes.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.17.31",
+	"version": "0.17.32",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",

package/src/generate-routes.ts

@@ -47,6 +47,18 @@ export function generateURL(actionName: string, url: string) {
         ${actionName}URL.rawURL = "${encodeURI(url)}";`;
 }
 
+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
+	);
+}
+
 export async function generateRoutes(): Promise<void> {
 	const files = await Promise.all(
 		(
@@ -84,7 +96,7 @@ import type Router from "@koa/router";
 import { mount } from "@sealcode/sealgen";
 import * as URLs from "./urls.js"
 
-${files
+${sortRoutes(files)
 	.map(
 		({ actionName, fullpath }) =>
 			`import { default as ${actionName} } from "${importPath(
@@ -95,17 +107,7 @@ ${files
 	.join("\n")}
 
 export default function mountAutoRoutes(router: Router) {
-${files
-
-	.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
-	)
+${sortRoutes(files)
 	.map(
 		({ actionName }) =>
 			`	mount(router, URLs.${actionName}URL, ${actionName});`
@@ -113,7 +115,7 @@ ${files
 	.join("\n")}
 }`;
 
-	const urls_content = `${files
+	const urls_content = `${sortRoutes(files)
 		.sort(({ url: url1 }, { url: url2 }) => (url1 < url2 ? -1 : 1))
 		.map(({ actionName, url }) => generateURL(actionName, url))
 		.join("\n")}