@checkdigit/eslint-plugin 7.18.0-PR.143-a26e → 7.18.0-PR.143-bebb

package/package.json

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

@@ -127,6 +127,23 @@ function getFunctionAliasName(as: { name: { name: { value: string }[] } } | null
   return as?.name.name[0]?.value;
 }
 
+// Extracts a column alias name from an alias-arg node.  Two cases arise:
+//   1. column_ref  (the normal case): { type: 'column_ref', column: 'dates' } → 'dates'
+//   2. zero-arg keyword function: SQL type keywords like `date` are parsed as DATE() function
+//      calls; recover the column name by lowercasing the function name.
+function extractColumnAliasName(arg: unknown): string | undefined {
+  const colRef = arg as { column?: unknown };
+  if (typeof colRef.column === 'string') {
+    return colRef.column;
+  }
+  const fnNode = arg as { type?: unknown; name?: { name?: { value?: string }[] }; args?: { value?: unknown[] } };
+  if (fnNode.type === 'function' && fnNode.args?.value?.length === 0) {
+    const functionName = fnNode.name?.name?.[0]?.value;
+    return functionName !== undefined ? functionName.toLowerCase() : undefined;
+  }
+  return undefined;
+}
+
 // UNNEST whose argument is a function call (e.g. SEQUENCE), not a column reference.
 function isStandaloneUnnest(node: unknown): node is UnnestFrom {
   return isUnnestFrom(node) && typeof (node.expr as { column?: unknown }).column !== 'string';
@@ -190,7 +207,7 @@ function resolveFromClause(select: Select, ctx: VisitContext): void {
       if (tableAlias !== undefined) {
         const columns = new Map(
           (unknownItem.as?.args.value ?? []).map((columnRef) => {
-            const colName = (columnRef as { column: string }).column;
+            const colName = extractColumnAliasName(columnRef) ?? '';
             return [colName, [resolvedCol(colName, {})]];
           }),
         );
@@ -223,6 +240,7 @@ function resolveFromClause(select: Select, ctx: VisitContext): void {
 interface UnnestMapping {
   fromColumn: string;
   toColumns: string[];
+  tableAlias?: string;
   ast: object;
 }
 
@@ -246,13 +264,20 @@ function extractUnnestMappings(select: Select): UnnestMapping[] {
     const aliasArgs = item.as?.args.value ?? [];
     const toColumns: string[] = [];
     for (const col of aliasArgs) {
-      if (typeof (col as { column?: unknown }).column === 'string') {
-        toColumns.push((col as { column: string }).column);
+      const colName = extractColumnAliasName(col);
+      if (colName !== undefined) {
+        toColumns.push(colName);
       }
     }
     assert.ok(toColumns.length > 0, 'UNNEST alias must have at least one column name');
 
-    mappings.push({ fromColumn, toColumns, ast: item.expr });
+    const tableAlias = getFunctionAliasName(item.as);
+    mappings.push({
+      fromColumn,
+      toColumns,
+      ...(tableAlias !== undefined ? { tableAlias } : {}),
+      ast: item.expr,
+    });
   }
 
   return mappings;
@@ -261,11 +286,11 @@ function extractUnnestMappings(select: Select): UnnestMapping[] {
 function applyUnnestPre(mappings: UnnestMapping[], ctx: VisitContext): UnnestMapping[] {
   const deferred: UnnestMapping[] = [];
 
-  for (const { fromColumn, toColumns, ast } of mappings) {
+  for (const { fromColumn, toColumns, tableAlias, ast } of mappings) {
     const ownerTable = [...ctx.tables.values()].flat().find((table) => table.columns.has(fromColumn));
 
     if (ownerTable === undefined) {
-      deferred.push({ fromColumn, toColumns, ast });
+      deferred.push({ fromColumn, toColumns, ...(tableAlias !== undefined ? { tableAlias } : {}), ast });
       continue;
     }
 
@@ -274,16 +299,17 @@ function applyUnnestPre(mappings: UnnestMapping[], ctx: VisitContext): UnnestMap
     const unnestTableName = `${ownerTable.name ?? ANONYMOUS_TABLE}:<unnested>`;
     const apiOperation = ownerTable.apiOperation !== undefined ? { apiOperation: ownerTable.apiOperation } : {};
 
+    let unnestEntry: ResolvedTable[];
     if (sourceSchema?.type === 'array') {
       const [toColumn] = toColumns;
       assert.ok(toColumn !== undefined);
-      ctx.tables.set(unnestTableName, [
+      unnestEntry = [
         {
           name: unnestTableName,
           ...apiOperation,
           columns: new Map([[toColumn, [resolvedCol(toColumn, sourceSchema.items, sourceColumns[0]?.ast)]]]),
         },
-      ]);
+      ];
     } else if (sourceSchema?.type === 'object') {
       const [keyColumn, valueColumn] = toColumns;
       assert.ok(
@@ -293,7 +319,7 @@ function applyUnnestPre(mappings: UnnestMapping[], ctx: VisitContext): UnnestMap
       const addlProps = (sourceSchema as SchemaObject)['additionalProperties'] as unknown;
       const valueSchema: SchemaObject =
         typeof addlProps === 'object' && addlProps !== null ? addlProps : { type: 'string' };
-      ctx.tables.set(unnestTableName, [
+      unnestEntry = [
         {
           name: unnestTableName,
           ...apiOperation,
@@ -302,13 +328,28 @@ function applyUnnestPre(mappings: UnnestMapping[], ctx: VisitContext): UnnestMap
             [valueColumn, [resolvedCol(valueColumn, valueSchema, sourceColumns[0]?.ast)]],
           ]),
         },
-      ]);
-    } else {
+      ];
+    } else if (ownerTable.apiOperation !== undefined) {
+      // Only raise an error when the column schema was derived from a known API spec — for
+      // computed columns (subqueries, CTEs, functions) the inferred schema may be imprecise.
       throw new AthenaError(
         ATHENA_ERROR,
         `UNNEST source column '${fromColumn}' must resolve to an array or map schema`,
         ast,
       );
+    } else {
+      // Non-API source: schema is an estimate; register target columns with unknown schema.
+      unnestEntry = [
+        {
+          name: unnestTableName,
+          ...apiOperation,
+          columns: new Map(toColumns.map((toColumn) => [toColumn, [resolvedCol(toColumn, {})]])),
+        },
+      ];
+    }
+    ctx.tables.set(unnestTableName, unnestEntry);
+    if (tableAlias !== undefined) {
+      ctx.tables.set(tableAlias, unnestEntry);
     }
   }