@marko/run 0.1.4 → 0.1.6

package/dist/vite/index.js

@@ -3,7 +3,7 @@ import path2 from "path";
 import crypto from "crypto";
 import fs2 from "fs";
 import glob from "glob";
-import { mergeConfig, resolvePackageData } from "vite";
+import { mergeConfig } from "vite";
 import markoVitePlugin, { FileStore } from "@marko/vite";
 
 // src/vite/constants.ts
@@ -643,7 +643,9 @@ function renderRouter(routes, options = {
       `import page${key} from '${virtualFilePrefix}/${markoRunFilePrefix}special__${key}.marko${serverEntryQuery}';`
     );
   }
-  writer.writeLines("").writeBlockStart(`export function match(method, pathname) {`).writeLines(
+  writer.writeLines(`
+globalThis.__marko_run__ = { match, fetch, invoke };
+    `).writeBlockStart(`export function match(method, pathname) {`).writeLines(
     `if (!pathname) {
     pathname = '/';
   } else if (pathname.charAt(0) !== '/') {
@@ -792,7 +794,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
     if (terminal || (dynamic == null ? void 0 : dynamic.route)) {
       closeCount++;
       writer.writeBlockStart(`if (!${index} || ${index} === len) {`);
-      let value = `pathname.slice(${offset}, ${index} ? -1 : len)`;
+      let value = `decodeURIComponent(pathname.slice(${offset}, ${index} ? -1 : len))`;
       if (dynamic == null ? void 0 : dynamic.route) {
         const segment = `s${next}`;
         writer.writeLines(`const ${segment} = ${value};`);
@@ -831,7 +833,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
         writer.writeBlockStart(`if (${index} && ${index} !== len) {`);
         closeCount++;
       }
-      let value = `pathname.slice(${offset}, ${index} - 1)`;
+      let value = `decodeURIComponent(pathname.slice(${offset}, ${index} - 1))`;
       if ((dynamic == null ? void 0 : dynamic.static) || (dynamic == null ? void 0 : dynamic.dynamic)) {
         const segment = `s${next}`;
         writer.writeLines(`const ${segment} = ${value};`);
@@ -843,11 +845,12 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
           writer.writeBlockStart(`switch (${value}.toLowerCase()) {`);
         }
         for (const child of children) {
+          const decodedKey = decodeURIComponent(child.key);
           if (useSwitch) {
-            writer.writeBlockStart(`case '${child.key}': {`);
+            writer.writeBlockStart(`case '${decodedKey}': {`);
           } else {
             writer.writeBlockStart(
-              `if (${value}.toLowerCase() === '${child.key}') {`
+              `if (${value}.toLowerCase() === '${decodedKey}') {`
             );
           }
           const nextOffset = typeof offset === "string" ? index : offset + child.key.length + 1;
@@ -877,6 +880,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
   }
 }
 function wrapPropertyName(name) {
+  name = decodeURIComponent(name);
   return /^[^A-Za-z_$]|[^A-Za-z0-9$_]/.test(name) ? `'${name}'` : name;
 }
 function renderParamsInfo(params, pathIndex) {
@@ -977,7 +981,10 @@ interface NoMeta {}
     const routeType = `Route${route.index}`;
     const pathType = `\`${route.path.replace(
       /\/\$(\$?)([^\/]*)/,
-      (_, catchAll, name) => catchAll ? `/:${name || "rest"}*` : `/:${name}`
+      (_, catchAll, name) => {
+        name = decodeURIComponent(name);
+        return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
+      }
     )}\``;
     const paramsType = (params == null ? void 0 : params.length) ? renderParamsInfoType(params) : "NoParams";
     let metaType = "NoMeta";
@@ -985,10 +992,10 @@ interface NoMeta {}
       const isGet = page || ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.includes("get"));
       const isPost = (_b = handler == null ? void 0 : handler.verbs) == null ? void 0 : _b.includes("post");
       if (isGet || isPost) {
-        const path3 = route.path.replace(
-          /\$(\$?)([^/]+)/g,
-          (_, s, name) => s ? `\${...${name}}` : `\${${name}}`
-        );
+        const path3 = route.path.replace(/\$(\$?)([^/]+)/g, (_, catchAll, name) => {
+          name = decodeURIComponent(name);
+          return catchAll ? `\${...${name}}` : `\${${name}}`;
+        });
         const splatIndex = path3.indexOf("/${...");
         if (splatIndex >= 0) {
           const path22 = path3.slice(0, splatIndex) || "/";
@@ -1199,9 +1206,9 @@ function getExportIdentifiers(astProgramNode) {
 }
 
 // src/vite/utils/log.ts
+import zlib from "node:zlib";
 import Table from "cli-table3";
 import kleur from "kleur";
-import { gzipSizeSync } from "gzip-size";
 import format from "human-format";
 var HttpVerbColors = {
   get: kleur.green,
@@ -1287,17 +1294,20 @@ function computeRouteSize(route, bundle) {
   }
   return [0, 0];
 }
-function byteSize(str) {
-  return new Blob([str]).size;
+function gzipSize(source) {
+  return zlib.gzipSync(source, { level: 9 }).length;
+}
+function byteSize(source) {
+  return new Blob([source]).size;
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
     return [
       byteSize(chunk.source),
-      gzipSizeSync(chunk.source)
+      gzipSize(chunk.source)
     ];
   }
-  const size = [byteSize(chunk.code), gzipSizeSync(chunk.code)];
+  const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
     if (!seen.has(id)) {
       const [bytes, compBytes] = computeChunkSize(bundle[id], bundle, seen);
@@ -1386,7 +1396,7 @@ function markoRun(opts = {}) {
       const filepath = path2.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes,
-        path2.relative(typesDir, routesDir),
+        path2.relative(typesDir, resolvedRoutesDir),
         adapter
       );
       if (data !== typesFile || !fs2.existsSync(filepath)) {
@@ -1499,6 +1509,9 @@ function markoRun(opts = {}) {
           define: isBuild ? {
             "process.env.NODE_ENV": "'production'"
           } : void 0,
+          ssr: {
+            noExternal: /@marko\/run/
+          },
           build: {
             emptyOutDir: isSSRBuild
           }
@@ -1736,6 +1749,7 @@ async function resolveAdapter(root, options, log) {
   if (adapter !== void 0) {
     return adapter;
   }
+  const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
     const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
@@ -1762,6 +1776,7 @@ import net from "net";
 import cp from "child_process";
 import { parse, config } from "dotenv";
 import fs3 from "fs";
+import cluster from "cluster";
 async function parseEnv(envFile) {
   if (fs3.existsSync(envFile)) {
     const content = await fs3.promises.readFile(envFile, "utf8");
@@ -1771,14 +1786,14 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   config({ path: envFile });
 }
-async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
   if (typeof env === "string") {
     env = await parseEnv(env);
   }
-  const proc = cp.spawn(cmd, {
+  const proc = cp.spawn(cmd, args, {
     cwd,
     shell: true,
     stdio: "inherit",
@@ -1789,32 +1804,45 @@ async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4)
     proc.unref();
     proc.kill();
   };
+  try {
+    await waitForServer(port, wait);
+  } catch (err) {
+    close();
+    throw err;
+  }
+  return {
+    port,
+    close
+  };
+}
+async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
-  while (!await isPortInUse(port)) {
+  let connection;
+  while (!(connection = await getConnection(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 {
-    port,
-    close
-  };
+  return connection;
 }
-async function isPortInUse(port) {
+async function getConnection(port) {
   return new Promise((resolve) => {
-    const connection = net.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => done(false)).on("connect", () => done(true));
-    function done(connected) {
+    const connection = net.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => {
       connection.end();
-      resolve(connected);
-    }
+      resolve(null);
+    }).on("connect", () => {
+      resolve(connection);
+    });
   });
 }
+async function isPortInUse(port) {
+  return Boolean(await getConnection(port));
+}
 async function getAvailablePort() {
   return new Promise((resolve) => {
     const server = net.createServer().listen(0, () => {

package/dist/vite/types.d.ts

@@ -1,19 +1,31 @@
 import type { RoutableFileType, HttpVerb, RoutableFileTypes } from "./constants";
 import type { Options as MarkoViteOptions } from "@marko/vite";
-import type { ResolvedConfig, UserConfig } from "vite";
+import type { ResolvedConfig, UserConfig, InlineConfig } from "vite";
+import type { SpawnedServer } from "./utils/server";
 export type { RoutableFileType, HttpVerb };
 export type StartServer = (port?: number) => Promise<void>;
 export interface AdapterConfig {
     [name: PropertyKey]: any;
 }
+export interface StartOptions {
+    cwd: string;
+    args: string[];
+    port?: number;
+    envFile?: string;
+}
+export interface StartDevOptions extends StartOptions {
+}
+export interface StartPreviewOptions extends StartOptions {
+    dir: string;
+}
 export interface Adapter {
     readonly name: string;
     configure?(config: AdapterConfig): void;
     pluginOptions?(options: Options): Promise<Options> | Options | undefined;
     viteConfig?(config: UserConfig): Promise<UserConfig> | UserConfig | undefined;
     getEntryFile?(): Promise<string> | string;
-    startDev?(configFile: string, port: number, envFile?: string): Promise<void> | void;
-    startPreview?(dir: string, entry?: string, port?: number, envFile?: string): Promise<void> | void;
+    startDev?(entry: string | undefined, config: InlineConfig, options: StartDevOptions): Promise<SpawnedServer> | SpawnedServer;
+    startPreview?(entry: string | undefined, options: StartPreviewOptions): Promise<SpawnedServer> | SpawnedServer;
     buildEnd?(config: ResolvedConfig, routes: Route[], builtEntries: string[], sourceEntries: string[]): Promise<void> | void;
     typeInfo?(writer: (data: string) => void): Promise<string> | string;
 }

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

@@ -1,9 +1,15 @@
+/// <reference types="node" />
+import { type Socket } from "net";
+import { type Worker } from "cluster";
 export interface SpawnedServer {
     port: number;
-    close(): void;
+    close(): Promise<void> | void;
 }
 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 spawnServer(cmd: string, args?: string[], port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number): Promise<SpawnedServer>;
+export declare function spawnServerWorker(module: string, args?: string[], port?: number, env?: string | Record<string, string>): Promise<Worker>;
+export declare function waitForServer(port: number, wait?: number): Promise<Socket>;
+export declare function getConnection(port: number): Promise<Socket | null>;
 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.1.4",
+  "version": "0.1.6",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -20,11 +20,10 @@
     "marko-run": "./dist/cli/index.mjs"
   },
   "scripts": {
-    "mocha": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
-    "test": "npm run mocha",
-    "test:watch": "npm run mocha -- --watch",
+    "test": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
+    "test:watch": "npm test -- --watch",
     "test:inspect": "npm test -- --inspect",
-    "test:update": "npm run mocha -- --update",
+    "test:update": "npm test -- --update",
     "build": "tsc -b && tsx scripts/build.ts"
   },
   "exports": {
@@ -83,17 +82,26 @@
   },
   "devDependencies": {
     "@babel/types": "^7.19.0",
+    "@marko/fixture-snapshots": "^2.1.7",
+    "@marko/testing-library": "^6.1.2",
     "@types/glob": "^8.0.1",
     "@types/human-format": "^1.0.0",
+    "@types/jsdom": "^21.1.0",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.11.18",
     "acorn": "^8.8.0",
     "cross-env": "^7.0.3",
     "esbuild": "^0.15.7",
+    "jsdom": "^21.1.1",
     "marko": "^5.23.0",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
     "mocha-snap": "^4.3.0",
+    "playwright": "^1.29.1",
     "prettier": "^2.7.1",
+    "ts-mocha": "^10.0.0",
+    "ts-node": "^10.9.1",
+    "tslib": "^2.5.0",
+    "tsm": "^2.3.0",
     "tsx": "^3.9.0",
     "typescript": "^4.7.4"
   },
@@ -103,9 +111,9 @@
     "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",
+    "parse-node-args": "^1.1.2",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",
     "strip-ansi": "^7.0.1",