@checkdigit/eslint-plugin 7.18.0-PR.143-c73c → 7.18.0-PR.143-a26e
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/validate.mjs +78 -43
- package/dist-mjs/athena/visitor.mjs +12 -1
- package/dist-types/athena/types.d.ts +20 -1
- package/dist-types/athena/visitor.d.ts +5 -2
- package/package.json +1 -1
- package/src/athena/types.ts +10 -1
- package/src/athena/validate.ts +100 -49
- package/src/athena/visitor.ts +15 -1
|
@@ -18,7 +18,8 @@ import {
|
|
|
18
18
|
isBaseFrom,
|
|
19
19
|
isJoin,
|
|
20
20
|
isTableExpr,
|
|
21
|
-
isUnnestFrom
|
|
21
|
+
isUnnestFrom,
|
|
22
|
+
isValuesFrom
|
|
22
23
|
} from "./visitor.mjs";
|
|
23
24
|
var SYNTEXT_ERROR = "SyntextError";
|
|
24
25
|
var ATHENA_ERROR = "AthenaError";
|
|
@@ -40,6 +41,7 @@ function offsetToLoc(text, offset) {
|
|
|
40
41
|
return { line: lines.length, column: lines[lines.length - 1]?.length ?? 0 };
|
|
41
42
|
}
|
|
42
43
|
var log = debug("eslint-plugin:athena");
|
|
44
|
+
var ANONYMOUS_TABLE = "<anonymous>";
|
|
43
45
|
function resolvedCol(name, schema, ast) {
|
|
44
46
|
return ast !== void 0 ? { name, schema, ast } : { name, schema };
|
|
45
47
|
}
|
|
@@ -52,6 +54,9 @@ function getApiSchemas(serviceName, ctx) {
|
|
|
52
54
|
return schemas;
|
|
53
55
|
}
|
|
54
56
|
function lookupTables(nameOrAlias, ctx) {
|
|
57
|
+
if (ctx.tables.has(nameOrAlias)) {
|
|
58
|
+
return ctx.tables.get(nameOrAlias) ?? [];
|
|
59
|
+
}
|
|
55
60
|
const canonical = ctx.aliases.get(nameOrAlias) ?? nameOrAlias;
|
|
56
61
|
return ctx.tables.get(canonical) ?? [];
|
|
57
62
|
}
|
|
@@ -64,15 +69,16 @@ function fromClauseItems(select) {
|
|
|
64
69
|
}
|
|
65
70
|
return [];
|
|
66
71
|
}
|
|
67
|
-
function resolveServiceTable(select, item, ctx) {
|
|
72
|
+
function resolveServiceTable(select, item, ctx, storageKey) {
|
|
68
73
|
const { table: tableName } = item;
|
|
74
|
+
const key = storageKey ?? tableName;
|
|
69
75
|
try {
|
|
70
76
|
const apiSchemas = getApiSchemas(tableName, ctx);
|
|
71
77
|
if (apiSchemas.length === 0) {
|
|
72
78
|
throw new AthenaError(ATHENA_ERROR, `service not found: "${tableName}" (no swagger schema located)`, item);
|
|
73
79
|
}
|
|
74
80
|
const operations = matchApi(select, item, apiSchemas) ?? [];
|
|
75
|
-
ctx.tables.set(
|
|
81
|
+
ctx.tables.set(key, buildServiceTables(tableName, operations));
|
|
76
82
|
} catch (error) {
|
|
77
83
|
if (error instanceof AthenaError) {
|
|
78
84
|
throw error;
|
|
@@ -80,52 +86,80 @@ function resolveServiceTable(select, item, ctx) {
|
|
|
80
86
|
throw new AthenaError(ATHENA_ERROR, error instanceof Error ? error.message : String(error), item);
|
|
81
87
|
}
|
|
82
88
|
}
|
|
83
|
-
function
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
function getFunctionAliasName(as) {
|
|
90
|
+
return as?.name.name[0]?.value;
|
|
91
|
+
}
|
|
92
|
+
function isStandaloneUnnest(node) {
|
|
93
|
+
return isUnnestFrom(node) && typeof node.expr.column !== "string";
|
|
94
|
+
}
|
|
95
|
+
function fromItemTableNames(item) {
|
|
96
|
+
if (isBaseFrom(item) || isJoin(item)) {
|
|
97
|
+
return item.as !== null ? [item.as, item.table] : [item.table];
|
|
98
|
+
}
|
|
99
|
+
if (isTableExpr(item)) {
|
|
100
|
+
return [typeof item.as === "string" ? item.as : "<subquery>"];
|
|
91
101
|
}
|
|
102
|
+
if (isValuesFrom(item)) {
|
|
103
|
+
const alias = getFunctionAliasName(item.as);
|
|
104
|
+
return alias !== void 0 ? [alias] : [];
|
|
105
|
+
}
|
|
106
|
+
const unknownItem = item;
|
|
107
|
+
if (isStandaloneUnnest(unknownItem)) {
|
|
108
|
+
const alias = getFunctionAliasName(unknownItem.as);
|
|
109
|
+
return alias !== void 0 ? [alias] : [];
|
|
110
|
+
}
|
|
111
|
+
return [];
|
|
112
|
+
}
|
|
113
|
+
function restrictToFromClause(select, ctx) {
|
|
114
|
+
const fromNames = new Set(fromClauseItems(select).flatMap(fromItemTableNames));
|
|
92
115
|
for (const name of [...ctx.tables.keys()]) {
|
|
93
116
|
if (!fromNames.has(name)) {
|
|
94
117
|
ctx.tables.delete(name);
|
|
95
118
|
}
|
|
96
119
|
}
|
|
97
120
|
}
|
|
121
|
+
function tableIsResolved(tableName, storageKey, ctx) {
|
|
122
|
+
return ctx.tables.has(storageKey) || ctx.tables.has(tableName);
|
|
123
|
+
}
|
|
124
|
+
function resolveTableOrJoinItem(select, item, ctx) {
|
|
125
|
+
const { table: tableName, as: alias } = item;
|
|
126
|
+
if (alias !== null) {
|
|
127
|
+
ctx.aliases.set(alias, tableName);
|
|
128
|
+
}
|
|
129
|
+
const storageKey = alias ?? tableName;
|
|
130
|
+
if (!tableIsResolved(tableName, storageKey, ctx)) {
|
|
131
|
+
resolveServiceTable(select, item, ctx, alias ?? void 0);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
98
134
|
function resolveFromClause(select, ctx) {
|
|
99
135
|
for (const item of fromClauseItems(select)) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
ctx.aliases.set(alias2, tableName2);
|
|
136
|
+
const unknownItem = item;
|
|
137
|
+
if (isStandaloneUnnest(unknownItem)) {
|
|
138
|
+
const tableAlias = getFunctionAliasName(unknownItem.as);
|
|
139
|
+
if (tableAlias !== void 0) {
|
|
140
|
+
const columns = new Map(
|
|
141
|
+
(unknownItem.as?.args.value ?? []).map((columnRef) => {
|
|
142
|
+
const colName = columnRef.column;
|
|
143
|
+
return [colName, [resolvedCol(colName, {})]];
|
|
144
|
+
})
|
|
145
|
+
);
|
|
146
|
+
ctx.tables.set(tableAlias, [{ name: tableAlias, columns }]);
|
|
112
147
|
}
|
|
113
|
-
|
|
114
|
-
|
|
148
|
+
} else if (isUnnestFrom(unknownItem)) {
|
|
149
|
+
} else if (isValuesFrom(item)) {
|
|
150
|
+
const tableAlias = getFunctionAliasName(item.as);
|
|
151
|
+
if (tableAlias !== void 0) {
|
|
152
|
+
const columns = new Map(
|
|
153
|
+
item.as.args.value.map((columnRef) => [columnRef.column, [resolvedCol(columnRef.column, {})]])
|
|
154
|
+
);
|
|
155
|
+
ctx.tables.set(tableAlias, [{ name: tableAlias, columns }]);
|
|
115
156
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
const { table: tableName, as: alias } = item;
|
|
122
|
-
if (alias !== null) {
|
|
123
|
-
ctx.aliases.set(alias, tableName);
|
|
124
|
-
}
|
|
125
|
-
if (ctx.tables.has(tableName)) {
|
|
126
|
-
continue;
|
|
157
|
+
} else if (isTableExpr(item)) {
|
|
158
|
+
const alias = typeof item.as === "string" ? item.as : "<subquery>";
|
|
159
|
+
checkSelect(item.expr.ast, ctx, alias);
|
|
160
|
+
} else if (isJoin(item) || isBaseFrom(item)) {
|
|
161
|
+
resolveTableOrJoinItem(select, item, ctx);
|
|
127
162
|
}
|
|
128
|
-
resolveServiceTable(select, item, ctx);
|
|
129
163
|
}
|
|
130
164
|
}
|
|
131
165
|
function extractUnnestMappings(select) {
|
|
@@ -135,7 +169,9 @@ function extractUnnestMappings(select) {
|
|
|
135
169
|
continue;
|
|
136
170
|
}
|
|
137
171
|
const fromColumn = typeof item.expr.column === "string" ? item.expr.column : void 0;
|
|
138
|
-
|
|
172
|
+
if (fromColumn === void 0) {
|
|
173
|
+
continue;
|
|
174
|
+
}
|
|
139
175
|
const aliasArgs = item.as?.args.value ?? [];
|
|
140
176
|
const toColumns = [];
|
|
141
177
|
for (const col of aliasArgs) {
|
|
@@ -158,7 +194,7 @@ function applyUnnestPre(mappings, ctx) {
|
|
|
158
194
|
}
|
|
159
195
|
const sourceColumns = ownerTable.columns.get(fromColumn) ?? [];
|
|
160
196
|
const sourceSchema = sourceColumns[0]?.schema;
|
|
161
|
-
const unnestTableName = `${ownerTable.name ??
|
|
197
|
+
const unnestTableName = `${ownerTable.name ?? ANONYMOUS_TABLE}:<unnested>`;
|
|
162
198
|
const apiOperation = ownerTable.apiOperation !== void 0 ? { apiOperation: ownerTable.apiOperation } : {};
|
|
163
199
|
if (sourceSchema?.type === "array") {
|
|
164
200
|
const [toColumn] = toColumns;
|
|
@@ -286,7 +322,7 @@ function lookupColumnOrThrow(colRef, ref, referencedTables) {
|
|
|
286
322
|
const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
|
|
287
323
|
if (resolvedColumns.length === 0) {
|
|
288
324
|
const tableNames = [
|
|
289
|
-
...new Set(referencedTables.map((referenceTable) => referenceTable.name ??
|
|
325
|
+
...new Set(referencedTables.map((referenceTable) => referenceTable.name ?? ANONYMOUS_TABLE))
|
|
290
326
|
].join(", ");
|
|
291
327
|
const availableCols = [...new Set(referencedTables.flatMap((table) => [...table.columns.keys()]))].join(", ");
|
|
292
328
|
throw new AthenaError(
|
|
@@ -341,10 +377,9 @@ function resolveSingleColumnRef(columnAST, columnAlias, indexedName, ref, allTab
|
|
|
341
377
|
assert.ok(colRef !== void 0, "column_ref must have a string column name");
|
|
342
378
|
const referencedTables = tableRef !== void 0 ? lookupTables(tableRef, ctx) : allTables;
|
|
343
379
|
if (referencedTables.length === 0) {
|
|
344
|
-
const tableNames = [...ctx.tables.keys()].join(", ");
|
|
345
380
|
throw new AthenaError(
|
|
346
381
|
ATHENA_ERROR,
|
|
347
|
-
`unknown table or alias '${tableRef ?? colRef}'; known tables: ${
|
|
382
|
+
`unknown table or alias '${tableRef ?? colRef}'; known tables: ${[...ctx.tables.keys()].join(", ")}`,
|
|
348
383
|
ref
|
|
349
384
|
);
|
|
350
385
|
}
|
|
@@ -477,4 +512,4 @@ export {
|
|
|
477
512
|
checkAthenaAst,
|
|
478
513
|
offsetToLoc
|
|
479
514
|
};
|
|
480
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/athena/validate.ts"],
  "mappings": "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",
  "names": ["alias", "tableName"]
}

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

|
|
@@ -7,6 +7,13 @@ function isUnnestFrom(node) {
|
|
|
7
7
|
function isDual(node) {
|
|
8
8
|
return typeof node === "object" && node !== null && node.type === "dual";
|
|
9
9
|
}
|
|
10
|
+
function isValuesFrom(node) {
|
|
11
|
+
if (typeof node !== "object" || node === null) {
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
14
|
+
const expr = node.expr;
|
|
15
|
+
return typeof expr === "object" && expr !== null && expr.type === "values";
|
|
16
|
+
}
|
|
10
17
|
function isTableExpr(node) {
|
|
11
18
|
if (typeof node !== "object" || node === null) {
|
|
12
19
|
return false;
|
|
@@ -122,6 +129,9 @@ function walkFrom(node, visitor) {
|
|
|
122
129
|
}
|
|
123
130
|
return;
|
|
124
131
|
}
|
|
132
|
+
if (isValuesFrom(node)) {
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
125
135
|
visitor.visitBaseFrom?.(node);
|
|
126
136
|
}
|
|
127
137
|
function walk(node, visitor) {
|
|
@@ -295,6 +305,7 @@ export {
|
|
|
295
305
|
isJoin,
|
|
296
306
|
isTableExpr,
|
|
297
307
|
isUnnestFrom,
|
|
308
|
+
isValuesFrom,
|
|
298
309
|
walk
|
|
299
310
|
};
|
|
300
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
311
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2F0aGVuYS92aXNpdG9yLnRzIl0sCiAgIm1hcHBpbmdzIjogIjtBQUVBLE9BQU8sV0FBVztBQUVsQixJQUFNLE1BQU0sTUFBTSxnQkFBZ0I7QUFvRTNCLFNBQVMsYUFBYSxNQUFtQztBQUM5RCxTQUFPLE9BQU8sU0FBUyxZQUFZLFNBQVMsUUFBUyxLQUE0QixTQUFTO0FBQzVGO0FBRU8sU0FBUyxPQUFPLE1BQTZCO0FBQ2xELFNBQU8sT0FBTyxTQUFTLFlBQVksU0FBUyxRQUFTLEtBQTRCLFNBQVM7QUFDNUY7QUFFTyxTQUFTLGFBQWEsTUFBbUM7QUFDOUQsTUFBSSxPQUFPLFNBQVMsWUFBWSxTQUFTLE1BQU07QUFDN0MsV0FBTztBQUFBLEVBQ1Q7QUFDQSxRQUFNLE9BQVEsS0FBNEI7QUFDMUMsU0FBTyxPQUFPLFNBQVMsWUFBWSxTQUFTLFFBQVMsS0FBNEIsU0FBUztBQUM1RjtBQUVPLFNBQVMsWUFBWSxNQUFrQztBQUM1RCxNQUFJLE9BQU8sU0FBUyxZQUFZLFNBQVMsTUFBTTtBQUM3QyxXQUFPO0FBQUEsRUFDVDtBQUNBLFFBQU0sT0FBUSxLQUE0QjtBQUMxQyxTQUFPLE9BQU8sU0FBUyxZQUFZLFNBQVMsUUFBUSxTQUFTO0FBQy9EO0FBRU8sU0FBUyxPQUFPLE1BQTZCO0FBQ2xELFNBQ0UsQ0FBQyxhQUFhLElBQUksS0FDbEIsQ0FBQyxPQUFPLElBQUksS0FDWixDQUFDLFlBQVksSUFBSSxLQUNqQixPQUFPLFNBQVMsWUFDaEIsU0FBUyxRQUNULFVBQVU7QUFFZDtBQUVPLFNBQVMsV0FBVyxNQUFpQztBQUMxRCxTQUNFLENBQUMsYUFBYSxJQUFJLEtBQ2xCLENBQUMsT0FBTyxJQUFJLEtBQ1osQ0FBQyxZQUFZLElBQUksS0FDakIsQ0FBQyxPQUFPLElBQUksS0FDWixPQUFPLFNBQVMsWUFDaEIsU0FBUyxRQUNULFdBQVc7QUFFZjtBQUVPLFNBQVMsY0FBYyxNQUFpRDtBQUM3RSxRQUFNLFFBQVE7QUFDZCxTQUFPLE1B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
|
|
@@ -60,7 +60,26 @@ export interface Dual {
|
|
|
60
60
|
type: 'dual';
|
|
61
61
|
loc?: LocationRange;
|
|
62
62
|
}
|
|
63
|
-
export
|
|
63
|
+
export interface ValuesFrom {
|
|
64
|
+
expr: {
|
|
65
|
+
type: 'values';
|
|
66
|
+
};
|
|
67
|
+
as: {
|
|
68
|
+
type: 'function';
|
|
69
|
+
name: {
|
|
70
|
+
name: {
|
|
71
|
+
value: string;
|
|
72
|
+
}[];
|
|
73
|
+
};
|
|
74
|
+
args: {
|
|
75
|
+
type: 'expr_list';
|
|
76
|
+
value: {
|
|
77
|
+
column: string;
|
|
78
|
+
}[];
|
|
79
|
+
};
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
export type From = BaseFrom | Join | TableExpr | ValuesFrom | Dual;
|
|
64
83
|
export interface LimitValue {
|
|
65
84
|
type: string;
|
|
66
85
|
value: number;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import type { AggrFunc, BaseFrom, Binary, Case, Cast, Column, ColumnRefItem, Dual, ExpressionValue, ExprList, Function, Join, Select, TableExpr, With } from './types';
|
|
1
|
+
import type { AggrFunc, BaseFrom, Binary, Case, Cast, Column, ColumnRefItem, Dual, ExpressionValue, ExprList, Function, Join, Select, TableExpr, ValuesFrom, With } from './types';
|
|
2
2
|
export interface UnnestFrom {
|
|
3
3
|
type: 'unnest';
|
|
4
|
-
expr: ColumnRefItem
|
|
4
|
+
expr: ColumnRefItem | {
|
|
5
|
+
type: string;
|
|
6
|
+
};
|
|
5
7
|
parentheses: boolean;
|
|
6
8
|
as: {
|
|
7
9
|
type: 'function';
|
|
@@ -42,6 +44,7 @@ export interface VisitorMap {
|
|
|
42
44
|
}
|
|
43
45
|
export declare function isUnnestFrom(node: unknown): node is UnnestFrom;
|
|
44
46
|
export declare function isDual(node: unknown): node is Dual;
|
|
47
|
+
export declare function isValuesFrom(node: unknown): node is ValuesFrom;
|
|
45
48
|
export declare function isTableExpr(node: unknown): node is TableExpr;
|
|
46
49
|
export declare function isJoin(node: unknown): node is Join;
|
|
47
50
|
export declare function isBaseFrom(node: unknown): node is BaseFrom;
|
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-a26e","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":">=24.14.1"},"service":{"api":{"root":"src","endpoints":["api/v1"]}}}
|
package/src/athena/types.ts
CHANGED
|
@@ -67,7 +67,16 @@ export interface Dual {
|
|
|
67
67
|
type: 'dual';
|
|
68
68
|
loc?: LocationRange;
|
|
69
69
|
}
|
|
70
|
-
|
|
70
|
+
// Represents: (VALUES (...), ...) alias(col1, col2, ...)
|
|
71
|
+
export interface ValuesFrom {
|
|
72
|
+
expr: { type: 'values' };
|
|
73
|
+
as: {
|
|
74
|
+
type: 'function';
|
|
75
|
+
name: { name: { value: string }[] };
|
|
76
|
+
args: { type: 'expr_list'; value: { column: string }[] };
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
export type From = BaseFrom | Join | TableExpr | ValuesFrom | Dual;
|
|
71
80
|
export interface LimitValue {
|
|
72
81
|
type: string;
|
|
73
82
|
value: number;
|
package/src/athena/validate.ts
CHANGED
|
@@ -32,6 +32,8 @@ import {
|
|
|
32
32
|
isJoin,
|
|
33
33
|
isTableExpr,
|
|
34
34
|
isUnnestFrom,
|
|
35
|
+
isValuesFrom,
|
|
36
|
+
type UnnestFrom,
|
|
35
37
|
} from './visitor.ts';
|
|
36
38
|
|
|
37
39
|
export const SYNTEXT_ERROR = 'SyntextError';
|
|
@@ -58,6 +60,7 @@ export function offsetToLoc(text: string, offset: number): { line: number; colum
|
|
|
58
60
|
}
|
|
59
61
|
|
|
60
62
|
const log = debug('eslint-plugin:athena');
|
|
63
|
+
const ANONYMOUS_TABLE = '<anonymous>';
|
|
61
64
|
|
|
62
65
|
// ---------------------------------------------------------------------------
|
|
63
66
|
// Helpers
|
|
@@ -77,6 +80,10 @@ function getApiSchemas(serviceName: string, ctx: VisitContext) {
|
|
|
77
80
|
}
|
|
78
81
|
|
|
79
82
|
function lookupTables(nameOrAlias: string, ctx: VisitContext): ResolvedTable[] {
|
|
83
|
+
// Direct hit first: aliases are now stored under their alias key in ctx.tables.
|
|
84
|
+
if (ctx.tables.has(nameOrAlias)) {
|
|
85
|
+
return ctx.tables.get(nameOrAlias) ?? [];
|
|
86
|
+
}
|
|
80
87
|
const canonical = ctx.aliases.get(nameOrAlias) ?? nameOrAlias;
|
|
81
88
|
return ctx.tables.get(canonical) ?? [];
|
|
82
89
|
}
|
|
@@ -95,15 +102,18 @@ function fromClauseItems(select: Select): From[] {
|
|
|
95
102
|
// Pass 1 — Resolve FROM clause: service tables → ctx.tables + ctx.aliases
|
|
96
103
|
// ---------------------------------------------------------------------------
|
|
97
104
|
|
|
98
|
-
function resolveServiceTable(select: Select, item: BaseFrom, ctx: VisitContext): void {
|
|
105
|
+
function resolveServiceTable(select: Select, item: BaseFrom, ctx: VisitContext, storageKey?: string): void {
|
|
99
106
|
const { table: tableName } = item;
|
|
107
|
+
const key = storageKey ?? tableName;
|
|
100
108
|
try {
|
|
101
109
|
const apiSchemas = getApiSchemas(tableName, ctx);
|
|
102
110
|
if (apiSchemas.length === 0) {
|
|
103
111
|
throw new AthenaError(ATHENA_ERROR, `service not found: "${tableName}" (no swagger schema located)`, item);
|
|
104
112
|
}
|
|
105
113
|
const operations = matchApi(select, item, apiSchemas) ?? [];
|
|
106
|
-
|
|
114
|
+
// Always use the canonical table name for ResolvedTable.name so that error messages
|
|
115
|
+
// ("in tables: …") show the service name, not the alias.
|
|
116
|
+
ctx.tables.set(key, buildServiceTables(tableName, operations));
|
|
107
117
|
} catch (error) {
|
|
108
118
|
if (error instanceof AthenaError) {
|
|
109
119
|
throw error;
|
|
@@ -112,15 +122,41 @@ function resolveServiceTable(select: Select, item: BaseFrom, ctx: VisitContext):
|
|
|
112
122
|
}
|
|
113
123
|
}
|
|
114
124
|
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
125
|
+
// Returns the alias name for a ValuesFrom or a standalone UnnestFrom (UNNEST(fn(...))).
|
|
126
|
+
function getFunctionAliasName(as: { name: { name: { value: string }[] } } | null): string | undefined {
|
|
127
|
+
return as?.name.name[0]?.value;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
// UNNEST whose argument is a function call (e.g. SEQUENCE), not a column reference.
|
|
131
|
+
function isStandaloneUnnest(node: unknown): node is UnnestFrom {
|
|
132
|
+
return isUnnestFrom(node) && typeof (node.expr as { column?: unknown }).column !== 'string';
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
// Returns every name under which this FROM item can be stored in ctx.tables.
|
|
136
|
+
// Both the alias key and the canonical table name are returned so that service
|
|
137
|
+
// tables (stored under alias) and CTEs (stored under canonical name) both survive
|
|
138
|
+
// the prune in restrictToFromClause.
|
|
139
|
+
function fromItemTableNames(item: From): string[] {
|
|
140
|
+
if (isBaseFrom(item) || isJoin(item)) {
|
|
141
|
+
return item.as !== null ? [item.as, item.table] : [item.table];
|
|
142
|
+
}
|
|
143
|
+
if (isTableExpr(item)) {
|
|
144
|
+
return [typeof item.as === 'string' ? item.as : '<subquery>'];
|
|
145
|
+
}
|
|
146
|
+
if (isValuesFrom(item)) {
|
|
147
|
+
const alias = getFunctionAliasName(item.as);
|
|
148
|
+
return alias !== undefined ? [alias] : [];
|
|
149
|
+
}
|
|
150
|
+
const unknownItem = item as unknown;
|
|
151
|
+
if (isStandaloneUnnest(unknownItem)) {
|
|
152
|
+
const alias = getFunctionAliasName(unknownItem.as);
|
|
153
|
+
return alias !== undefined ? [alias] : [];
|
|
123
154
|
}
|
|
155
|
+
return [];
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
function restrictToFromClause(select: Select, ctx: VisitContext): void {
|
|
159
|
+
const fromNames = new Set(fromClauseItems(select).flatMap(fromItemTableNames));
|
|
124
160
|
for (const name of [...ctx.tables.keys()]) {
|
|
125
161
|
if (!fromNames.has(name)) {
|
|
126
162
|
ctx.tables.delete(name);
|
|
@@ -128,45 +164,55 @@ function restrictToFromClause(select: Select, ctx: VisitContext): void {
|
|
|
128
164
|
}
|
|
129
165
|
}
|
|
130
166
|
|
|
167
|
+
function tableIsResolved(tableName: string, storageKey: string, ctx: VisitContext): boolean {
|
|
168
|
+
return ctx.tables.has(storageKey) || ctx.tables.has(tableName);
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
// Shared resolution logic for BaseFrom and Join items (Join extends BaseFrom).
|
|
172
|
+
function resolveTableOrJoinItem(select: Select, item: BaseFrom, ctx: VisitContext): void {
|
|
173
|
+
const { table: tableName, as: alias } = item;
|
|
174
|
+
if (alias !== null) {
|
|
175
|
+
ctx.aliases.set(alias, tableName);
|
|
176
|
+
}
|
|
177
|
+
const storageKey = alias ?? tableName;
|
|
178
|
+
// Skip if already resolved: CTE stored under canonical name, or duplicate alias.
|
|
179
|
+
if (!tableIsResolved(tableName, storageKey, ctx)) {
|
|
180
|
+
resolveServiceTable(select, item, ctx, alias ?? undefined);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
|
|
131
184
|
function resolveFromClause(select: Select, ctx: VisitContext): void {
|
|
132
185
|
for (const item of fromClauseItems(select)) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
186
|
+
const unknownItem = item as unknown;
|
|
187
|
+
if (isStandaloneUnnest(unknownItem)) {
|
|
188
|
+
// Standalone UNNEST(fn()) — register alias with declared column names (schema unknown).
|
|
189
|
+
const tableAlias = getFunctionAliasName(unknownItem.as);
|
|
190
|
+
if (tableAlias !== undefined) {
|
|
191
|
+
const columns = new Map(
|
|
192
|
+
(unknownItem.as?.args.value ?? []).map((columnRef) => {
|
|
193
|
+
const colName = (columnRef as { column: string }).column;
|
|
194
|
+
return [colName, [resolvedCol(colName, {})]];
|
|
195
|
+
}),
|
|
196
|
+
);
|
|
197
|
+
ctx.tables.set(tableAlias, [{ name: tableAlias, columns }]);
|
|
198
|
+
}
|
|
199
|
+
} else if (isUnnestFrom(unknownItem)) {
|
|
200
|
+
// CROSS JOIN UNNEST with a column ref — handled later by extractUnnestMappings.
|
|
201
|
+
} else if (isValuesFrom(item)) {
|
|
202
|
+
const tableAlias = getFunctionAliasName(item.as);
|
|
203
|
+
if (tableAlias !== undefined) {
|
|
204
|
+
const columns = new Map(
|
|
205
|
+
item.as.args.value.map((columnRef) => [columnRef.column, [resolvedCol(columnRef.column, {})]]),
|
|
206
|
+
);
|
|
207
|
+
ctx.tables.set(tableAlias, [{ name: tableAlias, columns }]);
|
|
208
|
+
}
|
|
209
|
+
} else if (isTableExpr(item)) {
|
|
138
210
|
const alias = typeof item.as === 'string' ? item.as : '<subquery>';
|
|
139
211
|
// eslint-disable-next-line no-use-before-define
|
|
140
212
|
checkSelect(item.expr.ast, ctx, alias);
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
if (isJoin(item)) {
|
|
145
|
-
const { table: tableName, as: alias } = item;
|
|
146
|
-
if (alias !== null) {
|
|
147
|
-
ctx.aliases.set(alias, tableName);
|
|
148
|
-
}
|
|
149
|
-
if (!ctx.tables.has(tableName)) {
|
|
150
|
-
resolveServiceTable(select, item, ctx);
|
|
151
|
-
}
|
|
152
|
-
continue;
|
|
213
|
+
} else if (isJoin(item) || isBaseFrom(item)) {
|
|
214
|
+
resolveTableOrJoinItem(select, item, ctx);
|
|
153
215
|
}
|
|
154
|
-
|
|
155
|
-
if (!isBaseFrom(item)) {
|
|
156
|
-
continue;
|
|
157
|
-
}
|
|
158
|
-
|
|
159
|
-
const { table: tableName, as: alias } = item;
|
|
160
|
-
|
|
161
|
-
if (alias !== null) {
|
|
162
|
-
ctx.aliases.set(alias, tableName);
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
if (ctx.tables.has(tableName)) {
|
|
166
|
-
continue;
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
resolveServiceTable(select, item, ctx);
|
|
170
216
|
}
|
|
171
217
|
}
|
|
172
218
|
|
|
@@ -188,8 +234,14 @@ function extractUnnestMappings(select: Select): UnnestMapping[] {
|
|
|
188
234
|
continue;
|
|
189
235
|
}
|
|
190
236
|
|
|
191
|
-
const fromColumn =
|
|
192
|
-
|
|
237
|
+
const fromColumn =
|
|
238
|
+
typeof (item.expr as { column?: unknown }).column === 'string'
|
|
239
|
+
? (item.expr as { column: string }).column
|
|
240
|
+
: undefined;
|
|
241
|
+
if (fromColumn === undefined) {
|
|
242
|
+
// Standalone UNNEST (e.g. UNNEST(SEQUENCE(...))) — registered in resolveFromClause.
|
|
243
|
+
continue;
|
|
244
|
+
}
|
|
193
245
|
|
|
194
246
|
const aliasArgs = item.as?.args.value ?? [];
|
|
195
247
|
const toColumns: string[] = [];
|
|
@@ -219,7 +271,7 @@ function applyUnnestPre(mappings: UnnestMapping[], ctx: VisitContext): UnnestMap
|
|
|
219
271
|
|
|
220
272
|
const sourceColumns = ownerTable.columns.get(fromColumn) ?? [];
|
|
221
273
|
const sourceSchema = sourceColumns[0]?.schema;
|
|
222
|
-
const unnestTableName = `${ownerTable.name ??
|
|
274
|
+
const unnestTableName = `${ownerTable.name ?? ANONYMOUS_TABLE}:<unnested>`;
|
|
223
275
|
const apiOperation = ownerTable.apiOperation !== undefined ? { apiOperation: ownerTable.apiOperation } : {};
|
|
224
276
|
|
|
225
277
|
if (sourceSchema?.type === 'array') {
|
|
@@ -388,7 +440,7 @@ function lookupColumnOrThrow(colRef: string, ref: object, referencedTables: Reso
|
|
|
388
440
|
const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
|
|
389
441
|
if (resolvedColumns.length === 0) {
|
|
390
442
|
const tableNames = [
|
|
391
|
-
...new Set(referencedTables.map((referenceTable) => referenceTable.name ??
|
|
443
|
+
...new Set(referencedTables.map((referenceTable) => referenceTable.name ?? ANONYMOUS_TABLE)),
|
|
392
444
|
].join(', ');
|
|
393
445
|
const availableCols = [...new Set(referencedTables.flatMap((table) => [...table.columns.keys()]))].join(', ');
|
|
394
446
|
throw new AthenaError(
|
|
@@ -460,10 +512,9 @@ function resolveSingleColumnRef(
|
|
|
460
512
|
|
|
461
513
|
const referencedTables = tableRef !== undefined ? lookupTables(tableRef, ctx) : allTables;
|
|
462
514
|
if (referencedTables.length === 0) {
|
|
463
|
-
const tableNames = [...ctx.tables.keys()].join(', ');
|
|
464
515
|
throw new AthenaError(
|
|
465
516
|
ATHENA_ERROR,
|
|
466
|
-
`unknown table or alias '${tableRef ?? colRef}'; known tables: ${
|
|
517
|
+
`unknown table or alias '${tableRef ?? colRef}'; known tables: ${[...ctx.tables.keys()].join(', ')}`,
|
|
467
518
|
ref,
|
|
468
519
|
);
|
|
469
520
|
}
|
package/src/athena/visitor.ts
CHANGED
|
@@ -20,13 +20,16 @@ import type {
|
|
|
20
20
|
Join,
|
|
21
21
|
Select,
|
|
22
22
|
TableExpr,
|
|
23
|
+
ValuesFrom,
|
|
23
24
|
With,
|
|
24
25
|
} from './types';
|
|
25
26
|
|
|
26
27
|
// UNNEST is not in types.ts (the grammar produces it but the TS types don't model it).
|
|
27
28
|
export interface UnnestFrom {
|
|
28
29
|
type: 'unnest';
|
|
29
|
-
expr
|
|
30
|
+
// expr is a column_ref when used with CROSS JOIN; for standalone UNNEST (e.g.
|
|
31
|
+
// UNNEST(SEQUENCE(...))) it is a function call with no `column` property.
|
|
32
|
+
expr: ColumnRefItem | { type: string };
|
|
30
33
|
parentheses: boolean;
|
|
31
34
|
as: {
|
|
32
35
|
type: 'function';
|
|
@@ -75,6 +78,14 @@ export function isDual(node: unknown): node is Dual {
|
|
|
75
78
|
return typeof node === 'object' && node !== null && (node as { type?: unknown }).type === 'dual';
|
|
76
79
|
}
|
|
77
80
|
|
|
81
|
+
export function isValuesFrom(node: unknown): node is ValuesFrom {
|
|
82
|
+
if (typeof node !== 'object' || node === null) {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
const expr = (node as { expr?: unknown }).expr;
|
|
86
|
+
return typeof expr === 'object' && expr !== null && (expr as { type?: unknown }).type === 'values';
|
|
87
|
+
}
|
|
88
|
+
|
|
78
89
|
export function isTableExpr(node: unknown): node is TableExpr {
|
|
79
90
|
if (typeof node !== 'object' || node === null) {
|
|
80
91
|
return false;
|
|
@@ -220,6 +231,9 @@ function walkFrom(node: From, visitor: VisitorMap): void {
|
|
|
220
231
|
}
|
|
221
232
|
return;
|
|
222
233
|
}
|
|
234
|
+
if (isValuesFrom(node)) {
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
223
237
|
visitor.visitBaseFrom?.(node);
|
|
224
238
|
}
|
|
225
239
|
|