refactor: remove useless stuff in Dockerfile

.adonisjs/api.ts

@@ -0,0 +1,467 @@
+import type { MakeTuyauRequest, MakeTuyauResponse } from '@tuyau/utils/types';
+import type { InferInput } from '@vinejs/vine/types';
+
+type UserThemePost = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/user.ts'))['updateUserThemeValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/apps_controller.ts').default['updateUserTheme']
+	>;
+};
+type FaviconGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/favicons_controller.ts').default['index']
+	>;
+};
+type SharedIdGetHead = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/shared_collection.ts'))['getSharedCollectionValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/shared_collections_controller.ts').default['index']
+	>;
+};
+type AdminGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/admin_controller.ts').default['index']
+	>;
+};
+type AuthLoginGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/users_controller.ts').default['login']
+	>;
+};
+type AuthCallbackGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/users_controller.ts').default['callbackAuth']
+	>;
+};
+type AuthLogoutGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/users_controller.ts').default['logout']
+	>;
+};
+type DashboardGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/collections_controller.ts').default['index']
+	>;
+};
+type CollectionsCreateGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/collections_controller.ts').default['showCreatePage']
+	>;
+};
+type CollectionsPost = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/collection.ts'))['createCollectionValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/collections_controller.ts').default['store']
+	>;
+};
+type CollectionsEditGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/collections_controller.ts').default['showEditPage']
+	>;
+};
+type CollectionsIdPut = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/collection.ts'))['updateCollectionValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/collections_controller.ts').default['update']
+	>;
+};
+type CollectionsDeleteGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/collections_controller.ts').default['showDeletePage']
+	>;
+};
+type CollectionsIdDelete = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/collection.ts'))['deleteCollectionValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/collections_controller.ts').default['delete']
+	>;
+};
+type LinksCreateGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/links_controller.ts').default['showCreatePage']
+	>;
+};
+type LinksPost = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/link.ts'))['createLinkValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/links_controller.ts').default['store']
+	>;
+};
+type LinksEditGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/links_controller.ts').default['showEditPage']
+	>;
+};
+type LinksIdPut = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/link.ts'))['updateLinkValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/links_controller.ts').default['update']
+	>;
+};
+type LinksIdFavoritePut = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/link.ts'))['updateLinkFavoriteStatusValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/links_controller.ts').default['toggleFavorite']
+	>;
+};
+type LinksDeleteGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/links_controller.ts').default['showDeletePage']
+	>;
+};
+type LinksIdDelete = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/link.ts'))['deleteLinkValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/links_controller.ts').default['delete']
+	>;
+};
+type SearchGetHead = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/search_term.ts'))['searchTermValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/searches_controller.ts').default['search']
+	>;
+};
+export interface ApiDefinition {
+	user: {
+		theme: {
+			$url: {};
+			$post: UserThemePost;
+		};
+	};
+	favicon: {
+		$url: {};
+		$get: FaviconGetHead;
+		$head: FaviconGetHead;
+	};
+	shared: {
+		':id': {
+			$url: {};
+			$get: SharedIdGetHead;
+			$head: SharedIdGetHead;
+		};
+	};
+	admin: {
+		$url: {};
+		$get: AdminGetHead;
+		$head: AdminGetHead;
+	};
+	auth: {
+		login: {
+			$url: {};
+			$get: AuthLoginGetHead;
+			$head: AuthLoginGetHead;
+		};
+		callback: {
+			$url: {};
+			$get: AuthCallbackGetHead;
+			$head: AuthCallbackGetHead;
+		};
+		logout: {
+			$url: {};
+			$get: AuthLogoutGetHead;
+			$head: AuthLogoutGetHead;
+		};
+	};
+	dashboard: {
+		$url: {};
+		$get: DashboardGetHead;
+		$head: DashboardGetHead;
+	};
+	collections: {
+		create: {
+			$url: {};
+			$get: CollectionsCreateGetHead;
+			$head: CollectionsCreateGetHead;
+		};
+		$url: {};
+		$post: CollectionsPost;
+		edit: {
+			$url: {};
+			$get: CollectionsEditGetHead;
+			$head: CollectionsEditGetHead;
+		};
+		':id': {
+			$url: {};
+			$put: CollectionsIdPut;
+			$delete: CollectionsIdDelete;
+		};
+		delete: {
+			$url: {};
+			$get: CollectionsDeleteGetHead;
+			$head: CollectionsDeleteGetHead;
+		};
+	};
+	links: {
+		create: {
+			$url: {};
+			$get: LinksCreateGetHead;
+			$head: LinksCreateGetHead;
+		};
+		$url: {};
+		$post: LinksPost;
+		edit: {
+			$url: {};
+			$get: LinksEditGetHead;
+			$head: LinksEditGetHead;
+		};
+		':id': {
+			$url: {};
+			$put: LinksIdPut;
+			favorite: {
+				$url: {};
+				$put: LinksIdFavoritePut;
+			};
+			$delete: LinksIdDelete;
+		};
+		delete: {
+			$url: {};
+			$get: LinksDeleteGetHead;
+			$head: LinksDeleteGetHead;
+		};
+	};
+	search: {
+		$url: {};
+		$get: SearchGetHead;
+		$head: SearchGetHead;
+	};
+}
+const routes = [
+	{
+		params: [],
+		name: 'home',
+		path: '/',
+		method: ['GET', 'HEAD'],
+		types: {} as unknown,
+	},
+	{
+		params: [],
+		name: 'terms',
+		path: '/terms',
+		method: ['GET', 'HEAD'],
+		types: {} as unknown,
+	},
+	{
+		params: [],
+		name: 'privacy',
+		path: '/privacy',
+		method: ['GET', 'HEAD'],
+		types: {} as unknown,
+	},
+	{
+		params: [],
+		name: 'user.theme',
+		path: '/user/theme',
+		method: ['POST'],
+		types: {} as UserThemePost,
+	},
+	{
+		params: [],
+		name: 'favicon',
+		path: '/favicon',
+		method: ['GET', 'HEAD'],
+		types: {} as FaviconGetHead,
+	},
+	{
+		params: ['id'],
+		name: 'shared',
+		path: '/shared/:id',
+		method: ['GET', 'HEAD'],
+		types: {} as SharedIdGetHead,
+	},
+	{
+		params: [],
+		name: 'admin.dashboard',
+		path: '/admin',
+		method: ['GET', 'HEAD'],
+		types: {} as AdminGetHead,
+	},
+	{
+		params: [],
+		name: 'auth.login',
+		path: '/auth/login',
+		method: ['GET', 'HEAD'],
+		types: {} as AuthLoginGetHead,
+	},
+	{
+		params: [],
+		name: 'auth.google',
+		path: '/auth/google',
+		method: ['GET', 'HEAD'],
+		types: {} as unknown,
+	},
+	{
+		params: [],
+		name: 'auth.callback',
+		path: '/auth/callback',
+		method: ['GET', 'HEAD'],
+		types: {} as AuthCallbackGetHead,
+	},
+	{
+		params: [],
+		name: 'auth.logout',
+		path: '/auth/logout',
+		method: ['GET', 'HEAD'],
+		types: {} as AuthLogoutGetHead,
+	},
+	{
+		params: [],
+		name: 'dashboard',
+		path: '/dashboard',
+		method: ['GET', 'HEAD'],
+		types: {} as DashboardGetHead,
+	},
+	{
+		params: [],
+		name: 'collection.create-form',
+		path: '/collections/create',
+		method: ['GET', 'HEAD'],
+		types: {} as CollectionsCreateGetHead,
+	},
+	{
+		params: [],
+		name: 'collection.create',
+		path: '/collections',
+		method: ['POST'],
+		types: {} as CollectionsPost,
+	},
+	{
+		params: [],
+		name: 'collection.edit-form',
+		path: '/collections/edit',
+		method: ['GET', 'HEAD'],
+		types: {} as CollectionsEditGetHead,
+	},
+	{
+		params: ['id'],
+		name: 'collection.edit',
+		path: '/collections/:id',
+		method: ['PUT'],
+		types: {} as CollectionsIdPut,
+	},
+	{
+		params: [],
+		name: 'collection.delete-form',
+		path: '/collections/delete',
+		method: ['GET', 'HEAD'],
+		types: {} as CollectionsDeleteGetHead,
+	},
+	{
+		params: ['id'],
+		name: 'collection.delete',
+		path: '/collections/:id',
+		method: ['DELETE'],
+		types: {} as CollectionsIdDelete,
+	},
+	{
+		params: [],
+		name: 'link.create-form',
+		path: '/links/create',
+		method: ['GET', 'HEAD'],
+		types: {} as LinksCreateGetHead,
+	},
+	{
+		params: [],
+		name: 'link.create',
+		path: '/links',
+		method: ['POST'],
+		types: {} as LinksPost,
+	},
+	{
+		params: [],
+		name: 'link.edit-form',
+		path: '/links/edit',
+		method: ['GET', 'HEAD'],
+		types: {} as LinksEditGetHead,
+	},
+	{
+		params: ['id'],
+		name: 'link.edit',
+		path: '/links/:id',
+		method: ['PUT'],
+		types: {} as LinksIdPut,
+	},
+	{
+		params: ['id'],
+		name: 'link.toggle-favorite',
+		path: '/links/:id/favorite',
+		method: ['PUT'],
+		types: {} as LinksIdFavoritePut,
+	},
+	{
+		params: [],
+		name: 'link.delete-form',
+		path: '/links/delete',
+		method: ['GET', 'HEAD'],
+		types: {} as LinksDeleteGetHead,
+	},
+	{
+		params: ['id'],
+		name: 'link.delete',
+		path: '/links/:id',
+		method: ['DELETE'],
+		types: {} as LinksIdDelete,
+	},
+	{
+		params: [],
+		name: 'search',
+		path: '/search',
+		method: ['GET', 'HEAD'],
+		types: {} as SearchGetHead,
+	},
+] as const;
+export const api = {
+	routes,
+	definition: {} as ApiDefinition,
+};

