callman-core 1.29.0 → 1.31.0
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/ai/prompts/diagram.d.ts.map +1 -1
- package/dist/ai/prompts/diagram.js +24 -7
- package/dist/ai/prompts/diagram.js.map +1 -1
- package/dist/ai/types.d.ts +1 -1
- package/dist/ai/types.d.ts.map +1 -1
- package/dist/diagram/componentCatalog.d.ts +3 -0
- package/dist/diagram/componentCatalog.d.ts.map +1 -1
- package/dist/diagram/componentCatalog.js +5 -1
- package/dist/diagram/componentCatalog.js.map +1 -1
- package/dist/diagram/database/derive.d.ts +14 -0
- package/dist/diagram/database/derive.d.ts.map +1 -0
- package/dist/diagram/database/derive.js +114 -0
- package/dist/diagram/database/derive.js.map +1 -0
- package/dist/diagram/database/diff.d.ts +48 -0
- package/dist/diagram/database/diff.d.ts.map +1 -0
- package/dist/diagram/database/diff.js +109 -0
- package/dist/diagram/database/diff.js.map +1 -0
- package/dist/diagram/database/edit.d.ts +113 -0
- package/dist/diagram/database/edit.d.ts.map +1 -0
- package/dist/diagram/database/edit.js +359 -0
- package/dist/diagram/database/edit.js.map +1 -0
- package/dist/diagram/database/fromSchema.d.ts +12 -0
- package/dist/diagram/database/fromSchema.d.ts.map +1 -0
- package/dist/diagram/database/fromSchema.js +182 -0
- package/dist/diagram/database/fromSchema.js.map +1 -0
- package/dist/diagram/database/index.d.ts +9 -0
- package/dist/diagram/database/index.d.ts.map +1 -0
- package/dist/diagram/database/index.js +14 -0
- package/dist/diagram/database/index.js.map +1 -0
- package/dist/diagram/database/model.d.ts +93 -0
- package/dist/diagram/database/model.d.ts.map +1 -0
- package/dist/diagram/database/model.js +294 -0
- package/dist/diagram/database/model.js.map +1 -0
- package/dist/diagram/database/patch.d.ts +14 -0
- package/dist/diagram/database/patch.d.ts.map +1 -0
- package/dist/diagram/database/patch.js +186 -0
- package/dist/diagram/database/patch.js.map +1 -0
- package/dist/diagram/database/place.d.ts +4 -0
- package/dist/diagram/database/place.d.ts.map +1 -0
- package/dist/diagram/database/place.js +22 -0
- package/dist/diagram/database/place.js.map +1 -0
- package/dist/diagram/database/types.d.ts +50 -0
- package/dist/diagram/database/types.d.ts.map +1 -0
- package/dist/diagram/database/types.js +106 -0
- package/dist/diagram/database/types.js.map +1 -0
- package/dist/diagram/index.d.ts +1 -0
- package/dist/diagram/index.d.ts.map +1 -1
- package/dist/diagram/index.js +1 -0
- package/dist/diagram/index.js.map +1 -1
- package/dist/diagram/layout.d.ts +1 -0
- package/dist/diagram/layout.d.ts.map +1 -1
- package/dist/diagram/layout.js +2 -1
- package/dist/diagram/layout.js.map +1 -1
- package/dist/diagram/ops.d.ts +1 -1
- package/dist/diagram/ops.d.ts.map +1 -1
- package/dist/diagram/ops.js +42 -0
- package/dist/diagram/ops.js.map +1 -1
- package/dist/diagram/opsReference.d.ts +1 -1
- package/dist/diagram/opsReference.d.ts.map +1 -1
- package/dist/diagram/opsReference.js +9 -0
- package/dist/diagram/opsReference.js.map +1 -1
- package/dist/diagram/patchInput.d.ts +65 -1
- package/dist/diagram/patchInput.d.ts.map +1 -1
- package/dist/diagram/patchInput.js +414 -11
- package/dist/diagram/patchInput.js.map +1 -1
- package/dist/diagram/schema.d.ts +2 -2
- package/dist/diagram/schema.d.ts.map +1 -1
- package/dist/diagram/schema.js +3 -3
- package/dist/diagram/schema.js.map +1 -1
- package/dist/diagram/views.d.ts +13 -0
- package/dist/diagram/views.d.ts.map +1 -1
- package/dist/diagram/views.js +49 -0
- package/dist/diagram/views.js.map +1 -1
- package/dist/host/db/introspection/index.d.ts +9 -0
- package/dist/host/db/introspection/index.d.ts.map +1 -0
- package/dist/host/db/introspection/index.js +35 -0
- package/dist/host/db/introspection/index.js.map +1 -0
- package/dist/host/db/introspection/mongo.d.ts +7 -0
- package/dist/host/db/introspection/mongo.d.ts.map +1 -0
- package/dist/host/db/introspection/mongo.js +183 -0
- package/dist/host/db/introspection/mongo.js.map +1 -0
- package/dist/host/db/introspection/mssql.d.ts +6 -0
- package/dist/host/db/introspection/mssql.d.ts.map +1 -0
- package/dist/host/db/introspection/mssql.js +211 -0
- package/dist/host/db/introspection/mssql.js.map +1 -0
- package/dist/host/db/introspection/mysql.d.ts +5 -0
- package/dist/host/db/introspection/mysql.d.ts.map +1 -0
- package/dist/host/db/introspection/mysql.js +163 -0
- package/dist/host/db/introspection/mysql.js.map +1 -0
- package/dist/host/db/introspection/oracle.d.ts +12 -0
- package/dist/host/db/introspection/oracle.d.ts.map +1 -0
- package/dist/host/db/introspection/oracle.js +225 -0
- package/dist/host/db/introspection/oracle.js.map +1 -0
- package/dist/host/db/introspection/postgres.d.ts +5 -0
- package/dist/host/db/introspection/postgres.d.ts.map +1 -0
- package/dist/host/db/introspection/postgres.js +172 -0
- package/dist/host/db/introspection/postgres.js.map +1 -0
- package/dist/host/db/introspection/shared.d.ts +29 -0
- package/dist/host/db/introspection/shared.d.ts.map +1 -0
- package/dist/host/db/introspection/shared.js +119 -0
- package/dist/host/db/introspection/shared.js.map +1 -0
- package/dist/host/db/introspection/types.d.ts +58 -0
- package/dist/host/db/introspection/types.d.ts.map +1 -0
- package/dist/host/db/introspection/types.js +6 -0
- package/dist/host/db/introspection/types.js.map +1 -0
- package/dist/host/db/mongoAdapter.d.ts +1 -0
- package/dist/host/db/mongoAdapter.d.ts.map +1 -1
- package/dist/host/db/mongoAdapter.js +13 -0
- package/dist/host/db/mongoAdapter.js.map +1 -1
- package/dist/host/db/mssqlAdapter.d.ts +1 -0
- package/dist/host/db/mssqlAdapter.d.ts.map +1 -1
- package/dist/host/db/mssqlAdapter.js +3 -1
- package/dist/host/db/mssqlAdapter.js.map +1 -1
- package/dist/host/db/mysqlAdapter.d.ts +1 -0
- package/dist/host/db/mysqlAdapter.d.ts.map +1 -1
- package/dist/host/db/mysqlAdapter.js +11 -0
- package/dist/host/db/mysqlAdapter.js.map +1 -1
- package/dist/host/db/oracleAdapter.d.ts +1 -0
- package/dist/host/db/oracleAdapter.d.ts.map +1 -1
- package/dist/host/db/oracleAdapter.js +22 -0
- package/dist/host/db/oracleAdapter.js.map +1 -1
- package/dist/host/db/postgresAdapter.d.ts +1 -0
- package/dist/host/db/postgresAdapter.d.ts.map +1 -1
- package/dist/host/db/postgresAdapter.js +13 -0
- package/dist/host/db/postgresAdapter.js.map +1 -1
- package/dist/host/db/queryExecutor.d.ts +2 -1
- package/dist/host/db/queryExecutor.d.ts.map +1 -1
- package/dist/host/db/queryExecutor.js +1 -1
- package/dist/host/db/queryExecutor.js.map +1 -1
- package/dist/host/index.d.ts +7 -0
- package/dist/host/index.d.ts.map +1 -1
- package/dist/host/index.js +9 -0
- package/dist/host/index.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/ui-test/commands.d.ts +54 -0
- package/dist/ui-test/commands.d.ts.map +1 -0
- package/dist/ui-test/commands.js +436 -0
- package/dist/ui-test/commands.js.map +1 -0
- package/dist/ui-test/flow-lint.d.ts +43 -0
- package/dist/ui-test/flow-lint.d.ts.map +1 -0
- package/dist/ui-test/flow-lint.js +229 -0
- package/dist/ui-test/flow-lint.js.map +1 -0
- package/dist-cjs/ai/prompts/diagram.js +23 -6
- package/dist-cjs/ai/prompts/diagram.js.map +1 -1
- package/dist-cjs/diagram/componentCatalog.js +5 -1
- package/dist-cjs/diagram/componentCatalog.js.map +1 -1
- package/dist-cjs/diagram/database/derive.js +119 -0
- package/dist-cjs/diagram/database/derive.js.map +1 -0
- package/dist-cjs/diagram/database/diff.js +115 -0
- package/dist-cjs/diagram/database/diff.js.map +1 -0
- package/dist-cjs/diagram/database/edit.js +366 -0
- package/dist-cjs/diagram/database/edit.js.map +1 -0
- package/dist-cjs/diagram/database/fromSchema.js +188 -0
- package/dist-cjs/diagram/database/fromSchema.js.map +1 -0
- package/dist-cjs/diagram/database/index.js +32 -0
- package/dist-cjs/diagram/database/index.js.map +1 -0
- package/dist-cjs/diagram/database/model.js +311 -0
- package/dist-cjs/diagram/database/model.js.map +1 -0
- package/dist-cjs/diagram/database/patch.js +190 -0
- package/dist-cjs/diagram/database/patch.js.map +1 -0
- package/dist-cjs/diagram/database/place.js +26 -0
- package/dist-cjs/diagram/database/place.js.map +1 -0
- package/dist-cjs/diagram/database/types.js +122 -0
- package/dist-cjs/diagram/database/types.js.map +1 -0
- package/dist-cjs/diagram/index.js +1 -0
- package/dist-cjs/diagram/index.js.map +1 -1
- package/dist-cjs/diagram/layout.js +3 -2
- package/dist-cjs/diagram/layout.js.map +1 -1
- package/dist-cjs/diagram/ops.js +42 -0
- package/dist-cjs/diagram/ops.js.map +1 -1
- package/dist-cjs/diagram/opsReference.js +9 -0
- package/dist-cjs/diagram/opsReference.js.map +1 -1
- package/dist-cjs/diagram/patchInput.js +414 -11
- package/dist-cjs/diagram/patchInput.js.map +1 -1
- package/dist-cjs/diagram/schema.js +3 -3
- package/dist-cjs/diagram/schema.js.map +1 -1
- package/dist-cjs/diagram/views.js +51 -1
- package/dist-cjs/diagram/views.js.map +1 -1
- package/dist-cjs/host/db/introspection/index.js +59 -0
- package/dist-cjs/host/db/introspection/index.js.map +1 -0
- package/dist-cjs/host/db/introspection/mongo.js +189 -0
- package/dist-cjs/host/db/introspection/mongo.js.map +1 -0
- package/dist-cjs/host/db/introspection/mssql.js +216 -0
- package/dist-cjs/host/db/introspection/mssql.js.map +1 -0
- package/dist-cjs/host/db/introspection/mysql.js +167 -0
- package/dist-cjs/host/db/introspection/mysql.js.map +1 -0
- package/dist-cjs/host/db/introspection/oracle.js +230 -0
- package/dist-cjs/host/db/introspection/oracle.js.map +1 -0
- package/dist-cjs/host/db/introspection/postgres.js +176 -0
- package/dist-cjs/host/db/introspection/postgres.js.map +1 -0
- package/dist-cjs/host/db/introspection/shared.js +133 -0
- package/dist-cjs/host/db/introspection/shared.js.map +1 -0
- package/dist-cjs/host/db/introspection/types.js +7 -0
- package/dist-cjs/host/db/introspection/types.js.map +1 -0
- package/dist-cjs/host/db/mongoAdapter.js +15 -1
- package/dist-cjs/host/db/mongoAdapter.js.map +1 -1
- package/dist-cjs/host/db/mssqlAdapter.js +5 -2
- package/dist-cjs/host/db/mssqlAdapter.js.map +1 -1
- package/dist-cjs/host/db/mysqlAdapter.js +13 -1
- package/dist-cjs/host/db/mysqlAdapter.js.map +1 -1
- package/dist-cjs/host/db/oracleAdapter.js +24 -1
- package/dist-cjs/host/db/oracleAdapter.js.map +1 -1
- package/dist-cjs/host/db/postgresAdapter.js +15 -1
- package/dist-cjs/host/db/postgresAdapter.js.map +1 -1
- package/dist-cjs/host/db/queryExecutor.js +5 -4
- package/dist-cjs/host/db/queryExecutor.js.map +1 -1
- package/dist-cjs/host/index.js +24 -1
- package/dist-cjs/host/index.js.map +1 -1
- package/dist-cjs/index.js +2 -0
- package/dist-cjs/index.js.map +1 -1
- package/dist-cjs/ui-test/commands.js +441 -0
- package/dist-cjs/ui-test/commands.js.map +1 -0
- package/dist-cjs/ui-test/flow-lint.js +235 -0
- package/dist-cjs/ui-test/flow-lint.js.map +1 -0
- package/package.json +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram.d.ts","sourceRoot":"","sources":["../../../src/ai/prompts/diagram.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE1F,MAAM,WAAW,0BAA0B;IAGzC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IAGjC,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B;
|
|
1
|
+
{"version":3,"file":"diagram.d.ts","sourceRoot":"","sources":["../../../src/ai/prompts/diagram.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE1F,MAAM,WAAW,0BAA0B;IAGzC,UAAU,CAAC,EAAE,mBAAmB,CAAC;IAGjC,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B;AA6CD,eAAO,MAAM,wBAAwB,GAAI,UAAS,0BAA+B,KAAG,MAuGtE,CAAC;AAEf,eAAO,MAAM,sBAAsB,GAAI,0FASpC,kBAAkB,KAAG,MAsCvB,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
// (features/diagram-studio/model/schema.ts) — it is described here in prose so
|
|
7
7
|
// the model emits the right shape; the client runs the authoritative validator
|
|
8
8
|
// (safeParseDiagramDocument) before applying anything to the canvas.
|
|
9
|
-
import { diagramGraphView } from "../../diagram/views.js";
|
|
9
|
+
import { databaseSchemaView, diagramGraphView } from "../../diagram/views.js";
|
|
10
10
|
import { renderDiagramOpsReference } from "../../diagram/opsReference.js";
|
|
11
11
|
const BPMN_SECTION = () => [
|
|
12
12
|
"",
|
|
@@ -24,6 +24,20 @@ const BPMN_SECTION = () => [
|
|
|
24
24
|
" 100x80, gateways 50x50, a 60px gap, one row per branch) — the app writes the BPMN XML.",
|
|
25
25
|
"- EDIT mode: emit ops; new nodes need no position (the app places them after their predecessor).",
|
|
26
26
|
];
|
|
27
|
+
const DATABASE_SECTION = () => [
|
|
28
|
+
"",
|
|
29
|
+
"THIS IS A DATABASE DIAGRAM (an entity-relationship diagram of a database schema, not an architecture diagram):",
|
|
30
|
+
"- Node `type` MUST be db.table, db.view or db.collection (MongoDB). Never use catalog types here.",
|
|
31
|
+
"- CREATE mode: each node's `label` is the table name and `data.db` holds the schema facts:",
|
|
32
|
+
' {"db": {"schema"?: "public", "columns": [{"name": "id", "dataType": "uuid", "primaryKey": true}, {"name": "email", "dataType": "varchar(255)", "unique": true}, {"name": "created_at", "dataType": "timestamp", "nullable": false}], "comment"?: "…"}}.',
|
|
33
|
+
" Use the database's own type names. Mark primary keys, unique columns, nullable columns, defaults and foreign-key columns (name them <parent>_id).",
|
|
34
|
+
"- Edges are RELATIONSHIPS: `source` is the child (foreign-key) table, `target` the parent; `data.db` names the columns and the cardinality:",
|
|
35
|
+
' {"db": {"sourceColumns": ["user_id"], "targetColumns": ["id"], "cardinality": "N:1"}} (also "1:1", "1:N", "N:M"). No markers/routing needed.',
|
|
36
|
+
"- Sizes/positions are optional (the app sizes tables from their columns and lays the diagram out).",
|
|
37
|
+
"- EDIT mode: use the DATABASE OPS (addTable, addColumn, alterColumn, addRelationship, …) — they edit the schema by meaning.",
|
|
38
|
+
" The CURRENT DIAGRAM block is the schema view: tables with columns and keys, relationships as table.column pairs, hidden tables.",
|
|
39
|
+
"- Model what a real database of this domain has: keys, timestamps, status columns, junction tables for N:M, sensible types.",
|
|
40
|
+
];
|
|
27
41
|
const EDIT_AS_OPS_SECTION = (kind) => [
|
|
28
42
|
"",
|
|
29
43
|
"EDIT MODE OUTPUT (this session): do NOT re-emit the document. Respond with",
|
|
@@ -32,7 +46,7 @@ const EDIT_AS_OPS_SECTION = (kind) => [
|
|
|
32
46
|
"without geometry — positions are the app's business. CREATE mode is unchanged: emit the",
|
|
33
47
|
"whole document under `diagram` and leave `ops` null.",
|
|
34
48
|
"",
|
|
35
|
-
renderDiagramOpsReference(kind === "bpmn" ? "bpmn" : "canvas"),
|
|
49
|
+
renderDiagramOpsReference(kind === "bpmn" ? "bpmn" : kind === "database" ? "database" : "canvas"),
|
|
36
50
|
];
|
|
37
51
|
export const buildDiagramSystemPrompt = (options = {}) => [
|
|
38
52
|
"You are a STAFF-level software/systems architect and domain expert embedded in a visual",
|
|
@@ -134,6 +148,7 @@ export const buildDiagramSystemPrompt = (options = {}) => [
|
|
|
134
148
|
" try to hand-pack children into a box; let the layout do it.",
|
|
135
149
|
"- Edges may connect a child to a node outside its container, or to the container itself.",
|
|
136
150
|
...(options.diagramKind === "bpmn" ? BPMN_SECTION() : []),
|
|
151
|
+
...(options.diagramKind === "database" ? DATABASE_SECTION() : []),
|
|
137
152
|
...(options.editOutput === "ops" ? EDIT_AS_OPS_SECTION(options.diagramKind) : []),
|
|
138
153
|
].join("\n");
|
|
139
154
|
export const buildDiagramUserPrompt = ({ instruction, mode, document, components = [], selection = [], canvas, editOutput, diagramKind, }) => {
|
|
@@ -143,22 +158,24 @@ export const buildDiagramUserPrompt = ({ instruction, mode, document, components
|
|
|
143
158
|
// Ops mode: the model sees the graph (ids, types, labels, containers,
|
|
144
159
|
// connections) and never the geometry — ~70% smaller and nothing to scramble.
|
|
145
160
|
const documentBlock = mode === "edit" && document
|
|
146
|
-
?
|
|
147
|
-
? JSON.stringify(
|
|
148
|
-
:
|
|
161
|
+
? diagramKind === "database"
|
|
162
|
+
? JSON.stringify(databaseSchemaView(document))
|
|
163
|
+
: editOutput === "ops"
|
|
164
|
+
? JSON.stringify(diagramGraphView(document))
|
|
165
|
+
: JSON.stringify(document)
|
|
149
166
|
: "(none — creating a new diagram)";
|
|
150
167
|
const canvasLine = canvas && (canvas.width || canvas.height)
|
|
151
168
|
? `CANVAS SIZE: ${Math.round(canvas.width ?? 0)} x ${Math.round(canvas.height ?? 0)}`
|
|
152
169
|
: null;
|
|
153
170
|
return [
|
|
154
171
|
`MODE: ${mode}`,
|
|
155
|
-
diagramKind === "bpmn" ? "DIAGRAM KIND: bpmn (BPMN 2.0 process; use bpmn.* types only)" : null,
|
|
172
|
+
diagramKind === "bpmn" ? "DIAGRAM KIND: bpmn (BPMN 2.0 process; use bpmn.* types only)" : diagramKind === "database" ? "DIAGRAM KIND: database (entity-relationship diagram; db.table / db.view / db.collection with data.db columns; relationships as edges)" : null,
|
|
156
173
|
canvasLine,
|
|
157
174
|
"",
|
|
158
175
|
"AVAILABLE COMPONENT TYPES (type — label (category)):",
|
|
159
176
|
componentLines,
|
|
160
177
|
"",
|
|
161
|
-
editOutput === "ops" ? "CURRENT DIAGRAM (edit mode; graph view — ids, types, labels, containers, connections):" : "CURRENT DIAGRAM (edit mode; full document JSON):",
|
|
178
|
+
diagramKind === "database" ? "CURRENT DIAGRAM (edit mode; schema view — tables, columns, keys, relationships, hidden tables):" : editOutput === "ops" ? "CURRENT DIAGRAM (edit mode; graph view — ids, types, labels, containers, connections):" : "CURRENT DIAGRAM (edit mode; full document JSON):",
|
|
162
179
|
documentBlock,
|
|
163
180
|
"",
|
|
164
181
|
`SELECTED CELL IDS: ${selection.length ? selection.join(", ") : "(none)"}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram.js","sourceRoot":"","sources":["../../../src/ai/prompts/diagram.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gFAAgF;AAChF,6EAA6E;AAC7E,EAAE;AACF,6DAA6D;AAC7D,+EAA+E;AAC/E,+EAA+E;AAC/E,qEAAqE;AAErE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"diagram.js","sourceRoot":"","sources":["../../../src/ai/prompts/diagram.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gFAAgF;AAChF,6EAA6E;AAC7E,EAAE;AACF,6DAA6D;AAC7D,+EAA+E;AAC/E,+EAA+E;AAC/E,qEAAqE;AAErE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAa1E,MAAM,YAAY,GAAG,GAAa,EAAE,CAAC;IACnC,EAAE;IACF,mEAAmE;IACnE,yGAAyG;IACzG,2GAA2G;IAC3G,2GAA2G;IAC3G,8GAA8G;IAC9G,iGAAiG;IACjG,+FAA+F;IAC/F,iHAAiH;IACjH,0GAA0G;IAC1G,6GAA6G;IAC7G,yGAAyG;IACzG,0FAA0F;IAC1F,kGAAkG;CACnG,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAa,EAAE,CAAC;IACvC,EAAE;IACF,gHAAgH;IAChH,mGAAmG;IACnG,4FAA4F;IAC5F,2PAA2P;IAC3P,qJAAqJ;IACrJ,6IAA6I;IAC7I,gJAAgJ;IAChJ,oGAAoG;IACpG,6HAA6H;IAC7H,mIAAmI;IACnI,6HAA6H;CAC9H,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,IAA+B,EAAY,EAAE,CAAC;IACzE,EAAE;IACF,4EAA4E;IAC5E,2FAA2F;IAC3F,+FAA+F;IAC/F,yFAAyF;IACzF,sDAAsD;IACtD,EAAE;IACF,yBAAyB,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;CAClG,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,UAAsC,EAAE,EAAU,EAAE,CAC3F;IACE,yFAAyF;IACzF,sFAAsF;IACtF,yFAAyF;IACzF,wFAAwF;IACxF,gEAAgE;IAChE,EAAE;IACF,OAAO,CAAC,UAAU,KAAK,KAAK;QAC1B,CAAC,CAAC,qFAAqF;QACvF,CAAC,CAAC,wDAAwD;IAC5D,EAAE;IACF,wBAAwB;IACxB,GAAG;IACH,uBAAuB;IACvB,kGAAkG;IAClG,kEAAkE;IAClE,eAAe;IACf,uFAAuF;IACvF,yFAAyF;IACzF,6CAA6C;IAC7C,kDAAkD;IAClD,uDAAuD;IACvD,kGAAkG;IAClG,8DAA8D;IAC9D,+FAA+F;IAC/F,gHAAgH;IAChH,iJAAiJ;IACjJ,qGAAqG;IACrG,QAAQ;IACR,sFAAsF;IACtF,OAAO;IACP,eAAe;IACf,mBAAmB;IACnB,8DAA8D;IAC9D,8DAA8D;IAC9D,8DAA8D;IAC9D,oFAAoF;IACpF,0EAA0E;IAC1E,MAAM;IACN,GAAG;IACH,EAAE;IACF,QAAQ;IACR,sFAAsF;IACtF,0FAA0F;IAC1F,qFAAqF;IACrF,oFAAoF;IACpF,4FAA4F;IAC5F,gGAAgG;IAChG,yFAAyF;IACzF,iGAAiG;IACjG,+FAA+F;IAC/F,iGAAiG;IACjG,+EAA+E;IAC/E,yFAAyF;IACzF,0FAA0F;IAC1F,iFAAiF;IACjF,sDAAsD;IACtD,0FAA0F;IAC1F,sFAAsF;IACtF,0EAA0E;IAC1E,0FAA0F;IAC1F,wFAAwF;IACxF,8FAA8F;IAC9F,2FAA2F;IAC3F,0FAA0F;IAC1F,qFAAqF;IACrF,2FAA2F;IAC3F,EAAE;IACF,kFAAkF;IAClF,2FAA2F;IAC3F,0FAA0F;IAC1F,8FAA8F;IAC9F,iGAAiG;IACjG,2FAA2F;IAC3F,2FAA2F;IAC3F,uCAAuC;IACvC,iGAAiG;IACjG,qFAAqF;IACrF,2FAA2F;IAC3F,4FAA4F;IAC5F,8FAA8F;IAC9F,0FAA0F;IAC1F,yFAAyF;IACzF,4FAA4F;IAC5F,qFAAqF;IACrF,sFAAsF;IACtF,0FAA0F;IAC1F,iGAAiG;IACjG,4EAA4E;IAC5E,EAAE;IACF,+CAA+C;IAC/C,mFAAmF;IACnF,yFAAyF;IACzF,+DAA+D;IAC/D,2FAA2F;IAC3F,6FAA6F;IAC7F,6FAA6F;IAC7F,+DAA+D;IAC/D,0FAA0F;IAC1F,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;CAClF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEf,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,EACrC,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,UAAU,GAAG,EAAE,EACf,SAAS,GAAG,EAAE,EACd,MAAM,EACN,UAAU,EACV,WAAW,GACQ,EAAU,EAAE;IAC/B,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM;QACtC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5E,CAAC,CAAC,sCAAsC,CAAC;IAE3C,sEAAsE;IACtE,8EAA8E;IAC9E,MAAM,aAAa,GACjB,IAAI,KAAK,MAAM,IAAI,QAAQ;QACzB,CAAC,CAAC,WAAW,KAAK,UAAU;YAC1B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,QAAsC,CAAC,CAAC;YAC5E,CAAC,CAAC,UAAU,KAAK,KAAK;gBACpB,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,QAAsC,CAAC,CAAC;gBAC1E,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC9B,CAAC,CAAC,iCAAiC,CAAC;IAExC,MAAM,UAAU,GACd,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC;QACvC,CAAC,CAAC,gBAAgB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE;QACrF,CAAC,CAAC,IAAI,CAAC;IAEX,OAAO;QACL,SAAS,IAAI,EAAE;QACf,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,8DAA8D,CAAC,CAAC,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,uIAAuI,CAAC,CAAC,CAAC,IAAI;QACrQ,UAAU;QACV,EAAE;QACF,sDAAsD;QACtD,cAAc;QACd,EAAE;QACF,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,iGAAiG,CAAC,CAAC,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,wFAAwF,CAAC,CAAC,CAAC,kDAAkD;QACrS,aAAa;QACb,EAAE;QACF,sBAAsB,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC1E,EAAE;QACF,gBAAgB,WAAW,EAAE;KAC9B;SACE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC;SAC/B,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC"}
|
package/dist/ai/types.d.ts
CHANGED
|
@@ -29,7 +29,7 @@ export interface DiagramComponentRef {
|
|
|
29
29
|
category: string;
|
|
30
30
|
}
|
|
31
31
|
export type AiDiagramEditOutput = "document" | "ops";
|
|
32
|
-
export type AiDiagramKind = "canvas" | "mermaid" | "bpmn";
|
|
32
|
+
export type AiDiagramKind = "canvas" | "mermaid" | "bpmn" | "database";
|
|
33
33
|
export interface DiagramPromptInput {
|
|
34
34
|
instruction: string;
|
|
35
35
|
mode: AiDiagramMode;
|
package/dist/ai/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/ai/types.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,gBAAgB,6DAA8D,CAAC;AAC5F,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAI9D,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE9C,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAKD,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/ai/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentCatalog.d.ts","sourceRoot":"","sources":["../../src/diagram/componentCatalog.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,wBAAwB,GAChC,SAAS,GACT,WAAW,GACX,KAAK,GACL,KAAK,GACL,YAAY,GACZ,UAAU,GACV,WAAW,GACX,UAAU,GACV,WAAW,GACX,QAAQ,GACR,MAAM,GACN,eAAe,GACf,KAAK,GACL,OAAO,GACP,KAAK,CAAC;AAEV,eAAO,MAAM,sBAAsB,EAAE,wBAAwB,EAgB5D,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,wBAAwB,EAAE,MAAM,CAgB5E,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AACpF,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAExE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,wBAAwB,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,OAAO,EAAE,uBAAuB,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,qBAAqB,CAAC;CACnC;AAED,eAAO,MAAM,yBAAyB,EAAE,SAAS,oBAAoB,EAAmC,CAAC;AAMzG,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,KAAG,oBAAoB,GAAG,SAA6B,CAAC;AAExG,eAAO,MAAM,2BAA2B,GAAI,MAAM,MAAM,KAAG,OAA2B,CAAC;AAEvF,eAAO,MAAM,2BAA2B,QAAO,MAAM,CAAC,wBAAwB,EAAE,oBAAoB,EAAE,CAKrG,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,OAAO,MAAM,KAAG,oBAAoB,EAM3E,CAAC;
|
|
1
|
+
{"version":3,"file":"componentCatalog.d.ts","sourceRoot":"","sources":["../../src/diagram/componentCatalog.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,wBAAwB,GAChC,SAAS,GACT,WAAW,GACX,KAAK,GACL,KAAK,GACL,YAAY,GACZ,UAAU,GACV,WAAW,GACX,UAAU,GACV,WAAW,GACX,QAAQ,GACR,MAAM,GACN,eAAe,GACf,KAAK,GACL,OAAO,GACP,KAAK,CAAC;AAEV,eAAO,MAAM,sBAAsB,EAAE,wBAAwB,EAgB5D,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,wBAAwB,EAAE,MAAM,CAgB5E,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AACpF,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;AAExE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,wBAAwB,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,OAAO,EAAE,uBAAuB,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,qBAAqB,CAAC;CACnC;AAED,eAAO,MAAM,yBAAyB,EAAE,SAAS,oBAAoB,EAAmC,CAAC;AAMzG,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,KAAG,oBAAoB,GAAG,SAA6B,CAAC;AAExG,eAAO,MAAM,2BAA2B,GAAI,MAAM,MAAM,KAAG,OAA2B,CAAC;AAEvF,eAAO,MAAM,2BAA2B,QAAO,MAAM,CAAC,wBAAwB,EAAE,oBAAoB,EAAE,CAKrG,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,OAAO,MAAM,KAAG,oBAAoB,EAM3E,CAAC;AAKF,eAAO,MAAM,sBAAsB,GAAI,KAAK;IAAE,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,KAAG,MAAM,EAY3H,CAAC"}
|
|
@@ -57,11 +57,15 @@ export const searchDiagramComponents = (query) => {
|
|
|
57
57
|
return DIAGRAM_COMPONENT_CATALOG.filter((entry) => [entry.label, entry.type, ...(entry.aliases ?? [])].join(" ").toLowerCase().includes(q));
|
|
58
58
|
};
|
|
59
59
|
// Unknown `type`s in a document (each reported once, in first-seen order).
|
|
60
|
+
// A source-backed diagram brings its own vocabulary: bpmn.* on a BPMN
|
|
61
|
+
// diagram, db.* on a database diagram (neither lives in the catalog).
|
|
60
62
|
export const validateComponentTypes = (doc) => {
|
|
61
63
|
const unknown = [];
|
|
62
64
|
const seen = new Set();
|
|
65
|
+
const format = doc.source?.format;
|
|
66
|
+
const ownVocabulary = (type) => (format === "bpmn" && type.startsWith("bpmn.")) || (format === "database" && (type === "db.table" || type === "db.view" || type === "db.collection"));
|
|
63
67
|
for (const node of doc.nodes) {
|
|
64
|
-
if (byType.has(node.type) || seen.has(node.type))
|
|
68
|
+
if (byType.has(node.type) || ownVocabulary(node.type) || seen.has(node.type))
|
|
65
69
|
continue;
|
|
66
70
|
seen.add(node.type);
|
|
67
71
|
unknown.push(node.type);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentCatalog.js","sourceRoot":"","sources":["../../src/diagram/componentCatalog.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,2EAA2E;AAC3E,8EAA8E;AAC9E,2EAA2E;AAC3E,6EAA6E;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAmB5E,MAAM,CAAC,MAAM,sBAAsB,GAA+B;IAChE,SAAS;IACT,WAAW;IACX,KAAK;IACL,KAAK;IACL,YAAY;IACZ,UAAU;IACV,WAAW;IACX,UAAU;IACV,WAAW;IACX,QAAQ;IACR,MAAM;IACN,eAAe;IACf,KAAK;IACL,OAAO;IACP,KAAK;CACN,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAA6C;IAC/E,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,WAAW;IACtB,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,UAAU,EAAE,cAAc;IAC1B,QAAQ,EAAE,WAAW;IACrB,SAAS,EAAE,WAAW;IACtB,QAAQ,EAAE,WAAW;IACrB,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE,gBAAgB;IACxB,IAAI,EAAE,iBAAiB;IACvB,aAAa,EAAE,eAAe;IAC9B,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,KAAK;CACX,CAAC;AAkBF,MAAM,CAAC,MAAM,yBAAyB,GAAoC,8BAA8B,CAAC;AAEzG,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,yBAAyB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAC9D,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAoC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAExG,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAEvF,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAA6D,EAAE;IACxG,MAAM,GAAG,GAAG,EAA8D,CAAC;IAC3E,KAAK,MAAM,QAAQ,IAAI,sBAAsB;QAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAClE,KAAK,MAAM,KAAK,IAAI,yBAAyB;QAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/E,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAa,EAA0B,EAAE;IAC/E,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,GAAG,yBAAyB,CAAC,CAAC;IAC9C,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAChD,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CACxF,CAAC;AACJ,CAAC,CAAC;AAEF,2EAA2E;AAC3E,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"componentCatalog.js","sourceRoot":"","sources":["../../src/diagram/componentCatalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { DiagramOp } from "../ops.js";
|
|
2
|
+
import type { DiagramDocument } from "../schema.js";
|
|
3
|
+
import { type DatabaseModel, type ParsedDatabaseModel } from "./model.js";
|
|
4
|
+
export interface ParsedDatabaseSource extends ParsedDatabaseModel {
|
|
5
|
+
}
|
|
6
|
+
export declare const parseDatabaseSource: (text: string) => ParsedDatabaseSource;
|
|
7
|
+
export interface DatabaseSyncResult {
|
|
8
|
+
ops: DiagramOp[];
|
|
9
|
+
addedNodeIds: string[];
|
|
10
|
+
removedNodeIds: string[];
|
|
11
|
+
unpositionedNodeIds: string[];
|
|
12
|
+
}
|
|
13
|
+
export declare const syncOpsFromDatabase: (doc: DiagramDocument, model: DatabaseModel) => DatabaseSyncResult;
|
|
14
|
+
//# sourceMappingURL=derive.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"derive.d.ts","sourceRoot":"","sources":["../../../src/diagram/database/derive.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAA4B,MAAM,cAAc,CAAC;AAC9E,OAAO,EAA2C,KAAK,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAGnH,MAAM,WAAW,oBAAqB,SAAQ,mBAAmB;CAAG;AAEpE,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,KAAG,oBAAgD,CAAC;AAEpG,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,SAAS,EAAE,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,mBAAmB,EAAE,MAAM,EAAE,CAAC;CAC/B;AAID,eAAO,MAAM,mBAAmB,GAAI,KAAK,eAAe,EAAE,OAAO,aAAa,KAAG,kBA+FhF,CAAC"}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
// Model → diagram: the nodes and edges a database model implies, as ops
|
|
2
|
+
// against the current document (mirror of bpmn/derive: what is missing is
|
|
3
|
+
// added, what is gone is removed, what changed is updated — positions are
|
|
4
|
+
// never touched except for brand-new tables, which the host lays out).
|
|
5
|
+
import { entityQualifiedName, parseDatabaseModel } from "./model.js";
|
|
6
|
+
import { databaseEntitySize, databaseNodeHeight, databaseTypeForKind, dbEdgeData, dbNodeData, isDatabaseType, markersForRelationship } from "./types.js";
|
|
7
|
+
export const parseDatabaseSource = (text) => parseDatabaseModel(text);
|
|
8
|
+
const sameJson = (a, b) => JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
|
|
9
|
+
export const syncOpsFromDatabase = (doc, model) => {
|
|
10
|
+
const ops = [];
|
|
11
|
+
const addedNodeIds = [];
|
|
12
|
+
const removedNodeIds = [];
|
|
13
|
+
const unpositionedNodeIds = [];
|
|
14
|
+
const existingNodes = new Map(doc.nodes.map((node) => [node.id, node]));
|
|
15
|
+
const existingEdges = new Map(doc.edges.map((edge) => [edge.id, edge]));
|
|
16
|
+
const wantedEntities = new Map(model.entities.map((entity) => [entity.id, entity]));
|
|
17
|
+
const wantedRelationships = new Map(model.relationships.map((relationship) => [relationship.id, relationship]));
|
|
18
|
+
// Edges of relationships that are gone (only the diagram's own database edges).
|
|
19
|
+
for (const edge of doc.edges) {
|
|
20
|
+
if (!wantedRelationships.has(edge.id) && dbEdgeData(edge.data))
|
|
21
|
+
ops.push({ op: "removeEdge", id: edge.id });
|
|
22
|
+
}
|
|
23
|
+
// Tables that are gone.
|
|
24
|
+
for (const node of doc.nodes) {
|
|
25
|
+
if (isDatabaseType(node.type) && !wantedEntities.has(node.id)) {
|
|
26
|
+
ops.push({ op: "removeNode", id: node.id, children: "lift" });
|
|
27
|
+
removedNodeIds.push(node.id);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
for (const entity of model.entities) {
|
|
31
|
+
const existing = existingNodes.get(entity.id);
|
|
32
|
+
const type = databaseTypeForKind(entity.kind);
|
|
33
|
+
const data = { name: entity.name, ...(entity.schema ? { schema: entity.schema } : {}), kind: entity.kind, columns: entity.columns.length };
|
|
34
|
+
const label = entityQualifiedName(entity);
|
|
35
|
+
if (!existing) {
|
|
36
|
+
const node = {
|
|
37
|
+
id: entity.id,
|
|
38
|
+
type,
|
|
39
|
+
position: { x: 0, y: 0 },
|
|
40
|
+
size: databaseEntitySize(entity),
|
|
41
|
+
label,
|
|
42
|
+
data: { db: data },
|
|
43
|
+
};
|
|
44
|
+
ops.push({ op: "addNode", node });
|
|
45
|
+
addedNodeIds.push(entity.id);
|
|
46
|
+
unpositionedNodeIds.push(entity.id);
|
|
47
|
+
continue;
|
|
48
|
+
}
|
|
49
|
+
const changes = {};
|
|
50
|
+
if (existing.type !== type)
|
|
51
|
+
changes.type = type;
|
|
52
|
+
if ((existing.label ?? null) !== label)
|
|
53
|
+
changes.label = label;
|
|
54
|
+
const previousData = dbNodeData(existing.data);
|
|
55
|
+
if (!sameJson(previousData, data) || existing.data?.db !== undefined && existing.data.db.columnInputs !== undefined)
|
|
56
|
+
changes.data = { db: data };
|
|
57
|
+
if (Object.keys(changes).length > 0)
|
|
58
|
+
ops.push({ op: "updateNode", id: entity.id, changes });
|
|
59
|
+
// Height follows the column count; the width is the user's (only widened
|
|
60
|
+
// when a new column no longer fits a never-resized box).
|
|
61
|
+
const previousCount = previousData?.columns ?? entity.columns.length;
|
|
62
|
+
if (previousCount !== entity.columns.length || !previousData) {
|
|
63
|
+
const auto = databaseEntitySize(entity, Boolean(existing.collapsed));
|
|
64
|
+
const height = databaseNodeHeight(entity.columns.length, Boolean(existing.collapsed));
|
|
65
|
+
const width = Math.max(existing.size.width, previousData ? 0 : auto.width);
|
|
66
|
+
if (Math.abs(height - existing.size.height) >= 0.5 || Math.abs(width - existing.size.width) >= 0.5) {
|
|
67
|
+
ops.push({ op: "resizeNode", id: entity.id, size: { width, height } });
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
for (const relationship of model.relationships) {
|
|
72
|
+
if (!wantedEntities.has(relationship.source.entityId) || !wantedEntities.has(relationship.target.entityId))
|
|
73
|
+
continue;
|
|
74
|
+
const existing = existingEdges.get(relationship.id);
|
|
75
|
+
const data = {
|
|
76
|
+
cardinality: relationship.cardinality,
|
|
77
|
+
kind: relationship.kind,
|
|
78
|
+
sourceColumns: [...relationship.source.columnIds],
|
|
79
|
+
targetColumns: [...relationship.target.columnIds],
|
|
80
|
+
...(relationship.name ? { name: relationship.name } : {}),
|
|
81
|
+
};
|
|
82
|
+
const markers = markersForRelationship(model, relationship);
|
|
83
|
+
if (!existing) {
|
|
84
|
+
const edge = {
|
|
85
|
+
id: relationship.id,
|
|
86
|
+
source: relationship.source.entityId,
|
|
87
|
+
target: relationship.target.entityId,
|
|
88
|
+
...(relationship.label ? { label: relationship.label } : {}),
|
|
89
|
+
markerStart: markers.markerStart,
|
|
90
|
+
markerEnd: markers.markerEnd,
|
|
91
|
+
data: { db: data },
|
|
92
|
+
};
|
|
93
|
+
ops.push({ op: "addEdge", edge });
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
const changes = {};
|
|
97
|
+
if (existing.source !== relationship.source.entityId)
|
|
98
|
+
changes.source = relationship.source.entityId;
|
|
99
|
+
if (existing.target !== relationship.target.entityId)
|
|
100
|
+
changes.target = relationship.target.entityId;
|
|
101
|
+
if ((relationship.label ?? null) !== (existing.label ?? null))
|
|
102
|
+
changes.label = relationship.label ?? null;
|
|
103
|
+
if ((existing.markerStart ?? null) !== markers.markerStart)
|
|
104
|
+
changes.markerStart = markers.markerStart;
|
|
105
|
+
if ((existing.markerEnd ?? null) !== markers.markerEnd)
|
|
106
|
+
changes.markerEnd = markers.markerEnd;
|
|
107
|
+
if (!sameJson(dbEdgeData(existing.data), data))
|
|
108
|
+
changes.data = { db: data };
|
|
109
|
+
if (Object.keys(changes).length > 0)
|
|
110
|
+
ops.push({ op: "updateEdge", id: relationship.id, changes });
|
|
111
|
+
}
|
|
112
|
+
return { ops, addedNodeIds, removedNodeIds, unpositionedNodeIds };
|
|
113
|
+
};
|
|
114
|
+
//# sourceMappingURL=derive.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"derive.js","sourceRoot":"","sources":["../../../src/diagram/database/derive.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { type ModelFromSchemaOptions } from "./fromSchema.js";
|
|
2
|
+
import type { DbSchema } from "../../host/db/introspection/types.js";
|
|
3
|
+
import { type DatabaseColumn, type DatabaseEntity, type DatabaseModel, type DatabaseRelationship } from "./model.js";
|
|
4
|
+
export interface DatabaseColumnChange {
|
|
5
|
+
columnId: string;
|
|
6
|
+
name: string;
|
|
7
|
+
before: DatabaseColumn;
|
|
8
|
+
after: DatabaseColumn;
|
|
9
|
+
fields: string[];
|
|
10
|
+
}
|
|
11
|
+
export interface DatabaseEntityChange {
|
|
12
|
+
entityId: string;
|
|
13
|
+
name: string;
|
|
14
|
+
addedColumns: DatabaseColumn[];
|
|
15
|
+
removedColumns: DatabaseColumn[];
|
|
16
|
+
changedColumns: DatabaseColumnChange[];
|
|
17
|
+
kindChanged?: {
|
|
18
|
+
before: string;
|
|
19
|
+
after: string;
|
|
20
|
+
};
|
|
21
|
+
commentChanged?: {
|
|
22
|
+
before?: string;
|
|
23
|
+
after?: string;
|
|
24
|
+
};
|
|
25
|
+
primaryKeyChanged?: {
|
|
26
|
+
before: string[];
|
|
27
|
+
after: string[];
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
export interface DatabaseDiff {
|
|
31
|
+
addedEntities: DatabaseEntity[];
|
|
32
|
+
removedEntities: DatabaseEntity[];
|
|
33
|
+
changedEntities: DatabaseEntityChange[];
|
|
34
|
+
addedRelationships: DatabaseRelationship[];
|
|
35
|
+
removedRelationships: DatabaseRelationship[];
|
|
36
|
+
fresh: DatabaseModel;
|
|
37
|
+
isEmpty: boolean;
|
|
38
|
+
}
|
|
39
|
+
export declare const diffDatabaseModels: (current: DatabaseModel, freshInput: DatabaseModel) => DatabaseDiff;
|
|
40
|
+
export declare const diffDatabaseSchema: (current: DatabaseModel, schema: DbSchema, options?: Omit<ModelFromSchemaOptions, "previous">) => DatabaseDiff;
|
|
41
|
+
export interface DatabaseDiffSelection {
|
|
42
|
+
addEntities?: string[];
|
|
43
|
+
removeEntities?: string[];
|
|
44
|
+
updateEntities?: string[];
|
|
45
|
+
applyRelationships?: boolean;
|
|
46
|
+
}
|
|
47
|
+
export declare const applyDatabaseDiff: (current: DatabaseModel, diff: DatabaseDiff, selection?: DatabaseDiffSelection) => DatabaseModel;
|
|
48
|
+
//# sourceMappingURL=diff.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/diagram/database/diff.ts"],"names":[],"mappings":"AAMA,OAAO,EAA2B,KAAK,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACvF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAA2C,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAE9J,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,cAAc,EAAE,CAAC;IAC/B,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,cAAc,EAAE,oBAAoB,EAAE,CAAC;IACvC,WAAW,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,cAAc,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,iBAAiB,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC3D;AAED,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,cAAc,EAAE,CAAC;IAChC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,eAAe,EAAE,oBAAoB,EAAE,CAAC;IACxC,kBAAkB,EAAE,oBAAoB,EAAE,CAAC;IAC3C,oBAAoB,EAAE,oBAAoB,EAAE,CAAC;IAE7C,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB;AAaD,eAAO,MAAM,kBAAkB,GAAI,SAAS,aAAa,EAAE,YAAY,aAAa,KAAG,YAoCtF,CAAC;AAGF,eAAO,MAAM,kBAAkB,GAAI,SAAS,aAAa,EAAE,QAAQ,QAAQ,EAAE,UAAS,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAM,KAAG,YACrC,CAAC;AAElG,MAAM,WAAW,qBAAqB;IAEpC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAEvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAOD,eAAO,MAAM,iBAAiB,GAAI,SAAS,aAAa,EAAE,MAAM,YAAY,EAAE,YAAW,qBAA0B,KAAG,aAqCrH,CAAC"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
// Schema refresh: what changed between the diagram's model and a fresh
|
|
2
|
+
// introspection, and a new model that applies the changes the user accepted.
|
|
3
|
+
// Entities match by schema.table (case-insensitive), columns by name; ids of
|
|
4
|
+
// matched entities and columns are kept, so nothes and edges stay put.
|
|
5
|
+
// Manual relationships are never touched by a refresh.
|
|
6
|
+
import { databaseModelFromSchema } from "./fromSchema.js";
|
|
7
|
+
import { cloneDatabaseModel, entityQualifiedName } from "./model.js";
|
|
8
|
+
const lower = (value) => (value ?? "").toLowerCase();
|
|
9
|
+
const entityKey = (entity) => lower(entityQualifiedName(entity));
|
|
10
|
+
const COLUMN_FIELDS = ["dataType", "nullable", "primaryKey", "unique", "defaultValue", "autoIncrement", "comment"];
|
|
11
|
+
const columnFieldsDiffer = (a, b) => COLUMN_FIELDS.filter((field) => (a[field] ?? null) !== (b[field] ?? null) && !(field === "nullable" && Boolean(a.nullable) === Boolean(b.nullable)));
|
|
12
|
+
const relationshipKey = (relationship) => `${relationship.source.entityId}[${[...relationship.source.columnIds].sort().join(",")}]->${relationship.target.entityId}[${[...relationship.target.columnIds].sort().join(",")}]`;
|
|
13
|
+
export const diffDatabaseModels = (current, freshInput) => {
|
|
14
|
+
const fresh = cloneDatabaseModel(freshInput);
|
|
15
|
+
const currentByKey = new Map(current.entities.map((entity) => [entityKey(entity), entity]));
|
|
16
|
+
const freshByKey = new Map(fresh.entities.map((entity) => [entityKey(entity), entity]));
|
|
17
|
+
const addedEntities = fresh.entities.filter((entity) => !currentByKey.has(entityKey(entity)));
|
|
18
|
+
const removedEntities = current.entities.filter((entity) => !freshByKey.has(entityKey(entity)));
|
|
19
|
+
const changedEntities = [];
|
|
20
|
+
for (const entity of current.entities) {
|
|
21
|
+
const next = freshByKey.get(entityKey(entity));
|
|
22
|
+
if (!next)
|
|
23
|
+
continue;
|
|
24
|
+
const change = { entityId: entity.id, name: entityQualifiedName(entity), addedColumns: [], removedColumns: [], changedColumns: [] };
|
|
25
|
+
const nextByName = new Map(next.columns.map((column) => [lower(column.name), column]));
|
|
26
|
+
const currentByName = new Map(entity.columns.map((column) => [lower(column.name), column]));
|
|
27
|
+
for (const column of next.columns)
|
|
28
|
+
if (!currentByName.has(lower(column.name)))
|
|
29
|
+
change.addedColumns.push(column);
|
|
30
|
+
for (const column of entity.columns) {
|
|
31
|
+
const after = nextByName.get(lower(column.name));
|
|
32
|
+
if (!after) {
|
|
33
|
+
change.removedColumns.push(column);
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
const fields = columnFieldsDiffer(column, after);
|
|
37
|
+
if (fields.length > 0)
|
|
38
|
+
change.changedColumns.push({ columnId: column.id, name: column.name, before: column, after, fields });
|
|
39
|
+
}
|
|
40
|
+
if (entity.kind !== next.kind)
|
|
41
|
+
change.kindChanged = { before: entity.kind, after: next.kind };
|
|
42
|
+
if ((entity.comment ?? "") !== (next.comment ?? ""))
|
|
43
|
+
change.commentChanged = { before: entity.comment, after: next.comment };
|
|
44
|
+
const pkBefore = entity.columns.filter((column) => column.primaryKey).map((column) => column.name);
|
|
45
|
+
const pkAfter = next.columns.filter((column) => column.primaryKey).map((column) => column.name);
|
|
46
|
+
if (pkBefore.join(",") !== pkAfter.join(","))
|
|
47
|
+
change.primaryKeyChanged = { before: pkBefore, after: pkAfter };
|
|
48
|
+
if (change.addedColumns.length || change.removedColumns.length || change.changedColumns.length || change.kindChanged || change.commentChanged || change.primaryKeyChanged)
|
|
49
|
+
changedEntities.push(change);
|
|
50
|
+
}
|
|
51
|
+
const currentFkKeys = new Set(current.relationships.filter((relationship) => relationship.kind === "foreignKey").map(relationshipKey));
|
|
52
|
+
const freshFkKeys = new Set(fresh.relationships.filter((relationship) => relationship.kind === "foreignKey").map(relationshipKey));
|
|
53
|
+
const addedRelationships = fresh.relationships.filter((relationship) => relationship.kind === "foreignKey" && !currentFkKeys.has(relationshipKey(relationship)));
|
|
54
|
+
const removedRelationships = current.relationships.filter((relationship) => relationship.kind === "foreignKey" && !freshFkKeys.has(relationshipKey(relationship)));
|
|
55
|
+
const isEmpty = addedEntities.length === 0 && removedEntities.length === 0 && changedEntities.length === 0 && addedRelationships.length === 0 && removedRelationships.length === 0;
|
|
56
|
+
return { addedEntities, removedEntities, changedEntities, addedRelationships, removedRelationships, fresh, isEmpty };
|
|
57
|
+
};
|
|
58
|
+
// Introspection → fresh model aligned to the current ids → diff, in one call.
|
|
59
|
+
export const diffDatabaseSchema = (current, schema, options = {}) => diffDatabaseModels(current, databaseModelFromSchema(schema, { ...options, previous: current }));
|
|
60
|
+
const chosen = (ids, id) => ids === undefined || ids.includes(id);
|
|
61
|
+
// The current model with the accepted parts of the diff applied. Kept
|
|
62
|
+
// entities keep their ids and column ids (the diff's fresh model is already
|
|
63
|
+
// aligned); dropped entities take their relationships along.
|
|
64
|
+
export const applyDatabaseDiff = (current, diff, selection = {}) => {
|
|
65
|
+
const model = cloneDatabaseModel(current);
|
|
66
|
+
const freshByKey = new Map(diff.fresh.entities.map((entity) => [entityKey(entity), entity]));
|
|
67
|
+
const removedIds = new Set(diff.removedEntities.filter((entity) => chosen(selection.removeEntities, entity.id)).map((entity) => entity.id));
|
|
68
|
+
model.entities = model.entities.filter((entity) => !removedIds.has(entity.id));
|
|
69
|
+
for (const change of diff.changedEntities) {
|
|
70
|
+
if (!chosen(selection.updateEntities, change.entityId))
|
|
71
|
+
continue;
|
|
72
|
+
const index = model.entities.findIndex((entity) => entity.id === change.entityId);
|
|
73
|
+
const next = index >= 0 ? freshByKey.get(entityKey(model.entities[index])) : undefined;
|
|
74
|
+
if (index < 0 || !next)
|
|
75
|
+
continue;
|
|
76
|
+
model.entities[index] = { ...next, id: model.entities[index].id };
|
|
77
|
+
}
|
|
78
|
+
for (const entity of diff.addedEntities)
|
|
79
|
+
if (chosen(selection.addEntities, entity.id) && !model.entities.some((existing) => existing.id === entity.id))
|
|
80
|
+
model.entities.push(entity);
|
|
81
|
+
const entityIds = new Set(model.entities.map((entity) => entity.id));
|
|
82
|
+
if (selection.applyRelationships !== false) {
|
|
83
|
+
const removedKeys = new Set(diff.removedRelationships.map(relationshipKey));
|
|
84
|
+
model.relationships = model.relationships.filter((relationship) => relationship.kind === "manual" || !removedKeys.has(relationshipKey(relationship)));
|
|
85
|
+
for (const relationship of diff.addedRelationships) {
|
|
86
|
+
if (model.relationships.some((existing) => existing.id === relationship.id || relationshipKey(existing) === relationshipKey(relationship)))
|
|
87
|
+
continue;
|
|
88
|
+
model.relationships.push(relationship);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
// Ends must exist; columns must exist on their entity.
|
|
92
|
+
model.relationships = model.relationships
|
|
93
|
+
.filter((relationship) => entityIds.has(relationship.source.entityId) && entityIds.has(relationship.target.entityId))
|
|
94
|
+
.map((relationship) => {
|
|
95
|
+
const source = model.entities.find((entity) => entity.id === relationship.source.entityId);
|
|
96
|
+
const target = model.entities.find((entity) => entity.id === relationship.target.entityId);
|
|
97
|
+
return {
|
|
98
|
+
...relationship,
|
|
99
|
+
source: { entityId: source.id, columnIds: relationship.source.columnIds.filter((id) => source.columns.some((column) => column.id === id)) },
|
|
100
|
+
target: { entityId: target.id, columnIds: relationship.target.columnIds.filter((id) => target.columns.some((column) => column.id === id)) },
|
|
101
|
+
};
|
|
102
|
+
});
|
|
103
|
+
if (diff.fresh.connection)
|
|
104
|
+
model.connection = { ...model.connection, ...diff.fresh.connection };
|
|
105
|
+
if (diff.fresh.dialect)
|
|
106
|
+
model.dialect = diff.fresh.dialect;
|
|
107
|
+
return model;
|
|
108
|
+
};
|
|
109
|
+
//# sourceMappingURL=diff.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../src/diagram/database/diff.ts"],"names":[],"mappings":"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"}
|