tiendu 0.8.1 → 0.9.0

package/lib/init.mjs

@@ -1,8 +1,10 @@
-import { mkdir, access } from "node:fs/promises";
+import { mkdir, readdir } from "node:fs/promises";
 import path from "node:path";
 import { readConfig, readCredentials, writeConfig, writeCredentials } from "./config.mjs";
-import { fetchUserStores } from "./api.mjs";
+import { fetchUserStores, fetchPreview } from "./api.mjs";
 import { formatInitSummary } from "./stores.mjs";
+import { listPreviews, createPreview, getPreviewDisplayName, getPreviewUrl } from "./preview.mjs";
+import { pull } from "./pull.mjs";
 import * as ui from "./ui.mjs";
 
 const DEFAULT_API_BASE_URL = "https://tiendu.uy";
@@ -21,19 +23,52 @@ const resolveBaseUrlOrFail = (baseUrlArg) => {
   return candidate;
 };
 
-const prepareWorkDir = async (dirArg) => {
-  if (!dirArg) return;
+const checkTargetDir = async (dirArg) => {
+  if (dirArg) {
+    const targetDir = path.resolve(process.cwd(), dirArg);
+    try {
+      const entries = await readdir(targetDir);
+      const hasContent = entries.filter((n) => !n.startsWith(".")).length > 0;
+      if (hasContent && !ui.isInteractive()) {
+        ui.log.error(`Directory "${dirArg}" already exists and is not empty.`);
+        process.exit(1);
+      }
 
-  const targetDir = path.resolve(process.cwd(), dirArg);
+      if (hasContent) {
+        const confirmed = await ui.confirm({
+          message: `Directory "${dirArg}" already exists. Overwrite its contents?`,
+        });
+        if (ui.isCancel(confirmed) || !confirmed) {
+          ui.cancel("Setup cancelled.");
+          process.exit(0);
+        }
+      }
+    } catch {
+      // Directory doesn't exist — fine
+    }
+    return;
+  }
 
   try {
-    await access(targetDir);
-    ui.cancel(`Directory "${dirArg}" already exists.`);
-    process.exit(1);
+    const entries = await readdir(process.cwd());
+    const hasContent = entries.filter((n) => !n.startsWith(".") && n !== ".cli").length > 0;
+    if (hasContent && ui.isInteractive()) {
+      const confirmed = await ui.confirm({
+        message: "Current directory is not empty. Overwrite its contents?",
+      });
+      if (ui.isCancel(confirmed) || !confirmed) {
+        ui.cancel("Setup cancelled.");
+        process.exit(0);
+      }
+    }
   } catch {
-    // Safe to create the target directory.
+    // Can't happen for cwd
   }
+};
 
+const enterTargetDir = async (dirArg) => {
+  if (!dirArg) return;
+  const targetDir = path.resolve(process.cwd(), dirArg);
   await mkdir(targetDir, { recursive: true });
   process.chdir(targetDir);
 };
@@ -108,9 +143,7 @@ const collectDirectInputs = (apiKeyArg, baseUrlArg) => {
   };
 };
 
