@bottomlessmargaritas/formatting-configs 1.0.0 → 2.1.0

package/bin/cli.js

@@ -3,31 +3,37 @@
 import {
     existsSync,
     copyFileSync,
-    mkdirSync,
     readFileSync,
     writeFileSync,
     readdirSync,
-    renameSync,
+    unlinkSync,
 } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join, resolve, extname, basename } from "node:path";
 import { fileURLToPath } from "node:url";
 import { execSync } from "node:child_process";
-import { createInterface } from "node:readline";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const CONFIGS_DIR = resolve(__dirname, "..", "configs");
 
-const isAuto = process.argv.includes("--auto");
 const isDryRun = process.argv.includes("--dry-run");
 const skipInstall = process.argv.includes("--skip-install");
 
 const PKG_NAME = "@bottomlessmargaritas/formatting-configs";
+const NAMESPACE = "bottomlessmargaritas";
 
+// Namespaced filenames: prettier.config.js → prettier.config.bottomlessmargaritas.js
+function namespacedFileName(file) {
+    const ext = extname(file);
+    const base = basename(file, ext);
+    return `${base}.${NAMESPACE}${ext}`;
+}
+
+// Scripts reference the namespaced config files explicitly
 const SCRIPTS_TO_ADD = {
-    format: 'prettier --write "**/*.{js,jsx,ts,tsx,json,css,scss,md}"',
-    "format:check": 'prettier --check "**/*.{js,jsx,ts,tsx,json,css,scss,md}"',
-    lint: "eslint .",
-    "lint:fix": "eslint . --fix",
+    [`${NAMESPACE}:format`]: `prettier --config ${namespacedFileName("prettier.config.js")} --write "**/*.{js,jsx,ts,tsx,json,css,scss,md}"`,
+    [`${NAMESPACE}:format:check`]: `prettier --config ${namespacedFileName("prettier.config.js")} --check "**/*.{js,jsx,ts,tsx,json,css,scss,md}"`,
+    [`${NAMESPACE}:lint`]: `eslint --config ${namespacedFileName("eslint.config.js")} .`,
+    [`${NAMESPACE}:lint:fix`]: `eslint --config ${namespacedFileName("eslint.config.js")} . --fix`,
 };
 
 const PEER_DEPS = {
@@ -42,7 +48,6 @@ const PEER_DEPS = {
     "typescript-eslint": "^8",
 };
 
-// React-related deps — only installed if project uses React
 const REACT_PEER_DEPS = {
     "@babel/eslint-parser": "^7",
     "eslint-plugin-jsx-a11y": "^6",
@@ -61,11 +66,6 @@ function findProjectRoot(startDir) {
     return null;
 }
 
-function getBackupName(filePath) {
-    const timestamp = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
-    return `${filePath}.backup-${timestamp}`;
-}
-
 function detectPackageManager(projectRoot) {
     if (existsSync(join(projectRoot, "pnpm-lock.yaml"))) {
         return "pnpm";
@@ -89,25 +89,16 @@ function projectUsesReact(projectRoot) {
     }
 }
 
-async function prompt(question) {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise((resolve) => {
-        rl.question(question, (answer) => {
-            rl.close();
-            resolve(answer.trim().toLowerCase());
-        });
-    });
-}
-
-async function copyConfigFiles(projectRoot) {
+function copyConfigFiles(projectRoot) {
     const configFiles = readdirSync(CONFIGS_DIR);
+    const currentNamespacedFiles = new Set(configFiles.map(namespacedFileName));
     let copied = 0;
-    let backed = 0;
     let skipped = 0;
 
     for (const file of configFiles) {
         const source = join(CONFIGS_DIR, file);
-        const target = join(projectRoot, file);
+        const targetName = namespacedFileName(file);
+        const target = join(projectRoot, targetName);
 
         if (existsSync(target)) {
             const sourceContent = readFileSync(source, "utf8");
@@ -117,66 +108,73 @@ async function copyConfigFiles(projectRoot) {
                 skipped++;
                 continue;
             }
+        }
 
-            if (isAuto) {
-                const backupPath = getBackupName(target);
-                if (!isDryRun) {
-                    renameSync(target, backupPath);
-                    copyFileSync(source, target);
-                    console.log(`  ↪ Backed up existing ${file} → ${backupPath.split("/").pop()}`);
-                }
-                backed++;
-                copied++;
-            } else {
-                const answer = await prompt(`  ${file} already exists and differs. Overwrite? (y/n) `);
-                if (answer !== "y") {
-                    skipped++;
-                    continue;
-                }
-
-                const backupPath = getBackupName(target);
-                if (!isDryRun) {
-                    renameSync(target, backupPath);
-                    copyFileSync(source, target);
-                    console.log(`  ↪ Backed up → ${backupPath.split("/").pop()}`);
-                }
-                backed++;
-                copied++;
-            }
+        if (isDryRun) {
+            console.log(`[dry-run] Would write: ${targetName}`);
         } else {
-            if (!isDryRun) {
-                copyFileSync(source, target);
+            copyFileSync(source, target);
+        }
+        copied++;
+    }
+
+    // Remove stale namespaced config files from previous versions
+    const namespacedPattern = `.${NAMESPACE}.`;
+    let removed = 0;
+
+    for (const file of readdirSync(projectRoot)) {
+        if (file.includes(namespacedPattern) && !currentNamespacedFiles.has(file)) {
+            if (isDryRun) {
+                console.log(`[dry-run] Would remove stale config: ${file}`);
+            } else {
+                unlinkSync(join(projectRoot, file));
             }
-            copied++;
+            removed++;
         }
     }
 
-    console.log(`${PKG_NAME}: ${copied} config(s) copied, ${backed} backed up, ${skipped} unchanged`);
+    console.log(`${PKG_NAME}: ${copied} config(s) written, ${skipped} unchanged, ${removed} stale removed`);
 }
 
 function updatePackageJsonScripts(projectRoot) {
     const pkgPath = join(projectRoot, "package.json");
-    const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+    const raw = readFileSync(pkgPath, "utf8");
+    const pkg = JSON.parse(raw);
 
     if (!pkg.scripts) {
         pkg.scripts = {};
     }
 
+    const currentScriptNames = new Set(Object.keys(SCRIPTS_TO_ADD));
     let added = 0;
+    let removed = 0;
+
+    // Add/update current scripts
     for (const [name, command] of Object.entries(SCRIPTS_TO_ADD)) {
-        if (!pkg.scripts[name]) {
+        if (pkg.scripts[name] !== command) {
             pkg.scripts[name] = command;
             added++;
         }
     }
 
-    if (added > 0) {
-        if (!isDryRun) {
+    // Remove stale namespaced scripts from previous versions
+    for (const name of Object.keys(pkg.scripts)) {
+        if (name.startsWith(`${NAMESPACE}:`) && !currentScriptNames.has(name)) {
+            delete pkg.scripts[name];
+            removed++;
+        }
+    }
+
+    if (added > 0 || removed > 0) {
+        if (isDryRun) {
+            if (added > 0) console.log(`[dry-run] Would add/update ${added} script(s) in package.json`);
+            if (removed > 0) console.log(`[dry-run] Would remove ${removed} stale script(s) from package.json`);
+        } else {
             writeFileSync(pkgPath, JSON.stringify(pkg, null, 4) + "\n", "utf8");
         }
-        console.log(`${PKG_NAME}: Added ${added} script(s) to package.json (format, format:check, lint, lint:fix)`);
+        console.log(`${PKG_NAME}: ${added} script(s) added/updated, ${removed} stale removed in package.json`);
     } else {
-        console.log(`${PKG_NAME}: All formatting scripts already present in package.json`);
+        console.log(`${PKG_NAME}: All namespaced scripts already up to date in package.json`);
     }
 }
 
@@ -205,18 +203,18 @@ function installMissingPeers(projectRoot) {
 
     console.log(`${PKG_NAME}: Installing ${missing.length} missing peer dep(s) with ${pm}...`);
 
-    if (!isDryRun) {
+    if (isDryRun) {
+        console.log(`[dry-run] Would run: ${installCmd}`);
+    } else {
         try {
             execSync(installCmd, { cwd: projectRoot, stdio: "inherit" });
         } catch {
             console.warn(`${PKG_NAME}: Peer dependency install failed. Run manually:\n  ${installCmd}`);
         }
-    } else {
-        console.log(`[dry-run] Would run: ${installCmd}`);
     }
 }
 
-async function run() {
+function run() {
     const cwd = process.env.INIT_CWD || process.cwd();
     const projectRoot = findProjectRoot(cwd);
 
@@ -225,7 +223,7 @@ async function run() {
         process.exit(1);
     }
 
-    await copyConfigFiles(projectRoot);
+    copyConfigFiles(projectRoot);
     updatePackageJsonScripts(projectRoot);
 
     if (!skipInstall) {
@@ -233,7 +231,4 @@ async function run() {
     }
 }
 
-run().catch((err) => {
-    console.error(`${PKG_NAME}:`, err.message);
-    process.exit(1);
-});
+run();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@bottomlessmargaritas/formatting-configs",
-    "version": "1.0.0",
-    "description": "Canonical Prettier and ESLint configs for @nullvoidundefined projects",
+    "version": "2.1.0",
+    "description": "Canonical Prettier and ESLint configs for @bottomlessmargaritas projects",
     "type": "module",
     "bin": {
         "formatting-configs": "./bin/cli.js"
@@ -29,10 +29,18 @@
         "typescript-eslint": ">=8"
     },
     "peerDependenciesMeta": {
-        "@babel/eslint-parser": { "optional": true },
-        "eslint-plugin-jsx-a11y": { "optional": true },
-        "eslint-plugin-react": { "optional": true },
-        "eslint-plugin-react-hooks": { "optional": true }
+        "@babel/eslint-parser": {
+            "optional": true
+        },
+        "eslint-plugin-jsx-a11y": {
+            "optional": true
+        },
+        "eslint-plugin-react": {
+            "optional": true
+        },
+        "eslint-plugin-react-hooks": {
+            "optional": true
+        }
     },
     "keywords": [
         "prettier",
@@ -40,7 +48,7 @@
         "formatting",
         "config"
     ],
-    "author": "nullvoidundefined",
+    "author": "bottomlessmargaritas",
     "license": "MIT",
     "engines": {
         "node": ">=18"