@featherk/icons 0.15.7 → 0.16.0

package/README.md

@@ -68,11 +68,23 @@ variants, data URL usage, and related utilities) see [COMING-SOON.md](docs/COMIN
 
 ## Font Awesome Build Integration
 
-Font Awesome services are separate from `getCustomIcon()` and the owned icon registry. The package supplies a Vite plugin, Node generator, and CLI to prepare selected icons from the consumer's installed Font Awesome packages; it includes no Free or paid Font Awesome artwork and grants no license rights.
+Font Awesome services are separate from `getCustomIcon()` and the owned icon registry. They generate selected icons from the consumer's installed Font Awesome packages; the package includes no Free or paid Font Awesome artwork and grants no license rights.
 
-Start with [Choose Font Awesome Icons and Create a Manifest](https://github.com/NantHealth/featherk/blob/integration/packages/icons/docs/fontawesome/CreateFontAwesomeManifest.md) for how UX provides globally unique catalog keys and apps select only the keys they use. The metadata-only Free/Pro catalog is published at `@featherk/icons/fontawesome/catalog`; it contains no Font Awesome artwork.
+One keys-only manifest drives the whole setup:
 
-Dev then follows [Font Awesome setup](https://github.com/NantHealth/featherk/blob/integration/packages/icons/docs/fontawesome/FontAwesome.md) for the default Vite integration. For Dev-owned CLI generation, early type preparation, or non-Vite applications, see [CLI and non-Vite setup](https://github.com/NantHealth/featherk/blob/integration/packages/icons/docs/fontawesome/FontAwesomeCLI.md).
+```sh
+# 1. List UX-provided catalog keys in fontawesome.keys.json: { "free": [...], "pro": [...] }
+# 2. Install exactly those source packages: Free into the app, Pro into fontawesome-pro-sources/.
+#    (Add --free-only when there are no Pro keys.)
+npx featherk-fontawesome-setup --manifest fontawesome.keys.json
+```
+
+```ts
+// 3. Generate them in vite.config.ts; builds include Pro icons wherever fontawesome-pro-sources/ is installed.
+featherkFontAwesome({ manifest: "fontawesome.keys.json" });
+```
+
+Follow [FeatherK FontAwesome Developer Setup](https://github.com/NantHealth/featherk/blob/integration/packages/icons/docs/fontawesome/FontAwesomeDeveloperSetup.md) for the step-by-step local and CI setup. See [Choose Font Awesome Icons and Create a Manifest](https://github.com/NantHealth/featherk/blob/integration/packages/icons/docs/fontawesome/CreateFontAwesomeManifest.md) for keys, and [Font Awesome setup](https://github.com/NantHealth/featherk/blob/integration/packages/icons/docs/fontawesome/FontAwesome.md) for the Quick Start and advanced setups. The metadata-only Free/Pro catalog is published at `@featherk/icons/fontawesome/catalog`.
 
 For paid source packages, see [Pro licensing and setup](https://github.com/NantHealth/featherk/blob/integration/packages/icons/docs/fontawesome/LICENSING.md). Pro access is consumer-owned and optional; no paid artwork is distributed by this package.
 

package/bin/featherk-fontawesome-setup.mjs

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+import { runFontAwesomeSetup } from "../dist/fontawesome/setup.mjs";
+
+process.exitCode = await runFontAwesomeSetup(process.argv.slice(2));

package/dist/docs-manifest.d.ts

@@ -3,6 +3,7 @@ export type DocName =
   | "CreateFontAwesomeManifest"
   | "FontAwesome"
   | "FontAwesomeCLI"
+  | "FontAwesomeDeveloperSetup"
   | "LICENSING";
 
 export declare const packageName: "@featherk/icons";

package/dist/docs-manifest.js

@@ -1,20 +1,22 @@
 // Generated by scripts/generate-docs-manifest.mjs. Do not edit.
 export const packageName = "@featherk/icons";
 
-export const version = "0.15.7";
+export const version = "0.16.0";
 
 export const paths = {
   CreateFontAwesomeManifest: "fontawesome/CreateFontAwesomeManifest.md",
   FontAwesome: "fontawesome/FontAwesome.md",
   FontAwesomeCLI: "fontawesome/FontAwesomeCLI.md",
+  FontAwesomeDeveloperSetup: "fontawesome/FontAwesomeDeveloperSetup.md",
   LICENSING: "fontawesome/LICENSING.md",
 };
 
 export const docs = {
-  CreateFontAwesomeManifest: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.15.7/docs/fontawesome/CreateFontAwesomeManifest.md",
-  FontAwesome: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.15.7/docs/fontawesome/FontAwesome.md",
-  FontAwesomeCLI: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.15.7/docs/fontawesome/FontAwesomeCLI.md",
-  LICENSING: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.15.7/docs/fontawesome/LICENSING.md",
+  CreateFontAwesomeManifest: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.16.0/docs/fontawesome/CreateFontAwesomeManifest.md",
+  FontAwesome: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.16.0/docs/fontawesome/FontAwesome.md",
+  FontAwesomeCLI: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.16.0/docs/fontawesome/FontAwesomeCLI.md",
+  FontAwesomeDeveloperSetup: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.16.0/docs/fontawesome/FontAwesomeDeveloperSetup.md",
+  LICENSING: "https://cdn.jsdelivr.net/npm/@featherk/icons@0.16.0/docs/fontawesome/LICENSING.md",
 };
 
 export const docUrl = (name, host = "https://cdn.jsdelivr.net/npm") =>

package/dist/fontawesome/build.cjs

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const generate = require("./chunks/generate-BBurrhLv.cjs");
+const generate = require("./chunks/generate-B_FxftR7.cjs");
 const fontawesome_catalog = require("./catalog.cjs");
 exports.generateFaIcons = generate.generateFaIcons;
 exports.fontAwesomeCatalog = fontawesome_catalog.fontAwesomeCatalog;
-exports.getFontAwesomeInstallCommand = fontawesome_catalog.getFontAwesomeInstallCommand;
 exports.resolveFontAwesomeKeys = fontawesome_catalog.resolveFontAwesomeKeys;

package/dist/fontawesome/build.d.ts

@@ -1,5 +1,5 @@
 export { generateFaIcons } from "./generate";
-export { fontAwesomeCatalog, getFontAwesomeInstallCommand, resolveFontAwesomeKeys, } from "./catalog";
+export { fontAwesomeCatalog, resolveFontAwesomeKeys } from "./catalog";
 export type { GenerateFaIconsOptions, GeneratedFaIcons, FontAwesomeProvenance, } from "./generate";
 export type { FontAwesomeSelection, FontAwesomeOptions, FontAwesomeIcon, FontAwesomeCatalogEntry, FontAwesomeSourceSelection, FontAwesomeTier, } from "./types";
 export type { FontAwesomeCatalogKey, ResolveFontAwesomeKeysOptions, } from "./catalog";

package/dist/fontawesome/build.mjs

@@ -1,8 +1,7 @@
-import { g } from "./chunks/generate-Zq9q2YZD.mjs";
-import { fontAwesomeCatalog, getFontAwesomeInstallCommand, resolveFontAwesomeKeys } from "./catalog.mjs";
+import { g } from "./chunks/generate-DF9R65sV.mjs";
+import { fontAwesomeCatalog, resolveFontAwesomeKeys } from "./catalog.mjs";
 export {
   fontAwesomeCatalog,
   g as generateFaIcons,
-  getFontAwesomeInstallCommand,
   resolveFontAwesomeKeys
 };

package/dist/fontawesome/catalog.cjs

@@ -207,18 +207,5 @@ function resolveFontAwesomeKeys(keys, options = {}) {
     };
   });
 }
-function getFontAwesomeInstallCommand(keys, options = {}) {
-  resolveFontAwesomeKeys(keys, options);
-  const packages = /* @__PURE__ */ new Set();
-  for (const key of keys) {
-    const entry = catalogByKey.get(key);
-    packages.add(
-      entry.package === entry.registryPackage ? `${entry.registryPackage}@${entry.version}` : `${entry.package}@npm:${entry.registryPackage}@${entry.version}`
-    );
-  }
-  if (packages.size === 0) return void 0;
-  return `npm install --save-dev --save-exact ${[...packages].join(" ")}`;
-}
 exports.fontAwesomeCatalog = fontAwesomeCatalog;
-exports.getFontAwesomeInstallCommand = getFontAwesomeInstallCommand;
 exports.resolveFontAwesomeKeys = resolveFontAwesomeKeys;

package/dist/fontawesome/catalog.d.ts

@@ -295,12 +295,4 @@ export interface ResolveFontAwesomeKeysOptions {
  * @throws If a key is empty, duplicated, unknown, or Pro without opt-in.
  */
 export declare function resolveFontAwesomeKeys(keys: readonly string[], options?: ResolveFontAwesomeKeysOptions): FontAwesomeSourceSelection[];
-/**
- * Builds a deduplicated exact npm install command for the selected keys.
- * Npm aliases are emitted when a local dependency name differs from its
- * canonical registry package. The command is informational and is not run.
- *
- * @returns An install command, or `undefined` when no keys are selected.
- */
-export declare function getFontAwesomeInstallCommand(keys: readonly string[], options?: ResolveFontAwesomeKeysOptions): string | undefined;
 export {};

package/dist/fontawesome/catalog.mjs

@@ -205,20 +205,7 @@ function resolveFontAwesomeKeys(keys, options = {}) {
     };
   });
 }
