Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add queryName and queryFile to type error details #584

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add queryName and queryFile to type error details #584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions packages/cli/src/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,22 @@ export const generateTypeAlias = (typeName: string, alias: string) =>

type ParsedQuery =
| {
ast: TSQueryAST;
mode: ProcessingMode.TS;
}
ast: TSQueryAST;
mode: ProcessingMode.TS;
}
| {
ast: SQLQueryAST;
mode: ProcessingMode.SQL;
};
ast: SQLQueryAST;
mode: ProcessingMode.SQL;
};

export async function queryToTypeDeclarations(
parsedQuery: ParsedQuery,
fileName: string,
typeSource: TypeSource,
types: TypeAllocator,
config: ParsedConfig,
): Promise<string> {

let queryData;
let queryName;
if (parsedQuery.mode === ProcessingMode.TS) {
Expand All @@ -110,9 +112,10 @@ export async function queryToTypeDeclarations(
);

if (typeError || hasAnonymousColumns) {

// tslint:disable:no-console
if (typeError) {
console.error('Error in query. Details: %o', typeData);
console.error('Error in query. Details: %o', { ...typeData, queryName, fileName });
if (config.failOnError) {
throw new Error(
`Query "${queryName}" is invalid. Can't generate types.`,
Expand Down Expand Up @@ -234,19 +237,19 @@ export async function queryToTypeDeclarations(
`/** '${queryName}' return type */\n` +
(returnFieldTypes.length > 0
? generateInterface(
`${interfacePrefix}${interfaceName}Result`,
returnFieldTypes,
)
`${interfacePrefix}${interfaceName}Result`,
returnFieldTypes,
)
: generateTypeAlias(resultInterfaceName, 'void'));

const paramInterfaceName = `${interfacePrefix}${interfaceName}Params`;
const paramTypesInterface =
`/** '${queryName}' parameters type */\n` +
(paramFieldTypes.length > 0
? generateInterface(
`${interfacePrefix}${interfaceName}Params`,
paramFieldTypes,
)
`${interfacePrefix}${interfaceName}Params`,
paramFieldTypes,
)
: generateTypeAlias(paramInterfaceName, 'void'));

const typePairInterface =
Expand Down Expand Up @@ -325,6 +328,7 @@ export async function generateTypedecsFromFile(
const sqlQueryAST = queryAST as SQLQueryAST;
const result = await queryToTypeDeclarations(
{ ast: sqlQueryAST, mode: ProcessingMode.SQL },
fileName,
typeSource,
types,
config,
Expand Down Expand Up @@ -352,6 +356,7 @@ export async function generateTypedecsFromFile(
ast: tsQueryAST,
mode: ProcessingMode.TS,
},
fileName,
typeSource,
types,
config,
Expand Down