@pittica/drive-folder-qrcode 1.2.6 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -47,10 +47,14 @@ var _default = exports["default"] = /*#__PURE__*/function () {
47
47
  })["catch"](function (_ref3) {
48
48
  var code = _ref3.code,
49
49
  errors = _ref3.errors;
50
- errors.forEach(function (_ref4) {
51
- var message = _ref4.message;
52
- return console.error(code, message);
53
- });
50
+ if (errors) {
51
+ errors.forEach(function (_ref4) {
52
+ var message = _ref4.message;
53
+ return console.error(code, message);
54
+ });
55
+ } else {
56
+ console.error(code);
57
+ }
54
58
  return null;
55
59
  });
56
60
  case 4:
@@ -27,18 +27,20 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
27
27
  // limitations under the License.
28
28
  var _default = exports["default"] = /*#__PURE__*/function () {
29
29
  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(drive, output, logo, colors, font, size, margin) {
30
- var format,
30
+ var rounded,
31
+ format,
31
32
  credentials,
32
33
  images,
33
34
  _args2 = arguments;
34
35
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
35
36
  while (1) switch (_context2.prev = _context2.next) {
36
37
  case 0:
37
- format = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : "PDF";
38
- credentials = _args2.length > 8 && _args2[8] !== undefined ? _args2[8] : null;
39
- _context2.next = 4;
40
- return (0, _generate["default"])(drive, logo, colors, font, size, margin, credentials);
41
- case 4:
38
+ rounded = _args2.length > 7 && _args2[7] !== undefined ? _args2[7] : false;
39
+ format = _args2.length > 8 && _args2[8] !== undefined ? _args2[8] : "PDF";
40
+ credentials = _args2.length > 9 && _args2[9] !== undefined ? _args2[9] : null;
41
+ _context2.next = 5;
42
+ return (0, _generate["default"])(drive, logo, colors, font, size, margin, rounded, credentials);
43
+ case 5:
42
44
  images = _context2.sent;
43
45
  images.forEach(function (_ref2) {
44
46
  var _ref2$folder = _ref2.folder,
@@ -75,7 +77,7 @@ var _default = exports["default"] = /*#__PURE__*/function () {
75
77
  }
76
78
  });
77
79
  });
78
- case 6:
80
+ case 7:
79
81
  case "end":
80
82
  return _context2.stop();
81
83
  }
@@ -26,26 +26,32 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
26
26
  // limitations under the License.
