Clean up

Author: ije

cli.ts

@@ -2,7 +2,7 @@ import { parse } from "https://deno.land/[email protected]/flags/mod.ts";
 import { readLines } from "https://deno.land/[email protected]/io/mod.ts";
 import { writeAll } from "https://deno.land/[email protected]/streams/conversion.ts";
 import { basename, resolve } from "https://deno.land/[email protected]/path/mod.ts";
-import { readImportMap } from "./server/helpers.ts";
+import { parseImportMap } from "./server/helpers.ts";
 import { findFile } from "./lib/fs.ts";
 import log, { bold, dim, stripColor } from "./lib/log.ts";
 import { serveDir } from "./lib/serve.ts";
@@ -112,7 +112,7 @@ async function main() {
     if (runOptions.importMapFile) {
       try {
         let update: boolean | null = null;
-        const importMap = await readImportMap(runOptions.importMapFile);
+        const importMap = await parseImportMap(runOptions.importMapFile);
         for (const key in importMap.imports) {
           const url = importMap.imports[key];
           if (

server/helpers.ts

@@ -5,14 +5,7 @@ import { createGenerator } from "https://esm.sh/@unocss/[email protected]";
 import log from "../lib/log.ts";
 import util from "../lib/util.ts";
 import { isCanary, VERSION } from "../version.ts";
-import type { AlephConfig, ImportMap, ModuleLoader } from "./types.ts";
-
-export type JSXConfig = {
-  jsxRuntime?: "react" | "preact";
-  jsxImportSource?: string;
-  jsxRuntimeVersion?: string;
-  jsxRuntimeCdnVersion?: string;
-};
+import type { AlephConfig, ImportMap, JSXConfig, ModuleLoader } from "./types.ts";
 
 export const regFullVersion = /@\d+\.\d+\.\d+/;
 export const builtinModuleExts = ["tsx", "ts", "mts", "jsx", "js", "mjs"];
@@ -131,7 +124,7 @@ export async function loadJSXConfig(importMap: ImportMap): Promise<JSXConfig> {
     }
   }
 
-  let fuzzReactUrl: string | null = null;
+  let fuzzRuntimeUrl: string | null = null;
 
   for (const url of Object.values(importMap.imports)) {
     let m = url.match(/^https?:\/\/esm\.sh\/(p?react)@(\d+\.\d+\.\d+(-[a-z\d.]+)*)(\?|$)/);
@@ -152,16 +145,16 @@ export async function loadJSXConfig(importMap: ImportMap): Promise<JSXConfig> {
           jsxConfig.jsxImportSource = `https://esm.sh/${jsxConfig.jsxRuntime}@${m[2]}`;
         }
       } else {
-        fuzzReactUrl = url;
+        fuzzRuntimeUrl = url;
       }
       break;
     }
   }
 
   // get acctual react version from esm.sh
-  if (fuzzReactUrl) {
+  if (fuzzRuntimeUrl) {
     log.info(`Checking ${jsxConfig.jsxRuntime} version...`);
-    const text = await fetch(fuzzReactUrl).then((resp) => resp.text());
+    const text = await fetch(fuzzRuntimeUrl).then((resp) => resp.text());
     const m = text.match(/https?:\/\/cdn\.esm\.sh\/(v\d+)\/p?react@(\d+\.\d+\.\d+(-[a-z\d.]+)*)\//);
     if (m) {
       jsxConfig.jsxRuntimeCdnVersion = m[1].slice(1);
@@ -182,7 +175,7 @@ export async function loadImportMap(): Promise<ImportMap> {
   if (Deno.env.get("ALEPH_DEV")) {
     const alephPkgUri = Deno.env.get("ALEPH_PKG_URI") || `http://localhost:${Deno.env.get("ALEPH_DEV_PORT")}`;
     const importMapFile = join(Deno.env.get("ALEPH_DEV_ROOT")!, "import_map.json");
-    const { __filename, imports, scopes } = await readImportMap(importMapFile);
+    const { __filename, imports, scopes } = await parseImportMap(importMapFile);
     Object.assign(importMap, {
       __filename,
       imports: {
@@ -202,7 +195,7 @@ export async function loadImportMap(): Promise<ImportMap> {
   );
   if (importMapFile) {
     try {
-      const { __filename, imports, scopes } = await readImportMap(importMapFile);
+      const { __filename, imports, scopes } = await parseImportMap(importMapFile);
       Object.assign(importMap, { __filename });
       Object.assign(importMap.imports, imports);
       Object.assign(importMap.scopes, scopes);
@@ -219,6 +212,7 @@ export async function initModuleLoaders(importMap: ImportMap): Promise<ModuleLoa
   if (loaders.length > 0) {
     return loaders;
   }
+  // only init loaders in `CLI` mode
   if (Deno.env.get("ALEPH_CLI")) {
     for (const key in importMap.imports) {
       if (/^\*\.[a-z0-9]+$/i.test(key)) {
@@ -263,7 +257,7 @@ export async function parseJSONFile(jsonFile: string): Promise<Record<string, un
   return JSON.parse(raw);
 }
 
-export async function readImportMap(importMapFile: string): Promise<ImportMap> {
+export async function parseImportMap(importMapFile: string): Promise<ImportMap> {
   const importMap: ImportMap = { __filename: importMapFile, imports: {}, scopes: {} };
   const data = await parseJSONFile(importMapFile);
   const imports: Record<string, string> = toStringMap(data.imports);

server/transformer.ts

@@ -5,7 +5,6 @@ import { readCode } from "../lib/fs.ts";
 import log from "../lib/log.ts";
 import util from "../lib/util.ts";
 import { bundleCSS } from "./bundle_css.ts";
-import type { JSXConfig } from "./helpers.ts";
 import {
   builtinModuleExts,
   getAlephPkgUri,
@@ -16,7 +15,7 @@ import {
 } from "./helpers.ts";
 import { isRouteFile } from "./routing.ts";
 import { DependencyGraph } from "./graph.ts";
-import type { ImportMap, ModuleLoaderContent } from "./types.ts";
+import type { ImportMap, JSXConfig, ModuleLoaderContent } from "./types.ts";
 
 export type TransformerOptions = {
   buildHash: string;

server/types.ts

@@ -32,13 +32,11 @@ export type FetchHandler = {
   (request: Request): Promise<Response> | Response;
 };
 
-export type MiddlewareCallback = () => Promise<void> | void;
-
 export interface Middleware {
   fetch(
     request: Request,
     context: Record<string, unknown>,
-  ): Promise<Response | MiddlewareCallback | void> | Response | MiddlewareCallback | void;
+  ): Promise<Response | CallableFunction | void> | Response | CallableFunction | void;
 }
 
 export type ImportMap = {
@@ -47,6 +45,13 @@ export type ImportMap = {
   readonly scopes: Record<string, Record<string, string>>;
 };
 
+export type JSXConfig = {
+  jsxRuntime?: "react" | "preact";
+  jsxImportSource?: string;
+  jsxRuntimeVersion?: string;
+  jsxRuntimeCdnVersion?: string;
+};
+
 export type ModuleLoader = {
   test(pathname: string): boolean;
   load(pathname: string, env: ModuleLoaderEnv): Promise<ModuleLoaderContent> | ModuleLoaderContent;

types.d.ts

@@ -58,13 +58,11 @@ declare interface Data<T = unknown> {
   delete?(request: Request, context: Context): Promise<Response> | Response;
 }
 
-type MiddlewareCallback = () => Promise<void> | void;
-
 declare interface Middleware {
   fetch(
     request: Request,
     context: Context,
-  ): Promise<Response | MiddlewareCallback | void> | Response | MiddlewareCallback | void;
+  ): Promise<Response | CallableFunction | void> | Response | CallableFunction | void;
 }
 
 declare interface ImportMeta {

version.ts

@@ -5,18 +5,16 @@ export const VERSION = "1.0.0-alpha.27";
 export const isCanary = false;
 
 /** `prepublish` will be invoked before publish. */
-export async function prepublish(): Promise<boolean> {
-  if (!window.confirm("Build compiler wasm?")) {
-    return true;
+export async function prepublish(): Promise<boolean | void> {
+  if (window.confirm("Build compiler wasm?")) {
+    const p = Deno.run({
+      cmd: ["deno", "run", "-A", "build.ts"],
+      cwd: "./compiler",
+      stdout: "inherit",
+      stderr: "inherit",
+    });
+    const { success } = await p.status();
+    p.close();
+    return success;
   }
-
-  const p = Deno.run({
-    cmd: ["deno", "run", "-A", "build.ts"],
-    cwd: "./compiler",
-    stdout: "inherit",
-    stderr: "inherit",
-  });
-  const { success } = await p.status();
-  p.close();
-  return success;
 }