@cherepanov.pavel/shareable-config 1.0.13 → 1.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.editorconfig-get.js +6 -6
- package/.get-all.js +12 -12
- package/.gitattributes-get.js +6 -6
- package/.gitignore-get.js +12 -12
- package/.vscode/.code-snippets-get.js +14 -14
- package/.vscode/extensions.json-get.js +12 -12
- package/.vscode/settings.json-get.js +12 -12
- package/env.json5.set.js +2 -2
- package/package.json +1 -1
- package/tools/eslint-config/configs/global.js +9 -9
- package/tools/eslint-config/configs/javascript.js +7 -7
- package/tools/eslint-config/configs/json.js +57 -57
- package/tools/eslint-config/configs/typescript.js +9 -9
- package/tools/eslint-config/configs/vue.js +16 -16
- package/tools/eslint-config/index.js +5 -5
- package/tools/eslint-config/rules/constants.js +1 -1
- package/tools/eslint-config/rules/javascript/index.js +2 -2
- package/tools/eslint-config/rules/javascript/possible-problems.js +60 -60
- package/tools/eslint-config/rules/javascript/suggestions.js +206 -207
- package/tools/eslint-config/rules/severity.js +3 -3
- package/tools/eslint-config/rules/stylistic/index.js +2 -2
- package/tools/eslint-config/rules/stylistic/jsFormatting.js +113 -114
- package/tools/eslint-config/rules/stylistic/tsFormatting.js +5 -5
- package/tools/eslint-config/rules/typescript/common.js +103 -103
- package/tools/eslint-config/rules/typescript/compatibility.js +21 -21
- package/tools/eslint-config/rules/typescript/extension.js +46 -46
- package/tools/eslint-config/rules/typescript/index.js +3 -3
- package/tools/eslint-config/rules/vue/base.js +3 -3
- package/tools/eslint-config/rules/vue/extension.js +46 -45
- package/tools/eslint-config/rules/vue/formatting.js +33 -37
- package/tools/eslint-config/rules/vue/index.js +5 -5
- package/tools/eslint-config/rules/vue/possibleProblems.js +123 -123
- package/tools/eslint-config/rules/vue/suggestions.js +76 -76
- package/tools/stylelint-config/config.js +11 -11
- package/tools/stylelint-config/rules/base.js +19 -19
- package/tools/stylelint-config/rules/conflicts.js +2 -2
- package/tools/stylelint-config/rules/order.js +19 -19
- package/tools/stylelint-config/rules/property-groups.js +337 -337
- package/tools/stylelint-config/rules/scss.js +4 -4
- package/tools/stylelint-config/rules/stylistic.js +82 -82
- package/utils/communication.js +3 -3
- package/utils/copy-with-override.js +9 -9
- package/utils/env.js +6 -6
- package/utils/file-header.js +8 -8
- package/utils/file.js +12 -12
- package/utils/lint.js +2 -2
- package/utils/merge.js +11 -11
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
export default {
|
|
2
2
|
rules: {
|
|
3
3
|
/* $-variables */
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
{ ignore:
|
|
4
|
+
"scss/dollar-variable-empty-line-before": [
|
|
5
|
+
"never",
|
|
6
|
+
{ ignore: "after-dollar-variable" },
|
|
7
7
|
],
|
|
8
8
|
// https://gitlab.kadnk.ru/frontend/configs/-/issues/1
|
|
9
|
-
|
|
9
|
+
"scss/load-partial-extension": "always",
|
|
10
10
|
},
|
|
11
11
|
};
|
|
@@ -1,125 +1,125 @@
|
|
|
1
|
-
import { INDENT_SIZE } from
|
|
1
|
+
import { INDENT_SIZE } from "../../eslint-config/rules/constants.js";
|
|
2
2
|
|
|
3
3
|
const MAX_EMPTY_LINES = 1;
|
|
4
4
|
// const MAX_LINE_LENGTH = 80;
|
|
5
5
|
|
|
6
|
-
const ALWAYS =
|
|
7
|
-
const ALWAYS_MULTI_LINE =
|
|
8
|
-
const ALWAYS_SINGLE_LINE =
|
|
6
|
+
const ALWAYS = "always";
|
|
7
|
+
const ALWAYS_MULTI_LINE = "always-multi-line";
|
|
8
|
+
const ALWAYS_SINGLE_LINE = "always-single-line";
|
|
9
9
|
|
|
10
|
-
const NEVER =
|
|
11
|
-
const NEVER_MULTI_LINE =
|
|
12
|
-
const NEVER_SINGLE_LINE =
|
|
10
|
+
const NEVER = "never";
|
|
11
|
+
const NEVER_MULTI_LINE = "never-multi-line";
|
|
12
|
+
const NEVER_SINGLE_LINE = "never-single-line";
|
|
13
13
|
|
|
14
|
-
const LOWER_CASE =
|
|
14
|
+
const LOWER_CASE = "lower";
|
|
15
15
|
|
|
16
16
|
export default {
|
|
17
17
|
rules: {
|
|
18
18
|
/* == common == */
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
"@stylistic/indentation": INDENT_SIZE,
|
|
20
|
+
"@stylistic/linebreaks": "unix",
|
|
21
|
+
"@stylistic/max-empty-lines": MAX_EMPTY_LINES,
|
|
22
22
|
// '@stylistic/max-line-length': [MAX_LINE_LENGTH, { ignorePattern: '/^@(import|use)\\s+/' }],
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
23
|
+
"@stylistic/no-empty-first-line": true,
|
|
24
|
+
"@stylistic/no-eol-whitespace": true,
|
|
25
|
+
"@stylistic/no-extra-semicolons": true,
|
|
26
|
+
"@stylistic/no-missing-end-of-source-newline": true,
|
|
27
|
+
"@stylistic/unicode-bom": NEVER,
|
|
28
28
|
|
|
29
29
|
/* == color == */
|
|
30
|
-
|
|
30
|
+
"@stylistic/color-hex-case": LOWER_CASE,
|
|
31
31
|
|
|
32
32
|
/* == function == */
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
33
|
+
"@stylistic/function-comma-newline-after": ALWAYS_MULTI_LINE,
|
|
34
|
+
"@stylistic/function-comma-newline-before": NEVER_MULTI_LINE,
|
|
35
|
+
"@stylistic/function-comma-space-after": ALWAYS_SINGLE_LINE,
|
|
36
|
+
"@stylistic/function-comma-space-before": NEVER,
|
|
37
|
+
"@stylistic/function-max-empty-lines": 0,
|
|
38
|
+
"@stylistic/function-parentheses-space-inside": NEVER_SINGLE_LINE,
|
|
39
|
+
"@stylistic/function-whitespace-after": ALWAYS,
|
|
40
40
|
|
|
41
41
|
/* == number == */
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
"@stylistic/number-leading-zero": ALWAYS,
|
|
43
|
+
"@stylistic/number-no-trailing-zeros": true,
|
|
44
44
|
|
|
45
45
|
/* == string == */
|
|
46
|
-
|
|
46
|
+
"@stylistic/string-quotes": "double",
|
|
47
47
|
|
|
48
48
|
/* == unit == */
|
|
49
|
-
|
|
49
|
+
"@stylistic/unit-case": LOWER_CASE,
|
|
50
50
|
|
|
51
51
|
/* == value list == */
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
52
|
+
"@stylistic/value-list-comma-newline-after": ALWAYS_MULTI_LINE,
|
|
53
|
+
"@stylistic/value-list-comma-newline-before": NEVER_MULTI_LINE,
|
|
54
|
+
"@stylistic/value-list-comma-space-after": ALWAYS_SINGLE_LINE,
|
|
55
|
+
"@stylistic/value-list-comma-space-before": NEVER,
|
|
56
|
+
"@stylistic/value-list-max-empty-lines": 0,
|
|
57
57
|
|
|
58
58
|
/* == property == */
|
|
59
|
-
|
|
59
|
+
"@stylistic/property-case": LOWER_CASE,
|
|
60
60
|
|
|
61
61
|
/* == declaration == */
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
62
|
+
"@stylistic/declaration-bang-space-after": NEVER,
|
|
63
|
+
"@stylistic/declaration-bang-space-before": ALWAYS,
|
|
64
|
+
"@stylistic/declaration-colon-newline-after": ALWAYS_MULTI_LINE,
|
|
65
|
+
"@stylistic/declaration-colon-space-after": ALWAYS_SINGLE_LINE,
|
|
66
|
+
"@stylistic/declaration-colon-space-before": NEVER,
|
|
67
67
|
|
|
68
68
|
/* == declaration block == */
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
69
|
+
"@stylistic/declaration-block-semicolon-newline-after": ALWAYS,
|
|
70
|
+
"@stylistic/declaration-block-semicolon-newline-before": NEVER_MULTI_LINE,
|
|
71
|
+
"@stylistic/declaration-block-semicolon-space-after": ALWAYS_SINGLE_LINE,
|
|
72
|
+
"@stylistic/declaration-block-semicolon-space-before": NEVER,
|
|
73
|
+
"@stylistic/declaration-block-trailing-semicolon": ALWAYS,
|
|
74
74
|
|
|
75
75
|
/* == block == */
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
76
|
+
"@stylistic/block-closing-brace-empty-line-before": NEVER,
|
|
77
|
+
"@stylistic/block-closing-brace-newline-after": ALWAYS,
|
|
78
|
+
"@stylistic/block-closing-brace-newline-before": ALWAYS,
|
|
79
|
+
"@stylistic/block-closing-brace-space-after": ALWAYS_SINGLE_LINE,
|
|
80
|
+
"@stylistic/block-closing-brace-space-before": ALWAYS_SINGLE_LINE,
|
|
81
|
+
"@stylistic/block-opening-brace-newline-after": ALWAYS,
|
|
82
|
+
"@stylistic/block-opening-brace-newline-before": null,
|
|
83
|
+
"@stylistic/block-opening-brace-space-after": ALWAYS_SINGLE_LINE,
|
|
84
|
+
"@stylistic/block-opening-brace-space-before": ALWAYS,
|
|
85
85
|
|
|
86
86
|
/* == selector == */
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
87
|
+
"@stylistic/selector-attribute-brackets-space-inside": NEVER,
|
|
88
|
+
"@stylistic/selector-attribute-operator-space-after": NEVER,
|
|
89
|
+
"@stylistic/selector-attribute-operator-space-before": NEVER,
|
|
90
|
+
"@stylistic/selector-combinator-space-after": ALWAYS,
|
|
91
|
+
"@stylistic/selector-combinator-space-before": ALWAYS,
|
|
92
|
+
"@stylistic/selector-descendant-combinator-no-non-space": true,
|
|
93
|
+
"@stylistic/selector-max-empty-lines": 0,
|
|
94
|
+
"@stylistic/selector-pseudo-class-case": LOWER_CASE,
|
|
95
|
+
"@stylistic/selector-pseudo-class-parentheses-space-inside": NEVER,
|
|
96
|
+
"@stylistic/selector-pseudo-element-case": LOWER_CASE,
|
|
97
97
|
|
|
98
98
|
/* == selector list == */
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
99
|
+
"@stylistic/selector-list-comma-newline-after": ALWAYS,
|
|
100
|
+
"@stylistic/selector-list-comma-newline-before": NEVER_MULTI_LINE,
|
|
101
|
+
"@stylistic/selector-list-comma-space-after": ALWAYS_SINGLE_LINE,
|
|
102
|
+
"@stylistic/selector-list-comma-space-before": NEVER,
|
|
103
103
|
|
|
104
104
|
/* == media features == */
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
105
|
+
"@stylistic/media-feature-colon-space-after": ALWAYS,
|
|
106
|
+
"@stylistic/media-feature-colon-space-before": NEVER,
|
|
107
|
+
"@stylistic/media-feature-name-case": LOWER_CASE,
|
|
108
|
+
"@stylistic/media-feature-parentheses-space-inside": NEVER,
|
|
109
|
+
"@stylistic/media-feature-range-operator-space-after": ALWAYS,
|
|
110
|
+
"@stylistic/media-feature-range-operator-space-before": ALWAYS,
|
|
111
111
|
|
|
112
112
|
/* == media query list == */
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
113
|
+
"@stylistic/media-query-list-comma-newline-after": ALWAYS_MULTI_LINE,
|
|
114
|
+
"@stylistic/media-query-list-comma-newline-before": NEVER_MULTI_LINE,
|
|
115
|
+
"@stylistic/media-query-list-comma-space-after": ALWAYS_SINGLE_LINE,
|
|
116
|
+
"@stylistic/media-query-list-comma-space-before": NEVER_SINGLE_LINE,
|
|
117
117
|
|
|
118
118
|
/* == at rule == */
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
119
|
+
"@stylistic/at-rule-name-case": LOWER_CASE,
|
|
120
|
+
"@stylistic/at-rule-name-newline-after": ALWAYS_MULTI_LINE,
|
|
121
|
+
"@stylistic/at-rule-name-space-after": ALWAYS,
|
|
122
|
+
"@stylistic/at-rule-semicolon-newline-after": ALWAYS,
|
|
123
|
+
"@stylistic/at-rule-semicolon-space-before": NEVER,
|
|
124
124
|
},
|
|
125
125
|
};
|
package/utils/communication.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import readline from
|
|
1
|
+
import readline from "readline";
|
|
2
2
|
|
|
3
3
|
export async function askTypescript() {
|
|
4
4
|
return new Promise((resolve) => {
|
|
@@ -7,7 +7,7 @@ export async function askTypescript() {
|
|
|
7
7
|
output: process.stdout,
|
|
8
8
|
});
|
|
9
9
|
rl.question(
|
|
10
|
-
|
|
10
|
+
"Вы используете typescript? (Enter - нет, любые символы + Enter - да):",
|
|
11
11
|
(answer) => {
|
|
12
12
|
rl.close();
|
|
13
13
|
resolve(Boolean(answer.trim().toLowerCase()));
|
|
@@ -23,7 +23,7 @@ export async function askFramework() {
|
|
|
23
23
|
output: process.stdout,
|
|
24
24
|
});
|
|
25
25
|
rl.question(
|
|
26
|
-
|
|
26
|
+
"Какой фреймворк вы используете? (vue/nuxt/quasar, нажмите Enter, чтобы скопировать только framework-less): ",
|
|
27
27
|
(answer) => {
|
|
28
28
|
rl.close();
|
|
29
29
|
resolve(answer.trim().toLowerCase());
|
|
@@ -1,24 +1,24 @@
|
|
|
1
|
-
import { readFile } from
|
|
2
|
-
import { getHeader } from
|
|
3
|
-
import { outputFile } from
|
|
1
|
+
import { readFile } from "fs/promises";
|
|
2
|
+
import { getHeader } from "../utils/file-header.js";
|
|
3
|
+
import { outputFile } from "fs-extra";
|
|
4
4
|
|
|
5
5
|
export async function copyFile({ destFile, srcFileData, fileLabel }) {
|
|
6
6
|
// Если файла нет — просто создаём его
|
|
7
7
|
try {
|
|
8
|
-
await readFile(destFile,
|
|
8
|
+
await readFile(destFile, "utf8");
|
|
9
9
|
} catch {
|
|
10
|
-
await outputFile(destFile, `${getHeader(
|
|
10
|
+
await outputFile(destFile, `${getHeader("#")}${srcFileData}`);
|
|
11
11
|
console.info(`${fileLabel} пересоздан`);
|
|
12
12
|
return {};
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
// Если файл есть — разбираем оба файла
|
|
16
|
-
const destFileData = await readFile(destFile,
|
|
16
|
+
const destFileData = await readFile(destFile, "utf8");
|
|
17
17
|
// Ищем строку override (без учёта регистра)
|
|
18
18
|
const overrideRegex = /^# override.*$/imu;
|
|
19
19
|
const match = destFileData.match(overrideRegex);
|
|
20
20
|
if (!match) {
|
|
21
|
-
await outputFile(destFile, `${getHeader(
|
|
21
|
+
await outputFile(destFile, `${getHeader("#")}${srcFileData}`);
|
|
22
22
|
console.info(`${fileLabel} пересоздан`);
|
|
23
23
|
return {};
|
|
24
24
|
}
|
|
@@ -26,7 +26,7 @@ export async function copyFile({ destFile, srcFileData, fileLabel }) {
|
|
|
26
26
|
return { destFileData, match };
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
export async function copyWithOverride({ destFile, srcFileData, fileLabel =
|
|
29
|
+
export async function copyWithOverride({ destFile, srcFileData, fileLabel = "" }) {
|
|
30
30
|
try {
|
|
31
31
|
const { destFileData, match } = await copyFile({ destFile, srcFileData, fileLabel });
|
|
32
32
|
if (!destFileData) {
|
|
@@ -37,7 +37,7 @@ export async function copyWithOverride({ destFile, srcFileData, fileLabel = '' }
|
|
|
37
37
|
const preserved = destFileData.slice(overrideIndex);
|
|
38
38
|
const newContent = `${srcFileData.trimEnd()}\n\n${preserved.trimStart()}`;
|
|
39
39
|
|
|
40
|
-
await outputFile(destFile, `${getHeader(
|
|
40
|
+
await outputFile(destFile, `${getHeader("#")}${newContent}`);
|
|
41
41
|
console.info(`${fileLabel} обновлён с учётом override`);
|
|
42
42
|
} catch (err) {
|
|
43
43
|
console.error(`Ошибка копирования ${fileLabel}:`, err.message);
|
package/utils/env.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { readFile } from
|
|
2
|
-
import path from
|
|
3
|
-
import JSON5 from
|
|
4
|
-
import { outputFile } from
|
|
1
|
+
import { readFile } from "fs/promises";
|
|
2
|
+
import path from "path";
|
|
3
|
+
import JSON5 from "json5";
|
|
4
|
+
import { outputFile } from "fs-extra";
|
|
5
5
|
|
|
6
|
-
const envFileSrc = path.join(process.cwd(),
|
|
6
|
+
const envFileSrc = path.join(process.cwd(), "frontend-configs.env.json5");
|
|
7
7
|
|
|
8
8
|
export async function getEnvs() {
|
|
9
|
-
const srcFileData = await readFile(envFileSrc,
|
|
9
|
+
const srcFileData = await readFile(envFileSrc, "utf8");
|
|
10
10
|
const parsedSrcFileData = JSON5.parse(srcFileData);
|
|
11
11
|
return parsedSrcFileData;
|
|
12
12
|
}
|
package/utils/file-header.js
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { readFile } from
|
|
1
|
+
import { readFile } from "fs/promises";
|
|
2
2
|
|
|
3
|
-
const pkg = JSON.parse(await readFile(new URL(
|
|
3
|
+
const pkg = JSON.parse(await readFile(new URL("../package.json", import.meta.url), "utf8"));
|
|
4
4
|
|
|
5
|
-
export function getHeader(comment =
|
|
5
|
+
export function getHeader(comment = "//") {
|
|
6
6
|
const lines = [
|
|
7
|
-
|
|
8
|
-
`${pkg.repository?.url ||
|
|
9
|
-
`Version: ${pkg.version ||
|
|
10
|
-
|
|
7
|
+
"This file is generated with",
|
|
8
|
+
`${pkg.repository?.url || ""}`,
|
|
9
|
+
`Version: ${pkg.version || ""}`,
|
|
10
|
+
"File may contain override sections, see project README for more details",
|
|
11
11
|
];
|
|
12
12
|
|
|
13
13
|
return `${lines.map((line) => {
|
|
14
14
|
return `${comment} ${line}`.trim();
|
|
15
|
-
}).join(
|
|
15
|
+
}).join("\n")}\n`;
|
|
16
16
|
}
|
package/utils/file.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { fileURLToPath } from
|
|
2
|
-
import path from
|
|
3
|
-
import { readFile } from
|
|
4
|
-
import JSON5 from
|
|
1
|
+
import { fileURLToPath } from "url";
|
|
2
|
+
import path from "path";
|
|
3
|
+
import { readFile } from "fs/promises";
|
|
4
|
+
import JSON5 from "json5";
|
|
5
5
|
|
|
6
6
|
export async function getSrcFileData({ fileName }) {
|
|
7
7
|
const dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
8
|
-
const src = path.join(dirname,
|
|
9
|
-
const srcFileData = await readFile(src,
|
|
8
|
+
const src = path.join(dirname, "..", ".vscode", fileName);
|
|
9
|
+
const srcFileData = await readFile(src, "utf8");
|
|
10
10
|
|
|
11
11
|
return srcFileData;
|
|
12
12
|
}
|
|
@@ -19,23 +19,23 @@ export async function getSrcJSONFileData({
|
|
|
19
19
|
const srcFileData = await getSrcFileData({ fileName });
|
|
20
20
|
|
|
21
21
|
// Если есть нет typescript, нет лишних проблем, возвращаем
|
|
22
|
-
if (!srcFileData.includes(
|
|
22
|
+
if (!srcFileData.includes("// typescript")) {
|
|
23
23
|
return srcFileData;
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
const lines = srcFileData.split(
|
|
26
|
+
const lines = srcFileData.split("\n");
|
|
27
27
|
const result = [];
|
|
28
28
|
let nextLineIsTypescript = false;
|
|
29
29
|
let nextLineIsTypescriptMultiline = false;
|
|
30
30
|
|
|
31
31
|
lines.forEach((line) => {
|
|
32
32
|
// если следующая строка typescript only
|
|
33
|
-
if (line.includes(
|
|
33
|
+
if (line.includes("// typescript")) {
|
|
34
34
|
// если несколько следующих строк typescript only
|
|
35
|
-
if (line.includes(
|
|
35
|
+
if (line.includes("// typescript multiline")) {
|
|
36
36
|
// проверяем это конец multiline typescript комментария, или начало, и в соответствии
|
|
37
37
|
// с этим ставим флаг
|
|
38
|
-
nextLineIsTypescriptMultiline = !(line.includes(
|
|
38
|
+
nextLineIsTypescriptMultiline = !(line.includes("// typescript multiline end"));
|
|
39
39
|
} else {
|
|
40
40
|
nextLineIsTypescript = true; // Следующая строка будет typescript-only
|
|
41
41
|
}
|
|
@@ -55,7 +55,7 @@ export async function getSrcJSONFileData({
|
|
|
55
55
|
}
|
|
56
56
|
});
|
|
57
57
|
|
|
58
|
-
const stringResult = result.join(
|
|
58
|
+
const stringResult = result.join("\n");
|
|
59
59
|
if (removeDuplicateKeys) {
|
|
60
60
|
return JSON.stringify(JSON5.parse(stringResult), null, 2);
|
|
61
61
|
}
|
package/utils/lint.js
CHANGED
package/utils/merge.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
export async function mergeWithOverride(baseContent, overrideContent) {
|
|
8
8
|
let result = baseContent;
|
|
9
9
|
|
|
10
|
-
if (!overrideContent.includes(
|
|
10
|
+
if (!overrideContent.includes("// override")) {
|
|
11
11
|
return result;
|
|
12
12
|
}
|
|
13
13
|
|
|
@@ -23,7 +23,7 @@ export async function mergeWithOverride(baseContent, overrideContent) {
|
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
function findOverrideBlocks(overrideContent) {
|
|
26
|
-
const lines = overrideContent.split(
|
|
26
|
+
const lines = overrideContent.split("\n");
|
|
27
27
|
const overrideBlocks = [];
|
|
28
28
|
let currentBlock = null;
|
|
29
29
|
let braceCount = 0;
|
|
@@ -31,7 +31,7 @@ function findOverrideBlocks(overrideContent) {
|
|
|
31
31
|
for (let i = 0; i < lines.length; i++) {
|
|
32
32
|
const line = lines[i];
|
|
33
33
|
|
|
34
|
-
if (line.includes(
|
|
34
|
+
if (line.includes("// override")) {
|
|
35
35
|
currentBlock = {
|
|
36
36
|
startLine: i,
|
|
37
37
|
lines: [line],
|
|
@@ -98,7 +98,7 @@ function findOverrideBlocks(overrideContent) {
|
|
|
98
98
|
|
|
99
99
|
function processArrayOverride(baseContent, block) {
|
|
100
100
|
// Разбиваем на строки
|
|
101
|
-
const lines = baseContent.split(
|
|
101
|
+
const lines = baseContent.split("\n");
|
|
102
102
|
// Копируем только нужный диапазон
|
|
103
103
|
const overrideLines = lines.slice(block.startIdx, block.endIdx);
|
|
104
104
|
|
|
@@ -106,7 +106,7 @@ function processArrayOverride(baseContent, block) {
|
|
|
106
106
|
let processed = overrideLines;
|
|
107
107
|
for (const line of block.lines) {
|
|
108
108
|
const trimmed = line.trim();
|
|
109
|
-
if (trimmed.startsWith(
|
|
109
|
+
if (trimmed.startsWith("//")) {
|
|
110
110
|
const match = trimmed.match(/^\/\/\s*"([^"]+)"/u);
|
|
111
111
|
if (match) {
|
|
112
112
|
const elementToRemove = match[1];
|
|
@@ -125,7 +125,7 @@ function processArrayOverride(baseContent, block) {
|
|
|
125
125
|
...lines.slice(block.endIdx),
|
|
126
126
|
];
|
|
127
127
|
|
|
128
|
-
return resultLines.join(
|
|
128
|
+
return resultLines.join("\n");
|
|
129
129
|
}
|
|
130
130
|
|
|
131
131
|
function findEndOfArrOrObj(startIdx, lines, block) {
|
|
@@ -152,7 +152,7 @@ function findEndOfArrOrObj(startIdx, lines, block) {
|
|
|
152
152
|
function pasteOverrideInsideEndOfPath(block, result) {
|
|
153
153
|
if (block.path.length) {
|
|
154
154
|
const resultArr = [];
|
|
155
|
-
const lines = result.split(
|
|
155
|
+
const lines = result.split("\n");
|
|
156
156
|
let pathCount = 0;
|
|
157
157
|
for (let i = 0; i < lines.length; i++) {
|
|
158
158
|
if (lines[i].includes(block.path[pathCount])) {
|
|
@@ -164,21 +164,21 @@ function pasteOverrideInsideEndOfPath(block, result) {
|
|
|
164
164
|
}
|
|
165
165
|
}
|
|
166
166
|
if (i === block.endIdx) {
|
|
167
|
-
resultArr.push(
|
|
167
|
+
resultArr.push("");
|
|
168
168
|
resultArr.push(...block.lines);
|
|
169
169
|
}
|
|
170
170
|
resultArr.push(lines[i]);
|
|
171
171
|
}
|
|
172
172
|
|
|
173
|
-
return resultArr.join(
|
|
173
|
+
return resultArr.join("\n");
|
|
174
174
|
}
|
|
175
|
-
const lastBraceIndex = result.lastIndexOf(
|
|
175
|
+
const lastBraceIndex = result.lastIndexOf("}");
|
|
176
176
|
if (lastBraceIndex !== -1) {
|
|
177
177
|
const beforeBrace = result.substring(0, lastBraceIndex);
|
|
178
178
|
const afterBrace = result.substring(lastBraceIndex);
|
|
179
179
|
result = (
|
|
180
180
|
`${beforeBrace
|
|
181
|
-
}\n${block.lines.join(
|
|
181
|
+
}\n${block.lines.join("\n")}\n${
|
|
182
182
|
afterBrace}`
|
|
183
183
|
);
|
|
184
184
|
}
|