@@ -17,8 +17,8 @@ import {
1717 type OperationNode ,
1818} from 'kysely' ;
1919import type { FieldDef , ModelDef , SchemaDef } from '../../schema' ;
20+ import { extractFieldName , extractModelName , stripAlias } from '../kysely-utils' ;
2021import { getModel , requireModel } from '../query-utils' ;
21- import { stripAlias } from './kysely-utils' ;
2222
2323type Scope = {
2424 model ?: string ;
@@ -170,7 +170,7 @@ export class QueryNameMapper extends OperationNodeTransformer {
170170 const scopes : Scope [ ] = node . from . froms . map ( ( node ) => {
171171 const { alias, node : innerNode } = stripAlias ( node ) ;
172172 return {
173- model : this . extractModelName ( innerNode ) ,
173+ model : extractModelName ( innerNode ) ,
174174 alias,
175175 namesMapped : false ,
176176 } ;
@@ -219,8 +219,8 @@ export class QueryNameMapper extends OperationNodeTransformer {
219219 selections . push ( SelectionNode . create ( transformed ) ) ;
220220 } else {
221221 // otherwise use an alias to preserve the original field name
222- const origFieldName = this . extractFieldName ( selection . selection ) ;
223- const fieldName = this . extractFieldName ( transformed ) ;
222+ const origFieldName = extractFieldName ( selection . selection ) ;
223+ const fieldName = extractFieldName ( transformed ) ;
224224 if ( fieldName !== origFieldName ) {
225225 selections . push (
226226 SelectionNode . create (
@@ -425,7 +425,7 @@ export class QueryNameMapper extends OperationNodeTransformer {
425425 private processSelection ( node : AliasNode | ColumnNode | ReferenceNode ) {
426426 let alias : string | undefined ;
427427 if ( ! AliasNode . is ( node ) ) {
428- alias = this . extractFieldName ( node ) ;
428+ alias = extractFieldName ( node ) ;
429429 }
430430 const result = super . transformNode ( node ) ;
431431 return this . wrapAlias ( result , alias ? IdentifierNode . create ( alias ) : undefined ) ;
@@ -451,20 +451,5 @@ export class QueryNameMapper extends OperationNodeTransformer {
451451 } ) ;
452452 }
453453
454- private extractModelName ( node : OperationNode ) : string | undefined {
455- const { node : innerNode } = stripAlias ( node ) ;
456- return TableNode . is ( innerNode ! ) ? innerNode ! . table . identifier . name : undefined ;
457- }
458-
459- private extractFieldName ( node : ReferenceNode | ColumnNode ) {
460- if ( ReferenceNode . is ( node ) && ColumnNode . is ( node . column ) ) {
461- return node . column . column . name ;
462- } else if ( ColumnNode . is ( node ) ) {
463- return node . column . name ;
464- } else {
465- return undefined ;
466- }
467- }
468-
469454 // #endregion
470455}
0 commit comments