Merge pull request #481 from dduponchel/no_type

Improve the error without type in async()
Stuk · Nov 8, 2017 · ece381a · ece381a
2 parents a4c7e04 + 440ddd3
commit ece381a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/lib/zipObject.js b/lib/zipObject.js
@@ -37,20 +37,29 @@ ZipObject.prototype = {
      * @return StreamHelper the stream.
      */
     internalStream: function (type) {
-        var outputType = type.toLowerCase();
-        var askUnicodeString = outputType === "string" || outputType === "text";
-        if (outputType === "binarystring" || outputType === "text") {
-            outputType = "string";
-        }
-        var result = this._decompressWorker();
+        var result = null, outputType = "string";
+        try {
+            if (!type) {
+                throw new Error("No output type specified.");
+            }
+            outputType = type.toLowerCase();
+            var askUnicodeString = outputType === "string" || outputType === "text";
+            if (outputType === "binarystring" || outputType === "text") {
+                outputType = "string";
+            }
+            result = this._decompressWorker();
 
-        var isUnicodeString = !this._dataBinary;
+            var isUnicodeString = !this._dataBinary;
 
-        if (isUnicodeString && !askUnicodeString) {
-            result = result.pipe(new utf8.Utf8EncodeWorker());
-        }
-        if (!isUnicodeString && askUnicodeString) {
-            result = result.pipe(new utf8.Utf8DecodeWorker());
+            if (isUnicodeString && !askUnicodeString) {
+                result = result.pipe(new utf8.Utf8EncodeWorker());
+            }
+            if (!isUnicodeString && askUnicodeString) {
+                result = result.pipe(new utf8.Utf8DecodeWorker());
+            }
+        } catch (e) {
+            result = new GenericWorker("error");
+            result.error(e);
         }
 
         return new StreamHelper(result, outputType, "");

diff --git a/test/asserts/file.js b/test/asserts/file.js
@@ -141,6 +141,7 @@ QUnit.module("file", function () {
         _actualTestFileDataGetters.testGetter(opts, "nodebuffer");
         _actualTestFileDataGetters.testGetter(opts, "blob");
         _actualTestFileDataGetters.testGetter(opts, "unknown");
+        _actualTestFileDataGetters.testGetter(opts, null);
 
         stop();
         opts.zip.generateAsync({type:"binarystring"})
@@ -162,6 +163,7 @@ QUnit.module("file", function () {
             _actualTestFileDataGetters.testGetter(reloaded, "nodebuffer");
             _actualTestFileDataGetters.testGetter(reloaded, "blob");
             _actualTestFileDataGetters.testGetter(reloaded, "unknown");
+            _actualTestFileDataGetters.testGetter(reloaded, null);
 
             opts.zip.file("file.txt", "changing the content after the call won't change the result");
             start();
@@ -253,6 +255,10 @@ QUnit.module("file", function () {
         assert_unknown : function (opts, err, buffer, testName) {
             equal(buffer, null, testName + "no data");
             ok(err.message.match("not supported by this platform"), testName + "the error message is useful");
+        },
+        assert_null : function (opts, err, buffer, testName) {
+            equal(buffer, null, testName + "no data");
+            ok(err.message.match("No output type specified"), testName + "the error message is useful");
         }
     };