@yanqirenshi/d3.ter 0.1.18 → 0.1.20

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.
package/dist/index.d.ts CHANGED
@@ -28,7 +28,14 @@ export interface TerAttribute {
28
28
  description?: string;
29
29
  }
30
30
 
31
- /** TM(T字形ER)のエンティティ種別(9種)。これ以外の値は描画時に例外になる */
31
+ /**
32
+ * TM(T字形ER)のエンティティ種別(10種)。これ以外の値は描画時に例外になる。
33
+ * 'CLASS' は「クラスで整える」の箱(モノに混入した別の性質の切り出し。
34
+ * 例: 従業員.入社)で、種別バッジを持たない。
35
+ * **結線できるのは切り出し元(親)のみ**(クラスの識別子=親の個体指定子の
36
+ * マスタを相手が共有していること)。それ以外のモノやクラス同士を
37
+ * relationships の端点に指定するとデータ構築時に例外になる。
38
+ */
32
39
  export type TerEntityType =
33
40
  | 'RESOURCE'
34
41
  | 'RESOURCE-SUBSET'
@@ -38,7 +45,8 @@ export type TerEntityType =
38
45
  | 'CORRESPONDENCE'
39
46
  | 'RECURSION'
40
47
  | 'MANY-VALUED-OR'
41
- | 'MANY-VALUED-AND';
48
+ | 'MANY-VALUED-AND'
49
+ | 'CLASS';
42
50
 
43
51
  /** カーディナリティ(1 または 多=3) */
44
52
  export type TerCardinality = 1 | 3;
@@ -73,7 +81,7 @@ export interface TerEntity {
73
81
  attributes: TerAttributeInstance[];
74
82
  }
75
83
 
76
- /** リレーションシップの端点 */
84
+ /** リレーションシップの端点(CLASS は切り出し元(親)との結線のみ可 — それ以外は構築時に例外) */
77
85
  export interface TerRelationshipEnd {
78
86
  /** 接続先エンティティの id */
79
87
  entity: number | string;
@@ -89,6 +97,18 @@ export interface TerRelationshipDetail {
89
97
  to: { id: number | string; description?: string };
90
98
  }
91
99
 
100
+ /**
101
+ * サブセット結線の区分コード表記(TM)。
102
+ * kind 'same' → =区分コード(同一のサブセット: 属性構成が同じ)
103
+ * kind 'different' → ×区分コード(相違のサブセット: 属性構成が異なる)
104
+ * 線の中点にラベルとして描画される。
105
+ */
106
+ export interface TerSubset {
107
+ kind: 'same' | 'different';
108
+ /** 区分コード名(例: '行種別') */
109
+ code: string;
110
+ }
111
+
92
112
  /** エンティティ間のリレーションシップ */
93
113
  export interface TerRelationship {
94
114
  id: number | string;
@@ -97,6 +117,8 @@ export interface TerRelationship {
97
117
  to: TerRelationshipEnd;
98
118
  /** 省略時は先頭の識別子インスタンスに取り付く */
99
119
  details?: TerRelationshipDetail[];
120
+ /** サブセットへの結線に区分コード(= / ×)を表示する(任意) */
121
+ subset?: TerSubset;
100
122
  description?: string;
101
123
  }
102
124
 
package/dist/js/Entity.js CHANGED
@@ -277,6 +277,10 @@ var Entity = exports["default"] = /*#__PURE__*/function (_Atman) {
277
277
  return 'MO';
278
278
  case 'MANY-VALUED-AND':
279
279
  return 'MA';
280
+ // TM の「クラス」(モノに混入した別の性質の切り出し。例: 従業員.入社)。
281
+ // 種別バッジを持たない(空文字 = 意図的なバッジ無し)
282
+ case 'CLASS':
283
+ return '';
280
284
  default:
281
285
  throw new Error(type + " は知らないよ。");
282
286
  }
@@ -314,6 +318,9 @@ var Entity = exports["default"] = /*#__PURE__*/function (_Atman) {
314
318
  },
315
319
  "many-valued-and": {
316
320
  color: '#9fd5c9'
321
+ },
322
+ "class": {
323
+ color: '#bdc0ba'
317
324
  }
318
325
  };
319
326
  var key = this._core.type.toLowerCase();
@@ -474,8 +481,16 @@ var Entity = exports["default"] = /*#__PURE__*/function (_Atman) {
474
481
  key: "sizingType",
475
482
  value: function sizingType() {
476
483
  var data = this.type;
477
- if (!data.contents) data.contents = '??';
484
+
485
+ // 空文字は「意図的なバッジ無し」(CLASS)。未設定(null/undefined)とは
486
+ // 区別し、'??' への補完は未設定のときだけ行う。
487
+ if (data.contents === undefined || data.contents === null) data.contents = '??';
478
488
  data.size.h = this._default.line.height + data.padding * 2;
489
+ if (data.contents === '') {
490
+ // バッジ無し: 幅 0 にして名称エリアがヘッダ全幅を使う
491
+ data.size.w = 0;
492
+ return;
493
+ }
479
494
 
480
495
  // 幅 = テキストの概算幅 + 両側の padding。
481
496
  // ラベルは box 左端から padding 分内側に描かれるため、旧実装
@@ -35,7 +35,7 @@ var PortCardinalities = exports["default"] = /*#__PURE__*/function () {
35
35
  value: function drawLine(g) {
36
36
  var _this = this;
37
37
  var lines = g.selectAll('line').data(function (d) {
38
- return d.ports.items.list;
38
+ return _this._parent.visiblePorts(d);
39
39
  }, function (d) {
40
40
  return d.id();
41
41
  });
@@ -74,7 +74,7 @@ var PortCardinalities = exports["default"] = /*#__PURE__*/function () {
74
74
  });
75
75
  };
76
76
  var cardinalities = g.selectAll('line.cardinality').data(function (d) {
77
- return filter(d.ports.items.list);
77
+ return filter(_this2._parent.visiblePorts(d));
78
78
  }, function (d) {
79
79
  return d.id();
80
80
  });
@@ -111,7 +111,7 @@ var PortCardinalities = exports["default"] = /*#__PURE__*/function () {
111
111
  });
112
112
  };
113
113
  var cardinalities = g.selectAll('path.cardinality').data(function (d) {
114
- return filter(d.ports.items.list);
114
+ return filter(_this3._parent.visiblePorts(d));
115
115
  }, function (d) {
116
116
  return d.id();
117
117
  });
@@ -13,14 +13,14 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
13
13
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
14
14
  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); }
