@valbuild/cli 0.97.7 → 0.98.0

package/src/lsp.ts

@@ -0,0 +1,19 @@
+/**
+ * Start the Val language server.
+ *
+ * Editors normally resolve `@valbuild/language-server` from the project's
+ * `node_modules` and launch its `val-language-server` binary directly. This
+ * subcommand exists so the server is discoverable from the CLI and easy to
+ * start by hand when debugging an editor integration:
+ *
+ *     npx val lsp --stdio
+ *
+ * The import is dynamic so that `vscode-languageserver` is not loaded on every
+ * `val` invocation.
+ */
+export async function lsp(): Promise<void> {
+  const { main } = await import("@valbuild/language-server");
+  // Transport (`--stdio`, `--node-ipc`, `--socket=`) is read from argv by the
+  // server itself, so the flags pass straight through.
+  main();
+}

package/src/utils/evalValConfigFile.ts

@@ -1,100 +1,6 @@
-import path from "path";
-import fs from "fs/promises";
-import vm from "node:vm";
-import ts from "typescript"; // TODO: make this dependency optional (only required if the file is val.config.ts not val.config.js)
-import z from "zod";
-import { ValConfig } from "@valbuild/core";
-import { createRequire } from "node:module";
-
-const ValConfigSchema = z.object({
-  project: z.string().optional(),
-  root: z.string().optional(),
-  files: z
-    .object({
-      directory: z.string().refine(
-        (val): val is `/public` | `/public/${string}` =>
-          (val === "/public" ||
-            (val.startsWith("/public/") && !val.endsWith("/"))) &&
-          // Reject path traversal so the directory cannot escape /public
-          !val
-            .split("/")
-            .some((segment) => segment === "." || segment === ".."),
-        {
-          message:
-            "files.directory must start with '/public', must not end with '/' and must not contain '.' or '..' segments",
-        },
-      ),
-    })
-    .optional(),
-  gitCommit: z.string().optional(),
-  gitBranch: z.string().optional(),
-  defaultTheme: z.union([z.literal("light"), z.literal("dark")]).optional(),
-  ai: z
-    .object({
-      commitMessages: z
-        .object({
-          disabled: z.boolean().optional(),
-        })
-        .optional(),
-    })
-    .optional(),
-});
-
-export async function evalValConfigFile(
-  projectRoot: string,
-  configFileName: string,
-): Promise<ValConfig | null> {
-  const valConfigPath = path.join(projectRoot, configFileName);
-
-  let code: string | null = null;
-  try {
-    code = await fs.readFile(valConfigPath, "utf-8");
-  } catch {
-    //
-  }
-  if (!code) {
-    return null;
-  }
-
-  const transpiled = ts.transpileModule(code, {
-    compilerOptions: {
-      target: ts.ScriptTarget.ES2020,
-      module: ts.ModuleKind.CommonJS,
-      esModuleInterop: true,
-    },
-    fileName: valConfigPath,
-  });
-
-  const projectRootRequire = createRequire(valConfigPath);
-  const exportsObj = {};
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const sandbox: Record<string, any> = {
-    exports: exportsObj,
-    module: { exports: exportsObj },
-    require: projectRootRequire, // NOTE: this is a security risk, but this code is running in the users own environment at the CLI level
-    __filename: valConfigPath,
-    __dirname: projectRoot,
-    console,
-    process,
-  };
-  sandbox.global = sandbox;
-
-  const context = vm.createContext(sandbox);
-  const script = new vm.Script(transpiled.outputText, {
-    filename: valConfigPath,
-  });
-  script.runInContext(context);
-  const valConfig = sandbox.module.exports.config;
-  if (!valConfig) {
-    throw Error(
-      `Val config file at path: '${valConfigPath}' must export a config object. Got: ${valConfig}`,
-    );
-  }
-  const result = ValConfigSchema.safeParse(valConfig);
-  if (!result.success) {
-    throw Error(
-      `Val config file at path: '${valConfigPath}' has invalid schema: ${result.error.message}`,
-    );
-  }
-  return result.data;
-}
+/**
+ * Moved to `@valbuild/server` so that the CLI and
+ * `@valbuild/language-server` resolve project config through the same code.
+ * Re-exported here to keep existing CLI imports working.
+ */
+export { evalValConfigFile, findAndEvalValConfigFile } from "@valbuild/server";

package/src/validate.ts

@@ -4,7 +4,7 @@ import fs from "fs/promises";
 import { glob } from "fast-glob";
 import { DEFAULT_CONTENT_HOST, DEFAULT_VAL_REMOTE_HOST } from "@valbuild/core";
 import { getSettings, uploadRemoteFile } from "@valbuild/server";
-import { evalValConfigFile } from "./utils/evalValConfigFile";
+import { findAndEvalValConfigFile } from "./utils/evalValConfigFile";
 import { createDefaultValFSHost, runValidation } from "./runValidation";
 import {
   sourcePathToCodeFrame,
@@ -49,9 +49,7 @@ export async function validate({
   // errors found. Re-reads config and val files each call so it always reflects
   // the latest state on disk (used both for one-shot and watch mode).
   async function runOnce(): Promise<number> {
-    const valConfigFile =
-      (await evalValConfigFile(projectRoot, "val.config.ts")) ||
-      (await evalValConfigFile(projectRoot, "val.config.js"));
+    const valConfigFile = await findAndEvalValConfigFile(projectRoot);
 
     const resolvedValConfigFile = valConfigFile
       ? {