@malloydata/malloy-sql 0.0.43-dev230622144455 → 0.0.43-dev230622180905
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.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { LogMessage, MalloyError } from '@malloydata/malloy';
|
|
2
2
|
import { MalloySQLStatement, MalloySQLParseErrorExpected } from './types';
|
|
3
3
|
export declare class MalloySQLParseError extends MalloyError {
|
|
4
|
-
constructor(message: string,
|
|
4
|
+
constructor(message: string, problems?: LogMessage[]);
|
|
5
5
|
}
|
|
6
6
|
export declare class MalloySQLSyntaxError extends MalloySQLParseError {
|
|
7
7
|
expected: MalloySQLParseErrorExpected[];
|
package/dist/malloySQLParser.js
CHANGED
|
@@ -50,8 +50,8 @@ const malloy_1 = require("@malloydata/malloy");
|
|
|
50
50
|
const parser = __importStar(require("./grammar/malloySQL"));
|
|
51
51
|
const types_1 = require("./types");
|
|
52
52
|
class MalloySQLParseError extends malloy_1.MalloyError {
|
|
53
|
-
constructor(message,
|
|
54
|
-
super(message,
|
|
53
|
+
constructor(message, problems = []) {
|
|
54
|
+
super(message, problems);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
exports.MalloySQLParseError = MalloySQLParseError;
|
|
@@ -84,6 +84,7 @@ class MalloySQLParser {
|
|
|
84
84
|
url,
|
|
85
85
|
range: this.convertRange(range),
|
|
86
86
|
},
|
|
87
|
+
severity: 'error',
|
|
87
88
|
};
|
|
88
89
|
return new MalloySQLParseError(message, [log]);
|
|
89
90
|
}
|
|
@@ -105,6 +106,7 @@ class MalloySQLParser {
|
|
|
105
106
|
{
|
|
106
107
|
message: e.message,
|
|
107
108
|
at: { url, range: this.convertRange(e.location) },
|
|
109
|
+
severity: 'error',
|
|
108
110
|
},
|
|
109
111
|
], e.expected, e.found),
|
|
110
112
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"malloySQLParser.js","sourceRoot":"","sources":["../src/malloySQLParser.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAK4B;AAC5B,4DAA8C;AAC9C,mCAUiB;AAEjB,MAAa,mBAAoB,SAAQ,oBAAW;IAClD,YAAY,OAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"malloySQLParser.js","sourceRoot":"","sources":["../src/malloySQLParser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@malloydata/malloy-sql",
|
|
3
|
-
"version": "0.0.43-
|
|
3
|
+
"version": "0.0.43-dev230622180905",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"prepublishOnly": "npm run build"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@malloydata/malloy": "^0.0.43-
|
|
22
|
+
"@malloydata/malloy": "^0.0.43-dev230622180905"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"md5": "^2.3.0",
|