@zalify/cli 0.13.0 → 0.15.0

package/dist/cli.js

@@ -12064,7 +12064,7 @@ async function imagesGenerate(storeDir) {
 import { readFileSync as readFileSync6, existsSync as existsSync6 } from "node:fs";
 import { basename as basename3, join as join6, resolve as resolve5 } from "node:path";
 
-// src/site.ts
+// src/shop.ts
 import { spawn as spawn3, spawnSync as spawnSync3 } from "node:child_process";
 import { existsSync as existsSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync6 } from "node:fs";
 import { basename as basename2, join as join5, resolve as resolve4 } from "node:path";
@@ -12493,11 +12493,11 @@ function mergePackageJson(projectDir, oldDir, newDir, dryRun) {
   return depsChanged;
 }
 
-// src/site.ts
+// src/shop.ts
 function apiError2(status, json, appUrl) {
   if (status === 402) {
     return new Error(`${json.error ?? "Upgrade required"}
-` + `  Site hosting is a paid feature — upgrade the workspace in ${appUrl}`);
+` + `  Shop hosting is a paid feature — upgrade the workspace in ${appUrl}`);
   }
   if (json.code === "NO_CONNECTION") {
     return new Error(`${json.error}
@@ -12560,10 +12560,10 @@ async function pollUntilReady(auth, id) {
   }
   throw new Error("Provisioning timed out after 10 minutes — check the Temporal UI.");
 }
-async function siteCreate(dir2, opts) {
+async function shopCreate(dir2, opts) {
   const auth = requireActive();
   const slug = basename2(resolve4(dir2)).toLowerCase().replaceAll(/[^a-z0-9-]+/g, "-").replaceAll(/^-+|-+$/g, "") || "site";
-  console.log(`Provisioning site "${slug}" (workspace "${auth.workspaceName}")`);
+  console.log(`Provisioning shop "${slug}" (workspace "${auth.workspaceName}")`);
   const created = await request(auth, "POST", "/api/sites", {
     slug,
     theme: opts.theme ?? "nextjs",
@@ -12619,7 +12619,7 @@ Live: https://${view.domain}`);
 Next steps:
 ` + `  - author your theme in ${dir2}/theme/ (see theme/README.md), commit + push
 ` + `  - zalify brand push <brand-dir> --prune    # catalog (auto-refreshes this site)
-` + `  - zalify site open ${slug}                 # see it live
+` + `  - zalify shop open ${slug}                 # see it live
 ` + `  - zalify theme status ${dir2}               # drift check anytime`);
 }
 async function resolveSite(auth, slugOrDir) {
@@ -12650,18 +12650,18 @@ async function resolveSite(auth, slugOrDir) {
     const match = sites.find((s) => s.slug === slug);
     if (match)
       return match;
-    throw new Error(`No site "${slug}" in workspace "${auth.workspaceName}".
-` + `  Sites here: ${sites.map((s) => s.slug).join(", ") || "(none)"}`);
+    throw new Error(`No shop "${slug}" in workspace "${auth.workspaceName}".
+` + `  Shops here: ${sites.map((s) => s.slug).join(", ") || "(none)"}`);
   }
   if (sites.length === 1)
     return sites[0];
-  throw new Error(sites.length === 0 ? `No sites in workspace "${auth.workspaceName}" — create one with \`zalify site create <dir>\`.` : `Multiple sites in this workspace — name one: ${sites.map((s) => s.slug).join(", ")}`);
+  throw new Error(sites.length === 0 ? `No shops in workspace "${auth.workspaceName}" — create one with \`zalify shop create <dir>\`.` : `Multiple shops in this workspace — name one: ${sites.map((s) => s.slug).join(", ")}`);
 }
-async function siteList() {
+async function shopList() {
   const auth = requireActive();
   const sites = await listSites(auth);
   if (!sites.length) {
-    console.log(`No sites in workspace "${auth.workspaceName}".`);
+    console.log(`No shops in workspace "${auth.workspaceName}".`);
     return;
   }
   for (const s of sites) {
@@ -12669,23 +12669,34 @@ async function siteList() {
     console.log(`${s.status === "READY" ? "✓" : s.status === "FAILED" ? "✗" : "…"} ${s.slug}  ${url}  (${s.status.toLowerCase()}${s.githubRepo ? `, ${s.githubRepo}` : ""})`);
   }
 }
-async function siteRefresh(slugOrDir) {
+async function shopRefresh(slugOrDir) {
   const auth = requireActive();
   const site = await resolveSite(auth, slugOrDir);
   await request(auth, "POST", `/api/sites/${site.id}/revalidate`, {});
   console.log(`✓ refreshed https://${site.domain}`);
 }
-async function siteOpen(slugOrDir) {
+async function shopOpen(slugOrDir) {
   const auth = requireActive();
   const site = await resolveSite(auth, slugOrDir);
   if (!site.domain)
-    throw new Error(`Site "${site.slug}" has no domain yet.`);
+    throw new Error(`Shop "${site.slug}" has no domain yet.`);
   const url = `https://${site.domain}`;
   const opener = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
   spawn3(opener, [url], { detached: true, stdio: "ignore" }).unref();
   console.log(url);
 }
-async function maybeRefreshSites(auth, brandDir, siteSlugOverride) {
+async function shopDomainSync(slugOrDir) {
+  const auth = requireActive();
+  const site = await resolveSite(auth, slugOrDir);
+  const before = site.domain;
+  const result = await request(auth, "POST", `/api/sites/${site.id}/domains`, {});
+  if (!result.changed) {
+    console.log(`Already in sync: https://${result.site.domain}`);
+    return;
+  }
+  console.log(`✓ ${site.slug}: https://${before} → https://${result.site.domain} (old domain 308s)`);
+}
+async function maybeRefreshShops(auth, brandDir, siteSlugOverride) {
   try {
     let slug = siteSlugOverride ?? null;
     if (!slug) {
@@ -12699,7 +12710,7 @@ async function maybeRefreshSites(auth, brandDir, siteSlugOverride) {
     const sites = (await listSites(auth)).filter((s) => s.slug === slug && s.status === "READY");
     for (const site of sites) {
       await request(auth, "POST", `/api/sites/${site.id}/revalidate`, {});
-      console.log(`✓ site refreshed (https://${site.domain})`);
+      console.log(`✓ shop refreshed (https://${site.domain})`);
     }
   } catch {}
 }
@@ -12836,6 +12847,34 @@ async function shopifyImport(storeDir, options = {}) {
         console.log(`  ✓ pruned ${node.handle}`);
     }
   }
+  for (const disc of catalog.discounts ?? []) {
+    const existing = await gql(auth, `query($q: String!) { codeDiscountNodes(first: 1, query: $q) { nodes { id } } }`, { q: `code:${disc.code}` });
+    if (existing.codeDiscountNodes.nodes.length) {
+      console.log(`  - discount ${disc.code} exists, skipped`);
+      continue;
+    }
+    const res = await gql(auth, `mutation($discount: DiscountCodeBasicInput!) {
+        discountCodeBasicCreate(basicCodeDiscount: $discount) {
+          userErrors { field message }
+        }
+      }`, {
+      discount: {
+        title: disc.title ?? `${disc.code} — ${disc.percentOff}% off`,
+        code: disc.code,
+        startsAt: new Date().toISOString(),
+        customerSelection: { all: true },
+        customerGets: {
+          value: { percentage: disc.percentOff / 100 },
+          items: { all: true }
+        }
+      }
+    });
+    const errs = res.discountCodeBasicCreate.userErrors;
+    if (errs.length)
+      console.error(`  ✗ discount ${disc.code}: ${joinErrors(errs)}`);
+    else
+      console.log(`  ✓ discount ${disc.code} created (${disc.percentOff}% off)`);
+  }
   for (const pg of catalog.pages ?? []) {
     const existing = await gql(auth, `query($q: String!) { pages(first: 1, query: $q) { nodes { id handle } } }`, { q: `handle:${pg.handle}` });
     const node = existing.pages.nodes[0];
@@ -12951,7 +12990,7 @@ async function shopifyImport(storeDir, options = {}) {
     console.warn(`  ! could not publish to Online Store (write_publications scope missing?): ${e instanceof Error ? e.message : String(e)}`);
   }
   console.log("Done.");
-  await maybeRefreshSites(auth, dir2, options.site);
+  await maybeRefreshShops(auth, dir2, options.site);
 }
 async function shopifyUploadImages(storeDir, options = {}) {
   const auth = requireActive();
@@ -13031,7 +13070,7 @@ async function shopifyUploadImages(storeDir, options = {}) {
       console.log(`  ✓ ${entry.file}`);
   }
   console.log("Done.");
-  await maybeRefreshSites(auth, dir2, options.site);
+  await maybeRefreshShops(auth, dir2, options.site);
 }
 
 // src/brand.ts
@@ -13076,6 +13115,10 @@ alone. Validate anytime with \`zalify brand validate\` (defaults to cwd).
   privacy-policy, terms-of-service); write \`bodyHtml\` in the brand
   voice (simple HTML: h2/p/ul/li). The \`contact\` page already exists in
   every Shopify store — link it, don't create it.
+- **Discounts** (\`discounts\`): code discounts created by \`brand push\`
+  (\`{ code, percentOff, title? }\`). Keep the scaffold's \`WELCOME20\` —
+  it is the code the theme's cart voucher banner shows by default, so
+  Apply actually works. Codes: 4-20 uppercase letters/digits.
 - **Menus** (\`menus\`): \`main-menu\` (header nav) and \`footer\`, upserted
   by \`brand push\`; the catalog is the source of truth (a push replaces
   the menu's items). Items are \`{ title, url, items? }\`, max 3 levels.
@@ -13121,7 +13164,7 @@ alone. Validate anytime with \`zalify brand validate\` (defaults to cwd).
 zalify brand validate                  # lint this folder (cwd)
 # create the Shopify dev store + Zalify workspace, then:
 zalify workspace set <workspace-slug>
-zalify site create <slug>              # hosted site: repo + deploy + domain + token
+zalify shop create <slug>              # hosted shop: repo + deploy + domain + token
 zalify brand push --prune              # catalog → your Shopify store
 zalify brand images generate           # create the manifest's shots
 zalify brand images attach             # attach them to the products
@@ -13238,6 +13281,13 @@ var CATALOG_JSON = (vendor, currency) => JSON.stringify({
       bodyHtml: "<p><Plain-language terms: orders, pricing, liability, governing law.></p>"
     }
   ],
+  discounts: [
+    {
+      code: "WELCOME20",
+      percentOff: 20,
+      title: "Welcome — 20% off the first order"
+    }
+  ],
   menus: {
     "main-menu": [
       { title: "New in", url: "/collections/all" },
@@ -13478,6 +13528,15 @@ function brandValidate(dir2 = ".") {
     for (const [menuHandle, nodes] of Object.entries(catalog.menus ?? {})) {
       checkMenu(nodes ?? [], menuHandle, 1);
     }
+    for (const disc of catalog.discounts ?? []) {
+      const where = `discount "${disc.code ?? "?"}"`;
+      if (!disc.code || !/^[A-Z0-9]{4,20}$/.test(disc.code)) {
+        problems.push(`${where}: code must be 4-20 uppercase letters/digits`);
+      }
+      if (typeof disc.percentOff !== "number" || !Number.isInteger(disc.percentOff) || disc.percentOff < 1 || disc.percentOff > 99) {
+        problems.push(`${where}: percentOff must be an integer 1-99`);
+      }
+    }
   }
   const manifest = readJson2("images/manifest.json");
   if (manifest) {
@@ -13540,12 +13599,12 @@ try {
   });
 } catch {}
 var program2 = new Command;
-program2.name("zalify").description("Zalify CLI — author a brand, launch its site, keep the theme current").version(pkg.version, "-v, --version", "output the current version");
+program2.name("zalify").description("Zalify CLI — author a brand, launch its shop, keep the theme current").version(pkg.version, "-v, --version", "output the current version");
 program2.addHelpText("after", `
 The golden path (new brand, start to live):
   1. zalify brand init stores/acme        author the data (no login needed)
   2. zalify login && zalify workspace set <workspace>
-  3. zalify site create acme              repo + hosting + domain + deploy
+  3. zalify shop create acme              live at acme.z1.shop in ~4 minutes
   4. cd stores/acme && zalify brand push --prune
   5. zalify brand images generate && zalify brand images attach
   6. zalify theme status | upgrade        stay current, keep your edits
@@ -13572,15 +13631,15 @@ brand.command("init [dir]").description("Scaffold a brand folder (catalog, voice
 brand.command("validate [dir]").description("Lint the brand folder against the authoring rules").action((dir2) => {
   brandValidate(dir2);
 });
-brand.command("push [dir]").description("Push catalog.json to your connected Shopify store (products, smart collections, publish; idempotent)").option("--prune", "delete store products (by catalog vendor) absent from catalog.json").option("--site <slug>", "refresh only this site afterwards (default: every site matching the brand)").action(async (dir2, options) => {
-  await shopifyImport(dir2 ?? ".", options);
+brand.command("push [dir]").description("Push catalog.json to your connected Shopify store (products, smart collections, publish; idempotent)").option("--prune", "delete store products (by catalog vendor) absent from catalog.json").option("--shop <slug>", "refresh only this shop afterwards (default: every shop matching the brand)").option("--site <slug>", "(old spelling of --shop)", undefined).action(async (dir2, options) => {
+  await shopifyImport(dir2 ?? ".", { prune: options.prune, site: options.shop ?? options.site });
 });
 var brandImages = brand.command("images").description("The brand's imagery pipeline: generate → attach → push/pull masters");
 brandImages.command("generate [dir]").description("Generate the manifest's missing images on Zalify infrastructure (resumable)").action(async (dir2) => {
   await imagesGenerate(dir2 ?? ".");
 });
-brandImages.command("attach [dir]").description("Attach generated images to their Shopify products per the manifest (skips already-attached)").option("--site <slug>", "refresh only this site afterwards").action(async (dir2, options) => {
-  await shopifyUploadImages(dir2 ?? ".", options);
+brandImages.command("attach [dir]").description("Attach generated images to their Shopify products per the manifest (skips already-attached)").option("--shop <slug>", "refresh only this shop afterwards").option("--site <slug>", "(old spelling of --shop)", undefined).action(async (dir2, options) => {
+  await shopifyUploadImages(dir2 ?? ".", { site: options.shop ?? options.site });
 });
 brandImages.command("push [dir]").description("Upload image masters to the Zalify asset library (sha256 dedup, writes assets.json)").action(async (dir2) => {
   await assetsPush(dir2 ?? ".");
@@ -13588,18 +13647,21 @@ brandImages.command("push [dir]").description("Upload image masters to the Zalif
 brandImages.command("pull [dir]").description("Download masters listed in images/assets.json (fresh-clone restore)").action(async (dir2) => {
   await assetsPull(dir2 ?? ".");
 });
-var site = program2.command("site").description("Hosted sites — Zalify provisions the repo, deployment, and domain");
-site.command("create <dir>").description("One-command launch: provision repo + deployment + domain + storefront token, scaffold locally, push, go live").option("-t, --theme <name>", "theme", "nextjs").option("--editor", "include the Zalify canvas-editor (z1) wiring").option("--to <version>", "theme version (default: latest)").option("--no-install", "skip dependency install").option("--no-git", "skip git init/push").action(async (dir2, options) => {
-  await siteCreate(dir2, options);
+var shop = program2.command("shop").description("Hosted shops at <slug>.z1.shop — Zalify provisions the repo, deployment, and domain");
+shop.command("create <dir>").description("One-command launch: provision repo + deployment + domain + storefront token, scaffold locally, push, go live").option("-t, --theme <name>", "theme", "nextjs").option("--editor", "include the Zalify canvas-editor (z1) wiring").option("--to <version>", "theme version (default: latest)").option("--no-install", "skip dependency install").option("--no-git", "skip git init/push").action(async (dir2, options) => {
+  await shopCreate(dir2, options);
 });
-site.command("list", { isDefault: true }).description("List the workspace's hosted sites").action(async () => {
-  await siteList();
+shop.command("list", { isDefault: true }).description("List the workspace's hosted shops").action(async () => {
+  await shopList();
 });
-site.command("refresh [slug-or-dir]").description("Refresh the live site's data cache (defaults to the site linked to cwd)").action(async (slugOrDir) => {
-  await siteRefresh(slugOrDir);
+shop.command("refresh [slug-or-dir]").description("Refresh the live shop's data cache (defaults to the shop linked to cwd)").action(async (slugOrDir) => {
+  await shopRefresh(slugOrDir);
 });
-site.command("open [slug-or-dir]").description("Open the live site in your browser (defaults to the site linked to cwd)").action(async (slugOrDir) => {
-  await siteOpen(slugOrDir);
+shop.command("open [slug-or-dir]").description("Open the live shop in your browser (defaults to the shop linked to cwd)").action(async (slugOrDir) => {
+  await shopOpen(slugOrDir);
+});
+shop.command("domain-sync [slug-or-dir]").description("Re-point the shop at the current root domain (the old domain 308-redirects)").action(async (slugOrDir) => {
+  await shopDomainSync(slugOrDir);
 });
 var theme = program2.command("theme").description("Theme source code — scaffold a copy and upgrade it without losing your edits");
 theme.command("create <dir>").description("Scaffold only — no Zalify hosting (self-host path; `site create` is the fully-hosted launch)").option("-t, --template <name>", "liquid | hydrogen | nextjs", "nextjs").option("--editor", "include the Zalify canvas-editor (z1) wiring").option("--store-domain <domain>", "your-store.myshopify.com (default: mock.shop demo data)").option("--storefront-token <token>", "public Storefront API access token").option("--to <version>", "theme version (default: latest)").option("--no-install", "skip dependency install").option("--no-git", "skip git init + initial commit").option("--tarball <path>", "use a local @zalify/theme-templates .tgz instead of npm").action(async (dir2, options) => {
@@ -13632,50 +13694,22 @@ A new version (${update.latest}) is available. Run "zalify self-update" to updat
     }
   } catch {}
 });
-var legacyStore = program2.command("store", { hidden: true });
-legacyStore.command("init <dir>").option("--name <name>").option("--vertical <vertical>").option("--currency <code>").action((dir2, options) => {
-  moved("brand init");
-  brandInit(dir2, options);
-});
-legacyStore.command("validate <dir>").action((dir2) => {
-  moved("brand validate");
-  brandValidate(dir2);
-});
-var legacyShopify = program2.command("shopify", { hidden: true });
-legacyShopify.command("import <store-dir>").option("--prune").action(async (storeDir, options) => {
-  moved("brand push");
-  await shopifyImport(storeDir, options);
-});
-legacyShopify.command("upload-images <store-dir>").action(async (storeDir) => {
-  moved("brand images attach");
-  await shopifyUploadImages(storeDir);
-});
-var legacyImages = program2.command("images", { hidden: true });
-legacyImages.command("generate <store-dir>").action(async (storeDir) => {
-  moved("brand images generate");
-  await imagesGenerate(storeDir);
-});
-var legacyAssets = program2.command("assets", { hidden: true });
-legacyAssets.command("push <store-dir>").action(async (storeDir) => {
-  moved("brand images push");
-  await assetsPush(storeDir);
-});
-legacyAssets.command("pull <store-dir>").action(async (storeDir) => {
-  moved("brand images pull");
-  await assetsPull(storeDir);
+var legacySite = program2.command("site", { hidden: true });
+legacySite.command("create <dir>").option("-t, --theme <name>", "", "nextjs").option("--editor").option("--to <version>").option("--no-install").option("--no-git").action(async (dir2, options) => {
+  moved("shop create");
+  await shopCreate(dir2, options);
 });
-var legacyStorefront = program2.command("storefront", { hidden: true });
-legacyStorefront.command("create <dir>").option("-t, --theme <name>", "", "nextjs").option("--editor").option("--to <version>").option("--no-install").option("--no-git").action(async (dir2, options) => {
-  moved("site create");
-  await siteCreate(dir2, options);
+legacySite.command("list", { isDefault: true }).action(async () => {
+  moved("shop list");
+  await shopList();
 });
-legacyStorefront.command("list", { isDefault: true }).action(async () => {
-  moved("site list");
-  await siteList();
+legacySite.command("refresh [slug-or-dir]").action(async (slugOrDir) => {
+  moved("shop refresh");
+  await shopRefresh(slugOrDir);
 });
-legacyStorefront.command("revalidate <slug-or-store-dir>").action(async (slugOrDir) => {
-  moved("site refresh");
-  await siteRefresh(slugOrDir);
+legacySite.command("open [slug-or-dir]").action(async (slugOrDir) => {
+  moved("shop open");
+  await shopOpen(slugOrDir);
 });
 program2.parseAsync().catch((err) => {
   console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zalify/cli",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "Zalify CLI - command-line interface for Zalify",
   "type": "module",
   "main": "dist/cli.js",