@leo-h/create-nodejs-app 1.0.52 → 1.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leo-h/create-nodejs-app",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "packageManager": "pnpm@9.15.9",
   "author": "Leonardo Henrique <leonardo0507.business@gmail.com>",
   "description": "Create a modern Node.js app with TypeScript using one command.",

package/templates/fastify/.lintstagedrc.json

@@ -1,4 +1,4 @@
 {
   "*.{js,ts,json,yaml,yml,md}": "prettier --write --cache",
-  "*.{js,ts}": ["eslint --max-warnings 0 --fix --cache --no-ignore"]
+  "*.{js,ts}": ["eslint --max-warnings 0 --fix --cache --no-warn-ignored"]
 }

package/templates/fastify/src/core/fastify/middleware.ts

@@ -0,0 +1,20 @@
+import { BaseError } from "@/http/errors";
+import { Constructor } from "type-fest";
+
+export type MiddlewareHandlerOutput<
+  Errors extends ReadonlyArray<Constructor<BaseError>>,
+> = Promise<MiddlewareLeft<InstanceType<Errors[number]>> | void>;
+
+export const middleware = Object.freeze({
+  left,
+} as const);
+
+class MiddlewareLeft<Error extends BaseError> {
+  public constructor(public readonly error: Error) {
+    throw error;
+  }
+}
+
+function left<Error extends BaseError>(error: Error) {
+  return new MiddlewareLeft<Error>(error);
+}

package/templates/fastify/src/core/schema.ts

@@ -17,3 +17,8 @@ export type ZodUnrestrictShape<Target> = {
 export type ZodUnrestrictFieldsShape<Target> = {
   [K in keyof Target | (string & {})]?: ZodTypeAny;
 };
+
+export type ZodUnrestrictEnumFromLiterals<Target extends string> = [
+  Target,
+  ...Target[],
+];

package/templates/fastify/src/http/controllers/hello-multipart.controller.ts

@@ -1,5 +1,5 @@
 import { FastifyZodInstance } from "@/@types/fastify";
-import { createControllerResponseSchema } from "@/core/create-controller-response-schema";
+import { createControllerResponseSchema } from "@/core/fastify/create-controller-response-schema";
 import { z } from "zod";
 import { InternalServerError, ValidationError } from "../errors";
 import {

package/templates/fastify/src/http/controllers/hello.controller.ts

@@ -1,5 +1,5 @@
 import { FastifyZodInstance } from "@/@types/fastify";
-import { createControllerResponseSchema } from "@/core/create-controller-response-schema";
+import { createControllerResponseSchema } from "@/core/fastify/create-controller-response-schema";
 import { z } from "zod";
 import { InternalServerError, ValidationError } from "../errors";
 

package/templates/react-vite/.lintstagedrc.json

@@ -1,4 +1,6 @@
 {
   "*.{js,jsx,ts,tsx,css,scss,html,json,yaml,yml,md}": "prettier --write --cache",
-  "*.{js,jsx,ts,tsx}": ["eslint --max-warnings 0 --fix --cache"]
+  "*.{js,jsx,ts,tsx}": [
+    "eslint --max-warnings 0 --fix --cache --no-ignore --no-warn-ignored"
+  ]
 }

package/templates/react-vite/.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": "explicit",
+    "source.fixAll.eslint": "explicit"
+  },
+  "css.lint.unknownAtRules": "ignore"
+}

package/templates/react-vite/api/errors.ts

@@ -6,9 +6,9 @@ export class ApiError {
   ) {}
 }
 
