tiendu 0.6.0 → 0.7.0

package/lib/dev.mjs

@@ -1,8 +1,7 @@
 import { watch } from "node:fs";
 import { readFile, stat } from "node:fs/promises";
 import path from "node:path";
-import * as p from "@clack/prompts";
-import { loadConfigOrFail, isBuiltTheme, getDistDir } from "./config.mjs";
+import { getDistDir, loadConfigOrFail } from "./config.mjs";
 import {
   fetchPreviewDetails,
   resolvePreviewKeyInteractively,
@@ -16,6 +15,7 @@ import { isDotfile } from "./fs-utils.mjs";
 import { startLocalPreviewServer } from "./local-preview.mjs";
 import { pushPreparedDirectoryToPreview } from "./push.mjs";
 import { retryAsync } from "./retry.mjs";
+import * as ui from "./ui.mjs";
 
 const RETRY_ATTEMPTS = 3;
 const MAX_SYNC_FILE_SIZE_BYTES = 20 * 1024 * 1024;
@@ -59,7 +59,7 @@ const runCleanupStep = async (label, cleanupFn) => {
       }),
     ]);
   } catch (error) {
-    p.log.warn(error.message);
+    ui.log.warn(error.message);
   } finally {
     if (timeoutId) clearTimeout(timeoutId);
   }
