leading slash check #34

Author: sandorfr

Common/Node/jsonPatcher.ts

@@ -4,7 +4,7 @@ var jsonPatch = require('fast-json-patch');
 
 export class JsonPatcher implements patch.IPatcher {
     constructor(
-        private patches: patch.IPatch[]
+        public patches: patch.IPatch[]
     ) {
     }
 

Common/Node/patch.ts

@@ -8,6 +8,7 @@ export interface IPatch{
 }
 
 export interface IPatcher {
+    patches: IPatch[];
     apply(content: string): string;
 }
 

Common/Node/patchProcess.ts

@@ -24,6 +24,15 @@ export function apply(patcher: patch.IPatcher, workingDirectory: string, filters
     outputPatchedFile: boolean, failIfNoPatchApplied: boolean, skipErrors: boolean) {
     var files = matcher.getMatches(workingDirectory, filters);
 
+    for (var index = 0; index < patcher.patches.length; index++) {
+        var patch = patcher.patches[index];
+        if (patch.path && patch.path[0] != '/'
+            || patch.from && patch.from[0] != '/')
+        {
+            throw new Error("All path must start with a leading slash. Please verify patch at index " + String(index));
+        }
+    }
+
     tl.debug("Attempt to patch " + String(files.length) + "files");
 
     var filePatched = 0;

Tasks/XmlPatch/xmlPatcher.ts

@@ -5,11 +5,39 @@ import XRegExp = require('xregexp');
 
 export class XmlPatcher implements patch.IPatcher {
     constructor(
-        private patches: patch.IPatch[],
+        public patches: patch.IPatch[],
         private namespaces: { [tag: string]: string }
     ) {
     }
 
+    detectArrayOperation(path: string): { path: string, isArrayOperation: boolean, append?: boolean, index?: number } {
+        var lastSlash = path.lastIndexOf('/');
+        var lastFragment = path.substr(lastSlash + 1);
+        var remainingPath = path.substr(0, lastSlash);
+
+        console.log(lastFragment);
+        if (lastFragment == '-') {
+            return {
+                path: remainingPath,
+                isArrayOperation: true,
+                append: true
+            };
+        }
+
+        if (XRegExp.match(lastFragment, /^\d+$/g)) {
+            return {
+                path: remainingPath,
+                isArrayOperation: true,
+                index: parseInt(lastFragment)
+            };
+        }
+
+        return {
+            path: path,
+            isArrayOperation: false
+        };
+    }
+
     getParentPath(path: string): { path: string, nodeName: string, isAttribute: boolean } {
         var lastSlash = path.lastIndexOf('/');
         var nodeName = path.substr(lastSlash + 1);
@@ -27,11 +55,28 @@ export class XmlPatcher implements patch.IPatcher {
     }
 
     remove(xml: Document, select: any, patch: patch.IPatch): boolean {
+        var arrayOperation = this.detectArrayOperation(patch.path);
+        console.log(JSON.stringify(arrayOperation));
+        if (arrayOperation.isArrayOperation) {
+            if (arrayOperation.append) {
+                var node = <SVGSVGElement>select(arrayOperation.path, xml, true);
+                node.removeChild(node.lastChild);
+                console.log('arrayOperation.path');
+                console.log(node);
+                console.log('remove lastchild');
+                return true;
+            } else {
+                var node = <SVGSVGElement>select(arrayOperation.path, xml, true);
+                node.removeChild(node.childNodes[arrayOperation.index]);
+                return true;
+            }
+        }
+
         var node = <SVGSVGElement>select(patch.path, xml, true);
         if (node) {
             var parentPath = this.getParentPath(patch.path);
             var parentNode = <SVGSVGElement>select(parentPath.path, xml, true);
-            if (parentPath.isAttribute){
+            if (parentPath.isAttribute) {
                 parentNode.removeAttribute(parentPath.nodeName);
             } else {
                 node.parentNode.removeChild(node);
@@ -47,7 +92,7 @@ export class XmlPatcher implements patch.IPatcher {
         var toNode = <SVGSVGElement>select(patch.path, xml, true);
         if (fromNode) {
             patch.value = fromNode.textContent;
-            this.remove(xml, select, { op: 'remove', path : patch.from });
+            this.remove(xml, select, { op: 'remove', path: patch.from });
             return this.replace(xml, select, patch);
         } else {
             return this.notfound(patch);
@@ -66,6 +111,23 @@ export class XmlPatcher implements patch.IPatcher {
     }
 
     add(xml: Document, select: any, patch: patch.IPatch): boolean {
+        var arrayOperation = this.detectArrayOperation(patch.path);
+        console.log(JSON.stringify(arrayOperation));
+        if (arrayOperation.isArrayOperation) {
+            if (arrayOperation.append) {
+                var node = <SVGSVGElement>select(arrayOperation.path, xml, true);
+                var newNode = xml.createElement(patch.value);
+                node.appendChild(newNode);
+                return true;
+            } else {
+                var node = <SVGSVGElement>select(arrayOperation.path, xml, true);
+                var newNode = xml.createElement(patch.value);
+                node.insertBefore(newNode, node.childNodes[arrayOperation.index])
+                node.appendChild(newNode);
+                return true;
+            }
+        }
+
         var node = <SVGSVGElement>select(patch.path, xml, true);
         if (node) {
             node.textContent = patch.value;
@@ -96,10 +158,10 @@ export class XmlPatcher implements patch.IPatcher {
         if (node) {
             var parentPath = this.getParentPath(patch.path);
             var parentNode = <SVGSVGElement>select(parentPath.path, xml, true);
-            if (parentPath.isAttribute){
+            if (parentPath.isAttribute) {
                 parentNode.setAttribute(parentPath.nodeName, patch.value);
             } else {
-                 node.textContent = patch.value;
+                node.textContent = patch.value;
             }
             return true;
         } else {
@@ -135,12 +197,12 @@ export class XmlPatcher implements patch.IPatcher {
             } else if (patch.op == 'test') {
                 operation = this.test.bind(this);
             }
-            
+
             if (!operation(xml, select, patch)) {
                 throw new Error("Failed to patch xml file");
             }
         }
-        
+
         return new xmldom.XMLSerializer().serializeToString(xml);
     }
 }

Tests/XmlPatch/xmlPatcher.spec.ts

@@ -219,7 +219,6 @@ describe("XML Patcher", () => {
                     }
                 ], {});
              var result = patcher.apply(source);
-             console.log(result);
              expect(result).not.toContain('#should_be_replaced#');
         });
     });