Merge pull request #62 from selemondev/refactor/registry-url

refactor: registry url

Author: selemondev

src/utils/registry.ts

@@ -1,10 +1,9 @@
 import { ofetch } from "ofetch";
 import { to } from "./index";
 import { detectPackageManager } from "./vscode";
-import { getSvelteVersion } from "./getSvelteVersion";
 
 type OgComponent = {
-  type: "components:ui";
+  type: "registry:ui";
   name: string;
   files: string[];
   dependencies?: string[];
@@ -19,8 +18,7 @@ export type Component = {
 export type Components = Component[];
 
 export const getRegistry = async (): Promise<Components | null> => {
-  const svelteVersion = await getSvelteVersion();
-  const reqUrl = svelteVersion >= 5 ? "https://next.shadcn-svelte.com/registry/index.json" : "https://shadcn-svelte.com/registry/index.json";
+  const reqUrl = "https://shadcn-svelte.com/registry/index.json";
   const [res, err] = await to(ofetch(reqUrl));
 
   if (err || !res) {
@@ -33,51 +31,47 @@ export const getRegistry = async (): Promise<Components | null> => {
     return null;
   }
 
-  const components: Components = (data as OgComponent[]).map((c) => {
+  const components: Components = (data as OgComponent[]).filter((c) => c.type === 'registry:ui').map((c) => {
     const component: Component = {
       label: c.name,
-      detail: `dependencies: ${c.dependencies && c.dependencies.length > 0 ? c.dependencies.join(" ") : "no dependency"}`,
+      detail: `dependencies: ${c.registryDependencies && c.registryDependencies.length > 0 ? c.registryDependencies.join(", ") : "no dependency"}`,
     };
 
     return component;
   });
-
   return components;
 };
 
 export const getInstallCmd = async (components: string[], cwd: string) => {
   const packageManager = await detectPackageManager();
   const componentStr = components.join(" ");
-  const svelteVersion = await getSvelteVersion();
 
   if (packageManager === "bun") {
-    return svelteVersion >= 5 ? `bunx shadcn-svelte@next add ${componentStr} -c ${cwd}` : `bunx shadcn-svelte add ${componentStr} -c ${cwd}`;
+    return `bunx shadcn-svelte@latest add ${componentStr} -c ${cwd}`;
   }
 
   if (packageManager === "pnpm") {
-    return svelteVersion >= 5 ? `pnpm dlx shadcn-svelte@next add ${componentStr} -c ${cwd}` : `pnpm dlx shadcn-svelte@latest add ${componentStr} -c ${cwd}`;
+    return `pnpm dlx shadcn-svelte@latest add ${componentStr} -c ${cwd}`;
   }
 
-  return svelteVersion >= 5 ? `npx shadcn-svelte@next add ${componentStr} -c ${cwd}` : `npx shadcn-svelte@latest add ${componentStr} -c ${cwd}`;
+  return `npx shadcn-svelte@latest add ${componentStr} -c ${cwd}`;
 };
 
 export const getInitCmd = async (cwd: string) => {
   const packageManager = await detectPackageManager();
-  const svelteVersion = await getSvelteVersion();
 
   if (packageManager === "bun") {
-    return svelteVersion >= 5 ? `bunx shadcn-svelte@next init -c ${cwd}` : `bunx shadcn-svelte init -c ${cwd}`;
+    return `bunx shadcn-svelte@latest init -c ${cwd}`;
   }
 
   if (packageManager === "pnpm") {
-    return svelteVersion >= 5 ? `pnpm dlx shadcn-svelte@next init -c ${cwd}` : `pnpm dlx shadcn-svelte@latest init -c ${cwd}`;
+    return `pnpm dlx shadcn-svelte@latest init -c ${cwd}`;
   }
 
-  return svelteVersion >= 5 ? `npx shadcn-svelte@next init -c ${cwd}` : `npx shadcn-svelte@latest init -c ${cwd}`;
+  return `npx shadcn-svelte@latest init -c ${cwd}`;
 };
 
 export const getComponentDocLink = async (component: string) => {
-  const svelteVersion = await getSvelteVersion();
-  const shadCnDocUrl = svelteVersion >= 5 ? "https://next.shadcn-svelte.com/docs" : "https://shadcn-svelte.com/docs";
+  const shadCnDocUrl = "https://shadcn-svelte.com/docs";
   return `${shadCnDocUrl}/components/${component}`;
 };

src/utils/vscode.ts

@@ -33,14 +33,18 @@ export const getFileStat = async (fileName: string) => {
 };
 
 export const detectPackageManager = async (): Promise<PackageManager> => {
-  const [bunLockExists, bunLockBExists] = await Promise.all([
-    getFileStat("bun.lock").then(() => true).catch(() => false),
-    getFileStat("bun.lockb").then(() => true).catch(() => false),
-  ]);
-  if (bunLockExists || bunLockBExists) {
+  const lockFiles = ["bun.lock", "bun.lockb"];
+  const results = await Promise.all(
+    lockFiles.map((file) =>
+      getFileStat(file).catch(err => err.code === 'ENOENT' ? false : Promise.reject(err))
+    )
+  );
+
+  if (results.some(Boolean)) {
     return 'bun';
   }
 
+
   const pnpmLockExists = await getFileStat("pnpm-lock.yaml");
   if (pnpmLockExists) {
     return "pnpm";