@checkdigit/eslint-plugin 7.18.0-PR.143-1b97 → 7.18.0-PR.143-3aac
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.
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { strict as assert } from "node:assert";
|
|
3
3
|
import debug from "debug";
|
|
4
4
|
import { JSONPath } from "jsonpath-plus";
|
|
5
|
-
import { ESLintUtils } from "@typescript-eslint/utils";
|
|
5
|
+
import { AST_NODE_TYPES, ESLintUtils } from "@typescript-eslint/utils";
|
|
6
6
|
import { parse } from "../peggy/athena-peggy.mjs";
|
|
7
7
|
import { matchApi } from "./api-matcher.mjs";
|
|
8
8
|
import { locateApi } from "./api-locator.mjs";
|
|
@@ -28,12 +28,46 @@ var SYNTEXT_ERROR = "SyntextError";
|
|
|
28
28
|
var ATHENA_ERROR = "AthenaError";
|
|
29
29
|
var AthenaError = class extends Error {
|
|
30
30
|
code;
|
|
31
|
-
|
|
31
|
+
ast;
|
|
32
|
+
constructor(code, message, ast) {
|
|
32
33
|
super(message);
|
|
33
34
|
this.code = code;
|
|
34
35
|
this.name = "AthenaError";
|
|
36
|
+
if (ast !== void 0) {
|
|
37
|
+
this.ast = ast;
|
|
38
|
+
}
|
|
35
39
|
}
|
|
36
40
|
};
|
|
41
|
+
function offsetToLoc(text, offset) {
|
|
42
|
+
const prefix = text.slice(0, offset);
|
|
43
|
+
const lines = prefix.split("\n");
|
|
44
|
+
return { line: lines.length, column: lines[lines.length - 1]?.length ?? 0 };
|
|
45
|
+
}
|
|
46
|
+
function buildSqlMapping(sqlNode) {
|
|
47
|
+
if (sqlNode.type !== AST_NODE_TYPES.TemplateLiteral) {
|
|
48
|
+
return [{ sqlStart: 0, srcStart: sqlNode.range[0] + 1 }];
|
|
49
|
+
}
|
|
50
|
+
const rawSql = sqlNode.quasis.map((quasi) => quasi.value.cooked ?? "").join("");
|
|
51
|
+
const trimStart = rawSql.length - rawSql.trimStart().length;
|
|
52
|
+
const segments = [];
|
|
53
|
+
let sqlCursor = 0;
|
|
54
|
+
for (const [index, quasi] of sqlNode.quasis.entries()) {
|
|
55
|
+
const cooked = quasi.value.cooked ?? "";
|
|
56
|
+
const localTrim = index === 0 ? trimStart : 0;
|
|
57
|
+
segments.push({ sqlStart: sqlCursor, srcStart: quasi.range[0] + 1 + localTrim });
|
|
58
|
+
sqlCursor += cooked.length - localTrim;
|
|
59
|
+
}
|
|
60
|
+
return segments;
|
|
61
|
+
}
|
|
62
|
+
function sqlOffsetToSource(sqlOffset, segments) {
|
|
63
|
+
for (let index = segments.length - 1; index >= 0; index--) {
|
|
64
|
+
const seg = segments[index];
|
|
65
|
+
if (seg !== void 0 && sqlOffset >= seg.sqlStart) {
|
|
66
|
+
return seg.srcStart + (sqlOffset - seg.sqlStart);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return segments[0]?.srcStart ?? 0;
|
|
70
|
+
}
|
|
37
71
|
function resolvedCol(name, schema, ast) {
|
|
38
72
|
return ast !== void 0 ? { name, schema, ast } : { name, schema };
|
|
39
73
|
}
|
|
@@ -147,7 +181,7 @@ function expandWildcard(referencedTables, columns) {
|
|
|
147
181
|
}
|
|
148
182
|
}
|
|
149
183
|
}
|
|
150
|
-
function resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns) {
|
|
184
|
+
function resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns, ast) {
|
|
151
185
|
const adjustedPath = `$.${propertyAccessor.substring(1).replace(/(\.|\[)/gu, "..properties$1")}`;
|
|
152
186
|
log("adjusted path", adjustedPath);
|
|
153
187
|
const extractedSchemas = resolvedColumns.flatMap(
|
|
@@ -155,19 +189,20 @@ function resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns) {
|
|
|
155
189
|
);
|
|
156
190
|
log("extracted schemas", extractedSchemas);
|
|
157
191
|
if (extractedSchemas.length === 0) {
|
|
158
|
-
throw new AthenaError(ATHENA_ERROR, `property not found ${colRef} - ${propertyAccessor}
|
|
192
|
+
throw new AthenaError(ATHENA_ERROR, `property not found ${colRef} - ${propertyAccessor}`, ast);
|
|
159
193
|
}
|
|
160
194
|
return extractedSchemas;
|
|
161
195
|
}
|
|
162
196
|
function navigateSchemaPath(colRef, propertyAccessor, resolvedColumns, colName, columnAST, columns) {
|
|
163
|
-
const
|
|
197
|
+
const errorAst = extractJsonExtractCalls(columnAST)[0]?.fnNode ?? columnAST;
|
|
198
|
+
const extractedSchemas = resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns, errorAst);
|
|
164
199
|
columns.set(
|
|
165
200
|
colName,
|
|
166
201
|
extractedSchemas.map((schema) => resolvedCol(colName, schema, columnAST))
|
|
167
202
|
);
|
|
168
203
|
}
|
|
169
204
|
function validateComplexColumnExpression(columnAST, allTables, ctx) {
|
|
170
|
-
for (const { ref, path } of extractJsonExtractCalls(columnAST)) {
|
|
205
|
+
for (const { ref, path, fnNode } of extractJsonExtractCalls(columnAST)) {
|
|
171
206
|
const tableRef = ref.table ?? void 0;
|
|
172
207
|
const colRef = typeof ref.column === "string" ? ref.column : void 0;
|
|
173
208
|
if (colRef === void 0) {
|
|
@@ -176,7 +211,7 @@ function validateComplexColumnExpression(columnAST, allTables, ctx) {
|
|
|
176
211
|
const referencedTables = tableRef !== void 0 ? lookupTables(tableRef, ctx) : allTables;
|
|
177
212
|
const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
|
|
178
213
|
if (resolvedColumns.length > 0) {
|
|
179
|
-
resolveSchemaAtPath(colRef, path, resolvedColumns);
|
|
214
|
+
resolveSchemaAtPath(colRef, path, resolvedColumns, fnNode);
|
|
180
215
|
}
|
|
181
216
|
}
|
|
182
217
|
}
|
|
@@ -195,7 +230,7 @@ function resolveSingleColumnRef(columnAST, columnAlias, indexedName, ref, allTab
|
|
|
195
230
|
const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
|
|
196
231
|
if (resolvedColumns.length === 0) {
|
|
197
232
|
const tableNames = [...ctx.tables.keys()].join(", ");
|
|
198
|
-
throw new AthenaError(ATHENA_ERROR, `can't found column ${colRef} in tables: ${tableNames}
|
|
233
|
+
throw new AthenaError(ATHENA_ERROR, `can't found column ${colRef} in tables: ${tableNames}`, columnAST);
|
|
199
234
|
}
|
|
200
235
|
const propertyAccessor = extractJsonExtractPath(columnAST) ?? extractBracketAccessorPath(columnAST);
|
|
201
236
|
if (propertyAccessor !== void 0) {
|
|
@@ -301,17 +336,31 @@ var rule = createRule({
|
|
|
301
336
|
});
|
|
302
337
|
return;
|
|
303
338
|
}
|
|
339
|
+
const sqlMapping = buildSqlMapping(sqlNode);
|
|
304
340
|
const athenaCtx = createRootContext();
|
|
305
341
|
try {
|
|
306
342
|
checkAthenaAst(Array.isArray(ast) ? ast[0] : ast, athenaCtx);
|
|
307
343
|
} catch (error) {
|
|
308
344
|
log("error checking Athena AST", { error, sql });
|
|
309
345
|
if (error instanceof AthenaError) {
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
346
|
+
const astLoc = error.ast?.loc;
|
|
347
|
+
if (astLoc !== void 0) {
|
|
348
|
+
const sourceText = context.sourceCode.getText();
|
|
349
|
+
context.report({
|
|
350
|
+
loc: {
|
|
351
|
+
start: offsetToLoc(sourceText, sqlOffsetToSource(astLoc.start.offset, sqlMapping)),
|
|
352
|
+
end: offsetToLoc(sourceText, sqlOffsetToSource(astLoc.end.offset, sqlMapping))
|
|
353
|
+
},
|
|
354
|
+
messageId: ATHENA_ERROR,
|
|
355
|
+
data: { errorMessage: error.message }
|
|
356
|
+
});
|
|
357
|
+
} else {
|
|
358
|
+
context.report({
|
|
359
|
+
node: sqlNode,
|
|
360
|
+
messageId: ATHENA_ERROR,
|
|
361
|
+
data: { errorMessage: error.message }
|
|
362
|
+
});
|
|
363
|
+
}
|
|
315
364
|
} else {
|
|
316
365
|
console.error(`Failed to apply ${ruleId} rule for "${context.filename}":`, error);
|
|
317
366
|
context.report({
|
|
@@ -343,4 +392,4 @@ export {
|
|
|
343
392
|
athena_default as default,
|
|
344
393
|
ruleId
|
|
345
394
|
};
|
|
346
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/athena/athena.ts"],
  "mappings": ";AAQA,SAAS,UAAU,cAAc;AAEjC,OAAO,WAAW;AAClB,SAAS,gBAAgB;AACzB,SAAS,mBAAkC;AAG3C,SAAS,aAAa;AAEtB,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B;AAAA,EACE;AAAA,EACA;AAAA,OAIK;AACP,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,IAAM,SAAS;AAEtB,IAAM,MAAM,MAAM,sBAAsB;AACxC,IAAM,aAAa,YAAY,YAAY,CAAC,SAAS,IAAI;AAEzD,IAAM,gBAAgB;AACtB,IAAM,eAAe;AAErB,IAAM,cAAN,cAA0B,MAAM;AAAA,EACvB;AAAA,EACP,YAAY,MAAc,SAAiB;AACzC,UAAM,OAAO;AACb,SAAK,OAAO;AACZ,SAAK,OAAO;AAAA,EACd;AACF;AAMA,SAAS,YAAY,MAAc,QAAsB,KAA8B;AACrF,SAAO,QAAQ,SAAY,EAAE,MAAM,QAAQ,IAAI,IAAI,EAAE,MAAM,OAAO;AACpE;AAGA,SAAS,cAAc,aAAqB,KAAmB;AAC7D,MAAI,UAAU,IAAI,WAAW,IAAI,WAAW;AAC5C,MAAI,YAAY,QAAW;AACzB,cAAU,UAAU,WAAW;AAC/B,QAAI,WAAW,IAAI,aAAa,OAAO;AAAA,EACzC;AACA,SAAO;AACT;AAGA,SAAS,aAAa,aAAqB,KAAoC;AAC7E,QAAM,YAAY,IAAI,QAAQ,IAAI,WAAW,KAAK;AAClD,SAAO,IAAI,OAAO,IAAI,SAAS,KAAK,CAAC;AACvC;AAGA,SAAS,gBAAgB,QAAwB;AAC/C,MAAI,MAAM,QAAQ,OAAO,IAAI,GAAG;AAC9B,WAAO,OAAO;AAAA,EAChB;AACA,MAAI,OAAO,SAAS,MAAM;AACxB,WAAO,CAAC,OAAO,IAAI;AAAA,EACrB;AACA,SAAO,CAAC;AACV;AAMA,SAAS,kBAAkB,QAAgB,KAAyB;AAClE,aAAW,QAAQ,gBAAgB,MAAM,GAAG;AAC1C,QAAI,aAAa,IAAI,GAAG;AACtB;AAAA,IACF;AAEA,QAAI,OAAO,IAAI,GAAG;AAChB,YAAM,EAAE,OAAOA,YAAW,IAAIC,OAAM,IAAI;AACxC,UAAIA,WAAU,MAAM;AAClB,YAAI,QAAQ,IAAIA,QAAOD,UAAS;AAAA,MAClC;AACA,UAAI,CAAC,IAAI,OAAO,IAAIA,UAAS,GAAG;AAC9B,cAAME,cAAa,cAAcF,YAAW,GAAG;AAC/C,cAAMG,cAAa,SAAS,QAAQ,MAAMD,WAAU,KAAK,CAAC;AAC1D,YAAI,OAAO,IAAIF,YAAW,mBAAmBA,YAAWG,WAAU,CAAC;AAAA,MACrE;AACA;AAAA,IACF;AAEA,QAAI,CAAC,WAAW,IAAI,GAAG;AACrB;AAAA,IACF;AAEA,UAAM,EAAE,OAAO,WAAW,IAAI,MAAM,IAAI;AAExC,QAAI,UAAU,MAAM;AAClB,UAAI,QAAQ,IAAI,OAAO,SAAS;AAAA,IAClC;AAEA,QAAI,IAAI,OAAO,IAAI,SAAS,GAAG;AAC7B;AAAA,IACF;AAIA,UAAM,aAAa,cAAc,WAAW,GAAG;AAC/C,UAAM,aAAa,SAAS,QAAQ,MAAM,UAAU,KAAK,CAAC;AAC1D,QAAI,OAAO,IAAI,WAAW,mBAAmB,WAAW,UAAU,CAAC;AAAA,EACrE;AACF;AAYA,SAAS,sBAAsB,QAAiC;AAC9D,QAAM,WAA4B,CAAC;AAEnC,aAAW,QAAQ,gBAAgB,MAAM,GAAG;AAC1C,QAAI,CAAC,aAAa,IAAI,GAAG;AACvB;AAAA,IACF;AAEA,UAAM,aAAa,OAAO,KAAK,KAAK,WAAW,WAAW,KAAK,KAAK,SAAS;AAC7E,WAAO,GAAG,eAAe,QAAW,4DAA4D;AAGhG,UAAM,WAAW,KAAK,IAAI,KAAK,MAAM,CAAC;AACtC,UAAM,YACJ,aAAa,UAAa,OAAQ,SAAkC,WAAW,WAC1E,SAAgC,SACjC;AACN,WAAO,GAAG,cAAc,QAAW,6DAA6D;AAEhG,aAAS,KAAK,EAAE,YAAY,UAAU,UAAU,CAAC;AAAA,EACnD;AAEA,SAAO;AACT;AAEA,SAAS,eAAe,UAA2B,KAAoC;AACrF,QAAM,WAA4B,CAAC;AAEnC,aAAW,EAAE,YAAY,SAAS,KAAK,UAAU;AAE/C,UAAM,aAAa,CAAC,GAAG,IAAI,OAAO,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,UAAU,MAAM,QAAQ,IAAI,UAAU,CAAC;AAEhG,QAAI,eAAe,QAAW;AAC5B,eAAS,KAAK,EAAE,YAAY,SAAS,CAAC;AACtC;AAAA,IACF;AAEA,UAAM,gBAAgB,WAAW,QAAQ,IAAI,UAAU,KAAK,CAAC;AAC7D,UAAM,eAAe,cAAc,CAAC,GAAG;AACvC,WAAO,GAAG,cAAc,SAAS,SAAS,yBAAyB,UAAU,2BAA2B;AAExG,UAAM,kBAAkB,GAAG,WAAW,QAAQ,aAAa;AAC3D,QAAI,OAAO,IAAI,iBAAiB;AAAA,MAC9B;AAAA,QACE,MAAM;AAAA,QACN,GAAI,WAAW,iBAAiB,SAAY,EAAE,cAAc,WAAW,aAAa,IAAI,CAAC;AAAA,QACzF,SAAS,oBAAI,IAAI,CAAC,CAAC,UAAU,CAAC,YAAY,UAAU,aAAa,OAAO,cAAc,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;AAAA,MACnG;AAAA,IACF,CAAC;AAAA,EACH;AAEA,SAAO;AACT;AAEA,SAAS,gBAAgB,UAA2B,SAA8C;AAChG,aAAW,EAAE,YAAY,SAAS,KAAK,UAAU;AAC/C,UAAM,gBAAgB,QAAQ,IAAI,UAAU;AAC5C,WAAO,GAAG,kBAAkB,QAAW,UAAU,UAAU,gCAAgC;AAC3F,UAAM,eAAe,cAAc,CAAC,GAAG;AACvC,WAAO,GAAG,cAAc,SAAS,SAAS,yBAAyB,UAAU,2BAA2B;AACxG,YAAQ,IAAI,UAAU,CAAC,YAAY,UAAU,aAAa,OAAO,cAAc,CAAC,GAAG,GAAG,CAAC,CAAC;AAAA,EAC1F;AACF;AAMA,SAAS,2BACP,aACA,aACA,WACA,SACM;AACN,QAAM,OAAO,eAAe;AAC5B,UAAQ,IAAI,MAAM,CAAC,YAAY,MAAM,EAAE,MAAM,SAAS,GAAG,SAAmB,CAAC,CAAC;AAChF;AAEA,SAAS,eAAe,kBAAmC,SAA8C;AACvG,aAAW,SAAS,kBAAkB;AACpC,eAAW,CAAC,SAAS,IAAI,KAAK,MAAM,SAAS;AAC3C,cAAQ,IAAI,SAAS,IAAI;AAAA,IAC3B;AAAA,EACF;AACF;AAEA,SAAS,oBACP,QACA,kBACA,iBACgB;AAGhB,QAAM,eAAe,KAAK,iBAAiB,UAAU,CAAC,EAAE,QAAQ,aAAa,gBAAgB,CAAC;AAC9F,MAAI,iBAAiB,YAAY;AAEjC,QAAM,mBAAmB,gBAAgB;AAAA,IAAQ,CAAC,QAChD,SAAyB,EAAE,MAAM,IAAI,QAAQ,MAAM,aAAa,CAAC;AAAA,EACnE;AACA,MAAI,qBAAqB,gBAAgB;AAEzC,MAAI,iBAAiB,WAAW,GAAG;AACjC,UAAM,IAAI,YAAY,cAAc,sBAAsB,MAAM,MAAM,gBAAgB,EAAE;AAAA,EAC1F;AACA,SAAO;AACT;AAEA,SAAS,mBACP,QACA,kBACA,iBACA,SACA,WACA,SACM;AACN,QAAM,mBAAmB,oBAAoB,QAAQ,kBAAkB,eAAe;AACtF,UAAQ;AAAA,IACN;AAAA,IACA,iBAAiB,IAAI,CAAC,WAAW,YAAY,SAAS,QAAQ,SAAmB,CAAC;AAAA,EACpF;AACF;AAOA,SAAS,gCAAgC,WAAoB,WAA4B,KAAyB;AAChH,aAAW,EAAE,KAAK,KAAK,KAAK,wBAAwB,SAAS,GAAG;AAC9D,UAAM,WAAW,IAAI,SAAS;AAC9B,UAAM,SAAS,OAAO,IAAI,WAAW,WAAW,IAAI,SAAS;AAC7D,QAAI,WAAW,QAAW;AACxB;AAAA,IACF;AACA,UAAM,mBAAmB,aAAa,SAAY,aAAa,UAAU,GAAG,IAAI;AAChF,UAAM,kBAAkB,iBAAiB,QAAQ,CAAC,UAAU,MAAM,QAAQ,IAAI,MAAM,KAAK,CAAC,CAAC;AAC3F,QAAI,gBAAgB,SAAS,GAAG;AAC9B,0BAAoB,QAAQ,MAAM,eAAe;AAAA,IACnD;AAAA,EACF;AACF;AAGA,SAAS,uBACP,WACA,aACA,aACA,KACA,WACA,KACA,SACM;AACN,QAAM,WAAW,IAAI,SAAS;AAC9B,QAAM,SAAS,OAAO,IAAI,WAAW,WAAW,IAAI,SAAS;AAC7D,SAAO,GAAG,WAAW,QAAW,2CAA2C;AAE3E,QAAM,mBAAmB,aAAa,SAAY,aAAa,UAAU,GAAG,IAAI;AAChF,SAAO,GAAG,iBAAiB,SAAS,GAAG,yCAAyC,MAAM,GAAG;AAEzF,MAAI,WAAW,KAAK;AAClB,mBAAe,kBAAkB,OAAO;AACxC;AAAA,EACF;AAEA,QAAM,gBAAgB,iBAAiB,SAAS;AAChD,QAAM,UAAU,gBAAgB,gBAAgB,cAAc;AAC9D,QAAM,kBAAkB,iBAAiB,QAAQ,CAAC,UAAU,MAAM,QAAQ,IAAI,MAAM,KAAK,CAAC,CAAC;AAE3F,MAAI,gBAAgB,WAAW,GAAG;AAChC,UAAM,aAAa,CAAC,GAAG,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,IAAI;AACnD,UAAM,IAAI,YAAY,cAAc,sBAAsB,MAAM,eAAe,UAAU,EAAE;AAAA,EAC7F;AAEA,QAAM,mBAAmB,uBAAuB,SAAS,KAAK,2BAA2B,SAAS;AAClG,MAAI,qBAAqB,QAAW;AAClC,uBAAmB,QAAQ,kBAAkB,iBAAiB,SAAS,WAAW,OAAO;AACzF;AAAA,EACF;AAEA,UAAQ;AAAA,IACN;AAAA,IACA,gBAAgB,IAAI,CAAC,QAAQ,YAAY,SAAS,IAAI,QAAQ,SAAmB,CAAC;AAAA,EACpF;AACF;AAEA,SAAS,qBAAqB,QAAgB,KAAkD;AAC9F,QAAM,YAAY,CAAC,GAAG,IAAI,OAAO,OAAO,CAAC,EAAE,KAAK;AAChD,QAAM,UAAU,oBAAI,IAA8B;AAElD,aAAW,CAAC,OAAO,SAAS,KAAK,OAAO,QAAQ,QAAQ,GAAG;AACzD,QAAI,oBAAoB,SAAS;AAEjC,UAAM,cAAe,UAAqC,MAAM;AAChE,UAAM,cAAc,OAAO,OAAO,KAAK,CAAC;AACxC,UAAM,aAAa,kBAAkB,SAAS;AAE9C,QAAI,WAAW,WAAW,GAAG;AAC3B,sCAAgC,WAAW,WAAW,GAAG;AACzD,iCAA2B,aAAa,aAAa,WAAW,OAAO;AACvE;AAAA,IACF;AAEA,UAAM,CAAC,GAAG,IAAI;AACd,WAAO,GAAG,QAAQ,MAAS;AAC3B,2BAAuB,WAAW,aAAa,aAAa,KAAK,WAAW,KAAK,OAAO;AAAA,EAC1F;AAEA,SAAO;AACT;AAMA,SAAS,YAAY,WAA0B,KAAmB,eAA8B;AAE9F,QAAM,SAAS,UAAU,YAAY,UAAU,KAAK,MAAM;AAG1D,QAAM,YAAY,mBAAmB,GAAG;AAGxC,oBAAkB,QAAQ,SAAS;AAGnC,QAAM,iBAAiB,sBAAsB,MAAM;AACnD,QAAM,iBAAiB,eAAe,gBAAgB,SAAS;AAG/D,QAAM,UAAU,qBAAqB,QAAQ,SAAS;AAGtD,kBAAgB,gBAAgB,OAAO;AAEvC,MAAI,oBAAoB,CAAC,GAAG,QAAQ,KAAK,CAAC,CAAC;AAG3C,QAAM,YAAY,CAAC,GAAG,UAAU,OAAO,OAAO,CAAC,EAAE,KAAK;AACtD,MAAI,OAAO,UAAU,MAAM;AACzB,oCAAgC,OAAO,OAAO,WAAW,SAAS;AAAA,EACpE;AACA,MAAI,OAAO,WAAW,MAAM;AAC1B,oCAAgC,OAAO,QAAQ,WAAW,SAAS;AAAA,EACrE;AACA,aAAW,aAAa,OAAO,WAAW,CAAC,GAAG;AAC5C,oCAAgC,UAAU,MAAM,WAAW,SAAS;AAAA,EACtE;AACA,MAAI,OAAO,SAAS,YAAY,QAAW;AACzC,eAAW,YAAY,OAAO,QAAQ,SAAS;AAC7C,sCAAgC,UAAU,WAAW,SAAS;AAAA,IAChE;AAAA,EACF;AAGA,MAAI,OAAO,UAAU,QAAW;AAC9B,gBAAY,OAAO,OAAO,KAAK,aAAa;AAAA,EAC9C;AAGA,MAAI,kBAAkB,QAAW;AAC/B,UAAM,gBAA+B,EAAE,MAAM,eAAe,QAAQ;AACpE,QAAI,OAAO,IAAI,eAAe,CAAC,aAAa,CAAC;AAAA,EAC/C;AACF;AAEA,SAAS,eAAe,KAAU,KAAyB;AACzD,SAAO,GAAG,IAAI,SAAS,QAAQ;AAC/B,QAAM,SAAS;AAEf,MAAI,OAAO,SAAS,MAAM;AACxB,eAAW,YAAY,OAAO,MAAM;AAClC,kBAAY,SAAS,KAAK,KAAK,KAAK,SAAS,KAAK,KAAK;AAAA,IACzD;AACA,WAAO,OAAO;AAAA,EAChB;AAEA,cAAY,QAAQ,GAAG;AACzB;AAMA,IAAM,OAA2E,WAAW;AAAA,EAC1F,MAAM;AAAA,EACN,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,MAAM;AAAA,MACJ,aAAa;AAAA,IACf;AAAA,IACA,QAAQ,CAAC;AAAA,IACT,UAAU;AAAA,MACR,CAAC,aAAa,GAAG;AAAA,MACjB,CAAC,YAAY,GAAG;AAAA,IAClB;AAAA,EACF;AAAA,EACA,gBAAgB,CAAC;AAAA,EACjB,OAAO,SAAS;AACd,aAAS,SAAS,KAAa,SAAwB;AACrD,UAAI,CAAC,qEAAqE,KAAK,GAAG,GAAG;AACnF,YAAI,kCAAkC,EAAE,IAAI,CAAC;AAC7C;AAAA,MACF;AAEA,UAAI;AACJ,UAAI;AAEF,SAAC,EAAE,IAAI,IAAI,MAAM,KAAK,EAAE,kBAAkB,KAAK,CAAC;AAAA,MAClD,SAAS,OAAO;AACd,YAAI,6BAA6B,EAAE,OAAO,IAAI,CAAC;AAC/C,gBAAQ,OAAO;AAAA,UACb,MAAM;AAAA,UACN,WAAW;AAAA,UACX,MAAM,EAAE,cAAc,KAAK,UAAU,OAAO,QAAW,CAAC,GAAG,IAAI;AAAA,QACjE,CAAC;AACD;AAAA,MACF;AAEA,YAAM,YAAY,kBAAkB;AACpC,UAAI;AAEF,uBAAe,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;AAAA,MAC7D,SAAS,OAAO;AACd,YAAI,6BAA6B,EAAE,OAAO,IAAI,CAAC;AAC/C,YAAI,iBAAiB,aAAa;AAChC,kBAAQ,OAAO;AAAA,YACb,MAAM;AAAA,YACN,WAAW;AAAA,YACX,MAAM,EAAE,cAAc,MAAM,QAAQ;AAAA,UACtC,CAAC;AAAA,QACH,OAAO;AAEL,kBAAQ,MAAM,mBAAmB,MAAM,cAAc,QAAQ,QAAQ,MAAM,KAAK;AAChF,kBAAQ,OAAO;AAAA,YACb,MAAM;AAAA,YACN,WAAW;AAAA,YACX,MAAM;AAAA,cACJ,cAAc,iBAAiB,QAAQ,OAAO,KAAK,IAAI,KAAK,UAAU,OAAO,QAAW,CAAC;AAAA,YAC3F;AAAA,UACF,CAAC;AAAA,QACH;AAAA,MACF;AAAA,IACF;AAEA,WAAO;AAAA,MACL,gBAAgB,SAAS;AACvB,cAAM,MAAM,QAAQ,OACjB,IAAI,CAAC,UAAU,MAAM,MAAM,MAAM,EACjC,KAAK,EAAE,EACP,KAAK;AACR,iBAAS,KAAK,OAAO;AAAA,MACvB;AAAA,MACA,QAAQ,SAAS;AACf,YAAI,OAAO,QAAQ,UAAU,UAAU;AACrC;AAAA,QACF;AACA,iBAAS,QAAQ,OAAO,OAAO;AAAA,MACjC;AAAA,IACF;AAAA,EACF;AACF,CAAC;AAED,IAAO,iBAAQ;",
  "names": ["tableName", "alias", "apiSchemas", "operations"]
}

|
|
395
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/athena/athena.ts"],
  "mappings": "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",
  "names": ["tableName", "alias", "apiSchemas", "operations"]
}

|
|
@@ -209,7 +209,7 @@ function extractJsonExtractCalls(expr) {
|
|
|
209
209
|
if (ref === void 0 || typeof path !== "string") {
|
|
210
210
|
return;
|
|
211
211
|
}
|
|
212
|
-
calls.push({ ref, path });
|
|
212
|
+
calls.push({ ref, path, fnNode: node });
|
|
213
213
|
}
|
|
214
214
|
});
|
|
215
215
|
return calls;
|
|
@@ -255,4 +255,4 @@ export {
|
|
|
255
255
|
isUnnestFrom,
|
|
256
256
|
walk
|
|
257
257
|
};
|
|
258
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
258
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2F0aGVuYS92aXNpdG9yLnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUVBLE9BQU8sV0FBVztBQUVsQixJQUFNLE1BQU0sTUFBTSxnQkFBZ0I7QUFpRTNCLFNBQVMsYUFBYSxNQUFtQztBQUM5RCxTQUFPLE9BQU8sU0FBUyxZQUFZLFNBQVMsUUFBUyxLQUE0QixTQUFTO0FBQzVGO0FBRU8sU0FBUyxPQUFPLE1BQTZCO0FBQ2xELFNBQU8sT0FBTyxTQUFTLFlBQVksU0FBUyxRQUFTLEtBQTRCLFNBQVM7QUFDNUY7QUFFTyxTQUFTLFlBQVksTUFBa0M7QUFDNUQsTUFBSSxPQUFPLFNBQVMsWUFBWSxTQUFTLE1BQU07QUFDN0MsV0FBTztBQUFBLEVBQ1Q7QUFDQSxRQUFNLE9BQVEsS0FBNEI7QUFDMUMsU0FBTyxPQUFPLFNBQVMsWUFBWSxTQUFTLFFBQVEsU0FBUztBQUMvRDtBQUVPLFNBQVMsT0FBTyxNQUE2QjtBQUNsRCxTQUNFLENBQUMsYUFBYSxJQUFJLEtBQ2xCLENBQUMsT0FBTyxJQUFJLEtBQ1osQ0FBQyxZQUFZLElBQUksS0FDakIsT0FBTyxTQUFTLFlBQ2hCLFNBQVMsUUFDVCxVQUFVO0FBRWQ7QUFFTyxTQUFTLFdBQVcsTUFBaUM7QUFDMUQsU0FDRSxDQUFDLGFBQWEsSUFBSSxLQUNsQixDQUFDLE9BQU8sSUFBSSxLQUNaLENBQUMsWUFBWSxJQUFJLEtBQ2pCLENBQUMsT0FBTyxJQUFJLEtBQ1osT0FBTyxTQUFTLFlBQ2hCLFNBQVMsUUFDVCxXQUFXO0FBRWY7QUFFTyxTQUFTLGNBQWMsTUFBaUQ7QUFDN0UsUUFBTSxRQUFRO0FBQ2QsU0FBTyxNQUFNLFFBQVEsTUFBTSxXQUFXLEtBQUssTUFBTSxZQUFZLFNBQVM7QUFDeEU7QUFPQSxTQUFTLFNBQVMsTUFBZSxTQUEyQjtBQUMxRCxNQUFJLE9BQU8sU0FBUyxZQUFZLFNBQVMsTUFBTTtBQUM3QztBQUFBLEVBQ0Y7QUFDQSxRQUFNLFFBQVE7QUFFZCxVQUFRLE1BQU0s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
|
|
@@ -54,6 +54,7 @@ export declare function extractJsonExtractPath(expr: unknown): string | undefine
|
|
|
54
54
|
export interface JsonExtractCall {
|
|
55
55
|
ref: ColumnRefItem;
|
|
56
56
|
path: string;
|
|
57
|
+
fnNode: Function;
|
|
57
58
|
}
|
|
58
59
|
/** Collect ALL json_extract / json_extract_scalar calls as (source column_ref, path) pairs. */
|
|
59
60
|
export declare function extractJsonExtractCalls(expr: unknown): JsonExtractCall[];
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@checkdigit/eslint-plugin","version":"7.18.0-PR.143-
|
|
1
|
+
{"name":"@checkdigit/eslint-plugin","version":"7.18.0-PR.143-3aac","description":"Check Digit eslint plugins","keywords":["eslint","eslintplugin"],"homepage":"https://github.com/checkdigit/eslint-plugin#readme","bugs":{"url":"https://github.com/checkdigit/eslint-plugin/issues"},"repository":{"type":"git","url":"https://github.com/checkdigit/eslint-plugin"},"license":"MIT","author":"Check Digit, LLC","sideEffects":false,"type":"module","exports":{".":{"types":"./dist-types/index.d.ts","import":"./dist-mjs/index.mjs","default":"./dist-mjs/index.mjs"}},"files":["src","dist-types","dist-mjs","!src/**/test/**","!src/**/*.test.ts","!src/**/*.spec.ts","!dist-types/**/test/**","!dist-types/**/*.test.d.ts","!dist-types/**/*.spec.d.ts","!dist-mjs/**/test/**","!dist-mjs/**/*.test.mjs","!dist-mjs/**/*.spec.mjs","SECURITY.md"],"scripts":{"build:dist-mjs":"rimraf dist-mjs && npx builder --type=module --sourceMap --outDir=dist-mjs && node dist-mjs/index.mjs","build:dist-types":"rimraf dist-types && npx builder --type=types --outDir=dist-types","ci:compile":"tsc --noEmit","ci:coverage":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=true","ci:lint":"npm run lint","ci:style":"npm run prettier","ci:test":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=false","lint":"eslint --max-warnings 0 .","lint:fix":"eslint --max-warnings 0 --fix .","peggy":"for file in ./src/peggy/*.peggy; do peggy \"$file\" --format es --output \"${file%.peggy}-peggy.ts\"; done","peggy-watch":"for file in ./src/peggy/*.peggy; do peggy \"$file\" --format=es --watch --output=\"${file%.peggy}-peggy.ts\"; done","prepare":"","prepublishOnly":"npm run build:dist-types && npm run build:dist-mjs","prettier":"prettier --ignore-path .gitignore --list-different .","prettier:fix":"prettier --ignore-path .gitignore --write .","test":"npm run ci:compile && npm run ci:test && npm run ci:lint && npm run ci:style"},"prettier":"@checkdigit/prettier-config","jest":{"preset":"@checkdigit/jest-config"},"dependencies":{"@apidevtools/json-schema-ref-parser":"^15.3.5","@typescript-eslint/type-utils":"^8.60.1","@typescript-eslint/utils":"^8.60.1","ajv":"^8.20.0","debug":"^4.4.3","glob":"^13.0.6","http-status-codes":"^2.3.0","js-yaml":"^4.2.0","json-pointer":"^0.6.2","jsonpath-plus":"^10.4.0","ts-api-utils":"^2.5.0"},"devDependencies":{"@checkdigit/jest-config":"^6.0.2","@checkdigit/prettier-config":"^6.1.0","@checkdigit/typescript-config":"10.0.0","@eslint/js":"^9.37.0","@types/debug":"^4.1.13","@types/eslint":"^9.6.1","@types/eslint-config-prettier":"^6.11.3","@types/js-yaml":"^4.0.9","@types/json-pointer":"^1.0.34","@typescript-eslint/parser":"^8.60.1","@typescript-eslint/rule-tester":"^8.60.1","eslint":"^9.37.0","eslint-config-prettier":"^10.1.8","eslint-import-resolver-typescript":"^4.4.5","eslint-plugin-eslint-plugin":"^6.4.0","eslint-plugin-import":"^2.32.0","eslint-plugin-no-only-tests":"^3.4.0","eslint-plugin-no-secrets":"^2.3.3","eslint-plugin-node":"^11.1.0","eslint-plugin-sonarjs":"^1.0.4","openapi-types":"^12.1.3","peggy":"^4.2.0","rimraf":"^6.1.3","typescript-eslint":"^8.60.1"},"peerDependencies":{"eslint":">=9 <10"},"engines":{"node":">=22.18"},"service":{"api":{"root":"src","endpoints":["api/v1"]}},"wallaby":{"env":{"params":{"runner":"--experimental-vm-modules"}}}}
|
package/src/athena/athena.ts
CHANGED
|
@@ -10,7 +10,7 @@ import { strict as assert } from 'node:assert';
|
|
|
10
10
|
|
|
11
11
|
import debug from 'debug';
|
|
12
12
|
import { JSONPath } from 'jsonpath-plus';
|
|
13
|
-
import { ESLintUtils, type TSESTree } from '@typescript-eslint/utils';
|
|
13
|
+
import { AST_NODE_TYPES, ESLintUtils, type TSESTree } from '@typescript-eslint/utils';
|
|
14
14
|
import type { SchemaObject } from 'ajv/dist/2020';
|
|
15
15
|
|
|
16
16
|
import { parse } from '../peggy/athena-peggy.ts';
|
|
@@ -46,11 +46,60 @@ const ATHENA_ERROR = 'AthenaError';
|
|
|
46
46
|
|
|
47
47
|
class AthenaError extends Error {
|
|
48
48
|
public code: string;
|
|
49
|
-
|
|
49
|
+
public ast?: object;
|
|
50
|
+
constructor(code: string, message: string, ast?: object) {
|
|
50
51
|
super(message);
|
|
51
52
|
this.code = code;
|
|
52
53
|
this.name = 'AthenaError';
|
|
54
|
+
if (ast !== undefined) {
|
|
55
|
+
this.ast = ast;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
// Convert a 0-based character offset in `text` to a 1-based line / 0-based column ESLint location.
|
|
61
|
+
function offsetToLoc(text: string, offset: number): { line: number; column: number } {
|
|
62
|
+
const prefix = text.slice(0, offset);
|
|
63
|
+
const lines = prefix.split('\n');
|
|
64
|
+
return { line: lines.length, column: lines[lines.length - 1]?.length ?? 0 };
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
// Maps a SQL-string offset (as produced by the PEG parser) back to an absolute source offset.
|
|
68
|
+
// Each quasi in a TemplateLiteral contributes a segment; template expressions have no SQL width
|
|
69
|
+
// but do occupy source characters, so a naïve single-offset approach gives wrong results when
|
|
70
|
+
// the error location is in a quasi that follows one or more template expressions.
|
|
71
|
+
interface SqlSourceSegment {
|
|
72
|
+
sqlStart: number; // offset in the trimmed SQL where this quasi's content begins
|
|
73
|
+
srcStart: number; // absolute source offset where this quasi's content begins
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function buildSqlMapping(sqlNode: TSESTree.Node): SqlSourceSegment[] {
|
|
77
|
+
if (sqlNode.type !== AST_NODE_TYPES.TemplateLiteral) {
|
|
78
|
+
// String literals: single segment, content starts one char after the opening quote.
|
|
79
|
+
return [{ sqlStart: 0, srcStart: sqlNode.range[0] + 1 }];
|
|
80
|
+
}
|
|
81
|
+
const rawSql = sqlNode.quasis.map((quasi) => quasi.value.cooked ?? '').join('');
|
|
82
|
+
const trimStart = rawSql.length - rawSql.trimStart().length;
|
|
83
|
+
const segments: SqlSourceSegment[] = [];
|
|
84
|
+
let sqlCursor = 0;
|
|
85
|
+
for (const [index, quasi] of sqlNode.quasis.entries()) {
|
|
86
|
+
const cooked = quasi.value.cooked ?? '';
|
|
87
|
+
const localTrim = index === 0 ? trimStart : 0;
|
|
88
|
+
// quasi.range[0] is the opening backtick (index 0) or the closing } of the preceding expression.
|
|
89
|
+
segments.push({ sqlStart: sqlCursor, srcStart: quasi.range[0] + 1 + localTrim });
|
|
90
|
+
sqlCursor += cooked.length - localTrim;
|
|
53
91
|
}
|
|
92
|
+
return segments;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
function sqlOffsetToSource(sqlOffset: number, segments: SqlSourceSegment[]): number {
|
|
96
|
+
for (let index = segments.length - 1; index >= 0; index--) {
|
|
97
|
+
const seg = segments[index];
|
|
98
|
+
if (seg !== undefined && sqlOffset >= seg.sqlStart) {
|
|
99
|
+
return seg.srcStart + (sqlOffset - seg.sqlStart);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return segments[0]?.srcStart ?? 0;
|
|
54
103
|
}
|
|
55
104
|
|
|
56
105
|
// ---------------------------------------------------------------------------
|
|
@@ -233,6 +282,7 @@ function resolveSchemaAtPath(
|
|
|
233
282
|
colRef: string,
|
|
234
283
|
propertyAccessor: string,
|
|
235
284
|
resolvedColumns: ResolvedColumn[],
|
|
285
|
+
ast?: object,
|
|
236
286
|
): SchemaObject[] {
|
|
237
287
|
// Double-dot handles allOf / anyOf / oneOf wrappers that may appear in the schema.
|
|
238
288
|
// eslint-disable-next-line prefer-named-capture-group
|
|
@@ -245,7 +295,7 @@ function resolveSchemaAtPath(
|
|
|
245
295
|
log('extracted schemas', extractedSchemas);
|
|
246
296
|
|
|
247
297
|
if (extractedSchemas.length === 0) {
|
|
248
|
-
throw new AthenaError(ATHENA_ERROR, `property not found ${colRef} - ${propertyAccessor}
|
|
298
|
+
throw new AthenaError(ATHENA_ERROR, `property not found ${colRef} - ${propertyAccessor}`, ast);
|
|
249
299
|
}
|
|
250
300
|
return extractedSchemas;
|
|
251
301
|
}
|
|
@@ -258,7 +308,9 @@ function navigateSchemaPath(
|
|
|
258
308
|
columnAST: unknown,
|
|
259
309
|
columns: Map<string, ResolvedColumn[]>,
|
|
260
310
|
): void {
|
|
261
|
-
|
|
311
|
+
// Prefer the inner function/expression node for location: the Column wrapper rarely carries loc.
|
|
312
|
+
const errorAst = (extractJsonExtractCalls(columnAST)[0]?.fnNode ?? columnAST) as object;
|
|
313
|
+
const extractedSchemas = resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns, errorAst);
|
|
262
314
|
columns.set(
|
|
263
315
|
colName,
|
|
264
316
|
extractedSchemas.map((schema) => resolvedCol(colName, schema, columnAST as object)),
|
|
@@ -271,7 +323,7 @@ function navigateSchemaPath(
|
|
|
271
323
|
|
|
272
324
|
/** Validate all json_extract / json_extract_scalar paths in a complex column expression. */
|
|
273
325
|
function validateComplexColumnExpression(columnAST: unknown, allTables: ResolvedTable[], ctx: VisitContext): void {
|
|
274
|
-
for (const { ref, path } of extractJsonExtractCalls(columnAST)) {
|
|
326
|
+
for (const { ref, path, fnNode } of extractJsonExtractCalls(columnAST)) {
|
|
275
327
|
const tableRef = ref.table ?? undefined;
|
|
276
328
|
const colRef = typeof ref.column === 'string' ? ref.column : undefined;
|
|
277
329
|
if (colRef === undefined) {
|
|
@@ -280,7 +332,7 @@ function validateComplexColumnExpression(columnAST: unknown, allTables: Resolved
|
|
|
280
332
|
const referencedTables = tableRef !== undefined ? lookupTables(tableRef, ctx) : allTables;
|
|
281
333
|
const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
|
|
282
334
|
if (resolvedColumns.length > 0) {
|
|
283
|
-
resolveSchemaAtPath(colRef, path, resolvedColumns); // throws if path not found
|
|
335
|
+
resolveSchemaAtPath(colRef, path, resolvedColumns, fnNode); // throws if path not found
|
|
284
336
|
}
|
|
285
337
|
}
|
|
286
338
|
}
|
|
@@ -313,7 +365,7 @@ function resolveSingleColumnRef(
|
|
|
313
365
|
|
|
314
366
|
if (resolvedColumns.length === 0) {
|
|
315
367
|
const tableNames = [...ctx.tables.keys()].join(', ');
|
|
316
|
-
throw new AthenaError(ATHENA_ERROR, `can't found column ${colRef} in tables: ${tableNames}
|
|
368
|
+
throw new AthenaError(ATHENA_ERROR, `can't found column ${colRef} in tables: ${tableNames}`, columnAST as object);
|
|
317
369
|
}
|
|
318
370
|
|
|
319
371
|
const propertyAccessor = extractJsonExtractPath(columnAST) ?? extractBracketAccessorPath(columnAST);
|
|
@@ -461,6 +513,7 @@ const rule: ESLintUtils.RuleModule<typeof SYNTEXT_ERROR | typeof ATHENA_ERROR> =
|
|
|
461
513
|
return;
|
|
462
514
|
}
|
|
463
515
|
|
|
516
|
+
const sqlMapping = buildSqlMapping(sqlNode);
|
|
464
517
|
const athenaCtx = createRootContext();
|
|
465
518
|
try {
|
|
466
519
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
@@ -468,11 +521,25 @@ const rule: ESLintUtils.RuleModule<typeof SYNTEXT_ERROR | typeof ATHENA_ERROR> =
|
|
|
468
521
|
} catch (error) {
|
|
469
522
|
log('error checking Athena AST', { error, sql });
|
|
470
523
|
if (error instanceof AthenaError) {
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
524
|
+
const astLoc = (error.ast as { loc?: { start: { offset: number }; end: { offset: number } } } | undefined)
|
|
525
|
+
?.loc;
|
|
526
|
+
if (astLoc !== undefined) {
|
|
527
|
+
const sourceText = context.sourceCode.getText();
|
|
528
|
+
context.report({
|
|
529
|
+
loc: {
|
|
530
|
+
start: offsetToLoc(sourceText, sqlOffsetToSource(astLoc.start.offset, sqlMapping)),
|
|
531
|
+
end: offsetToLoc(sourceText, sqlOffsetToSource(astLoc.end.offset, sqlMapping)),
|
|
532
|
+
},
|
|
533
|
+
messageId: ATHENA_ERROR,
|
|
534
|
+
data: { errorMessage: error.message },
|
|
535
|
+
});
|
|
536
|
+
} else {
|
|
537
|
+
context.report({
|
|
538
|
+
node: sqlNode,
|
|
539
|
+
messageId: ATHENA_ERROR,
|
|
540
|
+
data: { errorMessage: error.message },
|
|
541
|
+
});
|
|
542
|
+
}
|
|
476
543
|
} else {
|
|
477
544
|
// eslint-disable-next-line no-console
|
|
478
545
|
console.error(`Failed to apply ${ruleId} rule for "${context.filename}":`, error);
|
package/src/athena/visitor.ts
CHANGED
|
@@ -302,6 +302,7 @@ export function extractJsonExtractPath(expr: unknown): string | undefined {
|
|
|
302
302
|
export interface JsonExtractCall {
|
|
303
303
|
ref: ColumnRefItem;
|
|
304
304
|
path: string;
|
|
305
|
+
fnNode: Function;
|
|
305
306
|
}
|
|
306
307
|
|
|
307
308
|
/** Collect ALL json_extract / json_extract_scalar calls as (source column_ref, path) pairs. */
|
|
@@ -327,7 +328,7 @@ export function extractJsonExtractCalls(expr: unknown): JsonExtractCall[] {
|
|
|
327
328
|
if (ref === undefined || typeof path !== 'string') {
|
|
328
329
|
return;
|
|
329
330
|
}
|
|
330
|
-
calls.push({ ref, path });
|
|
331
|
+
calls.push({ ref, path, fnNode: node });
|
|
331
332
|
},
|
|
332
333
|
});
|
|
333
334
|
return calls;
|