@popcraft/cli 0.5.0 → 0.5.1

package/dist/popcraft.mjs

@@ -1166,7 +1166,7 @@ function operations(spec = openapi) {
 }
 async function call(target2, method, path, opts = {}) {
   const qs = new URLSearchParams(opts.query ?? {}).toString();
-  const headers = { "user-agent": `popcraft-cli/${"0.5.0"}`, ...opts.headers };
+  const headers = { "user-agent": `popcraft-cli/${"0.5.1"}`, ...opts.headers };
   if (target2.token) headers.authorization = `Bearer ${target2.token}`;
   if (opts.contentType) headers["content-type"] = opts.contentType;
   try {
@@ -89015,7 +89015,6 @@ function estimateBpm(onsets) {
 var WINDOW, HOP, NEIGHBOURS, MIN_GAP_MS, RISE_BACK, SILENCE, QUIET_DB;
 var init_audio_onsets = __esm({
   "lib/motion/audio-onsets.ts"() {
-    "use strict";
     WINDOW = 1024;
     HOP = 256;
     NEIGHBOURS = 16;
@@ -248677,7 +248676,6 @@ function removeRecords(doc2, ids2) {
 var COLLECTION_LIMITS, slugify2, dataMemo, withData, ITEM_RECORD, MARK, itemMark, templateRecord, compare, TOKEN2, hasItemToken, layerId, copyRecord, coerce3, newId;
 var init_collections = __esm({
   "lib/document/collections.ts"() {
-    "use strict";
     init_expressions2();
     init_variables();
     init_contract();
@@ -293016,7 +293014,6 @@ function playSegments(tr, elapsed, horizon) {
 var MIX_SAMPLE_RATE, toSample, sourceKey2;
 var init_audio_plan = __esm({
   "lib/motion/audio-plan.ts"() {
-    "use strict";
     init_audio_clips();
     MIX_SAMPLE_RATE = 48e3;
     toSample = (ms2, rate) => Math.round(ms2 * rate / 1e3);
@@ -297252,7 +297249,6 @@ function downloadBlob(blob, filename) {
 }
 var init_download = __esm({
   "lib/io/download.ts"() {
-    "use strict";
   }
 });
 
@@ -298125,7 +298121,6 @@ function applyTextPath(layout2, path, tp, rebase = true) {
 var defaultCircleRadius, ownsPath, mapPoint;
 var init_text_path = __esm({
   "lib/engine/text/text-path.ts"() {
-    "use strict";
     init_scene_graph();
     init_transform();
     init_shape_to_path();
@@ -298243,7 +298238,6 @@ function areaBounds(rings) {
 }
 var init_text_area = __esm({
   "lib/engine/text/text-area.ts"() {
-    "use strict";
   }
 });
 
@@ -301132,7 +301126,6 @@ ${photoCreditsText(credits).replace(/]]>/g, "]]]]><![CDATA[>")}]]></metadata>` :
 var resolvedFills2, resolvedStrokes2, roundedRectPath, shapePathFor, childrenOf2, rootMatrix2;
 var init_svg_export = __esm({
   "lib/io/svg-export.ts"() {
-    "use strict";
     init_credits();
     init_media_store();
     init_pattern_fill();
@@ -302310,7 +302303,6 @@ async function writeImage(w, img, color4) {
 var PT, MARK_LEN, MARK_GAP, MAX_TEX, MAX_RASTER_PIXELS, posterFrames, pdfOptionsFor;
 var init_pdf = __esm({
   "lib/io/pdf/index.ts"() {
-    "use strict";
     init_credits();
     init_scene_graph();
     init_export_fills();
@@ -302475,7 +302467,6 @@ async function exportSettingFile(renderer, node2, setting, doc2, styles) {
 var MIME, DEFAULT_EXPORT, exportSettingsOf;
 var init_export = __esm({
   "lib/io/export.ts"() {
-    "use strict";
     init_download();
     init_scene_graph();
     init_codecs();
@@ -308589,7 +308580,6 @@ var init_motion_shared = __esm({
 var layer, CODE_FORMATS, CODE_FORMAT_IDS, codeFormat, isLayerFormat, layerFormats, downloadFormats;
 var init_formats = __esm({
   "lib/io/web/formats.ts"() {
-    "use strict";
     layer = (o) => ({ scope: "layer", download: true, pictures: "svg", platform: "WEB", plays: false, ...o });
     CODE_FORMATS = {
       css: layer({ label: "CSS", note: "The stylesheet alone.", extension: "css", mime: "text/css", plays: true, download: false }),
@@ -312741,7 +312731,7 @@ var init_package = __esm({
   "packages/runtime/package.json"() {
     package_default = {
       name: "@popcraft/runtime",
-      version: "0.5.0",
+      version: "0.5.1",
       description: "What code exported from PopCraft shares: the meaning of expressions (operators and functions) and, as it grows, the parts of a design's behaviour that are common code rather than generated React.",
       license: "MIT",
       homepage: "https://popcraft.app/docs/exporting/nextjs",
@@ -337094,7 +337084,6 @@ function hashOf(text) {
 }
 var init_hash = __esm({
   "lib/code/hash.ts"() {
-    "use strict";
   }
 });
 
@@ -337594,7 +337583,6 @@ function fieldPart(nodes, id3) {
 var cleanName2;
 var init_controls = __esm({
   "lib/document/controls.ts"() {
-    "use strict";
     cleanName2 = (raw) => raw.trim().replace(/[^A-Za-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
   }
 });
@@ -338538,7 +338526,6 @@ function routesOf(screens) {
 var slug2;
 var init_routes = __esm({
   "lib/document/routes.ts"() {
-    "use strict";
     slug2 = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
   }
 });
@@ -338837,7 +338824,6 @@ function webTreeFor(doc2, nodeId2, lang, opts = {}) {
 var WEB_LANGUAGES, assetKindFor, playsMotion, WRITERS, serializeFor, extensionFor;
 var init_web = __esm({
   "lib/io/web/index.ts"() {
-    "use strict";
     init_compose2();
     init_email();
     init_html();
@@ -339030,7 +339016,6 @@ function rendererAssetResolvers(doc2, scale = 2) {
 var nodeFor, mainNodeFor, asDataURL;
 var init_resolvers = __esm({
   "lib/io/web/resolvers.ts"() {
-    "use strict";
     init_scene_graph();
     init_renderer_registry();
     init_export();
@@ -341397,7 +341382,6 @@ function diagnosticsText(diagnostics) {
 var HARNESS_NAMES, plainDiagnostics;
 var init_shader_diagnostics = __esm({
   "lib/engine/shader-diagnostics.ts"() {
-    "use strict";
     HARNESS_NAMES = ["ShaderUniforms", "VOut", "vs_main", "fs_main", "u", "p"];
     plainDiagnostics = (errors2) => errors2.map((message) => ({ line: null, column: null, message, severity: "error" }));
   }
@@ -344863,7 +344847,6 @@ function designRecorder() {
 var installed;
 var init_recorders = __esm({
   "lib/agent/design-script/recorders.ts"() {
-    "use strict";
     installed = null;
   }
 });
@@ -392622,6 +392605,7 @@ var init_pictures = __esm({
 var template_exports = {};
 __export(template_exports, {
   ownCopy: () => ownCopy,
+  rankOfficial: () => rankOfficial,
   runTemplate: () => runTemplate,
   sourceFiles: () => sourceFiles
 });
@@ -392648,32 +392632,27 @@ function sourceFiles(paths) {
   });
 }
 async function loadSource(file2) {
-  let mod;
-  try {
-    mod = await import(pathToFileURL2(file2).href);
-  } catch (e) {
-    throw new CliError(`${relative4(process.cwd(), file2)}: ${e.message}`);
-  }
+  const mod = await import(pathToFileURL2(file2).href);
   const s = mod.default;
   return s && typeof s === "object" && typeof s.id === "string" && s.meta && typeof s.build === "function" ? s : null;
 }
 async function buildAll(files, out, appUrl, o) {
   if (!files.length) throw usage("No template sources (files whose default export is `defineTemplate({ \u2026 })`).");
+  process.env.POPCRAFT_APP_URL ??= appUrl;
   const { kit } = await projectKit(dirname3(files[0]));
   await kit.prepareFonts(files.map((f2) => readFileSync11(f2, "utf8")));
   const built = [];
+  let broken2 = 0;
   for (const file2 of files) {
-    const source3 = await loadSource(file2);
-    if (!source3) continue;
-    let template2;
-    for (let tries = 0; !template2; tries++) {
-      try {
-        template2 = kit.buildTemplateSource(source3);
-      } catch (e) {
-        const hash3 = e.hash;
-        if (!hash3 || tries > 64) throw new CliError(`${relative4(process.cwd(), file2)}: ${e.message}`);
-        await fetchShippedMedia(appUrl, hash3, o);
-      }
+    let source3, template2;
+    try {
+      source3 = await loadSource(file2);
+      if (!source3) continue;
+      template2 = await kit.buildFromSource(source3, { appUrl });
+    } catch (e) {
+      o.info(`\u2716 ${relative4(process.cwd(), file2)}: ${e.message}`);
+      broken2++;
+      continue;
     }
     const dir = resolve4(out, source3.id);
     mkdirSync7(join10(dir, "media"), { recursive: true });
@@ -392683,15 +392662,7 @@ async function buildAll(files, out, appUrl, o) {
     o.info(`\u2713 ${relative4(process.cwd(), file2)} \u2192 ${relative4(process.cwd(), dir)}  ${template2.meta.sizes ? template2.meta.sizes.join(", ") : ""}`);
     built.push({ file: file2, source: source3, template: template2, dir });
   }
-  return built;
-}
-async function fetchShippedMedia(appUrl, hash3, o) {
-  const dir = process.env.POPCRAFT_MEDIA_DIR ?? join10((await import("node:os")).homedir(), ".cache", "popcraft", "media");
-  o.info(`  fetching PopCraft media ${hash3}\u2026`);
-  const res = await fetch(`${appUrl}/templates/media/${hash3}`).catch(() => null);
-  if (!res?.ok) throw new CliError(`Could not fetch ${appUrl}/templates/media/${hash3}`);
-  mkdirSync7(dir, { recursive: true });
-  writeFileSync8(join10(dir, hash3), new Uint8Array(await res.arrayBuffer()));
+  return Object.assign(built, { broken: broken2 });
 }
 async function checkAll(built, o) {
   const { kit } = await projectKit(dirname3(built[0].file));
@@ -392708,6 +392679,16 @@ async function checkAll(built, o) {
   }
   return ok2;
 }
+function rankOfficial(index2, query2, f2 = {}) {
+  const words = query2.toLowerCase().split(/\s+/).filter(Boolean);
+  const one = (text, w) => new RegExp(`(^|[^a-z0-9])${w.replace(/[^a-z0-9]/g, "")}(e?s)?([^a-z0-9]|$)`).test(text);
+  const has = (text, w) => one(text, w) || w.length > 3 && (one(text, w.replace(/es$/, "")) || one(text, w.replace(/s$/, "")));
+  return Object.entries(index2).filter(([, e]) => (!f2.platform || e.platforms.includes(f2.platform)) && (!f2.format || e.formats.includes(f2.format)) && (!f2.useCase || e.useCases.includes(f2.useCase)) && (!f2.category || e.category === f2.category) && (!f2.kind || e.kind === f2.kind.toUpperCase()) && (!f2.animated || !!e.animated)).map(([id3, e]) => {
+    const name2 = `${id3} ${e.name}`.toLowerCase(), tags = [...e.tags, ...e.formats, ...e.platforms, ...e.useCases, e.category].join(" ").toLowerCase(), about = e.description.toLowerCase();
+    const per = words.map((w) => (has(name2, w) ? 3 : 0) + (has(tags, w) ? 2 : 0) + (has(about, w) ? 1 : 0));
+    return { id: id3, e, matched: per.filter(Boolean).length, score: per.reduce((a, b) => a + b, 0) };
+  }).filter((r) => !words.length || r.score > 0).sort((a, b) => b.matched - a.matched || b.score - a.score || a.id.localeCompare(b.id)).map(({ matched: _m, ...r }) => r);
+}
 function ownCopy(text, path, officialId, id3) {
   const from2 = ["src", ...path.split("/").slice(0, -1)];
   const kitPath = (rel) => {
@@ -392752,6 +392733,7 @@ async function runTemplate(argv, flags, ctx2) {
       if (!file2) throw usage("popcraft template new <file.ts> [--from <official id>]");
       if (existsSync11(file2)) throw usage(`${file2} exists`);
       const id3 = basename2(file2).replace(/\.(ts|js|mjs)$/, "");
+      if (!/^[a-z0-9][a-z0-9-]{2,63}$/.test(id3)) throw usage(`The file name is the template's id: 3\u201364 lowercase letters, digits and dashes (${JSON.stringify(id3)} is not one). Try templates/spring-sale.ts`);
       const from2 = flagString(flags, "from");
       mkdirSync7(dirname3(resolve4(file2)), { recursive: true });
       writeFileSync8(file2, from2 ? copyOfficial((await projectKit(dirname3(resolve4(file2)))).root, from2, id3) : BLANK(id3));
@@ -392760,14 +392742,16 @@ async function runTemplate(argv, flags, ctx2) {
     }
     case "list": {
       const index2 = officialIndex((await projectKit(process.cwd())).root);
-      const words = paths.join(" ").toLowerCase().split(/\s+/).filter(Boolean);
-      const facet = (k2, v) => (e) => !v || [].concat(e[k2]).includes(v);
-      const rows = Object.entries(index2).filter(([, e]) => facet("platforms", flagString(flags, "platform"))(e) && facet("formats", flagString(flags, "format"))(e) && facet("useCases", flagString(flags, "useCase"))(e) && facet("category", flagString(flags, "category"))(e)).filter(([, e]) => (!flagBool(flags, "animated") || !!e.animated) && (!flagString(flags, "kind") || e.kind === flagString(flags, "kind").toUpperCase())).map(([id3, e]) => {
-        const hay = [id3, e.name, e.description, ...e.tags, ...e.formats, ...e.platforms, ...e.useCases].join(" ").toLowerCase();
-        return { id: id3, e, score: words.reduce((n, w) => n + (hay.includes(w) ? 1 : 0), 0) };
-      }).filter((r) => !words.length || r.score > 0).sort((a, b) => b.score - a.score || a.id.localeCompare(b.id)).slice(0, Number(flagString(flags, "limit") ?? 30));
+      const rows = rankOfficial(index2, paths.join(" "), {
+        platform: flagString(flags, "platform"),
+        format: flagString(flags, "format"),
+        useCase: flagString(flags, "useCase"),
+        category: flagString(flags, "category"),
+        kind: flagString(flags, "kind"),
+        animated: flagBool(flags, "animated")
+      }).slice(0, Number(flagString(flags, "limit") ?? 30));
       if (o.json) o.result(`${rows.length} templates`, rows.map((r) => ({ id: r.id, ...r.e })));
-      else for (const r of rows) o.line(`${r.id.padEnd(44)} ${r.e.name}${r.e.animated ? "  (animated)" : ""}
+      else for (const r of rows) o.line(`${r.id.padEnd(44)} ${r.e.name}${r.e.animated && !/animated/i.test(r.e.name) ? "  (animated)" : ""}
 ${"".padEnd(44)} ${r.e.formats.join(", ")} \xB7 ${r.e.platforms.join(", ")}`);
       return 0;
     }
@@ -392791,15 +392775,17 @@ ${"".padEnd(44)} ${r.e.formats.join(", ")} \xB7 ${r.e.platforms.join(", ")}`);
       return 0;
     }
     case "build": {
-      await buildAll(sourceFiles(paths), out, ctx2.appUrl, o);
+      const built = await buildAll(sourceFiles(paths), out, ctx2.appUrl, o);
+      if (built.broken) throw new CliError(`${built.broken} source${built.broken === 1 ? "" : "s"} did not build`);
       return 0;
     }
     case "check":
     case "pictures":
     case "publish": {
       const built = await buildAll(sourceFiles(paths), out, ctx2.appUrl, o);
-      if (!built.length) throw usage("No template sources found.");
-      if (!await checkAll(built, o)) throw new CliError("Fix what the checks say, then run it again.");
+      if (!built.length && !built.broken) throw usage("No template sources found.");
+      const passed = built.length ? await checkAll(built, o) : true;
+      if (built.broken || !passed) throw new CliError(`${built.broken ? `${built.broken} did not build. ` : ""}Fix what it says, then run it again.`);
       if (verb === "check") return 0;
       if (verb === "pictures" || !flagBool(flags, "noPictures")) {
         for (const b of built) await runPictures(b.dir, ctx2.appUrl, o);
@@ -392808,7 +392794,7 @@ ${"".padEnd(44)} ${r.e.formats.join(", ")} \xB7 ${r.e.platforms.join(", ")}`);
       return 0;
     }
     default:
-      throw usage("popcraft template new|build|check|pictures|publish \u2014 see `popcraft --help`");
+      throw usage("popcraft template list|new|build|check|look|pictures|publish \u2014 see `popcraft --help`");
   }
 }
 var BLANK, officialIndex;
@@ -393178,7 +393164,7 @@ init_resources();
 init_desktop();
 init_hypery();
 import { createInterface } from "node:readline";
-var VERSION2 = "0.5.0";
+var VERSION2 = "0.5.1";
 var HELP = `popcraft ${VERSION2} \u2014 the PopCraft command line
 
 Files (headless, on .popcraft files):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@popcraft/cli",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "The PopCraft command line: edit .popcraft files headlessly, call the REST API, publish to the marketplace and manage the desktop app's local plugins, themes, fonts, skills and agents.",
   "license": "MIT",
   "homepage": "https://popcraft.app/docs/api/cli",
@@ -34,7 +34,7 @@
     "esbuild": "0.28.2"
   },
   "dependencies": {
-    "@popcraft/kit": "0.5.0"
+    "@popcraft/kit": "0.5.1"
   },
   "scripts": {
     "build": "node build.mjs",