@valbuild/cli 0.73.1 → 0.74.0

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

@@ -115,12 +115,19 @@ async function evalValConfigFile(projectRoot, configFileName) {
   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,
@@ -319,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;
@@ -360,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}`);
                     }
@@ -384,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

@@ -115,12 +115,19 @@ async function evalValConfigFile(projectRoot, configFileName) {
   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,
@@ -319,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;
@@ -360,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}`);
                     }
@@ -384,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

@@ -83,12 +83,19 @@ async function evalValConfigFile(projectRoot, configFileName) {
   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,
@@ -287,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;
@@ -328,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}`);
                     }
@@ -352,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.1",
+  "version": "0.74.0",
   "description": "Val CLI tools",
   "bin": {
     "val": "./bin.js"
@@ -18,9 +18,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@valbuild/core": "~0.73.1",
-    "@valbuild/server": "~0.73.1",
-    "@valbuild/eslint-plugin": "~0.73.1",
+    "@valbuild/core": "~0.74.0",
+    "@valbuild/server": "~0.74.0",
+    "@valbuild/eslint-plugin": "~0.74.0",
     "eslint": "^8.31.0",
     "@inquirer/confirm": "^2.0.15",
     "@inquirer/prompts": "^3.0.2",

package/src/validate.ts

@@ -23,7 +23,9 @@ 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,
@@ -34,6 +36,8 @@ 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,
@@ -352,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("✘"),
@@ -420,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"
@@ -465,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,
+                      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,
-                      relativeFilePath,
-                      resolveRemoteFileSchema as
-                        | SerializedFileSchema
-                        | SerializedImageSchema,
-                      fileSourceMetadata,
+                      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,
                     };
                   }