Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-31 23:31:30 -05:00
Code Issues Activity

fix: dynamically load zod-to-ts (#12273)

Browse source
This commit is contained in:
Matt Kane 2024-10-21 15:19:58 +01:00 • committed by GitHub
parent f32a7a8388
commit c2ee963cb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/swift-crabs-exercise.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes an issue with some package managers where sites would not build if TypeScript was not installed.

14
packages/astro/src/content/types-generator.ts
View file

@ -6,7 +6,6 @@ import { bold, cyan } from 'kleur/colors';
import { type ViteDevServer, normalizePath } from 'vite';
import { type ZodSchema, z } from 'zod';
import { zodToJsonSchema } from 'zod-to-json-schema';
import { printNode, zodToTs } from 'zod-to-ts';
import type { AstroSettings, ContentEntryType } from '../@types/astro.js';
import { AstroError } from '../core/errors/errors.js';
import { AstroErrorData } from '../core/errors/index.js';
@ -396,8 +395,17 @@ async function typeForCollection<T extends keyof ContentConfig['collections']>(
if (collection?.type === CONTENT_LAYER_TYPE) {
const schema = await getContentLayerSchema(collection, collectionKey);
if (schema) {
const ast = zodToTs(schema);
return printNode(ast.node);
try {
const zodToTs = await import('zod-to-ts');
const ast = zodToTs.zodToTs(schema);
return zodToTs.printNode(ast.node);
} catch (err: any) {
// zod-to-ts is sad if we don't have TypeScript installed, but that's fine as we won't be needing types in that case
if (err.message.includes("Cannot find package 'typescript'")) {
return 'any';
}
throw err;
}
}
}
return 'any';