ember-codemod-remove-global-styles 0.9.0 → 0.11.0

package/README.md

@@ -47,7 +47,7 @@ pnpx ember-codemod-remove-global-styles --src app/assets/app.css
 
 <details>
 
-<summary>Optional: Limit types of files to consider</summary>
+<summary>Optional: Limit type of files to consider</summary>
 
 By default, the codemod considers components and routes. Pass `--convert` to consider a subset of these.
 
@@ -63,19 +63,16 @@ pnpx ember-codemod-remove-global-styles --convert routes
 
 <details>
 
-<summary>Optional: Limit folders to consider</summary>
+<summary>Optional: Limit entity to consider</summary>
 
-By default, the codemod considers all files and folders for components and routes. Pass `--folder` to limit the search to 1 folder. (You may use glob patterns to specify multiple folders.)
+By default, the codemod considers all files and folders for components, routes, and tests. Pass `--entity` to limit the search to 1 entity and its sub-entities (if any). You may use curly braces to specify multiple entities.
 
 ```sh
-# `ui` folder only (search `app/{components,templates}/ui`)
-pnpx ember-codemod-remove-global-styles --folder ui
+# `ui/form` only
+pnpx ember-codemod-remove-global-styles --entity ui/form
 
-# `ui/form` folder only (search `app/{components,templates}/ui/form`)
-pnpx ember-codemod-remove-global-styles --folder ui/form
-
-# `route1` and `route2` folders only (search `app/templates/{route1,route2}`)
-pnpx ember-codemod-remove-global-styles --convert routes --folder "{route1,route2}"
+# `route1` and `route2` only
+pnpx ember-codemod-remove-global-styles --convert routes --entity "{route1,route2}"
 ```
 
 </details>

package/dist/bin/ember-codemod-remove-global-styles.js

@@ -12,8 +12,8 @@ const argv = yargs(hideBin(process.argv))
     describe: 'Which type of files to consider',
     type: 'array',
 })
