refactor: Extracted ContentTag, parse(), Range

Author: ijlee2

src/parse/preprocess.ts

@@ -1,12 +1,9 @@
-import { Preprocessor } from 'content-tag';
+import { parse, type Range } from '../utils/content-tag.js';
 
 export interface Template {
   contents: string;
   type: string;
-  range: {
-    start: number;
-    end: number;
-  };
+  range: Range;
   utf16Range: {
     start: number;
     end: number;
@@ -93,11 +90,9 @@ export function preprocessTemplateRange(
   return replaceRange(code, template.range.start, template.range.end, total);
 }
 
-const p = new Preprocessor();
-
 /** Pre-processes the template info, parsing the template content to Glimmer AST. */
 export function codeToGlimmerAst(code: string, filename: string): Template[] {
-  const rawTemplates = p.parse(code, { filename });
+  const rawTemplates = parse(code, { filename });
 
   const templates: Template[] = rawTemplates.map((r) => ({
     type: r.type,

src/types/glimmer.ts

@@ -7,7 +7,8 @@ import type {
   StaticBlock,
   TSAsExpression,
 } from '@babel/types';
-import type { Parsed as RawGlimmerTemplate } from 'content-tag';
+
+import type { ContentTag } from '../utils/content-tag.js';
 
 type GlimmerTemplateProperties = (
   | BlockStatement
@@ -28,7 +29,7 @@ type GlimmerTemplateProperties = (
 
   extra: {
     isGlimmerTemplate: true;
-    template: RawGlimmerTemplate;
+    template: ContentTag;
     [key: string]: unknown;
   };
 };

src/utils/content-tag.ts

@@ -0,0 +1,22 @@
+/* eslint-disable @typescript-eslint/consistent-type-definitions, eslint-comments/disable-enable-pair, jsdoc/require-jsdoc, unicorn/prefer-export-from */
+import {
+  type Parsed as ContentTag,
+  Preprocessor,
+  type PreprocessorOptions,
+} from 'content-tag';
+
+type Range = {
+  end: number;
+  start: number;
+};
+
+export function parse(
+  file: string,
+  options?: PreprocessorOptions,
+): ContentTag[] {
+  const preprocessor = new Preprocessor();
+
+  return preprocessor.parse(file, options);
+}
+
+export type { ContentTag, Range };

tests/helpers/ambiguous.ts

@@ -1,7 +1,7 @@
-import { Preprocessor } from 'content-tag';
 import { describe, expect, test } from 'vitest';
 
 import type { Options } from '../../src/options.js';
+import { parse } from '../../src/utils/content-tag.js';
 import type { TestCase } from '../helpers/cases.js';
 import { getAllCases } from '../helpers/cases.js';
 import { format } from '../helpers/format.js';
@@ -13,8 +13,6 @@ import type { Config } from './make-suite.js';
  */
 export const AMBIGUOUS_PLACEHOLDER = '/*AMBIGUOUS*/';
 
-const preprocessor = new Preprocessor();
-
 const AMBIGUOUS_EXPRESSIONS = [
   '(oops) => {}',
   '(oh, no) => {}',
@@ -96,7 +94,7 @@ async function behavesLikeFormattedAmbiguousCase(
   try {
     const result = await format(code, formatOptions);
     expect(result).toMatchSnapshot();
-    preprocessor.parse(result);
+    parse(result);
   } catch (error: unknown) {
     // Some of the ambiguous cases are Syntax Errors when parsed
     const isSyntaxError =