pnpm-plugin-alex-857 1.0.27 → 1.0.29

package/install-catalog.js

@@ -21,8 +21,22 @@ if (specifiers.length === 0) {
   process.exit(0);
 }
 
-const isWorkspaceRoot =
-  fs.existsSync(path.join(process.cwd(), "pnpm-workspace.yaml"));
+// In a workspace, catalog: is resolved by the plugin (configDependencies). If the workspace
+// was just created or config was wiped, skip so postinstall does not fail.
+const workspaceYamlPath = path.join(process.cwd(), "pnpm-workspace.yaml");
+if (fs.existsSync(workspaceYamlPath)) {
+  const yaml = fs.readFileSync(workspaceYamlPath, "utf8");
+  const hasCatalog =
+    /\ncatalog\s*:/m.test(yaml) || /\nconfigDependencies\s*:/m.test(yaml);
+  if (!hasCatalog) {
+    console.warn(
+      "install-catalog: No catalog or configDependencies in pnpm-workspace.yaml; run 'pnpm add --config pnpm-plugin-alex-857@latest' first, then pnpm install."
+    );
+    process.exit(0);
+  }
+}
+
+const isWorkspaceRoot = fs.existsSync(workspaceYamlPath);
 const addCmd = `pnpm add ${isWorkspaceRoot ? "-w " : ""}${specifiers.join(" ")}`;
 
 console.log("Adding from catalog:", specifiers.join(", "));

package/install-workspace.js

@@ -2,6 +2,7 @@
 const path = require("path");
 const fs = require("fs");
 
+// Resolve pnpm-workspace.json: plugin dir first, then cwd
 const possiblePaths = [
   path.join(__dirname, "pnpm-workspace.json"),
   path.join(process.cwd(), "pnpm-workspace.json"),
@@ -26,12 +27,27 @@ if (fs.existsSync(yamlPath)) {
   raw = fs.readFileSync(yamlPath, "utf8");
 }
 
-// Extract existing package patterns from the packages section (avoid duplicates from malformed YAML)
+// Extract existing package patterns from the packages section (no duplicates).
+// Only matches lines like "  - 'x'" or "  - \"x\"".
 function extractExistingPackages(text) {
   const seen = new Set();
   const list = [];
-  const sectionMatch = text.match(/^packages\s*:\s*\n([\s\S]*?)(?=\n[a-zA-Z][\w]*\s*:|\s*$)/m);
-  if (!sectionMatch) return list;
+  const sectionMatch = text.match(
+    /^packages\s*:\s*\n([\s\S]*?)(?=\n(?:catalog|configDependencies)\s*:)/m
+  );
+  if (!sectionMatch) {
+    const toEnd = text.match(/^packages\s*:\s*\n([\s\S]*)/m);
+    if (toEnd) {
+      for (const m of toEnd[1].matchAll(/^\s+-\s+['"]([^'"]+)['"]\s*$/gm)) {
+        const p = m[1].trim();
+        if (p && !seen.has(p)) {
+          seen.add(p);
+          list.push(p);
+        }
+      }
+    }
+    return list;
+  }
   const section = sectionMatch[1];
   for (const m of section.matchAll(/^\s+-\s+['"]([^'"]+)['"]\s*$/gm)) {
     const p = m[1].trim();
@@ -43,6 +59,7 @@ function extractExistingPackages(text) {
   return list;
 }
 
+// Merge: keep all existing entries and add from plugin list; no duplicates.
 const existingPackages = raw ? extractExistingPackages(raw) : [];
 const mergedPackages = [...new Set([...existingPackages, ...packagesFromJson])];
 const packagesBlock =
@@ -50,16 +67,17 @@ const packagesBlock =
 
 let output;
 if (raw && /^packages\s*:/m.test(raw)) {
-  // Replace the entire packages section (from "packages:" to next top-level key or end) to avoid duplication/corruption
-  output = raw.replace(
-    /^packages\s*:\s*\n[\s\S]*?(?=\n[a-zA-Z][\w]*\s*:|\s*$)/m,
-    () => packagesBlock
-  );
-  if (output === raw) {
-    output = raw.replace(/^packages\s*:[\s\S]*?(?=\n(?:catalog|configDependencies)\s*:)/m, packagesBlock);
-  }
+  // Replace only the packages list: "packages:\n" + list lines. Never replace to end of file
+  // so we never wipe catalog / configDependencies (which would break install-catalog).
+  const nextKeyRegex = /^packages\s*:\s*\n[\s\S]*?(?=\n(?:catalog|configDependencies)\s*:)/m;
+  output = raw.replace(nextKeyRegex, () => packagesBlock);
   if (output === raw) {
-    output = raw.replace(/^packages\s*:[\s\S]*/m, packagesBlock);
+    // No catalog/configDependencies after packages: replace only the list lines (  - '...')
+    // so any trailing content (catalog, configDependencies, blank lines) is preserved.
+    output = raw.replace(
+      /^(packages\s*:\s*\n)((?:\s+-\s+['"][^'"]+['"]\s*\n)*)/m,
+      () => packagesBlock
+    );
   }
 } else if (raw) {
   output = raw.trimEnd() + "\n\n" + packagesBlock;
@@ -70,6 +88,6 @@ if (raw && /^packages\s*:/m.test(raw)) {
 fs.writeFileSync(yamlPath, output, "utf8");
 console.log(
   raw ? "Updated" : "Created",
-  "pnpm-workspace.yaml with packages:",
+  "pnpm-workspace.yaml with packages (no duplicates):",
   mergedPackages.join(", ")
 );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pnpm-plugin-alex-857",
-    "version": "1.0.27",
+    "version": "1.0.29",
     "description": "A plugin for pnpm to use alex as a linter",
     "bin": {
         "install-catalog": "./install-catalog.js",