toosoon-utils 1.1.0 → 1.3.0

package/lib/constants.js

@@ -1,173 +1,170 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.W3CX11 = exports.QUARTER_PI = exports.HALF_PI = exports.TWO_PI = exports.PI = exports.EPSILON = void 0;
 // *********************
 // Maths
 // *********************
-exports.EPSILON = 1e-10;
-exports.PI = Math.PI;
-exports.TWO_PI = Math.PI * 2;
-exports.HALF_PI = Math.PI / 2;
-exports.QUARTER_PI = Math.PI / 4;
+export var EPSILON = 1e-10;
+export var PI = Math.PI;
+export var TWO_PI = Math.PI * 2;
+export var HALF_PI = Math.PI / 2;
+export var QUARTER_PI = Math.PI / 4;
 // *********************
 // Colors
 // *********************
 // X11 colors
 // -> https://www.w3.org/TR/css-color-3/#svg-color
-exports.W3CX11 = {
-    aliceblue: '#f0f8ff',
-    antiquewhite: '#faebd7',
-    aqua: '#00ffff',
-    aquamarine: '#7fffd4',
-    azure: '#f0ffff',
-    beige: '#f5f5dc',
-    bisque: '#ffe4c4',
-    black: '#000000',
-    blanchedalmond: '#ffebcd',
-    blue: '#0000ff',
-    blueviolet: '#8a2be2',
-    brown: '#a52a2a',
-    burlywood: '#deb887',
-    cadetblue: '#5f9ea0',
-    chartreuse: '#7fff00',
-    chocolate: '#d2691e',
-    coral: '#ff7f50',
-    cornflower: '#6495ed',
-    cornflowerblue: '#6495ed',
-    cornsilk: '#fff8dc',
-    crimson: '#dc143c',
-    cyan: '#00ffff',
-    darkblue: '#00008b',
-    darkcyan: '#008b8b',
-    darkgoldenrod: '#b8860b',
-    darkgray: '#a9a9a9',
-    darkgreen: '#006400',
-    darkgrey: '#a9a9a9',
-    darkkhaki: '#bdb76b',
-    darkmagenta: '#8b008b',
-    darkolivegreen: '#556b2f',
-    darkorange: '#ff8c00',
-    darkorchid: '#9932cc',
-    darkred: '#8b0000',
-    darksalmon: '#e9967a',
-    darkseagreen: '#8fbc8f',
-    darkslateblue: '#483d8b',
-    darkslategray: '#2f4f4f',
-    darkslategrey: '#2f4f4f',
-    darkturquoise: '#00ced1',
-    darkviolet: '#9400d3',
-    deeppink: '#ff1493',
-    deepskyblue: '#00bfff',
-    dimgray: '#696969',
-    dimgrey: '#696969',
-    dodgerblue: '#1e90ff',
-    firebrick: '#b22222',
-    floralwhite: '#fffaf0',
-    forestgreen: '#228b22',
-    fuchsia: '#ff00ff',
-    gainsboro: '#dcdcdc',
-    ghostwhite: '#f8f8ff',
-    gold: '#ffd700',
-    goldenrod: '#daa520',
-    gray: '#808080',
-    green: '#008000',
-    greenyellow: '#adff2f',
-    grey: '#808080',
-    honeydew: '#f0fff0',
-    hotpink: '#ff69b4',
-    indianred: '#cd5c5c',
-    indigo: '#4b0082',
-    ivory: '#fffff0',
-    khaki: '#f0e68c',
-    laserlemon: '#ffff54',
-    lavender: '#e6e6fa',
-    lavenderblush: '#fff0f5',
-    lawngreen: '#7cfc00',
-    lemonchiffon: '#fffacd',
-    lightblue: '#add8e6',
-    lightcoral: '#f08080',
-    lightcyan: '#e0ffff',
-    lightgoldenrod: '#fafad2',
-    lightgoldenrodyellow: '#fafad2',
-    lightgray: '#d3d3d3',
-    lightgreen: '#90ee90',
-    lightgrey: '#d3d3d3',
-    lightpink: '#ffb6c1',
-    lightsalmon: '#ffa07a',
-    lightseagreen: '#20b2aa',
-    lightskyblue: '#87cefa',
-    lightslategray: '#778899',
-    lightslategrey: '#778899',
-    lightsteelblue: '#b0c4de',
-    lightyellow: '#ffffe0',
-    lime: '#00ff00',
-    limegreen: '#32cd32',
-    linen: '#faf0e6',
-    magenta: '#ff00ff',
-    maroon: '#800000',
-    maroon2: '#7f0000',
-    maroon3: '#b03060',
-    mediumaquamarine: '#66cdaa',
-    mediumblue: '#0000cd',
-    mediumorchid: '#ba55d3',
-    mediumpurple: '#9370db',
-    mediumseagreen: '#3cb371',
-    mediumslateblue: '#7b68ee',
-    mediumspringgreen: '#00fa9a',
-    mediumturquoise: '#48d1cc',
-    mediumvioletred: '#c71585',
-    midnightblue: '#191970',
-    mintcream: '#f5fffa',
-    mistyrose: '#ffe4e1',
-    moccasin: '#ffe4b5',
-    navajowhite: '#ffdead',
-    navy: '#000080',
-    oldlace: '#fdf5e6',
-    olive: '#808000',
-    olivedrab: '#6b8e23',
-    orange: '#ffa500',
-    orangered: '#ff4500',
-    orchid: '#da70d6',
-    palegoldenrod: '#eee8aa',
-    palegreen: '#98fb98',
-    paleturquoise: '#afeeee',
-    palevioletred: '#db7093',
-    papayawhip: '#ffefd5',
-    peachpuff: '#ffdab9',
-    peru: '#cd853f',
-    pink: '#ffc0cb',
-    plum: '#dda0dd',
-    powderblue: '#b0e0e6',
-    purple: '#800080',
-    purple2: '#7f007f',
-    purple3: '#a020f0',
-    rebeccapurple: '#663399',
-    red: '#ff0000',
-    rosybrown: '#bc8f8f',
-    royalblue: '#4169e1',
-    saddlebrown: '#8b4513',
-    salmon: '#fa8072',
-    sandybrown: '#f4a460',
-    seagreen: '#2e8b57',
-    seashell: '#fff5ee',
-    sienna: '#a0522d',
-    silver: '#c0c0c0',
-    skyblue: '#87ceeb',
-    slateblue: '#6a5acd',
-    slategray: '#708090',
-    slategrey: '#708090',
-    snow: '#fffafa',
-    springgreen: '#00ff7f',
-    steelblue: '#4682b4',
-    tan: '#d2b48c',
-    teal: '#008080',
-    thistle: '#d8bfd8',
-    tomato: '#ff6347',
-    turquoise: '#40e0d0',
-    violet: '#ee82ee',
-    wheat: '#f5deb3',
-    white: '#ffffff',
-    whitesmoke: '#f5f5f5',
-    yellow: '#ffff00',
-    yellowgreen: '#9acd32'
+export var W3CX11 = {
+    aliceblue: 0xf0f8ff,
+    antiquewhite: 0xfaebd7,
+    aqua: 0x00ffff,
+    aquamarine: 0x7fffd4,
+    azure: 0xf0ffff,
+    beige: 0xf5f5dc,
+    bisque: 0xffe4c4,
+    black: 0x000000,
+    blanchedalmond: 0xffebcd,
+    blue: 0x0000ff,
+    blueviolet: 0x8a2be2,
+    brown: 0xa52a2a,
+    burlywood: 0xdeb887,
+    cadetblue: 0x5f9ea0,
+    chartreuse: 0x7fff00,
+    chocolate: 0xd2691e,
+    coral: 0xff7f50,
+    cornflower: 0x6495ed,
+    cornflowerblue: 0x6495ed,
+    cornsilk: 0xfff8dc,
+    crimson: 0xdc143c,
+    cyan: 0x00ffff,
+    darkblue: 0x00008b,
+    darkcyan: 0x008b8b,
+    darkgoldenrod: 0xb8860b,
+    darkgray: 0xa9a9a9,
+    darkgreen: 0x006400,
+    darkgrey: 0xa9a9a9,
+    darkkhaki: 0xbdb76b,
+    darkmagenta: 0x8b008b,
+    darkolivegreen: 0x556b2f,
+    darkorange: 0xff8c00,
+    darkorchid: 0x9932cc,
+    darkred: 0x8b0000,
+    darksalmon: 0xe9967a,
+    darkseagreen: 0x8fbc8f,
+    darkslateblue: 0x483d8b,
+    darkslategray: 0x2f4f4f,
+    darkslategrey: 0x2f4f4f,
+    darkturquoise: 0x00ced1,
+    darkviolet: 0x9400d3,
+    deeppink: 0xff1493,
+    deepskyblue: 0x00bfff,
+    dimgray: 0x696969,
+    dimgrey: 0x696969,
+    dodgerblue: 0x1e90ff,
+    firebrick: 0xb22222,
+    floralwhite: 0xfffaf0,
+    forestgreen: 0x228b22,
+    fuchsia: 0xff00ff,
+    gainsboro: 0xdcdcdc,
+    ghostwhite: 0xf8f8ff,
+    gold: 0xffd700,
+    goldenrod: 0xdaa520,
+    gray: 0x808080,
+    green: 0x008000,
+    greenyellow: 0xadff2f,
+    grey: 0x808080,
+    honeydew: 0xf0fff0,
+    hotpink: 0xff69b4,
+    indianred: 0xcd5c5c,
+    indigo: 0x4b0082,
+    ivory: 0xfffff0,
+    khaki: 0xf0e68c,
+    laserlemon: 0xffff54,
+    lavender: 0xe6e6fa,
+    lavenderblush: 0xfff0f5,
+    lawngreen: 0x7cfc00,
+    lemonchiffon: 0xfffacd,
+    lightblue: 0xadd8e6,
+    lightcoral: 0xf08080,
+    lightcyan: 0xe0ffff,
+    lightgoldenrod: 0xfafad2,
+    lightgoldenrodyellow: 0xfafad2,
+    lightgray: 0xd3d3d3,
+    lightgreen: 0x90ee90,
+    lightgrey: 0xd3d3d3,
+    lightpink: 0xffb6c1,
+    lightsalmon: 0xffa07a,
+    lightseagreen: 0x20b2aa,
+    lightskyblue: 0x87cefa,
+    lightslategray: 0x778899,
+    lightslategrey: 0x778899,
+    lightsteelblue: 0xb0c4de,
+    lightyellow: 0xffffe0,
+    lime: 0x00ff00,
+    limegreen: 0x32cd32,
+    linen: 0xfaf0e6,
+    magenta: 0xff00ff,
+    maroon: 0x800000,
+    maroon2: 0x7f0000,
+    maroon3: 0xb03060,
+    mediumaquamarine: 0x66cdaa,
+    mediumblue: 0x0000cd,
+    mediumorchid: 0xba55d3,
+    mediumpurple: 0x9370db,
+    mediumseagreen: 0x3cb371,
+    mediumslateblue: 0x7b68ee,
+    mediumspringgreen: 0x00fa9a,
+    mediumturquoise: 0x48d1cc,
+    mediumvioletred: 0xc71585,
+    midnightblue: 0x191970,
+    mintcream: 0xf5fffa,
+    mistyrose: 0xffe4e1,
+    moccasin: 0xffe4b5,
+    navajowhite: 0xffdead,
+    navy: 0x000080,
+    oldlace: 0xfdf5e6,
+    olive: 0x808000,
+    olivedrab: 0x6b8e23,
+    orange: 0xffa500,
+    orangered: 0xff4500,
+    orchid: 0xda70d6,
+    palegoldenrod: 0xeee8aa,
+    palegreen: 0x98fb98,
+    paleturquoise: 0xafeeee,
+    palevioletred: 0xdb7093,
+    papayawhip: 0xffefd5,
+    peachpuff: 0xffdab9,
+    peru: 0xcd853f,
+    pink: 0xffc0cb,
+    plum: 0xdda0dd,
+    powderblue: 0xb0e0e6,
+    purple: 0x800080,
+    purple2: 0x7f007f,
+    purple3: 0xa020f0,
+    rebeccapurple: 0x663399,
+    red: 0xff0000,
+    rosybrown: 0xbc8f8f,
+    royalblue: 0x4169e1,
+    saddlebrown: 0x8b4513,
+    salmon: 0xfa8072,
+    sandybrown: 0xf4a460,
+    seagreen: 0x2e8b57,
+    seashell: 0xfff5ee,
+    sienna: 0xa0522d,
+    silver: 0xc0c0c0,
+    skyblue: 0x87ceeb,
+    slateblue: 0x6a5acd,
+    slategray: 0x708090,
+    slategrey: 0x708090,
+    snow: 0xfffafa,
+    springgreen: 0x00ff7f,
+    steelblue: 0x4682b4,
+    tan: 0xd2b48c,
+    teal: 0x008080,
+    thistle: 0xd8bfd8,
+    tomato: 0xff6347,
+    turquoise: 0x40e0d0,
+    violet: 0xee82ee,
+    wheat: 0xf5deb3,
+    white: 0xffffff,
+    whitesmoke: 0xf5f5f5,
+    yellow: 0xffff00,
+    yellowgreen: 0x9acd32
 };

package/lib/dom.d.ts

@@ -20,6 +20,6 @@ export declare function createCanvas(width: number, height: number): {
 /**
  * Inject CSS styles in `document.head`
  *
- * @param {string} cssContent CSS style to inject
+ * @param {string} styles CSS styles to inject
  */
-export declare function injectStyles(cssContent: string): void;
+export declare function injectStyles(styles: string): void;

package/lib/dom.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectStyles = exports.createCanvas = exports.closest = void 0;
 var DOCUMENT_NODE_TYPE = 9;
 /**
  * Find the closest parent that matches a selector
@@ -9,7 +6,7 @@ var DOCUMENT_NODE_TYPE = 9;
  * @param {(Element|string)} selector Selector or parent to match
  * @returns {Element|null}
  */
-function closest(element, selector) {
+export function closest(element, selector) {
     var current = element;
     while (current && current.nodeType !== DOCUMENT_NODE_TYPE) {
         if ((typeof selector === 'string' && current.matches(selector)) || current === selector) {
@@ -19,7 +16,6 @@ function closest(element, selector) {
     }
     return current;
 }
-exports.closest = closest;
 /**
  * Create a canvas and 2d context
  *
@@ -27,7 +23,7 @@ exports.closest = closest;
  * @param {Number} height Height of the canvas
  * @returns {{ canvas: HTMLCanvasElement, ctx: CanvasRenderingContext2D }}
  */
-function createCanvas(width, height) {
+export function createCanvas(width, height) {
     var _a;
     var canvas = document.createElement('canvas');
     canvas.width = width;
@@ -35,19 +31,17 @@ function createCanvas(width, height) {
     var ctx = (_a = canvas.getContext('2d')) !== null && _a !== void 0 ? _a : new CanvasRenderingContext2D();
     return { canvas: canvas, ctx: ctx };
 }
-exports.createCanvas = createCanvas;
 /**
  * Inject CSS styles in `document.head`
  *
- * @param {string} cssContent CSS style to inject
+ * @param {string} styles CSS styles to inject
  */
-function injectStyles(cssContent) {
+export function injectStyles(styles) {
     var $style = document.createElement('style');
-    $style.innerHTML = cssContent;
+    $style.innerHTML = styles;
     var $before = document.querySelector('head link[rel=stylesheet], head style');
     if ($before)
         document.head.insertBefore($style, $before);
     else
         document.head.appendChild($style);
 }
-exports.injectStyles = injectStyles;

package/lib/files.d.ts

@@ -9,6 +9,6 @@ export declare function download(blob: Blob, filename: string): void;
  * Upload a file from user files
  *
  * @param {Function} onLoad    Callback called once the file is loaded
- * @param {string} [accept=''] Types the file input should accept
+ * @param {string} [accept=''] MIME type the file input should accept
  */
 export declare function upload(onLoad: (dataUrl: string) => void, accept?: string): void;

package/lib/files.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.upload = exports.download = void 0;
 /**
  * Download a Blob object into user files
  *
  * @param {Blob} blob       Blob object to download
  * @param {string} filename Downloaded file name
  */
-function download(blob, filename) {
+export function download(blob, filename) {
     var link = document.createElement('a');
     link.setAttribute('href', URL.createObjectURL(blob));
     link.setAttribute('download', filename);
@@ -15,14 +12,13 @@ function download(blob, filename) {
     link.click();
     document.body.removeChild(link);
 }
-exports.download = download;
 /**
  * Upload a file from user files
  *
  * @param {Function} onLoad    Callback called once the file is loaded
- * @param {string} [accept=''] Types the file input should accept
+ * @param {string} [accept=''] MIME type the file input should accept
  */
-function upload(onLoad, accept) {
+export function upload(onLoad, accept) {
     if (accept === void 0) { accept = ''; }
     var input = document.createElement('input');
     input.setAttribute('type', 'file');
@@ -40,4 +36,3 @@ function upload(onLoad, accept) {
     input.click();
     document.body.removeChild(input);
 }
-exports.upload = upload;

package/lib/functions.d.ts

@@ -6,13 +6,17 @@ export declare const noop: () => void;
 /**
  * Promise wrapped setTimeout
  *
- * @param {number} timeout Time in ms
+ * @param {number} [timeout=0] Time to wait (in milliseconds)
  * @returns {Promise}
  */
-export declare function wait(timeout: number): Promise<void>;
+export declare function wait(timeout?: number): Promise<void>;
 /**
  * Deferred promise implementation
  *
  * @returns {Deferred}
  */
 export declare function defer<T = void>(): Deferred<T>;
+/**
+ * Polyfill for `now()` functions
+ */
+export declare let now: () => number;

package/lib/functions.js

@@ -1,27 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defer = exports.wait = exports.noop = void 0;
 /**
  * No-op function
  */
-var noop = function () { };
-exports.noop = noop;
+export var noop = function () { };
 /**
  * Promise wrapped setTimeout
  *
- * @param {number} timeout Time in ms
+ * @param {number} [timeout=0] Time to wait (in milliseconds)
  * @returns {Promise}
  */
-function wait(timeout) {
+export function wait(timeout) {
+    if (timeout === void 0) { timeout = 0; }
     return new Promise(function (resolve) { return setTimeout(resolve, timeout); });
 }
-exports.wait = wait;
 /**
  * Deferred promise implementation
  *
  * @returns {Deferred}
  */
-function defer() {
+export function defer() {
     var resolve;
     var reject;
     var promise = new Promise(function (_resolve, _reject) {
@@ -30,4 +26,28 @@ function defer() {
     });
     return { promise: promise, resolve: resolve, reject: reject };
 }
-exports.defer = defer;
+/**
+ * Polyfill for `now()` functions
+ */
+export var now;
+// In node.js, use `process.hrtime`
+if (typeof process !== 'undefined' && process.hrtime) {
+    now = function () {
+        // Convert [seconds, nanoseconds] to milliseconds
+        var time = process.hrtime();
+        return time[0] * 1000 + time[1] / 1000000;
+    };
+}
+// In a browser use `performance` or `Date`
+else if (typeof performance !== 'undefined') {
+    // This must be bound, because directly assigning this function leads to an invocation exception in Chrome
+    now = performance.now.bind(performance);
+}
+else if (typeof Date.now !== 'undefined') {
+    now = Date.now;
+}
+else {
+    now = function () {
+        return new Date().getTime();
+    };
+}

package/lib/geometry.d.ts

@@ -53,8 +53,8 @@ export declare function diagonal(width: number, height: number): number;
  * Convert radians to a 3D point on the surface of a unit sphere
  *
  * @param  {number} radius  Radius of the sphere
- * @param  {number} phi     Polar angle from the y (up) axis     : 0 to PI
- * @param  {number} theta   Equator angle around the y (up) axis : 0 to 2 PI
+ * @param  {number} phi     Polar angle from the y (up) axis     : [0, PI]
+ * @param  {number} theta   Equator angle around the y (up) axis : [0, 2*PI]
  * @param  {Vector3} target Target vector
  * @returns {Vector3}
  */

package/lib/geometry.js

@@ -1,27 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.contain = exports.cover = exports.radToSphere = exports.diagonal = exports.distance = exports.closestAngle = exports.angle = exports.toRadians = exports.toDegrees = void 0;
-var constants_1 = require("./constants");
+import { PI } from './constants';
 /**
  * Convert a radians value into degrees
  *
  * @param {number} radians Angle in radians
  * @returns {number} Angle in degrees
  */
-function toDegrees(radians) {
-    return (radians * 180) / constants_1.PI;
+export function toDegrees(radians) {
+    return (radians * 180) / PI;
 }
-exports.toDegrees = toDegrees;
 /**
  * Convert a degrees value into radians
  *
  * @param {number} degrees Angle in degrees
  * @returns {number} Angle in radians
  */
-function toRadians(degrees) {
-    return (degrees * constants_1.PI) / 180;
+export function toRadians(degrees) {
+    return (degrees * PI) / 180;
 }
-exports.toRadians = toRadians;
 /**
  * Calculate the angle from a point to another
  *
@@ -31,10 +26,9 @@ exports.toRadians = toRadians;
  * @param  {number} y2 Y value of the second point
  * @returns {number} Angle
  */
-function angle(x1, y1, x2, y2) {
+export function angle(x1, y1, x2, y2) {
     return Math.atan2(y2 - y1, x2 - x1);
 }
-exports.angle = angle;
 /**
  * Find the closest angle between to angles
  *
@@ -42,11 +36,10 @@ exports.angle = angle;
  * @param {number} target Target angle in radians
  * @returns {number} Closest angle
  */
-function closestAngle(source, target) {
+export function closestAngle(source, target) {
     var delta = target - source;
-    return delta > constants_1.PI ? target - 2 * constants_1.PI : target < -constants_1.PI ? delta + 2 * constants_1.PI : target;
+    return delta > PI ? target - 2 * PI : target < -PI ? delta + 2 * PI : target;
 }
-exports.closestAngle = closestAngle;
 /**
  * Calculate the distance between two points
  *
@@ -56,12 +49,11 @@ exports.closestAngle = closestAngle;
  * @param {number} y2 Y coord of the second point
  * @returns {number} Computed distance
  */
-function distance(x1, y1, x2, y2) {
+export function distance(x1, y1, x2, y2) {
     var dx = x1 - x2;
     var dy = y1 - y2;
     return Math.sqrt(dx * dx + dy * dy);
 }
-exports.distance = distance;
 /**
  * Calculate the length of the diagonal of a rectangle
  *
@@ -69,27 +61,25 @@ exports.distance = distance;
  * @param {number} height Height of the rectangle
  * @returns {number} Diagonal length
  */
-function diagonal(width, height) {
+export function diagonal(width, height) {
     return Math.sqrt(width * width + height * height);
 }
-exports.diagonal = diagonal;
 /**
  * Convert radians to a 3D point on the surface of a unit sphere
  *
  * @param  {number} radius  Radius of the sphere
- * @param  {number} phi     Polar angle from the y (up) axis     : 0 to PI
- * @param  {number} theta   Equator angle around the y (up) axis : 0 to 2 PI
+ * @param  {number} phi     Polar angle from the y (up) axis     : [0, PI]
+ * @param  {number} theta   Equator angle around the y (up) axis : [0, 2*PI]
  * @param  {Vector3} target Target vector
  * @returns {Vector3}
  */
-function radToSphere(radius, phi, theta, target) {
+export function radToSphere(radius, phi, theta, target) {
     if (target === void 0) { target = { x: 0, y: 0, z: 0 }; }
     target.x = radius * Math.sin(phi) * Math.sin(theta);
     target.y = radius * Math.cos(phi);
     target.z = radius * Math.sin(phi) * Math.cos(theta);
     return target;
 }
-exports.radToSphere = radToSphere;
 /**
  * Make a target fit a container
  *
@@ -123,10 +113,9 @@ function fit(target, container, mode) {
  * @param {FitInput} container Dimension of the container
  * @returns {FitOutput}
  */
-function cover(target, container) {
+export function cover(target, container) {
     return fit(target, container, 'cover');
 }
-exports.cover = cover;
 /**
  * Make a target fit a container (contain mode)
  *
@@ -134,7 +123,6 @@ exports.cover = cover;
  * @param {FitInput} container Dimension of the container
  * @returns {FitOutput}
  */
-function contain(target, container) {
+export function contain(target, container) {
     return fit(target, container, 'contain');
 }
-exports.contain = contain;