Dockerfile

@@ -1,57 +1,37 @@
 # Source : https://github.com/adonisjs-community/adonis-packages/blob/main/Dockerfile
 
-FROM node:20-alpine3.18 AS base
+FROM node:20-alpine3.18 as base
 
 RUN apk --no-cache add curl
 RUN corepack enable
 
 # All deps stage
-FROM base AS deps
+FROM base as deps
 WORKDIR /app
-ADD package.json pnpm-lock.yaml ./
+COPY package.json pnpm-lock.yaml /app/
+COPY .adonisjs /app/.adonisjs
 RUN pnpm install --ignore-scripts
 
 # Production only deps stage
-FROM base AS production-deps
+FROM base as production-deps
 WORKDIR /app
-ADD package.json pnpm-lock.yaml ./
-RUN pnpm install --ignore-scripts
+COPY package.json pnpm-lock.yaml /app/
+COPY .adonisjs /app/.adonisjs
+RUN pnpm install --ignore-scripts --prod
 
 # Build stage
-FROM base AS build
+FROM base as build
 WORKDIR /app
 COPY --from=deps /app/node_modules /app/node_modules
-ADD . .
-
-ENV PORT=3333
-ENV HOST=localhost
-ENV LOG_LEVEL=info
-ENV APP_KEY=sLoJth45JD1vcS8n92Y2JUd8w3OL4HQb
-ENV NODE_ENV=production
-ENV SESSION_DRIVER=cookie
-ENV DB_HOST=127.0.0.1
-ENV DB_PORT=5432
-ENV DB_USER=db_user
-ENV DB_PASSWORD=db_password
-ENV DB_DATABASE=db_db
-ENV GOOGLE_CLIENT_ID=client_id
-ENV GOOGLE_CLIENT_SECRET=client_secret
-ENV GOOGLE_CLIENT_CALLBACK_URL=http://localhost:3333/auth/callback
-
-RUN node ace izzy:routes
+COPY . /app
 RUN node ace build
 
 # Production stage
 FROM base
-
 ENV NODE_ENV=production
-ENV LOG_LEVEL=debug
-ENV CACHE_VIEWS=false
-ENV SESSION_DRIVER=cookie
-ENV PORT=$PORT
-
 WORKDIR /app
 COPY --from=production-deps /app/node_modules /app/node_modules
+COPY --from=production-deps /app/.adonisjs /app/.adonisjs
 COPY --from=build /app/build /app
 
 # Expose port
@@ -59,3 +39,4 @@ EXPOSE $PORT
 
 # Start app
 CMD node bin/console.js migration:run --force && node bin/server.js
+

adonisrc.ts

