Lib files for latest release.

Author: brentlintner

lib/cli.js

@@ -23,6 +23,7 @@ var configure = function () {
         .option("-n, --ngram [number]", "Specify ngram length for comparing token sequences. " +
         ("[default=" + similar.DEFAULT_NGRAM_LENGTH + ",2,3...]"))
         .option("-d, --disablecolors", "Disable color output")
+        .option("--estype [value]", "Set the JavaScript parser source type [default=module,script]")
         .action(compare);
     program.on("--help", function () {
         console.log("  Command specific help:");

lib/similar.js

@@ -98,13 +98,16 @@ var filter_redundencies = function (group) {
     });
     return group;
 };
-var _compare = function (files, ftype, n_len, t_len, sim_min) {
+var _compare = function (files, ftype, opts) {
     var is_ts = ftype === "ts";
     var is_file = is_ts ? /\.ts$/ : /\.js$/;
     files = _.filter(files, function (file) { return is_file.test(file); });
     var parse = is_ts ? parse_ts : parse_js;
-    var items = parse.find(files);
+    var items = parse.find(files, opts);
     var group = {};
+    var t_len = parse_token_length(_.toString(opts.minlength));
+    var n_len = parse_ngram_length(_.toString(opts.ngram));
+    var sim_min = parse_threshold(_.toString(opts.similarity));
     each_pair(items, function (src, cmp) {
         if (false_positive(src, cmp, t_len))
             return;
@@ -122,11 +125,8 @@ var _compare = function (files, ftype, n_len, t_len, sim_min) {
 var compare = function (files, opts) {
     if (opts === void 0) { opts = {}; }
     files = _.concat([], files);
-    var t_len = parse_token_length(_.toString(opts.minlength));
-    var n_len = parse_ngram_length(_.toString(opts.ngram));
-    var threshold = parse_threshold(_.toString(opts.similarity));
-    var js_group = _compare(files, "js", n_len, t_len, threshold);
-    var ts_group = _compare(files, "ts", n_len, t_len, threshold);
+    var js_group = _compare(files, "js", opts);
+    var ts_group = _compare(files, "ts", opts);
     return { js: js_group, ts: ts_group };
 };
 module.exports = {

lib/similar/javascript.js

@@ -5,19 +5,22 @@ var codegen = require("escodegen");
 var esprima = require("esprima");
 var estraverse = require("estraverse");
 var FUNCTION_OR_CLASS_NODE = [
-    "ArrowFunctionExpression",
-    "ClassDeclaration",
-    "FunctionDeclaration",
-    "FunctionExpression"
+    esprima.Syntax.ArrowFunctionExpression,
+    esprima.Syntax.ClassDeclaration,
+    esprima.Syntax.FunctionDeclaration,
+    esprima.Syntax.FunctionExpression
 ];
 var normalize = function (token_list) {
     return _.map(token_list, function (t) { return t.value; });
 };
 var tokenize = function (code) {
     return normalize(esprima.tokenize(code));
 };
-var astify = function (code) {
-    return esprima.parse(code, { loc: true });
+var astify = function (code, opts) {
+    return esprima.parse(code, {
+        loc: true,
+        sourceType: _.get(opts, "estype", "module")
+    });
 };
 var ast_to_code = function (node) {
     var opts = { format: { indent: { style: "  " } } };
@@ -35,10 +38,11 @@ var parse_methods_and_classes = function (root_node, filepath) {
                 return;
             var method = ast_to_code(node);
             var tokens = tokenize(method);
+            var is_class = node.type === esprima.Syntax.ClassDeclaration;
             var result = {
                 ast: node,
                 code: method,
-                is_class: node.type === "ClassDeclaration",
+                is_class: is_class,
                 path: filepath,
                 pos: line_info(node),
                 tokens: tokens,
@@ -49,10 +53,10 @@ var parse_methods_and_classes = function (root_node, filepath) {
     });
     return entries;
 };
-var find_similar_methods_and_classes = function (filepaths) {
+var find_similar_methods_and_classes = function (filepaths, opts) {
     return _.flatMap(filepaths, function (filepath) {
         var code = fs.readFileSync(filepath).toString();
-        var node = astify(code);
+        var node = astify(code, opts);
         return parse_methods_and_classes(node, filepath);
     });
 };

lib/similar/typescript.js

@@ -48,7 +48,7 @@ var PASSTHROUGH_NODES = FUNCTION_OR_CLASS_NODE.concat([
     ts.SyntaxKind.VariableDeclarationList,
     ts.SyntaxKind.VariableStatement
 ]);
-var astify = function (code, filepath) {
+var astify = function (code, filepath, opts) {
     ts.createProgram([filepath], {});
     return ts.createSourceFile(filepath, code, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
 };
@@ -112,10 +112,10 @@ var parse_methods_and_classes = function (node, root_node, path) {
         };
     });
 };
-var find_similar_methods_and_classes = function (filepaths) {
+var find_similar_methods_and_classes = function (filepaths, opts) {
     return _.flatMap(filepaths, function (filepath) {
         var code = fs.readFileSync(filepath).toString();
-        var node = astify(code, filepath);
+        var node = astify(code, filepath, opts);
         var root_node = node;
         return parse_methods_and_classes(node, root_node, filepath);
     });