lecodes-cli 2.0.3 → 2.0.4

package/dist/index.js

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "lecodes-cli",
-    version: "2.0.3",
+    version: "2.0.4",
     dependencies: {
       "@letary/chisel": "^0.13.0",
       jimp: "^1.6.1",
@@ -73,7 +73,7 @@ var init_package = __esm(() => {
     },
     peerDependencies: {
       "lecodes-design": "^0.11.0",
-      "lecodes-headless": "^2.0.3",
+      "lecodes-headless": "^2.0.4",
       "lecodes-3d-editor": "^0.9.0",
       "lecodes-assets": "^0.2.1"
     },
@@ -127,7 +127,7 @@ var init_package = __esm(() => {
 });
 
 // ../../sdk/src/version.ts
-var SDK_VERSION = "2.0.3", sdkMajor = (version) => {
+var SDK_VERSION = "2.0.4", sdkMajor = (version) => {
   const m = version?.match(/^(\d+)\.\d+\.\d+/);
   return m ? Number(m[1]) : null;
 }, bundleSdkVersion = (head) => head.slice(0, 2000).match(/^\/\/ sdk: (\d+\.\d+\.\d+\S*)/m)?.[1] ?? null, bundleRunsOn = (bundleVersion, hostVersion) => sdkMajor(bundleVersion) !== null && sdkMajor(bundleVersion) === sdkMajor(hostVersion);
@@ -212719,21 +212719,50 @@ var init_peers = __esm(() => {
 });
 
 // src/hosts/archives.ts
-var ARCHIVED_PEERS, BASE = "https://storage.yandexcloud.net/le-codes/releases/packages", packagesBase = () => (process.env.LECODES_PACKAGES_URL || BASE).replace(/\/$/, ""), archiveUrl = (name, version) => `${packagesBase()}/${name}/${name}-${version}.tgz`, archivedVersion = (name) => {
+var ARCHIVED_PEERS, BASE = "https://storage.yandexcloud.net/le-codes/releases/packages", packagesBase = () => (process.env.LECODES_PACKAGES_URL || BASE).replace(/\/$/, ""), archiveUrl = (name, version) => `${packagesBase()}/${name}/${name}-${version}.tgz`, numbers = (version) => version.split(/[.-]/).slice(0, 3).map(Number), byVersion = (a2, b) => {
+  const pa = numbers(a2), pb = numbers(b);
+  for (let i2 = 0;i2 < 3; i2++) {
+    const d = (pa[i2] ?? 0) - (pb[i2] ?? 0);
+    if (d)
+      return d;
+  }
+  return 0;
+}, caretTakes = (floor, version) => {
+  if (!/^\d+\.\d+\.\d+$/.test(version) || byVersion(version, floor) < 0)
+    return false;
+  const f5 = numbers(floor), v = numbers(version);
+  const held = f5[0] ? 1 : f5[1] ? 2 : 3;
+  for (let i2 = 0;i2 < held; i2++)
+    if (f5[i2] !== v[i2])
+      return false;
+  return true;
+}, asked, versionsOut = (name) => {
+  const url = `${packagesBase()}/${name}/index.json`;
+  let answer = asked.get(url);
+  if (!answer) {
+    answer = fetch(`${url}?t=${Date.now()}`, { signal: AbortSignal.timeout(4000) }).then(async (res) => res.ok ? (await res.json()).versions ?? [] : []).catch(() => []);
+    asked.set(url, answer);
+  }
+  return answer;
+}, archivedVersion = async (name) => {
   if (!ARCHIVED_PEERS.has(name))
     return null;
   if (name === "lecodes-headless")
     return package_default.version;
   const range = package_default.peerDependencies?.[name];
-  const version = range?.replace(/^[\^~>=\s]+/, "");
-  return version && /^\d+\.\d+\.\d+/.test(version) ? version : null;
-}, archiveSpec = (name) => {
-  const version = archivedVersion(name);
+  const floor = range?.replace(/^[\^~>=\s]+/, "");
+  if (!floor || !/^\d+\.\d+\.\d+/.test(floor))
+    return null;
+  const newest = (await versionsOut(name)).filter((version) => caretTakes(floor, version)).sort(byVersion).pop();
+  return newest ?? floor;
+}, archiveSpec = async (name) => {
+  const version = await archivedVersion(name);
   return version ? archiveUrl(name, version) : null;
 };
 var init_archives = __esm(() => {
   init_package();
   ARCHIVED_PEERS = new Set(["lecodes-headless", "lecodes-design", "lecodes-3d-editor"]);
+  asked = new Map;
 });
 
 // src/hosts/peerInstall.ts
@@ -212754,7 +212783,7 @@ async function loadPeer(name, subpath, opts) {
     if (opts.install === false)
       return null;
     if (peerVersionGlobal(name, spec) !== null)
-      throw new CliError(`${name} is installed but "${spec}" can't be loaded from it — reinstall it: npm install -g ${peerSpec(name)}`);
+      throw new CliError(`${name} is installed but "${spec}" can't be loaded from it — reinstall it: npm install -g ${await peerSpec(name)}`);
     await installPeers(companions(name), opts.for);
   }
   return await import(pathToFileURL(resolveEntry(dir, subpath)).href);
@@ -212765,8 +212794,8 @@ var CANVAS_RANGE_FALLBACK = "^0.1.65", readJson2 = (path2) => {
   } catch {
     return null;
   }
-}, peerSpec = (name) => {
-  const archive = archiveSpec(name);
+}, peerSpec = async (name) => {
+  const archive = await archiveSpec(name);
   if (archive)
     return archive;
   if (name === "@napi-rs/canvas") {
@@ -212795,7 +212824,7 @@ var CANVAS_RANGE_FALLBACK = "^0.1.65", readJson2 = (path2) => {
 `);
   }
   const ordered = [...names3].sort((a2, b) => a2 === "lecodes-headless" ? -1 : b === "lecodes-headless" ? 1 : 0);
-  const specsNow = ordered.map(peerSpec);
+  const specsNow = await Promise.all(ordered.map(peerSpec));
   const yes = opts.yes === true || !!process.env.LECODES_YES;
   if (!yes) {
     const interactive = process.stdin.isTTY && process.stdout.isTTY;
@@ -212812,7 +212841,7 @@ var CANVAS_RANGE_FALLBACK = "^0.1.65", readJson2 = (path2) => {
   if (!tool)
     throw new CliError(`Neither npm nor bun is on PATH, so ${names3.join(" + ")} can't be installed automatically. Install one, or run on a machine with Node:  ${manualCommand(dir, specsNow)}`);
   for (const name of ordered) {
-    const spec = peerSpec(name);
+    const spec = await peerSpec(name);
     const argv = tool === "npm" ? ["install", "--prefix", dir, "--no-audit", "--no-fund", "--loglevel=error", spec] : ["add", "--cwd", dir, spec];
     note(`$ ${tool} ${argv.join(" ")}`);
     const r2 = spawnSync6(tool, argv, { stdio: "inherit", shell: process.platform === "win32", timeout: 10 * 60000 });
@@ -230640,15 +230669,15 @@ var parsePlatforms = (raw) => {
   if (raw === undefined)
     return;
   const known = allShaderPlatforms();
-  const asked = raw.split(",").map((p2) => p2.trim()).filter(Boolean);
-  if (asked.length === 0)
+  const asked2 = raw.split(",").map((p2) => p2.trim()).filter(Boolean);
+  if (asked2.length === 0)
     throw new CliError(`--platform needs at least one target. Known: ${known.join(", ")}`);
-  const bad = asked.filter((p2) => !known.includes(p2));
+  const bad = asked2.filter((p2) => !known.includes(p2));
   if (bad.length > 0) {
     throw new CliError(`Unknown shader platform${bad.length > 1 ? "s" : ""}: ${bad.join(", ")}
   Known: ${known.join(", ")}`);
   }
-  return asked;
+  return asked2;
 };
 var compileShaders = async (platforms) => {
   const { root, shaders } = collectShaders();
@@ -231886,7 +231915,7 @@ ${c.bold(name)}  ${c.dim(what)}`);
       for (const [name, probe] of OPTIONAL_PEERS) {
         const where = peerSource(name, probe);
         const installed = peerVersion(name, probe);
-        const latest = !installed ? null : archivedVersion(name) ?? await npmLatest(name);
+        const latest = !installed ? null : await archivedVersion(name) ?? await npmLatest(name);
         rows.push({ name, installed, latest, where });
       }
       rows.push({ name: "lecodes-cli", installed: package_default.version, latest: await npmLatest("lecodes-cli"), where: "global" });
@@ -231900,7 +231929,7 @@ ${c.bold(name)}  ${c.dim(what)}`);
       if (behind.length === 0)
         return "ok";
       const prefixBehind = behind.filter((r2) => r2.where === "prefix");
-      const globalSpecs = behind.filter((r2) => r2.where !== "prefix").map((r2) => archiveSpec(r2.name) ?? r2.name + "@latest");
+      const globalSpecs = await Promise.all(behind.filter((r2) => r2.where !== "prefix").map(async (r2) => await archiveSpec(r2.name) ?? r2.name + "@latest"));
       if (flags.check) {
         return ["updated", behind.length + " behind — run: lecodes update" + (globalSpecs.length ? "  (global: npm install -g " + globalSpecs.join(" ") + ")" : "")];
       }
@@ -232022,6 +232051,20 @@ var buildWeb = async (options) => {
   rmSync14(out, { recursive: true, force: true });
   mkdirSync33(out, { recursive: true });
   cpSync6(lite, out, { recursive: true });
+  const table2 = join51(out, "features.json");
+  if (existsSync51(table2)) {
+    const { features, fonts } = JSON.parse(readFileSync41(table2, "utf8"));
+    if (config.font === "system")
+      for (const file of fonts ?? [])
+        rmSync14(join51(out, file), { force: true });
+    for (const feature of features) {
+      if (feature.uses.some((name2) => js.includes(name2)))
+        continue;
+      for (const file of feature.files)
+        rmSync14(join51(out, file), { force: true });
+    }
+    rmSync14(table2);
+  }
   const bundle = `app.${createHash9("sha256").update(js).digest("hex").slice(0, 10)}.js`;
   writeFileSync35(join51(out, bundle), js);
   for (const entry of entries) {
@@ -232053,7 +232096,11 @@ var buildWeb = async (options) => {
   }
   if (mode === "path")
     head.unshift(`<base href="${escapeHtml(base)}" />`);
-  const attrs = [`data-src="${bundle}"`, ...mode === "path" ? [`data-urls="path"`, `data-base="${escapeHtml(base)}"`] : []].join(" ");
+  const attrs = [
+    `data-src="${bundle}"`,
+    ...mode === "path" ? [`data-urls="path"`, `data-base="${escapeHtml(base)}"`] : [],
+    ...config.font === "system" ? [`data-font="system"`] : []
+  ].join(" ");
   const replace = (from, to2) => {
     const next = html.replace(from, to2);
     if (next === html)

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "lecodes-cli",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "dependencies": {
     "@letary/chisel": "^0.13.0",
     "jimp": "^1.6.1",
-    "lecodes-sdk": "2.0.3"
+    "lecodes-sdk": "2.0.4"
   },
   "devDependencies": {
     "lecodes-design": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-design/lecodes-design-0.11.0.tgz",
-    "lecodes-headless": "2.0.3",
+    "lecodes-headless": "2.0.4",
     "qrcode-terminal": "^0.12.0",
     "lecodes-3d-editor": "https://storage.yandexcloud.net/le-codes/releases/packages/lecodes-3d-editor/lecodes-3d-editor-0.9.0.tgz",
     "lecodes-assets": "0.2.1",
     "lecodes-creator-nav": "0.19.0",
-    "lecodes-gl-lite": "2.0.3",
-    "lecodes-web-frame": "2.0.3",
-    "lecodes-web-player": "2.0.3",
-    "lecodes-web-shared": "2.0.3",
+    "lecodes-gl-lite": "2.0.4",
+    "lecodes-web-frame": "2.0.4",
+    "lecodes-web-player": "2.0.4",
+    "lecodes-web-shared": "2.0.4",
     "lecodes-web-lite": "2.0.2"
   },
   "peerDependencies": {
     "lecodes-design": "^0.11.0",
-    "lecodes-headless": "^2.0.3",
+    "lecodes-headless": "^2.0.4",
     "lecodes-3d-editor": "^0.9.0",
     "lecodes-assets": "^0.2.1"
   },