initialise commands are now working with the new file structure

Author: Daniel Del Core

package.json

@@ -15,7 +15,7 @@
     "test": "jest",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
-    "validate": "yarn build && yarn lint && yarn lint:file-structure && yarn monorepo:check && yarn community:validate",
+    "validate": "yarn build && yarn lint && yarn monorepo:check && yarn community:validate",
     "lint": "eslint --config .eslintrc.js --ext tsx,ts ./packages/**/src ./community/**/src",
     "lint:fix": "yarn lint -- --fix",
     "types:check": "tsc --noEmit --skipLibCheck",

packages/initializer/src/index.ts

@@ -29,8 +29,8 @@ export function getPackageJson(packageName: string, version = '0.0.0') {
       devDependencies: {
         '@codeshift/cli': `^${cliVersion}`,
         '@codeshift/test-utils': `^${testUtilVersion}`,
-        '@types/node': '^16.11.0',
         '@types/jest': '^26.0.15',
+        '@types/node': '^16.11.0',
         jest: '^26.6.0',
         parcel: '^2.8.3',
         prettier: '^2.0.0',
@@ -59,9 +59,9 @@ function getConfig(packageName: string, transform?: string, preset?: string) {
   targets: [],
   description: 'Codemods for ${packageName}',
   transforms: {${
-    transform ? `'${transform}': resolve('./${transform}/transform'),` : ''
+    transform ? `'${transform}': require('./${transform}/transform'),` : ''
   }},
-  presets: {${preset ? `'${preset}': resolve('./${preset}/transform'),` : ''}},
+  presets: {${preset ? `'${preset}': require('./${preset}/transform'),` : ''}},
 };
 `;
 }
@@ -139,20 +139,26 @@ export function initDirectory(
   targetPath = './',
   isReduced = false,
 ) {
+  const sourcePath = path.join(targetPath, 'src');
+
   fs.copySync(
     path.join(TEMPLATE_PATH, isReduced ? 'codemods' : ''),
-    targetPath,
+    sourcePath,
     {
       filter: src => !src.includes('codemods/codemod'),
     },
   );
 
-  if (!isReduced) {
-    fs.writeFileSync(
-      path.join(targetPath, 'package.json'),
-      getPackageJson(packageName),
-    );
+  fs.writeFileSync(
+    path.join(targetPath, 'package.json'),
+    getPackageJson(
+      isReduced
+        ? `@codeshift/mod-${packageName.replace('/', '__').replace('@', '')}`
+        : packageName,
+    ),
+  );
 
+  if (!isReduced) {
     fs.writeFileSync(path.join(targetPath, '.npmignore'), getNpmIgnore());
 
     const readmeFilePath = path.join(targetPath, 'README.md');
@@ -163,7 +169,7 @@ export function initDirectory(
     fs.writeFileSync(readmeFilePath, readmeFile);
   }
 
-  initConfig(packageName, targetPath);
+  initConfig(packageName, sourcePath);
 }
 
 export function initTransform(
@@ -177,7 +183,8 @@ export function initTransform(
     throw new Error(`Provided version ${id} is not a valid semver version`);
   }
 
-  const transformPath = path.join(targetPath, !isReduced ? 'codemods' : '', id);
+  const sourcePath = path.join(targetPath, 'src');
+  const transformPath = path.join(sourcePath, id);
 
   if (fs.existsSync(transformPath)) {
     throw new Error(`Codemod for ${type} "${id}" already exists`);
@@ -213,5 +220,5 @@ export function initTransform(
 
   fs.writeFileSync(readmeFilePath, readmeFile);
 
-  updateConfig(targetPath, packageName, id || '', type, isReduced);
+  updateConfig(sourcePath, packageName, id || '', type, isReduced);
 }

scripts/initialize-preset.ts

@@ -1,12 +1,23 @@
 import chalk from 'chalk';
-import { initDirectory, initTransform } from '@codeshift/initializer';
 import path from 'path';
 
+import { initDirectory, initTransform } from '@codeshift/initializer';
+
 const communityPath = `${__dirname}/../community`;
 
 export function main(packageName: string, preset?: string) {
-  if (!packageName) throw new Error('Package name was not provided');
-  if (!preset) throw new Error('Preset name was not provided');
+  if (!packageName)
+    throw new Error(
+      chalk.red(
+        'Package name was not provided. Example: yarn community:init foobar my-preset',
+      ),
+    );
+  if (!preset)
+    throw new Error(
+      chalk.red(
+        'Preset name was not provided. Example: Example: yarn community:init foobar my-preset',
+      ),
+    );
 
   const targetPath = path.join(communityPath, packageName.replace('/', '__'));
 

scripts/initialize.ts

@@ -1,12 +1,23 @@
 import chalk from 'chalk';
-import { initDirectory, initTransform } from '@codeshift/initializer';
 import path from 'path';
 
+import { initDirectory, initTransform } from '@codeshift/initializer';
+
 const communityPath = `${__dirname}/../community`;
 
 export function main(packageName: string, transform?: string) {
-  if (!packageName) throw new Error('Package name was not provided');
-  if (!transform) throw new Error('Version was not provided');
+  if (!packageName)
+    throw new Error(
+      chalk.red(
+        'Package name was not provided. Example: yarn community:init foobar 12.0.0',
+      ),
+    );
+  if (!transform)
+    throw new Error(
+      chalk.red(
+        'Version was not provided. Example: Example: yarn community:init foobar 12.0.0',
+      ),
+    );
 
   const targetPath = path.join(communityPath, packageName.replace('/', '__'));