Finished moving esprima parsing into the frontend

Author: akash5474

app/scripts/services/apirequest.js

@@ -11,6 +11,7 @@ angular.module('codeSearchApp')
     var searchQuery;
     var library;
     var libFunction;
+    var returnSnips;
 
     var getDepVar = function(lib, file) {
       var parsedData = esprima.tokenize(file);
@@ -89,44 +90,58 @@ angular.module('codeSearchApp')
         console.log('sOpts', searchOptions);
         console.log('sQuer', searchQuery);
 
+        var snippitsToReturn = [];
+
         async.map(files, snippIterator, function(err, snippitsArr) {
           snippitsArr = _.flatten(snippitsArr);
           console.log('done iterating through snippits', snippitsArr.length);
           console.log(snippitsArr);
           console.log('populating snippit ids');
 
-          var snipPaths = _.pluck(snippitsArr, 'filePath');
-
-          $http.post('/api/popSnips', {snipPaths: snipPaths})
-          .then(function(data) {
-
+          var popData = snippitsArr.forEach(function(el) {
+            snippitsToReturn.push({
+              snippit: el.snippit,
+              filePath: el.filePath
+            });
           });
         });
+
+        return snippitsToReturn;
       })
-      // .then(function(data){
-      //   var parsedData = angular.fromJson(data);
-      //   parsedData.data.snippits.sort(function(a, b) {
-      //     if (a.snippitScore < b.snippitScore) {
-      //       return 1;
-      //     } else if (a.snippitScore > b.snippitScore) {
-      //       return -1;
-      //     } else {
-      //       return 0;
-      //     }
-      //   });
-
-      //   var snippitsReturned = {};
-      //   snippitsReturned.codeSnippits = parsedData.data.snippits;
-
-      //   var pages = Math.ceil(snippitsReturned.codeSnippits.length / 10 );
-      //   snippitsReturned.pageArray = [];
-
-      //   for ( var i = 0; i < pages; i++ ) {
-      //     snippitsReturned.pageArray.push(i);
-      //   }
-
-      //   return snippitsReturned
-      // })
+      .then(function(snippitsToReturn) {
+        return $http.post('/api/popSnips', {data: snippitsToReturn})
+        .then(function(data){
+          var parsedData = angular.fromJson(data);
+          parsedData.data.snippits.sort(function(a, b) {
+            if (a.snippitScore < b.snippitScore) {
+              return 1;
+            } else if (a.snippitScore > b.snippitScore) {
+              return -1;
+            } else {
+              return 0;
+            }
+          });
+
+          var snippitsReturned = {};
+          snippitsReturned.codeSnippits = parsedData.data.snippits;
+
+          var pages = Math.ceil(snippitsReturned.codeSnippits.length / 10 );
+          snippitsReturned.pageArray = [];
+
+          for ( var i = 0; i < pages; i++ ) {
+            snippitsReturned.pageArray.push(i);
+          }
+
+          console.log(snippitsReturned);
+
+          // returnSnips = snippitsReturned;
+
+          return snippitsReturned
+        });
+        console.log('returning');
+        console.log(data);
+        return data;
+      });
     }
 
     return apiRequest

lib/controllers/files.js

@@ -35,29 +35,6 @@ var extractDependencies = function(content) {
     return moduleArray;
 };
 
-var getDepVar = function(lib, file) {
-  var parsedData = esprima.tokenize(file);
-
-  for ( var i = 0; i < parsedData.length; i++ ) {
-    var o = parsedData[i];
-
-    if ( o.type === 'String' &&
-         o.value.substring(1, o.value.length - 1 ) === lib &&
-         parsedData[ i+1 ].type === 'Punctuator' &&
-         parsedData[ i+1 ].value === ')' &&
-         parsedData[ i-1 ].type === 'Punctuator' &&
-         parsedData[ i-1 ].value === '(' &&
-         parsedData[ i-2 ].type === 'Identifier' &&
-         parsedData[ i-2 ].value === 'require' &&
-         parsedData[ i-3 ].type === 'Punctuator' &&
-         parsedData[ i-3 ].value === '=' &&
-         parsedData[ i-4 ].type === 'Identifier' ) {
-
-      return parsedData[ i-4 ].value;
-    }
-  }
-};
-
 exports.addToDB = function(req, res, next) {
 
   var filePath = req.body.url;
@@ -100,7 +77,6 @@ var populateSnippitIds = function(snippitObj, cb) {
         return;
       }
 
-      // console.log(typeof file._snippitIds, ': ', file._snippitIds);
       if (file._snippitIds.length > 0) {
         console.log(snippitObj.filePath);
         for (var i = 0; i < file._snippitIds.length; i++){
@@ -145,63 +121,19 @@ exports.findCode = function(req, res, next) {
     searchOptions.func = libFunction.length > 0 ? true : false;
   }
 
-  // console.log('searchQuery', searchQuery);
-  // console.log('searchOptions', searchOptions);
-  var snippIterator = function (doc, callback) {
-
-    var docContent = doc.contents;
-    var repoUrl = doc.repoUrl || "";
-    var filePath = doc.filePath || "";
-    var snippitRatings = doc.snippitRatings ?
-                          doc.snippitRatings[libFunction] : {};
-
-    var dep;
-    if ( library.length > 0 && libFunction.length > 0 ) {
-      dep = getDepVar( library, docContent );
-
-      if ( dep ) {
-        searchQuery = dep + '.' + libFunction;
-      }
-    }
-
-    var snippit = codeParser(docContent, searchQuery, searchOptions);
-
-    var resultsArr = [];
-    snippit.forEach(function(snippit) {
-      // console.log(snippit.length);
-      var snippitObj = {
-        repoUrl: repoUrl,
-        filePath: filePath,
-        snippit: snippit,
-        docContent: docContent
-      };
-      resultsArr.push(snippitObj);
-    });
-    callback(null, resultsArr);
-  };
-
   File.find({ $text: { $search: searchQuery } }, function(err, files) {
     console.log('Found \033[35m', files.length, '\033[39m many files');
-    console.log(files.length, { searchOptions: searchOptions, searchQuery: searchQuery })
     res.json({ files: files, searchOptions: searchOptions, searchQuery: searchQuery });
-
-    // async.map(files, snippIterator, function(err, snippitsArr) {
-    //   snippitsArr = uu.flatten(snippitsArr);
-    //   console.log('done iterating through snippits', snippitsArr.length);
-    //   console.log('populating snippit ids');
-    //   async.map(snippitsArr, populateSnippitIds, function(err, data) {
-    //     console.log('sending response to client', data.length);
-    //     res.json({ snippits: data });
-    //   });
-    // });
   });
 
 };
 
 exports.popSnips = function(req, res, next) {
-  console.log('Popping snippits');
-  console.log(req.body.snipPaths.length);
-
+  var snipsArr = req.body.data;
+  async.map(snipsArr, populateSnippitIds, function(err, data) {
+      console.log('sending response to client', data.length);
+      res.json({ snippits: data });
+  });
 };
 
 var filesInDirectory = function(dirPath, done) {
@@ -245,7 +177,6 @@ var isValidJSFile = function(file) {
   }
 };
 
-// exports.pushFileToDirectory = function(req, res, next){
 exports.pushFileToDirectory = function(repoPath, cloneUrl, moduleName){
   // var jsResults = [];