Skip to content

[tsp-client] Fix error reported when the typespec project dir doesnt exist in cloned repo #13460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
catalinaperalta wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[tsp-client] Fix error reported when the typespec project dir doesnt exist in cloned repo #13460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1da0d67
fix issue when tsp dir doesnt exist in repo
cperaltah Jan 6, 2026
1cfcf7e
improve error messages
cperaltah Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion tools/tsp-client/src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,18 @@ export async function syncCommand(argv: any) {
await addSpecFiles(cloneDir, dir);
}
await checkoutCommit(cloneDir, tspLocation.commit);
await cp(joinPaths(cloneDir, tspLocation.directory), srcDir, { recursive: true });
const clonedTspProject = joinPaths(cloneDir, tspLocation.directory);
try {
// Check if the cloned TypeSpec project exists
await stat(clonedTspProject);
} catch (err) {
Logger.error(
`Unexpected error reading the TypeSpec project directory after cloning the repository: '${clonedTspProject}'. Please verify that the TypeSpec directory path is correct and that it exists at the specified commit: '${tspLocation.commit}'.\n${err}`,
);
await removeDirectory(cloneDir);
process.exit(1);
}
await cp(clonedTspProject, srcDir, { recursive: true });
for (const dir of tspLocation.additionalDirectories!) {
Logger.info(`Syncing additional directory: ${dir}`);
await cp(joinPaths(cloneDir, dir), joinPaths(tempRoot, getAdditionalDirectoryName(dir)), {
Expand Down
10 changes: 7 additions & 3 deletions tools/tsp-client/src/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@ import { spawn } from "child_process";
import { simpleGit } from "simple-git";

export async function getRepoRoot(repoPath: string): Promise<string> {
return simpleGit(repoPath).revparse(["--show-toplevel"]);
return simpleGit(repoPath)
.revparse(["--show-toplevel"])
.catch((err) => {
throw new Error(`Failed to get repo root: ${err}`);
});
}

export async function cloneRepo(rootUrl: string, cloneDir: string, repo: string): Promise<void> {
return new Promise((resolve, reject) => {
simpleGit(rootUrl).clone(repo, cloneDir, ["--no-checkout", "--filter=tree:0"], (err) => {
if (err) {
reject(err);
reject(new Error(`git clone failed with error: ${err}`));
}
resolve();
});
Expand Down Expand Up @@ -58,7 +62,7 @@ export async function checkoutCommit(cloneDir: string, commit: string): Promise<
return new Promise((resolve, reject) => {
simpleGit(cloneDir).checkout(commit, undefined, (err) => {
if (err) {
reject(err);
reject(new Error(`git checkout failed with error: ${err}`));
}
resolve();
});
Expand Down