Skip to content

Commit 265990d

Browse files
huydo862003huydo862003
committed
refactor: syncDep
1 parent 1c41bc6 commit 265990d

7 files changed

Lines changed: 172 additions & 199 deletions

File tree

‎packages/dbml-core/__tests__/examples/model_exporter/dbml_exporter/input/dep.in.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
{
3737
"schemaName": "public",
3838
"note": { "value": "Aggregate staging into facts" },
39-
"custom": { "materialized": "table", "owner": "data-team", "priority": 1 },
39+
"metadata": { "materialized": "table", "owner": "data-team", "priority": 1 },
4040
"edges": [
4141
{ "upstream": { "tableName": "stg_orders", "fieldNames": [] }, "downstream": { "tableName": "fct_orders", "fieldNames": [] } },
4242
{ "upstream": { "tableName": "stg_orders", "fieldNames": ["id"] }, "downstream": { "tableName": "fct_orders", "fieldNames": ["amount"] } }

‎packages/dbml-core/__tests__/examples/model_structure/dep.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"name": null,
2727
"schemaName": "public",
2828
"note": { "value": "Aggregate staging into facts" },
29-
"custom": { "materialized": "table", "owner": "data-team" },
29+
"metadata": { "materialized": "table", "owner": "data-team" },
3030
"edges": [
3131
{ "upstream": { "schemaName": null, "tableName": "stg_orders", "fieldNames": [] }, "downstream": { "schemaName": null, "tableName": "fct_orders", "fieldNames": [] } },
3232
{ "upstream": { "schemaName": null, "tableName": "stg_orders", "fieldNames": ["id"] }, "downstream": { "schemaName": null, "tableName": "fct_orders", "fieldNames": ["amount"] } }

‎packages/dbml-core/__tests__/examples/model_structure/dep.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('@dbml/core - Dep model', () => {
2828
test('no note, no custom', () => {
2929
const dep = database.schemas[0].deps[0];
3030
expect(dep.note).toBeNull();
31-
expect(dep.custom).toBeNull();
31+
expect(dep.metadata).toBeNull();
3232
});
3333
});
3434

@@ -45,7 +45,7 @@ describe('@dbml/core - Dep model', () => {
4545
test('note + custom carried correctly', () => {
4646
const dep = database.schemas[0].deps[1];
4747
expect(dep.note).toBe('Aggregate staging into facts');
48-
expect(dep.custom).toEqual({ materialized: 'table', owner: 'data-team' });
48+
expect(dep.metadata).toEqual({ materialized: 'table', owner: 'data-team' });
4949
});
5050
});
5151

@@ -123,12 +123,12 @@ describe('@dbml/core - Dep model', () => {
123123
expect(edge.downstream.fieldNames).toEqual(['id']);
124124
});
125125

126-
test('normalize preserves note + custom on the dep record', () => {
126+
test('normalize preserves note + metadata on the dep record', () => {
127127
const model = database.normalize();
128-
const depWithCustom = Object.values(model.deps).find((d: any) => d.custom) as any;
129-
expect(depWithCustom).toBeDefined();
130-
expect(depWithCustom.note).toBe('Aggregate staging into facts');
131-
expect(depWithCustom.custom).toEqual({ materialized: 'table', owner: 'data-team' });
128+
const depWithMetadata = Object.values(model.deps).find((d: any) => d.metadata) as any;
129+
expect(depWithMetadata).toBeDefined();
130+
expect(depWithMetadata.note).toBe('Aggregate staging into facts');
131+
expect(depWithMetadata.metadata).toEqual({ materialized: 'table', owner: 'data-team' });
132132
});
133133

134134
test('depEdge.depId points back to its parent dep', () => {

‎packages/dbml-core/__tests__/examples/normalized_model/dep_pipeline.out.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"id": 1,
128128
"name": null,
129129
"note": "Cast + rename: raw id → canonical user_id",
130-
"custom": null,
130+
"metadata": null,
131131
"edgeIds": [
132132
1
133133
],
@@ -137,7 +137,7 @@
137137
"id": 2,
138138
"name": null,
139139
"note": "Lowercase + validate email",
140-
"custom": null,
140+
"metadata": null,
141141
"edgeIds": [
142142
2
143143
],
@@ -147,7 +147,7 @@
147147
"id": 3,
148148
"name": null,
149149
"note": "Trim + normalize name",
150-
"custom": null,
150+
"metadata": null,
151151
"edgeIds": [
152152
3
153153
],
@@ -157,7 +157,7 @@
157157
"id": 4,
158158
"name": null,
159159
"note": "Parse timestamp (UTC)",
160-
"custom": null,
160+
"metadata": null,
161161
"edgeIds": [
162162
4
163163
],
@@ -167,7 +167,7 @@
167167
"id": 5,
168168
"name": null,
169169
"note": "Rename: id → order_id",
170-
"custom": null,
170+
"metadata": null,
171171
"edgeIds": [
172172
5
173173
],
@@ -177,7 +177,7 @@
177177
"id": 6,
178178
"name": null,
179179
"note": "Join key to users dimension",
180-
"custom": null,
180+
"metadata": null,
181181
"edgeIds": [
182182
6
183183
],
@@ -187,7 +187,7 @@
187187
"id": 7,
188188
"name": null,
189189
"note": "Parse + standardize order timestamp",
190-
"custom": null,
190+
"metadata": null,
191191
"edgeIds": [
192192
7
193193
],
@@ -197,7 +197,7 @@
197197
"id": 8,
198198
"name": null,
199199
"note": "Map raw status codes → business statuses",
200-
"custom": null,
200+
"metadata": null,
201201
"edgeIds": [
202202
8
203203
],
@@ -207,7 +207,7 @@
207207
"id": 9,
208208
"name": null,
209209
"note": null,
210-
"custom": null,
210+
"metadata": null,
211211
"edgeIds": [
212212
9
213213
],
@@ -217,7 +217,7 @@
217217
"id": 10,
218218
"name": null,
219219
"note": null,
220-
"custom": null,
220+
"metadata": null,
221221
"edgeIds": [
222222
10
223223
],
@@ -227,7 +227,7 @@
227227
"id": 11,
228228
"name": null,
229229
"note": null,
230-
"custom": null,
230+
"metadata": null,
231231
"edgeIds": [
232232
11
233233
],
@@ -237,7 +237,7 @@
237237
"id": 12,
238238
"name": null,
239239
"note": null,
240-
"custom": null,
240+
"metadata": null,
241241
"edgeIds": [
242242
12
243243
],
@@ -247,7 +247,7 @@
247247
"id": 13,
248248
"name": null,
249249
"note": "Rename: price → unit_price",
250-
"custom": null,
250+
"metadata": null,
251251
"edgeIds": [
252252
13
253253
],
@@ -257,7 +257,7 @@
257257
"id": 14,
258258
"name": null,
259259
"note": null,
260-
"custom": null,
260+
"metadata": null,
261261
"edgeIds": [
262262
14
263263
],
@@ -267,7 +267,7 @@
267267
"id": 15,
268268
"name": null,
269269
"note": null,
270-
"custom": null,
270+
"metadata": null,
271271
"edgeIds": [
272272
15
273273
],
@@ -277,7 +277,7 @@
277277
"id": 16,
278278
"name": null,
279279
"note": null,
280-
"custom": null,
280+
"metadata": null,
281281
"edgeIds": [
282282
16
283283
],
@@ -287,7 +287,7 @@
287287
"id": 17,
288288
"name": null,
289289
"note": null,
290-
"custom": null,
290+
"metadata": null,
291291
"edgeIds": [
292292
17
293293
],
@@ -297,7 +297,7 @@
297297
"id": 18,
298298
"name": null,
299299
"note": "Aggregation: MIN(ordered_at) by user",
300-
"custom": null,
300+
"metadata": null,
301301
"edgeIds": [
302302
18
303303
],
@@ -307,7 +307,7 @@
307307
"id": 19,
308308
"name": null,
309309
"note": "Aggregation: COUNT(order_id) by user",
310-
"custom": null,
310+
"metadata": null,
311311
"edgeIds": [
312312
19
313313
],
@@ -317,7 +317,7 @@
317317
"id": 20,
318318
"name": null,
319319
"note": null,
320-
"custom": null,
320+
"metadata": null,
321321
"edgeIds": [
322322
20
323323
],
@@ -327,7 +327,7 @@
327327
"id": 21,
328328
"name": null,
329329
"note": null,
330-
"custom": null,
330+
"metadata": null,
331331
"edgeIds": [
332332
21
333333
],
@@ -337,7 +337,7 @@
337337
"id": 22,
338338
"name": null,
339339
"note": null,
340-
"custom": null,
340+
"metadata": null,
341341
"edgeIds": [
342342
22
343343
],
@@ -347,7 +347,7 @@
347347
"id": 23,
348348
"name": null,
349349
"note": null,
350-
"custom": null,
350+
"metadata": null,
351351
"edgeIds": [
352352
23
353353
],
@@ -357,7 +357,7 @@
357357
"id": 24,
358358
"name": null,
359359
"note": "Aggregation: SUM(quantity) by order_id",
360-
"custom": null,
360+
"metadata": null,
361361
"edgeIds": [
362362
24
363363
],
@@ -367,7 +367,7 @@
367367
"id": 25,
368368
"name": null,
369369
"note": "Aggregation: SUM(line_total) by order_id",
370-
"custom": null,
370+
"metadata": null,
371371
"edgeIds": [
372372
25
373373
],
@@ -377,7 +377,7 @@
377377
"id": 26,
378378
"name": null,
379379
"note": "Raw data → Staging data",
380-
"custom": null,
380+
"metadata": null,
381381
"edgeIds": [
382382
26
383383
],
@@ -387,7 +387,7 @@
387387
"id": 27,
388388
"name": null,
389389
"note": "Raw data → Staging data",
390-
"custom": null,
390+
"metadata": null,
391391
"edgeIds": [
392392
27
393393
],
@@ -397,7 +397,7 @@
397397
"id": 28,
398398
"name": null,
399399
"note": "Raw data → Staging data",
400-
"custom": null,
400+
"metadata": null,
401401
"edgeIds": [
402402
28
403403
],
@@ -407,7 +407,7 @@
407407
"id": 29,
408408
"name": null,
409409
"note": "Staging data → Domain data",
410-
"custom": null,
410+
"metadata": null,
411411
"edgeIds": [
412412
29
413413
],
@@ -417,7 +417,7 @@
417417
"id": 30,
418418
"name": null,
419419
"note": "Staging data → Domain data",
420-
"custom": null,
420+
"metadata": null,
421421
"edgeIds": [
422422
30
423423
],
@@ -427,7 +427,7 @@
427427
"id": 31,
428428
"name": null,
429429
"note": "Staging data → Domain data",
430-
"custom": null,
430+
"metadata": null,
431431
"edgeIds": [
432432
31
433433
],

‎packages/dbml-parse/__tests__/examples/compiler/syncDep.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ Dep {
130130
});
131131
});
132132

133-
describe('syncDep - remove existing block color', () => {
133+
describe('syncDep - remove color via update', () => {
134134
it('removes a sole header [color] together with its [...] list', () => {
135135
const dbml = `${PRELUDE}
136136
Dep [color: #000000] {
137137
a -> b
138138
}`;
139139
const { newDbml } = syncDep(dbml, [
140-
{ operation: 'remove', edge: tableEdge('a', 'b') },
140+
{ operation: 'update', edge: tableEdge('a', 'b'), color: null },
141141
]);
142142
expect(newDbml).not.toContain('color');
143143
expect(newDbml).not.toContain('[');
@@ -151,7 +151,7 @@ Dep [note: "x", color: #000000] {
151151
a -> b
152152
}`;
153153
const { newDbml } = syncDep(dbml, [
154-
{ operation: 'remove', edge: tableEdge('a', 'b') },
154+
{ operation: 'update', edge: tableEdge('a', 'b'), color: null },
155155
]);
156156
expect(newDbml).not.toContain('color');
157157
expect(newDbml).toContain('note: "x"');
@@ -166,7 +166,7 @@ Dep {
166166
color: #000000
167167
}`;
168168
const { newDbml } = syncDep(dbml, [
169-
{ operation: 'remove', edge: tableEdge('a', 'b') },
169+
{ operation: 'update', edge: tableEdge('a', 'b'), color: null },
170170
]);
171171
expect(newDbml).not.toContain('#000000');
172172
const db = interpret(newDbml).getValue()!;
@@ -177,7 +177,7 @@ Dep {
177177
const dbml = `${PRELUDE}
178178
Dep: a -> b [color: #000000]`;
179179
const { newDbml } = syncDep(dbml, [
180-
{ operation: 'remove', edge: tableEdge('a', 'b') },
180+
{ operation: 'update', edge: tableEdge('a', 'b'), color: null },
181181
]);
182182
expect(newDbml).not.toContain('color');
183183
const db = interpret(newDbml).getValue()!;
@@ -186,7 +186,7 @@ Dep: a -> b [color: #000000]`;
186186

187187
it('is a no-op for an edge with no block', () => {
188188
const { newDbml, edits } = syncDep(PRELUDE, [
189-
{ operation: 'remove', edge: tableEdge('a', 'b') },
189+
{ operation: 'update', edge: tableEdge('a', 'b'), color: null },
190190
]);
191191
expect(edits).toHaveLength(0);
192192
expect(newDbml).toBe(PRELUDE);
@@ -198,7 +198,7 @@ Dep {
198198
a -> b
199199
}`;
200200
const { edits } = syncDep(dbml, [
201-
{ operation: 'remove', edge: tableEdge('a', 'b') },
201+
{ operation: 'update', edge: tableEdge('a', 'b'), color: null },
202202
]);
203203
expect(edits).toHaveLength(0);
204204
});

0 commit comments

Comments
 (0)