Merge pull request #7 from IgnaceMaes/extract-more-steps

.changeset/six-suns-yawn.md

@@ -0,0 +1,5 @@
+---
+"ember-codemod-template-tag": patch
+---
+
+refactor: extract change extension step

src/index.ts

@@ -1,3 +1,4 @@
+import { changeExtension } from './steps/change-extension.js';
 import { convertTests, createOptions } from './steps/index.js';
 import { removeHbsImport } from './steps/remove-import.js';
 import type { CodemodOptions } from './types/index.js';
@@ -6,5 +7,6 @@ export function runCodemod(codemodOptions: CodemodOptions): void {
   const options = createOptions(codemodOptions);
 
   convertTests(options);
+  changeExtension(options);
   removeHbsImport(options);
 }

src/steps/change-extension.ts

@@ -0,0 +1,34 @@
+import { readFileSync, renameSync } from 'node:fs';
+import { join } from 'node:path';
+
+import { findFiles } from '@codemod-utils/files';
+
+import type { Options } from '../types/index.js';
+import { parse } from '../utils/ast/template-tag.js';
+import { replaceExtensionWithGlimmer } from '../utils/general.js';
+
+function isUsingTemplateTag(file: string): boolean {
+  const contentTags = parse(file);
+
+  return contentTags.length > 0;
+}
+
+export function changeExtension(options: Options): void {
+  const { projectRoot } = options;
+
+  const filePaths = findFiles('**/*-test.{js,ts}', {
+    projectRoot,
+  });
+
+  filePaths.forEach((filePath) => {
+    const file = readFileSync(join(projectRoot, filePath), 'utf8');
+
+    const isTemplateTag = isUsingTemplateTag(file);
+
+    if (isTemplateTag) {
+      // Move file to new extension
+      const newFilePath = replaceExtensionWithGlimmer(filePath);
+      renameSync(join(projectRoot, filePath), join(projectRoot, newFilePath));
+    }
+  });
+}

src/steps/convert-tests.ts

@@ -1,4 +1,4 @@
-import { readFileSync, renameSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 
 import { AST as AST_JS } from '@codemod-utils/ast-javascript';
@@ -11,10 +11,7 @@ import {
   getComponentNameFromNestedPath,
 } from '../utils/components.js';
 import { BUILT_IN_HELPERS } from '../utils/constants.js';
-import {
-  isTypeScriptFile,
-  replaceExtensionWithGlimmer,
-} from '../utils/general.js';
+import { isTypeScriptFile } from '../utils/general.js';
 
 function rewriteHbsTemplateString(
   file: string,
@@ -149,17 +146,13 @@ export function convertTests(options: Options): void {
     filePaths.map((filePath) => {
       let file = readFileSync(join(projectRoot, filePath), 'utf8');
 
-      // Move file to new extension
-      const newFilePath = replaceExtensionWithGlimmer(filePath);
-      renameSync(join(projectRoot, filePath), join(projectRoot, newFilePath));
-
       // Replace hbs`` template string with a <template> tag
       file = rewriteHbsTemplateString(file, {
         appName,
         isTypeScript: isTypeScriptFile(filePath),
       });
 
-      return [newFilePath, file];
+      return [filePath, file];
     }),
   );
 

tests/steps/change-extension/base-case.test.ts

@@ -0,0 +1,27 @@
+import { assertFixture, loadFixture, test } from '@codemod-utils/tests';
+
+import { changeExtension } from '../../../src/steps/change-extension.js';
+import {
+  codemodOptions,
+  options,
+} from '../../helpers/shared-test-setups/convert-tests.js';
+
+test('steps | change-extension > base case', function () {
+  const inputProject = {
+    'example-test.js': "const foo = 'bar';\n<template>Test</template>\n",
+    'no-template-tag-test.js': "const foo = 'bar';\nhbs`<foo>Bar</foo>`\n",
+    'ts-test.ts': "const foo: string = 'bar';\n<template>Test</template>\n",
+  };
+
+  const outputProject = {
+    'example-test.gjs': "const foo = 'bar';\n<template>Test</template>\n",
+    'no-template-tag-test.js': "const foo = 'bar';\nhbs`<foo>Bar</foo>`\n",
+    'ts-test.gts': "const foo: string = 'bar';\n<template>Test</template>\n",
+  };
+
+  loadFixture(inputProject, codemodOptions);
+
+  changeExtension(options);
+
+  assertFixture(outputProject, codemodOptions);
+});