@tscircuit/fake-snippets 0.0.30 → 0.0.31

package/dist/index.js

@@ -198,10 +198,10 @@ var databaseSchema = z.object({
   jlcpcbOrderStepRuns: z.array(jlcpcbOrderStepRunSchema).default([])
 });
 
-// fake-snippets-api/lib/db/autoload-dev-snippets.ts
-import axios from "redaxios";
+// fake-snippets-api/lib/db/autoload-dev-packages.ts
 import fs from "fs";
 import path from "path";
+import axios from "redaxios";
 var extractTsciDependencies = (code) => {
   const regex = /@tsci\/([^.]+)\.([^"'\s]+)/g;
   const matches = Array.from(code.matchAll(regex));
@@ -217,52 +217,137 @@ var registryApi = axios.create({
     "Content-Type": "application/json"
   }
 });
-var fetchSnippetFromRegistry = async (owner, name) => {
-  const response = await registryApi.get(
-    `/snippets/get?owner_name=${owner}&unscoped_name=${name}`
-  );
-  return response.data.snippet;
-};
-var loadSnippetWithDependencies = async (db, owner, name, loadedSnippets = /* @__PURE__ */ new Set()) => {
-  const snippetKey = `${owner}/${name}`;
-  if (loadedSnippets.has(snippetKey)) {
-    return;
+var fetchPackageFromRegistry = async (owner, name) => {
+  const fullName = `${owner}/${name}`;
+  console.log(`Fetching package ${fullName}...`);
+  let packageData;
+  try {
+    const response = await registryApi.post("/packages/get", {
+      name: fullName
+    });
+    packageData = response.data;
+  } catch (e) {
+    console.error(`Failed to fetch package data for ${fullName}:`, e);
+    throw e;
   }
+  let releaseData;
   try {
-    const snippet = await fetchSnippetFromRegistry(owner, name);
-    if (db.getSnippetByAuthorAndName(owner, name)) return;
-    db.addSnippet(snippet);
-    loadedSnippets.add(snippetKey);
-    const dependencies = extractTsciDependencies(snippet.code);
-    for (const dep of dependencies) {
-      loadSnippetWithDependencies(db, dep.owner, dep.name, loadedSnippets);
-    }
+    const response = await registryApi.post("/package_releases/get", {
+      package_id: packageData.package.package_id,
+      is_latest: true
+    });
+    releaseData = response.data;
   } catch (e) {
-    console.error(`\u2717 Failed to load ${snippetKey}:`, e);
+    console.error(`Failed to fetch release data for ${fullName}:`, e);
+    throw e;
   }
+  let filesData;
+  try {
+    const response = await registryApi.post("/package_files/list", {
+      package_release_id: releaseData.package_release.package_release_id
+    });
+    filesData = response.data;
+  } catch (e) {
+    console.error(`Failed to fetch files data for ${fullName}:`, e);
+    throw e;
+  }
+  return {
+    package: packageData.package,
+    release: releaseData.package_release,
+    files: filesData.package_files
+  };
 };
-var loadAutoloadSnippets = async (db) => {
+var loadPackageWithDependencies = async (db, owner, name, loadedPackages = /* @__PURE__ */ new Set()) => {
+  const packageKey = `${owner}/${name}`;
+  if (loadedPackages.has(packageKey)) {
+    return true;
+  }
+  let result;
   try {
-    const autoloadPath = path.join(
-      path.dirname(__dirname),
-      "db",
-      "autoload-snippets.json"
+    result = await fetchPackageFromRegistry(owner, name);
+  } catch (e) {
+    console.error(`\u2717 Failed to load ${packageKey}`);
+    return false;
+  }
+  const { package: pkg, release, files } = result;
+  if (db.getPackageById(pkg.package_id)) {
+    console.log(`\u2713 Package ${packageKey} already exists`);
+    return true;
+  }
+  db.addPackage({
+    ...pkg,
+    created_at: (/* @__PURE__ */ new Date()).toISOString(),
+    updated_at: (/* @__PURE__ */ new Date()).toISOString(),
+    latest_package_release_id: release.package_release_id
+  });
+  db.addPackageRelease({
+    ...release,
+    created_at: (/* @__PURE__ */ new Date()).toISOString()
+  });
+  for (const file of files) {
+    db.addPackageFile({
+      ...file,
+      created_at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+  }
+  loadedPackages.add(packageKey);
+  console.log(`\u2713 Loaded ${packageKey}`);
+  const mainFile = files.find(
+    (f) => f.file_path === "index.tsx" || f.file_path === "index.ts"
+  );
+  if (!mainFile?.content_text) {
+    return true;
+  }
+  const dependencies = extractTsciDependencies(mainFile.content_text);
+  let allDepsLoaded = true;
+  for (const dep of dependencies) {
+    const depLoaded = await loadPackageWithDependencies(
+      db,
+      dep.owner,
+      dep.name,
+      loadedPackages
     );
-    if (fs.existsSync(autoloadPath)) {
-      const autoloadContent = JSON.parse(fs.readFileSync(autoloadPath, "utf8"));
-      console.log("Loading development snippets from registry...");
-      const loadedSnippets = /* @__PURE__ */ new Set();
-      for (const snippetRef of autoloadContent.snippets) {
-        loadSnippetWithDependencies(
-          db,
-          snippetRef.owner,
-          snippetRef.name,
-          loadedSnippets
-        );
-      }
+    if (!depLoaded) {
+      allDepsLoaded = false;
+      console.warn(
+        `\u26A0\uFE0F Failed to load dependency ${dep.owner}/${dep.name} for ${packageKey}`
+      );
     }
-  } catch (e) {
-    console.error("Failed to load autoload-snippets.json:", e);
+  }
+  return allDepsLoaded;
+};
+var loadAutoloadPackages = async (db) => {
+  const autoloadPath = path.join(
+    path.dirname(__dirname),
+    "db",
+    "autoload-packages.json"
+  );
+  if (!fs.existsSync(autoloadPath)) {
+    console.error("No autoload-packages.json found");
+    return;
+  }
+  const autoloadContent = JSON.parse(fs.readFileSync(autoloadPath, "utf8"));
+  const loadedPackages = /* @__PURE__ */ new Set();
+  let successCount = 0;
+  let failureCount = 0;
+  for (const packageRef of autoloadContent.packages) {
+    const success = await loadPackageWithDependencies(
+      db,
+      packageRef.owner,
+      packageRef.name,
+      loadedPackages
+    );
+    if (success) {
+      successCount++;
+    } else {
+      failureCount++;
+    }
+  }
+  console.log(`
+Package loading complete:`);
+  console.log(`\u2713 Successfully loaded: ${successCount} packages`);
+  if (failureCount > 0) {
+    console.log(`\u2717 Failed to load: ${failureCount} packages`);
   }
 };
 
@@ -287,8 +372,8 @@ var seed = (db) => {
   db.addAccount({
     github_username: "seveibar"
   });
-  if (process.env.AUTOLOAD_SNIPPETS === "true") {
-    loadAutoloadSnippets(db);
+  if (process.env.AUTOLOAD_PACKAGES === "true") {
+    loadAutoloadPackages(db);
   }
   db.addSnippet({
     name: "testuser/my-test-board",

package/fake-snippets-api/lib/db/autoload-dev-packages.ts

@@ -0,0 +1,185 @@
+import fs from "fs"
+import path from "path"
+import axios from "redaxios"
+import type { DbClient } from "./db-client"
+import type { Package, PackageFile, PackageRelease } from "./schema"
+
+const extractTsciDependencies = (
+  code: string,
+): Array<{ owner: string; name: string }> => {
+  const regex = /@tsci\/([^.]+)\.([^"'\s]+)/g
+  const matches = Array.from(code.matchAll(regex))
+  return matches.map((match) => ({
+    owner: match[1],
+    name: match[2],
+  }))
+}
+
+const registryApi = axios.create({
+  baseURL: "https://registry-api.tscircuit.com",
+  headers: {
+    Accept: "application/json",
+    "Content-Type": "application/json",
+  },
+})
+
+const fetchPackageFromRegistry = async (owner: string, name: string) => {
+  const fullName = `${owner}/${name}`
+  console.log(`Fetching package ${fullName}...`)
+
+  let packageData
+  try {
+    const response = await registryApi.post("/packages/get", {
+      name: fullName,
+    })
+    packageData = response.data
+  } catch (e) {
+    console.error(`Failed to fetch package data for ${fullName}:`, e)
+    throw e
+  }
+
+  let releaseData
+  try {
+    const response = await registryApi.post("/package_releases/get", {
+      package_id: packageData.package.package_id,
+      is_latest: true,
+    })
+    releaseData = response.data
+  } catch (e) {
+    console.error(`Failed to fetch release data for ${fullName}:`, e)
+    throw e
+  }
+
+  let filesData
+  try {
+    const response = await registryApi.post("/package_files/list", {
+      package_release_id: releaseData.package_release.package_release_id,
+    })
+    filesData = response.data
+  } catch (e) {
+    console.error(`Failed to fetch files data for ${fullName}:`, e)
+    throw e
+  }
+
+  return {
+    package: packageData.package as Package,
+    release: releaseData.package_release as PackageRelease,
+    files: filesData.package_files as PackageFile[],
+  }
+}
+
+const loadPackageWithDependencies = async (
+  db: DbClient,
+  owner: string,
+  name: string,
+  loadedPackages = new Set<string>(),
+) => {
+  const packageKey = `${owner}/${name}`
+  if (loadedPackages.has(packageKey)) {
+    return true
+  }
+
+  let result
+  try {
+    result = await fetchPackageFromRegistry(owner, name)
+  } catch (e) {
+    console.error(`✗ Failed to load ${packageKey}`)
+    return false
+  }
+
+  const { package: pkg, release, files } = result
+
+  // Check if package already exists
+  if (db.getPackageById(pkg.package_id)) {
+    console.log(`✓ Package ${packageKey} already exists`)
+    return true
+  }
+
+  // Add package, release, and files to db
+  db.addPackage({
+    ...pkg,
+    created_at: new Date().toISOString(),
+    updated_at: new Date().toISOString(),
+    latest_package_release_id: release.package_release_id,
+  })
+
+  db.addPackageRelease({
+    ...release,
+    created_at: new Date().toISOString(),
+  })
+
+  for (const file of files) {
+    db.addPackageFile({
+      ...file,
+      created_at: new Date().toISOString(),
+    })
+  }
+
+  loadedPackages.add(packageKey)
+  console.log(`✓ Loaded ${packageKey}`)
+
+  // Load dependencies
+  const mainFile = files.find(
+    (f) => f.file_path === "index.tsx" || f.file_path === "index.ts",
+  )
+  if (!mainFile?.content_text) {
+    return true
+  }
+
+  const dependencies = extractTsciDependencies(mainFile.content_text)
+  let allDepsLoaded = true
+
+  for (const dep of dependencies) {
+    const depLoaded = await loadPackageWithDependencies(
+      db,
+      dep.owner,
+      dep.name,
+      loadedPackages,
+    )
+    if (!depLoaded) {
+      allDepsLoaded = false
+      console.warn(
+        `⚠️ Failed to load dependency ${dep.owner}/${dep.name} for ${packageKey}`,
+      )
+    }
+  }
+
+  return allDepsLoaded
+}
+
+export const loadAutoloadPackages = async (db: DbClient) => {
+  const autoloadPath = path.join(
+    path.dirname(__dirname),
+    "db",
+    "autoload-packages.json",
+  )
+  if (!fs.existsSync(autoloadPath)) {
+    console.error("No autoload-packages.json found")
+    return
+  }
+
+  const autoloadContent = JSON.parse(fs.readFileSync(autoloadPath, "utf8"))
+  const loadedPackages = new Set<string>()
+  let successCount = 0
+  let failureCount = 0
+
+  for (const packageRef of autoloadContent.packages) {
+    const success = await loadPackageWithDependencies(
+      db,
+      packageRef.owner,
+      packageRef.name,
+      loadedPackages,
+    )
+    if (success) {
+      successCount++
+    } else {
+      failureCount++
+    }
+  }
+
+  console.log(`\nPackage loading complete:`)
+  console.log(`✓ Successfully loaded: ${successCount} packages`)
+  if (failureCount > 0) {
+    console.log(`✗ Failed to load: ${failureCount} packages`)
+  }
+}

package/fake-snippets-api/lib/db/{autoload-snippets.json → autoload-packages.json}

@@ -1,5 +1,5 @@
 {
-  "snippets": [
+  "packages": [
     {
       "owner": "Abse2001",
       "name": "Arduino-Nano-Servo-Breakout"
@@ -23,6 +23,10 @@
     {
       "owner": "AnasSarkiz",
       "name": "grid-of-LEDs-with-an-ESP32"
+    },
+    {
+      "owner": "seveibar",
+      "name": "keyboard-default60"
     }
   ]
 }

package/fake-snippets-api/lib/db/seed.ts

@@ -1,5 +1,5 @@
 import { DbClient } from "./db-client"
-import { loadAutoloadSnippets } from "./autoload-dev-snippets"
+import { loadAutoloadPackages } from "./autoload-dev-packages"
 
 export const seed = (db: DbClient) => {
   const { account_id } = db.addAccount({
@@ -22,8 +22,8 @@ export const seed = (db: DbClient) => {
     github_username: "seveibar",
   })
 
-  if (process.env.AUTOLOAD_SNIPPETS === "true") {
-    loadAutoloadSnippets(db)
+  if (process.env.AUTOLOAD_PACKAGES === "true") {
+    loadAutoloadPackages(db)
   }
 
   db.addSnippet({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/fake-snippets",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "type": "module",
   "repository": {
     "type": "git",

package/src/components/ViewPackagePage/hooks/use-current-package-circuit-json.ts

@@ -1,9 +1,9 @@
-import { useCurrentSnippetId } from "@/hooks/use-current-snippet-id"
+import { useCurrentPackageId } from "@/hooks/use-current-package-id"
 import { usePackageFile } from "@/hooks/use-package-files"
 import { useEffect, useState } from "react"
 
 export function useCurrentPackageCircuitJson() {
-  const { packageId } = useCurrentSnippetId()
+  const { packageId } = useCurrentPackageId()
 
   const [circuitJson, setCircuitJson] = useState<any>(null)
   const [isLoading, setIsLoading] = useState(true)

package/src/hooks/use-current-package-id.ts

@@ -1,3 +1,47 @@
-import { useCurrentSnippetId } from "./use-current-snippet-id"
+import { useEffect, useState } from "react"
+import { useParams } from "wouter"
+import { usePackageById } from "./use-package-by-package-id"
+import { usePackageByName } from "./use-package-by-package-name"
+import { useUrlParams } from "./use-url-params"
 
-export const useCurrentPackageId = useCurrentSnippetId
+export const useCurrentPackageId = (): {
+  packageId: string | null
+  isLoading: boolean
+  error: (Error & { status: number }) | null
+} => {
+  const urlParams = useUrlParams()
+  const urlPackageId = urlParams.package_id
+  const wouter = useParams()
+  const [packageIdFromUrl, setPackageId] = useState<string | null>(urlPackageId)
+
+  useEffect(() => {
+    if (urlPackageId) {
+      setPackageId(urlPackageId)
+    }
+  }, [urlPackageId])
+
+  const packageName =
+    wouter.author && wouter.packageName
+      ? `${wouter.author}/${wouter.packageName}`
+      : null
+
+  const {
+    data: packageByName,
+    isLoading: isLoadingPackageByName,
+    error: errorPackageByName,
+  } = usePackageByName(packageName)
+
+  const {
+    data: packageById,
+    isLoading: isLoadingPackageById,
+    error: errorPackageById,
+  } = usePackageById(packageIdFromUrl)
+
+  const packageId = packageIdFromUrl ?? packageByName?.package_id ?? null
+
+  return {
+    packageId,
+    isLoading: isLoadingPackageByName || isLoadingPackageById,
+    error: errorPackageByName || errorPackageById,
+  }
+}

package/fake-snippets-api/lib/db/autoload-dev-snippets.ts

@@ -1,84 +0,0 @@
-import axios from "redaxios"
-import fs from "fs"
-import path from "path"
-import { DbClient } from "./db-client"
-
-const extractTsciDependencies = (
-  code: string,
-): Array<{ owner: string; name: string }> => {
-  const regex = /@tsci\/([^.]+)\.([^"'\s]+)/g
-  const matches = Array.from(code.matchAll(regex))
-  return matches.map((match) => ({
-    owner: match[1],
-    name: match[2],
-  }))
-}
-
-const registryApi = axios.create({
-  baseURL: "https://registry-api.tscircuit.com",
-  headers: {
-    Accept: "application/json",
-    "Content-Type": "application/json",
-  },
-})
-
-const fetchSnippetFromRegistry = async (owner: string, name: string) => {
-  const response = await registryApi.get(
-    `/snippets/get?owner_name=${owner}&unscoped_name=${name}`,
-  )
-  return response.data.snippet
-}
-
-const loadSnippetWithDependencies = async (
-  db: DbClient,
-  owner: string,
-  name: string,
-  loadedSnippets = new Set<string>(),
-) => {
-  const snippetKey = `${owner}/${name}`
-  if (loadedSnippets.has(snippetKey)) {
-    return
-  }
-
-  try {
-    const snippet = await fetchSnippetFromRegistry(owner, name)
-
-    if (db.getSnippetByAuthorAndName(owner, name)) return
-
-    db.addSnippet(snippet)
-    loadedSnippets.add(snippetKey)
-
-    const dependencies = extractTsciDependencies(snippet.code)
-    for (const dep of dependencies) {
-      loadSnippetWithDependencies(db, dep.owner, dep.name, loadedSnippets)
-    }
-  } catch (e) {
-    console.error(`✗ Failed to load ${snippetKey}:`, e)
-  }
-}
-
-export const loadAutoloadSnippets = async (db: DbClient) => {
-  try {
-    const autoloadPath = path.join(
-      path.dirname(__dirname),
-      "db",
-      "autoload-snippets.json",
-    )
-    if (fs.existsSync(autoloadPath)) {
-      const autoloadContent = JSON.parse(fs.readFileSync(autoloadPath, "utf8"))
-      console.log("Loading development snippets from registry...")
-
-      const loadedSnippets = new Set<string>()
-      for (const snippetRef of autoloadContent.snippets) {
-        loadSnippetWithDependencies(
-          db,
-          snippetRef.owner,
-          snippetRef.name,
-          loadedSnippets,
-        )
-      }
-    }
-  } catch (e) {
-    console.error("Failed to load autoload-snippets.json:", e)
-  }
-}