@adobe/aio-cli-plugin-api-mesh 2.3.1 → 2.3.3

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.3.1","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"}},"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: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"}},"args":[{"name":"file"}]},"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":"2.3.3","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"}},"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: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"}},"args":[{"name":"file"}]},"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": "2.3.1",
+	"version": "2.3.3",
 	"publishConfig": {
 		"access": "public"
 	},

package/src/commands/__fixtures__/sample_mesh_with_composer_files.json

@@ -0,0 +1,42 @@
+{
+	"meshConfig": {
+		"sources": [
+			{
+				"name": "<json_source_name>",
+				"handler": {
+					"JsonSchema": {
+						"baseUrl": "<json_source__baseurl>",
+						"operations": [
+							{
+								"type": "Query",
+								"field": "<query>",
+								"path": "<query_path>",
+								"method": "POST",
+								"requestSchema": "./requestParams.json"
+							}
+						]
+					}
+				}
+			}
+		],
+		"plugins": [
+			{
+				"hooks": {
+					"beforeAll": {
+						"composer": "./hooks.js#functionName"
+					}
+				}
+			}
+		],
+		"files": [
+			{
+				"path": "./requestParams.json",
+				"content": "{\"type\":\"dummyContent\"}"
+			},
+			{
+				"path": "./hooks.js",
+				"content": "module.exports.functionName = () => { console.log('beforeAll hook'); }"
+			}
+		]
+	}
+}

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

@@ -14,6 +14,7 @@ const mockConsoleCLIInstance = {};
 
 const CreateCommand = require('../create');
 const sampleCreateMeshConfig = require('../../__fixtures__/sample_mesh.json');
+const meshConfigWithComposerFiles = require('../../__fixtures__/sample_mesh_with_composer_files.json');
 const {
 	initSdk,
 	initRequestId,
@@ -165,6 +166,78 @@ describe('create command tests', () => {
 	`);
 		expect(CreateCommand.aliases).toMatchInlineSnapshot(`[]`);
 	});
+
+	test('should pass if a valid mesh config file with composer files are provided', async () => {
+		createMesh.mockResolvedValueOnce({
+			meshId: 'dummy_mesh_id',
+			meshConfig: meshConfigWithComposerFiles.meshConfig,
+		});
+
+		parseSpy.mockResolvedValueOnce({
+			args: { file: 'src/commands/__fixtures__/sample_mesh_with_composer_files.json' },
+			flags: {
+				autoConfirmAction: Promise.resolve(true),
+			},
+		});
+
+		const output = await CreateCommand.run();
+
+		expect(output).toMatchInlineSnapshot(`
+		{
+		  "adobeIdIntegrationsForWorkspace": {
+		    "apiKey": "dummy_api_key",
+		    "id": "dummy_id",
+		  },
+		  "mesh": {
+		    "meshConfig": {
+		      "files": [
+		        {
+		          "content": "{"type":"dummyContent"}",
+		          "path": "./requestParams.json",
+		        },
+		        {
+		          "content": "module.exports.functionName = () => { console.log('beforeAll hook'); }",
+		          "path": "./hooks.js",
+		        },
+		      ],
+		      "plugins": [
+		        {
+		          "hooks": {
+		            "beforeAll": {
+		              "composer": "./hooks.js#functionName",
+		            },
+		          },
+		        },
+		      ],
+		      "sources": [
+		        {
+		          "handler": {
+		            "JsonSchema": {
+		              "baseUrl": "<json_source__baseurl>",
+		              "operations": [
+		                {
+		                  "field": "<query>",
+		                  "method": "POST",
+		                  "path": "<query_path>",
+		                  "requestSchema": "./requestParams.json",
+		                  "type": "Query",
+		                },
+		              ],
+		            },
+		          },
+		          "name": "<json_source_name>",
+		        },
+		      ],
+		    },
+		    "meshId": "dummy_mesh_id",
+		  },
+		  "sdkList": [
+		    "dummy_service",
+		  ],
+		}
+	`);
+	});
+
 	test('should fail if create mesh api has failed', async () => {
 		createMesh.mockRejectedValueOnce(new Error('create mesh api failed'));
 
@@ -189,6 +262,7 @@ describe('create command tests', () => {
 		]
 	`);
 	});
