@malloydata/malloy-sql 0.0.62-dev230726224736 → 0.0.62-dev230727165759
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/malloySQLParser.js
CHANGED
|
@@ -141,13 +141,19 @@ class MalloySQLParser {
|
|
|
141
141
|
});
|
|
142
142
|
}
|
|
143
143
|
else {
|
|
144
|
+
const parsedMalloySQLSQL = malloySQLSQLParser_1.MalloySQLSQLParser.parse(parsedStatement.statementText, url, parsedStatement.range.start);
|
|
145
|
+
for (const comment of parsedMalloySQLSQL.comments) {
|
|
146
|
+
const match = /\bconnection:\s*(?<connectionName>\S*)/.exec(comment.text);
|
|
147
|
+
if (match && match.groups) {
|
|
148
|
+
config.connection = match.groups['connectionName'];
|
|
149
|
+
}
|
|
150
|
+
}
|
|
144
151
|
if (!config.connection) {
|
|
145
152
|
if (!previousConnection)
|
|
146
|
-
errors.push(this.createParseError('No connection configuration specified
|
|
153
|
+
errors.push(this.createParseError('No connection configuration specified', parsedStatement.delimiterRange, url));
|
|
147
154
|
config.connection = previousConnection;
|
|
148
155
|
}
|
|
149
156
|
previousConnection = config.connection;
|
|
150
|
-
const parsedMalloySQLSQL = malloySQLSQLParser_1.MalloySQLSQLParser.parse(parsedStatement.statementText, url, parsedStatement.range.start);
|
|
151
157
|
const embeddedMalloyQueries = parsedMalloySQLSQL.embeddedMalloyQueries;
|
|
152
158
|
statements.push({
|
|
153
159
|
...base,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"malloySQLParser.js","sourceRoot":"","sources":["../src/malloySQLParser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"malloySQLParser.js","sourceRoot":"","sources":["../src/malloySQLParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { MalloySQLParseLocation, EmbeddedMalloyQuery } from './types';
|
|
1
|
+
import { MalloySQLParseLocation, EmbeddedMalloyQuery, EmbeddedComment } from './types';
|
|
2
2
|
import { MalloySQLParseError } from './malloySQLErrors';
|
|
3
3
|
export declare class MalloySQLSQLParser {
|
|
4
4
|
private static convertLocation;
|
|
@@ -6,6 +6,7 @@ export declare class MalloySQLSQLParser {
|
|
|
6
6
|
static parse(document: string, url?: string, start?: MalloySQLParseLocation | null): MalloySQLSQLParse;
|
|
7
7
|
}
|
|
8
8
|
export interface MalloySQLSQLParse {
|
|
9
|
+
comments: EmbeddedComment[];
|
|
9
10
|
embeddedMalloyQueries: EmbeddedMalloyQuery[];
|
|
10
11
|
errors: MalloySQLParseError[];
|
|
11
12
|
}
|
|
@@ -74,6 +74,7 @@ class MalloySQLSQLParser {
|
|
|
74
74
|
}
|
|
75
75
|
catch (e) {
|
|
76
76
|
return {
|
|
77
|
+
comments: [],
|
|
77
78
|
embeddedMalloyQueries: [],
|
|
78
79
|
errors: [
|
|
79
80
|
new malloySQLErrors_1.MalloySQLSyntaxError(e.message, [
|
|
@@ -87,7 +88,17 @@ class MalloySQLSQLParser {
|
|
|
87
88
|
};
|
|
88
89
|
}
|
|
89
90
|
if (!parsed.parts)
|
|
90
|
-
return { embeddedMalloyQueries: [], errors: [] };
|
|
91
|
+
return { comments: [], embeddedMalloyQueries: [], errors: [] };
|
|
92
|
+
const comments = parsed.parts
|
|
93
|
+
.filter((part) => {
|
|
94
|
+
return part.type === 'comment';
|
|
95
|
+
})
|
|
96
|
+
.map(part => {
|
|
97
|
+
return {
|
|
98
|
+
range: this.convertRange(part.range, start),
|
|
99
|
+
text: part.text,
|
|
100
|
+
};
|
|
101
|
+
});
|
|
91
102
|
const embeddedMalloyQueries = parsed.parts
|
|
92
103
|
.filter((part) => {
|
|
93
104
|
return part.type === 'malloy';
|
|
@@ -102,6 +113,7 @@ class MalloySQLSQLParser {
|
|
|
102
113
|
};
|
|
103
114
|
});
|
|
104
115
|
return {
|
|
116
|
+
comments,
|
|
105
117
|
embeddedMalloyQueries,
|
|
106
118
|
errors: [],
|
|
107
119
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"malloySQLSQLParser.js","sourceRoot":"","sources":["../src/malloySQLSQLParser.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,+DAAiD;
|
|
1
|
+
{"version":3,"file":"malloySQLSQLParser.js","sourceRoot":"","sources":["../src/malloySQLSQLParser.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -39,7 +39,7 @@ export interface MalloySQLParseResults {
|
|
|
39
39
|
statements: ParsedMalloySQLStatement[];
|
|
40
40
|
}
|
|
41
41
|
export interface MalloySQLSQLParseResults {
|
|
42
|
-
parts:
|
|
42
|
+
parts: ParsedMalloySQLStatementPart[];
|
|
43
43
|
}
|
|
44
44
|
export interface MalloySQLStatmentConfig {
|
|
45
45
|
connection?: string;
|
|
@@ -63,6 +63,10 @@ export interface EmbeddedMalloyQuery {
|
|
|
63
63
|
malloyRange: DocumentRange;
|
|
64
64
|
parenthized: boolean;
|
|
65
65
|
}
|
|
66
|
+
export interface EmbeddedComment {
|
|
67
|
+
text: string;
|
|
68
|
+
range: DocumentRange;
|
|
69
|
+
}
|
|
66
70
|
export interface MalloySQLMalloyStatement extends MalloySQLStatementBase {
|
|
67
71
|
type: MalloySQLStatementType.MALLOY;
|
|
68
72
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@malloydata/malloy-sql",
|
|
3
|
-
"version": "0.0.62-
|
|
3
|
+
"version": "0.0.62-dev230727165759",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"prepublishOnly": "npm run build"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@malloydata/malloy": "^0.0.62-
|
|
24
|
+
"@malloydata/malloy": "^0.0.62-dev230727165759"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
27
|
"peggy": "^3.0.2"
|