refactor: rename interface 'Module' to 'RouteModule'

Author: Je

aleph.ts

@@ -2,7 +2,7 @@ import React, { ComponentType, useCallback, useEffect, useRef, useState } from '
 import { DataContext, RouterContext } from './context.ts'
 import { E400MissingDefaultExportAsComponent, E404Page, ErrorBoundary } from './error.ts'
 import events from './events.ts'
-import { createPageProps, Module, Routing } from './routing.ts'
+import { createPageProps, RouteModule, Routing } from './routing.ts'
 import type { RouterURL } from './types.ts'
 import util, { hashShort, reModuleExt } from './util.ts'
 
@@ -87,7 +87,7 @@ export function ALEPH({ initial }: {
             console.log('[DATA]', data)
             setStaticData(data)
         }
-        const onAddModule = async (mod: Module) => {
+        const onAddModule = async (mod: RouteModule) => {
             switch (mod.id) {
                 case '/404.js': {
                     const { default: Component } = await import(getModuleImportUrl(baseUrl, mod, true))
@@ -215,6 +215,6 @@ export async function redirect(url: string, replace?: boolean) {
     events.emit('popstate', { type: 'popstate', scrollTo: 0 })
 }
 
-export function getModuleImportUrl(baseUrl: string, mod: Module, forceFetch = false) {
+export function getModuleImportUrl(baseUrl: string, mod: RouteModule, forceFetch = false) {
     return util.cleanPath(baseUrl + '/_aleph/' + util.trimSuffix(mod.id, '.js') + `.${mod.hash.slice(0, hashShort)}.js` + (forceFetch ? `?t=${Date.now()}` : ''))
 }

bootstrap.ts

@@ -1,7 +1,7 @@
 import React, { ComponentType } from 'https://esm.sh/react'
 import { hydrate, render } from 'https://esm.sh/react-dom'
 import { ALEPH, getModuleImportUrl } from './aleph.ts'
-import { Module, Route, Routing } from './routing.ts'
+import { Route, RouteModule, Routing } from './routing.ts'
 import { reModuleExt } from './util.ts'
 
 export default async function bootstrap({
@@ -15,7 +15,7 @@ export default async function bootstrap({
     baseUrl: string
     defaultLocale: string
     locales: string[]
-    preloadModules: Module[]
+    preloadModules: RouteModule[]
 }) {
     const { document } = window as any
     const mainEl = document.querySelector('main')

project.ts

@@ -5,7 +5,7 @@ import { AlephAPIRequest, AlephAPIResponse } from './api.ts'
 import { EventEmitter } from './events.ts'
 import { createHtml } from './html.ts'
 import log from './log.ts'
-import { Routing } from './routing.ts'
+import { RouteModule, Routing } from './routing.ts'
 import { colors, ensureDir, path, ServerRequest, Sha1, walk } from './std.ts'
 import { compile } from './tsc/compile.ts'
 import type { AlephRuntime, APIHandle, Config, RouterURL } from './types.ts'
@@ -513,14 +513,14 @@ export class Project {
         if (existsDirSync(apiDir)) {
             for await (const { path: p } of walk(apiDir, walkOptions)) {
                 const mod = await this._compile('/api' + util.trimPrefix(p, apiDir))
-                this.#apiRouting.update(this._getPageModule(mod))
+                this.#apiRouting.update(this._getRouteModule(mod))
             }
         }
 
         for await (const { path: p } of walk(pagesDir, { ...walkOptions, exts: [...walkOptions.exts, '.jsx', '.tsx', '.md', '.mdx'] })) {
             const rp = util.trimPrefix(p, pagesDir)
             const mod = await this._compile('/pages' + rp)
-            this.#routing.update(this._getPageModule(mod))
+            this.#routing.update(this._getRouteModule(mod))
         }
 
         const precompileUrls = [
@@ -647,9 +647,9 @@ export class Project {
                                     }
                                 }
                                 if (moduleID.startsWith('/pages/')) {
-                                    this.#routing.update(this._getPageModule(mod))
+                                    this.#routing.update(this._getRouteModule(mod))
                                 } else if (moduleID.startsWith('/api/')) {
-                                    this.#apiRouting.update(this._getPageModule(mod))
+                                    this.#apiRouting.update(this._getRouteModule(mod))
                                 }
                                 if (shouldUpdateMainModule) {
                                     this._createMainModule()
@@ -683,7 +683,7 @@ export class Project {
         }
     }
 
-    private _getPageModule({ id, hash }: Module) {
+    private _getRouteModule({ id, hash }: Module): RouteModule {
         const asyncDeps = this._lookupStyleDeps(id).filter(({ async }) => !!async).map(({ async, ...rest }) => rest)
         return { id, hash, asyncDeps: asyncDeps.length > 0 ? asyncDeps : undefined }
     }
@@ -716,7 +716,7 @@ export class Project {
             locales: [],
             routes: this.#routing.routes,
             preloadModules: ['/404.js', '/app.js', '/data.js'].filter(id => this.#modules.has(id)).map(id => {
-                return this._getPageModule(this.#modules.get(id)!)
+                return this._getRouteModule(this.#modules.get(id)!)
             })
         }
         const module = this._moduleFromURL('/main.js')
@@ -1008,7 +1008,7 @@ export class Project {
                 mod.hash = getHash(mod.jsContent)
             }
 
-            log.debug(`compile ${url} in ${Math.round(performance.now() - t)}ms`)
+            log.debug(`compile '${url}' in ${Math.round(performance.now() - t)}ms`)
 
             if (!fsync) {
                 fsync = true

routing.ts

@@ -2,18 +2,18 @@ import { E400MissingDefaultExportAsComponent } from './error.ts'
 import type { RouterURL } from './types.ts'
 import util, { reMDExt, reModuleExt } from './util.ts'
 
-export interface Module {
-    readonly id: string
-    readonly hash: string
-    readonly asyncDeps?: { url: string, hash: string }[]
-}
-
 export interface Route {
     path: string
-    module: Module
+    module: RouteModule
     children?: Route[]
 }
 
+export interface RouteModule {
+    readonly id: string
+    readonly hash: string
+    readonly asyncDeps?: { url: string, hash: string }[]
+}
+
 export interface PageProps {
     Page: any
     pageProps: Partial<PageProps> & { name?: string }
@@ -54,7 +54,7 @@ export class Routing {
         return JSON.parse(JSON.stringify(this._routes))
     }
 
-    update(module: Module) {
+    update(module: RouteModule) {
         const newRoute: Route = { path: getPagePath(module.id), module }
         const dirtyRoutes: Set<Route[]> = new Set()
         let exists = false
@@ -109,15 +109,15 @@ export class Routing {
         })
     }
 
-    createRouter(location?: { pathname: string, search?: string }): [RouterURL, Module[]] {
+    createRouter(location?: { pathname: string, search?: string }): [RouterURL, RouteModule[]] {
         const loc = location || (window as any).location || { pathname: '/' }
         const query = new URLSearchParams(loc.search)
 
         let locale = this._defaultLocale
         let pathname = util.cleanPath(util.trimPrefix(loc.pathname, this._baseUrl))
         let pagePath = ''
         let params: Record<string, string> = {}
-        let tree: Module[] = []
+        let tree: RouteModule[] = []
 
         if (pathname !== '/' && this._locales.length > 0) {
             const a = pathname.split('/')