@duckcodeailabs/dql-notebook 0.2.1 → 0.2.3
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/execute.d.ts.map +1 -1
- package/dist/execute.js +19 -6
- package/dist/execute.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/semantic-refs.d.ts +46 -0
- package/dist/semantic-refs.d.ts.map +1 -0
- package/dist/semantic-refs.js +134 -0
- package/dist/semantic-refs.js.map +1 -0
- package/package.json +3 -3
package/dist/execute.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGvE,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,KAAK,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,4EAA4E;IAC5E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,yBAAyB,GAClC,qBAAqB,GAAG,IAAI,CAiE9B"}
|
package/dist/execute.js
CHANGED
|
@@ -1,12 +1,23 @@
|
|
|
1
1
|
import { NodeKind, parse, } from '@duckcodeailabs/dql-core';
|
|
2
|
+
import { resolveSemanticRefs, hasSemanticRefs } from './semantic-refs.js';
|
|
2
3
|
export function buildExecutionPlan(cell, options) {
|
|
3
4
|
if (cell.type === 'markdown' || cell.type === 'chart') {
|
|
4
5
|
return null;
|
|
5
6
|
}
|
|
6
7
|
if (cell.type === 'sql') {
|
|
8
|
+
// Resolve @metric(name) and @dim(name) references in SQL cells
|
|
9
|
+
let resolvedSql = cell.source;
|
|
10
|
+
if (options?.semanticLayer && hasSemanticRefs(cell.source)) {
|
|
11
|
+
const resolution = resolveSemanticRefs(cell.source, options.semanticLayer);
|
|
12
|
+
if (resolution.unresolvedRefs.length > 0) {
|
|
13
|
+
throw new Error(`Unresolved semantic references in SQL cell: ${resolution.unresolvedRefs.join(', ')}. ` +
|
|
14
|
+
'Check that these metrics/dimensions exist in your semantic layer.');
|
|
15
|
+
}
|
|
16
|
+
resolvedSql = resolution.resolvedSql;
|
|
17
|
+
}
|
|
7
18
|
return {
|
|
8
19
|
title: cell.title || 'SQL cell',
|
|
9
|
-
sql:
|
|
20
|
+
sql: resolvedSql,
|
|
10
21
|
sqlParams: [],
|
|
11
22
|
variables: {},
|
|
12
23
|
chartConfig: cell.config,
|
|
@@ -97,14 +108,16 @@ function buildSemanticPlan(block, semanticLayer, driver) {
|
|
|
97
108
|
throw new Error('Semantic block requires a semantic-layer/ configuration. ' +
|
|
98
109
|
'Add metric and dimension YAML files to your project\'s semantic-layer/ directory.');
|
|
99
110
|
}
|
|
100
|
-
// Extract metric
|
|
111
|
+
// Extract metric references: metricsRef (array) takes precedence over metricRef (single)
|
|
101
112
|
const metrics = [];
|
|
102
113
|
const dimensions = [];
|
|
103
|
-
if (block.
|
|
114
|
+
if (block.metricsRef && block.metricsRef.length > 0) {
|
|
115
|
+
metrics.push(...block.metricsRef);
|
|
116
|
+
}
|
|
117
|
+
else if (block.metricRef) {
|
|
104
118
|
metrics.push(block.metricRef);
|
|
105
119
|
}
|
|
106
|
-
// Also extract dimensions from block params if they reference
|
|
107
|
-
// For now, dimensions can be passed via block params named "dimensions"
|
|
120
|
+
// Also extract dimensions/metrics from block params if they reference names
|
|
108
121
|
for (const param of block.params?.params ?? []) {
|
|
109
122
|
const val = evaluateExpression(param.initializer);
|
|
110
123
|
if (param.name === 'dimensions' && Array.isArray(val)) {
|
|
@@ -116,7 +129,7 @@ function buildSemanticPlan(block, semanticLayer, driver) {
|
|
|
116
129
|
}
|
|
117
130
|
if (metrics.length === 0) {
|
|
118
131
|
throw new Error(`Semantic block "${block.name}" has no metric references. ` +
|
|
119
|
-
'Add
|
|
132
|
+
'Add metric = "metric_name" or metrics = ["metric1", "metric2"] to your block declaration.');
|
|
120
133
|
}
|
|
121
134
|
const composed = semanticLayer.composeQuery({ metrics, dimensions, driver });
|
|
122
135
|
if (!composed) {
|
package/dist/execute.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,KAAK,GAKN,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Semantic reference resolver for SQL cells.
|
|
3
|
+
*
|
|
4
|
+
* Resolves `@metric(name)` and `@dim(name)` references in plain SQL strings
|
|
5
|
+
* by looking up the metric/dimension definition in the SemanticLayer and
|
|
6
|
+
* inlining the SQL expression.
|
|
7
|
+
*
|
|
8
|
+
* Example:
|
|
9
|
+
* Input: SELECT @dim(segment), @metric(total_revenue) FROM fct_revenue GROUP BY @dim(segment)
|
|
10
|
+
* Output: SELECT segment_tier AS segment, SUM(amount) AS total_revenue FROM fct_revenue GROUP BY segment_tier
|
|
11
|
+
*/
|
|
12
|
+
import type { SemanticLayer } from '@duckcodeailabs/dql-core';
|
|
13
|
+
export interface SemanticRefResolution {
|
|
14
|
+
/** The resolved SQL with all semantic references expanded. */
|
|
15
|
+
resolvedSql: string;
|
|
16
|
+
/** Names of metrics that were resolved. */
|
|
17
|
+
resolvedMetrics: string[];
|
|
18
|
+
/** Names of dimensions that were resolved. */
|
|
19
|
+
resolvedDimensions: string[];
|
|
20
|
+
/** Any references that could not be resolved. */
|
|
21
|
+
unresolvedRefs: string[];
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Check if a SQL string contains any semantic references.
|
|
25
|
+
*/
|
|
26
|
+
export declare function hasSemanticRefs(sql: string): boolean;
|
|
27
|
+
/**
|
|
28
|
+
* Resolve all `@metric(name)` and `@dim(name)` references in a SQL string.
|
|
29
|
+
*
|
|
30
|
+
* - `@metric(total_revenue)` → expands to the metric's SQL expression with an alias
|
|
31
|
+
* - `@dim(segment)` or `@dimension(segment)` → expands to the dimension's SQL expression with an alias
|
|
32
|
+
*
|
|
33
|
+
* If a reference can't be found in the semantic layer, it is left as-is and
|
|
34
|
+
* added to `unresolvedRefs` so the caller can report a helpful error.
|
|
35
|
+
*/
|
|
36
|
+
export declare function resolveSemanticRefs(sql: string, semanticLayer: SemanticLayer | undefined): SemanticRefResolution;
|
|
37
|
+
/**
|
|
38
|
+
* Get a list of available semantic references for autocomplete.
|
|
39
|
+
*/
|
|
40
|
+
export declare function getSemanticRefCompletions(semanticLayer: SemanticLayer | undefined): Array<{
|
|
41
|
+
type: 'metric' | 'dimension';
|
|
42
|
+
name: string;
|
|
43
|
+
label: string;
|
|
44
|
+
description: string;
|
|
45
|
+
}>;
|
|
46
|
+
//# sourceMappingURL=semantic-refs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"semantic-refs.d.ts","sourceRoot":"","sources":["../src/semantic-refs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAK9D,MAAM,WAAW,qBAAqB;IACpC,8DAA8D;IAC9D,WAAW,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,8CAA8C;IAC9C,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,iDAAiD;IACjD,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,aAAa,GAAG,SAAS,GACvC,qBAAqB,CA2DvB;AA+BD;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,aAAa,GAAG,SAAS,GACvC,KAAK,CAAC;IAAE,IAAI,EAAE,QAAQ,GAAG,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CAwB3F"}
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Semantic reference resolver for SQL cells.
|
|
3
|
+
*
|
|
4
|
+
* Resolves `@metric(name)` and `@dim(name)` references in plain SQL strings
|
|
5
|
+
* by looking up the metric/dimension definition in the SemanticLayer and
|
|
6
|
+
* inlining the SQL expression.
|
|
7
|
+
*
|
|
8
|
+
* Example:
|
|
9
|
+
* Input: SELECT @dim(segment), @metric(total_revenue) FROM fct_revenue GROUP BY @dim(segment)
|
|
10
|
+
* Output: SELECT segment_tier AS segment, SUM(amount) AS total_revenue FROM fct_revenue GROUP BY segment_tier
|
|
11
|
+
*/
|
|
12
|
+
/** Pattern to match @metric(name) or @dim(name) references. */
|
|
13
|
+
const SEMANTIC_REF_PATTERN = /@(metric|dim|dimension)\(\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*\)/g;
|
|
14
|
+
/**
|
|
15
|
+
* Check if a SQL string contains any semantic references.
|
|
16
|
+
*/
|
|
17
|
+
export function hasSemanticRefs(sql) {
|
|
18
|
+
return SEMANTIC_REF_PATTERN.test(sql);
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Resolve all `@metric(name)` and `@dim(name)` references in a SQL string.
|
|
22
|
+
*
|
|
23
|
+
* - `@metric(total_revenue)` → expands to the metric's SQL expression with an alias
|
|
24
|
+
* - `@dim(segment)` or `@dimension(segment)` → expands to the dimension's SQL expression with an alias
|
|
25
|
+
*
|
|
26
|
+
* If a reference can't be found in the semantic layer, it is left as-is and
|
|
27
|
+
* added to `unresolvedRefs` so the caller can report a helpful error.
|
|
28
|
+
*/
|
|
29
|
+
export function resolveSemanticRefs(sql, semanticLayer) {
|
|
30
|
+
const resolvedMetrics = [];
|
|
31
|
+
const resolvedDimensions = [];
|
|
32
|
+
const unresolvedRefs = [];
|
|
33
|
+
if (!semanticLayer) {
|
|
34
|
+
// No semantic layer — check if there are refs that need resolving
|
|
35
|
+
const refs = [];
|
|
36
|
+
sql.replace(SEMANTIC_REF_PATTERN, (_match, _type, name) => {
|
|
37
|
+
refs.push(name);
|
|
38
|
+
return _match;
|
|
39
|
+
});
|
|
40
|
+
if (refs.length > 0) {
|
|
41
|
+
return {
|
|
42
|
+
resolvedSql: sql,
|
|
43
|
+
resolvedMetrics: [],
|
|
44
|
+
resolvedDimensions: [],
|
|
45
|
+
unresolvedRefs: refs,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
return { resolvedSql: sql, resolvedMetrics: [], resolvedDimensions: [], unresolvedRefs: [] };
|
|
49
|
+
}
|
|
50
|
+
// Track which position in the SQL each ref appears to handle GROUP BY correctly
|
|
51
|
+
// (in GROUP BY, we should NOT include the alias or aggregation wrapper)
|
|
52
|
+
const resolvedSql = sql.replace(SEMANTIC_REF_PATTERN, (match, refType, name) => {
|
|
53
|
+
if (refType === 'metric') {
|
|
54
|
+
const metric = semanticLayer.getMetric(name);
|
|
55
|
+
if (!metric) {
|
|
56
|
+
unresolvedRefs.push(`metric:${name}`);
|
|
57
|
+
return match;
|
|
58
|
+
}
|
|
59
|
+
resolvedMetrics.push(name);
|
|
60
|
+
// In SELECT context: wrap with aggregation and alias
|
|
61
|
+
// In GROUP BY / WHERE context: just the raw expression
|
|
62
|
+
// We use a heuristic: check if this ref appears after GROUP BY, ORDER BY, WHERE, HAVING
|
|
63
|
+
return `${metric.sql} AS ${sanitizeAlias(name)}`;
|
|
64
|
+
}
|
|
65
|
+
// dim or dimension
|
|
66
|
+
const dim = semanticLayer.getDimension(name);
|
|
67
|
+
if (!dim) {
|
|
68
|
+
unresolvedRefs.push(`dimension:${name}`);
|
|
69
|
+
return match;
|
|
70
|
+
}
|
|
71
|
+
resolvedDimensions.push(name);
|
|
72
|
+
return `${dim.sql} AS ${sanitizeAlias(name)}`;
|
|
73
|
+
});
|
|
74
|
+
// Second pass: fix GROUP BY / ORDER BY / WHERE / HAVING clauses
|
|
75
|
+
// In these clauses, we should use just the raw SQL without alias
|
|
76
|
+
const fixedSql = fixClauseRefs(resolvedSql, semanticLayer);
|
|
77
|
+
return {
|
|
78
|
+
resolvedSql: fixedSql,
|
|
79
|
+
resolvedMetrics,
|
|
80
|
+
resolvedDimensions,
|
|
81
|
+
unresolvedRefs,
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* In GROUP BY, ORDER BY, WHERE, HAVING clauses, replace "expr AS alias" with just "expr".
|
|
86
|
+
* This is needed because SQL doesn't allow aliases in GROUP BY for most databases.
|
|
87
|
+
*/
|
|
88
|
+
function fixClauseRefs(sql, semanticLayer) {
|
|
89
|
+
// Find all "expression AS alias" patterns that appear after GROUP BY, ORDER BY, WHERE, HAVING
|
|
90
|
+
const clausePattern = /\b(GROUP\s+BY|ORDER\s+BY|WHERE|HAVING)\b/gi;
|
|
91
|
+
const match = clausePattern.exec(sql);
|
|
92
|
+
if (!match)
|
|
93
|
+
return sql;
|
|
94
|
+
const clauseStart = match.index;
|
|
95
|
+
const beforeClause = sql.substring(0, clauseStart);
|
|
96
|
+
const clauseAndAfter = sql.substring(clauseStart);
|
|
97
|
+
// In the clause portion, strip " AS alias" from resolved refs
|
|
98
|
+
const fixed = clauseAndAfter.replace(/(\S+)\s+AS\s+([a-zA-Z_][a-zA-Z0-9_]*)/g, (_m, expr, _alias) => {
|
|
99
|
+
return expr;
|
|
100
|
+
});
|
|
101
|
+
return beforeClause + fixed;
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* Sanitize a name to be a valid SQL alias.
|
|
105
|
+
*/
|
|
106
|
+
function sanitizeAlias(name) {
|
|
107
|
+
return name.replace(/\./g, '_').replace(/[^a-zA-Z0-9_]/g, '');
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* Get a list of available semantic references for autocomplete.
|
|
111
|
+
*/
|
|
112
|
+
export function getSemanticRefCompletions(semanticLayer) {
|
|
113
|
+
if (!semanticLayer)
|
|
114
|
+
return [];
|
|
115
|
+
const completions = [];
|
|
116
|
+
for (const metric of semanticLayer.listMetrics()) {
|
|
117
|
+
completions.push({
|
|
118
|
+
type: 'metric',
|
|
119
|
+
name: metric.name,
|
|
120
|
+
label: metric.label,
|
|
121
|
+
description: metric.description ?? '',
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
for (const dim of semanticLayer.listDimensions()) {
|
|
125
|
+
completions.push({
|
|
126
|
+
type: 'dimension',
|
|
127
|
+
name: dim.name,
|
|
128
|
+
label: dim.label,
|
|
129
|
+
description: dim.description ?? '',
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
return completions;
|
|
133
|
+
}
|
|
134
|
+
//# sourceMappingURL=semantic-refs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"semantic-refs.js","sourceRoot":"","sources":["../src/semantic-refs.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@duckcodeailabs/dql-notebook",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.3",
|
|
4
4
|
"description": "Notebook document model and execution helpers for DQL",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"type": "module",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"access": "public"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@duckcodeailabs/dql-
|
|
28
|
-
"@duckcodeailabs/dql-
|
|
27
|
+
"@duckcodeailabs/dql-connectors": "0.1.6",
|
|
28
|
+
"@duckcodeailabs/dql-core": "0.3.2"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@types/node": "^22.0.0",
|