15
15
  var PortCircles = exports["default"] = /*#__PURE__*/function () {
16
- function PortCircles() {
16
+ function PortCircles(parent) {
17
17
  _classCallCheck(this, PortCircles);
18
+ this._parent = parent;
18
19
  }
20
+ // protected
19
21
  return _createClass(PortCircles, [{
20
22
  key: "drawPortsCore",
21
- value:
22
- // protected
23
- function drawPortsCore(ports) {
23
+ value: function drawPortsCore(ports) {
24
24
  ports.attr('class', 'entity-port').attr('cx', function (d) {
25
25
  return d.position().x;
26
26
  }).attr('cy', function (d) {
@@ -34,8 +34,9 @@ var PortCircles = exports["default"] = /*#__PURE__*/function () {
34
34
  }, {
35
35
  key: "draw",
36
36
  value: function draw(groups_entity) {
37
+ var _this = this;
37
38
  var ports = groups_entity.selectAll('circle.entity-port').data(function (d) {
38
- return d.ports.items.list;
39
+ return _this._parent.visiblePorts(d);
39
40
  }).enter().append('circle');
40
41
  this.drawPortsCore(ports);
41
42
  }
@@ -30,8 +30,9 @@ var PortOptionalities = exports["default"] = /*#__PURE__*/function () {
30
30
  }, {
31
31
  key: "selections",
32
32
  value: function selections(g, selector, filter) {
33
+ var _this = this;
33
34
  return g.selectAll(selector).data(function (d) {
34
- return filter(d.ports.items.list);
35
+ return filter(_this._parent.visiblePorts(d));
35
36
  }, function (d) {
36
37
  return d.id();
37
38
  });
@@ -39,7 +40,7 @@ var PortOptionalities = exports["default"] = /*#__PURE__*/function () {
39
40
  }, {
40
41
  key: "drawOptionalityOne",
41
42
  value: function drawOptionalityOne(g) {
42
- var _this = this;
43
+ var _this2 = this;
43
44
  var filter = function filter() {
44
45
  var ports = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
45
46
  return ports.filter(function (d) {
@@ -57,7 +58,7 @@ var PortOptionalities = exports["default"] = /*#__PURE__*/function () {
57
58
  return d.optionalityPosition().to.x;
58
59
  }).attr("y2", function (d) {
59
60
  return d.optionalityPosition().to.y;
60
- }).attr("stroke-width", _this.style().port.stroke.width).attr("stroke", _this.style().port.stroke.color);
61
+ }).attr("stroke-width", _this2.style().port.stroke.width).attr("stroke", _this2.style().port.stroke.color);
61
62
  };
62
63
 
63
64
  // delete
@@ -73,7 +74,7 @@ var PortOptionalities = exports["default"] = /*#__PURE__*/function () {
73
74
  }, {
74
75
  key: "drawOptionalityZero",
75
76
  value: function drawOptionalityZero(g) {
76
- var _this2 = this;
77
+ var _this3 = this;
77
78
  var filter = function filter() {
78
79
  var ports = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
79
80
  return ports.filter(function (d) {
@@ -87,7 +88,7 @@ var PortOptionalities = exports["default"] = /*#__PURE__*/function () {
87
88
  return d.optionalityPosition().x;
88
89
  }).attr("cy", function (d) {
89
90
  return d.optionalityPosition().y;
90
- }).attr("r", 5).attr("fill", "#fefefe").attr("stroke-width", _this2.style().port.stroke.width).attr("stroke", _this2.style().port.stroke.color);
91
+ }).attr("r", 5).attr("fill", "#fefefe").attr("stroke-width", _this3.style().port.stroke.width).attr("stroke", _this3.style().port.stroke.color);
91
92
  };
92
93
 
93
94
  // delete
@@ -37,6 +37,19 @@ var Ports = exports["default"] = /*#__PURE__*/function () {
37
37
  value: function callbacks() {
38
38
  return this._parent.callbacks;
39
39
  }
40
+ /**
41
+ * ポート記号(円・カーディナリティ・オプショナリティ)を描く対象。
42
+ * サブセット結線(relationship.subset あり)は幹+バスのグループ線
43
+ * (Painters/Relationships.js)で描くため、個別ポートの記号は描かない。
44
+ */
45
+ }, {
46
+ key: "visiblePorts",
47
+ value: function visiblePorts(entity) {
48
+ return entity.ports.items.list.filter(function (p) {
49
+ var r = p._relationship;
50
+ return !(r && r.subsetLabel && r.subsetLabel());
51
+ });
52
+ }
40
53
  /* **************************************************************** *
41
54
  * Old
42
55
  * **************************************************************** */
@@ -6,6 +6,13 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports["default"] = void 0;
7
7
  var _assh0le = require("@yanqirenshi/assh0le");
8
8
  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); }
9
+ function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
10
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
11
+ function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
12
+ function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
13
+ 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; } } }; }
14
+ 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; } }
15
+ 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; }
9
16
  function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
10
17
  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); } }
11
18
  function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -25,16 +32,16 @@ var Relationships = exports["default"] = /*#__PURE__*/function () {
25
32
  return d._id;
26
33
  },
27
34
  x1: function x1(d) {
28
- return d.from.position().x + d.from._owner.position.x;
35
+ return _this.fromPoint(d).x;
29
36
  },
30
37
  y1: function y1(d) {
31
- return d.from.position().y + d.from._owner.position.y;
38
+ return _this.fromPoint(d).y;
32
39
  },
33
40
  x2: function x2(d) {
34
- return d.to.position().x + d.to._owner.position.x;
41
+ return _this.toPoint(d).x;
35
42
  },
36
43
  y2: function y2(d) {
37
- return d.to.position().y + d.to._owner.position.y;
44
+ return _this.toPoint(d).y;
38
45
  },
39
46
  stroke: function stroke() {
40
47
  return '#888888';
@@ -63,14 +70,167 @@ var Relationships = exports["default"] = /*#__PURE__*/function () {
63
70
  value: function callbacks() {
64
71
  return this._parent.callbacks;
65
72
  }
73
+ /** port の entity 相対座標を絶対座標にする。 */
74
+ }, {
75
+ key: "fromPoint",
76
+ value: function fromPoint(d) {
77
+ return {
78
+ x: d.from.position().x + d.from._owner.position.x,
79
+ y: d.from.position().y + d.from._owner.position.y
80
+ };
81
+ }
82
+ }, {
83
+ key: "toPoint",
84
+ value: function toPoint(d) {
85
+ return {
86
+ x: d.to.position().x + d.to._owner.position.x,
87
+ y: d.to.position().y + d.to._owner.position.y
88
+ };
89
+ }
66
90
  // public
67
91
  }, {
68
92
  key: "drawRelationships",
69
93
  value: function drawRelationships(place, relationships) {
94
+ var _this2 = this;
70
95
  var data = relationships.list.filter(function (edge) {
71
96
  return edge.from._class === 'PORT-FROM' && edge.to._class === 'PORT-TO';
72
97
  });
73
- this._lines.draw(place, data);
98
+
99
+ // サブセット結線は直線ではなく「幹 + 水平バス + 垂下」のグループ線
100
+ // (tm3-1 §5、組織図と同じ直交スタイル)で描くため、直線からは除外する
101
+ var plain = data.filter(function (d) {
102
+ return !_this2.isSubset(d);
103
+ });
104
+ this._lines.draw(place, plain);
105
+ this.drawSubsetTrees(place, data);
106
+ }
107
+ }, {
108
+ key: "isSubset",
109
+ value: function isSubset(d) {
110
+ return !!(d.subsetLabel && d.subsetLabel());
111
+ }
112
+ /**
113
+ * サブセット結線のグループ化。同じ親エンティティ + 同じ区分コードの
114
+ * relationship を1つの分岐(幹 + バス + 垂下)として扱う。
115
+ */
116
+ }, {
117
+ key: "subsetGroups",
118
+ value: function subsetGroups(data) {
119
+ var ht = new Map();
120
+ var _iterator = _createForOfIteratorHelper(data),
121
+ _step;
122
+ try {
123
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
124
+ var d = _step.value;
125
+ if (!this.isSubset(d)) continue;
126
+ var parent = d.from._owner;
127
+ var key = parent._id + '::' + d._core.subset.code;
128
+ if (!ht.has(key)) ht.set(key, {
129
+ key: key,
130
+ parent: parent,
131
+ label: d.subsetLabel(),
132
+ rels: []
133
+ });
134
+ ht.get(key).rels.push(d);
135
+ }
136
+ } catch (err) {
137
+ _iterator.e(err);
138
+ } finally {
139
+ _iterator.f();
140
+ }
141
+ return _toConsumableArray(ht.values());
142
+ }
143
+ /** 分岐の幾何: 幹(親下端中央) → バス(中間の高さ) → 各サブセット上端中央。 */
144
+ }, {
145
+ key: "subsetGeometry",
146
+ value: function subsetGeometry(group) {
147
+ var parent = group.parent;
148
+ var px = parent.position.x + parent.size.w / 2;
149
+ var py = parent.position.y + parent.size.h;
150
+ var drops = group.rels.map(function (d) {
151
+ var child = d.to._owner;
152
+ return {
153
+ x: child.position.x + child.size.w / 2,
154
+ y: child.position.y
155
+ };
156
+ });
157
+ var child_top = Math.min.apply(Math, _toConsumableArray(drops.map(function (p) {
158
+ return p.y;
159
+ })));
160
+ var busY = py + Math.max(16, (child_top - py) / 2);
161
+ var xs = [px].concat(_toConsumableArray(drops.map(function (p) {
162
+ return p.x;
163
+ })));
164
+ return {
165
+ px: px,
166
+ py: py,
167
+ busY: busY,
168
+ drops: drops,
169
+ minX: Math.min.apply(Math, _toConsumableArray(xs)),
170
+ maxX: Math.max.apply(Math, _toConsumableArray(xs))
171
+ };
172
+ }
173
+ }, {
174
+ key: "subsetPath",
175
+ value: function subsetPath(group) {
176
+ var g = this.subsetGeometry(group);
177
+ var path = 'M ' + g.px + ' ' + g.py + ' V ' + g.busY + ' M ' + g.minX + ' ' + g.busY + ' H ' + g.maxX;
178
+ var _iterator2 = _createForOfIteratorHelper(g.drops),
179
+ _step2;
180
+ try {
181
+ for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
182
+ var p = _step2.value;
183
+ path += ' M ' + p.x + ' ' + g.busY + ' V ' + p.y;
184
+ }
185
+ } catch (err) {
186
+ _iterator2.e(err);
187
+ } finally {
188
+ _iterator2.f();
189
+ }
190
+ return path;
191
+ }
192
+ /**
193
+ * サブセットの分岐(幹 + バス + 垂下)と、幹の分岐点に添える区分コード
194
+ * (=区分コード / ×区分コード)を描く。enter/update join で冪等。
195
+ */
196
+ }, {
197
+ key: "drawSubsetTrees",
198
+ value: function drawSubsetTrees(place, data) {
199
+ this._subsetGroups = this.subsetGroups(data);
200
+ var paths = place.selectAll('path.subset-line').data(this._subsetGroups, function (d) {
201
+ return d.key;
202
+ });
203
+ paths.exit().remove();
204
+ var entered_paths = paths.enter().append('path').attr('class', 'subset-line').attr('fill', 'none').attr('stroke', '#888888').attr('stroke-width', 1);
205
+ var labels = place.selectAll('text.subset-code').data(this._subsetGroups, function (d) {
206
+ return d.key;
207
+ });
208
+ labels.exit().remove();
209
+ var entered_labels = labels.enter().append('text').attr('class', 'subset-code').attr('text-anchor', 'middle').attr('font-size', '12px').attr('fill', '#333333');
210
+ this.applySubsetTrees(entered_paths.merge(paths), entered_labels.merge(labels));
211
+ }
212
+ /** 分岐線の形状とラベル(バスの少し上・幹の位置)を適用する。 */
213
+ }, {
214
+ key: "applySubsetTrees",
215
+ value: function applySubsetTrees(paths, labels) {
216
+ var _this3 = this;
217
+ paths.attr('d', function (d) {
218
+ return _this3.subsetPath(d);
219
+ });
220
+ labels.attr('x', function (d) {
221
+ return _this3.subsetGeometry(d).px;
222
+ }).attr('y', function (d) {
223
+ return _this3.subsetGeometry(d).busY - 5;
224
+ }).text(function (d) {
225
+ return d.label;
226
+ });
227
+ }
228
+ /** ドラッグ追従: 分岐線・ラベル全体に現在のエンティティ位置を再適用する。 */
229
+ }, {
230
+ key: "updateSubsetTrees",
231
+ value: function updateSubsetTrees(place) {
232
+ if (!this._subsetGroups || this._subsetGroups.length === 0) return;
233
+ this.applySubsetTrees(place.selectAll('path.subset-line'), place.selectAll('text.subset-code'));
74
234
  }
75
235
  // Entity のドラッグ追従(Painters/Entities.js)から呼ばれる。
76
236
  // 指定 entity に接続する線を選択して座標を再適用する。
@@ -78,13 +238,19 @@ var Relationships = exports["default"] = /*#__PURE__*/function () {
78
238
  }, {
79
239
  key: "redrawEntityEdges",
80
240
  value: function redrawEntityEdges(place, entity) {
241
+ var _this4 = this;
81
242
  var edges = entity.ports.items.list.map(function (p) {
82
243
  return p._relationship;
83
244
  });
84
- var selection = place.selectAll('line.connector').data(edges, function (d) {
245
+ var selection = place.selectAll('line.connector').data(edges.filter(function (d) {
246
+ return !_this4.isSubset(d);
247
+ }), function (d) {
85
248
  return d._id;
86
249
  });
87
250
  this._lines.update(selection);
251
+
252
+ // サブセットの分岐線・区分コードも追従させる
253
+ this.updateSubsetTrees(place);
88
254
  }
89
255
  }]);
90
256
  }();
package/dist/js/Rectum.js CHANGED
@@ -53,7 +53,9 @@ var Rectum = exports["default"] = /*#__PURE__*/function (_Colon) {
53
53
  click: null
54
54
  }
55
55
  };
56
- return (0, _deepmerge["default"])(template, callbacks);
56
+
57
+ // callbacks 未指定でも落ちないように既定へフォールバック
58
+ return (0, _deepmerge["default"])(template, callbacks || {});
57
59
  }
