@yanqirenshi/d3.ter 0.1.16 → 0.1.17

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/js/Entity.js CHANGED
@@ -272,6 +272,11 @@ var Entity = exports["default"] = /*#__PURE__*/function (_Atman) {
272
272
  return 'Evt';
273
273
  case 'RECURSION':
274
274
  return '再帰';
275
+ // TM(T字形ER)の多値。MO=多値のOR(配列の正規形)、MA=多値のAND(HDR-DTL 構成)
276
+ case 'MANY-VALUED-OR':
277
+ return 'MO';
278
+ case 'MANY-VALUED-AND':
279
+ return 'MA';
275
280
  default:
276
281
  throw new Error(type + " は知らないよ。");
277
282
  }
@@ -303,6 +308,12 @@ var Entity = exports["default"] = /*#__PURE__*/function (_Atman) {
303
308
  },
304
309
  "recursion": {
305
310
  color: '#dbd0e6'
311
+ },
312
+ "many-valued-or": {
313
+ color: '#fddea5'
314
+ },
315
+ "many-valued-and": {
316
+ color: '#9fd5c9'
306
317
  }
307
318
  };
308
319
  var key = this._core.type.toLowerCase();
@@ -465,7 +476,15 @@ var Entity = exports["default"] = /*#__PURE__*/function (_Atman) {
465
476
  var data = this.type;
466
477
  if (!data.contents) data.contents = '??';
467
478
  data.size.h = this._default.line.height + data.padding * 2;
468
- data.size.w = this.strLen(data.contents) * this._default.line.font.size;
479
+
480
+ // 幅 = テキストの概算幅 + 両側の padding。
481
+ // ラベルは box 左端から padding 分内側に描かれるため、旧実装
482
+ // (strLen × フォントサイズのみ)では右側の余白が無く、MO / MA の
483
+ // ような幅広の半角グリフがはみ出ていた。バッジは英大文字か漢字の
484
+ // 2〜3文字なので、1文字 = 1em で概算すれば確実に収まる。
485
+ var font = this._default.line.font.size;
486
+ var chars = Array.from(String(data.contents)).length;
487
+ data.size.w = chars * font + data.padding * 2;
469
488
  }
470
489
  }, {
471
490
  key: "sizing",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yanqirenshi/d3.ter",
3
- "version": "0.1.16",
3
+ "version": "0.1.17",
4
4
  "author": "yanqirenshi@gmail.com",
5
5
  "license": "GPL-3.0-or-later",
6
6
  "description": "See `src/index.html`",
@@ -19,6 +19,17 @@ test('entity type marker and background color follow the entity type', () => {
19
19
  expect(event.background.color).toBe('#f09199');
20
20
  });
21
21
 
22
+ // issue #14: TM(T字形ER)の多値。MO=多値のOR、MA=多値のAND(HDR-DTL)
23
+ test('many-valued types render MO / MA badges with their own colors', () => {
24
+ const mo = new Entity(entityData('MANY-VALUED-OR'), null);
25
+ expect(mo.type.contents).toBe('MO');
26
+ expect(mo.background.color).toBe('#fddea5');
27
+
28
+ const ma = new Entity(entityData('MANY-VALUED-AND'), null);
29
+ expect(ma.type.contents).toBe('MA');
30
+ expect(ma.background.color).toBe('#9fd5c9');
31
+ });
32
+
22
33
  test('unknown entity type throws', () => {
23
34
  expect(() => new Entity(entityData('UNKNOWN'), null)).toThrow();
24
35
  });