@supabase/postgrest-js 1.17.1 → 1.17.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist/cjs/select-query-parser/parser.d.ts +17 -35
  2. package/dist/cjs/select-query-parser/parser.d.ts.map +1 -1
  3. package/dist/cjs/select-query-parser/result.d.ts +7 -7
  4. package/dist/cjs/select-query-parser/result.d.ts.map +1 -1
  5. package/dist/cjs/select-query-parser/utils.d.ts +43 -42
  6. package/dist/cjs/select-query-parser/utils.d.ts.map +1 -1
  7. package/package.json +2 -2
  8. package/src/select-query-parser/parser.ts +58 -54
  9. package/src/select-query-parser/result.ts +63 -39
  10. package/src/select-query-parser/utils.ts +197 -178
  11. package/src/version.ts +1 -1
package/dist/cjs/select-query-parser/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/select-query-parser/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/select-query-parser/utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@supabase/postgrest-js",
3
- "version": "1.17.1",
3
+ "version": "1.17.3",
4
4
  "description": "Isomorphic PostgREST client",
5
5
  "keywords": [
6
6
  "postgrest",
@@ -60,7 +60,7 @@
60
60
  "ts-jest": "^28.0.3",
61
61
  "tsd": "^0.31.2",
62
62
  "typedoc": "^0.22.16",
63
- "typescript": "~4.7",
63
+ "typescript": "4.5.5",
64
64
  "wait-for-localhost-cli": "^3.0.0"
65
65
  }
66
66
  }
package/src/select-query-parser/parser.ts CHANGED
@@ -12,10 +12,12 @@ import { SimplifyDeep } from '../types'
12
12
  */
13
13
  export type ParseQuery<Query extends string> = string extends Query
14
14
  ? GenericStringError
15
- : ParseNodes<EatWhitespace<Query>> extends [infer Nodes extends Ast.Node[], `${infer Remainder}`]
16
- ? EatWhitespace<Remainder> extends ''
17
- ? SimplifyDeep<Nodes>
18
- : ParserError<`Unexpected input: ${Remainder}`>
15
+ : ParseNodes<EatWhitespace<Query>> extends [infer Nodes, `${infer Remainder}`]
16
+ ? Nodes extends Ast.Node[]
17
+ ? EatWhitespace<Remainder> extends ''
18
+ ? SimplifyDeep<Nodes>
19
+ : ParserError<`Unexpected input: ${Remainder}`>
20
+ : ParserError<'Invalid nodes array structure'>
19
21
  : ParseNodes<EatWhitespace<Query>>
20
22
 
