git-shots-cli 0.6.0 → 0.6.2

package/dist/index.js

@@ -48,6 +48,14 @@ import { resolve as resolve2, basename, dirname } from "path";
 import { execSync } from "child_process";
 import { glob } from "glob";
 import chalk2 from "chalk";
+var BATCH_SIZE = 3;
+function chunk(arr, size) {
+  const chunks = [];
+  for (let i = 0; i < arr.length; i += size) {
+    chunks.push(arr.slice(i, i + size));
+  }
+  return chunks;
+}
 async function upload(config, options) {
   const dir = resolve2(process.cwd(), config.directory);
   if (!existsSync2(dir)) {
@@ -62,48 +70,73 @@ async function upload(config, options) {
   console.log(chalk2.dim(`SHA:      ${sha.slice(0, 7)}`));
   console.log(chalk2.dim(`Dir:      ${dir}`));
   console.log();
-  const files = await glob("**/*.png", { cwd: dir });
-  if (files.length === 0) {
+  const rawFiles = await glob("**/*.png", { cwd: dir });
+  if (rawFiles.length === 0) {
     console.log(chalk2.yellow("No PNG files found."));
     return;
   }
-  console.log(chalk2.dim(`Found ${files.length} screenshots`));
-  const formData = new FormData();
-  formData.append("project", config.project);
-  formData.append("branch", branch);
-  formData.append("gitSha", sha);
-  if (config.platform) formData.append("platform", config.platform);
-  for (const file of files) {
-    const fullPath = resolve2(dir, file);
-    const buffer = readFileSync2(fullPath);
-    const blob = new Blob([buffer], { type: "image/png" });
+  const files = rawFiles.map((file) => {
     const dirName = dirname(file);
-    const fieldName = dirName !== "." ? `${dirName}/${basename(file)}` : basename(file);
-    formData.append(fieldName, blob, basename(file));
-  }
+    return {
+      fieldName: dirName !== "." ? `${dirName}/${basename(file)}` : basename(file),
+      fileName: basename(file),
+      fullPath: resolve2(dir, file)
+    };
+  });
+  const localSlugs = files.map((f) => f.fileName.replace(/\.png$/, ""));
+  const allSlugs = [.../* @__PURE__ */ new Set([...options.baseManifest ?? [], ...localSlugs])];
+  console.log(chalk2.dim(`Found ${files.length} screenshots`));
   const url = `${config.server}/api/upload`;
-  console.log(chalk2.dim(`Uploading to ${url}...`));
-  try {
-    const res = await fetch(url, {
-      method: "POST",
-      body: formData,
-      headers: { Origin: config.server, ...authHeaders(config) }
-    });
-    const data = await res.json();
-    checkAuthError(res);
-    if (!res.ok) {
-      console.error(chalk2.red(`Upload failed: ${JSON.stringify(data)}`));
-      process.exit(1);
+  const batches = chunk(files, BATCH_SIZE);
+  let totalUploaded = 0;
+  let totalSkipped = 0;
+  for (let i = 0; i < batches.length; i++) {
+    const batch = batches[i];
+    const isLastBatch = i === batches.length - 1;
+    const formData = new FormData();
+    formData.append("project", config.project);
+    formData.append("branch", branch);
+    formData.append("gitSha", sha);
+    if (config.platform) formData.append("platform", config.platform);
+    if (isLastBatch) {
+      formData.append("allSlugs", JSON.stringify(allSlugs));
     }
-    if (data.skipped > 0) {
-      console.log(chalk2.green(`Uploaded ${data.uploaded} screenshots`) + chalk2.dim(` (${data.skipped} unchanged, skipped)`));
-    } else {
-      console.log(chalk2.green(`Uploaded ${data.uploaded} screenshots`));
+    for (const file of batch) {
+      const buffer = readFileSync2(file.fullPath);
+      const blob = new Blob([buffer], { type: "image/png" });
+      formData.append(file.fieldName, blob, file.fileName);
+    }
+    const batchLabel = batches.length > 1 ? chalk2.dim(`[${i + 1}/${batches.length}] `) : "";
+    try {
+      const res = await fetch(url, {
+        method: "POST",
+        body: formData,
+        headers: { Origin: config.server, ...authHeaders(config) }
+      });
+      checkAuthError(res);
+      const data = await res.json();
+      if (!res.ok) {
+        console.error(chalk2.red(`${batchLabel}Upload failed: ${JSON.stringify(data)}`));
+        process.exit(1);
+      }
+      totalUploaded += data.uploaded ?? 0;
+      totalSkipped += data.skipped ?? 0;
+      if (batches.length > 1) {
+        const parts2 = [];
+        if (data.uploaded > 0) parts2.push(chalk2.green(`${data.uploaded} uploaded`));
+        if (data.skipped > 0) parts2.push(chalk2.dim(`${data.skipped} skipped`));
+        console.log(`${batchLabel}${parts2.join(", ")}`);
+      }
+    } catch (err) {
+      console.error(chalk2.red(`${batchLabel}Request failed: ${err}`));
+      process.exit(1);
     }
-  } catch (err) {
-    console.error(chalk2.red(`Request failed: ${err}`));
-    process.exit(1);
   }
+  const parts = [];
+  if (totalUploaded > 0) parts.push(chalk2.green(`${totalUploaded} uploaded`));
+  if (totalSkipped > 0) parts.push(chalk2.dim(`${totalSkipped} unchanged`));
+  console.log(`
+${parts.join(", ") || chalk2.dim("nothing to do")}`);
 }
 
 // src/compare.ts
@@ -286,8 +319,21 @@ async function review(config, options) {
   console.log(chalk6.dim(`Branch:  ${branch}`));
   console.log(chalk6.dim(`SHA:     ${sha.slice(0, 7)}`));
   console.log();
+  let baseManifest;
+  try {
+    const manifestUrl = `${config.server}/api/projects/${encodeURIComponent(config.project)}/manifest?branch=main`;
+    const manifestRes = await fetch(manifestUrl, {
+      headers: { Origin: config.server, ...authHeaders(config) }
+    });
+    if (manifestRes.ok) {
+      const data = await manifestRes.json();
+      baseManifest = data.screenSlugs;
+      console.log(chalk6.dim(`Base manifest: ${baseManifest.length} screens on main`));
+    }
+  } catch {
+  }
   console.log(chalk6.dim("Uploading screenshots..."));
-  await upload(config, { branch, sha });
+  await upload(config, { branch, sha, baseManifest });
   console.log();
   console.log(chalk6.dim("Creating review session..."));
   const reviewUrl = `${config.server}/api/reviews`;
@@ -503,7 +549,7 @@ async function syncFlows(config) {
   const listUrl = `${config.server}/api/projects/${config.project}/flows`;
   let existingFlows = [];
   try {
-    const res = await fetch(listUrl, { headers: { Origin: config.server } });
+    const res = await fetch(listUrl, { headers: { Origin: config.server, ...authHeaders(config) } });
     if (res.ok) {
       const data = await res.json();
       existingFlows = data.flows ?? [];
@@ -517,7 +563,7 @@ async function syncFlows(config) {
       const patchUrl = `${config.server}/api/projects/${config.project}/flows/${flow.slug}`;
       const patchRes = await fetch(patchUrl, {
         method: "PATCH",
-        headers: { "Content-Type": "application/json", Origin: config.server },
+        headers: { "Content-Type": "application/json", Origin: config.server, ...authHeaders(config) },
         body: JSON.stringify({
           name: flow.name,
           description: flow.description ?? null,
@@ -532,7 +578,7 @@ async function syncFlows(config) {
       const stepsUrl = `${config.server}/api/projects/${config.project}/flows/${flow.slug}/steps`;
       const stepsRes = await fetch(stepsUrl, {
         method: "PUT",
-        headers: { "Content-Type": "application/json", Origin: config.server },
+        headers: { "Content-Type": "application/json", Origin: config.server, ...authHeaders(config) },
         body: JSON.stringify({ steps: flow.steps })
       });
       if (stepsRes.ok) {
@@ -545,7 +591,7 @@ async function syncFlows(config) {
       const createUrl = `${config.server}/api/projects/${config.project}/flows`;
       const res = await fetch(createUrl, {
         method: "POST",
-        headers: { "Content-Type": "application/json", Origin: config.server },
+        headers: { "Content-Type": "application/json", Origin: config.server, ...authHeaders(config) },
         body: JSON.stringify({
           slug: flow.slug,
           name: flow.name,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "git-shots-cli",
-	"version": "0.6.0",
+	"version": "0.6.2",
 	"description": "CLI for git-shots visual regression platform",
 	"type": "module",
 	"bin": {