Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions .adonisjs/client/registry.schema.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/* eslint-disable prettier/prettier */
/// <reference path="../../adonisrc.ts" />

import type { ExtractBody, ExtractQuery } from '@tuyau/core/types'
import type { Infer } from '@vinejs/vine/types'

export interface Registry {
'home': {
methods: ["GET","HEAD"]
pattern: '/'
types: {
body: {}
paramsTuple: []
params: {}
query: {}
response: unknown
}
}
'new_account.create': {
methods: ["GET","HEAD"]
pattern: '/signup'
types: {
body: {}
paramsTuple: []
params: {}
query: {}
response: Awaited<ReturnType<import('#controllers/new_account_controller').default['create']>>
}
}
'new_account.store': {
methods: ["POST"]
pattern: '/signup'
types: {
body: ExtractBody<Infer<(typeof import('#validators/user').signupValidator)>>
paramsTuple: []
params: {}
query: ExtractQuery<Infer<(typeof import('#validators/user').signupValidator)>>
response: Awaited<ReturnType<import('#controllers/new_account_controller').default['store']>>
}
}
'session.create': {
methods: ["GET","HEAD"]
pattern: '/login'
types: {
body: {}
paramsTuple: []
params: {}
query: {}
response: Awaited<ReturnType<import('#controllers/session_controller').default['create']>>
}
}
'session.store': {
methods: ["POST"]
pattern: '/login'
types: {
body: {}
paramsTuple: []
params: {}
query: {}
response: Awaited<ReturnType<import('#controllers/session_controller').default['store']>>
}
}
'session.destroy': {
methods: ["POST"]
pattern: '/logout'
types: {
body: {}
paramsTuple: []
params: {}
query: {}
response: Awaited<ReturnType<import('#controllers/session_controller').default['destroy']>>
}
}
}
15 changes: 15 additions & 0 deletions .adonisjs/client/registry.schema.tree.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* eslint-disable prettier/prettier */
import type { routes } from './registry.ts'

export interface ApiDefinition {
home: typeof routes['home']
newAccount: {
create: typeof routes['new_account.create']
store: typeof routes['new_account.store']
}
session: {
create: typeof routes['session.create']
store: typeof routes['session.store']
destroy: typeof routes['session.destroy']
}
}
59 changes: 59 additions & 0 deletions .adonisjs/client/registry.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/* eslint-disable prettier/prettier */
import type { AdonisEndpoint } from '@tuyau/core/types'
import type { Registry } from './registry.schema.d.ts'
import type { ApiDefinition } from './registry.schema.tree.d.ts'

const placeholder: any = {}

const routes = {
'home': {
methods: ["GET","HEAD"],
pattern: '/',
tokens: [{"old":"/","type":0,"val":"/","end":""}],
types: placeholder as Registry['home']['types'],
},
'new_account.create': {
methods: ["GET","HEAD"],
pattern: '/signup',
tokens: [{"old":"/signup","type":0,"val":"signup","end":""}],
types: placeholder as Registry['new_account.create']['types'],
},
'new_account.store': {
methods: ["POST"],
pattern: '/signup',
tokens: [{"old":"/signup","type":0,"val":"signup","end":""}],
types: placeholder as Registry['new_account.store']['types'],
},
'session.create': {
methods: ["GET","HEAD"],
pattern: '/login',
tokens: [{"old":"/login","type":0,"val":"login","end":""}],
types: placeholder as Registry['session.create']['types'],
},
'session.store': {
methods: ["POST"],
pattern: '/login',
tokens: [{"old":"/login","type":0,"val":"login","end":""}],
types: placeholder as Registry['session.store']['types'],
},
'session.destroy': {
methods: ["POST"],
pattern: '/logout',
tokens: [{"old":"/logout","type":0,"val":"logout","end":""}],
types: placeholder as Registry['session.destroy']['types'],
},
} as const satisfies Record<string, AdonisEndpoint>

export { routes }

export const registry = {
routes,
$tree: {} as ApiDefinition,
}

declare module '@tuyau/core/types' {
export interface UserRegistry {
routes: typeof routes
$tree: ApiDefinition
}
}
2 changes: 2 additions & 0 deletions adonisrc.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { indexPages } from '@adonisjs/inertia'
import { indexEntities } from '@adonisjs/core'
import { defineConfig } from '@adonisjs/core/app'
import { generateRegistry } from '@tuyau/core/hooks'

