refactor: cleanup

Author: Je

project.ts

@@ -517,7 +517,7 @@ export class Project {
         Object.assign(this, { buildID: this.mode + '.' + this.config.buildTarget })
         // update routing options
         this.#routing = new Routing([], this.config.baseUrl, this.config.defaultLocale, this.config.locales)
-        // import post plugins
+        // import postcss plugins
         await Promise.all(this.config.postcss.plugins.map(async p => {
             let name: string
             if (typeof p === 'string') {
@@ -676,7 +676,10 @@ export class Project {
                             break
                         }
                     }
-                    return isDep
+                    if (isDep) {
+                        return
+                    }
+                    return this.config.plugins.findIndex(p => p.test.test(path)) > -1
                 })()
                 if (validated) {
                     const moduleID = path.replace(reModuleExt, '.js')
@@ -846,7 +849,6 @@ export class Project {
             return this.#modules.get(mod.id)!
         }
 
-        const { importMap } = this
         const name = path.basename(mod.sourceFilePath).replace(reModuleExt, '')
         const saveDir = path.join(this.buildDir, path.dirname(mod.sourceFilePath))
         const metaFile = path.join(saveDir, `${name}.meta.json`)
@@ -870,6 +872,8 @@ export class Project {
 
         let sourceContent = ''
         let shouldCompile = false
+        let fsync = false
+
         if (options?.sourceCode) {
             const sourceHash = getHash(options.sourceCode, true)
             if (mod.sourceHash === '' || mod.sourceHash !== sourceHash) {
@@ -879,8 +883,9 @@ export class Project {
             }
         } else if (mod.isRemote) {
             let dlUrl = url
-            for (const importPath in importMap.imports) {
-                const alias = importMap.imports[importPath]
+            const { imports } = this.importMap
+            for (const importPath in imports) {
+                const alias = imports[importPath]
                 if (importPath === url) {
                     dlUrl = alias
                     break
@@ -960,8 +965,6 @@ export class Project {
             }
         }
 
-        let fsync = false
-
         // compile source code
         if (shouldCompile) {
             const t = performance.now()

renderer.ts

@@ -1,3 +1,4 @@
+import unescape from 'https://esm.sh/lodash/unescape?no-check'
 import React, { ComponentType, ReactElement } from 'https://esm.sh/react'
 import { renderToString } from 'https://esm.sh/react-dom/server'
 import { RouterContext } from './context.ts'

tsc/compile.ts

@@ -3,7 +3,6 @@ import transformImportPathRewrite from './transform-import-path-rewrite.ts'
 import transformReactJsx from './transform-react-jsx.ts'
 import transformReactRefresh from './transform-react-refresh.ts'
 import transformReactUseDenoHook from './transform-react-use-deno-hook.ts'
-import { CreatePlainTransformer, CreateTransformer } from './transformer.ts'
 
 export interface CompileOptions {
     mode: 'development' | 'production'
@@ -13,14 +12,6 @@ export interface CompileOptions {
     signUseDeno: (id: string) => string
 }
 
-export function createSourceFile(fileName: string, source: string) {
-    return ts.createSourceFile(
-        fileName,
-        source,
-        ts.ScriptTarget.ES2015,
-    )
-}
-
 const allowTargets = [
     'esnext',
     'es2015',
@@ -34,12 +25,12 @@ const allowTargets = [
 export function compile(fileName: string, source: string, { mode, target: targetName, rewriteImportPath, reactRefresh, signUseDeno }: CompileOptions) {
     const target = allowTargets.indexOf(targetName.toLowerCase())
     const transformers: ts.CustomTransformers = { before: [], after: [] }
-    transformers.before!.push(CreatePlainTransformer(transformReactJsx, { mode, rewriteImportPath }))
-    transformers.before!.push(CreateTransformer(transformReactUseDenoHook, signUseDeno))
+    transformers.before!.push(createPlainTransformer(transformReactJsx, { mode, rewriteImportPath }))
+    transformers.before!.push(createTransformer(transformReactUseDenoHook, signUseDeno))
     if (reactRefresh) {
-        transformers.before!.push(CreateTransformer(transformReactRefresh))
+        transformers.before!.push(createTransformer(transformReactRefresh))
     }
-    transformers.after!.push(CreatePlainTransformer(transformImportPathRewrite, rewriteImportPath))
+    transformers.after!.push(createPlainTransformer(transformImportPathRewrite, rewriteImportPath))
 
     return ts.transpileModule(source, {
         fileName,
@@ -60,3 +51,22 @@ export function compile(fileName: string, source: string, { mode, target: target
         transformers,
     })
 }
+
+function createPlainTransformer(transform: (sf: ts.SourceFile, node: ts.Node, ...args: any[]) => ts.VisitResult<ts.Node>, ...args: any[]): ts.TransformerFactory<ts.SourceFile> {
+    function nodeVisitor(ctx: ts.TransformationContext, sf: ts.SourceFile) {
+        const visitor: ts.Visitor = node => {
+            const ret = transform(sf, node, ...args)
+            if (ret != null) {
+                return ret
+            }
+            return ts.visitEachChild(node, visitor, ctx)
+        }
+        return visitor
+    }
+
+    return ctx => sf => ts.visitNode(sf, nodeVisitor(ctx, sf))
+}
+
+function createTransformer(transform: (ctx: ts.TransformationContext, sf: ts.SourceFile, options?: any) => ts.SourceFile, options?: Record<string, any>): ts.TransformerFactory<ts.SourceFile> {
+    return ctx => sf => transform(ctx, sf, options)
+}

tsc/transform-react-use-deno-hook.ts

@@ -1,7 +1,5 @@
 /**
- * TypeScript AST Transformer for react refresh.
- * @link https://github.com/facebook/react/issues/16604#issuecomment-528663101
- * @link https://github.com/facebook/react/blob/master/packages/react-refresh/src/ReactFreshBabelPlugin.js
+ * TypeScript AST Transformer for useDeno hook.
  */
 
 import ts from 'https://esm.sh/typescript'
@@ -113,8 +111,6 @@ export class RefreshTransformer {
     }
 }
 
-
-
 export default function transformReactUseDenoHook(ctx: ts.TransformationContext, sf: ts.SourceFile, signUseDeno: (id: string) => string): ts.SourceFile {
     const t = new RefreshTransformer(sf, signUseDeno)
     return t.transform()

tsc/transformer.ts

@@ -33,7 +33,7 @@ export interface SSROptions {
 export interface Plugin {
     test: RegExp
     resolve?(path: string): { path: string, external?: boolean }
-    transform?(path: string): { code: string, sourceMap?: string, loader?: 'js' | 'json' | 'css' | 'markdown' }
+    transform?(path: string): { code: string, sourceMap?: string, loader?: 'js' | 'css' | 'text' }
 }
 
 /**