fix: add test cases for reported issues

- armano2#6 - armano2#7
nebrelbug · Feb 12, 2023 · bcef280 · bcef280
1 parent 7b54605
commit bcef280
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/dist/npm-to-yarn.mjs b/dist/npm-to-yarn.mjs
@@ -238,10 +238,6 @@ var npmToYarnTable = {
         if (args[1] && !unchangedCLICommands.includes(args[1]) && !yarnCLICommands.includes(args[1])) {
             args.splice(0, 1);
         }
-        var index = args.findIndex(function (a) { return a === '--'; });
-        if (index >= 0) {
-            args.splice(index, 1);
-        }
         return args;
     },
     exec: function (args) {
@@ -278,8 +274,12 @@ var npmToYarnTable = {
 };
 function npmToYarn(_m, command) {
     var args = parse((command || '').trim());
+    var index = args.findIndex(function (a) { return a === '--'; });
+    if (index >= 0) {
+        args.splice(index, 1);
+    }
     if (unchangedCLICommands.includes(args[0])) {
-        return 'yarn ' + command;
+        return 'yarn ' + args.join(' ');
     }
     else if (args[0] in npmToYarnTable) {
         var converter = npmToYarnTable[args[0]];

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
@@ -54,10 +54,6 @@ const npmToYarnTable = {
     if (args[1] && !unchangedCLICommands.includes(args[1]) && !yarnCLICommands.includes(args[1])) {
       args.splice(0, 1)
     }
-    const index = args.findIndex((a) => a === '--')
-    if (index >= 0) {
-      args.splice(index, 1)
-    }
     return args
   },
   exec(args: string[]) {
@@ -97,8 +93,13 @@ const npmToYarnTable = {
 export function npmToYarn(_m: string, command: string): string {
   let args = parse((command || '').trim())
 
+  const index = args.findIndex((a) => a === '--')
+  if (index >= 0) {
+    args.splice(index, 1)
+  }
+
   if (unchangedCLICommands.includes(args[0])) {
-    return 'yarn ' + command
+    return 'yarn ' + args.join(' ')
   } else if (args[0] in npmToYarnTable) {
     const converter = npmToYarnTable[args[0] as keyof typeof npmToYarnTable]
 

diff --git a/test/index.spec.ts b/test/index.spec.ts
@@ -15,6 +15,7 @@ describe('NPM to Yarn tests', () => {
       'yarn add squirrelly --optional'
     )
     expect(convert('npm i squirrelly --save-exact', 'yarn')).toEqual('yarn add squirrelly --exact')
+    expect(convert('npm install pkg --save-exact', 'yarn')).toEqual('yarn add pkg --exact')
   })
 
   it('Simple convert works w/ remove', () => {
@@ -70,6 +71,13 @@ describe('NPM to Yarn tests', () => {
     expect(convert('npm test', 'yarn')).toEqual('yarn test')
   })
 
+  it('npm with dash-dash', () => {
+    expect(convert('npm run test -- --version', 'yarn')).toEqual('yarn run test --version')
+    expect(convert('npm run test -- -v', 'yarn')).toEqual('yarn run test -v')
+    expect(convert('npm test -- --version', 'yarn')).toEqual('yarn test --version')
+    expect(convert('npm test -- -v', 'yarn')).toEqual('yarn test -v')
+  })
+
   it('npm init', () => {
     expect(convert('npm init', 'yarn')).toEqual('yarn init')
     expect(convert('npm init -y', 'yarn')).toEqual('yarn init -y')