@valbuild/cli 0.85.1 → 0.86.1

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

@@ -486,19 +486,18 @@ function findSimilar(key, targets) {
   })).sort((a, b) => a.distance - b.distance);
 }
 
-async function files({
-  root,
-  managedDir
+async function listUnusedFiles({
+  root
 }) {
-  const printFilesUsedByVal = !managedDir;
+  const managedDir = "public/val";
   const projectRoot = root ? path__default["default"].resolve(root) : process.cwd();
   const service = await server.createService(projectRoot, {});
   const valFiles = await fastGlob.glob("**/*.val.{js,ts}", {
     ignore: ["node_modules/**"],
     cwd: projectRoot
   });
-  const absoluteFilesPathUsedByVal = [];
-  async function printOrGetFileRefs(file) {
+  const filesUsedByVal = [];
+  async function pushFilesUsedByVal(file) {
     const moduleId = `/${file}`; // TODO: check if this always works? (Windows?)
     const valModule = await service.get(moduleId, "", {
       validate: true,
@@ -515,11 +514,7 @@ async function files({
             const value = error.value;
             if (isFileRef(value)) {
               const absoluteFilePathUsedByVal = path__default["default"].join(projectRoot, ...value[core.FILE_REF_PROP].split("/"));
-              if (printFilesUsedByVal) {
-                console.log(absoluteFilePathUsedByVal);
-              } else {
-                absoluteFilesPathUsedByVal.push(absoluteFilePathUsedByVal);
-              }
+              filesUsedByVal.push(absoluteFilePathUsedByVal);
             }
           }
         }
@@ -527,19 +522,17 @@ async function files({
     }
   }
   for (const file of valFiles) {
-    await printOrGetFileRefs(file);
+    await pushFilesUsedByVal(file);
   }
-  if (managedDir) {
-    const managedRoot = path__default["default"].isAbsolute(managedDir) ? managedDir : path__default["default"].join(projectRoot, managedDir);
-    const allFilesInManagedDir = await fastGlob.glob("**/*", {
-      ignore: ["node_modules/**"],
-      cwd: managedRoot
-    });
-    for (const file of allFilesInManagedDir) {
-      const absoluteFilePath = path__default["default"].join(managedRoot, file);
-      if (!absoluteFilesPathUsedByVal.includes(absoluteFilePath)) {
-        console.log(path__default["default"].join(managedRoot, file));
-      }
+  const managedRoot = path__default["default"].join(projectRoot, managedDir);
+  const allFilesInManagedDir = await fastGlob.glob("**/*", {
+    ignore: ["node_modules/**"],
+    cwd: managedRoot
+  });
+  for (const file of allFilesInManagedDir) {
+    const absoluteFilePath = path__default["default"].join(managedRoot, file);
+    if (!filesUsedByVal.includes(absoluteFilePath)) {
+      console.log(path__default["default"].join(managedRoot, file));
     }
   }
   service.dispose();
@@ -581,7 +574,94 @@ const getVersions = () => {
   };
 };
 
-const host = process.env.VAL_BUILD_URL || "https://app.val.build";
+const host$1 = process.env.VAL_BUILD_URL || "https://admin.val.build";
+async function connect(options) {
+  const {
+    root
+  } = options;
+  const projectRoot = root ? path__default["default"].resolve(root) : process.cwd();
+  const maybeProject = await tryGetProject(projectRoot);
+  const maybeGitRemote = await tryGetGitRemote(projectRoot);
+  const maybeGitOwnerAndRepo = maybeGitRemote !== null ? getGitHubOwnerAndRepo(maybeGitRemote) : null;
+  const params = new URLSearchParams();
+  params.set("step", "create-project");
+  if (maybeProject) {
+    params.set("org", maybeProject.orgName);
+    params.set("project", maybeProject.projectName);
+  }
+  if (maybeGitOwnerAndRepo) {
+    params.set("github_repo", [maybeGitOwnerAndRepo.owner, maybeGitOwnerAndRepo.repo].join("/"));
+  }
+  const url = `${host$1}/connect?${params.toString()}`;
+  console.log(picocolors__default["default"].dim(`\nFollow the instructions in your browser to complete the setup:\n${picocolors__default["default"].cyan(url)}\n`));
+}
+async function tryGetProject(projectRoot) {
+  const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
+  if (valConfigFile && valConfigFile.project) {
+    const parts = valConfigFile.project.split("/");
+    if (parts.length === 2) {
+      return {
+        orgName: parts[0],
+        projectName: parts[1]
+      };
+    } else {
+      console.error(picocolors__default["default"].red(`Invalid project format in val.config file: "${valConfigFile.project}". Expected format "orgName/projectName".`));
+      process.exit(1);
+    }
+  }
+  return null;
+}
+function getGitHubOwnerAndRepo(gitRemote) {
+  const sshMatch = gitRemote.match(/git@github\.com:(.+?)\/(.+?)(\.git)?$/);
+  if (sshMatch) {
+    return {
+      owner: sshMatch[1],
+      repo: sshMatch[2]
+    };
+  }
+  const httpsMatch = gitRemote.match(/https:\/\/github\.com\/(.+?)\/(.+?)(\.git)?$/);
+  if (httpsMatch) {
+    return {
+      owner: httpsMatch[1],
+      repo: httpsMatch[2]
+    };
+  }
+  return null;
+}
+async function tryGetGitRemote(root) {
+  try {
+    const gitConfig = tryGetGitConfig(root);
+    if (!gitConfig) {
+      return null;
+    }
+    const remoteMatch = gitConfig.match(/\[remote "origin"\][\s\S]*?url = (.+)/);
+    if (remoteMatch && remoteMatch[1]) {
+      return remoteMatch[1].trim();
+    }
+    return null;
+  } catch (error) {
+    console.error(picocolors__default["default"].red("Failed to read .git/config file."), error);
+    return null;
+  }
+}
+function tryGetGitConfig(root) {
+  let currentDir = root;
+  let lastDir = null;
+  while (currentDir !== lastDir) {
+    const gitConfigPath = path__default["default"].join(currentDir, ".git", "config");
+    if (fs__default$1["default"].existsSync(gitConfigPath)) {
+      return fs__default$1["default"].readFileSync(gitConfigPath, "utf-8");
+    }
+    lastDir = currentDir;
+    currentDir = path__default["default"].dirname(currentDir);
+    if (lastDir === currentDir) {
+      break;
+    }
+  }
+  return null;
+}
+
+const host = process.env.VAL_BUILD_URL || "https://admin.val.build";
 async function login(options) {
   try {
     var _response$headers$get;
@@ -598,7 +678,7 @@ async function login(options) {
     let url;
     if (!((_response$headers$get = response.headers.get("content-type")) !== null && _response$headers$get !== void 0 && _response$headers$get.includes("application/json"))) {
       const text = await response.text();
-      console.error(picocolors__default["default"].red("Unexpected failure while trying to login (content type was not JSON). Server response:"), text || "<empty>");
+      console.error(picocolors__default["default"].red("Unexpected failure while trying to login (content type was not JSON). "), text ? `Server response: ${text} (status: ${response.status})` : `Status: ${response.status}`);
       process.exit(1);
     }
     const json = await response.json();
@@ -630,7 +710,9 @@ async function pollForConfirmation(token) {
   const start = Date.now();
   while (Date.now() - start < MAX_DURATION) {
     await new Promise(resolve => setTimeout(resolve, 1000));
-    const response = await fetch(`${host}/api/login?token=${token}&consume=true`);
+    const response = await fetch(`${host}/api/login?token=${token}&consume=true`, {
+      method: "POST"
+    });
     if (response.status === 500) {
       console.error(picocolors__default["default"].red("An error occurred on the server."));
       process.exit(1);
@@ -638,7 +720,7 @@ async function pollForConfirmation(token) {
     if (response.status === 200) {
       const json = await response.json();
       if (json) {
-        if (typeof json.profile.username === "string" && typeof json.pat === "string") {
+        if (typeof json.profile.email === "string" && typeof json.pat === "string") {
           return json;
         } else {
           console.error(picocolors__default["default"].red("Unexpected response from the server."));
@@ -655,7 +737,7 @@ function saveToken(result, filePath) {
     recursive: true
   });
   fs__default$1["default"].writeFileSync(filePath, JSON.stringify(result, null, 2));
-  console.log(picocolors__default["default"].green(`Token for ${picocolors__default["default"].cyan(result.profile.username)} saved to ${picocolors__default["default"].cyan(filePath)}`));
+  console.log(picocolors__default["default"].green(`Token for ${picocolors__default["default"].cyan(result.profile.email)} saved to ${picocolors__default["default"].cyan(filePath)}`));
 }
 
 async function main() {
@@ -673,7 +755,8 @@ async function main() {
       Commands:
         validate
         login
-        list-files
+        files
+        connect
         versions
       
       Command: validate
@@ -684,21 +767,21 @@ async function main() {
 
       
       Command: login
-      Description: login to app.val.build and generate a Personal Access Token
+      Description: login to admin.val.build and generate a Personal Access Token
       Options:
         --root [root], -r [root] Set project root directory (default process.cwd())
 
 
-      Command: files
-      Description: EXPERIMENTAL.
-        Perform file operations in Val.
-        By default it lists files (images, ...) currently in use by Val. 
+      Command: connect
+      Description: connect your local project to a Val Build project at admin.val.build
+      Options:
+        --root [root], -r [root] Set project root directory (default process.cwd())
 
-        If a managed directory is specified, 
-        it will list all files in the managed directory that ARE NOT currently used by Val.
+      Command: list-unused-files
+      Description: EXPERIMENTAL.
+        List files that are in public/val but not in use by any Val module.
         This is useful for cleaning up unused files.
       Options:
-        --managedDir [dir]      If set, list files found in directory that are not managed by Val
         --root [root], -r [root] Set project root directory (default process.cwd())
     `, {
     flags: {
@@ -731,13 +814,12 @@ async function main() {
   }
   const [command] = input;
   switch (command) {
-    case "files":
+    case "list-unused-files":
       if (flags.fix || flags.noEslint) {
-        return error(`Command "files" does not support --fix or --noEslint flags`);
+        return error(`Command "list-unused-files" does not support --fix or --noEslint flags`);
       }
-      return files({
-        root: flags.root,
-        managedDir: flags.managedDir
+      return listUnusedFiles({
+        root: flags.root
       });
     case "versions":
       return versions();
@@ -745,6 +827,13 @@ async function main() {
       return login({
         root: flags.root
       });
+    case "connect":
+      if (flags.fix || flags.noEslint) {
+        return error(`Command "connect" does not support --fix or --noEslint flags`);
+      }
+      return connect({
+        root: flags.root
+      });
     case "validate":
     case "idate":
       if (flags.managedDir) {

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

@@ -486,19 +486,18 @@ function findSimilar(key, targets) {
   })).sort((a, b) => a.distance - b.distance);
 }
 
-async function files({
-  root,
-  managedDir
+async function listUnusedFiles({
+  root
 }) {
-  const printFilesUsedByVal = !managedDir;
+  const managedDir = "public/val";
   const projectRoot = root ? path__default["default"].resolve(root) : process.cwd();
   const service = await server.createService(projectRoot, {});
   const valFiles = await fastGlob.glob("**/*.val.{js,ts}", {
     ignore: ["node_modules/**"],
     cwd: projectRoot
   });
-  const absoluteFilesPathUsedByVal = [];
-  async function printOrGetFileRefs(file) {
+  const filesUsedByVal = [];
+  async function pushFilesUsedByVal(file) {
     const moduleId = `/${file}`; // TODO: check if this always works? (Windows?)
     const valModule = await service.get(moduleId, "", {
       validate: true,
@@ -515,11 +514,7 @@ async function files({
             const value = error.value;
             if (isFileRef(value)) {
               const absoluteFilePathUsedByVal = path__default["default"].join(projectRoot, ...value[core.FILE_REF_PROP].split("/"));
-              if (printFilesUsedByVal) {
-                console.log(absoluteFilePathUsedByVal);
-              } else {
-                absoluteFilesPathUsedByVal.push(absoluteFilePathUsedByVal);
-              }
+              filesUsedByVal.push(absoluteFilePathUsedByVal);
             }
           }
         }
@@ -527,19 +522,17 @@ async function files({
     }
   }
   for (const file of valFiles) {
-    await printOrGetFileRefs(file);
+    await pushFilesUsedByVal(file);
   }
-  if (managedDir) {
-    const managedRoot = path__default["default"].isAbsolute(managedDir) ? managedDir : path__default["default"].join(projectRoot, managedDir);
-    const allFilesInManagedDir = await fastGlob.glob("**/*", {
-      ignore: ["node_modules/**"],
-      cwd: managedRoot
-    });
-    for (const file of allFilesInManagedDir) {
-      const absoluteFilePath = path__default["default"].join(managedRoot, file);
-      if (!absoluteFilesPathUsedByVal.includes(absoluteFilePath)) {
-        console.log(path__default["default"].join(managedRoot, file));
-      }
+  const managedRoot = path__default["default"].join(projectRoot, managedDir);
+  const allFilesInManagedDir = await fastGlob.glob("**/*", {
+    ignore: ["node_modules/**"],
+    cwd: managedRoot
+  });
+  for (const file of allFilesInManagedDir) {
+    const absoluteFilePath = path__default["default"].join(managedRoot, file);
+    if (!filesUsedByVal.includes(absoluteFilePath)) {
+      console.log(path__default["default"].join(managedRoot, file));
     }
   }
   service.dispose();
@@ -581,7 +574,94 @@ const getVersions = () => {
   };
 };
 
-const host = process.env.VAL_BUILD_URL || "https://app.val.build";
+const host$1 = process.env.VAL_BUILD_URL || "https://admin.val.build";
+async function connect(options) {
+  const {
+    root
+  } = options;
+  const projectRoot = root ? path__default["default"].resolve(root) : process.cwd();
+  const maybeProject = await tryGetProject(projectRoot);
+  const maybeGitRemote = await tryGetGitRemote(projectRoot);
+  const maybeGitOwnerAndRepo = maybeGitRemote !== null ? getGitHubOwnerAndRepo(maybeGitRemote) : null;
+  const params = new URLSearchParams();
+  params.set("step", "create-project");
+  if (maybeProject) {
+    params.set("org", maybeProject.orgName);
+    params.set("project", maybeProject.projectName);
+  }
+  if (maybeGitOwnerAndRepo) {
+    params.set("github_repo", [maybeGitOwnerAndRepo.owner, maybeGitOwnerAndRepo.repo].join("/"));
+  }
+  const url = `${host$1}/connect?${params.toString()}`;
+  console.log(picocolors__default["default"].dim(`\nFollow the instructions in your browser to complete the setup:\n${picocolors__default["default"].cyan(url)}\n`));
+}
+async function tryGetProject(projectRoot) {
+  const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
+  if (valConfigFile && valConfigFile.project) {
+    const parts = valConfigFile.project.split("/");
+    if (parts.length === 2) {
+      return {
+        orgName: parts[0],
+        projectName: parts[1]
+      };
+    } else {
+      console.error(picocolors__default["default"].red(`Invalid project format in val.config file: "${valConfigFile.project}". Expected format "orgName/projectName".`));
+      process.exit(1);
+    }
+  }
+  return null;
+}
+function getGitHubOwnerAndRepo(gitRemote) {
+  const sshMatch = gitRemote.match(/git@github\.com:(.+?)\/(.+?)(\.git)?$/);
+  if (sshMatch) {
+    return {
+      owner: sshMatch[1],
+      repo: sshMatch[2]
+    };
+  }
+  const httpsMatch = gitRemote.match(/https:\/\/github\.com\/(.+?)\/(.+?)(\.git)?$/);
+  if (httpsMatch) {
+    return {
+      owner: httpsMatch[1],
+      repo: httpsMatch[2]
+    };
+  }
+  return null;
+}
+async function tryGetGitRemote(root) {
+  try {
+    const gitConfig = tryGetGitConfig(root);
+    if (!gitConfig) {
+      return null;
+    }
+    const remoteMatch = gitConfig.match(/\[remote "origin"\][\s\S]*?url = (.+)/);
+    if (remoteMatch && remoteMatch[1]) {
+      return remoteMatch[1].trim();
+    }
+    return null;
+  } catch (error) {
+    console.error(picocolors__default["default"].red("Failed to read .git/config file."), error);
+    return null;
+  }
+}
+function tryGetGitConfig(root) {
+  let currentDir = root;
+  let lastDir = null;
+  while (currentDir !== lastDir) {
+    const gitConfigPath = path__default["default"].join(currentDir, ".git", "config");
+    if (fs__default$1["default"].existsSync(gitConfigPath)) {
+      return fs__default$1["default"].readFileSync(gitConfigPath, "utf-8");
+    }
+    lastDir = currentDir;
+    currentDir = path__default["default"].dirname(currentDir);
+    if (lastDir === currentDir) {
+      break;
+    }
+  }
+  return null;
+}
+
+const host = process.env.VAL_BUILD_URL || "https://admin.val.build";
 async function login(options) {
   try {
     var _response$headers$get;
@@ -598,7 +678,7 @@ async function login(options) {
     let url;
     if (!((_response$headers$get = response.headers.get("content-type")) !== null && _response$headers$get !== void 0 && _response$headers$get.includes("application/json"))) {
       const text = await response.text();
-      console.error(picocolors__default["default"].red("Unexpected failure while trying to login (content type was not JSON). Server response:"), text || "<empty>");
+      console.error(picocolors__default["default"].red("Unexpected failure while trying to login (content type was not JSON). "), text ? `Server response: ${text} (status: ${response.status})` : `Status: ${response.status}`);
       process.exit(1);
     }
     const json = await response.json();
@@ -630,7 +710,9 @@ async function pollForConfirmation(token) {
   const start = Date.now();
   while (Date.now() - start < MAX_DURATION) {
     await new Promise(resolve => setTimeout(resolve, 1000));
-    const response = await fetch(`${host}/api/login?token=${token}&consume=true`);
+    const response = await fetch(`${host}/api/login?token=${token}&consume=true`, {
+      method: "POST"
+    });
     if (response.status === 500) {
       console.error(picocolors__default["default"].red("An error occurred on the server."));
       process.exit(1);
@@ -638,7 +720,7 @@ async function pollForConfirmation(token) {
     if (response.status === 200) {
       const json = await response.json();
       if (json) {
-        if (typeof json.profile.username === "string" && typeof json.pat === "string") {
+        if (typeof json.profile.email === "string" && typeof json.pat === "string") {
           return json;
         } else {
           console.error(picocolors__default["default"].red("Unexpected response from the server."));
@@ -655,7 +737,7 @@ function saveToken(result, filePath) {
     recursive: true
   });
   fs__default$1["default"].writeFileSync(filePath, JSON.stringify(result, null, 2));
-  console.log(picocolors__default["default"].green(`Token for ${picocolors__default["default"].cyan(result.profile.username)} saved to ${picocolors__default["default"].cyan(filePath)}`));
+  console.log(picocolors__default["default"].green(`Token for ${picocolors__default["default"].cyan(result.profile.email)} saved to ${picocolors__default["default"].cyan(filePath)}`));
 }
 
 async function main() {
@@ -673,7 +755,8 @@ async function main() {
       Commands:
         validate
         login
-        list-files
+        files
+        connect
         versions
       
       Command: validate
@@ -684,21 +767,21 @@ async function main() {
 
       
       Command: login
-      Description: login to app.val.build and generate a Personal Access Token
+      Description: login to admin.val.build and generate a Personal Access Token
       Options:
         --root [root], -r [root] Set project root directory (default process.cwd())
 
 
-      Command: files
-      Description: EXPERIMENTAL.
-        Perform file operations in Val.
-        By default it lists files (images, ...) currently in use by Val. 
+      Command: connect
+      Description: connect your local project to a Val Build project at admin.val.build
+      Options:
+        --root [root], -r [root] Set project root directory (default process.cwd())
 
-        If a managed directory is specified, 
-        it will list all files in the managed directory that ARE NOT currently used by Val.
+      Command: list-unused-files
+      Description: EXPERIMENTAL.
+        List files that are in public/val but not in use by any Val module.
         This is useful for cleaning up unused files.
       Options:
-        --managedDir [dir]      If set, list files found in directory that are not managed by Val
         --root [root], -r [root] Set project root directory (default process.cwd())
     `, {
     flags: {
@@ -731,13 +814,12 @@ async function main() {
   }
   const [command] = input;
   switch (command) {
-    case "files":
+    case "list-unused-files":
       if (flags.fix || flags.noEslint) {
-        return error(`Command "files" does not support --fix or --noEslint flags`);
+        return error(`Command "list-unused-files" does not support --fix or --noEslint flags`);
       }
-      return files({
-        root: flags.root,
-        managedDir: flags.managedDir
+      return listUnusedFiles({
+        root: flags.root
       });
     case "versions":
       return versions();
@@ -745,6 +827,13 @@ async function main() {
       return login({
         root: flags.root
       });
+    case "connect":
+      if (flags.fix || flags.noEslint) {
+        return error(`Command "connect" does not support --fix or --noEslint flags`);
+      }
+      return connect({
+        root: flags.root
+      });
     case "validate":
     case "idate":
       if (flags.managedDir) {

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

@@ -454,19 +454,18 @@ function findSimilar(key, targets) {
   })).sort((a, b) => a.distance - b.distance);
 }
 
-async function files({
-  root,
-  managedDir
+async function listUnusedFiles({
+  root
 }) {
-  const printFilesUsedByVal = !managedDir;
+  const managedDir = "public/val";
   const projectRoot = root ? path.resolve(root) : process.cwd();
   const service = await createService(projectRoot, {});
   const valFiles = await glob("**/*.val.{js,ts}", {
     ignore: ["node_modules/**"],
     cwd: projectRoot
   });
-  const absoluteFilesPathUsedByVal = [];
-  async function printOrGetFileRefs(file) {
+  const filesUsedByVal = [];
+  async function pushFilesUsedByVal(file) {
     const moduleId = `/${file}`; // TODO: check if this always works? (Windows?)
     const valModule = await service.get(moduleId, "", {
       validate: true,
@@ -483,11 +482,7 @@ async function files({
             const value = error.value;
             if (isFileRef(value)) {
               const absoluteFilePathUsedByVal = path.join(projectRoot, ...value[FILE_REF_PROP].split("/"));
-              if (printFilesUsedByVal) {
-                console.log(absoluteFilePathUsedByVal);
-              } else {
-                absoluteFilesPathUsedByVal.push(absoluteFilePathUsedByVal);
-              }
+              filesUsedByVal.push(absoluteFilePathUsedByVal);
             }
           }
         }
@@ -495,19 +490,17 @@ async function files({
     }
   }
   for (const file of valFiles) {
-    await printOrGetFileRefs(file);
+    await pushFilesUsedByVal(file);
   }
-  if (managedDir) {
-    const managedRoot = path.isAbsolute(managedDir) ? managedDir : path.join(projectRoot, managedDir);
-    const allFilesInManagedDir = await glob("**/*", {
-      ignore: ["node_modules/**"],
-      cwd: managedRoot
-    });
-    for (const file of allFilesInManagedDir) {
-      const absoluteFilePath = path.join(managedRoot, file);
-      if (!absoluteFilesPathUsedByVal.includes(absoluteFilePath)) {
-        console.log(path.join(managedRoot, file));
-      }
+  const managedRoot = path.join(projectRoot, managedDir);
+  const allFilesInManagedDir = await glob("**/*", {
+    ignore: ["node_modules/**"],
+    cwd: managedRoot
+  });
+  for (const file of allFilesInManagedDir) {
+    const absoluteFilePath = path.join(managedRoot, file);
+    if (!filesUsedByVal.includes(absoluteFilePath)) {
+      console.log(path.join(managedRoot, file));
     }
   }
   service.dispose();
@@ -549,7 +542,94 @@ const getVersions = () => {
   };
 };
 
-const host = process.env.VAL_BUILD_URL || "https://app.val.build";
+const host$1 = process.env.VAL_BUILD_URL || "https://admin.val.build";
+async function connect(options) {
+  const {
+    root
+  } = options;
+  const projectRoot = root ? path.resolve(root) : process.cwd();
+  const maybeProject = await tryGetProject(projectRoot);
+  const maybeGitRemote = await tryGetGitRemote(projectRoot);
+  const maybeGitOwnerAndRepo = maybeGitRemote !== null ? getGitHubOwnerAndRepo(maybeGitRemote) : null;
+  const params = new URLSearchParams();
+  params.set("step", "create-project");
+  if (maybeProject) {
+    params.set("org", maybeProject.orgName);
+    params.set("project", maybeProject.projectName);
+  }
+  if (maybeGitOwnerAndRepo) {
+    params.set("github_repo", [maybeGitOwnerAndRepo.owner, maybeGitOwnerAndRepo.repo].join("/"));
+  }
+  const url = `${host$1}/connect?${params.toString()}`;
+  console.log(picocolors.dim(`\nFollow the instructions in your browser to complete the setup:\n${picocolors.cyan(url)}\n`));
+}
+async function tryGetProject(projectRoot) {
+  const valConfigFile = (await evalValConfigFile(projectRoot, "val.config.ts")) || (await evalValConfigFile(projectRoot, "val.config.js"));
+  if (valConfigFile && valConfigFile.project) {
+    const parts = valConfigFile.project.split("/");
+    if (parts.length === 2) {
+      return {
+        orgName: parts[0],
+        projectName: parts[1]
+      };
+    } else {
+      console.error(picocolors.red(`Invalid project format in val.config file: "${valConfigFile.project}". Expected format "orgName/projectName".`));
+      process.exit(1);
+    }
+  }
+  return null;
+}
+function getGitHubOwnerAndRepo(gitRemote) {
+  const sshMatch = gitRemote.match(/git@github\.com:(.+?)\/(.+?)(\.git)?$/);
+  if (sshMatch) {
+    return {
+      owner: sshMatch[1],
+      repo: sshMatch[2]
+    };
+  }
+  const httpsMatch = gitRemote.match(/https:\/\/github\.com\/(.+?)\/(.+?)(\.git)?$/);
+  if (httpsMatch) {
+    return {
+      owner: httpsMatch[1],
+      repo: httpsMatch[2]
+    };
+  }
+  return null;
+}
+async function tryGetGitRemote(root) {
+  try {
+    const gitConfig = tryGetGitConfig(root);
+    if (!gitConfig) {
+      return null;
+    }
+    const remoteMatch = gitConfig.match(/\[remote "origin"\][\s\S]*?url = (.+)/);
+    if (remoteMatch && remoteMatch[1]) {
+      return remoteMatch[1].trim();
+    }
+    return null;
+  } catch (error) {
+    console.error(picocolors.red("Failed to read .git/config file."), error);
+    return null;
+  }
+}
+function tryGetGitConfig(root) {
+  let currentDir = root;
+  let lastDir = null;
+  while (currentDir !== lastDir) {
+    const gitConfigPath = path.join(currentDir, ".git", "config");
+    if (fs$1.existsSync(gitConfigPath)) {
+      return fs$1.readFileSync(gitConfigPath, "utf-8");
+    }
+    lastDir = currentDir;
+    currentDir = path.dirname(currentDir);
+    if (lastDir === currentDir) {
+      break;
+    }
+  }
+  return null;
+}
+
+const host = process.env.VAL_BUILD_URL || "https://admin.val.build";
 async function login(options) {
   try {
     var _response$headers$get;
@@ -566,7 +646,7 @@ async function login(options) {
     let url;
     if (!((_response$headers$get = response.headers.get("content-type")) !== null && _response$headers$get !== void 0 && _response$headers$get.includes("application/json"))) {
       const text = await response.text();
-      console.error(picocolors.red("Unexpected failure while trying to login (content type was not JSON). Server response:"), text || "<empty>");
+      console.error(picocolors.red("Unexpected failure while trying to login (content type was not JSON). "), text ? `Server response: ${text} (status: ${response.status})` : `Status: ${response.status}`);
       process.exit(1);
     }
     const json = await response.json();
@@ -598,7 +678,9 @@ async function pollForConfirmation(token) {
   const start = Date.now();
   while (Date.now() - start < MAX_DURATION) {
     await new Promise(resolve => setTimeout(resolve, 1000));
-    const response = await fetch(`${host}/api/login?token=${token}&consume=true`);
+    const response = await fetch(`${host}/api/login?token=${token}&consume=true`, {
+      method: "POST"
+    });
     if (response.status === 500) {
       console.error(picocolors.red("An error occurred on the server."));
       process.exit(1);
@@ -606,7 +688,7 @@ async function pollForConfirmation(token) {
     if (response.status === 200) {
       const json = await response.json();
       if (json) {
-        if (typeof json.profile.username === "string" && typeof json.pat === "string") {
+        if (typeof json.profile.email === "string" && typeof json.pat === "string") {
           return json;
         } else {
           console.error(picocolors.red("Unexpected response from the server."));
@@ -623,7 +705,7 @@ function saveToken(result, filePath) {
     recursive: true
   });
   fs$1.writeFileSync(filePath, JSON.stringify(result, null, 2));
-  console.log(picocolors.green(`Token for ${picocolors.cyan(result.profile.username)} saved to ${picocolors.cyan(filePath)}`));
+  console.log(picocolors.green(`Token for ${picocolors.cyan(result.profile.email)} saved to ${picocolors.cyan(filePath)}`));
 }
 
 async function main() {
@@ -641,7 +723,8 @@ async function main() {
       Commands:
         validate
         login
-        list-files
+        files
+        connect
         versions
       
       Command: validate
@@ -652,21 +735,21 @@ async function main() {
 
       
       Command: login
-      Description: login to app.val.build and generate a Personal Access Token
+      Description: login to admin.val.build and generate a Personal Access Token
       Options:
         --root [root], -r [root] Set project root directory (default process.cwd())
 
 
-      Command: files
-      Description: EXPERIMENTAL.
-        Perform file operations in Val.
-        By default it lists files (images, ...) currently in use by Val. 
+      Command: connect
+      Description: connect your local project to a Val Build project at admin.val.build
+      Options:
+        --root [root], -r [root] Set project root directory (default process.cwd())
 
-        If a managed directory is specified, 
-        it will list all files in the managed directory that ARE NOT currently used by Val.
+      Command: list-unused-files
+      Description: EXPERIMENTAL.
+        List files that are in public/val but not in use by any Val module.
         This is useful for cleaning up unused files.
       Options:
-        --managedDir [dir]      If set, list files found in directory that are not managed by Val
         --root [root], -r [root] Set project root directory (default process.cwd())
     `, {
     flags: {
@@ -699,13 +782,12 @@ async function main() {
   }
   const [command] = input;
   switch (command) {
-    case "files":
+    case "list-unused-files":
       if (flags.fix || flags.noEslint) {
-        return error(`Command "files" does not support --fix or --noEslint flags`);
+        return error(`Command "list-unused-files" does not support --fix or --noEslint flags`);
       }
-      return files({
-        root: flags.root,
-        managedDir: flags.managedDir
+      return listUnusedFiles({
+        root: flags.root
       });
     case "versions":
       return versions();
@@ -713,6 +795,13 @@ async function main() {
       return login({
         root: flags.root
       });
+    case "connect":
+      if (flags.fix || flags.noEslint) {
+        return error(`Command "connect" does not support --fix or --noEslint flags`);
+      }
+      return connect({
+        root: flags.root
+      });
     case "validate":
     case "idate":
       if (flags.managedDir) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@valbuild/cli",
   "private": false,
-  "version": "0.85.1",
+  "version": "0.86.1",
   "description": "Val CLI tools",
   "bin": {
     "val": "./bin.js"
@@ -20,9 +20,9 @@
   "dependencies": {
     "@inquirer/confirm": "^2.0.15",
     "@inquirer/prompts": "^3.0.2",
-    "@valbuild/core": "~0.85.1",
-    "@valbuild/eslint-plugin": "~0.85.1",
-    "@valbuild/server": "~0.85.1",
+    "@valbuild/core": "~0.86.1",
+    "@valbuild/eslint-plugin": "~0.86.1",
+    "@valbuild/server": "~0.86.1",
     "chalk": "^4.1.2",
     "cors": "^2.8.5",
     "express": "^4.18.2",

package/src/cli.ts

@@ -1,8 +1,9 @@
 import meow from "meow";
 import { error } from "./logger";
 import { validate } from "./validate";
-import { files as files } from "./files";
+import { listUnusedFiles as listUnusedFiles } from "./listUnusedFiles";
 import { getVersions } from "./getVersions";
+import { connect } from "./connect";
 import chalk from "chalk";
 import { login } from "./login";
 
@@ -18,7 +19,8 @@ async function main(): Promise<void> {
       Commands:
         validate
         login
-        list-files
+        files
+        connect
         versions
       
       Command: validate
@@ -29,21 +31,21 @@ async function main(): Promise<void> {
 
       
       Command: login
-      Description: login to app.val.build and generate a Personal Access Token
+      Description: login to admin.val.build and generate a Personal Access Token
       Options:
         --root [root], -r [root] Set project root directory (default process.cwd())
 
 
-      Command: files
-      Description: EXPERIMENTAL.
-        Perform file operations in Val.
-        By default it lists files (images, ...) currently in use by Val. 
+      Command: connect
+      Description: connect your local project to a Val Build project at admin.val.build
+      Options:
+        --root [root], -r [root] Set project root directory (default process.cwd())
 
-        If a managed directory is specified, 
-        it will list all files in the managed directory that ARE NOT currently used by Val.
+      Command: list-unused-files
+      Description: EXPERIMENTAL.
+        List files that are in public/val but not in use by any Val module.
         This is useful for cleaning up unused files.
       Options:
-        --managedDir [dir]      If set, list files found in directory that are not managed by Val
         --root [root], -r [root] Set project root directory (default process.cwd())
     `,
     {
@@ -81,15 +83,14 @@ async function main(): Promise<void> {
 
   const [command] = input;
   switch (command) {
-    case "files":
+    case "list-unused-files":
       if (flags.fix || flags.noEslint) {
         return error(
-          `Command "files" does not support --fix or --noEslint flags`,
+          `Command "list-unused-files" does not support --fix or --noEslint flags`,
         );
       }
-      return files({
+      return listUnusedFiles({
         root: flags.root,
-        managedDir: flags.managedDir,
       });
     case "versions":
       return versions();
@@ -97,6 +98,15 @@ async function main(): Promise<void> {
       return login({
         root: flags.root,
       });
+    case "connect":
+      if (flags.fix || flags.noEslint) {
+        return error(
+          `Command "connect" does not support --fix or --noEslint flags`,
+        );
+      }
+      return connect({
+        root: flags.root,
+      });
     case "validate":
     case "idate":
       if (flags.managedDir) {

package/src/connect.ts

@@ -0,0 +1,115 @@
+import pc from "picocolors";
+import fs from "fs";
+import path from "path";
+import { evalValConfigFile } from "./utils/evalValConfigFile";
+
+const host = process.env.VAL_BUILD_URL || "https://admin.val.build";
+
+export async function connect(options: { root?: string }) {
+  const { root } = options;
+  const projectRoot = root ? path.resolve(root) : process.cwd();
+
+  const maybeProject = await tryGetProject(projectRoot);
+  const maybeGitRemote = await tryGetGitRemote(projectRoot);
+  const maybeGitOwnerAndRepo =
+    maybeGitRemote !== null ? getGitHubOwnerAndRepo(maybeGitRemote) : null;
+
+  const params = new URLSearchParams();
+  params.set("step", "create-project");
+  if (maybeProject) {
+    params.set("org", maybeProject.orgName);
+    params.set("project", maybeProject.projectName);
+  }
+  if (maybeGitOwnerAndRepo) {
+    params.set(
+      "github_repo",
+      [maybeGitOwnerAndRepo.owner, maybeGitOwnerAndRepo.repo].join("/"),
+    );
+  }
+  const url = `${host}/connect?${params.toString()}`;
+
+  console.log(
+    pc.dim(
+      `\nFollow the instructions in your browser to complete the setup:\n${pc.cyan(url)}\n`,
+    ),
+  );
+}
+
+async function tryGetProject(projectRoot: string): Promise<{
+  orgName: string;
+  projectName: string;
+} | null> {
+  const valConfigFile =
+    (await evalValConfigFile(projectRoot, "val.config.ts")) ||
+    (await evalValConfigFile(projectRoot, "val.config.js"));
+
+  if (valConfigFile && valConfigFile.project) {
+    const parts = valConfigFile.project.split("/");
+    if (parts.length === 2) {
+      return {
+        orgName: parts[0],
+        projectName: parts[1],
+      };
+    } else {
+      console.error(
+        pc.red(
+          `Invalid project format in val.config file: "${valConfigFile.project}". Expected format "orgName/projectName".`,
+        ),
+      );
+      process.exit(1);
+    }
+  }
+  return null;
+}
+
+function getGitHubOwnerAndRepo(
+  gitRemote: string,
+): { owner: string; repo: string } | null {
+  const sshMatch = gitRemote.match(/git@github\.com:(.+?)\/(.+?)(\.git)?$/);
+  if (sshMatch) {
+    return { owner: sshMatch[1], repo: sshMatch[2] };
+  }
+  const httpsMatch = gitRemote.match(
+    /https:\/\/github\.com\/(.+?)\/(.+?)(\.git)?$/,
+  );
+  if (httpsMatch) {
+    return { owner: httpsMatch[1], repo: httpsMatch[2] };
+  }
+  return null;
+}
+
+async function tryGetGitRemote(root: string): Promise<string | null> {
+  try {
+    const gitConfig = tryGetGitConfig(root);
+    if (!gitConfig) {
+      return null;
+    }
+    const remoteMatch = gitConfig.match(
+      /\[remote "origin"\][\s\S]*?url = (.+)/,
+    );
+    if (remoteMatch && remoteMatch[1]) {
+      return remoteMatch[1].trim();
+    }
+    return null;
+  } catch (error) {
+    console.error(pc.red("Failed to read .git/config file."), error);
+    return null;
+  }
+}
+
+function tryGetGitConfig(root: string): string | null {
+  let currentDir = root;
+  let lastDir = null;
+  while (currentDir !== lastDir) {
+    const gitConfigPath = path.join(currentDir, ".git", "config");
+    if (fs.existsSync(gitConfigPath)) {
+      return fs.readFileSync(gitConfigPath, "utf-8");
+    }
+    lastDir = currentDir;
+    currentDir = path.dirname(currentDir);
+    if (lastDir === currentDir) {
+      break;
+    }
+  }
+  return null;
+}

package/src/{files.ts → listUnusedFiles.ts}

@@ -9,14 +9,8 @@ import { createService } from "@valbuild/server";
 import { glob } from "fast-glob";
 import path from "path";
 
-export async function files({
-  root,
-  managedDir,
-}: {
-  root?: string;
-  managedDir?: string;
-}) {
-  const printFilesUsedByVal = !managedDir;
+export async function listUnusedFiles({ root }: { root?: string }) {
+  const managedDir = "public/val";
   const projectRoot = root ? path.resolve(root) : process.cwd();
 
   const service = await createService(projectRoot, {});
@@ -26,8 +20,8 @@ export async function files({
     cwd: projectRoot,
   });
 
-  const absoluteFilesPathUsedByVal: string[] = [];
-  async function printOrGetFileRefs(file: string) {
+  const filesUsedByVal: string[] = [];
+  async function pushFilesUsedByVal(file: string) {
     const moduleId = `/${file}` as ModuleFilePath; // TODO: check if this always works? (Windows?)
     const valModule = await service.get(moduleId, "" as ModulePath, {
       validate: true,
@@ -47,11 +41,7 @@ export async function files({
                 projectRoot,
                 ...value[FILE_REF_PROP].split("/"),
               );
-              if (printFilesUsedByVal) {
-                console.log(absoluteFilePathUsedByVal);
-              } else {
-                absoluteFilesPathUsedByVal.push(absoluteFilePathUsedByVal);
-              }
+              filesUsedByVal.push(absoluteFilePathUsedByVal);
             }
           }
         }
@@ -59,22 +49,18 @@ export async function files({
     }
   }
   for (const file of valFiles) {
-    await printOrGetFileRefs(file);
+    await pushFilesUsedByVal(file);
   }
 
-  if (managedDir) {
-    const managedRoot = path.isAbsolute(managedDir)
-      ? managedDir
-      : path.join(projectRoot, managedDir);
-    const allFilesInManagedDir = await glob("**/*", {
-      ignore: ["node_modules/**"],
-      cwd: managedRoot,
-    });
-    for (const file of allFilesInManagedDir) {
-      const absoluteFilePath = path.join(managedRoot, file);
-      if (!absoluteFilesPathUsedByVal.includes(absoluteFilePath)) {
-        console.log(path.join(managedRoot, file));
-      }
+  const managedRoot = path.join(projectRoot, managedDir);
+  const allFilesInManagedDir = await glob("**/*", {
+    ignore: ["node_modules/**"],
+    cwd: managedRoot,
+  });
+  for (const file of allFilesInManagedDir) {
+    const absoluteFilePath = path.join(managedRoot, file);
+    if (!filesUsedByVal.includes(absoluteFilePath)) {
+      console.log(path.join(managedRoot, file));
     }
   }
 

package/src/login.ts

@@ -3,7 +3,7 @@ import fs from "fs";
 import path from "path";
 import { getPersonalAccessTokenPath } from "@valbuild/server";
 
-const host = process.env.VAL_BUILD_URL || "https://app.val.build";
+const host = process.env.VAL_BUILD_URL || "https://admin.val.build";
 
 export async function login(options: { root?: string }) {
   try {
@@ -22,9 +22,11 @@ export async function login(options: { root?: string }) {
       const text = await response.text();
       console.error(
         pc.red(
-          "Unexpected failure while trying to login (content type was not JSON). Server response:",
+          "Unexpected failure while trying to login (content type was not JSON). ",
         ),
-        text || "<empty>",
+        text
+          ? `Server response: ${text} (status: ${response.status})`
+          : `Status: ${response.status}`,
       );
       process.exit(1);
     }
@@ -61,7 +63,7 @@ export async function login(options: { root?: string }) {
 
 const MAX_DURATION = 5 * 60 * 1000; // 5 minutes
 async function pollForConfirmation(token: string): Promise<{
-  profile: { username: string };
+  profile: { email: string };
   pat: string;
 }> {
   const start = Date.now();
@@ -69,6 +71,7 @@ async function pollForConfirmation(token: string): Promise<{
     await new Promise((resolve) => setTimeout(resolve, 1000));
     const response = await fetch(
       `${host}/api/login?token=${token}&consume=true`,
+      { method: "POST" },
     );
     if (response.status === 500) {
       console.error(pc.red("An error occurred on the server."));
@@ -78,7 +81,7 @@ async function pollForConfirmation(token: string): Promise<{
       const json = await response.json();
       if (json) {
         if (
-          typeof json.profile.username === "string" &&
+          typeof json.profile.email === "string" &&
           typeof json.pat === "string"
         ) {
           return json;
@@ -95,7 +98,7 @@ async function pollForConfirmation(token: string): Promise<{
 
 function saveToken(
   result: {
-    profile: { username: string };
+    profile: { email: string };
     pat: string;
   },
   filePath: string,
@@ -105,7 +108,7 @@ function saveToken(
   console.log(
     pc.green(
       `Token for ${pc.cyan(
-        result.profile.username,
+        result.profile.email,
       )} saved to ${pc.cyan(filePath)}`,
     ),
   );