wip: consider tsconfig aliases when resolving content layer image paths

packages/astro/src/content/content-layer.ts

@@ -284,6 +284,8 @@ class ContentLayer {
 						false,
 						// FUTURE: Remove in this in v6
 						id.endsWith('.svg'),
+						undefined,
+						this.#settings,
 					);
 
 					return parsedData;

packages/astro/src/content/utils.ts

@@ -16,6 +16,7 @@ import { normalizePath } from '../core/viteUtils.js';
 import type { AstroSettings } from '../types/astro.js';
 import type { AstroConfig } from '../types/public/config.js';
 import type { ContentEntryType, DataEntryType } from '../types/public/content.js';
+import { getConfigAlias } from '../vite-plugin-config-alias/index.js';
 import {
 	type CONTENT_FLAGS,
 	CONTENT_LAYER_TYPE,
@@ -155,7 +156,8 @@ export async function getEntryDataAndImages<
 	collectionConfig: CollectionConfig,
 	shouldEmitFile: boolean,
 	experimentalSvgEnabled: boolean,
-	pluginContext?: PluginContext,
+	pluginContext: PluginContext | undefined = undefined,
+	astroSettings: AstroSettings,
 ): Promise<{ data: TOutputData; imageImports: Array<string> }> {
 	let data: TOutputData;
 	// Legacy content collections have 'slug' removed
@@ -169,6 +171,7 @@ export async function getEntryDataAndImages<
 	let schema = collectionConfig.schema;
 
 	const imageImports = new Set<string>();
+	const importAliases = getConfigAlias(astroSettings);
 
 	if (typeof schema === 'function') {
 		if (pluginContext) {
@@ -190,7 +193,7 @@ export async function getEntryDataAndImages<
 						// - Relative paths (./foo, ../foo)
 						// - Absolute paths (/foo)
 						// - URLs (http://...)
-						// - Aliases (~/, @/, etc.)
+						// - Aliases (~/, @/, tsconfig aliases)
 						let normalizedPath = val;
 						if (
 							val &&
@@ -199,7 +202,8 @@ export async function getEntryDataAndImages<
 							!val.startsWith('/') &&
 							!val.startsWith('~') &&
 							!val.startsWith('@') &&
-							!val.includes('://')
+							!val.includes('://') &&
+							!importAliases?.some((alias) => alias.find.test(val))
 						) {
 							normalizedPath = `./${val}`;
 						}
@@ -273,14 +277,16 @@ export async function getEntryData(
 	collectionConfig: CollectionConfig,
 	shouldEmitFile: boolean,
 	experimentalSvgEnabled: boolean,
-	pluginContext?: PluginContext,
+	pluginContext: PluginContext | undefined = undefined,
+	astroSettings: AstroSettings,
 ) {
 	const { data } = await getEntryDataAndImages(
 		entry,
 		collectionConfig,
 		shouldEmitFile,
 		experimentalSvgEnabled,
 		pluginContext,
+		astroSettings,
 	);
 	return data;
 }

packages/astro/src/content/vite-plugin-content-imports.ts

@@ -9,7 +9,6 @@ import { AstroError } from '../core/errors/errors.js';
 import { AstroErrorData } from '../core/errors/index.js';
 import type { Logger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
-import type { AstroConfig } from '../types/public/config.js';
 import type {
 	ContentEntryModule,
 	ContentEntryType,
@@ -105,7 +104,7 @@ export function astroContentImportPlugin({
 						fileId,
 						entryConfigByExt: dataEntryConfigByExt,
 						contentDir,
-						config: settings.config,
+						settings,
 						fs,
 						pluginContext: this,
 						shouldEmitFile,
@@ -128,7 +127,7 @@ export const _internal = {
 						fileId,
 						entryConfigByExt: contentEntryConfigByExt,
 						contentDir,
-						config: settings.config,
+						settings,
 						fs,
 						pluginContext: this,
 						shouldEmitFile,
@@ -210,7 +209,7 @@ type GetEntryModuleParams<TEntryType extends ContentEntryType | DataEntryType> =
 	contentDir: URL;
 	pluginContext: PluginContext;
 	entryConfigByExt: Map<string, TEntryType>;
-	config: AstroConfig;
+	settings: AstroSettings;
 	shouldEmitFile: boolean;
 };
 
@@ -248,6 +247,7 @@ async function getContentEntryModule(
 				// FUTURE: Remove in this in v6
 				id.endsWith('.svg'),
 				pluginContext,
+				params.settings,
 			)
 		: unvalidatedData;
 
@@ -285,6 +285,7 @@ async function getDataEntryModule(
 				// FUTURE: Remove in this in v6
 				id.endsWith('.svg'),
 				pluginContext,
+				params.settings,
 			)
 		: unvalidatedData;
 

packages/astro/src/vite-plugin-config-alias/index.ts

@@ -9,7 +9,7 @@ type Alias = {
 };
 
 /** Returns a list of compiled aliases. */
-const getConfigAlias = (settings: AstroSettings): Alias[] | null => {
+export const getConfigAlias = (settings: AstroSettings): Alias[] | null => {
 	const { tsConfig, tsConfigPath } = settings;
 	if (!tsConfig || !tsConfigPath || !tsConfig.compilerOptions) return null;
 

packages/astro/test/content-layer.test.js

@@ -291,6 +291,11 @@ describe('Content Layer', () => {
 			assert.equal(json.rockets[1].data.image.format, 'jpg');
 		});
 
+		it('loads images with tsconfig aliases in JSON', async () => {
+			assert.ok(json.rockets[2].data.image.src.startsWith('/_astro'));
+			assert.equal(json.rockets[2].data.image.format, 'jpg');
+		});
+
 		it('renders images from frontmatter', async () => {
 			assert.ok($('img[alt="Lunar Module"]').attr('src').startsWith('/_astro'));
 		});

packages/astro/test/fixtures/content-layer/src/data/rockets.json

@@ -10,5 +10,11 @@
     "name": "Saturn V",
     "manufacturer": "NASA",
     "image": "./shuttle.jpg"
+  },
+  {
+    "id": "apollo-11",
+    "name": "Apollo 11",
+    "manufacturer": "NASA",
+    "image": "$images/shuttle.jpg"
   }
 ]

packages/astro/test/fixtures/content-layer/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "astro/tsconfigs/base",
+  "compilerOptions": {
+    "paths": {
+      "$images/*": ["./images/*"]
+    }
+  }
+}