@checkdigit/eslint-plugin 7.18.0-PR.143-9946 → 7.18.0-PR.143-c535

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.
Files changed (5) hide show
  1. package/dist-mjs/athena/athena.mjs +21 -3
  2. package/dist-types/athena/types.d.ts +2 -2
  3. package/package.json +1 -1
  4. package/src/athena/athena.ts +23 -3
  5. package/src/athena/types.ts +1 -1
package/dist-mjs/athena/athena.mjs CHANGED
@@ -235,6 +235,21 @@ function checkSelect(selectAST, ctx, withTableName) {
235
235
  const columns = resolveSelectColumns(select, selectCtx);
236
236
  applyUnnestPost(deferredUnnest, columns);
237
237
  log("resolved columns", [...columns.keys()]);
238
+ const allTables = [...selectCtx.tables.values()].flat();
239
+ if (select.where !== null) {
240
+ validateComplexColumnExpression(select.where, allTables, selectCtx);
241
+ }
242
+ if (select.having !== null) {
243
+ validateComplexColumnExpression(select.having, allTables, selectCtx);
244
+ }
245
+ for (const orderItem of select.orderby ?? []) {
246
+ validateComplexColumnExpression(orderItem.expr, allTables, selectCtx);
247
+ }
248
+ if (select.groupby?.columns !== void 0) {
249
+ for (const groupCol of select.groupby.columns) {
250
+ validateComplexColumnExpression(groupCol, allTables, selectCtx);
251
+ }
252
+ }
238
253
  if (select._next !== void 0) {
239
254
  checkSelect(select._next, ctx, withTableName);
240
255
  }
@@ -270,17 +285,19 @@ var rule = createRule({
270
285
  defaultOptions: [],
271
286
  create(context) {
272
287
  function checkSql(sql, sqlNode) {
273
- if (!/^SELECT\s+/iu.test(sql) && !/^WITH\s+/iu.test(sql)) {
288
+ if (!/^\s*(?:SELECT\b[\s\S]*\bFROM\b|WITH\b[\s\S]*\bSELECT\b[\s\S]*\b)/iu.test(sql)) {
289
+ log("skipping non-SELECT SQL string", { sql });
274
290
  return;
275
291
  }
276
292
  let ast;
277
293
  try {
278
294
  ({ ast } = parse(sql, { includeLocations: true }));
279
295
  } catch (error) {
296
+ log("error checking Athena AST", { error, sql });
280
297
  context.report({
281
298
  node: sqlNode,
282
299
  messageId: SYNTEXT_ERROR,
283
- data: { errorMessage: JSON.stringify(error, void 0, 2) }
300
+ data: { errorMessage: JSON.stringify(error, void 0, 2), sql }
284
301
  });
285
302
  return;
286
303
  }
@@ -288,6 +305,7 @@ var rule = createRule({
288
305
  try {
289
306
  checkAthenaAst(Array.isArray(ast) ? ast[0] : ast, athenaCtx);
290
307
  } catch (error) {
308
+ log("error checking Athena AST", { error, sql });
291
309
  if (error instanceof AthenaError) {
292
310
  context.report({
293
311
  node: sqlNode,
@@ -325,4 +343,4 @@ export {
325
343
  athena_default as default,
326
344
  ruleId
327
345
  };
328
- //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/athena/athena.ts"],
  "mappings": "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",
  "names": ["tableName", "alias", "apiSchemas", "operations"]
}

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

package/dist-types/athena/types.d.ts CHANGED
@@ -230,9 +230,9 @@ export interface Select {
230
230
  from: From[] | TableExpr | null;
231
231
  where: Binary | Function | null;
232
232
  groupby: {
233
- columns: ColumnRef[] | null;
233
+ columns: ColumnRef[] | undefined;
234
234
  modifiers: ValueExpr<string>[];
235
- };
235
+ } | undefined;
236
236
  having: any[] | null;
237
237
  orderby: OrderBy[] | null;
238
238
  limit: Limit | null;
package/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@checkdigit/eslint-plugin","version":"7.18.0-PR.143-9946","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"}}}}
1
+ {"name":"@checkdigit/eslint-plugin","version":"7.18.0-PR.143-c535","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
@@ -77,7 +77,7 @@ function lookupTables(nameOrAlias: string, ctx: VisitContext): ResolvedTable[] {
77
77
  return ctx.tables.get(canonical) ?? [];
78
78
  }
79
79
 
80
- /** Normalise the FROM clause into a flat array. */
80
+ /** Normalize the FROM clause into a flat array. */
81
81
  function fromClauseItems(select: Select): From[] {
82
82
  if (Array.isArray(select.from)) {
83
83
  return select.from;
@@ -379,6 +379,23 @@ function checkSelect(selectAST: Select | With, ctx: VisitContext, withTableName?
379
379
 
380
380
  log('resolved columns', [...columns.keys()]);
381
381
 
382
+ // Pass 3: validate JSON paths in WHERE / HAVING / GROUP BY / ORDER BY
383
+ const allTables = [...selectCtx.tables.values()].flat();
384
+ if (select.where !== null) {
385
+ validateComplexColumnExpression(select.where, allTables, selectCtx);
386
+ }
387
+ if (select.having !== null) {
388
+ validateComplexColumnExpression(select.having, allTables, selectCtx);
389
+ }
390
+ for (const orderItem of select.orderby ?? []) {
391
+ validateComplexColumnExpression(orderItem.expr, allTables, selectCtx);
392
+ }
393
+ if (select.groupby?.columns !== undefined) {
394
+ for (const groupCol of select.groupby.columns) {
395
+ validateComplexColumnExpression(groupCol, allTables, selectCtx);
396
+ }
397
+ }
398
+
382
399
  // UNION ALL — next SELECT in the chain
383
400
  if (select._next !== undefined) {
384
401
  checkSelect(select._next, ctx, withTableName);
@@ -425,7 +442,8 @@ const rule: ESLintUtils.RuleModule<typeof SYNTEXT_ERROR | typeof ATHENA_ERROR> =
425
442
  defaultOptions: [],
426
443
  create(context) {
427
444
  function checkSql(sql: string, sqlNode: TSESTree.Node) {
428
- if (!/^SELECT\s+/iu.test(sql) && !/^WITH\s+/iu.test(sql)) {
445
+ if (!/^\s*(?:SELECT\b[\s\S]*\bFROM\b|WITH\b[\s\S]*\bSELECT\b[\s\S]*\b)/iu.test(sql)) {
446
+ log('skipping non-SELECT SQL string', { sql });
429
447
  return;
430
448
  }
431
449
 
@@ -434,10 +452,11 @@ const rule: ESLintUtils.RuleModule<typeof SYNTEXT_ERROR | typeof ATHENA_ERROR> =
434
452
  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
435
453
  ({ ast } = parse(sql, { includeLocations: true }));
436
454
  } catch (error) {
455
+ log('error checking Athena AST', { error, sql });
437
456
  context.report({
438
457
  node: sqlNode,
439
458
  messageId: SYNTEXT_ERROR,
440
- data: { errorMessage: JSON.stringify(error, undefined, 2) },
459
+ data: { errorMessage: JSON.stringify(error, undefined, 2), sql },
441
460
  });
442
461
  return;
443
462
  }
@@ -447,6 +466,7 @@ const rule: ESLintUtils.RuleModule<typeof SYNTEXT_ERROR | typeof ATHENA_ERROR> =
447
466
  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
448
467
  checkAthenaAst(Array.isArray(ast) ? ast[0] : ast, athenaCtx);
449
468
  } catch (error) {
469
+ log('error checking Athena AST', { error, sql });
450
470
  if (error instanceof AthenaError) {
451
471
  context.report({
452
472
  node: sqlNode,
package/src/athena/types.ts CHANGED
@@ -268,7 +268,7 @@ export interface Select {
268
268
  columns: any[] | Column[];
269
269
  from: From[] | TableExpr | null;
270
270
  where: Binary | Function | null;
271
- groupby: { columns: ColumnRef[] | null; modifiers: ValueExpr<string>[] };
271
+ groupby: { columns: ColumnRef[] | undefined; modifiers: ValueExpr<string>[] } | undefined;
272
272
  having: any[] | null;
273
273
  orderby: OrderBy[] | null;
274
274
  limit: Limit | null;