Add extractInnerWord utility and update route generators to utilize it

Author: sagarsen2023

src/templates/next-js/route-generator.ts

@@ -11,6 +11,7 @@ import {
   generateNextJsDynamicSegmentInterface,
   getNextJsDynamicSegments,
 } from "./utils/get-next-js-dynamic-segments";
+import { extractInnerWord } from "../../utils/extract-inner-bracket-word";
 
 const successLog = (text: string) => console.log(chalk.greenBright(text));
 const infoLog = (text: string) => console.log(chalk.blueBright(text));
@@ -52,7 +53,7 @@ function Page(${isDynamic ? "{ params }:{ params: Promise<PageProps> }" : ""}) {
 }
 
 export default Page;
-`
+`,
     );
     successLog(`✓ Generated route file: ${newRoutePath}`);
   } else {
@@ -80,7 +81,7 @@ const generateModule = ({
     "src",
     "modules",
     parentPath,
-    parentPath.endsWith(lastStaticPath) ? "" : lastStaticPath // ? If route is: /user/:id/:orders/create then the complete route will be /user/create
+    parentPath.endsWith(lastStaticPath) ? "" : lastStaticPath, // ? If route is: /user/:id/:orders/create then the complete route will be /user/create
   );
   fs.ensureDirSync(modulePath);
   const newModulePath = `${modulePath}/index.${fileExtension}x`;
@@ -99,7 +100,7 @@ const generateModule = ({
 }
 
 export default ${moduleName};
-`
+`,
     );
     successLog(`✓ Generated module file: ${newModulePath}`);
   } else {
@@ -144,7 +145,7 @@ export const ${textToCamelCase({
       //     });
       //   },
 };
-`
+`,
     );
     successLog(`✓ Generated service file: ${newServicePath}`);
   } else {
@@ -191,7 +192,7 @@ const generateTypescriptType = ({
       })}Type {
   // Define your type properties here
 }
-`
+`,
     );
     successLog(`✓ Generated typescript type file: ${newTypePath}`);
   } else {
@@ -207,8 +208,15 @@ const generateTypescriptType = ({
  */
 export const nextRouteGenerator = (route: string) => {
   try {
-    const parentPath = staticParentPath(route);
-    const lastStaticPath = lastStaticSegment(route);
+    const parentPath = staticParentPath(route)
+      .split("/")
+      .map((seg) => extractInnerWord(seg))
+      .join("/");
+    const lastStaticPath = lastStaticSegment(route)
+      .split("/")
+      .map((seg) => extractInnerWord(seg))
+      .join("/");
+
     const { fileExtension } = getCalmUiJson();
 
     // ---------- GENERATING ROUTE FILE ----------

src/templates/vite-react/route-generator.ts

@@ -8,6 +8,7 @@ import { staticParentPath } from "./utils/static-parent-path";
 import { lastStaticSegment } from "./utils/last-static-segment";
 import { routeToTanstackPath } from "./utils/route-to-tanstack-path";
 import { getTanstackDynamicSegments } from "./utils/get-tanstack-dynamic-segments";
+import { extractInnerWord } from "../../utils/extract-inner-bracket-word";
 
 const successLog = (text: string) => console.log(chalk.greenBright(text));
 const infoLog = (text: string) => console.log(chalk.blueBright(text));
@@ -58,7 +59,7 @@ function RouteComponent() {
   }
   return <div>Hello "${route}"!</div>
 }
-`
+`,
     );
     successLog(`✓ Generated route file: ${newRoutePath}`);
   } else {
@@ -86,7 +87,7 @@ const generateModule = ({
     "src",
     "modules",
     parentPath,
-    parentPath.endsWith(lastStaticPath) ? "" : lastStaticPath // ? If route is: /user/:id/:orders/create then the complete route will be /user/create
+    parentPath.endsWith(lastStaticPath) ? "" : lastStaticPath, // ? If route is: /user/:id/:orders/create then the complete route will be /user/create
   );
   fs.ensureDirSync(modulePath);
   const newModulePath = `${modulePath}/index.${fileExtension}x`;
@@ -105,7 +106,7 @@ const generateModule = ({
 }
 
 export default ${moduleName};
-`
+`,
     );
     successLog(`✓ Generated module file: ${newModulePath}`);
   } else {
@@ -150,7 +151,7 @@ export const ${textToCamelCase({
       //     });
       //   },
 };
-`
+`,
     );
     successLog(`✓ Generated service file: ${newServicePath}`);
   } else {
@@ -197,7 +198,7 @@ const generateTypescriptType = ({
       })}Type {
   // Define your type properties here
 }
-`
+`,
     );
     successLog(`✓ Generated typescript type file: ${newTypePath}`);
   } else {
@@ -214,8 +215,15 @@ const generateTypescriptType = ({
 export const viteRouteGenerator = (route: string) => {
   try {
     const { fileExtension } = getCalmUiJson();
-    const parentPath = staticParentPath(route);
-    const lastStaticPath = lastStaticSegment(route);
+    const parentPath = staticParentPath(route)
+      .split("/")
+      .map((seg) => extractInnerWord(seg))
+      .join("/");
+
+    const lastStaticPath = lastStaticSegment(route)
+      .split("/")
+      .map((seg) => extractInnerWord(seg))
+      .join("/");
 
     // ---------- GENERATING ROUTES ----------
     generateRoute({

src/utils/extract-inner-bracket-word.ts

@@ -0,0 +1,6 @@
+export function extractInnerWord(s: string) {
+  if (s.startsWith("(") && s.endsWith(")")) {
+    return s.slice(1, -1);
+  }
+  return s;
+}