@checkdigit/eslint-plugin 7.18.0-PR.143-8290 → 7.18.0-PR.143-0de2

package/dist-mjs/athena/api-matcher.mjs

@@ -1,103 +1,193 @@
 // src/athena/api-matcher.ts
 import debug from "debug";
-import { JSONPath } from "jsonpath-plus";
 var log = debug("eslint-plugin:athena:api-matcher");
-function getVersionMatcher(_selectAST, _tableAST) {
-  return void 0;
+var ALWAYS_TRUE = () => true;
+function rec(node) {
+  return typeof node === "object" && node !== null ? node : void 0;
 }
-function getPathPartMatcher(selectAST, _tableAST) {
-  const [pathPartCondition] = JSONPath({
-    json: selectAST,
-    path: "$.where..[?(@ && @.type === 'binary_expr' && @.operator === '=' && @.left && @.left.type === 'function' && @.left.name && @.left.name.name && @.left.name.name[0] && @.left.name.name[0].value === 'split' && @.left.args && @.left.args.value && @.left.args.value[0] && @.left.args.value[0].type === 'column_ref' && @.left.args.value[0].column === 'url' && @.left.args.value[1] && @.left.args.value[1].type === 'single_quote_string' && @.left.args.value[1].value === '/' && @.left.array_index && @.left.array_index[0] && @.left.array_index[0].brackets === true && @.left.array_index[0].index && @.left.array_index[0].index.type === 'number')]"
-  });
-  if (pathPartCondition !== void 0) {
-    const [pathPartIndex] = JSONPath({
-      json: pathPartCondition,
-      path: "$.left.array_index[0].index.value"
-    });
-    const [pathPartMatch] = JSONPath({
-      json: pathPartCondition,
-      path: "$.right.value"
-    });
-    return (path, _method) => {
-      const parts = path.split("/");
-      const part = parts[pathPartIndex - 1];
-      log(`checking path part`, { path, pathPartIndex, part, pathPartMatch });
-      return part?.startsWith(":") === true ? true : parts[pathPartIndex - 1] === pathPartMatch;
-    };
+function getFunctionName(node) {
+  const fn = rec(node);
+  if (fn?.["type"] !== "function") {
+    return void 0;
   }
-  return void 0;
+  const name = fn["name"];
+  const firstName = name?.name[0];
+  return firstName === void 0 ? void 0 : firstName.value.toLowerCase();
 }
-function getPathPartsCountMatcher(selectAST, _tableAST) {
-  const [pathPartCount] = JSONPath({
-    json: selectAST,
-    path: "$.where..[?(@ && @.type === 'binary_expr' && @.operator === '=' &&  @.left && @.left.type === 'function' && @.left.name && @.left.name.name && @.left.name.name[0] && @.left.name.name[0].value === 'cardinality' && @.right && @.right.type === 'number' && @.left.args && @.left.args.value && @.left.args.value[0] && @.left.args.value[0].type === 'function' && @.left.args.value[0].name && @.left.args.value[0].name.name && @.left.args.value[0].name.name[0] && @.left.args.value[0].name.name[0].value === 'split' && @.left.args.value[0].args && @.left.args.value[0].args.value && @.left.args.value[0].args.value[0] && @.left.args.value[0].args.value[0].type === 'column_ref' && @.left.args.value[0].args.value[0].column === 'url' && @.left.args.value[0].args.value[1] && @.left.args.value[0].args.value[1].type === 'single_quote_string' && @.left.args.value[0].args.value[1].value === '/')].right.value"
-  });
-  if (pathPartCount !== void 0) {
-    return (path, _method) => {
-      const parts = path.split("/");
-      return parts.length === pathPartCount;
-    };
+function getColumnName(node) {
+  const col = rec(node);
+  if (col?.["type"] !== "column_ref") {
+    return void 0;
   }
-  return void 0;
+  const column = node.column;
+  return typeof column === "string" ? column.toLowerCase() : void 0;
+}
+function getColumnTable(node) {
+  const col = rec(node);
+  if (col?.["type"] !== "column_ref") {
+    return void 0;
+  }
+  return node.table;
+}
+function getStringValue(node) {
+  const val = rec(node);
+  if (val?.["type"] !== "single_quote_string" && val?.["type"] !== "string") {
+    return void 0;
+  }
+  return typeof val["value"] === "string" ? val["value"] : void 0;
+}
+function getNumberValue(node) {
+  const val = rec(node);
+  return val?.["type"] === "number" && typeof val["value"] === "number" ? val["value"] : void 0;
+}
+function isSplitUrlIndexed(node) {
+  const fn = rec(node);
+  if (fn?.["type"] !== "function") {
+    return false;
+  }
+  if (getFunctionName(node) !== "split") {
+    return false;
+  }
+  const args = fn["args"]?.value;
+  if (!Array.isArray(args) || args.length < 2) {
+    return false;
+  }
+  if (getColumnName(args[0]) !== "url") {
+    return false;
+  }
+  if (getStringValue(args[1]) !== "/") {
+    return false;
+  }
+  return Array.isArray(fn["array_index"]) && fn["array_index"].length > 0;
+}
+function isCardinalitySplitUrl(node) {
+  const fn = rec(node);
+  if (fn?.["type"] !== "function") {
+    return false;
+  }
+  if (getFunctionName(node) !== "cardinality") {
+    return false;
+  }
+  const outerArgs = fn["args"]?.value;
+  if (!Array.isArray(outerArgs) || outerArgs.length === 0) {
+    return false;
+  }
+  const innerFn = rec(outerArgs[0]);
+  if (innerFn?.["type"] !== "function") {
+    return false;
+  }
+  if (getFunctionName(outerArgs[0]) !== "split") {
+    return false;
+  }
+  const innerArgs = innerFn["args"]?.value;
+  if (!Array.isArray(innerArgs) || innerArgs.length < 2) {
+    return false;
+  }
+  return getColumnName(innerArgs[0]) === "url" && getStringValue(innerArgs[1]) === "/";
 }
-function getPathMatchers(selectAST, tableAST) {
-  return [getPathPartMatcher(selectAST, tableAST), getPathPartsCountMatcher(selectAST, tableAST)];
+function getConditionTableQualifier(left) {
+  const colName = getColumnName(left);
+  if (colName !== void 0) {
+    return getColumnTable(left);
+  }
+  if (isSplitUrlIndexed(left)) {
+    const args = rec(left)?.["args"]?.value;
+    return getColumnTable(args?.[0]) ?? null;
+  }
+  if (isCardinalitySplitUrl(left)) {
+    const outerArgs = rec(left)?.["args"]?.value;
+    const splitFn = rec(outerArgs?.[0]);
+    const innerArgs = splitFn?.["args"]?.value;
+    return getColumnTable(innerArgs?.[0]) ?? null;
+  }
+  return void 0;
 }
-function getMethodMatcher(selectAST, _tableAST) {
-  const [methodToMatch] = JSONPath({
-    json: selectAST,
-    path: "$.where..[?(@ && @.type === 'binary_expr' && @.operator === '=' && @.left && @.left.type === 'column_ref' && @.left.column === 'method' && @.right && @.right.type === 'single_quote_string')].right.value"
-  });
-  if (methodToMatch !== void 0) {
-    return (_path, method) => method === methodToMatch;
+function buildLeafPredicate(node, tableAlias) {
+  if (node.operator !== "=") {
+    return void 0;
+  }
+  const { left, right } = node;
+  const conditionTable = getConditionTableQualifier(left);
+  if (conditionTable !== null && conditionTable !== void 0 && tableAlias !== null && conditionTable !== tableAlias) {
+    return void 0;
+  }
+  if (getColumnName(left) === "method") {
+    const value = getStringValue(right);
+    if (value !== void 0) {
+      return (_path, method) => method === value;
+    }
+  }
+  if (getColumnName(left) === "responsestatus") {
+    const value = getStringValue(right);
+    if (value !== void 0) {
+      return (_path, _method, responseCode) => responseCode === value;
+    }
+  }
+  if (isSplitUrlIndexed(left)) {
+    const index = left.array_index[0]?.index.value;
+    const value = getStringValue(right);
+    if (typeof index === "number" && value !== void 0) {
+      return (path) => {
+        const parts = path.split("/");
+        const part = parts[index - 1];
+        log(`checking path part`, { path, index, part, value });
+        return part?.startsWith(":") === true ? true : part === value;
+      };
+    }
+  }
+  if (isCardinalitySplitUrl(left)) {
+    const count = getNumberValue(right);
+    if (count !== void 0) {
+      return (path) => path.split("/").length === count;
+    }
   }
   return void 0;
 }
-function getResponseStatusToMatch(selectAST, _tableAST) {
-  const [responseStatus] = JSONPath({
-    json: selectAST,
-    path: "$.where..[?(@ && @.type === 'binary_expr' && @.operator === '=' && @.left && @.left.type === 'column_ref' && @.left.column === 'responsestatus' && @.right && @.right.type === 'single_quote_string')].right.value"
-  });
-  return responseStatus;
+function buildPredicate(expr, tableAlias) {
+  const node = rec(expr);
+  if (node?.["type"] !== "binary_expr") {
+    return ALWAYS_TRUE;
+  }
+  const binary = expr;
+  switch (binary.operator) {
+    case "AND": {
+      const leftPred = buildPredicate(binary.left, tableAlias);
+      const rightPred = buildPredicate(binary.right, tableAlias);
+      return (path, method, code) => leftPred(path, method, code) && rightPred(path, method, code);
+    }
+    case "OR": {
+      const leftPred = buildPredicate(binary.left, tableAlias);
+      const rightPred = buildPredicate(binary.right, tableAlias);
+      return (path, method, code) => leftPred(path, method, code) || rightPred(path, method, code);
+    }
+    case "NOT": {
+      const innerPred = buildPredicate(binary.left, tableAlias);
+      return (path, method, code) => !innerPred(path, method, code);
+    }
+    default: {
+      return buildLeafPredicate(binary, tableAlias) ?? ALWAYS_TRUE;
+    }
+  }
 }
 function matchApi(selectAST, tableAST, apiSchemas) {
-  const schemaMatchers = [
-    getVersionMatcher(selectAST, tableAST),
-    getPathMatchers(selectAST, tableAST),
-    getMethodMatcher(selectAST, tableAST)
-  ].flat().filter((matcher) => matcher !== void 0);
-  const allOperationSchemas = apiSchemas.flatMap((apiSchema) => Object.entries(apiSchema.apis)).flatMap(
+  const tableAlias = tableAST.as ?? null;
+  const predicate = buildPredicate(selectAST.where ?? null, tableAlias);
+  const allOperations = apiSchemas.flatMap((apiSchema) => Object.entries(apiSchema.apis)).flatMap(
     ([path, operations]) => Object.entries(operations).map(([method, operationSchemas]) => ({
       path,
       method: method.toUpperCase(),
       operationSchemas
     }))
   );
-  log("total operation schemas", allOperationSchemas.length);
-  const matchedOperationSchemas = allOperationSchemas.filter(
-    ({ path, method }) => schemaMatchers.every((matcher) => matcher(path, method))
+  log("total operation schemas", allOperations.length);
+  const matchedApis = allOperations.flatMap(
+    ({ path, method, operationSchemas }) => Object.entries(operationSchemas.responses).flatMap(
+      ([responseCode, responseSchema]) => predicate(path, method, responseCode) ? [{ path, method, request: operationSchemas.request, response: responseSchema }] : []
+    )
   );
-  log("matched operation schemas", matchedOperationSchemas.length);
-  if (matchedOperationSchemas.length === 0) {
-    log("no matched operation schema");
-    throw new Error("no matched operation schema");
-  }
-  const matchedResponseStatus = getResponseStatusToMatch(selectAST, tableAST);
-  log("matchedResponseStatus", matchedResponseStatus);
-  const matchedApis = matchedOperationSchemas.flatMap(
-    (operation) => Object.entries(operation.operationSchemas.responses).map(([responseCode, responseSchema]) => {
-      const matchedResponseSchema = matchedResponseStatus === void 0 || responseCode === matchedResponseStatus ? responseSchema : void 0;
-      return matchedResponseSchema === void 0 ? void 0 : {
-        path: operation.path,
-        method: operation.method,
-        request: operation.operationSchemas.request,
-        response: matchedResponseSchema
-      };
-    })
-  ).filter((api) => api !== void 0);
+  log("matched apis", matchedApis.length);
   if (matchedApis.length === 0) {
-    log("no api satisfy both request and response matchers");
+    log("no matched api");
     throw new Error("no matched api");
   }
   return matchedApis;
@@ -105,4 +195,4 @@ function matchApi(selectAST, tableAST, apiSchemas) {
 export {
   matchApi
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2F0aGVuYS9hcGktbWF0Y2hlci50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFFQSxPQUFPLFdBQVc7QUFDbEIsU0FBUyxnQkFBZ0I7QUFLekIsSUFBTSxNQUFNLE1BQU0sa0NBQWtDO0FBa0JwRCxTQUFTLGtCQUFrQixZQUFvQixXQUF3QztBQUNyRixTQUFPO0FBQ1Q7QUFHQSxTQUFTLG1CQUFtQixXQUFtQixXQUF3QztBQUNyRixRQUFNLENBQUMsaUJBQWlCLElBQWMsU0FBUztBQUFBLElBQzdDLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxFQUNSLENBQUM7QUFHRCxNQUFJLHNCQUFzQixRQUFXO0FBQ25DLFVBQU0sQ0FBQyxhQUFhLElBQWMsU0FBUztBQUFBLE1BQ3pDLE1BQU07QUFBQSxNQUNOLE1BQU07QUFBQSxJQUNSLENBQUM7QUFDRCxVQUFNLENBQUMsYUFBYSxJQUFjLFNBQVM7QUFBQSxNQUN6QyxNQUFNO0FBQUEsTUFDTixNQUFNO0FBQUEsSUFDUixDQUFDO0FBRUQsV0FBTyxDQUFDLE1BQWMsWUFBb0I7QUFDeEMsWUFBTSxRQUFRLEtBQUssTUFBTSxHQUFHO0FBQzVCLFlBQU0sT0FBTyxNQUFNLGdCQUFnQixDQUFDO0FBQ3BDLFVBQUksc0JBQXNCLEVBQUUsTUFBTSxlQUFlLE1BQU0sY0FBYyxDQUFDO0FBQ3RFLGFBQU8sTUFBTSxXQUFXLEdBQUcsTUFBTSxPQUM3QixPQUNBLE1BQU0sZ0JBQWdCLENBQUMsTUFBTTtBQUFBLElBQ25DO0FBQUEsRUFDRjtBQUVBLFNBQU87QUFDVDtBQUdBLFNBQVMseUJBQXlCLFdBQW1CLFdBQXdDO0FBRTNGLFFBQU0sQ0FBQyxhQUFhLElBQWMsU0FBUztBQUFBLElBQ3pDLE1BQU07QUFBQSxJQUNOLE1BQU07QUFBQSxFQUNSLENBQUM7QUFFRCxNQUFJLGtCQUFrQixRQUFXO0FBRS9CLFdBQU8sQ0FBQyxNQUFjLFlBQW9CO0FBQ3hDLFlBQU0sUUFBUSxLQUFLLE1BQU0sR0FBRztB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
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2F0aGVuYS9hcGktbWF0Y2hlci50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFFQSxPQUFPLFdBQVc7QUFNbEIsSUFBTSxNQUFNLE1BQU0sa0NBQWtDO0FBa0JwRCxJQUFNLGNBQWtDLE1BQU07QUFJOUMsU0FBUyxJQUFJLE1BQW9EO0FBQy9ELFNBQU8sT0FBTyxTQUFTLFlBQVksU0FBUyxPQUFRLE9BQW1DO0FBQ3pGO0FBRUEsU0FBUyxnQkFBZ0IsTUFBbUM7QUFDMUQsUUFBTSxLQUFLLElBQUksSUFBSTtBQUNuQixNQUFJLEtBQUssTUFBTSxNQUFNLFlBQVk7QUFDL0IsV0FBTztBQUFBLEVBQ1Q7QUFDQSxRQUFNLE9BQU8sR0FBRyxNQUFNO0FBQ3RCLFFBQU0sWUFBWSxNQUFNLEtBQUssQ0FBQztBQUM5QixTQUFPLGNBQWMsU0FBWSxTQUFZLFVBQVUsTUFBTSxZQUFZO0FBQzNFO0FBRUEsU0FBUyxjQUFjLE1BQW1DO0FBQ3hELFFBQU0sTUFBTSxJQUFJLElBQUk7QUFDcEIsTUFBSSxNQUFNLE1BQU0sTUFBTSxjQUFjO0FBQ2xDLFdBQU87QUFBQSxFQUNUO0FBQ0EsUUFBTSxTQUFVLEtBQXVCO0FBQ3ZDLFNBQU8sT0FBTyxXQUFXLFdBQVcsT0FBTyxZQUFZLElBQUk7QUFDN0Q7QUFFQSxTQUFTLGVBQWUsTUFBMEM7QUFDaEUsUUFBTSxNQUFNLElBQUksSUFBSTtBQUNwQixNQUFJLE1BQU0sTUFBTSxNQUFNLGNBQWM7QUFDbEMsV0FBTztBQUFBLEVBQ1Q7QUFDQSxTQUFRLEtBQXVCO0FBQ2pDO0FBRUEsU0FBUyxlQUFlLE1BQW1DO0FBQ3pELFFBQU0sTUFBTSxJQUFJLElBQUk7QUFDcEIsTUFBSSxNQUFNLE1BQU0sTUFBTSx5QkFBeUIsTUFBTSxNQUFNLE1BQU0sVUFBVTtBQUN6RSxXQUFPO0FBQUEsRUFDVDtBQUNBLFNBQU8sT0FBTyxJQUFJLE9BQU8sTUFBTSxXQUFXLElBQUksT0FBTyxJQUFJO0FBQzNEO0FBRUEsU0FBUyxlQUFlLE1BQW1DO0FBQ3pELFFBQU0sTUFBTSxJQUFJLElBQUk7QUFDcEIsU0FBTyxNQUFNLE1BQU0sTUFBTSxZQUFZLE9BQU8sSUFBSSxPQUFPLE1BQU0sV0FBVyxJQUFJLE9BQU8sSUFBSTtBQUN6RjtBQU1BLFNBQVMsa0JBQWtCLE1BQXdDO0FBQ2pFLFFBQU0sS0FBSyxJQUFJLElBQUk7QUFDbkIsTUFBSSxLQUFLLE1BQU0sTUFBTSxZQUFZO0FBQy9CLFdBQU87QUFBQSxFQUNUO0FBQ0EsTUFBSSxnQkFBZ0IsSUFBSSxNQUFNLFNBQVM7QUFDckMsV0FBTztBQUFBLEVBQ1Q7QUFDQSxRQUFNLE9BQVEsR0FBRyxNQUFNLEdBQXlDO0FBQ2hFLE1BQUksQ0FBQyxNQUFNLFFBQVEsSUFBSSxLQUFLLEtBQUssU0FBUyxHQUFHO0FBQzNDLFdBQU87QUFBQSxFQUNUO0FBQ0EsTUFBSSxjQUFjLEtBQUssQ0FBQyxDQUFDLE1BQU0sT0FBTztBQUNwQyxXQUFPO0FBQUEsRUFDVDtBQUNBLE1BQUksZUFBZSxLQUFLLENBQUMsQ0FBQyxNQUFNLEtBQUs7QUFDbkMsV0FBTztBQUFBLEVBQ1Q7QUFDQSxTQUFPLE1BQU0sUUFBUSxHQUFHLGFBQWEsQ0FBQyxLQUFNLEdBQUcsYUFBYSxFQUFnQixTQUFTO0FBQ3ZGO0FBR0EsU0FBUyxzQkFBc0IsTUFBb0M7QUFDakUsUUFBTSxLQUFLLElBQUksSUFBSTtBQUNuQixNQUFJLEtBQUssTUFBTSxNQUFNLFlBQVk7QUFDL0IsV0FBTztBQUFBLEVBQ1Q7QUFDQSxNQUFJLGdCQUFnQixJQUFJLE1BQU0sZUFBZTtBQUMzQyxXQUFPO0FBQUEsRUFDVDtBQUNBLFFBQU0sWUFBYSxHQUFHLE1BQU0sR0FBeUM7QUFDckUsTUFBSSxDQUFDLE1BQU0sUUFBUSxTQUFTLEtBQUssVUFBVSxXQUFXLEdBQUc7QUFDdkQsV0FBTztBQUFBLEVBQ1Q7QUFDQSxRQUFNLFVBQVUsSUFBSSxVQUFVLENBQUMsQ0FBQztBQUNoQyxNQUFJLFVBQVUsTUFBTSxNQUFNLFlBQVk7QUFDcEMsV0FBTztBQUFBLEVBQ1Q7QUFDQSxNQUFJLGdCQUFnQixVQUFVLENBQUMsQ0FBQyxNQUFNLFNBQVM7QUFDN0MsV0FBTztBQUFBLEVBQ1Q7QUFDQSxRQUFNLFlBQWEsUUFBUSxNQUFNLEdBQXlDO0FBQzFFLE1BQUksQ0FBQyxNQUFNLFFBQVEsU0FBUyxLQUFLLFVBQVUsU0FBUyxHQUFHO0FBQ3JELFdBQU87QUFBQSxFQUNUO0FBQ0EsU0FBTyxjQUFjLFVBQVUsQ0FBQyxDQUFDLE1BQU0sU0FBUyxlQUFlLFVBQVUsQ0FBQyxDQUFDLE1BQU07QUFDbkY7QUFJQSxTQUFTLDJCQUEyQixNQUEwQztBQUM1RSxRQUFNLFVBQVUsY0FBYyxJQUFJO0FBQ2xDLE1BQUksWUFBWSxRQUFXO0FBQ3pCLFdBQU8sZUFBZSxJQUFJO0FBQUEsRUFDNUI7QUFFQSxNQUFJLGtCQUFrQixJQUFJLEdBQUc7QUFDM0IsVUFBTSxPQUFRLElBQUksSUFBSSxJQUFJLE1BQU0sR0FBeUM7QUFDekUsV0FBTyxlQUFlLE9BQU8sQ0FBQyxDQUFDLEtBQUs7QUFBQSxFQUN0QztBQUNBLE1BQUksc0JBQXNCLElBQUksR0FBRztBQUMvQixVQUFNLFlBQWEsSUFBSSxJQUFJLElBQUksTUFBTSxHQUF5QztBQUM5RSxVQUFNLFVBQVUsSUFBSSxZQUFZLENBQUMsQ0FBQztBQUNsQyxVQUFNLFlBQWEsVUFBVSxNQUFNLEdBQXlDO0FBQzVFLFdBQU8sZUFBZSxZQUFZLENBQUMsQ0FBQyxLQUFLO0FBQUEsRUFDM0M7QUFDQSxTQUFPO0FBQ1Q7QUFNQSxTQUFTLG1CQUFtQixNQUFjLFlBQTJEO0FBQ25HLE1BQUksS0FBSyxhQUFhLEtBQUs7QUFDekIsV0FBTztBQUFBLEVBQ1Q7QUFDQSxRQUFNLEVBQUUsTUFBTSxNQUFNLElBQUk7QUFFeEIsUUFBTSxpQkFBaUIsMkJBQTJCLElBQUk7QUFHdEQsTUFBSSxtQkFBbUIsUUFBUSxtQkFBbUIsVUFBYSxlQUFlLFFBQVEsbUJBQW1CLFlBQVk7QUFDbkgsV0FBTztBQUFBLEVBQ1Q7QUFHQSxNQUFJLGNBQWMsSUFBSSxNQUFNLFVBQVU7QUFDcEMsVUFBTSxRQUFRLGVBQWUsS0FBSztBQUNsQyxRQUFJLFVBQVUsUUFBVztBQUN2QixhQUFPLENBQUMsT0FBTyxXQUFXLFdBQVc7QUFBQSxJQUN2QztBQUFBLEVBQ0Y7QUFHQSxNQUFJLGNBQWMsSUFBSSxNQUFNLGtCQUFrQjtBQUM1QyxVQUFNLFFBQVEsZUFBZSxLQUFLO0FBQ2xDLFFBQUksVUFBVSxRQUFXO0FBQ3ZCLGFBQU8sQ0FBQyxPQUFPLFNBQVMsaUJBQWlCLGlCQUFpQjtBQUFBLElBQzVEO0FBQUEsRUFDRjtBQUdBLE1BQUksa0JBQWtCLElBQUksR0FBRztBQUMzQixVQUFNLFFBQVEsS0FBSyxZQUFZLENBQUMsR0FBRyxNQUFNO0FBQ3pDLFVBQU0sUUFBUSxlQUFlLEtBQUs7QUFDbEMsUUFBSSxPQUFPLFVBQVUsWUFBWSxVQUFVLFFBQVc7QUFDcEQsYUFBTyxDQUFDLFNBQVM7QUFDZixjQUFNLFFBQVEsS0FBSyxNQUFNLEdBQUc7QUFDNUIsY0FBTSxPQUFPLE1BQU0sUUFBUSxDQUFDO0FBQzVCLFlBQUksc0JBQXNCLEVBQUUsTUFBTSxPQUFPLE1BQU0sTUFBTSxDQUFDO0FBQ3RELGVBQU8sTUFBTSxXQUFXLEdBQUcsTUFBTSxPQUFPLE9BQU8sU0FBUztBQUFBLE1BQzFEO0FBQUEsSUFDRjtBQUFBLEVBQ0Y7QUFHQSxNQUFJLHNCQUFzQixJQUFJLEdBQUc7QUFDL0IsVUFBTSxRQUFRLGVBQWUsS0FBSztBQUNsQyxRQUFJLFVBQVUsUUFBVztBQUN2QixhQUFPLENBQUMsU0FBUyxLQUFLLE1BQU0sR0FBRyxFQUFFLFdBQVc7QUFBQSxJQUM5QztBQUFBLEVBQ0Y7QUFFQSxTQUFPO0FBQ1Q7QUFFQSxTQUFTLGVBQWUsTUFBZSxZQUErQztBQUNwRixRQUFNLE9BQU8sSUFBSSxJQUFJO0FBQ3JCLE1BQUksT0FBTyxNQUFNLE1BQU0sZUFBZTtBQUNwQyxXQUFPO0FBQUEsRUFDVDtBQUVBLFFBQU0sU0FBUztBQUVmLFVBQVEsT0FBTyxVQUFVO0FBQUEsSUFDdkIsS0FBSyxPQUFPO0FBQ1YsWUFBTSxXQUFXLGVBQWUsT0FBTyxNQUFNLFVBQVU7QUFDdkQsWUFBTSxZQUFZLGVBQWUsT0FBTyxPQUFPLFVBQVU7QUFDekQsYUFBTyxDQUFDLE1BQU0sUUFBUSxTQUFTLFNBQVMsTUFBTSxRQUFRLElBQUksS0FBSyxVQUFVLE1BQU0sUUFBUSxJQUFJO0FBQUEsSUFDN0Y7QUFBQSxJQUNBLEtBQUssTUFBTTtBQUNULFlBQU0sV0FBVyxlQUFlLE9BQU8sTUFBTSxVQUFVO0FBQ3ZELFlBQU0sWUFBWSxlQUFlLE9BQU8sT0FBTyxVQUFVO0FBQ3pELGFBQU8sQ0FBQyxNQUFNLFFBQVEsU0FBUyxTQUFTLE1BQU0sUUFBUSxJQUFJLEtBQUssVUFBVSxNQUFNLFFBQVEsSUFBSTtBQUFBLElBQzdGO0FBQUEsSUFDQSxLQUFLLE9BQU87QUFDVixZQUFNLFlBQVksZUFBZSxPQUFPLE1BQU0sVUFBVTtBQUN4RCxhQUFPLENBQUMsTUFBTSxRQUFRLFNBQVMsQ0FBQyxVQUFVLE1BQU0sUUFBUSxJQUFJO0FBQUEsSUFDOUQ7QUFBQSxJQUNBLFNBQVM7QUFDUCxhQUFPLG1CQUFtQixRQUFRLFVBQVUsS0FBSztBQUFBLElBQ25EO0FBQUEsRUFDRjtBQUNGO0FBRU8sU0FBUyxTQUNkLFdBQ0EsVUFDQSxZQUNnQztBQUNoQyxRQUFNLGFBQWMsU0FBb0MsTUFBTTtBQUM5RCxRQUFNLFlBQVksZUFBZ0IsVUFBa0MsU0FBUyxNQUFNLFVBQVU7QUFFN0YsUUFBTSxnQkFBb0MsV0FDdkMsUUFBUSxDQUFDLGNBQWMsT0FBTyxRQUFRLFVBQVUsSUFBSSxDQUFDLEVBQ3JEO0FBQUEsSUFBUSxDQUFDLENBQUMsTUFBTSxVQUFVLE1BQ3pCLE9BQU8sUUFBUSxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUMsUUFBUSxnQkFBZ0IsT0FBTztBQUFBLE1BQzlEO0FBQUEsTUFDQSxRQUFRLE9BQU8sWUFBWTtBQUFBLE1BQzNCO0FBQUEsSUFDRixFQUFFO0FBQUEsRUFDSjtBQUNGLE1BQUksMkJBQTJCLGNBQWMsTUFBTTtBQUVuRCxRQUFNLGNBQWMsY0FBYztBQUFBLElBQVEsQ0FBQyxFQUFFLE1BQU0sUUFBUSxpQkFBaUIsTUFDMUUsT0FBTyxRQUFRLGlCQUFpQixTQUFTLEVBQUU7QUFBQSxNQUFRLENBQUMsQ0FBQyxjQUFjLGNBQWMsTUFDL0UsVUFBVSxNQUFNLFFBQVEsWUFBWSxJQUNoQyxDQUFDLEVBQUUsTUFBTSxRQUFRLFNBQVMsaUJBQWlCLFNBQVMsVUFBVSxlQUFlLENBQUMsSUFDOUUsQ0FBQztBQUFBLElBQ1A7QUFBQSxFQUNGO0FBQ0EsTUFBSSxnQkFBZ0IsWUFBWSxNQUFNO0FBRXRDLE1BQUksWUFBWSxXQUFXLEdBQUc7QUFDNUIsUUFBSSxnQkFBZ0I7QUFDcEIsVUFBTSxJQUFJLE1BQU0sZ0JBQWdCO0FBQUEsRUFDbEM7QUFDQSxTQUFPO0FBQ1Q7IiwKICAibmFtZXMiOiBbXQp9Cg==

package/dist-mjs/athena/athena.mjs

@@ -235,6 +235,21 @@ function checkSelect(selectAST, ctx, withTableName) {
   const columns = resolveSelectColumns(select, selectCtx);
   applyUnnestPost(deferredUnnest, columns);
   log("resolved columns", [...columns.keys()]);
+  const allTables = [...selectCtx.tables.values()].flat();
+  if (select.where !== null) {
+    validateComplexColumnExpression(select.where, allTables, selectCtx);
+  }
+  if (select.having !== null) {
+    validateComplexColumnExpression(select.having, allTables, selectCtx);
+  }
+  for (const orderItem of select.orderby ?? []) {
+    validateComplexColumnExpression(orderItem.expr, allTables, selectCtx);
+  }
+  if (select.groupby?.columns !== void 0) {
+    for (const groupCol of select.groupby.columns) {
+      validateComplexColumnExpression(groupCol, allTables, selectCtx);
+    }
+  }
   if (select._next !== void 0) {
     checkSelect(select._next, ctx, withTableName);
   }
@@ -328,4 +343,4 @@ export {
   athena_default as default,
   ruleId
 };
-//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/athena/athena.ts"],
  "mappings": "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",
  "names": ["tableName", "alias", "apiSchemas", "operations"]
}

+//# 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

@@ -230,9 +230,9 @@ export interface Select {
     from: From[] | TableExpr | null;
     where: Binary | Function | null;
     groupby: {
-        columns: ColumnRef[] | null;
+        columns: ColumnRef[] | undefined;
         modifiers: ValueExpr<string>[];
-    };
+    } | undefined;
     having: any[] | null;
     orderby: OrderBy[] | null;
     limit: Limit | null;

package/package.json

@@ -1 +1 @@
-{"name":"@checkdigit/eslint-plugin","version":"7.18.0-PR.143-8290","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"}}}}
+{"name":"@checkdigit/eslint-plugin","version":"7.18.0-PR.143-0de2","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/api-matcher.ts

@@ -1,10 +1,10 @@
 // athena/api-matcher.ts
 
 import debug from 'debug';
-import { JSONPath } from 'jsonpath-plus';
 import type { SchemaObject } from 'ajv/dist/2020';
 
 import type { ApiSchemas, OperationSchemas } from '../openapi/generate-schema';
+import type { Binary, ColumnRefItem, Function as SqlFunction } from './types';
 
 const log = debug('eslint-plugin:athena:api-matcher');
 
@@ -21,105 +21,226 @@ export interface MatchedOperation {
   response: SchemaObject;
 }
 
-type Matcher = (path: string, method: string) => boolean;
+// A predicate over an API operation candidate: (url path, HTTP method, HTTP response code)
+type OperationPredicate = (path: string, method: string, responseCode: string) => boolean;
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function getVersionMatcher(_selectAST: object, _tableAST: object): Matcher | undefined {
-  return undefined;
+const ALWAYS_TRUE: OperationPredicate = () => true;
+
+// --- AST accessor helpers (use Record<string,unknown> to avoid TypeScript narrowing conflicts) ---
+
+function rec(node: unknown): Record<string, unknown> | undefined {
+  return typeof node === 'object' && node !== null ? (node as Record<string, unknown>) : undefined;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function getPathPartMatcher(selectAST: object, _tableAST: object): Matcher | undefined {
-  const [pathPartCondition]: object[] = JSONPath({
-    json: selectAST,
-    path: "$.where..[?(@ && @.type === 'binary_expr' && @.operator === '=' && @.left && @.left.type === 'function' && @.left.name && @.left.name.name && @.left.name.name[0] && @.left.name.name[0].value === 'split' && @.left.args && @.left.args.value && @.left.args.value[0] && @.left.args.value[0].type === 'column_ref' && @.left.args.value[0].column === 'url' && @.left.args.value[1] && @.left.args.value[1].type === 'single_quote_string' && @.left.args.value[1].value === '/' && @.left.array_index && @.left.array_index[0] && @.left.array_index[0].brackets === true && @.left.array_index[0].index && @.left.array_index[0].index.type === 'number')]",
-  }); /*?*/
-  // log('pathPartCondition', pathPartCondition);
-
-  if (pathPartCondition !== undefined) {
-    const [pathPartIndex]: [number] = JSONPath({
-      json: pathPartCondition,
-      path: '$.left.array_index[0].index.value',
-    }); /*?*/
-    const [pathPartMatch]: [string] = JSONPath({
-      json: pathPartCondition,
-      path: '$.right.value',
-    }); /*?*/
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    return (path: string, _method: string) => {
-      const parts = path.split('/'); /*?*/
-      const part = parts[pathPartIndex - 1]; //athena index is larger than js index by one /*?*/
-      log(`checking path part`, { path, pathPartIndex, part, pathPartMatch });
-      return part?.startsWith(':') === true
-        ? true // ignore path part if it presents a dynamic input parameter
-        : parts[pathPartIndex - 1] === pathPartMatch; // try to match with static path part
-    };
+function getFunctionName(node: unknown): string | undefined {
+  const fn = rec(node);
+  if (fn?.['type'] !== 'function') {
+    return undefined;
   }
+  const name = fn['name'] as SqlFunction['name'] | undefined;
+  const firstName = name?.name[0];
+  return firstName === undefined ? undefined : firstName.value.toLowerCase();
+}
 
-  return undefined;
+function getColumnName(node: unknown): string | undefined {
+  const col = rec(node);
+  if (col?.['type'] !== 'column_ref') {
+    return undefined;
+  }
+  const column = (node as ColumnRefItem).column;
+  return typeof column === 'string' ? column.toLowerCase() : undefined;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function getPathPartsCountMatcher(selectAST: object, _tableAST: object): Matcher | undefined {
-  // log('getPathPartsCountMatcher', JSON.stringify(selectAST, undefined, 2));
-  const [pathPartCount]: number[] = JSONPath({
-    json: selectAST,
-    path: "$.where..[?(@ && @.type === 'binary_expr' && @.operator === '=' &&  @.left && @.left.type === 'function' && @.left.name && @.left.name.name && @.left.name.name[0] && @.left.name.name[0].value === 'cardinality' && @.right && @.right.type === 'number' && @.left.args && @.left.args.value && @.left.args.value[0] && @.left.args.value[0].type === 'function' && @.left.args.value[0].name && @.left.args.value[0].name.name && @.left.args.value[0].name.name[0] && @.left.args.value[0].name.name[0].value === 'split' && @.left.args.value[0].args && @.left.args.value[0].args.value && @.left.args.value[0].args.value[0] && @.left.args.value[0].args.value[0].type === 'column_ref' && @.left.args.value[0].args.value[0].column === 'url' && @.left.args.value[0].args.value[1] && @.left.args.value[0].args.value[1].type === 'single_quote_string' && @.left.args.value[0].args.value[1].value === '/')].right.value",
-  }); /*?*/
+function getColumnTable(node: unknown): string | null | undefined {
+  const col = rec(node);
+  if (col?.['type'] !== 'column_ref') {
+    return undefined;
+  }
+  return (node as ColumnRefItem).table;
+}
 
-  if (pathPartCount !== undefined) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    return (path: string, _method: string) => {
-      const parts = path.split('/');
-      return parts.length === pathPartCount;
-    };
+function getStringValue(node: unknown): string | undefined {
+  const val = rec(node);
+  if (val?.['type'] !== 'single_quote_string' && val?.['type'] !== 'string') {
+    return undefined;
   }
+  return typeof val['value'] === 'string' ? val['value'] : undefined;
+}
 
-  return undefined;
+function getNumberValue(node: unknown): number | undefined {
+  const val = rec(node);
+  return val?.['type'] === 'number' && typeof val['value'] === 'number' ? val['value'] : undefined;
 }
 
-function getPathMatchers(selectAST: object, tableAST: object) {
-  return [getPathPartMatcher(selectAST, tableAST), getPathPartsCountMatcher(selectAST, tableAST)];
+// Matches: split(url, '/')[N]  — a Function node carrying an array_index extension
+interface SplitUrlIndexed extends SqlFunction {
+  array_index: { brackets: true; index: { type: string; value: unknown } }[];
+}
+function isSplitUrlIndexed(node: unknown): node is SplitUrlIndexed {
+  const fn = rec(node);
+  if (fn?.['type'] !== 'function') {
+    return false;
+  }
+  if (getFunctionName(node) !== 'split') {
+    return false;
+  }
+  const args = (fn['args'] as { value?: unknown[] } | undefined)?.value;
+  if (!Array.isArray(args) || args.length < 2) {
+    return false;
+  }
+  if (getColumnName(args[0]) !== 'url') {
+    return false;
+  }
+  if (getStringValue(args[1]) !== '/') {
+    return false;
+  }
+  return Array.isArray(fn['array_index']) && (fn['array_index'] as unknown[]).length > 0;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function getMethodMatcher(selectAST: object, _tableAST: object): Matcher | undefined {
-  const [methodToMatch]: string[] = JSONPath({
-    json: selectAST,
-    path: "$.where..[?(@ && @.type === 'binary_expr' && @.operator === '=' && @.left && @.left.type === 'column_ref' && @.left.column === 'method' && @.right && @.right.type === 'single_quote_string')].right.value",
-  }); /*?*/
+// Matches: cardinality(split(url, '/'))
+function isCardinalitySplitUrl(node: unknown): node is SqlFunction {
+  const fn = rec(node);
+  if (fn?.['type'] !== 'function') {
+    return false;
+  }
+  if (getFunctionName(node) !== 'cardinality') {
+    return false;
+  }
+  const outerArgs = (fn['args'] as { value?: unknown[] } | undefined)?.value;
+  if (!Array.isArray(outerArgs) || outerArgs.length === 0) {
+    return false;
+  }
+  const innerFn = rec(outerArgs[0]);
+  if (innerFn?.['type'] !== 'function') {
+    return false;
+  }
+  if (getFunctionName(outerArgs[0]) !== 'split') {
+    return false;
+  }
+  const innerArgs = (innerFn['args'] as { value?: unknown[] } | undefined)?.value;
+  if (!Array.isArray(innerArgs) || innerArgs.length < 2) {
+    return false;
+  }
+  return getColumnName(innerArgs[0]) === 'url' && getStringValue(innerArgs[1]) === '/';
+}
 
-  if (methodToMatch !== undefined) {
-    return (_path: string, method: string) => method === methodToMatch;
+// Returns the table qualifier of the left-hand side of a matchable binary condition.
+// null means unqualified (applies to every table); undefined means indeterminate.
+function getConditionTableQualifier(left: unknown): string | null | undefined {
+  const colName = getColumnName(left);
+  if (colName !== undefined) {
+    return getColumnTable(left);
+  }
+
+  if (isSplitUrlIndexed(left)) {
+    const args = (rec(left)?.['args'] as { value?: unknown[] } | undefined)?.value;
+    return getColumnTable(args?.[0]) ?? null;
+  }
+  if (isCardinalitySplitUrl(left)) {
+    const outerArgs = (rec(left)?.['args'] as { value?: unknown[] } | undefined)?.value;
+    const splitFn = rec(outerArgs?.[0]);
+    const innerArgs = (splitFn?.['args'] as { value?: unknown[] } | undefined)?.value;
+    return getColumnTable(innerArgs?.[0]) ?? null;
   }
   return undefined;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function getResponseStatusToMatch(selectAST: object, _tableAST: object): string | undefined {
-  const [responseStatus]: string[] = JSONPath({
-    json: selectAST,
-    path: "$.where..[?(@ && @.type === 'binary_expr' && @.operator === '=' && @.left && @.left.type === 'column_ref' && @.left.column === 'responsestatus' && @.right && @.right.type === 'single_quote_string')].right.value",
-  }); /*?*/
+// --- Predicate builders ---
+
+// tableAlias: the alias (or null if none) of the FROM-clause item we are currently matching.
+// Conditions that explicitly reference a different alias are skipped (treated as ALWAYS_TRUE).
+function buildLeafPredicate(node: Binary, tableAlias: string | null): OperationPredicate | undefined {
+  if (node.operator !== '=') {
+    return undefined;
+  }
+  const { left, right } = node;
+
+  const conditionTable = getConditionTableQualifier(left);
+  // conditionTable === null  → unqualified, applies to all tables
+  // conditionTable === string → qualified; skip if it names a different alias
+  if (conditionTable !== null && conditionTable !== undefined && tableAlias !== null && conditionTable !== tableAlias) {
+    return undefined;
+  }
+
+  // method = 'GET'
+  if (getColumnName(left) === 'method') {
+    const value = getStringValue(right);
+    if (value !== undefined) {
+      return (_path, method) => method === value;
+    }
+  }
+
+  // responsestatus = '200'
+  if (getColumnName(left) === 'responsestatus') {
+    const value = getStringValue(right);
+    if (value !== undefined) {
+      return (_path, _method, responseCode) => responseCode === value;
+    }
+  }
+
+  // split(url, '/')[N] = 'value'
+  if (isSplitUrlIndexed(left)) {
+    const index = left.array_index[0]?.index.value;
+    const value = getStringValue(right);
+    if (typeof index === 'number' && value !== undefined) {
+      return (path) => {
+        const parts = path.split('/');
+        const part = parts[index - 1]; // athena index is 1-based
+        log(`checking path part`, { path, index, part, value });
+        return part?.startsWith(':') === true ? true : part === value;
+      };
+    }
+  }
 
-  return responseStatus;
+  // cardinality(split(url, '/')) = N
+  if (isCardinalitySplitUrl(left)) {
+    const count = getNumberValue(right);
+    if (count !== undefined) {
+      return (path) => path.split('/').length === count;
+    }
+  }
+
+  return undefined;
+}
+
+function buildPredicate(expr: unknown, tableAlias: string | null): OperationPredicate {
+  const node = rec(expr);
+  if (node?.['type'] !== 'binary_expr') {
+    return ALWAYS_TRUE;
+  }
+
+  const binary = expr as Binary;
+
+  switch (binary.operator) {
+    case 'AND': {
+      const leftPred = buildPredicate(binary.left, tableAlias);
+      const rightPred = buildPredicate(binary.right, tableAlias);
+      return (path, method, code) => leftPred(path, method, code) && rightPred(path, method, code);
+    }
+    case 'OR': {
+      const leftPred = buildPredicate(binary.left, tableAlias);
+      const rightPred = buildPredicate(binary.right, tableAlias);
+      return (path, method, code) => leftPred(path, method, code) || rightPred(path, method, code);
+    }
+    case 'NOT': {
+      const innerPred = buildPredicate(binary.left, tableAlias);
+      return (path, method, code) => !innerPred(path, method, code);
+    }
+    default: {
+      return buildLeafPredicate(binary, tableAlias) ?? ALWAYS_TRUE;
+    }
+  }
 }
 
-// [TODO:] match only relevent table in case multiple tables are joined
 export function matchApi(
   selectAST: object,
   tableAST: object,
   apiSchemas: ApiSchemas[],
 ): MatchedOperation[] | undefined {
-  const schemaMatchers: Matcher[] = [
-    getVersionMatcher(selectAST, tableAST),
-    getPathMatchers(selectAST, tableAST),
-    getMethodMatcher(selectAST, tableAST),
-  ]
-    .flat()
-    .filter<Matcher>((matcher) => matcher !== undefined);
-
-  const allOperationSchemas: OperationToMatch[] = apiSchemas
+  const tableAlias = (tableAST as { as?: string | null }).as ?? null;
+  const predicate = buildPredicate((selectAST as { where?: unknown }).where ?? null, tableAlias);
+
+  const allOperations: OperationToMatch[] = apiSchemas
     .flatMap((apiSchema) => Object.entries(apiSchema.apis))
     .flatMap(([path, operations]) =>
       Object.entries(operations).map(([method, operationSchemas]) => ({
@@ -128,41 +249,19 @@ export function matchApi(
         operationSchemas,
       })),
     );
-  log('total operation schemas', allOperationSchemas.length);
+  log('total operation schemas', allOperations.length);
 
-  const matchedOperationSchemas = allOperationSchemas.filter(({ path, method }) =>
-    schemaMatchers.every((matcher) => matcher(path, method)),
+  const matchedApis = allOperations.flatMap(({ path, method, operationSchemas }) =>
+    Object.entries(operationSchemas.responses).flatMap(([responseCode, responseSchema]) =>
+      predicate(path, method, responseCode)
+        ? [{ path, method, request: operationSchemas.request, response: responseSchema }]
+        : [],
+    ),
   );
-  log('matched operation schemas', matchedOperationSchemas.length);
-
-  if (matchedOperationSchemas.length === 0) {
-    log('no matched operation schema');
-    throw new Error('no matched operation schema');
-  }
-
-  const matchedResponseStatus = getResponseStatusToMatch(selectAST, tableAST);
-  // [TODO:] should we allow multiple response status?
-  // assert.ok(matchedResponseStatus !== undefined);
-  log('matchedResponseStatus', matchedResponseStatus);
-
-  const matchedApis = matchedOperationSchemas
-    .flatMap((operation) =>
-      Object.entries(operation.operationSchemas.responses).map(([responseCode, responseSchema]) => {
-        const matchedResponseSchema =
-          matchedResponseStatus === undefined || responseCode === matchedResponseStatus ? responseSchema : undefined;
-        return matchedResponseSchema === undefined
-          ? undefined
-          : {
-              path: operation.path,
-              method: operation.method,
-              request: operation.operationSchemas.request,
-              response: matchedResponseSchema,
-            };
-      }),
-    )
-    .filter((api) => api !== undefined);
+  log('matched apis', matchedApis.length);
+
   if (matchedApis.length === 0) {
-    log('no api satisfy both request and response matchers');
+    log('no matched api');
     throw new Error('no matched api');
   }
   return matchedApis;

package/src/athena/athena.ts

@@ -379,6 +379,23 @@ function checkSelect(selectAST: Select | With, ctx: VisitContext, withTableName?
 
   log('resolved columns', [...columns.keys()]);
 
+  // Pass 3: validate JSON paths in WHERE / HAVING / GROUP BY / ORDER BY
+  const allTables = [...selectCtx.tables.values()].flat();
+  if (select.where !== null) {
+    validateComplexColumnExpression(select.where, allTables, selectCtx);
+  }
+  if (select.having !== null) {
+    validateComplexColumnExpression(select.having, allTables, selectCtx);
+  }
+  for (const orderItem of select.orderby ?? []) {
+    validateComplexColumnExpression(orderItem.expr, allTables, selectCtx);
+  }
+  if (select.groupby?.columns !== undefined) {
+    for (const groupCol of select.groupby.columns) {
+      validateComplexColumnExpression(groupCol, allTables, selectCtx);
+    }
+  }
+
   // UNION ALL — next SELECT in the chain
   if (select._next !== undefined) {
     checkSelect(select._next, ctx, withTableName);

package/src/athena/types.ts

@@ -268,7 +268,7 @@ export interface Select {
   columns: any[] | Column[];
   from: From[] | TableExpr | null;
   where: Binary | Function | null;
-  groupby: { columns: ColumnRef[] | null; modifiers: ValueExpr<string>[] };
+  groupby: { columns: ColumnRef[] | undefined; modifiers: ValueExpr<string>[] } | undefined;
   having: any[] | null;
   orderby: OrderBy[] | null;
   limit: Limit | null;