@koda-sl/baker-cli 0.223.0 → 0.225.0

package/dist/cli.js

@@ -58,7 +58,7 @@ import {
   ulid,
   validateCanvasDeep,
   ytDlpBlockSignal
-} from "./chunk-CMPAHYLB.js";
+} from "./chunk-EKLAHWSF.js";
 import {
   csvOrJson,
   daysAgoIso,
@@ -21272,24 +21272,28 @@ function renderFontFaceCss(faces) {
 }
 var FONT_PROVIDERS = ["google", "fontsource"];
 var FONTSOURCE_API = "https://api.fontsource.org/v1";
+var FONT_STYLES = ["normal", "italic"];
+var ITAL_AXIS = { normal: 0, italic: 1 };
 function fontsourceId(family) {
   return family.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
 }
-function fontsourceFaces(meta, weights, subsets) {
+function fontsourceFaces(meta, weights, subsets, styles = ["normal"]) {
   const faces = [];
   for (const subset of subsets.filter((s) => meta.subsets.includes(s))) {
     for (const weight of weights.filter((w) => meta.weights.includes(w))) {
-      const url = meta.variants[String(weight)]?.normal?.[subset]?.url?.woff2;
-      if (!url) continue;
-      faces.push({
-        subset,
-        family: meta.family,
-        style: "normal",
-        weight,
-        url,
-        unicodeRange: meta.unicodeRange?.[subset] ?? "",
-        provider: "fontsource"
-      });
+      for (const style of styles.filter((style2) => meta.styles.includes(style2))) {
+        const url = meta.variants[String(weight)]?.[style]?.[subset]?.url?.woff2;
+        if (!url) continue;
+        faces.push({
+          subset,
+          family: meta.family,
+          style,
+          weight,
+          url,
+          unicodeRange: meta.unicodeRange?.[subset] ?? "",
+          provider: "fontsource"
+        });
+      }
     }
   }
   return faces;
@@ -21319,29 +21323,30 @@ function asFontsourceMeta(body) {
   const ok = typeof meta.family === "string" && Array.isArray(meta.weights) && Array.isArray(meta.styles) && Array.isArray(meta.subsets) && typeof meta.variants === "object" && meta.variants !== null;
   return ok ? meta : null;
 }
-async function probeGoogleWeights(family, lookup) {
-  const probes = await Promise.all(
-    STANDARD_WEIGHTS.map(async (weight) => ({ weight, got: await lookup(googleFontCssUrl(family, [weight])) }))
-  );
-  if (probes.some((probe) => probe.got.status === "unreachable")) return null;
-  return probes.filter((probe) => probe.got.status === "served").map((probe) => probe.weight);
+async function probeGoogleFaces(family, lookup) {
+  const got = await lookup(googleFontCssUrl(family, STANDARD_WEIGHTS, FONT_STYLES));
+  if (got.status === "unreachable") return null;
+  return got.status === "served" ? parseGoogleFontFaces(got.css) : [];
 }
-async function resolveFromGoogle(family, weights, subsets, deps) {
-  const google = await deps.lookupGoogleCss(googleFontCssUrl(family, weights));
+async function resolveFromGoogle(family, weights, subsets, styles, deps) {
+  const google = await deps.lookupGoogleCss(googleFontCssUrl(family, weights, FONT_STYLES));
   if (google.status === "unreachable") return { ok: false, reason: "unreachable", provider: "google" };
   if (google.status === "absent") {
-    const served2 = await probeGoogleWeights(family, deps.lookupGoogleCss);
+    const served2 = await probeGoogleFaces(family, deps.lookupGoogleCss);
     if (served2 === null) return { ok: false, reason: "unreachable", provider: "google" };
-    return served2.length > 0 ? { ok: false, reason: "weight", provider: "google", available: served2 } : null;
+    const available = [...new Set(served2.map((face) => face.weight))].sort((a, b) => a - b);
+    return available.length > 0 ? { ok: false, reason: "weight", provider: "google", available } : null;
   }
   const served = parseGoogleFontFaces(google.css);
   if (served.length === 0) return null;
-  const faces = served.filter((face) => subsets.includes(face.subset)).map((face) => ({ ...face, provider: "google" }));
-  if (faces.length > 0) return { ok: true, provider: "google", faces };
+  const availableStyles = [...new Set(served.map((face) => face.style))].sort();
+  const inSubset = served.filter((face) => subsets.includes(face.subset));
+  const faces = inSubset.filter((face) => styles.includes(face.style)).map((face) => ({ ...face, provider: "google" }));
+  if (faces.length > 0) return { ok: true, provider: "google", faces, availableStyles };
   return { ok: false, reason: "subset", provider: "google", available: [...new Set(served.map((f) => f.subset))] };
 }
-async function resolveBrandFaces(family, weights, subsets, deps) {
-  const google = await resolveFromGoogle(family, weights, subsets, deps);
+async function resolveBrandFaces(family, weights, subsets, deps, styles = ["normal"]) {
+  const google = await resolveFromGoogle(family, weights, subsets, styles, deps);
   if (google) return google;
   let body;
   try {
@@ -21351,12 +21356,12 @@ async function resolveBrandFaces(family, weights, subsets, deps) {
   }
   const meta = asFontsourceMeta(body);
   if (meta) {
-    const faces = fontsourceFaces(meta, weights, subsets);
+    const faces = fontsourceFaces(meta, weights, subsets, styles);
     const ambiguous = undisambiguatedSubsets(faces);
     if (ambiguous.length > 0) {
       return { ok: false, reason: "ambiguous-subsets", provider: "fontsource", available: meta.subsets };
     }
-    if (faces.length > 0) return { ok: true, provider: "fontsource", faces };
+    if (faces.length > 0) return { ok: true, provider: "fontsource", faces, availableStyles: [...meta.styles].sort() };
     if (!subsets.some((subset) => meta.subsets.includes(subset))) {
       return { ok: false, reason: "subset", provider: "fontsource", available: meta.subsets };
     }
@@ -21453,18 +21458,28 @@ function resolveFetchWeights(flag, declared) {
   }
   return declared?.length ? declared : [400];
 }
-function googleFontCssUrl(family, weights) {
+var DEFAULT_SUBSETS = ["latin"];
+function resolveFetchSubsets(flag, selfHosted) {
+  const asked = String(flag ?? "").split(",").map((subset) => subset.trim()).filter(Boolean);
+  const named = flag ? [...new Set(asked)] : selfHosted;
+  return named.length > 0 ? named : [...DEFAULT_SUBSETS];
+}
+function resolveFetchStyles(italic, selfHosted) {
+  return italic || selfHosted.includes("italic") ? ["normal", "italic"] : ["normal"];
+}
+function googleFontCssUrl(family, weights, styles = ["normal"]) {
   const name = family.trim().split(/\s+/).map(encodeURIComponent).join("+");
-  const axis = [...new Set(weights)].sort((a, b) => a - b).join(";");
-  const spec = axis ? `${name}:wght@${axis}` : name;
+  const sorted = [...new Set(weights)].sort((a, b) => a - b);
+  if (sorted.length === 0) return `${GOOGLE_CSS2}?family=${name}&display=swap`;
+  const wanted = FONT_STYLES.filter((style) => styles.includes(style));
+  const spec = wanted.length > 1 ? `${name}:ital,wght@${wanted.flatMap((style) => sorted.map((w) => `${ITAL_AXIS[style]},${w}`)).join(";")}` : `${name}:wght@${sorted.join(";")}`;
   return `${GOOGLE_CSS2}?family=${spec}&display=swap`;
 }
 var STANDARD_WEIGHTS = [100, 200, 300, 400, 500, 600, 700, 800, 900];
 async function probeServedWeights(family, fetchCss) {
-  const probes = await Promise.all(
-    STANDARD_WEIGHTS.map(async (weight) => await fetchCss(googleFontCssUrl(family, [weight])) ? weight : null)
-  );
-  return probes.filter((w) => w !== null);
+  const css = await fetchCss(googleFontCssUrl(family, STANDARD_WEIGHTS));
+  if (css === null) return [];
+  return [...new Set(parseGoogleFontFaces(css).map((face) => face.weight))].sort((a, b) => a - b);
 }
 async function checkFontRequests(requests, fetchCss) {
   const results = [];
@@ -21546,6 +21561,34 @@ function selfHostedWeights(css, family) {
   }
   return [...weights].sort((a, b) => a - b);
 }
+function fontFileSubset(href) {
+  const file = posix.basename((href.split("?")[0] ?? "").split("#")[0] ?? "");
+  return /^[A-Za-z0-9]+-[1-9]00(?:italic)?-([\w-]+)\.woff2$/.exec(file)?.[1] ?? null;
+}
+function selfHostedSubsets(css, family) {
+  const target = normalizeFamily(family);
+  const subsets = /* @__PURE__ */ new Set();
+  for (const rule of stripCssComments(css).matchAll(/@font-face\s*\{([^}]*)\}/gi)) {
+    const body = rule[1] ?? "";
+    const declared = body.match(/font-family\s*:\s*([^;]+)/i)?.[1];
+    if (!declared || normalizeFamily(declared) !== target) continue;
+    for (const url of body.matchAll(/url\(\s*['"]?([^'")]+)['"]?\s*\)/gi)) {
+      const subset = fontFileSubset(url[1] ?? "");
+      if (subset) subsets.add(subset);
+    }
+  }
+  return [...subsets].sort();
+}
+function selfHostedStyles(css, family) {
+  const target = normalizeFamily(family);
+  const styles = /* @__PURE__ */ new Set();
+  for (const rule of stripCssComments(css).matchAll(/@font-face\s*\{([^}]*)\}/gi)) {
+    const body = rule[1] ?? "";
+    const declared = body.match(/font-family\s*:\s*([^;]+)/i)?.[1];
+    if (declared && normalizeFamily(declared) === target) styles.add(faceStyle(body));
+  }
+  return [...styles].sort();
+}
 function fontsourceFamilies(css) {
   const out = /* @__PURE__ */ new Set();
   for (const imported of stripCssComments(css).matchAll(/@fontsource(-variable)?\/([\w-]+)/gi)) {
@@ -21566,21 +21609,32 @@ function unresolvedBrandFamilies(css) {
   for (const request of googleFontRequests(stripCssComments(css))) loaded.add(normalizeFamily(request.family));
   return declared.filter((family) => !loaded.has(family)).map((family) => asAuthored(css, family));
 }
-function stripFontFaceBlocks(source, family) {
+function stripFontFaceBlocks(source, family, styles) {
   const target = normalizeFamily(family);
   const ranges = [];
-  for (const rule of stripCssComments(source).matchAll(/@font-face\s*\{[^}]*\}/gi)) {
-    const declared = rule[0].match(/font-family\s*:\s*([^;]+)/i)?.[1];
-    if (declared && normalizeFamily(declared) === target && rule.index !== void 0) {
-      ranges.push([rule.index, rule.index + rule[0].length]);
-    }
+  for (const rule of stripCssComments(source).matchAll(/@font-face\s*\{([^}]*)\}/gi)) {
+    const body = rule[1] ?? "";
+    const declared = body.match(/font-family\s*:\s*([^;]+)/i)?.[1];
+    if (!declared || normalizeFamily(declared) !== target || rule.index === void 0) continue;
+    if (styles && !styles.has(faceStyle(body))) continue;
+    ranges.push([rule.index, rule.index + rule[0].length]);
   }
   let out = source;
   for (const [start, end] of ranges.reverse()) out = `${out.slice(0, start)}${out.slice(end)}`;
   return out.replace(/\n{3,}/g, "\n\n");
 }
+function faceStyle(body) {
+  return body.match(/font-style\s*:\s*([\w-]+)/i)?.[1]?.trim().toLowerCase() ?? "normal";
+}
+function declaredStyles(block) {
+  const styles = /* @__PURE__ */ new Set();
+  for (const rule of stripCssComments(block).matchAll(/@font-face\s*\{([^}]*)\}/gi))
+    styles.add(faceStyle(rule[1] ?? ""));
+  return styles;
+}
 function upsertFontFaceCss(css, family, block) {
-  const out = stripFontFaceBlocks(css, family);
+  const styles = declaredStyles(block);
+  const out = stripFontFaceBlocks(css, family, styles.size > 0 ? styles : void 0);
   const themeAt = stripCssComments(out).search(/@theme\b/);
   if (themeAt < 0) return `${out.trimEnd()}
 
@@ -21600,7 +21654,7 @@ ${tail}`;
 // src/commands/brand/fonts.ts
 var GLOBAL_CSS = path2.join("src", "styles", "global.css");
 var FONTS_DIR = path2.join("src", "brand", "fonts");
-var DEFAULT_SUBSETS = "latin";
+var DEFAULT_SUBSETS_LABEL = DEFAULT_SUBSETS.join(",");
 var BROWSER_UA = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/120.0 Safari/537.36";
 registerSchema({
   command: "brand.fonts.check",
@@ -21624,7 +21678,12 @@ registerSchema({
     },
     subsets: {
       type: "string",
-      description: `Comma-separated unicode subsets (default: ${DEFAULT_SUBSETS})`,
+      description: `Comma-separated unicode subsets (default: the subsets global.css already self-hosts, else ${DEFAULT_SUBSETS_LABEL})`,
+      required: false
+    },
+    italic: {
+      type: "boolean",
+      description: "Also self-host the family's italic faces. On automatically when global.css already loads one, so a re-fetch never strands it.",
       required: false
     }
   }
@@ -21669,15 +21728,34 @@ var WIRING_HINT = {
 };
 var PROVIDER_DEPS = { lookupGoogleCss, fetchJson };
 var PROVIDER_LABEL = { google: "Google Fonts", fontsource: "Fontsource" };
+function italicHints(family, wantedStyles, availableStyles, downloadedStyles, provider) {
+  const wanted = wantedStyles.includes("italic");
+  const available = availableStyles.includes("italic");
+  if (wanted && !downloadedStyles.includes("italic")) {
+    return [
+      `NO ITALIC: ${PROVIDER_LABEL[provider]} does not ship an italic for "${family}", so none was written. Drop italic from src/brand/BRAND.md, or the browser will slant the upright face instead.`
+    ];
+  }
+  if (!wanted && available) {
+    return [
+      `${PROVIDER_LABEL[provider]} also ships an italic for "${family}", which was NOT downloaded. If the brand uses italic anywhere, re-run with \`--italic\` \u2014 otherwise the browser slants the upright face, which is not the same shapes.`
+    ];
+  }
+  return [];
+}
 function fetchHints({
   family,
   downloadedWeights,
+  downloadedStyles,
   incomplete,
   wiring,
-  provider
+  provider,
+  wantedStyles,
+  availableStyles
 }) {
   return [
     WIRING_HINT[wiring](family),
+    ...italicHints(family, wantedStyles, availableStyles, downloadedStyles, provider),
     `Record the exact weights (${downloadedWeights.join(", ")}) in src/brand/BRAND.md \u2014 a weight listed there but not downloaded renders as a synthesized fallback.`,
     ...incomplete.length > 0 ? [
       // The remedy is provider-specific: only a Google family has an @import
@@ -21838,7 +21916,14 @@ var fontsFetchCommand = defineCommand93({
       type: "string",
       description: "Comma-separated weights (default: the weights global.css already requests or self-hosts, else 400)"
     },
-    subsets: { type: "string", description: `Comma-separated unicode subsets (default: ${DEFAULT_SUBSETS})` }
+    subsets: {
+      type: "string",
+      description: `Comma-separated unicode subsets (default: the subsets global.css already self-hosts, else ${DEFAULT_SUBSETS_LABEL})`
+    },
+    italic: {
+      type: "boolean",
+      description: "Also self-host the family's italic faces (default: on when global.css already loads one, off otherwise)"
+    }
   },
   async run({ args }) {
     const family = String(args.family).trim();
@@ -21850,10 +21935,9 @@ var fontsFetchCommand = defineCommand93({
     if (weights.length === 0) {
       fail("INVALID_WEIGHTS", `"${args.weights}" has no usable weight \u2014 pass whole hundreds, e.g. --weights 400,700.`);
     }
-    const wanted = new Set(
-      String(args.subsets ?? DEFAULT_SUBSETS).split(",").map((s) => s.trim()).filter(Boolean)
-    );
-    const resolved = await resolveBrandFaces(family, weights, [...wanted], PROVIDER_DEPS);
+    const wanted = new Set(resolveFetchSubsets(args.subsets, selfHostedSubsets(css, family)));
+    const styles = resolveFetchStyles(args.italic, selfHostedStyles(css, family));
+    const resolved = await resolveBrandFaces(family, weights, [...wanted], PROVIDER_DEPS, styles);
     if (!resolved.ok) return failResolution(family, weights, resolved);
     const faces = resolved.faces;
     const fontsDir = path2.resolve(process.cwd(), FONTS_DIR);
@@ -21877,6 +21961,7 @@ var fontsFetchCommand = defineCommand93({
     }
     const fontFace = renderFontFaceCss(downloaded);
     const downloadedWeights = [...new Set(downloaded.map((f) => f.weight))].sort((a, b) => a - b);
+    const downloadedStyles = [...new Set(downloaded.map((f) => f.style))].sort();
     const incomplete = weights.filter((w) => !downloadedWeights.includes(w));
     const wiring = await wireFontFaceIntoStylesheet(css, family, fontFace);
     writeJson({
@@ -21885,11 +21970,21 @@ var fontsFetchCommand = defineCommand93({
         family,
         provider: resolved.provider,
         weights: downloadedWeights,
+        styles: downloadedStyles,
         files: written,
         fontFace,
         stylesheet: wiring
       },
-      hints: fetchHints({ family, downloadedWeights, incomplete, wiring, provider: resolved.provider })
+      hints: fetchHints({
+        family,
+        downloadedWeights,
+        downloadedStyles,
+        incomplete,
+        wiring,
+        provider: resolved.provider,
+        wantedStyles: styles,
+        availableStyles: resolved.availableStyles
+      })
     });
   }
 });