@zalify/cli 0.24.0 → 0.25.0

package/dist/cli.js

@@ -18316,6 +18316,33 @@ function writeConfig(config) {
 function deleteConfig() {
   rmSync(file, { force: true });
 }
+function enforceWorkspaceLink(root, auth) {
+  const linkPath = join(root, ".zalify", "brand-repo.json");
+  if (!existsSync(linkPath))
+    return;
+  let link;
+  try {
+    link = JSON.parse(readFileSync(linkPath, "utf8"));
+  } catch {
+    return;
+  }
+  const ws = link.workspace;
+  if (!ws?.id) {
+    link.workspace = {
+      id: auth.workspaceId,
+      name: auth.workspaceName,
+      slug: auth.workspaceSlug
+    };
+    writeFileSync2(linkPath, `${JSON.stringify(link, null, 2)}
+`);
+    console.log(`stamped workspace "${auth.workspaceSlug}" into .zalify/brand-repo.json — commit it.`);
+    return;
+  }
+  if (ws.id !== auth.workspaceId) {
+    throw new Error(`This checkout belongs to workspace "${ws.name ?? ws.slug ?? ws.id}" ` + `but the active workspace is "${auth.workspaceName}" (${auth.workspaceSlug}).
+` + `Run \`zalify workspace set ${ws.slug ?? ws.id}\` first.`);
+  }
+}
 function requireActive() {
   const config = readConfig();
   if (!config) {
@@ -20258,7 +20285,16 @@ async function adsCreate(dir2) {
   console.log(`  ✓ provisioned: ${view.githubRepo}`);
   scaffoldStarter(dir2, slug, auth.workspaceId);
   mkdirSync3(join8(resolve6(dir2), ".zalify"), { recursive: true });
-  writeFileSync7(join8(resolve6(dir2), ".zalify", "brand-repo.json"), JSON.stringify({ id: created.repoId, slug: view.slug, repo: view.githubRepo }, null, 2) + `
+  writeFileSync7(join8(resolve6(dir2), ".zalify", "brand-repo.json"), JSON.stringify({
+    id: created.repoId,
+    slug: view.slug,
+    repo: view.githubRepo,
+    workspace: {
+      id: auth.workspaceId,
+      name: auth.workspaceName,
+      slug: auth.workspaceSlug
+    }
+  }, null, 2) + `
 `);
   if (view.githubRepo) {
     const { token, repo } = await request2(auth, "POST", `/api/repos/${created.repoId}/push-token`, {});
@@ -20568,7 +20604,9 @@ async function collect(base) {
     }
   }
   for (const rel of campaignDirs(base)) {
-    files.push(await collectFolder(base, rel));
+    const payload = await collectFolder(base, rel);
+    const imported = typeof payload.doc === "object" && payload.doc !== null && payload.doc.imported === true;
+    files.push(imported ? { path: payload.path, doc: payload.doc } : payload);
   }
   return { files };
 }
@@ -20628,6 +20666,7 @@ ${s.creates} to create, ${s.updates} to update, ${s.unchanged} unchanged` + `${r
 async function adsDiff() {
   const auth = requireActive();
   const base = root();
+  enforceWorkspaceLink(base, auth);
   const { files } = await collect(base);
   if (files.length === 0) {
     console.log("No campaign files — `zalify ads pull` or `zalify ads new` first.");
@@ -20645,6 +20684,7 @@ async function adsDiff() {
 async function adsApply(opts) {
   const auth = requireActive();
   const base = root();
+  enforceWorkspaceLink(base, auth);
   const { files } = await collect(base);
   if (files.length === 0) {
     console.log("No campaign files — `zalify ads pull` or `zalify ads new` first.");
@@ -20732,6 +20772,7 @@ function readBindings(root2) {
 async function adsPull(opts) {
   const auth = requireActive();
   const root2 = checkoutRoot();
+  enforceWorkspaceLink(root2, auth);
   const params = new URLSearchParams;
   if (opts.account)
     params.set("account", opts.account);
@@ -20750,10 +20791,22 @@ async function adsPull(opts) {
   }
   const result = await res.json();
   const bindings = readBindings(root2);
+  const ownedElsewhere = new Map;
+  for (const [key, v] of Object.entries(bindings.nodes)) {
+    if (v.kind === "campaign")
+      ownedElsewhere.set(v.id, key.split("#")[0]);
+  }
   let written = 0;
   let unchanged = 0;
+  let owned = 0;
   const skipped = [];
   for (const f of result.files) {
+    const campaignId = result.bindings[`${f.path}#campaign`]?.id;
+    const owner = campaignId ? ownedElsewhere.get(campaignId) : undefined;
+    if (owner && owner !== f.path) {
+      owned += 1;
+      continue;
+    }
     const abs = join11(root2, f.path);
     const nextHash = sha(f.yaml);
     const lastPulled = bindings.pulled[f.path];
@@ -20764,7 +20817,7 @@ async function adsPull(opts) {
         bindings.pulled[f.path] = nextHash;
         continue;
       }
-      const locallyEdited = lastPulled !== undefined && sha(current) !== lastPulled;
+      const locallyEdited = lastPulled === undefined || sha(current) !== lastPulled;
       if (locallyEdited && !opts.force) {
         skipped.push(f.path);
         continue;
@@ -20775,7 +20828,14 @@ async function adsPull(opts) {
     bindings.pulled[f.path] = nextHash;
     written += 1;
   }
-  Object.assign(bindings.nodes, result.bindings);
+  for (const [key, v] of Object.entries(result.bindings)) {
+    const file2 = key.split("#")[0];
+    const campaignId = result.bindings[`${file2}#campaign`]?.id;
+    const owner = campaignId ? ownedElsewhere.get(campaignId) : undefined;
+    if (owner && owner !== file2)
+      continue;
+    bindings.nodes[key] = v;
+  }
   const bindingsPath = join11(root2, "accounts", ".bindings.json");
   mkdirSync5(dirname2(bindingsPath), { recursive: true });
   writeFileSync10(bindingsPath, `${JSON.stringify(bindings, null, 2)}
@@ -20783,7 +20843,7 @@ async function adsPull(opts) {
   const exported = new Set(result.files.map((f) => f.path));
   const gone = Object.keys(bindings.pulled).filter((p) => !exported.has(p) && existsSync11(join11(root2, p)));
   const s = result.summary;
-  console.log(`pulled ${s.campaigns} campaigns (${s.adSets} ad sets, ${s.ads} ads): ` + `${written} written, ${unchanged} unchanged, ${skipped.length} kept (locally edited)`);
+  console.log(`pulled ${s.campaigns} campaigns (${s.adSets} ad sets, ${s.ads} ads): ` + `${written} written, ${unchanged} unchanged, ${skipped.length} kept (locally edited)` + `${owned ? `, ${owned} owned by authored files` : ""}`);
   for (const p of skipped)
     console.log(`  kept  ${p}  (edited — --force overwrites)`);
   if (gone.length > 0) {

package/package.json

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