@checkdigit/eslint-plugin 7.18.0-PR.143-c73c → 7.18.0-PR.143-9235

package/dist-mjs/athena/validate.mjs

@@ -40,6 +40,7 @@ function offsetToLoc(text, offset) {
   return { line: lines.length, column: lines[lines.length - 1]?.length ?? 0 };
 }
 var log = debug("eslint-plugin:athena");
+var ANONYMOUS_TABLE = "<anonymous>";
 function resolvedCol(name, schema, ast) {
   return ast !== void 0 ? { name, schema, ast } : { name, schema };
 }
@@ -52,6 +53,9 @@ function getApiSchemas(serviceName, ctx) {
   return schemas;
 }
 function lookupTables(nameOrAlias, ctx) {
+  if (ctx.tables.has(nameOrAlias)) {
+    return ctx.tables.get(nameOrAlias) ?? [];
+  }
   const canonical = ctx.aliases.get(nameOrAlias) ?? nameOrAlias;
   return ctx.tables.get(canonical) ?? [];
 }
@@ -64,15 +68,16 @@ function fromClauseItems(select) {
   }
   return [];
 }
-function resolveServiceTable(select, item, ctx) {
+function resolveServiceTable(select, item, ctx, storageKey) {
   const { table: tableName } = item;
+  const key = storageKey ?? tableName;
   try {
     const apiSchemas = getApiSchemas(tableName, ctx);
     if (apiSchemas.length === 0) {
       throw new AthenaError(ATHENA_ERROR, `service not found: "${tableName}" (no swagger schema located)`, item);
     }
     const operations = matchApi(select, item, apiSchemas) ?? [];
-    ctx.tables.set(tableName, buildServiceTables(tableName, operations));
+    ctx.tables.set(key, buildServiceTables(tableName, operations));
   } catch (error) {
     if (error instanceof AthenaError) {
       throw error;
@@ -84,6 +89,9 @@ function restrictToFromClause(select, ctx) {
   const fromNames = /* @__PURE__ */ new Set();
   for (const item of fromClauseItems(select)) {
     if (isBaseFrom(item) || isJoin(item)) {
+      if (item.as !== null) {
+        fromNames.add(item.as);
+      }
       fromNames.add(item.table);
     } else if (isTableExpr(item)) {
       fromNames.add(typeof item.as === "string" ? item.as : "<subquery>");
@@ -95,37 +103,30 @@ function restrictToFromClause(select, ctx) {
     }
   }
 }
+function tableIsResolved(tableName, storageKey, ctx) {
+  return ctx.tables.has(storageKey) || ctx.tables.has(tableName);
+}
+function resolveTableOrJoinItem(select, item, ctx) {
+  const { table: tableName, as: alias } = item;
+  if (alias !== null) {
+    ctx.aliases.set(alias, tableName);
+  }
+  const storageKey = alias ?? tableName;
+  if (!tableIsResolved(tableName, storageKey, ctx)) {
+    resolveServiceTable(select, item, ctx, alias ?? void 0);
+  }
+}
 function resolveFromClause(select, ctx) {
   for (const item of fromClauseItems(select)) {
     if (isUnnestFrom(item)) {
       continue;
     }
     if (isTableExpr(item)) {
-      const alias2 = typeof item.as === "string" ? item.as : "<subquery>";
-      checkSelect(item.expr.ast, ctx, alias2);
-      continue;
-    }
-    if (isJoin(item)) {
-      const { table: tableName2, as: alias2 } = item;
-      if (alias2 !== null) {
-        ctx.aliases.set(alias2, tableName2);
-      }
-      if (!ctx.tables.has(tableName2)) {
-        resolveServiceTable(select, item, ctx);
-      }
-      continue;
-    }
-    if (!isBaseFrom(item)) {
-      continue;
-    }
-    const { table: tableName, as: alias } = item;
-    if (alias !== null) {
-      ctx.aliases.set(alias, tableName);
-    }
-    if (ctx.tables.has(tableName)) {
-      continue;
+      const alias = typeof item.as === "string" ? item.as : "<subquery>";
+      checkSelect(item.expr.ast, ctx, alias);
+    } else if (isJoin(item) || isBaseFrom(item)) {
+      resolveTableOrJoinItem(select, item, ctx);
     }
-    resolveServiceTable(select, item, ctx);
   }
 }
 function extractUnnestMappings(select) {
@@ -158,7 +159,7 @@ function applyUnnestPre(mappings, ctx) {
     }
     const sourceColumns = ownerTable.columns.get(fromColumn) ?? [];
     const sourceSchema = sourceColumns[0]?.schema;
-    const unnestTableName = `${ownerTable.name ?? "<anonymous>"}:<unnested>`;
+    const unnestTableName = `${ownerTable.name ?? ANONYMOUS_TABLE}:<unnested>`;
     const apiOperation = ownerTable.apiOperation !== void 0 ? { apiOperation: ownerTable.apiOperation } : {};
     if (sourceSchema?.type === "array") {
       const [toColumn] = toColumns;
@@ -286,7 +287,7 @@ function lookupColumnOrThrow(colRef, ref, referencedTables) {
   const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
   if (resolvedColumns.length === 0) {
     const tableNames = [
-      ...new Set(referencedTables.map((referenceTable) => referenceTable.name ?? "<anonymous>"))
+      ...new Set(referencedTables.map((referenceTable) => referenceTable.name ?? ANONYMOUS_TABLE))
     ].join(", ");
     const availableCols = [...new Set(referencedTables.flatMap((table) => [...table.columns.keys()]))].join(", ");
     throw new AthenaError(
@@ -341,10 +342,9 @@ function resolveSingleColumnRef(columnAST, columnAlias, indexedName, ref, allTab
   assert.ok(colRef !== void 0, "column_ref must have a string column name");
   const referencedTables = tableRef !== void 0 ? lookupTables(tableRef, ctx) : allTables;
   if (referencedTables.length === 0) {
-    const tableNames = [...ctx.tables.keys()].join(", ");
     throw new AthenaError(
       ATHENA_ERROR,
-      `unknown table or alias '${tableRef ?? colRef}'; known tables: ${tableNames}`,
+      `unknown table or alias '${tableRef ?? colRef}'; known tables: ${[...ctx.tables.keys()].join(", ")}`,
       ref
     );
   }
@@ -477,4 +477,4 @@ export {
   checkAthenaAst,
   offsetToLoc
 };
-//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../src/athena/validate.ts"],
  "mappings": "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",
  "names": ["alias", "tableName"]
}

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


package/package.json

@@ -1 +1 @@
-{"name":"@checkdigit/eslint-plugin","version":"7.18.0-PR.143-c73c","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"]}}}
+{"name":"@checkdigit/eslint-plugin","version":"7.18.0-PR.143-9235","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/validate.ts

@@ -58,6 +58,7 @@ export function offsetToLoc(text: string, offset: number): { line: number; colum
 }
 
 const log = debug('eslint-plugin:athena');
+const ANONYMOUS_TABLE = '<anonymous>';
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -77,6 +78,10 @@ function getApiSchemas(serviceName: string, ctx: VisitContext) {
 }
 
 function lookupTables(nameOrAlias: string, ctx: VisitContext): ResolvedTable[] {
+  // Direct hit first: aliases are now stored under their alias key in ctx.tables.
+  if (ctx.tables.has(nameOrAlias)) {
+    return ctx.tables.get(nameOrAlias) ?? [];
+  }
   const canonical = ctx.aliases.get(nameOrAlias) ?? nameOrAlias;
   return ctx.tables.get(canonical) ?? [];
 }
@@ -95,15 +100,18 @@ function fromClauseItems(select: Select): From[] {
 // Pass 1 — Resolve FROM clause: service tables → ctx.tables + ctx.aliases
 // ---------------------------------------------------------------------------
 
-function resolveServiceTable(select: Select, item: BaseFrom, ctx: VisitContext): void {
+function resolveServiceTable(select: Select, item: BaseFrom, ctx: VisitContext, storageKey?: string): void {
   const { table: tableName } = item;
+  const key = storageKey ?? tableName;
   try {
     const apiSchemas = getApiSchemas(tableName, ctx);
     if (apiSchemas.length === 0) {
       throw new AthenaError(ATHENA_ERROR, `service not found: "${tableName}" (no swagger schema located)`, item);
     }
     const operations = matchApi(select, item, apiSchemas) ?? [];
-    ctx.tables.set(tableName, buildServiceTables(tableName, operations));
+    // Always use the canonical table name for ResolvedTable.name so that error messages
+    // ("in tables: …") show the service name, not the alias.
+    ctx.tables.set(key, buildServiceTables(tableName, operations));
   } catch (error) {
     if (error instanceof AthenaError) {
       throw error;
@@ -116,6 +124,11 @@ function restrictToFromClause(select: Select, ctx: VisitContext): void {
   const fromNames = new Set<string>();
   for (const item of fromClauseItems(select)) {
     if (isBaseFrom(item) || isJoin(item)) {
+      // Service tables are stored under the alias key; CTEs are stored under the
+      // canonical name.  Add both so either lookup survives the prune.
+      if (item.as !== null) {
+        fromNames.add(item.as);
+      }
       fromNames.add(item.table);
     } else if (isTableExpr(item)) {
       fromNames.add(typeof item.as === 'string' ? item.as : '<subquery>');
@@ -128,45 +141,35 @@ function restrictToFromClause(select: Select, ctx: VisitContext): void {
   }
 }
 
+function tableIsResolved(tableName: string, storageKey: string, ctx: VisitContext): boolean {
+  return ctx.tables.has(storageKey) || ctx.tables.has(tableName);
+}
+
+// Shared resolution logic for BaseFrom and Join items (Join extends BaseFrom).
+function resolveTableOrJoinItem(select: Select, item: BaseFrom, ctx: VisitContext): void {
+  const { table: tableName, as: alias } = item;
+  if (alias !== null) {
+    ctx.aliases.set(alias, tableName);
+  }
+  const storageKey = alias ?? tableName;
+  // Skip if already resolved: CTE stored under canonical name, or duplicate alias.
+  if (!tableIsResolved(tableName, storageKey, ctx)) {
+    resolveServiceTable(select, item, ctx, alias ?? undefined);
+  }
+}
+
 function resolveFromClause(select: Select, ctx: VisitContext): void {
   for (const item of fromClauseItems(select)) {
     if (isUnnestFrom(item)) {
       continue;
     }
-
     if (isTableExpr(item)) {
       const alias = typeof item.as === 'string' ? item.as : '<subquery>';
       // eslint-disable-next-line no-use-before-define
       checkSelect(item.expr.ast, ctx, alias);
-      continue;
+    } else if (isJoin(item) || isBaseFrom(item)) {
+      resolveTableOrJoinItem(select, item, ctx);
     }
-
-    if (isJoin(item)) {
-      const { table: tableName, as: alias } = item;
-      if (alias !== null) {
-        ctx.aliases.set(alias, tableName);
-      }
-      if (!ctx.tables.has(tableName)) {
-        resolveServiceTable(select, item, ctx);
-      }
-      continue;
-    }
-
-    if (!isBaseFrom(item)) {
-      continue;
-    }
-
-    const { table: tableName, as: alias } = item;
-
-    if (alias !== null) {
-      ctx.aliases.set(alias, tableName);
-    }
-
-    if (ctx.tables.has(tableName)) {
-      continue;
-    }
-
-    resolveServiceTable(select, item, ctx);
   }
 }
 
@@ -219,7 +222,7 @@ function applyUnnestPre(mappings: UnnestMapping[], ctx: VisitContext): UnnestMap
 
     const sourceColumns = ownerTable.columns.get(fromColumn) ?? [];
     const sourceSchema = sourceColumns[0]?.schema;
-    const unnestTableName = `${ownerTable.name ?? '<anonymous>'}:<unnested>`;
+    const unnestTableName = `${ownerTable.name ?? ANONYMOUS_TABLE}:<unnested>`;
     const apiOperation = ownerTable.apiOperation !== undefined ? { apiOperation: ownerTable.apiOperation } : {};
 
     if (sourceSchema?.type === 'array') {
@@ -388,7 +391,7 @@ function lookupColumnOrThrow(colRef: string, ref: object, referencedTables: Reso
   const resolvedColumns = referencedTables.flatMap((table) => table.columns.get(colRef) ?? []);
   if (resolvedColumns.length === 0) {
     const tableNames = [
-      ...new Set(referencedTables.map((referenceTable) => referenceTable.name ?? '<anonymous>')),
+      ...new Set(referencedTables.map((referenceTable) => referenceTable.name ?? ANONYMOUS_TABLE)),
     ].join(', ');
     const availableCols = [...new Set(referencedTables.flatMap((table) => [...table.columns.keys()]))].join(', ');
     throw new AthenaError(
@@ -460,10 +463,9 @@ function resolveSingleColumnRef(
 
   const referencedTables = tableRef !== undefined ? lookupTables(tableRef, ctx) : allTables;
   if (referencedTables.length === 0) {
-    const tableNames = [...ctx.tables.keys()].join(', ');
     throw new AthenaError(
       ATHENA_ERROR,
-      `unknown table or alias '${tableRef ?? colRef}'; known tables: ${tableNames}`,
+      `unknown table or alias '${tableRef ?? colRef}'; known tables: ${[...ctx.tables.keys()].join(', ')}`,
       ref,
     );
   }