Skip to content

Commit de6b809

Browse files
3.10.10
1 parent c6d363f commit de6b809

File tree

4 files changed

+176
-89
lines changed

4 files changed

+176
-89
lines changed

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Igor Kowalski (Igorkowalski94)",
33
"name": "eslint-plugin-project-structure",
4-
"version": "3.10.9",
4+
"version": "3.10.10",
55
"license": "MIT",
66
"description": "Powerful ESLint plugin with rules to help you achieve a scalable, consistent, and well-structured project. Create your own framework! Define your folder structure, file composition, advanced naming conventions, and create independent modules. Take your project to the next level and save time by automating the review of key principles of a healthy project! react folder structure react file structure react project structure react conventions architecture react next.js angular node solid vue svelte",
77
"keywords": [
@@ -56,34 +56,34 @@
5656
"husky:prepare": "husky install"
5757
},
5858
"dependencies": {
59-
"@typescript-eslint/utils": "^8.15.0",
59+
"@typescript-eslint/utils": "^8.17.0",
6060
"comment-json": "^4.2.5",
6161
"js-yaml": "^4.1.0",
6262
"jsonschema": "^1.4.1",
6363
"micromatch": "^4.0.8"
6464
},
6565
"devDependencies": {
66-
"@eslint/compat": "^1.2.3",
67-
"@eslint/js": "^9.15.0",
66+
"@eslint/compat": "^1.2.4",
67+
"@eslint/js": "^9.16.0",
6868
"@types/eslint__js": "^8.42.3",
6969
"@types/jest": "^29.5.14",
7070
"@types/js-yaml": "^4.0.9",
7171
"@types/micromatch": "^4.0.9",
72-
"@types/node": "^22.9.0",
73-
"eslint": "^9.15.0",
72+
"@types/node": "^22.10.1",
73+
"eslint": "^9.16.0",
7474
"eslint-config-prettier": "^9.1.0",
7575
"eslint-plugin-import": "^2.31.0",
7676
"eslint-plugin-prettier": "^5.2.1",
77-
"eslint-plugin-project-structure": "3.10.8",
77+
"eslint-plugin-project-structure": "3.10.9",
7878
"husky": "^9.1.7",
7979
"jest": "^29.7.0",
80-
"prettier": "^3.3.3",
80+
"prettier": "^3.4.2",
8181
"ts-jest": "^29.2.5",
8282
"ts-node": "^10.9.2",
8383
"ts-prune": "^0.10.3",
8484
"tsup": "^8.3.5",
85-
"typescript": "^5.6.3",
86-
"typescript-eslint": "^8.15.0"
85+
"typescript": "^5.7.2",
86+
"typescript-eslint": "^8.17.0"
8787
},
8888
"resolutions": {
8989
"micromatch": "^4.0.8",

src/rules/folderStructure/helpers/validateFolderStructure/helpers/validatePath/helpers/getChildren/helpers/sortChildrenByNameType.test.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ describe("sortChildrenByNameType", () => {
1212
{ name: "FixedName1.ts" },
1313
{ name: "*_{camelCase}.ts" },
1414
{ name: "use*", children: [] },
15+
{ name: "{snake_case}", children: [] },
1516
{ name: "*", children: [] },
1617
{ name: "use*.ts" },
1718
{ name: "{FolderName}.ts" },
@@ -20,32 +21,39 @@ describe("sortChildrenByNameType", () => {
2021
{ name: "use*", children: [] },
2122
{ name: "{camelCase}.ts" },
2223
{ name: "FixedName3.ts" },
23-
{ name: "custom-name1", children: [] },
24-
{ name: "custom_name2", children: [] },
24+
{ name: "custom-name-1", children: [] },
25+
{ name: "custom_name-2", children: [] },
2526
{ name: "{kebab-case}", children: [] },
26-
{ name: "{snake_case}", children: [] },
2727
];
2828

2929
const childrenSorted: Rule[] = [
30-
{ name: "FixedName3.ts" },
31-
{ name: "FixedName2.ts" },
3230
{ name: "FixedName1.ts" },
33-
{ name: "{camelCase}.ts" },
31+
{ name: "FixedName2.ts" },
32+
{ name: "FixedName3.ts" },
33+
3434
{ name: "{FolderName}.ts" },
35+
{ name: "{camelCase}.ts" },
36+
37+
{ name: "*_{FolderName}.ts" },
3538
{ name: "use*.ts" },
3639
{ name: "*_{camelCase}.ts" },
3740
{ name: "use*.ts" },
38-
{ name: "*_{FolderName}.ts" },
41+
3942
{ name: "*" },
4043
{ name: "*" },
41-
{ name: "custom_name2", children: [] },
42-
{ name: "custom-name1", children: [] },
44+
45+
{ name: "custom-name-1", children: [] },
46+
{ name: "custom_name-2", children: [] },
47+
4348
{ name: "{snake_case}", children: [] },
4449
{ name: "{kebab-case}", children: [] },
50+
4551
{ name: "use*", children: [] },
4652
{ name: "use*", children: [] },
53+
4754
{ name: "*", children: [] },
4855
{ name: "*", children: [] },
56+
4957
{ ruleId: "ruleId" },
5058
{ ruleId: "ruleId" },
5159
];

src/rules/folderStructure/helpers/validateFolderStructure/helpers/validatePath/helpers/getChildren/helpers/sortChildrenByNameType.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ export const sortChildrenByNameType = (children: Rule[]): Rule[] =>
3737
if (isRegex(nameA) && !isRegex(nameB)) return 1;
3838
if (!isRegex(nameA) && isRegex(nameB)) return -1;
3939

40-
return -1;
40+
return 0;
4141
},
4242
);

0 commit comments

Comments
 (0)