modscape 2.0.0 → 2.0.1

package/README.ja.md

@@ -92,6 +92,7 @@ YAMLのルートレベル構造は以下の通りです：
 domains      – 関連テーブルをまとめるビジュアルコンテナ
 tables       – 3階層メタデータを持つエンティティ定義
 relationships – テーブル間のERカーディナリティ
+lineage      – データの流れ / 変換パス
 annotations  – キャンバス上のスティッキーノート・吹き出し
 layout       – 全座標データ（tables/domains の中に x/y を書いてはいけない）
 ```
@@ -104,7 +105,7 @@ domains:
     name: "主要売上"
     description: "営業チームのトランザクションデータ。"  # 任意
     color: "rgba(59, 130, 246, 0.1)"  # 背景色
-    tables: [orders, dim_customers]
+    tables: [orders, dim_customers]   # 論理的な所属リスト
     isLocked: false  # true にするとキャンバスでの誤ドラッグを防止
 ```
 
@@ -130,11 +131,6 @@ tables:
       businessDefinitions:
         revenue: "割引・返品後の純売上"
 
-    lineage:  # mart/集計テーブルのみに定義
-      upstream:
-        - fct_sales
-        - dim_dates
-
     implementation:  # 任意 – AIコード生成へのヒント
       materialization: incremental  # table | view | incremental | ephemeral
       incremental_strategy: merge   # merge | append | delete+insert
@@ -165,23 +161,22 @@ tables:
           type: "BIGINT"
           constraints: [NOT NULL]
 
-    sampleData:  # 2次元配列。先頭行 = カラムID
-      - [order_id, amount, status]
+    sampleData:  # 実数値の2次元配列
       - [1001, 50.0, "COMPLETED"]
       - [1002, 120.5, "PENDING"]
 ```
 
-**テーブルタイプと `appearance.type` の使い分け：**
+### Data Lineage（データリネージ）
+
+ルートレベルの `lineage` セクションでテーブル間のデータの流れ（どのソースからどの集計テーブルが作られるか）を定義します。リネージモードではアニメーション付きの点線矢印として表示されます。
 
-| type | 用途 |
-|------|------|
-| `fact` | 取引・イベント・測定値 |
-| `dimension` | エンティティ・マスタ・参照リスト |
-| `mart` | 集計・消費者向けテーブル（`lineage.upstream` を必ず定義） |
-| `hub` | Data Vault のビジネスキー |
-| `link` | Data Vault のハブ間結合・トランザクション |
-| `satellite` | Data Vault のハブに紐づく履歴属性 |
-| `table` | 汎用 |
+```yaml
+lineage:
+  - from: fct_orders    # ソーステーブル ID
+    to: mart_revenue    # 派生テーブル ID
+  - from: dim_dates
+    to: mart_revenue
+```
 
 ### Relationships（リレーションシップ）
 
@@ -196,7 +191,7 @@ relationships:
     type: one-to-many  # one-to-one | one-to-many | many-to-one | many-to-many
 ```
 
-> **データリネージ**は `lineage.upstream` で定義し、リネージモードでアニメーション矢印として表示されます。`relationships` に重複して記載しないでください。
+> **ER関係** vs **リネージ**: 構造的な結合（外部キーなど）には `relationships` を、データの加工・変換の流れには `lineage` を使用してください。両方に同じ接続を記述しないでください。
 
 ### Annotations（アノテーション）
 

package/README.md

@@ -95,6 +95,7 @@ Modscape uses a schema designed for data analysis contexts. The full YAML struct
 domains      – visual containers grouping related tables
 tables       – entity definitions with tri-layer metadata
 relationships – ER cardinality between tables
+lineage      – data flow / transformation paths
 annotations  – sticky notes / callouts on the canvas
 layout       – ALL coordinate data (never put x/y inside tables or domains)
 ```
@@ -107,7 +108,7 @@ domains:
     name: "Core Sales"
     description: "Transactional data for the sales team."  # optional
     color: "rgba(59, 130, 246, 0.1)"  # background fill
-    tables: [orders, dim_customers]
+    tables: [orders, dim_customers]   # logical membership
     isLocked: false  # prevent accidental drag when true
 ```
 