-export const init = async ({ dirArg, apiKeyArg, baseUrlArg } = {}) => {
-  await prepareWorkDir(dirArg);
-
+export const init = async ({ dirArg, apiKeyArg, baseUrlArg, previewKeyArg } = {}) => {
   const existingConfig = await readConfig();
   const existingCredentials = await readCredentials();
   const hasExistingSetup = Boolean(existingConfig || existingCredentials);
@@ -121,7 +154,7 @@ export const init = async ({ dirArg, apiKeyArg, baseUrlArg } = {}) => {
     process.exit(1);
   }
 
-  if (!directMode) {
+  if (!directMode && !dirArg) {
     await ensureResetAllowed(hasExistingSetup);
   }
 
@@ -146,20 +179,156 @@ export const init = async ({ dirArg, apiKeyArg, baseUrlArg } = {}) => {
     process.exit(1);
   }
 
-  const selectedStore = stores.length === 1 ? stores[0] : null;
-  spinner.stop(`Connected to Tiendu. ${stores.length} store${stores.length === 1 ? "" : "s"} available.`);
+  let selectedStore = stores.length === 1 ? stores[0] : null;
+
+  if (!selectedStore && ui.isInteractive()) {
+    spinner.stop(`Connected to Tiendu. ${stores.length} stores available.`);
+
+    const storeOptions = stores.map((store) => ({
+      value: store.id,
+      label: store.name,
+      hint: `ID: ${store.id}`,
+    }));
+
+    const chosen = await ui.select({
+      message: "Select a store",
+      options: storeOptions,
+    });
+
+    if (ui.isCancel(chosen)) {
+      ui.cancel("Setup cancelled.");
+      process.exit(1);
+    }
+
+    selectedStore = stores.find((s) => s.id === chosen) ?? null;
+  }
+
+  if (selectedStore || stores.length === 1) {
+    spinner.stop(
+      `Connected to Tiendu. ${stores.length} store${stores.length === 1 ? "" : "s"} available.`,
+    );
+  } else {
+    spinner.stop(
+      `Connected to Tiendu. ${stores.length} stores available.`,
+    );
+  }
+
+  let previewKey = null;
+
+  if (previewKeyArg && selectedStore) {
+    const result = await fetchPreview(apiBaseUrl, apiKey, selectedStore.id, previewKeyArg);
+    if (result.ok) {
+      previewKey = previewKeyArg;
+      const url = getPreviewUrl(apiBaseUrl, result.data);
+      const displayName = getPreviewDisplayName(result.data);
+      ui.log.message(`Preview "${displayName}" (${previewKey})`);
+      ui.log.message(`  ${url}`);
+    } else {
+      ui.log.error(`Preview ${previewKeyArg} not found.`);
+      process.exit(1);
+    }
+  } else if (selectedStore && ui.isInteractive()) {
+    const listResult = await listPreviews(apiBaseUrl, apiKey, selectedStore.id);
+    let previews = [];
+    if (listResult.ok) {
+      previews = listResult.data;
+    }
+
+    const LIVE_VALUE = "__live__";
+    const CREATE_NEW_VALUE = "__create_new__";
+
+    const options = [
+      {
+        value: LIVE_VALUE,
+        label: "Live theme",
+        hint: "No preview — work directly with the live storefront",
+      },
+      ...previews.map((p) => ({
+        value: p.previewKey,
+        label: `${getPreviewDisplayName(p)} (${p.previewKey})`,
+      })),
+      { value: CREATE_NEW_VALUE, label: "Create a new preview" },
+    ];
+
+    const chosen = await ui.select({
+      message: "Select a preview",
+      options,
+    });
+
+    if (ui.isCancel(chosen)) {
+      ui.cancel("Setup cancelled.");
+      process.exit(1);
+    }
+
+    if (chosen === LIVE_VALUE) {
+      // Live theme — no preview key
+    } else if (chosen === CREATE_NEW_VALUE) {
+      const nameInput = await ui.text({
+        message: "Preview name (optional)",
+        placeholder: "Press Enter to skip",
+        defaultValue: "",
+      });
+
+      if (ui.isCancel(nameInput)) {
+        ui.cancel("Setup cancelled.");
+        process.exit(1);
+      }
+
+      const name = (nameInput ?? "").trim();
+      const createSpinner = ui.spinner();
+      createSpinner.start("Creating preview...");
+
+      const createResult = await createPreview(
+        apiBaseUrl,
+        apiKey,
+        selectedStore.id,
+        name,
+      );
+
+      if (!createResult.ok) {
+        createSpinner.stop("Failed to create preview.", 1);
+        ui.log.error(createResult.error);
+        process.exit(1);
+      }
+
+      const preview = createResult.data;
+      previewKey = preview.previewKey;
+      const url = getPreviewUrl(apiBaseUrl, preview);
+      const displayName = getPreviewDisplayName(preview);
+      createSpinner.stop(`Preview "${displayName}" created (${previewKey})`);
+      ui.log.message(`  ${url}`);
+    } else {
+      const selectedPreview = previews.find((p) => p.previewKey === chosen);
+      previewKey = chosen;
+      if (selectedPreview) {
+        const displayName = getPreviewDisplayName(selectedPreview);
+        const url = getPreviewUrl(apiBaseUrl, selectedPreview);
+        ui.log.message(`Preview "${displayName}" (${previewKey})`);
+        ui.log.message(`  ${url}`);
+      }
+    }
+  }
+
+  await checkTargetDir(dirArg);
+  await enterTargetDir(dirArg);
 
   await writeCredentials({ apiKey });
   await writeConfig({
     apiBaseUrl,
     ...(selectedStore ? { storeId: selectedStore.id } : {}),
+    ...(previewKey ? { previewKey } : {}),
   });
 
+  if (selectedStore) {
+    await pull({ previewKey: previewKey || undefined, confirmSourceSync: false });
+  }
+
   const summary = formatInitSummary({
     apiBaseUrl,
     usedDefaultBaseUrl,
     stores,
     selectedStore,
+    previewKey,
   });
 
   if (ui.isInteractive()) {

package/lib/preview.mjs

@@ -429,12 +429,14 @@ export const previewShow = async () => {
   const preview = result.data;
   const url = getPreviewUrl(config.apiBaseUrl, preview);
   const displayName = getPreviewDisplayName(preview);
+  const editorUrl = `${config.apiBaseUrl}/admin/tiendas/${config.storeId}/tema/personalizar?preview=${preview.previewKey}`;
 
   ui.note(
     [
       `Name: ${displayName}`,
       `Key: ${preview.previewKey}`,
       `URL: ${url}`,
+      `Editor: ${editorUrl}`,
       `Created: ${formatRelativeDate(preview.createdAt)}`,
     ].join("\n"),
     "Attached preview",

package/lib/publish.mjs

@@ -7,7 +7,7 @@ import {
 import { push } from "./push.mjs";
 import * as ui from "./ui.mjs";
 
-export const publish = async ({ skipBuild = false, previewKey: previewKeyArg, skipInstances = false } = {}) => {
+export const publish = async ({ skipBuild = false, previewKey: previewKeyArg, overrideState = false } = {}) => {
   const { config, credentials } = await loadConfigOrFail();
 
   // Resolve preview key: explicit arg > interactive picker
@@ -42,7 +42,7 @@ export const publish = async ({ skipBuild = false, previewKey: previewKeyArg, sk
       ? "Syncing existing dist/ output to the preview before publishing..."
       : "Building and syncing the latest dist/ output before publishing...",
   );
-  await push({ skipBuild, previewKey, skipInstances });
+  await push({ skipBuild, previewKey, overrideState });
 
   const spinner = ui.spinner();
   spinner.start("Publishing preview to live storefront...");

package/lib/pull.mjs

@@ -1,4 +1,5 @@
-import { mkdir, rm } from "node:fs/promises";
+import { cp, mkdir, readdir, rm } from "node:fs/promises";
+import path from "node:path";
 import { getDistDir, loadConfigOrFail } from "./config.mjs";
 import { downloadStorefrontArchive, downloadPreviewArchive } from "./api.mjs";
 import { fetchPreviewDetails } from "./preview.mjs";
@@ -12,8 +13,52 @@ const formatBytes = (bytes) => {
   return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 };
 
-export const pull = async ({ previewKey } = {}) => {
+const syncDistToSrc = async (distDir) => {
+  const rootDir = path.resolve(distDir, "..");
+  const srcDir = path.join(rootDir, "src");
+  let entries;
+
+  try {
+    entries = await readdir(distDir, { withFileTypes: true });
+  } catch {
+    return 0;
+  }
+
+  const distDirs = entries.filter(
+    (entry) => entry.isDirectory() && !entry.name.startsWith("."),
+  );
+
+  let synced = 0;
+
+  for (const dir of distDirs) {
+    const distSubDir = path.join(distDir, dir.name);
+    const srcDest = path.join(srcDir, dir.name);
+    const rootDest = path.join(rootDir, dir.name);
+
+    await rm(srcDest, { recursive: true, force: true });
+
+    if (srcDest !== rootDest) {
+      await rm(rootDest, { recursive: true, force: true });
+    }
+
+    await cp(distSubDir, srcDest, { recursive: true });
+    synced++;
+  }
+
+  return synced;
+};
+
+export const pull = async ({ previewKey, forceLive = false, confirmSourceSync = true } = {}) => {
   const { config, credentials } = await loadConfigOrFail();
+
+  if (!previewKey && !forceLive && config.previewKey) {
+    previewKey = config.previewKey;
+  }
+
+  if (forceLive) {
+    previewKey = undefined;
+  }
+
   const previewDetails = previewKey
     ? await fetchPreviewDetails(
         config.apiBaseUrl,
@@ -63,6 +108,23 @@ export const pull = async ({ previewKey } = {}) => {
     `${extractedFiles.length} file${extractedFiles.length === 1 ? "" : "s"} extracted${suffix}.`,
   );
 
+  if (confirmSourceSync && ui.isInteractive()) {
+    const confirmed = await ui.confirm({
+      message: "Sync downloaded theme directories to src/? This overwrites local theme files.",
+    });
+
+    if (ui.isCancel(confirmed) || !confirmed) {
+      ui.cancel("Source sync cancelled. dist/ was updated.");
+      return;
+    }
+  }
+
+  spinner.start("Syncing dist to src...");
+  const syncedDirs = await syncDistToSrc(outputDir);
+  spinner.stop(
+    `${syncedDirs} director${syncedDirs === 1 ? "y" : "ies"} synced to src/.`,
+  );
+
   if (previewDetails?.ok) {
     ui.log.message(`  ${previewDetails.data.url}`);
   }

package/lib/push.mjs

@@ -26,11 +26,11 @@ export const pushPreparedDirectoryToPreview = async ({
   compressMessage = "Compressing files...",
   uploadMessage,
   retryMessage,
-  skipInstances = false,
+  overrideState = false,
 }) => {
   spinner.message(compressMessage);
 
-  const shouldInclude = skipInstances
+  const shouldInclude = !overrideState
     ? (relativePath) => !isInstanceFile(relativePath)
     : undefined;
 
@@ -40,7 +40,7 @@ export const pushPreparedDirectoryToPreview = async ({
   );
 
   return retryAsync(
-    () => uploadPreviewZip(apiBaseUrl, apiKey, storeId, previewKey, zipBuffer, skipInstances),
+    () => uploadPreviewZip(apiBaseUrl, apiKey, storeId, previewKey, zipBuffer, !overrideState),
     {
       attempts: 3,
       shouldRetry: (uploadResult) => !uploadResult.ok && Boolean(uploadResult.retriable),
@@ -54,11 +54,11 @@ export const pushPreparedDirectoryToPreview = async ({
   );
 };
 
-export const push = async ({ skipBuild = false, previewKey: previewKeyArg, skipInstances = false } = {}) => {
+export const push = async ({ skipBuild = false, previewKey: previewKeyArg, overrideState = false } = {}) => {
   const { config, credentials } = await loadConfigOrFail();
 
   if (!skipBuild) {
-    const result = await build({ skipInstances });
+    const result = await build({ overrideState });
     if (!result.ok) {
       process.exit(1);
     }
@@ -89,7 +89,7 @@ export const push = async ({ skipBuild = false, previewKey: previewKeyArg, skipI
     previewKey,
     rootDir,
     spinner,
-    skipInstances,
+    overrideState,
   });
 
   if (!result.ok) {
@@ -99,5 +99,8 @@ export const push = async ({ skipBuild = false, previewKey: previewKeyArg, skipI
   }
 
   spinner.stop(`Files uploaded to preview ${previewKey}.`);
+  ui.log.message(
+    `Theme state: ${overrideState ? "overridden from local files" : "preserved from the theme editor"}`,
+  );
   ui.log.message(`  ${previewDetails.data.url}`);
 };

package/lib/stores.mjs

@@ -66,7 +66,7 @@ export const storesSet = async (storeIdArg) => {
   spinner.stop(`Active store set to ${selectedStore.name} (ID: ${selectedStore.id}).`);
 };
 
-export const formatInitSummary = ({ apiBaseUrl, usedDefaultBaseUrl, stores, selectedStore }) => {
+export const formatInitSummary = ({ apiBaseUrl, usedDefaultBaseUrl, stores, selectedStore, previewKey }) => {
   const lines = ["Status: Connected."];
 
   if (usedDefaultBaseUrl) {
@@ -76,7 +76,12 @@ export const formatInitSummary = ({ apiBaseUrl, usedDefaultBaseUrl, stores, sele
   }
 
   if (selectedStore) {
-    lines.push(`Store: ${selectedStore.name} (ID: ${selectedStore.id}) [auto-selected]`);
+    lines.push(`Store: ${selectedStore.name} (ID: ${selectedStore.id})${stores.length === 1 ? " [auto-selected]" : ""}`);
+    if (previewKey) {
+      lines.push(`Preview: ${previewKey} [attached]`);
+    } else {
+      lines.push("Preview: live theme (no preview attached)");
+    }
     return lines.join("\n");
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiendu",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "CLI para desarrollar y publicar temas en Tiendu",
   "type": "module",
   "bin": {