@granite-js/plugin-router 0.1.30 → 0.1.32

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @granite-js/plugin-router
 
+## 0.1.32
+
+### Patch Changes
+
+- 7572713: bump version up babel
+- Updated dependencies [7572713]
+  - @granite-js/plugin-core@0.1.32
+
+## 0.1.31
+
+### Patch Changes
+
+- 37ae3f3: feat(router): supports standard schema
+- Updated dependencies [9bf8b50]
+- Updated dependencies [e957833]
+  - @granite-js/plugin-core@0.1.31
+
 ## 0.1.30
 
 ### Patch Changes

package/dist/index.cjs

@@ -21,12 +21,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const fs = __toESM(require("fs"));
-const path = __toESM(require("path"));
-const __swc_core = __toESM(require("@swc/core"));
-const es_toolkit = __toESM(require("es-toolkit"));
-const fs_promises = __toESM(require("fs/promises"));
-const chokidar = __toESM(require("chokidar"));
+let fs = require("fs");
+let path = require("path");
+let __swc_core = require("@swc/core");
+let es_toolkit = require("es-toolkit");
+let fs_promises = require("fs/promises");
+let chokidar = require("chokidar");
+chokidar = __toESM(chokidar);
 
 //#region src/checkExportRoute.ts
 /**
@@ -38,20 +39,18 @@ function checkExportRoute(path$1) {
 			syntax: "typescript",
 			tsx: true
 		});
-		const hasExportSpecifiers = ast.body.some((node) => {
+		if (ast.body.some((node) => {
 			if (node.type !== "ExportNamedDeclaration") return false;
 			return node.specifiers?.some((specifier) => {
 				if (specifier.type !== "ExportSpecifier") return false;
 				return specifier.orig?.value === "Route";
 			});
-		});
-		if (hasExportSpecifiers) return true;
-		const hasExportNamedVariable = ast.body.some((node) => {
+		})) return true;
+		return ast.body.some((node) => {
 			if (node.type !== "ExportDeclaration") return false;
 			if (node.declaration.type !== "VariableDeclaration") return false;
 			return node.declaration.declarations.some((declaration) => declaration.id.type === "Identifier" && declaration.id.value === "Route");
 		});
-		return hasExportNamedVariable;
 	} catch {
 		return false;
 	}
@@ -60,11 +59,9 @@ function checkExportRoute(path$1) {
 //#endregion
 //#region src/getComponentName.ts
 function getComponentName(filePath) {
-	const path$1 = filePath.replace(/^pages\//, "").replace(/\.(tsx|ts)$/, "");
-	const segments = path$1.split("/").filter(Boolean);
+	const segments = filePath.replace(/^pages\//, "").replace(/\.(tsx|ts)$/, "").split("/").filter(Boolean);
 	if (segments[segments.length - 1] === "index") segments.pop();
-	const componentName = segments.map((segment) => (0, es_toolkit.pascalCase)(segment)).join("");
-	return componentName || "Index";
+	return segments.map((segment) => (0, es_toolkit.pascalCase)(segment)).join("") || "Index";
 }
 
 //#endregion
@@ -100,6 +97,10 @@ const ROUTER_GEN_TEMPLATE = `/* eslint-disable */
 %%pageImports%%
 
 declare module '@granite-js/react-native' {
+  interface RegisterScreenInput {
+%%pageInputRoutes%%
+  }
+
   interface RegisterScreen {
 %%pageRoutes%%
   }
@@ -141,8 +142,7 @@ function transformTemplate(templateString, values) {
 function generateRouterFile() {
 	const cwd = process.cwd();
 	function getPageFiles(dir, prefix = "") {
-		const files = (0, fs.readdirSync)((0, path.join)(cwd, dir), { withFileTypes: true });
-		return files.reduce((acc, file) => {
+		return (0, fs.readdirSync)((0, path.join)(cwd, dir), { withFileTypes: true }).reduce((acc, file) => {
 			if (file.isDirectory()) return [...acc, ...getPageFiles(`${dir}/${file.name}`, `${prefix}${file.name}/`)];
 			if (file.name.endsWith(".tsx") || file.name.endsWith(".ts")) {
 				const name = (0, path.parse)(file.name).name;
@@ -155,30 +155,29 @@ function generateRouterFile() {
 	const allPages = getPageFiles("pages");
 	const exportRouteMap = new Map(allPages.map((page) => [page, checkExportRoute((0, path.join)(cwd, "pages", page))]));
 	const pageFiles = allPages.filter((page) => !page.startsWith("_") && exportRouteMap.get(page));
-	const pageImports = pageFiles.map((page) => {
-		const componentName = getComponentName(page);
-		const pagePath = getPath(page);
-		return transformTemplate("import { Route as _%%componentName%%Route } from '../pages%%pagePath%%';", {
-			componentName,
-			pagePath
-		});
-	}).join("\n");
-	const pageRoutes = pageFiles.map((page) => {
-		const componentName = getComponentName(page);
-		const pagePath = getPath(page);
-		return transformTemplate("    '%%pagePath%%': ReturnType<typeof _%%componentName%%Route.useParams>;", {
-			componentName,
-			pagePath
-		});
-	}).join("\n");
 	const generatedContent = transformTemplate(ROUTER_GEN_TEMPLATE, {
-		pageImports,
-		pageRoutes
+		pageImports: pageFiles.map((page) => {
+			return transformTemplate("import { Route as _%%componentName%%Route } from '../pages%%pagePath%%';", {
+				componentName: getComponentName(page),
+				pagePath: getPath(page)
+			});
+		}).join("\n"),
+		pageInputRoutes: pageFiles.map((page) => {
+			return transformTemplate("    '%%pagePath%%': (typeof _%%componentName%%Route)['_inputType'];", {
+				componentName: getComponentName(page),
+				pagePath: getPath(page)
+			});
+		}).join("\n"),
+		pageRoutes: pageFiles.map((page) => {
+			return transformTemplate("    '%%pagePath%%': (typeof _%%componentName%%Route)['_outputType'];", {
+				componentName: getComponentName(page),
+				pagePath: getPath(page)
+			});
+		}).join("\n")
 	});
 	const routerFilePath = (0, path.join)(cwd, "src", "router.gen.ts");
 	if ((0, fs.existsSync)(routerFilePath)) {
-		const existingContent = (0, fs.readFileSync)(routerFilePath, "utf-8");
-		if (existingContent === generatedContent) return;
+		if ((0, fs.readFileSync)(routerFilePath, "utf-8") === generatedContent) return;
 	}
 	(0, fs.writeFileSync)(routerFilePath, generatedContent);
 	console.log("✅ Router file generated successfully!");
@@ -221,9 +220,7 @@ function watchRouter() {
 		cwd: process.cwd()
 	});
 	const handleAdd = async (path$1) => {
-		const file = (0, path.join)(process.cwd(), path$1);
-		const code = await (0, fs_promises.readFile)(file, "utf8");
-		if (code !== "") return;
+		if (await (0, fs_promises.readFile)((0, path.join)(process.cwd(), path$1), "utf8") !== "") return;
 		const filename = (0, path.parse)(path$1).name;
 		if (filename.startsWith("_")) switch (filename) {
 			case "_layout":

package/dist/index.d.cts

@@ -5,6 +5,5 @@ interface RouterPluginOptions {
   watch?: boolean;
 }
 declare const router: (options?: RouterPluginOptions) => GranitePluginCore;
-
 //#endregion
 export { router };

package/dist/index.d.ts

@@ -5,6 +5,5 @@ interface RouterPluginOptions {
   watch?: boolean;
 }
 declare const router: (options?: RouterPluginOptions) => GranitePluginCore;
-
 //#endregion
 export { router };

package/dist/index.js

@@ -15,20 +15,18 @@ function checkExportRoute(path) {
 			syntax: "typescript",
 			tsx: true
 		});
-		const hasExportSpecifiers = ast.body.some((node) => {
+		if (ast.body.some((node) => {
 			if (node.type !== "ExportNamedDeclaration") return false;
 			return node.specifiers?.some((specifier) => {
 				if (specifier.type !== "ExportSpecifier") return false;
 				return specifier.orig?.value === "Route";
 			});
-		});
-		if (hasExportSpecifiers) return true;
-		const hasExportNamedVariable = ast.body.some((node) => {
+		})) return true;
+		return ast.body.some((node) => {
 			if (node.type !== "ExportDeclaration") return false;
 			if (node.declaration.type !== "VariableDeclaration") return false;
 			return node.declaration.declarations.some((declaration) => declaration.id.type === "Identifier" && declaration.id.value === "Route");
 		});
-		return hasExportNamedVariable;
 	} catch {
 		return false;
 	}
@@ -37,11 +35,9 @@ function checkExportRoute(path) {
 //#endregion
 //#region src/getComponentName.ts
 function getComponentName(filePath) {
-	const path = filePath.replace(/^pages\//, "").replace(/\.(tsx|ts)$/, "");
-	const segments = path.split("/").filter(Boolean);
+	const segments = filePath.replace(/^pages\//, "").replace(/\.(tsx|ts)$/, "").split("/").filter(Boolean);
 	if (segments[segments.length - 1] === "index") segments.pop();
-	const componentName = segments.map((segment) => pascalCase(segment)).join("");
-	return componentName || "Index";
+	return segments.map((segment) => pascalCase(segment)).join("") || "Index";
 }
 
 //#endregion
@@ -77,6 +73,10 @@ const ROUTER_GEN_TEMPLATE = `/* eslint-disable */
 %%pageImports%%
 
 declare module '@granite-js/react-native' {
+  interface RegisterScreenInput {
+%%pageInputRoutes%%
+  }
+
   interface RegisterScreen {
 %%pageRoutes%%
   }
@@ -118,8 +118,7 @@ function transformTemplate(templateString, values) {
 function generateRouterFile() {
 	const cwd = process.cwd();
 	function getPageFiles(dir, prefix = "") {
-		const files = readdirSync(join(cwd, dir), { withFileTypes: true });
-		return files.reduce((acc, file) => {
+		return readdirSync(join(cwd, dir), { withFileTypes: true }).reduce((acc, file) => {
 			if (file.isDirectory()) return [...acc, ...getPageFiles(`${dir}/${file.name}`, `${prefix}${file.name}/`)];
 			if (file.name.endsWith(".tsx") || file.name.endsWith(".ts")) {
 				const name = parse(file.name).name;
@@ -132,30 +131,29 @@ function generateRouterFile() {
 	const allPages = getPageFiles("pages");
 	const exportRouteMap = new Map(allPages.map((page) => [page, checkExportRoute(join(cwd, "pages", page))]));
 	const pageFiles = allPages.filter((page) => !page.startsWith("_") && exportRouteMap.get(page));
-	const pageImports = pageFiles.map((page) => {
-		const componentName = getComponentName(page);
-		const pagePath = getPath(page);
-		return transformTemplate("import { Route as _%%componentName%%Route } from '../pages%%pagePath%%';", {
-			componentName,
-			pagePath
-		});
-	}).join("\n");
-	const pageRoutes = pageFiles.map((page) => {
-		const componentName = getComponentName(page);
-		const pagePath = getPath(page);
-		return transformTemplate("    '%%pagePath%%': ReturnType<typeof _%%componentName%%Route.useParams>;", {
-			componentName,
-			pagePath
-		});
-	}).join("\n");
 	const generatedContent = transformTemplate(ROUTER_GEN_TEMPLATE, {
-		pageImports,
-		pageRoutes
+		pageImports: pageFiles.map((page) => {
+			return transformTemplate("import { Route as _%%componentName%%Route } from '../pages%%pagePath%%';", {
+				componentName: getComponentName(page),
+				pagePath: getPath(page)
+			});
+		}).join("\n"),
+		pageInputRoutes: pageFiles.map((page) => {
+			return transformTemplate("    '%%pagePath%%': (typeof _%%componentName%%Route)['_inputType'];", {
+				componentName: getComponentName(page),
+				pagePath: getPath(page)
+			});
+		}).join("\n"),
+		pageRoutes: pageFiles.map((page) => {
+			return transformTemplate("    '%%pagePath%%': (typeof _%%componentName%%Route)['_outputType'];", {
+				componentName: getComponentName(page),
+				pagePath: getPath(page)
+			});
+		}).join("\n")
 	});
 	const routerFilePath = join(cwd, "src", "router.gen.ts");
 	if (existsSync(routerFilePath)) {
-		const existingContent = readFileSync(routerFilePath, "utf-8");
-		if (existingContent === generatedContent) return;
+		if (readFileSync(routerFilePath, "utf-8") === generatedContent) return;
 	}
 	writeFileSync(routerFilePath, generatedContent);
 	console.log("✅ Router file generated successfully!");
@@ -198,9 +196,7 @@ function watchRouter() {
 		cwd: process.cwd()
 	});
 	const handleAdd = async (path) => {
-		const file = join(process.cwd(), path);
-		const code = await readFile(file, "utf8");
-		if (code !== "") return;
+		if (await readFile(join(process.cwd(), path), "utf8") !== "") return;
 		const filename = parse(path).name;
 		if (filename.startsWith("_")) switch (filename) {
 			case "_layout":

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@granite-js/plugin-router",
   "type": "module",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "description": "A Route Generator for Granite project",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -35,13 +35,13 @@
   ],
   "devDependencies": {
     "@types/node": "^22.10.2",
-    "@vitest/coverage-v8": "^2.1.8",
-    "tsdown": "^0.11.12",
+    "@vitest/coverage-v8": "^4.0.12",
+    "tsdown": "^0.16.5",
     "typescript": "5.8.3",
-    "vitest": "^2.1.8"
+    "vitest": "^4.0.12"
   },
   "dependencies": {
-    "@granite-js/plugin-core": "0.1.30",
+    "@granite-js/plugin-core": "0.1.32",
     "@swc/core": "1.5.24",
     "chokidar": "4.0.1",
     "es-toolkit": "^1.39.8"