@idraw/util 0.2.0-alpha.5 → 0.2.0-alpha.9

package/dist/index.cjs.js

@@ -136,61 +136,72 @@ var istype = {
     promise: function (data) {
         return parsePrototype(data) === 'Promise';
     },
-    nodeList: function (data) {
-        return parsePrototype(data) === 'NodeList';
-    },
-    imageData: function (data) {
-        return parsePrototype(data) === 'ImageData';
-    }
 };
 
-var Image = window.Image, Blob = window.Blob, FileReader = window.FileReader;
-function loadImage(src) {
-    return new Promise(function (resolve, reject) {
-        var img = new Image;
-        img.onload = function () {
-            resolve(img);
-        };
-        img.onabort = reject;
-        img.onerror = reject;
-        img.src = src;
-    });
-}
-function loadSVG(svg) {
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+}
+
+function parseHTMLToDataURL(html, opts) {
+    var width = opts.width, height = opts.height;
     return new Promise(function (resolve, reject) {
-        var _svg = svg;
-        var image = new Image();
+        var _svg = "\n    <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + (width || '') + "\" height = \"" + (height || '') + "\">\n      <foreignObject width=\"100%\" height=\"100%\">\n        <div xmlns = \"http://www.w3.org/1999/xhtml\">\n          " + html + "\n        </div>\n      </foreignObject>\n    </svg>\n    ";
         var blob = new Blob([_svg], { type: 'image/svg+xml;charset=utf-8' });
         var reader = new FileReader();
         reader.readAsDataURL(blob);
         reader.onload = function (event) {
             var _a;
             var base64 = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.result;
-            image.onload = function () {
-                resolve(image);
-            };
-            image.src = base64;
+            resolve(base64);
         };
         reader.onerror = function (err) {
             reject(err);
         };
     });
 }
