@pracht/cli 1.2.1 → 1.3.0

package/dist/{verification-CId4crSF.mjs → verification-WP-KTb41.mjs}

@@ -1,9 +1,9 @@
-import { n as extractRegistryEntries, r as extractRelativeModulePaths } from "./manifest-DGq1n5LT.mjs";
-import { a as readProjectConfig, c as resolveProjectPath, i as listFilesRecursively, n as displayPath, r as hasPagesAppShell } from "./project-DUyH_7eJ.mjs";
+import { a as readProjectConfig, c as resolveProjectPath, i as listFilesRecursively, n as displayPath, r as hasPagesAppShell } from "./project-BdMiN3s7.mjs";
+import { n as extractRegistryEntries, r as extractRelativeModulePaths } from "./manifest-Bs5hp3gA.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { basename, dirname, relative, resolve } from "node:path";
 import { execFileSync } from "node:child_process";
-//#region src/verification.ts
+//#region src/verification-helpers.ts
 const CONFIG_FILE_NAMES = new Set([
 	"vite.config.ts",
 	"vite.config.mts",
@@ -14,57 +14,79 @@ const CONFIG_FILE_NAMES = new Set([
 ]);
 const MODULE_SOURCE_RE = /\.(ts|tsx|js|jsx)$/;
 const PAGE_SOURCE_RE = /\.(ts|tsx|js|jsx|md|mdx)$/;
-function runDoctor(root) {
-	const report = runVerification(root);
+function createCheck(status, message) {
 	return {
-		checks: report.checks,
-		configFile: report.configFile,
-		mode: report.mode,
-		ok: report.ok
+		message,
+		status
 	};
 }
-function runVerification(root, options = {}) {
-	const project = readProjectConfig(root);
-	const checks = [];
-	const packageJsonPath = resolve(project.root, "package.json");
-	const configDisplayPath = project.configFile ? displayPath(root, project.configFile) : "vite.config.*";
-	const requestedScope = options.changed ? "changed" : "full";
-	collectConfigChecks(project, checks, configDisplayPath);
-	let changedInfo = {
-		files: [],
-		warning: null
+function isWithinDirectory(filePath, directoryPath) {
+	const relativePath = relative(directoryPath, filePath);
+	return relativePath === "" || !relativePath.startsWith("..") && !relativePath.startsWith("../");
+}
+function normalizePath(value) {
+	return value.replace(/\\/g, "/");
+}
+function toModuleSpecifier(fromDir, filePath) {
+	const relativePath = relative(fromDir, filePath).replace(/\\/g, "/");
+	if (relativePath.startsWith(".")) return relativePath;
+	return `./${relativePath}`;
+}
+function normalizeRoutePath(path) {
+	if (!path || path === "/") return "/";
+	const collapsed = (path.startsWith("/") ? path : `/${path}`).replace(/\/{2,}/g, "/");
+	return collapsed.length > 1 && collapsed.endsWith("/") ? collapsed.slice(0, -1) : collapsed;
+}
+function resolveApiRoutePath(apiDir, file) {
+	let relativePath = relative(apiDir, file).replace(/\\/g, "/");
+	relativePath = relativePath.replace(/\.(ts|tsx|js|jsx)$/, "");
+	if (relativePath === "index") relativePath = "";
+	else relativePath = relativePath.replace(/\/index$/, "");
+	relativePath = relativePath.replace(/\[\.\.\.[^\]]+\]/g, "*");
+	relativePath = relativePath.replace(/\[([^\]]+)\]/g, ":$1");
+	return normalizeRoutePath(relativePath ? `/api/${relativePath}` : "/api");
+}
+//#endregion
+//#region src/verification-pages.ts
+function scanPagesDirectory(pagesDir) {
+	return listFilesRecursively(pagesDir).filter((file) => PAGE_SOURCE_RE.test(file)).map((file) => describePagesFile(pagesDir, file));
+}
+function describePagesFile(pagesDir, file) {
+	const routePath = relative(pagesDir, file).replace(/\\/g, "/").replace(/\.(tsx?|jsx?|mdx?)$/, "");
+	const name = basename(routePath);
+	if (hasPagesAppShell(file)) return {
+		file,
+		kind: "shell"
+	};
+	if (name.startsWith("_")) return {
+		file,
+		kind: "ignored"
+	};
+	if (routePath === "index") return {
+		file,
+		kind: "route",
+		routePath: "/"
 	};
-	if (options.changed) {
-		changedInfo = collectChangedFiles(project.root);
-		if (changedInfo.warning) checks.push(createCheck("warning", changedInfo.warning));
-	}
-	const frameworkFiles = options.changed ? filterFrameworkFiles(project, changedInfo.files, packageJsonPath) : [];
-	const scope = options.changed && !changedInfo.warning && !requiresFullVerification(project, frameworkFiles) ? "changed" : "full";
-	if (project.mode === "pages") collectPagesVerification(project, checks, {
-		changedFiles: frameworkFiles,
-		scope
-	});
-	else collectManifestVerification(project, checks, {
-		changedFiles: frameworkFiles,
-		scope
-	});
-	collectApiVerification(project, checks, {
-		changedFiles: frameworkFiles,
-		scope
-	});
-	collectPackageChecks(project, checks, packageJsonPath);
-	if (options.changed && frameworkFiles.length === 0 && !changedInfo.warning) checks.push(createCheck("ok", "No changed framework files were detected in the current project scope."));
 	return {
-		checks,
-		configFile: project.configFile ? displayPath(root, project.configFile) : null,
-		mode: project.mode,
-		ok: !checks.some((check) => check.status === "error"),
-		requestedScope,
-		scope,
-		changedFiles: changedInfo.files.map((file) => displayPath(project.root, file)),
-		frameworkFiles: frameworkFiles.map((file) => displayPath(project.root, file))
+		file,
+		kind: "route",
+		routePath: normalizeRoutePath(`/${routePath.replace(/\/index$/, "").replace(/\[\.\.\.([^\]]+)\]/g, "*").replace(/\[([^\].]+)\]/g, ":$1")}`)
 	};
 }
+function collectDuplicateRoutePaths(routes) {
+	const routeMap = /* @__PURE__ */ new Map();
+	for (const route of routes) {
+		const files = routeMap.get(route.routePath) ?? [];
+		files.push(route.file);
+		routeMap.set(route.routePath, files);
+	}
+	return [...routeMap.entries()].filter(([, files]) => files.length > 1).map(([path, files]) => ({
+		files,
+		path
+	}));
+}
+//#endregion
+//#region src/verification-checks.ts
 function collectConfigChecks(project, checks, configDisplayPath) {
 	if (!project.configFile) checks.push(createCheck("error", "Missing vite config."));
 	else checks.push(createCheck("ok", `Found ${configDisplayPath}.`));
@@ -223,6 +245,8 @@ function collectPackageChecks(project, checks, packageJsonPath) {
 	if (adapterPackages.length === 0) checks.push(createCheck("warning", "No built-in pracht adapter dependency was found in package.json."));
 	else checks.push(createCheck("ok", `Found adapter dependency ${adapterPackages.map((name) => JSON.stringify(name)).join(", ")}.`));
 }
+//#endregion
+//#region src/verification-scope.ts
 function collectChangedFiles(root) {
 	try {
 		const repoRoot = execFileSync("git", ["rev-parse", "--show-toplevel"], {
@@ -300,72 +324,57 @@ function requiresFullVerification(project, changedFiles) {
 		return false;
 	});
 }
-function scanPagesDirectory(pagesDir) {
-	return listFilesRecursively(pagesDir).filter((file) => PAGE_SOURCE_RE.test(file)).map((file) => describePagesFile(pagesDir, file));
-}
-function describePagesFile(pagesDir, file) {
-	const routePath = relative(pagesDir, file).replace(/\\/g, "/").replace(/\.(tsx?|jsx?|mdx?)$/, "");
-	const name = basename(routePath);
-	if (hasPagesAppShell(file)) return {
-		file,
-		kind: "shell"
-	};
-	if (name.startsWith("_")) return {
-		file,
-		kind: "ignored"
-	};
-	if (routePath === "index") return {
-		file,
-		kind: "route",
-		routePath: "/"
-	};
+//#endregion
+//#region src/verification.ts
+function runDoctor(root) {
+	const report = runVerification(root);
 	return {
-		file,
-		kind: "route",
-		routePath: normalizeRoutePath(`/${routePath.replace(/\/index$/, "").replace(/\[\.\.\.([^\]]+)\]/g, "*").replace(/\[([^\].]+)\]/g, ":$1")}`)
+		checks: report.checks,
+		configFile: report.configFile,
+		mode: report.mode,
+		ok: report.ok
 	};
 }
-function collectDuplicateRoutePaths(routes) {
-	const routeMap = /* @__PURE__ */ new Map();
-	for (const route of routes) {
-		const files = routeMap.get(route.routePath) ?? [];
-		files.push(route.file);
-		routeMap.set(route.routePath, files);
+function runVerification(root, options = {}) {
+	const project = readProjectConfig(root);
+	const checks = [];
+	const packageJsonPath = resolve(project.root, "package.json");
+	const configDisplayPath = project.configFile ? displayPath(root, project.configFile) : "vite.config.*";
+	const requestedScope = options.changed ? "changed" : "full";
+	collectConfigChecks(project, checks, configDisplayPath);
+	let changedInfo = {
+		files: [],
+		warning: null
+	};
+	if (options.changed) {
+		changedInfo = collectChangedFiles(project.root);
+		if (changedInfo.warning) checks.push(createCheck("warning", changedInfo.warning));
 	}
-	return [...routeMap.entries()].filter(([, files]) => files.length > 1).map(([path, files]) => ({
-		files,
-		path
-	}));
-}
-function resolveApiRoutePath(apiDir, file) {
-	let relativePath = relative(apiDir, file).replace(/\\/g, "/");
-	relativePath = relativePath.replace(/\.(ts|tsx|js|jsx)$/, "");
-	if (relativePath === "index") relativePath = "";
-	else relativePath = relativePath.replace(/\/index$/, "");
-	relativePath = relativePath.replace(/\[([^\]]+)\]/g, ":$1");
-	return normalizeRoutePath(relativePath ? `/api/${relativePath}` : "/api");
-}
-function toModuleSpecifier(fromDir, filePath) {
-	const relativePath = relative(fromDir, filePath).replace(/\\/g, "/");
-	if (relativePath.startsWith(".")) return relativePath;
-	return `./${relativePath}`;
-}
-function normalizeRoutePath(path) {
-	if (!path || path === "/") return "/";
-	const collapsed = (path.startsWith("/") ? path : `/${path}`).replace(/\/{2,}/g, "/");
-	return collapsed.length > 1 && collapsed.endsWith("/") ? collapsed.slice(0, -1) : collapsed;
-}
-function isWithinDirectory(filePath, directoryPath) {
-	const relativePath = relative(directoryPath, filePath);
-	return relativePath === "" || !relativePath.startsWith("..") && !relativePath.startsWith("../");
-}
-function normalizePath(value) {
-	return value.replace(/\\/g, "/");
-}
-function createCheck(status, message) {
+	const frameworkFiles = options.changed ? filterFrameworkFiles(project, changedInfo.files, packageJsonPath) : [];
+	const scope = options.changed && !changedInfo.warning && !requiresFullVerification(project, frameworkFiles) ? "changed" : "full";
+	if (project.mode === "pages") collectPagesVerification(project, checks, {
+		changedFiles: frameworkFiles,
+		scope
+	});
+	else collectManifestVerification(project, checks, {
+		changedFiles: frameworkFiles,
+		scope
+	});
+	collectApiVerification(project, checks, {
+		changedFiles: frameworkFiles,
+		scope
+	});
+	collectPackageChecks(project, checks, packageJsonPath);
+	if (options.changed && frameworkFiles.length === 0 && !changedInfo.warning) checks.push(createCheck("ok", "No changed framework files were detected in the current project scope."));
 	return {
-		message,
-		status
+		checks,
+		configFile: project.configFile ? displayPath(root, project.configFile) : null,
+		mode: project.mode,
+		ok: !checks.some((check) => check.status === "error"),
+		requestedScope,
+		scope,
+		changedFiles: changedInfo.files.map((file) => displayPath(project.root, file)),
+		frameworkFiles: frameworkFiles.map((file) => displayPath(project.root, file))
 	};
 }
 //#endregion

package/dist/{verify-D7Bg1Su6.mjs → verify-Do8bG-fq.mjs}

@@ -1,4 +1,4 @@
-import { n as runVerification } from "./verification-CId4crSF.mjs";
+import { n as runVerification } from "./verification-WP-KTb41.mjs";
 import { defineCommand } from "citty";
 //#region src/commands/verify.ts
 var verify_default = defineCommand({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pracht/cli",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "license": "MIT",
   "homepage": "https://github.com/JoviDeCroock/pracht/tree/main/packages/cli",
   "bugs": {
@@ -14,13 +14,20 @@
   "bin": {
     "pracht": "./bin/pracht.js"
   },
+  "files": [
+    "bin",
+    "dist",
+    "README.md",
+    "LICENSE",
+    "CHANGELOG.md"
+  ],
   "type": "module",
   "publishConfig": {
     "provenance": true
   },
   "dependencies": {
     "citty": "^0.1.6",
-    "@pracht/core": "0.2.7"
+    "@pracht/core": "0.4.0"
   },
   "scripts": {
     "build": "tsdown"

package/src/build-metadata.ts

@@ -1,101 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import { resolve } from "node:path";
-
-const MANIFEST_PATHS = ["dist/client/.vite/manifest.json", "dist/.vite/manifest.json"];
-const PRACHT_CLIENT_MODULE_QUERY = "pracht-client";
-
-interface ViteManifestEntry {
-  css?: string[];
-  file: string;
-  imports?: string[];
-  src?: string;
-}
-
-export interface ClientBuildAssets {
-  clientEntryUrl: string | null;
-  cssManifest: Record<string, string[]>;
-  jsManifest: Record<string, string[]>;
-}
-
-export function readClientBuildAssets(root: string = process.cwd()): ClientBuildAssets {
-  const manifestPath = MANIFEST_PATHS.map((candidate) => resolve(root, candidate)).find((path) =>
-    existsSync(path),
-  );
-
-  if (!manifestPath) {
-    return {
-      clientEntryUrl: null,
-      cssManifest: {},
-      jsManifest: {},
-    };
-  }
-
-  const rawManifest = readFileSync(manifestPath, "utf-8");
-  const manifest: Record<string, ViteManifestEntry> = JSON.parse(rawManifest);
-  const clientEntry = manifest["virtual:pracht/client"];
-
-  function collectTransitiveDeps(key: string): { css: string[]; js: string[] } {
-    const css = new Set<string>();
-    const js = new Set<string>();
-    const visited = new Set<string>();
-
-    function collect(currentKey: string): void {
-      if (visited.has(currentKey)) return;
-      visited.add(currentKey);
-
-      const entry = manifest[currentKey];
-      if (!entry) return;
-
-      for (const cssFile of entry.css ?? []) {
-        css.add(cssFile);
-      }
-
-      js.add(entry.file);
-
-      for (const importedKey of entry.imports ?? []) {
-        collect(importedKey);
-      }
-    }
-
-    collect(key);
-    return {
-      css: [...css],
-      js: [...js],
-    };
-  }
-
-  const cssManifest: Record<string, string[]> = {};
-  const jsManifest: Record<string, string[]> = {};
-
-  for (const [key, entry] of Object.entries(manifest)) {
-    if (!entry.src) continue;
-
-    const deps = collectTransitiveDeps(key);
-    const manifestKey = stripPrachtClientModuleQuery(entry.src);
-    if (deps.css.length > 0) {
-      cssManifest[manifestKey] = deps.css.map((file) => `/${file}`);
-    }
-    if (deps.js.length > 0) {
-      jsManifest[manifestKey] = deps.js.map((file) => `/${file}`);
-    }
-  }
-
-  return {
-    clientEntryUrl: clientEntry ? `/${clientEntry.file}` : null,
-    cssManifest,
-    jsManifest,
-  };
-}
-
-function stripPrachtClientModuleQuery(id: string): string {
-  const queryStart = id.indexOf("?");
-  if (queryStart === -1) return id;
-
-  const path = id.slice(0, queryStart);
-  const query = id
-    .slice(queryStart + 1)
-    .split("&")
-    .filter((part) => part !== PRACHT_CLIENT_MODULE_QUERY);
-
-  return query.length > 0 ? `${path}?${query.join("&")}` : path;
-}

package/src/build-shared.ts

@@ -1,163 +0,0 @@
-import { cpSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-
-import { VERSION } from "./constants.js";
-
-const ROUTE_STATE_REQUEST_HEADER = "x-pracht-route-state-request";
-
-interface VercelBuildOutputOptions {
-  functionName?: string;
-  headersManifest?: Record<string, Record<string, string>>;
-  isgRoutes: string[];
-  regions?: string[];
-  root: string;
-  staticRoutes: string[];
-}
-
-export function writeVercelBuildOutput({
-  functionName,
-  headersManifest = {},
-  isgRoutes,
-  regions,
-  root,
-  staticRoutes,
-}: VercelBuildOutputOptions): string {
-  const outputDir = join(root, ".vercel/output");
-  const staticDir = join(outputDir, "static");
-  const functionDir = join(outputDir, "functions", `${functionName || "render"}.func`);
-
-  rmSync(outputDir, { force: true, recursive: true });
-  mkdirSync(outputDir, { recursive: true });
-  cpSync(join(root, "dist/client"), staticDir, { recursive: true });
-  cpSync(join(root, "dist/server"), functionDir, { recursive: true });
-
-  writeFileSync(
-    join(outputDir, "config.json"),
-    `${JSON.stringify(
-      createVercelOutputConfig({ functionName, headersManifest, staticRoutes, isgRoutes }),
-      null,
-      2,
-    )}\n`,
-    "utf-8",
-  );
-  writeFileSync(
-    join(functionDir, ".vc-config.json"),
-    `${JSON.stringify(createVercelFunctionConfig({ regions }), null, 2)}\n`,
-    "utf-8",
-  );
-
-  return ".vercel/output";
-}
-
-function createVercelOutputConfig({
-  functionName,
-  headersManifest,
-  staticRoutes,
-  isgRoutes,
-}: {
-  functionName?: string;
-  headersManifest: Record<string, Record<string, string>>;
-  isgRoutes: string[];
-  staticRoutes: string[];
-}): Record<string, unknown> {
-  const target = `/${functionName || "render"}`;
-  const routes: Record<string, unknown>[] = [
-    {
-      dest: target,
-      has: [{ type: "header", key: ROUTE_STATE_REQUEST_HEADER, value: "1" }],
-      src: "/(.*)",
-    },
-  ];
-
-  for (const route of sortStaticRoutes(staticRoutes)) {
-    routes.push({
-      dest: routeToStaticHtmlPath(route),
-      src: routeToRouteExpression(route),
-    });
-  }
-
-  for (const route of isgRoutes) {
-    routes.push({
-      dest: target,
-      src: routeToRouteExpression(route),
-    });
-  }
-
-  routes.push({ handle: "filesystem" });
-  routes.push({ dest: target, src: "/(.*)" });
-
-  const headers: Record<string, unknown>[] = [
-    {
-      headers: [
-        {
-          key: "permissions-policy",
-          value:
-            "accelerometer=(), camera=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), usb=()",
-        },
-        { key: "referrer-policy", value: "strict-origin-when-cross-origin" },
-        { key: "x-content-type-options", value: "nosniff" },
-        { key: "x-frame-options", value: "SAMEORIGIN" },
-      ],
-      source: "/(.*)",
-    },
-  ];
-
-  for (const route of sortStaticRoutes(staticRoutes)) {
-    const routeHeaders = headersManifest[route];
-    if (!routeHeaders) continue;
-    headers.push({
-      headers: Object.entries(routeHeaders).map(([key, value]) => ({ key, value })),
-      source: routeToHeaderSource(route),
-    });
-  }
-
-  return {
-    headers,
-    framework: {
-      version: VERSION,
-    },
-    routes,
-    version: 3,
-  };
-}
-
-function createVercelFunctionConfig({ regions }: { regions?: string[] }): Record<string, unknown> {
-  const config: Record<string, unknown> = {
-    entrypoint: "server.js",
-    runtime: "edge",
-  };
-
-  if (regions) {
-    config.regions = regions;
-  }
-
-  return config;
-}
-
-function sortStaticRoutes(routes: string[]): string[] {
-  return [...new Set(routes)].sort((left, right) => right.length - left.length);
-}
-
-function routeToRouteExpression(route: string): string {
-  if (route === "/") {
-    return "^/$";
-  }
-
-  return `^${escapeRegex(route)}/?$`;
-}
-
-function routeToStaticHtmlPath(route: string): string {
-  if (route === "/") {
-    return "/index.html";
-  }
-
-  return `${route}/index.html`;
-}
-
-function routeToHeaderSource(route: string): string {
-  return route === "/" ? "/" : route;
-}
-
-function escapeRegex(value: string): string {
-  return value.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
-}