astrotype 0.1.3 → 0.1.5

package/cli/commands/add-font.mjs

@@ -33,15 +33,16 @@ export async function addFontCommand(fontName, options = {}) {
   const cssText = `${toCssRules(font)}`;
   const cssPath = writeAstrotypeCss(targetDir, font.name, cssText);
   const fontsSetup = ensureAstroFontsApiSetup(targetDir, [font]);
-  console.log(`Installed font "${font.name}" into ${path.relative(targetDir, cssPath)}.`);
+  console.log(`Installed font "${font.name}" -> ${path.relative(targetDir, cssPath)}`);
   if (fontsSetup.configured) {
-    console.log("Configured Astro Fonts API entries for this font.");
+    console.log("Wired Astro Fonts API entries for this font.");
     if (fontsSetup.manualMergeRequired) {
       console.log(
-        `Detected an existing fonts config in ${path.relative(targetDir, fontsSetup.configPath)}; merge astrotypeFonts manually there.`
+        `Heads up: existing fonts config found in ${path.relative(targetDir, fontsSetup.configPath)}. Merge astrotypeFonts there.`
       );
     }
   } else {
     console.log(`Skipped Astro Fonts API setup: ${fontsSetup.reason}`);
   }
+  console.log(`Next step: map your app classes/tokens to ${font.font.variable || `--font-${font.name}`}.`);
 }

package/cli/commands/add.mjs

@@ -1,6 +1,7 @@
 import path from "node:path";
