uvako-cli 0.5.0 → 0.6.0

package/src/remote.js

@@ -1,7 +1,7 @@
-import { existsSync, mkdirSync, readFileSync, watch, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, statSync, watch, writeFileSync } from "node:fs";
 import path from "node:path";
 import { ApiError, call } from "./api.js";
-import { printReport } from "./check.js";
+import { checkTheme, localOnly, printReport } from "./check.js";
 import { dropSession, saveSession, session, sessions, storeOrigin } from "./config.js";
 import { buildArchive } from "./package.js";
 import { unzip } from "./zip.js";
@@ -50,9 +50,31 @@ function explain(error) {
   console.error(`✖ ${tm(error.message)}`);
   for (const problem of error.problems) console.error(`  ✖ ${tm(problem)}`);
   if (error.status === 401) console.error(t("  Yeni anahtar: mağaza paneli → Ayarlar → Temalar → Geliştirici erişimi, sonra `uvako login`."));
+  if (error.status === 429) console.error(t("  Yükleme sınırı aşıldı. {0} saniye sonra tekrar deneyin.", error.retryAfter || 5));
+  if (error.code === "conflict") console.error(t("  Sunucudaki sürümü almak için: uvako theme pull <anahtar> --force. Üzerine yazmak için: uvako theme push --force"));
   return 1;
 }
 
