fix: add missing conversion for link/ln/unlink

nebrelbug · Feb 15, 2023 · 043cf08 · 043cf08
1 parent 08c746a
commit 043cf08
Show file tree

Hide file tree

Showing 8 changed files with 392 additions and 381 deletions.
diff --git a/dist/npm-to-yarn.mjs b/dist/npm-to-yarn.mjs
diff --git a/dist/npm-to-yarn.mjs.map b/dist/npm-to-yarn.mjs.map
diff --git a/dist/npm-to-yarn.umd.js b/dist/npm-to-yarn.umd.js
diff --git a/dist/npm-to-yarn.umd.js.map b/dist/npm-to-yarn.umd.js.map
diff --git a/src/npmToYarn.ts b/src/npmToYarn.ts
@@ -53,12 +53,6 @@ const npmToYarnTable = {
   remove (args: string[]) {
     return npmToYarnTable.uninstall(args)
   },
-  un (args: string[]) {
-    return npmToYarnTable.uninstall(args)
-  },
-  unlink (args: string[]) {
-    return npmToYarnTable.uninstall(args)
-  },
   r (args: string[]) {
     return npmToYarnTable.uninstall(args)
   },
@@ -122,9 +116,8 @@ const npmToYarnTable = {
     }
     return args.filter(item => item !== '--scope')
   },
-  start: 'start',
-  stop: 'stop',
-  test: 'test'
+  ln: 'link',
+  un: 'unlink'
 }
 
 export function npmToYarn (_m: string, command: string): string {
@@ -136,7 +129,7 @@ export function npmToYarn (_m: string, command: string): string {
   }
 
   if (unchangedCLICommands.includes(args[0])) {
-    return 'yarn ' + args.join(' ')
+    return 'yarn ' + args.filter(Boolean).join(' ')
   } else if (args[0] in npmToYarnTable) {
     const converter = npmToYarnTable[args[0] as keyof typeof npmToYarnTable]
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,4 +1,15 @@
-export const unchangedCLICommands = ['test', 'login', 'logout', 'link', 'publish', 'cache']
+export const unchangedCLICommands = [
+  'test',
+  'login',
+  'logout',
+  'link',
+  'unlink',
+  'publish',
+  'cache',
+  'start',
+  'stop',
+  'test'
+]
 
 export const yarnCLICommands = [
   'init',
@@ -29,8 +40,6 @@ export const yarnCLICommands = [
   'self-update',
   'tag',
   'team',
-  'link',
-  'unlink',
   'upgrade',
   'upgrade-interactive',
   'version',

diff --git a/src/yarnToNpm.ts b/src/yarnToNpm.ts
@@ -23,7 +23,7 @@ function convertAddRemoveArgs (args: string[]) {
 const yarnToNpmTable = {
   add (args: string[]) {
     if (args.length === 2 && args[1] === '--force') {
-      return ['rebuild'];
+      return ['rebuild']
     }
     args[0] = 'install'
     if (
@@ -71,9 +71,6 @@ const yarnToNpmTable = {
   init: 'init',
   create: 'init',
   run: 'run',
-  start: 'start',
-  stop: 'stop',
-  test: 'test',
   global (args: string[]) {
     switch (args[1]) {
       case 'add':

diff --git a/test/index.spec.ts b/test/index.spec.ts
@@ -19,6 +19,8 @@ describe('NPM to Yarn tests', () => {
   })
 
   it('Simple convert works w/ remove', () => {
+    expect(convert('npm r squirrelly', 'yarn')).toEqual('yarn remove squirrelly')
+    expect(convert('npm remove squirrelly', 'yarn')).toEqual('yarn remove squirrelly')
     expect(convert('npm uninstall squirrelly', 'yarn')).toEqual('yarn remove squirrelly')
   })
 
@@ -171,6 +173,13 @@ describe('NPM to Yarn tests', () => {
     expect(convert('npm ls --production', 'yarn')).toEqual('yarn list --production')
     expect(convert('npm ls --development', 'yarn')).toEqual('yarn list --development')
   })
+
+  it('npm link/unlink', () => {
+    expect(convert('npm ln custom', 'yarn')).toEqual('yarn link custom')
+    expect(convert('npm link custom', 'yarn')).toEqual('yarn link custom')
+    expect(convert('npm unlink custom', 'yarn')).toEqual('yarn unlink custom')
+    expect(convert('npm un custom', 'yarn')).toEqual('yarn unlink custom')
+  })
 })
 
 describe('Yarn to NPM tests', () => {
@@ -295,4 +304,9 @@ describe('Yarn to NPM tests', () => {
     expect(convert('yarn list --production', 'npm')).toEqual('npm ls --production')
     expect(convert('yarn list --development', 'npm')).toEqual('npm ls --development')
   })
+
+  it('npm link/unlink', () => {
+    expect(convert('yarn link custom', 'npm')).toEqual('npm link custom')
+    expect(convert('yarn unlink custom', 'npm')).toEqual('npm unlink custom')
+  })
 })