@valbuild/cli 0.73.0 → 0.73.2

package/cli/dist/valbuild-cli-cli.cjs.dev.js

@@ -9,6 +9,9 @@ var fastGlob = require('fast-glob');
 var picocolors = require('picocolors');
 var eslint = require('eslint');
 var fs = require('fs/promises');
+var vm = require('node:vm');
+var ts = require('typescript');
+var z = require('zod');
 var fs$1 = require('fs');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -36,23 +39,102 @@ var chalk__default = /*#__PURE__*/_interopDefault(chalk);
 var path__default = /*#__PURE__*/_interopDefault(path);
 var picocolors__default = /*#__PURE__*/_interopDefault(picocolors);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
+var vm__default = /*#__PURE__*/_interopDefault(vm);
+var ts__default = /*#__PURE__*/_interopDefault(ts);
+var z__default = /*#__PURE__*/_interopDefault(z);
 var fs__default$1 = /*#__PURE__*/_interopDefault(fs$1);
 
 function error(message) {
   console.error(chalk__default["default"].red("❌Error: ") + message);
 }
 
+const ValConfigSchema = z__default["default"].object({
+  project: z__default["default"].string().optional(),
+  root: z__default["default"].string().optional(),
+  files: z__default["default"].object({
+    directory: z__default["default"].string().refine(val => val.startsWith("/public/val"), {
+      message: "files.directory must start with '/public/val'"
+    })
+  }).optional(),
+  gitCommit: z__default["default"].string().optional(),
+  gitBranch: z__default["default"].string().optional(),
+  defaultTheme: z__default["default"].union([z__default["default"].literal("light"), z__default["default"].literal("dark")]).optional(),
+  ai: z__default["default"].object({
+    commitMessages: z__default["default"].object({
+      disabled: z__default["default"].boolean().optional()
+    }).optional()
+  }).optional()
+});
+async function evalValConfigFile(projectRoot, configFileName) {
+  const valConfigPath = path__default["default"].join(projectRoot, configFileName);
+  let code = null;
+  try {
+    code = await fs__default["default"].readFile(valConfigPath, "utf-8");
+  } catch (err) {
+    //
+  }
+  if (!code) {
+    return null;
+  }
+  const transpiled = ts__default["default"].transpileModule(code, {
+    compilerOptions: {
+      target: ts__default["default"].ScriptTarget.ES2020,
+      module: ts__default["default"].ModuleKind.CommonJS,
+      esModuleInterop: true
+    },
+    fileName: valConfigPath
+  });
+  const exportsObj = {};
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const sandbox = {
+    exports: exportsObj,
+    module: {
+      exports: exportsObj
+    },
+    require,
+    // NOTE: this is a security risk, but this code is running in the users own environment at the CLI level
+    __filename: valConfigPath,
+    __dirname: path__default["default"].dirname(valConfigPath),
+    console,
+    process
+  };
+  sandbox.global = sandbox;
+  const context = vm__default["default"].createContext(sandbox);
+  const script = new vm__default["default"].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;
+}
+
+function getFileExt(filePath) {
+  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
+  return filePath.split(".").pop() || "";
+}
+
+const textEncoder = new TextEncoder();
 async function validate({
   root,
   fix,
   noEslint
 }) {
   const valRemoteHost = process.env.VAL_REMOTE_HOST || core.DEFAULT_VAL_REMOTE_HOST;
+  const contentHostUrl = process.env.VAL_CONTENT_URL || "https://content.val.build";
   const projectRoot = root ? path__default["default"].resolve(root) : process.cwd();
   const eslint$1 = new eslint.ESLint({
     cwd: projectRoot,
     ignore: false
   });
+  const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
+  console.log(picocolors__default["default"].greenBright(`Validating project${valConfigFile !== null && valConfigFile !== void 0 && valConfigFile.project ? ` '${picocolors__default["default"].inverse(valConfigFile === null || valConfigFile === void 0 ? void 0 : valConfigFile.project)}'` : ""}...`));
   const service = await server.createService(projectRoot, {});
   const checkKeyIsValid = async (key, sourcePath) => {
     const [moduleFilePath, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
@@ -120,7 +202,7 @@ async function validate({
     });
     console.log(errors === 0 ? picocolors__default["default"].green("✔") : picocolors__default["default"].red("✘"), "ESlint complete", lintFiles.length, "files");
   }
-  console.log("Validating...", valFiles.length, "files");
+  console.log(picocolors__default["default"].greenBright(`Found ${valFiles.length} files...`));
   let publicProjectId;
   let didFix = false; // TODO: ugly
   async function validateFile(file) {
@@ -208,7 +290,6 @@ async function validate({
                   if (valModule.source && valModule.schema) {
                     const resolvedRemoteFileAtSourcePath = core.Internal.resolvePath(modulePath, valModule.source, valModule.schema);
                     let filePath = null;
-                    console.log(sourcePath, resolvedRemoteFileAtSourcePath.source);
                     try {
                       var _resolvedRemoteFileAt;
                       filePath = path__default["default"].join(projectRoot, // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -245,8 +326,7 @@ async function validate({
                       console.log(picocolors__default["default"].yellow("⚠"), `Remote file ${filePath} already uploaded`);
                       continue;
                     }
-                    // TODO: parallelize this:
-                    console.log(picocolors__default["default"].yellow("⚠"), `Uploading remote file ${filePath}...`);
+                    // TODO: parallelize uploading files
                     if (!resolvedRemoteFileAtSourcePath.schema) {
                       console.log(picocolors__default["default"].red("✘"), `Cannot upload remote file: schema not found for ${sourcePath}`);
                       errors += 1;
@@ -263,31 +343,7 @@ async function validate({
                     if (!publicProjectId || !remoteFileBuckets) {
                       let projectName = process.env.VAL_PROJECT;
                       if (!projectName) {
-                        try {
-                          var _require;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require = require(`${root}/val.config`)) === null || _require === void 0 || (_require = _require.config) === null || _require === void 0 ? void 0 : _require.project;
-                        } catch {
-                          // ignore
-                        }
-                      }
-                      if (!projectName) {
-                        try {
-                          var _require2;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require2 = require(`${root}/val.config.ts`)) === null || _require2 === void 0 || (_require2 = _require2.config) === null || _require2 === void 0 ? void 0 : _require2.project;
-                        } catch {
-                          // ignore
-                        }
-                      }
-                      if (!projectName) {
-                        try {
-                          var _require3;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require3 = require(`${root}/val.config.js`)) === null || _require3 === void 0 || (_require3 = _require3.config) === null || _require3 === void 0 ? void 0 : _require3.project;
-                        } catch {
-                          // ignore
-                        }
+                        projectName = valConfigFile === null || valConfigFile === void 0 ? void 0 : valConfigFile.project;
                       }
                       if (!projectName) {
                         console.log(picocolors__default["default"].red("✘"), "Project name not found. Set VAL_PROJECT environment variable or add project name to val.config");
@@ -310,6 +366,11 @@ async function validate({
                       errors += 1;
                       continue;
                     }
+                    if (!(valConfigFile !== null && valConfigFile !== void 0 && valConfigFile.project)) {
+                      console.log(picocolors__default["default"].red("✘"), `Could not get project. Check that your val.config has the 'project' field set, or set it using the VAL_PROJECT environment variable`);
+                      errors += 1;
+                      continue;
+                    }
                     if (resolveRemoteFileSchema.type !== "image" && resolveRemoteFileSchema.type !== "file") {
                       console.log(picocolors__default["default"].red("✘"), `The schema is the remote is neither image nor file: ${sourcePath}`);
                     }
@@ -334,17 +395,31 @@ async function validate({
                       errors += 1;
                       continue;
                     }
-                    const remoteFileUpload = await server.uploadRemoteFile(valRemoteHost, fileBuffer, publicProjectId, bucket, relativeFilePath, resolveRemoteFileSchema, fileSourceMetadata, {
+                    const fileHash = core.Internal.remote.getFileHash(fileBuffer);
+                    const coreVersion = core.Internal.VERSION.core || "unknown";
+                    const fileExt = getFileExt(filePath);
+                    const schema = resolveRemoteFileSchema;
+                    const metadata = fileSourceMetadata;
+                    const ref = core.Internal.remote.createRemoteRef(valRemoteHost, {
+                      publicProjectId,
+                      coreVersion,
+                      bucket,
+                      validationHash: core.Internal.remote.getValidationHash(coreVersion, schema, fileExt, metadata, fileHash, textEncoder),
+                      fileHash,
+                      filePath: relativeFilePath
+                    });
+                    console.log(picocolors__default["default"].yellow("⚠"), `Uploading remote file: '${ref}'...`);
+                    const remoteFileUpload = await server.uploadRemoteFile(contentHostUrl, valConfigFile.project, bucket, fileHash, fileExt, fileBuffer, {
                       pat
                     });
                     if (!remoteFileUpload.success) {
-                      console.log(picocolors__default["default"].red("✘"), `Error uploading remote file: ${remoteFileUpload.error}`);
+                      console.log(picocolors__default["default"].red("✘"), `Could not upload remote file: '${ref}'. Error: ${remoteFileUpload.error}`);
                       errors += 1;
                       continue;
                     }
-                    console.log(picocolors__default["default"].yellow("⚠"), `Uploaded remote file ${filePath}`);
+                    console.log(picocolors__default["default"].green("✔"), `Completed upload of remote file: '${ref}'`);
                     remoteFiles[sourcePath] = {
-                      ref: remoteFileUpload.ref,
+                      ref,
                       metadata: fileSourceMetadata
                     };
                   }

package/cli/dist/valbuild-cli-cli.cjs.prod.js

@@ -9,6 +9,9 @@ var fastGlob = require('fast-glob');
 var picocolors = require('picocolors');
 var eslint = require('eslint');
 var fs = require('fs/promises');
+var vm = require('node:vm');
+var ts = require('typescript');
+var z = require('zod');
 var fs$1 = require('fs');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -36,23 +39,102 @@ var chalk__default = /*#__PURE__*/_interopDefault(chalk);
 var path__default = /*#__PURE__*/_interopDefault(path);
 var picocolors__default = /*#__PURE__*/_interopDefault(picocolors);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
+var vm__default = /*#__PURE__*/_interopDefault(vm);
+var ts__default = /*#__PURE__*/_interopDefault(ts);
+var z__default = /*#__PURE__*/_interopDefault(z);
 var fs__default$1 = /*#__PURE__*/_interopDefault(fs$1);
 
 function error(message) {
   console.error(chalk__default["default"].red("❌Error: ") + message);
 }
 
+const ValConfigSchema = z__default["default"].object({
+  project: z__default["default"].string().optional(),
+  root: z__default["default"].string().optional(),
+  files: z__default["default"].object({
+    directory: z__default["default"].string().refine(val => val.startsWith("/public/val"), {
+      message: "files.directory must start with '/public/val'"
+    })
+  }).optional(),
+  gitCommit: z__default["default"].string().optional(),
+  gitBranch: z__default["default"].string().optional(),
+  defaultTheme: z__default["default"].union([z__default["default"].literal("light"), z__default["default"].literal("dark")]).optional(),
+  ai: z__default["default"].object({
+    commitMessages: z__default["default"].object({
+      disabled: z__default["default"].boolean().optional()
+    }).optional()
+  }).optional()
+});
+async function evalValConfigFile(projectRoot, configFileName) {
+  const valConfigPath = path__default["default"].join(projectRoot, configFileName);
+  let code = null;
+  try {
+    code = await fs__default["default"].readFile(valConfigPath, "utf-8");
+  } catch (err) {
+    //
+  }
+  if (!code) {
+    return null;
+  }
+  const transpiled = ts__default["default"].transpileModule(code, {
+    compilerOptions: {
+      target: ts__default["default"].ScriptTarget.ES2020,
+      module: ts__default["default"].ModuleKind.CommonJS,
+      esModuleInterop: true
+    },
+    fileName: valConfigPath
+  });
+  const exportsObj = {};
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const sandbox = {
+    exports: exportsObj,
+    module: {
+      exports: exportsObj
+    },
+    require,
+    // NOTE: this is a security risk, but this code is running in the users own environment at the CLI level
+    __filename: valConfigPath,
+    __dirname: path__default["default"].dirname(valConfigPath),
+    console,
+    process
+  };
+  sandbox.global = sandbox;
+  const context = vm__default["default"].createContext(sandbox);
+  const script = new vm__default["default"].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;
+}
+
+function getFileExt(filePath) {
+  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
+  return filePath.split(".").pop() || "";
+}
+
+const textEncoder = new TextEncoder();
 async function validate({
   root,
   fix,
   noEslint
 }) {
   const valRemoteHost = process.env.VAL_REMOTE_HOST || core.DEFAULT_VAL_REMOTE_HOST;
+  const contentHostUrl = process.env.VAL_CONTENT_URL || "https://content.val.build";
   const projectRoot = root ? path__default["default"].resolve(root) : process.cwd();
   const eslint$1 = new eslint.ESLint({
     cwd: projectRoot,
     ignore: false
   });
+  const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
+  console.log(picocolors__default["default"].greenBright(`Validating project${valConfigFile !== null && valConfigFile !== void 0 && valConfigFile.project ? ` '${picocolors__default["default"].inverse(valConfigFile === null || valConfigFile === void 0 ? void 0 : valConfigFile.project)}'` : ""}...`));
   const service = await server.createService(projectRoot, {});
   const checkKeyIsValid = async (key, sourcePath) => {
     const [moduleFilePath, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
@@ -120,7 +202,7 @@ async function validate({
     });
     console.log(errors === 0 ? picocolors__default["default"].green("✔") : picocolors__default["default"].red("✘"), "ESlint complete", lintFiles.length, "files");
   }
-  console.log("Validating...", valFiles.length, "files");
+  console.log(picocolors__default["default"].greenBright(`Found ${valFiles.length} files...`));
   let publicProjectId;
   let didFix = false; // TODO: ugly
   async function validateFile(file) {
@@ -208,7 +290,6 @@ async function validate({
                   if (valModule.source && valModule.schema) {
                     const resolvedRemoteFileAtSourcePath = core.Internal.resolvePath(modulePath, valModule.source, valModule.schema);
                     let filePath = null;
-                    console.log(sourcePath, resolvedRemoteFileAtSourcePath.source);
                     try {
                       var _resolvedRemoteFileAt;
                       filePath = path__default["default"].join(projectRoot, // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -245,8 +326,7 @@ async function validate({
                       console.log(picocolors__default["default"].yellow("⚠"), `Remote file ${filePath} already uploaded`);
                       continue;
                     }
-                    // TODO: parallelize this:
-                    console.log(picocolors__default["default"].yellow("⚠"), `Uploading remote file ${filePath}...`);
+                    // TODO: parallelize uploading files
                     if (!resolvedRemoteFileAtSourcePath.schema) {
                       console.log(picocolors__default["default"].red("✘"), `Cannot upload remote file: schema not found for ${sourcePath}`);
                       errors += 1;
@@ -263,31 +343,7 @@ async function validate({
                     if (!publicProjectId || !remoteFileBuckets) {
                       let projectName = process.env.VAL_PROJECT;
                       if (!projectName) {
-                        try {
-                          var _require;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require = require(`${root}/val.config`)) === null || _require === void 0 || (_require = _require.config) === null || _require === void 0 ? void 0 : _require.project;
-                        } catch {
-                          // ignore
-                        }
-                      }
-                      if (!projectName) {
-                        try {
-                          var _require2;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require2 = require(`${root}/val.config.ts`)) === null || _require2 === void 0 || (_require2 = _require2.config) === null || _require2 === void 0 ? void 0 : _require2.project;
-                        } catch {
-                          // ignore
-                        }
-                      }
-                      if (!projectName) {
-                        try {
-                          var _require3;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require3 = require(`${root}/val.config.js`)) === null || _require3 === void 0 || (_require3 = _require3.config) === null || _require3 === void 0 ? void 0 : _require3.project;
-                        } catch {
-                          // ignore
-                        }
+                        projectName = valConfigFile === null || valConfigFile === void 0 ? void 0 : valConfigFile.project;
                       }
                       if (!projectName) {
                         console.log(picocolors__default["default"].red("✘"), "Project name not found. Set VAL_PROJECT environment variable or add project name to val.config");
@@ -310,6 +366,11 @@ async function validate({
                       errors += 1;
                       continue;
                     }
+                    if (!(valConfigFile !== null && valConfigFile !== void 0 && valConfigFile.project)) {
+                      console.log(picocolors__default["default"].red("✘"), `Could not get project. Check that your val.config has the 'project' field set, or set it using the VAL_PROJECT environment variable`);
+                      errors += 1;
+                      continue;
+                    }
                     if (resolveRemoteFileSchema.type !== "image" && resolveRemoteFileSchema.type !== "file") {
                       console.log(picocolors__default["default"].red("✘"), `The schema is the remote is neither image nor file: ${sourcePath}`);
                     }
@@ -334,17 +395,31 @@ async function validate({
                       errors += 1;
                       continue;
                     }
-                    const remoteFileUpload = await server.uploadRemoteFile(valRemoteHost, fileBuffer, publicProjectId, bucket, relativeFilePath, resolveRemoteFileSchema, fileSourceMetadata, {
+                    const fileHash = core.Internal.remote.getFileHash(fileBuffer);
+                    const coreVersion = core.Internal.VERSION.core || "unknown";
+                    const fileExt = getFileExt(filePath);
+                    const schema = resolveRemoteFileSchema;
+                    const metadata = fileSourceMetadata;
+                    const ref = core.Internal.remote.createRemoteRef(valRemoteHost, {
+                      publicProjectId,
+                      coreVersion,
+                      bucket,
+                      validationHash: core.Internal.remote.getValidationHash(coreVersion, schema, fileExt, metadata, fileHash, textEncoder),
+                      fileHash,
+                      filePath: relativeFilePath
+                    });
+                    console.log(picocolors__default["default"].yellow("⚠"), `Uploading remote file: '${ref}'...`);
+                    const remoteFileUpload = await server.uploadRemoteFile(contentHostUrl, valConfigFile.project, bucket, fileHash, fileExt, fileBuffer, {
                       pat
                     });
                     if (!remoteFileUpload.success) {
-                      console.log(picocolors__default["default"].red("✘"), `Error uploading remote file: ${remoteFileUpload.error}`);
+                      console.log(picocolors__default["default"].red("✘"), `Could not upload remote file: '${ref}'. Error: ${remoteFileUpload.error}`);
                       errors += 1;
                       continue;
                     }
-                    console.log(picocolors__default["default"].yellow("⚠"), `Uploaded remote file ${filePath}`);
+                    console.log(picocolors__default["default"].green("✔"), `Completed upload of remote file: '${ref}'`);
                     remoteFiles[sourcePath] = {
-                      ref: remoteFileUpload.ref,
+                      ref,
                       metadata: fileSourceMetadata
                     };
                   }

package/cli/dist/valbuild-cli-cli.esm.js

@@ -7,23 +7,102 @@ import { glob } from 'fast-glob';
 import picocolors from 'picocolors';
 import { ESLint } from 'eslint';
 import fs from 'fs/promises';
+import vm from 'node:vm';
+import ts from 'typescript';
+import z from 'zod';
 import fs$1 from 'fs';
 
 function error(message) {
   console.error(chalk.red("❌Error: ") + message);
 }
 
+const ValConfigSchema = z.object({
+  project: z.string().optional(),
+  root: z.string().optional(),
+  files: z.object({
+    directory: z.string().refine(val => val.startsWith("/public/val"), {
+      message: "files.directory must start with '/public/val'"
+    })
+  }).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()
+});
+async function evalValConfigFile(projectRoot, configFileName) {
+  const valConfigPath = path.join(projectRoot, configFileName);
+  let code = null;
+  try {
+    code = await fs.readFile(valConfigPath, "utf-8");
+  } catch (err) {
+    //
+  }
+  if (!code) {
+    return null;
+  }
+  const transpiled = ts.transpileModule(code, {
+    compilerOptions: {
+      target: ts.ScriptTarget.ES2020,
+      module: ts.ModuleKind.CommonJS,
+      esModuleInterop: true
+    },
+    fileName: valConfigPath
+  });
+  const exportsObj = {};
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const sandbox = {
+    exports: exportsObj,
+    module: {
+      exports: exportsObj
+    },
+    require,
+    // NOTE: this is a security risk, but this code is running in the users own environment at the CLI level
+    __filename: valConfigPath,
+    __dirname: path.dirname(valConfigPath),
+    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;
+}
+
+function getFileExt(filePath) {
+  // NOTE: We do not import the path module. This code is copied in different projects. We want the same implementation and which means that this might running in browser where path is not available).
+  return filePath.split(".").pop() || "";
+}
+
+const textEncoder = new TextEncoder();
 async function validate({
   root,
   fix,
   noEslint
 }) {
   const valRemoteHost = process.env.VAL_REMOTE_HOST || DEFAULT_VAL_REMOTE_HOST;
+  const contentHostUrl = process.env.VAL_CONTENT_URL || "https://content.val.build";
   const projectRoot = root ? path.resolve(root) : process.cwd();
   const eslint = new ESLint({
     cwd: projectRoot,
     ignore: false
   });
+  const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
+  console.log(picocolors.greenBright(`Validating project${valConfigFile !== null && valConfigFile !== void 0 && valConfigFile.project ? ` '${picocolors.inverse(valConfigFile === null || valConfigFile === void 0 ? void 0 : valConfigFile.project)}'` : ""}...`));
   const service = await createService(projectRoot, {});
   const checkKeyIsValid = async (key, sourcePath) => {
     const [moduleFilePath, modulePath] = Internal.splitModuleFilePathAndModulePath(sourcePath);
@@ -91,7 +170,7 @@ async function validate({
     });
     console.log(errors === 0 ? picocolors.green("✔") : picocolors.red("✘"), "ESlint complete", lintFiles.length, "files");
   }
-  console.log("Validating...", valFiles.length, "files");
+  console.log(picocolors.greenBright(`Found ${valFiles.length} files...`));
   let publicProjectId;
   let didFix = false; // TODO: ugly
   async function validateFile(file) {
@@ -179,7 +258,6 @@ async function validate({
                   if (valModule.source && valModule.schema) {
                     const resolvedRemoteFileAtSourcePath = Internal.resolvePath(modulePath, valModule.source, valModule.schema);
                     let filePath = null;
-                    console.log(sourcePath, resolvedRemoteFileAtSourcePath.source);
                     try {
                       var _resolvedRemoteFileAt;
                       filePath = path.join(projectRoot, // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -216,8 +294,7 @@ async function validate({
                       console.log(picocolors.yellow("⚠"), `Remote file ${filePath} already uploaded`);
                       continue;
                     }
-                    // TODO: parallelize this:
-                    console.log(picocolors.yellow("⚠"), `Uploading remote file ${filePath}...`);
+                    // TODO: parallelize uploading files
                     if (!resolvedRemoteFileAtSourcePath.schema) {
                       console.log(picocolors.red("✘"), `Cannot upload remote file: schema not found for ${sourcePath}`);
                       errors += 1;
@@ -234,31 +311,7 @@ async function validate({
                     if (!publicProjectId || !remoteFileBuckets) {
                       let projectName = process.env.VAL_PROJECT;
                       if (!projectName) {
-                        try {
-                          var _require;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require = require(`${root}/val.config`)) === null || _require === void 0 || (_require = _require.config) === null || _require === void 0 ? void 0 : _require.project;
-                        } catch {
-                          // ignore
-                        }
-                      }
-                      if (!projectName) {
-                        try {
-                          var _require2;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require2 = require(`${root}/val.config.ts`)) === null || _require2 === void 0 || (_require2 = _require2.config) === null || _require2 === void 0 ? void 0 : _require2.project;
-                        } catch {
-                          // ignore
-                        }
-                      }
-                      if (!projectName) {
-                        try {
-                          var _require3;
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = (_require3 = require(`${root}/val.config.js`)) === null || _require3 === void 0 || (_require3 = _require3.config) === null || _require3 === void 0 ? void 0 : _require3.project;
-                        } catch {
-                          // ignore
-                        }
+                        projectName = valConfigFile === null || valConfigFile === void 0 ? void 0 : valConfigFile.project;
                       }
                       if (!projectName) {
                         console.log(picocolors.red("✘"), "Project name not found. Set VAL_PROJECT environment variable or add project name to val.config");
@@ -281,6 +334,11 @@ async function validate({
                       errors += 1;
                       continue;
                     }
+                    if (!(valConfigFile !== null && valConfigFile !== void 0 && valConfigFile.project)) {
+                      console.log(picocolors.red("✘"), `Could not get project. Check that your val.config has the 'project' field set, or set it using the VAL_PROJECT environment variable`);
+                      errors += 1;
+                      continue;
+                    }
                     if (resolveRemoteFileSchema.type !== "image" && resolveRemoteFileSchema.type !== "file") {
                       console.log(picocolors.red("✘"), `The schema is the remote is neither image nor file: ${sourcePath}`);
                     }
@@ -305,17 +363,31 @@ async function validate({
                       errors += 1;
                       continue;
                     }
-                    const remoteFileUpload = await uploadRemoteFile(valRemoteHost, fileBuffer, publicProjectId, bucket, relativeFilePath, resolveRemoteFileSchema, fileSourceMetadata, {
+                    const fileHash = Internal.remote.getFileHash(fileBuffer);
+                    const coreVersion = Internal.VERSION.core || "unknown";
+                    const fileExt = getFileExt(filePath);
+                    const schema = resolveRemoteFileSchema;
+                    const metadata = fileSourceMetadata;
+                    const ref = Internal.remote.createRemoteRef(valRemoteHost, {
+                      publicProjectId,
+                      coreVersion,
+                      bucket,
+                      validationHash: Internal.remote.getValidationHash(coreVersion, schema, fileExt, metadata, fileHash, textEncoder),
+                      fileHash,
+                      filePath: relativeFilePath
+                    });
+                    console.log(picocolors.yellow("⚠"), `Uploading remote file: '${ref}'...`);
+                    const remoteFileUpload = await uploadRemoteFile(contentHostUrl, valConfigFile.project, bucket, fileHash, fileExt, fileBuffer, {
                       pat
                     });
                     if (!remoteFileUpload.success) {
-                      console.log(picocolors.red("✘"), `Error uploading remote file: ${remoteFileUpload.error}`);
+                      console.log(picocolors.red("✘"), `Could not upload remote file: '${ref}'. Error: ${remoteFileUpload.error}`);
                       errors += 1;
                       continue;
                     }
-                    console.log(picocolors.yellow("⚠"), `Uploaded remote file ${filePath}`);
+                    console.log(picocolors.green("✔"), `Completed upload of remote file: '${ref}'`);
                     remoteFiles[sourcePath] = {
-                      ref: remoteFileUpload.ref,
+                      ref,
                       metadata: fileSourceMetadata
                     };
                   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@valbuild/cli",
   "private": false,
-  "version": "0.73.0",
+  "version": "0.73.2",
   "description": "Val CLI tools",
   "bin": {
     "val": "./bin.js"
@@ -18,9 +18,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@valbuild/core": "~0.73.0",
-    "@valbuild/server": "~0.73.0",
-    "@valbuild/eslint-plugin": "~0.73.0",
+    "@valbuild/core": "~0.73.2",
+    "@valbuild/server": "~0.73.2",
+    "@valbuild/eslint-plugin": "~0.73.2",
     "eslint": "^8.31.0",
     "@inquirer/confirm": "^2.0.15",
     "@inquirer/prompts": "^3.0.2",
@@ -34,7 +34,8 @@
     "zod": "^3.22.4"
   },
   "peerDependencies": {
-    "prettier": "*"
+    "prettier": "*",
+    "typescript": ">=5.0.0"
   },
   "preconstruct": {
     "entrypoints": [

package/src/utils/evalValConfigFile.ts

@@ -0,0 +1,90 @@
+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";
+
+const ValConfigSchema = z.object({
+  project: z.string().optional(),
+  root: z.string().optional(),
+  files: z
+    .object({
+      directory: z
+        .string()
+        .refine((val): val is `/public/val` => val.startsWith("/public/val"), {
+          message: "files.directory must start with '/public/val'",
+        }),
+    })
+    .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 (err) {
+    //
+  }
+  if (!code) {
+    return null;
+  }
+
+  const transpiled = ts.transpileModule(code, {
+    compilerOptions: {
+      target: ts.ScriptTarget.ES2020,
+      module: ts.ModuleKind.CommonJS,
+      esModuleInterop: true,
+    },
+    fileName: valConfigPath,
+  });
+
+  const exportsObj = {};
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const sandbox: Record<string, any> = {
+    exports: exportsObj,
+    module: { exports: exportsObj },
+    require, // NOTE: this is a security risk, but this code is running in the users own environment at the CLI level
+    __filename: valConfigPath,
+    __dirname: path.dirname(valConfigPath),
+    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;
+}

package/src/validate.ts

@@ -22,7 +22,10 @@ import { glob } from "fast-glob";
 import picocolors from "picocolors";
 import { ESLint } from "eslint";
 import fs from "fs/promises";
+import { evalValConfigFile } from "./utils/evalValConfigFile";
+import { getFileExt } from "./utils/getFileExt";
 
+const textEncoder = new TextEncoder();
 export async function validate({
   root,
   fix,
@@ -33,11 +36,21 @@ export async function validate({
   noEslint?: boolean;
 }) {
   const valRemoteHost = process.env.VAL_REMOTE_HOST || DEFAULT_VAL_REMOTE_HOST;
+  const contentHostUrl =
+    process.env.VAL_CONTENT_URL || "https://content.val.build";
   const projectRoot = root ? path.resolve(root) : process.cwd();
   const eslint = new ESLint({
     cwd: projectRoot,
     ignore: false,
   });
+  const valConfigFile =
+    (await evalValConfigFile(projectRoot, "val.config.ts")) ||
+    (await evalValConfigFile(projectRoot, "val.config.js"));
+  console.log(
+    picocolors.greenBright(
+      `Validating project${valConfigFile?.project ? ` '${picocolors.inverse(valConfigFile?.project)}'` : ""}...`,
+    ),
+  );
   const service = await createService(projectRoot, {});
   const checkKeyIsValid = async (
     key: string,
@@ -130,8 +143,7 @@ export async function validate({
       "files",
     );
   }
-  console.log("Validating...", valFiles.length, "files");
-
+  console.log(picocolors.greenBright(`Found ${valFiles.length} files...`));
   let publicProjectId: string | undefined;
   let didFix = false; // TODO: ugly
   async function validateFile(file: string): Promise<number> {
@@ -287,10 +299,6 @@ export async function validate({
                       valModule.schema,
                     );
                     let filePath: string | null = null;
-                    console.log(
-                      sourcePath,
-                      resolvedRemoteFileAtSourcePath.source,
-                    );
                     try {
                       filePath = path.join(
                         projectRoot,
@@ -348,12 +356,7 @@ export async function validate({
                       );
                       continue;
                     }
-                    // TODO: parallelize this:
-                    console.log(
-                      picocolors.yellow("⚠"),
-                      `Uploading remote file ${filePath}...`,
-                    );
-
+                    // TODO: parallelize uploading files
                     if (!resolvedRemoteFileAtSourcePath.schema) {
                       console.log(
                         picocolors.red("✘"),
@@ -383,31 +386,7 @@ export async function validate({
                     if (!publicProjectId || !remoteFileBuckets) {
                       let projectName = process.env.VAL_PROJECT;
                       if (!projectName) {
-                        try {
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = require(`${root}/val.config`)?.config
-                            ?.project;
-                        } catch {
-                          // ignore
-                        }
-                      }
-                      if (!projectName) {
-                        try {
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = require(`${root}/val.config.ts`)?.config
-                            ?.project;
-                        } catch {
-                          // ignore
-                        }
-                      }
-                      if (!projectName) {
-                        try {
-                          // eslint-disable-next-line @typescript-eslint/no-var-requires
-                          projectName = require(`${root}/val.config.js`)?.config
-                            ?.project;
-                        } catch {
-                          // ignore
-                        }
+                        projectName = valConfigFile?.project;
                       }
                       if (!projectName) {
                         console.log(
@@ -440,6 +419,14 @@ export async function validate({
                       errors += 1;
                       continue;
                     }
+                    if (!valConfigFile?.project) {
+                      console.log(
+                        picocolors.red("✘"),
+                        `Could not get project. Check that your val.config has the 'project' field set, or set it using the VAL_PROJECT environment variable`,
+                      );
+                      errors += 1;
+                      continue;
+                    }
                     if (
                       resolveRemoteFileSchema.type !== "image" &&
                       resolveRemoteFileSchema.type !== "file"
@@ -485,32 +472,57 @@ export async function validate({
                       errors += 1;
                       continue;
                     }
-                    const remoteFileUpload = await uploadRemoteFile(
-                      valRemoteHost,
-                      fileBuffer,
+
+                    const fileHash = Internal.remote.getFileHash(fileBuffer);
+                    const coreVersion = Internal.VERSION.core || "unknown";
+                    const fileExt = getFileExt(filePath);
+                    const schema = resolveRemoteFileSchema as
+                      | SerializedImageSchema
+                      | SerializedFileSchema;
+                    const metadata = fileSourceMetadata;
+                    const ref = Internal.remote.createRemoteRef(valRemoteHost, {
                       publicProjectId,
+                      coreVersion,
                       bucket,
-                      relativeFilePath,
-                      resolveRemoteFileSchema as
-                        | SerializedFileSchema
-                        | SerializedImageSchema,
-                      fileSourceMetadata,
+                      validationHash: Internal.remote.getValidationHash(
+                        coreVersion,
+                        schema,
+                        fileExt,
+                        metadata,
+                        fileHash,
+                        textEncoder,
+                      ),
+                      fileHash,
+                      filePath: relativeFilePath,
+                    });
+                    console.log(
+                      picocolors.yellow("⚠"),
+                      `Uploading remote file: '${ref}'...`,
+                    );
+
+                    const remoteFileUpload = await uploadRemoteFile(
+                      contentHostUrl,
+                      valConfigFile.project,
+                      bucket,
+                      fileHash,
+                      fileExt,
+                      fileBuffer,
                       { pat },
                     );
                     if (!remoteFileUpload.success) {
                       console.log(
                         picocolors.red("✘"),
-                        `Error uploading remote file: ${remoteFileUpload.error}`,
+                        `Could not upload remote file: '${ref}'. Error: ${remoteFileUpload.error}`,
                       );
                       errors += 1;
                       continue;
                     }
                     console.log(
-                      picocolors.yellow("⚠"),
-                      `Uploaded remote file ${filePath}`,
+                      picocolors.green("✔"),
+                      `Completed upload of remote file: '${ref}'`,
                     );
                     remoteFiles[sourcePath as SourcePath] = {
-                      ref: remoteFileUpload.ref,
+                      ref,
                       metadata: fileSourceMetadata,
                     };
                   }