+// Yerel durum: son push/pull'un revizyonu. Push bu revizyonu gönderir; paket arada başka biri
+// tarafından değiştirildiyse sunucu yüklemeyi reddeder (409). Dosya pakete girmez.
+function readState(dir) {
+  try {
+    return JSON.parse(readFileSync(path.join(dir, ".uvako", "state.json"), "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+function writeState(dir, state) {
+  mkdirSync(path.join(dir, ".uvako"), { recursive: true });
+  writeFileSync(path.join(dir, ".uvako", "state.json"), `${JSON.stringify(state, null, 2)}\n`);
+}
+
+function baseRevision(dir, current, key, force) {
+  const state = readState(dir);
+  return !force && state && state.origin === current.origin && state.key === key && Number.isInteger(state.revision) ? { "X-Uvako-Base-Revision": String(state.revision) } : {};
+}
+
 const previewUrl = (origin, installationId) => `${origin}/?preview=${installationId}`;
 const editorUrl = (origin, installationId) => `${origin}/admin/ayarlar/temalar/${installationId}/editor`;
 
@@ -115,23 +137,46 @@ export async function list(options) {
   }
 }
 
-async function upload(current, dir, quiet = false) {
+async function upload(current, dir, quiet = false, force = false) {
   const built = buildArchive(dir);
   if (!built.ok) {
     printReport(built.report);
     return null;
   }
   if (!quiet) printReport(built.report);
-  const result = await call(current, "PUT", "/themes", { body: built.buffer });
+  // SHA-256: paket yolda bozulursa sunucu reddeder. Revizyon: başkasının yüklemesinin üstüne yazılmaz.
+  const headers = { "X-Uvako-Package-Sha256": built.sha256, ...baseRevision(dir, current, built.meta.key, force) };
+  const result = await call(current, "PUT", "/themes", { body: built.buffer, headers });
+  writeState(dir, { origin: current.origin, key: result.package.key, revision: result.package.revision });
   for (const warning of result.warnings ?? []) console.warn(`  ! ${warning}`);
   return result;
 }
 
+/** Kuru denetim: sunucu paketi yükleme kurallarıyla denetler, hiçbir şey kaydetmez. */
+export async function remoteCheck(dir, options) {
+  let current;
+  try {
+    current = session(typeof options.store === "string" ? options.store : "");
+  } catch {
+    return null;
+  }
+  const built = buildArchive(dir);
+  if (!built.ok) return null;
+  try {
+    const result = await call(current, "POST", "/themes/check", { body: built.buffer });
+    return { ok: true, origin: current.origin, warnings: result.warnings ?? [] };
+  } catch (error) {
+    if (!(error instanceof ApiError)) throw error;
+    if (error.status === 422 || error.status === 403) return { ok: false, origin: current.origin, message: error.message, problems: error.problems };
+    return { ok: true, origin: current.origin, warnings: [t("Sunucu denetimi yapılamadı: {0}", tm(error.message))] };
+  }
+}
+
 export async function push(target, options) {
   const dir = path.resolve(target ?? ".");
   try {
     const current = session(typeof options.store === "string" ? options.store : "");
-    const result = await upload(current, dir);
+    const result = await upload(current, dir, false, Boolean(options.force));
     if (!result) {
       console.error(t("Yüklenmedi: önce hataları düzeltin."));
       return 1;
@@ -185,7 +230,29 @@ export async function dev(target, options) {
   let timer = null;
   let running = false;
   let again = false;
+  const changed = new Set();
   const stamp = () => new Date().toLocaleTimeString("tr-TR");
+  // Yalnızca değişen dosyalar gönderilir; sunucu paketin tamamını yine aynı kurallarla denetler.
+  const sendChanges = async () => {
+    const files = [...changed];
+    changed.clear();
+    const report = checkTheme(dir);
+    if (report.errors.length) {
+      printReport(report);
+      return null;
+    }
+    if (files.length > 10 || files.includes("theme.json")) return upload(current, dir, true);
+    let result = null;
+    for (const rel of files) {
+      const full = path.join(dir, rel);
+      const exists = existsSync(full) && statSync(full).isFile();
+      const route = `/themes/${encodeURIComponent(first.package.key)}/files/${rel.split("/").map(encodeURIComponent).join("/")}`;
+      const headers = baseRevision(dir, current, first.package.key, false);
+      result = await call(current, exists ? "PUT" : "DELETE", route, exists ? { body: readFileSync(full), headers, contentType: "application/octet-stream" } : { headers });
+      writeState(dir, { origin: current.origin, key: result.package.key, revision: result.package.revision });
+    }
+    return result;
+  };
   const sync = async () => {
     if (running) {
       again = true;
@@ -193,13 +260,14 @@ export async function dev(target, options) {
     }
     running = true;
     try {
-      const result = await upload(current, dir, true);
+      const result = await sendChanges();
       if (result) console.log(t("[{0}] yüklendi (sürüm no {1})", stamp(), result.package.revision));
       else console.error(t("[{0}] yüklenmedi: hataları düzeltip kaydedin.", stamp()));
     } catch (error) {
       if (error instanceof ApiError) {
         console.error(`[${stamp()}] ✖ ${tm(error.message)}`);
         for (const problem of error.problems) console.error(`  ✖ ${tm(problem)}`);
+        if (error.status === 429) console.error(t("  Yükleme sınırı aşıldı. {0} saniye sonra tekrar deneyin.", error.retryAfter || 5));
         if (error.status === 401 || error.status === 403) process.exit(1);
       } else {
         console.error(`[${stamp()}] ✖ ${tm(error.message)}`);
@@ -214,7 +282,9 @@ export async function dev(target, options) {
   };
   const watcher = watch(dir, { recursive: true }, (_event, file) => {
     const rel = String(file ?? "").replaceAll("\\", "/");
-    if (!rel || rel.startsWith("reference/") || rel.startsWith(".git/") || rel.includes("node_modules/") || rel.endsWith(".zip") || rel.endsWith("~") || rel.split("/").some((part) => part.startsWith("."))) return;
+    if (!rel || localOnly(rel) || rel.startsWith(".git/") || rel.includes("node_modules/") || rel.endsWith("~") || rel.split("/").some((part) => part.startsWith("."))) return;
+    if (existsSync(path.join(dir, rel)) && statSync(path.join(dir, rel)).isDirectory()) return;
+    changed.add(rel);
     clearTimeout(timer);
     timer = setTimeout(() => void sync(), 300);
   });
@@ -264,6 +334,9 @@ export async function pull(key, options) {
       writeFileSync(file, entry.data);
       count++;
     }
+    const state = await call(current, "GET", "/themes");
+    const pkg = (state.packages ?? []).find((item) => item.key === key);
+    if (pkg) writeState(dir, { origin: current.origin, key, revision: pkg.revision });
     console.log(t("İndirildi: {0} ({1} dosya)", path.relative(process.cwd(), dir) || ".", count));
     return 0;
   } catch (error) {

package/src/rules.generated.js

@@ -0,0 +1,452 @@
+// Generated by scripts/generate-theme-rules.js. Edit backend/internal/theme/rules/rules.json.
+export const rules = {
+  "version": 1,
+  "engines": [
+    "",
+    "sections"
+  ],
+  "templates": [
+    "index",
+    "product",
+    "collection",
+    "cart",
+    "search",
+    "page",
+    "account",
+    "login",
+    "thank_you"
+  ],
+  "functions": [
+    "money",
+    "image_url",
+    "asset_url",
+    "t",
+    "url_for",
+    "default",
+    "truncate",
+    "json",
+    "eq",
+    "ne",
+    "lt",
+    "le",
+    "gt",
+    "ge",
+    "and",
+    "or",
+    "not",
+    "len"
+  ],
+  "actions": [
+    "if",
+    "else",
+    "end",
+    "range",
+    "with",
+    "define",
+    "template"
+  ],
+  "platformSchemas": {
+    "product-main": {
+      "name": "Ürün (temanın ürün sayfası)",
+      "settings": []
+    },
+    "product-gallery": {
+      "name": "Ürün görselleri",
+      "settings": [
+        {
+          "id": "layout",
+          "type": "select",
+          "label": "Yerleşim",
+          "default": "slider",
+          "options": [
+            {
+              "value": "slider",
+              "label": "Kaydırmalı"
+            },
+            {
+              "value": "grid",
+              "label": "Izgara"
+            }
+          ]
+        },
+        {
+          "id": "show_thumbnails",
+          "type": "checkbox",
+          "label": "Küçük görseller",
+          "default": true
+        }
+      ]
+    },
+    "product-info": {
+      "name": "Ürün bilgileri",
+      "settings": [
+        {
+          "id": "show_sku",
+          "type": "checkbox",
+          "label": "Stok kodu",
+          "default": true
+        },
+        {
+          "id": "show_stock",
+          "type": "checkbox",
+          "label": "Stok durumu",
+          "default": true
+        },
+        {
+          "id": "show_unit_price",
+          "type": "checkbox",
+          "label": "Birim fiyat",
+          "default": true
+        },
+        {
+          "id": "shipping_note",
+          "type": "text",
+          "label": "Kargo notu",
+          "default": ""
+        }
+      ]
+    },
+    "product-details": {
+      "name": "Ürün ayrıntıları",
+      "settings": [
+        {
+          "id": "title",
+          "type": "text",
+          "label": "Başlık",
+          "default": "Ürün ayrıntıları"
+        },
+        {
+          "id": "show_specs",
+          "type": "checkbox",
+          "label": "Teknik bilgiler tablosu",
+          "default": true
+        },
+        {
+          "id": "collapsible",
+          "type": "checkbox",
+          "label": "Akordeon",
+          "default": false
+        }
+      ]
+    },
+    "product-related": {
+      "name": "İlgili ürünler",
+      "settings": [
+        {
+          "id": "title",
+          "type": "text",
+          "label": "Başlık",
+          "default": "Bununla iyi gider"
+        },
+        {
+          "id": "limit",
+          "type": "range",
+          "label": "Ürün sayısı",
+          "default": 4,
+          "min": 2,
+          "max": 12,
+          "step": 1
+        }
+      ]
+    },
+    "collection-main": {
+      "name": "Ürün listesi (temanın liste sayfası)",
+      "settings": []
+    },
+    "cart-main": {
+      "name": "Sepet (temanın sepet sayfası)",
+      "settings": []
+    },
+    "search-main": {
+      "name": "Arama",
+      "settings": []
+    },
+    "page-main": {
+      "name": "Sayfa",
+      "settings": []
+    },
+    "account-main": {
+      "name": "Hesabım",
+      "settings": []
+    },
+    "login-main": {
+      "name": "Giriş",
+      "settings": []
+    },
+    "thank-you-main": {
+      "name": "Sipariş onayı",
+      "settings": []
+    },
+    "plate-rack": {
+      "name": "Plaka rafı",
+      "settings": [
+        {
+          "id": "title",
+          "type": "text",
+          "label": "Başlık",
+          "default": "Öne çıkanlar"
+        },
+        {
+          "id": "source",
+          "type": "select",
+          "label": "Ürünler",
+          "default": "featured",
+          "options": [
+            {
+              "value": "featured",
+              "label": "Öne çıkanlar"
+            },
+            {
+              "value": "newest",
+              "label": "Yeni gelenler"
+            },
+            {
+              "value": "discounted",
+              "label": "İndirimdekiler"
+            },
+            {
+              "value": "popular",
+              "label": "Çok satanlar"
+            }
+          ]
+        },
+        {
+          "id": "limit",
+          "type": "range",
+          "label": "Ürün sayısı",
+          "default": 8,
+          "min": 2,
+          "max": 20,
+          "step": 1
+        }
+      ]
+    },
+    "portion-comparison": {
+      "name": "Porsiyon karşılaştırması",
+      "settings": [
+        {
+          "id": "title",
+          "type": "text",
+          "label": "Başlık",
+          "default": "Porsiyon karşılaştırması"
+        },
+        {
+          "id": "source",
+          "type": "select",
+          "label": "Ürünler",
+          "default": "featured",
+          "options": [
+            {
+              "value": "featured",
+              "label": "Öne çıkanlar"
+            },
+            {
+              "value": "newest",
+              "label": "Yeni gelenler"
+            },
+            {
+              "value": "discounted",
+              "label": "İndirimdekiler"
+            },
+            {
+              "value": "popular",
+              "label": "Çok satanlar"
+            }
+          ]
+        },
+        {
+          "id": "limit",
+          "type": "range",
+          "label": "Ürün sayısı",
+          "default": 4,
+          "min": 2,
+          "max": 8,
+          "step": 1
+        },
+        {
+          "id": "portion_label",
+          "type": "text",
+          "label": "Porsiyon özelliğinin adı",
+          "default": "Porsiyon"
+        },
+        {
+          "id": "protein_label",
+          "type": "text",
+          "label": "Protein özelliğinin adı",
+          "default": "Protein"
+        }
+      ]
+    },
+    "vehicle-finder": {
+      "name": "Araç bulucu",
+      "settings": [
+        {
+          "id": "title",
+          "type": "text",
+          "label": "Başlık",
+          "default": "Önce aracını seç"
+        },
+        {
+          "id": "text",
+          "type": "textarea",
+          "label": "Açıklama",
+          "default": "Sonra sadece aracına uyan parçaları gösterelim."
+        },
+        {
+          "id": "button_label",
+          "type": "text",
+          "label": "Düğme",
+          "default": "Parçaları göster"
+        },
+        {
+          "id": "image",
+          "type": "image",
+          "label": "Görsel",
+          "default": ""
+        }
+      ]
+    },
+    "side-cart": {
+      "name": "Yan sepet",
+      "settings": [
+        {
+          "id": "title",
+          "type": "text",
+          "label": "Başlık",
+          "default": "Sepetin"
+        },
+        {
+          "id": "free_shipping_threshold",
+          "type": "number",
+          "label": "Ücretsiz kargo sınırı (TL)",
+          "info": "0: kapalı",
+          "default": 0,
+          "min": 0
+        }
+      ]
+    },
+    "tab-menu": {
+      "name": "Sekmeli menü",
+      "settings": [
+        {
+          "id": "limit",
+          "type": "range",
+          "label": "Sekme sayısı",
+          "default": 6,
+          "min": 2,
+          "max": 12,
+          "step": 1
+        },
+        {
+          "id": "colored",
+          "type": "checkbox",
+          "label": "Kategori renkleri",
+          "default": true
+        }
+      ]
+    }
+  },
+  "deniedElements": [
+    "script",
+    "style",
+    "iframe",
+    "frame",
+    "frameset",
+    "object",
+    "embed",
+    "applet",
+    "base",
+    "meta",
+    "link",
+    "template",
+    "foreignobject",
+    "noembed",
+    "noframes",
+    "xmp",
+    "plaintext",
+    "portal",
+    "set",
+    "animate",
+    "handler"
+  ],
+  "deniedAttributes": [
+    "srcdoc",
+    "http-equiv"
+  ],
+  "urlAttributes": [
+    "href",
+    "src",
+    "action",
+    "formaction",
+    "poster",
+    "xlink:href",
+    "background",
+    "cite",
+    "data",
+    "ping",
+    "codebase",
+    "manifest",
+    "lowsrc",
+    "dynsrc",
+    "longdesc",
+    "usemap"
+  ],
+  "urlSchemes": [
+    "http",
+    "https",
+    "mailto",
+    "tel"
+  ],
+  "settingTypes": [
+    "text",
+    "textarea",
+    "number",
+    "range",
+    "checkbox",
+    "select",
+    "color",
+    "url",
+    "image"
+  ],
+  "roots": [
+    "shop",
+    "settings",
+    "section",
+    "product",
+    "collection",
+    "cart",
+    "request",
+    "customer",
+    "layout"
+  ],
+  "paths": [
+    "theme.json",
+    "config/settings_schema.json",
+    "config/settings_data.json",
+    "templates/{template}.json",
+    "locales/{locale}.json",
+    "styles/*.scss",
+    "assets/**",
+    "sections/*.html.tmpl",
+    "sections/*.schema.json",
+    "snippets/*.html.tmpl",
+    "layout/theme.html.tmpl"
+  ],
+  "limits": {
+    "archiveBytes": 41943040,
+    "fileBytes": 5242880,
+    "totalBytes": 62914560,
+    "files": 600,
+    "styleBytes": 524288,
+    "jsonBytes": 1048576,
+    "localeBytes": 262144,
+    "localeEntries": 2000,
+    "templateBytes": 65536,
+    "renderBytes": 262144,
+    "renderMilliseconds": 50,
+    "listItems": 100,
+    "includeDepth": 8,
+    "instructions": 10000,
+    "sectionSettings": 25
+  }
+};