@cherepanov.pavel/shareable-config 1.0.10 → 1.0.12

package/.vscode/.code-snippets-get.js

@@ -7,6 +7,7 @@ import { mergeWithOverride } from '../utils/merge.js';
 import { getHeader } from '../utils/file-header.js';
 import { getSrcJSONFileData } from '../utils/file.js';
 import { getEnvs } from '../utils/env.js';
+import { eslintFiles } from '../utils/lint.js';
 
 const fileNames = [
 	'vue.code-snippets',
@@ -41,6 +42,7 @@ try {
 		}
 
 		await outputFile(destFile, `${getHeader()}${result}`);
+		await eslintFiles(destFile);
 		if (isDestFileHaveOverride) {
 			console.info(`${fileName} обновлён с учётом override`);
 		} else {

package/.vscode/extensions.json

@@ -22,4 +22,4 @@
 		// need to check that it's working well
 		// iulian-radu-at.find-unused-exports
 	],
-}
+}

package/.vscode/extensions.json-get.js

@@ -7,6 +7,7 @@ import { mergeWithOverride } from '../utils/merge.js';
 import { getHeader } from '../utils/file-header.js';
 import { getEnvs } from '../utils/env.js';
 import { outputFile } from 'fs-extra';
+import { eslintFiles } from '../utils/lint.js';
 
 const fileName = 'extensions.json';
 const destFile = path.join(process.cwd(), `.vscode/${fileName}`);
@@ -33,6 +34,7 @@ try {
 	}
 
 	await outputFile(destFile, `${getHeader()}${result}`);
+	await eslintFiles(destFile);
 	if (overrideContent) {
 		console.info(`${fileName} обновлён с учётом override`);
 	} else {

package/.vscode/settings.json-get.js

@@ -7,6 +7,7 @@ import { mergeWithOverride } from '../utils/merge.js';
 import { getHeader } from '../utils/file-header.js';
 import { getEnvs } from '../utils/env.js';
 import { outputFile } from 'fs-extra';
+import { eslintFiles } from '../utils/lint.js';
 
 const fileName = 'settings.json';
 const destFile = path.join(process.cwd(), `.vscode/${fileName}`);
@@ -33,6 +34,7 @@ try {
 	}
 
 	await outputFile(destFile, `${getHeader()}${result}`);
+	await eslintFiles(destFile);
 	if (overrideContent) {
 		console.info(`${fileName} обновлён с учётом override`);
 	} else {

package/.vscode/vue.code-snippets

@@ -25,4 +25,4 @@
 		],
 		// typescript multiline end
 	},
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cherepanov.pavel/shareable-config",
 	"description": "setup for new repositories",