-function getFontAwesomeInstallCommand(keys, options = {}) {
-  resolveFontAwesomeKeys(keys, options);
-  const packages = /* @__PURE__ */ new Set();
-  for (const key of keys) {
-    const entry = catalogByKey.get(key);
-    packages.add(
-      entry.package === entry.registryPackage ? `${entry.registryPackage}@${entry.version}` : `${entry.package}@npm:${entry.registryPackage}@${entry.version}`
-    );
-  }
-  if (packages.size === 0) return void 0;
-  return `npm install --save-dev --save-exact ${[...packages].join(" ")}`;
-}
 export {
   fontAwesomeCatalog,
-  getFontAwesomeInstallCommand,
   resolveFontAwesomeKeys
 };

package/dist/fontawesome/chunks/{generate-BBurrhLv.cjs → generate-B_FxftR7.cjs}

@@ -173,6 +173,16 @@ async function writeAtomically(file, content) {
     });
   }
 }
+function summarizeFaIcons(provenance) {
+  const packages = new Set(
+    provenance.map(
+      ({ package: name, sourcePackage, version }) => name === sourcePackage ? `${name}@${version}` : `${name} (${sourcePackage}@${version})`
+    )
+  );
+  const icons = `${provenance.length} Font Awesome icon(s)`;
+  return packages.size ? `${icons} from:
+${[...packages].map((name) => `  ${name}`).join("\n")}` : icons;
+}
 async function generateFaIcons(options) {
   const selections = fontawesome_catalog.resolveFontAwesomeKeys(options.keys, {
     allowPro: options.allowPro
@@ -230,7 +240,7 @@ async function generateFaIconsFromSelections(options) {
       );
     } catch (error) {
       throw new Error(
-        `Cannot resolve installed Font Awesome source "${selection.package}/${exportName}" for "${selection.key}". Install its pinned package and expose package.json and individual icon modules.`,
+        `Cannot resolve installed Font Awesome source "${selection.package}/${exportName}" for "${selection.key}". Install the manifest's pinned packages with "featherk-fontawesome-setup --manifest <manifest>" (or, after npm ci, "featherk-fontawesome-setup" for fontawesome-pro-sources/).`,
         { cause: error }
       );
     }
@@ -313,3 +323,4 @@ ${result.declarationCode.replaceAll("export declare ", "export ")}
   return result;
 }
 exports.generateFaIcons = generateFaIcons;
+exports.summarizeFaIcons = summarizeFaIcons;

package/dist/fontawesome/chunks/{generate-Zq9q2YZD.mjs → generate-DF9R65sV.mjs}

@@ -172,6 +172,16 @@ async function writeAtomically(file, content) {
     });
   }
 }
