@cherepanov.pavel/shareable-config 2.0.3 → 2.0.5

package/.gitignore

@@ -1,15 +1,19 @@
-node_modules
-.idea
+/node_modules/
+/.idea/
 *.local
 
 # vue
-dist
+/dist/
 
 # nuxt
-.output
-.nuxt
+/.output/
+/.nuxt/
 
 # quasar
-dist
-.quasar
-quasar.config.*.temporary.compiled*
+/dist/
+/.quasar/
+quasar.config.*.temporary.compiled*
+
+# astro
+/dist/
+/.astro/

package/.gitignore-get.js

@@ -24,14 +24,13 @@ async function getGitignoreFileData(framework) {
 
 	const [
 		commonData,
-	] = srcFileData.split(/^#\s*\w+/mu);
+		...sections
+	] = srcFileData.split(/^# /mu);
 
 	if (!framework) {
-		return commonData.trim();
+		return commonData;
 	}
 
-	const sections = srcFileData.split(/^#\s*/mu)
-	.slice(1);
 	const matchedSection = sections.find((section) => {
 		const [
 			header,
@@ -39,7 +38,6 @@ async function getGitignoreFileData(framework) {
 		return (
 			header
 			.trim()
-			.toLowerCase()
 		) === framework;
 	});
 
@@ -48,14 +46,19 @@ async function getGitignoreFileData(framework) {
 			header,
 			...body
 		] = matchedSection.split("\n");
-		return `${commonData.trim()}\n\n# ${header}\n${
-			body
-			.join("\n")
-			.trim()
-		}`.trim();
+		return (
+			// eslint-disable-next-line prefer-template
+			`${commonData.trim()}\n\n`
+			+ `# ${header.trim()}\n`
+			+ (
+				body
+				.join("\n")
+				.trim()
+			)
+		);
 	}
-	// Если не найдено — только общий контент
-	return commonData.trim();
+	// Если не найдено, только общий контент
+	return commonData;
 }
 
 try {

package/README.md

@@ -19,7 +19,7 @@ As you'll see further down in this README, the project is flexible and supports
 1. **Open the target project.**
 2. **Install the package:**
   ```sh
-  npm i @cherepanov.pavel/shareable-config
+  npm i @cherepanov.pavel/shareable-config -D
   ```
 
 3. **Copy the config files:**

package/env.json5.set.js

@@ -4,21 +4,19 @@ import {
 	askFramework, askOptionsApi, askTypescript,
 } from "./modules/shared/utils/communication.js";
 import {
-	getEnvs, setEnvs, envFileSrc,
+	getEnvs, setEnvs,
 } from "./modules/shared/utils/env.js";
-import {
-	eslintFiles,
-} from "./modules/shared/utils/lint.js";
 
-let envs = {};
-try {
-	envs = await getEnvs();
-} catch (err) {}
+const envs = await (
+	getEnvs()
+	.catch(() => {
+		return {
+		};
+	})
+);
 
 envs.isRepositoryUseTypescript = await askTypescript();
 envs.repositoryFramework = await askFramework();
 envs.isRepositoryUseOptionsApi = await askOptionsApi();
 
 await setEnvs(envs);
-
-await eslintFiles(envFileSrc);

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

@@ -57,24 +57,7 @@ const COMMON_RULES = {
 	"jsonc/no-useless-escape": suggestionRules["no-useless-escape"],
 	"jsonc/object-curly-newline": [
 		jsFormatting["@stylistic/object-curly-newline"][0],
-		{
-			"ObjectExpression": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"ObjectPattern": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"ImportDeclaration": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"ExportDeclaration": {
-				multiline: false,
-				minProperties: 1,
-			},
-		},
+		jsFormatting["@stylistic/object-curly-newline"][1],
 		// Object.fromEntries(
 		// 	[
 		// 		"ObjectExpression",

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

@@ -77,7 +77,7 @@ export const possibleProblemRules = {
 		ERROR,
 	],
 	"no-empty-pattern": [
-		ERROR,
+		WARN,
 	],
 	"no-ex-assign": [
 		ERROR,

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

@@ -9,10 +9,7 @@ import {
 export default {
 	"@stylistic/array-bracket-newline": [
 		ERROR,
-		{
-			multiline: true,
-			minItems: 1,
-		},
+		"always",
 	],
 	"@stylistic/array-bracket-spacing": [
 		ERROR,
@@ -226,36 +223,7 @@ export default {
 	],
 	"@stylistic/object-curly-newline": [
 		ERROR,
-		{
-			"ObjectExpression": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"ObjectPattern": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"ImportDeclaration": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"ExportDeclaration": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"TSTypeLiteral": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"TSInterfaceBody": {
-				multiline: false,
-				minProperties: 1,
-			},
-			"TSEnumBody": {
-				multiline: false,
-				minProperties: 1,
-			},
-		},
+		"always",
 	],
 	"@stylistic/object-curly-spacing": [
 		ERROR,

package/modules/shared/constants/index.js

@@ -0,0 +1,6 @@
+export const supportedFrameworks = {
+	vue: "vue",
+	nuxt: "nuxt",
+	quasar: "quasar",
+	astro: "astro",
+};

package/modules/shared/utils/communication.js

@@ -1,57 +1,45 @@
-import readline from "readline";
+import {
+	cancel, isCancel, confirm, select,
+} from "@clack/prompts";
+import {
+	supportedFrameworks,
+} from "../constants/index.js";
 
 export async function askTypescript() {
-	return new Promise((resolve) => {
-		const rl = readline.createInterface({
-			input: process.stdin,
-			output: process.stdout,
-		});
-		rl.question(
-			"Do you use TypeScript? (Enter — no, any characters + Enter — yes):",
-			(answer) => {
-				rl.close();
-				resolve(Boolean(
-					answer,
-				));
-			},
-		);
-	});
+	return unwrapPrompt(confirm({
+		message: "Do you use TypeScript?",
+		initialValue: true,
+	}));
 }
 
 export async function askFramework() {
-	return new Promise((resolve) => {
-		const rl = readline.createInterface({
-			input: process.stdin,
-			output: process.stdout,
-		});
-		rl.question(
-			"Which framework do you use? (vue/nuxt/quasar, press Enter to copy only the framework-less): ",
-			(answer) => {
-				rl.close();
-				resolve(
-					answer
-					.trim()
-					.toLowerCase(),
-				);
-			},
-		);
-	});
+	return unwrapPrompt(select({
+		message: "Which framework do you use?",
+		options: (
+			Object.values(supportedFrameworks)
+			.map((value) => {
+				return {
+					value,
+				};
+			})
+		),
+	}));
 }
 
 export async function askOptionsApi() {
-	return new Promise((resolve) => {
-		const rl = readline.createInterface({
-			input: process.stdin,
-			output: process.stdout,
-		});
-		rl.question(
-			"Do you use the Vue options API? (Enter — no, any characters + Enter — yes):",
-			(answer) => {
-				rl.close();
-				resolve(Boolean(
-					answer,
-				));
-			},
-		);
-	});
+	return unwrapPrompt(confirm({
+		message: "Do you use the Vue options API?",
+		initialValue: false,
+	}));
+}
+
+async function unwrapPrompt(maybeCancelPromise) {
+	const result = await maybeCancelPromise;
+
+	if (isCancel(result)) {
+		cancel("✖ Operation cancelled");
+		process.exit(0);
+	}
+
+	return result;
 }

package/modules/shared/utils/copy-with-override.js

@@ -17,7 +17,8 @@ export async function copyFile({
 	} catch {
 		await outputFile(destFile, `${getHeader("#")}${srcFileData}`);
 		console.info(`${fileLabel} пересоздан`);
-		return {};
+		return {
+		};
 	}
 
 	// Если файл есть — разбираем оба файла
@@ -28,7 +29,8 @@ export async function copyFile({
 	if (!match) {
 		await outputFile(destFile, `${getHeader("#")}${srcFileData}`);
 		console.info(`${fileLabel} пересоздан`);
-		return {};
+		return {
+		};
 	}
 
 	return {

package/modules/shared/utils/env.js

@@ -6,8 +6,11 @@ import JSON5 from "json5";
 import {
 	outputFile,
 } from "fs-extra";
+import {
+	eslintFiles,
+} from "./lint";
 
-export const envFileSrc = path.join(process.cwd(), "frontend-configs.env.json5");
+const envFileSrc = path.join(process.cwd(), "frontend-configs.env.json5");
 
 export async function getEnvs() {
 	const srcFileData = await readFile(envFileSrc, "utf8");
@@ -17,4 +20,5 @@ export async function getEnvs() {
 
 export async function setEnvs(envObj) {
 	await outputFile(envFileSrc, JSON5.stringify(envObj, null, 2));
+	await eslintFiles(envFileSrc);
 }

package/modules/shared/utils/file-header.js

@@ -9,7 +9,7 @@ const pkg = JSON.parse(await readFile(pkgJsonFileUrl, "utf8"));
 export function getHeader(comment = "//") {
 	const lines = [
 		"This file is generated with",
-		`${pkg.repository?.url || ""}`,
+		String(pkg.repository?.url || ""),
 		`Version: ${pkg.version || ""}`,
 		"File may contain override sections, see project README for more details",
 	];

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cherepanov.pavel/shareable-config",
 	"description": "setup for new repositories",
-	"version": "2.0.3",
+	"version": "2.0.5",
 	"type": "module",
 	"devEngines": {
 		"packageManager": {
@@ -55,6 +55,7 @@
 		"lint:css:fix": "npm run lint:css -- --fix"
 	},
 	"dependencies": {
+		"@clack/prompts": "^1.8.1",
 		"@eslint/compat": "2.1.0",
 		"@stylistic/eslint-plugin": "5.10.0",
 		"@stylistic/stylelint-plugin": "5.2.1",