diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1af6b1d..1b86d8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,9 +132,8 @@ jobs: - name: Create Environment File run: | # Extract anon key and service key from Supabase output - # Handle the exact format with leading spaces for anon key - ANON_KEY=$(grep -E '^\s+anon key:' supabase_output.txt | sed 's/.*anon key: //') - SERVICE_KEY=$(grep -E '^service_role key:' supabase_output.txt | sed 's/.*service_role key: //') + ANON_KEY=$(grep "sb_publishable_" supabase_output.txt | awk '{print $4}') + SERVICE_KEY=$(grep "sb_secret_" supabase_output.txt | awk '{print $4}') # Fallback: extract JWT tokens directly if the above fails if [ -z "$ANON_KEY" ] || [ -z "$SERVICE_KEY" ]; then diff --git a/eslint.config.js b/eslint.config.js index 621bc6b..ffb62a4 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -4,8 +4,9 @@ import react from "eslint-plugin-react"; import reactHooks from "eslint-plugin-react-hooks"; import reactRefresh from "eslint-plugin-react-refresh"; import tseslint from "typescript-eslint"; +import { defineConfig } from "eslint/config"; -export default tseslint.config( +export default defineConfig( { ignores: ["dist", "src/contexts/supabase/database.d.ts"] }, { extends: [js.configs.recommended, ...tseslint.configs.strictTypeChecked, ...tseslint.configs.stylisticTypeChecked], diff --git a/src/contexts/supabase/database.d.ts b/src/contexts/supabase/database.d.ts index a2b8de1..46da8e1 100644 --- a/src/contexts/supabase/database.d.ts +++ b/src/contexts/supabase/database.d.ts @@ -17,10 +17,10 @@ export type Database = { Functions: { graphql: { Args: { + extensions?: Json operationName?: string query?: string variables?: Json - extensions?: Json } Returns: Json } @@ -364,26 +364,23 @@ export type Database = { } } Functions: { - accept_co_authoring: { - Args: { post_id: string } - Returns: boolean - } + accept_co_authoring: { Args: { post_id: string }; Returns: boolean } extreme_danger_truncate_all_tables_yes_i_am_sure: { - Args: Record + Args: never Returns: undefined } get_posts_feed: { Args: { - has_text?: string[] + from_date?: string has_authors?: string[] has_categories?: string[] + has_text?: string[] liked_by?: string[] - from_date?: string - to_date?: string - sort_by?: string - sort_order?: string paging_limit?: number paging_offset?: number + sort_by?: string + sort_order?: string + to_date?: string } Returns: { body: string | null @@ -392,22 +389,28 @@ export type Database = { parent_post: string | null rt_of: string | null }[] + SetofOptions: { + from: "*" + to: "posts" + isOneToOne: false + isSetofReturn: true + } } get_profiles_feed: { Args: { - has_handle?: string[] - has_bio?: string[] - has_categories?: string[] + author_of?: string[] featured_by?: string[] features_user?: string[] - author_of?: string[] - likes_posts?: string[] from_date?: string - to_date?: string - sort_by?: string - sort_order?: string + has_bio?: string[] + has_categories?: string[] + has_handle?: string[] + likes_posts?: string[] paging_limit?: number paging_offset?: number + sort_by?: string + sort_order?: string + to_date?: string } Returns: { banner: string | null @@ -418,11 +421,14 @@ export type Database = { pinned_posts: string[] | null profile_pic: string | null }[] + SetofOptions: { + from: "*" + to: "profiles" + isOneToOne: false + isSetofReturn: true + } } - id_of_ensured_category: { - Args: { request: string } - Returns: string - } + id_of_ensured_category: { Args: { request: string }; Returns: string } } Enums: { [_ in never]: never @@ -433,21 +439,25 @@ export type Database = { } } -type DefaultSchema = Database[Extract] +type DatabaseWithoutInternals = Omit + +type DefaultSchema = DatabaseWithoutInternals[Extract] export type Tables< DefaultSchemaTableNameOrOptions extends | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) - | { schema: keyof Database }, + | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof Database + schema: keyof DatabaseWithoutInternals } - ? keyof (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & - Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"]) + ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & + DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"]) : never = never, -> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database } - ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & - Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends { +> = DefaultSchemaTableNameOrOptions extends { + schema: keyof DatabaseWithoutInternals +} + ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & + DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends { Row: infer R } ? R @@ -465,14 +475,16 @@ export type Tables< export type TablesInsert< DefaultSchemaTableNameOrOptions extends | keyof DefaultSchema["Tables"] - | { schema: keyof Database }, + | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof Database + schema: keyof DatabaseWithoutInternals } - ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] + ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never, -> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database } - ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { +> = DefaultSchemaTableNameOrOptions extends { + schema: keyof DatabaseWithoutInternals +} + ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { Insert: infer I } ? I @@ -488,14 +500,16 @@ export type TablesInsert< export type TablesUpdate< DefaultSchemaTableNameOrOptions extends | keyof DefaultSchema["Tables"] - | { schema: keyof Database }, + | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof Database + schema: keyof DatabaseWithoutInternals } - ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] + ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never, -> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database } - ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { +> = DefaultSchemaTableNameOrOptions extends { + schema: keyof DatabaseWithoutInternals +} + ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { Update: infer U } ? U @@ -511,14 +525,16 @@ export type TablesUpdate< export type Enums< DefaultSchemaEnumNameOrOptions extends | keyof DefaultSchema["Enums"] - | { schema: keyof Database }, + | { schema: keyof DatabaseWithoutInternals }, EnumName extends DefaultSchemaEnumNameOrOptions extends { - schema: keyof Database + schema: keyof DatabaseWithoutInternals } - ? keyof Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"] + ? keyof DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"] : never = never, -> = DefaultSchemaEnumNameOrOptions extends { schema: keyof Database } - ? Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName] +> = DefaultSchemaEnumNameOrOptions extends { + schema: keyof DatabaseWithoutInternals +} + ? DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName] : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"] ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions] : never @@ -526,14 +542,16 @@ export type Enums< export type CompositeTypes< PublicCompositeTypeNameOrOptions extends | keyof DefaultSchema["CompositeTypes"] - | { schema: keyof Database }, + | { schema: keyof DatabaseWithoutInternals }, CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { - schema: keyof Database + schema: keyof DatabaseWithoutInternals } - ? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"] + ? keyof DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"] : never = never, -> = PublicCompositeTypeNameOrOptions extends { schema: keyof Database } - ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName] +> = PublicCompositeTypeNameOrOptions extends { + schema: keyof DatabaseWithoutInternals +} + ? DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName] : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"] ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions] : never