Skip to content

Commit

Permalink
Fix for #9673 (#9680)
Browse files Browse the repository at this point in the history
* Fix for #9673

* 🦋 add changeset file

* Update breezy-plants-smoke.md

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>

* ⚡️ simplified normalizeConfigPath

---------

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
  • Loading branch information
loucyx and florian-lefebvre authored Jan 24, 2024
1 parent 457e8b6 commit 5d7db1d
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 11 deletions.
5 changes: 5 additions & 0 deletions .changeset/breezy-plants-smoke.md
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
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,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 @@ -415,18 +431,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 @@ -436,7 +445,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

0 comments on commit 5d7db1d

Please sign in to comment.