Refactor

.babelrc

@@ -1,10 +1,9 @@
 {
-  "presets": [
-    ["env", { "loose": true }]
-  ],
+  "presets": [["env", { "loose": true }]],
   "plugins": [
     "transform-runtime",
     "transform-export-extensions",
+    "transform-object-rest-spread",
     ["transform-class-properties", { "loose": true }]
   ]
 }

.gitignore

@@ -4,3 +4,5 @@ yarn.lock
 dist
 *.pdf
 lerna-debug.log
+*.ttf
+.vscode

package.json

@@ -28,6 +28,7 @@
     "babel-eslint": "^8.2.2",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-export-extensions": "^6.22.0",
+    "babel-plugin-transform-object-rest-spread": "^6.22.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.7.0",
     "eslint": "^4.18.2",

packages/bidi-engine/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "prepublish": "npm run build",
-    "build": "babel index.js --out-dir ./dist",
+    "build": "babel index.js --out-dir ./dist --source-maps",
     "build:watch": "babel index.js --out-dir ./dist --watch",
     "precommit": "lint-staged",
     "test": "jest"

packages/core/package.json

@@ -1,25 +1,26 @@
 {
   "name": "@textkit/core",
-  "version": "0.1.16",
+  "version": "0.1.23",
   "description": "An advanced text layout framework",
   "main": "dist/index.js",
   "scripts": {
     "prebuild": "rimraf dist",
     "prepublish": "npm run build",
-    "build": "babel ./src --out-dir ./dist",
+    "build": "babel ./src --out-dir ./dist --source-maps",
     "build:watch": "babel ./src --out-dir ./dist --watch",
     "precommit": "lint-staged",
     "test": "jest"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "files": [
     "dist"
   ],
   "author": "Devon Govett <[email protected]>",
   "license": "MIT",
   "dependencies": {
     "cubic2quad": "^1.1.0",
-    "iconv-lite": "^0.4.13",
-    "svgpath": "^2.2.0",
     "unicode-properties": "^1.1.0"
   }
 }

packages/core/src/geom/BBox.js

@@ -1,45 +1,17 @@
-/**
- * Represents a glyph bounding box
- */
+import Rect from './Rect';
+
 class BBox {
   constructor(minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity) {
-    /**
-     * The minimum X position in the bounding box
-     * @type {number}
-     */
     this.minX = minX;
-
-    /**
-     * The minimum Y position in the bounding box
-     * @type {number}
-     */
     this.minY = minY;
-
-    /**
-     * The maxmimum X position in the bounding box
-     * @type {number}
-     */
     this.maxX = maxX;
-
-    /**
-     * The maxmimum Y position in the bounding box
-     * @type {number}
-     */
     this.maxY = maxY;
   }
 
-  /**
-   * The width of the bounding box
-   * @type {number}
-   */
   get width() {
     return this.maxX - this.minX;
   }
 
-  /**
-   * The height of the bounding box
-   * @type {number}
-   */
   get height() {
     return this.maxY - this.minY;
   }
@@ -67,6 +39,10 @@ class BBox {
     this.addPoint(rect.maxX, rect.maxY);
   }
 
+  toRect() {
+    return new Rect(this.minX, this.minY, this.width, this.height);
+  }
+
   copy() {
     return new BBox(this.minX, this.minY, this.maxX, this.maxY);
   }

packages/core/src/geom/Rect.js

@@ -2,98 +2,43 @@ import Point from './Point';
 
 const CORNERS = ['topLeft', 'topRight', 'bottomLeft', 'bottomRight'];
 
-/**
- * Represents a rectangle
- */
 class Rect {
   /** @public */
   constructor(x = 0, y = 0, width = 0, height = 0) {
-    /**
-     * The x-coordinate of the rectangle
-     * @type {number}
-     */
     this.x = x;
-
-    /**
-     * The y-coordinate of the rectangle
-     * @type {number}
-     */
     this.y = y;
-
-    /**
-     * The width of the rectangle
-     * @type {number}
-     */
     this.width = width;
-
-    /**
-     * The height of the rectangle
-     * @type {number}
-     */
     this.height = height;
   }
 
-  /**
-   * The maximum x-coordinate in the rectangle
-   * @type {number}
-   */
   get maxX() {
     return this.x + this.width;
   }
 
-  /**
-   * The maximum y-coordinate in the rectangle
-   * @type {number}
-   */
   get maxY() {
     return this.y + this.height;
   }
 
-  /**
-   * The area of the rectangle
-   * @type {number}
-   */
   get area() {
     return this.width * this.height;
   }
 
-  /**
-   * The top left corner of the rectangle
-   * @type {Point}
-   */
   get topLeft() {
     return new Point(this.x, this.y);
   }
 
-  /**
-   * The top right corner of the rectangle
-   * @type {Point}
-   */
   get topRight() {
     return new Point(this.maxX, this.y);
   }
 
-  /**
-   * The bottom left corner of the rectangle
-   * @type {Point}
-   */
   get bottomLeft() {
     return new Point(this.x, this.maxY);
   }
 
-  /**
-   * The bottom right corner of the rectangle
-   * @type {Point}
-   */
   get bottomRight() {
     return new Point(this.maxX, this.maxY);
   }
 
-  /**
-   * Returns whether this rectangle intersects another rectangle
-   * @param {Rect} rect - The rectangle to check
-   * @return {boolean}
-   */
   intersects(rect) {
     return (
       this.x <= rect.x + rect.width &&
@@ -103,30 +48,14 @@ class Rect {
     );
   }
 
-  /**
-   * Returns whether this rectangle fully contains another rectangle
-   * @param {Rect} rect - The rectangle to check
-   * @return {boolean}
-   */
   containsRect(rect) {
     return this.x <= rect.x && this.y <= rect.y && this.maxX >= rect.maxX && this.maxY >= rect.maxY;
   }
 
-  /**
-   * Returns whether the rectangle contains the given point
-   * @param {Point} point - The point to check
-   * @return {boolean}
-   */
   containsPoint(point) {
     return this.x <= point.x && this.y <= point.y && this.maxX >= point.x && this.maxY >= point.y;
   }
 
-  /**
-   * Returns the first corner of this rectangle (from top to bottom, left to right)
-   * that is contained in the given rectangle, or null of the rectangles do not intersect.
-   * @param {Rect} rect - The rectangle to check
-   * @return {string}
-   */
   getCornerInRect(rect) {
     for (const key of CORNERS) {
       if (rect.containsPoint(this[key])) {
@@ -154,10 +83,6 @@ class Rect {
     return this.width === size.width && this.height === size.height;
   }
 
-  /**
-   * Returns a copy of this rectangle
-   * @return {Rect}
-   */
   copy() {
     return new Rect(this.x, this.y, this.width, this.height);
   }

packages/core/src/index.js

@@ -3,7 +3,6 @@ export {
   Run,
   Block,
   Range,
-  TabStop,
   RunStyle,
   GlyphRun,
   Container,