+
 	test('should create if a valid mesh config file is provided', async () => {
 		const runResult = await CreateCommand.run();
 
@@ -295,7 +369,7 @@ describe('create command tests', () => {
 		let fetchedMeshConfig = sampleCreateMeshConfig;
 		fetchedMeshConfig.meshId = 'dummy_id';
 		fetchedMeshConfig.meshURL = 'https://tigraph.adobe.io';
-		getMesh.mockResolvedValue(fetchedMeshConfig);
+		getMesh.mockResolvedValueOnce(fetchedMeshConfig);
 
 		const runResult = await CreateCommand.run();
 
@@ -753,7 +827,7 @@ describe('create command tests', () => {
 	});
 
 	test('should successfully create a mesh if provided env file is valid, mesh interpolation is successful and interpolated mesh is a valid JSON', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_placeholder' },
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,
@@ -804,7 +878,7 @@ describe('create command tests', () => {
 	});
 
 	test('should return error if inputMesh is not a valid JSON', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_invalid_mesh.txt' },
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,
@@ -855,12 +929,12 @@ describe('create command tests', () => {
 			],
 		};
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -970,7 +1044,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the file name is more than 25 characters', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_file_name.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -998,36 +1072,8 @@ describe('create command tests', () => {
 	`);
 	});
 
-	test('should fail if the file paths in files array and filenames in sources, transforms, additionalResolvers do not match in mesh config', async () => {
-		parseSpy.mockResolvedValue({
-			args: { file: 'src/commands/__fixtures__/sample_mesh_mismatching_path.json' },
-			flags: {
-				autoConfirmAction: Promise.resolve(false),
-			},
-		});
-
-		const output = CreateCommand.run();
-
-		await expect(output).rejects.toEqual(new Error('Input mesh config is not valid.'));
-
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "Please make sure the file names are matching in meshConfig.",
-		  ],
-		]
-	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "Input mesh config is not valid.",
-		  ],
-		]
-	`);
-	});
-
 	test('should fail if the file is of type other than js, json extension', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_type.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -1055,7 +1101,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the files do not exist in the mesh directory or subdirectory', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_paths.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -1093,7 +1139,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if import files function fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -1158,19 +1204,19 @@ describe('create command tests', () => {
 			],
 		};
 
-		promptConfirm.mockResolvedValue(false).mockResolvedValue(true);
+		promptConfirm.mockResolvedValueOnce(false).mockResolvedValueOnce(true);
 
-		importFiles.mockResolvedValue(meshConfig);
+		importFiles.mockResolvedValueOnce(meshConfig);
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_files_array.json' },
 			flags: {
-				autoConfirmAction: Promise.resolve(false),
+				autoConfirmAction: Promise.resolve(true),
 			},
 		});
 
@@ -1298,12 +1344,12 @@ describe('create command tests', () => {
 			],
 		};
 
-		promptConfirm.mockResolvedValue(true).mockResolvedValue(true);
+		promptConfirm.mockResolvedValueOnce(true).mockResolvedValueOnce(true);
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_with_files_array.json' },
 			flags: {
-				autoConfirmAction: Promise.resolve(false),
+				autoConfirmAction: Promise.resolve(true),
 			},
 		});
 
@@ -1311,7 +1357,7 @@ describe('create command tests', () => {
 			meshConfig,
 		});
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
@@ -1443,20 +1489,20 @@ describe('create command tests', () => {
 			],
 		};
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_fully_qualified_mesh.json' },
 			flags: {
-				autoConfirmAction: Promise.resolve(false),
+				autoConfirmAction: Promise.resolve(true),
 			},
 		});
 
-		promptConfirm.mockResolvedValue(true);
+		promptConfirm.mockResolvedValueOnce(true);
 
 		importFiles.mockResolvedValueOnce({
 			meshConfig,
 		});
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
@@ -1587,15 +1633,15 @@ describe('create command tests', () => {
 			],
 		};
 
-		createMesh.mockResolvedValue({
+		createMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_subdirectory.json' },
 			flags: {
-				autoConfirmAction: Promise.resolve(false),
+				autoConfirmAction: Promise.resolve(true),
 			},
 		});
 
