duto 0.260915.0 → 0.261011.0

package/src/pages/compiler/vite-plugin.ts

@@ -6,23 +6,24 @@ import { defineConfig } from 'vite'
 
 import preact from '@preact/preset-vite'
 import tailwind from '@tailwindcss/vite'
+import { JSJSON } from 't0n'
 
 import { EXT_RE } from './constants'
-import { setAsset, setChunk, setEntry } from './assets'
+import { getChunk, setAsset, setChunk, setEntry } from './assets'
 import { renderPage } from '.'
 import { removeExports, resolveImport } from './ast'
 import { getMetadata } from './meta'
 
 import type {
-  // Plugin,
   UserConfig, ConfigEnv, ResolvedConfig,
-  PreviewServer,
+  // PreviewServer,
   // ViteDevServer,
   EnvironmentOptions,
   PluginOption,
 } from 'vite'
 import type { Metadata, PluginOptions } from './types'
 import { _pages, _root } from '@/utils'
+import { cp } from 'node:fs/promises'
 
 const VIRTUAL_ID = ':duto'
 const RESOLVED_ID = '\0'+ VIRTUAL_ID
@@ -42,6 +43,7 @@ export const config = (opts: UserConfig & PluginOptions) => { // @ts-ignore
   return defineConfig(opts)
 }
 
+// TODO: remover..
 export default config
 
 let metadata: Metadata