58
60
  }, {
59
61
  key: "entities",
@@ -90,6 +92,29 @@ var Rectum = exports["default"] = /*#__PURE__*/function (_Colon) {
90
92
  var entities = this.entities();
91
93
  return entities.ht[id] || null;
92
94
  }
95
+ /**
96
+ * クラス(CLASS)を端点に持つリレーションシップの検証。
97
+ * クラスは切り出し元(親)としか結線できない。親かどうかは
98
+ * 「クラスが持つ識別子(親の個体指定子 R)のマスタを相手も持つか」で判定する。
99
+ */
100
+ }, {
101
+ key: "assertClassLink",
102
+ value: function assertClassLink(r, entity_from, entity_to) {
103
+ var isClass = function isClass(e) {
104
+ return !!e && e._core.type === 'CLASS';
105
+ };
106
+ if (!isClass(entity_from) && !isClass(entity_to)) return;
107
+ if (isClass(entity_from) && isClass(entity_to)) throw new Error('クラス(CLASS)同士は結線できません。relationship id=' + r.id);
108
+ var klass = isClass(entity_from) ? entity_from : entity_to;
109
+ var other = isClass(entity_from) ? entity_to : entity_from;
110
+ var masters = new Set((klass._core.identifiers || []).map(function (d) {
111
+ return d.identifier;
112
+ }));
113
+ var is_parent = (other._core.identifiers || []).some(function (d) {
114
+ return masters.has(d.identifier);
115
+ });
116
+ if (!is_parent) throw new Error('クラス(CLASS)は切り出し元(親)としか結線できません。' + 'relationship id=' + r.id + ', entity id=' + other._id);
117
+ }
93
118
  }, {
94
119
  key: "buildRelationshipsWithPort",
95
120
  value: function buildRelationshipsWithPort(relationships) {
@@ -102,6 +127,11 @@ var Rectum = exports["default"] = /*#__PURE__*/function (_Colon) {
102
127
  var entity_from = _this2.getEntity(from.entity);
103
128
  var entity_to = _this2.getEntity(to.entity);
104
129
 
130
+ // TM の「クラス」は切り出し元(親)としか結線できない
131
+ // (参照 tm3-1 §7「クラスで整える」: 親→クラスの線はあるが、
132
+ // 他のモノとの結線は不可)。誤結線は描画が壊れる前に検出する。
133
+ _this2.assertClassLink(r, entity_from, entity_to);
134
+
105
135
  // Port のクラスインスタンスを作成する。
106
136
  var port_from = new _Port["default"]('from', entity_from, r, _this2);
107
137
  var port_to = new _Port["default"]('to', entity_to, r, _this2);
@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports["default"] = void 0;
8
8
  var _Atman2 = _interopRequireDefault(require("./Atman.js"));
9
9
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
10
+ function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
10
11
  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); } }
