shadcn-studio-extension-cli 0.1.10 → 0.1.11

package/dist/toolbar-app/index.js

@@ -7120,8 +7120,15 @@ const performLocalSearch = (blocks, query) => {
   return new Fuse(blocks, fuseLocalSearchOptions).search(query).map((result) => result.item);
 }, filterProBlocks = (blocks) => blocks.filter((block) => {
   var _a;
-  return ((_a = block.meta) == null ? void 0 : _a.isPro) === !1;
-}), fetchBlocksFromAPI = async (isValidated) => {
+  return ((_a = block.meta) == null ? void 0 : _a.isBasic) === !1;
+}), checkPlan$1 = async (licenseKey, email) => {
+  const fetchPlanUrl = `https://shadcnstudio.com/api/ide-extension/plan-variant?email=${email}&license_key=${licenseKey}`;
+  try {
+    return (await (await fetch(fetchPlanUrl, { method: "GET" })).json()).plan_variant;
+  } catch (error2) {
+    console.error("Failed to fetch plan variant:", error2);
+  }
+}, fetchBlocksFromAPI = async (isValidated, licenseKey, email) => {
   const fetchBlocksUrl = "https://shadcnstudio.com/r/blocks/registry.json?is_extension=true";
   try {
     const response = await fetch(fetchBlocksUrl, { method: "GET" });
@@ -7129,14 +7136,18 @@ const performLocalSearch = (blocks, query) => {
       return console.warn(
         `Failed to fetch blocks: ${response.status} ${response.statusText}`
       ), [];
-    let blocks = (await response.json()).items;
-    return isValidated || (blocks = filterProBlocks(blocks)), blocks;
+    let blocks = (await response.json()).items, planVariant = "basic";
+    return isValidated && licenseKey && email && (planVariant = await checkPlan$1(licenseKey, email)), console.log("User plan variant:", planVariant, "isValidated:", isValidated), (!isValidated || isValidated && planVariant === "basic") && (blocks = filterProBlocks(blocks)), blocks;
   } catch (error2) {
     return console.warn("Error fetching blocks:", error2), [];
   }
-}, fetchAndSearchBlocks = async (query, isValidated) => {
+}, fetchAndSearchBlocks = async (query, isValidated, licenseKey, email) => {
   try {
-    const searchResults = await fetchBlocksFromAPI(isValidated);
+    const searchResults = await fetchBlocksFromAPI(
+      isValidated,
+      licenseKey,
+      email
+    );
     if (searchResults.length === 0)
       return [];
     const fuseBlocksOptions = {
@@ -7161,7 +7172,9 @@ const performLocalSearch = (blocks, query) => {
     isValidated,
     debounceMs = 200,
     minScore = 0.35,
-    maxResults = 20
+    maxResults = 20,
+    licenseKey,
+    email
   } = options2, [searchResults, setSearchResults] = useState([]), [isSearching, setIsSearching] = useState(!1), [searchError, setSearchError] = useState(null);
   return useEffect(() => {
     if (!(searchQuery != null && searchQuery.trim())) {
@@ -7173,7 +7186,12 @@ const performLocalSearch = (blocks, query) => {
       try {
         const query = searchQuery.trim().toLowerCase(), localResults = performLocalSearch(localBlocks, query);
         setSearchResults(localResults);
-        const apiResults = await fetchAndSearchBlocks(query, isValidated);
+        const apiResults = await fetchAndSearchBlocks(
+          query,
+          isValidated,
+          licenseKey,
+          email
+        );
         if (apiResults.length > 0) {
           const combinedResults = [...apiResults, ...localResults], uniqueResults = removeDuplicateBlocks(combinedResults);
           setSearchResults(uniqueResults);
@@ -7186,7 +7204,16 @@ const performLocalSearch = (blocks, query) => {
       }
     }, debounceMs);
     return () => clearTimeout(searchTimeout);
-  }, [searchQuery, localBlocks, isValidated, debounceMs, minScore, maxResults]), {
+  }, [
+    searchQuery,
+    localBlocks,
+    isValidated,
+    debounceMs,
+    minScore,
+    maxResults,
+    licenseKey,
+    email
+  ]), {
     searchResults,
     isSearching,
     searchError
@@ -7227,18 +7254,26 @@ function useLicenseKey() {
   }, [loadLicenseKey]);
   const validateLicenseKey = useCallback(
     async (licensekey, email) => {
-      if (!licensekey || typeof licensekey != "string" || !email || typeof email != "string" || !email.includes("@"))
-        return !1;
-      const trimmedLicenseKey = licensekey.trim(), validateUrl = `https://shadcnstudio.com/api/validate-user?email=${email.trim()}&license_key=${trimmedLicenseKey}`, response = await fetch(validateUrl, {
+      if (!licensekey || typeof licensekey != "string")
+        return { isValid: !1, message: "Invalid license key" };
+      if (!email || typeof email != "string" || !email.includes("@"))
+        return { isValid: !1, message: "Invalid email" };
+      const trimmedLicenseKey = licensekey.trim(), validateUrl = `https://shadcnstudio.com/api/ide-extension/validate-user?email=${email.trim()}&license_key=${trimmedLicenseKey}`, response = await fetch(validateUrl, {
         method: "GET",
         headers: {
           "Content-Type": "application/json"
         }
-      });
-      return response.ok ? !0 : (console.error(
+      }), data = await response.json();
+      return response.ok ? {
+        isValid: !0,
+        message: data.message || "License key validation successful"
+      } : (console.error(
         "License key validation request failed:",
         response.status
-      ), !1);
+      ), {
+        isValid: !1,
+        message: data.message
+      });
     },
     []
   ), saveLicenseKey = useCallback(
@@ -7294,7 +7329,7 @@ function useLicenseKey() {
     }
   }, []), refreshLicenseValidation = useCallback(async () => {
     if (!licenseState.licenseKey)
-      return !1;
+      return { isValid: !1, message: "No license key found" };
     try {
       const isValid = await validateLicenseKey(
         licenseState.licenseKey,
@@ -7320,7 +7355,10 @@ function useLicenseKey() {
         removeLicenseKey();
       return isValid;
     } catch (error2) {
-      return console.error("Failed to refresh license validation:", error2), !1;
+      return console.error("Failed to refresh license validation:", error2), {
+        isValid: !1,
+        message: "Failed to refresh license validation"
+      };
     }
   }, [licenseState.licenseKey, validateLicenseKey, removeLicenseKey]), needsRevalidation = useCallback(() => licenseState.lastValidated ? (Date.now() - licenseState.lastValidated.getTime()) / (1e3 * 60 * 60) > 24 : !0, [licenseState.lastValidated]);
   return {
@@ -7365,7 +7403,7 @@ const RECENT_BLOCKS_KEY = "shadcnstudio-toolbar-blocks-recent", getRecentBlocks
     onCloseBlocks,
     onReady
   }, ref) => {
-    const { isValidated } = useLicenseKey(), [recentBlocks, setRecentBlocks] = useState([]);
+    const { isValidated, licenseKey, email } = useLicenseKey(), [recentBlocks, setRecentBlocks] = useState([]);
     useEffect(() => {
       setRecentBlocks(getRecentBlocks());
     }, []);
@@ -7379,7 +7417,7 @@ const RECENT_BLOCKS_KEY = "shadcnstudio-toolbar-blocks-recent", getRecentBlocks
     }, [recentBlocks]), { searchResults, isSearching, searchError } = useBlockSearch(
       searchQuery || "",
       localBlocks,
-      { isValidated, debounceMs: 500 }
+      { isValidated, debounceMs: 500, licenseKey, email }
     ), filteredBlocks = useMemo(() => searchQuery != null && searchQuery.trim() ? searchResults : localBlocks, [searchQuery, searchResults, localBlocks]), [activeIndex, setActiveIndex] = useState(-1), [startIndex, setStartIndex] = useState(0), [isFocused, setIsFocused] = useState(!1), containerRef = useRef(null), visibleBlocks = useMemo(() => filteredBlocks.slice(startIndex, startIndex + 3), [filteredBlocks, startIndex]);
     useEffect(() => {
       activeIndex >= filteredBlocks.length && filteredBlocks.length > 0 ? (setActiveIndex(filteredBlocks.length - 1), setStartIndex(Math.max(0, filteredBlocks.length - 3))) : filteredBlocks.length === 0 && activeIndex !== -1 && (setActiveIndex(-1), setStartIndex(0));
@@ -8013,6 +8051,16 @@ const fetchGenericThemesFromAPI = async () => {
   } catch (error2) {
     return console.warn("Error fetching themes:", error2), [];
   }
+}, checkPlan = async () => {
+  const { email, licenseKey } = getLicenseDataFromStorage();
+  if (!email || !licenseKey)
+    return "basic";
+  const fetchPlanUrl = `https://shadcnstudio.com/api/ide-extension/plan-variant?email=${email}&license_key=${licenseKey}`;
+  try {
+    return (await (await fetch(fetchPlanUrl, { method: "GET" })).json()).plan_variant;
+  } catch (error2) {
+    console.error("Failed to fetch plan variant:", error2);
+  }
 }, fetchUserThemesFromAPI = async () => {
   const { email, licenseKey } = getLicenseDataFromStorage(), fetchThemesUrl = `https://shadcnstudio.com/api/user-themes?email=${email}&license_key=${licenseKey}&is_extension=true`;
   try {
@@ -8024,8 +8072,11 @@ const fetchGenericThemesFromAPI = async () => {
     return console.warn("Error fetching themes:", error2), [];
   }
 }, fetchThemesFromAPI = async () => {
-  const userThemes = await fetchUserThemesFromAPI(), genericThemes = await fetchGenericThemesFromAPI();
-  return userThemes.length > 0 ? [...userThemes, ...genericThemes] : genericThemes;
+  const userThemes = await fetchUserThemesFromAPI(), genericThemes = await fetchGenericThemesFromAPI(), userPlan = await checkPlan(), allThemes = userThemes.length > 0 ? [...userThemes, ...genericThemes] : genericThemes;
+  return userPlan === "basic" ? allThemes.filter((theme) => {
+    var _a;
+    return ((_a = theme.meta) == null ? void 0 : _a.isPro) !== !0;
+  }) : allThemes;
 }, fetchAndSearchThemes = async (searchQuery) => {
   try {
     const searchResults = await fetchThemesFromAPI();
@@ -10534,9 +10585,9 @@ function LicenseKeyDialog({
     }
     setIsValidating(!0), setValidationError(null);
     try {
-      console.log("In handle Save function Validating license key:", inputKey), console.log("In handle save function With email:", email), await validateLicenseKey(inputKey.trim(), email.trim()) ? (await saveLicenseKey(inputKey.trim(), email.trim()), setInputKey(""), onClose()) : setValidationError(
-        "Invalid license key or Email. Please check and try again."
-      );
+      console.log("In handle Save function Validating license key:", inputKey), console.log("In handle save function With email:", email);
+      const isValid = await validateLicenseKey(inputKey.trim(), email.trim());
+      console.log("License key validation result:", isValid), isValid.isValid ? (await saveLicenseKey(inputKey.trim(), email.trim()), setInputKey(""), onClose()) : (console.log("License key validation failed:", isValid), setValidationError(isValid.message || "Invalid license key or Email"));
     } catch (error2) {
       setValidationError(
         error2 instanceof Error ? error2.message : "Failed to validate license key"

package/package.json

@@ -2,7 +2,7 @@
   "name": "shadcn-studio-extension-cli",
   "module": "src/index.ts",
   "type": "module",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Shadcn/Studio Extension CLI",
   "author": "stagewise GmbH",
   "license": "AGPL-3.0-only",