feat(typegen): add postgrest_version parameter to typegen #1740
avalleteAnnotations
5 errors
|
Test
Process completed with exit code 1.
|
|
test/index.test.ts > typegen: typescript w/ postgrestVersion:
test/server/typegen.ts#L1884
Error: Snapshot `typegen: typescript w/ postgrestVersion 1` mismatched
- Expected
+ Received
@@ -5,10 +5,15 @@
| null
| { [key: string]: Json | undefined }
| Json[]
export type Database = {
+ // Allows to automatically instanciate createClient with right options
+ // instead of createClient<Database, { PostgrestVersion: 'XX' }>(URL, KEY)
+ __InternalSupabase: {
+ PostgrestVersion: "13"
+ }
public: {
Tables: {
category: {
Row: {
id: number
@@ -501,47 +506,31 @@
composite_type_with_record_attribute: {
todo: Database["public"]["Tables"]["todos"]["Row"] | null
}
}
}
- // Allows to automatically instanciate createClient with right options
- // instead of createClient<Database, { PostgrestVersion: 'XX' }>(URL, KEY)
- __InternalSupabase: {
- PostgrestVersion: "13"
- Tables: {
- [_ in never]: never
- }
- Views: {
- [_ in never]: never
- }
- Functions: {
- [_ in never]: never
- }
- Enums: {
- [_ in never]: never
- }
- CompositeTypes: {
- [_ in never]: never
- }
- }
- }
+ }
+
+ type DatabaseWithoutInternals = Omit<Database, "__InternalSupabase">
- type DefaultSchema = Database[Extract<keyof Database, "public">]
+ type DefaultSchema = DatabaseWithoutInternals[Extract<keyof Database, "public">]
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"] &
+ ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
- Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
: never = never,
- > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
- ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+ > = DefaultSchemaTableNameOrOptions extends {
+ schema: keyof DatabaseWithoutInternals
+ }
+ ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
- Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
Row: infer R
}
? R
: never
: DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
@@ -555,18 +544,20 @@
: never
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
: never
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
@@ -578,18 +569,20 @@
: never
export type TablesUpdate<
DefaultSchemaTableNameOrOptions extends
| keyof DefaultSchema["Tables"]
- | { schema: keyof Database },
+ | { schema: keyof DatabaseWithoutInternals },
TableName extends DefaultS
|
|
test/index.test.ts > typegen: typescript w/ one-to-one relationships:
test/server/typegen.ts#L1251
Error: Snapshot `typegen: typescript w/ one-to-one relationships 1` mismatched
- Expected
+ Received
@@ -503,25 +503,29 @@
}
}
}
}
- type DefaultSchema = Database[Extract<keyof Database, "public">]
+ type DatabaseWithoutInternals = Omit<Database, "__InternalSupabase">
+
+ type DefaultSchema = DatabaseWithoutInternals[Extract<keyof Database, "public">]
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"] &
+ ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
- Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
: never = never,
- > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
- ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+ > = DefaultSchemaTableNameOrOptions extends {
+ schema: keyof DatabaseWithoutInternals
+ }
+ ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
- Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
Row: infer R
}
? R
: never
: DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
@@ -535,18 +539,20 @@
: never
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
: never
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
@@ -558,18 +564,20 @@
: never
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
: never
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
@@ -581,33 +589,37 @@
: never
export type Enums<
DefaultSchemaEnumNameOrOptions extends
| keyof DefaultSchema["Enums"]
- | { schema: keyof Database },
+ | { schema: keyof DatabaseWithoutI
|
|
test/index.test.ts > typegen w/ one-to-one relationships:
test/server/typegen.ts#L618
Error: Snapshot `typegen w/ one-to-one relationships 1` mismatched
- Expected
+ Received
@@ -503,25 +503,29 @@
}
}
}
}
- type DefaultSchema = Database[Extract<keyof Database, "public">]
+ type DatabaseWithoutInternals = Omit<Database, "__InternalSupabase">
+
+ type DefaultSchema = DatabaseWithoutInternals[Extract<keyof Database, "public">]
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"] &
+ ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
- Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
: never = never,
- > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
- ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+ > = DefaultSchemaTableNameOrOptions extends {
+ schema: keyof DatabaseWithoutInternals
+ }
+ ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
- Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
Row: infer R
}
? R
: never
: DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
@@ -535,18 +539,20 @@
: never
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
: never
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
@@ -558,18 +564,20 @@
: never
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
: never
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
@@ -581,33 +589,37 @@
: never
export type Enums<
DefaultSchemaEnumNameOrOptions extends
| keyof DefaultSchema["Enums"]
- | { schema: keyof Database },
+ | { schema: keyof DatabaseWithoutInternals },
|
|
test/index.test.ts > typegen: typescript:
test/server/typegen.ts#L6
Error: Snapshot `typegen: typescript 1` mismatched
- Expected
+ Received
@@ -482,25 +482,29 @@
}
}
}
}
- type DefaultSchema = Database[Extract<keyof Database, "public">]
+ type DatabaseWithoutInternals = Omit<Database, "__InternalSupabase">
+
+ type DefaultSchema = DatabaseWithoutInternals[Extract<keyof Database, "public">]
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"] &
+ ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
- Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
: never = never,
- > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
- ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+ > = DefaultSchemaTableNameOrOptions extends {
+ schema: keyof DatabaseWithoutInternals
+ }
+ ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
- Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+ DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
Row: infer R
}
? R
: never
: DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
@@ -514,18 +518,20 @@
: never
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
: never
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
@@ -537,18 +543,20 @@
: never
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
: never
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
@@ -560,33 +568,37 @@
: never
export type Enums<
DefaultSchemaEnumNameOrOptions extends
| keyof DefaultSchema["Enums"]
- | { schema: keyof Database },
+ | { schema: keyof DatabaseWithoutInternals },
EnumName ext
|