@checkdigit/eslint-plugin 7.18.0-PR.143-0de2 → 7.18.0-PR.143-d38b
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-mjs/athena/api-matcher.mjs +35 -1
- package/dist-mjs/athena/athena.mjs +46 -14
- package/dist-mjs/athena/visitor.mjs +2 -2
- package/dist-types/athena/visitor.d.ts +1 -0
- package/package.json +1 -1
- package/src/athena/api-matcher.ts +38 -0
- package/src/athena/athena.ts +52 -12
- package/src/athena/visitor.ts +2 -1
|
@@ -60,6 +60,23 @@ function isSplitUrlIndexed(node) {
|
|
|
60
60
|
}
|
|
61
61
|
return Array.isArray(fn["array_index"]) && fn["array_index"].length > 0;
|
|
62
62
|
}
|
|
63
|
+
function isSplitPartUrl(node) {
|
|
64
|
+
const fn = rec(node);
|
|
65
|
+
if (fn?.["type"] !== "function") {
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
if (getFunctionName(node) !== "split_part") {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
const args = fn["args"]?.value;
|
|
72
|
+
if (!Array.isArray(args) || args[2] === void 0) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
if (getColumnName(args[0]) !== "url") {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
return getStringValue(args[1]) === "/" && getNumberValue(args[2]) !== void 0;
|
|
79
|
+
}
|
|
63
80
|
function isCardinalitySplitUrl(node) {
|
|
64
81
|
const fn = rec(node);
|
|
65
82
|
if (fn?.["type"] !== "function") {
|
|
@@ -94,6 +111,10 @@ function getConditionTableQualifier(left) {
|
|
|
94
111
|
const args = rec(left)?.["args"]?.value;
|
|
95
112
|
return getColumnTable(args?.[0]) ?? null;
|
|
96
113
|
}
|
|
114
|
+
if (isSplitPartUrl(left)) {
|
|
115
|
+
const args = rec(left)?.["args"]?.value;
|
|
116
|
+
return getColumnTable(args?.[0]) ?? null;
|
|
117
|
+
}
|
|
97
118
|
if (isCardinalitySplitUrl(left)) {
|
|
98
119
|
const outerArgs = rec(left)?.["args"]?.value;
|
|
99
120
|
const splitFn = rec(outerArgs?.[0]);
|
|
@@ -135,6 +156,19 @@ function buildLeafPredicate(node, tableAlias) {
|
|
|
135
156
|
};
|
|
136
157
|
}
|
|
137
158
|
}
|
|
159
|
+
if (isSplitPartUrl(left)) {
|
|
160
|
+
const args = rec(left)?.["args"]?.value;
|
|
161
|
+
const index = getNumberValue(args?.[2]);
|
|
162
|
+
const value = getStringValue(right);
|
|
163
|
+
if (index !== void 0 && value !== void 0) {
|
|
164
|
+
return (path) => {
|
|
165
|
+
const parts = path.split("/");
|
|
166
|
+
const part = parts[index - 1];
|
|
167
|
+
log("checking split_part path part", { path, index, part, value });
|
|
168
|
+
return part?.startsWith(":") === true ? true : part === value;
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
}
|
|
138
172
|
if (isCardinalitySplitUrl(left)) {
|
|
139
173
|
const count = getNumberValue(right);
|
|
140
174
|
if (count !== void 0) {
|
|
@@ -195,4 +229,4 @@ function matchApi(selectAST, tableAST, apiSchemas) {
|
|
|
195
229
|
export {
|
|
196
230
|
matchApi
|
|
197
231
|
};
|
|
198
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
232
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2F0aGVuYS9hcGktbWF0Y2hlci50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFFQSxPQUFPLFdBQVc7QUFNbEIsSUFBTSxNQUFNLE1BQU0sa0NBQWtDO0FBa0JwRCxJQUFNLGNBQWtDLE1BQU07QUFJOUMsU0FBUyxJQUFJLE1BQW9EO0FBQy9ELFNBQU8sT0FBTyxTQUFTLFlBQVksU0FBUyxPQUFRLE9BQW1DO0FBQ3pGO0FBRUEsU0FBUyxnQkFBZ0IsTUFBbUM7QUFDMUQsUUFBTSxLQUFLLElBQUksSUFBSTtBQUNuQixNQUFJLEtBQUssTUFBTSxNQUFNLFlBQVk7QUFDL0IsV0FBTztBQUFBLEVBQ1Q7QUFDQSxRQUFNLE9BQU8sR0FBRyxNQUFNO0FBQ3RCLFFBQU0sWUFBWSxNQUFNLEtBQUssQ0FBQztBQUM5QixTQUFPLGNBQWMsU0FBWSxTQUFZLFVBQVUsTUFBTSxZQUFZO0FBQzNFO0FBRUEsU0FBUyxjQUFjLE1BQW1DO0FBQ3hELFFBQU0sTUFBTSxJQUFJLElBQUk7QUFDcEIsTUFBSSxNQUFNLE1BQU0sTUFBTSxjQUFjO0FBQ2xDLFdBQU87QUFBQSxFQUNUO0FBQ0EsUUFBTSxTQUFVLEtBQXVCO0FBQ3ZDLFNBQU8sT0FBTyxXQUFXLFdBQVcsT0FBTyxZQUFZLElBQUk7QUFDN0Q7QUFFQSxTQUFTLGVBQWUsTUFBMEM7QUFDaEUsUUFBTSxNQUFNLElBQUksSUFBSTtBQUNwQixNQUFJLE1BQU0sTUFBTSxNQUFNLGNBQWM7QUFDbEMsV0FBTztBQUFBLEVBQ1Q7QUFDQSxTQUFRLEtBQXVCO0FBQ2pDO0FBRUEsU0FBUyxlQUFlLE1BQW1DO0FBQ3pELFFBQU0sTUFBTSxJQUFJLElBQUk7QUFDcEIsTUFBSSxNQUFNLE1BQU0sTUFBTSx5QkFBeUIsTUFBTSxNQUFNLE1BQU0sVUFBVTtBQUN6RSxXQUFPO0FBQUEsRUFDVDtBQUNBLFNBQU8sT0FBTyxJQUFJLE9BQU8sTUFBTSxXQUFXLElBQUksT0FBTyxJQUFJO0FBQzNEO0FBRUEsU0FBUyxl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
|
|
@@ -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,29 @@ 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 sqlStartOffset(sqlNode) {
|
|
47
|
+
const afterQuote = sqlNode.range[0] + 1;
|
|
48
|
+
if (sqlNode.type !== AST_NODE_TYPES.TemplateLiteral) {
|
|
49
|
+
return afterQuote;
|
|
50
|
+
}
|
|
51
|
+
const rawSql = sqlNode.quasis.map((quasi) => quasi.value.cooked ?? "").join("");
|
|
52
|
+
return afterQuote + (rawSql.length - rawSql.trimStart().length);
|
|
53
|
+
}
|
|
37
54
|
function resolvedCol(name, schema, ast) {
|
|
38
55
|
return ast !== void 0 ? { name, schema, ast } : { name, schema };
|
|
39
56
|
}
|
|
@@ -147,7 +164,7 @@ function expandWildcard(referencedTables, columns) {
|
|
|
147
164
|
}
|
|
148
165
|
}
|
|
149
166
|
}
|
|
150
|
-
function resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns) {
|
|
167
|
+
function resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns, ast) {
|
|
151
168
|
const adjustedPath = `$.${propertyAccessor.substring(1).replace(/(\.|\[)/gu, "..properties$1")}`;
|
|
152
169
|
log("adjusted path", adjustedPath);
|
|
153
170
|
const extractedSchemas = resolvedColumns.flatMap(
|
|
@@ -155,19 +172,20 @@ function resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns) {
|
|
|
155
172
|
);
|
|
156
173
|
log("extracted schemas", extractedSchemas);
|
|
157
174
|
if (extractedSchemas.length === 0) {
|
|
158
|
-
throw new AthenaError(ATHENA_ERROR, `property not found ${colRef} - ${propertyAccessor}
|
|
175
|
+
throw new AthenaError(ATHENA_ERROR, `property not found ${colRef} - ${propertyAccessor}`, ast);
|
|
159
176
|
}
|
|
160
177
|
return extractedSchemas;
|
|
161
178
|
}
|
|
162
179
|
function navigateSchemaPath(colRef, propertyAccessor, resolvedColumns, colName, columnAST, columns) {
|
|
163
|
-
const
|
|
180
|
+
const errorAst = extractJsonExtractCalls(columnAST)[0]?.fnNode ?? columnAST;
|
|
181
|
+
const extractedSchemas = resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns, errorAst);
|
|
164
182
|
columns.set(
|
|
165
183
|
colName,
|
|
166
184
|
extractedSchemas.map((schema) => resolvedCol(colName, schema, columnAST))
|
|
167
185
|
);
|
|
168
186
|
}
|
|
169
187
|
function validateComplexColumnExpression(columnAST, allTables, ctx) {
|
|
170
|
-
for (const { ref, path } of extractJsonExtractCalls(columnAST)) {
|
|
188
|
+
for (const { ref, path, fnNode } of extractJsonExtractCalls(columnAST)) {
|
|
171
189
|
const tableRef = ref.table ?? void 0;
|
|
172
190
|
const colRef = typeof ref.column === "string" ? ref.column : void 0;
|
|
173
191
|
if (colRef === void 0) {
|
|
@@ -176,7 +194,7 @@ function validateComplexColumnExpression(columnAST, allTables, ctx) {
|
|
|
176
194
|
const referencedTables = tableRef !== void 0 ? lookupTables(tableRef, ctx) : allTables;
|
|
177
195
|
const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
|
|
178
196
|
if (resolvedColumns.length > 0) {
|
|
179
|
-
resolveSchemaAtPath(colRef, path, resolvedColumns);
|
|
197
|
+
resolveSchemaAtPath(colRef, path, resolvedColumns, fnNode);
|
|
180
198
|
}
|
|
181
199
|
}
|
|
182
200
|
}
|
|
@@ -195,7 +213,7 @@ function resolveSingleColumnRef(columnAST, columnAlias, indexedName, ref, allTab
|
|
|
195
213
|
const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
|
|
196
214
|
if (resolvedColumns.length === 0) {
|
|
197
215
|
const tableNames = [...ctx.tables.keys()].join(", ");
|
|
198
|
-
throw new AthenaError(ATHENA_ERROR, `can't found column ${colRef} in tables: ${tableNames}
|
|
216
|
+
throw new AthenaError(ATHENA_ERROR, `can't found column ${colRef} in tables: ${tableNames}`, columnAST);
|
|
199
217
|
}
|
|
200
218
|
const propertyAccessor = extractJsonExtractPath(columnAST) ?? extractBracketAccessorPath(columnAST);
|
|
201
219
|
if (propertyAccessor !== void 0) {
|
|
@@ -301,17 +319,31 @@ var rule = createRule({
|
|
|
301
319
|
});
|
|
302
320
|
return;
|
|
303
321
|
}
|
|
322
|
+
const sqlStart = sqlStartOffset(sqlNode);
|
|
304
323
|
const athenaCtx = createRootContext();
|
|
305
324
|
try {
|
|
306
325
|
checkAthenaAst(Array.isArray(ast) ? ast[0] : ast, athenaCtx);
|
|
307
326
|
} catch (error) {
|
|
308
327
|
log("error checking Athena AST", { error, sql });
|
|
309
328
|
if (error instanceof AthenaError) {
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
329
|
+
const astLoc = error.ast?.loc;
|
|
330
|
+
if (astLoc !== void 0) {
|
|
331
|
+
const sourceText = context.sourceCode.getText();
|
|
332
|
+
context.report({
|
|
333
|
+
loc: {
|
|
334
|
+
start: offsetToLoc(sourceText, sqlStart + astLoc.start.offset),
|
|
335
|
+
end: offsetToLoc(sourceText, sqlStart + astLoc.end.offset)
|
|
336
|
+
},
|
|
337
|
+
messageId: ATHENA_ERROR,
|
|
338
|
+
data: { errorMessage: error.message }
|
|
339
|
+
});
|
|
340
|
+
} else {
|
|
341
|
+
context.report({
|
|
342
|
+
node: sqlNode,
|
|
343
|
+
messageId: ATHENA_ERROR,
|
|
344
|
+
data: { errorMessage: error.message }
|
|
345
|
+
});
|
|
346
|
+
}
|
|
315
347
|
} else {
|
|
316
348
|
console.error(`Failed to apply ${ruleId} rule for "${context.filename}":`, error);
|
|
317
349
|
context.report({
|
|
@@ -343,4 +375,4 @@ export {
|
|
|
343
375
|
athena_default as default,
|
|
344
376
|
ruleId
|
|
345
377
|
};
|
|
346
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/athena/athena.ts"],
  "mappings": "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",
  "names": ["tableName", "alias", "apiSchemas", "operations"]
}

|
|
378
|
+
//# 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-d38b","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"}}}}
|
|
@@ -97,6 +97,25 @@ function isSplitUrlIndexed(node: unknown): node is SplitUrlIndexed {
|
|
|
97
97
|
return Array.isArray(fn['array_index']) && (fn['array_index'] as unknown[]).length > 0;
|
|
98
98
|
}
|
|
99
99
|
|
|
100
|
+
// Matches: split_part(url, '/', N) — Presto-style, index in args[2] (1-based)
|
|
101
|
+
function isSplitPartUrl(node: unknown): node is SqlFunction {
|
|
102
|
+
const fn = rec(node);
|
|
103
|
+
if (fn?.['type'] !== 'function') {
|
|
104
|
+
return false;
|
|
105
|
+
}
|
|
106
|
+
if (getFunctionName(node) !== 'split_part') {
|
|
107
|
+
return false;
|
|
108
|
+
}
|
|
109
|
+
const args = (fn['args'] as { value?: unknown[] } | undefined)?.value;
|
|
110
|
+
if (!Array.isArray(args) || args[2] === undefined) {
|
|
111
|
+
return false;
|
|
112
|
+
}
|
|
113
|
+
if (getColumnName(args[0]) !== 'url') {
|
|
114
|
+
return false;
|
|
115
|
+
}
|
|
116
|
+
return getStringValue(args[1]) === '/' && getNumberValue(args[2]) !== undefined;
|
|
117
|
+
}
|
|
118
|
+
|
|
100
119
|
// Matches: cardinality(split(url, '/'))
|
|
101
120
|
function isCardinalitySplitUrl(node: unknown): node is SqlFunction {
|
|
102
121
|
const fn = rec(node);
|
|
@@ -136,6 +155,10 @@ function getConditionTableQualifier(left: unknown): string | null | undefined {
|
|
|
136
155
|
const args = (rec(left)?.['args'] as { value?: unknown[] } | undefined)?.value;
|
|
137
156
|
return getColumnTable(args?.[0]) ?? null;
|
|
138
157
|
}
|
|
158
|
+
if (isSplitPartUrl(left)) {
|
|
159
|
+
const args = (rec(left)?.['args'] as { value?: unknown[] } | undefined)?.value;
|
|
160
|
+
return getColumnTable(args?.[0]) ?? null;
|
|
161
|
+
}
|
|
139
162
|
if (isCardinalitySplitUrl(left)) {
|
|
140
163
|
const outerArgs = (rec(left)?.['args'] as { value?: unknown[] } | undefined)?.value;
|
|
141
164
|
const splitFn = rec(outerArgs?.[0]);
|
|
@@ -192,6 +215,21 @@ function buildLeafPredicate(node: Binary, tableAlias: string | null): OperationP
|
|
|
192
215
|
}
|
|
193
216
|
}
|
|
194
217
|
|
|
218
|
+
// split_part(url, '/', N) = 'value'
|
|
219
|
+
if (isSplitPartUrl(left)) {
|
|
220
|
+
const args = (rec(left)?.['args'] as { value?: unknown[] } | undefined)?.value;
|
|
221
|
+
const index = getNumberValue(args?.[2]);
|
|
222
|
+
const value = getStringValue(right);
|
|
223
|
+
if (index !== undefined && value !== undefined) {
|
|
224
|
+
return (path) => {
|
|
225
|
+
const parts = path.split('/');
|
|
226
|
+
const part = parts[index - 1]; // 1-based
|
|
227
|
+
log('checking split_part path part', { path, index, part, value });
|
|
228
|
+
return part?.startsWith(':') === true ? true : part === value;
|
|
229
|
+
};
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
|
|
195
233
|
// cardinality(split(url, '/')) = N
|
|
196
234
|
if (isCardinalitySplitUrl(left)) {
|
|
197
235
|
const count = getNumberValue(right);
|
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,33 @@ 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
|
+
// Return the absolute source offset of the first character of the SQL that was passed to the parser.
|
|
68
|
+
// Template literals trim the raw content before parsing; string literals do not.
|
|
69
|
+
function sqlStartOffset(sqlNode: TSESTree.Node): number {
|
|
70
|
+
const afterQuote = sqlNode.range[0] + 1; // skip the opening backtick or quote
|
|
71
|
+
if (sqlNode.type !== AST_NODE_TYPES.TemplateLiteral) {
|
|
72
|
+
return afterQuote;
|
|
53
73
|
}
|
|
74
|
+
const rawSql = sqlNode.quasis.map((quasi) => quasi.value.cooked ?? '').join('');
|
|
75
|
+
return afterQuote + (rawSql.length - rawSql.trimStart().length);
|
|
54
76
|
}
|
|
55
77
|
|
|
56
78
|
// ---------------------------------------------------------------------------
|
|
@@ -233,6 +255,7 @@ function resolveSchemaAtPath(
|
|
|
233
255
|
colRef: string,
|
|
234
256
|
propertyAccessor: string,
|
|
235
257
|
resolvedColumns: ResolvedColumn[],
|
|
258
|
+
ast?: object,
|
|
236
259
|
): SchemaObject[] {
|
|
237
260
|
// Double-dot handles allOf / anyOf / oneOf wrappers that may appear in the schema.
|
|
238
261
|
// eslint-disable-next-line prefer-named-capture-group
|
|
@@ -245,7 +268,7 @@ function resolveSchemaAtPath(
|
|
|
245
268
|
log('extracted schemas', extractedSchemas);
|
|
246
269
|
|
|
247
270
|
if (extractedSchemas.length === 0) {
|
|
248
|
-
throw new AthenaError(ATHENA_ERROR, `property not found ${colRef} - ${propertyAccessor}
|
|
271
|
+
throw new AthenaError(ATHENA_ERROR, `property not found ${colRef} - ${propertyAccessor}`, ast);
|
|
249
272
|
}
|
|
250
273
|
return extractedSchemas;
|
|
251
274
|
}
|
|
@@ -258,7 +281,9 @@ function navigateSchemaPath(
|
|
|
258
281
|
columnAST: unknown,
|
|
259
282
|
columns: Map<string, ResolvedColumn[]>,
|
|
260
283
|
): void {
|
|
261
|
-
|
|
284
|
+
// Prefer the inner function/expression node for location: the Column wrapper rarely carries loc.
|
|
285
|
+
const errorAst = (extractJsonExtractCalls(columnAST)[0]?.fnNode ?? columnAST) as object;
|
|
286
|
+
const extractedSchemas = resolveSchemaAtPath(colRef, propertyAccessor, resolvedColumns, errorAst);
|
|
262
287
|
columns.set(
|
|
263
288
|
colName,
|
|
264
289
|
extractedSchemas.map((schema) => resolvedCol(colName, schema, columnAST as object)),
|
|
@@ -271,7 +296,7 @@ function navigateSchemaPath(
|
|
|
271
296
|
|
|
272
297
|
/** Validate all json_extract / json_extract_scalar paths in a complex column expression. */
|
|
273
298
|
function validateComplexColumnExpression(columnAST: unknown, allTables: ResolvedTable[], ctx: VisitContext): void {
|
|
274
|
-
for (const { ref, path } of extractJsonExtractCalls(columnAST)) {
|
|
299
|
+
for (const { ref, path, fnNode } of extractJsonExtractCalls(columnAST)) {
|
|
275
300
|
const tableRef = ref.table ?? undefined;
|
|
276
301
|
const colRef = typeof ref.column === 'string' ? ref.column : undefined;
|
|
277
302
|
if (colRef === undefined) {
|
|
@@ -280,7 +305,7 @@ function validateComplexColumnExpression(columnAST: unknown, allTables: Resolved
|
|
|
280
305
|
const referencedTables = tableRef !== undefined ? lookupTables(tableRef, ctx) : allTables;
|
|
281
306
|
const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
|
|
282
307
|
if (resolvedColumns.length > 0) {
|
|
283
|
-
resolveSchemaAtPath(colRef, path, resolvedColumns); // throws if path not found
|
|
308
|
+
resolveSchemaAtPath(colRef, path, resolvedColumns, fnNode); // throws if path not found
|
|
284
309
|
}
|
|
285
310
|
}
|
|
286
311
|
}
|
|
@@ -313,7 +338,7 @@ function resolveSingleColumnRef(
|
|
|
313
338
|
|
|
314
339
|
if (resolvedColumns.length === 0) {
|
|
315
340
|
const tableNames = [...ctx.tables.keys()].join(', ');
|
|
316
|
-
throw new AthenaError(ATHENA_ERROR, `can't found column ${colRef} in tables: ${tableNames}
|
|
341
|
+
throw new AthenaError(ATHENA_ERROR, `can't found column ${colRef} in tables: ${tableNames}`, columnAST as object);
|
|
317
342
|
}
|
|
318
343
|
|
|
319
344
|
const propertyAccessor = extractJsonExtractPath(columnAST) ?? extractBracketAccessorPath(columnAST);
|
|
@@ -461,6 +486,7 @@ const rule: ESLintUtils.RuleModule<typeof SYNTEXT_ERROR | typeof ATHENA_ERROR> =
|
|
|
461
486
|
return;
|
|
462
487
|
}
|
|
463
488
|
|
|
489
|
+
const sqlStart = sqlStartOffset(sqlNode);
|
|
464
490
|
const athenaCtx = createRootContext();
|
|
465
491
|
try {
|
|
466
492
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
@@ -468,11 +494,25 @@ const rule: ESLintUtils.RuleModule<typeof SYNTEXT_ERROR | typeof ATHENA_ERROR> =
|
|
|
468
494
|
} catch (error) {
|
|
469
495
|
log('error checking Athena AST', { error, sql });
|
|
470
496
|
if (error instanceof AthenaError) {
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
497
|
+
const astLoc = (error.ast as { loc?: { start: { offset: number }; end: { offset: number } } } | undefined)
|
|
498
|
+
?.loc;
|
|
499
|
+
if (astLoc !== undefined) {
|
|
500
|
+
const sourceText = context.sourceCode.getText();
|
|
501
|
+
context.report({
|
|
502
|
+
loc: {
|
|
503
|
+
start: offsetToLoc(sourceText, sqlStart + astLoc.start.offset),
|
|
504
|
+
end: offsetToLoc(sourceText, sqlStart + astLoc.end.offset),
|
|
505
|
+
},
|
|
506
|
+
messageId: ATHENA_ERROR,
|
|
507
|
+
data: { errorMessage: error.message },
|
|
508
|
+
});
|
|
509
|
+
} else {
|
|
510
|
+
context.report({
|
|
511
|
+
node: sqlNode,
|
|
512
|
+
messageId: ATHENA_ERROR,
|
|
513
|
+
data: { errorMessage: error.message },
|
|
514
|
+
});
|
|
515
|
+
}
|
|
476
516
|
} else {
|
|
477
517
|
// eslint-disable-next-line no-console
|
|
478
518
|
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;
|