Skip to content

[TypeSpec Validation] exclude trailing slash when calculating folder depth #26626

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

Merged
ckairen merged 4 commits into from
Dec 6, 2023
+18 −2
Merged

[TypeSpec Validation] exclude trailing slash when calculating folder depth #26626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1044754
trailing slash tsv folder rule
ckairen Nov 8, 2023
d6b6aaf
Update eng/tools/typespec-validation/src/rules/folder-structure.ts
ckairen Nov 9, 2023
90e0524
merge and add test
ckairen Dec 5, 2023
7b1f3a6
pull
ckairen Dec 5, 2023
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
4 changes: 2 additions & 2 deletions eng/tools/typespec-validation/src/rules/folder-structure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export class FolderStructureRule implements Rule {
}
});

// Verify top level folder is lower case
let folderStruct = relativePath.split("/");
// Verify top level folder is lower case and remove empty entries when splitting by slash
let folderStruct = relativePath.split("/").filter(Boolean);
if (folderStruct[1].match(/[A-Z]/g)) {
success = false;
errorOutput += `Invalid folder name. Folders under specification/ must be lower case.\n`;
Expand Down
16 changes: 16 additions & 0 deletions eng/tools/typespec-validation/test/folder-structure.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,22 @@ describe("folder-structure", function () {
assert(result.errorOutput.includes("must be lower case"));
});

it("should succeed if package folder has trailing slash", async function () {
let host = new TsvTestHost();
host.globby = async () => {
return ["/foo/bar/tspconfig.yaml"];
};
host.normalizePath = () => {
return "/gitroot";
};

const result = await new FolderStructureRule().execute(
host,
"/gitroot/specification/foo/Foo/Foo/",
);
assert(result.success);
});

it("should fail if package folder is more than 3 levels deep", async function () {
let host = new TsvTestHost();
host.globby = async () => {
Expand Down
⚡