@capgo/cli 4.2.3 → 4.2.7

package/src/types/supabase.types.ts

@@ -648,42 +648,54 @@ export interface Database {
       global_stats: {
         Row: {
           apps: number
+          apps_active: number | null
           created_at: string | null
           date_id: string
           need_upgrade: number | null
           not_paying: number | null
           onboarded: number | null
           paying: number | null
+          paying_monthly: number | null
+          paying_yearly: number | null
           stars: number
           trial: number | null
           updates: number
           users: number | null
+          users_active: number | null
         }
         Insert: {
           apps: number
+          apps_active?: number | null
           created_at?: string | null
           date_id: string
           need_upgrade?: number | null
           not_paying?: number | null
           onboarded?: number | null
           paying?: number | null
+          paying_monthly?: number | null
+          paying_yearly?: number | null
           stars: number
           trial?: number | null
           updates: number
           users?: number | null
+          users_active?: number | null
         }
         Update: {
           apps?: number
+          apps_active?: number | null
           created_at?: string | null
           date_id?: string
           need_upgrade?: number | null
           not_paying?: number | null
           onboarded?: number | null
           paying?: number | null
+          paying_monthly?: number | null
+          paying_yearly?: number | null
           stars?: number
           trial?: number | null
           updates?: number
           users?: number | null
+          users_active?: number | null
         }
         Relationships: []
       }
@@ -1257,6 +1269,12 @@ export interface Database {
         }
         Returns: number
       }
+      count_active_users: {
+        Args: {
+          app_ids: string[]
+        }
+        Returns: number
+      }
       count_all_apps: {
         Args: Record<PropertyKey, never>
         Returns: number
@@ -1382,6 +1400,14 @@ export interface Database {
           }
           Returns: string
         }
+      get_customer_counts: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          yearly: number
+          monthly: number
+          total: number
+        }[]
+      }
       get_cycle_info:
         | {
           Args: Record<PropertyKey, never>
@@ -1930,35 +1956,37 @@ export interface Database {
     }
     CompositeTypes: {
       match_plan: {
-        name: string
+        name: string | null
       }
       orgs_table: {
-        id: string
-        created_by: string
-        created_at: string
-        updated_at: string
-        logo: string
-        name: string
+        id: string | null
+        created_by: string | null
+        created_at: string | null
+        updated_at: string | null
+        logo: string | null
+        name: string | null
       }
       owned_orgs: {
-        id: string
-        created_by: string
-        logo: string
-        name: string
-        role: string
+        id: string | null
+        created_by: string | null
+        logo: string | null
+        name: string | null
+        role: string | null
       }
       stats_table: {
-        mau: number
-        bandwidth: number
-        storage: number
+        mau: number | null
+        bandwidth: number | null
+        storage: number | null
       }
     }
   }
 }
 
+type PublicSchema = Database[Extract<keyof Database, 'public'>]
+
 export type Tables<
   PublicTableNameOrOptions extends
-  | keyof (Database['public']['Tables'] & Database['public']['Views'])
+  | keyof (PublicSchema['Tables'] & PublicSchema['Views'])
   | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
     ? keyof (Database[PublicTableNameOrOptions['schema']]['Tables'] &
@@ -1971,10 +1999,10 @@ export type Tables<
     }
       ? R
       : never
-  : PublicTableNameOrOptions extends keyof (Database['public']['Tables'] &
-  Database['public']['Views'])
-    ? (Database['public']['Tables'] &
-    Database['public']['Views'])[PublicTableNameOrOptions] extends {
+  : PublicTableNameOrOptions extends keyof (PublicSchema['Tables'] &
+  PublicSchema['Views'])
+    ? (PublicSchema['Tables'] &
+    PublicSchema['Views'])[PublicTableNameOrOptions] extends {
         Row: infer R
       }
         ? R
@@ -1983,7 +2011,7 @@ export type Tables<
 
 export type TablesInsert<
   PublicTableNameOrOptions extends
-  | keyof Database['public']['Tables']
+  | keyof PublicSchema['Tables']
   | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
     ? keyof Database[PublicTableNameOrOptions['schema']]['Tables']
@@ -1994,8 +2022,8 @@ export type TablesInsert<
   }
     ? I
     : never
