Simplify transform (#354)

Author: fisker

eslint.config.js

@@ -6,7 +6,7 @@ import globals from 'globals';
 import tseslint from 'typescript-eslint';
 
 export default tseslint.config(
-  { ignores: ['coverage/', 'lib/', '**/.yarn/**', '**/.pnp.*'] },
+  { ignores: ['coverage/', 'lib/', '**/.yarn/**', '**/.pnp.*', 'dist*/'] },
   eslintPluginJs.configs.recommended,
   ...tseslint.configs.recommended,
   eslintConfigPrettier,

prettier.config.js

@@ -1,3 +1,7 @@
+/**
+ * @see https://prettier.io/docs/configuration
+ * @type {import("prettier").Config}
+ */
 export default {
   singleQuote: true,
   trailingComma: 'all',

src/angular-parser.ts

@@ -38,10 +38,7 @@ function extractComments(text: string, shouldExtractComment: boolean) {
     }),
   };
 
-  return {
-    text: text.slice(0, commentStart),
-    comments: [comment],
-  };
+  return { text: text.slice(0, commentStart), comments: [comment] };
 }
 
 function createAngularParseFunction<

src/source.ts

@@ -1,3 +1,4 @@
+import * as angular from '@angular/compiler';
 import type * as babel from '@babel/types';
 
 import type { LocationInformation, NGNode, RawNGSpan } from './types.ts';
@@ -27,11 +28,26 @@ export class Source {
   }
 
   createNode<T extends NGNode>(
-    properties: Partial<T> & { type: T['type'] } & RawNGSpan,
+    properties: Partial<T> & { type: T['type'] },
+    location: angular.AST | RawNGSpan | [number, number],
   ) {
+    let start: number;
+    let end: number;
+    let range: [number, number];
+    if (Array.isArray(location)) {
+      range = location;
+      [start, end] = location;
+    } else {
+      ({ start, end } =
+        location instanceof angular.AST ? location.sourceSpan : location);
+      range = [start, end];
+    }
+
     const node = {
+      start,
+      end,
+      range,
       ...properties,
-      range: [properties.start, properties.end],
     } as T & LocationInformation;
 
     switch (node.type) {