refactor: clean up

Author: ije

cli.ts

@@ -3,9 +3,10 @@ import { Request } from './server/api.ts'
 import { getContentType } from './server/mime.ts'
 import { createHtml } from './server/util.ts'
 import { existsDirSync, existsFileSync } from './shared/fs.ts'
+import type { LevelNames } from './shared/log.ts'
 import log from './shared/log.ts'
 import util from './shared/util.ts'
-import { ServerRequest } from './types.ts'
+import type { ServerRequest } from './types.ts'
 import { VERSION } from './version.ts'
 
 const commands = {
@@ -97,7 +98,7 @@ async function main() {
     // sets log level
     const l = flags.L || flags['log-level']
     if (util.isNEString(l)) {
-        log.setLevel(l)
+        log.setLevel(l.toLowerCase() as LevelNames)
     }
 
     if (!hasCommand && !args[0]) {

server/app.ts

@@ -3,7 +3,7 @@ import type { AcceptedPlugin, ECMA } from '../deps.ts'
 import { CleanCSS, colors, ensureDir, minify, path, postcss, Sha1, Sha256, walk } from '../deps.ts'
 import { EventEmitter } from '../framework/core/events.ts'
 import { getPagePathname, isPageModule, RouteModule, Routing, trimPageModuleExt } from '../framework/core/routing.ts'
-import { defaultReactVersion, pageModuleExts } from '../shared/constants.ts'
+import { defaultReactVersion, minDenoVersion, pageModuleExts } from '../shared/constants.ts'
 import { ensureTextFile, existsDirSync, existsFileSync } from '../shared/fs.ts'
 import log from '../shared/log.ts'
 import util from '../shared/util.ts'
@@ -507,6 +507,10 @@ export class Appliaction {
             log.fatal(`'pages' directory not found.`)
         }
 
+        if (Deno.version.deno < minDenoVersion) {
+            log.fatal(`need Deno ${minDenoVersion}+, but got ${Deno.version.deno}`)
+        }
+
         const p = Deno.run({
             cmd: ['deno', 'info'],
             stdout: 'piped',
@@ -1449,7 +1453,7 @@ export class Appliaction {
         })
 
         // workaround for https://github.com/denoland/deno/issues/9212
-        if (Deno.version.deno === '1.7.0') {
+        if (Deno.version.deno === '1.7.0' && bundlingFile.endsWith('/deps.bundling.js')) {
             code = code.replace(' _ = l.baseState, ', ' var _ = l.baseState, ')
         }
 

server/util.ts

@@ -145,17 +145,16 @@ export function createHtml({
 }) {
     const eol = minify ? '' : '\n'
     const indent = minify ? '' : ' '.repeat(4)
-    const headTags = head.map(tag => tag.trim())
-        .concat(scripts.map(v => {
-            if (!util.isString(v) && util.isNEString(v.src)) {
-                if (v.type === 'module') {
-                    return `<link rel="modulepreload" href=${JSON.stringify(v.src)} />`
-                } else if (!v.nomodule) {
-                    return `<link rel="preload" href=${JSON.stringify(v.src)} as="script" />`
-                }
+    const headTags = head.map(tag => tag.trim()).concat(scripts.map(v => {
+        if (!util.isString(v) && util.isNEString(v.src)) {
+            if (v.type === 'module') {
+                return `<link rel="modulepreload" href=${JSON.stringify(v.src)} />`
+            } else if (!v.nomodule) {
+                return `<link rel="preload" href=${JSON.stringify(v.src)} as="script" />`
             }
-            return ''
-        })).filter(Boolean)
+        }
+        return ''
+    })).filter(Boolean)
     const scriptTags = scripts.map(v => {
         if (util.isString(v)) {
             return `<script>${v}</script>`

shared/constants.ts

@@ -1,2 +1,3 @@
 export const pageModuleExts = ['tsx', 'jsx', 'ts', 'js', 'mjs']
 export const defaultReactVersion = '17.0.1'
+export const minDenoVersion = '1.7.0'

shared/log.ts

@@ -1,5 +1,7 @@
 import { colors } from '../deps.ts'
 
+export type LevelNames = 'debug' | 'info' | 'warn' | 'error' | 'fatal'
+
 export enum Level {
     Debug = 0,
     Info = 1,
@@ -11,8 +13,8 @@ export enum Level {
 export class Logger {
     #level: Level = Level.Info
 
-    setLevel(level: string) {
-        switch (level.toLowerCase()) {
+    setLevel(level: LevelNames) {
+        switch (level) {
             case 'debug':
                 this.#level = Level.Debug
                 break
@@ -33,38 +35,34 @@ export class Logger {
 
     debug(...args: unknown[]) {
         if (this.#level <= Level.Debug) {
-            console.log(colorfulTag('debug', colors.blue), ...args)
+            console.log(colors.blue('DEBUG'), ...args)
         }
     }
 
     info(...args: unknown[]) {
         if (this.#level <= Level.Info) {
-            console.log(colorfulTag('info', colors.green), ...args)
+            console.log(colors.green('INFO'), ...args)
         }
     }
 
     warn(...args: unknown[]) {
         if (this.#level <= Level.Warn) {
-            console.log(colorfulTag('warn', colors.yellow), ...args)
+            console.log(colors.yellow('WARN'), ...args)
         }
     }
 
     error(...args: unknown[]) {
         if (this.#level <= Level.Error) {
-            console.log(colorfulTag('error', colors.red), ...args)
+            console.log(colors.red('ERROR'), ...args)
         }
     }
 
     fatal(...args: unknown[]) {
         if (this.#level <= Level.Fatal) {
-            console.log(colorfulTag('fatal', colors.red), ...args)
+            console.log(colors.red('FATAL'), ...args)
             Deno.exit(1)
         }
     }
 }
 
-function colorfulTag(tag: string, colorful: (text: string) => string) {
-    return colorful(tag.toUpperCase())
-}
-
 export default new Logger()