Fix bug where numbers and strings were not differentiated (Fixes issue qiao#10).

Update build scripts and npm dependencies.
Add unit test for issue qiao#10.

Author: ewoudenberg-kasisto

Makefile

@@ -12,9 +12,9 @@ test:
 		node_modules/.bin/mocha \
 			--ui qunit \
 			--require should \
+			--require coffeescript/register \
 			--timeout $(TEST_TIMEOUT) \
 			--reporter $(TEST_REPORTER) \
-			--compilers coffee:coffee-script \
 			test/*.coffee
 
 .PHONY: test

dist/difflib-browser.js

@@ -1,27 +1,32 @@
 {
-    "name"            : "difflib"
-  , "version"         : "0.2.4"
-  , "description"     : "text diff library ported from Python's difflib module"
-  , "homepage"        : "https://github.com/qiao/difflib.js"
-  , "keywords"        : ["diff"]
-  , "author"          : "Xueqiao Xu <[email protected]>"
-  , "main"            : "./index.js"
-  , "dependencies"    : {
-      "heap"            : ">= 0.2.0"
-  }
-  , "devDependencies" : {
-      "coffee-script"   : "1.3.x"
-    , "mocha"           : "1.0.x"
-    , "should"          : "0.6.x"
-    , "browserify"      : "1.10.x"
-    , "uglify-js"       : ">= 1.2.5"
-  }
-  , "repository"      : {
-      "type"          : "git"
-    , "url"           : "git://github.com/qiao/difflib.js.git"
-  }
-  , "licenses"        : [{
-      "type"          :  "PSF"
-    , "url"           : "http://docs.python.org/license.html"
-  }]
+    "name": "difflib",
+    "version": "0.2.4",
+    "description": "text diff library ported from Python's difflib module",
+    "homepage": "https://github.com/qiao/difflib.js",
+    "keywords": [
+        "diff"
+    ],
+    "author": "Xueqiao Xu <[email protected]>",
+    "main": "./index.js",
+    "dependencies": {
+        "browserify-fs": "^1.0.0",
+        "heap": ">= 0.2.0"
+    },
+    "devDependencies": {
+        "browserify": "17.0.x",
+        "coffeescript": "2.6.x",
+        "mocha": "9.1.x",
+        "should": "13.2.x",
+        "uglify-js": ">= 3.14.x"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/qiao/difflib.js.git"
+    },
+    "licenses": [
+        {
+            "type": "PSF",
+            "url": "http://docs.python.org/license.html"
+        }
+    ]
 }

lib/difflib.js

@@ -310,37 +310,38 @@ class SequenceMatcher
     # out the junk later is much cheaper than building b2j "right"
     # from the start.
     b = @b
-    @b2j = b2j = {}
+    @b2j = b2j = new Map()
 
     for elt, i in b
-      indices = if _has(b2j, elt) then b2j[elt] else b2j[elt] = []
+      if !b2j.has(elt) then b2j.set(elt, [])
+      indices = b2j.get(elt)
       indices.push(i)
 
     # Purge junk elements
-    junk = {}
+    junk = new Map()
     isjunk = @isjunk
     if isjunk
-      for elt in Object.keys(b2j)
+      b2j.forEach (idxs, elt) ->
         if isjunk(elt)
-          junk[elt] = true
-          delete b2j[elt]
+          junk.set(elt, true)
+          b2j.delete(elt)
 
     # Purge popular elements that are not junk
-    popular = {}
+    popular = new Map()
     n = b.length
     if @autojunk and n >= 200
       ntest = floor(n / 100) + 1
-      for elt, idxs of b2j
+      b2j.forEach (idxs, elt) ->
         if idxs.length > ntest
-          popular[elt] = true
-          delete b2j[elt]
+          popular.set(elt, true)
+          b2j.delete(elt)
 
     # Now for x in b, isjunk(x) == x in junk, but the latter is much faster.
     # Sicne the number of *unique* junk elements is probably small, the
     # memory burden of keeping this set alive is likely trivial compared to
     # the size of b2j.
-    @isbjunk = (b) -> _has(junk, b)
-    @isbpopular = (b) -> _has(popular, b)
+    @isbjunk = (b) -> junk.has(b)
+    @isbpopular = (b) -> popular.has(b)
 
   findLongestMatch: (alo, ahi, blo, bhi) ->
     ### 
@@ -393,7 +394,10 @@ class SequenceMatcher
       # look at all instances of a[i] in b; note that because
       # b2j has no junk keys, the loop is skipped if a[i] is junk
       newj2len = {}
-      for j in (if _has(b2j, a[i]) then b2j[a[i]] else [])
+      jlist = []
+      if b2j.has(a[i])
+        jlist = b2j.get(a[i])
+      for j in jlist
         # a[i] matches b[j]
         continue if j < blo
         break if j >= bhi

package.json

@@ -19,6 +19,10 @@ test '#setSeq2', ->
   s.setSeq2('abcd')
   s.ratio().should.eql 1.0
 
+test '#stringsAndIntsAreDifferent', ->
+  opcodes = new SequenceMatcher(null, ['1','b','c','d'], [1, 'b','c','d']).getOpcodes()
+  opcodes.should.eql [ [ 'replace', 0, 1, 0, 1 ], [ 'equal', 1, 4, 1, 4 ] ]
+
 test '#findLongestMatch', ->
   isjunk = (x) -> x is ' '
   s = new SequenceMatcher(isjunk, ' abcd', 'abcd abcd')

src/difflib.coffee

@@ -28,7 +28,8 @@ test '.getCloseMatches', ->
  getCloseMatches('appel', ['ape', 'apple', 'peach', 'puppy'])
    .should.eql ['apple', 'ape']
 
- KEYWORDS = require('coffee-script').RESERVED
+ # KEYWORDS = require('coffeescript').RESERVED # -- no longer available
+ KEYWORDS = ['case', 'default', 'function', 'var', 'void', 'with', 'const', 'let', 'enum', 'export', 'import', 'native', '__hasProp', '__extends', '__slice', '__bind', '__indexOf', 'implements', 'else', 'interface', 'package', 'private', 'protected', 'public', 'static', 'yield', 'true', 'false', 'null', 'this', 'new', 'delete', 'typeof', 'in', 'arguments', 'eval', 'instanceof', 'return', 'throw', 'break', 'continue', 'debugger', 'if', 'else', 'switch', 'for', 'while', 'do', 'try', 'catch', 'finally', 'class', 'extends', 'super', 'undefined', 'then', 'unless', 'until', 'loop', 'of', 'by', 'when', 'and', 'or', 'is', 'isnt', 'not', 'yes', 'no', 'on', 'off']
  getCloseMatches('wheel', KEYWORDS).should.eql ['when', 'while']
  getCloseMatches('accost', KEYWORDS).should.eql ['const']
 

test/SequenceMatcher.coffee

@@ -14,10 +14,14 @@ BANNER = '''
 '''
 
 build = (dest) ->
-  browserified = browserify.bundle(__dirname + '/../lib/difflib.js')
-  namespaced   = 'var difflib = (function() {' + browserified + 'return require("/difflib");})();'
-  uglified     = uglify(namespaced)
-  bannered     = BANNER + uglified
-  fs.writeFileSync(dest, bannered)
-
+  bify = browserify()
+  bify.add(__dirname + '/../lib/difflib.js')
+  bify.bundle((err, payload) -> 
+    browserified = payload.toString('utf8')
+    namespaced   = 'var difflib = (function() {' + browserified + 'return require("/difflib");})();'
+    uglified     = uglify.minify(namespaced).code
+    bannered     = BANNER + uglified
+    fs.writeFileSync(dest, bannered)
+  )
+  
 build(__dirname + '/../dist/difflib-browser.js')