21
23
  /**
@@ -34,14 +36,15 @@ type ParseNodes<Input extends string> = string extends Input
34
36
  : ParseNodesHelper<Input, []>
35
37
 
36
38
  type ParseNodesHelper<Input extends string, Nodes extends Ast.Node[]> = ParseNode<Input> extends [
37
- infer Node extends Ast.Node,
39
+ infer Node,
38
40
  `${infer Remainder}`
39
41
  ]
40
- ? EatWhitespace<Remainder> extends `,${infer Remainder}`
41
- ? ParseNodesHelper<EatWhitespace<Remainder>, [...Nodes, Node]>
42
- : [[...Nodes, Node], EatWhitespace<Remainder>]
42
+ ? Node extends Ast.Node
43
+ ? EatWhitespace<Remainder> extends `,${infer Remainder}`
44
+ ? ParseNodesHelper<EatWhitespace<Remainder>, [...Nodes, Node]>
45
+ : [[...Nodes, Node], EatWhitespace<Remainder>]
46
+ : ParserError<'Invalid node type in nodes helper'>
43
47
  : ParseNode<Input>
44
-
45
48
  /**
46
49
  * Parses a node.
47
50
  * A node is one of the following:
@@ -57,11 +60,10 @@ type ParseNode<Input extends string> = Input extends ''
57
60
  ? [Ast.StarNode, EatWhitespace<Remainder>]
58
61
  : // `...field`
59
62
  Input extends `...${infer Remainder}`
60
- ? ParseField<EatWhitespace<Remainder>> extends [
61
- infer TargetField extends Ast.FieldNode,
62
- `${infer Remainder}`
63
- ]
64
- ? [{ type: 'spread'; target: TargetField }, EatWhitespace<Remainder>]
63
+ ? ParseField<EatWhitespace<Remainder>> extends [infer TargetField, `${infer Remainder}`]
64
+ ? TargetField extends Ast.FieldNode
65
+ ? [{ type: 'spread'; target: TargetField }, EatWhitespace<Remainder>]
66
+ : ParserError<'Invalid target field type in spread'>
65
67
  : ParserError<`Unable to parse spread resource at \`${Input}\``>
66
68
  : ParseIdentifier<Input> extends [infer NameOrAlias, `${infer Remainder}`]
67
69
  ? EatWhitespace<Remainder> extends `::${infer _}`
@@ -69,11 +71,10 @@ type ParseNode<Input extends string> = Input extends ''
69
71
  ParseField<Input>
70
72
  : EatWhitespace<Remainder> extends `:${infer Remainder}`
71
73
  ? // `alias:`
72
- ParseField<EatWhitespace<Remainder>> extends [
73
- infer Field extends Ast.FieldNode,
74
- `${infer Remainder}`
75
- ]
76
- ? [Omit<Field, 'alias'> & { alias: NameOrAlias }, EatWhitespace<Remainder>]
74
+ ParseField<EatWhitespace<Remainder>> extends [infer Field, `${infer Remainder}`]
75
+ ? Field extends Ast.FieldNode
76
+ ? [Omit<Field, 'alias'> & { alias: NameOrAlias }, EatWhitespace<Remainder>]
77
+ : ParserError<'Invalid field type in alias parsing'>
77
78
  : ParserError<`Unable to parse renamed field at \`${Input}\``>
78
79
  : // Otherwise, just parse it as a field without alias.
79
80
  ParseField<Input>
@@ -98,24 +99,22 @@ type ParseField<Input extends string> = Input extends ''
98
99
  ? Name extends 'count'
99
100
  ? ParseCountField<Input>
100
101
  : Remainder extends `!inner${infer Remainder}`
101
- ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
102
- infer Children extends Ast.Node[],
103
- `${infer Remainder}`
104
- ]
105
- ? // `field!inner(nodes)`
106
- [{ type: 'field'; name: Name; innerJoin: true; children: Children }, Remainder]
102
+ ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [infer Children, `${infer Remainder}`]
103
+ ? Children extends Ast.Node[]
104
+ ? // `field!inner(nodes)`
105
+ [{ type: 'field'; name: Name; innerJoin: true; children: Children }, Remainder]
106
+ : ParserError<'Invalid children array in inner join'>
107
107
  : CreateParserErrorIfRequired<
108
108
  ParseEmbeddedResource<EatWhitespace<Remainder>>,
109
109
  `Expected embedded resource after "!inner" at \`${Remainder}\``
110
110
  >
111
111
  : EatWhitespace<Remainder> extends `!left${infer Remainder}`
112
- ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
113
- infer Children extends Ast.Node[],
114
- `${infer Remainder}`
115
- ]
116
- ? // `field!left(nodes)`
117
- // !left is a noise word - treat it the same way as a non-`!inner`.
118
- [{ type: 'field'; name: Name; children: Children }, EatWhitespace<Remainder>]
112
+ ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [infer Children, `${infer Remainder}`]
113
+ ? Children extends Ast.Node[]
114
+ ? // `field!left(nodes)`
115
+ // !left is a noise word - treat it the same way as a non-`!inner`.
116
+ [{ type: 'field'; name: Name; children: Children }, EatWhitespace<Remainder>]
117
+ : ParserError<'Invalid children array in left join'>
119
118
  : CreateParserErrorIfRequired<
120
119
  ParseEmbeddedResource<EatWhitespace<Remainder>>,
121
120
  `Expected embedded resource after "!left" at \`${EatWhitespace<Remainder>}\``
@@ -124,30 +123,36 @@ type ParseField<Input extends string> = Input extends ''
124
123
  ? ParseIdentifier<EatWhitespace<Remainder>> extends [infer Hint, `${infer Remainder}`]
125
124
  ? EatWhitespace<Remainder> extends `!inner${infer Remainder}`
126
125
  ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
127
- infer Children extends Ast.Node[],
126
+ infer Children,
128
127
  `${infer Remainder}`
129
128
  ]
130
- ? // `field!hint!inner(nodes)`
131
- [
132
- { type: 'field'; name: Name; hint: Hint; innerJoin: true; children: Children },
133
- EatWhitespace<Remainder>
134
- ]
129
+ ? Children extends Ast.Node[]
130
+ ? // `field!hint!inner(nodes)`
131
+ [
132
+ { type: 'field'; name: Name; hint: Hint; innerJoin: true; children: Children },
133
+ EatWhitespace<Remainder>
134
+ ]
135
+ : ParserError<'Invalid children array in hint inner join'>
135
136
  : ParseEmbeddedResource<EatWhitespace<Remainder>>
136
137
  : ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
137
- infer Children extends Ast.Node[],
138
+ infer Children,
138
139
  `${infer Remainder}`
139
140
  ]
140
- ? // `field!hint(nodes)`
141
- [{ type: 'field'; name: Name; hint: Hint; children: Children }, EatWhitespace<Remainder>]
141
+ ? Children extends Ast.Node[]
142
+ ? // `field!hint(nodes)`
143
+ [
144
+ { type: 'field'; name: Name; hint: Hint; children: Children },
145
+ EatWhitespace<Remainder>
146
+ ]
147
+ : ParserError<'Invalid children array in hint'>
142
148
  : ParseEmbeddedResource<EatWhitespace<Remainder>>
143
149
  : ParserError<`Expected identifier after "!" at \`${EatWhitespace<Remainder>}\``>
144
150
  : EatWhitespace<Remainder> extends `(${infer _}`
145
- ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
146
- infer Children extends Ast.Node[],
147
- `${infer Remainder}`
148
- ]
149
- ? // `field(nodes)`
150
- [{ type: 'field'; name: Name; children: Children }, EatWhitespace<Remainder>]
151
+ ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [infer Children, `${infer Remainder}`]
152
+ ? Children extends Ast.Node[]
153
+ ? // `field(nodes)`
154
+ [{ type: 'field'; name: Name; children: Children }, EatWhitespace<Remainder>]
155
+ : ParserError<'Invalid children array in field'>
151
156
  : // Return error if start of embedded resource was detected but not found.
152
157
  ParseEmbeddedResource<EatWhitespace<Remainder>>
153
158
  : // Otherwise it's a non-embedded resource field.
@@ -184,13 +189,12 @@ type ParseCountField<Input extends string> = ParseIdentifier<Input> extends [
184
189
  type ParseEmbeddedResource<Input extends string> = Input extends `(${infer Remainder}`
185
190
  ? EatWhitespace<Remainder> extends `)${infer Remainder}`
186
191
  ? [[], EatWhitespace<Remainder>]
187
- : ParseNodes<EatWhitespace<Remainder>> extends [
188
- infer Nodes extends Ast.Node[],
189
- `${infer Remainder}`
190
- ]
191
- ? EatWhitespace<Remainder> extends `)${infer Remainder}`
192
- ? [Nodes, EatWhitespace<Remainder>]
193
- : ParserError<`Expected ")" at \`${EatWhitespace<Remainder>}\``>
192
+ : ParseNodes<EatWhitespace<Remainder>> extends [infer Nodes, `${infer Remainder}`]
193
+ ? Nodes extends Ast.Node[]
194
+ ? EatWhitespace<Remainder> extends `)${infer Remainder}`
195
+ ? [Nodes, EatWhitespace<Remainder>]
196
+ : ParserError<`Expected ")" at \`${EatWhitespace<Remainder>}\``>
197
+ : ParserError<'Invalid nodes array in embedded resource'>
194
198
  : ParseNodes<EatWhitespace<Remainder>>
195
199
  : ParserError<`Expected "(" at \`${Input}\``>
196
200
 
package/src/select-query-parser/result.ts CHANGED
@@ -35,14 +35,18 @@ export type GetResult<
35
35
  Relationships,
36
36
  Query extends string
37
37
  > = IsAny<Schema> extends true
38
- ? ParseQuery<Query> extends infer ParsedQuery extends Ast.Node[]
39
- ? RelationName extends string
40
- ? ProcessNodesWithoutSchema<ParsedQuery>
41
- : any
38
+ ? ParseQuery<Query> extends infer ParsedQuery
39
+ ? ParsedQuery extends Ast.Node[]
40
+ ? RelationName extends string
41
+ ? ProcessNodesWithoutSchema<ParsedQuery>
42
+ : any
43
+ : ParsedQuery
42
44
  : any
43
45
  : Relationships extends null // For .rpc calls the passed relationships will be null in that case, the result will always be the function return type
44
- ? ParseQuery<Query> extends infer ParsedQuery extends Ast.Node[]
45
- ? RPCCallNodes<ParsedQuery, RelationName extends string ? RelationName : 'rpc_call', Row>
46
+ ? ParseQuery<Query> extends infer ParsedQuery
47
+ ? ParsedQuery extends Ast.Node[]
48
+ ? RPCCallNodes<ParsedQuery, RelationName extends string ? RelationName : 'rpc_call', Row>
49
+ : ParsedQuery
46
50
  : Row
47
51
  : ParseQuery<Query> extends infer ParsedQuery
48
52
  ? ParsedQuery extends Ast.Node[]
@@ -111,11 +115,15 @@ type ProcessNodeWithoutSchema<Node extends Ast.Node> = Node extends Ast.StarNode
111
115
  type ProcessNodesWithoutSchema<
112
116
  Nodes extends Ast.Node[],
113
117
  Acc extends Record<string, unknown> = {}
114
- > = Nodes extends [infer FirstNode extends Ast.Node, ...infer RestNodes extends Ast.Node[]]
115
- ? ProcessNodeWithoutSchema<FirstNode> extends infer FieldResult
116
- ? FieldResult extends Record<string, unknown>
117
- ? ProcessNodesWithoutSchema<RestNodes, Acc & FieldResult>
118
- : FieldResult
118
+ > = Nodes extends [infer FirstNode, ...infer RestNodes]
119
+ ? FirstNode extends Ast.Node
120
+ ? RestNodes extends Ast.Node[]
121
+ ? ProcessNodeWithoutSchema<FirstNode> extends infer FieldResult
122
+ ? FieldResult extends Record<string, unknown>
123
+ ? ProcessNodesWithoutSchema<RestNodes, Acc & FieldResult>
124
+ : FieldResult
125
+ : any
126
+ : any
119
127
  : any
120
128
  : Prettify<Acc>
121
129
 
@@ -130,11 +138,12 @@ export type ProcessRPCNode<
130
138
  Row extends Record<string, unknown>,
131
139
  RelationName extends string,
132
140
  NodeType extends Ast.Node
133
- > = NodeType extends Ast.StarNode // If the selection is *
141
+ > = NodeType['type'] extends Ast.StarNode['type'] // If the selection is *
134
142
  ? Row
135
- : NodeType extends Ast.FieldNode
136
- ? ProcessSimpleField<Row, RelationName, NodeType>
137
- : SelectQueryError<'Unsupported node type.'>
143
+ : NodeType['type'] extends Ast.FieldNode['type']
144
+ ? ProcessSimpleField<Row, RelationName, Extract<NodeType, Ast.FieldNode>>
145
+ : SelectQueryError<'RPC Unsupported node type.'>
146
+
138
147
  /**
139
148
  * Process select call that can be chained after an rpc call
140
149
  */
