@vosjs/cli 0.60.1 → 0.61.0

package/README.md

@@ -328,7 +328,7 @@ vos pull bright-loop [--since <versionId>] [--check]   # what changed on vos.so
                                                        # --check reports without writing; --since walks from a base you name
 vos duplicate <vosId>                                  # a private sibling of your OWN vos (someone else's is remixed: fetch, then push --remix-of)
 vos folder list | create <name> [--parent] [--desc] | move <ids…> --to <folder|none> | pull <ref> [--media]
-vos asset push <file…> [--folder <slug>] | rename <id> <name.ext>   # sound and video too: they land in Sound > Uploads
+vos asset push <file…> [--folder <slug>] | rename <id> <name.ext>   # any kind the platform takes (GET /api/limits): models, pictures, SVG, fonts, HDR, sound, video
 vos recipe push <FILE.md> --folder <slug> | --asset <id>   # the one recipe write: create, or replace in place
 ```
 

package/dist/{assetManifest-Y5FYTZW6.js → assetManifest-NS64PLY5.js}

@@ -4,7 +4,7 @@ import {
   localManifestRefs,
   pullManifest,
   uploadManifest
-} from "./chunk-YMVRTZ4L.js";
+} from "./chunk-EZW6ZCEH.js";
 import "./chunk-WCF6KIOK.js";
 export {
   hostedLiteralWarnings,
@@ -12,4 +12,4 @@ export {
   pullManifest,
   uploadManifest
 };
-//# sourceMappingURL=assetManifest-Y5FYTZW6.js.map
+//# sourceMappingURL=assetManifest-NS64PLY5.js.map

package/dist/{chunk-QL25OPZB.js → chunk-C4P6MZJG.js}

@@ -34,7 +34,7 @@ import {
   uploadDocRefs,
   uploadManifest,
   writeJson
-} from "./chunk-YMVRTZ4L.js";
+} from "./chunk-EZW6ZCEH.js";
 import {
   CREDENTIALS_PATH,
   MEDIA_HEAD_BYTES,
@@ -7255,6 +7255,7 @@ async function pushTake(dir, flags, r) {
       `recording upload failed: ${e instanceof Error ? e.message : String(e)}`
     );
   }
+  for (const note of upload.notes) r.log(`  note: ${note}`);
   const assetId = upload.id;
   const assetUrl = upload.url;
   r.event({ event: "recording", assetId, reused: upload.reused });
@@ -8358,18 +8359,8 @@ async function writeProgramDoc(dir, hosted) {
 // src/plugin/asset.ts
 import { createHash as createHash2 } from "crypto";
 import { readFileSync as readFileSync3 } from "fs";
-import { basename as basename3, extname as extname2 } from "path";
+import { basename as basename3 } from "path";
 var BOOLEAN_FLAGS3 = /* @__PURE__ */ new Set(["json", "help"]);
-var MIME_BY_EXT = {
-  ".png": "image/png",
-  ".jpg": "image/jpeg",
-  ".jpeg": "image/jpeg",
-  ".webp": "image/webp",
-  ".gif": "image/gif",
-  ".glb": "model/gltf-binary",
-  ".gltf": "model/gltf+json",
-  ".md": "text/markdown"
-};
 async function cmdRename(argv) {
   const { positionals, flags } = parseArgs(argv, BOOLEAN_FLAGS3);
   const [assetId, filename] = positionals;
@@ -8408,7 +8399,6 @@ async function cmdPush(argv) {
   const folderRef = strFlag(flags, "folder");
   const folder = folderRef ? resolveFolder(await listFolders(origin, key), folderRef) : null;
   const uploaded = [];
-  let unfiledMedia = 0;
   for (const file of positionals) {
     const name = basename3(file);
     const body = readFileSync3(file);
@@ -8416,56 +8406,36 @@ async function cmdPush(argv) {
       head: body.subarray(0, MEDIA_HEAD_BYTES),
       filename: name
     });
-    if (/^(audio|video)\//.test(media.type)) {
-      const sent = nameForType(name, media.type);
-      let put;
-      try {
-        put = await uploadAsset({ origin, key }, new Uint8Array(body), {
-          filename: sent,
-          contentType: media.type,
-          contentHash: createHash2("sha256").update(body).digest("hex"),
-          ...folder ? { folderId: folder.id } : {}
-        });
-      } catch (e) {
-        const landed = uploaded.length ? ` (${uploaded.length} of ${positionals.length} landed before it)` : "";
-        throw new Error(
-          `push ${name}${landed}: ${e instanceof Error ? e.message : String(e)}`
-        );
-      }
-      if (!folder && !put.reused) unfiledMedia += 1;
-      uploaded.push({ id: put.id, filename: sent });
-      r.log(
-        `uploaded ${sent} (${put.id})${put.reused ? " \u2014 already on your shelf" : ""}  ${put.url}`
-      );
-      continue;
-    }
-    const mime = MIME_BY_EXT[extname2(name).toLowerCase()] ?? "application/octet-stream";
-    const form = new FormData();
-    form.set("file", new Blob([body], { type: mime }), name);
-    if (folder) form.set("folderId", folder.id);
-    const res = await fetch(`${origin}/api/assets/upload`, {
-      method: "POST",
-      headers: { accept: "application/json", authorization: `Bearer ${key}` },
-      body: form
-    });
-    let payload = {};
+    const isMedia = /^(audio|video)\//.test(media.type);
+    const sent = isMedia ? nameForType(name, media.type) : name;
+    let put;
     try {
-      payload = await res.json();
-    } catch {
-    }
-    if (res.status !== 200 && res.status !== 201) {
+      put = await uploadAsset({ origin, key }, new Uint8Array(body), {
+        filename: sent,
+        ...isMedia ? { contentType: media.type } : {},
+        contentHash: createHash2("sha256").update(body).digest("hex"),
+        intent: "library",
+        ...folder ? { folderId: folder.id } : {}
+      });
+    } catch (e) {
       const landed = uploaded.length ? ` (${uploaded.length} of ${positionals.length} landed before it)` : "";
       throw new Error(
-        apiError(`push ${name}${landed}`, {
-          status: res.status,
-          body: payload
-        })
+        `push ${name}${landed}: ${e instanceof Error ? e.message : String(e)}`
       );
     }
-    uploaded.push({ id: payload.id, filename: payload.filename });
+    const stored = put.filename || sent;
+    uploaded.push({
+      id: put.id,
+      filename: stored,
+      kind: put.kind,
+      url: put.url,
+      ...put.reused ? { reused: true } : {},
+      ...put.notes.length ? { notes: put.notes } : {}
+    });
     r.log(
-      `uploaded ${String(payload.filename ?? name)} (${String(payload.id)})`
+      `uploaded ${stored} (${put.id})${put.reused ? " \u2014 already on your shelf" : ""}  ${put.url}`
     );
+    for (const note of put.notes) r.log(`  note: ${note}`);
   }
   r.done(
     {
@@ -8473,8 +8443,7 @@ async function cmdPush(argv) {
       count: uploaded.length,
       folder: folder?.slug ?? null
     },
-    `pushed ${uploaded.length} asset${uploaded.length === 1 ? "" : "s"}${folder ? ` into ${folder.slug}` : ""}` + (unfiledMedia ? `
-note: an unfiled sound or video that no document uses is removed after 7 days. Reference it from a doc (doc.audio key = its url) or push it with --folder <slug>` : "")
+    `pushed ${uploaded.length} asset${uploaded.length === 1 ? "" : "s"}${folder ? ` into ${folder.slug}` : ""}`
   );
   return EXIT_OK;
 }
@@ -9185,7 +9154,7 @@ import { findFontFamily as findFontFamily3 } from "@vosjs/shared";
 import { existsSync as existsSync16, readFileSync as readFileSync5, readdirSync as readdirSync3, statSync as statSync5 } from "fs";
 import { createServer as createServer2 } from "http";
 import { createRequire } from "module";
-import { basename as basename5, extname as extname3, join as join19 } from "path";
+import { basename as basename5, extname as extname2, join as join19 } from "path";
 function themeColors(sources) {
   const out = {};
   const re = /\bconst\s+([A-Za-z_$][\w$]*)\s*(?::\s*string\s*)?=\s*['"](#[0-9a-fA-F]{3,8})['"]/g;
@@ -9366,7 +9335,7 @@ async function readRemotion(dir, log) {
     if (!f.startsWith(out) || !existsSync16(f) || statSync5(f).isDirectory())
       f = join19(out, "index.html");
     rs.writeHead(200, {
-      "content-type": TYPES[extname3(f)] ?? "application/octet-stream"
+      "content-type": TYPES[extname2(f)] ?? "application/octet-stream"
     });
     rs.end(readFileSync5(f));
   }).listen(0, "127.0.0.1");
@@ -10684,6 +10653,7 @@ function scaffoldSourceDir(inv) {
 }
 
 // src/plugin/recipe.ts
+import { createHash as createHash3 } from "crypto";
 import { readFileSync as readFileSync8 } from "fs";
 import { basename as basename7 } from "path";
 var BOOLEAN_FLAGS9 = /* @__PURE__ */ new Set(["json", "help"]);
@@ -10712,55 +10682,49 @@ async function cmdPush2(argv) {
   });
   const key = requireCredential(strFlag(flags, "key"));
   if (assetId) {
-    const res2 = await apiJson(origin, `/api/assets/${assetId}/file`, {
+    const res = await apiJson(origin, `/api/assets/${assetId}/file`, {
       method: "PUT",
       key,
       raw: new Uint8Array(body),
       headers: { "content-type": "text/markdown" }
     });
-    if (res2.status !== 200) {
-      throw new Error(apiError(`replace recipe ${assetId}`, res2));
+    if (res.status !== 200) {
+      throw new Error(apiError(`replace recipe ${assetId}`, res));
     }
     r.done(
-      { id: assetId, filename: res2.body.filename, replaced: true },
-      `replaced recipe ${assetId} (${String(res2.body.filename)}) in place \u2014 the prior body is kept, restore it from the recipe page`
+      { id: assetId, filename: res.body.filename, replaced: true },
+      `replaced recipe ${assetId} (${String(res.body.filename)}) in place \u2014 the prior body is kept, restore it from the recipe page`
     );
     return EXIT_OK;
   }
   const folder = resolveFolder(await listFolders(origin, key), folderRef);
-  const form = new FormData();
-  form.set("file", new Blob([body], { type: "text/markdown" }), filename);
-  form.set("folderId", folder.id);
-  const res = await fetch(`${origin}/api/assets/upload`, {
-    method: "POST",
-    headers: { accept: "application/json", authorization: `Bearer ${key}` },
-    body: form
-  });
-  let payload = {};
+  let put;
   try {
-    payload = await res.json();
-  } catch {
-  }
-  if (res.status !== 200 && res.status !== 201) {
+    put = await uploadAsset({ origin, key }, new Uint8Array(body), {
+      filename,
+      contentType: "text/markdown",
+      contentHash: createHash3("sha256").update(body).digest("hex"),
+      intent: "library",
+      folderId: folder.id
+    });
+  } catch (e) {
     throw new Error(
-      apiError(`push recipe ${filename}`, {
-        status: res.status,
-        body: payload
-      })
+      `push recipe ${filename}: ${e instanceof Error ? e.message : String(e)}`
     );
   }
-  const meta = payload.metadata ?? {};
-  const stored = typeof payload.filename === "string" ? payload.filename : filename;
+  const meta = put.metadata ?? {};
+  const stored = put.filename || filename;
   r.done(
     {
-      id: payload.id,
-      filename: payload.filename,
+      id: put.id,
+      filename: stored,
       folder: folder.slug,
       name: meta.name,
-      description: meta.description
+      description: meta.description,
+      ...put.notes.length ? { notes: put.notes } : {}
     },
-    `pushed ${stored} into ${folder.slug} (${String(payload.id)})${typeof meta.name === "string" ? ` \u2014 ${meta.name}` : ""}
-Replace it later with: vos recipe push ${file} --asset ${String(payload.id)}`
+    `pushed ${stored} into ${folder.slug} (${put.id})${typeof meta.name === "string" ? ` \u2014 ${meta.name}` : ""}
+Replace it later with: vos recipe push ${file} --asset ${put.id}`
   );
   return EXIT_OK;
 }
@@ -12683,12 +12647,12 @@ Platform (vos.so) \u2014 fetch, edit, push, pull, repeat
             and fileUrl untouched; the extension must keep matching the
             asset's kind (a recipe stays .md)
   vos asset push <file...> [--folder <folderId|slug>]
-            upload files onto your shelf (a key takes models .glb/.gltf,
-            recipes .md and images .png/.jpg/.webp/.gif \u2014 posters and
-            store stills file into the release's project; 40 images/24h \u2014
-            and sound and video, which land in Sound > Uploads and print
-            the url a doc.json audio key takes; an unfiled one that no
-            document uses is removed after 7 days, so pass --folder)
+            add files to your library: models, pictures and SVGs, fonts,
+            HDR maps, sound, video, captions and recipes. The platform
+            reads each file and answers what it is and the name it is
+            stored under; the same bytes twice are the same file. Prints
+            the url a doc.json key takes. GET /api/limits lists the
+            kinds, their size caps and their daily rates
   vos recipe push <file.md> --folder <folderId|slug>
   vos recipe push <file.md> --asset <assetId>
             put a recipe (a plain .md) on the shelf: --folder creates it
@@ -14643,4 +14607,4 @@ export {
   verbHelp,
   run
 };
-//# sourceMappingURL=chunk-QL25OPZB.js.map
+//# sourceMappingURL=chunk-C4P6MZJG.js.map