Skip to content
Open
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion src/cli/codegen_templates/dataModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,20 @@ async function staticDataModelImpl(
return useTypeScript ? noSchemaDataModelTS() : noSchemaDataModelDTS();
}

// Conditionally include AnyDataModel in the import only when schema
// validation is disabled (it is used later as `& AnyDataModel`).
const serverImports = [
"DocumentByName",
"TableNamesInDataModel",
"SystemTableNames",
];
if (!analysis.schema.schemaValidation) {
serverImports.push("AnyDataModel");
}

const lines = [
header("Generated data model types."),
`import type { DocumentByName, TableNamesInDataModel, SystemTableNames, AnyDataModel } from "convex/server";`,
`import type { ${serverImports.join(", ")} } from "convex/server";`,
`import type { GenericId } from "convex/values";`,
];
for await (const line of codegenDataModel(ctx, analysis.schema)) {
Expand Down