Add ParseField helper

This removes the duplication of parsing required for renamed fields and
non-renamed fields.

Author: bnjmnt4n

src/select-query-parser.ts

@@ -141,12 +141,12 @@ type ConstructFieldDefinition<
           : Child[]
         : never
     }
+  : Field extends { name: string; type: infer T }
+  ? { [K in Field['name']]: T }
   : Field extends { name: string; original: string }
   ? Field['original'] extends keyof Row
     ? { [K in Field['name']]: Row[Field['original']] }
     : SelectQueryError<`Referencing missing column \`${Field['original']}\``>
-  : Field extends { name: string; type: infer T }
-  ? { [K in Field['name']]: T }
   : Record<string, unknown>
 
 /**
@@ -210,29 +210,19 @@ type ParseIdentifier<Input extends string> = ReadLetters<Input> extends [
   : ParserError<`No (possibly double-quoted) identifier at \`${Input}\``>
 
 /**
- * Parses a node.
- * A node is one of the following:
- * - `*`
+ * Parses a field without preceding field renaming.
+ * A field is one of the following:
  * - `field`
  * - `field->json...`
  * - `field(nodes)`
  * - `field!hint(nodes)`
  * - `field!inner(nodes)`
  * - `field!hint!inner(nodes)`
- * - `renamed_field:field`
- * - `renamed_field:field->json...`
- * - `renamed_field:field(nodes)`
- * - `renamed_field:field!hint(nodes)`
- * - `renamed_field:field!inner(nodes)`
- * - `renamed_field:field!hint!inner(nodes)`
  *
- * TODO: casting operators `::text`, more support for JSON operators `->`, `->>`.
+ * TODO: casting operators `::text`
  */
-type ParseNode<Input extends string> = Input extends ''
+type ParseField<Input extends string> = Input extends ''
   ? ParserError<'Empty string'>
-  : // `*`
-  Input extends `*${infer Remainder}`
-  ? [{ star: true }, EatWhitespace<Remainder>]
   : ParseIdentifier<Input> extends [infer Name, `${infer Remainder}`]
   ? EatWhitespace<Remainder> extends `!inner${infer Remainder}`
     ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [infer Fields, `${infer Remainder}`]
@@ -266,72 +256,6 @@ type ParseNode<Input extends string> = Input extends ''
             'Expected embedded resource after `!hint`'
           >
       : ParserError<'Expected identifier after `!`'>
-    : EatWhitespace<Remainder> extends `:${infer Remainder}`
-    ? ParseIdentifier<EatWhitespace<Remainder>> extends [infer OriginalName, `${infer Remainder}`]
-      ? EatWhitespace<Remainder> extends `!inner${infer Remainder}`
-        ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
-            infer Fields,
-            `${infer Remainder}`
-          ]
-          ? // `renamed_field:field!inner(nodes)`
-            [{ name: Name; original: OriginalName; children: Fields }, EatWhitespace<Remainder>]
-          : CreateParserErrorIfRequired<
-              ParseEmbeddedResource<EatWhitespace<Remainder>>,
-              'Expected embedded resource after `!inner`'
-            >
-        : EatWhitespace<Remainder> extends `!${infer Remainder}`
-        ? ParseIdentifier<EatWhitespace<Remainder>> extends [infer Hint, `${infer Remainder}`]
-          ? EatWhitespace<Remainder> extends `!inner${infer Remainder}`
-            ? ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
-                infer Fields,
-                `${infer Remainder}`
-              ]
-              ? // `renamed_field:field!hint!inner(nodes)`
-                [
-                  { name: Name; original: OriginalName; hint: Hint; children: Fields },
-                  EatWhitespace<Remainder>
-                ]
-              : CreateParserErrorIfRequired<
-                  ParseEmbeddedResource<EatWhitespace<Remainder>>,
-                  'Expected embedded resource after `!inner`'
-                >
-            : ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
-                infer Fields,
-                `${infer Remainder}`
-              ]
-            ? // `renamed_field:field!hint(nodes)`
-              [
-                {
-                  name: Name
-                  original: OriginalName
-                  hint: Hint
-                  children: Fields
-                },
-                EatWhitespace<Remainder>
-              ]
-            : CreateParserErrorIfRequired<
-                ParseEmbeddedResource<EatWhitespace<Remainder>>,
-                'Expected embedded resource after `!hint`'
-              >
-          : ParserError<'Expected identifier after `!`'>
-        : ParseEmbeddedResource<EatWhitespace<Remainder>> extends [
-            infer Fields,
-            `${infer Remainder}`
-          ]
-        ? // `renamed_field:field(nodes)`
-          [{ name: Name; original: OriginalName; children: Fields }, EatWhitespace<Remainder>]
-        : ParseJsonAccessor<EatWhitespace<Remainder>> extends [
-            infer _PropertyName,
-            infer PropertyType,
-            `${infer Remainder}`
-          ]
-        ? // `renamed_field:field->json...`
-          [{ name: Name; type: PropertyType }, EatWhitespace<Remainder>]
-        : ParseEmbeddedResource<EatWhitespace<Remainder>> extends ParserError<string>
-        ? ParseEmbeddedResource<EatWhitespace<Remainder>>
-        : // `renamed_field:field`
-          [{ name: Name; original: OriginalName }, EatWhitespace<Remainder>]
-      : ParseIdentifier<EatWhitespace<Remainder>>
     : ParseEmbeddedResource<EatWhitespace<Remainder>> extends [infer Fields, `${infer Remainder}`]
     ? // `field(nodes)`
       [{ name: Name; original: Name; children: Fields }, EatWhitespace<Remainder>]
@@ -341,13 +265,37 @@ type ParseNode<Input extends string> = Input extends ''
         `${infer Remainder}`
       ]
     ? // `field->json...`
-      [{ name: PropertyName; type: PropertyType }, EatWhitespace<Remainder>]
+      [{ name: PropertyName; original: PropertyName; type: PropertyType }, EatWhitespace<Remainder>]
     : ParseEmbeddedResource<EatWhitespace<Remainder>> extends ParserError<string>
     ? ParseEmbeddedResource<EatWhitespace<Remainder>>
     : // `field`
       [{ name: Name; original: Name }, EatWhitespace<Remainder>]
   : ParserError<`Expected identifier at \`${Input}\``>
 
+/**
+ * Parses a node.
+ * A node is one of the following:
+ * - `*`
+ * - a field, as defined above
+ * - a renamed field, `renamed_field:field`
+ */
+type ParseNode<Input extends string> = Input extends ''
+  ? ParserError<'Empty string'>
+  : // `*`
+  Input extends `*${infer Remainder}`
+  ? [{ star: true }, EatWhitespace<Remainder>]
+  : ParseIdentifier<Input> extends [infer Name, `${infer Remainder}`]
+  ? EatWhitespace<Remainder> extends `:${infer Remainder}`
+    ? // `renamed_field:`
+      ParseField<EatWhitespace<Remainder>> extends [infer Field, `${infer Remainder}`]
+      ? Field extends { name: string }
+        ? [Prettify<Omit<Field, 'name'> & { name: Name }>, EatWhitespace<Remainder>]
+        : ParserError<`Unable to parse renamed field`>
+      : ParserError<`Unable to parse renamed field`>
+    : // Otherwise, just parse it as a field without renaming.
+      ParseField<Input>
+  : ParserError<`Expected identifier at \`${Input}\``>
+
 /**
  * Parses a JSON property accessor of the shape `->a->b->c`. The last accessor in
  * the series may convert to text by using the ->> operator instead of ->.