-import { getFontByName, getPairingByName } from "../lib/registry.mjs";
+import { getAllPairings, getFontByName, getPairingByName } from "../lib/registry.mjs";
 import {
+  activatePairingCssImport,
   ensureAstroFontsApiSetup,
   isAstroProject,
   writeAstrotypeCss,
@@ -17,6 +18,20 @@ function toCssRules(ruleMap) {
     .join("\n\n");
 }
 
+function toUtilityClassRules() {
+  return `.font-heading {
+  font-family: var(--font-heading);
+}
+
+.font-body {
+  font-family: var(--font-body);
+}
+
+.font-mono {
+  font-family: var(--font-mono);
+}`;
+}
+
 export async function addPairingCommand(pairingName, options = {}) {
   const targetDir = path.resolve(options.cwd || process.cwd());
   if (!isAstroProject(targetDir)) {
@@ -41,21 +56,28 @@ export async function addPairingCommand(pairingName, options = {}) {
   }
 
   const cssText = `${toCssRules(pairing.css)}
+
+${toUtilityClassRules()}
 `;
   const pairingCssPath = writeAstrotypeCss(targetDir, pairing.name, cssText);
+  const pairingSlugs = getAllPairings().map((item) => item.name).filter(Boolean);
+  const importUpdate = activatePairingCssImport(targetDir, pairing.name, pairingSlugs);
   const fontsSetup = ensureAstroFontsApiSetup(targetDir, fonts);
 
-  console.log(`Installed pairing "${pairing.name}" into ${path.relative(targetDir, pairingCssPath)}.`);
+  console.log(`Installed pairing "${pairing.name}" -> ${path.relative(targetDir, pairingCssPath)}`);
+  if (importUpdate.removed.length > 0) {
+    console.log(`Switched active pairing import (removed: ${importUpdate.removed.join(", ")}).`);
+  }
   if (fontsSetup.configured) {
-    console.log("Configured Astro Fonts API entries for this pairing.");
+    console.log("Wired Astro Fonts API entries for this pairing.");
     if (fontsSetup.manualMergeRequired) {
       console.log(
-        `Detected an existing fonts config in ${path.relative(targetDir, fontsSetup.configPath)}; merge astrotypeFonts manually there.`
+        `Heads up: existing fonts config found in ${path.relative(targetDir, fontsSetup.configPath)}. Merge astrotypeFonts there.`
       );
     }
   } else {
     console.log(`Skipped Astro Fonts API setup: ${fontsSetup.reason}`);
   }
-  console.log("No Tailwind color utilities are required; styles are CSS-token driven.");
+  console.log("Next step: map your app classes/tokens to --font-heading, --font-body, and --font-mono.");
 }
 

package/cli/lib/add-utils.mjs

@@ -150,18 +150,29 @@ ${lines}
   configText = ensureAstroConfigHasAstrotypeImport(configText);
   const result = ensureAstroConfigHasFontsProperty(configText);
   fs.writeFileSync(astroConfigPath, result.text);
+  const isAlreadyWired = /\bfonts\s*:\s*astrotypeFonts\b/.test(result.text);
 
   return {
     configured: true,
     configPath: astroConfigPath,
-    manualMergeRequired: !result.injected && /\bfonts\s*:/.test(configText),
+    manualMergeRequired: !result.injected && !isAlreadyWired && /\bfonts\s*:/.test(configText),
   };
 }
 
 export function ensureImport(globalCssPath, importLine) {
   const css = fs.existsSync(globalCssPath) ? fs.readFileSync(globalCssPath, "utf-8") : "";
   if (css.includes(importLine)) return;
-  fs.writeFileSync(globalCssPath, `${importLine}\n${css}`);
+  const lines = css.split(/\r?\n/);
+  let lastImportIndex = -1;
+  for (let index = 0; index < lines.length; index += 1) {
+    if (/^\s*@import\s+/.test(lines[index])) lastImportIndex = index;
+  }
+  if (lastImportIndex === -1) {
+    fs.writeFileSync(globalCssPath, `${importLine}\n${css}`);
+    return;
+  }
+  lines.splice(lastImportIndex + 1, 0, importLine);
+  fs.writeFileSync(globalCssPath, `${lines.join("\n")}\n`);
 }
 
 export function writeAstrotypeCss(targetDir, slug, cssText) {
@@ -175,3 +186,53 @@ export function writeAstrotypeCss(targetDir, slug, cssText) {
   ensureImport(globalCssPath, `@import "./astrotypes/${slug}.css";`);
   return cssPath;
 }
+
+export function activatePairingCssImport(targetDir, activePairingSlug, pairingSlugs) {
+  const globalCssPath = path.join(targetDir, "src", "styles", "global.css");
+  ensureDir(path.dirname(globalCssPath));
+  const importLine = `@import "./astrotypes/${activePairingSlug}.css";`;
+  const knownPairings = new Set(pairingSlugs || []);
+
+  if (!fs.existsSync(globalCssPath)) {
+    fs.writeFileSync(globalCssPath, `${importLine}\n`);
+    return { removed: [], added: true };
+  }
+
+  const css = fs.readFileSync(globalCssPath, "utf-8");
+  const lines = css.split(/\r?\n/);
+  const keptLines = [];
+  const removed = [];
+  let hasActive = false;
+
+  for (const line of lines) {
+    const match = line.match(
+      /^\s*@import\s+["']\.\/astrotypes\/([a-z0-9-]+)\.css["'];\s*$/
+    );
+    if (!match) {
+      keptLines.push(line);
+      continue;
+    }
+    const slug = match[1];
+    if (slug === activePairingSlug) {
+      hasActive = true;
+      keptLines.push(importLine);
+      continue;
+    }
+    if (knownPairings.has(slug)) {
+      removed.push(slug);
+      continue;
+    }
+    keptLines.push(line);
+  }
+
+  if (!hasActive) {
+    let lastImportIndex = -1;
+    for (let index = 0; index < keptLines.length; index += 1) {
+      if (/^\s*@import\s+/.test(keptLines[index])) lastImportIndex = index;
+    }
+    if (lastImportIndex === -1) keptLines.unshift(importLine);
+    else keptLines.splice(lastImportIndex + 1, 0, importLine);
+  }
+  fs.writeFileSync(globalCssPath, `${keptLines.join("\n")}\n`);
+  return { removed, added: !hasActive };
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "astrotype",
   "description": "Astro-first font registry and CLI for installing pairings or single fonts.",
   "type": "module",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "private": false,
   "keywords": [
     "astro",