27
27
  var _default = exports["default"] = /*#__PURE__*/function () {
28
28
  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(drive, logo, colors, font, size, margin) {
29
- var credentials,
30
- data,
29
+ var rounded,
30
+ credentials,
31
31
  folders,
32
+ data,
32
33
  _args = arguments;
33
34
  return _regeneratorRuntime().wrap(function _callee$(_context) {
34
35
  while (1) switch (_context.prev = _context.next) {
35
36
  case 0:
36
- credentials = _args.length > 6 && _args[6] !== undefined ? _args[6] : null;
37
- _context.next = 3;
38
- return (0, _logo.getContent)(logo);
39
- case 3:
40
- data = _context.sent;
41
- _context.next = 6;
37
+ rounded = _args.length > 6 && _args[6] !== undefined ? _args[6] : false;
38
+ credentials = _args.length > 7 && _args[7] !== undefined ? _args[7] : null;
39
+ if (!drive) {
40
+ _context.next = 13;
41
+ break;
42
+ }
43
+ _context.next = 5;
42
44
  return (0, _folder.list)(drive, credentials);
43
- case 6:
45
+ case 5:
44
46
  folders = _context.sent;
47
+ _context.next = 8;
48
+ return (0, _logo.getContent)(logo);
49
+ case 8:
50
+ data = _context.sent;
45
51
  console.info("Processing \"".concat(drive, "\"..."));
46
52
  return _context.abrupt("return", folders.map(function (folder) {
47
53
  try {
48
- var qr = (0, _image["default"])(folder, size, margin, logo, data ? (0, _logo.resize)(data, size) : null, colors, font);
54
+ var qr = (0, _image["default"])(folder, size, margin, logo, data ? (0, _logo.resize)(data, size) : null, colors, font, rounded);
49
55
  console.info("Creating QR code for \"".concat(folder.name, "\"."));
50
56
  return {
51
57
  folder: folder,
@@ -55,7 +61,9 @@ var _default = exports["default"] = /*#__PURE__*/function () {
55
61
  console.error("Error creating QR code for \"".concat(folder.name, "\"."));
56
62
  }
57
63
  }));
58
- case 9:
64
+ case 13:
65
+ console.error("Source Drive or folder is required.");
66
+ case 14:
59
67
  case "end":
60
68
  return _context.stop();
61
69
  }
@@ -27,18 +27,20 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
27
27
  // limitations under the License.
28
28
  var _default = exports["default"] = /*#__PURE__*/function () {
29
29
  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(drive, output, logo, colors, font, size, margin) {
30
- var format,
30
+ var rounded,
31
+ format,
31
32
  credentials,
32
33
  images,
33
34
  _args = arguments;
34
35
  return _regeneratorRuntime().wrap(function _callee$(_context) {
35
36
  while (1) switch (_context.prev = _context.next) {
36
37
  case 0:
37
- format = _args.length > 7 && _args[7] !== undefined ? _args[7] : "PDF";
38
- credentials = _args.length > 8 && _args[8] !== undefined ? _args[8] : null;
39
- _context.next = 4;
40
- return (0, _generate["default"])(drive, logo, colors, font, size, margin, credentials);
41
- case 4:
38
+ rounded = _args.length > 7 && _args[7] !== undefined ? _args[7] : false;
39
+ format = _args.length > 8 && _args[8] !== undefined ? _args[8] : "PDF";
40
+ credentials = _args.length > 9 && _args[9] !== undefined ? _args[9] : null;
41
+ _context.next = 5;
42
+ return (0, _generate["default"])(drive, logo, colors, font, size, margin, rounded, credentials);
43
+ case 5:
42
44
  images = _context.sent;
43
45
  images.forEach(function (_ref2) {
44
46
  var _ref2$folder = _ref2.folder,
@@ -59,7 +61,7 @@ var _default = exports["default"] = /*#__PURE__*/function () {
59
61
  }
60
62
  });
61
63
  });
62
- case 6:
64
+ case 7:
63
65
  case "end":
64
66
  return _context.stop();
65
67
  }
@@ -17,8 +17,8 @@ exports["default"] = void 0;
17
17
  // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18
18
  // See the License for the specific language governing permissions and
19
19
  // limitations under the License.
20
- var _default = exports["default"] = function _default(context, width, height, margin, color) {
20
+ var _default = exports["default"] = function _default(context, width, height, margin, color, rounded) {
21
21
  context.fillStyle = color;
22
- context.roundRect(1, 1, width - 2, height + margin * 2 - 2, margin);
22
+ context.roundRect(1, 1, width - 2, height + margin * 2 - 2, rounded ? margin : 0);
23
23
  context.fill();
24
24
  };
@@ -17,10 +17,10 @@ exports["default"] = void 0;
17
17
  // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18
18
  // See the License for the specific language governing permissions and
19
19
  // limitations under the License.
20
- var _default = exports["default"] = function _default(context, width, height, margin, color) {
20
+ var _default = exports["default"] = function _default(context, width, height, margin, color, rounded) {
21
21
  var over = margin * 2;
22
22
  context.fillStyle = color;
23
- context.roundRect(0, 0, width, height + over, margin);
24
- context.roundRect(margin, margin, width - over, height - over, margin);
23
+ context.roundRect(0, 0, width, height + over, rounded ? margin : 0);
24
+ context.roundRect(margin, margin, width - over, height - over, rounded ? margin : 0);
25
25
  context.fill("evenodd");
26
26
  };
@@ -20,9 +20,9 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
20
20
  // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
21
21
  // See the License for the specific language governing permissions and
22
22
  // limitations under the License.
23
- var _default = exports["default"] = function _default(createCanvas, width, height, margin, color) {
23
+ var _default = exports["default"] = function _default(createCanvas, width, height, margin, color, rounded) {
24
24
  var canvas = createCanvas(width, height + margin, "svg");
25
25
  var context = canvas.getContext("2d");
26
- (0, _fillBackground["default"])(context, width, height, margin, color);
26
+ (0, _fillBackground["default"])(context, width, height, margin, color, rounded);
27
27
  return (0, _document["default"])(canvas.toBuffer().toString());
28
28
  };
@@ -30,12 +30,12 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
30
30
  // limitations under the License.
31
31
  var _default = exports["default"] = /*#__PURE__*/function () {
32
32
  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(svg, _ref) {
33
- var _ref$nodeCanvas, createCanvas, registerFont, width, height, margin, caption, image, logo, backgroundOptions, borderOptions, font, bg, canvas, context, frame, elements, images, h, _optimize, data, optimized, background;
33
+ var _ref$nodeCanvas, createCanvas, registerFont, width, height, margin, caption, image, logo, backgroundOptions, borderOptions, font, rounded, bg, canvas, context, frame, elements, images, h, _optimize, data, optimized, background;
34
34
  return _regeneratorRuntime().wrap(function _callee$(_context) {
35
35
  while (1) switch (_context.prev = _context.next) {
36
36
  case 0:
37
- _ref$nodeCanvas = _ref.nodeCanvas, createCanvas = _ref$nodeCanvas.createCanvas, registerFont = _ref$nodeCanvas.registerFont, width = _ref.width, height = _ref.height, margin = _ref.margin, caption = _ref.caption, image = _ref.image, logo = _ref.logo, backgroundOptions = _ref.backgroundOptions, borderOptions = _ref.borderOptions, font = _ref.font;
38
- if (font.path) {
37
+ _ref$nodeCanvas = _ref.nodeCanvas, createCanvas = _ref$nodeCanvas.createCanvas, registerFont = _ref$nodeCanvas.registerFont, width = _ref.width, height = _ref.height, margin = _ref.margin, caption = _ref.caption, image = _ref.image, logo = _ref.logo, backgroundOptions = _ref.backgroundOptions, borderOptions = _ref.borderOptions, font = _ref.font, rounded = _ref.rounded;
38
+ if (font.path && font.family) {
39
39
  registerFont(font.path, {
40
40
  family: font.family
41
41
  });
@@ -44,8 +44,8 @@ var _default = exports["default"] = /*#__PURE__*/function () {
44
44
  bg.parentElement.removeChild(bg);
45
45
  canvas = createCanvas(width, height + margin, "svg");
46
46
  context = canvas.getContext("2d");
47
- (0, _fillMargin["default"])(context, width, height, margin, borderOptions.color);
48
- context.font = "".concat(margin, "px \"").concat(font.family, "\"");
47
+ (0, _fillMargin["default"])(context, width, height, margin, borderOptions.color, rounded);
48
+ context.font = font.family ? "".concat(margin, "px \"").concat(font.family, "\"") : "".concat(margin, "px");
49
49
  context.fillStyle = backgroundOptions.color;
50
50
  (0, _fillCaption["default"])(caption.toUpperCase(), context, canvas, margin);
51
51
  frame = (0, _document["default"])(canvas.toBuffer().toString());
@@ -64,7 +64,7 @@ var _default = exports["default"] = /*#__PURE__*/function () {
64
64
  plugins: ["collapseGroups", "convertColors", "inlineStyles", "removeUselessDefs", "removeUselessStrokeAndFill", "removeComments", "mergePaths", "convertPathData", "convertStyleToAttrs", "removeEmptyContainers"]
65
65
  }), data = _optimize.data;
66
66
  optimized = (0, _document["default"])(data);
67
- background = (0, _getBackground["default"])(createCanvas, width, height, margin, backgroundOptions.color);
67
+ background = (0, _getBackground["default"])(createCanvas, width, height, margin, backgroundOptions.color, rounded);
68
68
  svg.innerHTML = background.querySelector("svg").innerHTML + optimized.getElementsByTagName("svg")[0].innerHTML;
69
69
  case 22:
70
70
  case "end":
@@ -30,6 +30,7 @@ var _default = exports["default"] = function _default(_ref, size, margin, image,
30
30
  square = _ref2.square,
31
31
  background = _ref2.background,
32
32
  border = _ref2.border;
33
+ var rounded = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
33
34
  var qr = new _qrCodeStyling["default"]({
34
35
  jsdom: _jsdom.JSDOM,
35
36
  nodeCanvas: _canvas["default"],
@@ -41,15 +42,15 @@ var _default = exports["default"] = function _default(_ref, size, margin, image,
41
42
  image: image,
42
43
  dotsOptions: {
43
44
  color: fore,
44
- type: "dots"
45
+ type: rounded ? "dots" : "square"
45
46
  },
46
47
  cornersDotOptions: {
47
48
  color: dots,
48
- type: "dot"
49
+ type: rounded ? "dot" : "square"
49
50
  },
50
51
  cornersSquareOptions: {
51
52
  color: square,
52
- type: "extra-rounded"
53
+ type: rounded ? "extra-rounded" : "square"
53
54
  },
54
55
  backgroundOptions: {
55
56
  color: background
@@ -64,7 +65,8 @@ var _default = exports["default"] = function _default(_ref, size, margin, image,
64
65
  },
65
66
  caption: name,
66
67
  logo: logo,
67
- font: font
68
+ font: font,
69
+ rounded: rounded
68
70
  });
69
71
  qr.applyExtension(_extension["default"]);
70
72
  return qr;
package/dist/scripts.js CHANGED
@@ -34,6 +34,7 @@ var drive = exports.drive = /*#__PURE__*/function () {
34
34
  colorBorder,
35
35
  fontFamily,
36
36
  fontPath,
37
+ rounded,
37
38
  _args = arguments;
38
39
  return _regeneratorRuntime().wrap(function _callee$(_context) {
39
40
  while (1) switch (_context.prev = _context.next) {
@@ -47,7 +48,8 @@ var drive = exports.drive = /*#__PURE__*/function () {
47
48
  colorBorder = _args.length > 11 && _args[11] !== undefined ? _args[11] : "#000000";
48
49
  fontFamily = _args.length > 12 && _args[12] !== undefined ? _args[12] : "Arial";
49
50
  fontPath = _args.length > 13 && _args[13] !== undefined ? _args[13] : null;
50
- _context.next = 11;
51
+ rounded = _args.length > 14 && _args[14] !== undefined ? _args[14] : true;
52
+ _context.next = 12;
51
53
  return (0, _drive2["default"])(_drive, output, logo, {
52
54
  fore: colorFore,
53
55
  dots: colorDots,
@@ -57,10 +59,10 @@ var drive = exports.drive = /*#__PURE__*/function () {
57
59
  }, {
58
60
  path: fontPath,
59
61
  family: fontFamily
60
- }, parseFloat(size), parseFloat(margin), format, credentials);
61
- case 11:
62
- return _context.abrupt("return", _context.sent);
62
+ }, parseFloat(size), parseFloat(margin), rounded, format, credentials);
63
63
  case 12:
64
+ return _context.abrupt("return", _context.sent);
65
+ case 13:
64
66
  case "end":
65
67
  return _context.stop();
66
68
  }
@@ -81,6 +83,7 @@ var local = exports.local = /*#__PURE__*/function () {
81
83
  colorBorder,
82
84
  fontFamily,
83
85
  fontPath,
86
+ rounded,
84
87
  _args2 = arguments;
85
88
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
86
89
  while (1) switch (_context2.prev = _context2.next) {
@@ -94,7 +97,8 @@ var local = exports.local = /*#__PURE__*/function () {
94
97
  colorBorder = _args2.length > 11 && _args2[11] !== undefined ? _args2[11] : "#000000";
95
98
  fontFamily = _args2.length > 12 && _args2[12] !== undefined ? _args2[12] : "Arial";
96
99
  fontPath = _args2.length > 13 && _args2[13] !== undefined ? _args2[13] : null;
97
- _context2.next = 11;
100
+ rounded = _args2.length > 14 && _args2[14] !== undefined ? _args2[14] : false;
101
+ _context2.next = 12;
98
102
  return (0, _local["default"])(drive, output, logo, {
99
103
  fore: colorFore,
100
104
  dots: colorDots,
@@ -104,10 +108,10 @@ var local = exports.local = /*#__PURE__*/function () {
104
108
  }, {
105
109
  path: fontPath,
106
110
  family: fontFamily
107
- }, parseFloat(size), parseFloat(margin), format, credentials);
108
- case 11:
109
- return _context2.abrupt("return", _context2.sent);
111
+ }, parseFloat(size), parseFloat(margin), rounded, format, credentials);
110
112
  case 12:
113
+ return _context2.abrupt("return", _context2.sent);
114
+ case 13:
111
115
  case "end":
112
116
  return _context2.stop();
113
117
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@pittica/drive-folder-qrcode",
3
3
  "private": false,
4
- "version": "1.2.6",
4
+ "version": "1.3.1",
5
5
  "description": "Creates QR codes from Google Drive folder names.",
6
6
  "main": "dist/index.js",
7
7
  "scripts": {