initial commit

Author: tehfedaykin

.gitignore

@@ -0,0 +1,2 @@
+node_modules
+package-lock.json

diff.js

@@ -0,0 +1,119 @@
+var path = require("path");
+var fs = require("fs");
+var diffChecker = require("./src/diffchecker.js");
+
+var typeConverters = {
+  stache: 'html',
+  mustache: 'html',
+  component: 'html'
+};
+var convertType = function(type) {
+  return typeConverters[type] || type;
+};
+
+var createGroupedLines = function(sequentialLines) {
+  var groupedLines = sequentialLines[0] + '-' + sequentialLines[sequentialLines.length-1]
+  return groupedLines
+}
+
+var checkSequence = function(diffLines) {
+  //check to chunk lines together
+  var singleLines = [];
+  //temp array to hold sequences
+  var sequentialLines = [];
+  var prevLine = null;
+  for (var index = 0; index < diffLines.length; index++) {
+    var line = diffLines[index];
+    
+    if (prevLine ) {
+      if (prevLine + 1 === line) {
+        sequentialLines.push(line);
+      }
+      else {
+        //break sequencing
+        if (sequentialLines.length > 1) {
+          //updating singles array
+          var startingSeqIndex = singleLines.indexOf(sequentialLines[0]);
+          singleLines.splice(startingSeqIndex, sequentialLines.length, createGroupedLines(sequentialLines) )
+
+        }
+        sequentialLines = [];
+        sequentialLines.push(line);
+      }
+      // last line is part of sequence
+      if(index + 1 === diffLines.length) {
+        if (prevLine + 1 === line) {
+          sequentialLines.push(line);
+          if (sequentialLines.length > 1) {
+            var startingSeqIndex = singleLines.indexOf(sequentialLines[0]);
+            singleLines.splice(startingSeqIndex,  sequentialLines.length, createGroupedLines(sequentialLines) )
+            sequentialLines = [];
+          }
+        }
+        else {
+          singleLines.push(line);
+        }
+      }
+      else {
+        singleLines.push(line);
+      }
+      prevLine = line;
+    }
+    else {
+      singleLines.push(line);
+      sequentialLines.push(line);
+      prevLine = line;
+    } 
+  }
+  return singleLines;
+} 
+
+/**
+ * @parent bit-docs-tag-sourceref/tags
+ * @module {bit-docs-process-tags/types/tag} bit-docs-tag-sourceref/tags/sourceref @sourceref
+ * 
+ * @description Creates a diff from two files to get the changed lines and wraps them with markdown for code block.
+ * 
+ * @signature `@diff PATH1 PATH2 only`
+ * 
+ * Wraps file contents with triple \` so it shows up as a code block.
+ * 
+ * @param {String} PATH1 The path to original file to be checked against.
+ * @param {String} PATH2 The path to new version of original file.
+ * @param {String} only Option flag to only show changed lines
+ * 
+ */
+module.exports = {
+  add: function(line, curData) {
+    var onlyFlag = line.indexOf('only') > -1 ? 'only': '';
+    var files = line.replace(/@diff|only/g, "").trim().split(" ");
+    //break if more then two throw new error
+    if (files.length > 2) {
+      return false;
+    }
+    if (this.src.path) {
+      var pathedFiles = []
+      for (var fileI = 0; fileI < files.length; fileI++) {
+        let fileName = files[fileI];
+        pathedFiles.push(path.join(path.dirname(this.src.path), fileName));
+      }
+      files = pathedFiles;
+    }
+    var file1 = fs.readFileSync(files[0]).toString();
+    var file2 = fs.readFileSync(files[1]).toString();
+    var validCurData = (curData && curData.length !== 2);
+    var fileType = convertType(path.extname(files[1]).substring(1));
+    var useCurData = useCurData ? validCurData && (typeof curData.description === "string") && !curData.body : false;;
+    var markdown = '\n```' + fileType + '\n' + file2 + '\n```';
+    var diffLines = diffChecker.diff(file1, file2);
+    if(diffLines.length) {
+      var lines = checkSequence(diffLines);
+      markdown += '\n <div line-highlight="' + lines.toString() + ',' + onlyFlag + '"></div>';
+    };
+    if (useCurData) {
+      curData.description += markdown;
+    } else {
+      this.body += markdown;
+    }
+  }
+};

package.json

@@ -0,0 +1,23 @@
+{
+  "name": "bit-docs-tag-diff",
+  "version": "1.0.0",
+  "description": "Create a diff from two filepaths",
+  "main": "diff.js",
+  "scripts": {
+    "test": "mocha test/test.js --reporter spec",
+    "browser": "mocha test/test.js --inspect-brk"
+  },
+  "keywords": [
+    "bit-docs"
+  ],
+  "author": "Bitovi",
+  "license": "ISC",
+  "devDependencies": {
+    "bit-docs-process-tags": "0.0.6",
+    "mocha": "^6.1.4"
+  },
+  "dependencies": {
+    "diff": "^4.0.1",
+    "prettydiff": "^101.0.3"
+  }
+}

