image-js 0.35.2 → 0.35.3

package/lib/util/Shape.js

@@ -4,17 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Image = _interopRequireDefault(require("../image/Image"));
-
 var _kindNames = require("../image/core/kindNames");
-
 var _zerosMatrix = _interopRequireDefault(require("./zerosMatrix"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const cross = [[0, 0, 1, 0, 0], [0, 0, 1, 0, 0], [1, 1, 1, 1, 1], [0, 0, 1, 0, 0], [0, 0, 1, 0, 0]];
 const smallCross = [[0, 1, 0], [1, 1, 1], [0, 1, 0]];
+
 /**
  * Class representing a shape
  * @class Shape
@@ -28,7 +24,6 @@ const smallCross = [[0, 1, 0], [1, 1, 1], [0, 1, 0]];
  * @param {number} [options.height=options.size] - width of the shape. Must be odd.
  * @param {boolean} [options.filled=true] - If false only the border ot the shape is taken into account.
  */
-
 class Shape {
   constructor(options = {}) {
     let {
@@ -39,12 +34,10 @@ class Shape {
       height,
       filled = true
     } = options;
-
     if (size) {
       width = size;
       height = size;
     }
-
     if (shape) {
       switch (shape.toLowerCase()) {
         case 'square':
@@ -53,20 +46,17 @@ class Shape {
             filled
           });
           break;
-
         case 'circle':
         case 'ellipse':
           this.matrix = ellipse(width, height, {
             filled
           });
           break;
-
         case 'triangle':
           this.matrix = triangle(width, height, {
             filled
           });
           break;
-
         default:
           throw new Error(`Shape: unexpected shape: ${shape}`);
       }
@@ -75,33 +65,28 @@ class Shape {
         case 'cross':
           this.matrix = cross;
           break;
-
         case 'smallcross':
           this.matrix = smallCross;
           break;
-
         default:
           throw new Error(`Shape: unexpected kind: ${kind}`);
       }
     } else {
       throw new Error('Shape: expected a kind or a shape option');
     }
-
     this.height = this.matrix.length;
     this.width = this.matrix[0].length;
     this.halfHeight = this.height / 2 >> 0;
     this.halfWidth = this.width / 2 >> 0;
   }
+
   /**
    * Returns an array of [x,y] points
    * @return {Array<Array<number>>} - Array of [x,y] points
    */
-
-
   getPoints() {
     let matrix = this.matrix;
     let points = [];
-
     for (let y = 0; y < matrix.length; y++) {
       for (let x = 0; x < matrix[0].length; x++) {
         if (matrix[y][x]) {
@@ -109,20 +94,17 @@ class Shape {
         }
       }
     }
-
     return points;
   }
+
   /**
    * Returns a Mask (1 bit Image) corresponding to this shape.
    * @return {Image}
    */
-
-
   getMask() {
     let img = new _Image.default(this.width, this.height, {
       kind: _kindNames.BINARY
     });
-
     for (let y = 0; y < this.matrix.length; y++) {
       for (let x = 0; x < this.matrix[0].length; x++) {
         if (this.matrix[y][x]) {
@@ -130,17 +112,12 @@ class Shape {
         }
       }
     }
-
     return img;
   }
-
 }
-
 exports.default = Shape;
-
 function rectangle(width, height, options) {
   const matrix = (0, _zerosMatrix.default)(height, width);
-
   if (options.filled) {
     for (let y = 0; y < height; y++) {
       for (let x = 0; x < width; x++) {
@@ -153,32 +130,25 @@ function rectangle(width, height, options) {
         matrix[y][x] = 1;
       }
     }
-
     for (let y = 0; y < height; y++) {
       for (let x of [0, width - 1]) {
         matrix[y][x] = 1;
       }
     }
   }
-
   return matrix;
 }
-
 function ellipse(width, height, options) {
   const matrix = (0, _zerosMatrix.default)(height, width, options);
   let yEven = 1 - height % 2;
   let xEven = 1 - width % 2;
   let a = Math.floor((width - 1) / 2); // horizontal ellipse axe
-
   let b = Math.floor((height - 1) / 2); // vertical ellipse axe
-
   let a2 = a * a;
   let b2 = b * b;
-
   if (options.filled) {
     for (let y = 0; y <= b; y++) {
       let shift = Math.floor(Math.sqrt(a2 - a2 * y * y / b2));
-
       for (let x = a - shift; x <= a; x++) {
         matrix[b - y][x] = 1;
         matrix[b + y + yEven][x] = 1;
@@ -195,7 +165,6 @@ function ellipse(width, height, options) {
       matrix[b - y][width - x - 1] = 1;
       matrix[b + y + yEven][width - x - 1] = 1;
     }
-
     for (let x = 0; x <= a; x++) {
       let shift = Math.floor(Math.sqrt(b2 - b2 * x * x / a2));
       let y = b - shift;
@@ -205,24 +174,18 @@ function ellipse(width, height, options) {
       matrix[height - y - 1][a + x + xEven] = 1;
     }
   }
-
   return matrix;
 }
-
 function triangle(width, height, options) {
   if (!options.filled) {
     throw new Error('Non filled triangle is not implemented');
   }
-
   const matrix = (0, _zerosMatrix.default)(height, width, options);
-
   for (let y = 0; y < height; y++) {
     let shift = Math.floor((1 - y / height) * width / 2);
-
     for (let x = shift; x < width - shift; x++) {
       matrix[y][x] = 1;
     }
   }
-
   return matrix;
 }

package/lib/util/base64.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.decode = decode;
 exports.encode = encode;
 exports.toBase64URL = toBase64URL;
-
 /*
  * base64-arraybuffer
  * https://github.com/niklasvh/base64-arraybuffer
@@ -14,51 +13,43 @@ exports.toBase64URL = toBase64URL;
  * Copyright (c) 2012 Niklas von Hertzen
  * Licensed under the MIT license.
  */
-let chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; // Use a lookup table to find the index.
 
-let lookup = new Uint8Array(256);
+let chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 
+// Use a lookup table to find the index.
+let lookup = new Uint8Array(256);
 for (let i = 0; i < chars.length; i++) {
   lookup[chars.charCodeAt(i)] = i;
 }
-
 function encode(bytes) {
   let i;
   let len = bytes.length;
   let base64 = '';
-
   for (i = 0; i < len; i += 3) {
     base64 += chars[bytes[i] >> 2];
     base64 += chars[(bytes[i] & 3) << 4 | bytes[i + 1] >> 4];
     base64 += chars[(bytes[i + 1] & 15) << 2 | bytes[i + 2] >> 6];
     base64 += chars[bytes[i + 2] & 63];
   }
-
   if (len % 3 === 2) {
     base64 = `${base64.substring(0, base64.length - 1)}=`;
   } else if (len % 3 === 1) {
     base64 = `${base64.substring(0, base64.length - 2)}==`;
   }
-
   return base64;
 }
-
 function decode(base64) {
   let bufferLength = base64.length * 0.75;
   let len = base64.length;
   let p = 0;
   let encoded1, encoded2, encoded3, encoded4;
-
   if (base64[base64.length - 1] === '=') {
     bufferLength--;
-
     if (base64[base64.length - 2] === '=') {
       bufferLength--;
     }
   }
-
   const bytes = new Uint8Array(bufferLength);
-
   for (let i = 0; i < len; i += 4) {
     encoded1 = lookup[base64.charCodeAt(i)];
     encoded2 = lookup[base64.charCodeAt(i + 1)];
@@ -68,10 +59,8 @@ function decode(base64) {
     bytes[p++] = (encoded2 & 15) << 4 | encoded3 >> 2;
     bytes[p++] = (encoded3 & 3) << 6 | encoded4 & 63;
   }
-
   return bytes;
 }
-
 function toBase64URL(u8, type) {
   const base64 = encode(u8);
   return `data:${type};base64,${base64}`;

package/lib/util/channel.js

@@ -5,13 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.validateArrayOfChannels = validateArrayOfChannels;
 exports.validateChannel = validateChannel;
-
 var Model = _interopRequireWildcard(require("../image/model/model"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /**
  * Specify which channels should be processed
  * * undefined : we take all the channels but alpha
@@ -21,70 +17,57 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * * [string] : array of channels as one letter string
  * @typedef {undefined|number|string|Array<number>|Array<string>} SelectedChannels
  */
+
 function validateArrayOfChannels(image, options = {}) {
   let {
     channels,
     allowAlpha,
     // are we allowing the selection of an alpha channel ?
     defaultAlpha // if no channels are selected should we take the alpha channel ?
-
   } = options;
-
   if (typeof allowAlpha !== 'boolean') {
     allowAlpha = true;
   }
-
   if (typeof channels === 'undefined') {
     return allChannels(image, defaultAlpha);
   } else {
     return validateChannels(image, channels, allowAlpha);
   }
 }
-
 function allChannels(image, defaultAlpha) {
   let length = defaultAlpha ? image.channels : image.components;
   let array = new Array(length);
-
   for (let i = 0; i < length; i++) {
     array[i] = i;
   }
-
   return array;
 }
-
 function validateChannels(image, channels, allowAlpha) {
   if (!Array.isArray(channels)) {
     channels = [channels];
   }
-
   for (let c = 0; c < channels.length; c++) {
     channels[c] = validateChannel(image, channels[c], allowAlpha);
   }
-
   return channels;
 }
-
 function validateChannel(image, channel, allowAlpha = true) {
   if (channel === undefined) {
     throw new RangeError(`validateChannel : the channel has to be >=0 and <${image.channels}`);
   }
-
   if (typeof channel === 'string') {
     switch (image.colorModel) {
       case Model.GREY:
         break;
-
       case Model.RGB:
         if ('rgb'.includes(channel)) {
           switch (channel) {
             case 'r':
               channel = 0;
               break;
-
             case 'g':
               channel = 1;
               break;
-
             case 'b':
               channel = 2;
               break;
@@ -93,18 +76,15 @@ function validateChannel(image, channel, allowAlpha = true) {
         }
 
         break;
-
       case Model.HSL:
         if ('hsl'.includes(channel)) {
           switch (channel) {
             case 'h':
               channel = 0;
               break;
-
             case 's':
               channel = 1;
               break;
-
             case 'l':
               channel = 2;
               break;
@@ -113,18 +93,15 @@ function validateChannel(image, channel, allowAlpha = true) {
         }
 
         break;
-
       case Model.HSV:
         if ('hsv'.includes(channel)) {
           switch (channel) {
             case 'h':
               channel = 0;
               break;
-
             case 's':
               channel = 1;
               break;
-
             case 'v':
               channel = 2;
               break;
@@ -133,22 +110,18 @@ function validateChannel(image, channel, allowAlpha = true) {
         }
 
         break;
-
       case Model.CMYK:
         if ('cmyk'.includes(channel)) {
           switch (channel) {
             case 'c':
               channel = 0;
               break;
-
             case 'm':
               channel = 1;
               break;
-
             case 'y':
               channel = 2;
               break;
-
             case 'k':
               channel = 3;
               break;
@@ -157,31 +130,24 @@ function validateChannel(image, channel, allowAlpha = true) {
         }
 
         break;
-
       default:
         throw new Error(`Unexpected color model: ${image.colorModel}`);
     }
-
     if (channel === 'a') {
       if (!image.alpha) {
         throw new Error('validateChannel : the image does not contain alpha channel');
       }
-
       channel = image.components;
     }
-
     if (typeof channel === 'string') {
       throw new Error(`validateChannel : undefined channel: ${channel}`);
     }
   }
-
   if (channel >= image.channels) {
     throw new RangeError(`validateChannel : the channel has to be >=0 and <${image.channels}`);
   }
-
   if (!allowAlpha && channel >= image.components) {
     throw new RangeError('validateChannel : alpha channel may not be selected');
   }
-
   return channel;
 }

package/lib/util/color.js

@@ -7,43 +7,33 @@ exports.css2array = css2array;
 exports.getColors = getColors;
 exports.getDistinctColors = getDistinctColors;
 exports.getRandomColor = getRandomColor;
-
 var _colorFns = require("@swiftcarrot/color-fns");
-
 function css2array(string) {
   let color = (0, _colorFns.cssColor)(string);
   return [color.r, color.g, color.b, Math.round(color.a * 255 / 100)];
 }
-
 function hue2rgb(p, q, t) {
   if (t < 0) {
     t += 1;
   }
-
   if (t > 1) {
     t -= 1;
   }
-
   if (t < 1 / 6) {
     return p + (q - p) * 6 * t;
   }
-
   if (t < 1 / 2) {
     return q;
   }
-
   if (t < 2 / 3) {
     return p + (q - p) * (2 / 3 - t) * 6;
   }
-
   return p;
 }
-
 function hsl2rgb(h, s, l) {
   let m1, m2, hue, r, g, b;
   s /= 100;
   l /= 100;
-
   if (s === 0) {
     r = g = b = l * 255;
   } else {
@@ -52,37 +42,32 @@ function hsl2rgb(h, s, l) {
     } else {
       m2 = l + s - l * s;
     }
-
     m1 = l * 2 - m2;
     hue = h / 360;
     r = hue2rgb(m1, m2, hue + 1 / 3);
     g = hue2rgb(m1, m2, hue);
     b = hue2rgb(m1, m2, hue - 1 / 3);
   }
-
   return {
     r: r,
     g: g,
     b: b
   };
 }
-
 function getDistinctColors(numColors) {
   let colors = new Array(numColors);
   let j = 0;
-
   for (let i = 0; i < 360; i += 360 / numColors) {
     j++;
     let color = hsl2rgb(i, 100, 30 + j % 4 * 15);
     colors[j - 1] = [Math.round(color.r * 255), Math.round(color.g * 255), Math.round(color.b * 255)];
   }
-
   return colors;
 }
-
 function getRandomColor() {
   return [Math.floor(Math.random() * 256), Math.floor(Math.random() * 256), Math.floor(Math.random() * 256)];
 }
+
 /**
  * returns an array of colors based on various options
  * by default this methods return 50 distinct colors
@@ -95,8 +80,6 @@ function getRandomColor() {
  * @return {Array} Array of colors
  * @private
  */
-
-
 function getColors(options) {
   let {
     color,
@@ -105,33 +88,26 @@ function getColors(options) {
     // true / false
     numberColors = 50
   } = options;
-
   if (color && !Array.isArray(color)) {
     color = css2array(color);
   }
-
   if (color) {
     return [color];
   }
-
   if (colors) {
     colors = colors.map(function (color) {
       if (!Array.isArray(color)) {
         return css2array(color);
       }
-
       return color;
     });
     return colors;
   }
-
   if (randomColors) {
     colors = new Array(numberColors);
-
     for (let i = 0; i < numberColors; i++) {
       colors[i] = getRandomColor();
     }
   }
-
   return getDistinctColors(numberColors);
 }

package/lib/util/converter.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.factorDimensions = factorDimensions;
 exports.getFactor = getFactor;
 exports.getThreshold = getThreshold;
-
 /**
  * Converts a factor value to a number between 0 and 1
  * @private
@@ -17,14 +16,13 @@ function getFactor(value) {
   if (typeof value === 'string') {
     const last = value[value.length - 1];
     value = parseFloat(value);
-
     if (last === '%') {
       value /= 100;
     }
   }
-
   return value;
 }
+
 /**
  * We can specify a threshold as "0.4", "40%" or 123
  * @private
@@ -32,45 +30,35 @@ function getFactor(value) {
  * @param {number} maxValue
  * @return {number}
  */
-
-
 function getThreshold(value, maxValue) {
   if (!maxValue) {
     throw Error('getThreshold : the maxValue should be specified');
   }
-
   if (typeof value === 'string') {
     let last = value[value.length - 1];
-
     if (last !== '%') {
       throw Error('getThreshold : if the value is a string it must finish by %');
     }
-
     return parseFloat(value) / 100 * maxValue;
   } else if (typeof value === 'number') {
     if (value < 1) {
       return value * maxValue;
     }
-
     return value;
   } else {
     throw Error('getThreshold : the value is not valid');
   }
 }
-
 function factorDimensions(factor, width, height) {
   factor = getFactor(factor);
   let newWidth = Math.round(factor * width);
   let newHeight = Math.round(factor * height);
-
   if (newWidth <= 0) {
     newWidth = 1;
   }
-
   if (newHeight <= 0) {
     newHeight = 1;
   }
-
   return {
     width: newWidth,
     height: newHeight

package/lib/util/deepValue.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = deepValue;
-
 function deepValue(object, path = '') {
   let parts = path.split('.');
-
   for (let part of parts) {
     if (object[part] === undefined) return undefined;
     object = object[part];
   }
-
   return object;
 }