-	"version": "1.0.10",
+	"version": "1.0.12",
 	"type": "module",
 	"devEngines": {
 		"packageManager": {
@@ -47,7 +47,7 @@
 		"lint:js": "eslint",
 		"lint:js:fix": "npm run lint:js -- --fix",
 		"lint:css": "stylelint \"./**/*.{css,vue}\" --ignore-path .gitignore --formatter verbose",
-		"lint:css:fix": "npm run lint:css:files -- --fix"
+		"lint:css:fix": "npm run lint:css -- --fix"
 	},
 	"dependencies": {
 		"@eslint/compat": "2.1.0",

package/tools/eslint-config/configs/json.js

@@ -2,6 +2,9 @@ import { defineConfig } from 'eslint/config';
 import jsonc from 'eslint-plugin-jsonc';
 import { ERROR } from '../rules/severity.js';
 import { jsFormatting } from '../rules/stylistic/index.js';
+import { possibleProblemRules } from '../rules/javascript/possible-problems.js';
+import { suggestionRules } from '../rules/javascript/suggestions.js';
+import stylisticPlugin from '@stylistic/eslint-plugin';
 
 const JSON_BUT_JSONC_FILES = [
 	'**/.vscode/*.json',
@@ -9,6 +12,7 @@ const JSON_BUT_JSONC_FILES = [
 	'**/tsconfig*.json',
 ];
 const COMMON_RULES = {
+	'@stylistic/eol-last': jsFormatting['@stylistic/eol-last'],
 	'jsonc/no-bigint-literals': ERROR,
 	'jsonc/no-binary-expression': ERROR,
 	'jsonc/no-binary-numeric-literals': ERROR,
@@ -27,11 +31,20 @@ const COMMON_RULES = {
 	'jsonc/array-bracket-newline': jsFormatting['@stylistic/array-bracket-newline'],
 	'jsonc/array-bracket-spacing': jsFormatting['@stylistic/array-bracket-spacing'],
 	'jsonc/array-element-newline': jsFormatting['@stylistic/array-element-newline'],
+	'jsonc/comma-dangle': jsFormatting['@stylistic/comma-dangle'],
+	'jsonc/comma-style': jsFormatting['@stylistic/comma-style'],
 	'jsonc/indent': [
 		jsFormatting['@stylistic/indent'][0],
 		jsFormatting['@stylistic/indent'][1],
 	],
-	'jsonc/comma-dangle': jsFormatting['@stylistic/comma-dangle'],
+	'jsonc/key-spacing': jsFormatting['@stylistic/key-spacing'],
+	'jsonc/no-dupe-keys': possibleProblemRules['no-dupe-keys'],
+	'jsonc/no-floating-decimal': jsFormatting['@stylistic/no-floating-decimal'],
+	'jsonc/no-irregular-whitespace': possibleProblemRules['no-irregular-whitespace'],
+	'jsonc/no-octal-escape': suggestionRules['no-octal-escape'],
+	'jsonc/no-octal': suggestionRules['no-octal'],
+	'jsonc/no-sparse-arrays': ERROR,
+	'jsonc/no-useless-escape': suggestionRules['no-useless-escape'],
 };
 const JSON_RULES = {
 	'jsonc/no-comments': ERROR,
@@ -42,12 +55,14 @@ const JSON_RULES = {
 };
 const JSON_JSONC_RULES = {
 	'jsonc/no-infinity': ERROR,
+	'jsonc/no-multi-str': suggestionRules['no-multi-str'],
 };
 
 
 export default defineConfig([
 	{
 		plugins: {
+			'@stylistic': stylisticPlugin,
 			jsonc,
 		},
 	},

package/tools/eslint-config/rules/javascript/possible-problems.js

@@ -28,7 +28,7 @@ export const possibleProblemRules = {
 	'no-dupe-args': [ERROR],
 	'no-dupe-class-members': [ERROR],
 	'no-dupe-else-if': [ERROR],
-	'no-dupe-keys': [ERROR],
+	'no-dupe-keys': [WARN],
 	'no-duplicate-case': [ERROR],
 	'no-duplicate-imports': [ERROR],
 	'no-empty-character-class': [ERROR],

package/tools/eslint-config/rules/stylistic/jsFormatting.js

@@ -43,21 +43,6 @@ export default {
 	'@stylistic/comma-style': [
 		ERROR,
 		'last',
-		{
-			exceptions: {
-				ArrayExpression: false,
-				ArrayPattern: false,
-				ArrowFunctionExpression: false,
-				CallExpression: false,
-				FunctionDeclaration: false,
-				FunctionExpression: false,
-				ImportDeclaration: false,
-				NewExpression: false,
-				ObjectExpression: false,
-				ObjectPattern: false,
-				VariableDeclaration: false,
-			},
-		},
 	],
 	'@stylistic/computed-property-spacing': [
 		ERROR,
@@ -101,7 +86,11 @@ export default {
 	],
 	'@stylistic/key-spacing': [
 		ERROR,
-		{ beforeColon: false, afterColon: true },
+		{
+			beforeColon: false,
+			afterColon: true,
+			mode: 'strict',
+		},
 	],
 	'@stylistic/keyword-spacing': [
 		ERROR,

package/tools/eslint-config/rules/vue/suggestions.js

@@ -1,3 +1,4 @@
+import { possibleProblemRules } from '../javascript/possible-problems.js';
 import { ERROR, OFF } from '../severity.js';
 
 export const suggestionRules = {
@@ -31,7 +32,7 @@ export const suggestionRules = {
 	'vue/no-deprecated-v-on-native-modifier': [ERROR],
 	'vue/no-deprecated-v-on-number-modifiers': [ERROR],
 	'vue/no-deprecated-vue-config-keycodes': [ERROR],
-	'vue/no-dupe-keys': [ERROR],
+	'vue/no-dupe-keys': possibleProblemRules['no-dupe-keys'],
 	'vue/no-dupe-v-else-if': [ERROR],
 	'vue/no-duplicate-attributes': [ERROR],
 	'vue/no-export-in-script-setup': [ERROR],

package/utils/file.js

@@ -57,7 +57,7 @@ export async function getSrcJSONFileData({
 
 	const stringResult = result.join('\n');
 	if (removeDuplicateKeys) {
-		return JSON.stringify(JSON5.parse(stringResult), null, 2);
+		return JSON.stringify(JSON5.parse(stringResult));
 	}
 
 	return stringResult;

package/utils/lint.js

@@ -0,0 +1,14 @@
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+
+const execAsync = promisify(exec);
+//  filePaths: string | string[]
+export async function eslintFiles(filePaths) {
+	const paths = Array.isArray(filePaths) ? filePaths : [filePaths];
+
+	const promises = paths.map(async (path) => {
+		return execAsync(`eslint ${path} --fix`);
+	});
+
+	return Promise.all(promises);
+}