-function loadHTML(html, opts) {
-    var width = opts.width, height = opts.height;
+function parseSVGToDataURL(svg) {
     return new Promise(function (resolve, reject) {
-        var _svg = "\n    <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + (width || '') + "\" height = \"" + (height || '') + "\">\n      <foreignObject width=\"100%\" height=\"100%\">\n        <div xmlns = \"http://www.w3.org/1999/xhtml\">\n          " + html + "\n        </div>\n      </foreignObject>\n    </svg>\n    ";
-        var image = new Image();
+        var _svg = svg;
         var blob = new Blob([_svg], { type: 'image/svg+xml;charset=utf-8' });
         var reader = new FileReader();
         reader.readAsDataURL(blob);
         reader.onload = function (event) {
             var _a;
             var base64 = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.result;
-            image.onload = function () {
-                resolve(image);
-            };
-            image.src = base64;
+            resolve(base64);
         };
         reader.onerror = function (err) {
             reject(err);
@@ -198,6 +209,51 @@ function loadHTML(html, opts) {
     });
 }
 
+var Image = window.Image;
+function loadImage(src) {
+    return new Promise(function (resolve, reject) {
+        var img = new Image;
+        img.onload = function () {
+            resolve(img);
+        };
+        img.onabort = reject;
+        img.onerror = reject;
+        img.src = src;
+    });
+}
+function loadSVG(svg) {
+    return __awaiter(this, void 0, void 0, function () {
+        var dataURL, image;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4, parseSVGToDataURL(svg)];
+                case 1:
+                    dataURL = _a.sent();
+                    return [4, loadImage(dataURL)];
+                case 2:
+                    image = _a.sent();
+                    return [2, image];
+            }
+        });
+    });
+}
+function loadHTML(html, opts) {
+    return __awaiter(this, void 0, void 0, function () {
+        var dataURL, image;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4, parseHTMLToDataURL(html, opts)];
+                case 1:
+                    dataURL = _a.sent();
+                    return [4, loadImage(dataURL)];
+                case 2:
+                    image = _a.sent();
+                    return [2, image];
+            }
+        });
+    });
+}
+
 var index = {
     time: {
         delay: delay,

package/dist/index.d.ts

@@ -37,8 +37,6 @@ declare const _default: {
         undefined(data: any): boolean;
         null(data: any): boolean;
         promise(data: any): boolean;
-        nodeList(data: any): boolean;
-        imageData(data: any): boolean;
     };
     data: {
         deepClone: typeof deepClone;

package/dist/index.es.js

@@ -134,61 +134,72 @@ var istype = {
     promise: function (data) {
         return parsePrototype(data) === 'Promise';
     },
-    nodeList: function (data) {
-        return parsePrototype(data) === 'NodeList';
-    },
-    imageData: function (data) {
-        return parsePrototype(data) === 'ImageData';
-    }
 };
 
-var Image = window.Image, Blob = window.Blob, FileReader = window.FileReader;
-function loadImage(src) {
-    return new Promise(function (resolve, reject) {
-        var img = new Image;
-        img.onload = function () {
-            resolve(img);
-        };
-        img.onabort = reject;
-        img.onerror = reject;
-        img.src = src;
-    });
-}
-function loadSVG(svg) {
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+}
+
+function parseHTMLToDataURL(html, opts) {
+    var width = opts.width, height = opts.height;
     return new Promise(function (resolve, reject) {
-        var _svg = svg;
-        var image = new Image();
+        var _svg = "\n    <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + (width || '') + "\" height = \"" + (height || '') + "\">\n      <foreignObject width=\"100%\" height=\"100%\">\n        <div xmlns = \"http://www.w3.org/1999/xhtml\">\n          " + html + "\n        </div>\n      </foreignObject>\n    </svg>\n    ";
         var blob = new Blob([_svg], { type: 'image/svg+xml;charset=utf-8' });
         var reader = new FileReader();
         reader.readAsDataURL(blob);
         reader.onload = function (event) {
             var _a;
             var base64 = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.result;
-            image.onload = function () {
-                resolve(image);
-            };
-            image.src = base64;
+            resolve(base64);
         };
         reader.onerror = function (err) {
             reject(err);
         };
     });
 }
-function loadHTML(html, opts) {
-    var width = opts.width, height = opts.height;
+function parseSVGToDataURL(svg) {
     return new Promise(function (resolve, reject) {
-        var _svg = "\n    <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + (width || '') + "\" height = \"" + (height || '') + "\">\n      <foreignObject width=\"100%\" height=\"100%\">\n        <div xmlns = \"http://www.w3.org/1999/xhtml\">\n          " + html + "\n        </div>\n      </foreignObject>\n    </svg>\n    ";
-        var image = new Image();
+        var _svg = svg;
         var blob = new Blob([_svg], { type: 'image/svg+xml;charset=utf-8' });
         var reader = new FileReader();
         reader.readAsDataURL(blob);
         reader.onload = function (event) {
             var _a;
             var base64 = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.result;
-            image.onload = function () {
-                resolve(image);
-            };
-            image.src = base64;
+            resolve(base64);
         };
         reader.onerror = function (err) {
             reject(err);
@@ -196,6 +207,51 @@ function loadHTML(html, opts) {
     });
 }
 
+var Image = window.Image;
+function loadImage(src) {
+    return new Promise(function (resolve, reject) {
+        var img = new Image;
+        img.onload = function () {
+            resolve(img);
+        };
+        img.onabort = reject;
+        img.onerror = reject;
+        img.src = src;
+    });
+}
+function loadSVG(svg) {
+    return __awaiter(this, void 0, void 0, function () {
+        var dataURL, image;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4, parseSVGToDataURL(svg)];
+                case 1:
+                    dataURL = _a.sent();
+                    return [4, loadImage(dataURL)];
+                case 2:
+                    image = _a.sent();
+                    return [2, image];
+            }
+        });
+    });
+}
+function loadHTML(html, opts) {
+    return __awaiter(this, void 0, void 0, function () {
+        var dataURL, image;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4, parseHTMLToDataURL(html, opts)];
+                case 1:
+                    dataURL = _a.sent();
+                    return [4, loadImage(dataURL)];
+                case 2:
+                    image = _a.sent();
+                    return [2, image];
+            }
+        });
+    });
+}
+
 var index = {
     time: {
         delay: delay,

package/dist/index.global.js

@@ -137,61 +137,72 @@ var iDrawUtil = (function () {
       promise: function (data) {
           return parsePrototype(data) === 'Promise';
       },
-      nodeList: function (data) {
-          return parsePrototype(data) === 'NodeList';
-      },
-      imageData: function (data) {
-          return parsePrototype(data) === 'ImageData';
-      }
   };
 
-  var Image = window.Image, Blob = window.Blob, FileReader = window.FileReader;
-  function loadImage(src) {
-      return new Promise(function (resolve, reject) {
-          var img = new Image;
-          img.onload = function () {
-              resolve(img);
-          };
-          img.onabort = reject;
-          img.onerror = reject;
-          img.src = src;
-      });
-  }
-  function loadSVG(svg) {
+  function __awaiter(thisArg, _arguments, P, generator) {
+      function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+      return new (P || (P = Promise))(function (resolve, reject) {
+          function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+          function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+          function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+      });
+  }
+  function __generator(thisArg, body) {
+      var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+      return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+      function verb(n) { return function (v) { return step([n, v]); }; }
+      function step(op) {
+          if (f) throw new TypeError("Generator is already executing.");
+          while (_) try {
+              if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+              if (y = 0, t) op = [op[0] & 2, t.value];
+              switch (op[0]) {
+                  case 0: case 1: t = op; break;
+                  case 4: _.label++; return { value: op[1], done: false };
+                  case 5: _.label++; y = op[1]; op = [0]; continue;
+                  case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                  default:
+                      if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                      if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                      if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                      if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                      if (t[2]) _.ops.pop();
+                      _.trys.pop(); continue;
+              }
+              op = body.call(thisArg, _);
+          } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+          if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+      }
+  }
+
+  function parseHTMLToDataURL(html, opts) {
+      var width = opts.width, height = opts.height;
       return new Promise(function (resolve, reject) {
-          var _svg = svg;
-          var image = new Image();
+          var _svg = "\n    <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + (width || '') + "\" height = \"" + (height || '') + "\">\n      <foreignObject width=\"100%\" height=\"100%\">\n        <div xmlns = \"http://www.w3.org/1999/xhtml\">\n          " + html + "\n        </div>\n      </foreignObject>\n    </svg>\n    ";
           var blob = new Blob([_svg], { type: 'image/svg+xml;charset=utf-8' });
           var reader = new FileReader();
           reader.readAsDataURL(blob);
           reader.onload = function (event) {
               var _a;
               var base64 = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.result;
-              image.onload = function () {
-                  resolve(image);
-              };
-              image.src = base64;
+              resolve(base64);
           };
           reader.onerror = function (err) {
               reject(err);
           };
       });
   }
-  function loadHTML(html, opts) {
-      var width = opts.width, height = opts.height;
+  function parseSVGToDataURL(svg) {
       return new Promise(function (resolve, reject) {
-          var _svg = "\n    <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + (width || '') + "\" height = \"" + (height || '') + "\">\n      <foreignObject width=\"100%\" height=\"100%\">\n        <div xmlns = \"http://www.w3.org/1999/xhtml\">\n          " + html + "\n        </div>\n      </foreignObject>\n    </svg>\n    ";
-          var image = new Image();
+          var _svg = svg;
           var blob = new Blob([_svg], { type: 'image/svg+xml;charset=utf-8' });
           var reader = new FileReader();
           reader.readAsDataURL(blob);
           reader.onload = function (event) {
               var _a;
               var base64 = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.result;
-              image.onload = function () {
-                  resolve(image);
-              };
-              image.src = base64;
+              resolve(base64);
           };
           reader.onerror = function (err) {
               reject(err);
@@ -199,6 +210,51 @@ var iDrawUtil = (function () {
       });
   }
 
+  var Image = window.Image;
+  function loadImage(src) {
+      return new Promise(function (resolve, reject) {
+          var img = new Image;
+          img.onload = function () {
+              resolve(img);
+          };
+          img.onabort = reject;
+          img.onerror = reject;
+          img.src = src;
+      });
+  }
+  function loadSVG(svg) {
+      return __awaiter(this, void 0, void 0, function () {
+          var dataURL, image;
+          return __generator(this, function (_a) {
+              switch (_a.label) {
+                  case 0: return [4, parseSVGToDataURL(svg)];
+                  case 1:
+                      dataURL = _a.sent();
+                      return [4, loadImage(dataURL)];
+                  case 2:
+                      image = _a.sent();
+                      return [2, image];
+              }
+          });
+      });
+  }
+  function loadHTML(html, opts) {
+      return __awaiter(this, void 0, void 0, function () {
+          var dataURL, image;
+          return __generator(this, function (_a) {
+              switch (_a.label) {
+                  case 0: return [4, parseHTMLToDataURL(html, opts)];
+                  case 1:
+                      dataURL = _a.sent();
+                      return [4, loadImage(dataURL)];
+                  case 2:
+                      image = _a.sent();
+                      return [2, image];
+              }
+          });
+      });
+  }
+
   var index = {
       time: {
           delay: delay,
@@ -229,4 +285,4 @@ var iDrawUtil = (function () {
 
   return index;
 
-}());
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idraw/util",
-  "version": "0.2.0-alpha.5",
+  "version": "0.2.0-alpha.9",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
@@ -25,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "edd6c5d676d9b9f606da4d77d9c16258f361c491"
+  "gitHead": "5a6f75f6e1ad11b635e1e165c4f826ead00125b3"
 }