@@ -133,11 +134,6 @@ tables:
       businessDefinitions:
         revenue: "Net revenue after discounts"
 
-    lineage:  # for mart/aggregated tables only
-      upstream:
-        - fct_sales
-        - dim_dates
-
     implementation:  # optional – hints for AI code generation
       materialization: incremental  # table | view | incremental | ephemeral
       incremental_strategy: merge   # merge | append | delete+insert
@@ -168,12 +164,23 @@ tables:
           type: "BIGINT"
           constraints: [NOT NULL]
 
-    sampleData:  # 2D array; first row = column IDs
-      - [order_id, amount, status]
+    sampleData:  # 2D array of realistic values
       - [1001, 50.0, "COMPLETED"]
       - [1002, 120.5, "PENDING"]
 ```
 
+### Data Lineage
+
+Top-level `lineage` section declares data flow between tables (which source tables feed which derived tables). This is rendered as dashed arrows in **Lineage Mode**.
+
+```yaml
+lineage:
+  - from: fct_orders    # source table ID
+    to: mart_revenue    # derived table ID
+  - from: dim_dates
+    to: mart_revenue
+```
+
 ### Relationships
 
 ```yaml
@@ -187,7 +194,7 @@ relationships:
     type: one-to-many  # one-to-one | one-to-many | many-to-one | many-to-many
 ```
 
-> **Data Lineage** connections are driven by `lineage.upstream` and rendered as animated arrows in Lineage Mode. Do **not** duplicate them as `relationships` entries.
+> **ER Relationships** vs **Lineage**: Use `relationships` for structural joins (FKs) and `lineage` for data flow (transformations). Do not duplicate them.
 
 ### Annotations
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modscape",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Modscape: A YAML-driven data modeling visualizer CLI",
   "repository": {
     "type": "git",
@@ -29,6 +29,7 @@
     "@inquirer/prompts": "^8.3.0",
     "chokidar": "^5.0.0",
     "commander": "^14.0.3",
+    "dagre": "^0.8.5",
     "express": "^5.2.1",
     "js-yaml": "^4.1.1",
     "open": "^11.0.0",

package/src/index.js

@@ -10,6 +10,7 @@ import { exportModel } from './export.js';
 import { createModel } from './create.js';
 import { importDbt } from './import-dbt.js';
 import { syncDbt } from './sync-dbt.js';
+import { applyLayout } from './layout.js';
 import { createRequire } from 'module';
   import { mergeModels } from './merge.js';
   
@@ -104,4 +105,13 @@ program
     mergeModels(paths, options);
   });
 
+program
+  .command('layout')
+  .description('Perform automatic layout calculation and update the YAML file')
+  .argument('<path>', 'path to the YAML model file')
+  .option('-o, --output <path>', 'output file path (defaults to overwriting input)')
+  .action((path, options) => {
+    applyLayout(path, options);
+  });
+
 program.parse();

package/src/layout.js

@@ -0,0 +1,151 @@
+import fs from 'fs';
+import path from 'path';
+import yaml from 'js-yaml';
+import dagre from 'dagre';
+
+/**
+ * CLI-based layout engine for Modscape.
+ * Replicates the logic from the visualizer to ensure consistency.
+ */
+export function applyLayout(inputPath, options = {}) {
+  const absolutePath = path.resolve(process.cwd(), inputPath);
+  if (!fs.existsSync(absolutePath)) {
+    console.error(`  ❌ File not found: ${inputPath}`);
+    return;
+  }
+
+  const raw = fs.readFileSync(absolutePath, 'utf8');
+  let schema;
+  try {
+    schema = yaml.load(raw);
+  } catch (e) {
+    console.error(`  ❌ Failed to parse YAML: ${e.message}`);
+    return;
+  }
+
+  if (!schema || !schema.tables) {
+    console.error('  ❌ Invalid schema: No tables found.');
+    return;
+  }
+
+  console.log(`  🏗️  Calculating layout for ${schema.tables.length} tables...`);
+
+  // Initialize Dagre Graph
+  const g = new dagre.graphlib.Graph({ compound: true });
+  g.setGraph({
+    rankdir: 'LR',
+    nodesep: 80,
+    ranksep: 200,
+    marginx: 80,
+    marginy: 80,
+  });
+  g.setDefaultEdgeLabel(() => ({}));
+
+  // 1. Add Tables
+  schema.tables.forEach((table) => {
+    // Standard table size in canvas units
+    g.setNode(table.id, { width: 280, height: 160 });
+  });
+
+  // 2. Add Lineage Edges
+  if (schema.lineage) {
+    schema.lineage.forEach((edge) => {
+      if (g.hasNode(edge.from) && g.hasNode(edge.to)) {
+        g.setEdge(edge.from, edge.to);
+      }
+    });
+  }
+
+  // 3. Add ER Relationships
+  if (schema.relationships) {
+    schema.relationships.forEach((rel) => {
+      if (g.hasNode(rel.from.table) && g.hasNode(rel.to.table)) {
+        g.setEdge(rel.from.table, rel.to.table);
+      }
+    });
+  }
+
+  // 4. Setup Domains
+  const domainTableMap = new Map();
+  if (schema.domains) {
+    schema.domains.forEach((domain) => {
+      g.setNode(domain.id, { label: domain.name, cluster: true });
+      domain.tables.forEach((tableId) => {
+        if (g.hasNode(tableId)) {
+          g.setParent(tableId, domain.id);
+        }
+      });
+      domainTableMap.set(domain.id, domain.tables);
+    });
+  }
+
+  // Execute Layout Calculation
+  dagre.layout(g);
+
+  // 5. Post-process: Convert Dagre results to Modscape Layout format
+  const newLayout = {};
+  const PAD = 48;
+  const TABLE_W = 280;
+  const TABLE_H = 160; // Default height for layout estimation
+  const GAP = 40;
+
+  // Process Domains (Grid packing)
+  if (schema.domains) {
+    schema.domains.forEach(domain => {
+      const members = domain.tables.filter(tid => g.hasNode(tid));
+      if (members.length === 0) return;
+
+      // Sort by dagre rank (left -> right)
+      members.sort((a, b) => g.node(a).x - g.node(b).x);
+
+      const cols = Math.min(3, Math.ceil(Math.sqrt(members.length)));
+      const rowCount = Math.ceil(members.length / cols);
+
+      const gridW = cols * (TABLE_W + GAP) - GAP;
+      const gridH = rowCount * (TABLE_H + GAP) - GAP;
+
+      // Anchor grid to dagre centroid
+      const cx = members.reduce((s, tid) => s + g.node(tid).x, 0) / members.length;
+      const cy = members.reduce((s, tid) => s + g.node(tid).y, 0) / members.length;
+      const originX = cx - gridW / 2;
+      const originY = cy - gridH / 2;
+
+      members.forEach((tid, idx) => {
+        const col = idx % cols;
+        const row = Math.floor(idx / cols);
+        const xOff = col * (TABLE_W + GAP) + TABLE_W / 2;
+        const yOff = row * (TABLE_H + GAP) + TABLE_H / 2;
+        newLayout[tid] = {
+          x: Math.round(originX + xOff),
+          y: Math.round(originY + yOff),
+          parentId: domain.id
+        };
+      });
+
+      // Domain bounding box
+      const HEADER = 28;
+      newLayout[domain.id] = {
+        x: Math.round(originX - PAD),
+        y: Math.round(originY - PAD - HEADER),
+        width: Math.round(gridW + PAD * 2),
+        height: Math.round(gridH + PAD * 2 + HEADER)
+      };
+    });
+  }
+
+  // Standalone Tables
+  const domainTableIds = new Set(schema.domains?.flatMap(d => d.tables) ?? []);
+  schema.tables.forEach(t => {
+    if (!domainTableIds.has(t.id)) {
+      const pos = g.node(t.id);
+      newLayout[t.id] = { x: Math.round(pos.x), y: Math.round(pos.y) };
+    }
+  });
+
+  // 6. Save back to YAML
+  schema.layout = newLayout;
+  const outputPath = options.output ? path.resolve(process.cwd(), options.output) : absolutePath;
+  
+  fs.writeFileSync(outputPath, yaml.dump(schema, { indent: 2, lineWidth: -1, noRefs: true }), 'utf8');
+  console.log(`  ✅ Layout complete! Saved to: ${path.relative(process.cwd(), outputPath)}`);
+}

package/visualizer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "visualizer",
   "private": true,
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",