@checkdigit/eslint-plugin 7.18.0-PR.143-1cc5 → 7.18.0-PR.143-c067
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/athena.mjs +26 -4
- package/package.json +1 -1
- package/src/athena/athena.ts +31 -4
|
@@ -250,7 +250,7 @@ function lookupColumnOrThrow(colRef, ref, referencedTables, ctx) {
|
|
|
250
250
|
}
|
|
251
251
|
return resolvedColumns;
|
|
252
252
|
}
|
|
253
|
-
function checkColumnRefsExist(ast, allTables, ctx) {
|
|
253
|
+
function checkColumnRefsExist(ast, allTables, ctx, selectColumns) {
|
|
254
254
|
if (containsLambda(ast)) {
|
|
255
255
|
return;
|
|
256
256
|
}
|
|
@@ -260,7 +260,18 @@ function checkColumnRefsExist(ast, allTables, ctx) {
|
|
|
260
260
|
continue;
|
|
261
261
|
}
|
|
262
262
|
const tableRef = ref.table ?? void 0;
|
|
263
|
-
|
|
263
|
+
if (tableRef === void 0 && selectColumns?.has(colRef) === true) {
|
|
264
|
+
continue;
|
|
265
|
+
}
|
|
266
|
+
const referencedTables = tableRef !== void 0 ? lookupTables(tableRef, ctx) : allTables;
|
|
267
|
+
if (referencedTables.length === 0) {
|
|
268
|
+
throw new AthenaError(
|
|
269
|
+
ATHENA_ERROR,
|
|
270
|
+
`unknown table or alias '${tableRef ?? colRef}'; known tables: ${[...ctx.tables.keys()].join(", ")}`,
|
|
271
|
+
ref
|
|
272
|
+
);
|
|
273
|
+
}
|
|
274
|
+
lookupColumnOrThrow(colRef, ref, referencedTables, ctx);
|
|
264
275
|
}
|
|
265
276
|
}
|
|
266
277
|
function validateComplexColumnExpression(columnAST, allTables, ctx) {
|
|
@@ -282,7 +293,14 @@ function resolveSingleColumnRef(columnAST, columnAlias, indexedName, ref, allTab
|
|
|
282
293
|
const colRef = typeof ref.column === "string" ? ref.column : void 0;
|
|
283
294
|
assert.ok(colRef !== void 0, "column_ref must have a string column name");
|
|
284
295
|
const referencedTables = tableRef !== void 0 ? lookupTables(tableRef, ctx) : allTables;
|
|
285
|
-
|
|
296
|
+
if (referencedTables.length === 0) {
|
|
297
|
+
const tableNames = [...ctx.tables.keys()].join(", ");
|
|
298
|
+
throw new AthenaError(
|
|
299
|
+
ATHENA_ERROR,
|
|
300
|
+
`unknown table or alias '${tableRef ?? colRef}'; known tables: ${tableNames}`,
|
|
301
|
+
ref
|
|
302
|
+
);
|
|
303
|
+
}
|
|
286
304
|
if (colRef === "*") {
|
|
287
305
|
expandWildcard(referencedTables, columns);
|
|
288
306
|
return;
|
|
@@ -331,16 +349,20 @@ function checkSelect(selectAST, ctx, withTableName) {
|
|
|
331
349
|
log("resolved columns", [...columns.keys()]);
|
|
332
350
|
const allTables = [...selectCtx.tables.values()].flat();
|
|
333
351
|
if (select.where !== null) {
|
|
352
|
+
checkColumnRefsExist(select.where, allTables, selectCtx);
|
|
334
353
|
validateComplexColumnExpression(select.where, allTables, selectCtx);
|
|
335
354
|
}
|
|
336
355
|
if (select.having !== null) {
|
|
356
|
+
checkColumnRefsExist(select.having, allTables, selectCtx, columns);
|
|
337
357
|
validateComplexColumnExpression(select.having, allTables, selectCtx);
|
|
338
358
|
}
|
|
339
359
|
for (const orderItem of select.orderby ?? []) {
|
|
360
|
+
checkColumnRefsExist(orderItem.expr, allTables, selectCtx, columns);
|
|
340
361
|
validateComplexColumnExpression(orderItem.expr, allTables, selectCtx);
|
|
341
362
|
}
|
|
342
363
|
if (select.groupby?.columns !== void 0) {
|
|
343
364
|
for (const groupCol of select.groupby.columns) {
|
|
365
|
+
checkColumnRefsExist(groupCol, allTables, selectCtx, columns);
|
|
344
366
|
validateComplexColumnExpression(groupCol, allTables, selectCtx);
|
|
345
367
|
}
|
|
346
368
|
}
|
|
@@ -464,4 +486,4 @@ export {
|
|
|
464
486
|
athena_default as default,
|
|
465
487
|
ruleId
|
|
466
488
|
};
|
|
467
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/athena/athena.ts"],
  "mappings": "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",
  "names": ["tableName", "alias"]
}

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

|
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-c067","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
|
@@ -382,7 +382,12 @@ function lookupColumnOrThrow(
|
|
|
382
382
|
}
|
|
383
383
|
|
|
384
384
|
/** Check all column_refs in `ast` exist in scope. Skips lambda expressions (lambda params look like column_refs). */
|
|
385
|
-
function checkColumnRefsExist(
|
|
385
|
+
function checkColumnRefsExist(
|
|
386
|
+
ast: unknown,
|
|
387
|
+
allTables: ResolvedTable[],
|
|
388
|
+
ctx: VisitContext,
|
|
389
|
+
selectColumns?: Map<string, ResolvedColumn[]>,
|
|
390
|
+
): void {
|
|
386
391
|
if (containsLambda(ast)) {
|
|
387
392
|
return;
|
|
388
393
|
}
|
|
@@ -392,7 +397,18 @@ function checkColumnRefsExist(ast: unknown, allTables: ResolvedTable[], ctx: Vis
|
|
|
392
397
|
continue;
|
|
393
398
|
}
|
|
394
399
|
const tableRef = ref.table ?? undefined;
|
|
395
|
-
|
|
400
|
+
if (tableRef === undefined && selectColumns?.has(colRef) === true) {
|
|
401
|
+
continue; // SELECT alias used in GROUP BY / ORDER BY / HAVING — valid
|
|
402
|
+
}
|
|
403
|
+
const referencedTables = tableRef !== undefined ? lookupTables(tableRef, ctx) : allTables;
|
|
404
|
+
if (referencedTables.length === 0) {
|
|
405
|
+
throw new AthenaError(
|
|
406
|
+
ATHENA_ERROR,
|
|
407
|
+
`unknown table or alias '${tableRef ?? colRef}'; known tables: ${[...ctx.tables.keys()].join(', ')}`,
|
|
408
|
+
ref,
|
|
409
|
+
);
|
|
410
|
+
}
|
|
411
|
+
lookupColumnOrThrow(colRef, ref, referencedTables, ctx);
|
|
396
412
|
}
|
|
397
413
|
}
|
|
398
414
|
|
|
@@ -427,7 +443,14 @@ function resolveSingleColumnRef(
|
|
|
427
443
|
assert.ok(colRef !== undefined, 'column_ref must have a string column name');
|
|
428
444
|
|
|
429
445
|
const referencedTables = tableRef !== undefined ? lookupTables(tableRef, ctx) : allTables;
|
|
430
|
-
|
|
446
|
+
if (referencedTables.length === 0) {
|
|
447
|
+
const tableNames = [...ctx.tables.keys()].join(', ');
|
|
448
|
+
throw new AthenaError(
|
|
449
|
+
ATHENA_ERROR,
|
|
450
|
+
`unknown table or alias '${tableRef ?? colRef}'; known tables: ${tableNames}`,
|
|
451
|
+
ref,
|
|
452
|
+
);
|
|
453
|
+
}
|
|
431
454
|
|
|
432
455
|
if (colRef === '*') {
|
|
433
456
|
expandWildcard(referencedTables, columns);
|
|
@@ -502,19 +525,23 @@ function checkSelect(selectAST: Select | With, ctx: VisitContext, withTableName?
|
|
|
502
525
|
|
|
503
526
|
log('resolved columns', [...columns.keys()]);
|
|
504
527
|
|
|
505
|
-
// Pass 3: validate JSON paths in WHERE / HAVING / GROUP BY / ORDER BY
|
|
528
|
+
// Pass 3: validate column refs and JSON paths in WHERE / HAVING / GROUP BY / ORDER BY
|
|
506
529
|
const allTables = [...selectCtx.tables.values()].flat();
|
|
507
530
|
if (select.where !== null) {
|
|
531
|
+
checkColumnRefsExist(select.where, allTables, selectCtx);
|
|
508
532
|
validateComplexColumnExpression(select.where, allTables, selectCtx);
|
|
509
533
|
}
|
|
510
534
|
if (select.having !== null) {
|
|
535
|
+
checkColumnRefsExist(select.having, allTables, selectCtx, columns);
|
|
511
536
|
validateComplexColumnExpression(select.having, allTables, selectCtx);
|
|
512
537
|
}
|
|
513
538
|
for (const orderItem of select.orderby ?? []) {
|
|
539
|
+
checkColumnRefsExist(orderItem.expr, allTables, selectCtx, columns);
|
|
514
540
|
validateComplexColumnExpression(orderItem.expr, allTables, selectCtx);
|
|
515
541
|
}
|
|
516
542
|
if (select.groupby?.columns !== undefined) {
|
|
517
543
|
for (const groupCol of select.groupby.columns) {
|
|
544
|
+
checkColumnRefsExist(groupCol, allTables, selectCtx, columns);
|
|
518
545
|
validateComplexColumnExpression(groupCol, allTables, selectCtx);
|
|
519
546
|
}
|
|
520
547
|
}
|