11
12
  function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
12
13
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
13
14
  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); }
14
- function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
15
15
  function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
16
16
  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); }
17
17
  function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
@@ -30,6 +30,19 @@ var Relationship = exports["default"] = /*#__PURE__*/function (_Atman) {
30
30
  port_to._relationship = _this;
31
31
  return _this;
32
32
  }
33
+ /**
34
+ * TM のサブセット結線に添える区分コードの表記。
35
+ * =区分コード … 同一のサブセット(kind: 'same')
36
+ * ×区分コード … 相違のサブセット(kind: 'different'。'same' 以外は×扱い)
37
+ * 入力の relationship.subset = { kind, code }。無ければ null(表示なし)。
38
+ */
33
39
  _inherits(Relationship, _Atman);
34
- return _createClass(Relationship);
40
+ return _createClass(Relationship, [{
41
+ key: "subsetLabel",
42
+ value: function subsetLabel() {
43
+ var subset = this._core.subset;
44
+ if (!subset || !subset.code) return null;
45
+ return (subset.kind === 'same' ? '=' : '×') + subset.code;
46
+ }
47
+ }]);
35
48
  }(_Atman2["default"]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yanqirenshi/d3.ter",
3
- "version": "0.1.18",
3
+ "version": "0.1.20",
4
4
  "author": "yanqirenshi@gmail.com",
5
5
  "license": "GPL-3.0-or-later",
6
6
  "description": "See `src/index.html`",
@@ -30,6 +30,23 @@ test('many-valued types render MO / MA badges with their own colors', () => {
30
30
  expect(ma.background.color).toBe('#9fd5c9');
31
31
  });
32
32
 
33
+ // issue #17: TM の「クラス」— 種別バッジを持たない箱
34
+ test('CLASS renders without a type badge (empty badge, zero badge width)', () => {
35
+ const klass = new Entity(entityData('CLASS'), null);
36
+
37
+ expect(klass.type.contents).toBe('');
38
+ expect(klass.background.color).toBe('#bdc0ba');
39
+
40
+ // バッジ無しなので幅 0(名称エリアがヘッダ全幅を使う)
41
+ klass.sizingType();
42
+ expect(klass.type.size.w).toBe(0);
43
+
44
+ // 通常種別のバッジ幅は従来どおり正
45
+ const resource = new Entity(entityData('RESOURCE'), null);
46
+ resource.sizingType();
47
+ expect(resource.type.size.w).toBeGreaterThan(0);
48
+ });
49
+
33
50
  test('unknown entity type throws', () => {
34
51
  expect(() => new Entity(entityData('UNKNOWN'), null)).toThrow();
35
52
  });
@@ -0,0 +1,118 @@
1
+ import Rectum from '../src/js/Rectum.js';
2
+
3
+ // issue #17: TM の「クラス」は切り出し元(親)としか結線できない
4
+ // (tm3-1 §7「クラスで整える」: 親→クラスの線はあるが、他のモノとは結線不可)。
5
+ // selector 未設定の Rectum.data() は描画せずデータ構築のみ行う(DOM 不要)。
6
+ const DATA = (relationships) => ({
7
+ identifiers: [
8
+ { id: 10000, name: { logical: 'Entity ID', physical: 'entity_id' }, description: '' },
9
+ { id: 10001, name: { logical: 'Attribute ID', physical: 'attribute_id' }, description: '' },
10
+ ],
11
+ attributes: [
12
+ { id: 20000, name: { physical: 'name', logical: '名称' } },
13
+ ],
14
+ entities: [
15
+ {
16
+ id: 30000, type: 'RESOURCE', name: 'Entity', description: '',
17
+ position: { x: 0, y: 0, z: 0 }, size: { w: 0, h: 0 },
18
+ identifiers: [{ id: 3000001, identifier: 10000 }],
19
+ attributes: [{ id: 3000010, attribute: 20000 }],
20
+ },
21
+ {
22
+ // クラスと個体指定子を共有しない別のモノ(親ではない)
23
+ id: 30001, type: 'RESOURCE', name: 'Attribute', description: '',
24
+ position: { x: 600, y: 0, z: 0 }, size: { w: 0, h: 0 },
25
+ identifiers: [{ id: 3000101, identifier: 10001 }],
26
+ attributes: [{ id: 3000110, attribute: 20000 }],
27
+ },
28
+ {
29
+ id: 70000, type: 'CLASS', name: 'Entity.廃止', description: '',
30
+ position: { x: 0, y: 400, z: 0 }, size: { w: 0, h: 0 },
31
+ identifiers: [{ id: 7000001, identifier: 10000 }],
32
+ attributes: [{ id: 7000010, attribute: 20000 }],
33
+ },
34
+ {
35
+ id: 70001, type: 'CLASS', name: 'Entity.別区分', description: '',
36
+ position: { x: 300, y: 400, z: 0 }, size: { w: 0, h: 0 },
37
+ identifiers: [{ id: 7000101, identifier: 10000 }],
38
+ attributes: [{ id: 7000110, attribute: 20000 }],
39
+ },
40
+ ],
41
+ relationships,
42
+ });
43
+
44
+ test('CLASS entity builds fine when it has no relationships', () => {
45
+ const rectum = new Rectum({});
46
+
47
+ expect(() => rectum.data(DATA([]))).not.toThrow();
48
+ expect(rectum.entities().ht[70000]).toBeDefined();
49
+ });
50
+
51
+ test('a parent → CLASS relationship is allowed (identifier master is shared)', () => {
52
+ const rectum = new Rectum({});
53
+ const parentLink = [{
54
+ id: 1, type: null,
55
+ from: { entity: 30000, cardinality: 1, optionality: 0, position: 270 },
56
+ to: { entity: 70000, cardinality: 1, optionality: 0, position: 90 },
57
+ details: [{ from: { id: 3000001 }, to: { id: 7000001 } }],
58
+ }];
59
+
60
+ expect(() => rectum.data(DATA(parentLink))).not.toThrow();
61
+ });
62
+
63
+ test('a CLASS relationship to a non-parent throws', () => {
64
+ // Attribute(30001) はクラスの個体指定子(Entity ID)を持たない = 親ではない
65
+ const bad = [{
66
+ id: 1, type: null,
67
+ from: { entity: 30001, cardinality: 1, optionality: 0, position: 270 },
68
+ to: { entity: 70000, cardinality: 1, optionality: 0, position: 90 },
69
+ details: [{ from: { id: 3000101 }, to: { id: 7000001 } }],
70
+ }];
71
+
72
+ expect(() => new Rectum({}).data(DATA(bad)))
73
+ .toThrow(/クラス\(CLASS\)は切り出し元\(親\)としか結線できません/);
74
+ });
75
+
76
+ // issue #15: サブセット結線の区分コード表記(=同一 / ×相違)
77
+ test('subsetLabel composes = / × with the code (default: different)', () => {
78
+ const rectum = new Rectum({});
79
+ rectum.data(DATA([
80
+ {
81
+ id: 1, type: null,
82
+ from: { entity: 30000, cardinality: 1, optionality: 0, position: 270 },
83
+ to: { entity: 30001, cardinality: 1, optionality: 0, position: 90 },
84
+ details: [{ from: { id: 3000001 }, to: { id: 3000101 } }],
85
+ subset: { kind: 'different', code: '状態区分' },
86
+ },
87
+ {
88
+ id: 2, type: null,
89
+ from: { entity: 30000, cardinality: 1, optionality: 0, position: 0 },
90
+ to: { entity: 30001, cardinality: 1, optionality: 0, position: 180 },
91
+ details: [{ from: { id: 3000001 }, to: { id: 3000101 } }],
92
+ subset: { kind: 'same', code: '行種別' },
93
+ },
94
+ {
95
+ id: 3, type: null,
96
+ from: { entity: 30000, cardinality: 1, optionality: 0, position: 315 },
97
+ to: { entity: 30001, cardinality: 1, optionality: 0, position: 45 },
98
+ details: [{ from: { id: 3000001 }, to: { id: 3000101 } }],
99
+ },
100
+ ]));
101
+
102
+ const rels = rectum._relationships.ht;
103
+ expect(rels[1].subsetLabel()).toBe('×状態区分');
104
+ expect(rels[2].subsetLabel()).toBe('=行種別');
105
+ expect(rels[3].subsetLabel()).toBeNull(); // subset 無し → 表示なし
106
+ });
107
+
108
+ test('a CLASS-to-CLASS relationship throws', () => {
109
+ const bad = [{
110
+ id: 1, type: null,
111
+ from: { entity: 70000, cardinality: 1, optionality: 0, position: 270 },
112
+ to: { entity: 70001, cardinality: 1, optionality: 0, position: 90 },
113
+ details: [{ from: { id: 7000001 }, to: { id: 7000101 } }],
114
+ }];
115
+
116
+ expect(() => new Rectum({}).data(DATA(bad)))
117
+ .toThrow(/クラス\(CLASS\)同士は結線できません/);
118
+ });