Clean up

ije · ije · commit 57856c2b65ab · 2022-04-29T17:58:38.000+08:00
diff --git a/cli.ts b/cli.ts
@@ -2,7 +2,7 @@ import { parse } from "https://deno.land/std@0.136.0/flags/mod.ts";
 import { readLines } from "https://deno.land/std@0.136.0/io/mod.ts";
 import { writeAll } from "https://deno.land/std@0.136.0/streams/conversion.ts";
 import { basename, resolve } from "https://deno.land/std@0.136.0/path/mod.ts";
-import { readImportMap } from "./server/config.ts";
+import { readImportMap } 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";
diff --git a/commands/build.ts b/commands/build.ts
@@ -1,9 +1,8 @@
 import { basename } from "https://deno.land/std@0.136.0/path/mod.ts";
 import { findFile } from "../lib/fs.ts";
-import { builtinModuleExts } from "../lib/helpers.ts";
 import log, { blue, bold } from "../lib/log.ts";
-import { initModuleLoaders, loadImportMap } from "../server/config.ts";
 import { build } from "../server/build.ts";
+import { builtinModuleExts, initModuleLoaders, loadImportMap } from "../server/helpers.ts";
 import { serve } from "../server/mod.ts";
 import { proxyModules } from "../server/proxy_modules.ts";
 
diff --git a/commands/dev.ts b/commands/dev.ts
@@ -1,11 +1,10 @@
 import { basename, relative } from "https://deno.land/std@0.136.0/path/mod.ts";
 import mitt, { Emitter } from "https://esm.sh/mitt@3.0.0";
 import { findFile, watchFs } from "../lib/fs.ts";
-import { builtinModuleExts } from "../lib/helpers.ts";
 import log, { blue } from "../lib/log.ts";
 import util from "../lib/util.ts";
 import { serve as httpServe } from "../lib/serve.ts";
-import { initModuleLoaders, loadImportMap } from "../server/config.ts";
+import { builtinModuleExts, initModuleLoaders, loadImportMap } from "../server/helpers.ts";
 import { serve } from "../server/mod.ts";
 import { initRoutes, toRouteRegExp } from "../server/routing.ts";
 import type { DependencyGraph } from "../server/graph.ts";
diff --git a/commands/start.ts b/commands/start.ts
@@ -1,10 +1,9 @@
 import { basename, join } from "https://deno.land/std@0.136.0/path/mod.ts";
 import { serve as stdServe, serveTls } from "https://deno.land/std@0.136.0/http/server.ts";
 import { findFile } from "../lib/fs.ts";
-import { builtinModuleExts } from "../lib/helpers.ts";
 import log, { blue } from "../lib/log.ts";
-import { initModuleLoaders, loadImportMap } from "../server/config.ts";
 import { build } from "../server/build.ts";
+import { builtinModuleExts, initModuleLoaders, loadImportMap } from "../server/helpers.ts";
 import { serve } from "../server/mod.ts";
 import { proxyModules } from "../server/proxy_modules.ts";
 import type { AlephConfig } from "../server/types.ts";
diff --git a/framework/react/data.ts b/framework/react/data.ts
@@ -1,5 +1,5 @@
 import { useCallback, useContext, useEffect, useMemo, useState } from "react";
-import { FetchError } from "../../lib/helpers.ts";
+import FetchError from "../../lib/fetch_error.ts";
 import { DataContext } from "./context.ts";
 
 export type HttpMethod = "get" | "post" | "put" | "patch" | "delete";
diff --git a/framework/react/router.ts b/framework/react/router.ts
@@ -1,9 +1,9 @@
 import type { FC, ReactElement, ReactNode } from "react";
 import { createElement, useContext, useEffect, useMemo, useState } from "react";
-import { FetchError } from "../../lib/helpers.ts";
+import FetchError from "../../lib/fetch_error.ts";
 import type { Route, RouteMeta, RouteModule, Routes } from "../../lib/route.ts";
 import { matchRoutes } from "../../lib/route.ts";
