Update types

Author: ije

framework/react/init.ts

@@ -6,7 +6,7 @@ export async function init(aleph: Aleph) {
     const alephPkgUri = getAlephPkgUri()
     const alephPkgPath = alephPkgUri.replace('https://', '').replace('http://localhost:', 'http_localhost_')
     await aleph.addModule(`${alephPkgUri}/framework/react/refresh.ts`)
-    aleph.onTransform('main.js', ({ code }) => ({
+    aleph.onTransform('mainscript', ({ code }) => ({
       code: [
         `import "./-/${alephPkgPath}/framework/react/refresh.js";`,
         code

plugins/css.ts

@@ -41,7 +41,7 @@ export const cssLoader = async ({ specifier, data }: LoadInput, aleph: Aleph): P
     }
   }
 
-  let plugins = cssConfig.postcss?.plugins || []
+  let plugins = cssConfig.postcss.plugins || []
   let modulesJSON: Record<string, string> = {}
   if (/\.module\.[a-z]+$/.test(specifier)) {
     const options = {

server/aleph.ts

@@ -76,7 +76,7 @@ type LoadListener = {
 }
 
 type TransformListener = {
-  test: RegExp | string,
+  test: RegExp | 'hmr' | 'mainscript',
   transform(input: TransformInput): TransformOutput,
 }
 
@@ -492,7 +492,7 @@ export class Aleph implements IAleph {
     this.#loadListeners.push({ test, load: callback })
   }
 
-  onTransform(test: RegExp | string, callback: (input: TransformInput) => TransformOutput): void {
+  onTransform(test: RegExp | 'hmr' | 'mainscript', callback: (input: TransformInput) => TransformOutput): void {
     this.#transformListeners.push({ test, transform: callback })
   }
 
@@ -671,7 +671,7 @@ export class Aleph implements IAleph {
       `bootstrap(${JSON.stringify(config, undefined, this.isDev ? 2 : undefined)});`
     ].filter(Boolean).join('\n')
     this.#transformListeners.forEach(({ test, transform }) => {
-      if (test === 'main.js') {
+      if (test === 'mainscript') {
         const ret = transform({ specifier: '/main.js', code })
         code = ret.code
       }
@@ -1195,7 +1195,7 @@ export class Aleph implements IAleph {
       }
 
       this.#transformListeners.forEach(({ test, transform }) => {
-        if (test instanceof RegExp ? test.test(specifier) : test === '*') {
+        if (test instanceof RegExp && test.test(specifier)) {
           const { code, map } = transform({ specifier, code: jsCode, map: sourceMap })
           jsCode = code
           if (map) {

server/config.ts

@@ -4,14 +4,11 @@ import { defaultReactVersion } from '../shared/constants.ts'
 import { existsDir } from '../shared/fs.ts'
 import log from '../shared/log.ts'
 import util from '../shared/util.ts'
-import type { BrowserName, Config, ImportMap, PostCSSPlugin } from '../types.ts'
+import type { BrowserName, Config, RequiredConfig as TRequiredConfig, ImportMap, PostCSSPlugin } from '../types.ts'
 import { getAlephPkgUri } from './helper.ts'
 
-export type RequiredConfig = Required<Config> & {
+export type RequiredConfig = TRequiredConfig & {
   srcDir: string
-  i18n: Required<Config['i18n']>
-  build: Required<Config['build']>
-  server: Required<Config['server']>
   react: ReactOptions
 }
 
@@ -33,6 +30,7 @@ export function defaultConfig(): Readonly<RequiredConfig> {
     plugins: [],
     css: {
       cache: false,
+      modules: {},
       extract: {
         limit: 8 * 1024
       },
@@ -126,7 +124,7 @@ export async function loadConfig(specifier: string): Promise<Config> {
     config.css = {
       cache: Boolean(cache),
       extract: util.isPlainObject(extract) ? { limit: typeof extract.limit === 'number' ? extract.limit : 8 * 1024 } : Boolean(extract),
-      modules: util.isPlainObject(modules) ? modules : undefined,
+      modules: util.isPlainObject(modules) ? modules : {},
       postcss: isPostcssConfig(postcss) ? postcss : { plugins: ['autoprefixer'] }
     }
   }

types.ts

@@ -4,20 +4,18 @@
 export interface Aleph {
   readonly mode: 'development' | 'production'
   readonly workingDir: string
-  readonly config: Required<Config>
-  readonly importMap: ImportMap
+  readonly config: RequiredConfig
   addModule(specifier: string, sourceCode?: string): Promise<void>
   addDist(path: string, content: Uint8Array): Promise<void>
   fetchModule(specifier: string): Promise<{ content: Uint8Array, contentType: string | null }>
   onResolve(test: RegExp, resolve: (specifier: string) => ResolveResult): void
   onLoad(test: RegExp, load: (input: LoadInput) => LoadOutput | Promise<LoadOutput>): void
-  onTransform(test: RegExp, transform: (input: TransformInput) => TransformOutput): void
-  onTransform(specifier: string, transform: (input: TransformInput) => TransformOutput): void
+  onTransform(test: 'hmr' | 'mainscript' | RegExp, transform: (input: TransformInput) => TransformOutput): void
   onSSR(callback: (path: string, html: string) => { html: string }): void
 }
 
 /**
- * The config for aleph app.
+ * The configuration for aleph app.
  */
 export type Config = {
   /** `framework` specifies the framework (default is 'react'). */
@@ -26,18 +24,25 @@ export type Config = {
   basePath?: string
   /** `i18n` specifies the options for **Internationalization**. */
   i18n?: I18nOptions
+  /** `css` specifies the css processing options. */
+  css?: CSSOptions
   /** `build` specifies the options for **ES Build**. */
   build?: BuildOptions
   /** `ssr` specifies the options for **SSR**. */
   ssr?: boolean | GlobalSSROptions
-  /** `server` specifies the options for **Server**. */
-  server?: ServerOptions
-  /** `css` specifies the css processing options. */
-  css?: CSSOptions
   /** `plugins` specifies some plugins to extend Aleph runtime. */
   plugins?: Plugin[]
   /** `env` appends system env variables. */
   env?: Record<string, string>
+  /** `server` specifies the options for **Server**. */
+  server?: ServerOptions
+}
+
+export type RequiredConfig = Required<Config> & {
+  i18n: Required<I18nOptions>
+  build: Required<BuildOptions>
+  server: Required<ServerOptions>
+  css: Required<CSSOptions>
 }
 
 /**