@blocofy/cli 0.1.4 → 0.1.6

package/bin/blocofy.mjs

@@ -14,11 +14,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 { 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.4";
+const VERSION = "0.1.6";
 const args = process.argv.slice(2);
 
 /** Parse `--key value` and `--flag` (boolean) arguments. */
@@ -216,6 +217,20 @@ async function themeDev(rest) {
   console.log(`\n  Press:  ${keys}`);
   console.log(`  Edit a theme file and save — every open view reloads automatically.\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);
+  const fileCount = Object.keys(localFiles).length;
+  if (fileCount === 0) {
+    console.warn(
+      `  ⚠ No theme files found under ${themeDir}\n` +
+        `    Expected top-level folders: layout/ section/ partial/ asset/ block/ template/\n` +
+        `    Run this from your theme root, or fetch it first:  blocofy theme pull\n`,
+    );
+  } else {
+    console.log(`  Watching ${themeDir} — ${fileCount} theme files\n`);
+  }
+
   if (flags.dry) {
     console.log("(--dry: server not started)");
     return;
@@ -227,6 +242,18 @@ async function themeDev(rest) {
     token: creds.token,
     port,
     syncDraft: Boolean(session),
+    // Her kaydetmede ne olduğunu bas — "reloaded" = watch tetiklendi; "0 views"
+    // = hiçbir tarayıcı sekmesi bağlı değil (yanlış görünüme bakıyorsun); sync
+    // hatası = draft güncellenemedi (preview/editör eski kalır, local yine yenilenir).
+    onReload: ({ file, synced, clients, error }) => {
+      const what = file || "change";
+      if (error) {
+        console.error(`  ↻ ${what} — draft sync failed: ${error} (local view still reloaded)`);
+        return;
+      }
+      const views = clients ? `${clients} view${clients === 1 ? "" : "s"}` : "no views connected";
+      console.log(`  ↻ ${what} → ${synced ? "synced + " : ""}reloaded (${views})`);
+    },
     onError: (err) => {
       if (err && err.code === "EADDRINUSE") {
         console.error(`Port ${port} is in use. Try a different port: blocofy theme dev --port <n>`);

package/lib/dev-server.mjs

@@ -1,9 +1,10 @@
 import { createServer } from "node:http";
-import { existsSync, readFileSync, statSync, watch } from "node:fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join, normalize, sep } from "node:path";
 
 import {
   LIVERELOAD_PATH,
+  THEME_DIRS,
   contentTypeFor,
   injectLivereload,
   readLocalTemplates,
@@ -19,7 +20,7 @@ import { pushTheme } from "./theme-sync.mjs";
  * separate request); direct `/asset/*` references are served from disk. Images/JS
  * are remote (Directus/CDN), so no local serving is needed for them.
  */
-export function startDevServer({ dir, url, token, port, syncDraft = false, onError }) {
+export function startDevServer({ dir, url, token, port, syncDraft = false, onError, onReload }) {
   const base = url.replace(/\/+$/, "");
   const clients = new Set();
 
@@ -90,16 +91,19 @@ export function startDevServer({ dir, url, token, port, syncDraft = false, onErr
     for (const client of clients) client.write("data: reload\n\n");
   };
   // Değişimde: önce taslağa senkronla (canlı-domain önizleme + editör güncel olsun),
-  // SONRA reload yayınla → tüm görünümler en güncel taslağı çeker.
-  const watcher = startWatch(dir, async () => {
+  // SONRA reload yayınla → tüm görünümler en güncel taslağı çeker. `onReload` log için:
+  // hangi dosya, senkron oldu mu, kaç görünüm bağlı (clients.size = açık EventSource'lar).
+  const watcher = startWatch(dir, async (file) => {
+    let error = null;
     if (syncDraft) {
       try {
         await pushTheme({ dir, url, token, draft: true });
-      } catch {
-        /* senkron hatası reload'u engellemesin */
+      } catch (err) {
+        error = err?.message ?? String(err); // senkron hatası reload'u engellemesin
       }
     }
     broadcast();
+    onReload?.({ file, synced: syncDraft && !error, clients: clients.size, error });
   });
 
   // Açılışta taslağı bir kez doldur → uzak görünümler hemen güncel local'i gösterir.
@@ -124,25 +128,82 @@ export function startDevServer({ dir, url, token, port, syncDraft = false, onErr
 }
 
 /**
- * Watch `dir`; if recursive watching is unsupported (older Node/Linux), fall back to
- * a non-recursive watch. Calls `onChange` debounced. Returns null if unwatchable
- * (livereload disabled).
+ * Recursively snapshot theme-file mtimes → Map(relPath → mtimeMs). Only descends
+ * into THEME_DIRS at the top level, so node_modules / .git / build tooling don't
+ * bloat the scan. Used by the polling watcher.
+ */
+function snapshot(dir) {
+  const map = new Map();
+  const walk = (current, rel) => {
+    let entries;
+    try {
+      entries = readdirSync(current, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (!rel && !THEME_DIRS.has(entry.name)) continue; // top level: theme dirs only
+      const childRel = rel ? `${rel}/${entry.name}` : entry.name;
+      const full = join(current, entry.name);
+      if (entry.isDirectory()) {
+        walk(full, childRel);
+      } else {
+        try {
+          map.set(childRel, statSync(full).mtimeMs);
+        } catch {
+          /* dosya kayboldu (atomik kaydetme yarış) — sonraki tarama yakalar */
+        }
+      }
+    }
+  };
+  walk(dir, "");
+  return map;
+}
+
+/**
+ * Watch `dir` by polling theme-file mtimes (default 300ms). fs.watch yerine polling:
+ * editörün kaydetme şekli (yerinde/atomik), dosya sistemi ve `recursive` desteği
+ * olmayan Node build'lerinden bağımsız çalışır — kaybolan event yok. Değişen/eklenen/
+ * silinen ilk dosyanın yolunu `onChange`'e geçirir (debounce'lu). `.close()` döner.
  */
-function startWatch(dir, onChange) {
+function startWatch(dir, onChange, intervalMs = 300) {
+  let prev = snapshot(dir);
   let timer = null;
-  const fire = () => {
+  let lastFile = null;
+  const fire = (file) => {
+    if (file) lastFile = file;
     if (timer) clearTimeout(timer);
-    timer = setTimeout(onChange, 120);
+    timer = setTimeout(() => onChange(lastFile), 80);
   };
-  try {
-    return watch(dir, { recursive: true }, fire);
-  } catch {
-    try {
-      return watch(dir, fire);
-    } catch {
-      return null;
+  const tick = () => {
+    const cur = snapshot(dir);
+    let changed = null;
+    for (const [key, mtime] of cur) {
+      const before = prev.get(key);
+      if (before === undefined || before !== mtime) {
+        changed = key;
+        break;
+      }
     }
-  }
+    if (!changed) {
+      for (const key of prev.keys()) {
+        if (!cur.has(key)) {
+          changed = key;
+          break;
+        }
+      }
+    }
+    prev = cur;
+    if (changed) fire(changed);
+  };
+  const interval = setInterval(tick, intervalMs);
+  if (interval.unref) interval.unref();
+  return {
+    close() {
+      clearInterval(interval);
+      if (timer) clearTimeout(timer);
+    },
+  };
 }
 
 /** Map a `/asset/*` path to a disk file (path-traversal safe); null if missing. */

package/lib/local-theme.mjs

@@ -7,7 +7,7 @@ import { extname, join, relative, sep } from "node:path";
  * THEME_DIRS, keyed by relative path with the `.liquid` extension stripped.
  */
 
-const THEME_DIRS = new Set(["layout", "section", "block", "partial", "asset", "template"]);
+export const THEME_DIRS = new Set(["layout", "section", "block", "partial", "asset", "template"]);
 const LIQUID_KINDS = new Set(["layout", "section", "block", "partial", "template"]);
 
 /**

package/package.json

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