@@ -143,14 +152,18 @@ export type RPCCallNodes<
143
152
  RelationName extends string,
144
153
  Row extends Record<string, unknown>,
145
154
  Acc extends Record<string, unknown> = {} // Acc is now an object
146
- > = Nodes extends [infer FirstNode extends Ast.Node, ...infer RestNodes extends Ast.Node[]]
147
- ? ProcessRPCNode<Row, RelationName, FirstNode> extends infer FieldResult
148
- ? FieldResult extends Record<string, unknown>
149
- ? RPCCallNodes<RestNodes, RelationName, Row, Acc & FieldResult>
150
- : FieldResult extends SelectQueryError<infer E>
151
- ? SelectQueryError<E>
152
- : SelectQueryError<'Could not retrieve a valid record or error value'>
153
- : SelectQueryError<'Processing node failed.'>
155
+ > = Nodes extends [infer FirstNode, ...infer RestNodes]
156
+ ? FirstNode extends Ast.Node
157
+ ? RestNodes extends Ast.Node[]
158
+ ? ProcessRPCNode<Row, RelationName, FirstNode> extends infer FieldResult
159
+ ? FieldResult extends Record<string, unknown>
160
+ ? RPCCallNodes<RestNodes, RelationName, Row, Acc & FieldResult>
161
+ : FieldResult extends SelectQueryError<infer E>
162
+ ? SelectQueryError<E>
163
+ : SelectQueryError<'Could not retrieve a valid record or error value'>
164
+ : SelectQueryError<'Processing node failed.'>
165
+ : SelectQueryError<'Invalid rest nodes array in RPC call'>
166
+ : SelectQueryError<'Invalid first node in RPC call'>
154
167
  : Prettify<Acc>