-export class ApiUnexpectedResponseError {
+export class ApiUnknownError {
   static readonly message =
-    "Houve uma falha inesperada ao se comunicar com nosso servidor. Aguarde alguns instantes ou contate nosso suporte.";
+    "Houve uma falha inesperada ao se comunicar com nosso servidor. Tente novamente em alguns segundos ou nos contate se o problema persistir.";
 
-  constructor(public message = ApiUnexpectedResponseError.message) {}
+  constructor(public message = ApiUnknownError.message) {}
 }

package/templates/react-vite/api/swr-fetcher.ts

@@ -1,7 +1,7 @@
 import { publicEnv } from "@/public-env";
-import { ApiError, ApiUnexpectedResponseError } from "./errors";
+import { ApiError, ApiUnknownError } from "./errors";
 
-type SwrFetcherOutput = {
+export type SwrFetcherOutput = {
   body: unknown;
   status: number;
   headers: Headers;
@@ -11,16 +11,19 @@ export async function swrFetcher<Output extends SwrFetcherOutput>(
   endpointUrl: RequestInfo | URL,
   options: RequestInit,
 ): Promise<Output> {
-  const url = new URL(publicEnv.API_BASE_URL);
+  const url = getFullUrlFromApiByEndpoint(endpointUrl);
+  let response: Response;
 
-  if (url.pathname.endsWith("/")) {
-    url.pathname = endpointUrl.toString();
-  } else {
-    url.pathname += endpointUrl;
+  try {
+    response = await fetch(url, {
+      credentials: "include",
+      ...options,
+    });
+  } catch {
+    throw new ApiUnknownError();
   }
 
-  const response = await fetch(endpointUrl, options);
-  let body: unknown;
+  let body: unknown = null;
 
   if (
     response.headers.get("Content-Type")?.includes("application/json") &&
@@ -38,7 +41,7 @@ export async function swrFetcher<Output extends SwrFetcherOutput>(
 
     if (error) throw new ApiError(error.statusCode, error.error, error.message);
 
-    throw new ApiUnexpectedResponseError();
+    throw new ApiUnknownError();
   }
 
   return {
@@ -47,3 +50,27 @@ export async function swrFetcher<Output extends SwrFetcherOutput>(
     headers: response.headers,
   } as Awaited<Output>;
 }
+
+function getFullUrlFromApiByEndpoint(endpointUrl: RequestInfo | URL) {
+  const url = new URL(publicEnv.API_BASE_URL);
+  const [pathname, stringifiedSearchParams] = endpointUrl.toString().split("?");
+
+  if (url.pathname.endsWith("/")) {
+    url.pathname = pathname;
+  } else {
+    url.pathname += pathname;
+  }
+
+  if (stringifiedSearchParams) {
+    const searchParams = new URLSearchParams(stringifiedSearchParams);
+
+    for (const searchParamKey of Array.from(searchParams.keys())) {
+      const searchParamValue = searchParams.get(searchParamKey);
+
+      if (searchParamValue)
+        url.searchParams.set(searchParamKey, searchParamValue);
+    }
+  }
+
+  return url;
+}

package/templates/react-vite/gitignore

@@ -13,7 +13,6 @@ dist-ssr
 *.local
 
 # Editor directories and files
-.vscode/*
 !.vscode/extensions.json
 .idea
 .DS_Store

package/templates/react-vite/src/app.tsx

@@ -1,5 +1,5 @@
 import { RouterProvider } from "react-router/dom";
-import { router } from "./routes";
+import { router } from "./lib/react-router-config";
 
 export function App() {
   return <RouterProvider router={router} />;

package/templates/react-vite/src/hooks/use-current-route.ts

@@ -0,0 +1,24 @@
+import { routeGroups } from "@/routes";
+import { useLocation } from "react-router";
+
+type RouteGroup = (typeof routeGroups)[number];
+
+type Route = RouteGroup extends Record<string, infer Route> ? Route : never;
+
+export function useCurrentRoute() {
+  const { pathname } = useLocation();
+  let currentRoute: Route | null = null;
+
+  for (const routeGroup of routeGroups) {
+    const matchedRoute = Object.values(routeGroup).find(route => {
+      return route.path === pathname;
+    });
+
+    if (matchedRoute) {
+      currentRoute = matchedRoute;
+      break;
+    }
+  }
+
+  return currentRoute;
+}

package/templates/react-vite/src/lib/react-router-config.tsx

@@ -0,0 +1,32 @@
+import { AppLayout } from "@/pages/_layouts/app";
+import { AuthLayout } from "@/pages/_layouts/auth";
+import { privateRoutes, publicRoutes } from "@/routes";
+import { createBrowserRouter, RouteObject } from "react-router";
+
+export const router = createBrowserRouter([
+  {
+    element: <AuthLayout />,
+    children: [
+      ...Object.values(publicRoutes).map(
+        publicRoute =>
+          ({
+            path: publicRoute.path,
+            element: <publicRoute.element />,
+            index: true,
+          }) satisfies RouteObject,
+      ),
+    ],
+  },
+  {
+    element: <AppLayout />,
+    children: [
+      ...Object.values(privateRoutes).map(
+        publicRoute =>
+          ({
+            path: publicRoute.path,
+            element: <publicRoute.element />,
+          }) satisfies RouteObject,
+      ),
+    ],
+  },
+]);

package/templates/react-vite/src/pages/_layouts/app.tsx

@@ -1,15 +1,12 @@
-import { privateRoutes } from "@/routes";
-import { Outlet, useLocation } from "react-router";
+import { useCurrentRoute } from "@/hooks/use-current-route";
+import { Outlet } from "react-router";
 
 export function AppLayout() {
-  const { pathname } = useLocation();
-  const currentPublicRoute = Object.values(privateRoutes).find(privateRoute => {
-    return privateRoute.path === pathname;
-  });
+  const currentRoute = useCurrentRoute();
 
   return (
     <>
-      {currentPublicRoute && <title>{currentPublicRoute.title}</title>}
+      {currentRoute && <title>{currentRoute.title}</title>}
 
       <div>
         <Outlet />

package/templates/react-vite/src/pages/_layouts/auth.tsx

@@ -1,15 +1,12 @@
-import { publicRoutes } from "@/routes";
-import { Outlet, useLocation } from "react-router";
+import { useCurrentRoute } from "@/hooks/use-current-route";
+import { Outlet } from "react-router";
 
 export function AuthLayout() {
-  const { pathname } = useLocation();
-  const currentPublicRoute = Object.values(publicRoutes).find(publicRoute => {
-    return publicRoute.path === pathname;
-  });
+  const currentRoute = useCurrentRoute();
 
   return (
     <>
-      {currentPublicRoute && <title>{currentPublicRoute.title}</title>}
+      {currentRoute && <title>{currentRoute.title}</title>}
 
       <div>
         <Outlet />

package/templates/react-vite/src/pages/app/dashboard/{dashboard.tsx → index.tsx}

@@ -2,7 +2,7 @@ import { publicRoutes } from "@/routes";
 import { Link } from "react-router";
 import "./styles.css";
 
-export function Dashboard() {
+export function DashboardPage() {
   return (
     <div className="dashboard-wrapper">
       <h1>Hello world!</h1>

package/templates/react-vite/src/pages/auth/sign-in/index.tsx

@@ -12,7 +12,7 @@ const signInFormSchema = z.object({
 
 type SignInForm = z.infer<typeof signInFormSchema>;
 
-export function SignIn() {
+export function SignInPage() {
   const navigate = useNavigate();
 
   const signInForm = useForm<SignInForm>({

package/templates/react-vite/src/routes.ts

@@ -0,0 +1,27 @@
+import { DashboardPage } from "./pages/app/dashboard";
+import { SignInPage } from "./pages/auth/sign-in";
+import { publicEnv } from "./public-env";
+
+export const publicRoutes = Object.freeze({
+  signIn: {
+    path: "/",
+    element: SignInPage,
+    title: createPageTitleTemplate("Sign In"),
+    label: "Sign In",
+  },
+} as const);
+
+export const privateRoutes = Object.freeze({
+  dashboard: {
+    path: "/dashboard",
+    element: DashboardPage,
+    title: createPageTitleTemplate("Dashboard"),
+    label: "Dashboard",
+  },
+} as const);
+
+export const routeGroups = [publicRoutes, privateRoutes] as const;
+
+function createPageTitleTemplate(title: string) {
+  return `${title} | ${publicEnv.APP_NAME}`;
+}

package/templates/react-vite/src/@types/routes.ts

@@ -1,24 +0,0 @@
-import { RouteObject } from "react-router";
-import { OverrideProperties } from "type-fest";
-
-export type CustomRouteDefinition = {
-  path: string;
-  label: string;
-};
-
-export type ReactRouterRouteDefinition<Routes extends CustomRouteDefinition[]> =
-  OverrideProperties<
-    RouteObject,
-    {
-      path: Routes[number]["path"] | "*";
-      handle: ReactRouterRouteHandleDefinition;
-    }
-  >;
-
-export type ReactRouterRouteHandleDefinition = {
-  metadata: {
-    title: string;
-    description?: string;
-  };
-  [K: string]: unknown;
-};

package/templates/react-vite/src/routes.tsx

@@ -1,49 +0,0 @@
-import { createBrowserRouter, RouteObject } from "react-router";
-import { AppLayout } from "./pages/_layouts/app";
-import { AuthLayout } from "./pages/_layouts/auth";
-import { Dashboard } from "./pages/app/dashboard/dashboard";
-import { SignIn } from "./pages/auth/sign-in";
-import { publicEnv } from "./public-env";
-
-export const publicRoutes = Object.freeze({
-  signIn: {
-    path: "/",
-    element: <SignIn />,
-    title: createTitleTemplate("Sign In"),
-  },
-} as const);
-
-export const privateRoutes = Object.freeze({
-  dashboard: {
-    path: "/dashboard",
-    element: <Dashboard />,
-    title: createTitleTemplate("Dashboard"),
-  },
-} as const);
-
-export const router = createBrowserRouter([
-  {
-    element: <AuthLayout />,
-    children: [
-      ...Object.values(publicRoutes).map<RouteObject>(publicRoute => ({
-        path: publicRoute.path,
-        element: publicRoute.element,
-        index: true,
-      })),
-    ],
-  },
-  {
-    element: <AppLayout />,
-    children: [
-      ...Object.values(privateRoutes).map<RouteObject>(publicRoute => ({
-        path: publicRoute.path,
-        element: publicRoute.element,
-        index: true,
-      })),
-    ],
-  },
-]);
-
-function createTitleTemplate(title: string) {
-  return `${title} | ${publicEnv.APP_NAME}`;
-}