Support multi-node removal

Author: magicmonkey

src/overlay.js

@@ -8,29 +8,22 @@ function applyOverlayToOpenAPI(spec, overlay) {
 	overlay.actions.forEach((a)=>{
 		// Is it a remove?
 		if (a.hasOwnProperty('remove')) {
-			// split the path expression
-			var target_pieces = jsonpath.parse(a.target);
-			// snag the last piece, we need this info to work out which element to remove
-			var final_segment = target_pieces.pop();
-			var target_key = "";
-			if(final_segment.expression.type == "identifier") {
-				target_key = final_segment.expression.value;
+			while(true) {
+				var path = jsonpath.paths(spec, a.target, 1)
+				if (path.length == 0) {
+					break
+				}
+				var parent = jsonpath.parent(spec, a.target)
+				const thingToRemove = path[0][path[0].length - 1]
+				delete parent[thingToRemove]
 			}
 
-		    // Now rebuild the path up to before the final bit
-			var remaining_path = jsonpath.stringify(target_pieces);
-			
-			// get the parent node and remove the target element
-			var node_value = jsonpath.value(spec, remaining_path);
-			delete node_value[target_key];
-			
 		} else {
 			// It must be an update
 			jsonpath.apply(spec, a.target, (chunk) => {
 
 				// Deep merge using a module (built-in spread operator is only shallow)
 				const merger = mergician({appendArrays: true});
-				console.debug(a);
 				const merged = merger(chunk, a.update);
 				return merged;
 
@@ -43,8 +36,6 @@ function applyOverlayToOpenAPI(spec, overlay) {
 
 export function overlayFiles(openapiFile, overlayFile) {
 	// Parse the "input" OpenAPI document
-    console.debug(openapiFile);
-    console.debug (typeof openapiFile);
 	const specraw = fs.readFileSync(openapiFile, 'utf8');
 	var spec = parseWithPointers(specraw).data;
 

test/expected/town-remove-example.yaml

@@ -4,15 +4,13 @@ info:
   title: Imaginary town
 servers:
   - url: 'https://example.com'
-    description: Example server
 paths:
   /buildings:
     get:
       summary: All buildings
       operationId: buildingsAll
       responses:
         '200':
-          description: Return all known buildings
           content:
             application/json:
               schema:

test/overlays/remove-example.yaml

@@ -5,3 +5,5 @@ info:
 actions:
 - target: $.paths['/buildings'].get.responses['200'].content['application/json'].schema.properties['message'].example
   remove: true
+- target: $..description
+  remove: true