-import { URLPatternCompat } from "../../lib/urlpattern.ts";
+import { URLPatternCompat } from "../../lib/url_pattern.ts";
 import events from "../core/events.ts";
 import { redirect } from "../core/redirect.ts";
 import { DataContext, ForwardPropsContext, RouterContext } from "./context.ts";
diff --git a/lib/fetch_error.ts b/lib/fetch_error.ts
@@ -0,0 +1,24 @@
+export default class FetchError extends Error {
+  constructor(
+    public status: number,
+    public details: Record<string, unknown>,
+    message: string,
+    opts?: ErrorOptions,
+  ) {
+    super(message, opts);
+  }
+
+  static async fromResponse(res: Response): Promise<FetchError> {
+    let message = res.statusText;
+    let details: Record<string, unknown> = {};
+    if (res.headers.get("content-type")?.startsWith("application/json")) {
+      details = await res.json();
+      if (typeof details.message === "string") {
+        message = details.message;
+      }
+    } else {
+      message = await res.text();
+    }
+    return new FetchError(res.status, details, message);
+  }
+}
diff --git a/lib/helpers.ts b/lib/helpers.ts
diff --git a/lib/log.ts b/lib/log.ts
@@ -11,31 +11,23 @@ export enum Level {
 }
 
 export class Timing {
-  #t: number;
-
-  constructor(quit?: boolean) {
-    this.#t = !quit ? performance.now() : 0;
-  }
+  #t = performance.now();
 
   reset() {
-    if (this.#t > 0) {
-      this.#t = performance.now();
-    }
+    this.#t = performance.now();
   }
 
   stop(message: string) {
-    if (this.#t > 0) {
-      const now = performance.now();
-      const d = Math.round(now - this.#t);
-      let cf = green;
-      if (d > 10000) {
-        cf = red;
-      } else if (d > 1000) {
-        cf = yellow;
-      }
-      this.#t = now;
-      console.debug(dim("TIMING"), message, "in", cf(d + "ms"));
+    const now = performance.now();
+    const d = Math.round(now - this.#t);
+    let cf = green;
+    if (d > 10000) {
+      cf = red;
+    } else if (d > 1000) {
+      cf = yellow;
     }
+    console.debug(dim("TIMING"), message, "in", cf(d + "ms"));
+    this.#t = now;
   }
 }
 
@@ -97,10 +89,13 @@ export class Logger {
     }
   }
 
-  timing(): Timing {
-    return new Timing(this.level > Level.Debug);
+  timing(): { reset(): void; stop(message: string): void } {
+    if (this.level === Level.Debug) {
+      return new Timing();
+    }
+    return { reset: () => {}, stop: () => {} };
   }
 }
 
-export default new Logger();
 export { blue, bold, dim, green, red, stripColor, yellow };
+export default new Logger();
diff --git a/lib/route.ts b/lib/route.ts
@@ -1,5 +1,5 @@
-import type { URLPatternCompat, URLPatternInput, URLPatternResult } from "./urlpattern.ts";
-import { createStaticURLPatternResult } from "./urlpattern.ts";
+import type { URLPatternCompat, URLPatternInput, URLPatternResult } from "./url_pattern.ts";
+import { createStaticURLPatternResult } from "./url_pattern.ts";
 import util from "./util.ts";
 
 export type RouteModule = {
diff --git a/lib/url_pattern.ts b/lib/url_pattern.ts
diff --git a/server/build.ts b/server/build.ts
@@ -4,14 +4,20 @@ import { build as esbuild, type Loader, stop } from "https://deno.land/x/esbuild
 import { parseExportNames } from "../compiler/mod.ts";
 import cache from "../lib/cache.ts";
 import { existsDir, existsFile } from "../lib/fs.ts";
-import { builtinModuleExts, toLocalPath } from "../lib/helpers.ts";
 import { parseHtmlLinks } from "./html.ts";
 import log from "../lib/log.ts";
 import util from "../lib/util.ts";
-import { getAlephPkgUri, initModuleLoaders, loadImportMap, loadJSXConfig } from "../server/config.ts";
-import { DependencyGraph } from "../server/graph.ts";
-import { initRoutes } from "../server/routing.ts";
-import type { AlephConfig, BuildPlatform, FetchHandler } from "../server/types.ts";
+import { DependencyGraph } from "./graph.ts";
+import {
+  builtinModuleExts,
+  getAlephPkgUri,
+  initModuleLoaders,
+  loadImportMap,
+  loadJSXConfig,
+  toLocalPath,
+} from "./helpers.ts";
+import { initRoutes } from "./routing.ts";
+import type { AlephConfig, BuildPlatform, FetchHandler } from "./types.ts";
 
 const supportedPlatforms: Record<BuildPlatform, string> = {
   "deno": "Deno",
diff --git a/server/bundle_css.ts b/server/bundle_css.ts
@@ -1,9 +1,8 @@
 import { transformCSS } from "../compiler/mod.ts";
 import { Targets } from "../compiler/types.ts";
 import { readCode } from "../lib/fs.ts";
-import { toLocalPath } from "../lib/helpers.ts";
 import util from "../lib/util.ts";
-import { getAlephPkgUri } from "./config.ts";
+import { getAlephPkgUri, toLocalPath } from "./helpers.ts";
 
 export type BundleCSSOptions = {
   targets?: Targets;
diff --git a/server/helpers.ts b/server/helpers.ts
@@ -1,7 +1,6 @@
 import { basename, dirname, globToRegExp, join } from "https://deno.land/std@0.136.0/path/mod.ts";
 import { JSONC } from "https://deno.land/x/jsonc_parser@v0.0.1/src/jsonc.ts";
 import { findFile } from "../lib/fs.ts";
-import { globalIt } from "../lib/helpers.ts";
 import { createGenerator } from "https://esm.sh/@unocss/core@0.31.6";
 import log from "../lib/log.ts";
 import util from "../lib/util.ts";
@@ -15,6 +14,59 @@ export type JSXConfig = {
   jsxRuntimeCdnVersion?: string;
 };
 
+export const regFullVersion = /@\d+\.\d+\.\d+/;
+export const builtinModuleExts = ["tsx", "ts", "mts", "jsx", "js", "mjs"];
+
+/**
+ * fix remote url to local path.
+ * e.g. `https://esm.sh/react@17.0.2?dev` -> `/-/esm.sh/react@17.0.2?dev`
+ */
+export function toLocalPath(url: string): string {
+  if (util.isLikelyHttpURL(url)) {
+    let { hostname, pathname, port, protocol, search } = new URL(url);
+    const isHttp = protocol === "http:";
+    if ((isHttp && port === "80") || (protocol === "https:" && port === "443")) {
+      port = "";
+    }
+    return [
+      "/-/",
+      isHttp && "http_",
+      hostname,
+      port && "_" + port,
+      util.trimSuffix(pathname, "/"),
+      search,
+    ].filter(Boolean).join("");
+  }
+  return url;
+}
+
+/**
+ * restore the remote url from local path.
+ * e.g. `/-/esm.sh/react@17.0.2` -> `https://esm.sh/react@17.0.2`
+ */
+export function restoreUrl(pathname: string): string {
+  let [h, ...rest] = pathname.substring(3).split("/");
+  let protocol = "https";
+  if (h.startsWith("http_")) {
+    h = h.substring(5);
+    protocol = "http";
+  }
+  const [host, port] = h.split("_");
+  return `${protocol}://${host}${port ? ":" + port : ""}/${rest.join("/")}`;
+}
+
+export function globalIt<T>(name: string, fn: () => T): T {
+  const cache: T | undefined = Reflect.get(globalThis, name);
+  if (cache !== undefined) {
+    return cache;
+  }
+  const ret = fn();
+  if (ret !== undefined) {
+    Reflect.set(globalThis, name, ret);
+  }
+  return ret;
+}
+
 export function getAlephPkgUri() {
   return globalIt("__ALEPH_PKG_URI", () => {
     const uriFromEnv = Deno.env.get("ALEPH_PKG_URI");
diff --git a/server/html.ts b/server/html.ts
@@ -2,9 +2,8 @@ import { concat } from "https://deno.land/std@0.136.0/bytes/mod.ts";
 import type { Comment, DocumentEnd, Element } from "https://deno.land/x/lol_html@0.0.3/types.d.ts";
 import initLolHtml, { HTMLRewriter } from "https://deno.land/x/lol_html@0.0.3/mod.js";
 import decodeLolHtmlWasm from "https://deno.land/x/lol_html@0.0.3/wasm.js";
-import { toLocalPath } from "../lib/helpers.ts";
 import util from "../lib/util.ts";
-import { getAlephPkgUri } from "./config.ts";
+import { getAlephPkgUri, toLocalPath } from "./helpers.ts";
 
 await initLolHtml(decodeLolHtmlWasm());
 
diff --git a/server/mod.ts b/server/mod.ts
@@ -5,7 +5,7 @@ import { getContentType } from "../lib/mime.ts";
 import type { Routes } from "../lib/route.ts";
 import util from "../lib/util.ts";
 import { VERSION } from "../version.ts";
-import { initModuleLoaders, loadImportMap, loadJSXConfig } from "./config.ts";
+import { initModuleLoaders, loadImportMap, loadJSXConfig } from "./helpers.ts";
 import { loadAndFixIndexHtml } from "./html.ts";
 import type { HTMLRewriterHandlers, SSR } from "./renderer.ts";
 import renderer from "./renderer.ts";
@@ -250,7 +250,6 @@ export const serve = (options: ServerOptions = {}) => {
               const fetcher = dataConfig[req.method.toLowerCase()];
               if (typeof fetcher === "function") {
                 const res = await fetcher(req, { ...ctx, params: ret.pathname.groups });
-                console.log(res);
                 if (res instanceof Response) {
                   return res;
                 }
diff --git a/server/proxy_modules.ts b/server/proxy_modules.ts
@@ -1,12 +1,12 @@
 import MagicString from "https://esm.sh/magic-string@0.26.1";
 import { parseDeps } from "../compiler/mod.ts";
-import { builtinModuleExts } from "../lib/helpers.ts";
 import log from "../lib/log.ts";
 import { getContentType } from "../lib/mime.ts";
 import { serveDir } from "../lib/serve.ts";
 import util from "../lib/util.ts";
 import { bundleCSS } from "./bundle_css.ts";
 import { DependencyGraph } from "./graph.ts";
+import { builtinModuleExts } from "./helpers.ts";
 import type { ImportMap, ModuleLoader, ModuleLoaderContent, ModuleLoaderEnv } from "./types.ts";
 
 const cssModuleLoader = async (pathname: string, env: ModuleLoaderEnv) => {
diff --git a/server/renderer.ts b/server/renderer.ts
@@ -1,10 +1,10 @@
-import { builtinModuleExts, FetchError } from "../lib/helpers.ts";
+import FetchError from "../lib/fetch_error.ts";
 import log from "../lib/log.ts";
 import util from "../lib/util.ts";
 import type { RouteModule, Routes } from "../lib/route.ts";
 import { matchRoutes } from "../lib/route.ts";
-import { getUnoGenerator } from "./config.ts";
 import type { DependencyGraph, Module } from "./graph.ts";
+import { builtinModuleExts, getUnoGenerator } from "./helpers.ts";
 import type { Comment, Element } from "./html.ts";
 import { HTMLRewriter } from "./html.ts";
 import { importRouteModule } from "./routing.ts";
diff --git a/server/routing.ts b/server/routing.ts
diff --git a/server/serve_dist.ts b/server/serve_dist.ts
diff --git a/server/transformer.ts b/server/transformer.ts
diff --git a/tests/server_helpers_test.ts b/tests/server_helpers_test.ts
diff --git a/tests/server_html_test.ts b/tests/server_html_test.ts
