trajectories-sh 1.25.0 → 1.25.1

package/dist/cli.js

@@ -708,7 +708,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
     );
   }
   if (isZip) {
-    const { uploadZip } = await import("./upload-6HQ5A2H7.js");
+    const { uploadZip } = await import("./upload-OW7RWQVX.js");
     const slug2 = opts.slug ?? pathArg.replace(/\.zip$/i, "").replace(/\/+$/, "").split("/").pop();
     console.log(chalk.bold(`
   Uploading ZIP ${pathArg} \u2192 ${chalk.cyan(slug2)}
@@ -737,7 +737,7 @@ async function uploadTrajectoryAction(pathArg, opts) {
   Uploading trajectory ${pathArg} \u2192 ${chalk.cyan(slug)}
 `));
   try {
-    const { uploadJob } = await import("./upload-6HQ5A2H7.js");
+    const { uploadJob } = await import("./upload-OW7RWQVX.js");
     const result = await uploadJob(pathArg, {
       slug,
       name: opts.name

package/dist/{upload-6HQ5A2H7.js → upload-OW7RWQVX.js}

@@ -9,9 +9,27 @@ import {
   getAuthHeader
 } from "./chunk-ERO5HP43.js";
 
+// src/converted-image-paths.ts
+import { dirname, resolve } from "path";
+function rewriteConvertedImagePaths(value, trajectoryPath, converted) {
+  if (!value || typeof value !== "object") return;
+  if (Array.isArray(value)) {
+    for (const item of value) rewriteConvertedImagePaths(item, trajectoryPath, converted);
+    return;
+  }
+  const object = value;
+  if (object.type === "image" && object.source && typeof object.source === "object") {
+    const source = object.source;
+    if (typeof source.path === "string" && converted.has(resolve(dirname(trajectoryPath), source.path))) {
+      source.path = source.path.replace(/\.png$/i, ".webp");
+    }
+  }
+  for (const item of Object.values(object)) rewriteConvertedImagePaths(item, trajectoryPath, converted);
+}
+
 // src/upload.ts
 import { readdirSync, statSync, readFileSync, writeFileSync, mkdirSync, copyFileSync, unlinkSync } from "fs";
-import { join, relative, dirname } from "path";
+import { join, relative } from "path";
 import { tmpdir } from "os";
 import { randomBytes, createHash } from "crypto";
 var SKIP = /* @__PURE__ */ new Set(["__pycache__", ".DS_Store", ".git", "node_modules"]);
@@ -78,7 +96,7 @@ async function uploadZip(zipPath, opts) {
   console.log("  Uploading ZIP via resumable upload...");
   const { createReadStream } = await import("fs");
   const tus = await import("tus-js-client");
-  await new Promise((resolve, reject) => {
+  await new Promise((resolve2, reject) => {
     const fileStream = createReadStream(zipPath);
     const upload = new tus.Upload(fileStream, {
       endpoint: `${uploadInfo.supabase_url}/storage/v1/upload/resumable`,
@@ -107,7 +125,7 @@ async function uploadZip(zipPath, opts) {
       },
       onSuccess() {
         console.log(`  \u2191 100% \u2014 ZIP uploaded to storage.`);
-        resolve();
+        resolve2();
       }
     });
     upload.start();
@@ -204,6 +222,7 @@ async function convertToWebP(dir) {
   const prevConcurrency = sharp.concurrency();
   sharp.concurrency(1);
   sharp.cache({ memory: 0, files: 0, items: 0 });
+  const convertedPaths = /* @__PURE__ */ new Map();
   let converted = 0;
   let savedBytes = 0;
   let processed = 0;
@@ -216,6 +235,7 @@ async function convertToWebP(dir) {
       const origSize = statSync(srcPath).size;
       const newSize = statSync(webpPath).size;
       if (newSize < origSize) {
+        convertedPaths.set(srcPath, webpPath);
         unlinkSync(srcPath);
         savedBytes += origSize - newSize;
         converted++;
@@ -241,20 +261,11 @@ async function convertToWebP(dir) {
   const trajFiles = collectFiles(tmpDir).files.filter((f) => f.relPath.endsWith("trajectory.json"));
   for (const tf of trajFiles) {
     try {
-      let content = readFileSync(tf.absPath, "utf-8");
-      const original = content;
-      content = content.replace(/screenshots\/([^"]+)\.png/g, (match, name) => {
-        const webpPath = join(dirname(tf.absPath), "screenshots", `${name}.webp`);
-        try {
-          statSync(webpPath);
-          return `screenshots/${name}.webp`;
-        } catch {
-          return match;
-        }
-      });
-      if (content !== original) {
-        writeFileSync(tf.absPath, content);
-      }
+      const original = readFileSync(tf.absPath, "utf-8");
+      const trajectory = JSON.parse(original);
+      const before = JSON.stringify(trajectory);
+      rewriteConvertedImagePaths(trajectory, tf.absPath, convertedPaths);
+      if (JSON.stringify(trajectory) !== before) writeFileSync(tf.absPath, JSON.stringify(trajectory));
     } catch {
     }
   }
@@ -673,6 +684,7 @@ function truncate(s, n) {
 }
 export {
   collectFiles,
+  convertToWebP,
   uploadJob,
   uploadZip
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trajectories-sh",
-  "version": "1.25.0",
+  "version": "1.25.1",
   "description": "CLI for uploading trajectory jobs to trajectories.sh",
   "type": "module",
   "bin": {