-  : PublicTableNameOrOptions extends keyof Database['public']['Tables']
-    ? Database['public']['Tables'][PublicTableNameOrOptions] extends {
+  : PublicTableNameOrOptions extends keyof PublicSchema['Tables']
+    ? PublicSchema['Tables'][PublicTableNameOrOptions] extends {
       Insert: infer I
     }
       ? I
@@ -2004,7 +2032,7 @@ export type TablesInsert<
 
 export type TablesUpdate<
   PublicTableNameOrOptions extends
-  | keyof Database['public']['Tables']
+  | keyof PublicSchema['Tables']
   | { schema: keyof Database },
   TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
     ? keyof Database[PublicTableNameOrOptions['schema']]['Tables']
@@ -2015,8 +2043,8 @@ export type TablesUpdate<
   }
     ? U
     : never
-  : PublicTableNameOrOptions extends keyof Database['public']['Tables']
-    ? Database['public']['Tables'][PublicTableNameOrOptions] extends {
+  : PublicTableNameOrOptions extends keyof PublicSchema['Tables']
+    ? PublicSchema['Tables'][PublicTableNameOrOptions] extends {
       Update: infer U
     }
       ? U
@@ -2025,13 +2053,13 @@ export type TablesUpdate<
 
 export type Enums<
   PublicEnumNameOrOptions extends
-  | keyof Database['public']['Enums']
+  | keyof PublicSchema['Enums']
   | { schema: keyof Database },
   EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
     ? keyof Database[PublicEnumNameOrOptions['schema']]['Enums']
     : never = never,
 > = PublicEnumNameOrOptions extends { schema: keyof Database }
   ? Database[PublicEnumNameOrOptions['schema']]['Enums'][EnumName]
-  : PublicEnumNameOrOptions extends keyof Database['public']['Enums']
-    ? Database['public']['Enums'][PublicEnumNameOrOptions]
+  : PublicEnumNameOrOptions extends keyof PublicSchema['Enums']
+    ? PublicSchema['Enums'][PublicEnumNameOrOptions]
     : never

package/src/utils.ts

@@ -18,6 +18,7 @@ export const baseKeyPub = `${baseKey}.pub`
 export const defaultHost = 'https://capgo.app'
 export const defaultApiHost = 'https://api.capgo.app'
 export const defaultHostWeb = 'https://web.capgo.app'
+export const EMPTY_UUID = '00000000-0000-0000-0000-000000000000'
 
 export const regexSemver = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
 export const formatError = (error: any) => error ? `\n${prettyjson.render(error)}` : ''
@@ -192,7 +193,7 @@ export enum OrganizationPerm {
   upload = 2,
   write = 3,
   admin = 4,
-  owner = 5,
+  super_admin = 5,
 }
 
 export const hasOrganizationPerm = (perm: OrganizationPerm, required: OrganizationPerm): boolean => (perm as number) >= (required as number)
@@ -234,7 +235,7 @@ export async function isAllowedAppOrg(supabase: SupabaseClient<Database>, apikey
         break
       }
       case 'perm_owner': {
-        perm = OrganizationPerm.owner
+        perm = OrganizationPerm.super_admin
         break
       }
       default: {
@@ -406,10 +407,10 @@ export async function updateOrCreateVersion(supabase: SupabaseClient<Database>,
     .eq('name', update.name)
 }
 
-export async function uploadUrl(supabase: SupabaseClient<Database>, appId: string, bucketId: string): Promise<string> {
+export async function uploadUrl(supabase: SupabaseClient<Database>, appId: string, name: string): Promise<string> {
   const data = {
     app_id: appId,
-    bucket_id: bucketId,
+    name,
   }
   try {
     const pathUploadLink = 'private/upload_link'
@@ -433,7 +434,7 @@ export async function updateOrCreateChannel(supabase: SupabaseClient<Database>,
     .select('enable_progressive_deploy, secondaryVersionPercentage, secondVersion')
     .eq('app_id', update.app_id)
     .eq('name', update.name)
-  // .eq('created_by', update.created_by)
+    // .eq('created_by', update.created_by)
     .single()
 
   if (data && !error) {
@@ -459,7 +460,7 @@ export async function updateOrCreateChannel(supabase: SupabaseClient<Database>,
       .update(update)
       .eq('app_id', update.app_id)
       .eq('name', update.name)
-    // .eq('created_by', update.created_by)
+      // .eq('created_by', update.created_by)
       .select()
       .single()
   }