@donotdev/cli 0.0.11 → 0.0.12

package/dist/bin/commands/bump.js

@@ -255,7 +255,7 @@ function m(e2, u2) {
   const t = e2;
   t.isTTY && t.setRawMode(u2);
 }
-var import_sisteransi, uD, W, tD, eD, FD, sD, w, N, I, R, r, iD, CD, ED, d, oD, y, V, nD, G, _, z, K, aD, k, hD, lD, xD, B, AD, S, gD, vD, h, x, dD, A, kD, $D, H, SD;
+var import_sisteransi, uD, W, tD, eD, FD, sD, w, N, I, R, r, iD, CD, ED, d, oD, y, V, nD, G, _, z, K, aD, k, hD, lD, xD, B, AD, S, gD, vD, h, x, dD, A, OD, PD, J, LD;
 var init_dist = __esm({
   "node_modules/.bun/@clack+prompts@0.11.0/node_modules/@clack/prompts/node_modules/@clack/core/dist/index.mjs"() {
     init_utils();
@@ -492,14 +492,12 @@ var init_dist = __esm({
       }
     };
     A = /* @__PURE__ */ new WeakMap();
-    kD = Object.defineProperty;
-    $D = (e2, u2, t) => u2 in e2 ? kD(e2, u2, { enumerable: true, configurable: true, writable: true, value: t }) : e2[u2] = t;
-    H = (e2, u2, t) => ($D(e2, typeof u2 != "symbol" ? u2 + "" : u2, t), t);
-    SD = class extends x {
+    OD = Object.defineProperty;
+    PD = (e2, u2, t) => u2 in e2 ? OD(e2, u2, { enumerable: true, configurable: true, writable: true, value: t }) : e2[u2] = t;
+    J = (e2, u2, t) => (PD(e2, typeof u2 != "symbol" ? u2 + "" : u2, t), t);
+    LD = class extends x {
       constructor(u2) {
-        super(u2, false), H(this, "options"), H(this, "cursor", 0), this.options = u2.options, this.value = [...u2.initialValues ?? []], this.cursor = Math.max(this.options.findIndex(({ value: t }) => t === u2.cursorAt), 0), this.on("key", (t) => {
-          t === "a" && this.toggleAll();
-        }), this.on("cursor", (t) => {
+        super(u2, false), J(this, "options"), J(this, "cursor", 0), this.options = u2.options, this.cursor = this.options.findIndex(({ value: t }) => t === u2.initialValue), this.cursor === -1 && (this.cursor = 0), this.changeValue(), this.on("cursor", (t) => {
           switch (t) {
             case "left":
             case "up":
@@ -509,22 +507,15 @@ var init_dist = __esm({
             case "right":
               this.cursor = this.cursor === this.options.length - 1 ? 0 : this.cursor + 1;
               break;
-            case "space":
-              this.toggleValue();
-              break;
           }
+          this.changeValue();
         });
       }
       get _value() {
-        return this.options[this.cursor].value;
-      }
-      toggleAll() {
-        const u2 = this.value.length === this.options.length;
-        this.value = u2 ? [] : this.options.map((t) => t.value);
+        return this.options[this.cursor];
       }
-      toggleValue() {
-        const u2 = this.value.includes(this._value);
-        this.value = u2 ? this.value.filter((t) => t !== this._value) : [...this.value, this._value];
+      changeValue() {
+        this.value = this._value.value;
       }
     };
   }
@@ -536,7 +527,7 @@ import y2 from "node:process";
 function ce() {
   return y2.platform !== "win32" ? y2.env.TERM !== "linux" : !!y2.env.CI || !!y2.env.WT_SESSION || !!y2.env.TERMINUS_SUBLIME || y2.env.ConEmuTask === "{cmd::Cmder}" || y2.env.TERM_PROGRAM === "Terminus-Sublime" || y2.env.TERM_PROGRAM === "vscode" || y2.env.TERM === "xterm-256color" || y2.env.TERM === "alacritty" || y2.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
 }
-var import_picocolors, import_sisteransi2, V2, u, le, L2, W2, C, ue, o, d2, k2, P2, A2, T, F, $e, _2, me, de, pe, q, D, U, K2, b2, G2, ye, fe, xe, Ie, Se, M2, J;
+var import_picocolors, import_sisteransi2, V2, u, le, L2, W2, C, ue, o, d2, k2, P2, A2, T, F, $e, _2, me, de, pe, q, D, U, K2, b2, G2, ye, ve, xe, Ie, Se, M2, J2;
 var init_dist2 = __esm({
   "node_modules/.bun/@clack+prompts@0.11.0/node_modules/@clack/prompts/dist/index.mjs"() {
     init_utils();
@@ -609,40 +600,32 @@ ${import_picocolors.default.cyan(d2)}
         }
       } }).prompt();
     };
-    fe = (t) => {
+    ve = (t) => {
       const n = (r2, i) => {
         const s = r2.label ?? String(r2.value);
-        return i === "active" ? `${import_picocolors.default.cyan(A2)} ${s} ${r2.hint ? import_picocolors.default.dim(`(${r2.hint})`) : ""}` : i === "selected" ? `${import_picocolors.default.green(T)} ${import_picocolors.default.dim(s)} ${r2.hint ? import_picocolors.default.dim(`(${r2.hint})`) : ""}` : i === "cancelled" ? `${import_picocolors.default.strikethrough(import_picocolors.default.dim(s))}` : i === "active-selected" ? `${import_picocolors.default.green(T)} ${s} ${r2.hint ? import_picocolors.default.dim(`(${r2.hint})`) : ""}` : i === "submitted" ? `${import_picocolors.default.dim(s)}` : `${import_picocolors.default.dim(F)} ${import_picocolors.default.dim(s)}`;
+        switch (i) {
+          case "selected":
+            return `${import_picocolors.default.dim(s)}`;
+          case "active":
+            return `${import_picocolors.default.green(k2)} ${s} ${r2.hint ? import_picocolors.default.dim(`(${r2.hint})`) : ""}`;
+          case "cancelled":
+            return `${import_picocolors.default.strikethrough(import_picocolors.default.dim(s))}`;
+          default:
+            return `${import_picocolors.default.dim(P2)} ${import_picocolors.default.dim(s)}`;
+        }
       };
-      return new SD({ options: t.options, initialValues: t.initialValues, required: t.required ?? true, cursorAt: t.cursorAt, validate(r2) {
-        if (this.required && r2.length === 0) return `Please select at least one option.
-${import_picocolors.default.reset(import_picocolors.default.dim(`Press ${import_picocolors.default.gray(import_picocolors.default.bgWhite(import_picocolors.default.inverse(" space ")))} to select, ${import_picocolors.default.gray(import_picocolors.default.bgWhite(import_picocolors.default.inverse(" enter ")))} to submit`))}`;
-      }, render() {
+      return new LD({ options: t.options, initialValue: t.initialValue, render() {
         const r2 = `${import_picocolors.default.gray(o)}
 ${b2(this.state)}  ${t.message}
-`, i = (s, c) => {
-          const a = this.value.includes(s.value);
-          return c && a ? n(s, "active-selected") : a ? n(s, "selected") : n(s, c ? "active" : "inactive");
-        };
+`;
         switch (this.state) {
           case "submit":
-            return `${r2}${import_picocolors.default.gray(o)}  ${this.options.filter(({ value: s }) => this.value.includes(s)).map((s) => n(s, "submitted")).join(import_picocolors.default.dim(", ")) || import_picocolors.default.dim("none")}`;
-          case "cancel": {
-            const s = this.options.filter(({ value: c }) => this.value.includes(c)).map((c) => n(c, "cancelled")).join(import_picocolors.default.dim(", "));
-            return `${r2}${import_picocolors.default.gray(o)}  ${s.trim() ? `${s}
-${import_picocolors.default.gray(o)}` : ""}`;
-          }
-          case "error": {
-            const s = this.error.split(`
-`).map((c, a) => a === 0 ? `${import_picocolors.default.yellow(d2)}  ${import_picocolors.default.yellow(c)}` : `   ${c}`).join(`
-`);
-            return `${r2 + import_picocolors.default.yellow(o)}  ${G2({ options: this.options, cursor: this.cursor, maxItems: t.maxItems, style: i }).join(`
-${import_picocolors.default.yellow(o)}  `)}
-${s}
-`;
-          }
+            return `${r2}${import_picocolors.default.gray(o)}  ${n(this.options[this.cursor], "selected")}`;
+          case "cancel":
+            return `${r2}${import_picocolors.default.gray(o)}  ${n(this.options[this.cursor], "cancelled")}
+${import_picocolors.default.gray(o)}`;
           default:
-            return `${r2}${import_picocolors.default.cyan(o)}  ${G2({ options: this.options, cursor: this.cursor, maxItems: t.maxItems, style: i }).join(`
+            return `${r2}${import_picocolors.default.cyan(o)}  ${G2({ cursor: this.cursor, options: this.options, maxItems: t.maxItems, style: (i, s) => n(i, s ? "active" : "inactive") }).join(`
 ${import_picocolors.default.cyan(o)}  `)}
 ${import_picocolors.default.cyan(d2)}
 `;
@@ -687,7 +670,7 @@ ${import_picocolors.default.gray(d2)}  ${t}
     }, error: (t) => {
       M2.message(t, { symbol: import_picocolors.default.red(K2) });
     } };
-    J = `${import_picocolors.default.gray(o)}  `;
+    J2 = `${import_picocolors.default.gray(o)}  `;
   }
 });
 
@@ -7706,6 +7689,9 @@ import {
   isAbsolute as pathIsAbsolute
 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
+function getDirnameFromUrl(importMetaUrl) {
+  return dirname2(fileURLToPath2(importMetaUrl));
+}
 function detectExecutionMode() {
   const currentDir = process.cwd();
   const toolingPath = joinPath(currentDir, PACKAGE_PATHS.TOOLING);
@@ -7718,6 +7704,40 @@ function detectExecutionMode() {
   }
   return "published";
 }
+function getTemplatesRoot() {
+  const mode = detectExecutionMode();
+  if (mode === "development") {
+    const repoRoot = getRepoRoot();
+    return normalizePath(repoRoot, PACKAGE_PATHS.CLI, "templates");
+  } else {
+    try {
+      const cliRoot2 = resolveFrameworkPackage("@donotdev/cli");
+      if (cliRoot2) {
+        const templatesPath = normalizePath(cliRoot2, "templates");
+        if (pathExists(templatesPath)) {
+          return templatesPath;
+        }
+      }
+    } catch {
+    }
+    try {
+      const req = createRequire2(import.meta.url);
+      const cliPackageJsonPath = req.resolve("@donotdev/cli/package.json");
+      const cliRoot2 = normalizePath(dirname2(cliPackageJsonPath));
+      const templatesPath = normalizePath(cliRoot2, "templates");
+      if (pathExists(templatesPath)) {
+        return templatesPath;
+      }
+    } catch {
+    }
+    const cliRoot = getCliRootFromBundle();
+    return normalizePath(cliRoot, "templates");
+  }
+}
+function getCliRootFromBundle() {
+  const currentDir = getDirnameFromUrl(import.meta.url);
+  return normalizePath(currentDir, "..", "..", "..");
+}
 async function glob(pattern, options = {}) {
   const patterns = Array.isArray(pattern) ? pattern : [pattern];
   const cwd = options.cwd || pathResolverInstance.getAppRoot() || process.cwd();
@@ -7776,7 +7796,7 @@ function globSync(pattern, options = {}) {
   });
   return results.map((p2) => pathResolverInstance.normalizePath(p2));
 }
-var pathResolverInstance, getRepoRoot, getAppRoot, normalizePath, pathExists, read, readSync, write, writeSync, ensureDir, getRelativePathBetween, getDirname, joinPath;
+var pathResolverInstance, getRepoRoot, getAppRoot, resolveFrameworkPackage, normalizePath, pathExists, read, readSync, write, writeSync, ensureDir, getRelativePathBetween, getDirname, joinPath;
 var init_pathResolver = __esm({
   "packages/tooling/src/utils/pathResolver.ts"() {
     "use strict";
@@ -7785,6 +7805,7 @@ var init_pathResolver = __esm({
     pathResolverInstance = PathResolver.getInstance({ debug: false });
     getRepoRoot = () => pathResolverInstance.getRepoRoot();
     getAppRoot = () => pathResolverInstance.getAppRoot();
+    resolveFrameworkPackage = (name, from) => pathResolverInstance.resolveFrameworkPackage(name, from || null);
     normalizePath = (...pathSegments) => {
       return pathResolverInstance.normalizePath(join2(...pathSegments));
     };
@@ -7856,17 +7877,16 @@ async function askForConfirmation(message, defaultValue = false) {
   }
   return result;
 }
-async function askForMultiSelection(message, choices, defaultIndices = []) {
+async function askForSelection(message, choices, defaultValue = 0) {
   const options = choices.map((choice) => ({
     value: choice.value,
     label: choice.title,
     hint: choice.hint
   }));
-  const initialValues = defaultIndices.map((i) => choices[i]?.value).filter(Boolean);
-  const result = await fe({
+  const result = await ve({
     message,
     options,
-    initialValues: initialValues.length > 0 ? initialValues : void 0
+    initialValue: choices[defaultValue]?.value
   });
   if (pD(result)) {
     xe("Operation cancelled.");
@@ -8047,40 +8067,17 @@ var PRESERVE_IF_EXISTS = [
   "CLAUDE.md"
   // User may have customized
 ];
-function getInstalledCliTemplatesPath() {
-  const appRoot = getAppRoot();
-  if (!appRoot) return null;
-  const cliTemplatesPath = joinPath(
-    appRoot,
-    "node_modules",
-    "@donotdev",
-    "cli",
-    "templates",
-    "root-consumer"
-  );
-  if (pathExists(cliTemplatesPath)) {
-    return normalizePath(cliTemplatesPath);
-  }
-  return null;
-}
-function getFrameworkTemplatesPath() {
-  const possiblePaths = [
-    joinPath(process.cwd(), "..", "packages", "cli", "templates", "root-consumer"),
-    joinPath(process.cwd(), "packages", "cli", "templates", "root-consumer")
-  ];
-  for (const path of possiblePaths) {
-    if (pathExists(path)) {
-      return normalizePath(path);
+function getSourceTemplatesPath() {
+  try {
+    const templatesRoot = getTemplatesRoot();
+    const rootConsumerPath = joinPath(templatesRoot, "root-consumer");
+    if (pathExists(rootConsumerPath)) {
+      return normalizePath(rootConsumerPath);
     }
+    return null;
+  } catch (error2) {
+    return null;
   }
-  return null;
-}
-function getSourceTemplatesPath() {
-  const installed = getInstalledCliTemplatesPath();
-  if (installed) return installed;
-  const framework = getFrameworkTemplatesPath();
-  if (framework) return framework;
-  return null;
 }
 async function syncFile(sourcePath, destPath, preserveIfExists, appRoot) {
   const destPathWithoutExample = destPath.endsWith(".example") ? destPath.slice(0, -8) : destPath;
@@ -8190,10 +8187,16 @@ async function syncDocumentation(options = {}) {
   }
   const sourceRoot = getSourceTemplatesPath();
   if (!sourceRoot) {
-    log.error(
-      "Could not find framework templates. Make sure @donotdev/cli is installed."
-    );
-    return 1;
+    log.warn("Could not find framework templates. Documentation sync skipped.");
+    log.info("");
+    log.info("  Templates are looked up the same way as create-project:");
+    log.info("    \u2022 Published mode: node_modules/@donotdev/cli/templates");
+    log.info("    \u2022 Dev mode: packages/cli/templates (from monorepo)");
+    log.info("");
+    log.info("  To enable docs sync:");
+    log.info("    \u2022 Install @donotdev/cli: bun add -D @donotdev/cli");
+    log.info("    \u2022 Or run from framework monorepo (dev mode)");
+    return 0;
   }
   log.info(`Source templates: ${sourceRoot}`);
   log.info(`Destination: ${appRoot}`);
@@ -8287,20 +8290,24 @@ async function main(options = {}) {
     updatePackages = true;
     updateDocs = true;
   } else {
-    const selections = await askForMultiSelection(
+    const choices = [
+      { title: "Update packages", value: "packages", hint: "Update @donotdev/* packages and dependencies" },
+      { title: "Sync documentation", value: "docs", hint: "Sync guides, commands, and agents from framework" },
+      { title: "Both", value: "both", hint: "Update packages and sync documentation" }
+    ];
+    const selection = await askForSelection(
       "What would you like to update?",
-      [
-        { title: "Update packages", value: "packages", hint: "Update @donotdev/* packages and dependencies" },
-        { title: "Sync documentation", value: "docs", hint: "Sync guides, commands, and agents from framework" }
-      ],
-      [0, 1]
-      // Both selected by default
+      choices,
+      2
+      // Default to "Both"
     );
-    updatePackages = selections.includes("packages");
-    updateDocs = selections.includes("docs");
-    if (!updatePackages && !updateDocs) {
-      log.info("Nothing selected. Exiting.");
-      return 0;
+    if (selection === "packages") {
+      updatePackages = true;
+    } else if (selection === "docs") {
+      updateDocs = true;
+    } else if (selection === "both") {
+      updatePackages = true;
+      updateDocs = true;
     }
   }
   if (updatePackages) {

package/dist/bin/commands/create-app.js

@@ -8027,6 +8027,26 @@ function getTemplatesRoot() {
     const repoRoot = getRepoRoot();
     return normalizePath(repoRoot, PACKAGE_PATHS.CLI, "templates");
   } else {
+    try {
+      const cliRoot2 = resolveFrameworkPackage("@donotdev/cli");
+      if (cliRoot2) {
+        const templatesPath = normalizePath(cliRoot2, "templates");
+        if (pathExists(templatesPath)) {
+          return templatesPath;
+        }
+      }
+    } catch {
+    }
+    try {
+      const req = createRequire2(import.meta.url);
+      const cliPackageJsonPath = req.resolve("@donotdev/cli/package.json");
+      const cliRoot2 = normalizePath(dirname2(cliPackageJsonPath));
+      const templatesPath = normalizePath(cliRoot2, "templates");
+      if (pathExists(templatesPath)) {
+        return templatesPath;
+      }
+    } catch {
+    }
     const cliRoot = getCliRootFromBundle();
     return normalizePath(cliRoot, "templates");
   }

package/dist/bin/commands/create-project.js

@@ -8027,6 +8027,26 @@ function getTemplatesRoot() {
     const repoRoot = getRepoRoot();
     return normalizePath(repoRoot, PACKAGE_PATHS.CLI, "templates");
   } else {
+    try {
+      const cliRoot2 = resolveFrameworkPackage("@donotdev/cli");
+      if (cliRoot2) {
+        const templatesPath = normalizePath(cliRoot2, "templates");
+        if (pathExists(templatesPath)) {
+          return templatesPath;
+        }
+      }
+    } catch {
+    }
+    try {
+      const req = createRequire2(import.meta.url);
+      const cliPackageJsonPath = req.resolve("@donotdev/cli/package.json");
+      const cliRoot2 = normalizePath(dirname2(cliPackageJsonPath));
+      const templatesPath = normalizePath(cliRoot2, "templates");
+      if (pathExists(templatesPath)) {
+        return templatesPath;
+      }
+    } catch {
+    }
     const cliRoot = getCliRootFromBundle();
     return normalizePath(cliRoot, "templates");
   }

package/dist/index.js

@@ -8102,6 +8102,26 @@ function getTemplatesRoot() {
     const repoRoot = getRepoRoot();
     return normalizePath(repoRoot, PACKAGE_PATHS.CLI, "templates");
   } else {
+    try {
+      const cliRoot2 = resolveFrameworkPackage("@donotdev/cli");
+      if (cliRoot2) {
+        const templatesPath = normalizePath(cliRoot2, "templates");
+        if (pathExists(templatesPath)) {
+          return templatesPath;
+        }
+      }
+    } catch {
+    }
+    try {
+      const req = createRequire2(import.meta.url);
+      const cliPackageJsonPath = req.resolve("@donotdev/cli/package.json");
+      const cliRoot2 = normalizePath(dirname2(cliPackageJsonPath));
+      const templatesPath = normalizePath(cliRoot2, "templates");
+      if (pathExists(templatesPath)) {
+        return templatesPath;
+      }
+    } catch {
+    }
     const cliRoot = getCliRootFromBundle();
     return normalizePath(cliRoot, "templates");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@donotdev/cli",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Command-line interface for DoNotDev Framework",
   "type": "module",
   "private": false,

package/templates/app-next/src/pages/HomePage.tsx.example

@@ -68,7 +68,7 @@ export default function HomePage() {
         <RadioGroup
           value={currentPreset || 'landing'}
           onValueChange={(value) => setLayoutPreset(value as LayoutPreset)}
-          gridCols={3}
+          gridCols={[1,1,3,3]}
           items={LAYOUT_PRESETS.map((preset) => ({
             value: preset,
             label: preset.charAt(0).toUpperCase() + preset.slice(1),