Merge pull request #211 from gitKrystan/upgrade-content-tag

Author: gitKrystan

package.json

@@ -51,6 +51,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.23.6",
+    "content-tag": "^1.2.2",
     "prettier": "^3.1.1"
   },
   "devDependencies": {
@@ -65,7 +66,6 @@
     "@typescript-eslint/parser": "^6.16.0",
     "@vitest/ui": "^1.1.0",
     "concurrently": "^8.2.2",
-    "content-tag": "^1.1.2",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",

pnpm-lock.yaml

@@ -6,13 +6,14 @@ import type {
   ObjectExpression,
   StaticBlock,
 } from '@babel/types';
+import type { Parsed as RawGlimmerTemplate } from 'content-tag';
 import { Preprocessor } from 'content-tag';
 import type { Parser } from 'prettier';
 import { parsers as babelParsers } from 'prettier/plugins/babel.js';
 
 import { PRINTER_NAME } from '../config.js';
 import type { Options } from '../options.js';
-import type { GlimmerTemplate, RawGlimmerTemplate } from '../types/glimmer.js';
+import type { GlimmerTemplate } from '../types/glimmer.js';
 import { isDefaultTemplate } from '../types/glimmer.js';
 import { assert } from '../utils/index.js';
 import { preprocessTemplateRange } from './preprocess.js';
@@ -88,7 +89,7 @@ function preprocess(code: string): {
   code: string;
   rawTemplates: RawGlimmerTemplate[];
 } {
-  const rawTemplates = p.parse(code) as RawGlimmerTemplate[];
+  const rawTemplates = p.parse(code);
 
   let output = code;
   for (const rawTemplate of rawTemplates) {

src/parse/index.ts

@@ -1,4 +1,4 @@
-import type { RawGlimmerTemplate } from '../types/glimmer.js';
+import type { Parsed as RawGlimmerTemplate } from 'content-tag';
 
 function replaceRange(
   original: string,

src/parse/preprocess.ts

@@ -1,45 +1,6 @@
 import type { NodePath } from '@babel/core';
 import type { Node } from '@babel/types';
-
-/** The raw GlimmerTemplate node as parsed by the content-tag parser. */
-export interface RawGlimmerTemplate {
-  type: 'expression' | 'class-member';
-
-  tagName: 'template';
-
-  /** Raw template contents */
-  contents: string;
-
-  /**
-   * Range of the contents, inclusive of inclusive of the
-   * `<template></template>` tags.
-   */
-  range: {
-    start: number;
-    end: number;
-  };
-
-  /**
-   * Range of the template contents, not inclusive of the
-   * `<template></template>` tags.
-   */
-  contentRange: {
-    start: number;
-    end: number;
-  };
-
-  /** Range of the opening `<template>` tag. */
-  startRange: {
-    end: number;
-    start: number;
-  };
-
-  /** Range of the closing `</template>` tag. */
-  endRange: {
-    start: number;
-    end: number;
-  };
-}
+import type { Parsed as RawGlimmerTemplate } from 'content-tag';
 
 export interface GlimmerTemplate {
   type: 'FunctionDeclaration';