duto 0.260906.0 → 0.261001.0

package/src/pages/compiler/index.ts

@@ -1,31 +1,23 @@
+import { promisify } from 'node:util'
+import { brotliCompress } from 'node:zlib'
 import { mkdir } from 'node:fs/promises'
 import { join, dirname } from 'node:path'
-import { getLayouts, parsePage, resolveStaticOutputPath } from './meta'
 
 import { h } from 'preact'
 import { render } from 'preact-render-to-string'
 import minify from '@minify-html/node'
 
-import type { ResolvedConfig } from 'vite'
+import { JSJSON } from 't0n'
 import { DOCTYPE_RE } from './constants'
-import { getAsset, getChunk, normalizeId } from './assets'
-
-import type { IRoute, Metadata, RouteParams, StaticProps, SummaryMetadata } from './types'
-
-
-// import i18n from '../client/i18n'
+import { getAsset, getChunk } from './assets'
+import { getLayouts, resolveStaticOutputPath } from './meta'
 import { setLocale } from '../i18n/client'
-import { log, substep } from 't0n/log'
-
 
-
-import { promisify } from 'node:util'
-import { brotliCompress } from 'node:zlib'
-
-const brCompress = promisify(brotliCompress);
+import type { ResolvedConfig } from 'vite'
+import type { IRoute, Metadata, RouteParams, StaticProps, SummaryMetadata } from './types'
 
 
-export const selfCloseEmptyTags = (html: string, tagName: string) => html.replace(new RegExp(`<${tagName}\\b([^>]*?)>\\s*</${tagName}>`, 'g'), (_, attrs) => `<${tagName}${attrs} />`)
+const brCompress = promisify(brotliCompress)
 
 export async function renderPage(
   meta: Metadata,
@@ -33,40 +25,15 @@ export async function renderPage(
   page: IRoute
  ) {
   const {
-    mod, islands,
+    mod,
     hasGetProps, hasGetStaticProps,
     isClientOnly,
-  } = await parsePage(page, meta)
-  // const {
-  //   mod, islands,
-  //   hasGetProps, hasGetStaticProps,
-  //   isClientOnly,
-  // } = page
-
-  if (!mod?.default) {
-    console.warn(`No default export in ${page.filePath} — skipping`)
-    return
-  }
+  } = page
+  if (!mod?.default)
+    return console.warn(`No default export in ${page.filePath} — skipping`)
 
-  // console.log(page.filePath)
-  // console.error('hasGetProps:', hasGetProps)
-  // console.error('hasGetStaticProps:', hasGetStaticProps)
-  // console.error('isClientOnly:', isClientOnly)
-
-  if (page.isInternal || page.is404 || (page.isDynamic && !hasGetStaticProps)) {
-    meta.summary.set('/'+ page.fileName, {
-      type: 2,
-      path: '/'+ page.fileName,
-      size: 0,
-      sizeBr: 0,
-      sizeJS: 0,
-    })
-    // meta.routes.set(page.fullFilePath, page)
-    return
-  }
-
-  // console.log(meta.routes.size)
-  // meta.routes.set(page.filePath, page)
+  if (page.isInternal || page.is404 || (page.isDynamic && !hasGetStaticProps))
+    return meta.summary.set('/'+ page.fileName, { type: 2, path: '/'+ page.fileName, size: 0, sizeBr: 0, sizeJS: 0 })
 
   const { filePath, pattern, params } = page
 
@@ -109,7 +76,6 @@ export async function renderPage(
     const allProps = { ...prop.pageProps, ...prop.routeParams }
 
     // @ts-ignore
-    // i18n(allProps?.locale || meta.i18n.fallbackLocale, meta.i18n.locales, meta.i18n.messages, meta.i18n.routes, meta.i18n.routeMap)
     allProps?.locale && setLocale(allProps?.locale || meta.i18n.fallbackLocale)
 
     const pathname = resolveStaticOutputPath(page, prop.routeParams)
@@ -139,36 +105,11 @@ export async function renderPage(
       }
     // }
 
-    // TODO: refatorar isso... aqui dentro já é o SSG
-    const needsClient = hasGetProps || !!isClientOnly || islands.length > 0
-
-    // console.error(page.fileName)
-    // console.error('needsClient: ', needsClient)
-
-    const assets = []
-    for (const [depPath, dep] of meta.map.get(page.fullFilePath)!.deps)
-      assets.push(normalizeId(dep.path))
-
-
-    html = buildHtml(assets, html) //, needsClient, allProps, pattern, islands)
-    // html = selfCloseEmptyTags(String(minify.minify(
-    //   Buffer.from(buildHtml(assets, html, needsClient, allProps, pattern, islands)),
-    //   {}
-    //   // options != null ? options : {},
-    // )), 'i-i')
-
-    const outFile = join(
-      config.root,
-      config.build.outDir,
-      pathname +'.html'
-    )
-    const outHTML = minify.minify(
-      Buffer.from(html),
-      {}
-      // options != null ? options : {},
-    )
+    html = buildHtml(html, Object.keys(allProps).length ? allProps : undefined)
+
+    const outFile = join(config.root, config.build.outDir, pathname +'.html')
+    const outHTML = meta.minify ? minify.minify(Buffer.from(html), {}) : html
     await mkdir(dirname(outFile), {recursive: true})
-    // await writeFile(outFile, outHTML, 'utf-8')
     await Bun.write(outFile, outHTML)
 
     const key = '/'+ pathname
@@ -208,12 +149,8 @@ export async function renderPage(
 }
 
 function buildHtml(
-  _assets: string[],
   html: string,
-  // needsClient: boolean,
-  // props?: StaticProps,
-  // routePattern?: string,
-  // islands?: Island[],
+  props?: StaticProps,
 ): string {
   if (!(html.includes('<body') || html.includes('<html') || html.includes('<head')))
     html = wrapHtml(html)
@@ -221,58 +158,14 @@ function buildHtml(
   if (!DOCTYPE_RE.test(html))
     html = '<!DOCTYPE html>'+ html
 
-//   const pageProps = needsClient
-//     ? `<script>
-// window.__PROPS__ = ${JSON.stringify(props ?? {})};
-// </script>`
-//     : ''
-
   const assets = [
     ':duto/client/app.tsx',
-    // ..._assets,
   ]
 
   const prepend = assets.map(asset => {
     const href = getAsset(asset)
     return href ? `<link href="${href}" rel=stylesheet>` : null
   }).filter(Boolean).join('')
-    // + `<style>d-b,d-p,i-d,i-s{display:contents}</style>`
-    // + `<style>d,d-slot,d-s-slot{display:contents}</style>`
-
-//     d>*,d-slot>*,d-s-slot>*{display:revert}
-
-// d {
-//   display: block;
-//   box-sizing: border-box;
-// }
-
-// /* Herda todos os estilos padrão de div */
-// d:not([hidden]) {
-//   display: block;
-// }
-
-// /* Remove qualquer comportamento de display:contents */
-// d, d-slot, d-s-slot {
-//   display: block !important;
-// }
-
-//   d *,
-//   d-slot *,
-//   d-s-slot * {
-//     visibility: visible !important;
-//     opacity: 1 !important;
-//   }
-//     </style>
-
-//     <script>class DDiv extends HTMLElement {
-//     constructor() {
-//       super();
-//     }
-//   }
-
-//   if (typeof customElements !== 'undefined' && !customElements.get('d')) {
-//     customElements.define('d', DDiv);
-//   }</script>
 
   if (html.includes('</head>')) {
     html = html.replace('</head>', prepend +'</head>')
@@ -282,8 +175,7 @@ function buildHtml(
     html = prepend + html
   }
 
-  // const append = pageProps + assets.map(file => {
-  const append = assets.map(file => {
+  const append = (props ? `<script>(self.$duto=self.$duto||{}).props=${JSJSON(props)}</script>` : '') + assets.map(file => {
     const src = getChunk(file)
     return src ? `<script src="${src}" type=module></script>` : null
   }).filter(Boolean).join('')

package/src/pages/compiler/meta.ts

@@ -4,150 +4,65 @@
 // https://github.com/cloudflare/vinext/blob/main/packages/vinext/src/entries/pages-client-entry.ts
 // https://github.com/cloudflare/vinext/blob/main/packages/vinext/src/shims/ALS-ARCHITECTURE.md
 
-import { dirname, extname, join } from 'node:path'
-import { readdirSync } from 'node:fs'
+import { dirname, extname } from 'node:path'
 
-import { IMPORT, JSJSON, newID } from 't0n'
+import { getEnv, JSJSON, newID } from 't0n'
 
 import { getAliases } from './aliases'
-import { EXT_RE, DYNAMIC_RE, INTERNAL_RE, LAYOUT_RE, NF_NAMES } from './constants'
+import { DYNAMIC_RE, INTERNAL_RE, LAYOUT_RE, NF_NAMES, FILE_EXTENSIONS } from './constants'
+import { scan } from '@/utils'
 
 import { USE_CLIENT_RE } from './constants'
-import { parseSync } from '@swc/core'
-import { findUsage, getFileMap } from './ast'
-import { replaceIslands } from './island'
-import { mkdir } from 'node:fs/promises'
-
 
 import getI18n from '../i18n/server'
 import i18n from '../i18n/client'
 
 import type {
-  PageModule,
   IRoute, RouteParam, RouteParams,
   Metadata,
-  ImportUsage,
   SummaryMetadata,
 } from './types'
 
-export function getAssets(meta: Metadata): Set<string> {
-  const deps = new Set<string>()
-  const queue: string[] = []
-  const dir = join(meta.root, meta.dir)
-
-  for (const [path] of meta.map) {
-    if (path.startsWith(dir))
-      queue.push(path)
-  }
-
-  while (queue.length > 0) {
-    const path = queue.pop()!
-    const imports = meta.map.get(path)!.deps
-    if (!imports?.size) continue
-
-    for (const [dep] of imports) {
-      if (!dep.startsWith(meta.root) || dep.startsWith(dir) || deps.has(dep)) continue
-      deps.add(dep)
-      if (dep in meta.map) queue.push(dep)
-    }
-  }
-
-  return deps
-}
-
-
-export async function parsePage(page: IRoute, meta: Metadata) {
-  const fileMeta = meta.map.get(page.fullFilePath)!
-  if (!meta.violations.has(page.fullFilePath)) {
-    return page
-  }
-
-  const islands: ImportUsage[] = []
-  const ast = parseSync(fileMeta.content, { syntax: 'typescript', tsx: true })
-  for (const [depPath, dep] of fileMeta.deps) {
-    // console.error(depPath, page.fullFilePath)
-    if (!meta.violations.has(depPath)) continue
-
-    const usages = findUsage(fileMeta.content, dep.ref, ast)
-    // console.log(usages, dep.ref)
-    islands.push(...usages)
-    // for (const usage of usages)
-    //   islands.push(...usage.usages)
-
-
-    // console.log(id)
-    // console.log(usage)
-    // console.log(usage[0].usages)
-  }
-
-  //   // Limpar linhas vazias extras
-  //   result = result.replace(/^\s*\n/gm, '')
-
-  const content = await replaceIslands(fileMeta.content, islands)
-  // @ts-ignore
-  let mod: PageModule = {}
-  const tmpPath = join(meta.root, 'tmp', page.filePath)
-  try {
-    await mkdir(dirname(tmpPath), {recursive: true})
-    await Bun.write(tmpPath, content)
-    mod = await IMPORT(tmpPath)
-  } catch {}
-
-  return {
-    safeFilePath: tmpPath,
-    mod, content, islands,
-    hasGetStaticProps: typeof mod.getStaticProps === 'function',
-    hasGetProps: typeof mod.getProps === 'function',
-    isClientOnly: USE_CLIENT_RE.test(content),
-  }
-}
-
 
 // TODO: https://github.com/cloudflare/vinext/blob/adfc2236cba5f7cde63f32f6fb35c0d892428376/packages/vinext/src/routing/file-matcher.ts#L90
 export async function getPages(meta: Metadata) {
-  const files = readdirSync(join(meta.root, meta.dir), {recursive: true})
   const nf = new Map<string, IRoute>()
   const layouts = new Map<string, IRoute>()
   const pages = new Map<string, IRoute>()
   const spages = new Set<string>()
   const routes: IRoute[] = []
 
-  for (const file of files) {
-    if (typeof file !== 'string' || !EXT_RE.test(file)) continue
-
+  for await (const [file, path, mod] of scan(meta.dir, FILE_EXTENSIONS)) {
     const ext = extname(file)
-    const fullFilePath = join(meta.root, meta.dir, file)
-    const { pattern, params } = filePathToWouterPattern(file)
-
-    const name = file.replace(EXT_RE, '').split('/').pop() as string
+    const filePath = path.split(meta.dir+'/').pop() as string
+    const fileName = filePath.replace(ext, '')
+    const { pattern, params } = filePathToWouterPattern(fileName)
 
-    const fileMeta = meta.map.get(fullFilePath)!
-    const mod = (await IMPORT(fullFilePath)) as PageModule
+    const name = file.replace(ext, '').split('/').pop() as string
+    const content = await Bun.file(file).text()
 
-    // console.error(file, INTERNAL_RE.test(file))
     const page = {
       fileExt: ext.substring(1),
-      fileName: file.replace(ext, ''),
-      filePath: file,
-      fullFilePath,
+      fileName,
+      filePath,
+      fullFilePath: file,
       pattern,
       params,
       is404: name ? NF_NAMES.includes(name) : false,
-      isDynamic: DYNAMIC_RE.test(file),
-      isInternal: INTERNAL_RE.test(file),
+      isDynamic: DYNAMIC_RE.test(path),
+      isInternal: INTERNAL_RE.test(path),
 
       importName: newID(),
 
       mod,
-      content: fileMeta.content,
-      islands: [],
+      content: content,
       layouts: [],
       hasGetStaticProps: typeof mod.getStaticProps === 'function',
       hasGetProps: typeof mod.getProps === 'function',
-      isClientOnly: USE_CLIENT_RE.test(fileMeta.content),
+      isClientOnly: USE_CLIENT_RE.test(content),
     }
 
-    if (LAYOUT_RE.test(file)) {
+    if (LAYOUT_RE.test(path)) {
       layouts.set(page.fileName, page)
       continue
     }
@@ -155,14 +70,14 @@ export async function getPages(meta: Metadata) {
     if (page.is404) {
       nf.set(page.fileName, page)
       routes.push(page)
-      pages.set(fullFilePath, page)
+      pages.set(file, page)
       continue
     }
 
     if (!page.isInternal)
-      pages.set(fullFilePath, page)
+      pages.set(file, page)
 
-    if (!page.isInternal && page.isDynamic && page.hasGetProps)
+    if (!page.isInternal)
       routes.push(page)
 
     if (!page.isInternal) {
@@ -170,11 +85,9 @@ export async function getPages(meta: Metadata) {
         try {
           const _props = await page.mod.getStaticProps?.()
           const props = Array.isArray(_props) ? _props : [_props]
-          for (const prop of props) {
-            // console.log(prop, file)
+          for (const prop of props)
             spages.add('/'+resolveStaticOutputPath(page, prop as any))
-          }
-            // spages.add('/'+resolveStaticOutputPath(page, prop as any))
+
         } catch(e) {
           console.log('errro', e)
         }
@@ -192,49 +105,6 @@ export async function getPages(meta: Metadata) {
   meta.routes = await sortRoutes(meta, routes)
 }
 
-/**
- * A partir do path de um arquivo relativo à raiz de rotas do Next.js
- * (app/ ou pages/), retorna:
- *
- * - layouts: arquivos "layout.{tsx,ts,jsx,js}" aplicáveis à rota, ordenados
- *   do mais próximo do arquivo (segmento irmão) ao mais distante (raiz).
- *   Ex.: ["users/layout.tsx", "layout.tsx"]
- * - document: o "_document.{tsx,ts,jsx,js}" do Pages Router, se existir na
- *   raiz das rotas. Só é checado uma vez no topo, nunca por segmento — é
- *   um arquivo único, diferente do layout, que pode ser aninhado.
- *
- * Compatibilidade com a especificação oficial do Next.js:
- * - App Router: nenhum arquivo especial usa prefixo "_" — é "layout", não
- *   "_layout". layout.js é o componente mais externo de um route segment e
- *   envolve template.js, error.js, loading.js, not-found.js e page.js.
- * - Pages Router: pages/_document.js (com "_") customiza as tags <html> e
- *   <body> e existe só uma vez, na raiz de pages/. No App Router esse papel
- *   foi assumido pelo root layout.js — não há "_document" equivalente lá.
- */
-// export async function getLayouts(meta: Metadata, path: string) {
-//   const isDir = existsSync(path) && statSync(path).isDirectory()
-//   const fileDir = isDir ? path : dirname(path)
-
-//   const layouts: Page[] = []
-//   let currentDir = fileDir
-
-//   while (true) {
-//     const layout = findFileByName(meta, currentDir, 'layout')
-//     if (layout && meta.pages.has(layout)) {
-//       // const mod = meta.pages.get(layout)?.mod
-//       const { mod, content } = await parsePage(meta.pages.get(layout)!, meta)
-//       if (mod?.default) layouts.push(mod.default)
-//     }
-
-//     const parentDir = dirname(currentDir)
-//     if (parentDir === currentDir) break
-
-//     currentDir = parentDir
-//   }
-
-//   return layouts
-// }
-
 export async function getLayouts(meta: Metadata, path: string) {
   const layouts: IRoute[] = []
   const segments = dirname(path).split(/[\\/]/).filter(Boolean)
@@ -242,48 +112,36 @@ export async function getLayouts(meta: Metadata, path: string) {
   for (let i = segments.length; i >= 0; i--) {
     const dir = segments.slice(0, i).join('/')
 
-    const page = meta.layouts.get(dir ? dir +'/_layout' : '_layout') || meta.layouts.get(dir ? dir +'/layout' : 'layout')
-    if (!page) continue
-
-    const { mod } = await parsePage(page, meta) // @ts-ignore
-    if (mod?.default) {
-      page.mod = mod
-      layouts.push(page)
-    }
+    const layout = meta.layouts.get(dir ? dir +'/_layout' : '_layout') || meta.layouts.get(dir ? dir +'/layout' : 'layout')
+    if (!layout) continue
 
+    // @ts-ignore
+    if (layout.mod?.default)
+      layouts.push(layout)
   }
 
   return layouts
 }
 
 export async function getMetadata(root: string, dir: string) {
-  const meta = { root, dir } as Metadata
+  const meta = { root, dir, ...getEnv('duto', {}) } as Metadata
   meta.summary = new Map<string, SummaryMetadata>()
 
   meta.i18n = await getI18n(meta)
   i18n(meta.i18n.fallbackLocale, meta.i18n.locales, meta.i18n.messages, meta.i18n.routes, meta.i18n.routeMap)
 
-  meta.aliases = getAliases(root)
-  const fileMap = await getFileMap(meta)
-  meta.map = fileMap.map
-  meta.violations = fileMap.violations
-  meta.assets = Array.from(getAssets(meta))
+  meta.aliases = await getAliases(root)
 
   await getPages(meta)
 
   meta.string = `// AUTO-GENERATED FILE - DO NOT EDIT
-${meta.routes.map((page, index) => `\nimport Page${index + (page.hasGetProps ? `, { getProps as getProps${index} }` : '')} from '${page.fullFilePath}'`).join('\n')}
-${Array.from(meta.layouts.values()).map(layout => `\nimport Layout${layout.importName} from '${layout.fullFilePath}'`).join('\n')}
+${meta.routes.filter(r => r.is404).map(r => `\nimport Page${r.importName + (r.hasGetProps ? `, { getProps as getProps${r.importName} }` : '')} from '${r.fullFilePath}'`).join('\n')}
+${Array.from(meta.layouts.values()).map(l => `\nimport Layout${l.importName} from '${l.fullFilePath}'`).join('\n')}
 
-export const views = [${meta.routes.map((page, index) => `['${page.pattern}',Page${index},${JSJSON(Object.entries(page.params).map(([_,v]) => v))}${page.hasGetProps ? `,getProps${index}` : (page.layouts.length ? ',0': '')}${page.layouts.length ? ',[' + Object.entries(page.layouts).map(([_,v]) => 'Layout'+v.importName) +']' : ''}]`).join(',')}]
+export const views = [${meta.routes.map(r => `['${r.pattern}',${r.is404 ? 'Page'+ r.importName : `'${r.fullFilePath}'`},${Object.keys(r.params).length ? JSJSON(Object.entries(r.params).map(([_,v]) => v)) : '0'}${r.hasGetProps ? (r.is404 ? `,getProps${r.importName}` : `,1`) : (r.layouts.length ? ',0': '')}${r.layouts.length ? ',[' + Object.entries(r.layouts).map(([_,l]) => 'Layout'+l.importName) +']' : ''}]`).join(',')}]
 
 export const SRoutes = new Set(${JSJSON([...meta.spages])})
-
-
-` /// + meta.i18n.string
-
-  // console.error(meta.string)
-  // console.log(meta.map.get(`/Users/nicolau/Projects/preact-skeleton/pages/index.tsx`))
+`
 
   return meta
 }
@@ -381,64 +239,19 @@ function getRouteMeta(pattern: string): RouteMeta {
     segmentsCount: segments.length,
   }
 }
-// //////////////////////////////////////////////////////////////////////////////////////////
 
-// export function sortRoutes(pages: Map<string, IRoute>) {
-//   const metas = new Map<string, { score: number, segmentsCount: number }>()
-
-//   for (const [route, page] of pages)
-//     metas.set(route, computeRouteMeta(page.pattern))
-
-//   const list = Array.from(pages.values()).sort((a, b) => {
-//     const metaA = metas.get(a.fullFilePath)!
-//     const metaB = metas.get(b.fullFilePath)!
-
-//     if (metaA.score === metaB.score)
-//       return metaB.segmentsCount - metaA.segmentsCount
-
-//     return metaB.score - metaA.score
-//   })
-
-//   while (list.length && list.at(-1)?.pattern === '/') {
-//     const last = list.pop()
-//     last && list.unshift(last)
-//   }
-
-//   return list
-// }
-
-// function computeRouteMeta(path: string) {
-//   const segments = path.split('/').filter(Boolean)
-
-//   let score = 0
-//   for (const segment of segments) {
-//     if (segment === '*') {
-//       continue
-//     } else if (segment.startsWith(':')) {
-//       score += 1
-//     } else {
-//       score += 10
-//     }
-//   }
-
-//   return { score, segmentsCount: segments.length }
-// }
-
-// //////////////////////////////////////////////////////////////////////////////////////////
 const CATCHALL_NAMES = new Set(['404', 'not-found'])
 
-export function filePathToWouterPattern(filePath: string): {
+export function filePathToWouterPattern(path: string): {
   pattern: string
   params: Record<string, RouteParam>
 } {
-  const withoutExt = filePath.replace(EXT_RE, '')
-
   const normalized =
-    withoutExt === 'index'
+    path === 'index'
       ? ''
-      : withoutExt.endsWith('/index')
-        ? withoutExt.slice(0, -6)
-        : withoutExt
+      : path.endsWith('/index')
+        ? path.slice(0, -6)
+        : path
 
   const segments = normalized ? normalized.split('/') : []
 
@@ -535,8 +348,6 @@ export function filePathToWouterPattern(filePath: string): {
 
   return { pattern, params }
 }
-// //////////////////////////////////////////////////////////////////////////////////////////
-
 
 /**
  * Given a static props entry (returned by getStaticProps),

package/src/pages/compiler/routes.ts

@@ -1,13 +1,12 @@
-import { join } from 'pathe'
-import { _root } from './utils'
-import type { IRoute, Metadata } from './types'
-import { dirname } from 'node:path'
+import { dirname, join } from 'pathe'
 import { NF_NAMES } from './constants'
+import { _root } from '@/utils'
+import type { Metadata } from './types'
 
 export const router = new Bun.FileSystemRouter({
   style: 'nextjs',
   dir: join(_root, 'pages'),
-  // origin: 'https://mydomain.com',
+  // origin: 'https://example.com',
   // assetPrefix: 'assets/',
 })
 export const reload = () => router.reload()