Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-01-06 22:10:10 -05:00
Code Issues Activity

Fix a performance issue with JSON schema generation (#11249)

Browse source
This commit is contained in:
Mark Gaze 2024-06-14 11:38:20 +01:00 committed by GitHub
parent 773828a056
commit de60c69aa0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/early-spies-bow.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes a performance issue with JSON schema generation

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

@ -449,41 +449,42 @@ async function writeContentFiles({
for (const entryKey of Object.keys(collection.entries).sort()) {
const dataType = collectionConfig?.schema ? `InferEntrySchema<${collectionKey}>` : 'any';
dataTypesStr += `${entryKey}: {\n id: ${entryKey};\n collection: ${collectionKey};\n data: ${dataType}\n};\n`;
if (
settings.config.experimental.contentCollectionJsonSchema &&
collectionConfig?.schema
) {
let zodSchemaForJson =
typeof collectionConfig.schema === 'function'
? collectionConfig.schema({ image: () => z.string() })
: collectionConfig.schema;
if (zodSchemaForJson instanceof z.ZodObject) {
zodSchemaForJson = zodSchemaForJson.extend({
$schema: z.string().optional(),
});
}
try {
await fs.promises.writeFile(
new URL(`./${collectionKey.replace(/"/g, '')}.schema.json`, collectionSchemasDir),
JSON.stringify(
zodToJsonSchema(zodSchemaForJson, {
name: collectionKey.replace(/"/g, ''),
markdownDescription: true,
errorMessages: true,
}),
null,
2
)
);
} catch (err) {
logger.warn(
'content',
`An error was encountered while creating the JSON schema for the ${entryKey} entry in ${collectionKey} collection. Proceeding without it. Error: ${err}`
);
}
dataTypesStr += `};\n`;
}
if (
settings.config.experimental.contentCollectionJsonSchema &&
collectionConfig?.schema
) {
let zodSchemaForJson =
typeof collectionConfig.schema === 'function'
? collectionConfig.schema({ image: () => z.string() })
: collectionConfig.schema;
if (zodSchemaForJson instanceof z.ZodObject) {
zodSchemaForJson = zodSchemaForJson.extend({
$schema: z.string().optional(),
});
}
try {
await fs.promises.writeFile(
new URL(`./${collectionKey.replace(/"/g, '')}.schema.json`, collectionSchemasDir),
JSON.stringify(
zodToJsonSchema(zodSchemaForJson, {
name: collectionKey.replace(/"/g, ''),
markdownDescription: true,
errorMessages: true,
}),
null,
2
)
);
} catch (err) {
logger.warn(
'content',
`An error was encountered while creating the JSON schema for the ${collectionKey} collection. Proceeding without it. Error: ${err}`
);
}
}
dataTypesStr += `};\n`;
break;
}
}