create-next-hydra 0.2.0 → 0.2.1

package/dist/composition/catalog.d.ts

@@ -17,7 +17,10 @@ export declare function fetchRegistryItemGraph(options: {
     repository?: string;
 }): Promise<RegistryItemGraph>;
 export declare function loadSourceRegistryCatalog(cwd: string, registryFile?: string): Promise<SourceRegistryCatalog>;
-export declare function loadGitHubSourceRegistryCatalog(repository: string, ref?: string): Promise<SourceRegistryCatalog>;
+export declare function loadGitHubSourceRegistryCatalog(repository: string, ref?: string, dependencies?: {
+    fetchItems?: (addresses: string[]) => RegistryItem[] | Promise<RegistryItem[]>;
+    loadRegistryConfig?: (cwd: string) => RegistriesConfig | Promise<RegistriesConfig>;
+}): Promise<SourceRegistryCatalog>;
 export declare function addCatalogReferences(catalog: SourceRegistryCatalog, references: Iterable<string>, cwd?: string): Promise<SourceRegistryCatalog>;
 export declare function resolveCatalogSelection(catalog: SourceRegistryCatalog, reference: string): CatalogSelection;
 //# sourceMappingURL=catalog.d.ts.map

package/dist/composition/catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/composition/catalog.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAclD,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AA4JpB,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,MAAM,EAAE,GACnB,MAAM,EAAE,CA+BV;AAaD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CAClC,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACpD,MAAM,EAAE,gBAAgB,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,gBAAgB,CAAC;IACrC,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC/B,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyF7B;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,MAAM,EACX,YAAY,SAAkB,GAC7B,OAAO,CAAC,qBAAqB,CAAC,CAqChC;AAED,wBAAsB,+BAA+B,CACnD,UAAU,EAAE,MAAM,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,qBAAqB,CAAC,CAuBhC;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC5B,GAAG,SAA+B,GACjC,OAAO,CAAC,qBAAqB,CAAC,CA8ChC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,qBAAqB,EAC9B,SAAS,EAAE,MAAM,GAChB,gBAAgB,CASlB"}
+{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/composition/catalog.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAclD,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AA2KpB,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,MAAM,EAAE,GACnB,MAAM,EAAE,CA+BV;AAaD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CAClC,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACpD,MAAM,EAAE,gBAAgB,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,gBAAgB,CAAC;IACrC,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC/B,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA0F7B;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,MAAM,EACX,YAAY,SAAkB,GAC7B,OAAO,CAAC,qBAAqB,CAAC,CAqChC;AAED,wBAAsB,+BAA+B,CACnD,UAAU,EAAE,MAAM,EAClB,GAAG,CAAC,EAAE,MAAM,EACZ,YAAY,GAAE;IACZ,UAAU,CAAC,EAAE,CACX,SAAS,EAAE,MAAM,EAAE,KAChB,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC9C,kBAAkB,CAAC,EAAE,CACnB,GAAG,EAAE,MAAM,KACR,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC9C,GACL,OAAO,CAAC,qBAAqB,CAAC,CA4BhC;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,qBAAqB,EAC9B,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC5B,GAAG,SAA+B,GACjC,OAAO,CAAC,qBAAqB,CAAC,CA8ChC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,qBAAqB,EAC9B,SAAS,EAAE,MAAM,GAChB,gBAAgB,CASlB"}

package/dist/composition/catalog.js

@@ -7,6 +7,7 @@ import { CompositionValidationError } from "./errors.js";
 import { isManagedApplicationSource, resolveRegistryTarget, resolveWorkspacePath, } from "./paths.js";
 import { formatZodError, NEXT_HYDRA_SELECTION_SCHEMA_URL, selectionDefinitionSchema, } from "./schema.js";
 const GITHUB_HOMEPAGE_PATTERN = /^https:\/\/github\.com\/([^/]+\/[^/]+?)(?:\.git)?\/?$/;
+const SHADCN_REGISTRY_ITEM_SCHEMA_URL = "https://ui.shadcn.com/schema/registry-item.json";
 const OFFICIAL_REFERENCES = {
     commercetools: "next-hydra/commerce/commercetools",
     contentstack: "next-hydra/cms/contentstack",
@@ -22,6 +23,15 @@ const OFFICIAL_ITEM_NAMES = [
     "drupal",
     "next-hydra-standard",
 ];
+function restoreFetchedSelectionSchema(item) {
+    // ShadCN assigns its registry-item schema to every resolved artifact,
+    // including artifacts authored with the Next Hydra Selection schema.
+    if (item.meta?.nextHydra !== undefined &&
+        item.$schema === SHADCN_REGISTRY_ITEM_SCHEMA_URL) {
+        return { ...item, $schema: NEXT_HYDRA_SELECTION_SCHEMA_URL };
+    }
+    return item;
+}
 function createCatalog(options) {
     const items = new Map(options.registryItems.map((item) => [item.name, item]));
     const itemByReference = new Map(options.itemByReference);
@@ -162,12 +172,13 @@ export async function fetchRegistryItemGraph(options) {
         if (!itemName) {
             // oxlint-disable-next-line no-await-in-loop -- Breadth-first discovery reveals each next reference in order.
             const resolvedReference = await resolveRegistryReference(reference, options.cwd);
-            const [artifact] = await fetchItems([resolvedReference], {
+            const [fetchedArtifact] = await fetchItems([resolvedReference], {
                 config: options.config,
             });
-            if (!artifact) {
+            if (!fetchedArtifact) {
                 throw new CompositionValidationError("The registry dependency graph is incomplete.", [`${reference} returned no registry item`]);
             }
+            const artifact = restoreFetchedSelectionSchema(fetchedArtifact);
             const fetched = fetchedItems.get(artifact.name);
             const unpinnedReference = reference.split("#", 1)[0] ?? reference;
             const replacesPinnedRepositoryItem = reference.includes("#") &&
@@ -233,11 +244,12 @@ export async function loadSourceRegistryCatalog(cwd, registryFile = "registry.js
         repository,
     });
 }
-export async function loadGitHubSourceRegistryCatalog(repository, ref) {
+export async function loadGitHubSourceRegistryCatalog(repository, ref, dependencies = {}) {
     const suffix = ref ? `#${ref}` : "";
     const addresses = OFFICIAL_ITEM_NAMES.map((item) => `${repository}/${item}${suffix}`);
-    const registryItems = await getRegistryItems(addresses);
-    const registryConfig = await getRegistriesConfig(process.cwd());
+    const fetchedItems = await (dependencies.fetchItems ?? getRegistryItems)(addresses);
+    const registryItems = fetchedItems.map(restoreFetchedSelectionSchema);
+    const registryConfig = await (dependencies.loadRegistryConfig ?? getRegistriesConfig)(process.cwd());
     const itemByReference = new Map(registryItems.flatMap((item, index) => {
         const address = addresses[index];
         return address ? [[address, item.name]] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-hydra",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "CLI to scaffold a new next-hydra project",
   "keywords": [
     "cli",