export default defineConfig({
/*
Expand Down Expand Up @@ -123,6 +124,7 @@ export default defineConfig({
framework: 'react',
}),
],
routesScanned: [generateRegistry()],
buildStarting: [() => import('@adonisjs/vite/build_hook')],
},
})
8 changes: 7 additions & 1 deletion inertia/app.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import './css/app.css'
import { client } from './client'
import { ReactElement } from 'react'
import Layout from '~/layouts/default'
import { Data } from '~/generated/data'
import { createRoot } from 'react-dom/client'
import { createInertiaApp } from '@inertiajs/react'
import { TuyauProvider } from '@adonisjs/inertia/react'
import { resolvePageComponent } from '@adonisjs/inertia/helpers'

const appName = import.meta.env.VITE_APP_NAME || 'AdonisJS'
Expand All @@ -18,7 +20,11 @@ createInertiaApp({
)
},
setup({ el, App, props }) {
createRoot(el).render(<App {...props} />)
createRoot(el).render(
<TuyauProvider client={client}>
<App {...props} />
</TuyauProvider>
)
},
progress: {
color: '#4B5563',
Expand Down
9 changes: 9 additions & 0 deletions inertia/client.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { registry } from '~registry'
import { createTuyau } from '@tuyau/core/client'

export const client = createTuyau({
baseUrl: 'http://localhost:3333',
registry,
})

export const urlFor = client.urlFor
13 changes: 6 additions & 7 deletions inertia/layouts/default.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { toast, Toaster } from 'sonner'
import { ReactElement, useEffect } from 'react'
import { Data } from '~/generated/data'
import { Form, Link, usePage } from '@inertiajs/react'
import { usePage } from '@inertiajs/react'
import { Link } from '@adonisjs/inertia/react'

export default function Layout({ children }: { children: ReactElement<Data.SharedProps> }) {
useEffect(() => {
Expand All @@ -17,7 +18,7 @@ export default function Layout({ children }: { children: ReactElement<Data.Share
<header>
<div>
<div>
<Link href="/">
<Link route="home">
<svg
width="120"
height="24"
Expand All @@ -35,13 +36,11 @@ export default function Layout({ children }: { children: ReactElement<Data.Share
<div>
<nav>
{children.props.user ? (
<Form method="POST" action="/logout">
<button type="submit"> Logout </button>
</Form>
<Link route="session.create">Logout</Link>
) : (
<>
<Link href="/signup">Signup</Link>
<Link href="/login">Login</Link>
<Link route="new_account.create">Signup</Link>
<Link route="session.create">Login</Link>
</>
)}
</nav>
Expand Down
3 changes: 2 additions & 1 deletion inertia/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"composite": true,
"paths": {
"~/*": ["./*"],
"~/generated/*": ["../.adonisjs/client/*"]
"~/generated/*": ["../.adonisjs/client/*"],
"~registry": ["../.adonisjs/client/registry.ts"]
}
},
"include": ["./**/*.ts", "./**/*.tsx", "../.adonisjs/client/**/*.ts"]
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,14 @@
"@adonisjs/auth": "^10.0.0-next.2",
"@adonisjs/core": "^7.0.0-next.12",
"@adonisjs/cors": "^3.0.0-next.0",
"@adonisjs/inertia": "^4.0.0-next.11",
"@adonisjs/inertia": "^4.0.0-next.13",
"@adonisjs/lucid": "^22.0.0-next.1",
"@adonisjs/session": "^8.0.0-next.0",
"@adonisjs/shield": "^9.0.0-next.1",
"@adonisjs/static": "^2.0.0-next.1",
"@adonisjs/vite": "^5.1.0-next.2",
"@inertiajs/react": "^2.2.19",
"@tuyau/core": "^1.0.0-beta.5",
"@vinejs/vine": "^4.1.0",
"better-sqlite3": "^12.5.0",
"edge.js": "^6.3.0",
Expand Down
1 change: 1 addition & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default defineConfig({
resolve: {
alias: {
'~/': `${import.meta.dirname}/inertia/`,
'~registry': `${import.meta.dirname}/.adonisjs/client/registry.ts`,
},
},
})