+function summarizeFaIcons(provenance) {
+  const packages = new Set(
+    provenance.map(
+      ({ package: name, sourcePackage, version }) => name === sourcePackage ? `${name}@${version}` : `${name} (${sourcePackage}@${version})`
+    )
+  );
+  const icons = `${provenance.length} Font Awesome icon(s)`;
+  return packages.size ? `${icons} from:
+${[...packages].map((name) => `  ${name}`).join("\n")}` : icons;
+}
 async function generateFaIcons(options) {
   const selections = resolveFontAwesomeKeys(options.keys, {
     allowPro: options.allowPro
@@ -229,7 +239,7 @@ async function generateFaIconsFromSelections(options) {
       );
     } catch (error) {
       throw new Error(
-        `Cannot resolve installed Font Awesome source "${selection.package}/${exportName}" for "${selection.key}". Install its pinned package and expose package.json and individual icon modules.`,
+        `Cannot resolve installed Font Awesome source "${selection.package}/${exportName}" for "${selection.key}". Install the manifest's pinned packages with "featherk-fontawesome-setup --manifest <manifest>" (or, after npm ci, "featherk-fontawesome-setup" for fontawesome-pro-sources/).`,
         { cause: error }
       );
     }
@@ -312,5 +322,6 @@ ${result.declarationCode.replaceAll("export declare ", "export ")}
   return result;
 }
 export {
-  generateFaIcons as g
+  generateFaIcons as g,
+  summarizeFaIcons as s
 };

package/dist/fontawesome/chunks/manifest-CSRIDvaR.mjs

@@ -0,0 +1,56 @@
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { fontAwesomeCatalog } from "../catalog.mjs";
+const isKeyList = (value) => Array.isArray(value) && value.every((key) => typeof key === "string");
+function parseFontAwesomeManifest(manifest) {
+  if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) {
+    throw new Error("Font Awesome manifest must be a JSON object");
+  }
+  const { free, pro } = manifest;
+  if (!isKeyList(free) || pro !== void 0 && !isKeyList(pro)) {
+    throw new Error(
+      'Font Awesome manifest must contain "free" and optional "pro" key arrays'
+    );
+  }
+  return { free, pro: pro ?? [] };
+}
+async function readFontAwesomeManifest(path) {
+  return parseFontAwesomeManifest(JSON.parse(await readFile(path, "utf8")));
+}
+const fontAwesomeProSourcesDir = "fontawesome-pro-sources";
+function isFontAwesomeIsolated(root) {
+  return existsSync(join(root, fontAwesomeProSourcesDir, "package.json"));
+}
+function isFontAwesomeProInstalled(root) {
+  return existsSync(join(root, fontAwesomeProSourcesDir, "node_modules"));
+}
+const tiers = new Map(
+  fontAwesomeCatalog.map((entry) => [entry.key, entry.tier])
+);
+function fontAwesomeManifestKeys(manifest) {
+  const misplaced = manifest.free.filter((key) => tiers.get(key) === "pro");
+  if (misplaced.length) {
+    throw new Error(
+      `Font Awesome manifest lists Pro keys under "free"; move them to "pro": ${misplaced.join(", ")}`
+    );
+  }
+  return [...manifest.free, ...manifest.pro];
+}
+function selectFontAwesomeManifestKeys(manifest, root) {
+  const keys = fontAwesomeManifestKeys(manifest);
+  if (!isFontAwesomeIsolated(root)) {
+    return { keys, allowPro: true };
+  }
+  if (!isFontAwesomeProInstalled(root)) {
+    return { keys: manifest.free, allowPro: false };
+  }
+  return { keys, allowPro: true, sourceRoot: fontAwesomeProSourcesDir };
+}
+export {
+  fontAwesomeManifestKeys as a,
+  fontAwesomeProSourcesDir as f,
+  isFontAwesomeIsolated as i,
+  readFontAwesomeManifest as r,
+  selectFontAwesomeManifestKeys as s
+};

