fix: make test pass again, make output valid, amend sort order

Author: MikeRalphson

src/overlay.js

@@ -19,39 +19,38 @@ function applyOverlayToOpenAPI(spec, overlay) {
 			}
 
 		} else {
-			// It must be an update
-			jsonpath.apply(spec, a.target, (chunk) => {
-				
-				// Deep merge using a module (built-in spread operator is only shallow)
-				try {
+			try {
+				// 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})
 					return merger(chunk, a.update)
-				}
-				catch (ex) {
-					process.stderr.write(`Error applying overlay: ${ex.message}\n`)
-					return chunk
-				}
+				});
+			}
+			catch (ex) {
+				process.stderr.write(`Error applying overlay: ${ex.message}\n`)
+				//return chunk
+			}
 
-			});
 		}
 	})
 
 	return spec;
 }
 
 function sortOpenAPIFields(field1, field2) {
-    const orderedKeys = ["info", "servers", "paths", "components", "summary", "objectId", "description", "tags", "parameters", "responses"];
+	const orderedKeys = ["info", "servers", "summary", "operationId", "tags", "paths", "components", "description", "parameters", "responses"];
 
-    const index1 = orderedKeys.indexOf(field1);
-    const index2 = orderedKeys.indexOf(field2);
+	const index1 = orderedKeys.indexOf(field1);
+	const index2 = orderedKeys.indexOf(field2);
 
-    if (index1 === -1 || index2 === -1) {
-        return 0;
-    } else if (index1 > index2) {
-        return 1;
-    } else {
-        return -1;
-    }
+	if (index1 === -1 || index2 === -1) {
+		return 0;
+	} else if (index1 > index2) {
+		return 1;
+	} else {
+		return -1;
+	}
 }
 
 export function overlayFiles(openapiFile, overlayFile) {

test/expected/output1.yaml

@@ -10,9 +10,6 @@ paths:
   /pets:
     get:
       operationId: listPets
-      info:
-        x-overlay-applied: structured-overlay
-        description: This is an added description
       tags:
         - pets
         - wildcard-done
@@ -44,6 +41,9 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
+      x-info:
+        x-overlay-applied: structured-overlay
+        description: This is an added description
     post:
       foo:
         bar: hello

test/overlays/overlay.yaml

@@ -11,7 +11,7 @@ actions:
       - wildcard-done
 - target: $.paths['/pets'].get
   update:
-    info:
+    x-info:
       x-overlay-applied: structured-overlay
       description: This is an added description
     tags: