@adobe/aio-cli-plugin-api-mesh 5.2.2 → 5.2.3-alpha.1

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"5.2.2","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:log-get-bulk":{"id":"api-mesh:log-get-bulk","description":"Download all mesh logs for a selected time period.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"startTime":{"name":"startTime","type":"option","description":"Start time for the logs in UTC"},"endTime":{"name":"endTime","type":"option","description":"End time for the logs in UTC"},"filename":{"name":"filename","type":"option","description":"Path to the output file for logs","required":true},"past":{"name":"past","type":"option","description":"Past time window in mins"},"from":{"name":"from","type":"option","description":"The from time in YYYY-MM-DD:HH:MM:SS format based on your system's time zone. It is used to fetch logs from the past and is the starting time for the past time duration."}},"args":[]},"api-mesh:log-get":{"id":"api-mesh:log-get","description":"Get the Log of a given mesh by RayId","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"rayId","description":"Fetch a single log by rayID","required":true}]},"api-mesh:log-list":{"id":"api-mesh:log-list","description":"Get recent logs of requests made to the API Mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"filename":{"name":"filename","type":"option","description":"Name of CSV file to export the recent logs to"}},"args":[]},"api-mesh:run":{"id":"api-mesh:run","description":"Run a local development server that builds and compiles a mesh locally","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"Port number for the local dev server"},"debug":{"name":"debug","type":"boolean","description":"Enable debugging mode","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"select":{"name":"select","type":"boolean","description":"Retrieve existing artifacts from the mesh","allowNo":false},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file","description":"Mesh File"}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:cache:purge":{"id":"api-mesh:cache:purge","description":"Cache purge for a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"all":{"name":"all","type":"boolean","char":"a","description":"Purge all cache. CLI will purge all cache data.","required":true,"allowNo":false}},"args":[]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}
+{"version":"5.2.3-alpha.1","commands":{"api-mesh":{"id":"api-mesh","description":"Create, run, test, and deploy API Mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:log-get-bulk":{"id":"api-mesh:log-get-bulk","description":"Download all mesh logs for a selected time period.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"startTime":{"name":"startTime","type":"option","description":"Start time for the logs in UTC"},"endTime":{"name":"endTime","type":"option","description":"End time for the logs in UTC"},"filename":{"name":"filename","type":"option","description":"Path to the output file for logs","required":true},"past":{"name":"past","type":"option","description":"Past time window in mins"},"from":{"name":"from","type":"option","description":"The from time in YYYY-MM-DD:HH:MM:SS format based on your system's time zone. It is used to fetch logs from the past and is the starting time for the past time duration."}},"args":[]},"api-mesh:log-get":{"id":"api-mesh:log-get","description":"Get the Log of a given mesh by RayId","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"rayId","description":"Fetch a single log by rayID","required":true}]},"api-mesh:log-list":{"id":"api-mesh:log-list","description":"Get recent logs of requests made to the API Mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"filename":{"name":"filename","type":"option","description":"Name of CSV file to export the recent logs to"}},"args":[]},"api-mesh:run":{"id":"api-mesh:run","description":"Run a local development server that builds and compiles a mesh locally","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"Port number for the local dev server","default":5000},"inspectPort":{"name":"inspectPort","type":"option","char":"i","description":"Port number for the local dev server inspector","default":9229},"debug":{"name":"debug","type":"boolean","description":"Enable debugging mode","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"select":{"name":"select","type":"boolean","description":"Retrieve existing artifacts from the mesh","allowNo":false},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file","description":"Mesh File"}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:cache:purge":{"id":"api-mesh:cache:purge","description":"Cache purge for a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"all":{"name":"all","type":"boolean","char":"a","description":"Purge all cache. CLI will purge all cache data.","required":true,"allowNo":false}},"args":[]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adobe/aio-cli-plugin-api-mesh",
-	"version": "5.2.2",
+	"version": "5.2.3-alpha.1",
 	"description": "Adobe I/O CLI plugin to develop and manage API mesh sources",
 	"keywords": [
 		"oclif-plugin"
@@ -21,6 +21,7 @@
 	},
 	"files": [
 		"/oclif.manifest.json",
+		"wrangler.toml",
 		"/src"
 	],
 	"scripts": {
@@ -43,7 +44,7 @@
 		"@adobe/aio-lib-core-logging": "^3.0.0",
 		"@adobe/aio-lib-env": "^3.0.0",
 		"@adobe/aio-lib-ims": "^7.0.1",
-		"@adobe/plugin-hooks": "0.3.3",
+		"@adobe/plugin-hooks": "0.3.4",
 		"@adobe/plugin-on-fetch": "0.1.1",
 		"@adobe/plugin-source-headers": "^0.0.2",
 		"@envelop/disable-introspection": "^6.0.0",
@@ -99,11 +100,12 @@
 		"source-registry-storage-adapter": "github:devx-services/source-registry-storage-adapter#main",
 		"util": "^0.12.5",
 		"uuid": "^8.3.2",
-		"wrangler": "3.80.4",
+		"wrangler": "4.3.0",
 		"yaml": "^2.4.2"
 	},
 	"devDependencies": {
 		"@babel/eslint-parser": "^7.15.8",
+		"@cloudflare/workers-types": "^4.20250320.0",
 		"@oclif/dev-cli": "1.26.10",
 		"@oclif/plugin-help": "2.2.3",
 		"@trivago/prettier-plugin-sort-imports": "^3.1.1",
@@ -136,6 +138,9 @@
 		"access": "public"
 	},
 	"oclif": {
+		"topics": {
+			"api-mesh": { "description": "Create, run, test, and deploy API Mesh"}
+		},
 		"commands": "./src/commands",
 		"bin": "aio",
 		"devPlugins": [

package/src/commands/api-mesh/__tests__/create.test.js

@@ -67,7 +67,7 @@ jest.mock('../../../helpers', () => ({
 	initRequestId: jest.fn().mockResolvedValue({}),
 	promptConfirm: jest.fn().mockResolvedValue(true),
 	interpolateMesh: jest.fn().mockResolvedValue({}),
-	importFiles: jest.fn().mockResolvedValue(),
+	importFiles: jest.fn().mockResolvedValue({}),
 }));
 jest.mock('../../../lib/devConsole');
 jest.mock('chalk', () => ({
@@ -895,7 +895,9 @@ describe('create command tests', () => {
 		});
 
 		importFiles.mockResolvedValueOnce({
-			meshConfig,
+			data: {
+				meshConfig,
+			},
 		});
 
 		const output = await CreateCommand.run();
@@ -1140,7 +1142,11 @@ describe('create command tests', () => {
 
 		promptConfirm.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
 
-		importFiles.mockResolvedValueOnce(meshConfig);
+		importFiles.mockResolvedValueOnce({
+			data: {
+				meshConfig,
+			},
+		});
 
 		createMesh.mockResolvedValueOnce({
 			mesh: {
@@ -1272,7 +1278,9 @@ describe('create command tests', () => {
 		});
 
 		importFiles.mockResolvedValueOnce({
-			meshConfig,
+			data: {
+				meshConfig,
+			},
 		});
 
 		createMesh.mockResolvedValueOnce({
@@ -1400,7 +1408,9 @@ describe('create command tests', () => {
 		promptConfirm.mockResolvedValueOnce(true);
 
 		importFiles.mockResolvedValueOnce({
-			meshConfig,
+			data: {
+				meshConfig,
+			},
 		});
 
 		createMesh.mockResolvedValueOnce({
@@ -1535,7 +1545,9 @@ describe('create command tests', () => {
 		});
 
 		importFiles.mockResolvedValueOnce({
-			meshConfig,
+			data: {
+				meshConfig,
+			},
 		});
 
 		const output = await CreateCommand.run();

package/src/commands/api-mesh/__tests__/run.test.js

@@ -19,7 +19,7 @@ const {
 	initSdk,
 	writeSecretsFile,
 } = require('../../../helpers');
-const { runServer } = require('../../../server');
+const { start } = require('../../../wranglerCli');
 const { getMeshId, getMeshArtifact } = require('../../../lib/devConsole');
 require('@adobe-apimesh/mesh-builder');
 
@@ -32,20 +32,25 @@ jest.mock('../../../helpers', () => ({
 	}),
 	initRequestId: jest.fn().mockResolvedValue({}),
 	interpolateMesh: jest.fn().mockResolvedValue({}),
-	importFiles: jest.fn().mockResolvedValue(),
+	importFiles: jest.fn().mockResolvedValue({}),
 	promptConfirm: jest.fn().mockResolvedValue(true),
 	setUpTenantFiles: jest.fn().mockResolvedValue(),
 	writeSecretsFile: jest.fn().mockResolvedValue(),
 }));
 
-jest.mock('../../../server', () => ({
-	runServer: jest.fn().mockResolvedValue(),
+jest.mock('../../../wranglerCli', () => ({
+	start: jest.fn().mockResolvedValue(),
 }));
 
 jest.mock('../../../lib/devConsole', () => ({
 	getMeshId: jest.fn().mockResolvedValue('mockMeshId'),
 	getMeshArtifact: jest.fn().mockResolvedValue(),
 }));
+
+jest.mock('../../../fixPlugins', () => ({
+	fixPlugins: jest.fn().mockResolvedValue({}),
+}));
+
 jest.mock('chalk', () => ({
 	red: jest.fn(text => text), // Return the input text without any color formatting
 }));
@@ -75,7 +80,6 @@ const originalEnv = {
 	API_MESH_TIER: 'NON-TI',
 };
 
-const defaultPort = 5000;
 const os = require('os');
 
 describe('run command tests', () => {
@@ -94,10 +98,6 @@ describe('run command tests', () => {
 		platformSpy.mockRestore();
 	});
 
-	beforeAll(() => {
-		jest.spyOn(RunCommand.prototype, 'copyMeshContent').mockImplementation(() => {});
-	});
-
 	test('snapshot run command description', () => {
 		expect(RunCommand.description).toMatchInlineSnapshot(
 			`"Run a local development server that builds and compiles a mesh locally"`,
@@ -138,8 +138,18 @@ describe('run command tests', () => {
 		    "parse": [Function],
 		    "type": "option",
 		  },
+		  "inspectPort": {
+		    "char": "i",
+		    "default": 9229,
+		    "description": "Port number for the local dev server inspector",
+		    "input": [],
+		    "multiple": false,
+		    "parse": [Function],
+		    "type": "option",
+		  },
 		  "port": {
 		    "char": "p",
+		    "default": 5000,
 		    "description": "Port number for the local dev server",
 		    "input": [],
 		    "multiple": false,
@@ -188,15 +198,23 @@ describe('run command tests', () => {
 	});
 
 	test('should use the port number provided in the flags for starting the server', async () => {
-		const parseOutput = {
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
-			flags: { port: 6000, debug: false },
+			flags: {
+				port: 6000,
+				debug: false,
+				inspectPort: 9229,
+			},
 		};
-
-		parseSpy.mockResolvedValue(parseOutput);
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		await RunCommand.run();
-		expect(runServer).toHaveBeenCalledWith(parseOutput.flags.port);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should use the port number provided in the .env file if there is no port', async () => {
@@ -205,15 +223,23 @@ describe('run command tests', () => {
 			PORT: 7000,
 		};
 
-		const parseOutput = {
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
-			flags: { debug: false },
+			flags: {
+				port: 5000,
+				debug: false,
+				inspectPort: 9229,
+			},
 		};
-
-		parseSpy.mockResolvedValue(parseOutput);
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		await RunCommand.run();
-		expect(runServer).toHaveBeenCalledWith(process.env.PORT);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			process.env.PORT,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should use the default port if port number is not provided explicitly', async () => {
@@ -221,15 +247,23 @@ describe('run command tests', () => {
 			...originalEnv,
 		};
 
-		const parseOutput = {
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
-			flags: { debug: false },
+			flags: {
+				port: 5000,
+				debug: false,
+				inspectPort: 9229,
+			},
 		};
-
-		parseSpy.mockResolvedValue(parseOutput);
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		await RunCommand.run();
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should return error for run command if the mesh has placeholders and env file provided using --env flag is not found', async () => {
@@ -377,14 +411,6 @@ describe('run command tests', () => {
 	});
 
 	test('should successfully run the mesh if provided env file is valid, mesh interpolation is successful and interpolated mesh is a valid JSON', async () => {
-		parseSpy.mockResolvedValueOnce({
-			args: { file: 'src/commands/__fixtures__/sample_mesh_with_placeholder' },
-			flags: {
-				env: 'src/commands/__fixtures__/env_valid',
-				debug: false,
-			},
-		});
-
 		//sampleInterpolated mesh where the mesh string is a valid JSON
 		const sampleInterpolatedMesh =
 			'{"meshConfig":{"sources":[{"name":"<api-name>","handler":{"graphql":{"endpoint":"<api-url>"}}}],"responseConfig":{"includeHTTPDetails":true}}}';
@@ -395,8 +421,24 @@ describe('run command tests', () => {
 			interpolatedMeshData: sampleInterpolatedMesh,
 		});
 
+		const cliInput = {
+			args: { file: 'src/commands/__fixtures__/sample_mesh_with_placeholder' },
+			flags: {
+				env: 'src/commands/__fixtures__/env_valid',
+				port: 5000,
+				debug: false,
+				inspectPort: 9229,
+			},
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
+
 		await RunCommand.run();
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	// file import tests
@@ -429,20 +471,30 @@ describe('run command tests', () => {
 			],
 		};
 
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(true),
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		importFiles.mockResolvedValueOnce({
-			meshConfig,
+			data: {
+				meshConfig,
+			},
 		});
 
 		await RunCommand.run();
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should fail if the file name is more than 25 characters', async () => {
@@ -608,17 +660,29 @@ describe('run command tests', () => {
 
 		promptConfirm.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
 
-		importFiles.mockResolvedValueOnce(meshConfig);
+		importFiles.mockResolvedValueOnce({
+			data: {
+				meshConfig,
+			},
+		});
 
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_files_array.json' },
 			flags: {
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		await RunCommand.run();
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should override if prompt returns Yes, if there is files array', async () => {
@@ -652,20 +716,30 @@ describe('run command tests', () => {
 
 		promptConfirm.mockResolvedValueOnce(true).mockResolvedValueOnce(true);
 
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_files_array.json' },
 			flags: {
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		importFiles.mockResolvedValueOnce({
-			meshConfig,
+			data: {
+				meshConfig,
+			},
 		});
 
 		await RunCommand.run();
 
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should pass for a fully-qualified meshConfig even if the file does not exist in fileSystem', async () => {
@@ -697,22 +771,32 @@ describe('run command tests', () => {
 			],
 		};
 
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_fully_qualified_mesh.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(true),
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		promptConfirm.mockResolvedValueOnce(true);
 
 		importFiles.mockResolvedValueOnce({
-			meshConfig,
+			data: {
+				meshConfig,
+			},
 		});
 
 		await RunCommand.run();
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should pass if the file is located in subdirectory of mesh directory', async () => {
@@ -744,21 +828,31 @@ describe('run command tests', () => {
 			],
 		};
 
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_mesh_subdirectory.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(true),
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		importFiles.mockResolvedValueOnce({
-			meshConfig,
+			data: {
+				meshConfig,
+			},
 		});
 
 		await RunCommand.run();
 
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should fail if the file is outside the workspace directory', async () => {
@@ -919,17 +1013,25 @@ describe('run command tests', () => {
 	});
 
 	test('should successfully run the mesh if provided secrets file is valid', async () => {
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_secrets_mesh.json' },
 			flags: {
 				secrets: 'src/commands/__fixtures__/secrets_valid.yaml',
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should return error if ran with secrets against windows platform with batch variables', async () => {
@@ -957,48 +1059,72 @@ describe('run command tests', () => {
 
 	test('should pass if ran with secrets against linux platform with batch variables', async () => {
 		platformSpy.mockReturnValue('linux');
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_secrets_mesh.json' },
 			flags: {
 				secrets: 'src/commands/__fixtures__/secrets_with_batch_variables.yaml',
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should pass if ran with secrets against darwin(macOS) platform with batch variables', async () => {
 		platformSpy.mockReturnValue('darwin');
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_secrets_mesh.json' },
 			flags: {
 				secrets: 'src/commands/__fixtures__/secrets_with_batch_variables.yaml',
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalled();
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 
 	test('should escape variables that are preceded by backslash symbol', async () => {
-		parseSpy.mockResolvedValueOnce({
+		const cliInput = {
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_escaped_secrets.json' },
 			flags: {
 				secrets: 'src/commands/__fixtures__/secrets_with_escaped_variables.yaml',
+				port: 5000,
 				debug: false,
+				inspectPort: 9229,
 			},
-		});
+		};
+		parseSpy.mockResolvedValueOnce(cliInput);
 
 		await RunCommand.run();
 		expect(writeSecretsFile).toHaveBeenCalledWith(
 			'Home: rootPath\nHomeString: $HOME\nHomeWithSlash: \\rootPath\nHomeStringWithSlash: \\$HOME\n',
 			expect.anything(),
 		);
-		expect(runServer).toHaveBeenCalledWith(defaultPort);
+		expect(start).toHaveBeenCalledWith(
+			expect.anything(),
+			cliInput.flags.port,
+			cliInput.flags.debug,
+			cliInput.flags.inspectPort,
+		);
 	});
 });