@yanqirenshi/d3.deployment 0.3.0 → 0.4.0

package/dist/components/D3Deployment.js

@@ -1,22 +1,14 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = D3Deployment;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _assh0le = _interopRequireDefault(require("@yanqirenshi/assh0le"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function D3Deployment(props) {
   var rectum = props.rectum;
   return /*#__PURE__*/_react["default"].createElement(_assh0le["default"], {

package/dist/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,17 +11,9 @@ Object.defineProperty(exports, "Rectum", {
   }
 });
 exports["default"] = void 0;
-
 var _D3Deployment = _interopRequireWildcard(require("./components/D3Deployment.js"));
-
 var _Rectum = _interopRequireDefault(require("./js/Rectum.js"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 // export { Camera };
-var _default = _D3Deployment["default"];
-exports["default"] = _default;
+var _default = exports["default"] = _D3Deployment["default"];

package/dist/js/Rectum.js

@@ -1,83 +1,62 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _assh0le = require("@yanqirenshi/assh0le");
-
-var _Node = _interopRequireDefault(require("./Node.js"));
-
-var _Edge = _interopRequireDefault(require("./Edge.js"));
-
-var _Port = _interopRequireDefault(require("./Port.js"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
-
-function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-var Rectum = /*#__PURE__*/function (_Colon) {
-  _inherits(Rectum, _Colon);
-
-  var _super = _createSuper(Rectum);
-
+var _Node = _interopRequireDefault(require("./datamodels/Node.js"));
+var _Edge = _interopRequireDefault(require("./datamodels/Edge.js"));
+var _Port = _interopRequireDefault(require("./datamodels/Port.js"));
+var _Node2 = _interopRequireDefault(require("./painters/Node.js"));
+var _Edge2 = _interopRequireDefault(require("./painters/Edge.js"));
+var _Port2 = _interopRequireDefault(require("./painters/Port.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+function _get() { return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) { var p = _superPropBase(e, t); if (p) { var n = Object.getOwnPropertyDescriptor(p, t); return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value; } }, _get.apply(null, arguments); }
+function _superPropBase(t, o) { for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t));); return t; }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+var Rectum = exports["default"] = /*#__PURE__*/function (_Colon) {
   function Rectum(params) {
     var _this;
-
     _classCallCheck(this, Rectum);
-
-    _this = _super.call(this, params);
+    _this = _callSuper(this, Rectum, [params]);
     _this.id_counter = 1;
+
+    // データクラス(正規化・幾何)
     _this._calculator = new _assh0le.Geometry();
     _this._node = new _Node["default"]();
     _this._port = new _Port["default"]();
     _this._edge = new _Edge["default"]();
+
+    // 描画クラス(ペインタ)
     _this._painter = {
-      NODE: _this._node,
-      EDGE: _this._edge,
-      PORT: _this._port
+      NODE: new _Node2["default"](),
+      EDGE: new _Edge2["default"](),
+      PORT: new _Port2["default"]()
     };
     return _this;
   }
   /* ******** */
-
   /*  Getter  */
-
   /* ******** */
-
-
-  _createClass(Rectum, [{
+  _inherits(Rectum, _Colon);
+  return _createClass(Rectum, [{
     key: "node",
     value: function node() {
       return this._node;
@@ -93,28 +72,21 @@ var Rectum = /*#__PURE__*/function (_Colon) {
       return this._edge;
     }
     /* **************************** */
-
     /*  Overwrite Asshole function  */
-
     /* **************************** */
-
   }, {
     key: "selector_setAfter",
     value: function selector_setAfter() {
-      this.node().addFilterShadow(this.d3Element());
+      this._painter.NODE.addFilterShadow(this.d3Element());
     }
     /* ******** */
-
     /*  DATA  */
-
     /* ******** */
-
   }, {
     key: "data2pool",
     value: function data2pool(trees, pool) {
       var _iterator = _createForOfIteratorHelper(trees),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var tree = _step.value;
@@ -128,7 +100,6 @@ var Rectum = /*#__PURE__*/function (_Colon) {
       } finally {
         _iterator.f();
       }
-
       return pool;
     }
   }, {
@@ -139,10 +110,8 @@ var Rectum = /*#__PURE__*/function (_Colon) {
         return node.normalize(d);
       });
       var h = new _assh0le.Hierarchy();
-
       var _iterator2 = _createForOfIteratorHelper(tmp),
-          _step2;
-
+        _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var data = _step2.value;
@@ -153,7 +122,6 @@ var Rectum = /*#__PURE__*/function (_Colon) {
       } finally {
         _iterator2.f();
       }
-
       var pool = this.data2pool(tmp, {
         list: [],
         ht: {},
@@ -166,7 +134,6 @@ var Rectum = /*#__PURE__*/function (_Colon) {
     key: "makeEdges",
     value: function makeEdges(edges) {
       var _this2 = this;
-
       var edge = this.edge();
       var id = 1;
       var tmp = (edges || []).map(function (d) {
@@ -199,10 +166,8 @@ var Rectum = /*#__PURE__*/function (_Colon) {
         list: [],
         ht: {}
       };
-
       var _iterator3 = _createForOfIteratorHelper(edges),
-          _step3;
-
+        _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           var edge = _step3.value;
@@ -218,66 +183,38 @@ var Rectum = /*#__PURE__*/function (_Colon) {
       } finally {
         _iterator3.f();
       }
-
       return ports;
     }
-  }, {
-    key: "getPortLineFrom",
-    value: function getPortLineFrom(node) {
-      return {
-        x: Math.floor(node._size.w / 2) + node._position.x,
-        y: Math.floor(node._size.h / 2) + node._position.y
-      };
-    }
-  }, {
-    key: "getPortLineToPoint",
-    value: function getPortLineToPoint(node) {
-      var w = node._size.w;
-      var h = node._size.h;
-      return {
-        x: 0,
-        y: Math.floor(Math.sqrt(w * w + h * h))
-      };
-    }
-  }, {
-    key: "getPortLineTo",
-    value: function getPortLineTo(degree, node) {
-      var point = this.getPortLineToPoint(node);
-      var x = point.x;
-      var y = point.y;
-      var degree_tmp;
-      if (degree === 0) degree_tmp = degree;else if (!degree) degree_tmp = 90;else degree_tmp = degree % 360;
-
-      var radian = this._calculator.deg2rad(degree_tmp);
-
-      var cos = Math.cos(radian);
-      var sin = Math.sin(radian);
-      return {
-        x: Math.floor(x * cos - y * sin),
-        y: Math.floor(x * sin + y * cos)
-      };
-    }
     /**
      * Port の位置を計算するため、Port と Nodeの中心の直線を算出する。
      *
-     * @param {object} port Line を算出する対象の Port。 TODO: これ、つこてなくない？
-     * @param {number} port_pos_degree Port の位置。
+     * 直線の構築は共有版(assh0le の Geometry.getPortLine)に委譲する。
+     * 共有版は box ローカル座標で返すため、node の絶対位置をオフセットして返す
+     * (旧インライン実装と数学的に等価)。
+     *
+     * @param {number} degree Port の位置(角度)。
      * @param {object} node port の Node。 算出した Line の位置を補正するための Node
      */
-
   }, {
     key: "makePortLine",
     value: function makePortLine(degree, node) {
-      var from = this.getPortLineFrom(node);
-      var to = this.getPortLineTo(degree, node);
+      var rect = {
+        size: {
+          w: node._size.w,
+          h: node._size.h
+        }
+      };
+      var line = this._calculator.getPortLine(degree, rect);
+      var px = node._position.x;
+      var py = node._position.y;
       return {
         from: {
-          x: from.x,
-          y: from.y
+          x: line.from.x + px,
+          y: line.from.y + py
         },
         to: {
-          x: to.x + from.x,
-          y: to.y + from.y
+          x: line.to.x + px,
+          y: line.to.y + py
         }
       };
     }
@@ -318,33 +255,31 @@ var Rectum = /*#__PURE__*/function (_Colon) {
      * data.edge を元に port のデータも作成する。
      * @param {object} data { node: [], edges: [] }
      */
-
   }, {
     key: "data",
     value: function data(_data) {
-      if (arguments.length === 0) return _get(_getPrototypeOf(Rectum.prototype), "data", this).call(this);
+      if (arguments.length === 0) return _superPropGet(Rectum, "data", this, 3)([]);
       var nodes = this.makeNodes(_data.nodes);
       var edges = this.makeEdges(_data.edges);
-      var ports = this.makePorts(nodes.ht, edges.list); // fitting ports
+      var ports = this.makePorts(nodes.ht, edges.list);
 
+      // fitting ports
       var _iterator4 = _createForOfIteratorHelper(ports.list),
-          _step4;
-
+        _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           var port = _step4.value;
           this.fittingPort(port);
-        } // fitting edges
+        }
 
+        // fitting edges
       } catch (err) {
         _iterator4.e(err);
       } finally {
         _iterator4.f();
       }
-
       var _iterator5 = _createForOfIteratorHelper(edges.list),
-          _step5;
-
+        _step5;
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
           var edge = _step5.value;
@@ -355,21 +290,19 @@ var Rectum = /*#__PURE__*/function (_Colon) {
       } finally {
         _iterator5.f();
       }
-
-      return _get(_getPrototypeOf(Rectum.prototype), "data", this).call(this, {
+      return _superPropGet(Rectum, "data", this, 3)([{
         nodes: nodes,
         edges: edges,
         ports: ports
-      });
-    } ///// ////////////////////////////////////////////////////////////////
+      }]);
+    }
+    ///// ////////////////////////////////////////////////////////////////
     /////   Flatten
     ///// ////////////////////////////////////////////////////////////////
-
   }, {
     key: "flattenCore",
     value: function flattenCore(data, lev) {
       var _this3 = this;
-
       var out = [data];
       var children = data.children.reduce(function (acc, val) {
         val._level = lev;
@@ -381,7 +314,6 @@ var Rectum = /*#__PURE__*/function (_Colon) {
     key: "flatten",
     value: function flatten(data) {
       var _this4 = this;
-
       var nodes = data.nodes.tree;
       if (!nodes) return [];
       var lev = 10;
@@ -395,27 +327,26 @@ var Rectum = /*#__PURE__*/function (_Colon) {
     value: function getDrawElements(data) {
       var out = this.flatten(data);
       var ports = data.ports.list;
-      var edges = data.edges.list; // port に level を設定
+      var edges = data.edges.list;
 
+      // port に level を設定
       var _iterator6 = _createForOfIteratorHelper(ports),
-          _step6;
-
+        _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
           var port = _step6.value;
           port._level = port.node._level;
           out.push(port);
-        } // edge に level を設定
+        }
 
+        // edge に level を設定
       } catch (err) {
         _iterator6.e(err);
       } finally {
         _iterator6.f();
       }
-
       var _iterator7 = _createForOfIteratorHelper(edges),
-          _step7;
-
+        _step7;
       try {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
           var edge = _step7.value;
@@ -423,21 +354,21 @@ var Rectum = /*#__PURE__*/function (_Colon) {
           var lev_to = edge.to.port._level;
           if (lev_from > lev_to) edge._level = lev_from - 1;else edge._level = lev_to - 1;
           out.push(edge);
-        } // ソートして返す
+        }
 
+        // ソートして返す
       } catch (err) {
         _iterator7.e(err);
       } finally {
         _iterator7.f();
       }
-
       return out.sort(function (a, b) {
         return a._level < b._level ? -1 : 1;
       });
-    } ///// ////////////////////////////////////////////////////////////////
+    }
+    ///// ////////////////////////////////////////////////////////////////
     /////   Draw
     ///// ////////////////////////////////////////////////////////////////
-
   }, {
     key: "painter",
     value: function painter(element_class) {
@@ -457,10 +388,8 @@ var Rectum = /*#__PURE__*/function (_Colon) {
       var place = this.layer('foreground');
       var data = this.data();
       var elements = this.getDrawElements(data);
-
       var _iterator8 = _createForOfIteratorHelper(elements),
-          _step8;
-
+        _step8;
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
           var element = _step8.value;
@@ -473,8 +402,4 @@ var Rectum = /*#__PURE__*/function (_Colon) {
       }
     }
   }]);
-
-  return Rectum;
-}(_assh0le.Colon);
-
-exports["default"] = Rectum;
+}(_assh0le.Colon);

package/dist/js/datamodels/Edge.js

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * Edge のデータクラス。入力データの正規化(既定値補完)を行う。
+ * 描画は painters/Edge.js が担当する。
+ */
+var Edge = exports["default"] = /*#__PURE__*/function () {
+  function Edge() {
+    _classCallCheck(this, Edge);
+  }
+  return _createClass(Edge, [{
+    key: "dataTemplate",
+    value: function dataTemplate() {
+      return {
+        from: {
+          id: null,
+          port: null,
+          node: null,
+          position: {
+            x: 0,
+            y: 0
+          }
+        },
+        to: {
+          id: null,
+          port: null,
+          node: null,
+          position: {
+            x: 0,
+            y: 0
+          }
+        },
+        stroke: {
+          color: '#333',
+          width: 1.5,
+          marker: {
+            start: false,
+            end: true
+          }
+        },
+        _id: null,
+        _core: null,
+        _class: 'EDGE'
+      };
+    }
+  }, {
+    key: "normalize",
+    value: function normalize(data) {
+      var new_data = this.dataTemplate();
+      new_data._core = data;
+      if (data.id) new_data._id = data.id;
+      if (data.from.id) new_data.from.id = data.from.id;
+      if (data.to.id) new_data.to.id = data.to.id;
+      if (data.stroke) {
+        if (data.stroke.color) new_data.stroke.color = data.stroke.color;
+        if (data.stroke.width) new_data.stroke.width = data.stroke.width;
+        if (data.stroke.marker) new_data.stroke.marker = data.stroke.marker;
+      }
+      data._edge = new_data;
+      return new_data;
+    }
+  }]);
+}();