@malloydata/malloy-sql 0.0.38-dev230531215954 → 0.0.38-dev230601002801
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.
|
@@ -106,8 +106,8 @@ describe('MalloySQL parse', () => {
|
|
|
106
106
|
const embeddedMalloy = stmt.embeddedMalloyQueries[0];
|
|
107
107
|
expect(embeddedMalloy.query).toBe(' malloy ');
|
|
108
108
|
expect(embeddedMalloy.parenthized).toBeTruthy();
|
|
109
|
-
expect(embeddedMalloy.range.start.character).toBe(
|
|
110
|
-
expect(embeddedMalloy.malloyRange.start.character).toBe(
|
|
109
|
+
expect(embeddedMalloy.range.start.character).toBe(7);
|
|
110
|
+
expect(embeddedMalloy.malloyRange.start.character).toBe(12);
|
|
111
111
|
});
|
|
112
112
|
test('Non-parenthized embedded malloy', () => {
|
|
113
113
|
const parse = malloySQLParser_1.MalloySQLParser.parse('>>>sql connection:bigquery\nSELECT %{ malloy }%');
|
|
@@ -115,8 +115,8 @@ describe('MalloySQL parse', () => {
|
|
|
115
115
|
const embeddedMalloy = stmt.embeddedMalloyQueries[0];
|
|
116
116
|
expect(embeddedMalloy.query).toBe(' malloy ');
|
|
117
117
|
expect(embeddedMalloy.parenthized).toBeFalsy();
|
|
118
|
-
expect(embeddedMalloy.range.start.character).toBe(
|
|
119
|
-
expect(embeddedMalloy.malloyRange.start.character).toBe(
|
|
118
|
+
expect(embeddedMalloy.range.start.character).toBe(7);
|
|
119
|
+
expect(embeddedMalloy.malloyRange.start.character).toBe(9);
|
|
120
120
|
});
|
|
121
121
|
});
|
|
122
122
|
describe('Parse output', () => {
|
|
@@ -129,8 +129,8 @@ describe('MalloySQL parse', () => {
|
|
|
129
129
|
expect((_a = parse.statements[0].config) === null || _a === void 0 ? void 0 : _a.connection).toBe('bigquery');
|
|
130
130
|
expect(parse.statements[0].statementIndex).toBe(0);
|
|
131
131
|
expect(parse.statements[0].range.start.line).toBe(1);
|
|
132
|
-
expect(parse.statements[0].range.start.character).toBe(
|
|
133
|
-
expect(parse.statements[0].range.end.character).toBe(
|
|
132
|
+
expect(parse.statements[0].range.start.character).toBe(0);
|
|
133
|
+
expect(parse.statements[0].range.end.character).toBe(8);
|
|
134
134
|
});
|
|
135
135
|
test('Should provide correct output for mulitple statements', () => {
|
|
136
136
|
var _a;
|
|
@@ -141,14 +141,14 @@ describe('MalloySQL parse', () => {
|
|
|
141
141
|
expect((_a = parse.statements[0].config) === null || _a === void 0 ? void 0 : _a.connection).toBe('bigquery');
|
|
142
142
|
expect(parse.statements[0].statementIndex).toBe(0);
|
|
143
143
|
expect(parse.statements[0].range.start.line).toBe(1);
|
|
144
|
-
expect(parse.statements[0].range.start.character).toBe(
|
|
145
|
-
expect(parse.statements[0].range.end.character).toBe(
|
|
144
|
+
expect(parse.statements[0].range.start.character).toBe(0);
|
|
145
|
+
expect(parse.statements[0].range.end.character).toBe(0);
|
|
146
146
|
expect(parse.statements[1].type).toBe(types_1.MalloySQLStatementType.MALLOY);
|
|
147
147
|
expect(parse.statements[1].statementText).toBe('import "airports.malloy"');
|
|
148
148
|
expect(parse.statements[1].statementIndex).toBe(1);
|
|
149
149
|
expect(parse.statements[1].range.start.line).toBe(3);
|
|
150
|
-
expect(parse.statements[1].range.start.character).toBe(
|
|
151
|
-
expect(parse.statements[1].range.end.character).toBe(
|
|
150
|
+
expect(parse.statements[1].range.start.character).toBe(0);
|
|
151
|
+
expect(parse.statements[1].range.end.character).toBe(24);
|
|
152
152
|
});
|
|
153
153
|
test('Should provide correct output for mulitple statements with embedded malloy', () => {
|
|
154
154
|
var _a;
|
|
@@ -159,21 +159,21 @@ describe('MalloySQL parse', () => {
|
|
|
159
159
|
expect((_a = parse.statements[0].config) === null || _a === void 0 ? void 0 : _a.connection).toBe('bigquery');
|
|
160
160
|
expect(parse.statements[0].statementIndex).toBe(0);
|
|
161
161
|
expect(parse.statements[0].range.start.line).toBe(1);
|
|
162
|
-
expect(parse.statements[0].range.start.character).toBe(
|
|
163
|
-
expect(parse.statements[0].range.end.character).toBe(
|
|
162
|
+
expect(parse.statements[0].range.start.character).toBe(0);
|
|
163
|
+
expect(parse.statements[0].range.end.character).toBe(0);
|
|
164
164
|
const embeddedMalloy = parse.statements[0]
|
|
165
165
|
.embeddedMalloyQueries;
|
|
166
166
|
expect(embeddedMalloy).toHaveLength(1);
|
|
167
167
|
expect(embeddedMalloy[0].parenthized).toBeFalsy();
|
|
168
168
|
expect(embeddedMalloy[0].query).toBe(' malloy-here ');
|
|
169
169
|
expect(embeddedMalloy[0].range.start.line).toBe(1);
|
|
170
|
-
expect(embeddedMalloy[0].range.start.character).toBe(
|
|
170
|
+
expect(embeddedMalloy[0].range.start.character).toBe(14);
|
|
171
171
|
expect(parse.statements[1].type).toBe(types_1.MalloySQLStatementType.MALLOY);
|
|
172
172
|
expect(parse.statements[1].statementText).toBe('import "airports.malloy"');
|
|
173
173
|
expect(parse.statements[1].statementIndex).toBe(1);
|
|
174
174
|
expect(parse.statements[1].range.start.line).toBe(3);
|
|
175
|
-
expect(parse.statements[1].range.start.character).toBe(
|
|
176
|
-
expect(parse.statements[1].range.end.character).toBe(
|
|
175
|
+
expect(parse.statements[1].range.start.character).toBe(0);
|
|
176
|
+
expect(parse.statements[1].range.end.character).toBe(24);
|
|
177
177
|
});
|
|
178
178
|
});
|
|
179
179
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.spec.js","sourceRoot":"","sources":["../../../src/grammar/test/parse.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"parse.spec.js","sourceRoot":"","sources":["../../../src/grammar/test/parse.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAEH,2DAAsD;AACtD,uCAA0E;AAW1E,MAAM,CAAC,MAAM,CAAC;IACZ,2BAA2B,EAAE,UAAU,QAAgB;QACrD,MAAM,KAAK,GAAG,iCAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,OAAO;gBACL,OAAO,EAAE,GAAG,EAAE,CACZ,4BAA4B,KAAK,CAAC,MAAM;qBACrC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;qBACnB,IAAI,CAAC,IAAI,CAAC,EAAE;gBACjB,IAAI,EAAE,KAAK;aACZ,CAAC;SACH;;YAAM,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;QAC5C,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACrD,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAChE,MAAM,CAAC,CAAC,CAAC,CAAC,2BAA2B,EAAE,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACnD,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAChE,MAAM,CAAC,CAAC,CAAC,CAAC,2BAA2B,EAAE,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACtC,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACpE,MAAM,CAAC,CAAC,CAAC,CAAC,2BAA2B,EAAE,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAClC,MAAM,CACJ,wCAAwC,CACzC,CAAC,2BAA2B,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;QAC9C,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;YAC5C;gBACE,qBAAqB;gBACrB,WAAW;gBACX,kBAAkB;gBAClB,sBAAsB;gBACtB,yBAAyB;gBACzB,8BAA8B;gBAC9B,+CAA+C;aAChD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,2BAA2B,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACvD;gBACE,6BAA6B;gBAC7B,mCAAmC;gBACnC,kBAAkB;aACnB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,2BAA2B,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gDAAgD,EAAE,GAAG,EAAE;YAC1D;gBACE,+DAA+D;gBAC/D,sDAAsD;gBACtD,0FAA0F;aAC3F,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,2BAA2B,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAChD,MAAM,CACJ,0DAA0D,CAC3D,CAAC,2BAA2B,EAAE,CAAC;YAChC,MAAM,CACJ,+CAA+C,CAChD,CAAC,2BAA2B,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;YACnC,MAAM,CACJ,6EAA6E,CAC9E,CAAC,2BAA2B,EAAE,CAAC;YAChC,MAAM,CACJ,6FAA6F,CAC9F,CAAC,2BAA2B,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACzD,MAAM,CAAC,iCAAe,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC,YAAY,CACvE,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,8DAA8D,EAAE,GAAG,EAAE;YACxE,MAAM,CAAC,iCAAe,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,YAAY,CACrE,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,IAAI,CAAC,+DAA+D,EAAE,GAAG,EAAE;YACzE,MAAM,KAAK,GAAG,iCAAe,CAAC,KAAK,CACjC,uDAAuD,CACxD,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAA0B,CAAC;YAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9C,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,UAAU,EAAE,CAAC;YAChD,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;YAC3C,MAAM,KAAK,GAAG,iCAAe,CAAC,KAAK,CACjC,iDAAiD,CAClD,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAA0B,CAAC;YAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9C,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,SAAS,EAAE,CAAC;YAC/C,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;;YAC9D,MAAM,KAAK,GAAG,iCAAe,CAAC,KAAK,CACjC,sCAAsC,CACvC,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,8BAAsB,CAAC,GAAG,CAAC,CAAC;YAClE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3D,MAAM,CAAC,MAAA,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,0CAAE,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;;YACjE,MAAM,KAAK,GAAG,iCAAe,CAAC,KAAK,CACjC,2EAA2E,CAC5E,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,8BAAsB,CAAC,GAAG,CAAC,CAAC;YAClE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7D,MAAM,CAAC,MAAA,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,0CAAE,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAExD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,8BAAsB,CAAC,MAAM,CAAC,CAAC;YACrE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAC5C,0BAA0B,CAC3B,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,4EAA4E,EAAE,GAAG,EAAE;;YACtF,MAAM,KAAK,GAAG,iCAAe,CAAC,KAAK,CACjC,mGAAmG,CACpG,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,8BAAsB,CAAC,GAAG,CAAC,CAAC;YAClE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAC5C,oCAAoC,CACrC,CAAC;YACF,MAAM,CAAC,MAAA,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,0CAAE,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAExD,MAAM,cAAc,GAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAA2B;iBAClE,qBAAqB,CAAC;YACzB,MAAM,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,SAAS,EAAE,CAAC;YAClD,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACtD,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAEzD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,8BAAsB,CAAC,MAAM,CAAC,CAAC;YACrE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAC5C,0BAA0B,CAC3B,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/malloySQLParser.js
CHANGED
|
@@ -65,8 +65,9 @@ class MalloySQLSyntaxError extends MalloySQLParseError {
|
|
|
65
65
|
exports.MalloySQLSyntaxError = MalloySQLSyntaxError;
|
|
66
66
|
class MalloySQLParser {
|
|
67
67
|
static convertLocation(location) {
|
|
68
|
+
// VSCode expects line/character numbers to be zero-based
|
|
68
69
|
return {
|
|
69
|
-
character: location.column,
|
|
70
|
+
character: location.column - 1,
|
|
70
71
|
line: location.line - 1,
|
|
71
72
|
};
|
|
72
73
|
}
|
|
@@ -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,MAAoB,EAAE;QACjD,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;CACF;AAJD,kDAIC;AAED,MAAa,oBAAqB,SAAQ,mBAAmB;IAI3D,YACE,OAAe,EACf,GAAiB,EACjB,QAAuC,EACvC,KAAa;QAEb,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAdD,oDAcC;AAED,MAAa,eAAe;IAClB,MAAM,CAAC,eAAe,CAC5B,QAAgC;QAEhC,OAAO;YACL,SAAS,EAAE,QAAQ,CAAC,MAAM;
|
|
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.38-
|
|
3
|
+
"version": "0.0.38-dev230601002801",
|
|
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.38-
|
|
22
|
+
"@malloydata/malloy": "^0.0.38-dev230601002801"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"md5": "^2.3.0",
|