@@ -50,13 +52,11 @@ export function meta() {
 }
 
 export function plugin(options: PluginOptions = {}): PluginOption[] {
-  // let server: ViteDevServer
   let config: ResolvedConfig
   const {
-    root = _root, // process.env.npm_config_local_prefix || process.env.PWD || process.cwd() || __dirname,
+    root = _root,
     pagesDir = 'pages',
   } = options
-  // let metadata: Metadata
 
   const PAGES_RE = new RegExp(`\/${pagesDir}\/.*\.(tsx?|jsx?)$`, 'i')
   const stripTarget = new Set(['getStaticProps'])
@@ -105,18 +105,9 @@ export function plugin(options: PluginOptions = {}): PluginOption[] {
       name: 'duto:scan',
       enforce: 'pre',
 
-      // configureServer(_server) {
-      //   server = _server
-      //   // servers.push(server)
-      // },
-
       async config(conf: UserConfig, env: ConfigEnv) {
         metadata = await getMetadata(root as string, pagesDir)
 
-        // console.log(metadata.map)
-        // console.log(metadata.violations)
-        // console.log(Array.from(metadata.violations).filter(file => EXT_RE.test(file)))
-
         if (conf.build) {
           // conf.build.emptyOutDir = false
           conf.build.copyPublicDir = false
@@ -129,10 +120,11 @@ export function plugin(options: PluginOptions = {}): PluginOption[] {
           conf.build.rolldownOptions = conf.build.rolldownOptions || {}
           conf.build.rolldownOptions.preserveEntrySignatures = 'exports-only' ///
           conf.build.rolldownOptions.input = [
+            ...metadata.routes.map(r => r.is404 ? '' : r.fullFilePath).filter(Boolean),
             ':duto/client/app.tsx',
             // ':duto/not-found.tsx',
-            ...Object.keys(metadata.pages),
-            ...metadata.assets,
+            // ...Object.keys(metadata.pages),
+            // ...metadata.assets,
           ]
 
           const filePrefix = metadata.minify ? '' : '[name].'
@@ -141,11 +133,6 @@ export function plugin(options: PluginOptions = {}): PluginOption[] {
             hoistTransitiveImports: false,
             format: 'esm',
             minifyInternalExports: metadata.minify,
-
-            // manualChunks: {
-            //   vendor: ['preact', '@preact/signals', 'wouter-preact'],
-            // },
-            // preserveModules: true,
             preserveModulesRoot: '/',
             assetFileNames: filePrefix +'[hash][extname]',
             entryFileNames: filePrefix +'[hash].js',
@@ -155,14 +142,19 @@ export function plugin(options: PluginOptions = {}): PluginOption[] {
             // entryFileNames: 'assets/[name].js',
             // chunkFileNames: 'assets/chunks/[name]-[hash].js',
             // assetFileNames: 'assets/[name][extname]',
+
+            // manualChunks: {
+            //   vendor: ['preact', '@preact/signals', 'wouter-preact'],
+            // },
+            // preserveModules: true,
           }
         }
 
         return conf
       },
 
-      async configResolved(conf) {
-        config = conf
+      async configResolved(c) {
+        config = c
       },
 
       resolveId(id) {
@@ -217,18 +209,26 @@ export function plugin(options: PluginOptions = {}): PluginOption[] {
         // for (const id of moduleIds)
         // console.error(id)
 
+        // TODO: rever isso...
         for (const key in bundle) {
           const file = bundle[key]
+
           if (file.type === 'chunk' && file.isEntry) {
             setChunk(file.facadeModuleId, '/'+ file.fileName)
             continue
           }
 
           if (file.type === 'asset' && file?.originalFileName?.endsWith('duto/pages/client/app.tsx'))
-            file.source += 'd-b,d-p,i-d,i-s,i-i{display:contents}'
+            file.source += 'i-i{display:contents}'
 
           if (file.type === 'asset' && file.fileName.endsWith('.css')) {
             setAsset(resolveImport(file.originalFileName as string, metadata.root, metadata.aliases), '/'+ file.fileName)
+
+            const css = typeof file.source === 'string'
+              ? file.source
+              : Buffer.from(file.source).toString('utf-8')
+
+            file.source = css.replace(/\/\*!\s*tailwindcss[^*]*\*\/\s*/g, '')
             continue
           }
 
@@ -275,13 +275,50 @@ export function plugin(options: PluginOptions = {}): PluginOption[] {
       },
 
       async closeBundle() {
-        for (const [_filePath, page] of metadata.pages) // {
+        for (const [_filePath, page] of metadata.pages)
           await renderPage(metadata, config, page)
           // const mod = await server.ssrLoadModule(_filePath)
-        // }
 
         rmSync(join(metadata.root, 'tmp'), {recursive: true, force: true})
         // await server.close()
+
+        const outPath = join(config.root, config.build.outDir)
+
+        await cp(join(config.root, 'public'), outPath, { recursive: true, force: true })
+
+        const entry = Bun.file(join(outPath, getChunk(':duto/client/app.tsx')))
+        if (await entry.exists()) {
+          let entryContent = await entry.text()
+
+          for (const r of metadata.routes.filter(r => !r.is404)) {
+            const rPath = getChunk(r.fullFilePath.replace(config.root, ''))
+
+            if (r.props) {
+              const rFile = Bun.file(join(outPath, rPath))
+              await rFile.write((await rFile.text()).replace('}export{', `}export const props=${JSJSON(r.props)};export{`))
+            }
+
+            entryContent = entryContent.replace(r.fullFilePath, rPath)
+          }
+
+          await entry.write(entryContent)
+        }
+
+        // i18n
+        for (const locale of metadata.i18n.locales) {
+          const intlPath = join(metadata.root, 'i18n', locale + '.ts')
+          if (existsSync(intlPath)) {
+            const intlMod = await import(intlPath)
+            await Bun.write(
+              join(outPath, locale +'.js'),
+              `var a=${JSJSON({
+                routes: intlMod.routes ?? intlMod.default?.routes,
+                messages: intlMod.messages ?? intlMod.default?.messages,
+              })};export { a as default }`
+            )
+          }
+        }
+
       },
 
       // TODO: precisa ser aqui mesmo pois se a pagina for importada no entry, pode incluir codigo nao usado no chunck/bundle

package/src/pages/components/link.tsx

@@ -1,4 +1,4 @@
-import { Link as WouterLink, useLocation } from 'wouter-preact'
+import { useLocation } from 'wouter-preact'
 import type { LinkProps } from 'wouter-preact'
 
 const isExternalUrl = (href?: string) =>
@@ -12,27 +12,19 @@ export const Link = ({
   href = to,
   ...rest
 }: LinkProps) => {
-  const isExternal = isExternalUrl(rest.href = href)
-  const isSRoute = window?.$duto?.sroutes?.has(href)
-
-  if (isExternal) {
+  if (isExternalUrl(rest.href = href)) {
     rest.target = '_blank'
     rest.rel = 'noopener noreferrer'
+  } else {
+    rest.is = 'i-l'
   }
 
-  if (!href || isExternal || isSRoute) {
-    const [pathname] = useLocation()
-    const baseClass = typeof rest.class === 'string' || !rest?.class
-      ? (rest.class || '') as string
-      : ''
-    rest.class = baseClass + (pathname === href ? ' active' : '')
-
-    !href && (delete rest.href)
-    return <a is='i-l' {...rest} />
-  }
-
-  if (typeof rest.class === 'string' || !rest?.class)
-    rest.className = a => (rest.class || '') + (a ? ' active' : '')
+  const [pathname] = useLocation()
+  const baseClass = typeof rest.class === 'string' || !rest?.class
+    ? (rest.class || '') as string
+    : ''
+  rest.class = baseClass + (pathname === href ? ' active' : '')
 
-  return <WouterLink is='i-l' {...rest} />
+  !href && (delete rest.href)
+  return <a {...rest} />
 }

package/src/pages/i18n/client.ts

@@ -1,6 +1,5 @@
 import { h, type JSX } from 'preact'
 import { local } from '#/client/storage'
-import { navigate } from '..'
 
 const accepted = (lang: string | undefined, locales: string[] = [], fallback: string) => lang && locales.includes(lang) ? lang : fallback
 
@@ -41,7 +40,7 @@ const getAccepted = (lang: string, locales: string[] = [], defaultLocale = '') =
   return defaultLocale
 }
 
-const detect = (locales: string[], defaultLocale: string) => {
+export const detect = (locales: string[], defaultLocale: string) => {
   if (!defaultLocale) defaultLocale = 'en'
   if (typeof window === 'undefined') return defaultLocale
 
@@ -84,12 +83,22 @@ export const getLocale = () => {
   }
 }
 
-export const setLocale = (lang: string) => {
+export const setLocale = async (lang: string) => {
+  await loadLang(lang)
   cache(lang)
   _locale = accepted(lang, _locales, _detected)
 }
 
-export default function i18n(
+async function loadLang(lang: string) {
+  if (!_routes[lang] || !_messages[lang]) {
+    const intlMod = await import('/'+ lang +'.js')
+    if (!intlMod) return
+    _routes[lang] = intlMod.routes ?? intlMod.default?.routes
+    _messages[lang] = intlMod.messages ?? intlMod.default?.messages
+  }
+}
+
+export default async function i18n(
   fallbackLocale: string,
   locales: string[],
   messages: Record<string, Record<string, string>>,
@@ -103,6 +112,8 @@ export default function i18n(
   _detected = detect(locales, fallbackLocale)
   _locale = typeof window === 'undefined' ? fallbackLocale : getLocale()
 
+  await loadLang(_locale)
+
   // console.error(routes)
   // console.error(routeMap)
 }
@@ -113,7 +124,7 @@ export const cached = () => local.get('lang') as string || ''
 export const updateWidth = (el: HTMLSelectElement) => {
   if (el) {
     const option = el.querySelector(`option[value="${el.value}"]`) as HTMLOptionElement
-    const length = option.textContent.split(' ')[0]?.length || 0
+    const length = option?.textContent.split(' ')[0]?.length || 0
     el.style.width = (length * 15.7)+ 'px'
   }
 }
@@ -141,7 +152,7 @@ export const r = (key: string, lang?: string) => {
   const path = '/'+ lang + (key ? '/'+ route(key, lang) : '')
 
   if (!location.pathname.endsWith(path))
-    navigate(path)
+    self.$duto?.navigate(path)
 
   // return '/' + lang + '/' + (key in _routes[lang] ? _routes[lang][key] : key)
 }
@@ -173,10 +184,10 @@ type TProps = {
 }
 
 const lookup = (key: string, lang: string): string => {
-  if (!key) return '';
-  if (key.startsWith('_')) return key.replace(/^_+/, '');
-  const msg = _messages[lang] ?? _messages[_locale];
-  return (key in msg ? msg[key] : key) as string;
+  if (!key) return ''
+  if (key.startsWith('_')) return key.replace(/^_+/, '')
+  const msg = _messages[lang] ?? _messages[_locale]
+  return (msg && key in msg ? msg[key] : key) as string
 }
 
 const interpolate = (template: string, params: Record<string, Primitives> | Primitives[]): string => {

package/src/pages/i18n/server.ts

@@ -11,7 +11,7 @@ export default async function getI18n(meta: Metadata) {
     'i18n.ts',
     'i18n/index.ts',
   ]) {
-     const path = join(meta.root, variant)
+    const path = join(meta.root, variant)
     if (existsSync(path)) {
       file = path
       break
@@ -22,13 +22,28 @@ export default async function getI18n(meta: Metadata) {
   const mod = await IMPORT<I18nMetadata>(file)
 
   // @ts-ignore
-  if (['locales', 'fallbackLocale', 'messages', 'routes', 'options'].some(i => !mod[i]))
+  if (['locales', 'fallbackLocale', 'options'].some(i => !mod[i]))
     return {} as I18nMetadata
 
+  // const routes = Object.fromEntries(mod.locales.map(locale => [locale, ]))
+
+  const routes: Record<string, Record<string, string>> = {}
+  const messages: Record<string, Record<string, string>> = {}
+  for (const locale of mod.locales) {
+    const intlPath = join(meta.root, 'i18n', locale + '.ts')
+    if (existsSync(intlPath)) {
+      const intlMod = await IMPORT<{default:{routes: Record<string, string>, messages: Record<string, string>}}>(intlPath)
+      routes[locale] = intlMod.default.routes
+      messages[locale] = intlMod.default.messages
+    }
+  }
+
   const i18n: I18nMetadata = {
     ...mod,
+    routes,
+    messages,
     routeMap: Object.fromEntries(
-      Object.values(mod.routes)
+      Object.values(routes)
         .map(paths => Object.entries(paths).map(([key, path]) => path == key ? 0 : [path, key]).filter(Boolean))
         .flat() as Array<[string, string]>
     ),
@@ -36,7 +51,7 @@ export default async function getI18n(meta: Metadata) {
     string: '',
   }
 
-  Object.entries(mod.routes)
+  Object.entries(routes)
     .forEach(([locale, paths]) => {
        Object.entries(paths)
         .forEach(([route, path]) => i18n.pageRoutes.push({ locale, path }))
@@ -44,8 +59,8 @@ export default async function getI18n(meta: Metadata) {
 
   i18n.string = `export const fallbackLocale = ${JSJSON(mod.fallbackLocale)}
 export const locales = ${JSJSON(mod.locales)}
-export const messages = ${JSJSON(mod.messages)}
-export const routes = ${JSJSON(mod.routes)}
+export const messages = ${JSJSON(messages)}
+export const routes = ${JSJSON(routes)}
 export const routeMap = ${JSJSON(i18n.routeMap)}
 export const pageRoutes = ${JSJSON(i18n.pageRoutes)}
 export const options = ${JSJSON(mod.options)}

package/src/pages/index.ts

@@ -1,28 +1,10 @@
 export {
-  Redirect,
-  useLocation, useParams, useSearch, useSearchParams,
-  matchRoute,
-} from 'wouter-preact'
-
-export {
-  t, r, d,
-  getLocale, setLocale,
-  isPrefixed,
+  route, r, redirect,
+  t, tl, d,
+  getLocale, setLocale, isPrefixed,
 } from './i18n/client'
 
 export { local } from './client/storage'
 
-export const navigate = <S = any>(
-  to: string | URL,
-  options?: { replace?: boolean; state?: S; transition?: boolean }
-) => {
-  if (window?.$duto?.sroutes?.has(to)) {
-    location.pathname = to
-    return
-  }
-
-  const n = window?.$duto?.navigate || useLocation()[1]
-  n(to, options)
-}
-
+export * from './client/theme'
 export { Link } from './components/link'

package/src/server/app.ts

@@ -10,6 +10,7 @@ import { isDev } from './utils/environment'
 import { getVerb } from './utils'
 import { registerMiddleware, resolveHandle, resolveMw } from './handle'
 
+const NFHandler = () => response.notFound()
 async function EHandler(e: Error | HTTPResponseError) {
   console.error(e)
 
@@ -74,7 +75,7 @@ export default function createApp<E extends Env>(options?: ServerOptions<E>) {
 
   // @ts-ignore
   app.onError(options?.onError || EHandler)
-  app.notFound(options?.notFound || response.notFound)
+  app.notFound(options?.notFound || NFHandler)
 
   if (options?.init) options.init(app)
 

package/src/server/routes.ts

@@ -1,4 +1,4 @@
-import { Glob, file, write } from 'bun'
+import { file, write } from 'bun'
 
 import { copyFileSync } from 'node:fs'
 import { join, relative } from 'pathe'
@@ -12,7 +12,7 @@ import { STATUS_CODES } from 'node:http'
 import $ from './app'
 import _response from './response'
 import _validator from './validator'
-import { _root, _server } from '@/utils'
+import { _root, _server, scan } from '@/utils'
 import { getLastCommitHash, ensureDir, nextId, verbAlias } from './utils'
 import { generateOpenAPI, generateOpenAPIClient, openAPIConfig } from './open-api/spec'
 import { highlightedMethod, highlightedURI } from './cli/utils'
@@ -21,28 +21,6 @@ import type { Routes, Rule, StandardSchemaV1 } from './types'
 import { autorizedPath } from './middlewares/auth'
 import { isDev } from './utils/environment'
 
-export async function* scan(
-  dir: string | string[],
-  ext: string | string[],
-  ignore: string[] = ['*.d.*'],
-  cwd?: string,
-): AsyncGenerator<[string, string, any]> {
-  if (typeof dir !== 'string')
-    dir = ext.length === 1 ? dir[0] : `{${dir.join(',')}}`
-
-  if (typeof ext !== 'string')
-    ext = ext.length === 1 ? ext[0] : `{${ext.join(',')}}`
-
-  cwd ??= _root
-  for await (const file of new Glob(dir +'/**/*.'+ ext).scan({
-    cwd,
-    absolute: true,
-    onlyFiles: true, // @ts-ignore
-    ignore,
-  })) {
-    yield [file, file.split(cwd as string)[1], await IMPORT(file)]
-  }
-}
 
 const importName = (name: string | undefined, dirs: string[]) => (name || nextId()).replace(/\.ts$/, '')
 
@@ -407,10 +385,10 @@ export async function cacheRoutes() {
   if (isDev()) {
     const _file = join(_server, 'middlewares', 'logger.ts')
     const _mod = await IMPORT(_file) // @ts-ignore
-    middlewares.unshift({
+    middlewares.unshift({ // @ts-ignore
       path: _mod?.path || '*',
       name: 'dev_logger',
-      file: _file,
+      file: _file, // @ts-ignore
       handle: _mod.handle,
     })
   }

package/src/utils.ts

@@ -1,10 +1,10 @@
-import { getEnv } from 't0n'
+import { IMPORT } from 't0n'
 import { dirname, join } from 'pathe'
 
 export const _duto = dirname(new URL(import.meta.url).pathname)
 export const _pages = join(_duto, 'pages')
-export const _server = join(_duto, 'server')
-export const _root = getEnv('npm_config_local_prefix') || getEnv('PWD') || join(_duto, '../../')
+export const _server = join(_duto, 'server') //@ts-ignore
+export const _root = process.env?.npm_config_local_prefix || process.env?.PWD || process.stdin?.path || process.cwd() // || join(_duto, '../../')s
 
 const UNITS = ['B', 'kB', 'MB', 'GB']
 export function filesize(bytes: number, decimals = 2) {
@@ -13,3 +13,34 @@ export function filesize(bytes: number, decimals = 2) {
   const i = Math.min(Math.floor(Math.log(bytes) / Math.log(1024)), UNITS.length - 1)
   return `${parseFloat((bytes / 1024 ** i).toFixed(decimals))} ${UNITS[i]}`
 }
+
+export const formatTime = (ms: number) => {
+  if (ms < 0.001) return `${(ms * 1_000_000).toFixed(2)}ns`
+  if (ms < 1) return `${(ms * 1000).toFixed(2)}µs`
+  if (ms < 1000) return `${ms.toFixed(2)}ms`
+  if (ms < 60000) return `${(ms / 1000).toFixed(2)}s`
+  return `${Math.floor(ms / 60000)}m ${((ms % 60000) / 1000).toFixed(1)}s`
+}
+
+export async function* scan(
+  dir: string | string[],
+  ext: string | string[],
+  ignore: string[] = ['*.d.*'],
+  cwd?: string,
+): AsyncGenerator<[string, string, any]> {
+  if (typeof dir !== 'string')
+    dir = ext.length === 1 ? dir[0] : `{${dir.join(',')}}`
+
+  if (typeof ext !== 'string')
+    ext = ext.length === 1 ? ext[0] : `{${ext.join(',')}}`
+
+  cwd ??= _root
+  for await (const file of new Bun.Glob(dir +'/**/*.'+ ext).scan({
+    cwd,
+    absolute: true,
+    onlyFiles: true, // @ts-ignore
+    ignore,
+  })) {
+    yield [file, file.split(cwd as string)[1], await IMPORT(file)]
+  }
+}