package/dist/fontawesome/chunks/manifest-Yjw62jxG.cjs

@@ -0,0 +1,55 @@
+"use strict";
+const node_fs = require("node:fs");
+const promises = require("node:fs/promises");
+const node_path = require("node:path");
+const fontawesome_catalog = require("../catalog.cjs");
+const isKeyList = (value) => Array.isArray(value) && value.every((key) => typeof key === "string");
+function parseFontAwesomeManifest(manifest) {
+  if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) {
+    throw new Error("Font Awesome manifest must be a JSON object");
+  }
+  const { free, pro } = manifest;
+  if (!isKeyList(free) || pro !== void 0 && !isKeyList(pro)) {
+    throw new Error(
+      'Font Awesome manifest must contain "free" and optional "pro" key arrays'
+    );
+  }
+  return { free, pro: pro ?? [] };
+}
+async function readFontAwesomeManifest(path) {
+  return parseFontAwesomeManifest(JSON.parse(await promises.readFile(path, "utf8")));
+}
+const fontAwesomeProSourcesDir = "fontawesome-pro-sources";
+function isFontAwesomeIsolated(root) {
+  return node_fs.existsSync(node_path.join(root, fontAwesomeProSourcesDir, "package.json"));
+}
+function isFontAwesomeProInstalled(root) {
+  return node_fs.existsSync(node_path.join(root, fontAwesomeProSourcesDir, "node_modules"));
+}
+const tiers = new Map(
+  fontawesome_catalog.fontAwesomeCatalog.map((entry) => [entry.key, entry.tier])
+);
+function fontAwesomeManifestKeys(manifest) {
+  const misplaced = manifest.free.filter((key) => tiers.get(key) === "pro");
+  if (misplaced.length) {
+    throw new Error(
+      `Font Awesome manifest lists Pro keys under "free"; move them to "pro": ${misplaced.join(", ")}`
+    );
+  }
+  return [...manifest.free, ...manifest.pro];
+}
+function selectFontAwesomeManifestKeys(manifest, root) {
+  const keys = fontAwesomeManifestKeys(manifest);
+  if (!isFontAwesomeIsolated(root)) {
+    return { keys, allowPro: true };
+  }
+  if (!isFontAwesomeProInstalled(root)) {
+    return { keys: manifest.free, allowPro: false };
+  }
+  return { keys, allowPro: true, sourceRoot: fontAwesomeProSourcesDir };
+}
+exports.fontAwesomeManifestKeys = fontAwesomeManifestKeys;
+exports.fontAwesomeProSourcesDir = fontAwesomeProSourcesDir;
+exports.isFontAwesomeIsolated = isFontAwesomeIsolated;
+exports.readFontAwesomeManifest = readFontAwesomeManifest;
+exports.selectFontAwesomeManifestKeys = selectFontAwesomeManifestKeys;

