fix tests

Author: danieldelcore

.changeset/grumpy-swans-think.md

@@ -0,0 +1,5 @@
+---
+'@codeshift/validator': minor
+---
+
+Fundamentally simplifies and improves on how validation works.

.changeset/silly-icons-whisper.md

@@ -0,0 +1,5 @@
+---
+'@codeshift/types': patch
+---
+
+Initial release

.changeset/slimy-foxes-train.md

@@ -0,0 +1,5 @@
+---
+'@codeshift/cli': minor
+---
+
+Codemods can now be sourced from standalone npm packages such as react as long as they provide a codeshift.config.js. This allows for greater flexibility for where codemods may be distributed

packages/cli/package.json

@@ -22,6 +22,7 @@
     "fs-extra": "^9.1.0",
     "jscodeshift": "^0.12.0",
     "live-plugin-manager": "^0.15.1",
+    "lodash": "^4.17.21",
     "semver": "^7.3.5",
     "ts-node": "^9.1.1"
   }

packages/cli/src/main.spec.ts

@@ -6,29 +6,12 @@ jest.mock('jscodeshift/src/Runner', () => ({
 // @ts-ignore
 import * as jscodeshift from 'jscodeshift/src/Runner';
 import { PluginManager } from 'live-plugin-manager';
+
 import main from './main';
 
 const mockPath = 'src/pages/home-page/';
 
 describe('main', () => {
-  beforeEach(() => {
-    (PluginManager as jest.Mock).mockReturnValue({
-      install: () => Promise.resolve(undefined),
-      require: (codemodName: string) => ({
-        transforms: {
-          '18.0.0': `${codemodName}/path/to/18.js`,
-          '19.0.0': `${codemodName}/path/to/19.js`,
-          '20.0.0': `${codemodName}/path/to/20.js`,
-        },
-        presets: {
-          'update-formatting': `${codemodName}/path/to/update-formatting.js`,
-          'update-imports': `${codemodName}/path/to/update-imports.js`,
-        },
-      }),
-      uninstallAll: () => Promise.resolve(),
-    });
-  });
-
   afterEach(() => {
     jest.resetAllMocks();
   });
@@ -134,6 +117,26 @@ describe('main', () => {
   });
 
   describe('when running transforms with the -p flag', () => {
+    beforeEach(() => {
+      (PluginManager as jest.Mock).mockImplementation(() => ({
+        install: jest.fn().mockResolvedValue(undefined),
+        require: jest.fn().mockImplementation((codemodName: string) => {
+          if (!codemodName.startsWith('@codeshift')) {
+            throw new Error('Attempted to fetch codemod from npm');
+          }
+
+          return {
+            transforms: {
+              '18.0.0': `${codemodName}/path/to/18.js`,
+              '19.0.0': `${codemodName}/path/to/19.js`,
+              '20.0.0': `${codemodName}/path/to/20.js`,
+            },
+          };
+        }),
+        uninstallAll: jest.fn().mockResolvedValue(undefined),
+      }));
+    });
+
     it('should run package transform for single version', async () => {
       await main([mockPath], {
         packages: 'mylib@18.0.0',
@@ -234,6 +237,7 @@ describe('main', () => {
         expect.any(Object),
       );
     });
+
     it('should run multiple transforms of the same package', async () => {
       await main([mockPath], {
         packages: '@myscope/mylib@20.0.0@19.0.0',
@@ -374,6 +378,25 @@ describe('main', () => {
   });
 
   describe('when running presets with the -p flag', () => {
+    beforeEach(() => {
+      (PluginManager as jest.Mock).mockImplementation(() => ({
+        install: jest.fn().mockResolvedValue(undefined),
+        require: jest.fn().mockImplementation((codemodName: string) => {
+          if (!codemodName.startsWith('@codeshift')) {
+            throw new Error('Attempted to fetch codemod from npm');
+          }
+
+          return {
+            presets: {
+              'update-formatting': `${codemodName}/path/to/update-formatting.js`,
+              'update-imports': `${codemodName}/path/to/update-imports.js`,
+            },
+          };
+        }),
+        uninstallAll: jest.fn().mockResolvedValue(undefined),
+      }));
+    });
+
     it('should run single preset', async () => {
       await main([mockPath], {
         packages: 'mylib#update-formatting',
@@ -508,18 +531,71 @@ describe('main', () => {
     });
   });
 
+  describe('when running transforms from NPM with the -p flag', () => {
+    beforeEach(() => {
+      (PluginManager as jest.Mock).mockImplementation(() => ({
+        install: jest.fn().mockResolvedValue(undefined),
+        require: jest.fn().mockImplementation((codemodName: string) => {
+          if (codemodName.startsWith('@codeshift')) {
+            throw new Error('Attempted to fetch codemod from community folder');
+          }
+
+          return {
+            transforms: {
+              '18.0.0': `${codemodName}/path/to/18.js`,
+            },
+            presets: {
+              'update-formatting': `${codemodName}/path/to/update-formatting.js`,
+            },
+          };
+        }),
+        uninstallAll: jest.fn().mockResolvedValue(undefined),
+      }));
+    });
+
+    it('should run package transform for single version', async () => {
+      await main([mockPath], {
+        packages: 'mylib@18.0.0',
+        parser: 'babel',
+        extensions: 'js',
+      });
+
+      expect(jscodeshift.run).toHaveBeenCalledTimes(1);
+      expect(jscodeshift.run).toHaveBeenCalledWith(
+        'mylib/path/to/18.js',
+        expect.arrayContaining([mockPath]),
+        expect.anything(),
+      );
+    });
+
+    it('should run single preset', async () => {
+      await main([mockPath], {
+        packages: 'mylib#update-formatting',
+        parser: 'babel',
+        extensions: 'js',
+      });
+
+      expect(jscodeshift.run).toHaveBeenCalledTimes(1);
+      expect(jscodeshift.run).toHaveBeenCalledWith(
+        'mylib/path/to/update-formatting.js',
+        expect.arrayContaining([mockPath]),
+        expect.anything(),
+      );
+    });
+  });
+
   describe('when reading configs using non-cjs exports', () => {
     it('should read configs exported with export default', async () => {
       (PluginManager as jest.Mock).mockReturnValue({
         install: () => Promise.resolve(undefined),
         // @ts-ignore
-        require: (codemodName: string) => ({
+        require: jest.fn().mockImplementationOnce((codemodName: string) => ({
           default: {
             transforms: {
               '18.0.0': `${codemodName}/path/to/18.js`,
             },
           },
-        }),
+        })),
         uninstallAll: () => Promise.resolve(),
       });
 

packages/cli/src/main.ts

@@ -11,9 +11,10 @@ import { CodeshiftConfig } from '@codeshift/types';
 import { Flags } from './types';
 import { InvalidUserInputError } from './errors';
 
-const packageManager = new PluginManager();
-
-async function fetchCommunityPackageConfig(packageName: string) {
+async function fetchCommunityPackageConfig(
+  packageName: string,
+  packageManager: PluginManager,
+) {
   const pkgName = packageName.replace('@', '').replace('/', '__');
   const commPackageName = `@codeshift/mod-${pkgName}`;
 
@@ -28,7 +29,10 @@ async function fetchCommunityPackageConfig(packageName: string) {
   return config;
 }
 
-async function fetchRemotePackageConfig(packageName: string) {
+async function fetchRemotePackageConfig(
+  packageName: string,
+  packageManager: PluginManager,
+) {
   await packageManager.install(packageName);
   const pkg = packageManager.require(packageName);
 
@@ -74,6 +78,7 @@ async function fetchRemotePackageConfig(packageName: string) {
 }
 
 export default async function main(paths: string[], flags: Flags) {
+  const packageManager = new PluginManager();
   let transforms: string[] = [];
 
   if (!flags.transform && !flags.packages) {
@@ -104,11 +109,14 @@ export default async function main(paths: string[], flags: Flags) {
       let remoteConfig;
 
       try {
-        communityConfig = await fetchCommunityPackageConfig(pkgName);
+        communityConfig = await fetchCommunityPackageConfig(
+          pkgName,
+          packageManager,
+        );
       } catch (error) {}
 
       try {
-        remoteConfig = await fetchRemotePackageConfig(pkgName);
+        remoteConfig = await fetchRemotePackageConfig(pkgName, packageManager);
       } catch (error) {}
 
       if (!communityConfig && !remoteConfig) {