-    .option('folder', {
-    describe: 'Which folder to consider',
+    .option('entity', {
+    describe: 'Which entity to consider',
     type: 'string',
 })
     .option('root', {
@@ -29,8 +29,8 @@ const argv = yargs(hideBin(process.argv))
 const DEFAULT_FOR_CONVERT = ['components', 'routes'];
 const codemodOptions = {
     convert: new Set(argv['convert'] ?? DEFAULT_FOR_CONVERT),
-    folder: argv['folder'] ?? '',
+    entity: argv['entity'],
     projectRoot: argv['root'] ?? process.cwd(),
     src: argv['src'],
 };
-runCodemod(codemodOptions);
+void runCodemod(codemodOptions);

package/dist/src/index.js

@@ -1,6 +1,6 @@
 import { analyzeProject, createOptions, updateProject } from './steps/index.js';
-export function runCodemod(codemodOptions) {
+export async function runCodemod(codemodOptions) {
     const options = createOptions(codemodOptions);
-    const project = analyzeProject(options);
-    updateProject(project, options);
+    const project = await analyzeProject(options);
+    await updateProject(project, options);
 }

package/dist/src/steps/analyze-project/analyze-components/task.js

@@ -0,0 +1,15 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { getEntityData } from '../get-entity-data.js';
+export function task(filePath, classNameToStyles, options) {
+    const { projectRoot } = options;
+    const file = readFileSync(join(projectRoot, filePath), 'utf8');
+    const entityData = getEntityData(file, {
+        classNameToStyles,
+        isHbs: filePath.endsWith('.hbs'),
+    });
+    if (entityData.localStyles.length === 0) {
+        return undefined;
+    }
+    return [filePath, entityData];
+}

package/dist/src/steps/analyze-project/analyze-components/worker.js

@@ -0,0 +1,11 @@
+import { parentPort, workerData } from 'node:worker_threads';
+import { runTask } from '@codemod-utils/threads';
+import { task } from './task.js';
+const { datasets } = workerData;
+runTask(task, datasets)
+    .then((result) => {
+    parentPort?.postMessage(result);
+})
+    .catch((error) => {
+    throw error;
+});

package/dist/src/steps/analyze-project/analyze-components.js

@@ -1,26 +1,22 @@
-import { readFileSync } from 'node:fs';
-import { join } from 'node:path';
 import { findFiles } from '@codemod-utils/files';
-import { normalizedJoin } from '../../utils/files/index.js';
-import { getEntityData } from './get-entity-data.js';
-export function analyzeComponents(classNameToStyles, options) {
-    const { convert, folder, projectRoot } = options;
-    const components = new Map();
+import { parallelize } from '@codemod-utils/threads';
+import { getPatternForComponents } from '../../utils/analyze-project/index.js';
+import { task } from './analyze-components/task.js';
+export async function analyzeComponents(classNameToStyles, options) {
+    const { convert, projectRoot } = options;
     if (!convert.components) {
-        return components;
+        return new Map();
     }
-    const filePaths = findFiles(normalizedJoin('app/components', folder, '**/*.{gjs,gts,hbs}'), {
+    const filePaths = findFiles(getPatternForComponents(options), {
         projectRoot,
     });
+    const datasets = [];
     filePaths.forEach((filePath) => {
-        const file = readFileSync(join(projectRoot, filePath), 'utf8');
-        const entityData = getEntityData(file, {
-            classNameToStyles,
-            isHbs: filePath.endsWith('.hbs'),
-        });
-        if (entityData.localStyles.length > 0) {
-            components.set(filePath, entityData);
-        }
+        datasets.push([filePath, classNameToStyles, options]);
     });
-    return components;
+    const entries = await parallelize(task, datasets, {
+        importMetaUrl: import.meta.url,
+        workerFilePath: './analyze-components/worker.js',
+    });
+    return new Map(entries.filter((entry) => entry !== undefined));
 }

package/dist/src/steps/analyze-project/analyze-routes/task.js

@@ -0,0 +1,15 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { getEntityData } from '../get-entity-data.js';
+export function task(filePath, classNameToStyles, options) {
+    const { projectRoot } = options;
+    const file = readFileSync(join(projectRoot, filePath), 'utf8');
+    const entityData = getEntityData(file, {
+        classNameToStyles,
+        isHbs: filePath.endsWith('.hbs'),
+    });
+    if (entityData.localStyles.length === 0) {
+        return undefined;
+    }
+    return [filePath, entityData];
+}

package/dist/src/steps/analyze-project/analyze-routes/worker.js

@@ -0,0 +1,11 @@
+import { parentPort, workerData } from 'node:worker_threads';
+import { runTask } from '@codemod-utils/threads';
+import { task } from './task.js';
+const { datasets } = workerData;
+runTask(task, datasets)
+    .then((result) => {
+    parentPort?.postMessage(result);
+})
+    .catch((error) => {
+    throw error;
+});

package/dist/src/steps/analyze-project/analyze-routes.js

@@ -1,26 +1,23 @@
-import { readFileSync } from 'node:fs';
-import { join } from 'node:path';
 import { findFiles } from '@codemod-utils/files';
-import { normalizedJoin } from '../../utils/files/index.js';
-import { getEntityData } from './get-entity-data.js';
-export function analyzeRoutes(classNameToStyles, options) {
-    const { convert, folder, projectRoot } = options;
+import { parallelize } from '@codemod-utils/threads';
+import { getPatternForRoutes } from '../../utils/analyze-project/index.js';
+import { task } from './analyze-routes/task.js';
+export async function analyzeRoutes(classNameToStyles, options) {
+    const { convert, projectRoot } = options;
     const routes = new Map();
     if (!convert.routes) {
         return routes;
     }
-    const filePaths = findFiles(normalizedJoin('app/templates', folder, '**/*.{gjs,gts,hbs}'), {
+    const filePaths = findFiles(getPatternForRoutes(options), {
         projectRoot,
     });
+    const datasets = [];
     filePaths.forEach((filePath) => {
-        const file = readFileSync(join(projectRoot, filePath), 'utf8');
-        const entityData = getEntityData(file, {
-            classNameToStyles,
-            isHbs: filePath.endsWith('.hbs'),
-        });
-        if (entityData.localStyles.length > 0) {
-            routes.set(filePath, entityData);
-        }
+        datasets.push([filePath, classNameToStyles, options]);
     });
-    return routes;
+    const entries = await parallelize(task, datasets, {
+        importMetaUrl: import.meta.url,
+        workerFilePath: './analyze-routes/worker.js',
+    });
+    return new Map(entries.filter((entry) => entry !== undefined));
 }

package/dist/src/steps/analyze-project.js

@@ -2,12 +2,12 @@ import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { getClassNameToStyles } from '../utils/css/index.js';
 import { analyzeComponents, analyzeRoutes } from './analyze-project/index.js';
-export function analyzeProject(options) {
+export async function analyzeProject(options) {
     const { projectRoot, src } = options;
     const stylesheet = readFileSync(join(projectRoot, src), 'utf8');
     const classNameToStyles = getClassNameToStyles(stylesheet);
-    const components = analyzeComponents(classNameToStyles, options);
-    const routes = analyzeRoutes(classNameToStyles, options);
+    const components = await analyzeComponents(classNameToStyles, options);
+    const routes = await analyzeRoutes(classNameToStyles, options);
     return {
         components,
         routes,

package/dist/src/steps/create-options.js

@@ -1,11 +1,11 @@
 export function createOptions(codemodOptions) {
-    const { convert, folder, projectRoot, src } = codemodOptions;
+    const { convert, entity, projectRoot, src } = codemodOptions;
     return {
         convert: {
             components: convert.has('components'),
             routes: convert.has('routes'),
         },
-        folder,
+        entity,
         projectRoot,
         src,
     };

package/dist/src/steps/update-project/create-stylesheets.js

@@ -16,9 +16,7 @@ function logErrors(cssModuleFilePath, errors) {
     if (errors.length === 0) {
         return;
     }
-    console.warn(`WARNING: ${cssModuleFilePath} may be incorrect.`);
-    console.warn(errors.map((error) => `- ${error}`).join(EOL));
-    console.log();
+    console.log(`WARNING: ${cssModuleFilePath} may be incorrect.`);
 }
 export function createStylesheets(project, options) {
     const fileMap = new Map();

package/dist/src/steps/update-project/update-classes/task.js

@@ -0,0 +1,8 @@
+import { updateClass } from '../../../utils/update-project/index.js';
+export function task(templateFilePath, options) {
+    const { output, status } = updateClass(templateFilePath, options);
+    if (status === 'error') {
+        return undefined;
+    }
+    return [output.classFilePath, output.classFile];
+}

package/dist/src/steps/update-project/update-classes/worker.js

@@ -0,0 +1,11 @@
+import { parentPort, workerData } from 'node:worker_threads';
+import { runTask } from '@codemod-utils/threads';
+import { task } from './task.js';
+const { datasets } = workerData;
+runTask(task, datasets)
+    .then((result) => {
+    parentPort?.postMessage(result);
+})
+    .catch((error) => {
+    throw error;
+});

package/dist/src/steps/update-project/update-classes.js

@@ -1,20 +1,18 @@
 import { createFiles } from '@codemod-utils/files';
-import { updateClass } from '../../utils/update-project/index.js';
-export function updateClasses(project, options) {
-    const fileMap = new Map();
+import { parallelize } from '@codemod-utils/threads';
+import { task } from './update-classes/task.js';
+export async function updateClasses(project, options) {
+    const datasets = [];
     project.components.forEach((_data, templateFilePath) => {
-        const { output, status } = updateClass(templateFilePath, options);
-        if (status === 'error') {
-            return;
-        }
-        fileMap.set(output.classFilePath, output.classFile);
+        datasets.push([templateFilePath, options]);
     });
     project.routes.forEach((_data, templateFilePath) => {
-        const { output, status } = updateClass(templateFilePath, options);
-        if (status === 'error') {
-            return;
-        }
-        fileMap.set(output.classFilePath, output.classFile);
+        datasets.push([templateFilePath, options]);
     });
+    const entries = await parallelize(task, datasets, {
+        importMetaUrl: import.meta.url,
+        workerFilePath: './update-classes/worker.js',
+    });
+    const fileMap = new Map(entries.filter((entry) => entry !== undefined));
     createFiles(fileMap, options);
 }

package/dist/src/steps/update-project/update-templates/task.js

@@ -0,0 +1,8 @@
+import { updateTemplate } from '../../../utils/update-project/index.js';
+export function task(templateFilePath, options) {
+    const { output, status } = updateTemplate(templateFilePath, options);
+    if (status === 'error') {
+        return undefined;
+    }
+    return [templateFilePath, output.templateFile];
+}

package/dist/src/steps/update-project/update-templates/worker.js

@@ -0,0 +1,11 @@
+import { parentPort, workerData } from 'node:worker_threads';
+import { runTask } from '@codemod-utils/threads';
+import { task } from './task.js';
+const { datasets } = workerData;
+runTask(task, datasets)
+    .then((result) => {
+    parentPort?.postMessage(result);
+})
+    .catch((error) => {
+    throw error;
+});

package/dist/src/steps/update-project/update-templates.js

@@ -1,20 +1,18 @@
 import { createFiles } from '@codemod-utils/files';
-import { updateTemplate } from '../../utils/update-project/index.js';
-export function updateTemplates(project, options) {
-    const fileMap = new Map();
+import { parallelize } from '@codemod-utils/threads';
+import { task } from './update-templates/task.js';
+export async function updateTemplates(project, options) {
+    const datasets = [];
     project.components.forEach((_data, templateFilePath) => {
-        const { output, status } = updateTemplate(templateFilePath, options);
-        if (status === 'error') {
-            return;
-        }
-        fileMap.set(templateFilePath, output.templateFile);
+        datasets.push([templateFilePath, options]);
     });
     project.routes.forEach((_data, templateFilePath) => {
-        const { output, status } = updateTemplate(templateFilePath, options);
-        if (status === 'error') {
-            return;
-        }
-        fileMap.set(templateFilePath, output.templateFile);
+        datasets.push([templateFilePath, options]);
     });
+    const entries = await parallelize(task, datasets, {
+        importMetaUrl: import.meta.url,
+        workerFilePath: './update-templates/worker.js',
+    });
+    const fileMap = new Map(entries.filter((entry) => entry !== undefined));
     createFiles(fileMap, options);
 }

package/dist/src/steps/update-project.js

@@ -1,6 +1,6 @@
 import { createStylesheets, updateClasses, updateTemplates, } from './update-project/index.js';
-export function updateProject(project, options) {
+export async function updateProject(project, options) {
     createStylesheets(project, options);
-    updateClasses(project, options);
-    updateTemplates(project, options);
+    await updateClasses(project, options);
+    await updateTemplates(project, options);
 }

package/dist/src/utils/analyze-project/get-pattern.js

@@ -0,0 +1,23 @@
+import { normalizedJoin } from '../files/index.js';
+export function getPatternForComponents(options) {
+    const source = 'app';
+    const { entity } = options;
+    if (entity === undefined) {
+        return [`${source}/components/**/*.{gjs,gts,hbs}`];
+    }
+    return [
+        normalizedJoin(source, 'components', `${entity}.{gjs,gts,hbs}`),
+        normalizedJoin(source, 'components', entity, '**/*.{gjs,gts,hbs}'),
+    ];
+}
+export function getPatternForRoutes(options) {
+    const source = 'app';
+    const { entity } = options;
+    if (entity === undefined) {
+        return [`${source}/templates/**/*.{gjs,gts,hbs}`];
+    }
+    return [
+        normalizedJoin(source, 'templates', `${entity}.{gjs,gts,hbs}`),
+        normalizedJoin(source, 'templates', entity, '**/*.{gjs,gts,hbs}'),
+    ];
+}

package/dist/src/utils/analyze-project/index.js

@@ -0,0 +1 @@
+export * from './get-pattern.js';

package/dist/src/utils/update-project/update-class.js

@@ -35,8 +35,7 @@ export function updateClass(templateFilePath, options) {
         };
     }
     catch (error) {
-        console.log(`WARNING: ${classFilePath} could not be updated.`);
-        console.log(error.message);
+        console.log(`WARNING: ${classFilePath} could not be updated. (${error.message})`);
         return {
             output: undefined,
             status: 'error',

package/dist/src/utils/update-project/update-template.js

@@ -31,8 +31,7 @@ export function updateTemplate(templateFilePath, options) {
         };
     }
     catch (error) {
-        console.log(`WARNING: ${templateFilePath} could not be updated.`);
-        console.log(error.message);
+        console.log(`WARNING: ${templateFilePath} could not be updated. ${error.message}`);
         return {
             output: undefined,
             status: 'error',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-codemod-remove-global-styles",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "Codemod to localize global styles",
   "keywords": [
     "codemod",
@@ -28,8 +28,9 @@
     "@codemod-utils/ast-template": "^3.0.0",
     "@codemod-utils/ast-template-tag": "^2.0.0",
     "@codemod-utils/files": "^4.0.0",
+    "@codemod-utils/threads": "^0.2.1",
     "css-selector-parser": "^3.3.0",
-    "postcss": "^8.5.6",
+    "postcss": "^8.5.8",
     "yargs": "^18.0.0"
   },
   "devDependencies": {