@@ -1702,7 +1748,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the file is outside the workspace directory', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_outside_workspace_dir.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -1729,7 +1775,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the file has invalid JSON content', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_file_content.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),
@@ -1766,7 +1812,7 @@ describe('create command tests', () => {
 	});
 
 	test('should fail if the file path starts from home directory i.e., path starts with ~/', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_path_from_home.json' },
 			flags: {
 				autoConfirmAction: Promise.resolve(false),

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

@@ -112,7 +112,7 @@ describe('delete command tests', () => {
 	});
 
 	test('should fail if mesh id is missing', async () => {
-		getMeshId.mockResolvedValue(null);
+		getMeshId.mockResolvedValueOnce(null);
 		const runResult = DeleteCommand.run();
 
 		return runResult.catch(err => {
@@ -147,7 +147,7 @@ describe('delete command tests', () => {
 	});
 
 	test('should not ask for prompt if autoConfirmAction is set', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {},
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,

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

@@ -109,7 +109,7 @@ describe('get command tests', () => {
 	});
 
 	test('should fail if mesh id is missing', async () => {
-		getMeshId.mockResolvedValue(null);
+		getMeshId.mockResolvedValueOnce(null);
 		const runResult = GetCommand.run();
 
 		return runResult.catch(err => {
@@ -128,7 +128,7 @@ describe('get command tests', () => {
 	});
 
 	test('should fail if getMeshId failed', async () => {
-		getMeshId.mockRejectedValue(new Error('getMeshId failed'));
+		getMeshId.mockRejectedValueOnce(new Error('getMeshId failed'));
 		const runResult = GetCommand.run();
 
 		return runResult.catch(err => {

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

@@ -95,7 +95,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass with no flags', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -103,7 +103,7 @@ describe('Workspace init command tests', () => {
 				path: './template',
 			},
 		});
-		promptSelect.mockResolvedValue('yarn');
+		promptSelect.mockResolvedValueOnce('yarn');
 		await InitCommand.run();
 		expect(promptConfirm).toHaveBeenCalled();
 		expect(promptSelect).toHaveBeenCalled();
@@ -121,7 +121,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass and create git project if git flag is provided', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -149,7 +149,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if git flag is provided and git init fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -178,7 +178,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass and create yarn project if yarn is package manager', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -203,7 +203,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass and create yarn + git project if yarn is package manager and git flag is set', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -227,7 +227,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass with creating the sub directory if the directory already exists', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -237,7 +237,7 @@ describe('Workspace init command tests', () => {
 				packageManager: mockPMDefaultFlag,
 			},
 		});
-		access.mockResolvedValue({});
+		access.mockResolvedValueOnce({});
 
 		await InitCommand.run();
 
@@ -252,7 +252,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if the directory already exists and sub directory of project name exists', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -262,7 +262,7 @@ describe('Workspace init command tests', () => {
 				packageManager: mockPMDefaultFlag,
 			},
 		});
-		access.mockResolvedValue({});
+		access.mockResolvedValueOnce({});
 		mkdir.mockRejectedValue(new Error());
 
 		await expect(InitCommand.run()).rejects.toThrow();
@@ -280,7 +280,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if directory creation fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -306,7 +306,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if npm install fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -333,7 +333,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if yarn install fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -360,7 +360,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should exit if sub directory prompt is provided with no', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -373,7 +373,7 @@ describe('Workspace init command tests', () => {
 		// create workspace prompt
 		promptConfirm.mockResolvedValueOnce(true);
 		// access passes
-		access.mockResolvedValue({});
+		access.mockResolvedValueOnce({});
 		// create in sub directory prompt
 		promptConfirm.mockResolvedValueOnce(false);
 		await InitCommand.run();
@@ -383,8 +383,8 @@ describe('Workspace init command tests', () => {
 });
 
 test('test createPackageJson', async () => {
-	jest.spyOn(fs, 'readFile').mockResolvedValue({});
-	jest.spyOn(fs, 'writeFile').mockResolvedValue({});
+	jest.spyOn(fs, 'readFile').mockResolvedValueOnce({});
+	jest.spyOn(fs, 'writeFile').mockResolvedValueOnce({});
 
 	await expect(InitCommand.prototype.createPackageJson()).resolves;
 });

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

@@ -89,7 +89,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -148,7 +148,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -207,7 +207,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -267,7 +267,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -277,7 +277,7 @@ describe('update command tests', () => {
 			},
 		});
 
-		getMeshId.mockResolvedValue(null);
+		getMeshId.mockResolvedValueOnce(null);
 		const runResult = UpdateCommand.run();
 
 		await expect(runResult).rejects.toMatchInlineSnapshot(
@@ -308,7 +308,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -349,7 +349,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -451,7 +451,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -500,7 +500,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		let meshConfig = {
 			sources: [
@@ -530,12 +530,12 @@ describe('update command tests', () => {
 			],
 		};
 
-		updateMesh.mockResolvedValue({
+		updateMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				autoConfirmAction: mockAutoApproveAction,
@@ -645,9 +645,9 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_file_name.json' },
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,
@@ -700,9 +700,9 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,

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

@@ -10,7 +10,6 @@ governing permissions and limitations under the License.
 */
 
 const { Command } = require('@oclif/core');
-
 const { initSdk, initRequestId, promptConfirm, importFiles } = require('../../helpers');
 const logger = require('../../classes/logger');
 const CONSTANTS = require('../../constants');
@@ -31,7 +30,7 @@ const {
 	subscribeCredentialToMeshService,
 } = require('../../lib/devConsole');
 
-const { MULTITENANT_GRAPHQL_SERVER_BASE_URL } = CONSTANTS;
+const { MULTITENANT_GRAPHQL_SERVER_BASE_URL, TMOConstants } = CONSTANTS;
 
 class CreateCommand extends Command {
 	static args = [{ name: 'file' }];
@@ -157,10 +156,18 @@ class CreateCommand extends Command {
 									? MULTITENANT_GRAPHQL_SERVER_BASE_URL
 									: meshURL;
 
-							this.log(
-								'Mesh Endpoint: %s\n',
-								`${meshUrl}/${mesh.meshId}/graphql?api_key=${adobeIdIntegrationsForWorkspace.apiKey}`,
-							);
+							if (
+								meshUrl === TMOConstants.TMO_STAGE_URL ||
+								meshUrl === TMOConstants.TMO_SANDBOX_URL ||
+								meshUrl === TMOConstants.TMO_PROD_URL
+							) {
+								this.log('Mesh Endpoint: %s\n', `${meshUrl}/${mesh.meshId}/graphql`);
+							} else {
+								this.log(
+									'Mesh Endpoint: %s\n',
+									`${meshUrl}/${mesh.meshId}/graphql?api_key=${adobeIdIntegrationsForWorkspace.apiKey}`,
+								);
+							}
 						} else {
 							this.log(
 								'Unable to subscribe API Key %s to API Mesh service',

package/src/commands/api-mesh/describe.js

@@ -19,7 +19,7 @@ const { describeMesh, getMesh } = require('../../lib/devConsole');
 
 require('dotenv').config();
 
-const { MULTITENANT_GRAPHQL_SERVER_BASE_URL } = CONSTANTS;
+const { MULTITENANT_GRAPHQL_SERVER_BASE_URL, TMOConstants } = CONSTANTS;
 
 class DescribeCommand extends Command {
 	static flags = {
@@ -55,11 +55,17 @@ class DescribeCommand extends Command {
 					const { meshURL } = await getMesh(imsOrgId, projectId, workspaceId, meshId);
 					const meshUrl = meshURL === '' ? MULTITENANT_GRAPHQL_SERVER_BASE_URL : meshURL;
 
-					if (apiKey) {
+					if (
+						apiKey &&
+						(meshUrl === TMOConstants.TMO_STAGE_URL ||
+							meshUrl === TMOConstants.TMO_SANDBOX_URL ||
+							meshUrl === TMOConstants.TMO_PROD_URL)
+					) {
+						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql`);
+					} else if (apiKey) {
 						this.log('API Key: %s', apiKey);
 						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql?api_key=${apiKey}`);
 					}
-
 					return meshDetails;
 				} else {
 					logger.error(

package/src/constants.js

@@ -19,5 +19,10 @@ const ProdConstants = {
 	AIO_CLI_API_KEY: 'aio-cli-console-auth',
 	SMS_BASE_URL: 'https://graph.adobe.io/api-admin',
 };
-
-module.exports = clientEnv === 'stage' ? StageConstants : ProdConstants;
+const TMOConstants = {
+	TMO_STAGE_URL: 'https://tigraph-dev.adobe.io/api',
+	TMO_SANDBOX_URL: 'https://tigraph-sandbox.adobe.io/api',
+	TMO_PROD_URL: 'https://tigraph.adobe.io/api',
+};
+const envConstants = clientEnv === 'stage' ? StageConstants : ProdConstants;
+module.exports = { ...envConstants, TMOConstants };

package/src/utils.js

@@ -79,7 +79,7 @@ function getFilesInMeshConfig(data, meshConfigName) {
 
 	// Additional Resolvers
 	data.meshConfig.additionalResolvers?.forEach(additionalResolver => {
-		if (!fileURLRegex.test(additionalResolver)) {
+		if (typeof additionalResolver === 'string' && !fileURLRegex.test(additionalResolver)) {
 			filesList.push(additionalResolver);
 		}
 	});
@@ -88,7 +88,9 @@ function getFilesInMeshConfig(data, meshConfigName) {
 	data.meshConfig.sources.transforms?.forEach(transform => {
 		transform.replaceField?.replacements.forEach(replacement => {
 			if (replacement.composer && !fileURLRegex.test(replacement.composer)) {
-				filesList.push(replacement.composer);
+				const [filename] = replacement.composer.split('#');
+
+				filesList.push(filename);
 			}
 		});
 	});
@@ -97,16 +99,51 @@ function getFilesInMeshConfig(data, meshConfigName) {
 	data.meshConfig.transforms?.forEach(transform => {
 		transform.replaceField?.replacements.forEach(replacement => {
 			if (replacement.composer && !fileURLRegex.test(replacement.composer)) {
-				filesList.push(replacement.composer);
+				const [filename] = replacement.composer.split('#');
+
+				filesList.push(filename);
 			}
 		});
 	});
 
+	// Hooks Plugin - mesh level
+	data.meshConfig.plugins?.forEach(plugin => {
+		if (plugin.hooks) {
+			if (plugin.hooks.beforeAll) {
+				const composer = plugin.hooks.beforeAll.composer;
+
+				if (composer && !fileURLRegex.test(composer)) {
+					const [filename] = composer.split('#');
+
+					filesList.push(filename);
+				}
+			}
+		}
+	});
+
+	// OnFetch plugin - mesh level
+	data.meshConfig.plugins?.forEach(plugin => {
+		if (plugin.onFetch) {
+			plugin.onFetch.forEach(onFetchConfig => {
+				const handler = onFetchConfig.handler;
+
+				if (handler) {
+					filesList.push(handler);
+				}
+			});
+		}
+	});
+
+	// remove duplicate files
+	filesList = [...new Set(filesList)];
+
+	logger.info(`Files to be imported: ${filesList.join(', ')}`);
+
 	try {
 		if (filesList.length) {
 			checkFilesAreUnderMeshDirectory(filesList, meshConfigName);
 			validateFileType(filesList);
-			validateFileName(filesList, data);
+			validateFileName(filesList);
 		}
 	} catch (err) {
 		logger.error(err.message);
@@ -226,9 +263,8 @@ function validateFileType(filesList) {
  * Validate the filenames
  *
  * @param filesList Files in sources, tranforms or additionalResolvers in the meshConfig
- * @param data MeshConfig
  */
-function validateFileName(filesList, data) {
+function validateFileName(filesList) {
 	const filesWithInvalidNames = [];
 
 	// Check if the file names are less than 25 characters
@@ -244,17 +280,6 @@ function validateFileName(filesList, data) {
 			`Mesh file names must be less than 25 characters. The following file(s) are invalid: ${filesWithInvalidNames}.`,
 		);
 	}
-
-	// check if the the filePaths in the files array match
-	// the fileNames in sources, transforms or additionalResolvers
-
-	if (data.meshConfig.files) {
-		for (let i = 0; i < data.meshConfig.files.length; i++) {
-			if (filesList.indexOf(data.meshConfig.files[i].path) == -1) {
-				throw new Error(`Please make sure the file names are matching in meshConfig.`);
-			}
-		}
-	}
 }
 
 /**validates the environment file content