Minor refactoring

Author: fisker

src/angular-parser.ts

@@ -10,7 +10,7 @@ import {
 } from '@angular/compiler';
 
 import { type CommentLine } from './types.ts';
-import { sourceSpanToLocationInformation } from './utils.ts';
+import { sourceSpanToLocationInformation } from './utilities.ts';
 
 const FILE_NAME = 'test.html';
 

…-transform/transform-array-expression.ts …t-transform-visitors/array-expression.tssrc/ast-transform/transform-array-expression.ts renamed to src/ast-transform-visitors/array-expression.ts src/ast-transform/transform-array-expression.ts renamed to src/ast-transform-visitors/array-expression.ts

@@ -1,11 +1,11 @@
 import { type LiteralArray } from '@angular/compiler';
 import type * as babel from '@babel/types';
 
-import { type Transformer } from './transform.ts';
+import { type NodeTransformer } from '../ast-transform/node-transformer.ts';
 
 export const visitLiteralArray = (
   node: LiteralArray,
-  transformer: Transformer,
+  transformer: NodeTransformer,
 ): babel.ArrayExpression => ({
   type: 'ArrayExpression',
   elements: transformer.transformChildren<babel.Expression>(node.expressions),

…t-transform/transform-ast-with-source.ts …st-transform-visitors/ast-with-source.tssrc/ast-transform/transform-ast-with-source.ts renamed to src/ast-transform-visitors/ast-with-source.ts src/ast-transform/transform-ast-with-source.ts renamed to src/ast-transform-visitors/ast-with-source.ts

@@ -1,8 +1,8 @@
 import { type ASTWithSource } from '@angular/compiler';
 
-import { type Transformer } from './transform.ts';
+import { type NodeTransformer } from '../ast-transform/node-transformer.ts';
 
 export const visitASTWithSource = (
   node: ASTWithSource,
-  transformer: Transformer,
+  transformer: NodeTransformer,
 ) => transformer.transformChild(node.ast);

…transform/transform-binary-expression.ts …-transform-visitors/binary-expression.tssrc/ast-transform/transform-binary-expression.ts renamed to src/ast-transform-visitors/binary-expression.ts src/ast-transform/transform-binary-expression.ts renamed to src/ast-transform-visitors/binary-expression.ts

@@ -1,7 +1,7 @@
 import { Binary } from '@angular/compiler';
 import type * as babel from '@babel/types';
 
-import { type Transformer } from './transform.ts';
+import { type NodeTransformer } from '../ast-transform/node-transformer.ts';
 
 const isAssignmentOperator = (
   operator: Binary['operation'],
@@ -15,7 +15,7 @@ const isLogicalOperator = (
 
 export const visitBinary = (
   node: Binary,
-  transformer: Transformer,
+  transformer: NodeTransformer,
 ):
   | babel.LogicalExpression
   | babel.AssignmentExpression

…t-transform/transform-call-expression.ts …st-transform-visitors/call-expression.tssrc/ast-transform/transform-call-expression.ts renamed to src/ast-transform-visitors/call-expression.ts src/ast-transform/transform-call-expression.ts renamed to src/ast-transform-visitors/call-expression.ts

@@ -1,8 +1,8 @@
 import { type Call, type SafeCall } from '@angular/compiler';
 import type * as babel from '@babel/types';
 
-import { type Transformer } from './transform.ts';
-import { isOptionalObjectOrCallee } from './utilities.ts';
+import { type NodeTransformer } from '../ast-transform/node-transformer.ts';
+import { isOptionalObjectOrCallee } from '../utilities.ts';
 
 const callOptions = { optional: false } as const;
 const safeCallOptions = { optional: true } as const;
@@ -22,7 +22,7 @@ const transformCall =
   }: Visitor['options']) =>
   (
     node: Visitor['node'],
-    transformer: Transformer,
+    transformer: NodeTransformer,
   ): babel.CallExpression | babel.OptionalCallExpression => {
     const arguments_ = transformer.transformChildren<babel.Expression>(
       node.args,

…ransform/transform-chained-expression.ts …transform-visitors/chained-expression.tssrc/ast-transform/transform-chained-expression.ts renamed to src/ast-transform-visitors/chained-expression.ts src/ast-transform/transform-chained-expression.ts renamed to src/ast-transform-visitors/chained-expression.ts

@@ -2,11 +2,11 @@ import { type Chain } from '@angular/compiler';
 import type * as babel from '@babel/types';
 
 import type { NGChainedExpression } from '../types.ts';
-import { type Transformer } from './transform.ts';
+import { type NodeTransformer } from '../ast-transform/node-transformer.ts';
 
 export const visitChain = (
   node: Chain,
-  transformer: Transformer,
+  transformer: NodeTransformer,
 ): Omit<NGChainedExpression, 'start' | 'end' | 'range'> => ({
   type: 'NGChainedExpression',
   expressions: transformer.transformChildren<babel.Expression>(

…form/transform-conditional-expression.ts …sform-visitors/conditional-expression.tssrc/ast-transform/transform-conditional-expression.ts renamed to src/ast-transform-visitors/conditional-expression.ts src/ast-transform/transform-conditional-expression.ts renamed to src/ast-transform-visitors/conditional-expression.ts

@@ -1,11 +1,11 @@
 import { type Conditional } from '@angular/compiler';
 import type * as babel from '@babel/types';
 
-import { type Transformer } from './transform.ts';
+import { type NodeTransformer } from '../ast-transform/node-transformer.ts';
 
 export const visitConditional = (
   node: Conditional,
-  transformer: Transformer,
+  transformer: NodeTransformer,
 ): babel.ConditionalExpression => {
   const [test, consequent, alternate] =
     transformer.transformChildren<babel.Expression>([

src/ast-transform-visitors/index.ts

@@ -0,0 +1,7 @@
+import { type AstVisitor } from '@angular/compiler';
+
+import * as visitors from './visitors.ts';
+
+type TransformVisitors = Required<Omit<AstVisitor, 'visit'>>;
+
+export const transformVisitors: TransformVisitors = visitors;

…ast-transform/transform-interpolation.ts …/ast-transform-visitors/interpolation.tssrc/ast-transform/transform-interpolation.ts renamed to src/ast-transform-visitors/interpolation.ts src/ast-transform/transform-interpolation.ts renamed to src/ast-transform-visitors/interpolation.ts

@@ -1,10 +1,10 @@
 import { type Interpolation } from '@angular/compiler';
 
-import { type Transformer } from './transform.ts';
+import { type NodeTransformer } from '../ast-transform/node-transformer.ts';
 
 export const visitInterpolation = (
   node: Interpolation,
-  transformer: Transformer,
+  transformer: NodeTransformer,
 ) => {
   const { expressions } = node;