package/dist/fontawesome/cli.cjs

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const promises = require("node:fs/promises");
 const node_path = require("node:path");
 const node_util = require("node:util");
-const fontawesome_catalog = require("./catalog.cjs");
-const generate = require("./chunks/generate-BBurrhLv.cjs");
-const usage = `Usage: featherk-fontawesome --manifest <icons.json> [--root <project>] [--source-root <installed-sources>] [--allow-pro] [--out <icons.mjs>] [--virtual-types <types.d.ts>]
+const generate = require("./chunks/generate-B_FxftR7.cjs");
+const manifest = require("./chunks/manifest-Yjw62jxG.cjs");
+const usage = `Usage: featherk-fontawesome --manifest <icons.json> [--root <project>] [--out <icons.mjs>] [--virtual-types <types.d.ts>]
 
-The JSON manifest contains { "free": [keys], "pro": [keys] }.
-Use --allow-pro to include Pro keys.
+The JSON manifest contains { "free": [keys], "pro": [keys] }, the same file
+used by featherk-fontawesome-setup and the Vite plugin.
+When the project has a ${manifest.fontAwesomeProSourcesDir}/ source project (the
+default setup), Pro keys are generated from it only when it is installed.
+Otherwise all keys are generated from the project's own installed sources.
 Provide --out, --virtual-types, or both. Paths are relative to the project root.
 This command does not download assets or authenticate; install licensed packages first.
 Generated assets belong to the consuming project, never the @featherk/icons package.`;
@@ -16,13 +18,19 @@ async function runFontAwesomeCli(args, io = {}) {
   const stdout = io.stdout ?? console.log;
   const stderr = io.stderr ?? console.error;
   try {
+    const removed = ["--allow-pro", "--source-root", "--pro-mode"].find(
+      (flag) => args.some((arg) => arg === flag || arg.startsWith(`${flag}=`))
+    );
+    if (removed) {
+      throw new Error(
+        `${removed} was removed in 0.16.0. Pro keys follow the manifest; Pro sources always live in ${manifest.fontAwesomeProSourcesDir}/ and are used wherever it is installed.`
+      );
+    }
     const { values } = node_util.parseArgs({
       args: [...args],
       options: {
         manifest: { type: "string" },
         root: { type: "string" },
-        "source-root": { type: "string" },
-        "allow-pro": { type: "boolean" },
         out: { type: "string" },
         "virtual-types": { type: "string" },
         help: { type: "boolean", short: "h" }
@@ -40,44 +48,21 @@ async function runFontAwesomeCli(args, io = {}) {
       );
     }
     const root = node_path.resolve(io.cwd ?? process.cwd(), values.root ?? ".");
-    const manifest = JSON.parse(
-      await promises.readFile(node_path.resolve(root, values.manifest), "utf8")
+    const manifest$1 = await manifest.readFontAwesomeManifest(
+      node_path.resolve(root, values.manifest)
     );
-    if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) {
-      throw new Error("Font Awesome manifest must be a JSON object");
-    }
-    const record = manifest;
-    const common = {
+    const selection = manifest.selectFontAwesomeManifestKeys(manifest$1, root);
+    const result = await generate.generateFaIcons({
       root,
-      sourceRoot: values["source-root"],
-      allowPro: values["allow-pro"],
+      keys: selection.keys,
+      sourceRoot: selection.sourceRoot,
+      allowPro: selection.allowPro,
       outFile: values.out,
       virtualTypesFile: values["virtual-types"]
-    };
-    const isKeyList = (value) => Array.isArray(value) && value.every((key) => typeof key === "string");
-    const freeKeys = record.free;
-    const proKeys = record.pro;
-    if (!isKeyList(freeKeys) || proKeys !== void 0 && !isKeyList(proKeys)) {
-      throw new Error(
-        'Font Awesome manifest must contain "free" and optional "pro" key arrays'
-      );
-    }
-    const keys = [
-      ...freeKeys,
-      ...values["allow-pro"] ? proKeys ?? [] : []
-    ];
-    const installCommand = fontawesome_catalog.getFontAwesomeInstallCommand(keys, {
-      allowPro: values["allow-pro"]
     });
-    if (installCommand) {
-      stdout(
-        `Install selected Font Awesome source packages with:
-${installCommand}`
-      );
-    }
-    const result = await generate.generateFaIcons({ ...common, keys });
     stdout(
-      `Prepared ${result.provenance.length} selected Font Awesome icon(s). Preserve generated license notices in application distribution.`
+      values.out ? `Prepared ${generate.summarizeFaIcons(result.provenance)}
+Preserve generated license notices in application distribution.` : `Prepared declarations for ${result.provenance.length} Font Awesome icon(s).`
     );
     return 0;
   } catch (error) {

package/dist/fontawesome/cli.mjs

@@ -1,12 +1,14 @@
-import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import { parseArgs } from "node:util";
-import { getFontAwesomeInstallCommand } from "./catalog.mjs";
-import { g as generateFaIcons } from "./chunks/generate-Zq9q2YZD.mjs";
-const usage = `Usage: featherk-fontawesome --manifest <icons.json> [--root <project>] [--source-root <installed-sources>] [--allow-pro] [--out <icons.mjs>] [--virtual-types <types.d.ts>]
+import { g as generateFaIcons, s as summarizeFaIcons } from "./chunks/generate-DF9R65sV.mjs";
+import { f as fontAwesomeProSourcesDir, r as readFontAwesomeManifest, s as selectFontAwesomeManifestKeys } from "./chunks/manifest-CSRIDvaR.mjs";
+const usage = `Usage: featherk-fontawesome --manifest <icons.json> [--root <project>] [--out <icons.mjs>] [--virtual-types <types.d.ts>]
 
-The JSON manifest contains { "free": [keys], "pro": [keys] }.
-Use --allow-pro to include Pro keys.
+The JSON manifest contains { "free": [keys], "pro": [keys] }, the same file
+used by featherk-fontawesome-setup and the Vite plugin.
+When the project has a ${fontAwesomeProSourcesDir}/ source project (the
+default setup), Pro keys are generated from it only when it is installed.
+Otherwise all keys are generated from the project's own installed sources.
 Provide --out, --virtual-types, or both. Paths are relative to the project root.
 This command does not download assets or authenticate; install licensed packages first.
 Generated assets belong to the consuming project, never the @featherk/icons package.`;