src/diffchecker.js

@@ -0,0 +1,26 @@
+module.exports = {
+  diff: function(ogString, newString) {
+    var diffLines = [];
+    var ogLines = ogString.split('\n');
+    var ogLinesStripped = []
+    for (var index = 0; index < ogLines.length; index++) {
+      ogLinesStripped.push(ogLines[index].replace(/;/g, ""));
+    }
+    var newLines = newString.split('\n');
+
+    for (var index = 0; index < newLines.length; index++) {
+      var lineNumber = index + 1;
+      var newLine = newLines[index].replace(/;/g, "");
+      var newLineIndx = ogLinesStripped.indexOf(newLine);
+      if (newLine != '') {
+        if (newLineIndx === -1) {
+          diffLines.push(lineNumber);
+        }
+        else {
+          ogLinesStripped.splice(newLineIndx, 1);
+        }
+      }
+    }
+    return diffLines
+  }
+}

test/dir1/hello-world1.js

@@ -0,0 +1 @@
+console.log("hello world");

test/dir1/ngfile.service.spec.ts

@@ -0,0 +1,92 @@
+import { TestBed } from '@angular/core/testing';
+
+import { RestaurantService } from './restaurant.service';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+
+describe('RestaurantService', () => {
+  let httpMock : HttpTestingController;
+  let restaurantService: RestaurantService;
+
+  beforeEach(() => TestBed.configureTestingModule({
+    imports: [HttpClientTestingModule],
+    providers: [
+      RestaurantService
+    ]
+  }));
+
+  beforeEach(() => {
+    httpMock = TestBed.get(HttpTestingController);
+    restaurantService = TestBed.get(RestaurantService);
+  })
+
+  it('should be created', () => {
+    expect(restaurantService).toBeTruthy();
+  });
+ 
+  it('should make a get request to restaurants', () => {
+    const mockRestaurants = {
+      data: [{
+      "name":"Brunch Place",
+      "slug":"brunch-place",
+      "images":{
+        "thumbnail":"node_modules/place-my-order-assets/images/4-thumbnail.jpg",
+        "owner":"node_modules/place-my-order-assets/images/2-owner.jpg",
+        "banner":"node_modules/place-my-order-assets/images/2-banner.jpg"},
+        "menu":{
+          "lunch":[
+            {"name":"Ricotta Gnocchi","price":15.99},
+            {"name":"Garlic Fries","price":15.99},
+            {"name":"Charred Octopus","price":25.99}
+          ],
+          "dinner":[
+            {"name":"Steamed Mussels","price":21.99},
+            {"name":"Roasted Salmon","price":23.99},
+            {"name":"Crab Pancakes with Sorrel Syrup","price":35.99}
+          ]
+        },
+        "address":{
+          "street":"2451 W Washburne Ave",
+          "city":"Ann Arbor","state":"MI","zip":"53295"},
+          "_id":"xugqxQIX5rPJTLBv"
+        },
+        {
+          "name":"Taco Joint",
+          "slug":"taco-joint",
+          "images":{
+            "thumbnail":"node_modules/place-my-order-assets/images/4-thumbnail.jpg",
+            "owner":"node_modules/place-my-order-assets/images/2-owner.jpg",
+            "banner":"node_modules/place-my-order-assets/images/2-banner.jpg"},
+            "menu":{
+              "lunch":[
+                {"name":"Beef Tacos","price":15.99},
+                {"name":"Chicken Tacos","price":15.99},
+                {"name":"Guacamole","price":25.99}
+              ],
+              "dinner":[
+                {"name":"Shrimp Tacos","price":21.99},
+                {"name":"Chicken Enchilada","price":23.99},
+                {"name":"Elotes","price":35.99}
+              ]
+            },
+            "address":{
+              "street":"13 N 21st St",
+              "city":"Chicago","state":"IL","zip":"53295"},
+              "_id":"xugqxQIX5dfgdgTLBv"
+            }]
+    };
+
+    restaurantService.getRestaurants().subscribe((restaurants:any) => {
+      expect(restaurants).toEqual(mockRestaurants);
+    });
+
+    let url = '/api/restaurants';
+    const req = httpMock.expectOne(url);
+
+
+    expect(req.request.method).toEqual('GET');
+    req.flush(mockRestaurants);
+
+    httpMock.verify();
+  });
+
+});

test/dir2/hello-world2.js

@@ -0,0 +1,2 @@
+console.log("hello world");
+console.log("hello universe");