@cmssy/cli 12.11.0 → 12.13.0

package/assets/init/eslint.config.mjs

@@ -0,0 +1,3 @@
+import cmssy from "@cmssy/eslint-plugin";
+
+export default [...cmssy.configs.standalone];

package/dist/index.js

@@ -603,14 +603,281 @@ function runAddBlock(options, deps) {
 
 // src/init.ts
 import {
-  copyFileSync,
-  existsSync as existsSync3,
+  copyFileSync as copyFileSync2,
+  existsSync as existsSync4,
   mkdirSync as mkdirSync2,
-  readFileSync as readFileSync3,
-  writeFileSync as writeFileSync2
+  readFileSync as readFileSync4,
+  writeFileSync as writeFileSync3
 } from "fs";
-import { dirname as dirname2, join as join3, resolve as resolve2 } from "path";
+import { dirname as dirname2, join as join4, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
+
+// src/eslint-config.ts
+import { copyFileSync, existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { join as join3 } from "path";
+var ESLINT_PLUGIN = "@cmssy/eslint-plugin";
+var ESLINT_CONFIG_FILE = "eslint.config.mjs";
+var ESLINT_PURPOSE = "the two wiring mistakes no build catches: server config pulled into a client bundle, and a provider the /cmssy-edit route never gets";
+var FLAT_CONFIGS = [
+  "eslint.config.js",
+  "eslint.config.mjs",
+  "eslint.config.cjs",
+  "eslint.config.ts",
+  "eslint.config.mts",
+  "eslint.config.cts"
+];
+var LEGACY_CONFIGS = [
+  ".eslintrc.js",
+  ".eslintrc.cjs",
+  ".eslintrc.mjs",
+  ".eslintrc.json",
+  ".eslintrc.yml",
+  ".eslintrc.yaml",
+  ".eslintrc"
+];
+var SPREAD = "...cmssy.configs.recommended";
+var IMPORT_LINE = `import cmssy from "${ESLINT_PLUGIN}";`;
+var STANDALONE_SNIPPET = `${IMPORT_LINE}
+       export default [...cmssy.configs.standalone];`;
+var APPEND_SNIPPET = `${IMPORT_LINE}
+       export default [...yourConfig, ${SPREAD}];`;
+var REQUIRE_SNIPPET = `const cmssy = require("${ESLINT_PLUGIN}");
+       module.exports = [...yourConfig, ${SPREAD}];`;
+var INLINE_STANDALONE = `an ${ESLINT_CONFIG_FILE} of \`${IMPORT_LINE} export default [...cmssy.configs.standalone];\``;
+var BUILDERS = /* @__PURE__ */ new Set([
+  "config",
+  "defineConfig",
+  "defineFlatConfig",
+  "tseslint.config"
+]);
+var WIRED = /(?:import|require)[\s\S]{0,200}?["']@cmssy\/eslint-plugin["']/;
+var RULES = "cmssy/edit-route-provider-parity and cmssy/no-server-config-in-client";
+function describeExpression(expression) {
+  const stack = [];
+  const pairs = { ")": "(", "]": "[", "}": "{" };
+  let closed = -1;
+  for (let i = 0; i < expression.length; i += 1) {
+    const char = expression[i];
+    if (char === '"' || char === "'" || char === "`") {
+      i += 1;
+      while (i < expression.length && expression[i] !== char) {
+        if (expression[i] === "\\") i += 1;
+        i += 1;
+      }
+      if (i >= expression.length) return { balanced: false, single: false };
+      continue;
+    }
+    if (char === "/" && expression[i + 1] === "/") {
+      while (i < expression.length && expression[i] !== "\n") i += 1;
+      continue;
+    }
+    if (char === "/" && expression[i + 1] === "*") {
+      i += 2;
+      while (i < expression.length && !(expression[i] === "*" && expression[i + 1] === "/")) {
+        i += 1;
+      }
+      if (i >= expression.length) return { balanced: false, single: false };
+      i += 1;
+      continue;
+    }
+    if (char === "(" || char === "[" || char === "{") {
+      stack.push(char);
+      continue;
+    }
+    if (char === ")" || char === "]" || char === "}") {
+      if (stack.pop() !== pairs[char])
+        return { balanced: false, single: false };
+      if (stack.length === 0) closed = i;
+      continue;
+    }
+    if (char === ";" && stack.length === 0) {
+      return { balanced: false, single: false };
+    }
+  }
+  return {
+    balanced: stack.length === 0,
+    single: closed === expression.length - 1
+  };
+}
+function indentOf(inner) {
+  return /\n([ \t]+)\S/.exec(inner)?.[1] ?? "  ";
+}
+function appendItem(inner) {
+  if (inner.trim() === "") return `
+  ${SPREAD},
+`;
+  if (!inner.includes("\n")) {
+    return `${inner.replace(/,\s*$/, "")}, ${SPREAD}`;
+  }
+  const body = inner.replace(/\s+$/, "");
+  const close = /\n([ \t]*)$/.exec(inner);
+  const item = `${body}${body.endsWith(",") ? "" : ","}
+${indentOf(inner)}${SPREAD}`;
+  return close ? `${item},
+${close[1]}` : item;
+}
+function patchExpression(expression) {
+  const shape = describeExpression(expression);
+  if (!shape.balanced) return null;
+  if (expression.startsWith("[") && expression.endsWith("]") && shape.single) {
+    return `[${appendItem(expression.slice(1, -1))}]`;
+  }
+  const call = /^([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\(([\s\S]*)\)$/.exec(
+    expression
+  );
+  if (call && shape.single && BUILDERS.has(call[1])) {
+    const args = call[2];
+    const only = args.trim();
+    if (only.startsWith("[") && only.endsWith("]")) {
+      const inner = patchExpression(only);
+      if (inner) return `${call[1]}(${inner})`;
+    }
+    return `${call[1]}(${appendItem(args)})`;
+  }
+  return `[...${expression}, ${SPREAD}]`;
+}
+function insertImport(source) {
+  const lines = source.split("\n");
+  let at = 0;
+  let block = false;
+  for (; at < lines.length; at += 1) {
+    const line = lines[at].trim();
+    if (block) {
+      if (line.includes("*/")) block = false;
+      continue;
+    }
+    if (line === "" || line.startsWith("//") || line.startsWith("#!")) continue;
+    if (line.startsWith("/*")) {
+      block = !line.includes("*/");
+      continue;
+    }
+    break;
+  }
+  const next = lines[at] ?? "";
+  const spacer = next.trim() === "" || next.startsWith("import ") ? [] : [""];
+  lines.splice(at, 0, IMPORT_LINE, ...spacer);
+  return lines.join("\n");
+}
+function patchFlatConfig(source) {
+  const exports = [...source.matchAll(/^export default\b/gm)];
+  const last = exports.at(-1);
+  if (last?.index === void 0) return null;
+  const head = source.slice(0, last.index);
+  const expression = source.slice(last.index + "export default".length).trim().replace(/;$/, "").trimEnd();
+  if (expression === "") return null;
+  const patched = patchExpression(expression);
+  if (!patched) return null;
+  const result = insertImport(`${head}export default ${patched};
+`);
+  if (!result.includes(SPREAD)) return null;
+  return result;
+}
+function withoutComments(source) {
+  let out = "";
+  for (let i = 0; i < source.length; i += 1) {
+    const char = source[i];
+    if (char === '"' || char === "'" || char === "`") {
+      out += char;
+      i += 1;
+      while (i < source.length && source[i] !== char) {
+        if (source[i] === "\\") {
+          out += source[i];
+          i += 1;
+        }
+        out += source[i] ?? "";
+        i += 1;
+      }
+      out += source[i] ?? "";
+      continue;
+    }
+    if (char === "/" && source[i + 1] === "/") {
+      while (i < source.length && source[i] !== "\n") i += 1;
+      out += "\n";
+      continue;
+    }
+    if (char === "/" && source[i + 1] === "*") {
+      i += 2;
+      while (i < source.length && !(source[i] === "*" && source[i + 1] === "/")) {
+        i += 1;
+      }
+      i += 1;
+      continue;
+    }
+    out += char;
+  }
+  return out;
+}
+function findFile(root, names) {
+  return names.find((name) => existsSync3(join3(root, name)));
+}
+function wireEslintConfig(root, pkg, asset) {
+  const flat = findFile(root, FLAT_CONFIGS);
+  const legacy = findFile(root, LEGACY_CONFIGS);
+  const installed = pkg.dependencies?.eslint !== void 0 || pkg.devDependencies?.eslint !== void 0;
+  if (!flat && legacy) {
+    return {
+      dependency: true,
+      notes: [
+        {
+          status: "fail",
+          message: `${legacy} is the legacy eslintrc format, so ${RULES} were not wired`,
+          fix: `migrate to flat config (an eslint.config.mjs) and add:
+       ${STANDALONE_SNIPPET}`
+        }
+      ]
+    };
+  }
+  if (!flat && !installed) {
+    return {
+      dependency: false,
+      notes: [
+        {
+          status: "unknown",
+          message: `this app has no eslint, so ${RULES} were not wired - they are the only check for a provider the editor route never gets; install eslint and rerun, or write ${INLINE_STANDALONE} yourself`
+        }
+      ]
+    };
+  }
+  if (!flat) {
+    copyFileSync(asset, join3(root, ESLINT_CONFIG_FILE));
+    return { written: ESLINT_CONFIG_FILE, dependency: true, notes: [] };
+  }
+  const source = readFileSync3(join3(root, flat), "utf8");
+  if (WIRED.test(withoutComments(source))) {
+    return { dependency: true, notes: [] };
+  }
+  if (flat.endsWith(".cjs") || /\bmodule\.exports\b/.test(source)) {
+    return {
+      dependency: true,
+      notes: [
+        {
+          status: "fail",
+          message: `${flat} is CommonJS, so ${RULES} were not wired - it was left untouched`,
+          fix: `add them yourself:
+       ${REQUIRE_SNIPPET}`
+        }
+      ]
+    };
+  }
+  const patched = patchFlatConfig(source);
+  if (!patched) {
+    return {
+      dependency: true,
+      notes: [
+        {
+          status: "fail",
+          message: `${flat} has no default export this can extend, so ${RULES} were not wired - it was left untouched`,
+          fix: `add them yourself:
+       ${APPEND_SNIPPET}`
+        }
+      ]
+    };
+  }
+  writeFileSync2(join3(root, flat), patched);
+  return { patched: flat, dependency: true, notes: [] };
+}
+
+// src/init.ts
 var ASSETS_DIR = fileURLToPath(new URL("../assets/init", import.meta.url));
 var CLI_PACKAGE_JSON = fileURLToPath(
   new URL("../package.json", import.meta.url)
@@ -635,40 +902,53 @@ function frameworkFiles(framework, root) {
   return files;
 }
 function cliVersion() {
-  const pkg = JSON.parse(readFileSync3(CLI_PACKAGE_JSON, "utf8"));
+  const pkg = JSON.parse(readFileSync4(CLI_PACKAGE_JSON, "utf8"));
   return pkg.version;
 }
-function addDependencies(root, pkg, framework) {
-  const present = { ...pkg.dependencies, ...pkg.devDependencies };
-  const missing = framework.dependencies.filter(
-    (name) => present[name] === void 0
+function sortedEntries(entries) {
+  return Object.fromEntries(
+    Object.entries(entries).sort(([a], [b]) => a.localeCompare(b))
   );
-  if (missing.length === 0) return [];
+}
+function addDependencies(root, pkg, framework, development) {
+  const present = { ...pkg.dependencies, ...pkg.devDependencies };
+  const absent = (name) => present[name] === void 0;
+  const missing = framework.dependencies.filter(absent);
+  const missingDev = development.filter(absent);
+  if (missing.length === 0 && missingDev.length === 0) return [];
   const range = `^${cliVersion()}`;
-  const dependencies = { ...pkg.dependencies };
-  for (const name of missing) dependencies[name] = range;
-  pkg.dependencies = Object.fromEntries(
-    Object.entries(dependencies).sort(([a], [b]) => a.localeCompare(b))
-  );
-  writeFileSync2(
-    join3(root, "package.json"),
+  const pinned = (names) => Object.fromEntries(names.map((name) => [name, range]));
+  if (missing.length > 0) {
+    pkg.dependencies = sortedEntries({
+      ...pkg.dependencies,
+      ...pinned(missing)
+    });
+  }
+  if (missingDev.length > 0) {
+    pkg.devDependencies = sortedEntries({
+      ...pkg.devDependencies,
+      ...pinned(missingDev)
+    });
+  }
+  writeFileSync3(
+    join4(root, "package.json"),
     `${JSON.stringify(pkg, null, 2)}
 `
   );
-  return missing.map((name) => `${name}@${range}`);
+  return [...missing, ...missingDev].map((name) => `${name}@${range}`);
 }
 function detectInstallCommand(root) {
-  if (existsSync3(join3(root, "pnpm-lock.yaml")) || existsSync3(join3(root, "pnpm-workspace.yaml"))) {
+  if (existsSync4(join4(root, "pnpm-lock.yaml")) || existsSync4(join4(root, "pnpm-workspace.yaml"))) {
     return "pnpm install";
   }
-  if (existsSync3(join3(root, "yarn.lock"))) return "yarn";
-  if (existsSync3(join3(root, "bun.lock")) || existsSync3(join3(root, "bun.lockb"))) {
+  if (existsSync4(join4(root, "yarn.lock"))) return "yarn";
+  if (existsSync4(join4(root, "bun.lock")) || existsSync4(join4(root, "bun.lockb"))) {
     return "bun install";
   }
   return "npm install";
 }
 function existingFile(root, base) {
-  return ["tsx", "ts", "jsx", "js"].map((extension) => `${base}.${extension}`).find((candidate) => existsSync3(join3(root, candidate)));
+  return ["tsx", "ts", "jsx", "js"].map((extension) => `${base}.${extension}`).find((candidate) => existsSync4(join4(root, candidate)));
 }
 function frameworkNotes(framework, root, skipped) {
   const notes = [];
@@ -703,7 +983,7 @@ function frameworkNotes(framework, root, skipped) {
       status: "unknown",
       message: "the cmssy wiring needs the React integration and a server adapter - run: npx astro add react node"
     });
-    if (existsSync3(join3(root, "src/pages/index.astro"))) {
+    if (existsSync4(join4(root, "src/pages/index.astro"))) {
       notes.push({
         status: "unknown",
         message: "src/pages/index.astro shadows the cmssy catch-all for / - delete it and the cmssy page serves /"
@@ -728,7 +1008,7 @@ function runInit(options, deps) {
   const { log } = deps;
   try {
     const root = resolve2(deps.cwd, options.dir ?? ".");
-    if (!existsSync3(root)) {
+    if (!existsSync4(root)) {
       throw new CliError(
         `${root} does not exist`,
         "pass --dir with the app's directory, or run cmssy init inside it"
@@ -745,8 +1025,8 @@ function runInit(options, deps) {
     const written = [];
     const skipped = [];
     for (const file of frameworkFiles(framework, root)) {
-      const target = join3(root, file.target);
-      if (existsSync3(target) && !options.force) {
+      const target = join4(root, file.target);
+      if (existsSync4(target) && !options.force) {
         skipped.push(file.target);
         log(
           formatResult({
@@ -757,12 +1037,36 @@ function runInit(options, deps) {
         continue;
       }
       mkdirSync2(dirname2(target), { recursive: true });
-      copyFileSync(join3(ASSETS_DIR, framework.name, file.asset), target);
+      copyFileSync2(join4(ASSETS_DIR, framework.name, file.asset), target);
       written.push(file.target);
       log(formatResult({ status: "ok", message: `wrote ${file.target}` }));
       log(`    ${file.purpose}`);
     }
-    const added = addDependencies(root, pkg, framework);
+    const eslint = wireEslintConfig(
+      root,
+      pkg,
+      join4(ASSETS_DIR, ESLINT_CONFIG_FILE)
+    );
+    if (eslint.written) {
+      written.push(eslint.written);
+      log(formatResult({ status: "ok", message: `wrote ${eslint.written}` }));
+      log(`    ${ESLINT_PURPOSE}`);
+    }
+    if (eslint.patched) {
+      log(
+        formatResult({
+          status: "ok",
+          message: `wired ${ESLINT_PLUGIN} into ${eslint.patched}`
+        })
+      );
+      log(`    ${ESLINT_PURPOSE}`);
+    }
+    const added = addDependencies(
+      root,
+      pkg,
+      framework,
+      eslint.dependency ? [ESLINT_PLUGIN] : []
+    );
     if (added.length > 0) {
       log(
         formatResult({
@@ -771,7 +1075,10 @@ function runInit(options, deps) {
         })
       );
     }
-    for (const note of frameworkNotes(framework, root, skipped)) {
+    for (const note of [
+      ...frameworkNotes(framework, root, skipped),
+      ...eslint.notes
+    ]) {
       log(formatResult(note));
     }
     log("");
@@ -814,8 +1121,8 @@ function runInit(options, deps) {
 }
 
 // src/link.ts
-import { existsSync as existsSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
-import { join as join5 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { join as join6 } from "path";
 import {
   buildEditorUrl,
   checkDraftSecret,
@@ -823,8 +1130,8 @@ import {
 } from "@cmssy/core/preflight";
 
 // src/env-load.ts
-import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
+import { join as join5 } from "path";
 
 // src/env-file.ts
 function parseEnvFile(content) {
@@ -863,9 +1170,9 @@ function applyEnv(vars, env) {
 var ENV_FILES = [".env.local", ".env"];
 function loadEnvFiles(cwd, env) {
   for (const file of ENV_FILES) {
-    const path = join4(cwd, file);
-    if (!existsSync4(path)) continue;
-    applyEnv(parseEnvFile(readFileSync4(path, "utf8")), env);
+    const path = join5(cwd, file);
+    if (!existsSync5(path)) continue;
+    applyEnv(parseEnvFile(readFileSync5(path, "utf8")), env);
   }
 }
 
@@ -1042,9 +1349,9 @@ function resolvePreviewUrl(options) {
   return origin;
 }
 function writeEnvLocal(cwd, updates) {
-  const path = join5(cwd, ".env.local");
-  const existing = existsSync5(path) ? readFileSync5(path, "utf8") : null;
-  writeFileSync3(path, mergeEnvContent(existing, updates));
+  const path = join6(cwd, ".env.local");
+  const existing = existsSync6(path) ? readFileSync6(path, "utf8") : null;
+  writeFileSync4(path, mergeEnvContent(existing, updates));
 }
 async function runLink(options, deps) {
   const { cwd, env, log } = deps;
@@ -1158,7 +1465,7 @@ async function runLink(options, deps) {
 }
 
 // src/types-command.ts
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync6, readdirSync, writeFileSync as writeFileSync4 } from "fs";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync7, readdirSync, writeFileSync as writeFileSync5 } from "fs";
 import { dirname as dirname3, relative, resolve as resolvePath } from "path";
 import { DEFAULT_CMSSY_API_URL } from "@cmssy/core";
 
@@ -1502,7 +1809,7 @@ function existingOperationNames(cwd, skipPath) {
     if (full === skipPath) continue;
     let source;
     try {
-      source = readFileSync6(full, "utf8");
+      source = readFileSync7(full, "utf8");
     } catch {
       continue;
     }
@@ -1522,7 +1829,7 @@ function syncOperations(options, deps) {
   const source = generateOperationsFile();
   let previous = null;
   try {
-    previous = readFileSync6(outPath, "utf8");
+    previous = readFileSync7(outPath, "utf8");
   } catch {
     previous = null;
   }
@@ -1550,7 +1857,7 @@ function syncOperations(options, deps) {
   }
   try {
     mkdirSync3(dirname3(outPath), { recursive: true });
-    writeFileSync4(outPath, source);
+    writeFileSync5(outPath, source);
   } catch (error) {
     throw new CliError(
       `could not write ${shown}: ${error.message}`,
@@ -1597,7 +1904,7 @@ async function runTypes(options, deps) {
     const source = generateModelTypes(models, { workspace });
     let previous = null;
     try {
-      previous = readFileSync6(outPath, "utf8");
+      previous = readFileSync7(outPath, "utf8");
     } catch {
       previous = null;
     }
@@ -1616,7 +1923,7 @@ async function runTypes(options, deps) {
       return 1;
     }
     mkdirSync3(dirname3(outPath), { recursive: true });
-    writeFileSync4(outPath, source);
+    writeFileSync5(outPath, source);
     const fieldCount = models.reduce(
       (total, model) => total + model.fields.length,
       0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "12.11.0",
+  "version": "12.13.0",
   "description": "The cmssy CLI: `cmssy init` wires cmssy into an existing Next.js, Astro or React Router app; `cmssy link` connects it to a workspace and verifies the editor wiring.",
   "keywords": [
     "cmssy",
@@ -27,7 +27,7 @@
     "assets"
   ],
   "dependencies": {
-    "@cmssy/core": "12.11.0"
+    "@cmssy/core": "12.13.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",