@zalify/cli 0.24.0 → 0.24.1

package/dist/cli.js

@@ -20568,7 +20568,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 };
 }
@@ -20750,10 +20752,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 +20778,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 +20789,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 +20804,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.24.1",
   "description": "Zalify CLI - command-line interface for Zalify",
   "type": "module",
   "main": "dist/cli.js",