@marko/run 0.0.1-beta1 → 0.0.1-beta3

package/dist/vite/types.d.ts

@@ -8,18 +8,17 @@ export interface Adapter {
     pluginOptions?(options: Options): Promise<Options> | Options | undefined;
     viteConfig?(config: UserConfig): Promise<UserConfig> | UserConfig | undefined;
     getEntryFile?(): Promise<string> | string;
-    startDev?(configFile: string, port: number): Promise<void> | void;
-    startPreview?(dir: string, entry?: string, port?: number): Promise<void> | void;
+    startDev?(configFile: string, port: number, envFile?: string): Promise<void> | void;
+    startPreview?(dir: string, entry?: string, port?: number, envFile?: string): Promise<void> | void;
     buildEnd?(config: ResolvedConfig, routes: Route[], builtEntries: string[], sourceEntries: string[]): Promise<void> | void;
 }
-export interface MarkoServeOptions {
+export interface RouterOptions {
+    trailingSlashes: 'Ignore' | 'RedirectWithout' | 'RedirectWith' | 'RewriteWithout' | 'RewriteWith';
+}
+export interface MarkoServeOptions extends Partial<RouterOptions> {
     routesDir?: string;
     emitRoutes?(routes: Route[]): void | Promise<void>;
     adapter?: Adapter;
-    codegen?: CodegenOptions;
-}
-export interface CodegenOptions {
-    trailingSlashes: 'Ignore' | 'RedirectWithout' | 'RedirectWith' | 'RewriteWithout' | 'RewriteWith';
 }
 export declare type Options = MarkoServeOptions & MarkoViteOptions;
 export interface Route {
@@ -43,9 +42,11 @@ export interface SpecialRoutes {
     [RoutableFileTypes.Error]?: Route;
 }
 export interface RoutableFile {
+    id: string;
     name: string;
     type: RoutableFileType;
     filePath: string;
+    relativePath: string;
     importPath: string;
     verbs?: HttpVerb[];
 }
@@ -59,4 +60,5 @@ export interface RouteTrie {
 export interface BuiltRoutes {
     list: Route[];
     special: SpecialRoutes;
+    middleware: RoutableFile[];
 }

package/dist/vite/utils/config.d.ts

@@ -1,3 +1,3 @@
 import type { Options } from '../types';
-export declare function getMarkoServeOptions<T extends Record<string, any>>(viteConfig: T): Readonly<Options> | undefined;
-export declare function setMarkoServeOptions<T extends Record<string, any>>(viteConfig: T, options: Options): T;
+export declare function getMarkoRunOptions<T extends Record<string, any>>(viteConfig: T): Readonly<Options> | undefined;
+export declare function setMarkoRunOptions<T extends Record<string, any>>(viteConfig: T, options: Options): T;

package/dist/vite/utils/server.d.ts

@@ -2,6 +2,8 @@ export interface SpawnedServer {
     port: number;
     close(): void;
 }
-export declare function spawnServer(cmd: string, port?: number, cwd?: string, wait?: number): Promise<SpawnedServer>;
+export declare function parseEnv(envFile: string): Promise<import("dotenv").DotenvParseOutput | undefined>;
+export declare function loadEnv(envFile: string): void;
+export declare function spawnServer(cmd: string, port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number): Promise<SpawnedServer>;
 export declare function isPortInUse(port: number): Promise<boolean>;
 export declare function getAvailablePort(): Promise<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.0.1-beta1",
+  "version": "0.0.1-beta3",
   "description": "File-based routing for Marko based on Vite",
   "keywords": [],
   "author": "Ryan Turnquist <rturnq@gmail.com>",
@@ -33,6 +33,11 @@
       "import": "./dist/vite/index.js",
       "require": "./dist/vite/index.cjs"
     },
+    "./adapter/middleware": {
+      "types": "./dist/adapter/middleware.d.ts",
+      "import": "./dist/adapter/middleware.js",
+      "require": "./dist/adapter/middleware.cjs"
+    },
     "./adapter": {
       "types": "./dist/adapter/index.d.ts",
       "import": "./dist/adapter/index.js",
@@ -50,6 +55,9 @@
       "vite": [
         "./src/vite/index.ts"
       ],
+      "adapter/middleware": [
+        "./src/adapter/middleware.ts"
+      ],
       "adapter": [
         "./src/adapter/index.ts"
       ]
@@ -66,8 +74,10 @@
   "devDependencies": {
     "@babel/types": "^7.19.0",
     "@marko/compiler": "^5.22.6",
+    "@types/glob": "^8.0.1",
+    "@types/human-format": "^1.0.0",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^18.7.6",
+    "@types/node": "^18.11.18",
     "acorn": "^8.8.0",
     "cross-env": "^7.0.3",
     "esbuild": "^0.15.7",
@@ -79,13 +89,15 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@hattip/adapter-node": "^0.0.24",
-    "@hattip/core": "^0.0.24",
-    "@marko/vite": "^2.3.11",
+    "@hattip/polyfills": "^0.0.27",
+    "@marko/vite": "^2.3.9",
     "cli-table3": "^0.6.3",
+    "compression": "^1.7.4",
+    "dotenv": "^16.0.3",
+    "glob": "^8.1.0",
     "gzip-size": "^7.0.0",
+    "human-format": "^1.0.0",
     "kleur": "^4.1.5",
-    "pretty-bytes": "^6.0.0",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",
     "vite": "^3.0.8"

package/dist/adapter/server-old.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="node" />
-import type { Server } from "http";
-export default function (dir?: string): Promise<Server>;

package/dist/adapter/server.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="node" />
-import { ViteDevServer } from "vite";
-import { type NodeMiddleware } from "@hattip/adapter-node";
-import type { Server } from "http";
-export declare function createViteDevMiddleware<T>(devServer: ViteDevServer, load: (prev: T | undefined) => Promise<T>, factory: (value: T) => NodeMiddleware): NodeMiddleware;
-export default function (entryFile?: string): Promise<Server>;

package/dist/adapters/node/index.d.ts

@@ -1,5 +0,0 @@
-import type { Adapter, Route } from "../../vite";
-export interface Options {
-    urls?: string[] | ((routes: Route[]) => string[] | Promise<string[]>);
-}
-export default function staticAdapter(_options?: Options): Adapter;

package/dist/adapters/node/server.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="node" />
-import type { Server } from "http";
-export default function (dir?: string): Promise<Server>;

package/dist/adapters/static/crawler.d.ts

@@ -1,9 +0,0 @@
-export interface Options {
-    out?: string;
-    origin?: string;
-    notFoundPath?: string;
-}
-export interface Crawler {
-    crawl(paths: string[]): Promise<void>;
-}
-export default function createCrawler(makeRequest: (request: Request) => Promise<Response>, opts?: Options): Crawler;

package/dist/adapters/static/default-entry.mjs

@@ -1 +0,0 @@
-export { router } from '@marko/run';

package/dist/adapters/static/index.cjs

@@ -1,371 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/adapters/static/index.ts
-var static_exports = {};
-__export(static_exports, {
-  default: () => staticAdapter
-});
-module.exports = __toCommonJS(static_exports);
-var import_path2 = __toESM(require("path"), 1);
-var import_url = require("url");
-var import_undici = require("undici");
-
-// src/adapters/static/crawler.ts
-var import_fs = __toESM(require("fs"), 1);
-var import_path = __toESM(require("path"), 1);
-var import_WritableStream = require("htmlparser2/lib/WritableStream");
-var noop = () => {
-};
-var ignoredRels = /* @__PURE__ */ new Set(["nofollow", "enclosure", "external"]);
-var contentType = "text/html";
-function createCrawler(makeRequest, opts = {}) {
-  const origin = opts.origin || `http://localhost`;
-  const out = import_path.default.resolve(opts.out || "dist");
-  const notFoundPath = resolvePath(opts.notFoundPath || "/404/", origin);
-  let seen;
-  let queue;
-  let pending;
-  async function visit(path2) {
-    var _a, _b;
-    const parser = new import_WritableStream.WritableStream({
-      onopentag(name, attrs) {
-        const href = resolveHref(name, attrs);
-        const path3 = href && resolvePath(href, origin);
-        if (path3 !== void 0 && !seen.has(path3)) {
-          seen.add(path3);
-          queue.push(visit(path3));
-        }
-      }
-    });
-    const dirname = import_path.default.join(out, path2);
-    const abortController = new AbortController();
-    let fsWriter;
-    try {
-      const url = new URL(path2, origin);
-      const req = new Request(url, {
-        method: "GET",
-        signal: abortController.signal,
-        headers: { accept: contentType }
-      });
-      const res = await makeRequest(req);
-      if (!((_a = res.headers.get("content-type")) == null ? void 0 : _a.includes(contentType))) {
-        abortController.abort();
-        return;
-      }
-      let redirect;
-      switch (res.status) {
-        case 200:
-          break;
-        case 404:
-          if (path2 !== notFoundPath) {
-            redirect = origin + notFoundPath;
-          }
-          break;
-        case 301: {
-          redirect = res.headers.get("location");
-          const redirectPath = resolvePath(redirect, origin);
-          if (redirectPath && !seen.has(redirectPath)) {
-            seen.add(redirectPath);
-            queue.push(visit(redirectPath));
-          }
-          break;
-        }
-        default: {
-          abortController.abort();
-          console.warn(`Status code ${res.status} was while crawling: '${path2}'`);
-          return;
-        }
-      }
-      await import_fs.default.promises.mkdir(dirname, { recursive: true }).catch(noop);
-      fsWriter = import_fs.default.createWriteStream(import_path.default.join(dirname, "index.html"));
-      if (redirect) {
-        abortController.abort();
-        fsWriter.write(
-          `<!DOCTYPE html><meta http-equiv=Refresh content="0;url=${redirect.replace(
-            /"/g,
-            "&#40;"
-          )}">`
-        );
-      } else {
-        const writable = new WritableStream({
-          write(data) {
-            fsWriter.write(data);
-            parser.write(data);
-          }
-        });
-        await ((_b = res.body) == null ? void 0 : _b.pipeTo(writable));
-      }
-    } finally {
-      fsWriter == null ? void 0 : fsWriter.end();
-      parser.end();
-    }
-  }
-  return {
-    async crawl(paths = ["/"]) {
-      if (pending) {
-        await pending;
-      }
-      const startPaths = paths.map((path2) => resolvePath(path2, origin)).concat(notFoundPath);
-      seen = new Set(startPaths);
-      try {
-        queue = startPaths.map(visit);
-        while (queue.length) {
-          pending = Promise.all(queue);
-          queue = [];
-          await pending;
-        }
-      } finally {
-        pending = void 0;
-      }
-    }
-  };
-}
-function resolveHref(tagName, attrs) {
-  switch (tagName) {
-    case "a":
-      if (attrs.href && !(attrs.download || ignoredRels.has(attrs.rel))) {
-        return attrs.href;
-      }
-      break;
-    case "link":
-      if (attrs.href) {
-        switch (attrs.rel) {
-          case "alternate":
-          case "author":
-          case "canonical":
-          case "help":
-          case "license":
-          case "next":
-          case "prefetch":
-          case "prerender":
-          case "prev":
-          case "search":
-          case "tag":
-            return attrs.href;
-          case "preload":
-            if (attrs.as === "document") {
-              return attrs.href;
-            }
-            break;
-        }
-      }
-      break;
-    case "iframe":
-      return attrs.src;
-  }
-}
-function resolvePath(href, origin) {
-  const url = new URL(href, origin);
-  if (url.origin === origin) {
-    let { pathname } = url;
-    const lastChar = pathname.length - 1;
-    if (pathname[lastChar] !== "/") {
-      pathname += "/";
-    }
-    return pathname + url.search;
-  }
-}
-
-// src/adapters/static/index.ts
-var import_promises = __toESM(require("fs/promises"), 1);
-
-// src/vite/utils/server.ts
-var import_net = __toESM(require("net"), 1);
-var import_child_process = __toESM(require("child_process"), 1);
-async function spawnServer(cmd, port = 0, wait = 3e4) {
-  if (port <= 0) {
-    port = await getAvailablePort();
-  }
-  const proc = import_child_process.default.spawn(cmd, {
-    shell: true,
-    stdio: "inherit",
-    windowsHide: true,
-    env: { ...process.env, PORT: `${port}` }
-  });
-  const close = () => {
-    proc.unref();
-    proc.kill();
-  };
-  let remaining = wait > 0 ? wait : Infinity;
-  while (!await isPortInUse(port)) {
-    if (remaining >= 100) {
-      remaining -= 100;
-      await sleep(100);
-    } else {
-      close();
-      throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
-      );
-    }
-  }
-  return close;
-}
-async function isPortInUse(port) {
-  return new Promise((resolve) => {
-    const connection = import_net.default.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => done(false)).on("connect", () => done(true));
-    function done(connected) {
-      connection.end();
-      resolve(connected);
-    }
-  });
-}
-async function getAvailablePort() {
-  return new Promise((resolve) => {
-    const server = import_net.default.createServer().listen(0, () => {
-      const { port } = server.address();
-      server.close(() => resolve(port));
-    });
-  });
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-// src/adapters/static/server.ts
-var import_serve_static = __toESM(require("serve-static"), 1);
-var import_http = require("http");
-var import_vite = require("vite");
-var import_adapter_node = require("@hattip/adapter-node");
-function noop2() {
-}
-async function server_default(dir) {
-  if (dir) {
-    const staticServe = (0, import_serve_static.default)(dir, {
-      index: "index.html",
-      immutable: true,
-      maxAge: "365 days"
-    });
-    return await (0, import_http.createServer)((req, res) => staticServe(req, res, noop2));
-  }
-  const devServer = await (0, import_vite.createServer)({
-    appType: "custom",
-    server: { middlewareMode: true }
-  });
-  let handler;
-  let middleware;
-  return devServer.middlewares.use(async (req, res, next) => {
-    try {
-      const module2 = await devServer.ssrLoadModule("@marko/run");
-      if (module2.handler !== handler) {
-        handler = module2.handler;
-        middleware = (0, import_adapter_node.createMiddleware)(handler);
-      }
-      await middleware(req, res, next);
-    } catch (err) {
-      if (err instanceof Error) {
-        devServer.ssrFixStacktrace(err);
-      }
-      return next(err);
-    }
-  });
-}
-
-// src/adapters/static/index.ts
-var import_meta = {};
-var __dirname = (0, import_url.fileURLToPath)(new URL(".", import_meta.url));
-function staticAdapter(_options = {}) {
-  return {
-    name: "static-adapter",
-    async config(_options2) {
-      return {
-        codegen: {
-          trailingSlashes: "RedirectWith"
-        }
-      };
-    },
-    async getEntryFile() {
-      return import_path2.default.join(__dirname, "default-entry");
-    },
-    async startServer(port, dir) {
-      const server = await server_default(dir);
-      server.on("error", (err) => {
-        console.error(err);
-        process.exit(1);
-      });
-      return new Promise((resolve) => {
-        const listener = server.listen(port, () => {
-          const address = listener.address();
-          console.log(`Server started: http://localhost:${address.port}`);
-          resolve();
-        });
-      });
-    },
-    async buildEnd(routes, builtEntries, sourceEntries) {
-      var _a;
-      const pathsToVisit = [];
-      for (const route of routes) {
-        if (!((_a = route.params) == null ? void 0 : _a.length)) {
-          pathsToVisit.push(route.path);
-        }
-      }
-      const defaultEntry = await this.getEntryFile();
-      if (sourceEntries[0] === defaultEntry) {
-        const { router } = await import(builtEntries[0]);
-        const crawler = createCrawler(router, {});
-        await crawler.crawl(pathsToVisit);
-      } else {
-        const port = await getAvailablePort();
-        const origin = `http://localhost:${port}`;
-        const client = new import_undici.Pool(origin);
-        const closeServer = await spawnServer(`node ${builtEntries[0]}`, port);
-        const crawler = createCrawler(
-          async (request) => {
-            const url = new URL(request.url);
-            const headers = {};
-            request.headers.forEach((value, key) => {
-              headers[key] = value;
-            });
-            const responseData = await client.request({
-              path: url.pathname + url.search,
-              method: request.method,
-              signal: request.signal,
-              headers
-            });
-            return new Response(responseData.body, {
-              status: responseData.statusCode,
-              headers: responseData.headers
-            });
-          },
-          {
-            origin
-          }
-        );
-        try {
-          await crawler.crawl(pathsToVisit);
-        } finally {
-          await client.close();
-          closeServer();
-        }
-      }
-      for (const file of builtEntries) {
-        await import_promises.default.rm(file, { maxRetries: 5 }).catch(() => {
-        });
-      }
-    }
-  };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/adapters/static/index.d.ts

@@ -1,5 +0,0 @@
-import type { Adapter, Route } from "../../vite";
-export interface Options {
-    urls?: string[] | ((routes: Route[]) => string[] | Promise<string[]>);
-}
-export default function staticAdapter(_options?: Options): Adapter;