@blocofy/cli 0.1.6 → 0.1.8

package/bin/blocofy.mjs

@@ -15,11 +15,12 @@ import { createInterface } from "node:readline/promises";
 import { credentialsPath, loadCredentials, saveCredentials } from "../lib/credentials.mjs";
 import { startDevServer } from "../lib/dev-server.mjs";
 import { readLocalTemplates } from "../lib/local-theme.mjs";
+import { githubNote } from "../lib/messages.mjs";
 import { fetchDevSession, pullTheme, pushTheme } from "../lib/theme-sync.mjs";
 import { hyperlink, openUrl } from "../lib/term.mjs";
 import { isValidToken, isValidUrl, normalizeUrl } from "../lib/validate.mjs";
 
-const VERSION = "0.1.6";
+const VERSION = "0.1.8";
 const args = process.argv.slice(2);
 
 /** Parse `--key value` and `--flag` (boolean) arguments. */
@@ -57,8 +58,9 @@ Usage
         --port <n>   local port (default 3030)
         --no-sync    local preview only (skip draft sync + remote views)
 
-  blocofy theme pull [dir]
+  blocofy theme pull [dir] [--draft]
       Download the live theme to disk. (dir defaults to cwd)
+        --draft      pull the draft theme (what 'theme dev' syncs into) instead of live
 
   blocofy theme push [dir] [--draft]
       Write the local theme to the site (create/update; no delete).
@@ -147,11 +149,13 @@ function requireCreds() {
 }
 
 async function themePull(rest) {
+  const flags = parseFlags(rest);
   const positional = rest.filter((a) => !a.startsWith("--"));
   const dir = resolve(positional[0] ?? process.cwd());
   const creds = requireCreds();
-  const { count } = await pullTheme({ dir, url: creds.url, token: creds.token });
-  console.log(`Downloaded ${count} theme files → ${dir}`);
+  const draft = Boolean(flags.draft);
+  const { count } = await pullTheme({ dir, url: creds.url, token: creds.token, draft });
+  console.log(`Downloaded ${count} ${draft ? "draft" : "live"} theme files → ${dir}`);
 }
 
 async function themePush(rest) {
@@ -217,6 +221,13 @@ async function themeDev(rest) {
   console.log(`\n  Press:  ${keys}`);
   console.log(`  Edit a theme file and save — every open view reloads automatically.\n`);
 
+  // Düzlem uyarısı: CLI yalnız tema KODUNU taşır; editörde yapılan içerik/ayar
+  // bulutta yaşar (githubNote → lib/messages.mjs, oturum durumuna göre uyarlanır).
+  const note = githubNote(session);
+  if (note) {
+    console.log(`  ℹ ${note}\n`);
+  }
+
   // Tanılama: kaç tema dosyası izleniyor? Boşsa hot-reload mümkün değil — yanlış
   // dizinde ya da `theme pull` yapılmamış demektir; sebebini açıkça söyle.
   const localFiles = readLocalTemplates(themeDir);

package/lib/messages.mjs

@@ -0,0 +1,21 @@
+/**
+ * `theme dev` kullanıcı-yönelik mesajları (saf → test edilebilir). Düzlem uyarısı:
+ * CLI yalnız tema KODUNU taşır; editörde yapılan içerik/ayar bulutta yaşar.
+ */
+
+/**
+ * Dev oturumuna göre "düzlem" uyarısı döndürür (string), oturum yoksa null.
+ * - GitHub bağlı → repo@branch + `git pull` ipucu.
+ * - Bağlı değil → içerik/ayar bulutta kalır + repo bağla ipucu.
+ * - Eski platform (githubConnected undefined) → ipuçsuz nötr uyarı.
+ */
+export function githubNote(session) {
+  if (!session) return null;
+  if (session.githubConnected === true) {
+    return `GitHub: ${session.githubRepo}@${session.githubBranch} — editor edits auto-commit there; run 'git pull' to sync them here.`;
+  }
+  return (
+    "Content & settings edited in the admin editor stay server-side — they won't appear in these local files." +
+    (session.githubConnected === false ? " Connect a GitHub repo for two-way sync." : "")
+  );
+}

package/lib/theme-sync.mjs

@@ -18,10 +18,16 @@ async function errorText(res) {
   }
 }
 
-/** Download the live theme to disk. `{ path: content }` (stripped) → `.liquid` files. */
-export async function pullTheme({ dir, url, token }) {
+/**
+ * Download a theme to disk. `{ path: content }` (stripped) → `.liquid` files.
+ * With `draft`, pulls the "CLI Draft" instance (what `theme dev` syncs into)
+ * instead of the live theme — symmetric with `push --draft`.
+ */
+export async function pullTheme({ dir, url, token, draft = false }) {
   const base = url.replace(/\/+$/, "");
-  const res = await fetch(`${base}/api/dev/theme`, { headers: { authorization: `Bearer ${token}` } });
+  const res = await fetch(`${base}/api/dev/theme${draft ? "?draft=1" : ""}`, {
+    headers: { authorization: `Bearer ${token}` },
+  });
   if (!res.ok) throw new Error(await errorText(res));
   const { files } = await res.json();
   let count = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocofy/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Develop your Blocofy theme locally against live data with instant preview — login, theme dev, pull, push.",
   "type": "module",
   "license": "MIT",