refactor: clean up

Author: ije

cli.ts

@@ -101,7 +101,7 @@ async function main() {
         Deno.env.set(key, value.trim())
       }
     })
-    log.debug('load env from', path.basename(p))
+    log.info('load env from', path.basename(p))
   }
 
   // proxy https://deno.land/x/aleph on localhost

framework/core/routing.ts

@@ -1,4 +1,5 @@
 import util from '../../shared/util.ts'
+import { moduleExts } from '../../shared/constants.ts'
 import type { RouterURL } from '../../types.ts'
 import events from './events.ts'
 
@@ -291,7 +292,7 @@ export async function redirect(url: string, replace?: boolean) {
 }
 
 export function isModuleURL(url: string) {
-  for (const ext of ['tsx', 'jsx', 'ts', 'js', 'mjs']) {
+  for (const ext of moduleExts) {
     if (url.endsWith('.' + ext)) {
       return true
     }
@@ -301,7 +302,7 @@ export function isModuleURL(url: string) {
 
 export function toPagePath(url: string): string {
   let pathname = url
-  for (const ext of ['tsx', 'jsx', 'ts', 'js', 'mjs']) {
+  for (const ext of moduleExts) {
     if (url.endsWith('.' + ext)) {
       pathname = url.slice(0, -(ext.length + 1))
       break

framework/react/helper.ts

@@ -1,5 +1,6 @@
 import { createContext } from 'https://esm.sh/react'
 import util from '../../shared/util.ts'
+import { hashShortLength, moduleExts } from '../../shared/constants.ts'
 import type { RouterURL } from '../../types.ts'
 
 const symbolFor = typeof Symbol === 'function' && Symbol.for
@@ -42,7 +43,7 @@ export function isLikelyReactComponent(type: any): Boolean {
 }
 
 export function trimModuleExt(url: string) {
-  for (const ext of ['tsx', 'jsx', 'ts', 'js', 'mjs']) {
+  for (const ext of moduleExts) {
     if (url.endsWith('.' + ext)) {
       return url.slice(0, -(ext.length + 1))
     }
@@ -58,7 +59,7 @@ export function importModule(baseUrl: string, mod: { url: string, hash: string }
   }
 
   if (ALEPH && mod.url.startsWith('/pages/')) {
-    const src = util.cleanPath(baseUrl + '/_aleph/' + trimModuleExt(mod.url) + `.bundle.${util.shortHash(mod.hash)}.js`)
+    const src = util.cleanPath(baseUrl + '/_aleph/' + trimModuleExt(mod.url) + `.bundle.${mod.hash.slice(0, hashShortLength)}.js`)
     return new Promise((resolve, reject) => {
       const script = document.createElement('script')
       script.onload = () => {
@@ -72,7 +73,7 @@ export function importModule(baseUrl: string, mod: { url: string, hash: string }
     })
   }
 
-  const src = util.cleanPath(baseUrl + '/_aleph/' + trimModuleExt(mod.url) + `.${util.shortHash(mod.hash)}.js`) + (forceRefetch ? `?t=${Date.now()}` : '')
+  const src = util.cleanPath(baseUrl + '/_aleph/' + trimModuleExt(mod.url) + `.${mod.hash.slice(0, hashShortLength)}.js`) + (forceRefetch ? `?t=${Date.now()}` : '')
   return import(src)
 }
 

server/app.ts

@@ -4,7 +4,7 @@ import { colors, createHash, ensureDir, minify, path, walk } from '../deps.ts'
 import { EventEmitter } from '../framework/core/events.ts'
 import type { RouteModule } from '../framework/core/routing.ts'
 import { createBlankRouterURL, isModuleURL, Routing, toPagePath } from '../framework/core/routing.ts'
-import { defaultReactVersion, minDenoVersion, hashShortLength } from '../shared/constants.ts'
+import { defaultReactVersion, minDenoVersion, moduleExts, hashShortLength } from '../shared/constants.ts'
 import { ensureTextFile, existsDirSync, existsFileSync } from '../shared/fs.ts'
 import log from '../shared/log.ts'
 import util from '../shared/util.ts'
@@ -71,9 +71,8 @@ export class Application implements ServerApplication {
   private async init(reload: boolean) {
     const t = performance.now()
     const alephPkgUri = getAlephPkgUri()
-    const mode = this.mode
     const { env, framework, plugins, ssr } = this.config
-    const walkOptions = { includeDirs: false, exts: ['tsx', 'jsx', 'ts', 'js', 'mjs'], skip: [/^\./, /\.d\.ts$/i, /\.(test|spec|e2e)\.m?(j|t)sx?$/i] }
+    const walkOptions = { includeDirs: false, skip: [/(^|\/|\\)\./, /\.d\.ts$/i, /(\.|_)(test|spec|e2e)\.(tsx?|jsx?|mjs)?$/i] }
     const apiDir = path.join(this.srcDir, 'api')
     const pagesDir = path.join(this.srcDir, 'pages')
 
@@ -122,14 +121,12 @@ export class Application implements ServerApplication {
     for (const plugin of plugins) {
       if (plugin.type === 'server') {
         await plugin.onInit(this)
-        Object.assign(this, { mode }) // to avoid plugin from changing the mode
       }
     }
 
     // init framework
     const { init } = await import(`../framework/${framework}/init.ts`)
     await init(this)
-    Object.assign(this, { mode }) // to avoid framework from changing the mode
 
     if (!this.isDev) {
       log.info('Building...')
@@ -150,33 +147,46 @@ export class Application implements ServerApplication {
       this.#renderer = await import('file://' + jsFile)
     }
 
-    // check custom components
-    for await (const { path: p, } of walk(this.srcDir, { ...walkOptions, maxDepth: 1 })) {
-      const name = path.basename(p)
-      switch (trimModuleExt(name)) {
-        case 'app':
-        case '404':
-        case 'loading':
-          await this.compile('/' + name)
+    // compile custom components
+    for (const name of ['app', '404', 'loading']) {
+      for (const ext of moduleExts) {
+        if (existsFileSync(path.join(this.srcDir, name + '.' + ext))) {
+          await this.compile('/' + name + '.' + ext)
           break
+        }
+      }
+    }
+
+    // update page routing
+    this.#pageRouting.config(this.config)
+    for await (const { path: p } of walk(pagesDir, walkOptions)) {
+      const url = util.cleanPath('/pages/' + util.trimPrefix(p, pagesDir))
+      let validated = moduleExts.some(ext => p.endsWith('.' + ext))
+      if (!validated) {
+        validated = this.config.plugins.some(p => p.type === 'loader' && p.test.test(url) && p.allowPage)
+      }
+      if (validated) {
+        const mod = await this.compile(url)
+        this.#pageRouting.update(this.getRouteModule(mod))
       }
     }
 
     // update api routing
     if (existsDirSync(apiDir)) {
-      for await (const { path: p } of walk(apiDir, walkOptions)) {
-        const mod = await this.compile(util.cleanPath('/api/' + util.trimPrefix(p, apiDir)))
+      for await (const { path: p } of walk(apiDir, { ...walkOptions, exts: moduleExts })) {
+        const url = util.cleanPath('/api/' + util.trimPrefix(p, apiDir))
+        let mod: Module
+        if (this.isDev) {
+          // in dev mode, we pre-compile the api code to support re-import the api module
+          // when it is changed.
+          mod = await this.compile(url)
+        } else {
+          mod = { url, hash: '', sourceHash: '', deps: [], jsFile: p }
+        }
         this.#apiRouting.update(this.getRouteModule(mod))
       }
     }
 
-    // update page routing
-    this.#pageRouting.config(this.config)
-    for await (const { path: p } of walk(pagesDir, { ...walkOptions })) {
-      const mod = await this.compile(util.cleanPath('/pages/' + util.trimPrefix(p, pagesDir)))
-      this.#pageRouting.update(this.getRouteModule(mod))
-    }
-
     // pre-bundle
     if (!this.isDev) {
       await this.bundle()
@@ -221,13 +231,13 @@ export class Application implements ServerApplication {
 
           // is dep
           for (const { deps } of this.#modules.values()) {
-            if (deps.findIndex(dep => dep.url === url) > -1) {
+            if (deps.some(dep => dep.url === url)) {
               return true
             }
           }
 
           // is loaded by plugin
-          return this.config.plugins.findIndex(p => p.type === 'loader' && p.test.test(url)) > -1
+          return this.config.plugins.some(p => p.type === 'loader' && p.test.test(url))
         }
 
         if (validated()) {
@@ -455,7 +465,7 @@ export class Application implements ServerApplication {
     if (!this.isDev) {
       return false
     }
-    for (const ext of ['tsx', 'jsx', 'ts', 'js', 'mjs']) {
+    for (const ext of moduleExts) {
       if (url.endsWith('.' + ext)) {
         return url.startsWith('/pages/') ||
           url.startsWith('/components/') ||

server/config.ts

@@ -26,7 +26,7 @@ export const defaultConfig: Readonly<Required<Config>> = {
 /** load config from `aleph.config.(ts|js|json)` */
 export async function loadConfig(workingDir: string): Promise<[Config, ImportMap]> {
   let data: Config = {}
-  for (const name of Array.from(['ts', 'js', 'json']).map(ext => 'aleph.config.' + ext)) {
+  for (const name of ['ts', 'js', 'json'].map(ext => 'aleph.config.' + ext)) {
     const p = path.join(workingDir, name)
     if (existsFileSync(p)) {
       log.info('Aleph server config loaded from', name)

server/helper.ts

@@ -1,5 +1,6 @@
 import { colors, createHash, path } from '../deps.ts'
 import { existsDirSync } from '../shared/fs.ts'
+import { moduleExts } from '../shared/constants.ts'
 import log from '../shared/log.ts'
 import util from '../shared/util.ts'
 import { VERSION } from '../version.ts'
@@ -61,7 +62,7 @@ export function getRelativePath(from: string, to: string): string {
 }
 
 export function trimModuleExt(url: string) {
-  for (const ext of ['tsx', 'jsx', 'ts', 'js', 'mjs']) {
+  for (const ext of moduleExts) {
     if (url.endsWith('.' + ext)) {
       return url.slice(0, -(ext.length + 1))
     }

shared/constants.ts

@@ -1,3 +1,4 @@
 export const minDenoVersion = '1.7.0'
 export const defaultReactVersion = '17.0.1'
 export const hashShortLength = 9
+export const moduleExts = ['tsx', 'jsx', 'ts', 'js', 'mjs']