155
168
 
156
169
  /**
@@ -171,14 +184,18 @@ export type ProcessNodes<
171
184
  Nodes extends Ast.Node[],
172
185
  Acc extends Record<string, unknown> = {} // Acc is now an object
173
186
  > = CheckDuplicateEmbededReference<Schema, RelationName, Relationships, Nodes> extends false
174
- ? Nodes extends [infer FirstNode extends Ast.Node, ...infer RestNodes extends Ast.Node[]]
175
- ? ProcessNode<Schema, Row, RelationName, Relationships, FirstNode> extends infer FieldResult
176
- ? FieldResult extends Record<string, unknown>
177
- ? ProcessNodes<Schema, Row, RelationName, Relationships, RestNodes, Acc & FieldResult>
178
- : FieldResult extends SelectQueryError<infer E>
179
- ? SelectQueryError<E>
180
- : SelectQueryError<'Could not retrieve a valid record or error value'>
181
- : SelectQueryError<'Processing node failed.'>
187
+ ? Nodes extends [infer FirstNode, ...infer RestNodes]
188
+ ? FirstNode extends Ast.Node
189
+ ? RestNodes extends Ast.Node[]
190
+ ? ProcessNode<Schema, Row, RelationName, Relationships, FirstNode> extends infer FieldResult
191
+ ? FieldResult extends Record<string, unknown>
192
+ ? ProcessNodes<Schema, Row, RelationName, Relationships, RestNodes, Acc & FieldResult>
193
+ : FieldResult extends SelectQueryError<infer E>
194
+ ? SelectQueryError<E>
195
+ : SelectQueryError<'Could not retrieve a valid record or error value'>
196
+ : SelectQueryError<'Processing node failed.'>
197
+ : SelectQueryError<'Invalid rest nodes array type in ProcessNodes'>
198
+ : SelectQueryError<'Invalid first node type in ProcessNodes'>
182
199
  : Prettify<Acc>
183
200
  : Prettify<CheckDuplicateEmbededReference<Schema, RelationName, Relationships, Nodes>>
184
201
 
@@ -197,13 +214,15 @@ export type ProcessNode<
197
214
  RelationName extends string,
198
215
  Relationships extends GenericRelationship[],
199
216
  NodeType extends Ast.Node
200
- > = NodeType extends Ast.StarNode // If the selection is *
201
- ? Row
202
- : NodeType extends Ast.SpreadNode // If the selection is a ...spread
203
- ? ProcessSpreadNode<Schema, Row, RelationName, Relationships, NodeType>
204
- : NodeType extends Ast.FieldNode
205
- ? ProcessFieldNode<Schema, Row, RelationName, Relationships, NodeType>
206
- : SelectQueryError<'Unsupported node type.'>
217
+ > =
218
+ // TODO: figure out why comparing the `type` property is necessary vs. `NodeType extends Ast.StarNode`
219
+ NodeType['type'] extends Ast.StarNode['type'] // If the selection is *
220
+ ? Row
221
+ : NodeType['type'] extends Ast.SpreadNode['type'] // If the selection is a ...spread
222
+ ? ProcessSpreadNode<Schema, Row, RelationName, Relationships, Extract<NodeType, Ast.SpreadNode>>
223
+ : NodeType['type'] extends Ast.FieldNode['type']
224
+ ? ProcessFieldNode<Schema, Row, RelationName, Relationships, Extract<NodeType, Ast.FieldNode>>
225
+ : SelectQueryError<'Unsupported node type.'>
207
226
 
208
227
  /**
209
228
  * Processes a FieldNode and returns the resulting TypeScript type.
@@ -369,7 +388,12 @@ type ProcessSpreadNode<
369
388
  /**
370
389
  * Helper type to process the result of a spread node.
371
390
  */
372
- type ProcessSpreadNodeResult<Result> = ExtractFirstProperty<Result> extends infer SpreadedObject
391
+ type ProcessSpreadNodeResult<Result> = Result extends Record<
392
+ string,
393
+ SelectQueryError<string> | null
394
+ >
395
+ ? Result
396
+ : ExtractFirstProperty<Result> extends infer SpreadedObject
373
397
  ? ContainsNull<SpreadedObject> extends true
374
398
  ? Exclude<{ [K in keyof SpreadedObject]: SpreadedObject[K] | null }, null>
375
399
  : Exclude<{ [K in keyof SpreadedObject]: SpreadedObject[K] }, null>