@tscircuit/fake-snippets 0.0.114 → 0.0.115

package/fake-snippets-api/routes/api/packages/create.ts

@@ -18,35 +18,44 @@ export default withRouteSpec({
     description: z.string().optional(),
     is_private: z.boolean().optional().default(false),
     is_unlisted: z.boolean().optional().default(false),
+    org_id: z.string().optional(),
   }),
   jsonResponse: z.object({
     package: packageSchema.optional(),
   }),
 })(async (req, ctx) => {
-  const { name, description, is_private, is_unlisted } = req.jsonBody
-
+  const { name, description, is_private, is_unlisted, org_id } = req.jsonBody
   let owner_segment = name?.split("/")[0]
   let unscoped_name = name?.split("/")[1]
 
   if (name && !unscoped_name) {
-    throw ctx.error(400, {
+    return ctx.error(400, {
       error_code: "invalid_package_name",
       message:
         "Package name must include an author segment (e.g. author/package_name)",
     })
   }
+  const org = ctx.db.getOrg({ org_id })
+  if (Boolean(org_id) && !Boolean(org))
+    return ctx.error(404, {
+      error_code: "org_not_found",
+      message: "Organization not found",
+    })
 
   if (!unscoped_name) {
     const state = ctx.db.getState()
-    const count = state.packages.filter(
-      (pkg) => pkg.creator_account_id === ctx.auth.account_id,
-    ).length
+
+    const count = org_id
+      ? state.packages.filter((pkg) => pkg.owner_org_id === org_id).length
+      : state.packages.filter(
+          (pkg) => pkg.creator_account_id === ctx.auth.account_id,
+        ).length
 
     unscoped_name = `untitled-package-${count}`
   }
 
   if (!owner_segment) {
-    owner_segment = ctx.auth.github_username
+    owner_segment = org_id ? org!.org_name : ctx.auth.github_username
   }
 
   const final_name = name ?? `${owner_segment}/${unscoped_name}`
@@ -71,7 +80,7 @@ export default withRouteSpec({
       )
 
     if (!memberOrg) {
-      throw ctx.error(403, {
+      return ctx.error(403, {
         error_code: "forbidden",
         message:
           "You must be a member of the organization to create a package under it",
@@ -87,7 +96,7 @@ export default withRouteSpec({
     .packages.find((pkg) => pkg.name === final_name)
 
   if (existingPackage) {
-    throw ctx.error(400, {
+    return ctx.error(400, {
       error_code: "package_already_exists",
       message: "A package with this name already exists",
     })

package/package.json

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

package/src/components/dialogs/new-package-save-prompt-dialog.tsx

@@ -19,6 +19,7 @@ import {
 import { createUseDialog } from "./create-use-dialog"
 import { useListUserOrgs } from "@/hooks/use-list-user-orgs"
 import { useGlobalStore } from "@/hooks/use-global-store"
+import { ICreatePackageProps } from "@/hooks/useFileManagement"
 
 export const NewPackageSavePromptDialog = ({
   open,
@@ -31,27 +32,31 @@ export const NewPackageSavePromptDialog = ({
   onOpenChange: (open: boolean) => void
   initialIsPrivate?: boolean
   initialName?: string
-  onSave: ({
-    name,
-    isPrivate,
-    orgId,
-  }: {
-    name?: string
-    isPrivate: boolean
-    orgId: string
-  }) => void
+  onSave: (props: ICreatePackageProps) => void
 }) => {
   const [packageName, setPackageName] = useState(initialName)
   const session = useGlobalStore((s) => s.session)
   const [isPrivate, setIsPrivate] = useState(initialIsPrivate)
   const [selectedOrgId, setSelectedOrgId] = useState<string>("")
   const { data: organizations, isLoading: orgsLoading } = useListUserOrgs()
+
+  const isOwnerPersonalOrg = useMemo(() => {
+    if (!selectedOrgId) return false
+    const selectedOrg = organizations?.find((x) => x.org_id === selectedOrgId)
+    return (
+      selectedOrg?.is_personal_org &&
+      selectedOrg?.owner_account_id == session?.account_id
+    )
+  }, [selectedOrgId, organizations, session?.github_username])
+
   const fullPackageName = useMemo(() => {
+    if (!Boolean(packageName)) return
     if (selectedOrgId) {
       return `${organizations?.find((x) => x.org_id === selectedOrgId)?.name}/${packageName}`
     }
     return `${session?.github_username}/${packageName}`
   }, [selectedOrgId, packageName, organizations, session?.github_username])
+
   useEffect(() => {
     if (organizations && organizations.length > 0 && !selectedOrgId) {
       setSelectedOrgId(
@@ -169,9 +174,13 @@ export const NewPackageSavePromptDialog = ({
           <Button
             onClick={() => {
               onSave({
-                name: fullPackageName.trim(),
+                name: fullPackageName,
                 isPrivate,
-                orgId: selectedOrgId,
+                ...(isOwnerPersonalOrg
+                  ? {}
+                  : {
+                      org_id: selectedOrgId,
+                    }),
               })
               onOpenChange(false)
             }}

package/src/hooks/useFileManagement.ts

@@ -45,6 +45,12 @@ export interface IRenameFileResult {
   fileRenamed: boolean
 }
 
+export interface ICreatePackageProps {
+  isPrivate?: boolean
+  name?: string
+  org_id?: string
+}
+
 export function useFileManagement({
   templateCode,
   currentPackage,
@@ -428,12 +434,8 @@ export function useFileManagement({
   const savePackage = async ({
     name,
     isPrivate,
-    orgId,
-  }: {
-    name?: string
-    isPrivate: boolean
-    orgId: string
-  }) => {
+    org_id,
+  }: ICreatePackageProps) => {
     if (!isLoggedIn) {
       toast({
         title: "Not Logged In",
@@ -443,9 +445,9 @@ export function useFileManagement({
     }
 
     await createPackageMutation.mutateAsync({
-      is_private: isPrivate,
-      org_id: orgId,
-      ...(name ? { name } : {}),
+      is_private: Boolean(isPrivate),
+      ...(org_id ? { org_id: org_id } : {}),
+      ...(name ? { name: name?.trim() } : {}),
     })
   }