@@ -14,13 +16,19 @@ async function runFontAwesomeCli(args, io = {}) {
   const stdout = io.stdout ?? console.log;
   const stderr = io.stderr ?? console.error;
   try {
+    const removed = ["--allow-pro", "--source-root", "--pro-mode"].find(
+      (flag) => args.some((arg) => arg === flag || arg.startsWith(`${flag}=`))
+    );
+    if (removed) {
+      throw new Error(
+        `${removed} was removed in 0.16.0. Pro keys follow the manifest; Pro sources always live in ${fontAwesomeProSourcesDir}/ and are used wherever it is installed.`
+      );
+    }
     const { values } = parseArgs({
       args: [...args],
       options: {
         manifest: { type: "string" },
         root: { type: "string" },
-        "source-root": { type: "string" },
-        "allow-pro": { type: "boolean" },
         out: { type: "string" },
         "virtual-types": { type: "string" },
         help: { type: "boolean", short: "h" }
@@ -38,44 +46,21 @@ async function runFontAwesomeCli(args, io = {}) {
       );
     }
     const root = resolve(io.cwd ?? process.cwd(), values.root ?? ".");
-    const manifest = JSON.parse(
-      await readFile(resolve(root, values.manifest), "utf8")
+    const manifest = await readFontAwesomeManifest(
+      resolve(root, values.manifest)
     );
-    if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) {
-      throw new Error("Font Awesome manifest must be a JSON object");
-    }
-    const record = manifest;
-    const common = {
+    const selection = selectFontAwesomeManifestKeys(manifest, root);
+    const result = await generateFaIcons({
       root,
-      sourceRoot: values["source-root"],
-      allowPro: values["allow-pro"],
+      keys: selection.keys,
+      sourceRoot: selection.sourceRoot,
+      allowPro: selection.allowPro,
       outFile: values.out,
       virtualTypesFile: values["virtual-types"]
-    };
-    const isKeyList = (value) => Array.isArray(value) && value.every((key) => typeof key === "string");
-    const freeKeys = record.free;
-    const proKeys = record.pro;
-    if (!isKeyList(freeKeys) || proKeys !== void 0 && !isKeyList(proKeys)) {
-      throw new Error(
-        'Font Awesome manifest must contain "free" and optional "pro" key arrays'
-      );
-    }
-    const keys = [
-      ...freeKeys,
-      ...values["allow-pro"] ? proKeys ?? [] : []
-    ];
-    const installCommand = getFontAwesomeInstallCommand(keys, {
-      allowPro: values["allow-pro"]
     });
-    if (installCommand) {
-      stdout(
-        `Install selected Font Awesome source packages with:
-${installCommand}`
-      );
-    }
-    const result = await generateFaIcons({ ...common, keys });
     stdout(
-      `Prepared ${result.provenance.length} selected Font Awesome icon(s). Preserve generated license notices in application distribution.`
+      values.out ? `Prepared ${summarizeFaIcons(result.provenance)}
+Preserve generated license notices in application distribution.` : `Prepared declarations for ${result.provenance.length} Font Awesome icon(s).`
     );
     return 0;
   } catch (error) {

package/dist/fontawesome/generate.d.ts

@@ -25,6 +25,13 @@ export interface GeneratedFaIcons {
     provenance: readonly FontAwesomeProvenance[];
     dependencies: readonly string[];
 }
+/**
+ * Summarizes generated icons and the source packages they came from, for an
+ * informational message after generation. Aliased packages show their
+ * canonical registry package.
+ * @internal
+ */
+export declare function summarizeFaIcons(provenance: readonly FontAwesomeProvenance[]): string;
 /**
  * Generates descriptors for the requested catalog keys.
  *

package/dist/fontawesome/manifest.d.ts

@@ -0,0 +1,50 @@
+/** Parsed manifest key groups; a missing `pro` group is empty. */
+export interface FontAwesomeKeysManifest {
+    free: string[];
+    pro: string[];
+}
+/**
+ * Validates parsed manifest JSON.
+ *
+ * @throws If the value is not an object with a `free` key array and an
+ * optional `pro` key array.
+ */
+export declare function parseFontAwesomeManifest(manifest: unknown): FontAwesomeKeysManifest;
+/** Reads and validates a manifest file at an absolute or cwd-relative path. */
+export declare function readFontAwesomeManifest(path: string): Promise<FontAwesomeKeysManifest>;
+/**
+ * The isolated Pro source project every application uses, relative to the
+ * application root. Its presence selects the isolated layout.
+ */
+export declare const fontAwesomeProSourcesDir = "fontawesome-pro-sources";
+/**
+ * Reports whether the application at `root` uses the isolated layout, that
+ * is, whether `fontawesome-pro-sources/package.json` exists.
+ */
+export declare function isFontAwesomeIsolated(root: string): boolean;
+/**
+ * Reports whether the isolated source project at `root` is installed, that
+ * is, whether `fontawesome-pro-sources/node_modules` exists. Installing it
+ * with the token is what enables Pro icons in a build.
+ */
+export declare function isFontAwesomeProInstalled(root: string): boolean;
+/** Keys, Pro opt-in, and source root for one generation run. */
+export interface FontAwesomeManifestSelection {
+    keys: string[];
+    allowPro: boolean;
+    sourceRoot?: string;
+}
+/** Returns the manifest's keys after rejecting Pro-tier keys under `free`. */
+export declare function fontAwesomeManifestKeys(manifest: FontAwesomeKeysManifest): string[];
+/**
+ * Selects the manifest keys for one build of the application at `root`.
+ *
+ * In the isolated layout, the `pro` keys are selected, and resolved from
+ * `fontawesome-pro-sources`, only when that project is installed; otherwise
+ * the build is Free-only and never reads it. Without the isolated project,
+ * the application installed its own sources, so every key is selected; a
+ * Free-only manifest has no `pro` keys.
+ *
+ * @throws If a Pro-tier key is listed under `free`.
+ */
+export declare function selectFontAwesomeManifestKeys(manifest: FontAwesomeKeysManifest, root: string): FontAwesomeManifestSelection;