@@ -119,20 +119,16 @@ export const dev = async () => {
   const { config, credentials } = await loadConfigOrFail();
   const { apiBaseUrl, storeId } = config;
   const { apiKey } = credentials;
-  const builtTheme = await isBuiltTheme();
-  const rootDir = builtTheme ? getDistDir() : process.cwd();
+  const rootDir = getDistDir();
   let buildCleanup = null;
   let localPreviewServer = null;
 
-  // For built themes, run the build first (with watch mode)
-  if (builtTheme) {
-    const buildResult = await build({ watch: true });
-    if (!buildResult.ok) {
-      p.log.error("Initial build failed. Fix errors and try again.");
-      process.exit(1);
-    }
-    buildCleanup = buildResult.cleanup;
+  const buildResult = await build({ watch: true });
+  if (!buildResult.ok) {
+    ui.log.error("Initial build failed. Fix errors and try again.");
+    process.exit(1);
   }
+  buildCleanup = buildResult.cleanup;
 
   // Resolve preview via shared interactive picker
   const previewKey = await resolvePreviewKeyInteractively({ config, credentials });
@@ -145,14 +141,14 @@ export const dev = async () => {
     previewKey,
   );
   if (!previewResult.ok) {
-    p.log.error(`Preview ${previewKey} not found.`);
+    ui.log.error(`Preview ${previewKey} not found.`);
     process.exit(1);
   }
 
   const previewHostname = previewResult.data.preview.previewHostname;
   const previewUrl = previewResult.data.url;
 
-  const spinner = p.spinner();
+  const spinner = ui.spinner();
   spinner.start("Compressing files...");
 
   const uploadResult = await pushPreparedDirectoryToPreview({
@@ -169,7 +165,7 @@ export const dev = async () => {
 
   if (!uploadResult.ok) {
     spinner.stop("Initial push failed.", 1);
-    p.log.error(uploadResult.error);
+    ui.log.error(uploadResult.error);
     process.exit(1);
   }
 
@@ -179,16 +175,16 @@ export const dev = async () => {
       previewHostname,
     });
   } catch (error) {
-    p.log.warn(`Could not start local live preview: ${error.message}`);
+    ui.log.warn(`Could not start local live preview: ${error.message}`);
   }
 
   spinner.stop(`Preview ready (${previewKey}).`);
   if (localPreviewServer) {
-    p.log.message(`Local live preview: ${localPreviewServer.url}`);
+    ui.log.message(`Local live preview: ${localPreviewServer.url}`);
   }
-  p.log.message(`Sharable preview: ${previewUrl}`);
+  ui.log.message(`Sharable preview: ${previewUrl}`);
 
-  p.log.message("Watching for changes \u2014 press Ctrl+C to stop.");
+  ui.log.message("Watching for changes - press Ctrl+C to stop.");
 
   // ── File watcher ──────────────────────────────────────────────────────────
   /** @type {Map<string, NodeJS.Timeout>} */
@@ -223,7 +219,7 @@ export const dev = async () => {
 
       if (!fileStat || !fileStat.isFile()) {
         if (!fileStat) {
-          console.log(`\u2715 ${relativePath}`);
+          console.log(`DELETE ${relativePath}`);
           const result = await deleteFileWithRetries(
             apiBaseUrl,
             apiKey,
@@ -231,14 +227,14 @@ export const dev = async () => {
             previewKey,
             relativePath,
             async (_, nextAttempt) => {
-              p.log.warn(
+              ui.log.warn(
                 `     Retry delete ${relativePath} (${nextAttempt}/${RETRY_ATTEMPTS})`,
               );
             },
           );
 
           if (!result.ok) {
-            p.log.warn(`     Failed to delete after ${RETRY_ATTEMPTS} attempts: ${result.error}`);
+            ui.log.warn(`     Failed to delete after ${RETRY_ATTEMPTS} attempts: ${result.error}`);
           } else {
             localPreviewServer?.notifyReload();
           }
@@ -247,9 +243,9 @@ export const dev = async () => {
         return;
       }
 
-      console.log(`\u2191 ${relativePath}`);
+      console.log(`UPLOAD ${relativePath}`);
       if (fileStat.size > MAX_SYNC_FILE_SIZE_BYTES) {
-        p.log.warn(
+        ui.log.warn(
           `     Skipping ${relativePath}: file is ${(fileStat.size / (1024 * 1024)).toFixed(1)} MB (limit ${(MAX_SYNC_FILE_SIZE_BYTES / (1024 * 1024)).toFixed(0)} MB).`,
         );
         return;
@@ -264,19 +260,19 @@ export const dev = async () => {
         relativePath,
         content,
         async (_, nextAttempt) => {
-          p.log.warn(
+          ui.log.warn(
             `     Retry upload ${relativePath} (${nextAttempt}/${RETRY_ATTEMPTS})`,
           );
         },
       );
 
       if (!result.ok) {
-        p.log.warn(`     Failed to upload after ${RETRY_ATTEMPTS} attempts: ${result.error}`);
+        ui.log.warn(`     Failed to upload after ${RETRY_ATTEMPTS} attempts: ${result.error}`);
       } else {
         localPreviewServer?.notifyReload();
       }
     } catch (error) {
-      p.log.warn(`     Error processing ${relativePath}: ${error.message}`);
+      ui.log.warn(`     Error processing ${relativePath}: ${error.message}`);
     } finally {
       inFlightPaths.delete(relativePath);
 
@@ -289,7 +285,7 @@ export const dev = async () => {
   const watcher = watch(rootDir, { recursive: true }, (eventType, filename) => {
     if (!filename) return;
     if (hasDotfileSegment(filename)) return;
-    if (shouldIgnoreWatchedPath(filename, builtTheme)) return;
+    if (shouldIgnoreWatchedPath(filename, true)) return;
 
     const relativePath = filename.split(path.sep).join("/");
     queueSync(relativePath);
@@ -306,7 +302,7 @@ export const dev = async () => {
     await runCleanupStep("Local preview shutdown", () => localPreviewServer?.close());
     await runCleanupStep("Build watcher shutdown", buildCleanup);
 
-    p.outro("Dev mode stopped.");
+    ui.outro("Dev mode stopped.");
     process.exit(0);
   };
 

package/lib/init.mjs

@@ -1,74 +1,73 @@
 import { mkdir, access } from "node:fs/promises";
 import path from "node:path";
-import * as p from "@clack/prompts";
-import {
-  readConfig,
-  readCredentials,
-  writeConfig,
-  writeCredentials,
-} from "./config.mjs";
+import { readConfig, readCredentials, writeConfig, writeCredentials } from "./config.mjs";
 import { fetchUserStores } from "./api.mjs";
+import { formatInitSummary } from "./stores.mjs";
+import * as ui from "./ui.mjs";
+
+const DEFAULT_API_BASE_URL = "https://tiendu.uy";
 
 /** @param {string} url */
 const normalizeBaseUrl = (url) => (url.endsWith("/") ? url.slice(0, -1) : url);
 
-/**
- * @param {string | undefined} dirArg  optional directory name passed as CLI arg
- */
-export const init = async (dirArg) => {
-  // ─── Resolve working directory ────────────────────────────────────────────
-  let workDir = process.cwd();
-
-  if (dirArg) {
-    const targetDir = path.resolve(process.cwd(), dirArg);
-
-    // Fail clearly if the directory already exists
-    try {
-      await access(targetDir);
-      // access succeeded → it exists
-      p.intro("Tiendu CLI — Setup");
-      p.cancel(`Directory "${dirArg}" already exists.`);
-      process.exit(1);
-    } catch {
-      // access failed → doesn't exist, safe to create
-    }
-
-    await mkdir(targetDir, { recursive: true });
-    workDir = targetDir;
-
-    // Change cwd so config is written inside the new directory
-    process.chdir(workDir);
+const resolveBaseUrlOrFail = (baseUrlArg) => {
+  const candidate = normalizeBaseUrl((baseUrlArg ?? DEFAULT_API_BASE_URL).trim());
+  try {
+    new URL(candidate);
+  } catch {
+    ui.log.error("Invalid base URL.");
+    process.exit(1);
   }
+  return candidate;
+};
 
-  // Re-read config after potential chdir
-  const existingConfig = await readConfig();
-  const existingCredentials = await readCredentials();
+const prepareWorkDir = async (dirArg) => {
+  if (!dirArg) return;
 
-  p.intro("Tiendu CLI — Setup");
+  const targetDir = path.resolve(process.cwd(), dirArg);
 
-  // ─── API Key ──────────────────────────────────────────────────────────────
-  const apiKeyDefault = existingCredentials?.apiKey ?? "";
+  try {
+    await access(targetDir);
+    ui.cancel(`Directory "${dirArg}" already exists.`);
+    process.exit(1);
+  } catch {
+    // Safe to create the target directory.
+  }
 
-  const apiKeyInput = await p.password({
-    message: "API Key",
-    mask: "*",
-    validate: (value) => {
-      const resolved = (value ?? "").trim() || apiKeyDefault;
-      if (!resolved) return "API Key is required.";
-    },
+  await mkdir(targetDir, { recursive: true });
+  process.chdir(targetDir);
+};
+
+const ensureResetAllowed = async (hasExistingSetup) => {
+  if (!hasExistingSetup) return;
+
+  const confirmed = await ui.confirm({
+    message: "Existing Tiendu configuration found. Reset it and continue?",
   });
 
-  if (p.isCancel(apiKeyInput)) {
-    p.cancel("Setup cancelled.");
+  if (ui.isCancel(confirmed) || !confirmed) {
+    ui.cancel("Setup cancelled.");
     process.exit(0);
   }
+};
 
-  const apiKey = (apiKeyInput ?? "").trim() || apiKeyDefault;
+const collectInteractiveInputs = async () => {
+  ui.intro("Tiendu CLI — Setup");
 
-  // ─── API Base URL ─────────────────────────────────────────────────────────
-  const baseUrlDefault = existingConfig?.apiBaseUrl ?? "https://tiendu.uy";
+  const apiKeyInput = await ui.password({
+    message: "API Key",
+    mask: "*",
+    validate: (value) => (!(value ?? "").trim() ? "API Key is required." : undefined),
+  });
 
-  const baseUrlInput = await p.text({
+  if (ui.isCancel(apiKeyInput)) {
+    ui.cancel("Setup cancelled.");
+    process.exit(0);
+  }
+
+  const apiKey = (apiKeyInput ?? "").trim();
+  const baseUrlDefault = DEFAULT_API_BASE_URL;
+  const baseUrlInput = await ui.text({
     message: "API base URL",
     placeholder: baseUrlDefault,
     defaultValue: baseUrlDefault,
@@ -82,81 +81,92 @@ export const init = async (dirArg) => {
     },
   });
 
-  if (p.isCancel(baseUrlInput)) {
-    p.cancel("Setup cancelled.");
+  if (ui.isCancel(baseUrlInput)) {
+    ui.cancel("Setup cancelled.");
     process.exit(0);
   }
 
-  const apiBaseUrl = normalizeBaseUrl(
-    (baseUrlInput ?? "").trim() || baseUrlDefault,
-  );
+  const apiBaseUrl = normalizeBaseUrl((baseUrlInput ?? "").trim() || baseUrlDefault);
+  return {
+    apiKey,
+    apiBaseUrl,
+    usedDefaultBaseUrl: apiBaseUrl === DEFAULT_API_BASE_URL,
+  };
+};
 
-  // ─── Fetch stores (validates API key implicitly) ───────────────────────────
-  const spinner = p.spinner();
+const collectDirectInputs = (apiKeyArg, baseUrlArg) => {
+  const apiKey = (apiKeyArg ?? "").trim();
+  if (!apiKey) {
+    ui.log.error("API Key is required. Use: tiendu init <api-key> [base-url]");
+    process.exit(1);
+  }
+
+  return {
+    apiKey,
+    apiBaseUrl: resolveBaseUrlOrFail(baseUrlArg),
+    usedDefaultBaseUrl: !baseUrlArg,
+  };
+};
+
+export const init = async ({ dirArg, apiKeyArg, baseUrlArg } = {}) => {
+  await prepareWorkDir(dirArg);
+
+  const existingConfig = await readConfig();
+  const existingCredentials = await readCredentials();
+  const hasExistingSetup = Boolean(existingConfig || existingCredentials);
+  const directMode = Boolean(apiKeyArg);
+
+  if (!directMode && !ui.isInteractive()) {
+    ui.log.error("Non-interactive init requires an API key. Use: tiendu init <api-key> [base-url] --non-interactive");
+    process.exit(1);
+  }
+
+  if (!directMode) {
+    await ensureResetAllowed(hasExistingSetup);
+  }
+
+  const { apiKey, apiBaseUrl, usedDefaultBaseUrl } = directMode
+    ? collectDirectInputs(apiKeyArg, baseUrlArg)
+    : await collectInteractiveInputs();
+
+  const spinner = ui.spinner();
   spinner.start("Verifying credentials...");
 
   const storesResult = await fetchUserStores(apiBaseUrl, apiKey);
-
   if (!storesResult.ok) {
     spinner.stop("Failed to verify credentials.", 1);
-    p.cancel(storesResult.error);
+    ui.log.error(storesResult.error);
     process.exit(1);
   }
 
   const stores = storesResult.data;
-
   if (stores.length === 0) {
     spinner.stop("No stores found.", 1);
-    p.cancel("Your API Key does not have access to any store.");
+    ui.log.error("Your API key does not have access to any stores.");
     process.exit(1);
   }
 
-  spinner.stop(
-    `${stores.length} store${stores.length === 1 ? "" : "s"} found.`,
-  );
+  const selectedStore = stores.length === 1 ? stores[0] : null;
+  spinner.stop(`Connected to Tiendu. ${stores.length} store${stores.length === 1 ? "" : "s"} available.`);
 
-  // ─── Select store ─────────────────────────────────────────────────────────
-  let storeId;
+  await writeCredentials({ apiKey });
+  await writeConfig({
+    apiBaseUrl,
+    ...(selectedStore ? { storeId: selectedStore.id } : {}),
+  });
+
+  const summary = formatInitSummary({
+    apiBaseUrl,
+    usedDefaultBaseUrl,
+    stores,
+    selectedStore,
+  });
 
-  if (stores.length === 1) {
-    storeId = stores[0].id;
-    p.log.info(`Store: ${stores[0].name} (ID: ${storeId})`);
+  if (ui.isInteractive()) {
+    ui.note(summary, "Setup complete");
   } else {
-    const selectedId = await p.select({
-      message: "Select a store",
-      options: stores.map((store) => ({
-        value: store.id,
-        label: store.name,
-        hint: `ID: ${store.id}`,
-      })),
-      initialValue: existingConfig?.storeId ?? stores[0].id,
-    });
-
-    if (p.isCancel(selectedId)) {
-      p.cancel("Setup cancelled.");
-      process.exit(0);
-    }
-
-    storeId = selectedId;
+    ui.log.message(summary);
   }
 
-  // ─── Save ─────────────────────────────────────────────────────────────────
-  await writeConfig({ storeId, apiBaseUrl });
-  await writeCredentials({ apiKey });
-
-  const nextSteps = dirArg
-    ? [`cd ${dirArg}`, `tiendu pull  # download the current live theme`]
-    : [`tiendu pull  # download the current live theme`];
-
-  p.note(
-    [
-      ...nextSteps,
-      "",
-      "Tip: enable Dev Mode in the Tiendu platform",
-      "(Settings → General) for preview data to load correctly.",
-    ].join("\n"),
-    "Next steps",
-  );
-
-  p.outro("Configuration saved to .cli/");
+  ui.outro("Configuration saved to .cli/");
 };