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

Jump to bottom

Fix for #9673 #9680

Merged
merged 4 commits into from
Jan 24, 2024
Merged

Fix for #9673 #9680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab2535d
Fix for #9673
loucyx Jan 12, 2024
098fa35
🦋 add changeset file
loucyx Jan 12, 2024
17872ed
Update breezy-plants-smoke.md
loucyx Jan 12, 2024
84f8d68
⚡️ simplified normalizeConfigPath
loucyx Jan 24, 2024
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
5 changes: 5 additions & 0 deletions .changeset/breezy-plants-smoke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"astro": patch
---

Fixes types generation from Content Collections config file
31 changes: 20 additions & 11 deletions packages/astro/src/content/types-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,22 @@ function invalidateVirtualMod(viteServer: ViteDevServer) {
viteServer.moduleGraph.invalidateModule(virtualMod);
}

/**
* Takes the source (`from`) and destination (`to`) of a config path and
* returns a normalized relative version:
* - If is not relative, it adds `./` to the beginning.
* - If it ends with `.ts`, it replaces it with `.js`.
* - It adds `""` around the string.
* @param from Config path source.
* @param to Config path destination.
* @returns Normalized config path.
*/
function normalizeConfigPath(from: string, to: string) {
const configPath = path.relative(from, to).replace(/\.ts$/, '.js');

return `"${isRelativePath(configPath) ? '' : './'}${configPath}"` as const;
}

async function writeContentFiles({
fs,
contentPaths,
Expand Down Expand Up @@ -444,18 +460,11 @@ async function writeContentFiles({
fs.mkdirSync(contentPaths.cacheDir, { recursive: true });
}

let configPathRelativeToCacheDir = normalizePath(
path.relative(contentPaths.cacheDir.pathname, contentPaths.config.url.pathname)
const configPathRelativeToCacheDir = normalizeConfigPath(
contentPaths.cacheDir.pathname,
contentPaths.config.url.pathname
);

if (!isRelativePath(configPathRelativeToCacheDir))
configPathRelativeToCacheDir = './' + configPathRelativeToCacheDir;

// Remove `.ts` from import path
if (configPathRelativeToCacheDir.endsWith('.ts')) {
configPathRelativeToCacheDir = configPathRelativeToCacheDir.replace(/\.ts$/, '');
}

for (const contentEntryType of contentEntryTypes) {
if (contentEntryType.contentModuleTypes) {
typeTemplateContent = contentEntryType.contentModuleTypes + '\n' + typeTemplateContent;
Expand All @@ -465,7 +474,7 @@ async function writeContentFiles({
typeTemplateContent = typeTemplateContent.replace('// @@DATA_ENTRY_MAP@@', dataTypesStr);
typeTemplateContent = typeTemplateContent.replace(
"'@@CONTENT_CONFIG_TYPE@@'",
contentConfig ? `typeof import(${JSON.stringify(configPathRelativeToCacheDir)})` : 'never'
contentConfig ? `typeof import(${configPathRelativeToCacheDir})` : 'never'
);

await fs.promises.writeFile(
Expand Down