Merge branch 'release/0.1.3'

Author: Yuta Imaya

bin/deflate.min.js

@@ -1,8 +1,14 @@
 {
-  "author": "imaya <imaya.devel@gmail.com>",
+  "author": {
+    "name": "Yuta Imaya"
+  },
+  "contributors": {
+    "name": "Yuta Imaya",
+    "email": "imaya.devel@gmail.com"
+  },
   "name": "zlibjs",
   "description": "zlib and gzip implementation in JavaScript",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "./bin/node-zlib.js",
   "homepage": "https://github.com/imaya/zlib.js",
   "repository": {

bin/gzip.min.js

@@ -203,6 +203,10 @@ if (ZLIB_DEFLATE_EXPORT) {
     'Zlib.Deflate.compress',
     Zlib.Deflate.compress
   );
+  goog.exportSymbol(
+    'Zlib.Deflate.prototype.compress',
+    Zlib.Deflate.prototype.compress
+  );
   goog.exportSymbol(
     'Zlib.Deflate.CompressionType',
     Zlib.Deflate.CompressionType

bin/node-zlib.js

@@ -1189,33 +1189,22 @@ Zlib.RawDeflate.prototype.getCodesFromLengths_ = function(lengths) {
   var codes = new (USE_TYPEDARRAY ? Uint16Array : Array)(lengths.length),
       count = [],
       startCode = [],
-      code = 0, i, l, j, m;
+      code = 0, i, il, j, m;
 
   // Count the codes of each length.
-  for (i = 0, l = lengths.length; i < l; i++) {
+  for (i = 0, il = lengths.length; i < il; i++) {
     count[lengths[i]] = (count[lengths[i]] | 0) + 1;
   }
 
   // Determine the starting code for each length block.
-  for (i = 1, l = Zlib.RawDeflate.MaxCodeLength; i <= l; i++) {
+  for (i = 1, il = Zlib.RawDeflate.MaxCodeLength; i <= il; i++) {
     startCode[i] = code;
     code += count[i] | 0;
-
-    // overcommited
-    if (code > (1 << i)) {
-      throw 'overcommitted';
-    }
-
     code <<= 1;
   }
 
-  // undercommitted
-  if (code < ((1 << Zlib.RawDeflate.MaxCodeLength) | 0)) {
-    throw 'undercommitted';
-  }
-
   // Determine the code for each symbol. Mirrored, of course.
-  for (i = 0, l = lengths.length; i < l; i++) {
+  for (i = 0, il = lengths.length; i < il; i++) {
     code = startCode[lengths[i]];
     startCode[lengths[i]] += 1;
     codes[i] = 0;

bin/zlib.min.js

@@ -126,6 +126,12 @@ buster.testCase(
       assert.equals(inflated.length, size, "inflated data size");
       assert(arrayEquals(inflated, plain));
     },
+    "undercomitted": function() {
+      var data = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23];
+      var compressed = new Zlib.Deflate(data).compress();
+      var decompressed = new Zlib.Inflate(compressed).decompress();
+      assert(arrayEquals(data, Array.prototype.slice.call(decompressed)));
+    },
     "uncompressed random data": function() {
       makeRandomData(this.testData);
       inflateTest('random', this.testData, Zlib.Deflate.CompressionType.NONE);

bin/zlib_and_gzip.min.js

@@ -200,7 +200,12 @@ buster.testCase(
       assert.equals(inflated.buffer.byteLength, 123456, "inflated data buffer size");
       assert(arrayEquals(inflated, plain));
     },
-
+    "undercomitted": function() {
+      var data = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23];
+      var compressed = new Zlib.Deflate(data).compress();
+      var decompressed = new Zlib.Inflate(compressed).decompress();
+      assert(arrayEquals(data, Array.prototype.slice.call(decompressed)));
+    },
     "uncompressed random data": function() {
       makeRandomData(this.testData);
       inflateTest('random', this.testData, Zlib.Deflate.CompressionType.NONE);

package.json

@@ -111,6 +111,12 @@ buster.testCase(
         done();
       });
     },
+    "undercomitted": function() {
+      var data = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23];
+      var compressed = zlib.deflateSync(data);
+      var decompressed = zlib.inflateSync(compressed);
+      assert(arrayEquals(data, Array.prototype.slice.call(decompressed)));
+    },
     // js deflate, native inflate
     "random data": function(done) {
       makeRandomData(this.testData);