Merge branch 'master' into feat/multiple-conversions

README.md

@@ -31,7 +31,6 @@ import { convert, convertMultiple } from 'npm-to-yarn'
 // var convert = require('npm-to-yarn')
 
 convert('npm install squirrelly', 'yarn')
-
 // yarn add squirrelly
 
 // one to many conversions
@@ -50,6 +49,11 @@ convertMultiple(["bun add rollup", "npm i express"], ["yarn", "pnpm"])
     ["pnpm add rollup", "pnpm add express"]
 ]
 */
+
+// npx conversions
+
+convert('npx create-next-app', 'yarn')
+// yarn dlx create-next-app
 ```
 
 `npm-to-yarn` exposes a UMD build, so you can also install it with a CDN (it exposes global variable `n2y`)
@@ -71,6 +75,7 @@ Tests can be run with `npm test`. Multiple tests check that parsing, rendering,
 ## 📦 Contributing to `npm-to-yarn` - Setup Guide
 
 Install Dependencies
+
 ```sh copy
 npm install
 ```
@@ -83,11 +88,12 @@ npm run start
 
 A new file: `npm-to-yarn.mjs` is created in `dist` folder. <br>
 Open `node` inside the terminal and write the following code to test new changes
+
 ```js
-const npmToYarn = await import("./dist/npm-to-yarn.mjs")
+const npmToYarn = await import('./dist/npm-to-yarn.mjs')
 const convert = npmToYarn.default
 
-convert("npm install react", "bun")
+convert('npm install react', 'bun')
 ```
 
 ## Resources

dist/npm-to-yarn.mjs

@@ -47,6 +47,12 @@ var yarnCLICommands = [
     'workspace',
     'workspaces'
 ];
+var executorCommands = {
+    npm: 'npx',
+    yarn: 'yarn dlx',
+    pnpm: 'pnpm dlx',
+    bun: 'bun x'
+};
 
 function parse(command) {
     var args = [];
@@ -619,7 +625,20 @@ function npmToBun(_m, command) {
  * Converts between npm and yarn command
  */
 function convert(str, to) {
-    if (to === 'npm') {
+    if (str.includes('npx') ||
+        str.includes('yarn dlx') ||
+        str.includes('pnpm dlx') ||
+        str.includes('bun x')) {
+        var executor = str.includes('npx')
+            ? 'npx'
+            : str.includes('yarn dlx')
+                ? 'yarn dlx'
+                : str.includes('pnpm dlx')
+                    ? 'pnpm dlx'
+                    : 'bun x';
+        return str.replace(executor, executorCommands[to]);
+    }
+    else if (to === 'npm') {
         return str.replace(/yarn(?: +([^&\n\r]*))?/gm, yarnToNPM);
     }
     else if (to === 'pnpm') {

dist/types/utils.d.ts

@@ -1,3 +1,9 @@
 export declare const unchangedCLICommands: string[];
 export declare const yarnCLICommands: string[];
 export declare const npmCLICommands: string[];
+export declare const executorCommands: {
+    npm: string;
+    yarn: string;
+    pnpm: string;
+    bun: string;
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-to-yarn",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "Convert npm CLI commands to Yarn commands, and vice versa",
   "keywords": [
     "string convert",

src/index.ts

@@ -2,14 +2,34 @@ import { yarnToNPM } from './yarnToNpm'
 import { npmToYarn } from './npmToYarn'
 import { npmToPnpm } from './npmToPnpm'
 import { npmToBun } from './npmToBun'
+import { executorCommands } from './utils'
 
 type Command = 'npm' | 'yarn' | 'pnpm' | 'bun'
 
 /**
  * Converts between npm and yarn command
  */
+
 export function convert (str: string, to: 'npm' | 'yarn' | 'pnpm' | 'bun'): string {
   if (to === 'npm') {
+
+export default function convert (str: string, to: 'npm' | 'yarn' | 'pnpm' | 'bun'): string {
+  if (
+    str.includes('npx') ||
+    str.includes('yarn dlx') ||
+    str.includes('pnpm dlx') ||
+    str.includes('bun x')
+  ) {
+    const executor = str.includes('npx')
+      ? 'npx'
+      : str.includes('yarn dlx')
+      ? 'yarn dlx'
+      : str.includes('pnpm dlx')
+      ? 'pnpm dlx'
+      : 'bun x'
+    return str.replace(executor, executorCommands[to])
+  } else if (to === 'npm') {
+
     return str.replace(/yarn(?: +([^&\n\r]*))?/gm, yarnToNPM)
   } else if (to === 'pnpm') {
     return str.replace(/npm(?: +([^&\n\r]*))?/gm, npmToPnpm)

src/utils.ts

@@ -108,3 +108,10 @@ export const npmCLICommands = [
   'view',
   'whoami'
 ]
+
+export const executorCommands = {
+  npm: 'npx',
+  yarn: 'yarn dlx',
+  pnpm: 'pnpm dlx',
+  bun: 'bun x'
+}