@foundrykit/cli 2.0.8 → 2.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -18,6 +18,7 @@ import { promisify } from "util";
18
18
  // src/lib/constants.ts
19
19
  var CLI_VERSION = "1.0.16";
20
20
  var DEFAULT_REGISTRY_URL = "https://foundry.umiflow.com";
21
+ var NPM_REGISTRY_URL = "https://registry.npmjs.org";
21
22
  var CACHE_TTL = 24 * 60 * 60 * 1e3;
22
23
  var CACHE_DIR = ".foundrykit";
23
24
  var REGISTRY_CATEGORY_ORDER = [
@@ -753,6 +754,7 @@ var DEFAULT_CONFIG = {
753
754
  var RegistryService = class {
754
755
  config;
755
756
  cacheFile;
757
+ foundryKitPackagesPromise = null;
756
758
  constructor(config) {
757
759
  this.config = { ...DEFAULT_CONFIG, ...config };
758
760
  this.cacheFile = path2.join(this.config.cacheDir, "registry.json");
@@ -776,7 +778,7 @@ var RegistryService = class {
776
778
  const components = await response.json();
777
779
  await this.updateCache(components);
778
780
  return this.filterComponents(
779
- this.withFoundryKitPackages(components),
781
+ await this.withFoundryKitPackages(components),
780
782
  category,
781
783
  search
782
784
  );
@@ -785,11 +787,16 @@ var RegistryService = class {
785
787
  if (cache && this.isCacheValid(cache)) {
786
788
  console.log(chalk2.yellow("Using cached registry data"));
787
789
  return this.filterComponents(
788
- this.withFoundryKitPackages(cache.components),
790
+ await this.withFoundryKitPackages(cache.components),
789
791
  category,
790
792
  search
791
793
  );
792
794
  }
795
+ const npmPackages = await this.fetchFoundryKitPackages();
796
+ if (npmPackages.length > 0) {
797
+ console.log(chalk2.yellow("Using npm package data"));
798
+ return this.filterComponents(npmPackages, category, search);
799
+ }
793
800
  throw new Error(
794
801
  `Failed to connect to registry: ${error instanceof Error ? error.message : "Unknown error"}
795
802
  Registry URL: ${this.config.registryUrl}
@@ -805,7 +812,7 @@ Try again later or check your internet connection.`
805
812
  return this.createSpecialDependency(id);
806
813
  }
807
814
  const foundryKitPackage = this.resolveFoundryKitPackageName(id);
808
- const isExplicitFoundryKitPackage = id.startsWith("@foundrykit/") || id.endsWith("-plugin") || FOUNDRYKIT_PACKAGE_ALIASES.includes(
815
+ const isKnownFoundryKitPackage = id.startsWith("@foundrykit/") || id.endsWith("-plugin") || FOUNDRYKIT_PACKAGE_ALIASES.includes(
809
816
  id
810
817
  );
811
818
  const cache = await this.loadCache();
@@ -821,8 +828,12 @@ Try again later or check your internet connection.`
821
828
  const response = await fetch(url);
822
829
  if (!response.ok) {
823
830
  if (response.status === 404) {
824
- if (foundryKitPackage && isExplicitFoundryKitPackage) {
825
- return this.createFoundryKitPackageDependency(foundryKitPackage);
831
+ if (foundryKitPackage) {
832
+ const npmPackage = await this.createFoundryKitPackageDependency(
833
+ foundryKitPackage,
834
+ !isKnownFoundryKitPackage
835
+ );
836
+ if (npmPackage) return npmPackage;
826
837
  }
827
838
  throw new Error(`Component "${id}" not found in registry`);
828
839
  }
@@ -834,8 +845,12 @@ Try again later or check your internet connection.`
834
845
  await this.cacheComponent(component);
835
846
  return component;
836
847
  } catch (error) {
837
- if (foundryKitPackage && isExplicitFoundryKitPackage) {
838
- return this.createFoundryKitPackageDependency(foundryKitPackage);
848
+ if (foundryKitPackage) {
849
+ const npmPackage = await this.createFoundryKitPackageDependency(
850
+ foundryKitPackage,
851
+ !isKnownFoundryKitPackage
852
+ );
853
+ if (npmPackage) return npmPackage;
839
854
  }
840
855
  if (cachedComponent) {
841
856
  console.log(chalk2.yellow(`Using cached data for component: ${id}`));
@@ -892,13 +907,16 @@ export function cn(...inputs: ClassValue[]) {
892
907
  };
893
908
  }
894
909
  if (id === "hooks") {
895
- return this.createFoundryKitPackageDependency("@foundrykit/hooks");
910
+ const component = await this.createFoundryKitPackageDependency("@foundrykit/hooks");
911
+ if (component) return component;
896
912
  }
897
913
  if (id === "types") {
898
- return this.createFoundryKitPackageDependency("@foundrykit/types");
914
+ const component = await this.createFoundryKitPackageDependency("@foundrykit/types");
915
+ if (component) return component;
899
916
  }
900
917
  if (id === "maps") {
901
- return this.createFoundryKitPackageDependency("@foundrykit/maps");
918
+ const component = await this.createFoundryKitPackageDependency("@foundrykit/maps");
919
+ if (component) return component;
902
920
  }
903
921
  throw new Error(`Unknown special dependency: ${id}`);
904
922
  }
@@ -926,34 +944,31 @@ export function cn(...inputs: ClassValue[]) {
926
944
  if (/^@foundrykit\/[a-z0-9][a-z0-9-]*$/i.test(id)) {
927
945
  return id;
928
946
  }
929
- if (FOUNDRYKIT_PACKAGE_ALIASES.includes(
930
- id
931
- ) || /^[a-z0-9][a-z0-9-]*-plugin$/i.test(id)) {
947
+ if (/^[a-z0-9][a-z0-9-]*$/i.test(id)) {
932
948
  return `@foundrykit/${id}`;
933
949
  }
934
950
  return null;
935
951
  }
936
- createFoundryKitPackageDependency(packageName) {
952
+ async createFoundryKitPackageDependency(packageName, requirePublishedPackage = false) {
937
953
  const id = packageName.replace("@foundrykit/", "");
938
954
  const category = id === "maps" ? "maps" : id === "hooks" ? "hooks" : "packages";
955
+ const metadata = await this.fetchPackageMetadata(packageName);
956
+ if (requirePublishedPackage && !metadata) {
957
+ return null;
958
+ }
939
959
  return {
940
960
  id,
941
961
  name: this.toDisplayName(id),
942
- description: `${packageName} npm package`,
962
+ version: metadata?.version,
963
+ description: metadata?.description ?? `${packageName} npm package`,
943
964
  category,
944
965
  files: [],
945
966
  registryDependencies: [],
946
967
  packageDependencies: [packageName]
947
968
  };
948
969
  }
949
- withFoundryKitPackages(components) {
950
- const packageEntries = FOUNDRYKIT_PACKAGE_ALIASES.map((packageId) => ({
951
- id: packageId,
952
- name: this.toDisplayName(packageId),
953
- category: packageId === "maps" ? "maps" : packageId === "hooks" ? "hooks" : "packages",
954
- description: `@foundrykit/${packageId} npm package`,
955
- packageDependencies: [`@foundrykit/${packageId}`]
956
- }));
970
+ async withFoundryKitPackages(components) {
971
+ const packageEntries = await this.fetchFoundryKitPackages();
957
972
  const seenIds = new Set(components.map((component) => component.id));
958
973
  return [
959
974
  ...components,
@@ -963,6 +978,66 @@ export function cn(...inputs: ClassValue[]) {
963
978
  toDisplayName(id) {
964
979
  return id.split("-").map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
965
980
  }
981
+ async fetchFoundryKitPackages() {
982
+ if (!this.foundryKitPackagesPromise) {
983
+ this.foundryKitPackagesPromise = this.fetchFoundryKitPackagesFromNpm();
984
+ }
985
+ try {
986
+ return await this.foundryKitPackagesPromise;
987
+ } catch {
988
+ return this.getFallbackFoundryKitPackages();
989
+ }
990
+ }
991
+ async fetchFoundryKitPackagesFromNpm() {
992
+ const url = `${NPM_REGISTRY_URL}/-/v1/search?text=scope:foundrykit&size=250`;
993
+ console.log(chalk2.gray(`Fetching FoundryKit packages from npm: ${url}`));
994
+ const response = await fetch(url);
995
+ if (!response.ok) {
996
+ throw new Error(
997
+ `npm returned ${response.status}: ${response.statusText}`
998
+ );
999
+ }
1000
+ const data = await response.json();
1001
+ return (data.objects ?? []).map((item) => item.package).filter((pkg) => {
1002
+ return Boolean(pkg?.name?.startsWith("@foundrykit/"));
1003
+ }).map((pkg) => this.toPackageComponentMeta(pkg.name, {
1004
+ version: pkg.version,
1005
+ description: pkg.description,
1006
+ keywords: pkg.keywords
1007
+ })).sort((a, b) => a.id.localeCompare(b.id));
1008
+ }
1009
+ async fetchPackageMetadata(packageName) {
1010
+ try {
1011
+ const encodedName = packageName.replace("/", "%2F");
1012
+ const response = await fetch(`${NPM_REGISTRY_URL}/${encodedName}`);
1013
+ if (!response.ok) return null;
1014
+ const data = await response.json();
1015
+ return {
1016
+ version: data["dist-tags"]?.latest ?? Object.keys(data.versions ?? {}).sort(compareVersions).at(-1),
1017
+ description: data.description,
1018
+ keywords: data.keywords
1019
+ };
1020
+ } catch {
1021
+ return null;
1022
+ }
1023
+ }
1024
+ getFallbackFoundryKitPackages() {
1025
+ return FOUNDRYKIT_PACKAGE_ALIASES.map(
1026
+ (packageId) => this.toPackageComponentMeta(`@foundrykit/${packageId}`)
1027
+ );
1028
+ }
1029
+ toPackageComponentMeta(packageName, metadata = {}) {
1030
+ const id = packageName.replace("@foundrykit/", "");
1031
+ return {
1032
+ id,
1033
+ name: this.toDisplayName(id),
1034
+ version: metadata.version,
1035
+ category: id === "maps" ? "maps" : id === "hooks" ? "hooks" : "packages",
1036
+ description: metadata.description ?? `${packageName} npm package`,
1037
+ tags: metadata.keywords,
1038
+ packageDependencies: [packageName]
1039
+ };
1040
+ }
966
1041
  /**
967
1042
  * Update the local cache with new component list
968
1043
  */
@@ -1084,6 +1159,19 @@ function getRegistry(config) {
1084
1159
  }
1085
1160
  return registryInstance;
1086
1161
  }
1162
+ function compareVersions(a, b) {
1163
+ const aParts = normalizeVersion(a).split(".").map(Number);
1164
+ const bParts = normalizeVersion(b).split(".").map(Number);
1165
+ const length = Math.max(aParts.length, bParts.length);
1166
+ for (let index = 0; index < length; index++) {
1167
+ const diff = (aParts[index] ?? 0) - (bParts[index] ?? 0);
1168
+ if (diff !== 0) return diff;
1169
+ }
1170
+ return 0;
1171
+ }
1172
+ function normalizeVersion(version) {
1173
+ return version.replace(/^[^\d]*/, "").split("-")[0]?.replace(/[^\d.]/g, "") || "0";
1174
+ }
1087
1175
 
1088
1176
  // src/commands/list.ts
1089
1177
  function listCommand() {
@@ -1344,7 +1432,7 @@ async function addSingleComponent(id, options) {
1344
1432
  await trackInstalledComponent(componentData);
1345
1433
  console.log(chalk4.green(`\u2705 ${componentData.name} added successfully!`));
1346
1434
  showUsageExample(componentData);
1347
- await handlePackageDependencies(componentData);
1435
+ await handlePackageDependencies(componentData, options);
1348
1436
  } catch (error) {
1349
1437
  console.error(chalk4.red(`Failed to add ${id}:`));
1350
1438
  throw error;
@@ -1438,7 +1526,7 @@ async function trackInstalledComponent(componentData) {
1438
1526
  };
1439
1527
  await fs3.writeJson(configPath, config, { spaces: 2 });
1440
1528
  }
1441
- async function handlePackageDependencies(componentData) {
1529
+ async function handlePackageDependencies(componentData, options = {}) {
1442
1530
  const allDependencies = /* @__PURE__ */ new Set();
1443
1531
  if (componentData.packageDependencies?.length) {
1444
1532
  componentData.packageDependencies.forEach((dep) => allDependencies.add(dep));
@@ -1446,16 +1534,25 @@ async function handlePackageDependencies(componentData) {
1446
1534
  if (allDependencies.size === 0) {
1447
1535
  return;
1448
1536
  }
1449
- const missingPackages = await getMissingPackages(Array.from(allDependencies));
1537
+ const dependencies = Array.from(allDependencies);
1538
+ const forcePackageUpdate = componentData.files.length === 0 && (options.force || options.overwrite);
1539
+ const missingPackages = forcePackageUpdate ? dependencies : await getMissingPackages(dependencies);
1450
1540
  if (missingPackages.length === 0) {
1451
1541
  console.log(chalk4.green("\u2705 All required packages are already installed"));
1452
1542
  return;
1453
1543
  }
1454
- console.log(chalk4.yellow("\n\u{1F4E6} Installing required packages..."));
1455
- console.log(chalk4.gray(` ${missingPackages.join(", ")}`));
1544
+ const packagesToInstall = missingPackages.map(
1545
+ (pkg) => forcePackageUpdate ? getPackageInstallSpec(pkg, componentData.version) : pkg
1546
+ );
1547
+ console.log(
1548
+ chalk4.yellow(
1549
+ forcePackageUpdate ? "\n\u{1F4E6} Updating required packages..." : "\n\u{1F4E6} Installing required packages..."
1550
+ )
1551
+ );
1552
+ console.log(chalk4.gray(` ${packagesToInstall.join(", ")}`));
1456
1553
  const packageManager = await detectPackageManager2();
1457
1554
  try {
1458
- const installCommand = `${packageManager} add ${missingPackages.join(" ")}`;
1555
+ const installCommand = `${packageManager} add ${packagesToInstall.join(" ")}`;
1459
1556
  console.log(chalk4.blue(` Running: ${installCommand}`));
1460
1557
  const { stdout, stderr } = await execAsync(installCommand);
1461
1558
  if (stderr && !stderr.includes("warning")) {
@@ -1466,10 +1563,16 @@ async function handlePackageDependencies(componentData) {
1466
1563
  console.log(chalk4.yellow("\n\u26A0\uFE0F Could not install packages automatically"));
1467
1564
  console.log(chalk4.gray(" Please install them manually:"));
1468
1565
  console.log(
1469
- chalk4.cyan(` ${packageManager} add ${missingPackages.join(" ")}`)
1566
+ chalk4.cyan(` ${packageManager} add ${packagesToInstall.join(" ")}`)
1470
1567
  );
1471
1568
  }
1472
1569
  }
1570
+ function getPackageInstallSpec(packageName, version) {
1571
+ if (!packageName.startsWith("@foundrykit/")) {
1572
+ return packageName;
1573
+ }
1574
+ return `${packageName}@${version ?? "latest"}`;
1575
+ }
1473
1576
  async function getMissingPackages(packages) {
1474
1577
  const packageJsonPath = path3.join(process.cwd(), "package.json");
1475
1578
  try {
@@ -1667,15 +1770,18 @@ function transformRegistryBarrelImports(content, sources, destinationBasePath, c
1667
1770
  `import\\s+{([^}]+)}\\s+from\\s+["'](${sourcePattern})["'];?`,
1668
1771
  "g"
1669
1772
  );
1670
- return content.replace(importPattern, (match, imports, source) => {
1671
- if (isPackageImportSpecifier(destinationBasePath)) {
1672
- return match.replace(source, destinationBasePath);
1673
- }
1674
- const groupedImports = groupImportsByComponent(imports, config, category);
1675
- return Array.from(groupedImports.entries()).map(([componentPath, specifiers]) => {
1676
- return `import { ${specifiers.join(", ")} } from "${destinationBasePath}/${componentPath}";`;
1677
- }).join("\n");
1678
- });
1773
+ return content.replace(
1774
+ importPattern,
1775
+ (match, imports, source) => {
1776
+ if (isPackageImportSpecifier(destinationBasePath)) {
1777
+ return match.replace(source, destinationBasePath);
1778
+ }
1779
+ const groupedImports = groupImportsByComponent(imports, config, category);
1780
+ return Array.from(groupedImports.entries()).map(([componentPath, specifiers]) => {
1781
+ return `import { ${specifiers.join(", ")} } from "${destinationBasePath}/${componentPath}";`;
1782
+ }).join("\n");
1783
+ }
1784
+ );
1679
1785
  }
1680
1786
  function groupImportsByComponent(imports, config, category) {
1681
1787
  const groupedImports = /* @__PURE__ */ new Map();
@@ -1915,6 +2021,16 @@ function updateCommand() {
1915
2021
  }
1916
2022
  const config = await fs4.readJson(configPath);
1917
2023
  let installed = config.installedComponents ?? {};
2024
+ const installedFoundryKitPackages = await getInstalledFoundryKitPackageVersions();
2025
+ for (const [pkgId, version] of Object.entries(
2026
+ installedFoundryKitPackages
2027
+ )) {
2028
+ installed[pkgId] = {
2029
+ id: pkgId,
2030
+ version,
2031
+ installedAt: installed[pkgId]?.installedAt ?? (/* @__PURE__ */ new Date()).toISOString()
2032
+ };
2033
+ }
1918
2034
  let installedIds = Object.keys(installed);
1919
2035
  if (installedIds.length === 0) {
1920
2036
  console.log(
@@ -1973,9 +2089,9 @@ function updateCommand() {
1973
2089
  for (const compId of installedIds) {
1974
2090
  try {
1975
2091
  const data = await registry.getComponent(compId, options.force);
1976
- const installedVersion = installed[compId]?.version ?? null;
2092
+ const installedVersion = installedFoundryKitPackages[compId] ?? installed[compId]?.version ?? null;
1977
2093
  const latestVersion = data.version ?? null;
1978
- const hasUpdate = latestVersion !== null && installedVersion !== null && latestVersion !== installedVersion;
2094
+ const hasUpdate = latestVersion !== null && installedVersion !== null && compareVersions2(latestVersion, installedVersion) > 0;
1979
2095
  const unknownVersion = installedVersion === null || latestVersion === null;
1980
2096
  if (hasUpdate || unknownVersion) {
1981
2097
  withUpdates.push({
@@ -2051,6 +2167,40 @@ function updateCommand() {
2051
2167
  }
2052
2168
  });
2053
2169
  }
2170
+ async function getInstalledFoundryKitPackageVersions() {
2171
+ const packageJsonPath = path4.join(process.cwd(), "package.json");
2172
+ if (!fs4.existsSync(packageJsonPath)) {
2173
+ return {};
2174
+ }
2175
+ const packageJson2 = await fs4.readJson(packageJsonPath);
2176
+ const dependencies = {
2177
+ ...packageJson2.dependencies,
2178
+ ...packageJson2.devDependencies,
2179
+ ...packageJson2.optionalDependencies
2180
+ };
2181
+ return Object.fromEntries(
2182
+ Object.entries(dependencies).filter(([name]) => name.startsWith("@foundrykit/")).map(([name, version]) => [
2183
+ name.replace("@foundrykit/", ""),
2184
+ normalizeVersionSpec(String(version))
2185
+ ])
2186
+ );
2187
+ }
2188
+ function compareVersions2(latest, installed) {
2189
+ const latestParts = normalizeVersionSpec(latest).split(".").map(Number);
2190
+ const installedParts = normalizeVersionSpec(installed).split(".").map(Number);
2191
+ const length = Math.max(latestParts.length, installedParts.length);
2192
+ for (let index = 0; index < length; index++) {
2193
+ const diff = (latestParts[index] ?? 0) - (installedParts[index] ?? 0);
2194
+ if (diff !== 0) return diff;
2195
+ }
2196
+ return 0;
2197
+ }
2198
+ function normalizeVersionSpec(version) {
2199
+ if (version === "workspace:*" || version === "*" || version === "latest") {
2200
+ return "0";
2201
+ }
2202
+ return version.replace(/^[^\d]*/, "").split("-")[0]?.replace(/[^\d.]/g, "") || "0";
2203
+ }
2054
2204
  async function runUpdates(ids, options) {
2055
2205
  let failed = 0;
2056
2206
  for (const compId of ids) {