@@ -2,29 +2,29 @@ import { defineConfig } from '@adonisjs/core/app';
 
 export default defineConfig({
 	/*
-  |--------------------------------------------------------------------------
-  | Commands
-  |--------------------------------------------------------------------------
-  |
-  | List of ace commands to register from packages. The application commands
-  | will be scanned automatically from the "./commands" directory.
-  |
-  */
+|--------------------------------------------------------------------------
+| Commands
+|--------------------------------------------------------------------------
+|
+| List of ace commands to register from packages. The application commands
+| will be scanned automatically from the "./commands" directory.
+|
+*/
 	commands: [
 		() => import('@adonisjs/core/commands'),
 		() => import('@adonisjs/lucid/commands'),
-		() => import('@izzyjs/route/commands'),
+		() => import('@tuyau/core/commands'),
 	],
 
 	/*
-  |--------------------------------------------------------------------------
-  | Service providers
-  |--------------------------------------------------------------------------
-  |
-  | List of service providers to import and register when booting the
-  | application
-  |
-  */
+|--------------------------------------------------------------------------
+| Service providers
+|--------------------------------------------------------------------------
+|
+| List of service providers to import and register when booting the
+| application
+|
+*/
 	providers: [
 		() => import('@adonisjs/core/providers/app_provider'),
 		() => import('@adonisjs/core/providers/hash_provider'),
@@ -43,29 +43,29 @@ export default defineConfig({
 		() => import('@adonisjs/auth/auth_provider'),
 		() => import('@adonisjs/inertia/inertia_provider'),
 		() => import('@adonisjs/ally/ally_provider'),
-		() => import('@izzyjs/route/izzy_provider'),
 		() => import('#providers/route_provider'),
+		() => import('@tuyau/core/tuyau_provider'),
 	],
 
 	/*
-  |--------------------------------------------------------------------------
-  | Preloads
-  |--------------------------------------------------------------------------
-  |
-  | List of modules to import before starting the application.
-  |
-  */
+|--------------------------------------------------------------------------
+| Preloads
+|--------------------------------------------------------------------------
+|
+| List of modules to import before starting the application.
+|
+*/
 	preloads: [() => import('#start/routes'), () => import('#start/kernel')],
 
 	/*
-  |--------------------------------------------------------------------------
-  | Tests
-  |--------------------------------------------------------------------------
-  |
-  | List of test suites to organize tests by their type. Feel free to remove
-  | and add additional suites.
-  |
-  */
+|--------------------------------------------------------------------------
+| Tests
+|--------------------------------------------------------------------------
+|
+| List of test suites to organize tests by their type. Feel free to remove
+| and add additional suites.
+|
+*/
 	tests: {
 		suites: [
 			{
@@ -83,14 +83,14 @@ export default defineConfig({
 	},
 
 	/*
-  |--------------------------------------------------------------------------
-  | Metafiles
-  |--------------------------------------------------------------------------
-  |
-  | A collection of files you want to copy to the build folder when creating
-  | the production build.
-  |
-  */
+|--------------------------------------------------------------------------
+| Metafiles
+|--------------------------------------------------------------------------
+|
+| A collection of files you want to copy to the build folder when creating
+| the production build.
+|
+*/
 	metaFiles: [
 		{
 			pattern: 'resources/views/**/*.edge',
@@ -105,6 +105,5 @@ export default defineConfig({
 	assetsBundler: false,
 	unstable_assembler: {
 		onBuildStarting: [() => import('@adonisjs/vite/build_hook')],
-		onDevServerStarted: [() => import('@izzyjs/route/dev_hook')],
 	},
 });

app/controllers/admin_controller.ts

@@ -14,9 +14,10 @@ class UserWithRelationCountDto {
 		fullname: this.user.name,
 		avatarUrl: this.user.avatarUrl,
 		isAdmin: this.user.isAdmin,
-		createdAt: this.user.createdAt,
-		updatedAt: this.user.updatedAt,
-		lastSeenAt: this.user.lastSeenAt,
+		createdAt: this.user.createdAt.toString(),
+		updatedAt: this.user.updatedAt.toString(),
+		lastSeenAt:
+			this.user.lastSeenAt?.toString() ?? this.user.updatedAt.toString(),
 		linksCount: Number(this.user.$extras.totalLinks),
 		collectionsCount: Number(this.user.$extras.totalCollections),
 	});

app/controllers/searches_controller.ts

@@ -1,16 +1,12 @@
+import { searchTermValidator } from '#validators/search_term';
 import type { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
 
 export default class SearchesController {
 	async search({ request, auth }: HttpContext) {
-		const term = request.qs()?.term;
-		if (!term) {
-			console.warn('qs term null');
-			return { error: 'missing "term" query param' };
-		}
-
+		const { searchTerm } = await request.validateUsing(searchTermValidator);
 		const { rows } = await db.rawQuery('SELECT * FROM search_text(?, ?)', [
-			term,
+			searchTerm,
 			auth.user!.id,
 		]);
 		return { results: rows };

app/controllers/users_controller.ts

@@ -1,8 +1,8 @@
 import User from '#models/user';
+import { RouteName } from '#types/tuyau';
 import type { HttpContext } from '@adonisjs/core/http';
 import logger from '@adonisjs/core/services/logger';
 import db from '@adonisjs/lucid/services/db';
-import { RouteName } from '@izzyjs/route/types';
 
 export default class UsersController {
 	private redirectTo: RouteName = 'auth.login';

app/lib/tuyau.ts

@@ -0,0 +1,22 @@
+import { api } from '#adonisjs/api';
+import { QueryParams } from '#types/query_params';
+import { RouteName } from '#types/tuyau';
+
+export const getRoute = (routeName: RouteName, options?: QueryParams) => {
+	const current = api.routes.find((route) => route.name === routeName);
+	if (!current) {
+		throw new Error(`Route ${routeName} not found`);
+	}
+
+	if (options?.qs) {
+		const searchParams = new URLSearchParams(options?.qs);
+		return { ...current, path: `${current.path}?${searchParams.toString()}` };
+	}
+
+	return current;
+};
+
+export function getPath(routeName: RouteName, options?: QueryParams) {
+	const current = getRoute(routeName, options);
+	return current.path;
+}

app/middleware/auth_middleware.ts

@@ -1,7 +1,7 @@
+import { getPath } from '#lib/tuyau';
 import type { Authenticators } from '@adonisjs/auth/types';
 import type { HttpContext } from '@adonisjs/core/http';
 import type { NextFn } from '@adonisjs/core/types/http';
-import { route } from '@izzyjs/route/client';
 
 /**
  * Auth middleware is used authenticate HTTP requests and deny
@@ -11,7 +11,7 @@ export default class AuthMiddleware {
 	/**
 	 * The URL to redirect to, when authentication fails
 	 */
-	redirectTo = route('auth.login').url;
+	redirectTo = getPath('auth.login');
 
 	async handle(
 		ctx: HttpContext,

app/types/query_params.ts

@@ -0,0 +1 @@
+export type QueryParams = { qs?: Record<string, any> };

app/types/tuyau.ts

@@ -0,0 +1,4 @@
+import { api } from '#adonisjs/api';
+
+export type RouteName = (typeof api)['routes'][number]['name'];
+export type RouteParams = (typeof api)['routes'][number]['params'];

app/validators/search_term.ts

@@ -0,0 +1,7 @@
+import vine from '@vinejs/vine';
+
+export const searchTermValidator = vine.compile(
+	vine.object({
+		searchTerm: vine.string().trim().minLength(1).maxLength(255),
+	})
+);

compose.yml

@@ -9,7 +9,7 @@ services:
       - POSTGRES_USER=${DB_USER}
       - POSTGRES_PASSWORD=${DB_PASSWORD}
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready']
+      test: ['CMD-SHELL', 'pg_isready', '-U', '${DB_USER}']
     volumes:
       - postgres-volume:/var/lib/postgresql/data
     ports:
@@ -19,20 +19,28 @@ services:
     container_name: pgadmin
     image: dpage/pgadmin4:8
     restart: always
+    entrypoint: /bin/sh -c "chmod 0600 /pgpass; /entrypoint.sh;"
     healthcheck:
       test: ['CMD', 'wget', '-O', '-', 'http://localhost:80/misc/ping']
       interval: 2s
       timeout: 10s
       retries: 30
+    env_file: .env
     environment:
       - PGADMIN_DEFAULT_EMAIL=myemail@gmail.com
       - PGADMIN_DEFAULT_PASSWORD=a12345678
+      - PGADMIN_CONFIG_SERVER_MODE=False
+      - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
     depends_on:
       - postgres
-    volumes:
-      - ./docker-config/servers_pgadmin.json:/pgadmin4/servers.json
     ports:
       - '5050:80'
+    user: root
+    configs:
+      - source: servers.json
+        target: /pgadmin4/servers.json
+      - source: pgpass
+        target: /pgpass
 
   my-links:
     container_name: my-links
@@ -53,4 +61,19 @@ services:
 
 volumes:
   postgres-volume:
-    name: postgres-prod-my-links
+
+configs:
+  pgpass:
+    content: postgres:${DB_PORT}:*:${DB_USER}:${DB_PASSWORD}
+  servers.json:
+    content: |
+      {"Servers": {"1": {
+        "Group": "Servers",
+        "Name": "project",
+        "Host": "postgres",
+        "Port": ${DB_PORT},
+        "MaintenanceDB": "${DB_DATABASE}",
+        "Username": "${DB_USER}",
+        "PassFile": "/pgpass",
+        "SSLMode": "prefer"
+      }}}

config/tuyau.ts

@@ -0,0 +1,17 @@
+import { defineConfig } from '@tuyau/core'
+
+const tuyauConfig = defineConfig({
+  codegen: {
+    /**
+     * Filters the definitions and named routes to be generated
+     */
+    // definitions: {
+    //  only: [],
+    // }
+    // routes: {
+    //  only: [],
+    // }
+  }
+})
+
+export default tuyauConfig

dev.compose.yml

@@ -1,4 +1,4 @@
-name: dev-stack
+name: my-links-dev
 services:
   postgres:
     container_name: postgres
@@ -9,26 +9,54 @@ services:
       - POSTGRES_USER=${DB_USER}
       - POSTGRES_PASSWORD=${DB_PASSWORD}
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready']
+      test: ["CMD-SHELL", "pg_isready", "-U", "${DB_USER}"]
     volumes:
-      - postgres_volume:/var/lib/postgresql/data
+      - postgres-volume:/var/lib/postgresql/data
     ports:
-      - '${DB_PORT}:5432'
+      - "${DB_PORT}:5432"
 
   pgadmin:
     container_name: pgadmin
     image: dpage/pgadmin4:8
     restart: always
+    entrypoint: /bin/sh -c "chmod 0600 /pgpass; /entrypoint.sh;"
+    healthcheck:
+      test: ["CMD", "wget", "-O", "-", "http://localhost:80/misc/ping"]
+      interval: 2s
+      timeout: 10s
+      retries: 30
+    env_file: .env
     environment:
       - PGADMIN_DEFAULT_EMAIL=myemail@gmail.com
       - PGADMIN_DEFAULT_PASSWORD=a12345678
+      - PGADMIN_CONFIG_SERVER_MODE=False
+      - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
     depends_on:
       - postgres
-    volumes:
-      - ./docker-config/servers_pgadmin.json:/pgadmin4/servers.json
     ports:
-      - '5050:80'
+      - "5050:80"
+    user: root
+    configs:
+      - source: servers.json
+        target: /pgadmin4/servers.json
+      - source: pgpass
+        target: /pgpass
 
 volumes:
-  postgres_volume:
-    name: postgres_test_dev_stack
+  postgres-volume:
+
+configs:
+  pgpass:
+    content: postgres:${DB_PORT}:*:${DB_USER}:${DB_PASSWORD}
+  servers.json:
+    content: |
+      {"Servers": {"1": {
+        "Group": "Servers",
+        "Name": "project",
+        "Host": "postgres",
+        "Port": ${DB_PORT},
+        "MaintenanceDB": "${DB_DATABASE}",
+        "Username": "${DB_USER}",
+        "PassFile": "/pgpass",
+        "SSLMode": "prefer"
+      }}}

docker-config/servers_pgadmin.json

@@ -1,13 +0,0 @@
-{
-  "Servers": {
-    "1": {
-      "Name": "project",
-      "Group": "Servers",
-      "Port": 5432,
-      "Username": "postgres",
-      "Host": "postgres",
-      "SSLMode": "prefer",
-      "MaintenanceDB": "my-links"
-    }
-  }
-}

inertia/components/common/navigation/back_to_dashboard.tsx

@@ -1,16 +1,14 @@
 import { router } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { ReactNode } from 'react';
 import useSearchParam from '~/hooks/use_search_param';
 import useShortcut from '~/hooks/use_shortcut';
-import { appendCollectionId } from '~/lib/navigation';
+import { routeWithCollectionId } from '~/lib/navigation';
 
 export default function BackToDashboard({ children }: { children: ReactNode }) {
 	const collectionId = Number(useSearchParam('collectionId'));
 	useShortcut(
 		'ESCAPE_KEY',
-		() =>
-			router.visit(appendCollectionId(route('dashboard').url, collectionId)),
+		() => router.visit(routeWithCollectionId('dashboard', collectionId)),
 		{ disableGlobalCheck: true }
 	);
 	return <>{children}</>;

inertia/components/dashboard/collection/header/collection_controls.tsx

@@ -1,4 +1,3 @@
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import { BsThreeDotsVertical } from 'react-icons/bs';
 import { GoPencil } from 'react-icons/go';
@@ -6,7 +5,7 @@ import { IoIosAddCircleOutline } from 'react-icons/io';
 import { IoTrashOutline } from 'react-icons/io5';
 import Dropdown from '~/components/common/dropdown/dropdown';
 import { DropdownItemLink } from '~/components/common/dropdown/dropdown_item';
-import { appendCollectionId } from '~/lib/navigation';
+import { getPath, routeWithCollectionId } from '~/lib/navigation';
 import { Collection } from '~/types/app';
 
 export default function CollectionControls({
@@ -17,22 +16,16 @@ export default function CollectionControls({
 	const { t } = useTranslation('common');
 	return (
 		<Dropdown label={<BsThreeDotsVertical />} svgSize={18}>
-			<DropdownItemLink href={route('link.create-form').url}>
+			<DropdownItemLink href={getPath('link.create-form')}>
 				<IoIosAddCircleOutline /> {t('link.create')}
 			</DropdownItemLink>
 			<DropdownItemLink
-				href={appendCollectionId(
-					route('collection.edit-form').url,
-					collectionId
-				)}
+				href={routeWithCollectionId('collection.edit-form', collectionId)}
 			>
 				<GoPencil /> {t('collection.edit')}
 			</DropdownItemLink>
 			<DropdownItemLink
-				href={appendCollectionId(
-					route('collection.delete-form').url,
-					collectionId
-				)}
+				href={routeWithCollectionId('collection.delete-form', collectionId)}
 				danger
 			>
 				<IoTrashOutline /> {t('collection.delete')}

inertia/components/dashboard/collection/list/collection_item.tsx

@@ -1,12 +1,11 @@
 import styled from '@emotion/styled';
 import { Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useEffect, useRef } from 'react';
 import { AiFillFolderOpen, AiOutlineFolder } from 'react-icons/ai';
 import TextEllipsis from '~/components/common/text_ellipsis';
 import { Item } from '~/components/dashboard/side_nav/nav_item';
 import useActiveCollection from '~/hooks/use_active_collection';
-import { appendCollectionId } from '~/lib/navigation';
+import { routeWithCollectionId } from '~/lib/navigation';
 import { CollectionWithLinks } from '~/types/app';
 
 const CollectionItemStyle = styled(Item, {
@@ -43,7 +42,7 @@ export default function CollectionItem({
 
 	return (
 		<CollectionItemLink
-			href={appendCollectionId(route('dashboard').url, collection.id)}
+			href={routeWithCollectionId('dashboard', collection.id)}
 			isActive={isActiveCollection}
 			ref={itemRef}
 		>

inertia/components/dashboard/dashboard_provider.tsx

@@ -1,12 +1,11 @@
 import { router } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { ReactNode, useMemo, useState } from 'react';
 import { ActiveCollectionContext } from '~/contexts/active_collection_context';
 import CollectionsContext from '~/contexts/collections_context';
 import FavoritesContext from '~/contexts/favorites_context';
 import GlobalHotkeysContext from '~/contexts/global_hotkeys_context';
 import useShortcut from '~/hooks/use_shortcut';
-import { appendCollectionId } from '~/lib/navigation';
+import { routeWithCollectionId } from '~/lib/navigation';
 import { CollectionWithLinks, LinkWithCollection } from '~/types/app';
 
 export default function DashboardProviders(
@@ -28,7 +27,7 @@ export default function DashboardProviders(
 
 	const handleChangeCollection = (collection: CollectionWithLinks) => {
 		setActiveCollection(collection);
-		router.visit(appendCollectionId(route('dashboard').url, collection.id));
+		router.visit(routeWithCollectionId('dashboard', collection.id));
 	};
 
 	// TODO: compute this in controller
@@ -67,7 +66,7 @@ export default function DashboardProviders(
 		'OPEN_CREATE_LINK_KEY',
 		() =>
 			router.visit(
-				appendCollectionId(route('link.create-form').url, activeCollection?.id)
+				routeWithCollectionId('link.create-form', activeCollection?.id)
 			),
 		{
 			enabled: globalHotkeysEnabled,
@@ -75,7 +74,7 @@ export default function DashboardProviders(
 	);
 	useShortcut(
 		'OPEN_CREATE_COLLECTION_KEY',
-		() => router.visit(route('collection.create-form').url),
+		() => router.visit('collection.create-form'),
 		{
 			enabled: globalHotkeysEnabled,
 		}

inertia/components/dashboard/link/link_controls.tsx

@@ -1,5 +1,4 @@
 import { useTheme } from '@emotion/react';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import { BsThreeDotsVertical } from 'react-icons/bs';
 import { GoPencil } from 'react-icons/go';
@@ -7,7 +6,7 @@ import { IoTrashOutline } from 'react-icons/io5';
 import Dropdown from '~/components/common/dropdown/dropdown';
 import { DropdownItemLink } from '~/components/common/dropdown/dropdown_item';
 import FavoriteDropdownItem from '~/components/dashboard/side_nav/favorite/favorite_dropdown_item';
-import { appendLinkId } from '~/lib/navigation';
+import { routeWithLinkId } from '~/lib/navigation';
 import { Link } from '~/types/app';
 
 export default function LinkControls({ link }: { link: Link }) {
@@ -21,13 +20,11 @@ export default function LinkControls({ link }: { link: Link }) {
 			svgSize={18}
 		>
 			<FavoriteDropdownItem link={link} />
-			<DropdownItemLink
-				href={appendLinkId(route('link.edit-form').url, link.id)}
-			>
+			<DropdownItemLink href={routeWithLinkId('link.edit-form', link.id)}>
 				<GoPencil /> {t('link.edit')}
 			</DropdownItemLink>
 			<DropdownItemLink
-				href={appendLinkId(route('link.delete-form').url, link.id)}
+				href={routeWithLinkId('link.delete-form', link.id)}
 				danger
 			>
 				<IoTrashOutline /> {t('link.delete')}

inertia/components/dashboard/link/no_item.tsx

@@ -1,9 +1,8 @@
 import styled from '@emotion/styled';
 import { Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import useActiveCollection from '~/hooks/use_active_collection';
-import { appendCollectionId } from '~/lib/navigation';
+import { routeWithCollectionId } from '~/lib/navigation';
 import { fadeIn } from '~/styles/keyframes';
 
 const NoCollectionStyle = styled.div({
@@ -30,9 +29,7 @@ export function NoCollection() {
 	return (
 		<NoCollectionStyle>
 			<Text>{t('select-collection')}</Text>
-			<Link href={route('collection.create-form').url}>
-				{t('or-create-one')}
-			</Link>
+			<Link href={'collection.create-form'}>{t('or-create-one')}</Link>
 		</NoCollectionStyle>
 	);
 }
@@ -54,10 +51,7 @@ export function NoLink() {
 				}}
 			/>
 			<Link
-				href={appendCollectionId(
-					route('link.create-form').url,
-					activeCollection?.id
-				)}
+				href={routeWithCollectionId('link.create-form', activeCollection?.id)}
 			>
 				{t('link.create')}
 			</Link>

inertia/components/dashboard/search/search_modal.tsx

@@ -1,5 +1,4 @@
 import styled from '@emotion/styled';
-import { route } from '@izzyjs/route/client';
 import { FormEvent, useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { IoIosSearch } from 'react-icons/io';
@@ -11,7 +10,7 @@ import useActiveCollection from '~/hooks/use_active_collection';
 import useCollections from '~/hooks/use_collections';
 import useToggle from '~/hooks/use_modal';
 import useShortcut from '~/hooks/use_shortcut';
-import { makeRequest } from '~/lib/request';
+import { tuyau, tuyauAbortController } from '~/lib/tuyau';
 import { SearchResult } from '~/types/search';
 
 const SearchInput = styled.input(({ theme }) => ({
@@ -78,18 +77,14 @@ function SearchModal({ openItem: OpenItem }: SearchModalProps) {
 			return setResults([]);
 		}
 
-		const controller = new AbortController();
-		const { url, method } = route('search', { qs: { term: searchTerm } });
-		makeRequest({
-			method,
-			url,
-			controller,
-		}).then(({ results: _results }) => {
-			setResults(_results);
-			setSelectedItem(_results?.[0]);
+		tuyau.search.$get({ query: { searchTerm } }).then(({ error, data }) => {
+			if (error?.status === 404) return setResults([]);
+			const results = data?.results || [];
+			setResults(results);
+			setSelectedItem(results?.[0]);
 		});
 
-		return () => controller.abort();
+		return () => tuyauAbortController.abort();
 	}, [searchTerm]);
 
 	return (

inertia/components/dashboard/side_nav/favorite/favorite_item.tsx

@@ -1,5 +1,4 @@
 import styled from '@emotion/styled';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import { BsThreeDotsVertical } from 'react-icons/bs';
 import { FaRegEye } from 'react-icons/fa';
@@ -12,7 +11,7 @@ import TextEllipsis from '~/components/common/text_ellipsis';
 import LinkFavicon from '~/components/dashboard/link/link_favicon';
 import FavoriteDropdownItem from '~/components/dashboard/side_nav/favorite/favorite_dropdown_item';
 import { ItemExternalLink } from '~/components/dashboard/side_nav/nav_item';
-import { appendCollectionId, appendLinkId } from '~/lib/navigation';
+import { routeWithCollectionId, routeWithLinkId } from '~/lib/navigation';
 import { LinkWithCollection } from '~/types/app';
 
 const FavoriteItemStyle = styled(ItemExternalLink)(({ theme }) => ({
@@ -47,18 +46,16 @@ export default function FavoriteItem({ link }: { link: LinkWithCollection }) {
 				svgSize={18}
 			>
 				<DropdownItemLink
-					href={appendCollectionId(route('dashboard').url, link.collection.id)}
+					href={routeWithCollectionId('dashboard', link.collection.id)}
 				>
 					<FaRegEye /> {t('go-to-collection')}
 				</DropdownItemLink>
 				<FavoriteDropdownItem link={link} />
-				<DropdownItemLink
-					href={appendLinkId(route('link.edit-form').url, link.id)}
-				>
+				<DropdownItemLink href={routeWithLinkId('link.edit-form', link.id)}>
 					<GoPencil /> {t('link.edit')}
 				</DropdownItemLink>
 				<DropdownItemLink
-					href={appendLinkId(route('link.delete-form').url, link.id)}
+					href={routeWithLinkId('link.delete-form', link.id)}
 					danger
 				>
 					<IoTrashOutline /> {t('link.delete')}

inertia/components/dashboard/side_nav/side_navigation.tsx

@@ -1,5 +1,4 @@
 import styled from '@emotion/styled';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import { AiOutlineFolderAdd } from 'react-icons/ai';
 import { IoAdd, IoShieldHalfSharp } from 'react-icons/io5';
@@ -11,7 +10,7 @@ import ModalSettings from '~/components/settings/settings_modal';
 import useActiveCollection from '~/hooks/use_active_collection';
 import useUser from '~/hooks/use_user';
 import { rgba } from '~/lib/color';
-import { appendCollectionId } from '~/lib/navigation';
+import { getPath, routeWithCollectionId } from '~/lib/navigation';
 
 const SideMenu = styled.nav(({ theme }) => ({
 	height: '100%',
@@ -56,21 +55,18 @@ export default function SideNavigation() {
 			<div css={{ paddingInline: '10px' }}>
 				<UserCard />
 				{user!.isAdmin && (
-					<AdminButton href={route('admin.dashboard').url}>
+					<AdminButton href={getPath('admin.dashboard')}>
 						<IoShieldHalfSharp /> {t('admin')}
 					</AdminButton>
 				)}
 				<ModalSettings openItem={SettingsButton} />
 				<SearchModal openItem={SearchButton} />
 				<AddButton
-					href={appendCollectionId(
-						route('link.create-form').url,
-						activeCollection?.id
-					)}
+					href={routeWithCollectionId('link.create-form', activeCollection?.id)}
 				>
 					<IoAdd /> {t('link.create')}
 				</AddButton>
-				<AddButton href={route('collection.create-form').url}>
+				<AddButton href={getPath('collection.create-form')}>
 					<AiOutlineFolderAdd /> {t('collection.create')}
 				</AddButton>
 			</div>

inertia/components/footer/footer.tsx

@@ -1,9 +1,9 @@
 import PATHS from '#constants/paths';
 import styled from '@emotion/styled';
 import { Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import ExternalLink from '~/components/common/external_link';
+import { getPath } from '~/lib/navigation';
 import packageJson from '../../../package.json';
 
 const FooterStyle = styled.footer(({ theme }) => ({
@@ -22,9 +22,9 @@ export default function Footer({ className }: { className?: string }) {
 	return (
 		<FooterStyle className={className}>
 			<div className="row">
-				<Link href={route('privacy').url}>{t('privacy')}</Link>
+				<Link href={getPath('privacy')}>{t('privacy')}</Link>
 				{' • '}
-				<Link href={route('terms').url}>{t('terms')}</Link>
+				<Link href={getPath('terms')}>{t('terms')}</Link>
 				{' • '}
 				<ExternalLink href={PATHS.EXTENSION}>Extension</ExternalLink>
 			</div>

inertia/components/home/hero_header.tsx

@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 import { Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import Quotes from '~/components/quotes';
+import { getPath } from '~/lib/navigation';
 
 const HeroStyle = styled.header(({ theme }) => ({
 	height: '250px',
@@ -46,9 +46,7 @@ export default function HeroHeader() {
 		<HeroStyle>
 			<HeroTitle>{t('about:hero.title')}</HeroTitle>
 			<HeroQuote>{t('common:slogan')}</HeroQuote>
-			<LinkButton href={route('dashboard').url}>
-				{t('about:hero.cta')}
-			</LinkButton>
+			<LinkButton href={getPath('dashboard')}>{t('about:hero.cta')}</LinkButton>
 		</HeroStyle>
 	);
 }

inertia/components/layouts/form_layout.tsx

@@ -1,13 +1,12 @@
 import styled from '@emotion/styled';
 import { Head, Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { FormEvent, ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 import Button from '~/components/common/form/_button';
 import Form from '~/components/common/form/_form';
 import TransitionLayout from '~/components/layouts/_transition_layout';
 import i18n from '~/i18n';
-import { appendCollectionId } from '~/lib/navigation';
+import { routeWithCollectionId } from '~/lib/navigation';
 import BaseLayout from './_base_layout';
 
 const FormLayoutStyle = styled(TransitionLayout)(({ theme }) => ({
@@ -59,7 +58,7 @@ export default function FormLayout({
 					</Button>
 				</Form>
 				{!disableHomeLink && (
-					<Link href={appendCollectionId(route('dashboard').url, collectionId)}>
+					<Link href={routeWithCollectionId('dashboard', collectionId)}>
 						{t('back-home')}
 					</Link>
 				)}

inertia/components/navbar/navbar.tsx

@@ -1,7 +1,6 @@
 import PATHS from '#constants/paths';
 import styled from '@emotion/styled';
 import { Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import { IoIosLogOut } from 'react-icons/io';
 import Dropdown from '~/components/common/dropdown/dropdown';
@@ -14,6 +13,7 @@ import RoundedImage from '~/components/common/rounded_image';
 import UnstyledList from '~/components/common/unstyled/unstyled_list';
 import ModalSettings from '~/components/settings/settings_modal';
 import useUser from '~/hooks/use_user';
+import { getPath } from '~/lib/navigation';
 
 type NavbarListDirection = {
 	right?: boolean;
@@ -66,7 +66,7 @@ export default function Navbar() {
 		<Nav>
 			<NavList>
 				<li>
-					<Link href={route('home').url} css={{ fontSize: '24px' }}>
+					<Link href={getPath('home')} css={{ fontSize: '24px' }}>
 						MyLinks
 					</Link>
 				</li>
@@ -79,13 +79,13 @@ export default function Navbar() {
 					<>
 						{user.isAdmin && (
 							<li>
-								<AdminLink href={route('admin.dashboard').url}>
+								<AdminLink href={getPath('admin.dashboard')}>
 									{t('admin')}
 								</AdminLink>
 							</li>
 						)}
 						<li>
-							<Link href={route('dashboard').url}>Dashboard</Link>
+							<Link href={getPath('dashboard')}>Dashboard</Link>
 						</li>
 						<li>
 							<ProfileDropdown />
@@ -97,7 +97,7 @@ export default function Navbar() {
 							<ModalSettings openItem={DropdownItemButtonWithPadding} />
 						</li>
 						<li>
-							<Link href={route('auth.login').url}>{t('login')}</Link>
+							<Link href={getPath('auth.login')}>{t('login')}</Link>
 						</li>
 					</>
 				)}
@@ -124,7 +124,7 @@ function ProfileDropdown() {
 			}
 		>
 			<ModalSettings openItem={DropdownItemButton} />
-			<DropdownItemLink href={route('auth.logout').url} danger>
+			<DropdownItemLink href={getPath('auth.logout')} danger>
 				<IoIosLogOut /> {t('logout')}
 			</DropdownItemLink>
 		</Dropdown>

inertia/components/settings/profile.tsx

@@ -1,6 +1,5 @@
 import styled from '@emotion/styled';
 import { Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import dayjs from 'dayjs';
 import { Fragment } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -8,6 +7,7 @@ import RoundedImage from '~/components/common/rounded_image';
 import UnstyledList from '~/components/common/unstyled/unstyled_list';
 import { DATE_FORMAT } from '~/constants';
 import useUser from '~/hooks/use_user';
+import { getPath } from '~/lib/navigation';
 
 const ProfileStyle = styled(UnstyledList)({
 	display: 'flex',
@@ -47,7 +47,7 @@ export default function Profile() {
 					alt={avatarLabel}
 					title={avatarLabel}
 				/>
-				<Link href={route('auth.logout').url}>{t('logout')}</Link>
+				<Link href={getPath('auth.logout')}>{t('logout')}</Link>
 			</Column>
 			<Column>
 				<Field>

inertia/contexts/dark_theme_context.tsx

@@ -1,7 +1,6 @@
 import { usePage } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { ReactNode, createContext, useEffect, useState } from 'react';
-import { makeRequest } from '~/lib/request';
+import { tuyau } from '~/lib/tuyau';
 
 const LS_KEY = 'dark_theme';
 
@@ -19,13 +18,8 @@ export default function DarkThemeContextProvider({
 	const [isDarkTheme, setDarkTheme] = useState<boolean>(preferDarkTheme);
 	const toggleDarkTheme = (value: boolean) => {
 		setDarkTheme(value);
-		const { method, url } = route('user.theme');
-		makeRequest({
-			method,
-			url,
-			body: {
-				preferDarkTheme: value,
-			},
+		tuyau.user.theme.$post({
+			preferDarkTheme: value,
 		});
 	};
 

inertia/lib/favorite.ts

@@ -1,5 +1,4 @@
-import { route } from '@izzyjs/route/client';
-import { makeRequest } from '~/lib/request';
+import { tuyau } from '~/lib/tuyau';
 import { Link } from '~/types/app';
 
 export const onFavorite = (
@@ -7,16 +6,14 @@ export const onFavorite = (
 	isFavorite: boolean,
 	cb: () => void
 ) => {
-	const { url, method } = route('link.toggle-favorite', {
-		params: { id: linkId.toString() },
-	});
-	makeRequest({
-		url,
-		method,
-		body: {
+	tuyau
+		.$route('link.toggle-favorite', {
+			id: linkId.toString(),
+		})
+		.$put({
 			favorite: isFavorite,
-		},
-	})
+			params: { id: linkId.toString() },
+		})
 		.then(() => cb())
 		.catch(console.error);
 };

inertia/lib/navigation.ts

@@ -1,19 +1,43 @@
+import { tuyau } from '~/lib/tuyau';
 import { Collection, Link } from '~/types/app';
+import { RouteName } from '~/types/tuyau';
 
-export const appendCollectionId = (
-	url: string,
+export const routeWithCollectionId = (
+	routeName: RouteName,
 	collectionId?: Collection['id'] | null | undefined
-) => `${url}${collectionId ? `?collectionId=${collectionId}` : ''}`;
+) =>
+	buildUrlWithQueryParams(routeName, {
+		collectionId,
+	});
 
-export const appendLinkId = (
-	url: string,
+export const routeWithLinkId = (
+	routeName: RouteName,
 	linkId?: Link['id'] | null | undefined
-) => `${url}${linkId ? `?linkId=${linkId}` : ''}`;
+) => buildUrlWithQueryParams(routeName, { linkId });
 
-export const appendResourceId = (
-	url: string,
+export const routeWithResourceId = (
+	routeName: RouteName,
 	resourceId?: Collection['id'] | Link['id']
-) => `${url}${resourceId ? `/${resourceId}` : ''}`;
+) => `${routeName}${resourceId ? `/${resourceId}` : ''}`;
+
+export function buildUrlWithQueryParams(
+	routeName: RouteName,
+	queryParam: Record<string, string | number | null | undefined>
+) {
+	const path = tuyau.$route(routeName).path;
+	const [key, value] = Object.entries(queryParam)[0];
+	if (!value) {
+		return path;
+	}
+
+	const searchParams = new URLSearchParams({
+		[key]: value.toString(),
+	});
+	return `${path}?${searchParams}`;
+}
+
+export const getRoute = (routeName: RouteName) => tuyau.$route(routeName);
+export const getPath = (routeName: RouteName) => getRoute(routeName).path;
 
 export function isValidHttpUrl(urlParam: string) {
 	let url;

inertia/lib/tuyau.ts

@@ -0,0 +1,11 @@
+/// <reference path="../../adonisrc.ts" />
+
+import { api } from '#adonisjs/api';
+import { createTuyau } from '@tuyau/client';
+
+export const tuyauAbortController = new AbortController();
+export const tuyau = createTuyau({
+	api,
+	baseUrl: 'http://localhost:3333',
+	signal: tuyauAbortController.signal,
+});

inertia/pages/collections/create.tsx

@@ -1,11 +1,11 @@
 import { Visibility } from '#enums/visibility';
 import { useForm } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import FormCollection, {
 	FormCollectionData,
 } from '~/components/form/form_collection';
+import { getRoute } from '~/lib/navigation';
 
 export default function CreateCollectionPage({
 	disableHomeLink,
@@ -24,8 +24,8 @@ export default function CreateCollectionPage({
 	);
 
 	const handleSubmit = () => {
-		const { method, url } = route('collection.create');
-		submit(method, url);
+		const { method, path } = getRoute('collection.create');
+		submit(method.at(0) as any, path);
 	};
 
 	return (

inertia/pages/collections/delete.tsx

@@ -1,9 +1,9 @@
 import { useForm } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import FormCollection, {
 	FormCollectionData,
 } from '~/components/form/form_collection';
+import { tuyau } from '~/lib/tuyau';
 import { Collection } from '~/types/app';
 
 export default function DeleteCollectionPage({
@@ -20,10 +20,10 @@ export default function DeleteCollectionPage({
 		});
 
 	const handleSubmit = () => {
-		const { method, url } = route('collection.delete', {
-			params: { id: collection.id.toString() },
+		const { method, path } = tuyau.$route('collection.delete', {
+			id: collection.id.toString(),
 		});
-		submit(method, url);
+		submit(method.at(0) as any, path);
 	};
 
 	return (

inertia/pages/collections/edit.tsx

@@ -1,10 +1,10 @@
 import { useForm } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import FormCollection, {
 	FormCollectionData,
 } from '~/components/form/form_collection';
+import { tuyau } from '~/lib/tuyau';
 import { Collection } from '~/types/app';
 
 export default function EditCollectionPage({
@@ -30,10 +30,10 @@ export default function EditCollectionPage({
 	}, [data, collection]);
 
 	const handleSubmit = () => {
-		const { method, url } = route('collection.edit', {
-			params: { id: collection.id.toString() },
+		const { method, path } = tuyau.$route('collection.edit', {
+			id: collection.id.toString(),
 		});
-		submit(method, url);
+		submit(method.at(0) as any, path);
 	};
 
 	return (

inertia/pages/links/create.tsx

@@ -1,10 +1,10 @@
 import { useForm } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import FormLink from '~/components/form/form_link';
 import useSearchParam from '~/hooks/use_search_param';
 import { isValidHttpUrl } from '~/lib/navigation';
+import { tuyau } from '~/lib/tuyau';
 import { Collection } from '~/types/app';
 
 export default function CreateLinkPage({
@@ -33,8 +33,8 @@ export default function CreateLinkPage({
 	);
 
 	const handleSubmit = () => {
-		const { method, url } = route('link.create');
-		submit(method, url);
+		const { method, path } = tuyau.$route('link.create');
+		submit(method.at(0) as any, path);
 	};
 
 	return (

inertia/pages/links/delete.tsx

@@ -1,7 +1,7 @@
 import { useForm } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useTranslation } from 'react-i18next';
 import FormLink from '~/components/form/form_link';
+import { tuyau } from '~/lib/tuyau';
 import { LinkWithCollection } from '~/types/app';
 
 export default function DeleteLinkPage({ link }: { link: LinkWithCollection }) {
@@ -15,10 +15,10 @@ export default function DeleteLinkPage({ link }: { link: LinkWithCollection }) {
 	});
 
 	const handleSubmit = () => {
-		const { method, url } = route('link.delete', {
-			params: { id: link.id.toString() },
+		const { method, path } = tuyau.$route('link.delete', {
+			id: link.id.toString(),
 		});
-		submit(method, url);
+		submit(method.at(0) as any, path);
 	};
 
 	return (

inertia/pages/links/edit.tsx

@@ -1,9 +1,9 @@
 import { useForm } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import FormLink from '~/components/form/form_link';
 import { isValidHttpUrl } from '~/lib/navigation';
+import { tuyau } from '~/lib/tuyau';
 import { Collection, Link } from '~/types/app';
 
 export default function EditLinkPage({
@@ -39,10 +39,10 @@ export default function EditLinkPage({
 	}, [data, processing]);
 
 	const handleSubmit = () => {
-		const { method, url } = route('link.edit', {
-			params: { id: link.id.toString() },
+		const { method, path } = tuyau.$route('link.edit', {
+			id: link.id.toString(),
 		});
-		submit(method, url);
+		submit(method.at(0) as any, path);
 	};
 
 	return (

inertia/pages/login.tsx

@@ -1,12 +1,12 @@
 import styled from '@emotion/styled';
 import { Head, Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FcGoogle } from 'react-icons/fc';
 import Button from '~/components/common/form/_button';
 import ContentLayout from '~/components/layouts/content_layout';
 import Quotes from '~/components/quotes';
+import { getPath } from '~/lib/navigation';
 
 const LoginContainer = styled.div({
 	width: '100%',
@@ -70,14 +70,14 @@ function LoginPage() {
 			<FormWrapper>
 				<h1>{t('login:title')}</h1>
 				<InformativeText>{t('login:informative-text')}</InformativeText>
-				<ButtonLink href={route('auth.google').url}>
+				<ButtonLink href={getPath('auth.google')}>
 					<FcGoogle size="1.5em" />{' '}
 					{t('login:continue-with', { provider: 'Google' })}
 				</ButtonLink>
 			</FormWrapper>
 			<AgreementText>
 				{t('login:accept-terms')}{' '}
-				<Link href={route('terms').url}>{t('common:terms')}</Link>
+				<Link href={getPath('terms')}>{t('common:terms')}</Link>
 			</AgreementText>
 		</LoginContainer>
 	);

inertia/pages/terms.tsx

@@ -1,8 +1,8 @@
 import { Link } from '@inertiajs/react';
-import { route } from '@izzyjs/route/client';
 import { ReactNode } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import LegalContentLayout from '~/components/layouts/legal_content_layout';
+import { getPath } from '~/lib/navigation';
 
 function TermsPage() {
 	const { t } = useTranslation('terms');
@@ -30,7 +30,7 @@ function TermsPage() {
 			<p>
 				<Trans
 					i18nKey="personal_data.collect.description"
-					components={{ a: <Link href={route('privacy').url} /> }}
+					components={{ a: <Link href={getPath('privacy')} /> }}
 				/>
 			</p>
 

inertia/types/tuyau.ts

@@ -0,0 +1,3 @@
+import { api } from '#adonisjs/api';
+
+export type RouteName = (typeof api)['routes'][number]['name'];

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "my-links",
-	"version": "2.2.0",
+	"version": "2.2.1",
 	"type": "module",
 	"license": "UNLICENSED",
 	"scripts": {
@@ -33,7 +33,9 @@
 		"#tests/*": "./tests/*.js",
 		"#start/*": "./start/*.js",
 		"#config/*": "./config/*.js",
-		"#lib/*": "./app/lib/*.js"
+		"#lib/*": "./app/lib/*.js",
+		"#types/*": "./app/types/*.js",
+		"#adonisjs/*": "./.adonisjs/*.js"
 	},
 	"devDependencies": {
 		"@adonisjs/assembler": "^7.8.2",
@@ -41,36 +43,36 @@
 		"@adonisjs/prettier-config": "^1.4.0",
 		"@adonisjs/tsconfig": "^1.4.0",
 		"@emotion/babel-plugin": "^11.12.0",
-		"@faker-js/faker": "^9.0.3",
+		"@faker-js/faker": "^9.1.0",
 		"@japa/assert": "^3.0.0",
 		"@japa/plugin-adonisjs": "^3.0.1",
 		"@japa/runner": "^3.1.4",
-		"@swc/core": "^1.7.26",
+		"@swc/core": "^1.7.40",
 		"@types/luxon": "^3.4.2",
 		"@types/node": "^20.14.10",
-		"@types/react": "^18.3.11",
-		"@types/react-dom": "^18.3.0",
+		"@types/react": "^18.3.12",
+		"@types/react-dom": "^18.3.1",
 		"@types/react-toggle": "^4.0.5",
-		"@typescript-eslint/eslint-plugin": "^8.8.0",
-		"@vitejs/plugin-react": "^4.3.2",
-		"eslint": "^9.12.0",
-		"hot-hook": "^0.3.0",
+		"@typescript-eslint/eslint-plugin": "^8.11.0",
+		"@vitejs/plugin-react": "^4.3.3",
+		"eslint": "^9.13.0",
+		"hot-hook": "^0.3.1",
 		"husky": "^9.1.6",
 		"lint-staged": "^15.2.10",
-		"pino-pretty": "^11.2.2",
+		"pino-pretty": "^11.3.0",
 		"prettier": "^3.3.3",
-		"release-it": "^17.7.0",
+		"release-it": "^17.10.0",
 		"ts-node-maintained": "^10.9.4",
 		"typescript": "~5.5.4",
-		"vite": "^5.4.8"
+		"vite": "^5.4.10"
 	},
 	"dependencies": {
 		"@adonisjs/ally": "^5.0.2",
 		"@adonisjs/auth": "^9.2.3",
-		"@adonisjs/core": "^6.14.0",
+		"@adonisjs/core": "^6.14.1",
 		"@adonisjs/cors": "^2.2.1",
-		"@adonisjs/inertia": "^1.2.2",
-		"@adonisjs/lucid": "^21.2.0",
+		"@adonisjs/inertia": "^1.2.3",
+		"@adonisjs/lucid": "^21.3.0",
 		"@adonisjs/session": "^7.5.0",
 		"@adonisjs/shield": "^8.1.1",
 		"@adonisjs/static": "^1.1.1",
@@ -78,26 +80,28 @@
 		"@emotion/react": "11.12.0",
 		"@emotion/styled": "^11.13.0",
 		"@inertiajs/react": "^1.2.0",
-		"@izzyjs/route": "^1.2.0",
 		"@tanstack/react-table": "^8.20.5",
+		"@tuyau/client": "^0.1.3",
+		"@tuyau/core": "^0.2.1",
+		"@tuyau/utils": "^0.0.4",
 		"@vinejs/vine": "^2.1.0",
 		"bentocache": "^1.0.0-beta.9",
 		"dayjs": "^1.11.13",
 		"edge.js": "^6.2.0",
 		"hex-rgb": "^5.0.0",
-		"i18next": "^23.15.2",
+		"i18next": "^23.16.4",
 		"knex": "^3.1.0",
 		"luxon": "^3.5.0",
 		"node-html-parser": "^6.1.13",
-		"pg": "^8.13.0",
+		"pg": "^8.13.1",
 		"react": "^18.3.1",
 		"react-dnd": "^16.0.1",
 		"react-dnd-html5-backend": "^16.0.1",
 		"react-dom": "^18.3.1",
 		"react-hotkeys-hook": "^4.5.1",
-		"react-i18next": "^15.0.2",
+		"react-i18next": "^15.1.0",
 		"react-icons": "^5.3.0",
-		"react-select": "^5.8.1",
+		"react-select": "^5.8.2",
 		"react-swipeable": "^7.0.1",
 		"react-toggle": "^4.1.3",
 		"reflect-metadata": "^0.2.2"

src/extensions.ts

@@ -1,18 +1,17 @@
+import { getRoute } from '#lib/tuyau';
+import { QueryParams } from '#types/query_params';
+import { RouteName, RouteParams } from '#types/tuyau';
 import { Response } from '@adonisjs/core/http';
-import { route } from '@izzyjs/route/client';
-import { RouteName } from '@izzyjs/route/types';
 
-type IzzyRouteOptions = {
-	params?: Record<string, any>; //Params<Name>;
-	qs?: Record<string, any>;
-	prefix?: string;
-};
+type RouteOptions = {
+	params?: RouteParams;
+} & QueryParams;
 
 declare module '@adonisjs/core/http' {
 	export interface Response {
 		redirectToNamedRoute: (
 			routeName: RouteName,
-			options?: IzzyRouteOptions
+			options?: RouteOptions
 		) => void;
 	}
 }
@@ -20,12 +19,7 @@ declare module '@adonisjs/core/http' {
 Response.macro(
 	'redirectToNamedRoute',
 	function (this: Response, routeName, options) {
-		// TODO: fix this
-		// @ts-ignore
-		const current = route(routeName, options);
-		this.redirect().toRoute(current.url, current.params, {
-			qs: current.qs,
-			disableRouteLookup: true,
-		});
+		const route = getRoute(routeName, options);
+		this.redirect().toRoute(route.path, route.params, options);
 	}
 );

start/kernel.ts

@@ -29,7 +29,6 @@ server.use([
 	() => import('@adonisjs/cors/cors_middleware'),
 	() => import('@adonisjs/vite/vite_middleware'),
 	() => import('@adonisjs/inertia/inertia_middleware'),
-	() => import('@izzyjs/route/izzy_middleware'),
 ]);
 
 /**

tests/bootstrap.ts

@@ -1,9 +1,8 @@
-import { assert } from '@japa/assert';
 import app from '@adonisjs/core/services/app';
-import type { Config } from '@japa/runner/types';
-import { pluginAdonisJS } from '@japa/plugin-adonisjs';
 import testUtils from '@adonisjs/core/services/test_utils';
-import { izzyRoutePlugin } from '@izzyjs/route/plugins/japa';
+import { assert } from '@japa/assert';
+import { pluginAdonisJS } from '@japa/plugin-adonisjs';
+import type { Config } from '@japa/runner/types';
 
 /**
  * This file is imported by the "bin/test.ts" entrypoint file
@@ -13,11 +12,7 @@ import { izzyRoutePlugin } from '@izzyjs/route/plugins/japa';
  * Configure Japa plugins in the plugins array.
  * Learn more - https://japa.dev/docs/runner-config#plugins-optional
  */
-export const plugins: Config['plugins'] = [
-	assert(),
-	pluginAdonisJS(app),
-	izzyRoutePlugin(),
-];
+export const plugins: Config['plugins'] = [assert(), pluginAdonisJS(app)];
 
 /**
  * Configure lifecycle function to run before and after all the